atris 3.70.0 → 3.71.1

package/commands/init.js

@@ -5,6 +5,7 @@ const { ensureExperimentsFramework } = require('./experiments');
 const { ensureWorkspaceBrain } = require('../lib/workspace-scaffold');
 const { upsertAtrisClaudeBootBlock } = require('../lib/claude-boot-block');
 const { ensureRunIgnore } = require('../lib/gitignore');
+const { snapshotBeforeInit, commitInitFiles } = require('../lib/init-commit');
 const { INTENTS } = require('../lib/intents');
 const {
   upsertAgentVoiceCard,
@@ -307,7 +308,7 @@ function initAtris() {
   // shouldn't have file-system side effects.
   const args = process.argv.slice(3);
   if (args[0] === '-h' || args[0] === '--help' || args[0] === 'help') {
-    console.log('Usage: atris init [--force] [--yes|-y] [--verbose] [--minimal] [--full] [--with-adapters] [--with-skills]');
+    console.log('Usage: atris init [--force] [--yes|-y] [--verbose] [--minimal] [--full] [--with-adapters] [--with-skills] [--no-commit]');
     console.log('');
     console.log('  Scaffold the atris/ workspace in the current directory.');
     console.log('  Refuses to run inside an existing atris/ folder unless --force is passed.');
@@ -315,6 +316,8 @@ function initAtris() {
     console.log('  Use --verbose to list every file installed.');
     console.log('  Use --minimal for atris.md + MAP + TODO + today journal + .atris/state (no IDE farm).');
     console.log('  Use --with-adapters / --with-skills with --minimal, or --full for the default full scaffold.');
+    console.log('  In a git repo with no commits yet, init commits the files it creates so every member copy starts with them.');
+    console.log('  Use --no-commit to leave them uncommitted.');
     return;
   }
   const verbose = args.includes('--verbose');
@@ -392,6 +395,9 @@ function initAtris() {
     walker = parent;
   }
 
+  // Snapshot what was already uncommitted so the setup commit only carries init's own files.
+  const gitSnapshot = args.includes('--no-commit') ? null : snapshotBeforeInit(cwd);
+
   const targetDir = path.join(cwd, 'atris');
   const teamDir = path.join(targetDir, 'team');
   const legacyAgentTeamDir = path.join(targetDir, 'agent_team');
@@ -1122,6 +1128,17 @@ Read atris/MAP.md. Begin iteration 1.`;
     fs.copyFileSync(sourceFile, targetFile);
     markReady('workspace', 'atris.md', '✓ Copied atris.md to atris/ folder');
     printReadyCounts();
+    if (gitSnapshot) {
+      const saved = commitInitFiles(gitSnapshot);
+      if (saved.committed) {
+        console.log('setup saved to git, so every member starts with it');
+      } else if (saved.reason === 'has_history') {
+        console.log('commit the new atris files so members start with them');
+      } else if (saved.reason === 'add_failed' || saved.reason === 'commit_failed') {
+        console.log('setup files are not committed yet. members only see them after you commit.');
+        if (saved.detail) console.log(`  git said: ${saved.detail.split('\n')[0]}`);
+      }
+    }
     console.log('\natris initialized.');
     console.log('no commands to learn. tell your agent what you want in plain words.');
   } else {

package/commands/integrations.js

@@ -7,7 +7,7 @@
  *   atris gmail archive <id> [...] [--account <id>] - Archive messages
  *   atris gmail triage [--account <id>] [--limit N] - Record keep or archive verdicts
  *   atris gmail verdicts [--summary] [--account <id>] [--limit N] - List recent Gmail verdicts
- *   atris gmail send <to> <subject> <body...> [--body-file <path>] [--account <id>] - Send an email
+ *   atris gmail send <to> <subject> <body...> --approved [--body-file <path>] [--account <id>] - Send an email
  *   atris gmail voice [account] [--clear]    - Edit an account's writing voice
  *   atris gmail connect [name]              - Connect or reconnect a Gmail account
  *   atris gmail accounts                     - List connected Gmail accounts and the active account
@@ -41,7 +41,7 @@ const { sleepSync } = require('../lib/sleep-sync');
 const CALENDAR_CACHE_PATH = path.join(stateHome(), '.atris', 'calendar-events-cache.json');
 const GMAIL_CONNECT_POLL_MS = 3000;
 const GMAIL_CONNECT_TIMEOUT_MS = 3 * 60 * 1000;
-const GMAIL_SEND_USAGE = 'usage: atris gmail send <to> <subject> <body...> [--body-file <path>] [--account <id>]';
+const GMAIL_SEND_USAGE = 'usage: atris gmail send <to> <subject> <body...> --approved [--body-file <path>] [--account <id>]';
 const GMAIL_VOICE_USAGE = 'usage: atris gmail voice [account] [--clear]';
 const GMAIL_TRIAGE_USAGE = 'usage: atris gmail triage [--account <id>] [--limit N]';
 const GMAIL_VERDICTS_USAGE = 'usage: atris gmail verdicts [--summary] [--account <id>] [--limit N]';
@@ -560,10 +560,15 @@ async function gmailArchive(messageIds, options = {}) {
 function parseGmailSendArgs(args = []) {
   let accountId = null;
   let bodyFile = null;
+  let approved = false;
   const positional = [];
 
   for (let i = 0; i < args.length; i += 1) {
     const arg = args[i];
+    if (arg === '--approved' || arg === '--confirm-approved') {
+      approved = true;
+      continue;
+    }
     if (arg === '--account' || arg === '--body-file') {
       const value = String(args[i + 1] || '').trim();
       if (!value || value.startsWith('--')) {
@@ -596,10 +601,17 @@ function parseGmailSendArgs(args = []) {
     }
   }
 
-  return { to, subject, body, accountId };
+  return { to, subject, body, accountId, approved };
 }
 
 async function gmailSend(to, subject, body, options = {}) {
+  // Approval is checked before any token lookup or network call so an
+  // unapproved send can never reach the server.
+  if (!options.approved) {
+    console.error('Refusing to send without --approved after the exact recipient, subject, and body are confirmed.');
+    console.error(GMAIL_SEND_USAGE);
+    process.exit(2);
+  }
   const token = await getAuthToken();
   const accountId = resolveGmailAccountId(options.accountId);
   const accounts = await fetchGmailAccounts(token);
@@ -864,7 +876,7 @@ async function gmailCommand(subcommand, ...args) {
     }
     case 'send': {
       const parsed = parseGmailSendArgs(args);
-      await gmailSend(parsed.to, parsed.subject, parsed.body, { accountId: parsed.accountId || undefined });
+      await gmailSend(parsed.to, parsed.subject, parsed.body, { accountId: parsed.accountId || undefined, approved: parsed.approved });
       break;
     }
     case 'voice': {
@@ -888,7 +900,7 @@ async function gmailCommand(subcommand, ...args) {
       console.log('  atris gmail archive <id> [...] [--account <id>] - archive messages (reversible, all mail keeps them)');
       console.log('  atris gmail triage [--account <id>] [--limit N] - record keep or archive verdicts without changing mail');
       console.log('  atris gmail verdicts [--summary] [--account <id>] [--limit N] - list recent gmail verdicts');
-      console.log('  atris gmail send <to> <subject> <body...> [--body-file <path>] [--account <id>] - send an email');
+      console.log('  atris gmail send <to> <subject> <body...> --approved [--body-file <path>] [--account <id>] - send an email');
       console.log('  atris gmail voice [account] [--clear]    - edit or clear an account writing voice');
       console.log('  atris gmail connect [name]               - connect or reconnect a gmail account');
       console.log('  atris gmail accounts                     - list connected gmail accounts and the active account');

package/commands/interview.js

@@ -135,6 +135,7 @@ Full skill (read if present): .claude/skills/interview/SKILL.md · spec: atris/f
   const modes = {
     operator: `Mode: OPERATOR WARM START. Interview the human at the keyboard. Open with the sharpest observed behavior in their recent journal/logs, especially repeated manual actions (unextracted members) and policies their own behavior contradicts. Output: a new member, an amendment, or a policy change.`,
     member: `Mode: MEMBER RE-INTERVIEW (performance review). Subject: the team member "${subject}". Read its folder (MEMBER.md, logs/, now.md, proofs) and interview the human ABOUT it: where it failed, what it should defend, what taste is missing from its file. Honest failure → document the lesson, no penalty. A false "done" is the one unforgivable act. Output: amend atris/team/${subject}/MEMBER.md.`,
+    one_on_one: `Mode: ONE-ON-ONE. You ARE the team member "${subject}". Speak in the first person as ${subject}, in the voice of your own SOUL.md and MEMBER.md, to your operator at the keyboard. This is a conversation with them, not an interview about you. Open with one honest observation from your own logs: what you shipped, where you stalled, what you are unsure of. One point or question per turn, and let their answer steer the next. Own failures plainly; a false "done" is the one unforgivable act. End by agreeing ONE concrete next step with them, then record it yourself by running: atris member goal ${subject} "<the next step>". Read the step back in one line, then say goodbye.`,
     expert: `Mode: COLD START. Subject: a new expert called "${subject}". No system data. Opener: "when someone is stuck, what's the problem where they say 'just ask you'?" (civilian variant: "what are you the designated one for?"). Then last real instance → live method demo → quality bar → verify question. Output: create atris/team/<slug>/MEMBER.md.`,
   };
 
@@ -147,7 +148,7 @@ Full skill (read if present): .claude/skills/interview/SKILL.md · spec: atris/f
   ].join('\n\n');
 }
 
-async function interviewCommand(args = [], root = process.cwd()) {
+async function interviewCommand(args = [], root = process.cwd(), { mode: forcedMode = '' } = {}) {
   if (args.includes('--help') || args.includes('-h') || args[0] === 'help') {
     showHelp();
     return 0;
@@ -182,6 +183,16 @@ async function interviewCommand(args = [], root = process.cwd()) {
       path.join(ws, 'atris', 'now.md'),
       path.join(ws, 'atris', 'TODO.md')
     );
+  } else if (forcedMode === 'one_on_one' && fs.existsSync(memberDir)) {
+    mode = 'one_on_one';
+    contextPaths = existing(
+      path.join(memberDir, 'MEMBER.md'),
+      path.join(memberDir, 'SOUL.md'),
+      path.join(memberDir, 'MISSION.md'),
+      path.join(memberDir, 'now.md'),
+      path.join(memberDir, 'goals.md'),
+      path.join(memberDir, 'logs')
+    );
   } else if (fs.existsSync(memberDir)) {
     mode = 'member';
     contextPaths = existing(
@@ -195,10 +206,11 @@ async function interviewCommand(args = [], root = process.cwd()) {
     mode = 'expert';
   }
 
-  const prompt = composePrompt(mode, mode === 'member' ? slug : subjectRaw, contextPaths, ws);
+  const memberMode = mode === 'member' || mode === 'one_on_one';
+  const prompt = composePrompt(mode, memberMode ? slug : subjectRaw, contextPaths, ws);
 
   console.log('');
-  console.log(`◈ interview: ${mode === 'operator' ? 'you, from your logs' : mode === 'member' ? `1-on-1 about ${slug}` : `cold start: ${subjectRaw}`}`);
+  console.log(`◈ interview: ${mode === 'operator' ? 'you, from your logs' : mode === 'one_on_one' ? `1-on-1 with ${slug}` : mode === 'member' ? `1-on-1 about ${slug}` : `cold start: ${subjectRaw}`}`);
   if (contextPaths.length) console.log(`  context: ${contextPaths.length} source${contextPaths.length > 1 ? 's' : ''} loaded`);
   console.log('');
 

package/commands/land.js

@@ -2,7 +2,7 @@ const fs = require('fs');
 const path = require('path');
 const gitSpawn = require('../lib/git-spawn');
 const { compactErrorPayload, printCliJson } = require('../lib/cli-json');
-const { listWorktrees, statusCounts, defaultMainlineBase, listActiveProcessCwds, worktreeHasActiveProcess, recordWorktreeRemoval } = require('./worktree');
+const { listWorktrees, statusCounts, defaultMainlineBase, listActiveProcessPaths, worktreeHasActiveProcess, recordWorktreeRemoval } = require('./worktree');
 
 const DEFAULT_TTL_DAYS = 7;
 const DEFAULT_STALE_HOURS = 48;
@@ -545,8 +545,8 @@ function reapReason(w, board, ttlDays, force) {
 // bundle cannot cover their commits, unattended reaps (autoland) pass false
 // and leave them for a human reap.
 function reap(root, { ttlDays = DEFAULT_TTL_DAYS, staleHours = DEFAULT_STALE_HOURS, base: baseOverride = '', dryRun = false, remote = true, includeDetached = true, protectCurrent = true, force = false, now = Date.now(), activeCwds: activeCwdsOverride, by = 'atris land --reap' } = {}) {
-  const readActiveCwds = () => (Array.isArray(activeCwdsOverride) ? activeCwdsOverride : listActiveProcessCwds());
-  let activeCwds = null;
+  const readActiveCwds = () => (Array.isArray(activeCwdsOverride) ? activeCwdsOverride : listActiveProcessPaths());
+  let activeCwds;
   const board = collectBoard(root, { ttlDays, staleHours, base: baseOverride, now });
   const targets = board.branches.filter((b) => b.state === 'landed' || b.state === 'due');
   const targetNames = new Set(targets.map((b) => b.name));
@@ -568,9 +568,9 @@ function reap(root, { ttlDays = DEFAULT_TTL_DAYS, staleHours = DEFAULT_STALE_HOU
     }
     // A run working inside the folder outranks --force: removing it pulls
     // the floor out from under a live engine.
-    if (!activeCwds) activeCwds = readActiveCwds();
+    if (activeCwds === undefined) activeCwds = readActiveCwds();
     if (worktreeHasActiveProcess(w.path, activeCwds)) {
-      protectedWorktrees.push({ ...w, reason: 'active_process' });
+      protectedWorktrees.push({ ...w, reason: activeCwds ? 'active_process' : 'process_scan_failed' });
       continue;
     }
     if (worktreeWithinReapGrace(w.path, now)) {
@@ -665,7 +665,7 @@ function reap(root, { ttlDays = DEFAULT_TTL_DAYS, staleHours = DEFAULT_STALE_HOU
   for (const w of survivingWorktreeTargets) {
     // A run can start in the folder while the bundle is built; look again.
     if (worktreeHasActiveProcess(w.path, activeAtRemoval)) {
-      receipt.keptWorktrees.push(`${w.path} (active_process)`);
+      receipt.keptWorktrees.push(`${w.path} (${activeAtRemoval ? 'active_process' : 'process_scan_failed'})`);
       if (w.branch) targetNames.delete(w.branch);
       continue;
     }
@@ -984,6 +984,8 @@ function showHelp() {
   console.log('  atris land --auto --dry-run    show which branch would be tried and why');
   console.log('  atris land --auto --verify "<cmd>" --limit <n>');
   console.log('                                 change the check (default: npm test) or the cap');
+  console.log('  atris land --requeue           put member changes github dropped from its');
+  console.log('                                 merge line back in, caught up with master');
   console.log('  atris land --ttl <days>        change the 7-day overdue line');
   console.log('  atris land --json              machine-readable output');
   console.log('');
@@ -1025,6 +1027,20 @@ function landCommand(args = []) {
     }
   }
 
+  if (args.includes('--requeue')) {
+    try {
+      const result = require('../lib/member-autoland').requeueDroppedAutolands({ cwd: root });
+      if (json) console.log(JSON.stringify(result, null, 2));
+      else {
+        console.log(`merge line: ${result.line}`);
+        for (const r of result.results) console.log(`  ${r.line}`);
+      }
+      return 0;
+    } catch (err) {
+      return finishLandError(err, json);
+    }
+  }
+
   if (args.includes('--reap')) {
     try {
       const receipt = reap(root, { ttlDays, base, dryRun: args.includes('--dry-run'), remote: !args.includes('--no-remote'), force: args.includes('--force') });

package/commands/link.js

@@ -246,6 +246,7 @@ function normalizeLinkAnswer(parsed, members) {
 function compactFailure(answer) {
   if (!answer) return 'no answer';
   if (answer.reason === 'timeout') return `timed out after ${Math.round((answer.duration_ms || 0) / 1000)}s`;
+  if (answer.kill_cause) return `stopped by ${answer.signal || 'SIGKILL'}; ${answer.kill_cause}`;
   const detail = String(answer.stderr || '').trim().split(/\r?\n/).find(Boolean);
   return detail || String(answer.reason || 'failed').replace(/_/g, ' ');
 }