atris 3.57.3 → 3.58.5

package/commands/avail.js

@@ -1,7 +1,7 @@
 'use strict';
 
 /**
- * Booking availability — read/update the windows that power /book/{username}.
+ * Booking availability: read/update the windows that power /book/{username}.
  *
  *   atris avail                         # show current settings
  *   atris avail set --wake 2:30pm --sleep 9pm --where Ibiza --days all --apply
@@ -172,13 +172,13 @@ function summarizeHours(availableHours) {
 }
 
 // The booking link is the funnel: an operator shares /book/{username} so a
-// stranger can pick a slot. With no claimed handle there is no link — say so and
+// stranger can pick a slot. With no claimed handle there is no link, say so and
 // name the fix instead of silently dropping the line.
 function formatBookingLink(username, appBase) {
   const handle = String(username || '').trim();
   const base = String(appBase || '').replace(/\/+$/, '');
   if (!handle) {
-    return '  link: none yet — claim a handle with `atris signup` to get your /book link';
+    return '  link: none yet, claim a handle with `atris signup` to get your /book link';
   }
   return `  link: ${base}/book/${handle}`;
 }
@@ -263,7 +263,7 @@ async function setAvail(argv) {
   console.log(summarizeHours(payload.available_hours));
 
   if (!opts.apply) {
-    console.log('\n  Dry run — add --apply to push to your profile.');
+    console.log('\n  Dry run, add --apply to push to your profile.');
     return 0;
   }
 
@@ -308,7 +308,7 @@ async function slotsAvail(argv) {
   if (!username) {
     const identity = await apiRequestJson('/identity/me', { method: 'GET', token });
     if (!identity.ok || !identity.data?.username) {
-      console.error('Could not resolve username — pass --user keshav');
+      console.error('Could not resolve username, pass --user keshav');
       return 1;
     }
     username = identity.data.username;

package/commands/bench.js

@@ -8,9 +8,11 @@ const {
   packMetadata,
   readResultRecords,
   runBench,
+  runBenchPair,
   taskMetadata,
 } = require('../lib/bench/runner');
 const { buildBenchReport, renderBenchReportText } = require('../lib/bench/report');
+const { materializeCandidate } = require('../lib/bench/tree-render');
 const { hasFlag } = require('../lib/arg-parser');
 
 function isAtrisCliRepo(cwd = process.cwd()) {
@@ -51,16 +53,32 @@ function readRepeatedFlag(args, name) {
 }
 
 function printHelp() {
-  console.log('Usage: atris bench run [--pack <id>] [--engine <name>] [--task <id> ...] [--label baseline|candidate] [--experiment <id>] [--update-baseline] [--json]');
+  console.log('Usage: atris bench run [--pack <id>] [--engine <name>] [--model <id>] [--task <id> ...] [--label baseline|candidate] [--experiment <id>] [--update-baseline] [--json]');
+  console.log('Usage: atris bench pair --candidate <dir|git-ref> [--pack <id>] [--engine <name>] [--model <id>] [--task <id> ...] [--min-win-margin <n>] [--repeats <n>] [--current <dir>] [--json]');
   console.log('Usage: atris bench results [--last N] [--json]');
   console.log('Usage: atris bench tasks [--pack <id>] [--json]');
   console.log('Usage: atris bench packs [--json]');
   console.log('Usage: atris bench report [--pack agents-v1] [--json]');
+  console.log('packs: core-v1, agents-v1, harness-v1');
   console.log('');
   console.log('Bench runs product gates and only belongs in the atris CLI repo.');
   console.log('Pass --here to allow running outside that repo.');
 }
 
+function pairScoreText(score) {
+  if (score === null) return 'could-not-run';
+  return score === 1 ? 'pass' : 'fail';
+}
+
+function printPairText(record) {
+  const width = Math.max(0, ...record.tasks.map((task) => task.id.length)) + 3;
+  for (const task of record.tasks) {
+    console.log(`${task.id.padEnd(width)}current ${pairScoreText(task.current)}   candidate ${pairScoreText(task.candidate)}   ${task.outcome}`);
+  }
+  console.log(`wins ${record.wins}  losses ${record.losses}  ties ${record.ties}`);
+  console.log(`verdict: ${record.verdict}, ${record.reason}`);
+}
+
 function printRunText(record) {
   console.log(record.summary);
   for (const task of record.tasks) {
@@ -76,6 +94,7 @@ async function runCommand(args) {
     const result = await runBench({
       pack: readInlineFirstFlag(args, '--pack') || undefined,
       engine: readInlineFirstFlag(args, '--engine') || undefined,
+      model: readInlineFirstFlag(args, '--model') || undefined,
       taskIds: readRepeatedFlag(args, '--task'),
       label: readInlineFirstFlag(args, '--label'),
       experiment: readInlineFirstFlag(args, '--experiment'),
@@ -102,6 +121,48 @@ async function runCommand(args) {
   }
 }
 
+async function pairCommand(args) {
+  const asJson = hasFlag(args, '--json');
+  const candidateSource = readInlineFirstFlag(args, '--candidate');
+  let candidateRoot = null;
+  let removeCandidate = false;
+  try {
+    if (!candidateSource) throw new BenchInfraError('candidate is required');
+    try {
+      removeCandidate = !fs.statSync(path.resolve(candidateSource)).isDirectory();
+    } catch {
+      removeCandidate = true;
+    }
+    candidateRoot = materializeCandidate(candidateSource, process.cwd());
+    const result = await runBenchPair({
+      pack: readInlineFirstFlag(args, '--pack') || undefined,
+      engine: readInlineFirstFlag(args, '--engine') || undefined,
+      model: readInlineFirstFlag(args, '--model') || undefined,
+      taskIds: readRepeatedFlag(args, '--task'),
+      minWinMargin: readInlineFirstFlag(args, '--min-win-margin') || undefined,
+      repeats: readInlineFirstFlag(args, '--repeats') || undefined,
+      currentRoot: readInlineFirstFlag(args, '--current') || undefined,
+      candidateRoot,
+      stateRoot: process.cwd(),
+    });
+    if (asJson) console.log(JSON.stringify(result.record));
+    else printPairText(result.record);
+    return result.exitCode;
+  } catch (err) {
+    const message = err && err.message ? err.message : String(err);
+    if (asJson) {
+      console.log(JSON.stringify({ schema: 'atris.bench.error.v1', error: message }));
+    } else {
+      console.error(`atris bench: ${message}`);
+    }
+    return 2;
+  } finally {
+    if (removeCandidate && candidateRoot) {
+      fs.rmSync(candidateRoot, { recursive: true, force: true });
+    }
+  }
+}
+
 function tasksCommand(args) {
   const pack = readInlineFirstFlag(args, '--pack') || undefined;
   const tasks = taskMetadata({ pack });
@@ -200,6 +261,7 @@ async function benchCommand(args = []) {
     return 2;
   }
   if (subcommand === 'run') return runCommand(rest);
+  if (subcommand === 'pair') return pairCommand(rest);
   if (subcommand === 'tasks') return tasksCommand(rest);
   if (subcommand === 'packs') return packsCommand(rest);
   if (subcommand === 'results') return resultsCommand(rest);

package/commands/browse.js

@@ -32,7 +32,7 @@ async function browseAtris() {
   const result = await apiRequestJson(endpoint, { method: 'GET', token: creds.token });
 
   if (!result.ok) {
-    // API failed — try local templates
+    // API failed, try local templates
     console.log('  API unavailable, checking local templates...');
     const localDir = path.join(os.homedir(), '.atris', 'templates');
     if (!fs.existsSync(localDir)) {
@@ -61,7 +61,7 @@ async function browseAtris() {
           desc = meta.description || '';
         } catch {}
       }
-      console.log(`  ${name}${desc ? '  —  ' + desc : ''}`);
+      console.log(`  ${name}${desc ? ': ' + desc : ''}`);
     }
     console.log('');
     return;

package/commands/business.js

@@ -58,14 +58,14 @@ function validateBusinessCreateName(name) {
     return {
       ok: false,
       usage: BUSINESS_CREATE_USAGE,
-      detail: `Refusing to create a business named "${name}" — looks like a flag, not a name.`,
+      detail: `Refusing to create a business named "${name}", looks like a flag, not a name.`,
     };
   }
   if (isAccidentalHelpBusiness(name)) {
     return {
       ok: false,
       usage: BUSINESS_CREATE_USAGE,
-      detail: `Refusing to create a business named "${name}" — looks like accidental help output, not a real business.`,
+      detail: `Refusing to create a business named "${name}", looks like accidental help output, not a real business.`,
     };
   }
   return { ok: true };
@@ -883,7 +883,7 @@ function collectBusinessOperatingState(cwd = process.cwd(), nowMs = Date.now())
 }
 
 function seedBusinessStarterTask(cwd, todoPath, starterAction) {
-  const title = `${starterAction.title} — ${starterAction.action}`;
+  const title = `${starterAction.title}: ${starterAction.action}`;
   try {
     const taskDb = require('../lib/task-db');
     const db = taskDb.open();
@@ -1626,12 +1626,12 @@ ${stagedSources.length > 0 ? `- Local evidence files: ${stagedSources.length}` :
     '- Before sharing the workspace, run `atris business share --write` and send the handoff.',
   ].filter(Boolean).join('\n') + '\n';
   fs.writeFileSync(cheatSheetPath, operatorSummary, 'utf8');
-  fs.writeFileSync(onePagerPath, operatorSummary.replace('# ', '# One Pager — '), 'utf8');
+  fs.writeFileSync(onePagerPath, operatorSummary.replace('# ', '# One Pager: '), 'utf8');
 
   const todoPath = path.join(cwd, 'atris', 'TODO.md');
   if (fs.existsSync(todoPath)) {
     let todoContent = fs.readFileSync(todoPath, 'utf8');
-    const taskLine = `- **Onboard:** ${starterAction.title} — ${starterAction.action} [execute]\n`;
+    const taskLine = `- **Onboard:** ${starterAction.title}: ${starterAction.action} [execute]\n`;
     const backlogMatch = todoContent.match(/^## Backlog\s*$/m);
     if (backlogMatch) {
       const insertAt = backlogMatch.index + backlogMatch[0].length;
@@ -1761,7 +1761,7 @@ function detectBusinessSlug(explicitSlug) {
 async function findExistingBusinessBySlug(slug, token) {
   if (!slug) return null;
 
-  // Local cache first — no network round-trip needed.
+  // Local cache first, no network round-trip needed.
   const local = loadBusinesses();
   if (local[slug]) {
     return { id: local[slug].business_id, name: local[slug].name, slug, source: 'local' };
@@ -1774,7 +1774,7 @@ async function findExistingBusinessBySlug(slug, token) {
 
   if (!token) return null;
 
-  // Cloud lookup — covers businesses the user is a member of but hasn't added.
+  // Cloud lookup, covers businesses the user is a member of but hasn't added.
   const direct = await apiRequestJson(`/business/by-slug/${encodeURIComponent(slug)}`, {
     method: 'GET',
     token,
@@ -1878,7 +1878,7 @@ async function listBusinesses(opts = {}) {
 
 /**
  * Walk ~/arena/atris-business/ and print a fleet status table for every
- * customer workspace. Pure local — no API calls, no rate-limit risk.
+ * customer workspace. Pure local, no API calls, no rate-limit risk.
  *
  * Classifies each dir as: ready, flat, unbound, nested, bare, or superseded.
  *
@@ -1986,7 +1986,7 @@ function listBusinessesLocal(opts = {}) {
   }
 
   console.log('');
-  console.log(`Atris Fleet — ${rootDir}`);
+  console.log(`Atris Fleet: ${rootDir}`);
   console.log('═'.repeat(86));
   console.log('  CUSTOMER              STATE         FILES   BIZ.JSON  ATRIS/  ACTION');
   console.log('  ' + '─'.repeat(83));
@@ -2016,7 +2016,7 @@ function listBusinessesLocal(opts = {}) {
   const counts = {};
   for (const c of customers) counts[c.state] = (counts[c.state] || 0) + 1;
   const summary = order.filter((s) => counts[s]).map((s) => `${counts[s]} ${s}`).join(', ');
-  console.log(`  ${customers.length} customers — ${summary}`);
+  console.log(`  ${customers.length} customers: ${summary}`);
   console.log('');
 
   const needsWork = customers.filter((c) => ['flat', 'unbound', 'flat-unbound', 'nested'].includes(c.state));
@@ -3086,7 +3086,7 @@ async function connectService(connector, ...flags) {
     for (const s of integrations) {
       console.log(`  ${s}`);
     }
-    if (integrations.length === 0) console.log('  (none found — install skills first)');
+    if (integrations.length === 0) console.log('  (none found, install skills first)');
     return;
   }
 
@@ -3540,7 +3540,7 @@ function printBusinessHelp() {
 }
 
 async function businessCommand(subcommand, ...args) {
-  // Help intercept — without this, `atris business init --help` would treat
+  // Help intercept, without this, `atris business init --help` would treat
   // `--help` as a business name and create one. Same for any subcommand that
   // takes a positional name/slug.
   if (!subcommand || isHelpToken(subcommand)) {

package/commands/card.js

@@ -1,4 +1,4 @@
-// atris card — one line of text -> a beautiful, on-brand image (your theme).
+// atris card, one line of text -> a beautiful, on-brand image (your theme).
 //
 //   atris card "Ship faster" --kind statement --theme brand --size og
 //   atris card "It just works" --kind quote --by "a happy user"
@@ -64,7 +64,7 @@ function run(argv) {
   const { flags, pos } = parseFlags(argv);
 
   if (pos[0] === 'help' || flags.help) {
-    console.log(`\n  atris card — one line of text into an on-brand image\n
+    console.log(`\n  atris card, one line of text into an on-brand image\n
   atris card "Your headline" [--kind statement|quote|stat] [--theme <name>] [--size og|wide|square|story]
   flags: --sub --kicker --by --number --label --brand --version --out <file.png> --html-only\n
   examples:

package/commands/clean.js

@@ -122,7 +122,7 @@ function cleanAtris(options = {}) {
   if (unhealable.length > 0) {
     console.log(`⚠ ${unhealable.length} MAP.md ${unhealable.length === 1 ? 'ref' : 'refs'} couldn't be healed:`);
     unhealable.slice(0, 3).forEach(ref => {
-      console.log(`   • ${ref.file}:${ref.line} — ${ref.reason}`);
+      console.log(`   • ${ref.file}:${ref.line}: ${ref.reason}`);
     });
     if (unhealable.length > 3) {
       console.log(`   ... and ${unhealable.length - 3} more`);
@@ -156,7 +156,7 @@ function cleanAtris(options = {}) {
   if (stalePages.length > 0) {
     console.log(`⚠ ${stalePages.length} stale ${stalePages.length === 1 ? 'page' : 'pages'} (source changed since last compiled):`);
     stalePages.forEach(sp => {
-      console.log(`   • ${path.relative(cwd, sp.page)} — stale source: ${sp.staleSource}`);
+      console.log(`   • ${path.relative(cwd, sp.page)}: stale source: ${sp.staleSource}`);
     });
     console.log('');
   } else {
@@ -165,7 +165,7 @@ function cleanAtris(options = {}) {
 
   // Dead code
   if ((results.deadFiles || []).length > 0) {
-    console.log(`⚠ ${results.deadFiles.length} dead ${results.deadFiles.length === 1 ? 'file' : 'files'} (unreachable and unreferenced — atris slop dead for detail):`);
+    console.log(`⚠ ${results.deadFiles.length} dead ${results.deadFiles.length === 1 ? 'file' : 'files'} (unreachable and unreferenced, atris slop dead for detail):`);
     results.deadFiles.slice(0, 5).forEach((f) => console.log(`   • ${f}`));
     if (results.deadFiles.length > 5) console.log(`   ... and ${results.deadFiles.length - 5} more`);
     console.log('');
@@ -252,8 +252,8 @@ function firstLine(text) {
 function mapScriptLine(step) {
   const script = MAP_SCRIPTS.find(s => step.script.endsWith(s.file));
   if (step.status === 'would_run') return `✓ ${script.dryLabel} (${step.script})`;
-  if (step.status === 'skipped') return `○ Skipped ${step.script} — ${step.detail}`;
-  if (step.status === 'failed') return `✗ ${script.failLabel} — ${step.detail}`;
+  if (step.status === 'skipped') return `○ Skipped ${step.script}: ${step.detail}`;
+  if (step.status === 'failed') return `✗ ${script.failLabel}: ${step.detail}`;
   return `✓ ${script.ranLabel}`;
 }
 
@@ -368,8 +368,8 @@ function healBrokenMapRefs(cwd, atrisDir, dryRun = false, homeDir = os.homedir()
 
   // Match both `file.js:123` and `file.js:123-456` with surrounding context
   // [^\S\n] = horizontal whitespace only (no newlines)
-  // Required delimiter [(,[,—,-] prevents bleeding into adjacent refs on same line
-  const refPattern = /(`?)([a-zA-Z0-9_~\-./\\]+\.(js|ts|py|go|rs|rb|java|c|cpp|h|hpp|md|json|yaml|yml)):(\d+)(?:-(\d+))?(`?)([^\S\n]*[\(\[—\-][^\S\n]*([^)\]\n]+))?/g;
+  // Required delimiter set, including the u2014 escape, prevents bleeding into adjacent refs on same line
+  const refPattern = /(`?)([a-zA-Z0-9_~\-./\\]+\.(js|ts|py|go|rs|rb|java|c|cpp|h|hpp|md|json|yaml|yml)):(\d+)(?:-(\d+))?(`?)([^\S\n]*[\(\[\u2014\-][^\S\n]*([^)\]\n]+))?/g;
 
   // Function Inventory form: `symbolName()` → `file:line[-line]`
   // Pre-scan to build a (file:line) → symbol map so refs with the symbol BEFORE them still verify.
@@ -518,7 +518,7 @@ function findFunctionEnd(lines, startLine) {
 }
 
 /**
- * Extract a symbol name from context like "(interactiveEntry function)" or "— Main entry"
+ * Extract a symbol name from context like "(interactiveEntry function)" or "Main entry" after punctuation
  */
 function extractSymbol(context) {
   if (!context) return null;
@@ -529,7 +529,7 @@ function extractSymbol(context) {
   const unquoted = context.trim().replace(/`/g, '');
   const wrapper = unquoted.match(/^([\(\[])/)?.[1];
   let cleaned = unquoted
-    .replace(/^[\(\[—\-:]+\s*/, '')
+    .replace(/^[\(\[\u2014\-:]+\s*/, '')
     .trim();
   if (wrapper === '(') cleaned = cleaned.replace(/\)$/, '').trim();
   if (wrapper === '[') cleaned = cleaned.replace(/\]$/, '').trim();
@@ -553,13 +553,13 @@ function extractSymbol(context) {
 
 /**
  * Find the line number where a symbol is defined (strict patterns only)
- * Returns null if only loose matches found — prevents healing to wrong locations
+ * Returns null if only loose matches found, prevents healing to wrong locations
  */
 function findSymbolLine(fileContent, symbol) {
   const lines = fileContent.split('\n');
   const esc = escapeRegExp(symbol);
 
-  // Strict definition patterns only — no loose fallback
+  // Strict definition patterns only, no loose fallback
   const patterns = [
     new RegExp(`^\\s*(async\\s+)?function\\s+${esc}\\s*\\(`),  // function name(
     new RegExp(`^\\s*(const|let|var)\\s+${esc}\\s*=`),          // const/let/var name =
@@ -652,7 +652,7 @@ function checkPageStaleness(cwd, filePath) {
 
   // Check each source's mtime against last_compiled.
   // Source entries can include a line range and/or a parenthesized annotation,
-  // e.g. "bin/atris.js:199-340 (showHelp function)" — strip both before stat.
+  // e.g. "bin/atris.js:199-340 (showHelp function)". Strip both before stat.
   for (const source of sources) {
     const filePart = source
       .replace(/\s*\([^)]*\)\s*$/, '')   // drop trailing "(annotation)"
@@ -670,7 +670,7 @@ function checkPageStaleness(cwd, filePath) {
         };
       }
     } catch {
-      // Source file doesn't exist — that's also a staleness signal
+      // Source file doesn't exist, that's also a staleness signal
       return {
         page: filePath,
         staleSource: source + ' (missing)',