atris 3.35.0 → 3.37.0

package/commands/next.js

@@ -0,0 +1,137 @@
+'use strict';
+
+const {
+  claimRoadmapItem,
+  nextCards,
+  markDreamCardConsumed,
+  parkNextCard,
+  recordDecision,
+  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('');
+  return 0;
+}
+
+function cardLabel(card) {
+  return String(card?.label || card?.title || '').trim();
+}
+
+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 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 printCard(card) {
+  console.log(renderCard(card));
+}
+
+function wishPromptTitle(label) {
+  return String(label || 'this').replace(/^(#\d+)\s+/, '$1: ');
+}
+
+function printWishAnswerPrompt(card) {
+  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"');
+  return 0;
+}
+
+function approveMove(card, root) {
+  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.`);
+    return 0;
+  }
+  const prompt = card.next_action && card.next_action.prompt;
+  console.log(prompt || `${cardLabel(card)} is working.`);
+  return 0;
+}
+
+function completeMissionFromCard(card) {
+  const action = card.next_action || {};
+  if (!action.mission_id || !action.proof_path) {
+    console.log('Review the proof, then complete this mission.');
+    return 0;
+  }
+  const { completeMission } = require('./mission');
+  completeMission([action.mission_id, '--proof', action.proof_path]);
+  return 0;
+}
+
+function executeCard(card, root) {
+  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 (action?.type === 'wish_review_prompt' || action?.type === 'mission_review_prompt') {
+    console.log(action.prompt || 'Review the proof, then choose done or stuck.');
+    return 0;
+  }
+  return approveMove(card, root);
+}
+
+function nextCommand(args = [], root = process.cwd()) {
+  const action = String(args[0] || '').trim().toLowerCase();
+  if (action === 'help' || action === '--help' || action === '-h') return showHelp();
+
+  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 (action === 'no') {
+    if (!current) {
+      printCard(null);
+      return 0;
+    }
+    parkNextCard(root, current);
+    console.log(`Parked ${cardLabel(current)}.`);
+    return 0;
+  }
+
+  if (action === 'yes') return executeCard(current, root);
+
+  console.log('Say yes, no, or skip.');
+  return 2;
+}
+
+module.exports = {
+  cardLabel,
+  nextCommand,
+  renderCard,
+};

package/commands/now.js

@@ -1,10 +1,13 @@
 const fs = require('fs');
 const path = require('path');
 const { hasRenderedSections, isOpenSection } = require('../lib/todo-sections');
+const { renderMorningCardRow } = require('../lib/receipt-block');
+const { historicalLandingText } = require('../lib/autoland');
 
 const NOW_PATH = path.join('atris', 'now.md');
 const TASK_EPISODES_PATH = path.join('.atris', 'state', 'task_episodes.jsonl');
 const CAREER_XP_RECEIPTS_PATH = path.join('.atris', 'state', 'career_xp_receipts.jsonl');
+const MISSION_RUNS_PATH = path.join('atris', 'runs');
 const EXECUTABLE_TASK_STATUSES = new Set(['open', 'claimed']);
 const TASK_RECEIPT_EVENTS = new Set(['proof_ready', 'reviewed', 'completed']);
 
@@ -15,6 +18,12 @@ function formatLocalDate(date = new Date()) {
   return `${year}-${month}-${day}`;
 }
 
+function formatLocalTimestamp(date = new Date()) {
+  const hours = String(date.getHours()).padStart(2, '0');
+  const minutes = String(date.getMinutes()).padStart(2, '0');
+  return `${formatLocalDate(date)} at ${hours}:${minutes} local time`;
+}
+
 function todayIso() {
   return formatLocalDate(new Date());
 }
@@ -167,6 +176,20 @@ function taskReceiptProof(row) {
   ).trim();
 }
 
+function taskReceiptResult(row) {
+  return compactLine(
+    row?.state?.metadata?.result
+    || row?.review_landing?.happened
+    || row?.state?.metadata?.landing_happened
+    || '',
+  );
+}
+
+function taskReceiptCertified(row) {
+  return row?.state?.metadata?.agent_certified === true
+    || /second-actor check/i.test(taskReceiptProof(row));
+}
+
 function taskReceiptKey(row, fallback) {
   const episodeId = row?.episode_id || row?.source_episode_id;
   if (episodeId) return `episode:${episodeId}`;
@@ -175,51 +198,205 @@ function taskReceiptKey(row, fallback) {
   return `row:${fallback}`;
 }
 
-function countTaskReceiptsToday(root = process.cwd(), date = new Date()) {
+function storeTaskReceipt(byKey, row) {
+  const key = taskReceiptKey(row, byKey.size);
+  const previous = byKey.get(key);
+  const candidate = {
+    title: taskReceiptTitle(row),
+    result: taskReceiptResult(row),
+    certified: taskReceiptCertified(row),
+  };
+  byKey.set(key, {
+    title: candidate.title || previous?.title,
+    result: candidate.result || previous?.result || '',
+    certified: Boolean(candidate.certified || previous?.certified),
+  });
+}
+
+// One pass over today's receipt sources, deduped by key. Both the
+// "Completed receipts today" count and the readable "While You Were Away"
+// lines derive from this, so the number and the list can never disagree.
+function collectTaskReceiptsToday(root = process.cwd(), date = new Date()) {
   const targetDay = formatLocalDate(date);
   const stateDir = path.join(root, '.atris', 'state');
-  const seen = new Set();
+  const byKey = new Map();
 
   for (const row of readJsonlRows(path.join(stateDir, 'task_episodes.jsonl'))) {
     if (localDateKey(row?.created_at) !== targetDay) continue;
     if (!rowMatchesWorkspace(row?.workspace_root, root)) continue;
-    if (!taskReceiptProof(row)) continue;
+    const proof = taskReceiptProof(row);
+    if (!proof) continue;
     const eventType = String(row?.action?.event_type || '').toLowerCase();
     if (eventType && !TASK_RECEIPT_EVENTS.has(eventType)) continue;
-    seen.add(taskReceiptKey(row, seen.size));
+    storeTaskReceipt(byKey, row);
   }
 
   for (const row of readJsonlRows(path.join(stateDir, 'career_xp_receipts.jsonl'))) {
     if (localDateKey(row?.accepted_at || row?.created_at || row?.ts) !== targetDay) continue;
     if (!rowMatchesWorkspace(row?.workspace_root, root)) continue;
-    if (!taskReceiptProof(row)) continue;
+    const proof = taskReceiptProof(row);
+    if (!proof) continue;
     const source = String(row?.source_type || row?.receipt_id || row?.source || '').toLowerCase();
     if (!source.includes('task')) continue;
-    seen.add(taskReceiptKey(row, seen.size));
+    storeTaskReceipt(byKey, row);
   }
 
-  return seen.size;
+  return Array.from(byKey.values());
+}
+
+function countTaskReceiptsToday(root = process.cwd(), date = new Date()) {
+  return collectTaskReceiptsToday(root, date).length;
 }
 
 function compactLine(value) {
   return String(value || '').replace(/\s+/g, ' ').trim();
 }
 
+function truncateLine(value, max) {
+  const s = compactLine(value);
+  if (s.length <= max) return s;
+  return `${s.slice(0, max - 1).trimEnd()}…`;
+}
+
+function compactCommitSubject(value, max = 90) {
+  return historicalLandingText(compactLine(value), max);
+}
+
+function taskReceiptTitle(row) {
+  return compactLine(row?.state?.title || row?.title || row?.task_id || 'untitled work');
+}
+
+// The receipts behind "Completed receipts today", as lines a human can read:
+// one per receipt, landed result + human proof state. Shares the collector
+// with the count so the number and the visible list always match.
+function todayTaskReceiptLines(root = process.cwd(), date = new Date(), limit = 6) {
+  return collectTaskReceiptsToday(root, date)
+    .slice(-limit)
+    .reverse()
+    .map((r) => {
+      const result = historicalLandingText(r.result || r.title, 180);
+      const proofState = r.certified ? 'independently checked' : 'proof on file';
+      return `- ✓ ${result} - ${proofState}`;
+    });
+}
+
+// What actually landed on this branch in the last day - the fleet's overnight
+// merges are the strongest "the computer worked while you were away" evidence.
+function landedCommitLines(root = process.cwd(), limit = 5) {
+  try {
+    const { execFileSync } = require('node:child_process');
+    const out = execFileSync(
+      'git',
+      ['log', '--since=24 hours ago', '--no-merges', '--format=%s', '-n', '40'],
+      { cwd: root, encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'] },
+    );
+    const seen = new Set();
+    const lines = [];
+    for (const subject of out.split('\n')) {
+      const s = compactLine(subject);
+      if (!s || seen.has(s)) continue;
+      seen.add(s);
+      lines.push(`- ↑ ${compactCommitSubject(s, 90)}`);
+      if (lines.length >= limit) break;
+    }
+    return lines;
+  } catch {
+    return [];
+  }
+}
+
+// The one thing only the owner can answer. Prefers an explicit owner action;
+// falls back to a blocked loop's open question (needs_human). Loops ask here -
+// they never invent the answer themselves.
+function nextOwnerActionLine(root = process.cwd()) {
+  const statusPath = path.join(root, 'atris', 'status', 'master-loop.md');
+  if (!fs.existsSync(statusPath)) return null;
+  const lines = fs.readFileSync(statusPath, 'utf8').split(/\r?\n/);
+  for (const prefix of ['- next_owner_action:', '- needs_human:']) {
+    const line = lines.find((l) => l.startsWith(prefix));
+    if (line) {
+      const action = truncateLine(line.replace(prefix, ''), 220);
+      if (action) return action;
+    }
+  }
+  return null;
+}
+
 function currentMissionMoveLine(root = process.cwd()) {
   try {
-    const { selectCodexGoalMission, codexGoalNextCommand } = require('./mission');
+    const { selectCodexGoalMission, codexGoalNextCommand, missionBudgetContinuationText } = require('./mission');
     const selected = selectCodexGoalMission(root);
     const mission = selected?.mission || null;
     if (!mission) return null;
-    const objective = compactLine(mission.objective);
-    const next = compactLine(codexGoalNextCommand(mission));
+    const objective = completeMissionObjective(mission.objective, 140);
+    const budgetContinuation = missionBudgetContinuationText(mission);
+    if (budgetContinuation) return `The move: ${objective} - next: ${budgetContinuation}`;
+    const compact = compactMissionCommand(codexGoalNextCommand(mission), mission);
+    const next = compact.length <= 160 ? compact : `atris mission status ${mission.n || mission.id}`;
     if (!objective || !next) return null;
-    return `The move: ${objective} — next: ${next}`;
+    return `The move: ${objective} - next: ${next}`;
   } catch {
     return null;
   }
 }
 
+function completeMissionObjective(objective, max = 140) {
+  const clean = String(objective || '').replace(/\s+/g, ' ').trim();
+  const firstClause = clean.split(',', 1)[0].trim();
+  if (firstClause.length >= 40 && firstClause.length <= max) return firstClause;
+  return historicalLandingText(clean, max);
+}
+
+function compactMissionCommand(command, mission) {
+  const value = String(command || '').trim();
+  const id = String(mission?.id || '').trim();
+  const shortRef = String(mission?.n || '').trim();
+  return id && shortRef ? value.split(id).join(shortRef) : value;
+}
+
+function receiptSortKey(receipt) {
+  return String(receipt?.at || receipt?.result?.tick?.finished_at || receipt?.result?.tick?.started_at || '');
+}
+
+function collectMissionReceiptsToday(root = process.cwd(), date = new Date()) {
+  const targetDay = formatLocalDate(date);
+  const runsDir = path.join(root, MISSION_RUNS_PATH);
+  if (!fs.existsSync(runsDir)) return [];
+  let files = [];
+  try {
+    files = fs.readdirSync(runsDir)
+      .filter((file) => file.endsWith('.json'))
+      .map((file) => path.join(runsDir, file));
+  } catch {
+    return [];
+  }
+  const receipts = [];
+  for (const file of files) {
+    let receipt = null;
+    try {
+      receipt = JSON.parse(fs.readFileSync(file, 'utf8'));
+    } catch {
+      continue;
+    }
+    if (receipt?.schema !== 'atris.mission_receipt.v1') continue;
+    if (localDateKey(receiptSortKey(receipt)) !== targetDay) continue;
+    receipts.push(receipt);
+  }
+  receipts.sort((a, b) => receiptSortKey(a).localeCompare(receiptSortKey(b)));
+  return receipts;
+}
+
+function countMissionReceiptsToday(root = process.cwd(), date = new Date()) {
+  return collectMissionReceiptsToday(root, date).length;
+}
+
+function todayMissionReceiptLines(root = process.cwd(), date = new Date(), limit = 6) {
+  return collectMissionReceiptsToday(root, date)
+    .slice(-limit)
+    .reverse()
+    .map((receipt) => renderMorningCardRow(receipt));
+}
+
 function currentJournalPath(root = process.cwd()) {
   const now = new Date();
   const year = String(now.getFullYear());
@@ -235,12 +412,26 @@ function renderDefaultNow(root = process.cwd()) {
   const openTodoCount = countOpenWorkItems(root, todoPath);
   const inboxCount = countMatches(journalPath, /^-\s+\*\*I\d+:/gm);
   const taskReceiptCount = countTaskReceiptsToday(root);
-  const completedCount = taskReceiptCount || countJournalCompletedReceipts(journalPath);
-  const generated = todayIso();
+  const missionReceiptCount = countMissionReceiptsToday(root);
+  const completedCount = taskReceiptCount + missionReceiptCount || countJournalCompletedReceipts(journalPath);
+  const generated = formatLocalTimestamp();
   const moveLine = currentMissionMoveLine(root);
   const whatMattersNow = moveLine
-    ? `${moveLine}\n\n- Decide the next useful move before opening more context.`
+    ? `${moveLine}\n\n- Run the named next action and leave proof before choosing another.`
     : '- Decide the next useful move before opening more context.';
+  const receiptLines = todayTaskReceiptLines(root);
+  const missionReceiptLines = todayMissionReceiptLines(root);
+  const commitLines = landedCommitLines(root);
+  const hiddenReceiptCount = Math.max(0, completedCount - missionReceiptLines.length - receiptLines.length);
+  const hiddenReceiptLine = hiddenReceiptCount > 0
+    ? [`- ${hiddenReceiptCount} more completed receipt${hiddenReceiptCount === 1 ? '' : 's'} omitted from this short recap; open task results with atris autoland digest and mission proof with atris mission status.`]
+    : [];
+  const awayLines = [...missionReceiptLines, ...receiptLines, ...hiddenReceiptLine, ...commitLines];
+  const whileAway = awayLines.length
+    ? awayLines.join('\n')
+    : '- Nothing has landed yet today.';
+  const ownerAction = nextOwnerActionLine(root);
+  const needsYou = ownerAction ? `\n## Needs You\n\n- ${ownerAction}\n` : '';
 
   return `# now
 
@@ -253,6 +444,10 @@ Last updated: ${generated}
 
 ${whatMattersNow}
 
+## While You Were Away
+
+${whileAway}
+${needsYou}
 ## Current Priority
 
 - Keep the workspace coherent and useful for the next human or agent.
@@ -264,16 +459,6 @@ ${whatMattersNow}
 - Inbox items today: ${inboxCount}
 - Completed receipts today: ${completedCount}
 
-## Watchouts
-
-- Do not treat old logs as current truth unless this file links to them.
-- Do not create motion for its own sake.
-- If facts conflict, surface the conflict and cite the receipts.
-
-## Next Move
-
-- Read \`atris/MAP.md\`, \`atris/TODO.md\`, and today's journal only as needed for the task in front of you.
-
 ## Receipts
 
 - \`atris/MAP.md\`
@@ -288,7 +473,7 @@ function renderPortfolioNow(root = process.cwd()) {
     throw new Error('atris/ folder not found. Run "atris init" first.');
   }
 
-  const generated = todayIso();
+  const generated = formatLocalTimestamp();
   const lines = workspaces.map((workspace) => {
     const heading = readFirstHeading(workspace.mapPath) || workspace.slug;
     const todoCount = countOpenWorkItems(workspace.root, workspace.todoPath);
@@ -444,11 +629,21 @@ module.exports = {
   CAREER_XP_RECEIPTS_PATH,
   ensureNowFile,
   formatLocalDate,
+  formatLocalTimestamp,
   countJournalCompletedReceipts,
   countOpenWorkItems,
   countOpenTodoItems,
+  countMissionReceiptsToday,
   countTaskReceiptsToday,
   currentMissionMoveLine,
+  compactMissionCommand,
+  compactCommitSubject,
+  completeMissionObjective,
+  landedCommitLines,
+  nextOwnerActionLine,
+  todayMissionReceiptLines,
+  todayTaskReceiptLines,
+  truncateLine,
   findChildWorkspaces,
   isGeneratedNowFile,
   nowAtris,