atris 3.64.0 → 3.65.0

package/commands/mail.js

@@ -0,0 +1,163 @@
+'use strict';
+
+// atris mail inboxes | read <inbox> | send <inbox> --to --subject --body
+// Your agents' own email inboxes (the @atrismail.com ones), not your Gmail.
+// For Gmail use `atris gmail`. Backend: /api/business/{id}/mail/...
+
+const readline = require('readline');
+const { apiRequestJson } = require('../utils/api');
+const { NOT_LOGGED_IN } = require('../lib/developer-api');
+const {
+  parseArgs, businessOrSay, loginToken, errorText, clip,
+} = require('../lib/business-target');
+
+// The only flags each subcommand takes (plus --help, --json, --business).
+const MAIL_FLAGS = {
+  inboxes: {},
+  read: { values: ['limit'] },
+  send: { switches: ['yes', 'dry_run'], values: ['to', 'subject', 'body'] },
+};
+const ALL_MAIL_FLAGS = { switches: ['yes', 'dry_run'], values: ['limit', 'to', 'subject', 'body'] };
+
+function mailHelp(log = console.log) {
+  log(`usage: atris mail inboxes [--business <slug>] [--json]
+       atris mail read <inbox> [--limit 10] [--json]
+       atris mail send <inbox> --to <address> --subject "<subject>" --body "<text>" [--yes] [--dry-run]
+
+your agents' own email inboxes (not your Gmail; for that use atris gmail).
+<inbox> is the address, the part before the @, or the inbox id.
+
+  inboxes   list every agent inbox in this business
+  read      newest messages first (--limit 1 to 200, default 10)
+  send      send one email from an agent inbox. asks before sending unless --yes.
+            --dry-run prints the email and sends nothing.
+            unknown flags are refused, so a typo never sends anything.`);
+}
+
+function toList(value) {
+  if (Array.isArray(value)) return value.map(String);
+  if (typeof value === 'string' && value.trim().startsWith('[')) {
+    try { return JSON.parse(value).map(String); } catch { /* fall through */ }
+  }
+  return value ? [String(value)] : [];
+}
+
+function renderInboxes(rows = []) {
+  if (!rows.length) return 'No agent inboxes yet. Hiring an agent makes one: atris hire "<name>" --job "<idea>"';
+  return rows.map((r) => `${r.email_address}${r.display_name ? `  (${r.display_name})` : ''}`).join('\n');
+}
+
+function renderMessages(inbox, rows = []) {
+  if (!rows.length) return `No mail in ${inbox.email_address} yet.`;
+  const lines = [];
+  for (const m of rows) {
+    const when = String(m.created_at || '').slice(0, 16).replace('T', ' ');
+    const out = m.direction === 'outbound';
+    const who = out ? `to ${toList(m.to_addresses).join(', ')}` : `from ${m.from_address || '?'}`;
+    lines.push(`${when}  ${out ? 'sent' : 'got '}  ${who}`);
+    lines.push(`  ${clip(m.subject || '(no subject)', 100)}`);
+    const body = clip(m.body_text || '', 160);
+    if (body) lines.push(`  ${body}`);
+  }
+  return lines.join('\n');
+}
+
+// address, local part, or id -> the inbox row
+function findInbox(rows, wanted) {
+  const w = String(wanted || '').trim().toLowerCase();
+  if (!w) return null;
+  return rows.find((r) => String(r.id).toLowerCase() === w)
+    || rows.find((r) => String(r.email_address || '').toLowerCase() === w)
+    || rows.find((r) => String(r.email_address || '').toLowerCase().split('@')[0] === w)
+    || null;
+}
+
+function askYesNo(question) {
+  if (!process.stdin.isTTY) return Promise.resolve(false);
+  return new Promise((resolve) => {
+    const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+    rl.question(question, (answer) => {
+      rl.close();
+      resolve(/^y(es)?$/i.test(String(answer || '').trim()));
+    });
+  });
+}
+
+async function mailCommand(args = [], deps = {}) {
+  const out = { log: deps.log || console.log, err: deps.err || console.error };
+  const { flags, pos } = parseArgs(args, ALL_MAIL_FLAGS);
+  const sub = pos[0];
+  if (flags.help || !sub || sub === 'help') { mailHelp(out.log); return sub || flags.help ? 0 : 1; }
+  if (!MAIL_FLAGS[sub]) {
+    out.err(`unknown mail command: ${sub}. try: atris mail inboxes | read | send`);
+    return 1;
+  }
+  // Checked against this subcommand's own flags, before any request: an
+  // unknown or mistyped flag on send must never turn into a real email.
+  const { error } = parseArgs(args, MAIL_FLAGS[sub]);
+  if (error) { out.err(`${error}. see: atris mail --help`); return 1; }
+  const words = sub === 'inboxes' ? 1 : 2;
+  if (pos.length > words) {
+    out.err(`atris mail ${sub} got an extra word: "${pos[words]}". put text in quotes, like --body "hi there"`);
+    return 1;
+  }
+
+  const business = businessOrSay(flags, deps, out.err);
+  if (!business) return 1;
+  const token = await loginToken(deps);
+  if (!token) { out.err(NOT_LOGGED_IN); return 1; }
+  const request = deps.apiRequestJson || apiRequestJson;
+  const base = `/business/${encodeURIComponent(business.id)}/mail`;
+
+  const listed = await request(`${base}/inboxes`, { method: 'GET', token });
+  if (!listed || !listed.ok) { out.err(`Could not load inboxes: ${errorText(listed)}`); return 1; }
+  const inboxes = Array.isArray(listed.data) ? listed.data : [];
+
+  if (sub === 'inboxes') {
+    out.log(flags.json ? JSON.stringify(inboxes) : renderInboxes(inboxes));
+    return 0;
+  }
+
+  if (!pos[1]) { out.err(`which inbox? atris mail ${sub} <inbox>`); return 1; }
+  const inbox = findInbox(inboxes, pos[1]);
+  if (!inbox) { out.err(`No inbox matches "${pos[1]}". See them all: atris mail inboxes`); return 1; }
+
+  if (sub === 'read') {
+    const limit = flags.limit == null ? 10 : Number(flags.limit);
+    if (!Number.isInteger(limit) || limit < 1 || limit > 200) { out.err('--limit must be a number from 1 to 200'); return 1; }
+    const res = await request(`${base}/inboxes/${encodeURIComponent(inbox.id)}/messages?limit=${limit}`, { method: 'GET', token });
+    if (!res || !res.ok) { out.err(`Could not read ${inbox.email_address}: ${errorText(res)}`); return 1; }
+    const rows = Array.isArray(res.data) ? res.data : [];
+    out.log(flags.json ? JSON.stringify(rows) : renderMessages(inbox, rows));
+    return 0;
+  }
+
+  // send
+  const to = typeof flags.to === 'string' ? flags.to.trim() : '';
+  const subject = typeof flags.subject === 'string' ? flags.subject : '';
+  const text = typeof flags.body === 'string' ? flags.body : '';
+  if (!to || !subject || !text) { out.err('send needs --to, --subject, and --body'); return 1; }
+  const preview = `From:    ${inbox.email_address}\nTo:      ${to}\nSubject: ${subject}\n\n${text}\n`;
+  if (flags.dry_run === true) {
+    out.log(`${preview}\nDry run: nothing was sent.`);
+    return 0;
+  }
+  // Only a bare --yes (or -y) skips the question; the parser refuses --yes=<anything>.
+  if (flags.yes !== true) {
+    out.log(preview);
+    const ok = await (deps.confirm || askYesNo)('Send this email? (y/N) ');
+    if (!ok) {
+      out.log(process.stdin.isTTY || deps.confirm ? 'Not sent.' : 'Not sent. Add --yes to send without asking.');
+      return 1;
+    }
+  }
+  const res = await request(`${base}/inboxes/${encodeURIComponent(inbox.id)}/messages/send`, {
+    method: 'POST', token, body: { to, subject, text }, retries: 0, timeoutMs: 30000,
+  });
+  if (!res || !res.ok) { out.err(`Not sent: ${errorText(res)}`); return 1; }
+  if (flags.json) out.log(JSON.stringify(res.data));
+  else out.log(`Sent from ${inbox.email_address} to ${to}.`);
+  return 0;
+}
+
+module.exports = { mailCommand, findInbox, renderInboxes, renderMessages };

package/commands/mission.js

@@ -7,6 +7,7 @@ const readline = require('readline');
 const { spawn, spawnSync } = require('child_process');
 const { hasFlag, readFlag, readIntFlag } = require('../lib/arg-parser');
 const { memberProcessPrompt } = require('../lib/member-context');
+const { memberIdentityLine, missionObjectiveLine } = require('../lib/member-identity');
 const {
   compactErrorPayload,
   compactSuccessPayload,
@@ -8634,7 +8635,7 @@ function buildTickPrompt(mission, tickIndex, maxTicks, frozen, pings = [], cwd =
     `# Mission Tick ${tickIndex}/${maxTicks}`,
     ...pingLines,
     ``,
-    `**Objective:** ${mission.objective}`,
+    missionObjectiveLine(mission.objective),
     `**Owner:** ${mission.owner}`,
     `**Lane:** ${frozen.lane}`,
     `**Cadence:** ${mission.cadence}`,
@@ -8648,7 +8649,7 @@ function buildTickPrompt(mission, tickIndex, maxTicks, frozen, pings = [], cwd =
     ``,
     `## Your task`,
     `Do ONE increment of work toward the stop condition. ONE. No more.`,
-    `- You are the member "${mission.owner}". Read atris/team/${mission.owner}/MEMBER.md (and SOUL.md if present) before acting, work in that identity, inside its scope and stop rules. After your work, append what you did and what you learned to atris/team/${mission.owner}/logs/<today's date>.md.`,
+    `- ${memberIdentityLine(mission.owner)} Read atris/team/${mission.owner}/MEMBER.md (and SOUL.md if present) before acting, work in that identity, inside its scope and stop rules. After your work, append what you did and what you learned to atris/team/${mission.owner}/logs/<today's date>.md.`,
     `- FIRST: inspect current mission/task state before acting. Read the relevant files, run \`atris mission status ${mission.id}\`, \`git status\`, or \`atris task list\` as needed so you know what's already done.`,
     `- Pick the smallest concrete action that moves the mission forward.`,
     `- Before acting, state your single next move in one sentence.`,

package/commands/stream.js

@@ -589,12 +589,33 @@ function worktreeTask(root, deps) {
   return worktreeConfig(root, deps).task;
 }
 
+// The branches a side copy starts from. A commit reachable from any of them
+// was inherited, not made in the copy.
+const WORKTREE_BASE_REFS = Object.freeze([
+  'refs/remotes/origin/HEAD',
+  'refs/remotes/origin/main',
+  'refs/remotes/origin/master',
+  'refs/heads/main',
+  'refs/heads/master',
+]);
+
+function worktreeBaseRefs(root, deps) {
+  const result = runGit(root, ['for-each-ref', '--format=%(refname)', ...WORKTREE_BASE_REFS], deps);
+  if (result.status !== 0) return [];
+  return String(result.stdout || '').split(/\r?\n/).map((line) => line.trim()).filter((ref) => WORKTREE_BASE_REFS.includes(ref));
+}
+
+// Only a commit the copy added on top of its base counts. A fresh copy cut
+// from someone else's commit has none, so its owner shows no work. A repo
+// with no main, master, or origin default keeps the newest commit.
 function collectWorktreeActivityEvents(root, deps, events) {
   const roots = collectWorkspaceRoots(root, deps);
   for (const item of roots) {
     const owner = worktreeOwner(item.root, deps);
     if (!owner) continue;
-    const log = runGit(item.root, ['log', '-1', '--format=%cI%x09%an%x09%s'], deps);
+    const bases = worktreeBaseRefs(item.root, deps);
+    const range = bases.length ? ['HEAD', '--not', ...bases] : [];
+    const log = runGit(item.root, ['log', '-1', '--format=%cI%x09%an%x09%s', ...range], deps);
     if (log.status !== 0 || !String(log.stdout || '').trim()) continue;
     const [ts, author, subject] = String(log.stdout || '').trim().split('\t');
     pushEvent(events, {