atris 3.15.46 → 3.15.49

package/commands/computer.js

@@ -1457,12 +1457,12 @@ async function runBusinessPromptViaRunnerProxy(token, ctx, prompt, options = {})
   return { ok: false, error: 'runner proxy timed out', status: 0 };
 }
 
-async function ensureBusinessAwake(token, ctx, maxWaitSec = 90) {
+async function ensureBusinessAwake(token, ctx, maxWaitSec = 90, options = {}) {
   const status = await apiRequestJson(`/business/${ctx.businessId}/ai-computer/status`, { method: 'GET', token });
   if (status.ok && status.data && status.data.status === 'running' && status.data.endpoint) {
     return true;
   }
-  process.stdout.write('  Waking business computer... ');
+  if (!options.quiet) process.stdout.write('  Waking business computer... ');
   await apiRequestJson(`/business/${ctx.businessId}/ai-computer/wake`, { method: 'POST', token, body: {} });
   const start = Date.now();
   while (Date.now() - start < maxWaitSec * 1000) {
@@ -1470,12 +1470,12 @@ async function ensureBusinessAwake(token, ctx, maxWaitSec = 90) {
     const next = await apiRequestJson(`/business/${ctx.businessId}/ai-computer/status`, { method: 'GET', token });
     if (next.ok && next.data && next.data.status === 'running' && next.data.endpoint) {
       const elapsed = Math.floor((Date.now() - start) / 1000);
-      console.log(`awake (${elapsed}s)`);
+      if (!options.quiet) console.log(`awake (${elapsed}s)`);
       await bootstrapBusinessComputerRuntime(token, ctx, 'computer-auto-wake');
       return true;
     }
   }
-  console.log('timeout');
+  if (!options.quiet) console.log('timeout');
   return false;
 }
 
@@ -2420,7 +2420,7 @@ async function computerAudit(token, ctx, limit = 10) {
   printBusinessChatAudit(result.data?.rows || []);
 }
 
-async function streamBusinessChatResult(token, ctx, executionId, rl = null) {
+async function streamBusinessChatResult(token, ctx, executionId, rl = null, options = {}) {
   let fromIndex = 0;
   let errors = 0;
   let cancelling = false;
@@ -2458,7 +2458,7 @@ async function streamBusinessChatResult(token, ctx, executionId, rl = null) {
   const sigintTarget = rl || process;
   sigintTarget.on('SIGINT', onSigint);
 
-  console.log(ui.dim('Running on cloud. Ctrl-C interrupts this run.'));
+  if (!options.quiet) console.log(ui.dim('Running on cloud. Ctrl-C interrupts this run.'));
 
   try {
     while (true) {
@@ -2486,7 +2486,7 @@ async function streamBusinessChatResult(token, ctx, executionId, rl = null) {
         } else if (event.type === 'result' && event.result && !sawVisibleOutput) {
           sawVisibleOutput = true;
           process.stdout.write(String(event.result));
-        } else if (event.type === 'tool_use' && event.tool) {
+        } else if (!options.quiet && event.type === 'tool_use' && event.tool) {
           const arg = event.input?.file_path || event.input?.path || event.input?.pattern || event.input?.command || '';
           if (arg) {
             console.log(`\n  [${event.tool}] ${String(arg).slice(0, 120)}`);
@@ -2566,7 +2566,7 @@ async function sendBusinessChat(token, ctx, message, sessionId, resetContext = f
   const nextSessionId = data.session_id || sessionId;
   if (rl) rl.pause();
   try {
-    await streamBusinessChatResult(token, ctx, data.execution_id, rl);
+    await streamBusinessChatResult(token, ctx, data.execution_id, rl, { quiet: Boolean(options.quiet) });
   } finally {
     if (rl) rl.resume();
   }
@@ -2584,28 +2584,33 @@ async function computerChat(token, ctx, initialOptions = {}) {
   const chatSystemPrompt = isCodeOps
     ? appendSystemPrompt(initialOptions.systemPrompt, CODEOPS_WORKFLOW_PROMPT)
     : initialOptions.systemPrompt;
+  const oneShotMessage = initialOptions.message != null;
   let sessionId = `biz-${ctx.businessId.slice(0, 8)}-${Date.now().toString(36)}`;
   const pipedInput = initialOptions.message != null ? null : await readPipedStdin();
   const scriptedInput = initialOptions.message != null ? String(initialOptions.message) : pipedInput;
-  printCloudWordmark();
-  const selection = await chooseCloudLane(token, ctx, initialOptions);
+  if (!oneShotMessage) printCloudWordmark();
+  const selection = oneShotMessage
+    ? { worker: initialOptions.worker, model: initialOptions.model }
+    : await chooseCloudLane(token, ctx, initialOptions);
   if (selection.cancelled) return;
   let worker = activeWorker(selection.worker);
   let model = selection.model || null;
   let awaitingLoginCode = false;
-  let billingLabel = await describeBillingMode(token, ctx, worker);
-  let authSummary = activeWorker(worker) === 'claude' ? await describeClaudeAuth(token, ctx) : null;
+  let billingLabel = oneShotMessage ? null : await describeBillingMode(token, ctx, worker);
+  let authSummary = oneShotMessage || activeWorker(worker) !== 'claude' ? null : await describeClaudeAuth(token, ctx);
 
-  const awake = await ensureBusinessAwake(token, ctx);
+  const awake = await ensureBusinessAwake(token, ctx, 90, { quiet: oneShotMessage });
   if (!awake) {
     console.error('  Computer did not become ready in time.');
     return;
   }
 
-  if (isCodeOps) {
-    printCodeOpsStartPanel(ctx, worker, model, billingLabel, authSummary);
-  } else {
-    printCloudStartPanel(ctx, worker, model, billingLabel, authSummary);
+  if (!oneShotMessage) {
+    if (isCodeOps) {
+      printCodeOpsStartPanel(ctx, worker, model, billingLabel, authSummary);
+    } else {
+      printCloudStartPanel(ctx, worker, model, billingLabel, authSummary);
+    }
   }
 
   if (scriptedInput !== null) {
@@ -2640,6 +2645,7 @@ async function computerChat(token, ctx, initialOptions = {}) {
         model,
         systemPrompt: chatSystemPrompt,
         allowedTools: initialOptions.allowedTools,
+        quiet: oneShotMessage,
       });
     }
     return;

package/commands/mission.js

@@ -7,6 +7,7 @@ const { spawn, spawnSync } = require('child_process');
 
 const VALID_STATUSES = new Set(['planning', 'running', 'ready', 'paused', 'blocked', 'stopped', 'complete']);
 const TERMINAL_STATUSES = new Set(['stopped', 'complete']);
+const GOAL_LOOP_STATUSES = new Set(['planning', 'running', 'ready']);
 const STATUS_ALIASES = new Set(['active']);
 
 function stampIso() {
@@ -622,9 +623,23 @@ function writeReceipt(mission, result, root = process.cwd()) {
   return path.relative(root, receiptPath);
 }
 
+function shellQuote(value) {
+  return `'${String(value || '').replace(/'/g, `'\\''`)}'`;
+}
+
+function resolveVerifierCommand(command) {
+  const raw = String(command || '');
+  const leading = raw.match(/^\s*/)?.[0] || '';
+  const trimmed = raw.trimStart();
+  if (!trimmed || !/^atris(?:\s|$)/.test(trimmed)) return raw;
+  const cliPath = path.resolve(__dirname, '..', 'bin', 'atris.js');
+  return `${leading}${shellQuote(process.execPath)} ${shellQuote(cliPath)}${trimmed.slice('atris'.length)}`;
+}
+
 function runVerifier(command, root = process.cwd()) {
   if (!command) return null;
-  const result = spawnSync(command, {
+  const resolvedCommand = resolveVerifierCommand(command);
+  const result = spawnSync(resolvedCommand, {
     cwd: root,
     shell: true,
     encoding: 'utf8',
@@ -633,6 +648,7 @@ function runVerifier(command, root = process.cwd()) {
   });
   return {
     command,
+    resolved_command: resolvedCommand === command ? null : resolvedCommand,
     status: result.status,
     signal: result.signal || null,
     passed: result.status === 0,
@@ -748,7 +764,7 @@ function secondsUntilMissionDue(mission, now = new Date()) {
 }
 
 function missionIsRunnable(mission) {
-  return mission && !TERMINAL_STATUSES.has(mission.status) && mission.status !== 'paused';
+  return mission && GOAL_LOOP_STATUSES.has(String(mission.status || ''));
 }
 
 function missionSortTime(mission) {

package/commands/now.js

@@ -2,6 +2,7 @@ const fs = require('fs');
 const path = require('path');
 
 const NOW_PATH = path.join('atris', 'now.md');
+const EXECUTABLE_TASK_STATUSES = new Set(['open', 'claimed']);
 
 function formatLocalDate(date = new Date()) {
   const year = String(date.getFullYear());
@@ -79,7 +80,7 @@ function countOpenTodoItems(filePath) {
     }
     const isTaskBullet = /^-\s+(?:\[[ ]\]\s+)?\*\*.+?\*\*/.test(line);
     if (!isTaskBullet) continue;
-    if (!hasRenderedSections || ['Backlog', 'In Progress', 'Blocked'].includes(section)) {
+    if (!hasRenderedSections || ['Backlog', 'In Progress'].includes(section)) {
       count += 1;
     }
   }
@@ -87,6 +88,25 @@ function countOpenTodoItems(filePath) {
   return count;
 }
 
+function countTaskProjectionItems(root = process.cwd()) {
+  const projectionPath = path.join(root, '.atris', 'state', 'tasks.projection.json');
+  if (!fs.existsSync(projectionPath)) return null;
+  try {
+    const projection = JSON.parse(fs.readFileSync(projectionPath, 'utf8'));
+    const tasks = Array.isArray(projection?.tasks) ? projection.tasks : null;
+    if (!tasks) return null;
+    return tasks.filter(task => EXECUTABLE_TASK_STATUSES.has(String(task?.status || '').toLowerCase())).length;
+  } catch {
+    return null;
+  }
+}
+
+function countOpenWorkItems(root = process.cwd(), todoPath = path.join(root, 'atris', 'TODO.md')) {
+  const projectionCount = countTaskProjectionItems(root);
+  if (projectionCount !== null) return projectionCount;
+  return countOpenTodoItems(todoPath);
+}
+
 function countJournalCompletedReceipts(filePath) {
   if (!fs.existsSync(filePath)) return 0;
   const content = fs.readFileSync(filePath, 'utf8');
@@ -107,7 +127,7 @@ function renderDefaultNow(root = process.cwd()) {
   const mapHeading = readFirstHeading(path.join(atrisDir, 'MAP.md')) || 'MAP not filled yet';
   const todoPath = path.join(atrisDir, 'TODO.md');
   const journalPath = currentJournalPath(root);
-  const openTodoCount = countOpenTodoItems(todoPath);
+  const openTodoCount = countOpenWorkItems(root, todoPath);
   const inboxCount = countMatches(journalPath, /^-\s+\*\*I\d+:/gm);
   const completedCount = countJournalCompletedReceipts(journalPath);
   const generated = todayIso();
@@ -161,7 +181,7 @@ function renderPortfolioNow(root = process.cwd()) {
   const generated = todayIso();
   const lines = workspaces.map((workspace) => {
     const heading = readFirstHeading(workspace.mapPath) || workspace.slug;
-    const todoCount = countOpenTodoItems(workspace.todoPath);
+    const todoCount = countOpenWorkItems(workspace.root, workspace.todoPath);
     const nowState = fs.existsSync(workspace.nowPath) ? 'has now.md' : 'needs now.md';
     return `- ${workspace.slug}: ${heading}; ${todoCount} open TODO item${todoCount === 1 ? '' : 's'}; ${nowState}.`;
   });
@@ -201,6 +221,18 @@ ${workspaces.map((workspace) => `- \`${workspace.slug}/atris/MAP.md\``).join('\n
 `;
 }
 
+function isGeneratedNowFile(content) {
+  const text = String(content || '');
+  const hasGeneratedSignature = (
+    text.includes('> Current operating truth for this workspace.') ||
+    text.includes('> Current operating truth for this portfolio of Atris workspaces.')
+  ) && text.includes('## Receipts');
+  const hasLegacyGeneratedCounters = /^#\s+now\s*$/m.test(text)
+    && /Open TODO items:\s*\d+/m.test(text)
+    && /Completed receipts today:\s*\d+/m.test(text);
+  return hasGeneratedSignature || hasLegacyGeneratedCounters;
+}
+
 function ensureNowFile(root = process.cwd()) {
   let atrisDir = path.join(root, 'atris');
   const isWorkspace = fs.existsSync(atrisDir) && hasWorkspaceMarkers(atrisDir);
@@ -220,7 +252,7 @@ function ensureNowFile(root = process.cwd()) {
   return { created: false, path: nowPath };
 }
 
-function refreshNowFile(root = process.cwd()) {
+function refreshNowFile(root = process.cwd(), options = {}) {
   const atrisDir = path.join(root, 'atris');
   const isWorkspace = fs.existsSync(atrisDir) && hasWorkspaceMarkers(atrisDir);
   const childWorkspaces = isWorkspace ? [] : findChildWorkspaces(root);
@@ -231,9 +263,15 @@ function refreshNowFile(root = process.cwd()) {
     fs.mkdirSync(atrisDir, { recursive: true });
   }
   const nowPath = path.join(atrisDir, 'now.md');
+  if (options.preserveCustom && fs.existsSync(nowPath)) {
+    const current = fs.readFileSync(nowPath, 'utf8');
+    if (!isGeneratedNowFile(current)) {
+      return { path: nowPath, preserved: true };
+    }
+  }
   const content = isWorkspace ? renderDefaultNow(root) : renderPortfolioNow(root);
   fs.writeFileSync(nowPath, content, 'utf8');
-  return { path: nowPath };
+  return { path: nowPath, preserved: false };
 }
 
 function nowAtris(args = process.argv.slice(3), root = process.cwd()) {
@@ -295,8 +333,10 @@ module.exports = {
   ensureNowFile,
   formatLocalDate,
   countJournalCompletedReceipts,
+  countOpenWorkItems,
   countOpenTodoItems,
   findChildWorkspaces,
+  isGeneratedNowFile,
   nowAtris,
   refreshNowFile,
   renderDefaultNow,