atris 3.52.0 → 3.55.0

package/commands/spaceship.js

@@ -1,3 +1,5 @@
+'use strict';
+
 /**
  * atris spaceship — bounded, self-reporting overnight runner.
  *
@@ -7,26 +9,87 @@
  * `atris spaceship ...` and integrates with the CLI's command dispatch.
  *
  * Examples:
- *   atris spaceship --hours 4
- *   atris spaceship --hours 4 --repo /path/to/repo --interval 780
- *   atris spaceship --hours 0.01 --tick-cmd /tmp/stub.sh --no-email   # test
+ *   atris spaceship --hours 4 --yes
+ *   atris spaceship --hours 4 --repo /path/to/repo --interval 780 --yes
+ *   atris spaceship --hours 0.01 --tick-cmd /tmp/stub.sh --no-email --yes
+ *
+ * Without --yes, spaceship only prints the plan (no email, no overnight run).
+ * `--json` without --yes prints a JSON refuse and still does not start.
  */
 
 const path = require('path');
 const fs = require('fs');
 const { spawn } = require('child_process');
+const { hasYesFlag, argsWantHelp, wantsJson } = require('../lib/noninteractive');
 
 const SCRIPT = path.join(__dirname, '..', 'scripts', 'spaceship.sh');
 
+function printUsage() {
+  const lines = [
+    'Usage: atris spaceship [--hours N] [--interval SEC] [--repo PATH]',
+    '                       [--tick-cmd CMD] [--tick-timeout SEC]',
+    '                       [--idle-alert N] [--halt-alert N] [--label NAME]',
+    '                       [--no-email] [--yes]',
+    '',
+    'Bounded overnight runner. Survives bad ticks and emails on state changes.',
+    'Without --yes, prints the plan only (no email, no overnight run).',
+    'Defaults: --hours 4, --interval 780, tick = atris autopilot --auto --iterations=1',
+  ];
+  console.log(lines.join('\n'));
+}
+
+function planLines(args = []) {
+  const hoursIdx = args.indexOf('--hours');
+  const hours = hoursIdx !== -1 && args[hoursIdx + 1] ? args[hoursIdx + 1] : '4';
+  return [
+    'spaceship plan (no run):',
+    `  budget: ${hours}h`,
+    '  email: on meaningful state changes (unless --no-email)',
+    '  tick: atris autopilot --auto --iterations=1',
+    'Pass --yes to start the overnight run.',
+  ];
+}
+
 function spaceship(args = []) {
+  const list = Array.isArray(args) ? args : [];
+  if (argsWantHelp(list) || list.includes('--help') || list.includes('-h')) {
+    printUsage();
+    return Promise.resolve({ success: true, help: true });
+  }
+
+  // Same proceed-flag gate as autopilot: --json is not consent, --once is
+  // not consent. Only --yes / -y start the overnight run.
+  if (wantsJson(list) && !hasYesFlag(list)) {
+    console.log(JSON.stringify({
+      ok: false,
+      command: 'spaceship',
+      running: false,
+      error: 'pass --yes to start',
+      usage: 'atris spaceship [--yes|--auto] [--once]',
+    }, null, 2));
+    process.exit(2);
+  }
+
+  if (!hasYesFlag(list)) {
+    for (const line of planLines(list)) console.log(line);
+    process.exit(2);
+  }
+
+  const runArgs = list.filter((a) => a !== '--yes' && a !== '-y' && a !== '--json');
   return new Promise((resolve, reject) => {
     if (!fs.existsSync(SCRIPT)) {
       reject(new Error(`spaceship.sh not found at ${SCRIPT}`));
       return;
     }
-    const child = spawn('bash', [SCRIPT, ...args], {
+    const env = { ...process.env };
+    if (!process.stdout.isTTY) {
+      env.NO_COLOR = '1';
+      env.CLICOLOR = '0';
+      env.FORCE_COLOR = '0';
+    }
+    const child = spawn('bash', [SCRIPT, ...runArgs], {
       stdio: 'inherit',
-      env: process.env,
+      env,
     });
     child.on('error', reject);
     child.on('close', (code) => {
@@ -36,4 +99,4 @@ function spaceship(args = []) {
   });
 }
 
-module.exports = { spaceship, SCRIPT };
+module.exports = { spaceship, SCRIPT, printUsage, planLines };

package/commands/stream.js

@@ -3,6 +3,7 @@
 const fs = require('fs');
 const path = require('path');
 const { hasFlag, readFlag } = require('../lib/arg-parser');
+const { isNonInteractive } = require('../lib/noninteractive');
 const escapeRegExp = require('../lib/escape-regexp');
 const { runGit: spawnGit } = require('../lib/git-spawn');
 const { collectBoard } = require('./land');
@@ -716,12 +717,16 @@ function parseArgs(args = [], nowMs = Date.now()) {
   const sinceRaw = readFlag(args, '--since', '');
   const intervalRaw = readFlag(args, '--interval', '');
   const interval = Number(intervalRaw);
+  const onceFlag = hasFlag(args, '--once');
+  // Watch loops must exit in agent/non-TTY sessions. --once is explicit;
+  // ATRIS_NONINTERACTIVE / non-TTY stdin also force a one-shot snapshot.
+  const once = onceFlag || isNonInteractive(args) || !process.stdin.isTTY || !process.stdout.isTTY;
   return {
     agent: readFlag(args, '--agent', ''),
     sinceMs: parseSince(sinceRaw, nowMs),
     json: hasFlag(args, '--json'),
     raw: hasFlag(args, '--raw'),
-    once: hasFlag(args, '--once'),
+    once,
     intervalMs: Number.isFinite(interval) && interval > 0 ? Math.max(250, interval * 1000) : DEFAULT_INTERVAL_MS,
   };
 }
@@ -750,12 +755,14 @@ function showHelp() {
   console.log('atris stream - watch the whole team work live');
   console.log('');
   console.log('  atris stream');
+  console.log('  atris stream --once');
   console.log('  atris stream --agent codex');
   console.log('  atris stream --since 1h');
   console.log('  atris stream --json');
   console.log('  atris stream --raw');
   console.log('');
   console.log('Default lines hide ids, branch names, and paths. Use --raw or --json for source records.');
+  console.log('--once (or non-TTY / ATRIS_NONINTERACTIVE) prints one snapshot and exits.');
   console.log('');
   return 0;
 }

package/commands/study.js

@@ -16,7 +16,6 @@ const path = require('path');
 const http = require('http');
 const { spawn, spawnSync } = require('child_process');
 
-const BACKEND_ROOT = '/Users/keshavrao/arena/atrisos-backend';
 const FEED_URL = 'http://localhost:8777';
 const FEED_STATS_URL = `${FEED_URL}/api/stats`;
 const FEED_NEXT_URL = `${FEED_URL}/api/next`;
@@ -91,18 +90,31 @@ function parseArgs(argv = []) {
   return opts;
 }
 
+function resolveStudyRoot(cwd = process.cwd()) {
+  const candidates = [
+    process.env.ATRIS_STUDY_ROOT,
+    process.env.ATRIS_BACKEND_ROOT,
+    path.join(path.resolve(cwd), 'atris', 'study'),
+  ].filter(Boolean);
+  for (const root of candidates) {
+    const resolved = path.resolve(String(root));
+    if (fs.existsSync(resolved)) return resolved;
+  }
+  return null;
+}
+
 function requireBackend() {
-  if (!fs.existsSync(BACKEND_ROOT)) {
-    console.error(`✗ Backend repo not found: ${BACKEND_ROOT}`);
-    process.exit(1);
+  const backendRoot = resolveStudyRoot();
+  if (!backendRoot) {
+    console.error('not installed');
+    process.exit(2);
   }
-  const venvPython = path.join(BACKEND_ROOT, 'venv/bin/python');
+  const venvPython = path.join(backendRoot, 'venv/bin/python');
   if (!fs.existsSync(venvPython)) {
-    console.error(`✗ Backend venv not found: ${venvPython}`);
-    console.error('  Create the venv in atrisos-backend before running atris study.');
-    process.exit(1);
+    console.error('not installed');
+    process.exit(2);
   }
-  return venvPython;
+  return { venvPython, backendRoot };
 }
 
 function detectLanguage(topic) {
@@ -608,11 +620,11 @@ async function runWhileMode(opts) {
   const topic = opts.topic;
 
   if (topic) {
-    const venvPython = requireBackend();
+    const { venvPython, backendRoot } = requireBackend();
     const language = detectLanguage(topic);
-    if (language) printTutorLoopBlock(BACKEND_ROOT, language);
+    if (language) printTutorLoopBlock(backendRoot, language);
     try {
-      await runIngest(venvPython, BACKEND_ROOT, topic, opts.personal);
+      await runIngest(venvPython, backendRoot, topic, opts.personal);
     } catch (err) {
       console.error(`\n✗ ${err.message || err}`);
     }
@@ -625,9 +637,10 @@ async function runWhileMode(opts) {
   let statsAvailable = false;
   let useCards = false;
 
-  if (fs.existsSync(BACKEND_ROOT) && fs.existsSync(path.join(BACKEND_ROOT, 'venv/bin/python'))) {
-    const venvPython = path.join(BACKEND_ROOT, 'venv/bin/python');
-    statsAvailable = await tryEnsureFeedServerSilent(venvPython, BACKEND_ROOT);
+  const studyRoot = resolveStudyRoot();
+  if (studyRoot && fs.existsSync(path.join(studyRoot, 'venv/bin/python'))) {
+    const venvPython = path.join(studyRoot, 'venv/bin/python');
+    statsAvailable = await tryEnsureFeedServerSilent(venvPython, studyRoot);
     useCards = statsAvailable;
   }
 
@@ -663,21 +676,21 @@ async function run(argv = []) {
     return 0;
   }
 
-  const venvPython = requireBackend();
+  const { venvPython, backendRoot } = requireBackend();
   const language = detectLanguage(opts.topic);
 
   if (language) {
-    printTutorLoopBlock(BACKEND_ROOT, language);
+    printTutorLoopBlock(backendRoot, language);
   }
 
   try {
-    await runIngest(venvPython, BACKEND_ROOT, opts.topic, opts.personal);
+    await runIngest(venvPython, backendRoot, opts.topic, opts.personal);
   } catch (err) {
     console.error(`\n✗ ${err.message || err}`);
     return 1;
   }
 
-  await ensureFeedServer(venvPython, BACKEND_ROOT);
+  await ensureFeedServer(venvPython, backendRoot);
   openFeed();
   return 0;
 }

package/commands/sync.js

@@ -9,6 +9,7 @@ const {
   upsertCursorVoiceCard,
   voiceCardForRoot,
 } = require('../lib/voice-card');
+const { isNonInteractive } = require('../lib/noninteractive');
 
 const TEMPLATE_ROOT_DIR = path.join(__dirname, '..', 'templates');
 const WORKSPACE_TEMPLATES = {
@@ -437,18 +438,28 @@ function syncBusinessCanonical(targetRoot, bizMeta, options = {}) {
 }
 
 function syncAtris(options = {}) {
-  const dryRun = options.dryRun != null ? options.dryRun : process.argv.includes('--dry-run');
+  const explicitDryRun = options.dryRun != null ? options.dryRun : process.argv.includes('--dry-run');
+  const yes = options.yes != null
+    ? options.yes
+    : (process.argv.includes('--yes') || process.argv.includes('-y'));
+  // Default is plan-only. Writes require an explicit --yes.
+  const dryRun = explicitDryRun || !yes;
   const force = options.force != null ? options.force : process.argv.includes('--force');
   // Business mode detection: if .atris/business.json exists, use canonical templates
   const bizFile = path.join(process.cwd(), '.atris', 'business.json');
   if (fs.existsSync(bizFile)) {
     try {
       const bizMeta = JSON.parse(fs.readFileSync(bizFile, 'utf8'));
-      return syncWorkspaceTemplate(process.cwd(), bizMeta, {
+      const result = syncWorkspaceTemplate(process.cwd(), bizMeta, {
         templateName: bizMeta.workspace_template || 'business',
         dryRun,
         force,
       });
+      if (!yes) {
+        console.log('\nPlan only. Re-run with --yes to write these files.');
+        if (!explicitDryRun && isNonInteractive()) process.exit(2);
+      }
+      return result;
     } catch (e) {
       console.error(`✗ Failed to read .atris/business.json: ${e.message}`);
       process.exit(1);
@@ -672,6 +683,10 @@ Key behaviors:
 
   if (dryRun) {
     console.log(`\nDry run: ${updated} file(s) would update, ${skipped} unchanged; no changes made.`);
+    if (!yes) {
+      console.log('Plan only. Re-run with --yes to write these files.');
+      if (!explicitDryRun && isNonInteractive()) process.exit(2);
+    }
   } else if (updated === 0) {
     ensureWikiScaffold(process.cwd());
     console.log('✓ Already up to date');
@@ -892,9 +907,13 @@ function buildSyncAllPlan({ root, pkgRoot, filesToSync = SYNC_ALL_FILES } = {})
   return { projects, plan };
 }
 
-function syncAtrisAll({ dryRun = false, force = false } = {}) {
+function syncAtrisAll({ dryRun = false, force = false, yes = false } = {}) {
   const root = process.cwd();
   const pkgRoot = path.join(__dirname, '..');
+  const writeYes = yes || process.argv.includes('--yes') || process.argv.includes('-y');
+  const explicitDryRun = dryRun || process.argv.includes('--dry-run');
+  // Default is plan-only. Writes require --yes.
+  const planOnly = explicitDryRun || !writeYes;
 
   console.log('');
   console.log(`Scanning ${root} for atris projects...`);
@@ -931,8 +950,12 @@ function syncAtrisAll({ dryRun = false, force = false } = {}) {
   }
   console.log('');
 
-  if (dryRun) {
+  if (planOnly) {
     console.log(`Dry run: ${wouldUpdate} project(s) would update, ${unchanged} unchanged, ${skipped} skipped.`);
+    if (!writeYes) {
+      console.log('Plan only. Re-run with --yes to write these files.');
+      if (!explicitDryRun && isNonInteractive()) process.exit(2);
+    }
     return;
   }
 
@@ -941,24 +964,7 @@ function syncAtrisAll({ dryRun = false, force = false } = {}) {
     return;
   }
 
-  // Confirm unless forced.
-  if (!force) {
-    const readline = require('readline');
-    const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
-    return new Promise((resolve) => {
-      rl.question(`Sync ${wouldUpdate} project(s)? (y/N) `, (answer) => {
-        rl.close();
-        if (!/^y(es)?$/i.test(answer.trim())) {
-          console.log('Cancelled.');
-          resolve();
-          return;
-        }
-        _executeSyncAll(plan, pkgRoot, filesToSync, root);
-        resolve();
-      });
-    });
-  }
-
+  // --yes already consented; skip the interactive confirm.
   _executeSyncAll(plan, pkgRoot, filesToSync, root);
 }