atris 3.58.7 → 3.58.8

package/commands/member.js

@@ -4,10 +4,12 @@ const crypto = require('crypto');
 const os = require('os');
 const { execFileSync, spawnSync } = require('child_process');
 const { loadCredentials } = require('../utils/auth');
+const { resolveBackendRoot } = require('../utils/backend-root');
 const { apiRequestJson } = require('../utils/api');
 const { runAliveTick } = require('../lib/member-alive');
 const { defaultObjectiveRunner } = require('../lib/default-runner');
 const { readJson, writeJson } = require('../lib/json-file');
+const { sleepSync } = require('../lib/sleep-sync');
 const { hasFlag, readFlag, readNumberFlag } = require('../lib/arg-parser');
 const { ensureMemberBundle, memberBundlePresent } = require('../lib/member-scaffold');
 const { memberProcessPrompt, MEMBER_PROCESS_PATH } = require('../lib/member-context');
@@ -686,6 +688,15 @@ const MEMBER_RUN_START_VALUE_FLAGS = [
   '--mission-id',
   '--owner',
   '--runner',
+  '--engine',
+  '--budget',
+  '--repo',
+  '--native-goal-status',
+  '--native-goal-objective',
+  '--visible-goal-status',
+  '--visible-goal-objective',
+  '--max-idle-ticks',
+  '--slots',
   '--lane',
   '--cadence',
   '--verify',
@@ -717,10 +728,49 @@ const MEMBER_RUN_START_BOOLEAN_FLAGS = [
   '--stop-when-done',
   '--choose-work',
   '--auto',
+  '--headless',
+  '--self-drive',
+  '--no-claude',
+  '--complete-on-pass',
+  '--no-drain',
+  '--create-next',
+  '--preflight',
+  '--no-preflight',
+  '--room-preflight',
+  '--no-room-preflight',
+  '--room-auto-run',
+  '--no-room-auto-run',
+  '--manual-ack',
+  '--allow-native-goal-supersede',
+  '--supersede-paused-native-goal',
+  '--take-goal-slot',
+  '--due',
+  '--detach',
+  '--fleet',
+  '--dry-run',
+  '--land',
+  '--cloud',
 ];
 
+function memberRunMissionWordIndices(args = []) {
+  const values = new Set(MEMBER_RUN_START_VALUE_FLAGS);
+  const booleans = new Set(['--full', '--verbose', ...MEMBER_RUN_START_BOOLEAN_FLAGS]);
+  const indices = [];
+  for (let i = 0; i < args.length; i += 1) {
+    const arg = String(args[i]);
+    const key = arg.includes('=') ? arg.slice(0, arg.indexOf('=')) : arg;
+    if (booleans.has(key)) continue;
+    if (values.has(key)) {
+      if (!arg.includes('=') && args[i + 1] && !String(args[i + 1]).startsWith('--')) i += 1;
+      continue;
+    }
+    indices.push(i);
+  }
+  return indices;
+}
+
 function memberRunMissionText(args = []) {
-  return stripKnownFlags(args, MEMBER_RUN_START_VALUE_FLAGS, MEMBER_RUN_START_BOOLEAN_FLAGS).join(' ').trim();
+  return memberRunMissionWordIndices(args).map((index) => args[index]).join(' ').trim();
 }
 
 function cleanMemberRunPhrase(value) {
@@ -834,10 +884,8 @@ function buildMemberRunStartArgs(owner, missionText, args = [], cwd = process.cw
   pushFlagValue(startArgs, args, '--minutes');
   pushFlagValue(startArgs, args, '--hours');
   pushFlagValue(startArgs, args, '--base');
-  // A member-run mission is driven immediately by its runner, not parked on
-  // the queue, so the mission-start verifier gate (built for parked planning
-  // wishes) would only kill autonomous legs like autopilot's "member chooses
-  // useful work". When the caller named no verifier, opt out explicitly.
+  // Member runs choose and drive work immediately, so an absent check must not
+  // leave autonomous callers with a mission that never ran.
   if (hasFlag(args, '--no-verify') || !readFlag(args, '--verify', '')) {
     startArgs.push('--no-verify');
   }
@@ -853,7 +901,7 @@ function buildMemberRunStartArgs(owner, missionText, args = [], cwd = process.cw
   if (!hasFlag(args, '--shared-checkout') && !hasFlag(args, '--no-worktree') && insideGitRepo(cwd)) {
     startArgs.push('--worktree');
   }
-  if (hasFlag(args, '--json')) startArgs.push('--json');
+  startArgs.push('--json');
   return startArgs;
 }
 
@@ -871,15 +919,52 @@ function startMemberRunMission(name, missionText, args = []) {
   const paths = requireMemberDir(name);
   const owner = paths.storageName || name;
   const startArgs = buildMemberRunStartArgs(owner, missionText, args);
+  return memberRunCli(startArgs, process.cwd());
+}
 
+function memberRunCli(args, cwd, { live = false, missionId = '' } = {}) {
   const cliPath = path.join(__dirname, '..', 'bin', 'atris.js');
+  const runsDir = path.join(cwd, 'atris', 'runs');
+  const previousReceipts = live && fs.existsSync(runsDir) ? new Set(fs.readdirSync(runsDir)) : new Set();
+  const result = spawnSync(process.execPath, [cliPath, ...args], {
+    cwd,
+    encoding: 'utf8',
+    maxBuffer: 64 * 1024 * 1024,
+    stdio: live ? 'inherit' : ['ignore', 'pipe', 'pipe'],
+  });
+  if (result.error) throw result.error;
+  if (live) {
+    const receiptName = fs.existsSync(runsDir)
+      ? fs.readdirSync(runsDir).filter((name) => !previousReceipts.has(name) && name.startsWith(`mission-${missionId}-`) && name.endsWith('.json')).sort().at(-1)
+      : null;
+    const receipt = receiptName ? readJson(path.join(runsDir, receiptName), null) : null;
+    return { status: result.status, payload: receipt?.result?.kind === 'mission_run_summary'
+      ? { ran_ticks: receipt.result.ran_ticks } : null, stderr: '', errorReported: result.status !== 0 };
+  }
+  let payload = null;
   try {
-    execFileSync(process.execPath, [cliPath, ...startArgs], {
-      cwd: process.cwd(),
-      stdio: 'inherit',
-    });
+    payload = JSON.parse(result.stdout);
   } catch (error) {
-    process.exitCode = Number(error?.status) || 1;
+    if (result.status === 0) throw new Error(`member run: mission command returned invalid json: ${error.message}`);
+  }
+  return { status: result.status, payload, stderr: String(result.stderr || '').trim() };
+}
+
+function memberRunConfiguredVerifier(paths) {
+  const frontmatter = parseFrontmatter(fs.readFileSync(paths.memberFile, 'utf8')) || {};
+  const check = frontmatter.verify || frontmatter.verifier;
+  return typeof check === 'string' ? check.trim() : '';
+}
+
+function printMemberRunResult(result, asJson) {
+  if (asJson) {
+    console.log(JSON.stringify(result));
+  } else if (result.started) {
+    console.log(`started ${result.mission_id} (${result.state})`);
+  }
+  if (result.ok === false || (!result.started && result.ok !== true)) {
+    if (!result.errorReported) console.error(result.error);
+    process.exitCode = 1;
   }
 }
 
@@ -967,48 +1052,96 @@ function memberPing(name, ...args) {
 
 function memberRun(name, ...args) {
   if (!name || name === '--help' || name === '-h' || hasFlag(args, '--help') || hasFlag(args, '-h')) {
-    console.log('Usage: atris member run <name> ["mission text"] [--minutes N|--hours N] [--json]');
-    console.log('New mission: atris member run growth "Improve onboarding proof" --minutes 30 --json');
-    console.log('Choose work: atris member run growth --industry logistics --value "reduce support time" --minutes 30 --json');
-    console.log('Existing mission: atris member run growth --mission <mission-id> --max-ticks 1 --json');
-    console.log('Meaning: if mission text is omitted, the member chooses one useful bounded task from Atris state.');
-    console.log('Truth: useful work must improve revenue, reliability, speed, security, clarity, or trust, then show plain proof.');
-    console.log('Isolation: new missions use --worktree by default; add --shared-checkout to stay here.');
+    console.log('usage: atris member run <name> ["mission text"] [--verify "<cmd>"] [--minutes N|--hours N] [--json]');
+    console.log('new mission: atris member run growth "improve onboarding proof" --verify "npm test" --minutes 30 --json');
+    console.log('choose work: atris member run growth --verify "npm test" --industry logistics --minutes 30 --json');
+    console.log('existing mission: atris member run growth --mission <mission-id> --max-ticks 1 --json');
+    console.log('meaning: if mission text is omitted, the member chooses one useful bounded task from atris state.');
+    console.log('truth: useful work must improve revenue, reliability, speed, security, clarity, or trust, then show plain proof.');
+    console.log('isolation: new missions use --worktree by default; add --shared-checkout to stay here.');
+    console.log('check: --verify or a verify field in the member file adds a mission check.');
     return;
   }
 
+  const asJson = hasFlag(args, '--json');
+  const paths = requireMemberDir(name);
+  const requestedVerifier = readFlag(args, '--verify', '') || memberRunConfiguredVerifier(paths);
   const missionText = memberRunMissionText(args);
   const hasMissionOverride = Boolean(readFlag(args, '--mission', '') || readFlag(args, '--mission-id', ''));
+  let mission = null;
+  let startedNewMission = false;
+  let nodeModulesLinked = false;
+  let nodeModulesSource = null;
   if (missionText && !hasMissionOverride) {
-    startMemberRunMission(name, missionText, args);
-    return;
+    const start = startMemberRunMission(name, missionText, requestedVerifier ? [...args, '--verify', requestedVerifier] : args);
+    if (start.status !== 0 || !start.payload?.mission) {
+      printMemberRunResult({ started: false, state: null, mission_id: start.payload?.mission?.id || null,
+        error: start.payload?.detail || start.payload?.error || start.stderr || 'mission creation failed' }, asJson);
+      return;
+    }
+    mission = start.payload.mission;
+    startedNewMission = true;
+    nodeModulesLinked = Boolean(start.payload.node_modules_linked);
+    nodeModulesSource = start.payload.node_modules_source || null;
+  } else {
+    const missionId = resolveMemberRunMissionId(name, args);
+    if (!missionId) {
+      const start = startMemberRunMission(name, memberRunAutoMissionText(name, args), requestedVerifier ? [...args, '--verify', requestedVerifier] : args);
+      if (start.status !== 0 || !start.payload?.mission) {
+        printMemberRunResult({ started: false, state: null, mission_id: start.payload?.mission?.id || null,
+          error: start.payload?.detail || start.payload?.error || start.stderr || 'mission creation failed' }, asJson);
+        return;
+      }
+      mission = start.payload.mission;
+      startedNewMission = true;
+      nodeModulesLinked = Boolean(start.payload.node_modules_linked);
+      nodeModulesSource = start.payload.node_modules_source || null;
+    } else {
+      mission = require('./mission').resolveMission(missionId);
+      if (!mission) {
+        printMemberRunResult({ started: false, state: null, mission_id: missionId, error: `mission ${missionId} was not found` }, asJson);
+        return;
+      }
+    }
   }
 
-  const missionId = resolveMemberRunMissionId(name, args);
-  if (!missionId) {
-    startMemberRunMission(name, memberRunAutoMissionText(name, args), args);
-    return;
+  if (startedNewMission && !asJson) {
+    if (mission.worktree?.path) console.log(`worktree: ${mission.worktree.path}`);
+    if (nodeModulesLinked) console.log(`linked node_modules from ${nodeModulesSource}`);
+  }
+
+  const cwd = mission.worktree?.path || process.cwd();
+  const verifier = readFlag(args, '--verify', '') || mission.verifier || requestedVerifier;
+  if (verifier && verifier !== mission.verifier) {
+    const changed = memberRunCli(['mission', 'set-verifier', mission.id, verifier, '--json'], cwd);
+    if (changed.status !== 0) {
+      printMemberRunResult({ started: false, state: mission.status, mission_id: mission.id, mission,
+        error: changed.payload?.detail || changed.payload?.error || changed.stderr || 'could not set mission check' }, asJson);
+      return;
+    }
+    mission.verifier = verifier;
   }
 
-  const runArgs = stripKnownFlags(args, ['--mission', '--mission-id', '--minutes', '--hours'], ['--worktree', '--shared-checkout', '--no-worktree']);
+  const missionWordIndices = missionText && !hasMissionOverride ? new Set(memberRunMissionWordIndices(args)) : new Set();
+  const executionArgs = args.filter((_, index) => !missionWordIndices.has(index));
+  const runArgs = stripKnownFlags(executionArgs,
+    ['--mission', '--mission-id', '--minutes', '--hours', '--industry', '--domain', '--value', '--outcome', '--truth', '--proof', '--base'],
+    ['--worktree', '--shared-checkout', '--no-worktree', '--choose-work', '--auto']);
   const budgetSeconds = memberRunBudgetSeconds(args);
-  // A timed run is a loop contract, not one tick: keep picking the next useful
-  // move until the wall clock (--max-wall) spends the budget. Only untimed runs
-  // default to a single tick.
   if (!readFlag(runArgs, '--max-ticks', '')) {
     runArgs.push('--max-ticks', budgetSeconds ? String(Math.max(4, Math.ceil(budgetSeconds / 300))) : '1');
   }
   if (!readFlag(runArgs, '--max-wall', '')) runArgs.push('--max-wall', String(budgetSeconds || 900));
-
-  const cliPath = path.join(__dirname, '..', 'bin', 'atris.js');
-  try {
-    execFileSync(process.execPath, [cliPath, 'mission', 'run', missionId, ...runArgs], {
-      cwd: process.cwd(),
-      stdio: 'inherit',
-    });
-  } catch (error) {
-    process.exitCode = Number(error?.status) || 1;
-  }
+  const run = memberRunCli(['mission', 'run', mission.id, ...runArgs], cwd, { live: !asJson, missionId: mission.id });
+  const payload = run.payload || {};
+  const finalMission = payload.mission || require('./mission').resolveMission(mission.id, cwd) || mission;
+  const started = run.status === 0 && payload.ok !== false && Number(payload.ran_ticks) > 0;
+  const noWorkStepExpected = hasFlag(runArgs, '--detach') || hasFlag(runArgs, '--dry-run');
+  const ok = run.status === 0 && payload.ok !== false && (started || noWorkStepExpected);
+  printMemberRunResult({ ...payload, ok, started, state: finalMission.status, mission_id: mission.id,
+    mission: finalMission, node_modules_linked: nodeModulesLinked, node_modules_source: nodeModulesSource,
+    errorReported: run.errorReported,
+    ...(!ok ? { error: payload.detail || payload.error || payload.reason || run.stderr || 'mission did not run a work step' } : {}) }, asJson);
 }
 
 function loadTeamScoreEvidence(scoreJsonPath) {
@@ -1831,8 +1964,8 @@ function problemSignalSources(root = process.cwd()) {
     sources.push(source);
   }
   for (const source of problemSignalFilesForStateDir(path.join(root, '.atris', 'state'))) push(source);
-  const siblingBackend = path.resolve(root, '..', 'atrisos-backend');
-  if (fs.existsSync(siblingBackend)) {
+  const siblingBackend = resolveBackendRoot(root);
+  if (siblingBackend) {
     for (const source of problemSignalFilesForStateDir(path.join(siblingBackend, '.atris', 'state'), 'backend')) push(source);
   }
   for (const source of configuredProblemSignalSources(root)) push(source);
@@ -4594,12 +4727,6 @@ function printJsonOrText(payload, lines, asJson) {
   for (const line of lines) console.log(line);
 }
 
-function sleepSync(ms) {
-  const duration = Math.max(0, Number(ms) || 0);
-  if (duration <= 0) return;
-  Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, duration);
-}
-
 function memberGoal(name, ...args) {
   const paths = requireMemberDir(name);
   const asJson = hasFlag(args, '--json');
@@ -9261,7 +9388,7 @@ async function memberCommand(subcommand, ...args) {
       console.log('  atris member goal-from-mission growth --json');
       console.log('  atris member goal-from-score growth --score-json team-score.json --json');
       console.log('  atris member wake growth --json');
-      console.log('  atris member run growth "Improve onboarding proof" --minutes 30 --json');
+      console.log('  atris member run growth "improve onboarding proof" --verify "npm test" --minutes 30 --json');
       console.log('  atris member run growth --mission <mission-id> --max-ticks 1 --json');
       console.log('  atris member wake growth --execute --confirm-autonomy-policy');
       console.log('  atris member supervisor recommendations --json');

package/commands/mission.js

@@ -13,6 +13,7 @@ const {
   printCliJson,
 } = require('../lib/cli-json');
 const escapeRegExp = require('../lib/escape-regexp');
+const { sleepSync } = require('../lib/sleep-sync');
 const {
   appendBriefRecord,
   stampBriefOutcome,
@@ -3568,8 +3569,8 @@ function readTasteReviewHistory(root, limit = 4) {
 
 function missionTasteMemorySignals(text) {
   const definitions = [
-    ['plain_language', 'Keshav asks for plain English', /\b(plain|jargon|feynman|understand|simple|clarify|clarity)\b/i],
-    ['proof_gate', 'Keshav wants proof before accept', /\b(proof|receipt|verify|verified|checked|tested|accept|approval)\b/i],
+    ['plain_language', 'the operator asks for plain English', /\b(plain|jargon|feynman|understand|simple|clarify|clarity)\b/i],
+    ['proof_gate', 'the operator wants proof before accept', /\b(proof|receipt|verify|verified|checked|tested|accept|approval)\b/i],
     ['runway_revenue', 'runway pushes user or revenue work', /\b(runway|revenue|cash|user|users|customer|demo|adoption|retention)\b/i],
     ['technical_ambition', 'technical advancement still matters', /\b(technical|homerun|research|runtime|architecture|model|benchmark|agent)\b/i],
     ['trust_boundary', 'trust and approval boundaries matter', /\b(security|safe|safety|trust|privacy|approval|permission|gmail|email|connector)\b/i],
@@ -3668,9 +3669,9 @@ function missionPlainTaskPreview(title) {
 function missionTasteMemoryReason(tasteMemory, signals) {
   const candidateIds = new Set((signals || []).map((signal) => signal.id));
   const memoryIds = new Set((tasteMemory?.signals || []).map((signal) => signal.id));
-  if (memoryIds.has('runway_revenue') && candidateIds.has('users_revenue')) return 'Keshav has been steering toward user/revenue proof because runway is tight.';
-  if (memoryIds.has('plain_language') && candidateIds.has('usability')) return 'Keshav keeps asking for plain-English, understandable work.';
-  if (memoryIds.has('proof_gate') && (candidateIds.has('trust') || candidateIds.has('technical'))) return 'Keshav wants proof and receipts before serious work is accepted.';
+  if (memoryIds.has('runway_revenue') && candidateIds.has('users_revenue')) return 'the operator has been steering toward user/revenue proof because runway is tight.';
+  if (memoryIds.has('plain_language') && candidateIds.has('usability')) return 'the operator keeps asking for plain-English, understandable work.';
+  if (memoryIds.has('proof_gate') && (candidateIds.has('trust') || candidateIds.has('technical'))) return 'the operator wants proof and receipts before serious work is accepted.';
   if (memoryIds.has('working_memory')) return 'Recent logs are being used as working memory for what matters now.';
   if (memoryIds.has('technical_ambition') && candidateIds.has('technical')) return 'The member memory still values technical advancement when it has proof.';
   return '';
@@ -4160,14 +4161,61 @@ function startMission(args, options = {}) {
   // checkout's dirt never reaches the mission baseline.
   if (hasFlag(args, '--worktree')) {
     let created;
+    const sourceTop = spawnSync('git', ['rev-parse', '--show-toplevel'], { cwd: process.cwd(), encoding: 'utf8' });
+    const sourceCheckout = sourceTop.status === 0 ? String(sourceTop.stdout).trim() : process.cwd();
+    let nodeModulesSource = null;
     try {
       const { createAgentWorktree } = require('./worktree');
       const base = readFlag(args, '--base', '') || inheritedWorktreeBase(process.cwd());
       created = createAgentWorktree({ member: mission.owner, task: mission.objective, ...(base ? { base } : {}) });
+      const packageFile = path.join(sourceCheckout, 'package.json');
+      const sourceModules = path.join(sourceCheckout, 'node_modules');
+      const targetModules = path.join(created.path, 'node_modules');
+      try {
+        let targetExists = false;
+        try {
+          fs.lstatSync(targetModules);
+          targetExists = true;
+        } catch (error) {
+          if (error.code !== 'ENOENT') throw error;
+        }
+        if (fs.existsSync(packageFile) && fs.existsSync(sourceModules) && !targetExists) {
+          const manifest = JSON.parse(fs.readFileSync(packageFile, 'utf8'));
+          const hasDependencies = ['dependencies', 'devDependencies', 'optionalDependencies']
+            .some((field) => manifest[field] && Object.keys(manifest[field]).length > 0);
+          if (hasDependencies) {
+            const checkIgnored = () => {
+              const result = spawnSync('git', ['check-ignore', '-q', 'node_modules'], { cwd: created.path, encoding: 'utf8' });
+              if (result.error || (result.status !== 0 && result.status !== 1)) {
+                throw new Error(result.error?.message || String(result.stderr || 'git check-ignore failed').trim());
+              }
+              return result.status === 0;
+            };
+            if (!checkIgnored()) {
+              const commonDir = spawnSync('git', ['rev-parse', '--git-common-dir'], { cwd: created.path, encoding: 'utf8' });
+              if (commonDir.error || commonDir.status !== 0) {
+                throw new Error(commonDir.error?.message || String(commonDir.stderr || 'could not find shared git directory').trim());
+              }
+              const excludeFile = path.resolve(created.path, String(commonDir.stdout).trim(), 'info', 'exclude');
+              fs.mkdirSync(path.dirname(excludeFile), { recursive: true });
+              const exclude = fs.existsSync(excludeFile) ? fs.readFileSync(excludeFile, 'utf8') : '';
+              if (!exclude.split(/\r?\n/).includes('/node_modules')) {
+                fs.appendFileSync(excludeFile, `${exclude && !exclude.endsWith('\n') ? '\n' : ''}/node_modules\n`);
+              }
+            }
+            if (!checkIgnored()) throw new Error('git still tracks node_modules after updating the shared exclude file');
+            fs.symlinkSync(sourceModules, targetModules, 'dir');
+            nodeModulesSource = sourceModules;
+          }
+        }
+      } catch (error) {
+        console.warn(`warning: could not link node_modules: ${String(error.message).split(/\r?\n/)[0]}`);
+      }
     } catch (e) {
       exitMissionError(`[mission start] worktree creation failed: ${e.message}`, 2, asJson);
     }
     mission.worktree = { path: created.path, branch: created.branch, base: created.base };
+    if (nodeModulesSource) mission.node_modules_source = nodeModulesSource;
     process.chdir(created.path);
   }
   if (mission.xp_task_enabled) {
@@ -4225,6 +4273,8 @@ function startMission(args, options = {}) {
       dirty_count: worktreeBaseline.dirty_count,
       dirty_hash: worktreeBaseline.dirty_hash,
     } : null,
+    node_modules_linked: Boolean(saved.node_modules_source),
+    node_modules_source: saved.node_modules_source || null,
     ...(saved.remap_reason ? { remap_reason: saved.remap_reason } : {}),
   };
   if (!options.silent) {
@@ -4236,6 +4286,7 @@ function startMission(args, options = {}) {
         `State: ${saved.status}`,
         ...(saved.remap_reason ? [`Remap: ${saved.remap_reason}`] : []),
         ...(saved.worktree ? [`Worktree: ${saved.worktree.path}`, `Branch: ${saved.worktree.branch}`] : []),
+        ...(saved.node_modules_source ? [`linked node_modules from ${saved.node_modules_source}`] : []),
         ...warnings.map((warning) => `Warning: ${warning.message}`),
         ...(saved.xp_task ? [`AgentXP task: ${saved.xp_task.ref}`] : []),
         ...(saved.worktree ? [`Next: cd ${saved.worktree.path} && ${nextTickCommand}`] : [`Next: ${nextTickCommand}`]),
@@ -8049,12 +8100,6 @@ function isWithinActiveHours(activeHours, now = new Date()) {
   return cur >= start || cur < end;
 }
 
-function sleepSync(ms) {
-  const waitMs = Math.max(0, Number(ms) || 0);
-  if (!waitMs) return;
-  Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, waitMs);
-}
-
 function missionLockOwnerIsAlive(pid) {
   const ownerPid = Number(pid);
   if (!Number.isInteger(ownerPid) || ownerPid <= 0) return false;
@@ -11629,6 +11674,7 @@ module.exports = {
   missionProtectedLaneHold,
   missionCommand,
   startMission,
+  resolveMission,
   spawnMissionDriver,
   missionRunnerNeedsLiveSession,
   completeMission,

package/commands/pack.js

@@ -1622,7 +1622,7 @@ async function publishPack(rawArgs, cwd = process.cwd(), options = {}) {
   }
 
   // pack.json belongs to the pack, not to whatever repo happens to contain it
-  // (2026-07-27: publishing ~/arena/atrisos-backend/atris wrote a pack.json
+  // (2026-07-27: publishing a backend workspace's atris folder wrote a pack.json
   // into atrisos-backend/ and polluted the source repo).
   const manifestPath = path.join(sourceDir, 'pack.json');
   const existing = readJson(manifestPath);
@@ -2453,7 +2453,7 @@ function printCapabilityTrustCard(policy, trust, receiptPath, userDenyRuleCount
   if (options.operatorInput) {
     console.log(`  operator input: ${options.operatorInput.bytes} bytes injected; source path withheld from the pack and receipt`);
   }
-  console.log(`  host shell: ${policy.grantedCapabilities.includes('host.shell') ? 'GRANTED \u2014 Bash can reach host files and network' : 'denied'}`);
+  console.log(`  host shell: ${policy.grantedCapabilities.includes('host.shell') ? 'granted, bash can reach host files and network' : 'denied'}`);
   console.log('  receipt coverage: Atris hook tool events; direct slash-skill invocations and later Claude or policy denials may not appear');
   console.log(`  receipt: ${receiptPath}`);
 }

package/commands/probe.js

@@ -454,18 +454,24 @@ async function probeCommand(argv) {
   const detail = ok
     ? `answer: ${resultText.slice(0, 80).replace(/\n/g, ' ')}`
     : `dead-end: ${deadEnd}`;
-  const line = `- **atris-probe** \`${stamp}\` \u2014 ${where} · ${a.model}`
+  const line = buildProbeLine({ stamp, where, model: a.model, member, engine, ok, secs, toolsRun, calendar: a.calendar, cliCalendarOps, detail });
+  console.log(line);
+  return ok ? 0 : 1;
+}
+
+function buildProbeLine({ stamp, where, model, member, engine, ok, secs, toolsRun, calendar, cliCalendarOps, detail }) {
+  const line = `- **atris-probe** \`${stamp}\` - ${where} · ${model}`
     + (member ? ` · member=${member}` : '')
     + (engine ? ` · engine=${engine}` : '')
-    + ` · ${ok ? 'PASS' : 'FAIL'} · ${secs}s · tools=${toolsRun}`
-    + (a.calendar ? ` cal_cli=${cliCalendarOps}` : '')
+    + ` · ${ok ? 'pass' : 'fail'} · ${secs}s · tools=${toolsRun}`
+    + (calendar ? ` cal_cli=${cliCalendarOps}` : '')
     + ` · ${detail}`;
-  console.log(line);
-  return ok ? 0 : 1;
+  return line.replace(/\s*\u2014\s*/g, ', ');
 }
 
 module.exports = {
   probeCommand,
+  buildProbeLine,
   runAtris2Turn,
   // exported for tests
   normalizePath,

package/commands/pull.js

@@ -722,7 +722,7 @@ async function pullBusiness(slug) {
         fs.mkdirSync(path.dirname(localPath), { recursive: true });
         fs.writeFileSync(localPath, content);
       }
-      console.log(`  \u26A0 ${p.replace(/^\//, '')}  CONFLICT \u2014 both you and the computer changed this`);
+      console.log(`  \u26A0 ${p.replace(/^\//, '')}: conflict, both you and the computer changed this`);
       console.log(`    \u2192 Remote version saved as ${p.replace(/^\//, '')}.remote`);
       conflictCount++;
     }

package/commands/push.js

@@ -985,7 +985,7 @@ async function pushAtris() {
       console.log(`    ... +${failedToLand.length - shown.length} more`);
     }
     console.log('');
-    console.log('  Common causes: path is outside the workspace (e.g. absolute /Users/... path),');
+    console.log('  common causes: path is outside the workspace (for example, an absolute home path),');
     console.log('  your role lacks write permission for that folder, or warm runner returned an error.');
     console.log('  These files will appear as drift on your next push so you can retry.');
   }

package/commands/rainmaker.js

@@ -9,22 +9,9 @@
  */
 
 const fs = require('fs');
-const os = require('os');
 const path = require('path');
 const { spawnSync } = require('child_process');
-
-function resolveBackendRoot() {
-  const candidates = [
-    process.env.ATRIS_BACKEND_DIR,
-    path.resolve(__dirname, '..', '..', 'atrisos-backend'),
-    path.resolve(process.cwd(), '..', 'atrisos-backend'),
-    path.join(os.homedir(), 'arena', 'atrisos-backend'),
-  ].filter(Boolean);
-  for (const root of candidates) {
-    if (fs.existsSync(path.join(root, 'scripts', 'rainmaker.py'))) return root;
-  }
-  return null;
-}
+const { BACKEND_ROOT_HINT, resolveBackendRoot } = require('../utils/backend-root');
 
 function rainmakerCommand(args = []) {
   if (args[0] === '--help' || args[0] === '-h') {
@@ -32,8 +19,8 @@ function rainmakerCommand(args = []) {
     return 0;
   }
   const root = resolveBackendRoot();
-  if (!root) {
-    console.error('Cannot find scripts/rainmaker.py. Set ATRIS_BACKEND_DIR to atrisos-backend.');
+  if (!root || !fs.existsSync(path.join(root, 'scripts', 'rainmaker.py'))) {
+    console.error(BACKEND_ROOT_HINT);
     return 1;
   }
   const script = path.join(root, 'scripts', 'rainmaker.py');

package/commands/spaceship.js

@@ -4,7 +4,7 @@
  * atris spaceship, bounded, self-reporting overnight runner.
  *
  * Thin wrapper over scripts/spaceship.sh. The script is the implementation
- * (a supervised loop that survives bad ticks and emails Keshav on every
+ * (a supervised loop that survives bad ticks and emails the operator on every
  * meaningful state change); this module just makes it reachable as
  * `atris spaceship ...` and integrates with the CLI's command dispatch.
  *

package/commands/stream.js

@@ -293,6 +293,31 @@ function pushEvent(events, input) {
   if (event) events.push({ ...event, key: eventKey(event) });
 }
 
+// When timestamps match, state snapshots precede receipts, then landing summaries.
+const STREAM_SOURCE_RANK = {
+  task: 20,
+  task_episode: 30,
+  scorecard: 40,
+  mission_event: 50,
+  mission_state: 60,
+  mission_receipt: 70,
+  mission_landing: 80,
+  worktree: 85,
+  landing: 90,
+  state: 10,
+};
+
+function compareStreamEvents(a, b) {
+  const byMs = a.ms - b.ms;
+  if (byMs) return byMs;
+  const rankA = STREAM_SOURCE_RANK[a.source] ?? 55;
+  const rankB = STREAM_SOURCE_RANK[b.source] ?? 55;
+  if (rankA !== rankB) return rankA - rankB;
+  const byKey = String(a.key || '').localeCompare(String(b.key || ''));
+  if (byKey) return byKey;
+  return String(a.event || '').localeCompare(String(b.event || ''));
+}
+
 function statePaths(root) {
   const stateDir = path.join(root, '.atris', 'state');
   return {
@@ -455,7 +480,6 @@ function collectRunReceiptEvents(root, deps, events) {
 
 function candidateWorktreeDirs(root, deps) {
   const dirs = new Set([
-    path.resolve(root, '..', '.agent-worktrees'),
     path.join(path.dirname(root), '.agent-worktrees', path.basename(root)),
   ]);
   const sidecar = readJson(statePaths(root).sidecar, deps, null);
@@ -606,7 +630,7 @@ function collectStreamEvents({ root = process.cwd(), sinceMs = 0, agent = '', no
     if (wantedAgent && event.agent.toLowerCase() !== wantedAgent) continue;
     byKey.set(event.key, event);
   }
-  return [...byKey.values()].sort((a, b) => (a.ms - b.ms) || a.event.localeCompare(b.event));
+  return [...byKey.values()].sort(compareStreamEvents);
 }
 
 function waitingOnOperator(tasks) {
@@ -841,6 +865,7 @@ function streamCommand(args = [], deps = defaultDeps()) {
 module.exports = {
   collectSnapshot,
   collectStreamEvents,
+  compareStreamEvents,
   createStreamState,
   parseArgs,
   parseSince,