atris 3.35.0 → 3.36.0

package/bin/atris.js

@@ -65,6 +65,8 @@ const {
   DEFAULT_CLIENT_ID, DEFAULT_USER_AGENT,
 } = require('../utils/api');
 const missionRuntime = require('../lib/mission-runtime-loop');
+const { knownCommands, suggestCommand } = require('../lib/known-commands');
+const { recordUsage } = require('../lib/usage');
 
 // Bind DI wrappers (utils/auth uses dependency injection for apiRequestJson)
 const validateAccessToken = (token) => _validateAccessToken(token, apiRequestJson);
@@ -85,7 +87,8 @@ const helpRequested = updateCommand === 'help'
   || updateArgs.includes('--help')
   || updateArgs.includes('-h')
   || updateArgs[0] === 'help';
-const jsonRequested = updateArgs.includes('--json');
+const jsonRequested = process.argv.slice(2).includes('--json');
+const dryRunRequested = updateArgs.includes('--dry-run');
 const skipUpdateCheck = Boolean(process.env.ATRIS_SKIP_UPDATE_CHECK || process.env.NO_UPDATE_NOTIFIER || helpRequested || jsonRequested);
 if (!skipUpdateCheck && (!updateCommand || (updateCommand && !['version', 'update'].includes(updateCommand)))) {
   updateCheckPromise = checkForUpdates()
@@ -107,6 +110,12 @@ let command = process.argv[2];
 const commandArgs = process.argv.slice(3);
 const firstCommandArg = process.argv[3];
 const RUNNER_FLAG_NAMES = ['--runner-bin', '--runner-template', '--runner-model', '--runner-profile'];
+const NATURAL_VALUE_FLAGS = [...RUNNER_FLAG_NAMES, '--engine', '--verify'];
+const SINGLE_WORD_NATURAL_INTENTS = new Set([
+  'add', 'analyze', 'build', 'change', 'check', 'create', 'debug', 'document',
+  'edit', 'fix', 'implement', 'inspect', 'investigate', 'make', 'patch',
+  'refactor', 'remove', 'rename', 'research', 'test', 'update', 'validate', 'write',
+]);
 
 function readOptionArg(args, name) {
   const prefix = `${name}=`;
@@ -121,6 +130,50 @@ function isOptionValue(args, index, optionNames) {
   return index > 0 && optionNames.includes(args[index - 1]);
 }
 
+function parseNaturalEntryArgs(args = []) {
+  const positionals = [];
+  let asJson = false;
+  let engine = '';
+  let verifier = '';
+  let error = '';
+  for (let i = 0; i < args.length; i += 1) {
+    const value = String(args[i] || '');
+    if (value === '--json') {
+      asJson = true;
+      continue;
+    }
+    const inlineFlag = NATURAL_VALUE_FLAGS.find((name) => value.startsWith(`${name}=`));
+    if (inlineFlag) {
+      const optionValue = value.slice(inlineFlag.length + 1);
+      if (!optionValue) error = `${inlineFlag} needs a value`;
+      if (inlineFlag === '--engine') engine = optionValue;
+      if (inlineFlag === '--verify') verifier = optionValue;
+      continue;
+    }
+    if (NATURAL_VALUE_FLAGS.includes(value)) {
+      const optionValue = String(args[i + 1] || '');
+      if (!optionValue || optionValue.startsWith('--')) {
+        error = `${value} needs a value`;
+      } else {
+        if (value === '--engine') engine = optionValue;
+        if (value === '--verify') verifier = optionValue;
+        i += 1;
+      }
+      continue;
+    }
+    positionals.push(value);
+  }
+  return {
+    asJson,
+    engine,
+    verifier,
+    error,
+    positionals,
+    input: positionals.join(' ').replace(/\s+/g, ' ').trim(),
+    multiword: positionals.length > 1 || positionals.some((value) => /\s/.test(value.trim())),
+  };
+}
+
 function applyRunnerFlags(args) {
   // --engine <name> is the operator-facing spelling of --runner-profile:
   // one flag rents a specific intelligence for this run.
@@ -196,13 +249,14 @@ const isBusinessSyncSafetyCommand = command === 'sync'
     || firstCommandArg === 'resolve'
   );
 
-// Auto-sync skills only for commands that modify workspace state
-if (['init', 'update', 'upgrade'].includes(command) || (command === 'sync' && !isBusinessSyncSafetyCommand)) {
+// Auto-sync skills only for commands that modify workspace state. Help must
+// stay read-only, including global ~/.claude and ~/.codex skill directories.
+if (!helpRequested && !dryRunRequested && (['init', 'update', 'upgrade'].includes(command) || (command === 'sync' && !isBusinessSyncSafetyCommand))) {
   try {
     const { syncSkills } = require('../commands/sync');
     const skillsUpdated = syncSkills({ silent: true });
     if (skillsUpdated > 0) {
-      console.log(`⬆️  ${skillsUpdated} skill${skillsUpdated > 1 ? 's' : ''} updated`);
+      console.log(`${skillsUpdated} skill${skillsUpdated > 1 ? 's' : ''} updated`);
     }
   } catch (e) {
     // Non-critical
@@ -345,76 +399,7 @@ function printAtrisGoalBanner(workspaceDir = process.cwd(), label = 'Atris goal'
 }
 
 function showSearchHelp() {
-  console.log('Usage: atris search <keyword>');
-  console.log('Example: atris search auth');
-}
-
-function searchJournal(keyword) {
-  if (!keyword) {
-    showSearchHelp();
-    process.exit(1);
-  }
-
-  if (keyword === '--help' || keyword === '-h') {
-    showSearchHelp();
-    process.exit(0);
-  }
-
-  if (process.argv.slice(4).includes('--help') || process.argv.slice(4).includes('-h')) {
-    showSearchHelp();
-    process.exit(1);
-  }
-
-  const logsDir = path.join(process.cwd(), 'atris', 'logs');
-  if (!fs.existsSync(logsDir)) {
-    console.log('No atris/logs/ directory found. Run "atris init" first.');
-    process.exit(1);
-  }
-
-  console.log(`Searching for "${keyword}" in atris/logs/**/*.md...\n`);
-
-  const results = [];
-  const keywordLower = keyword.toLowerCase();
-
-  // Recursively find all .md files in logs directory
-  function walkDir(dir) {
-    let files;
-    try { files = fs.readdirSync(dir); } catch { return; }
-    for (const file of files) {
-      try {
-        const filePath = path.join(dir, file);
-        const stat = fs.statSync(filePath);
-        if (stat.isDirectory()) {
-          walkDir(filePath);
-        } else if (file.endsWith('.md')) {
-          const content = fs.readFileSync(filePath, 'utf8');
-          const lines = content.split('\n');
-          lines.forEach((line, idx) => {
-            if (line.toLowerCase().includes(keywordLower)) {
-              results.push({
-                file: path.relative(process.cwd(), filePath),
-                line: idx + 1,
-                content: line.trim()
-              });
-            }
-          });
-        }
-      } catch { /* skip unreadable files */ }
-    }
-  }
-
-  walkDir(logsDir);
-
-  if (results.length === 0) {
-    console.log('No matches found.');
-  } else {
-    console.log(`Found ${results.length} match${results.length > 1 ? 'es' : ''}:\n`);
-    results.forEach(r => {
-      console.log(`${r.file}:${r.line}`);
-      console.log(`  ${r.content.substring(0, 100)}${r.content.length > 100 ? '...' : ''}`);
-      console.log('');
-    });
-  }
+  require('../commands/search').showSearchHelp();
 }
 
 function consoleCmd() {
@@ -453,7 +438,8 @@ function consoleCmd() {
 function showHelp() {
   console.log('');
   console.log('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━');
-  console.log('atris — an operating system for intelligence');
+  console.log('atris');
+  console.log('you say what you want in plain words. atris builds it, checks it, and shows you proof.');
   console.log('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━');
   console.log('');
   console.log('Quick Start:');
@@ -464,11 +450,15 @@ function showHelp() {
   console.log('  3. Atris acts with context, memory, tools, and a review loop');
   console.log('');
   console.log('Common invocations:');
+  console.log('  atris "<request>"         Build one isolated change, verify it, and stop in Review');
+  console.log('  atris "<request>" --verify "<cmd>" --json');
+  console.log('                            Supply proof explicitly and return one JSON result');
   console.log('  atris init [--yes]        Global install: initialize this project');
   console.log('  npx atris init [--yes]    Local install: initialize this project');
   console.log('  atris computer');
   console.log('  atris business init "My Company"');
   console.log('  atris run');
+  console.log('  atris drill');
   console.log('  atris status');
   console.log('  atris soul');
   console.log('  atris fleet status');
@@ -498,17 +488,26 @@ function showHelp() {
   console.log('');
   console.log('Context & tracking:');
   console.log('  log        - Add ideas to inbox');
+  console.log('  wish       - Say one plain sentence, then Atris asks only for gaps or delegates it');
   console.log('  now        - Show atris/now.md, the current operating truth');
+  console.log('  goal       - goal, distance, and what moved today (alias: wtf)');
+  console.log('  orb        - Pick next moves while engine jobs work in the background');
   console.log('  activate   - Load Atris context');
   console.log('  radar      - Show live agents joined with tasks, missions, and worktrees');
+  console.log('  stream     - Watch the whole team work live in one terminal');
+  console.log('  team       - Show who is awake, what they are doing, and running loops');
+  console.log('  watch      - Turn one sentence into an always-on background watcher');
   console.log('  ctop       - Show a process-first live agent CPU/memory view');
   console.log('  launchpad  - Show the next action from local brain, task, mission, and proof state');
+  console.log('  brief      - Show the one-glance operator brief');
   console.log('  status     - See local work and completions (`atris status <business>` for remote)');
   console.log('  recap      - What your AI team did, in plain English (--share for paste-ready)');
+  console.log('  report     - Weekly block: landings, journal completions, and Career XP');
   console.log('  xp         - Show Career XP and contribution graph');
   console.log('  analytics  - Show recent productivity from journals');
-  console.log('  search     - Search journal history (atris search <keyword>)');
+  console.log('  search     - Search workspace memory (atris search <keyword>)');
   console.log('  clean      - Housekeeping (stale tasks, archive journals, broken refs)');
+  console.log('  close      - track open loops with deadlines and daily escalation');
   console.log('  harvest    - Find bugs and next actions from receipts, run logs, and thinking');
   console.log('  verify     - Validate work is done (tests, MAP.md, changes)');
   console.log('  task       - Local agent task plane (atomic claims, TODO import)');
@@ -518,9 +517,13 @@ function showHelp() {
   console.log('    ... build ...');
   console.log('    atris task ready <id> --verify');
   console.log('    atris autoland tick   # second check runs, task lands');
-  console.log('  mission    - Goal + loop + member owner + verifier + receipt');
+  console.log('  mission    - Goal + loop + member owner + verifier + receipt; --budget quick|long|deep sets bounded tiers');
   console.log('  release    - Tag release, bump version, create GitHub release, draft /launch');
   console.log('  learn      - Project learnings (patterns, pitfalls, preferences)');
+  console.log('  study      - On-demand learning feed: ingest topic, start server, open browser');
+  console.log('  rainmaker  - Relationship manager dashboard (atrisos-backend/scripts/rainmaker.py)');
+  console.log('  meet       - onboard a stranger in one sitting and print their /book link');
+  console.log('  avail      - Booking availability (/book/{username} weekly windows)');
   console.log('  brain      - Compile MAP/TODO/wiki/state into a loadable agent brain');
   console.log('  lesson     - Append a one-line lesson to atris/lessons.md (mine: distill receipts/episodes/scorecards into policy lessons)');
   console.log('  ingest     - Local-first wiki ingest into atris/wiki/');
@@ -537,7 +540,7 @@ function showHelp() {
   console.log('  land       - The landing: what is actually done vs still in the air; --reap backs up + clears overdue');
   console.log('  drive      - One self-driving tick: mission doctor -> auto-fix -> count disengagements');
   console.log('  autoland   - Approve the policy once; certified work lands itself, you keep irreversible calls');
-  console.log('  engine     - Bring any intelligence: roster of installed coding CLIs, default engine, --engine per run, `engine test` preflight, `engine dispatch <task-id> --engine <name>` one-command claim/build/verify/ship');
+  console.log('  engine     - Engine registry: list/resolve roles, health flips, default engine, `engine test`, and dispatch flights');
   console.log('  sign       - Co-author trailer on every commit in an atris workspace (on/off/status)');
   console.log('  visualize  - Generate a Slack/deck-ready visual from a prompt');
   console.log('  youtube    - Process YouTube videos with timestamped transcript-first analysis');
@@ -547,6 +550,7 @@ function showHelp() {
   console.log('  experiments validate        - Validate experiment packs');
   console.log('  experiments run <slug>      - Execute a pack or record an Endstate receipt');
   console.log('  experiments benchmark [m]   - Run validate/runtime experiment benchmarks');
+  console.log('  bench      - run core benchmark gates');
   console.log('');
   console.log('Compile loop (learn like AI, run like code):');
   console.log('  compile record <name>       - Append an execution record (--input/--output)');
@@ -562,6 +566,7 @@ function showHelp() {
   console.log('Sync:');
   console.log('  pull       - Pull journals + member data from cloud');
   console.log('  push       - Push workspace files to cloud');
+  console.log('  cloud      - Delete cloud files not present locally (cloud clean --dry-run|--yes)');
   console.log('  live       - Keep a business brain fresh (doctor, pull, watch, push)');
   console.log('  clean-workspace <slug> - Analyze & remove junk files from a workspace (alias: cw)');
   console.log('');
@@ -569,8 +574,9 @@ function showHelp() {
   console.log('  browse [query]     - Discover workspace templates');
   console.log('  fork <template>    - Clone a template into a new workspace');
   console.log('  publish            - Share your workspace as a template');
-  console.log('  sleep [business]   - Pause workspace compute (context saved)');
-  console.log('  wake [business]    - Resume workspace (agents restart)');
+  console.log('  pack               - Publish or install an Atris brain zip');
+  console.log('  sleep [business|member] [--loop id] - Pause compute or flip a member switch');
+  console.log('  wake [business|member] [--loop id]  - Resume compute or flip a member switch');
   console.log('');
   console.log('Business:');
   console.log('  business init <name>   - Create shared owner + first/default computer');
@@ -597,7 +603,8 @@ function showHelp() {
   console.log('  console    - Start/attach always-on coding console (tmux daemon)');
   console.log('  soul       - Show, snapshot, or fork workspace identity');
   console.log('  fleet      - Inspect local fleet status');
-  console.log('  loops      - Background loops board: what runs, what died, start/stop');
+  console.log('  loops      - Self-improving loop audit/scaffold (`init`, `audit`, `tick`, `board`)');
+  console.log('  self-improve - Alias for `atris loops init`');
   console.log('  agent      - Select cloud agent, spawn worker requests, or run `agent doctor`');
   console.log('  chat       - Chat with Atris 2 Fast in this workspace (--agent for cloud agent; or: atris chat scan)');
   console.log('  fast       - Chat with Atris2 Fast');
@@ -762,12 +769,18 @@ function showVerifyHelp() {
   console.log('');
   console.log('Usage: atris verify [task]');
   console.log('Usage: atris verify <feature-slug> --section <name>');
+  console.log('Usage: atris verify artifact <path> [--objective "<text>"] [--min-lines N] [--max-age-hours H] [--json]');
   console.log('');
   console.log('Description:');
   console.log('  Validate workspace health, a specific task, or a feature rubric section.');
+  console.log('  The artifact form runs deterministic substance checks on a mission artifact');
+  console.log('  (a pre-filter for empty/skeleton/placeholder output, not a quality judgment).');
   console.log('');
   console.log('Options:');
   console.log('  --section <name>  Run a fenced bash check from atris/features/<slug>/validate.md.');
+  console.log('  --objective <t>   Require the artifact to cover the objective vocabulary.');
+  console.log('  --min-lines <n>   Minimum substantive lines (default 10).');
+  console.log('  --max-age-hours <h>  Require the artifact to be modified within this window.');
   console.log('  --help, -h        Show this help.');
   console.log('');
 }
@@ -968,6 +981,7 @@ const { logAtris: logCmd } = require('../commands/log');
 const { activateAtris: activateCmd } = require('../commands/activate');
 const { statusAtris: statusCmd } = require('../commands/status');
 const { planAtris: planCmd, doAtris: doCmd, reviewAtris: reviewCmd } = require('../commands/workflow');
+const { runOrb: orbCmd } = require('../commands/orb');
 
 // All other commands are lazy-loaded inline (require() only when invoked)
 
@@ -983,12 +997,6 @@ if (command === '2' && ['fast', 'pro'].includes(String(firstCommandArg || '').to
 }
 
 // Check if this is a known command or natural language input
-const knownCommands = ['init', 'log', 'now', 'radar', 'ctop', 'launchpad', 'status', 'analytics', 'visualize', 'brain', 'brainstorm', 'autopilot', 'run', '_start', 'plan', 'do', 'review', 'release',
-                       'activate', '_activate', 'agent', 'chat', 'fast', 'ax', 'console', 'serve', 'login', 'logout', 'whoami', 'switch', 'use', 'accounts', '_resolve', '_profile-email', '_switch-session', 'shell-init', 'update', 'upgrade', 'version', 'help', 'next', 'atris',
-                       'clean', 'harvest', 'verify', 'search', 'skill', 'member', 'codex-goal', 'app', 'apps', 'learn', 'lesson', 'plugin', 'experiments', 'receipt', 'proof', 'openclaw', 'pull', 'push', 'live', 'align', 'terminal', 'computer', 'diff', 'business', 'sync', 'youtube',
-                       'ingest', 'query', 'lint', 'loop', 'pulse', 'task', 'mission', 'probe', 'worktree', 'land', 'autoland', 'drive', 'aeo', 'slop', 'strings', 'write', 'security-review', 'secure', 'deck', 'site', 'theme', 'card', 'reel', 'improve', 'xp', 'play', 'gm', 'x', 'recap', 'signup', 'clarity', 'interview', 'moves', 'unknowns',
-                       'github', 'vercel', 'supabase', 'linear', 'stripe', 'gmail', 'calendar', 'twitter', 'slack', 'imessage', 'integrations', 'setup', 'clean-workspace', 'cw',
-                       'fork', 'browse', 'publish', 'sleep', 'wake', 'feedback', 'errors', 'wiki', 'code-review', 'cr', 'soul', 'fleet', 'loops', 'compile', 'spaceship', 'truth', 'sign', 'engine', 'engines', 'feed'];
 
 // Check if command is an atris.md spec file - triggers welcome visualization
 function isSpecFile(cmd) {
@@ -1043,11 +1051,7 @@ const voiceTriggers = {
 if (!command || !knownCommands.includes(command)) {
   // Check voice triggers before falling through to natural language
   const fullInput = process.argv.slice(2).join(' ').toLowerCase().trim();
-  const fullInputWithoutFlags = process.argv.slice(2)
-    .filter((arg, index, args) => !String(arg).startsWith('-') && !isOptionValue(args, index, RUNNER_FLAG_NAMES))
-    .join(' ')
-    .toLowerCase()
-    .trim();
+  const fullInputWithoutFlags = parseNaturalEntryArgs(process.argv.slice(2)).input.toLowerCase();
   const triggered = voiceTriggers[fullInput] || voiceTriggers[fullInputWithoutFlags];
   if (triggered) {
     command = triggered;
@@ -1061,28 +1065,36 @@ if (!command || !knownCommands.includes(command)) {
 }
 
 if (!command || !knownCommands.includes(command)) {
-  const userInput = process.argv.slice(2).join(' ');
+  const rawNaturalArgs = process.argv.slice(2);
+  const natural = parseNaturalEntryArgs(rawNaturalArgs);
+  const userInput = natural.input;
+  const directSingleWordNatural = !natural.multiword
+    && SINGLE_WORD_NATURAL_INTENTS.has(userInput.toLowerCase());
 
-  if (process.argv.includes('--json')) {
+  if (natural.asJson && !natural.multiword && !directSingleWordNatural) {
     console.log(JSON.stringify({
       ok: false,
       error: command ? `unknown command: ${command}` : 'unknown command',
       command: command || null,
-      input: userInput,
+      input: rawNaturalArgs.join(' '),
       usage: 'atris help',
     }, null, 2));
     process.exit(2);
   }
 
   // Warn if this looks like a mistyped single-word command (no spaces)
-  if (command && !userInput.includes(' ')) {
+  if (command && !natural.multiword && !directSingleWordNatural) {
     console.log(`⚠ Unknown command: "${command}". Run "atris help" for available commands.`);
+    const suggestion = suggestCommand(command);
+    if (suggestion) {
+      console.log(`  Did you mean "atris ${suggestion}"?`);
+    }
     console.log('  Treating as natural language input...\n');
   }
 
   // Launch interactive entry (the "Performance")
-  interactiveEntry(userInput)
-    .then(() => process.exit(0))
+  interactiveEntry(userInput, { oneLap: true, asJson: natural.asJson, engine: natural.engine, verifier: natural.verifier, optionError: natural.error })
+    .then((code) => process.exit(Number.isInteger(code) ? code : 0))
     .catch((error) => {
       console.error(`✗ Error: ${error.message || error}`);
       process.exit(1);
@@ -1090,6 +1102,12 @@ if (!command || !knownCommands.includes(command)) {
   return;
 }
 
+// Help and previews promise a write-free workspace. Business workspaces
+// already have .atris/, so ordinary usage telemetry would break that promise.
+if (!(helpRequested || dryRunRequested)) {
+  recordUsage(command, process.cwd());
+}
+
 function printAtrisOverview() {
   console.log('');
   console.log('Atris is an AI computer for a workspace.');
@@ -1111,23 +1129,90 @@ function shouldSkipContextGatherer() {
   return !useInteractiveAtrisUi() || initNonInteractiveFlag();
 }
 
-async function interactiveEntry(userInput) {
+function firstUseCommand() {
+  return 'atris "help me choose the first useful step for this project"';
+}
+
+function firstMissionObjective() {
+  return 'Verify this Atris workspace is ready';
+}
+
+function localOwnerName() {
+  return process.env.USER || os.userInfo?.().username || 'operator';
+}
+
+function firstMissionOwner(root = process.cwd()) {
+  const defaultOwner = path.join(root, 'atris', 'team', 'validator', 'MEMBER.md');
+  return fs.existsSync(defaultOwner) ? 'validator' : localOwnerName();
+}
+
+function firstMissionCommand() {
+  return `atris mission start "${firstMissionObjective()}" --owner ${firstMissionOwner()} --runner manual --lane workspace --verify "node -e \\"require('fs').accessSync('atris/atris.md')\\"" --stop "workspace readiness is verified"`;
+}
+
+function printFirstUseNext() {
+  const row = (label, value) => `  ${label.padEnd(9)}${value}`;
+  console.log(row('next', 'run `atris` and describe what you want in plain words.'));
+  console.log(`agents: ${firstMissionCommand()}`);
+  console.log(`Then: ${firstUseCommand()}`);
+}
+
+function printStarterTaskNext(starter) {
+  console.log('next setup: open atris/MAP.md, then claim the starter task.');
+  if (starter && starter.display_id) {
+    console.log(`Next: atris task claim ${starter.display_id} --as ${localOwnerName()}`);
+    return;
+  }
+  console.log('Next: atris task next --as ' + localOwnerName());
+}
+
+async function interactiveEntry(userInput, options = {}) {
   const workspaceDir = process.cwd();
   const state = detectWorkspaceState(workspaceDir);
   const context = loadContext(workspaceDir);
 
+  if (options.asJson && !String(userInput || '').trim()) {
+    console.log(JSON.stringify({
+      schema: 'atris.one_lap.v1',
+      ok: false,
+      status: 'stuck',
+      reason: 'a request is required',
+      next_action: 'atris "<request>" --json',
+    }, null, 2));
+    return 2;
+  }
+
   if (isAtrisMetaQuestion(userInput)) {
+    if (options.asJson) {
+      console.log(JSON.stringify({
+        schema: 'atris.overview.v1',
+        ok: true,
+        product: 'Atris',
+        description: 'An AI computer for a workspace with context, tasks, memory, tools, and proof.',
+        workflow: ['plan', 'do', 'review'],
+      }, null, 2));
+      return 0;
+    }
     printAtrisOverview();
     return;
   }
 
   // Fresh install - offer init
   if (state.state === 'fresh') {
+    if (options.asJson) {
+      console.log(JSON.stringify({
+        schema: 'atris.one_lap.v1',
+        ok: false,
+        status: 'stuck',
+        reason: 'this workspace is not initialized',
+        next_action: 'atris init --yes',
+      }, null, 2));
+      return 2;
+    }
     console.log('\nNo atris/ folder found.');
     console.log('');
-    console.log('Start here:');
-    console.log('  atris init       if Atris is installed globally');
-    console.log('  npx atris init   if Atris was installed in this project');
+    console.log('Next: atris init');
+    console.log('Local project install instead? Run: npx atris init');
     return;
   }
 
@@ -1155,6 +1240,55 @@ async function interactiveEntry(userInput) {
   // commitment that hasn't been closed yet.
   const activeMissions = loadActiveMissions(workspaceDir);
   const liveMissionsCount = activeMissions.length;
+  const wipCount = inProgressTasksCount + inProgressFeaturesCount;
+  const mapStatus = context.mapStatus || (context.mapExists ? 'ready' : 'missing');
+  const gatherContext = shouldGatherContext({
+    root: workspaceDir,
+    userInput,
+    mapStatus,
+    liveMissionsCount,
+    wipCount,
+    backlogCount,
+    inboxCount,
+    completedTasksCount,
+  });
+
+  if (options.optionError) {
+    const result = {
+      schema: 'atris.one_lap.v1',
+      ok: false,
+      status: 'stuck',
+      reason: options.optionError,
+      next_action: 'atris "<request>" [--engine <id>] [--verify "<cmd>"] [--json]',
+    };
+    if (options.asJson) console.log(JSON.stringify(result, null, 2));
+    else {
+      console.log('lap: stuck');
+      console.log(`why it matters: ${result.reason}`);
+      console.log(`next: ${result.next_action}`);
+    }
+    return 2;
+  }
+
+  if (userInput && mapStatus === 'ready' && !gatherContext && options.oneLap !== false) {
+    return require('../commands/one-lap').runOneLap(userInput, {
+      root: workspaceDir,
+      asJson: options.asJson === true,
+      engine: options.engine || '',
+      verifier: options.verifier || '',
+    });
+  }
+
+  if (options.asJson && userInput) {
+    console.log(JSON.stringify({
+      schema: 'atris.one_lap.v1',
+      ok: false,
+      status: 'stuck',
+      reason: mapStatus !== 'ready' ? 'the workspace map is not ready' : 'first-contact context is required',
+      next_action: mapStatus !== 'ready' ? 'atris init --yes' : 'atris "<first direction>"',
+    }, null, 2));
+    return 2;
+  }
   // Mission needs a tick when: it has a verifier configured AND that verifier
   // hasn't passed yet. Planning-state missions count too — first tick is what
   // moves them to running.
@@ -1164,41 +1298,29 @@ async function interactiveEntry(userInput) {
 
   // Build status line
   const parts = [];
-  const wipCount = inProgressTasksCount + inProgressFeaturesCount;
   if (wipCount > 0) {
-    parts.push(`WIP: ${wipCount}`);
+    parts.push(`work in progress: ${wipCount}`);
   }
   if (liveMissionsCount > 0) {
-    parts.push(`Missions: ${liveMissionsCount}`);
+    parts.push(`missions: ${liveMissionsCount}`);
   }
   if (inboxCount > 0) {
-    parts.push(`Inbox: ${inboxCount}`);
+    parts.push(`inbox: ${inboxCount}`);
   }
   if (backlogCount > 0) {
-    parts.push(`Backlog: ${backlogCount}`);
+    parts.push(`backlog: ${backlogCount}`);
   }
   if (completedTasksCount > 0) {
-    parts.push(`Done: ${completedTasksCount}`);
+    parts.push(`done: ${completedTasksCount}`);
   }
-  const statusLine = parts.length > 0 ? parts.join('  |  ') : 'Clean slate';
+  const statusLine = parts.length > 0 ? parts.join('  |  ') : 'clean slate';
 
   console.log('');
-  console.log('┌─────────────────────────────────────────────────────────────┐');
-  console.log('│ CONTEXT LOADED                                              │');
-  console.log('├─────────────────────────────────────────────────────────────┤');
-  console.log(`│ ${statusLine.padEnd(60)}│`);
-  console.log('└─────────────────────────────────────────────────────────────┘');
+  const contextRow = (label, value) => `  ${label.padEnd(9)}${value}`;
+  console.log(contextRow('context', 'loaded'));
+  console.log(contextRow('status', statusLine));
 
-  const mapStatus = context.mapStatus || (context.mapExists ? 'ready' : 'missing');
-  if (shouldGatherContext({
-    root: workspaceDir,
-    userInput,
-    mapStatus,
-    liveMissionsCount,
-    wipCount,
-    backlogCount,
-    inboxCount,
-  })) {
+  if (gatherContext) {
     const hotAnswer = String(userInput || '').trim();
     if (hotAnswer) {
       const answer = hotAnswer;
@@ -1217,7 +1339,7 @@ async function interactiveEntry(userInput) {
         console.log(`First task: ${starter.title}`);
       }
       if (mapStatus !== 'ready') {
-        printMapBootstrap({ userInput: answer, prefix: 'Next setup step' });
+        printStarterTaskNext(starter);
         return;
       }
       await planCmd(answer);
@@ -1225,7 +1347,11 @@ async function interactiveEntry(userInput) {
     }
     if (shouldSkipContextGatherer()) {
       console.log('');
-      console.log("context gatherer skipped (non-interactive). run 'atris plan' when you're ready.");
+      if (process.argv.includes('--verbose')) {
+        console.log('context gatherer skipped (non-interactive).');
+      }
+      printFirstUseNext();
+      return;
     } else {
       const answer = await askContextGatherer(workspaceDir);
       if (isAtrisMetaQuestion(answer)) {
@@ -1249,7 +1375,7 @@ async function interactiveEntry(userInput) {
         console.log(`First task: ${starter.title}`);
       }
       if (mapStatus !== 'ready') {
-        printMapBootstrap({ userInput: answer, prefix: 'Next setup step' });
+        printStarterTaskNext(starter);
         return;
       }
       await planCmd(answer);
@@ -1384,54 +1510,62 @@ function printMapBootstrap({ userInput, prefix = 'Bootstrap required' } = {}) {
   console.log('');
 }
 
-// ASCII Welcome Visualization
+// Boot status: plain rows, honest numbers, one next action.
+// The banner only renders in a real terminal; when a hook or agent captures
+// this output it stays compact so it costs almost nothing in context.
 function showWelcomeVisualization() {
-  const { getTaskCounts } = require('../lib/state-detection');
+  const { getTaskGlance } = require('../lib/state-detection');
   const { readEndgameState } = require('../commands/autopilot');
   const cwd = process.cwd();
   const atrisDir = path.join(cwd, 'atris');
   const projectName = path.basename(cwd);
+  const row = (label, value) => `  ${label.padEnd(9)}${value}`;
+  const sub = (text) => `  ${' '.repeat(9)}- ${text}`;
+  const trimTitle = (t) => (String(t).length > 64 ? `${String(t).slice(0, 61)}...` : String(t));
 
-  // Gather workspace stats
-  let filesIndexed = 0;
-  let tasksInBacklog = 0;
-  let tasksInProgress = 0;
-  let tasksInReview = 0;
-  let tasksCertified = 0;
+  let glance = {
+    backlog: 0, active: 0, review: 0, reviewCertified: 0,
+    activeTitles: [], backlogTitles: [], certifiedTitles: []
+  };
   let journalEntries = 0;
-  let hasMap = false;
-  let isInitialized = fs.existsSync(atrisDir);
+  let latestBriefName = '';
+  let latestBriefTitle = '';
+  const isInitialized = fs.existsSync(atrisDir);
   let endgameState = { slug: 'unset', horizon: '' };
 
   if (isInitialized) {
-    // Check MAP.md
-    const mapPath = path.join(atrisDir, 'MAP.md');
-    if (fs.existsSync(mapPath)) {
-      hasMap = true;
-      const mapContent = fs.readFileSync(mapPath, 'utf8');
-      // Count file references (lines with file paths)
-      const fileRefs = mapContent.match(/`[^`]+\.(js|ts|py|go|rs|md|json|yaml|yml)`/g);
-      filesIndexed = fileRefs ? fileRefs.length : 0;
-    }
-
-    // Task lane counts — DB truth first, TODO.md parse as fallback
     try {
-      const counts = getTaskCounts(atrisDir);
-      tasksInBacklog = counts.backlog;
-      tasksInProgress = counts.active;
-      tasksInReview = counts.review;
-      tasksCertified = counts.reviewCertified;
+      glance = getTaskGlance(atrisDir);
     } catch {
       // Silently fail - show 0 tasks if reading fails
     }
 
-    // Read endgame state
     try {
       endgameState = readEndgameState(cwd);
     } catch {
       // Silently fail - show unset if reading fails
     }
 
+    try {
+      const briefsDir = path.join(atrisDir, 'wiki', 'briefs');
+      latestBriefName = fs.readdirSync(briefsDir, { withFileTypes: true })
+        .filter((entry) => entry.isFile() && entry.name.endsWith('.md'))
+        .map((entry) => ({ name: entry.name, mtimeMs: fs.statSync(path.join(briefsDir, entry.name)).mtimeMs }))
+        .sort((a, b) => b.mtimeMs - a.mtimeMs || a.name.localeCompare(b.name))[0]?.name || '';
+      if (latestBriefName) {
+        // Prefer the brief's own H1 over its filename; strip miner boilerplate
+        // like "YouTube brief: <slug>" so boot reads like a sentence.
+        const head = fs.readFileSync(path.join(briefsDir, latestBriefName), 'utf8').slice(0, 2000);
+        const h1 = head.split('\n').find((line) => line.startsWith('# '));
+        let title = h1 ? h1.slice(2).trim() : '';
+        title = title.replace(/^youtube brief:\s*/i, '').trim();
+        const slug = path.basename(latestBriefName, '.md');
+        latestBriefTitle = title && title.toLowerCase() !== slug.toLowerCase() ? title : slug;
+      }
+    } catch {
+      // Briefs are optional, so missing or unreadable directories stay silent.
+    }
+
     // Count journal entries today
     const today = new Date();
     const year = today.getFullYear();
@@ -1446,119 +1580,136 @@ function showWelcomeVisualization() {
   }
 
   console.log('');
-  console.log('    ╭──────────────────────────────────────────╮');
-  console.log('    │                                          │');
-  console.log('    │      █████╗ ████████╗██████╗ ██╗███████╗ │');
-  console.log('    │     ██╔══██╗╚══██╔══╝██╔══██╗██║██╔════╝ │');
-  console.log('    │     ███████║   ██║   ██████╔╝██║███████╗ │');
-  console.log('    │     ██╔══██║   ██║   ██╔══██╗██║╚════██║ │');
-  console.log('    │     ██║  ██║   ██║   ██║  ██║██║███████║ │');
-  console.log('    │     ╚═╝  ╚═╝   ╚═╝   ╚═╝  ╚═╝╚═╝╚══════╝ │');
-  console.log('    │                                          │');
-  console.log('    ╰──────────────────────────────────────────╯');
+  if (process.stdout.isTTY) {
+    console.log('    ╭──────────────────────────────────────────╮');
+    console.log('    │                                          │');
+    console.log('    │      █████╗ ████████╗██████╗ ██╗███████╗ │');
+    console.log('    │     ██╔══██╗╚══██╔══╝██╔══██╗██║██╔════╝ │');
+    console.log('    │     ███████║   ██║   ██████╔╝██║███████╗ │');
+    console.log('    │     ██╔══██║   ██║   ██╔══██╗██║╚════██║ │');
+    console.log('    │     ██║  ██║   ██║   ██║  ██║██║███████║ │');
+    console.log('    │     ╚═╝  ╚═╝   ╚═╝   ╚═╝  ╚═╝╚═╝╚══════╝ │');
+    console.log('    │                                          │');
+    console.log('    ╰──────────────────────────────────────────╯');
+    console.log('');
+  }
+  console.log(`  atris v${CLI_VERSION} · ${projectName}`);
   console.log('');
 
   if (!isInitialized) {
-    console.log('    ⚡ Spec detected. No workspace found.');
+    console.log('  no atris workspace here yet.');
     console.log('');
-    console.log('    ┌─ READY TO INITIALIZE ────────────────────┐');
-    console.log('    │                                          │');
-    console.log(`    │   📍 Project: ${projectName.substring(0, 25).padEnd(25)}│`);
-    console.log(`    │   📄 Spec:    atris.md v${CLI_VERSION.padEnd(18)}│`);
-    console.log('    │                                          │');
-    console.log('    │   Run "atris init" to create workspace   │');
-    console.log('    │                                          │');
-    console.log('    └──────────────────────────────────────────┘');
-  } else {
-    console.log('    ⚡ Scanning spec...');
+    console.log(row('next', 'atris init  (set up this folder)'));
     console.log('');
-    console.log('    ┌─ WORKSPACE DETECTED ─────────────────────┐');
-    console.log('    │                                          │');
-    console.log(`    │   📍 Project: ${projectName.substring(0, 25).padEnd(25)}│`);
-    console.log(`    │   📄 Spec:    atris.md v${CLI_VERSION.padEnd(18)}│`);
-    console.log(`    │   🗺️  Map:    ${hasMap ? (filesIndexed + ' files indexed').padEnd(26) : 'not generated yet'.padEnd(26)}│`);
-    console.log(`    │   📋 Tasks:   ${(tasksInBacklog + ' backlog, ' + tasksInProgress + ' active').padEnd(26)}│`);
-    if (tasksInReview > 0) {
-      const reviewText = tasksCertified > 0
-        ? `${tasksInReview} waiting (${tasksCertified} certified)`
-        : `${tasksInReview} waiting`;
-      console.log(`    │   ⏳ Review:  ${reviewText.padEnd(26)}│`);
+    return;
+  }
+
+  if (latestBriefName) {
+    console.log(`  learned \"${latestBriefTitle}\" overnight -> atris/wiki/briefs/${latestBriefName}`);
+  }
+
+  // Show the work itself, not counts. A newcomer in any domain (code, docs,
+  // a travel plan) should read actual task names and know what's happening.
+  // Waiting-on-you comes first: the one thing only a human can do.
+  if (glance.reviewCertified > 0) {
+    console.log(row('you', `${glance.reviewCertified} done, waiting for your ok:`));
+    glance.certifiedTitles.forEach((t) => console.log(sub(trimTitle(t))));
+  }
+
+  if (glance.active > 0) {
+    console.log(row('now', trimTitle(glance.activeTitles[0] || 'work moving')));
+    glance.activeTitles.slice(1).forEach((t) => console.log(sub(trimTitle(t))));
+    const tail = [];
+    const moreActive = glance.active - glance.activeTitles.length;
+    if (moreActive > 0) tail.push(`${moreActive} more moving`);
+    if (glance.backlog > 0) tail.push(`${glance.backlog} waiting to start`);
+    if (glance.review > 0) tail.push(`${glance.review} getting a final look`);
+    if (tail.length) console.log(`  ${' '.repeat(9)}...and ${tail.join(', ')}`);
+  } else if (glance.backlog > 0) {
+    console.log(row('soon', trimTitle(glance.backlogTitles[0] || 'work queued')));
+    glance.backlogTitles.slice(1).forEach((t) => console.log(sub(trimTitle(t))));
+    const moreBacklog = glance.backlog - glance.backlogTitles.length;
+    if (moreBacklog > 0) console.log(`  ${' '.repeat(9)}...and ${moreBacklog} more waiting`);
+  } else {
+    console.log(row('now', 'nothing on the list yet'));
+  }
+
+  // landSummary is expensive (git board classification) - compute once per boot.
+  let landInfo = null;
+  try { landInfo = require('../commands/land').landSummary(cwd); } catch (err) { landInfo = null; }
+  let rotInfo = null;
+  try {
+    const { parseLessons } = require('../lib/memory-view');
+    const resolved = path.resolve(cwd);
+    const parent = path.dirname(resolved);
+    const grandparent = path.dirname(parent);
+    let worktreeDir;
+    if (path.basename(grandparent) === '.agent-worktrees') {
+      worktreeDir = parent;
+    } else {
+      worktreeDir = path.join(path.dirname(resolved), '.agent-worktrees', path.basename(resolved));
     }
-    let landInfo = null;
-    try { landInfo = require('../commands/land').landSummary(process.cwd()); } catch (err) { landInfo = null; }
-    if (landInfo && landInfo.branches > 0) {
-      const landText = `${landInfo.branches} in the air, ${landInfo.due} overdue`;
-      console.log(`    │   🛬 Land:    ${landText.padEnd(26)}│`);
+    let worktrees = 0;
+    if (fs.existsSync(worktreeDir)) {
+      worktrees = fs.readdirSync(worktreeDir, { withFileTypes: true })
+        .filter((entry) => entry.isDirectory()).length;
     }
-    let rotInfo = null;
+    let lessonsText = '';
     try {
-      const { parseLessons } = require('../lib/memory-view');
-      const resolved = path.resolve(cwd);
-      const parent = path.dirname(resolved);
-      const grandparent = path.dirname(parent);
-      let worktreeDir;
-      if (path.basename(grandparent) === '.agent-worktrees') {
-        worktreeDir = parent;
-      } else {
-        worktreeDir = path.join(path.dirname(resolved), '.agent-worktrees', path.basename(resolved));
-      }
-      let worktrees = 0;
-      if (fs.existsSync(worktreeDir)) {
-        worktrees = fs.readdirSync(worktreeDir, { withFileTypes: true })
-          .filter((entry) => entry.isDirectory()).length;
-      }
-      let lessonsText = '';
-      try {
-        lessonsText = fs.readFileSync(path.join(atrisDir, 'lessons.md'), 'utf8');
-      } catch (err) {
-        lessonsText = '';
-      }
-      // rot = fail lessons nobody has resolved. A `pass` lesson is knowledge
-      // that worked — it has nothing to resolve and counting it guilt-trips
-      // the operator with a number (600+) no one can ever drive to zero.
-      const unresolvedLessons = parseLessons(lessonsText)
-        .filter((lesson) => lesson.status === 'fail' && !lesson.resolved && !/\[resolved\]/i.test(lesson.text)).length;
-      if (worktrees > 0 || unresolvedLessons > 0) {
-        rotInfo = { worktrees, lessons: unresolvedLessons };
-      }
+      lessonsText = fs.readFileSync(path.join(atrisDir, 'lessons.md'), 'utf8');
     } catch (err) {
-      rotInfo = null;
-    }
-    if (rotInfo) {
-      const rotText = `${rotInfo.worktrees} stale worktree${rotInfo.worktrees === 1 ? '' : 's'}, ${rotInfo.lessons} unresolved lesson${rotInfo.lessons === 1 ? '' : 's'}`;
-      console.log(`    │   🧹 rot:      ${rotText.padEnd(26)}│`);
+      lessonsText = '';
     }
-    console.log(`    │   📝 Journal: ${(journalEntries + ' entries today').padEnd(26)}│`);
-    if (endgameState.slug !== 'unset' && endgameState.horizon) {
-      const endgameLine = endgameState.slug + ' — ' + endgameState.horizon;
-      const paddedEndgame = endgameLine.padEnd(26);
-      console.log(`    │   🎯 Endgame: ${paddedEndgame}│`);
+    // cleanup = fail lessons nobody has resolved. A `pass` lesson is knowledge
+    // that worked - it has nothing to resolve and counting it guilt-trips
+    // the operator with a number (600+) no one can ever drive to zero.
+    const unresolvedLessons = parseLessons(lessonsText)
+      .filter((lesson) => lesson.status === 'fail' && !lesson.resolved && !/\[resolved[\]:]/i.test(lesson.text)).length;
+    if (worktrees > 0 || unresolvedLessons > 0) {
+      rotInfo = { worktrees, lessons: unresolvedLessons };
     }
-    console.log('    │                                          │');
-    console.log('    │   ┌──────────────────────────────────┐   │');
-    console.log('    │   │  MAP.md ←──── YOU ARE HERE       │   │');
-    console.log('    │   │     ↓                            │   │');
-    const taskText = `${tasksInBacklog} task${tasksInBacklog === 1 ? '' : 's'} waiting`;
-    console.log(`    │   │  TODO.md ←── ${taskText.padEnd(20)}│   │`);
-    console.log('    │   │     ↓                            │   │');
-    console.log('    │   │  navigator → executor → validator│   │');
-    console.log('    │   └──────────────────────────────────┘   │');
-    console.log('    │                                          │');
-    console.log('    └──────────────────────────────────────────┘');
-  }
-  console.log('');
-  if (tasksCertified > 0) {
-    console.log(`    Ready. ${tasksCertified} certified await accept — run 'atris task reviews'.`);
+  } catch (err) {
+    rotInfo = null;
+  }
+  // One tidy row for all loose ends, in words that work outside engineering:
+  // unlanded finished work = "to put away", stale worktrees = "old copies".
+  const tidyBits = [];
+  if (landInfo && landInfo.branches > 0) {
+    let landText = `${landInfo.branches} finished piece${landInfo.branches === 1 ? '' : 's'} to put away`;
+    if (landInfo.due > 0) landText += ` (${landInfo.due} overdue)`;
+    tidyBits.push(landText);
+  }
+  if (rotInfo && rotInfo.worktrees > 0) tidyBits.push(`${rotInfo.worktrees} old cop${rotInfo.worktrees === 1 ? 'y' : 'ies'} to toss`);
+  if (rotInfo && rotInfo.lessons > 0) tidyBits.push(`${rotInfo.lessons} open problem${rotInfo.lessons === 1 ? '' : 's'}`);
+  if (tidyBits.length) {
+    console.log(row('tidy', tidyBits.join(', ')));
+  }
+
+  console.log(row('logs', journalEntries > 0
+    ? `${journalEntries} note${journalEntries === 1 ? '' : 's'} today`
+    : 'nothing yet today'));
+
+  if (endgameState.slug !== 'unset') {
+    // Repeated impression: the horizon sentence renders verbatim every boot
+    // so agents keep the target in mind (test/boot-impression.test.js).
+    console.log(row('goal', endgameState.horizon || endgameState.slug));
+  }
+
+  // The next command always carries a plain-english gloss: a newcomer should
+  // know what typing it will do before they type it.
+  let next;
+  if (glance.reviewCertified > 0) {
+    next = `atris task reviews  (approve the finished work)`;
+  } else if (landInfo && landInfo.due > 0) {
+    next = `atris land --reap  (put away the overdue work)`;
+  } else if (endgameState.slug !== 'unset') {
+    next = 'atris autopilot  (do the next piece of work)';
   } else {
-    let landHint = null;
-    try { landHint = require('../commands/land').landSummary(process.cwd()); } catch (err) { landHint = null; }
-    if (landHint && landHint.due > 0) {
-      console.log(`    Ready. ${landHint.due} overdue in the landing — run 'atris land --reap'.`);
-    } else {
-      console.log(`    Ready. Run 'atris plan' to start.`);
-    }
+    next = 'atris plan  (plan the first tasks)';
   }
   console.log('');
+  console.log(row('next', next));
+  console.log('');
 }
 
 if (command === 'init') {
@@ -1616,10 +1767,38 @@ if (command === 'init') {
   Promise.resolve(require('../commands/task').run(process.argv.slice(3)))
     .then(() => process.exit(0))
     .catch((err) => { console.error(`\n✗ Error: ${err.message || err}`); process.exit(1); });
+} else if (command === 'team') {
+  Promise.resolve(require('../commands/team').teamCommand(process.argv.slice(3)))
+    .then((code) => process.exit(code || 0))
+    .catch((err) => { console.error(`\nerror: ${err.message || err}`); process.exit(1); });
+} else if (command === 'wish') {
+  Promise.resolve(require('../commands/wish').wishCommand(process.argv.slice(3)))
+    .then((code) => process.exit(code || 0))
+    .catch((err) => { console.error(`\n✗ Error: ${err.message || err}`); process.exit(1); });
+} else if (command === 'drill') {
+  Promise.resolve(require('../commands/drill').drillCommand(process.argv.slice(3)))
+    .then((code) => process.exit(code || 0))
+    .catch((err) => { console.error(`\n✗ Error: ${err.message || err}`); process.exit(1); });
+} else if (command === 'bench') {
+  Promise.resolve(require('../commands/bench').benchCommand(process.argv.slice(3)))
+    .then((code) => process.exit(code || 0))
+    .catch((err) => { console.error(`\n✗ Error: ${err.message || err}`); process.exit(2); });
 } else if (command === 'mission') {
+  // process.exit() can outrun a piped stdout: writes beyond the 64KB pipe
+  // buffer are async, so large --json payloads truncate at 64KB multiples.
+  // Queue an empty write and exit from its callback — it fires only after
+  // every earlier buffered write has drained (BCK-1306).
+  const exitAfterStdoutDrain = (code) => {
+    if (process.stdout.writableLength === 0) process.exit(code);
+    else process.stdout.write('', () => process.exit(code));
+  };
   Promise.resolve(require('../commands/mission').missionCommand(process.argv.slice(3)))
-    .then(() => process.exit(process.exitCode || 0))
-    .catch((err) => { console.error(`\n✗ Error: ${err.message || err}`); process.exit(1); });
+    .then(() => exitAfterStdoutDrain(process.exitCode || 0))
+    .catch((err) => { console.error(`\n✗ Error: ${err.message || err}`); exitAfterStdoutDrain(1); });
+} else if (command === 'agents') {
+  // Glanceable view of every member's state: stuck, waiting on you, working, resting.
+  const code = require('../commands/agents').agentsCommand(process.argv.slice(3));
+  process.exit(code || 0);
 } else if (command === 'pulse') {
   // Pulse: durable overnight self-improvement heartbeat (OS cron) for atris-cli.
   Promise.resolve(require('../commands/pulse').pulseCommand(process.argv.slice(3)))
@@ -1642,16 +1821,32 @@ if (command === 'init') {
   Promise.resolve(require('../commands/land').landCommand(process.argv.slice(3)))
     .then((code) => process.exit(code || 0))
     .catch((err) => { console.error(`\n✗ Error: ${err.message || err}`); process.exit(1); });
+} else if (command === 'close') {
+  Promise.resolve(require('../commands/close').run(process.argv.slice(3)))
+    .then((code) => process.exit(typeof code === 'number' ? code : 0))
+    .catch((err) => { console.error(`\nerror: ${err.message || err}`); process.exit(1); });
+} else if (command === 'goal' || command === 'wtf') {
+  Promise.resolve(require('../commands/goal').run(process.argv.slice(3)))
+    .then((code) => process.exit(typeof code === 'number' ? code : 0))
+    .catch((err) => { console.error(`\nerror: ${err.message || err}`); process.exit(1); });
 } else if (command === 'drive') {
   // Drive: one self-driving tick — mission doctor -> auto-fix safe findings -> count disengagements.
   Promise.resolve(require('../commands/drive').driveCommand(process.argv.slice(3)))
     .then((code) => process.exit(code || 0))
     .catch((err) => { console.error(`\n✗ Error: ${err.message || err}`); process.exit(1); });
+} else if (command === 'orb') {
+  Promise.resolve(orbCmd(process.argv.slice(3)))
+    .then((code) => process.exit(typeof code === 'number' ? code : 0))
+    .catch((err) => { console.error(`\nError: ${err.message || err}`); process.exit(1); });
 } else if (command === 'radar' || command === 'ctop') {
   const radarArgs = command === 'ctop' ? ['--agents', ...process.argv.slice(3)] : process.argv.slice(3);
   Promise.resolve(require('../commands/radar').radarCommand(radarArgs))
     .then((code) => process.exit(code || 0))
     .catch((err) => { console.error(`\n✗ Error: ${err.message || err}`); process.exit(1); });
+} else if (command === 'stream') {
+  Promise.resolve(require('../commands/stream').streamCommand(process.argv.slice(3)))
+    .then((code) => process.exit(code || 0))
+    .catch((err) => { console.error(`\n✗ Error: ${err.message || err}`); process.exit(1); });
 } else if (command === 'truth') {
   // Truth: one table rolling up mission state, tasks, feature proof receipts, and loop heartbeats.
   Promise.resolve(require('../commands/truth').truthCommand(process.argv.slice(3)))
@@ -1671,6 +1866,22 @@ if (command === 'init') {
   Promise.resolve(require('../commands/improve').run(process.argv.slice(3)))
     .then((code) => process.exit(typeof code === 'number' ? code : 0))
     .catch((err) => { console.error(`\n✗ Error: ${err.message || err}`); process.exit(1); });
+} else if (command === 'study') {
+  // Study: on-demand learning feed ingest + local server + browser open.
+  Promise.resolve(require('../commands/study').run(process.argv.slice(3)))
+    .then((code) => process.exit(typeof code === 'number' ? code : 0))
+    .catch((err) => { console.error(`\n✗ Error: ${err.message || err}`); process.exit(1); });
+} else if (command === 'rainmaker') {
+  const code = require('../commands/rainmaker').rainmakerCommand(process.argv.slice(3));
+  process.exit(typeof code === 'number' ? code : 0);
+} else if (command === 'avail') {
+  Promise.resolve(require('../commands/avail').availCommand(process.argv.slice(3)))
+    .then((code) => process.exit(typeof code === 'number' ? code : 0))
+    .catch((err) => { console.error(`\n✗ Error: ${err.message || err}`); process.exit(1); });
+} else if (command === 'meet') {
+  Promise.resolve(require('../commands/meet').meetCommand(process.argv.slice(3)))
+    .then((code) => process.exit(typeof code === 'number' ? code : 0))
+    .catch((err) => { console.error(`\n✗ Error: ${err.message || err}`); process.exit(1); });
 } else if (command === 'brain') {
   Promise.resolve()
     .then(() => require('../commands/brain').brainCommand(process.argv.slice(3)))
@@ -1710,6 +1921,14 @@ if (command === 'init') {
   } else {
     logCmd();
   }
+} else if (command === 'logs') {
+  try {
+    require('../commands/log').logsDigest(process.argv.slice(3));
+    process.exit(0);
+  } catch (error) {
+    console.error(error.message || String(error));
+    process.exit(1);
+  }
 } else if (command === 'now') {
   const args = process.argv.slice(3);
   if (args.includes('--help') || args.includes('-h') || args[0] === 'help') {
@@ -1726,6 +1945,8 @@ if (command === 'init') {
     process.exit(0);
   }
   activateCmd();
+} else if (command === 'watch') {
+  require('../commands/watch').watchAtris();
 } else if (command === 'update' || command === 'sync') {
   const args = process.argv.slice(3);
   const firstSyncArg = process.argv[3];
@@ -1756,7 +1977,10 @@ if (command === 'init') {
       .then(() => process.exit(0))
       .catch((err) => { console.error(`\n✗ Error: ${err.message || err}`); process.exit(1); });
   } else {
-    syncCmd();
+    syncCmd({
+      dryRun: args.includes('--dry-run'),
+      force: args.includes('--force') || args.includes('--yes') || args.includes('-y'),
+    });
   }
 } else if (command === 'upgrade') {
   const args = process.argv.slice(3);
@@ -2100,15 +2324,36 @@ if (command === 'init') {
       console.error(`✗ Brainstorm failed: ${error.message || error}`);
       process.exit(1);
     });
-} else if (command === 'next' || command === 'atris') {
+} else if (command === 'next') {
+  Promise.resolve(require('../commands/next').nextCommand(process.argv.slice(3)))
+    .then((code) => process.exit(typeof code === 'number' ? code : 0))
+    .catch((error) => {
+      console.error(`✗ Error: ${error.message || error}`);
+      process.exit(1);
+    });
+} else if (command === 'dream') {
+  Promise.resolve(require('../commands/dream').dreamCommand(process.argv.slice(3)))
+    .then((code) => process.exit(typeof code === 'number' ? code : 0))
+    .catch((error) => {
+      console.log('No dreams tonight: could not finish dream');
+      console.log('Run me nightly: atris dream');
+      process.exit(0);
+    });
+} else if (command === 'atris') {
   const rawArgs = process.argv.slice(3);
   if (rawArgs.includes('--help') || rawArgs.includes('-h') || rawArgs[0] === 'help') {
     showNextHelp(command);
     process.exit(0);
   }
-  const userInput = rawArgs.filter((arg) => !arg.startsWith('-')).join(' ').trim();
-  interactiveEntry(userInput || null)
-    .then(() => process.exit(0))
+  const natural = parseNaturalEntryArgs(rawArgs);
+  interactiveEntry(natural.input || null, {
+    oneLap: Boolean(natural.input),
+    asJson: natural.asJson,
+    engine: natural.engine,
+    verifier: natural.verifier,
+    optionError: natural.error,
+  })
+    .then((code) => process.exit(Number.isInteger(code) ? code : 0))
     .catch((error) => {
       console.error(`✗ Error: ${error.message || error}`);
       process.exit(1);
@@ -2194,6 +2439,26 @@ if (command === 'init') {
     showVerifyHelp();
     process.exit(0);
   }
+  if (args[0] === 'artifact') {
+    const target = args[1] && !args[1].startsWith('--') ? args[1] : null;
+    if (!target) {
+      showVerifyHelp();
+      process.exit(2);
+    }
+    const readValue = (flag) => {
+      const idx = args.indexOf(flag);
+      return idx > 0 && args[idx + 1] ? args[idx + 1] : null;
+    };
+    const minLinesRaw = readValue('--min-lines');
+    const maxAgeRaw = readValue('--max-age-hours');
+    const code = require('../commands/verify').verifyArtifact(target, {
+      objective: readValue('--objective') || undefined,
+      minLines: minLinesRaw !== null ? Number(minLinesRaw) : undefined,
+      maxAgeHours: maxAgeRaw !== null ? Number(maxAgeRaw) : undefined,
+      json: args.includes('--json'),
+    });
+    process.exit(code);
+  }
   const sectionIdx = process.argv.indexOf('--section');
   if (sectionIdx > 0 && process.argv[sectionIdx + 1]) {
     const slug = process.argv[3] && !process.argv[3].startsWith('--') ? process.argv[3] : null;
@@ -2214,12 +2479,24 @@ if (command === 'init') {
     .then(() => process.exit(0))
     .catch((err) => { console.error(`\n✗ Error: ${err.message || err}`); process.exit(1); });
 } else if (command === 'search') {
-  const keyword = process.argv.slice(3).join(' ');
-  searchJournal(keyword);
+  const code = require('../commands/search').searchCommand(process.argv.slice(3));
+  process.exitCode = code;
+} else if (command === 'scout') {
+  require('../commands/scout').scoutCommand(process.argv.slice(3))
+    .then((code) => { process.exitCode = code; })
+    .catch((err) => { console.error(`✗ Error: ${err.message || err}`); process.exit(1); });
 } else if (command === 'xp') {
   require('../commands/xp').xpCommand(...process.argv.slice(3))
     .then(() => { process.exitCode = 0; })
     .catch((err) => { console.error(`✗ Error: ${err.message || err}`); process.exit(1); });
+} else if (command === 'report') {
+  const args = process.argv.slice(3);
+  const { reportCommand, showReportHelp } = require('../commands/report');
+  if (args.includes('--help') || args.includes('-h')) {
+    showReportHelp();
+    process.exit(0);
+  }
+  process.exit(reportCommand(args));
 } else if (command === 'play') {
   require('../commands/play').playCommand(...process.argv.slice(3))
     .then(() => process.exit(0))
@@ -2334,10 +2611,15 @@ if (command === 'init') {
   require('../commands/align').alignAtris()
     .then(() => process.exit(0))
     .catch((err) => { console.error(`\n✗ Error: ${err.message || err}`); process.exit(1); });
+} else if (command === 'cloud') {
+  require('../commands/cloud').cloudAtris();
 } else if (command === 'terminal') {
   require('../commands/terminal').terminalAtris()
     .then(() => process.exit(0))
     .catch((err) => { console.error(`\n✗ Error: ${err.message || err}`); process.exit(1); });
+} else if (command === 'fleet-report') {
+  require('../commands/fleet-report').fleetReport()
+    .catch((err) => { console.error(`\n✗ Error: ${err.message || err}`); process.exit(1); });
 } else if (command === 'x') {
   // Fast Agent SDK execution - like "atris x echo hello" or "atris x ls -la"
   const userInput = process.argv.slice(3).join(' ').trim();
@@ -2385,10 +2667,19 @@ if (command === 'init') {
   require('../commands/fleet').fleet(args)
     .then(() => process.exit(0))
     .catch((err) => { console.error(`\n✗ Error: ${err.message || err}`); process.exit(1); });
-} else if (command === 'loops') {
+} else if (command === 'loops' || command === 'self-improve') {
   try {
-    require('../commands/loops').loopsCommand(process.argv[3], ...process.argv.slice(4));
-    process.exit(0);
+    const loops = require('../commands/loops');
+    const aliasArgs = process.argv.slice(3);
+    const aliasWantsHelp = ['help', '--help', '-h'].includes(aliasArgs[0]);
+    const subcommand = command === 'self-improve'
+      ? (aliasWantsHelp ? aliasArgs[0] : 'init')
+      : process.argv[3];
+    const args = command === 'self-improve'
+      ? (aliasWantsHelp ? aliasArgs.slice(1) : aliasArgs)
+      : process.argv.slice(4);
+    const exitCode = loops.loopsCommand(subcommand, ...args);
+    process.exit(typeof exitCode === 'number' ? exitCode : 0);
   } catch (error) {
     console.error(`\n✗ Error: ${error.message || error}`);
     process.exit(1);
@@ -2527,6 +2818,15 @@ if (command === 'init') {
   Promise.resolve(require('../commands/card').run(process.argv.slice(3)))
     .then((code) => process.exit(typeof code === 'number' ? code : 0))
     .catch((err) => { console.error(`\n✗ Error: ${err.message || err}`); process.exit(1); });
+} else if (command === 'brief') {
+  // Brief: one-glance operator surface for landings, waits, and next moves.
+  Promise.resolve(require('../commands/brief').run(process.argv.slice(3)))
+    .then((code) => process.exit(typeof code === 'number' ? code : 0))
+    .catch((err) => { console.error(`\n✗ Error: ${err.message || err}`); process.exit(1); });
+} else if (command === 'pack') {
+  Promise.resolve(require('../commands/pack').run(process.argv.slice(3)))
+    .then((code) => process.exit(typeof code === 'number' ? code : 0))
+    .catch((err) => { console.error(`\n✗ Error: ${err.message || err}`); process.exit(1); });
 } else if (command === 'reel') {
   // Reel: one line of text into a short on-brand video (an animated card; frames via Chrome + ffmpeg).
   Promise.resolve(require('../commands/reel').run(process.argv.slice(3)))