atris 3.70.0 → 3.71.0

package/ax

@@ -97,8 +97,76 @@ function tierColor(mode) {
   return TIER_COLORS[mode] || ANSI.accent;
 }
 
+// Any model by name: `/model <name>` or `--model <name>` rides as mode `model:<spec>`.
+const MODEL_ALIASES = Object.freeze({
+  mercury: 'mercury',
+  'mercury-3': 'mercury',
+  'inception:mercury-3-preview-1002': 'mercury',
+  fast: 'fast',
+  pro: 'pro',
+  max: 'max',
+  rapid: 'rapid',
+  alpha: 'alpha',
+});
+
+// The /model pick list. Each row answered as itself on the backend 2026-10-14.
+const MODEL_CHOICES = Object.freeze([
+  { mode: 'fast', label: 'Atris 2 Fast' },
+  { mode: 'pro', label: 'Atris 2 Pro' },
+  { mode: 'max', label: 'Atris 2 Max' },
+  { mode: 'rapid', label: 'Atris Rapid' },
+  { mode: 'alpha', label: 'Atris Alpha' },
+  { mode: 'mercury', label: 'Mercury 3 (test)' },
+  { mode: 'model:openrouter:anthropic/claude-opus-5.5', label: 'Claude Opus 5.5' },
+  { mode: 'model:openai:gpt-6-astra', label: 'GPT-6 Astra' },
+  { mode: 'model:openai:gpt-5.6-terra', label: 'GPT-5.6 Terra' },
+  { mode: 'model:openrouter:google/gemini-3.8-flash', label: 'Gemini 3.8 Flash' },
+  { mode: 'model:xai:grok-4.6', label: 'Grok 4.6' },
+  { mode: 'model:openrouter:deepseek/deepseek-v4.1-flash', label: 'DeepSeek V4.1 Flash' },
+  { mode: 'model:openrouter:z-ai/glm-5.3-flash', label: 'GLM 5.3 Flash' },
+].map(choice => Object.freeze(choice)));
+
+function squashModelName(value) {
+  return String(value || '').toLowerCase().replace(/[^a-z0-9]/g, '');
+}
+
+function modeForModelName(name) {
+  const raw = String(name || '').trim();
+  if (!raw) return null;
+  if (/^\d+$/.test(raw)) {
+    const choice = MODEL_CHOICES[Number(raw) - 1];
+    return choice ? choice.mode : null;
+  }
+  const alias = MODEL_ALIASES[raw.toLowerCase()];
+  if (alias) return alias;
+  // "opus", "gemini", "gpt-6": a unique start of a pick-list name picks it.
+  const query = squashModelName(raw);
+  const exact = MODEL_CHOICES.find(choice => squashModelName(choice.label) === query);
+  if (exact) return exact.mode;
+  const hits = MODEL_CHOICES.filter(choice => squashModelName(choice.label).includes(query));
+  if (hits.length === 1) return hits[0].mode;
+  if (!raw.includes(':')) return null;
+  return `model:${raw}`;
+}
+
+function modelChoiceList(currentMode, options = {}) {
+  const width = MODEL_CHOICES.reduce((max, choice) => Math.max(max, choice.label.length), 0);
+  const rows = MODEL_CHOICES.map((choice, index) => {
+    const mark = choice.mode === currentMode ? '●' : ' ';
+    const num = String(index + 1).padStart(2);
+    const id = choice.mode.startsWith('model:') ? choice.mode.slice('model:'.length) : modelForMode(choice.mode);
+    return `  ${mark} ${num}  ${paint(choice.label.padEnd(width), [tierColor(choice.mode)], options)}  ${paint(id, [ANSI.muted], options)}`;
+  });
+  if (String(currentMode || '').startsWith('model:') && !MODEL_CHOICES.some(choice => choice.mode === currentMode)) {
+    rows.push(`  ●  -  ${currentMode.slice('model:'.length)}`);
+  }
+  return [...rows, paint('  pick: /model 6  ·  /model opus  ·  /model provider:model-name', [ANSI.muted], options)].join('\n');
+}
+
 function modelForMode(mode) {
+  if (String(mode || '').startsWith('model:')) return mode.slice('model:'.length);
   if (mode === 'code-fast') return CODE_FAST.model;
+  if (mode === 'mercury') return 'inception:mercury-3-preview-1002';
   if (mode === 'max') return 'atris:max';
   if (mode === 'alpha') return 'atris:alpha';
   if (mode === 'rapid') return 'atris:rapid';
@@ -147,7 +215,12 @@ function formatSeconds(totalSeconds) {
 }
 
 function tierLabel(mode) {
+  if (String(mode || '').startsWith('model:')) {
+    const choice = MODEL_CHOICES.find(item => item.mode === mode);
+    return choice ? choice.label : mode.slice('model:'.length);
+  }
   if (mode === 'code-fast') return 'Atris Code Fast';
+  if (mode === 'mercury') return 'mercury 3 (test model)';
   if (mode === 'max') return 'Atris 2 Max';
   if (mode === 'alpha') return 'Atris Alpha';
   if (mode === 'rapid') return 'Atris Rapid';
@@ -160,7 +233,7 @@ function formatHeader({ mode = 'pro', cwd = process.cwd(), chat = false, reasoni
   return [
     paint(`${tierLabel(mode)}${chat ? ' chat' : ''}${effortSuffix}`, [ANSI.bold, tierColor(normalizeMode(mode))], options),
     cwd,
-    chat ? paint('shift-tab bypass · /auto /log /today /now /who · /fast /pro /max /rapid /alpha /effort · exit to leave', [ANSI.muted], options) : '',
+    chat ? paint('shift-tab bypass · /auto /log /today /now /who · /model to switch models · /effort · exit to leave', [ANSI.muted], options) : '',
   ].filter(Boolean).join('\n');
 }
 
@@ -169,11 +242,11 @@ function formatUsage() {
     'ax - Atris local/code agent',
     '',
     'Usage:',
-    '  ax [--auto|--max|--pro|--fast|--rapid|--alpha|--code-fast] [--local|--cloud] <message>',
-    '  ax [--auto|--max|--pro|--fast|--rapid|--alpha|--code-fast] [--local|--cloud] --print <message>',
-    '  ax [--auto|--max|--pro|--fast|--rapid|--alpha|--code-fast] [--local|--cloud] --chat',
+    '  ax [--auto|--max|--pro|--fast|--rapid|--alpha|--mercury|--code-fast] [--local|--cloud] <message>',
+    '  ax [--auto|--max|--pro|--fast|--rapid|--alpha|--mercury|--code-fast] [--local|--cloud] --print <message>',
+    '  ax [--auto|--max|--pro|--fast|--rapid|--alpha|--mercury|--code-fast] [--local|--cloud] --chat',
     '  ax [--max|--pro|--fast|--rapid|--alpha] --business <slug> [<message>|--chat]',
-    '  ax [--max|--pro|--fast|--rapid|--alpha|--code-fast] --doctor',
+    '  ax [--max|--pro|--fast|--rapid|--alpha|--mercury|--code-fast] --doctor',
     '  ax --approvals',
     '  ax --approve <approval-id>',
     '  ax --deny <approval-id>',
@@ -191,6 +264,9 @@ function formatUsage() {
     '  --pro   hosted Atris 2, deeper tool loop',
     '  --fast  hosted Atris 2, faster low-latency turns',
     '  --rapid  hosted Atris Rapid, cheapest chat and first-hop tools',
+    '  --mercury  mercury 3 test model, with turn timing',
+    '  --model <name>  any model by name (mercury, or provider:model); in chat use /model <name>',
+    '  --diffuse  watch mercury text refine live in a terminal',
     '  --alpha  hosted experimental lane (free preview model, swap via ATRIS2_ALPHA_MODEL)',
     '  --effort <level>  reasoning effort: none, low, medium, high, xhigh, or default',
     '  --code-fast  Atris Code Fast public lane',
@@ -986,7 +1062,9 @@ function resolveRoute(message, options = {}) {
 }
 
 function normalizeMode(mode) {
+  if (String(mode || '').startsWith('model:')) return mode;
   if (mode === 'code-fast' || mode === 'code') return 'code-fast';
+  if (mode === 'mercury') return 'mercury';
   if (mode === 'max') return 'max';
   if (mode === 'alpha') return 'alpha';
   if (mode === 'rapid') return 'rapid';
@@ -1113,7 +1191,9 @@ function nextApproveMode(arg, current) {
 function formatPrompt(mode, options = {}) {
   if (!mode) return '› ';
   const tier = normalizeMode(mode);
-  const label = paint(tier, [ANSI.bold, tierColor(tier)], options);
+  // Picked models show their short name: "claude-opus-5.5", not "model:openrouter:...".
+  const short = tier.startsWith('model:') ? tier.split(/[:/]/).pop() : tier;
+  const label = paint(short, [ANSI.bold, tierColor(tier)], options);
   const tag = approveModeTag(options.approveMode);
   if (tag) {
     return `${label} ${paint(`[${tag}]`, [ANSI.muted], options)} › `;
@@ -1167,7 +1247,7 @@ function formatReasoningEffortLabel(value) {
 
 const CHAT_COMMANDS = Object.freeze([
   { name: '/help', description: 'list all commands', type: 'help' },
-  { name: '/model', description: 'show the current lane and how to switch', type: 'model' },
+  { name: '/model', description: 'pick a model from the list', type: 'model' },
   { name: '/status', description: 'show runtime health', type: 'status' },
   { name: '/fast', description: 'switch to quick answers with low latency', type: 'tier', mode: 'fast' },
   { name: '/pro', description: 'switch to a deeper tool loop', type: 'tier', mode: 'pro' },
@@ -1299,10 +1379,14 @@ function runChatSlash(line, options = {}) {
     };
   }
   if (command.type === 'model') {
-    return {
-      type: 'model',
-      output: `· current lane: ${tierLabel(mode)} · effort: ${formatReasoningEffortLabel(options.reasoningEffort)} · switch with /fast /pro /max /rapid /alpha · effort with /effort`,
-    };
+    if (parsed.arg) {
+      const next = modeForModelName(parsed.arg);
+      if (!next) {
+        return { type: 'model', output: `no single model matches "${parsed.arg}"\n${modelChoiceList(mode, options)}` };
+      }
+      return { type: 'tier', mode: next, output: `· ${tierLabel(next)}` };
+    }
+    return { type: 'model', output: modelChoiceList(mode, options) };
   }
   if (command.type === 'effort') {
     const current = formatReasoningEffortLabel(options.reasoningEffort);
@@ -1384,13 +1468,21 @@ function attachSlashMenu(rl, output, options = {}) {
   const original = rl._ttyWrite.bind(rl);
   let visibleRows = 0;
 
+  // Move back by row count, not a saved screen position: drawing the menu at
+  // the bottom of a short window scrolls the screen, and a saved position then
+  // points into the menu, so typed text landed on a menu row (seen 2026-10-14).
+  const backToInput = (rowsBelow) => {
+    if (rowsBelow) output.write(`\x1b[${rowsBelow}A`);
+    const cols = typeof rl.getCursorPos === 'function' ? rl.getCursorPos().cols : 0;
+    output.write(`\r${cols ? `\x1b[${cols}C` : ''}`);
+  };
+
   const clear = () => {
     if (!visibleRows) return;
-    output.write('\x1b7');
     for (let index = 0; index < visibleRows; index += 1) {
       output.write('\x1b[1B\r\x1b[2K');
     }
-    output.write('\x1b8');
+    backToInput(visibleRows);
     visibleRows = 0;
   };
 
@@ -1399,10 +1491,10 @@ function attachSlashMenu(rl, output, options = {}) {
     if (typeof options.isActive === 'function' && !options.isActive()) return;
     const matches = filterChatCommands(rl.line);
     if (!matches.length) return;
-    const rows = chatMenu(output, matches).split('\n');
-    output.write('\x1b7');
+    const room = Math.max(3, (Number(output.rows) || 24) - 2);
+    const rows = chatMenu(output, matches.slice(0, room)).split('\n');
     for (const row of rows) output.write(`\r\n${row}`);
-    output.write('\x1b8');
+    backToInput(rows.length);
     visibleRows = rows.length;
   };
 
@@ -2963,28 +3055,19 @@ function latestPendingApprovalRequest(history = []) {
   return null;
 }
 
+// A yes made only of these words runs the staged action: "approved do it",
+// "yes go ahead please". Any other word ("no", "wait", "but", "change") falls
+// through to the model, so a hedged or edited reply never fires the action.
+const APPROVAL_YES_WORDS = new Set(['yes', 'y', 'yep', 'yeah', 'yup', 'sure', 'ok', 'okay', 'approve', 'approved', 'confirm', 'confirmed']);
+const APPROVAL_FILLER_WORDS = new Set(['do', 'it', 'go', 'ahead', 'please', 'pls', 'create', 'send', 'post', 'run', 'now', 'that', 'looks', 'good']);
+
 function messageApprovesPendingApproval(message) {
-  const normalized = String(message || '').trim().toLowerCase().replace(/[.!?]+$/g, '');
-  return new Set([
-    'yes',
-    'y',
-    'yep',
-    'yeah',
-    'ok',
-    'okay',
-    'approve',
-    'approved',
-    'confirm',
-    'create it',
-    'send it',
-    'post it',
-    'do it',
-    'go ahead',
-    'looks good',
-    'yes create it',
-    'yes send it',
-    'yes post it',
-  ]).has(normalized);
+  const normalized = String(message || '').trim().toLowerCase().replace(/[.!?,]+/g, ' ').replace(/\s+/g, ' ').trim();
+  if (['do it', 'go ahead', 'looks good', 'create it', 'send it', 'post it'].includes(normalized)) return true;
+  const words = normalized.split(' ').filter(Boolean);
+  if (!words.length || words.length > 6) return false;
+  if (!words.some(word => APPROVAL_YES_WORDS.has(word))) return false;
+  return words.every(word => APPROVAL_YES_WORDS.has(word) || APPROVAL_FILLER_WORDS.has(word));
 }
 
 function messageCancelsPendingApproval(message) {
@@ -3027,6 +3110,7 @@ function buildPayload(message, options = {}) {
     verify_command: verifyCommand || 'true',
     local_tools: [backendApiToolDescriptor()]
   };
+  if (mode === 'mercury' && options.diffuse) payload.diffuse = true;
   if (previousMessages.length) {
     payload.previous_messages = previousMessages;
   }
@@ -3059,6 +3143,13 @@ function buildPayload(message, options = {}) {
   if (!local && options.connectionUserId) {
     payload.connection_user_id = options.connectionUserId;
   }
+  if (payload.diffuse) {
+    // The refining view is plain chat: the backend skips tools while diffusing,
+    // and a workspace or tool list would route the turn away from it.
+    delete payload.local_tools;
+    delete payload.workspace_path;
+    payload.max_turns = 1;
+  }
   return payload;
 }
 
@@ -3092,6 +3183,42 @@ function codeFastWorkspaceNotice(result) {
   return null;
 }
 
+// Drafts own a temporary area ending at the start of an empty row.
+// Clip to the visible terminal so wrapping and scrolling cannot leave debris.
+function clearTextSnapshot(state, output) {
+  if (!state.snapshotRows || !output || !output.isTTY) return;
+  output.write(`\r\x1b[${state.snapshotRows}A\x1b[J`);
+  state.snapshotRows = 0;
+}
+
+function renderTextSnapshot(state, output, content) {
+  stopProgress(state);
+  clearTextSnapshot(state, output);
+  const width = Math.max(1, (output.columns || 80) - 1);
+  const height = Math.max(1, (output.rows || 24) - 1);
+  const clipped = [];
+  for (const line of String(content).replace(/[\x00-\x09\x0b-\x1f\x7f]/g, '').split('\n')) {
+    // Wrap each line to the terminal width so the whole draft stays visible.
+    let used = 0;
+    let text = '';
+    for (const char of line) {
+      // Non-ASCII cells are conservatively two columns, including emoji.
+      const cells = /\p{Mark}/u.test(char) ? 0 : char.codePointAt(0) > 0xff ? 2 : 1;
+      if (used + cells > width) {
+        clipped.push(text);
+        text = '';
+        used = 0;
+      }
+      text += char;
+      used += cells;
+    }
+    clipped.push(text);
+  }
+  clipped.splice(height);
+  output.write(`${paint(clipped.join('\n'), [ANSI.dim], output)}\n`);
+  state.snapshotRows = clipped.length;
+}
+
 function handleEvent(event, state, output) {
   if (!event || typeof event !== 'object') return;
   state.events.push(event);
@@ -3114,6 +3241,19 @@ function handleEvent(event, state, output) {
     return;
   }
 
+  if ((event.type === 'text_snapshot' || event.type === 'text_delta' || event.type === 'text')
+    && event.content && state.firstTextMs == null) {
+    state.firstTextMs = Date.now() - state.startedAt;
+  }
+  if (event.type === 'text_snapshot') {
+    if (state.diffuse) {
+      state.snapshotCount += 1;
+      if (output && output.isTTY) renderTextSnapshot(state, output, event.content || '');
+    }
+    return;
+  }
+
+  clearTextSnapshot(state, output);
   if ((event.type === 'text_delta' || event.type === 'text') && event.content) {
     state.output += event.content;
     if (output && output.isTTY) writeStreamingText(state, output, event.content);
@@ -3184,6 +3324,13 @@ function handleEvent(event, state, output) {
   }
 
   if (event.type === 'receipt' && event.receipt) {
+    // A picked model the backend could not reach is swapped silently; say so.
+    const answeredBy = String(event.receipt.model || '');
+    const asked = String(state.requestedModel || '');
+    if (answeredBy && asked && !asked.startsWith('atris:') && !asked.endsWith(answeredBy) && !answeredBy.endsWith(asked.split(':').pop())) {
+      flushPendingText(state, output);
+      writeAuxLine(state, output, paint(`· ${asked} did not answer; fell back to ${answeredBy}`, [ANSI.muted], output));
+    }
     const approvalLine = formatApprovalReceipt(event.receipt);
     const previewRows = formatTaskPreviewRows(event.receipt, output);
     if (approvalLine) {
@@ -3234,6 +3381,7 @@ function isTurnInterruptedError(error) {
 }
 
 async function postTurn(message, options = {}) {
+  const startedAt = Date.now();
   let route = options.business ? 'local' : resolveRoute(message, options);
   if (route === 'local' && !options.business && !pinLocalCheckout(options)
     && !(await localBackendReachable())) {
@@ -3265,6 +3413,12 @@ async function postTurn(message, options = {}) {
     wroteText: false,
     wroteActivity: false,
     durationMs: 0,
+    startedAt,
+    firstTextMs: null,
+    diffuse: Boolean(payload.diffuse),
+    requestedModel: String(payload.model || ''),
+    snapshotCount: 0,
+    snapshotRows: 0,
     lastChar: '\n',
     progress: null,
     inAuxBlock: false,
@@ -3306,7 +3460,6 @@ async function postTurn(message, options = {}) {
   return new Promise((resolve, reject) => {
     let settled = false;
     let abortListener = null;
-    const startedAt = Date.now();
     state.progress = createProgressReporter(output, options);
     state.progress.start();
 
@@ -3316,7 +3469,16 @@ async function postTurn(message, options = {}) {
       if (abortListener && options.signal) options.signal.removeEventListener('abort', abortListener);
       if (state.progress) state.progress.stop();
       state.progress = null;
+      clearTextSnapshot(state, output);
       state.durationMs = Date.now() - startedAt;
+      const timedMode = normalizeMode(options.mode);
+      if (timedMode === 'mercury' || timedMode.startsWith('model:')) {
+        const first = state.firstTextMs == null ? 'none' : `${(state.firstTextMs / 1000).toFixed(2)}s`;
+        const steps = state.diffuse ? `, ${state.snapshotCount} refining steps` : '';
+        const stderr = options.stderr || process.stderr;
+        if (output && output.isTTY && state.lastChar !== '\n') output.write('\n');
+        stderr.write(`${paint(`${timedMode === 'mercury' ? 'mercury 3' : tierLabel(timedMode)}: first text ${first}, done ${(state.durationMs / 1000).toFixed(2)}s${steps}`, [ANSI.dim], stderr)}\n`);
+      }
       if (error) reject(error);
       else resolve(value);
     };
@@ -3564,6 +3726,8 @@ async function runHeadlessTurn(message, options = {}) {
       business: options.business,
       verify: options.verify,
       reasoningEffort: options.reasoningEffort,
+      diffuse: options.diffuse,
+      stderr: options.stderr,
       output: sink,
       showProgress: false,
     });
@@ -3684,7 +3848,7 @@ async function chat(options = {}) {
       }
       if (logger) logger.write(`${trimmed}\n`);
       const color = slash.mode ? [tierColor(slash.mode)] : [ANSI.muted];
-      const preservesOwnFormatting = slash.type === 'help' || slash.type === 'status';
+      const preservesOwnFormatting = slash.type === 'help' || slash.type === 'status' || slash.type === 'model';
       output.write(`${preservesOwnFormatting ? slash.output : paint(slash.output, color, output)}\n\n`);
       return false;
     }
@@ -3814,6 +3978,7 @@ async function chat(options = {}) {
         business: options.business,
         verify: options.verify,
         reasoningEffort: session.reasoningEffort,
+        diffuse: options.diffuse,
         conversationId,
         turnId,
         approveBackendApi: options.approveBackendApi,
@@ -4733,8 +4898,22 @@ async function main() {
     args.splice(verifyIdx, 2);
   }
 
-  const explicitLane = args.includes('--code-fast') || args.includes('--code')
+  // --model <name>: any backend model by name, or a lane alias like mercury.
+  let modelLane = null;
+  const modelIdx = args.indexOf('--model');
+  if (modelIdx !== -1) {
+    modelLane = modeForModelName(args[modelIdx + 1]);
+    if (!modelLane) {
+      console.error('Usage: ax --model <name> [prompt]   e.g. --model mercury or --model fireworks:glm-5.2');
+      process.exit(1);
+    }
+    args.splice(modelIdx, 2);
+  }
+
+  const explicitLane = modelLane || (args.includes('--code-fast') || args.includes('--code')
     ? 'code-fast'
+    : args.includes('--mercury')
+      ? 'mercury'
     : args.includes('--max')
       ? 'max'
       : args.includes('--rapid')
@@ -4745,7 +4924,8 @@ async function main() {
           ? 'fast'
           : args.includes('--pro')
             ? 'pro'
-            : null;
+            : null);
+  const diffuse = args.includes('--diffuse');
   const autoEnabled = args.includes('--auto') && !explicitLane;
   let mode = explicitLane || 'pro';
   const doctor = args.includes('--doctor');
@@ -4828,7 +5008,7 @@ async function main() {
 
   const route = forceCloud ? 'cloud' : forceLocal ? 'local' : 'auto';
   const prompt = args
-    .filter(arg => !['--auto', '--auto-approve', '--max', '--fast', '--rapid', '--alpha', '--pro', '--code-fast', '--code', '--chat', '--doctor', '--approvals', '--self-test', '--benchmark', '--print', '--headless', '--local', '--cloud', '--help', '-h', '--effort'].includes(arg))
+    .filter(arg => !['--auto', '--auto-approve', '--max', '--fast', '--rapid', '--alpha', '--mercury', '--diffuse', '--pro', '--code-fast', '--code', '--chat', '--doctor', '--approvals', '--self-test', '--benchmark', '--print', '--headless', '--local', '--cloud', '--help', '-h', '--effort'].includes(arg))
     .join(' ')
     .trim();
 
@@ -4990,6 +5170,7 @@ async function main() {
           verify,
           autoPick,
           reasoningEffort,
+          diffuse,
         })
         : { ok: false, model: modelForMode(mode), output: '', durationMs: 0, error: 'missing prompt' };
       // Drain stdout before exiting: process.exit right after a large write
@@ -5013,6 +5194,7 @@ async function main() {
         auto: autoEnabled,
         autoApprove,
         reasoningEffort,
+        diffuse,
       });
       return;
     }
@@ -5032,6 +5214,7 @@ async function main() {
         business,
         verify,
         reasoningEffort,
+        diffuse,
       });
       appendAutoOutcome(autoPick, {
         ok: true,
@@ -5156,6 +5339,7 @@ module.exports = {
   messageApprovesPendingApproval,
   messageCancelsPendingApproval,
   modelForMode,
+  normalizeMode,
   normalizeReasoningEffort,
   parseSseBlock,
   persistPendingApproval,

package/bin/atris.js

@@ -34,6 +34,13 @@ function exitWhenFlushed(code) {
   setTimeout(() => process.exit(code), 3000).unref();
 }
 
+// Exit right after stdout drains: a write past the 64KB pipe buffer is async,
+// and an empty write's callback fires only once every earlier write is out.
+function exitAfterStdoutDrain(code) {
+  if (process.stdout.writableLength === 0) process.exit(code);
+  else process.stdout.write('', () => process.exit(code));
+}
+
 let CLI_VERSION = 'unknown';
 try {
   const pkgRaw = fs.readFileSync(PACKAGE_JSON_PATH, 'utf8');
@@ -513,6 +520,11 @@ function showStartHelp() {
 function showHelpShort() {
   console.log('atris: you say what you want. already won. one next step.');
   console.log('');
+  console.log('Start here:');
+  console.log('  1. atris init                    set up this folder');
+  console.log('  2. atris doctor                  check this computer is ready');
+  console.log('  3. atris "what you want"         say it, the work starts');
+  console.log('');
   console.log('  atris "what do you want here?"   empty folder');
   console.log('  atris later "..."                remember without a room');
   console.log('  atris guide "..."                translate your words');
@@ -534,6 +546,7 @@ function helpCatalog() {
     { name: 'review', summary: 'validate work and capture learnings', json: false, interactive_risk: 'low' },
     { name: 'recap', summary: 'spoken recap of what your team did', json: true, interactive_risk: 'low' },
     { name: 'mission', summary: 'durable goal + owner + verifier + tick', json: true, interactive_risk: 'medium' },
+    { name: 'campaign', summary: 'long goal + judge + budget + seats, made of missions', json: true, interactive_risk: 'low' },
     { name: 'log', summary: 'append an idea to today inbox (or --repl)', json: true, interactive_risk: 'low' },
     { name: 'wish', summary: 'headless inbox / mission intake', json: true, interactive_risk: 'low' },
     { name: 'learn', summary: 'structured project learnings', json: false, interactive_risk: 'low' },
@@ -624,6 +637,7 @@ function showHelpAll() {
   console.log('    atris autoland tick   # second check runs, task lands');
   console.log('  mission    - Goal + loop + member owner + verifier + receipt; --budget quick|long|deep sets bounded tiers');
   console.log('  decide     - Answer open mission asks and send the decision to the next tick');
+  console.log('  campaign   - Long-running goals with a judge, a budget, and members in seats');
   console.log('  release    - Tag release, bump version, create GitHub release, draft /launch; atris release preflight before a v* tag');
   console.log('  learn      - Project learnings (patterns, pitfalls, preferences)');
   console.log('  study      - On-demand learning feed: ingest topic, start server, open browser');
@@ -1156,7 +1170,8 @@ function showAutopilotHelp() {
 
 if (command === 'help' || command === '--help' || command === '-h') {
   showHelp({ args: process.argv.slice(3) });
-  process.exit(0);
+  exitAfterStdoutDrain(0);
+  return;
 }
 
 // Core command handlers, loaded eagerly (used by interactiveEntry default path)
@@ -1893,12 +1908,13 @@ function showWelcomeVisualization() {
   }
 
   // The guarantee gauge, only when it has bad news: landings a human had to
-  // fix this week. Zero is the healthy state and stays silent; no git history
+  // fix this week. Coaching (role, goal, context edits) is not bad news. Zero is the healthy state and stays silent; no git history
   // (not a repo, git missing) also stays silent.
   try {
     const rev = require('../commands/improve').collectRevisionSignals(cwd, { days: 7 });
-    if (rev.revised > 0) {
-      console.log(`  ${rev.revised} landing${rev.revised === 1 ? '' : 's'} this week needed a human fix; run atris improve revisions`);
+    const fixed = Number.isFinite(rev.fixed) ? rev.fixed : rev.revised;
+    if (fixed > 0) {
+      console.log(`  ${fixed} landing${fixed === 1 ? '' : 's'} this week needed a human fix; run atris improve revisions`);
     }
   } catch {
     // Silent: the gauge never blocks boot.
@@ -2000,6 +2016,10 @@ if (command === 'guide') {
   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 === 'campaign') {
+  Promise.resolve(require('../commands/campaign').campaignCommand(process.argv.slice(3)))
+    .then((code) => process.exit(code || 0))
+    .catch((err) => { console.error(`\nerror: ${err.message || err}`); process.exit(1); });
 } else if (command === 'who') {
   Promise.resolve(require('../commands/who').whoCommand(process.argv.slice(3)))
     .then((code) => process.exit(code || 0))
@@ -3246,8 +3266,8 @@ if (command === 'guide') {
   // both (mirrors the `compile` command dispatch just above).
   const engineArgs = command === 'engines' && process.argv.length <= 3 ? [] : process.argv.slice(3);
   Promise.resolve(require('../commands/engine').engineCommand(engineArgs))
-    .then((code) => process.exit(typeof code === 'number' ? code : 0))
-    .catch((err) => { console.error(`\n✗ Error: ${err.message || err}`); process.exit(1); });
+    .then((code) => exitAfterStdoutDrain(typeof code === 'number' ? code : 0))
+    .catch((err) => { console.error(`\n✗ Error: ${err.message || err}`); exitAfterStdoutDrain(1); });
 } else if (command === 'link') {
   // Link: ask the roster's engine what two things could become together.
   Promise.resolve(require('../commands/link').linkCommand(process.argv.slice(3)))