atris 3.53.0 → 3.55.0

package/commands/integrations.js

@@ -2,8 +2,12 @@
  * Integration commands for Atris CLI
  *
  * Usage:
- *   atris gmail inbox       - List recent emails
- *   atris gmail read <id>   - Read specific email
+ *   atris gmail inbox [--account <id>]       - List recent emails for a mailbox
+ *   atris gmail read <id> [--account <id>]   - Read specific email
+ *   atris gmail archive <id> [...] [--account <id>] - Archive messages
+ *   atris gmail connect [name]              - Connect or reconnect a Gmail account
+ *   atris gmail accounts                     - List connected Gmail accounts and the active account
+ *   atris gmail use [<account_id|name>]      - Choose or set the active Gmail account
  *   atris calendar today    - Show today's events
  *   atris calendar yesterday - Show yesterday's events
  *   atris calendar week     - Show this week's events
@@ -25,9 +29,114 @@ const {
 const fs = require('fs');
 const os = require('os');
 const path = require('path');
+const readline = require('readline');
 const { spawnSync } = require('child_process');
 
 const CALENDAR_CACHE_PATH = path.join(os.homedir(), '.atris', 'calendar-events-cache.json');
+const GMAIL_CONNECT_POLL_MS = 3000;
+const GMAIL_CONNECT_TIMEOUT_MS = 3 * 60 * 1000;
+
+function gmailAccountStatePath() {
+  return process.env.ATRIS_GMAIL_ACCOUNT_FILE
+    || path.join(os.homedir(), '.atris', 'gmail-account.json');
+}
+
+function readGmailStickyAccount() {
+  try {
+    const data = JSON.parse(fs.readFileSync(gmailAccountStatePath(), 'utf8'));
+    const id = String(data.account_id || '').trim();
+    return id || null;
+  } catch {
+    return null;
+  }
+}
+
+function writeGmailStickyAccount(accountId) {
+  const filePath = gmailAccountStatePath();
+  fs.mkdirSync(path.dirname(filePath), { recursive: true });
+  fs.writeFileSync(filePath, `${JSON.stringify({ account_id: accountId }, null, 2)}\n`, 'utf8');
+}
+
+function resolveGmailAccountId(explicitId) {
+  const trimmed = String(explicitId || '').trim();
+  if (trimmed) return trimmed;
+  const sticky = readGmailStickyAccount();
+  if (sticky) return sticky;
+  return 'default';
+}
+
+function gmailAccountIdentity(account = {}) {
+  const id = String(account.account_id || account.id || 'default').trim() || 'default';
+  const email = String(account.email_address || account.email || '').trim().toLowerCase();
+  const name = String(account.display_name || account.name || id).trim().toLowerCase() || id.toLowerCase();
+  return { id, email, name };
+}
+
+function sortGmailAccounts(accounts) {
+  return [...accounts].sort((left, right) => {
+    const leftIdentity = gmailAccountIdentity(left);
+    const rightIdentity = gmailAccountIdentity(right);
+    const leftDefault = leftIdentity.id.toLowerCase() === 'default';
+    const rightDefault = rightIdentity.id.toLowerCase() === 'default';
+    if (leftDefault !== rightDefault) return leftDefault ? -1 : 1;
+    return leftIdentity.name.localeCompare(rightIdentity.name)
+      || leftIdentity.id.localeCompare(rightIdentity.id);
+  });
+}
+
+function formatGmailAccountRows(accounts, activeId = null) {
+  const rows = sortGmailAccounts(accounts).map((account) => {
+    const identity = gmailAccountIdentity(account);
+    return { ...identity, emailLabel: identity.email || 'email pending' };
+  });
+  const nameWidth = Math.max(...rows.map((row) => row.name.length));
+  const emailWidth = Math.max(...rows.map((row) => row.emailLabel.length));
+  const active = String(activeId || '').toLowerCase();
+  return rows.map((row) => {
+    const marker = row.id.toLowerCase() === active ? '  (active)' : '';
+    return `${row.name.padEnd(nameWidth)}  ${row.emailLabel.padEnd(emailWidth)}${marker}`.trimEnd();
+  });
+}
+
+async function fetchGmailAccounts(token, options = {}) {
+  const result = await apiRequestJson('/integrations/gmail/accounts', {
+    method: 'GET',
+    token,
+  });
+  if (!result.ok) {
+    if (options.quiet) return [];
+    console.error(`Error: ${result.error || 'Failed to fetch accounts'}`);
+    process.exit(1);
+  }
+  const accounts = result.data?.accounts || result.data || [];
+  return Array.isArray(accounts) ? accounts : [];
+}
+
+function findGmailAccount(accounts, accountId) {
+  const wanted = String(accountId || '').trim().toLowerCase();
+  return accounts.find((account) => gmailAccountIdentity(account).id.toLowerCase() === wanted) || null;
+}
+
+function findGmailAccountForUse(accounts, selector) {
+  const wanted = String(selector || '').trim().toLowerCase();
+  return findGmailAccount(accounts, wanted)
+    || accounts.find((account) => gmailAccountIdentity(account).name === wanted)
+    || null;
+}
+
+async function promptForGmailAccount(deps = {}) {
+  if (deps.prompt) return deps.prompt('choose account: ');
+  const rl = readline.createInterface({
+    input: deps.input || process.stdin,
+    output: deps.output || process.stdout,
+  });
+  return new Promise((resolve) => {
+    rl.question('choose account: ', (answer) => {
+      rl.close();
+      resolve(answer);
+    });
+  });
+}
 
 async function getAuth() {
   const ensured = await ensureValidCredentials(apiRequestJson);
@@ -51,13 +160,54 @@ async function getAuthToken() {
 // GMAIL
 // ============================================================================
 
+function extractGmailMailboxAccount(args = []) {
+  const out = [];
+  let mailboxAccountId = null;
+  for (let i = 0; i < args.length; i += 1) {
+    const arg = args[i];
+    if (arg === '--account' && args[i + 1] && !String(args[i + 1]).startsWith('-')) {
+      mailboxAccountId = args[i + 1];
+      i += 1;
+      continue;
+    }
+    out.push(arg);
+  }
+  return { args: out, mailboxAccountId };
+}
+
+function parseGmailArgs(args = []) {
+  const options = { accountId: null };
+  const positional = [];
+  for (let i = 0; i < args.length; i += 1) {
+    const arg = args[i];
+    if (arg === '--account') {
+      options.accountId = String(args[i + 1] || '').trim();
+      if (!options.accountId) {
+        console.error('Usage: --account requires an account id');
+        process.exit(1);
+      }
+      i += 1;
+    } else {
+      positional.push(arg);
+    }
+  }
+  return { ...options, positional };
+}
+
 async function gmailInbox(options = {}) {
   const { token, email } = await getAuth();
   const limit = options.limit || 10;
+  const accountId = resolveGmailAccountId(options.accountId);
+  const accounts = await fetchGmailAccounts(token, { quiet: true });
+  const account = findGmailAccount(accounts, accountId);
+  const mailboxEmail = account ? gmailAccountIdentity(account).email : '';
 
+  if (mailboxEmail) console.log(`inbox for ${mailboxEmail} (${accountId.toLowerCase()})`);
   console.log('📬 Fetching inbox...\n');
 
-  const result = await apiRequestJson(`/integrations/gmail/messages?max_results=${limit}`, {
+  const path = `/integrations/gmail/messages?max_results=${limit}&account_id=${encodeURIComponent(accountId)}`;
+
+  const result = await apiRequestJson(path, {
     method: 'GET',
     token,
   });
@@ -97,17 +247,20 @@ async function gmailInbox(options = {}) {
   }
 }
 
-async function gmailRead(messageId) {
+async function gmailRead(messageId, options = {}) {
   if (!messageId) {
-    console.error('Usage: atris gmail read <message_id>');
+    console.error('Usage: atris gmail read <message_id> [--account <id>]');
     process.exit(1);
   }
 
   const token = await getAuthToken();
+  const accountId = resolveGmailAccountId(options.accountId);
 
   console.log('📧 Fetching message...\n');
 
-  const result = await apiRequestJson(`/integrations/gmail/messages/${messageId}`, {
+  const path = `/integrations/gmail/messages/${messageId}?account_id=${encodeURIComponent(accountId)}`;
+
+  const result = await apiRequestJson(path, {
     method: 'GET',
     token,
   });
@@ -129,21 +282,24 @@ async function gmailRead(messageId) {
   console.log(msg.body || msg.snippet || '(no body)');
 }
 
-async function gmailArchive(messageIds) {
+async function gmailArchive(messageIds, options = {}) {
   const ids = (messageIds || []).map(id => String(id || '').trim()).filter(Boolean);
   if (!ids.length) {
-    console.error('Usage: atris gmail archive <message_id> [<message_id> ...]');
+    console.error('Usage: atris gmail archive <message_id> [<message_id> ...] [--account <id>]');
     process.exit(1);
   }
 
   const token = await getAuthToken();
+  const accountId = resolveGmailAccountId(options.accountId);
 
   console.log(`Archiving ${ids.length} message${ids.length === 1 ? '' : 's'}...`);
 
+  const body = { message_ids: ids, account_id: accountId };
+
   const result = await apiRequestJson('/integrations/gmail/messages/batch-archive', {
     method: 'POST',
     token,
-    body: { message_ids: ids },
+    body,
   });
 
   if (!result.ok) {
@@ -155,23 +311,169 @@ async function gmailArchive(messageIds) {
   console.log(`Archived ${archived} message${archived === 1 ? '' : 's'}. They stay searchable in All Mail.`);
 }
 
+function openGmailAuthUrl(authUrl, deps = {}) {
+  const run = deps.spawnSync || spawnSync;
+  const platform = deps.platform || process.platform;
+  const command = platform === 'darwin' ? 'open' : 'xdg-open';
+  const opened = run(command, [authUrl], { stdio: 'ignore' });
+  return !opened.error && opened.status === 0;
+}
+
+async function gmailConnect(accountName, deps = {}) {
+  const accountId = String(accountName || 'default').trim();
+  if (!/^[a-z0-9-]{1,32}$/.test(accountId)) {
+    console.error('invalid gmail account name. use 1 to 32 lowercase letters, numbers, or hyphens.');
+    process.exit(1);
+  }
+
+  const token = await getAuthToken();
+  const result = await apiRequestJson('/integrations/gmail/start', {
+    method: 'POST',
+    token,
+    body: { account_id: accountId },
+  });
+
+  if (!result.ok) {
+    const detail = String(result.error || 'request failed').toLowerCase();
+    console.error(`could not start gmail connection: ${detail}`);
+    process.exit(1);
+  }
+
+  const authUrl = String(result.data?.auth_url || result.data?.url || '').trim();
+  if (!authUrl) {
+    console.error('could not start gmail connection: the server did not return an auth url.');
+    process.exit(1);
+  }
+
+  const openAuthUrl = deps.openAuthUrl || openGmailAuthUrl;
+  if (!openAuthUrl(authUrl, deps)) {
+    console.log(`open this url in your browser: ${authUrl}`);
+  }
+
+  console.log(`waiting for gmail account ${accountId}...`);
+
+  const pollIntervalMs = deps.pollIntervalMs ?? GMAIL_CONNECT_POLL_MS;
+  const timeoutMs = deps.timeoutMs ?? GMAIL_CONNECT_TIMEOUT_MS;
+  const sleep = deps.sleep || ((milliseconds) => new Promise((resolve) => setTimeout(resolve, milliseconds)));
+  const maxPolls = Math.max(1, Math.ceil(timeoutMs / pollIntervalMs));
+
+  for (let poll = 0; poll < maxPolls; poll += 1) {
+    await sleep(pollIntervalMs);
+    const accountsResult = await apiRequestJson('/integrations/gmail/accounts', {
+      method: 'GET',
+      token,
+    });
+    const accounts = accountsResult.ok
+      ? (accountsResult.data?.accounts || accountsResult.data || [])
+      : [];
+    const match = Array.isArray(accounts) ? findGmailAccount(accounts, accountId) : null;
+    const email = match ? gmailAccountIdentity(match).email.trim() : '';
+    if (email && email !== 'unknown') {
+      console.log(`connected ${email} as ${accountId}`);
+      return;
+    }
+  }
+
+  console.error(`connection timed out. finish in your browser: ${authUrl}`);
+  console.error(`or connect from settings: https://atris.ai/dashboard/settings?connect=gmail&account=${accountId}`);
+  process.exit(1);
+}
+
+async function gmailAccounts() {
+  const token = await getAuthToken();
+  const accounts = await fetchGmailAccounts(token);
+  const activeId = resolveGmailAccountId(null);
+
+  if (!accounts.length) {
+    console.log('no connected accounts.');
+    return;
+  }
+
+  for (const line of formatGmailAccountRows(accounts, activeId)) console.log(line);
+}
+
+async function gmailUse(accountId, deps = {}) {
+  const token = await getAuthToken();
+  const accounts = await fetchGmailAccounts(token);
+  let selector = String(accountId || '').trim();
+
+  if (!selector) {
+    if (!accounts.length) {
+      console.log('no connected accounts.');
+      return;
+    }
+    if (accounts.length === 1) {
+      const { name, email } = gmailAccountIdentity(accounts[0]);
+      console.log(`${name} (${email || 'email pending'}) is already the only gmail account.`);
+      return;
+    }
+
+    const sortedAccounts = sortGmailAccounts(accounts);
+    const activeId = resolveGmailAccountId(null);
+    const rows = formatGmailAccountRows(sortedAccounts, activeId);
+    rows.forEach((line, index) => console.log(`${index + 1}. ${line}`));
+    const answer = String(await promptForGmailAccount(deps) || '').trim();
+    const number = /^\d+$/.test(answer) ? Number(answer) : 0;
+    selector = number >= 1 && number <= sortedAccounts.length
+      ? gmailAccountIdentity(sortedAccounts[number - 1]).id
+      : answer;
+  }
+
+  const match = findGmailAccountForUse(accounts, selector);
+  if (!match) {
+    console.error(`unknown gmail account "${selector}".`);
+    if (accounts.length) {
+      console.error('connected accounts:');
+      for (const account of sortGmailAccounts(accounts)) {
+        const { id, email, name } = gmailAccountIdentity(account);
+        console.error(`  ${id.toLowerCase()}: ${email || 'email pending'}, ${name}`);
+      }
+    } else {
+      console.error('no connected accounts.');
+    }
+    process.exit(1);
+  }
+
+  const { id, name, email } = gmailAccountIdentity(match);
+  writeGmailStickyAccount(id);
+  console.log(`now using ${name} (${email || 'email pending'})`);
+}
+
 async function gmailCommand(subcommand, ...args) {
   switch (subcommand) {
     case 'inbox':
-    case 'list':
-      await gmailInbox();
+    case 'list': {
+      const parsed = parseGmailArgs(args);
+      await gmailInbox({ accountId: parsed.accountId || undefined });
       break;
-    case 'read':
-      await gmailRead(args[0]);
+    }
+    case 'read': {
+      const parsed = parseGmailArgs(args);
+      await gmailRead(parsed.positional[0], { accountId: parsed.accountId || undefined });
       break;
-    case 'archive':
-      await gmailArchive(args);
+    }
+    case 'archive': {
+      const parsed = parseGmailArgs(args);
+      await gmailArchive(parsed.positional, { accountId: parsed.accountId || undefined });
+      break;
+    }
+    case 'connect':
+      await gmailConnect(args[0]);
+      break;
+    case 'accounts':
+      await gmailAccounts();
+      break;
+    case 'use':
+      await gmailUse(args.join(' '));
       break;
     default:
-      console.log('Gmail commands:');
-      console.log('  atris gmail inbox       - List recent emails');
-      console.log('  atris gmail read <id>   - Read specific email');
-      console.log('  atris gmail archive <id> [...] - Archive messages (reversible, All Mail keeps them)');
+      console.log('gmail commands:');
+      console.log('  atris gmail inbox [--account <id>]       - list recent emails for a mailbox');
+      console.log('  atris gmail read <id> [--account <id>]   - read specific email');
+      console.log('  atris gmail archive <id> [...] [--account <id>] - archive messages (reversible, all mail keeps them)');
+      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');
+      console.log('  atris gmail use [<account_id|name>]      - choose or set the active gmail account');
   }
 }
 
@@ -228,7 +530,8 @@ function formatCalendarTimeRange(event) {
 
 function formatCalendarEvents(label, events) {
   if (events.length === 0) {
-    console.log(`No events ${label}. 🎉`);
+    // label is already a phrase like "today's events" or "events on 2026-08-24"
+    console.log(`No ${label}.`);
     return;
   }
 
@@ -599,7 +902,15 @@ async function calendarCommand(subcommand, ...args) {
 // ============================================================================
 
 async function twitterPost(args = []) {
-  const outbound = prepareOutboundSendTextOrExit('twitter', args);
+  const approved = args.includes('--approved') || args.includes('--confirm-approved');
+  const cleaned = args.filter((a) => a !== '--approved' && a !== '--confirm-approved');
+  if (!approved) {
+    console.error('Refusing to post without --approved after the exact text is confirmed.');
+    console.error('Usage: atris twitter post "<text>" --approved');
+    process.exit(2);
+  }
+
+  const outbound = prepareOutboundSendTextOrExit('twitter', cleaned);
   let text = outbound.body;
   if (!text) {
     const readline = require('readline');
@@ -658,7 +969,7 @@ async function twitterCommand(subcommand, ...args) {
       break;
     default:
       console.log('Twitter commands:');
-      console.log('  atris twitter post [text]  - Post a tweet');
+      console.log('  atris twitter post "<text>" --approved  - Post a tweet');
   }
 }
 
@@ -834,9 +1145,16 @@ async function slackSearch(query, args = []) {
 
 async function slackSend(channel, textParts) {
   const target = String(channel || '').trim();
-  const text = prepareOutboundSendTextOrExit('slack', textParts).body;
+  const approved = (textParts || []).includes('--approved') || (textParts || []).includes('--confirm-approved');
+  const cleaned = (textParts || []).filter((a) => a !== '--approved' && a !== '--confirm-approved');
+  if (!approved) {
+    console.error('Refusing to send without --approved after the exact channel and exact text are confirmed.');
+    console.error('Usage: atris slack send <channel> "<message>" --approved');
+    process.exit(2);
+  }
+  const text = prepareOutboundSendTextOrExit('slack', cleaned).body;
   if (!target || !text) {
-    console.error('Usage: atris slack send <channel> "<message>"');
+    console.error('Usage: atris slack send <channel> "<message>" --approved');
     process.exit(1);
   }
 
@@ -860,9 +1178,16 @@ async function slackSend(channel, textParts) {
 
 async function slackDm(userId, textParts) {
   const target = String(userId || '').trim();
-  const text = prepareOutboundSendTextOrExit('slack', textParts).body;
+  const approved = (textParts || []).includes('--approved') || (textParts || []).includes('--confirm-approved');
+  const cleaned = (textParts || []).filter((a) => a !== '--approved' && a !== '--confirm-approved');
+  if (!approved) {
+    console.error('Refusing to send without --approved after the exact recipient and exact text are confirmed.');
+    console.error('Usage: atris slack dm <slack_user_id> "<message>" --approved');
+    process.exit(2);
+  }
+  const text = prepareOutboundSendTextOrExit('slack', cleaned).body;
   if (!target || !text) {
-    console.error('Usage: atris slack dm <slack_user_id> "<message>"');
+    console.error('Usage: atris slack dm <slack_user_id> "<message>" --approved');
     process.exit(1);
   }
 
@@ -912,8 +1237,8 @@ async function slackCommand(subcommand, ...args) {
       console.log('  atris slack dms                  - List Slack DMs');
       console.log('  atris slack messages <channel>   - Read recent messages');
       console.log('  atris slack search <query>       - Search Slack messages');
-      console.log('  atris slack send <channel> "<message>" - Send a message as you');
-      console.log('  atris slack dm <user_id> "<message>"   - DM someone as you');
+      console.log('  atris slack send <channel> "<message>" --approved - Send a message as you');
+      console.log('  atris slack dm <user_id> "<message>" --approved   - DM someone as you');
   }
 }
 
@@ -1588,10 +1913,41 @@ async function imessageCommand(subcommand, ...args) {
 // STATUS
 // ============================================================================
 
-async function integrationsStatus() {
+async function integrationsStatus(args = []) {
+  const { parseScopeFlag } = require('../lib/cli-scope');
+  const scope = parseScopeFlag(args);
+  const json = scope.args.includes('--json') || args.includes('--json');
+
+  if (!scope.global) {
+    const localPath = path.join(process.cwd(), '.atris', 'integrations.json');
+    let local = null;
+    try {
+      if (fs.existsSync(localPath)) local = JSON.parse(fs.readFileSync(localPath, 'utf8'));
+    } catch {}
+    const payload = {
+      scope: 'workspace',
+      workspace_root: process.cwd(),
+      integrations: Array.isArray(local?.integrations) ? local.integrations : [],
+      note: 'workspace scope only. pass --global for account-level mail/chat/code hosts.',
+    };
+    if (json) {
+      console.log(JSON.stringify(payload, null, 2));
+      return 0;
+    }
+    console.log('Integration Status (workspace)\n');
+    if (!payload.integrations.length) {
+      console.log('  (none configured in this workspace)');
+    } else {
+      for (const name of payload.integrations) console.log(`  • ${name}`);
+    }
+    console.log('\nPass --global to check account-level gmail/slack/github status.');
+    return 0;
+  }
+
   const token = await getAuthToken();
+  const rows = [];
 
-  console.log('🔌 Integration Status:\n');
+  console.log('🔌 Integration Status (global):\n');
 
   const integrations = ['gmail', 'google-calendar', 'slack', 'twitter', 'github'];
 
@@ -1606,19 +1962,31 @@ async function integrationsStatus() {
       const icon = connected ? '✅' : '❌';
       const displayName = name.replace('google-', '').replace('-', ' ');
       console.log(`  ${icon} ${displayName}`);
+      rows.push({ name, connected: Boolean(connected) });
     } catch {
       console.log(`  ❓ ${name}`);
+      rows.push({ name, connected: null });
     }
   }
 
   const imessage = imessageDoctor();
   console.log(`  ${imessage.connected ? '✅' : '❌'} iMessage (local Mac)`);
+  rows.push({ name: 'imessage', connected: Boolean(imessage.connected) });
 
   console.log('\nConnect integrations at: https://atris.ai/dashboard/settings');
+  if (json) {
+    console.log(JSON.stringify({ scope: 'global', integrations: rows }, null, 2));
+  }
+  return 0;
 }
 
 module.exports = {
   gmailCommand,
+  gmailConnect,
+  gmailUse,
+  extractGmailMailboxAccount,
+  parseGmailArgs,
+  gmailAccountStatePath,
   calendarCommand,
   twitterCommand,
   slackCommand,
@@ -1627,6 +1995,7 @@ module.exports = {
   integrationsStatus,
   parseCalendarSearchArgs,
   filterCalendarEventsForSearch,
+  formatCalendarEvents,
   formatCalendarSearchResults,
   formatCalendarSearchError,
 };

package/commands/interview.js

@@ -153,6 +153,14 @@ async function interviewCommand(args = [], root = process.cwd()) {
     return 0;
   }
 
+  const { refuseHeadlessUnless } = require('../lib/noninteractive');
+  if (refuseHeadlessUnless(args, {
+    allowYes: true,
+    usage: 'Usage: atris interview [subject] [--yes]\nHeadless interview needs --yes.',
+  })) {
+    return 2;
+  }
+
   const ws = findWorkspaceRoot(root);
   if (!ws) {
     console.error('✗ Not inside an Atris workspace (no atris/ directory found).');