atris 3.38.0 → 3.41.0

package/commands/play.js

@@ -5,6 +5,7 @@ const os = require('os');
 const fs = require('fs');
 const { spawnSync } = require('child_process');
 const { getSessionProfile, loadCredentials } = require('../utils/auth');
+const { hasFlag: hasExactFlag } = require('../lib/arg-parser');
 
 const AGENTXP_LEADERBOARD_URL = 'https://api.atris.ai/api/agentxp/leaderboard';
 const AGENTXP_GLOBAL_SYNC_RULE = 'Run atris login, then sync. Owner-provided sync tokens are guided-demo fallback only.';
@@ -38,8 +39,9 @@ function flag(args, name) {
   return null;
 }
 
-function hasFlag(args, name) {
-  return args.includes(name) || args.some(arg => arg.startsWith(`${name}=`));
+// This command treats --name=value as flag presence as well as a standalone flag.
+function hasFlagOrValue(args, name) {
+  return hasExactFlag(args, name) || args.some(arg => arg.startsWith(`${name}=`));
 }
 
 function positional(args) {
@@ -284,7 +286,7 @@ function handleSourceLine(state) {
 }
 
 function ensureStarterMission(taskDb, db, workspaceRoot, player, tasks, args = []) {
-  if (hasFlag(args, '--no-seed')) return { tasks, seeded: null };
+  if (hasFlagOrValue(args, '--no-seed')) return { tasks, seeded: null };
   if (selectMission(tasks, player)) return { tasks, seeded: null };
   fs.mkdirSync(path.join(workspaceRoot, 'atris'), { recursive: true });
 
@@ -476,7 +478,7 @@ async function playCommand(...args) {
   }
 
   const state = modeState(args);
-  if (hasFlag(args, '--json')) {
+  if (hasFlagOrValue(args, '--json')) {
     console.log(JSON.stringify(state, null, 2));
     return;
   }

package/commands/probe.js

@@ -29,7 +29,7 @@ const http = require('http');
 const path = require('path');
 const { getApiBaseUrl } = require('../utils/api');
 const { loadCredentials } = require('../utils/auth');
-const { encodeToolResult } = require('../lib/tool-result-encode');
+const { buildToolResultBody } = require('../lib/tool-result-encode');
 
 // G2's honest blocked message (tool_policy_bench.MAX_TURNS_EXHAUSTED_MESSAGE)
 // starts with this — an answer that is only this marker is a dead-end.
@@ -357,7 +357,7 @@ async function runAtris2Turn(opts = {}) {
                 unsupported.push(`tool:${name || '?'}`);
               }
               await postJson(`${base}/atris2/turn/tool-result`, token,
-                { call_id: ev.call_id || ev.id, result_base64: encodeToolResult(out) }, 30000);
+                buildToolResultBody(ev.call_id || ev.id, out), 30000);
               resetIdle();
             }).catch((e) => reject(e));
           } else if (et === 'result') {

package/commands/pulse.js

@@ -19,11 +19,10 @@ const path = require('path');
 const { spawnSync } = require('child_process');
 const pulse = require('../lib/pulse');
 const { DEFAULT_CLAUDE_RUNNER_MODEL } = require('../lib/runner-command');
+const { hasFlag } = require('../lib/arg-parser');
 
-function hasFlag(args, name) {
-  return args.includes(name);
-}
-function readFlag(args, name, fallback = null) {
+// Preserve the existing rule that the next token is a value, even if it is a flag.
+function readFollowingFlag(args, name, fallback = null) {
   const i = args.indexOf(name);
   if (i === -1 || i === args.length - 1) return fallback;
   return args[i + 1];
@@ -208,7 +207,7 @@ function tickCommand(args, root = process.cwd()) {
   const asJson = wantsJson(args);
   const noClaude = hasFlag(args, '--no-claude');
   const noVerify = hasFlag(args, '--no-verify');
-  const verifyCmd = noVerify ? null : readFlag(args, '--verify', pulse.defaultVerifyCmd(root));
+  const verifyCmd = noVerify ? null : readFollowingFlag(args, '--verify', pulse.defaultVerifyCmd(root));
   const startedAt = Date.now();
 
   // Detect a previous tick that died mid-run before we take the lock.
@@ -577,7 +576,7 @@ function installCommand(args, root = process.cwd(), options = {}) {
   const commandSpawn = options.spawnSync || spawnSync;
   const writeOutput = options.writeOutput || ((text) => process.stdout.write(text));
   const slot = pulse.resolvePulseSlot(root, options.homeDir ? { homeDir: options.homeDir } : {});
-  const cadenceInput = readFlag(args, '--cadence', pulse.DEFAULT_CADENCE_CRON);
+  const cadenceInput = readFollowingFlag(args, '--cadence', pulse.DEFAULT_CADENCE_CRON);
   let cron;
   try {
     cron = pulse.normalizeCronCadence(cadenceInput);
@@ -595,8 +594,8 @@ function installCommand(args, root = process.cwd(), options = {}) {
   let expiry;
   try {
     expiry = pulse.normalizeExpiryDuration({
-      hours: readFlag(args, '--hours', null),
-      days: readFlag(args, '--days', '7'),
+      hours: readFollowingFlag(args, '--hours', null),
+      days: readFollowingFlag(args, '--days', '7'),
     });
   } catch (error) {
     const out = {
@@ -604,17 +603,17 @@ function installCommand(args, root = process.cwd(), options = {}) {
       action: 'pulse_install',
       reason: 'invalid_expiry',
       detail: error && error.message ? error.message : String(error),
-      hours: readFlag(args, '--hours', null),
-      days: readFlag(args, '--days', '7'),
+      hours: readFollowingFlag(args, '--hours', null),
+      days: readFollowingFlag(args, '--days', '7'),
     };
     if (!asJson) process.stdout.write(`pulse install failed: ${out.detail}\n`);
     return emit(out, asJson);
   }
-  const verifyCmd = readFlag(args, '--verify', pulse.defaultVerifyCmd(root));
-  const model = readFlag(args, '--model', process.env.ATRIS_RUNNER_MODEL || process.env.ATRIS_CLAUDE_MODEL || DEFAULT_CLAUDE_RUNNER_MODEL);
-  const runnerProfile = readFlag(args, '--runner-profile', process.env.ATRIS_RUNNER_PROFILE || '');
-  const runnerBin = readFlag(args, '--runner-bin', process.env.ATRIS_RUNNER_BIN || process.env.ATRIS_CLAUDE_BIN || '');
-  const runnerCommandTemplate = readFlag(args, '--runner-template', process.env.ATRIS_RUNNER_COMMAND_TEMPLATE || process.env.ATRIS_CLAUDE_COMMAND_TEMPLATE || '');
+  const verifyCmd = readFollowingFlag(args, '--verify', pulse.defaultVerifyCmd(root));
+  const model = readFollowingFlag(args, '--model', process.env.ATRIS_RUNNER_MODEL || process.env.ATRIS_CLAUDE_MODEL || DEFAULT_CLAUDE_RUNNER_MODEL);
+  const runnerProfile = readFollowingFlag(args, '--runner-profile', process.env.ATRIS_RUNNER_PROFILE || '');
+  const runnerBin = readFollowingFlag(args, '--runner-bin', process.env.ATRIS_RUNNER_BIN || process.env.ATRIS_CLAUDE_BIN || '');
+  const runnerCommandTemplate = readFollowingFlag(args, '--runner-template', process.env.ATRIS_RUNNER_COMMAND_TEMPLATE || process.env.ATRIS_CLAUDE_COMMAND_TEMPLATE || '');
   const deadlineEpoch = Math.floor(Date.now() / 1000) + expiry.seconds;
 
   fs.mkdirSync(slot.stateHome, { recursive: true });
@@ -735,7 +734,7 @@ function uninstallCommand(args, root = process.cwd(), options = {}) {
 
 function runCommand(args, root = process.cwd()) {
   const asJson = wantsJson(args);
-  const maxTicks = Math.max(1, Number(readFlag(args, '--max-ticks', '1')) || 1);
+  const maxTicks = Math.max(1, Number(readFollowingFlag(args, '--max-ticks', '1')) || 1);
   const passthrough = args.filter((a) => a !== '--max-ticks' && a !== String(maxTicks));
   const results = [];
   for (let i = 0; i < maxTicks; i++) {

package/commands/release.js

@@ -7,7 +7,7 @@ const { execFileSync } = require('child_process');
  *
  * - Reads git log since last tag
  * - Determines bump type (minor if any scorecard has reward>=5, else patch)
- * - Bumps package.json version
+ * - Bumps package.json and package-lock.json together
  * - Commits, tags, pushes
  * - Creates GitHub release via `gh`
  * - Drafts a /launch post (3 emoji bullets)
@@ -79,16 +79,17 @@ async function releaseAtris({ dryRun = false } = {}) {
     return;
   }
 
-  // 7. Bump package.json
-  const updatedPkgRaw = pkgRaw.replace(
-    `"version": "${currentVersion}"`,
-    `"version": "${nextVersion}"`
-  );
-  fs.writeFileSync(pkgPath, updatedPkgRaw);
-  console.log(`bumped package.json to ${nextVersion}`);
+  // 7. Let npm keep package.json and package-lock.json aligned.
+  execFileSync('npm', [
+    'version',
+    nextVersion,
+    '--no-git-tag-version',
+    '--ignore-scripts',
+  ], { cwd, stdio: 'ignore' });
+  console.log(`bumped package.json and package-lock.json to ${nextVersion}`);
 
   // 8. Commit
-  execFileSync('git', ['add', 'package.json'], { cwd });
+  execFileSync('git', ['add', 'package.json', 'package-lock.json'], { cwd });
   execFileSync('git', ['commit', '-m', `v${nextVersion}`], { cwd });
   console.log('committed');
 

package/commands/router.js

@@ -13,7 +13,8 @@ const LANE_ORDER = ['fast', 'pro', 'max', 'code-fast'];
 const DEPTH = { fast: 0, 'code-fast': 1, pro: 1, max: 2 };
 const QUALITY_MISS_WEIGHT = 3;
 
-function readFlag(args, names) {
+// Preserve alias priority and inline-value priority within each alias.
+function readFirstNamedFlag(args, names) {
   for (const name of names) {
     const prefix = `${name}=`;
     const inline = args.find((arg) => String(arg).startsWith(prefix));
@@ -29,14 +30,14 @@ function readFlag(args, names) {
 function resolveRouterPaths(args = [], env = process.env) {
   const home = env.HOME || os.homedir();
   return {
-    picks: path.resolve(readFlag(args, ['--picks', '--picks-path'])
+    picks: path.resolve(readFirstNamedFlag(args, ['--picks', '--picks-path'])
       || env.ATRIS_ROUTER_PICKS_PATH
       || env.ATRIS_AX_AUTO_PICKS_PATH
       || path.join(home, '.atris', 'ax-auto-picks.jsonl')),
-    overrides: path.resolve(readFlag(args, ['--overrides', '--overrides-path'])
+    overrides: path.resolve(readFirstNamedFlag(args, ['--overrides', '--overrides-path'])
       || env.ATRIS_ROUTER_OVERRIDES_PATH
       || path.join(home, '.atris', 'router-overrides.json')),
-    gold: path.resolve(readFlag(args, ['--gold', '--gold-path'])
+    gold: path.resolve(readFirstNamedFlag(args, ['--gold', '--gold-path'])
       || env.ATRIS_ROUTER_GOLD_PATH
       || DEFAULT_GOLD_PATH),
   };