atris 3.38.0 → 3.40.0

package/commands/drill.js

@@ -3,22 +3,12 @@
 const fs = require('fs');
 const os = require('os');
 const path = require('path');
-const { spawnSync } = require('child_process');
+const { hasFlag } = require('../lib/arg-parser');
+const { runGit } = require('../lib/git-spawn');
 
 const VERIFY_COMMAND = 'node -e "process.exit(0)"';
 const COAUTHOR = 'Co-authored-by: Atris <299057014+atris-builder[bot]@users.noreply.github.com>';
 
-function hasFlag(args, name) {
-  return args.includes(name);
-}
-
-function runGit(args, cwd, options = {}) {
-  const result = spawnSync('git', args, { cwd, encoding: 'utf8' });
-  if (options.check === false || result.status === 0) return result;
-  const output = (result.stderr || result.stdout || `git ${args.join(' ')} failed`).trim();
-  throw new Error(output);
-}
-
 function parseJsonOutput(text) {
   const raw = String(text || '').trim();
   if (!raw) throw new Error('expected JSON output, got empty output');
@@ -97,9 +87,9 @@ async function createSandbox(ctx) {
   ctx.tmpRoot = fs.mkdtempSync(path.join(os.tmpdir(), 'atris-drill-'));
   ctx.sandboxPath = path.join(ctx.tmpRoot, 'sandbox');
   fs.mkdirSync(ctx.sandboxPath, { recursive: true });
-  runGit(['init', '-b', 'master'], ctx.sandboxPath);
-  runGit(['config', 'user.email', 'drill@example.invalid'], ctx.sandboxPath);
-  runGit(['config', 'user.name', 'Atris Drill'], ctx.sandboxPath);
+  runGit(['init', '-b', 'master'], { cwd: ctx.sandboxPath });
+  runGit(['config', 'user.email', 'drill@example.invalid'], { cwd: ctx.sandboxPath });
+  runGit(['config', 'user.name', 'Atris Drill'], { cwd: ctx.sandboxPath });
   fs.writeFileSync(path.join(ctx.sandboxPath, 'README.md'), '# Atris drill sandbox\n', 'utf8');
   await withSandboxProcessState(ctx.sandboxPath, {
     ATRIS_SKIP_UPDATE_CHECK: '1',
@@ -108,8 +98,8 @@ async function createSandbox(ctx) {
   }, async () => {
     await callInitAtris(ctx.sandboxPath);
   });
-  runGit(['add', '-A'], ctx.sandboxPath);
-  runGit(['commit', '-m', 'initial sandbox'], ctx.sandboxPath);
+  runGit(['add', '-A'], { cwd: ctx.sandboxPath });
+  runGit(['commit', '-m', 'initial sandbox'], { cwd: ctx.sandboxPath });
 }
 
 async function wishCaptured(ctx) {
@@ -199,10 +189,10 @@ async function landingShippedLocal(ctx) {
   try {
     require('../lib/task-db').close();
   } catch {}
-  const dirty = runGit(['status', '--porcelain'], ctx.sandboxPath).stdout.trim();
+  const dirty = runGit(['status', '--porcelain'], { cwd: ctx.sandboxPath }).stdout.trim();
   if (dirty) {
-    runGit(['add', '-A'], ctx.sandboxPath);
-    runGit(['commit', '-m', 'record drill pipeline state'], ctx.sandboxPath);
+    runGit(['add', '-A'], { cwd: ctx.sandboxPath });
+    runGit(['commit', '-m', 'record drill pipeline state'], { cwd: ctx.sandboxPath });
   }
   ctx.landingWorktree = path.join(ctx.tmpRoot, 'landing-worktree');
   const created = worktree.createAgentWorktree({
@@ -229,9 +219,9 @@ async function landingShippedLocal(ctx) {
     assertOk(shipped.value === 0, `worktree ship exited ${shipped.value}`);
     assertOk(/local mode/.test(`${shipped.stdout}\n${shipped.stderr}`), 'worktree ship did not report local mode');
   });
-  runGit(['worktree', 'remove', ctx.landingWorktree, '--force'], ctx.sandboxPath);
-  runGit(['branch', '-d', ctx.landingBranch], ctx.sandboxPath);
-  const landed = runGit(['show', 'master:drill-landing.txt'], ctx.sandboxPath).stdout;
+  runGit(['worktree', 'remove', ctx.landingWorktree, '--force'], { cwd: ctx.sandboxPath });
+  runGit(['branch', '-d', ctx.landingBranch], { cwd: ctx.sandboxPath });
+  const landed = runGit(['show', 'master:drill-landing.txt'], { cwd: ctx.sandboxPath }).stdout;
   assertOk(landed.trim() === 'local landing ok', 'landing file was not merged into sandbox master');
 }
 
@@ -244,7 +234,7 @@ async function ledgerChecked(ctx) {
   assertOk(currentMission, `mission not found: ${ctx.missionId}`);
   assertOk(currentMission.verifier_result && currentMission.verifier_result.passed === true, 'mission verifier result is not passing');
   assertOk(currentMission.receipt_path && fs.existsSync(path.join(ctx.sandboxPath, currentMission.receipt_path)), `mission receipt missing: ${currentMission.receipt_path}`);
-  const unmerged = runGit(['branch', '--no-merged', 'master'], ctx.sandboxPath).stdout
+  const unmerged = runGit(['branch', '--no-merged', 'master'], { cwd: ctx.sandboxPath }).stdout
     .split(/\r?\n/)
     .map((line) => line.replace(/^\*/, '').trim())
     .filter(Boolean)

package/commands/engine.js

@@ -26,6 +26,7 @@ const {
 } = require('../lib/runner-command');
 const {
   ENGINE_ROLES,
+  ENGINE_DUTIES,
   ENGINE_HEALTH_STATUSES,
   binInstalled,
   canonicalEngineName,
@@ -34,6 +35,9 @@ const {
   readEngineRegistry,
   resolveEngineForRole,
   resolveEngineForRoleRanked,
+  requireEngineBin,
+  engineDoctorReport,
+  setEngineOverrides,
   setEngineHealth,
 } = require('../lib/engine-registry');
 const { FLEET_CAPABLE, runDispatchFlight } = require('../lib/fleet');
@@ -90,14 +94,22 @@ function readSavedEngine(root = process.cwd()) {
 
 // The default engine for this workspace, in precedence order:
 // env (per-run flags land here) -> .atris/engine.json -> house default.
-// The house default is our own intelligence when it is installed.
+// When nothing is configured the pick comes from the registry's saved health
+// (seeded once on first sight, refreshed by `atris engine doctor`), never a
+// machine probe: policy over probes. A stale "ready" is the execution stage's
+// problem, where requireEngineBin fails in one plain sentence.
 function resolveDefaultEngine(root = process.cwd()) {
   const env = canonicalEngineName(process.env.ATRIS_RUNNER_PROFILE);
   if (env) return { name: env, source: 'env' };
   const saved = readSavedEngine(root);
   if (saved) return { name: saved, source: 'saved' };
-  if (binInstalled(RUNNER_PROFILE_DEFS[HOUSE_ENGINE].bin)) return { name: HOUSE_ENGINE, source: 'house' };
-  const fallback = RUNNER_PROFILE_NAMES.find((name) => binInstalled(RUNNER_PROFILE_DEFS[name].bin));
+  const ready = new Set(
+    engineRegistryView(root)
+      .filter((engine) => engine.health && engine.health.status === 'ready')
+      .map((engine) => engine.id)
+  );
+  if (ready.has(HOUSE_ENGINE)) return { name: HOUSE_ENGINE, source: 'house' };
+  const fallback = RUNNER_PROFILE_NAMES.find((name) => ready.has(name));
   return fallback ? { name: fallback, source: 'detected' } : { name: HOUSE_ENGINE, source: 'none' };
 }
 
@@ -887,13 +899,16 @@ function printRoster(root) {
   const found = list.filter((e) => e.installed).length;
   const current = resolveDefaultEngine(root);
   console.log('');
-  console.log(`  engines — ${found} intelligence${found === 1 ? '' : 's'} found`);
+  console.log(`  engines: ${found} intelligence${found === 1 ? '' : 's'} found`);
   console.log('');
   for (const engine of list) {
     const mark = engine.default ? '→' : ' ';
     const state = engine.health.status === 'not_installed' ? 'not installed' : engine.health.status.replace(/_/g, ' ');
     const roles = engine.roles.join(',');
     console.log(`  ${mark} ${engine.id.padEnd(12)} ${state.padEnd(13)} ${engine.tier.padEnd(4)} ${roles}`);
+    const details = [`models: ${engine.models.join(', ')}`];
+    if (engine.duty) details.push(`duty: ${engine.duty}`);
+    console.log(`      ${details.join('   ')}`);
   }
   console.log('');
   console.log(`  default: ${current.name}${current.source === 'saved' ? ' (set here)' : current.source === 'env' ? ' (this session)' : ''}`);
@@ -901,6 +916,139 @@ function printRoster(root) {
   console.log('');
 }
 
+function chartEngineLabel(engine) {
+  const id = String(engine && (engine.id || engine.name) || '').trim();
+  const models = Array.isArray(engine && engine.models)
+    ? engine.models.map((model) => String(model || '').trim()).filter(Boolean)
+    : [];
+  return models.length ? `${id}: ${models.join(', ')}` : id;
+}
+
+function chartBox(title, engines, note = '', emptyLabel = 'unassigned') {
+  const labels = engines.length ? engines.map(chartEngineLabel) : (emptyLabel ? [emptyLabel] : []);
+  const body = [title, ...labels, ...(note ? [note] : [])];
+  const innerWidth = Math.max(...body.map((line) => line.length)) + 2;
+  return {
+    width: innerWidth + 2,
+    lines: [
+      `┌${'─'.repeat(innerWidth)}┐`,
+      ...body.map((line) => `│ ${line.padEnd(innerWidth - 2)} │`),
+      `└${'─'.repeat(innerWidth)}┘`,
+    ],
+  };
+}
+
+function centerChartLine(line, width, center = Math.floor((width - 1) / 2)) {
+  const left = Math.max(0, center - Math.floor(line.length / 2));
+  return `${' '.repeat(left)}${line}`.padEnd(width);
+}
+
+function renderEngineChart(registry) {
+  const engines = Array.isArray(registry) ? registry : ((registry && registry.engines) || []);
+  const specialDuties = new Set(ENGINE_DUTIES);
+  const leaders = engines.filter((entry) => entry.duty === 'leader');
+  const rolePool = engines.filter((entry) => !specialDuties.has(entry.duty));
+  const builders = rolePool.filter((entry) => Array.isArray(entry.roles) && entry.roles.includes('executor'));
+  const checkers = rolePool.filter((entry) => Array.isArray(entry.roles) && entry.roles.includes('validator'));
+  const errands = engines.filter((entry) => entry.duty === 'errands');
+  const apprentices = engines.filter((entry) => entry.duty === 'learning');
+
+  const ownerBox = chartBox('owner', [], '', '');
+  const leaderBox = chartBox('leader', leaders);
+  const columns = [
+    chartBox('builders', builders),
+    chartBox('checkers', checkers),
+    chartBox('errands', errands),
+  ];
+  const gap = 3;
+  const totalWidth = columns.reduce((sum, column) => sum + column.width, 0) + (gap * (columns.length - 1));
+  const columnHeight = Math.max(...columns.map((column) => column.lines.length));
+  const columnLines = [];
+  for (let row = 0; row < columnHeight; row += 1) {
+    columnLines.push(columns.map((column) => (column.lines[row] || '').padEnd(column.width)).join(' '.repeat(gap)));
+  }
+
+  const centers = [];
+  let offset = 0;
+  for (const column of columns) {
+    centers.push(offset + Math.floor(column.width / 2));
+    offset += column.width + gap;
+  }
+  const fleetCenter = centers[1];
+  const branch = Array(totalWidth).fill(' ');
+  for (let i = centers[0]; i <= centers[centers.length - 1]; i += 1) branch[i] = '─';
+  branch[centers[0]] = '┌';
+  branch[centers[centers.length - 1]] = '┐';
+  for (const center of centers.slice(1, -1)) branch[center] = '┬';
+  branch[fleetCenter] = centers.includes(fleetCenter) ? '┼' : '┴';
+  const stems = Array(totalWidth).fill(' ');
+  for (const center of centers) stems[center] = '│';
+
+  const lines = [
+    ...ownerBox.lines.map((line) => centerChartLine(line, totalWidth, fleetCenter)),
+    centerChartLine('│', totalWidth, fleetCenter),
+    ...leaderBox.lines.map((line) => centerChartLine(line, totalWidth, fleetCenter)),
+    centerChartLine('│', totalWidth, fleetCenter),
+    branch.join(''),
+    stems.join(''),
+    ...columnLines,
+  ];
+  if (apprentices.length) {
+    const apprenticeBox = chartBox('apprentice', apprentices, 'learning the system');
+    lines.push(centerChartLine('│', totalWidth, fleetCenter));
+    lines.push(...apprenticeBox.lines.map((line) => centerChartLine(line, totalWidth, fleetCenter)));
+  }
+  return lines.map((line) => line.replace(/\s+$/, '')).join('\n');
+}
+
+function printEngineChart(root) {
+  console.log(renderEngineChart(readEngineRegistry(root)));
+}
+
+function flagValue(args, flag) {
+  const equals = `${flag}=`;
+  for (let i = 0; i < args.length; i += 1) {
+    const value = String(args[i] || '');
+    if (value === flag) return { present: true, value: args[i + 1] || '' };
+    if (value.startsWith(equals)) return { present: true, value: value.slice(equals.length) };
+  }
+  return { present: false, value: '' };
+}
+
+function runSetEngineCommand(args, root) {
+  const name = String(args[0] || '').trim();
+  const dutyFlag = flagValue(args.slice(1), '--duty');
+  const modelsFlag = flagValue(args.slice(1), '--models');
+  const duty = String(dutyFlag.value || '').trim();
+  const models = String(modelsFlag.value || '').split(',').map((model) => model.trim()).filter(Boolean);
+  if (!name || (!dutyFlag.present && !modelsFlag.present)) {
+    console.error('usage: atris engine set <name> [--duty leader|errands|learning] [--models "a, b"]');
+    return 2;
+  }
+  if (dutyFlag.present && !ENGINE_DUTIES.includes(duty)) {
+    console.error(`unknown duty "${duty}". known duties: ${ENGINE_DUTIES.join(', ')}`);
+    return 2;
+  }
+  if (modelsFlag.present && !models.length) {
+    console.error('models must include at least one name');
+    return 2;
+  }
+  try {
+    const updated = setEngineOverrides(name, {
+      ...(dutyFlag.present ? { duty } : {}),
+      ...(modelsFlag.present ? { models } : {}),
+    }, root);
+    const details = [];
+    if (updated.duty) details.push(`duty ${updated.duty}`);
+    if (updated.models) details.push(`models ${updated.models.join(', ')}`);
+    console.log(`${updated.id} updated: ${details.join('; ')}`);
+    return 0;
+  } catch (err) {
+    console.error(String(err.message || err).replace(/^Unknown/, 'unknown'));
+    return 2;
+  }
+}
+
 function registryPayload(root) {
   const current = resolveDefaultEngine(root);
   const registry = readEngineRegistry(root);
@@ -956,6 +1104,28 @@ function runResolveCommand(args, root) {
   return 0;
 }
 
+// Doctor is the one opt-in place that probes the machine: it checks every
+// engine binary, reports installed state, and folds ready/not_installed flips
+// back into the policy file. Routing itself never probes.
+function runDoctorCommand(args, root) {
+  const json = args.includes('--json');
+  const engines = engineDoctorReport(root);
+  if (json) {
+    console.log(JSON.stringify({ ok: true, engines }, null, 2));
+    return 0;
+  }
+  console.log('');
+  for (const engine of engines) {
+    const state = engine.installed ? 'installed' : 'missing';
+    const health = engine.health.status.replace(/_/g, ' ');
+    console.log(`  ${engine.id.padEnd(12)} ${String(engine.bin).padEnd(14)} ${state.padEnd(10)} health: ${health}`);
+  }
+  console.log('');
+  console.log('  probed just now and saved to the registry; routing reads that saved policy, never the machine.');
+  console.log('');
+  return 0;
+}
+
 function runHealthCommand(args, root) {
   const json = args.includes('--json');
   const positional = args.filter((a) => !String(a).startsWith('--'));
@@ -1203,9 +1373,12 @@ function runDispatchCommand(args, root) {
       return 2;
     }
   }
-  const def = RUNNER_PROFILE_DEFS[canonical];
-  if (!binInstalled(def.bin)) {
-    console.error(`engine dispatch: ${canonical} CLI (${def.bin}) is not installed here`);
+  // Execution stage: this is where the binary must exist. Routing above never
+  // probed the machine; a missing CLI fails loudly here instead.
+  try {
+    requireEngineBin(canonical);
+  } catch (err) {
+    console.error(`engine dispatch: ${err.message}`);
     return 2;
   }
   return runDispatchFlight({ root, taskIds, engine: canonical, prompt: promptOverride, yolo, ...(base ? { checkoutBase: base } : {}) }).then((flight) => {
@@ -1248,6 +1421,19 @@ function engineCommand(args = [], deps = {}) {
     return runHealthCommand(args.slice(args.indexOf('health') + 1), root);
   }
 
+  if (sub === 'doctor') {
+    return runDoctorCommand(args.slice(args.indexOf('doctor') + 1), root);
+  }
+
+  if (sub === 'set') {
+    return runSetEngineCommand(args.slice(args.indexOf('set') + 1), root);
+  }
+
+  if (sub === 'chart' || args.includes('--chart')) {
+    printEngineChart(root);
+    return 0;
+  }
+
   if (!sub || sub === 'list' || sub === 'status') {
     if (json) {
       console.log(JSON.stringify(registryPayload(root), null, 2));
@@ -1266,7 +1452,7 @@ function engineCommand(args = [], deps = {}) {
   }
 
   if (sub === 'help') {
-    console.log('\n  atris engine            roster + current default\n  atris engine list --json full registry: default + engines with tier, roles, fallback, health\n  atris engine resolve <role> [--json]\n                           choose the best ready engine for navigator|executor|validator\n  atris engine health <name> --set ready|not_installed|credit_out\n                           flip runtime health, for example when credits run out\n  atris engine <name>     make that engine the default here\n  atris engine test [name] preflight: run the engine CLI headless, report pass/fail\n  atris engine dispatch <task-id> [<task-id> ...] --engine cursor|codex [--prompt-file <f>] [--yolo]\n                           one-command claim, worktree, build, verify, ship, ready\n  atris engine login <provider> --yes\n                           upload a local provider CLI login to the backend vault\n  atris engine login <provider> --computer [--seat <name>]\n  atris engine login <provider> --business <id> [--seat <name>]\n                           sign in on an Atris computer by device flow\n  atris engine login --list | --remove <provider>\n                           list or remove vaulted provider logins\n  atris engine seats       show which named accounts are ready to work\n  atris engine seed <provider> --business <id>|--user\n                           push a vaulted login onto an Atris computer\n  atris engine reset      back to the house default\n  --engine <name>         one run on that engine (mission run / autopilot / run)\n');
+    console.log('\n  atris engine            roster + current default\n  atris engines --chart   show the fleet as an org chart\n  atris engine list --json full registry: default + engines with tier, roles, fallback, health\n  atris engine set <name> --duty leader|errands|learning [--models "a, b"]\n                           arrange the fleet and save its model policy\n  atris engine resolve <role> [--json]\n                           choose the best ready engine for navigator|executor|validator\n  atris engine health <name> --set ready|not_installed|credit_out\n                           flip runtime health, for example when credits run out\n  atris engine doctor [--json]\n                           probe which engine CLIs are installed here and sync that into health policy\n  atris engine <name>     make that engine the default here\n  atris engine test [name] preflight: run the engine CLI headless, report pass/fail\n  atris engine dispatch <task-id> [<task-id> ...] --engine cursor|codex [--prompt-file <f>] [--yolo]\n                           one-command claim, worktree, build, verify, ship, ready\n  atris engine login <provider> --yes\n                           upload a local provider CLI login to the backend vault\n  atris engine login <provider> --computer [--seat <name>]\n  atris engine login <provider> --business <id> [--seat <name>]\n                           sign in on an Atris computer by device flow\n  atris engine login --list | --remove <provider>\n                           list or remove vaulted provider logins\n  atris engine seats       show which named accounts are ready to work\n  atris engine seed <provider> --business <id>|--user\n                           push a vaulted login onto an Atris computer\n  atris engine reset      back to the house default\n  --engine <name>         one run on that engine (mission run / autopilot / run)\n');
     return 0;
   }
 
@@ -1304,6 +1490,8 @@ module.exports = {
   readEngineRegistry,
   resolveEngineForRole,
   setEngineHealth,
+  setEngineOverrides,
+  renderEngineChart,
   parseDispatchArgs,
   runDispatchCommand,
   ENGINE_LOGIN_MANIFESTS,

package/commands/gm.js

@@ -3,6 +3,7 @@
 const fs = require('fs');
 const os = require('os');
 const path = require('path');
+const { hasFlag: hasExactFlag } = require('../lib/arg-parser');
 
 const AGENTXP_LEADERBOARD_URL = 'https://api.atris.ai/api/agentxp/leaderboard';
 const AGENTXP_GLOBAL_SYNC_RULE = 'Run atris login, then sync. Owner-provided sync tokens are guided-demo fallback only.';
@@ -54,8 +55,9 @@ function flag(args, name) {
   return null;
 }
 
-function hasFlag(args, name) {
-  return args.includes(name) || args.some(arg => arg.startsWith(`${name}=`));
+// This command treats --name=value as flag presence as well as a standalone flag.
+function hasFlagOrValue(args, name) {
+  return hasExactFlag(args, name) || args.some(arg => arg.startsWith(`${name}=`));
 }
 
 function positional(args) {
@@ -185,7 +187,7 @@ function pickSeedPlayer(workspaceRoot, tasks, args = []) {
 }
 
 function ensureStarterMission(taskDb, db, workspaceRoot, tasks, args = []) {
-  if (hasFlag(args, '--no-seed')) return { tasks, seeded: null };
+  if (hasFlagOrValue(args, '--no-seed')) return { tasks, seeded: null };
   if (!fs.existsSync(path.join(workspaceRoot, 'atris'))) return { tasks, seeded: null };
   if (activeAgentXpTasks(tasks).length) return { tasks, seeded: null };
 
@@ -658,7 +660,7 @@ async function gmCommand(...args) {
     return memberCommand('wake', member, ...passthrough);
   }
 
-  if (!hasFlag(args, '--json') && !hasFlag(args, '--watch')) {
+  if (!hasFlagOrValue(args, '--json') && !hasFlagOrValue(args, '--watch')) {
     try {
       const { gameCommand } = require('./game');
       const dashboardShown = await gameCommand([], { silentMissing: true });
@@ -669,12 +671,12 @@ async function gmCommand(...args) {
   }
 
   const state = gmState(args);
-  if (hasFlag(args, '--json')) {
+  if (hasFlagOrValue(args, '--json')) {
     console.log(JSON.stringify(state, null, 2));
     return;
   }
   render(state);
-  if (hasFlag(args, '--watch')) {
+  if (hasFlagOrValue(args, '--watch')) {
     await gmWatch(args);
   }
 }

package/commands/harvest.js

@@ -1,14 +1,11 @@
 const fs = require('fs');
 const path = require('path');
+const { hasFlag } = require('../lib/arg-parser');
 const {
   isGenericInboxPlaceholder,
   seedInboxFromMove,
 } = require('../lib/next-moves');
 
-function hasFlag(args, name) {
-  return args.includes(name);
-}
-
 function safeRead(file) {
   try { return fs.readFileSync(file, 'utf8'); } catch { return ''; }
 }

package/commands/init.js

@@ -282,6 +282,7 @@ function initAtris() {
   const printReadyCounts = () => {
     console.log(`workspace files ready (${ready.workspace.size})`);
     console.log(`team members ready (${ready.team.size})`);
+    console.log('more members are available with atris member create <name>');
     console.log(`agent adapters ready (${ready.adapters.size})`);
     console.log(`skills installed (${ready.skills.size})`);
   };
@@ -601,8 +602,8 @@ function initAtris() {
 
 
   // Copy team members (MEMBER.md format — directory per member with skills/tools/context)
-  const members = ['navigator', 'executor', 'validator', 'launcher', 'brainstormer', 'researcher'];
-  members.forEach(name => {
+  const starterMembers = ['navigator', 'executor', 'validator', 'mission-lead', 'improver'];
+  starterMembers.forEach(name => {
     const sourceFile = path.join(__dirname, '..', 'atris', 'team', name, 'MEMBER.md');
     const targetMemberDir = path.join(teamDir, name);
     const targetFile = path.join(targetMemberDir, 'MEMBER.md');
@@ -644,7 +645,7 @@ tools: []
 # Insert persona, workflow, and rules below
 `;
     fs.writeFileSync(path.join(templateTargetDir, 'MEMBER.md'), templateContent);
-    markReady('team', '_template', '✓ Created team/_template/MEMBER.md');
+    markReady('workspace', 'team/_template/MEMBER.md', '✓ Created team/_template/MEMBER.md');
   }
 
   // Detect project context and generate profile
@@ -676,6 +677,25 @@ atris atris.md
 
 This is the Atris boot sequence. Show the output to the user, then respond naturally.
 
+## The way of talking (every reply, no exceptions)
+
+Talk like a person. This governs every message you send the operator: boot, status, summaries, everything.
+
+- Plain words. Say what happened and what it means for the reader, cause and effect. Not the machinery.
+- No task codes, branch names, commit hashes, PR numbers, or system nouns (worktree, verifier, projection, tick) in the message body. If the reader needs a command, put ONE copyable line at the end.
+- No insider terms without defining them in the same breath. A sharp non-engineer must follow it on first read.
+- Lead with the outcome. Complete sentences, one or two per paragraph, blank line between. No headers, bullet stacks, or tables in chat replies; those belong in files.
+- Detail lives in files and receipts. Offer "want the detail?" instead of dumping it.
+- No em dashes anywhere; use a comma, colon, or period.
+- The test before sending: read it fried at 2am. If decoding takes work, rewrite it.
+
+copy these shapes:
+- **Status:** "The reply check is built. I am running the final checks now, so the result is not ready yet."
+- **Landing:** "Replies now get a plain-language check before they reach you. The checks passed, and the change is ready."
+- **Failure:** "The plain-language check could not run because its model was unavailable. Your reply still went through, so no work was blocked."
+
+Canonical source: \`atris/atris.md\` \`## voice\`. This block is a copy for tools that only read \`AGENTS.md\`; if they differ, atris.md wins.
+
 ## Core Files
 
 Atris is the source of truth. This file is only an adapter for tools that read

package/commands/land.js

@@ -1,7 +1,6 @@
 const fs = require('fs');
 const path = require('path');
-const { spawnSync } = require('child_process');
-
+const { runGit } = require('../lib/git-spawn');
 const { listWorktrees, statusCounts } = require('./worktree');
 
 const DEFAULT_TTL_DAYS = 7;
@@ -14,14 +13,6 @@ function countLabel(n, word) {
   return `${n} ${word}${n === 1 ? '' : 's'}`;
 }
 
-function runGit(args, { cwd = process.cwd(), check = true, maxBuffer } = {}) {
-  const result = spawnSync('git', args, { cwd, encoding: 'utf8', ...(maxBuffer ? { maxBuffer } : {}) });
-  if (check && result.status !== 0) {
-    throw new Error(`git ${args.join(' ')} failed: ${(result.stderr || result.stdout || '').trim()}`);
-  }
-  return result;
-}
-
 function repoRoot(cwd = process.cwd()) {
   const result = runGit(['rev-parse', '--show-toplevel'], { cwd, check: false });
   if (result.status !== 0) return '';
@@ -614,7 +605,9 @@ function printReceipt(receipt) {
     // fresh-grace keeps are healthy active work, not a call to action —
     // "needs a human" on those trained readers to ignore the real ones.
     for (const k of receipt.keptWorktrees || []) {
+      // The receipt keeps the raw codes; the human line speaks in sentences.
       if (String(k).includes('(fresh_worktree_grace)')) console.log(`  in use, left alone: ${k.replace(' (fresh_worktree_grace)', '')}`);
+      else if (String(k).includes('(current_checkout)')) console.log(`  you are standing in it, left alone: ${k.replace(' (current_checkout)', '')}`);
       else console.log(`  ✋ kept, needs a human: ${k}`);
     }
     for (const m of receipt.keptMovedBranches || []) console.log(`  moved since scan, left alone: ${m}`);
@@ -624,7 +617,8 @@ function printReceipt(receipt) {
   console.log('');
 }
 
-function readFlag(args, name, fallback = '') {
+// Preserve split-only parsing and its fallback for missing or falsey values.
+function readFollowingFlag(args, name, fallback = '') {
   const idx = args.indexOf(name);
   if (idx === -1) return fallback;
   return args[idx + 1] || fallback;
@@ -665,10 +659,10 @@ function landCommand(args = []) {
     console.error('not a git repository');
     return 1;
   }
-  const ttlRaw = readFlag(args, '--ttl', '');
+  const ttlRaw = readFollowingFlag(args, '--ttl', '');
   const ttlParsed = Number(ttlRaw);
   const ttlDays = ttlRaw !== '' && Number.isFinite(ttlParsed) && ttlParsed >= 0 ? ttlParsed : DEFAULT_TTL_DAYS;
-  const base = readFlag(args, '--base', '');
+  const base = readFollowingFlag(args, '--base', '');
   const json = args.includes('--json');
 
   if (args.includes('--reap')) {
@@ -679,7 +673,7 @@ function landCommand(args = []) {
   }
 
   const lookupArgs = args[0] === 'status' ? args.slice(1) : args;
-  const name = lookupArgs.find((a) => !a.startsWith('-') && a !== readFlag(lookupArgs, '--ttl') && a !== readFlag(lookupArgs, '--base'));
+  const name = lookupArgs.find((a) => !a.startsWith('-') && a !== readFollowingFlag(lookupArgs, '--ttl') && a !== readFollowingFlag(lookupArgs, '--base'));
   if (name) {
     const story = collectStory(root, name, { base });
     if (!story) {

package/commands/launchpad.js

@@ -2,23 +2,10 @@
 
 const fs = require('fs');
 const path = require('path');
+const { hasFlag, readFlag } = require('../lib/arg-parser');
 
 const ACTIVE_MISSION_STATUSES = new Set(['planning', 'running', 'ready']);
 
-function hasFlag(args, name) {
-  return args.includes(name);
-}
-
-function readFlag(args, name, fallback = '') {
-  const prefix = `${name}=`;
-  for (let i = 0; i < args.length; i += 1) {
-    const arg = String(args[i]);
-    if (arg === name && args[i + 1] && !String(args[i + 1]).startsWith('--')) return String(args[i + 1]);
-    if (arg.startsWith(prefix)) return arg.slice(prefix.length);
-  }
-  return fallback;
-}
-
 function readJson(file) {
   try {
     return JSON.parse(fs.readFileSync(file, 'utf8'));

package/commands/lifecycle.js

@@ -168,7 +168,7 @@ async function sleepAtris() {
 }
 
 /**
- * Wake a sleeping workspace so agents resume automatically.
+ * Wake a sleeping workspace: remote wake request, or local wake flag.
  * @returns {Promise<void>}
  */
 async function wakeAtris() {
@@ -179,7 +179,7 @@ async function wakeAtris() {
   if (!slug || slug === '--help' || slug === '-h' || slug === 'help') {
     console.log('Usage: atris wake [business|member] [--loop <loop-id>]');
     console.log('');
-    console.log('  Wake a sleeping workspace. Agents resume automatically.');
+    console.log('  Wake a sleeping workspace. Wake signal sent; loops pick it up on their next pass.');
     console.log('  Or flip a local member / member-loop switch awake.');
     process.exit(0);
   }
@@ -207,13 +207,13 @@ async function wakeAtris() {
     console.log(`Waking business computer '${business.name || slug}'...`);
 
     if (result.data && result.data.status === 'running' && result.data.endpoint) {
-      console.log(`Business computer '${business.name || slug}' is alive. Agents resuming.`);
+      console.log(`Business computer '${business.name || slug}' is alive. Wake signal sent; loops pick it up on their next pass.`);
       return;
     }
 
     const running = await waitForBusinessComputer(creds.token, business);
     if (running) {
-      console.log(`Business computer '${business.name || slug}' is alive. Agents resuming.`);
+      console.log(`Business computer '${business.name || slug}' is alive. Wake signal sent; loops pick it up on their next pass.`);
       return;
     }
 
@@ -246,7 +246,7 @@ async function wakeAtris() {
     });
 
     if (status.ok && status.data && status.data.status === 'running') {
-      console.log(`Workspace '${slug}' is alive. Agents resuming.`);
+      console.log(`Workspace '${slug}' is alive. Wake signal sent; loops pick it up on their next pass.`);
       return;
     }
   }