atris 3.56.0 → 3.56.2

package/commands/next.js

@@ -1,5 +1,14 @@
 'use strict';
 
+const { argsWantHelp, wantsJson } = require('../lib/noninteractive');
+const {
+  buildFirstMinute,
+  folderName,
+  freshMinuteJson,
+  isFreshWorkspace,
+  listUserVisibleWork,
+} = require('../lib/first-minute');
+const { loadContext } = require('../lib/state-detection');
 const {
   claimRoadmapItem,
   nextCards,
@@ -9,70 +18,146 @@ const {
   seedInboxFromMove,
 } = require('../lib/next-moves');
 
-function showHelp() {
-  console.log('');
-  console.log('Usage: atris next [yes|no|skip]');
-  console.log('');
-  console.log('Shows one next move card.');
-  console.log('');
+function showHelp(log = console.log) {
+  log('Usage: atris next [--json]');
   return 0;
 }
 
-function cardLabel(card) {
-  return String(card?.label || card?.title || '').trim();
+function spokenWin(text) {
+  return String(text || '')
+    .split('\n')
+    .map((line) => line.trim())
+    .find(Boolean) || '';
 }
 
-function cardWhy(card) {
-  const why = String(card?.why || '').trim();
-  if (why) return why;
-  const status = String(card?.status || '').trim();
-  if (status) return status;
-  if (card?.source === 'task' || card?.source === 'mission') return 'working';
-  return 'new';
+function minuteText(screen) {
+  const win = spokenWin(screen && screen.text);
+  const next = String(screen && screen.nextCommand || '').trim();
+  if (!next) return win || 'nothing is waiting.';
+  return `${win}\n\nnext: ${next}`;
+}
+
+function minuteJson(screen, extra = {}) {
+  const reason = spokenWin(screen && screen.text).replace(/\.$/, '');
+  const next = String((screen && screen.nextCommand) || extra.next_action || '').trim();
+  const fresh = extra.fresh === true;
+  return {
+    schema: 'atris.one_lap.v1',
+    ok: Boolean(next) && !fresh,
+    status: fresh ? 'stuck' : (next ? 'ok' : 'stuck'),
+    reason,
+    next_action: next,
+  };
+}
+
+function printMinute(screen, { asJson = false, log = console.log, fresh = false } = {}) {
+  if (asJson) {
+    log(JSON.stringify(minuteJson(screen, { fresh }), null, 2));
+    return 0;
+  }
+  log('');
+  log(minuteText(screen));
+  return 0;
+}
+
+function nextScreen(root) {
+  const fresh = isFreshWorkspace(root);
+  if (fresh) {
+    return {
+      fresh: true,
+      screen: buildFirstMinute({ root, fresh: true }),
+    };
+  }
+  return {
+    fresh: false,
+    screen: buildFirstMinute({
+      root,
+      fresh: false,
+      context: loadContext(root),
+    }),
+  };
+}
+
+function speakNext(root, { asJson = false, log = console.log } = {}) {
+  const { fresh, screen } = nextScreen(root);
+  if (asJson && fresh) {
+    log(JSON.stringify(freshMinuteJson(folderName(root), listUserVisibleWork(root), { root }), null, 2));
+    return 0;
+  }
+  return printMinute(screen, { asJson, log, fresh });
+}
+
+function cardLabel(card) {
+  return String(card?.label || card?.title || '').trim();
 }
 
-function renderCard(card) {
-  if (!card) return 'Nothing to do. Rest or wish.';
-  return [
-    cardLabel(card),
-    `Why now: ${cardWhy(card)}`,
-    'Do it? yes / no / skip',
-  ].join('\n');
+function cardNextCommand(card) {
+  if (!card) return '';
+  const action = card.next_action || {};
+  const prompt = String(action.prompt || '').trim();
+  if (/^(atris|ax)\b/i.test(prompt)) return prompt;
+  if (action.type === 'mission_complete' && action.mission_id) {
+    if (action.proof_path) {
+      return `atris mission complete ${action.mission_id} --proof ${action.proof_path}`;
+    }
+    return `atris mission status ${action.mission_id}`;
+  }
+  if (action.type === 'mission_review_prompt' && action.mission_id) {
+    return `atris mission status ${action.mission_id}`;
+  }
+  if (action.type === 'wish_answer_prompt') return 'atris wish answer "your words"';
+  if (card.source === 'inbox') return 'atris plan';
+  if (card.source === 'task' || card.source === 'roadmap' || card.source === 'endgame') {
+    return 'atris do';
+  }
+  if (card.source === 'mission') {
+    const id = action.mission_id || card.ref;
+    return id ? `atris mission status ${id}` : 'atris mission status --status active';
+  }
+  return '';
 }
 
-function printCard(card) {
-  console.log(renderCard(card));
+function speakCard(card, { asJson = false, log = console.log } = {}) {
+  if (!card) {
+    return printMinute({ text: 'nothing is waiting.', nextCommand: '' }, { asJson, log });
+  }
+  const next = cardNextCommand(card);
+  const label = cardLabel(card) || 'this';
+  return printMinute({
+    text: `${label} is waiting.`,
+    nextCommand: next,
+  }, { asJson, log });
 }
 
 function wishPromptTitle(label) {
   return String(label || 'this').replace(/^(#\d+)\s+/, '$1: ');
 }
 
-function printWishAnswerPrompt(card) {
+function printWishAnswerPrompt(card, log = console.log) {
   const action = card.next_action || {};
-  console.log(`Got it, wish ${wishPromptTitle(action.label || cardLabel(card))}.`);
-  console.log(String(action.question || 'What should be different when this wish comes true?'));
-  console.log('Answer with: atris wish answer "your words"');
+  log(`Got it, wish ${wishPromptTitle(action.label || cardLabel(card))}.`);
+  log(String(action.question || 'What should be different when this wish comes true?'));
+  log('Answer with: atris wish answer "your words"');
   return 0;
 }
 
-function approveMove(card, root) {
+function approveMove(card, root, log = console.log) {
   recordDecision(root, card, 'approve', new Date().toISOString());
   if (['roadmap', 'inbox', 'endgame'].includes(card.source)) {
     seedInboxFromMove(root, card);
     if (card.source === 'roadmap') claimRoadmapItem(root, card.title);
-    console.log(`${cardLabel(card)} is working.`);
+    log(`${cardLabel(card)} is working.`);
     return 0;
   }
   const prompt = card.next_action && card.next_action.prompt;
-  console.log(prompt || `${cardLabel(card)} is working.`);
+  log(prompt || `${cardLabel(card)} is working.`);
   return 0;
 }
 
-function completeMissionFromCard(card) {
+function completeMissionFromCard(card, log = console.log) {
   const action = card.next_action || {};
   if (!action.mission_id || !action.proof_path) {
-    console.log('Review the proof, then complete this mission.');
+    log('Review the proof, then complete this mission.');
     return 0;
   }
   const { completeMission } = require('./mission');
@@ -80,57 +165,62 @@ function completeMissionFromCard(card) {
   return 0;
 }
 
-function executeCard(card, root) {
+function executeCard(card, root, log = console.log) {
   const action = card && card.next_action;
-  if (!card) {
-    printCard(null);
-    return 0;
-  }
-  if (action?.type === 'wish_answer_prompt') return printWishAnswerPrompt(card);
-  if (action?.type === 'mission_complete') return completeMissionFromCard(card);
+  if (!card) return speakCard(null, { log });
+  if (action?.type === 'wish_answer_prompt') return printWishAnswerPrompt(card, log);
+  if (action?.type === 'mission_complete') return completeMissionFromCard(card, log);
   if (action?.type === 'wish_review_prompt' || action?.type === 'mission_review_prompt') {
-    console.log(action.prompt || 'Review the proof, then choose done or stuck.');
+    log(action.prompt || 'Review the proof, then choose done or stuck.');
     return 0;
   }
-  return approveMove(card, root);
+  return approveMove(card, root, log);
 }
 
-function nextCommand(args = [], root = process.cwd()) {
-  const action = String(args[0] || '').trim().toLowerCase();
-  if (action === 'help' || action === '--help' || action === '-h') return showHelp();
+function actionToken(args = []) {
+  const list = Array.isArray(args) ? args : [];
+  const token = list.find((arg) => {
+    const text = String(arg || '').trim();
+    if (!text || text.startsWith('-')) return false;
+    return true;
+  });
+  return String(token || '').trim().toLowerCase();
+}
+
+function nextCommand(args = [], root = process.cwd(), { log = console.log } = {}) {
+  const list = Array.isArray(args) ? args : [];
+  if (argsWantHelp(list)) return showHelp(log);
+
+  const asJson = wantsJson(list);
+  const action = actionToken(list);
+
+  if (!action || action === 'json') return speakNext(root, { asJson, log });
 
   const current = nextCards(root, 1)[0] || null;
-  if (!action) {
-    printCard(current);
-    if (current?.source === 'dream') markDreamCardConsumed(root, current, new Date().toISOString(), 'dealt');
-    return 0;
-  }
 
   if (action === 'skip') {
     const following = current ? nextCards(root, 1, { skipIds: [current.id] })[0] : null;
-    if (current?.source === 'dream') markDreamCardConsumed(root, current, new Date().toISOString(), 'skipped');
-    printCard(following);
-    if (following?.source === 'dream') markDreamCardConsumed(root, following, new Date().toISOString(), 'dealt');
-    return 0;
+    if (current?.source === 'dream') {
+      markDreamCardConsumed(root, current, new Date().toISOString(), 'skipped');
+    }
+    if (following?.source === 'dream') {
+      markDreamCardConsumed(root, following, new Date().toISOString(), 'dealt');
+    }
+    return speakCard(following, { asJson, log });
   }
 
   if (action === 'no') {
-    if (!current) {
-      printCard(null);
-      return 0;
-    }
+    if (!current) return speakCard(null, { asJson, log });
     parkNextCard(root, current);
-    console.log(`Parked ${cardLabel(current)}.`);
+    log(`Parked ${cardLabel(current)}.`);
     return 0;
   }
 
-  if (action === 'yes') return executeCard(current, root);
+  if (action === 'yes') return executeCard(current, root, log);
 
-  console.log('Say yes, no, or skip.');
-  return 2;
+  return speakNext(root, { asJson, log });
 }
 
 module.exports = {
   nextCommand,
-  renderCard,
 };

package/commands/now.js

@@ -3,6 +3,13 @@ const path = require('path');
 const { hasRenderedSections, isOpenSection } = require('../lib/todo-sections');
 const { renderMorningCardRow } = require('../lib/receipt-block');
 const { historicalLandingText } = require('../lib/autoland');
+const {
+  buildFirstMinute,
+  isFreshWorkspace,
+  isKeepWorkingMinute,
+  speakFirstMinute,
+  speakKeepWorkingMinute,
+} = require('../lib/first-minute');
 
 const NOW_PATH = path.join('atris', 'now.md');
 const TASK_EPISODES_PATH = path.join('.atris', 'state', 'task_episodes.jsonl');
@@ -576,6 +583,39 @@ function refreshNowFile(root = process.cwd(), options = {}) {
   return { path: nowPath, preserved: false };
 }
 
+function stripAnsi(text) {
+  return String(text || '').replace(/\u001b\[[0-9;]*m/g, '');
+}
+
+function spokenCurrent(text) {
+  const line = stripAnsi(text).split(/\n/).map((part) => part.trim()).find(Boolean) || '';
+  return line.replace(/^hey\s+[^,]+,\s*/i, '').replace(/\.$/, '');
+}
+
+function printNowJson(payload) {
+  console.log(JSON.stringify(payload, null, 2));
+}
+
+function hasLiveKeepWorkingRun(root = process.cwd()) {
+  try {
+    const { pickLiveLocalMission } = require('./mission');
+    return Boolean(pickLiveLocalMission(root));
+  } catch {
+    return false;
+  }
+}
+
+function nowJsonPayload(root = process.cwd()) {
+  const fresh = isFreshWorkspace(root);
+  const screen = buildFirstMinute({ root, fresh });
+  const payload = { ok: !fresh };
+  const current = spokenCurrent(screen && screen.text);
+  const next = stripAnsi(screen && screen.nextCommand);
+  if (current) payload.current = current;
+  if (next) payload.next = next;
+  return payload;
+}
+
 function nowAtris(args = process.argv.slice(3), root = process.cwd()) {
   const help = args.includes('--help') || args.includes('-h') || args[0] === 'help';
   if (help) {
@@ -588,8 +628,8 @@ function nowAtris(args = process.argv.slice(3), root = process.cwd()) {
     console.log('  atris now --refresh Regenerate a small local now.md');
     console.log('  atris now --all     Refresh this parent and every child Atris workspace');
     console.log('  atris now --path    Print the file path only');
-    console.log('  atris now --json    Emit path and content as JSON');
-    return;
+    console.log('  atris now --json    Print ok, next or current as JSON');
+    return 0;
   }
 
   const init = args.includes('--init');
@@ -598,48 +638,85 @@ function nowAtris(args = process.argv.slice(3), root = process.cwd()) {
   const pathOnly = args.includes('--path');
   const asJson = args.includes('--json');
 
-  let result;
-  if (all) {
-    const workspaces = findChildWorkspaces(root);
-    for (const workspace of workspaces) {
-      refreshNowFile(workspace.root);
+  try {
+    if (asJson && !init && !refresh && !all && !pathOnly) {
+      const payload = nowJsonPayload(root);
+      printNowJson(payload);
+      return payload.ok ? 0 : 2;
     }
-    result = refreshNowFile(root);
-    if (!pathOnly && !asJson) {
-      console.log(`Refreshed ${workspaces.length} child workspace${workspaces.length === 1 ? '' : 's'}.`);
-      console.log('');
+
+    // Fresh folder: empty talks first-talk. A file already here
+    // names that file, same as bare atris / now --json. Do not mint.
+    // Just-minted file folder, nothing running: same two lines as
+    // first-minute / status / recap. Not factory MAP.md.
+    // After init, next is claim: same two lines as bare atris /
+    // now --json. Not factory now.md.
+    // --init / --refresh / --all / --path still write now.md.
+    if (!init && !refresh && !all && !pathOnly) {
+      if (isFreshWorkspace(root)) {
+        return speakFirstMinute({ root, fresh: true });
+      }
+      if (!hasLiveKeepWorkingRun(root)) {
+        const minute = buildFirstMinute({ root });
+        if (isKeepWorkingMinute(minute)) {
+          return speakKeepWorkingMinute({ root });
+        }
+        return speakFirstMinute({ root });
+      }
     }
-  } else if (refresh) {
-    result = refreshNowFile(root);
-  } else if (init) {
-    result = ensureNowFile(root);
-  } else {
-    result = ensureNowFile(root);
-  }
 
-  const rel = path.relative(root, result.path);
-  if (pathOnly) {
-    console.log(rel);
-    return;
-  }
+    let result;
+    if (all) {
+      const workspaces = findChildWorkspaces(root);
+      for (const workspace of workspaces) {
+        refreshNowFile(workspace.root);
+      }
+      result = refreshNowFile(root);
+      if (!pathOnly && !asJson) {
+        console.log(`Refreshed ${workspaces.length} child workspace${workspaces.length === 1 ? '' : 's'}.`);
+        console.log('');
+      }
+    } else if (refresh) {
+      result = refreshNowFile(root);
+    } else if (init) {
+      result = ensureNowFile(root);
+    } else {
+      result = ensureNowFile(root);
+    }
 
-  const content = fs.readFileSync(result.path, 'utf8').trimEnd();
-  if (asJson) {
-    console.log(JSON.stringify({
-      ok: true,
-      path: rel,
-      created: Boolean(result.created),
-      content,
-    }, null, 2));
-    return;
-  }
+    const rel = path.relative(root, result.path);
+    if (pathOnly) {
+      console.log(rel);
+      return 0;
+    }
 
-  if (result.created) {
-    console.log(`Created ${rel}`);
-    console.log('');
-  }
+    if (asJson) {
+      const payload = nowJsonPayload(root);
+      printNowJson(payload);
+      return payload.ok ? 0 : 2;
+    }
+
+    const content = fs.readFileSync(result.path, 'utf8').trimEnd();
+    if (result.created) {
+      console.log(`Created ${rel}`);
+      console.log('');
+    }
 
-  console.log(content);
+    console.log(content);
+    return 0;
+  } catch (err) {
+    const message = stripAnsi(err && err.message ? err.message : String(err));
+    if (asJson) {
+      printNowJson({
+        ok: false,
+        current: message.replace(/\.$/, ''),
+        next: 'atris init --yes',
+      });
+      return 2;
+    }
+    console.error(message);
+    return 1;
+  }
 }
 
 module.exports = {

package/commands/recap.js

@@ -1,6 +1,17 @@
 const fs = require('fs');
 const path = require('path');
-const { isCertifiedReview, personName } = require('../lib/first-minute');
+const {
+  isCertifiedReview,
+  isFreshWorkspace,
+  isKeepWorkingMinute,
+  isClaimMinute,
+  buildFirstMinute,
+  listUserVisibleWork,
+  personName,
+  speakFirstMinute,
+  speakKeepWorkingMinute,
+  taskCommand,
+} = require('../lib/first-minute');
 const { isRealTestRunnerProof, quoteVerifierCommand } = require('../lib/verifier-quality');
 
 const DAY_MS = 24 * 60 * 60 * 1000;
@@ -241,6 +252,20 @@ function recapSoftTitle(title, maxWords = 5) {
   return `"${text.toLowerCase()}"`;
 }
 
+function hasLiveKeepWorkingRun(root = process.cwd()) {
+  try {
+    const { pickLiveLocalMission } = require('./mission');
+    return Boolean(pickLiveLocalMission(root));
+  } catch {
+    return false;
+  }
+}
+
+function pickSpokenInProgress(items) {
+  const list = Array.isArray(items) ? items.filter(Boolean) : [];
+  return list.find((item) => item.owner) || list[0] || null;
+}
+
 function renderRecapMinute(data, { person } = {}) {
   const who = person != null ? person : personName();
   const greet = who ? `hey ${who}, ` : '';
@@ -290,9 +315,15 @@ function renderRecapMinute(data, { person } = {}) {
   }
 
   if (inProgress.length) {
-    const item = inProgress[0];
+    const item = pickSpokenInProgress(inProgress);
     const named = recapSoftTitle(item && item.title);
-    if (item && item.owner && named) return `${greet}${named} is already yours.`;
+    if (item && item.owner && named) {
+      return [
+        `${greet}${named} is already yours.`,
+        '',
+        `next: ${taskCommand({ display_id: item.id, status: 'claimed' })}`,
+      ].join('\n');
+    }
     if (named) return `${greet}${named} is ready to claim.`;
   }
 
@@ -319,9 +350,71 @@ function recapAtris(args = []) {
     printRecapHelp();
     return;
   }
+  const cwd = process.cwd();
+  const taskDb = loadTaskDb();
+  let root = cwd;
+  try {
+    root = taskDb ? taskDb.workspaceRoot(cwd) : cwd;
+  } catch {
+    root = cwd;
+  }
+  // cd src in a real git project still recaps that project. An empty
+  // child under /tmp stays its own room and does not inherit /tmp.
+  let inProjectSubdir = false;
+  try {
+    inProjectSubdir = fs.realpathSync(cwd) !== fs.realpathSync(root);
+  } catch {
+    inProjectSubdir = path.resolve(cwd) !== path.resolve(root);
+  }
+  const visibleBefore = listUserVisibleWork(root);
   const daysIdx = args.indexOf('--days');
   const days = daysIdx !== -1 ? Number(args[daysIdx + 1]) : DEFAULT_DAYS;
-  const data = buildRecapData(process.cwd(), { days });
+  const data = buildRecapData(root, { days });
+  if (
+    data.empty
+    && isFreshWorkspace(root)
+    && !inProjectSubdir
+    && !args.includes('--verbose')
+    && !args.includes('--full')
+    && !args.includes('--share')
+  ) {
+    return speakFirstMinute({
+      root,
+      asJson: args.includes('--json'),
+      files: visibleBefore,
+    });
+  }
+  // Just-minted file folder, nothing running: same two lines as
+  // first-minute / status / recap. After the work is yours, next
+  // is task ready so keep-working is not a do loop. Not factory MAP.md.
+  // After init, next is claim: same two lines as bare atris /
+  // status / now / stop. --json keeps the recap receipt and
+  // fills next from first-minute so it is not silent.
+  // A claimed non-seed task still recaps that work. A live mission
+  // and --verbose / --share keep the recap report.
+  if (
+    !args.includes('--verbose')
+    && !args.includes('--full')
+    && !args.includes('--share')
+    && !inProjectSubdir
+    && !hasLiveKeepWorkingRun(root)
+  ) {
+    const minute = buildFirstMinute({ root, files: visibleBefore });
+    if (isKeepWorkingMinute(minute)) {
+      return speakKeepWorkingMinute({
+        root,
+        asJson: args.includes('--json'),
+      });
+    }
+    if (isClaimMinute(minute)) {
+      if (args.includes('--json')) {
+        data.next = minute.nextCommand || null;
+        console.log(JSON.stringify(data, null, 2));
+        return;
+      }
+      return speakFirstMinute({ root });
+    }
+  }
   if (args.includes('--json')) {
     console.log(JSON.stringify(data, null, 2));
     return;

package/commands/run-front.js

@@ -1,9 +1,12 @@
 // atris run: thin front door over the mission runtime loop.
 // One bounded pursuit: start a mission from the objective (or resume the most
-// logical runnable mission), tick it, complete on pass, then exit.
+// logical runnable mission after --yes), then exit.
+// A hours / keep-working mission is never started from a bare invoke.
 // The old plan→do→review loop lives on behind `atris run --legacy`.
 const path = require('path');
 const { spawnSync } = require('child_process');
+const { hasYesFlag, wantsJson } = require('../lib/noninteractive');
+const { speakFirstMinute } = require('../lib/first-minute');
 
 const CLI_PATH = path.join(__dirname, '..', 'bin', 'atris.js');
 
@@ -91,6 +94,14 @@ function pickRunnableMission(root = process.cwd(), missionMap = null, options =
   return candidates[0] || null;
 }
 
+function isHoursMission(mission) {
+  if (!mission) return false;
+  if (mission.overnight_loop) return true;
+  const text = `${mission.objective || ''} ${mission.stop_condition || ''}`;
+  if (/\b(overnight|nonstop|forever|goal\s+after\s+goal|self[-\s]?improve)\b/i.test(text)) return true;
+  return /\bhours?\b/i.test(text);
+}
+
 function runTickBudget(args, budgetSeconds) {
   const explicit = positiveNumber(readValueFlag(args, '--max-ticks'));
   if (explicit) return Math.floor(explicit);
@@ -122,14 +133,17 @@ async function runMissionFront(args = []) {
     return result.ok ? 0 : 1;
   }
 
+  // Bare `atris run` talks like the desk. A long keep-working mission
+  // needs an objective or an explicit --yes. Headless never prompts.
+  if (!hasYesFlag(args)) {
+    return speakFirstMinute({ asJson: wantsJson(args) });
+  }
+
   const mission = pickRunnableMission(process.cwd(), null, {
     allowCallerSessionRunners: liveCodexSession(),
   });
   if (!mission) {
-    console.log('No objective given and no runnable mission found.');
-    console.log('Start one: atris run "<objective>" [--minutes N] [--owner <member>]');
-    console.log('Or keep going indefinitely: atris autopilot');
-    return 1;
+    return speakFirstMinute({ asJson: wantsJson(args) });
   }
   console.log(`Resuming mission ${mission.id} (${mission.status}): ${mission.objective}`);
   const result = spawnSync(process.execPath, [
@@ -144,6 +158,7 @@ async function runMissionFront(args = []) {
 module.exports = {
   runMissionFront,
   pickRunnableMission,
+  isHoursMission,
   runObjective,
   runBudgetSeconds,
   runTickBudget,