atris 3.38.0 → 3.41.0

package/commands/init.js

@@ -282,6 +282,7 @@ function initAtris() {
   const printReadyCounts = () => {
     console.log(`workspace files ready (${ready.workspace.size})`);
     console.log(`team members ready (${ready.team.size})`);
+    console.log('more members are available with atris member create <name>');
     console.log(`agent adapters ready (${ready.adapters.size})`);
     console.log(`skills installed (${ready.skills.size})`);
   };
@@ -601,8 +602,8 @@ function initAtris() {
 
 
   // Copy team members (MEMBER.md format — directory per member with skills/tools/context)
-  const members = ['navigator', 'executor', 'validator', 'launcher', 'brainstormer', 'researcher'];
-  members.forEach(name => {
+  const starterMembers = ['navigator', 'executor', 'validator', 'mission-lead', 'improver'];
+  starterMembers.forEach(name => {
     const sourceFile = path.join(__dirname, '..', 'atris', 'team', name, 'MEMBER.md');
     const targetMemberDir = path.join(teamDir, name);
     const targetFile = path.join(targetMemberDir, 'MEMBER.md');
@@ -644,7 +645,7 @@ tools: []
 # Insert persona, workflow, and rules below
 `;
     fs.writeFileSync(path.join(templateTargetDir, 'MEMBER.md'), templateContent);
-    markReady('team', '_template', '✓ Created team/_template/MEMBER.md');
+    markReady('workspace', 'team/_template/MEMBER.md', '✓ Created team/_template/MEMBER.md');
   }
 
   // Detect project context and generate profile
@@ -676,6 +677,25 @@ atris atris.md
 
 This is the Atris boot sequence. Show the output to the user, then respond naturally.
 
+## The way of talking (every reply, no exceptions)
+
+Talk like a person. This governs every message you send the operator: boot, status, summaries, everything.
+
+- Plain words. Say what happened and what it means for the reader, cause and effect. Not the machinery.
+- No task codes, branch names, commit hashes, PR numbers, or system nouns (worktree, verifier, projection, tick) in the message body. If the reader needs a command, put ONE copyable line at the end.
+- No insider terms without defining them in the same breath. A sharp non-engineer must follow it on first read.
+- Lead with the outcome. Complete sentences, one or two per paragraph, blank line between. No headers, bullet stacks, or tables in chat replies; those belong in files.
+- Detail lives in files and receipts. Offer "want the detail?" instead of dumping it.
+- No em dashes anywhere; use a comma, colon, or period.
+- The test before sending: read it fried at 2am. If decoding takes work, rewrite it.
+
+copy these shapes:
+- **Status:** "The reply check is built. I am running the final checks now, so the result is not ready yet."
+- **Landing:** "Replies now get a plain-language check before they reach you. The checks passed, and the change is ready."
+- **Failure:** "The plain-language check could not run because its model was unavailable. Your reply still went through, so no work was blocked."
+
+Canonical source: \`atris/atris.md\` \`## voice\`. This block is a copy for tools that only read \`AGENTS.md\`; if they differ, atris.md wins.
+
 ## Core Files
 
 Atris is the source of truth. This file is only an adapter for tools that read

package/commands/land.js

@@ -1,7 +1,6 @@
 const fs = require('fs');
 const path = require('path');
-const { spawnSync } = require('child_process');
-
+const { runGit } = require('../lib/git-spawn');
 const { listWorktrees, statusCounts } = require('./worktree');
 
 const DEFAULT_TTL_DAYS = 7;
@@ -14,14 +13,6 @@ function countLabel(n, word) {
   return `${n} ${word}${n === 1 ? '' : 's'}`;
 }
 
-function runGit(args, { cwd = process.cwd(), check = true, maxBuffer } = {}) {
-  const result = spawnSync('git', args, { cwd, encoding: 'utf8', ...(maxBuffer ? { maxBuffer } : {}) });
-  if (check && result.status !== 0) {
-    throw new Error(`git ${args.join(' ')} failed: ${(result.stderr || result.stdout || '').trim()}`);
-  }
-  return result;
-}
-
 function repoRoot(cwd = process.cwd()) {
   const result = runGit(['rev-parse', '--show-toplevel'], { cwd, check: false });
   if (result.status !== 0) return '';
@@ -614,7 +605,9 @@ function printReceipt(receipt) {
     // fresh-grace keeps are healthy active work, not a call to action —
     // "needs a human" on those trained readers to ignore the real ones.
     for (const k of receipt.keptWorktrees || []) {
+      // The receipt keeps the raw codes; the human line speaks in sentences.
       if (String(k).includes('(fresh_worktree_grace)')) console.log(`  in use, left alone: ${k.replace(' (fresh_worktree_grace)', '')}`);
+      else if (String(k).includes('(current_checkout)')) console.log(`  you are standing in it, left alone: ${k.replace(' (current_checkout)', '')}`);
       else console.log(`  ✋ kept, needs a human: ${k}`);
     }
     for (const m of receipt.keptMovedBranches || []) console.log(`  moved since scan, left alone: ${m}`);
@@ -624,7 +617,8 @@ function printReceipt(receipt) {
   console.log('');
 }
 
-function readFlag(args, name, fallback = '') {
+// Preserve split-only parsing and its fallback for missing or falsey values.
+function readFollowingFlag(args, name, fallback = '') {
   const idx = args.indexOf(name);
   if (idx === -1) return fallback;
   return args[idx + 1] || fallback;
@@ -665,10 +659,10 @@ function landCommand(args = []) {
     console.error('not a git repository');
     return 1;
   }
-  const ttlRaw = readFlag(args, '--ttl', '');
+  const ttlRaw = readFollowingFlag(args, '--ttl', '');
   const ttlParsed = Number(ttlRaw);
   const ttlDays = ttlRaw !== '' && Number.isFinite(ttlParsed) && ttlParsed >= 0 ? ttlParsed : DEFAULT_TTL_DAYS;
-  const base = readFlag(args, '--base', '');
+  const base = readFollowingFlag(args, '--base', '');
   const json = args.includes('--json');
 
   if (args.includes('--reap')) {
@@ -679,7 +673,7 @@ function landCommand(args = []) {
   }
 
   const lookupArgs = args[0] === 'status' ? args.slice(1) : args;
-  const name = lookupArgs.find((a) => !a.startsWith('-') && a !== readFlag(lookupArgs, '--ttl') && a !== readFlag(lookupArgs, '--base'));
+  const name = lookupArgs.find((a) => !a.startsWith('-') && a !== readFollowingFlag(lookupArgs, '--ttl') && a !== readFollowingFlag(lookupArgs, '--base'));
   if (name) {
     const story = collectStory(root, name, { base });
     if (!story) {

package/commands/launchpad.js

@@ -2,23 +2,10 @@
 
 const fs = require('fs');
 const path = require('path');
+const { hasFlag, readFlag } = require('../lib/arg-parser');
 
 const ACTIVE_MISSION_STATUSES = new Set(['planning', 'running', 'ready']);
 
-function hasFlag(args, name) {
-  return args.includes(name);
-}
-
-function readFlag(args, name, fallback = '') {
-  const prefix = `${name}=`;
-  for (let i = 0; i < args.length; i += 1) {
-    const arg = String(args[i]);
-    if (arg === name && args[i + 1] && !String(args[i + 1]).startsWith('--')) return String(args[i + 1]);
-    if (arg.startsWith(prefix)) return arg.slice(prefix.length);
-  }
-  return fallback;
-}
-
 function readJson(file) {
   try {
     return JSON.parse(fs.readFileSync(file, 'utf8'));

package/commands/lifecycle.js

@@ -168,7 +168,7 @@ async function sleepAtris() {
 }
 
 /**
- * Wake a sleeping workspace so agents resume automatically.
+ * Wake a sleeping workspace: remote wake request, or local wake flag.
  * @returns {Promise<void>}
  */
 async function wakeAtris() {
@@ -179,7 +179,7 @@ async function wakeAtris() {
   if (!slug || slug === '--help' || slug === '-h' || slug === 'help') {
     console.log('Usage: atris wake [business|member] [--loop <loop-id>]');
     console.log('');
-    console.log('  Wake a sleeping workspace. Agents resume automatically.');
+    console.log('  Wake a sleeping workspace. Wake signal sent; loops pick it up on their next pass.');
     console.log('  Or flip a local member / member-loop switch awake.');
     process.exit(0);
   }
@@ -207,13 +207,13 @@ async function wakeAtris() {
     console.log(`Waking business computer '${business.name || slug}'...`);
 
     if (result.data && result.data.status === 'running' && result.data.endpoint) {
-      console.log(`Business computer '${business.name || slug}' is alive. Agents resuming.`);
+      console.log(`Business computer '${business.name || slug}' is alive. Wake signal sent; loops pick it up on their next pass.`);
       return;
     }
 
     const running = await waitForBusinessComputer(creds.token, business);
     if (running) {
-      console.log(`Business computer '${business.name || slug}' is alive. Agents resuming.`);
+      console.log(`Business computer '${business.name || slug}' is alive. Wake signal sent; loops pick it up on their next pass.`);
       return;
     }
 
@@ -246,7 +246,7 @@ async function wakeAtris() {
     });
 
     if (status.ok && status.data && status.data.status === 'running') {
-      console.log(`Workspace '${slug}' is alive. Agents resuming.`);
+      console.log(`Workspace '${slug}' is alive. Wake signal sent; loops pick it up on their next pass.`);
       return;
     }
   }

package/commands/log.js

@@ -97,6 +97,56 @@ function readDigestSection(root, title, relativePath, maxLines = null) {
   };
 }
 
+// Splits a journal body into its ## groups so the digest can show
+// completed / inbox / notes as short labeled blocks instead of a raw dump.
+function journalGroups(lines) {
+  const groups = [];
+  let current = null;
+  for (const line of lines) {
+    const heading = line.match(/^##\s+(.+?)\s*$/);
+    if (heading) {
+      current = { heading: heading[1], lines: [] };
+      groups.push(current);
+    } else if (current) {
+      current.lines.push(line);
+    }
+  }
+  return groups;
+}
+
+function bulletCount(group) {
+  return group.lines.filter((line) => /^\s*-\s+/.test(line)).length;
+}
+
+function digestSummaryLine(date, sections) {
+  let completed = 0;
+  let inbox = 0;
+  for (const section of sections) {
+    for (const group of journalGroups(section.lines)) {
+      if (/^completed/i.test(group.heading)) completed += bulletCount(group);
+      else if (/^inbox/i.test(group.heading)) inbox += bulletCount(group);
+    }
+  }
+  const parts = [`${sections.length} log${sections.length === 1 ? '' : 's'}`];
+  if (completed) parts.push(`${completed} completed`);
+  if (inbox) parts.push(`${inbox} inbox`);
+  return `${date}: ${parts.join(', ')}`;
+}
+
+function renderDigestSection(section) {
+  const groups = journalGroups(section.lines);
+  if (!groups.length) {
+    return [`=== ${section.title} ===`, section.path, ...section.lines].join('\n');
+  }
+  const out = [`=== ${section.title} ===`, section.path];
+  for (const group of groups) {
+    const body = group.lines.filter((line) => line.trim() && line.trim() !== '---');
+    if (!body.length) continue;
+    out.push('', `${group.heading.toLowerCase()} (${bulletCount(group)})`, ...body);
+  }
+  return out.join('\n');
+}
+
 function logsDigest(args = [], options = {}) {
   const root = options.cwd || process.cwd();
   const date = digestDate(args);
@@ -125,11 +175,11 @@ function logsDigest(args = [], options = {}) {
   } else if (sections.length === 0) {
     console.log(`No logs for ${date} yet.`);
   } else {
-    console.log(sections.map((section) => [
-      `=== ${section.title} ===`,
-      section.path,
-      ...section.lines,
-    ].join('\n')).join('\n\n'));
+    console.log([
+      digestSummaryLine(date, sections),
+      '',
+      ...sections.map(renderDigestSection),
+    ].join('\n'));
   }
 
   return payload;