atris 3.58.6 → 3.58.8

package/commands/aeo.js

@@ -15,32 +15,29 @@
  *   atris aeo discover <source> [...]       # discovery audit
  *   atris aeo audit <source> [...]          # agent-usability audit
  *
- * Local workspace resolution: $ATRIS_AEO_ROOT or legacy $ATRIS_BACKEND_ROOT.
+ * Local workspace resolution: $ATRIS_AEO_ROOT or the configured backend root.
  */
 
 const fs = require('fs');
 const os = require('os');
 const path = require('path');
 const { spawnSync } = require('child_process');
+const { BACKEND_ROOT_HINT, resolveBackendRoot: resolveConfiguredBackendRoot } = require('../utils/backend-root');
 const { loadCredentials, abortOnAuthFailure } = require('../utils/auth');
 const { apiRequestJson } = require('../utils/api');
 const { loadBusinesses, saveBusinesses } = require('./business');
 
-function resolveBackendRoot() {
-  const candidates = [
-    process.env.ATRIS_AEO_ROOT,
-    process.env.ATRIS_BACKEND_ROOT,
-  ].filter(Boolean);
-  for (const root of candidates) {
-    if (fs.existsSync(path.join(root, 'atris', 'features', 'aeo'))) return root;
-  }
-  return null;
+function resolveAeoRoot() {
+  const explicit = process.env.ATRIS_AEO_ROOT;
+  if (explicit && fs.existsSync(path.join(explicit, 'atris', 'features', 'aeo'))) return explicit;
+  const backend = resolveConfiguredBackendRoot();
+  return backend && fs.existsSync(path.join(backend, 'atris', 'features', 'aeo')) ? backend : null;
 }
 
 function requireBackendRoot() {
-  const root = resolveBackendRoot();
+  const root = resolveAeoRoot();
   if (!root) {
-    console.error('Cannot find local AEO workspace. Set ATRIS_AEO_ROOT to a workspace containing atris/features/aeo.');
+    console.error(`cannot find local aeo workspace; ${BACKEND_ROOT_HINT}`);
     process.exit(1);
   }
   return root;

package/commands/analytics.js

@@ -68,17 +68,14 @@ function analyticsAtris() {
     }
 
     // Parse timestamps for productivity hours. Match the journal heading
-    // format `### Title -- HH:MM` (the dashed form) and the legacy `**HH:MM:SS**` form.
-    const timestampMatches = content.match(/(?:\u2014|--)\s*(\d{2}):\d{2}(?::\d{2})?\b|\*\*(\d{2}):\d{2}(?::\d{2})?\*\*/g);
-    if (timestampMatches) {
-      timestampMatches.forEach(ts => {
-        const m = ts.match(/(\d{2}):/);
-        if (!m) return;
-        const hour = parseInt(m[1], 10);
-        if (Number.isFinite(hour) && hour >= 0 && hour < 24) {
-          hourCounts[hour] = (hourCounts[hour] || 0) + 1;
-        }
-      });
+    // formats `### Title -- HH:MM`, `### Title - HH:MM`, and legacy `**HH:MM:SS**`.
+    // Only heading lines count, so a prose range like "10:00 - 12:30" is not a timestamp.
+    const timestampPattern = /^#{2,4} .*(?:\u2014|--| - )\s*(\d{2}):\d{2}(?::\d{2})?\s*$|\*\*(\d{2}):\d{2}(?::\d{2})?\*\*/gm;
+    for (const match of content.matchAll(timestampPattern)) {
+      const hour = parseInt(match[1] || match[2], 10);
+      if (Number.isFinite(hour) && hour >= 0 && hour < 24) {
+        hourCounts[hour] = (hourCounts[hour] || 0) + 1;
+      }
     }
   });
 

package/commands/auth.js

@@ -102,6 +102,10 @@ function scopedTokenCandidate(credentials = {}) {
 }
 
 function canMintFromLogin(credentials = {}) {
+  if (credentials.source === 'agent_token_file') return false;
+  if (credentials.source === 'env' && Array.isArray(credentials.scopes) && credentials.scopes.length) {
+    return false;
+  }
   const login = firstNonEmptyString(credentials.token);
   const refresh = firstNonEmptyString(credentials.refresh_token);
   if (isAgentAccessToken(login) && !refresh) return false;
@@ -227,8 +231,10 @@ async function ensureBilledCommandAuth(scope, deps = {}) {
   const credentials = ensured?.credentials || await load(api) || {};
   const candidate = scopedTokenCandidate(credentials);
   const claims = decodeJwtClaims(candidate);
-  const scopes = claims?.scopes || credentials.agent_token_scopes || [];
-  const expiry = claims?.exp ? claims.exp * 1000 : Date.parse(credentials.agent_token_expires_at);
+  const scopes = claims?.scopes || credentials.agent_token_scopes || credentials.scopes || [];
+  const expiry = claims?.exp
+    ? claims.exp * 1000
+    : Date.parse(credentials.agent_token_expires_at || credentials.expires_at);
   if (!deps.forceMint && candidate && Array.isArray(scopes) && scopes.includes(wanted) && Number.isFinite(expiry) && expiry > Date.now()) {
     return { ok: true, token: candidate, minted: false, credentials };
   }

package/commands/autopilot.js

@@ -25,14 +25,15 @@ const {
   detectEndgameCompletion
 } = require('../lib/scorecard');
 const { REWARD_CONFIG, REWARD_CHECKSUM } = require('../lib/reward-config');
+const { ownerIdentity } = require('../utils/owner-identity');
 
 const pkg = require('../package.json');
 
 const PHASE_TIMEOUT = 600000; // 10 min per phase
 
 function looksOwnerClaimed(claimed) {
-  const text = String(claimed || '').toLowerCase();
-  return /\bkeshav(?:rao)?\b/.test(text) || /\b(owner|human|operator)\b/.test(text);
+  const text = String(claimed || '').trim().toLowerCase();
+  return /\b(owner|human|operator)\b/.test(text) || ownerIdentity().names.includes(text.split(/\s+/)[0]);
 }
 
 function looksOwnerGatedTitle(title) {
@@ -640,7 +641,7 @@ function getContextFiles(phase, options = {}) {
 // checkout is forbidden (COORDINATION.md Rule 4). Interpolated into the
 // default and self-heal do prompts, never the benchmark prompt (it never
 // commits).
-const SHARED_CHECKOUT_GIT_CONTRACT = `- Shared-checkout git safety (COORDINATION.md Rule 4): edits to any repo OTHER than this tick's cwd (../atrisos-backend-style sibling repos) go through a per-tick worktree, start with \`atris worktree start --member <member> --task "<task>"\`, land with \`atris worktree ship --message "<msg>" --verify "<cmd>"\`. Never edit a sibling repo's shared checkout directly.
+const SHARED_CHECKOUT_GIT_CONTRACT = `- Shared-checkout git safety (COORDINATION.md Rule 4): edits to any repo OTHER than this tick's cwd (including sibling repos) go through a per-tick worktree, start with \`atris worktree start --member <member> --task "<task>"\`, land with \`atris worktree ship --message "<msg>" --verify "<cmd>"\`. Never edit a sibling repo's shared checkout directly.
 - On a shared checkout, \`git reset\`, \`git checkout --\`, \`git clean\`, and stashing other agents' work are FORBIDDEN, concurrent ticks' uncommitted work lives there.`;
 
 /**

package/commands/avail.js

@@ -308,7 +308,7 @@ async function slotsAvail(argv) {
   if (!username) {
     const identity = await apiRequestJson('/identity/me', { method: 'GET', token });
     if (!identity.ok || !identity.data?.username) {
-      console.error('Could not resolve username, pass --user keshav');
+      console.error('could not resolve username; pass --user <username>.');
       return 1;
     }
     username = identity.data.username;

package/commands/brain.js

@@ -3,6 +3,7 @@ const path = require('path');
 const crypto = require('crypto');
 const { spawnSync } = require('child_process');
 const { refreshNowFile } = require('./now');
+const { ownerIdentity } = require('../utils/owner-identity');
 const escapeRegExp = require('../lib/escape-regexp');
 const { hasRenderedSections, isOpenSection, isDoneSection } = require('../lib/todo-sections');
 const { isNonInteractive } = require('../lib/noninteractive');
@@ -794,7 +795,8 @@ function memberNextMove(member, state = null) {
   if (member.slug === 'justin' || /justin/i.test(member.name || '')) {
     return `${name}: run one customer-moving GTM rep, update the relevant workspace state within 10 minutes, and leave a scorecard.`;
   }
-  if (member.slug === 'keshav' || /keshav/i.test(member.name || '')) {
+  const ownerNames = ownerIdentity().names;
+  if (ownerNames.includes(String(member.slug || '').toLowerCase()) || ownerNames.includes(String(member.name || '').toLowerCase())) {
     return `${name}: act as Customer 0: choose one allocation, narrative, system, or talent leverage move; leave proof and route the next owner.`;
   }
   if (/opus|overnight/i.test(identity)) {
@@ -1774,6 +1776,7 @@ function brainCommand(args = process.argv.slice(3)) {
 }
 
 module.exports = {
+  readText,
   brainCommand,
   collectState,
   renderStatus,

package/commands/business.js

@@ -13,6 +13,10 @@ const {
   renderDryRun,
 } = require('../lib/business-simulate');
 
+function businessWorkspaceBase() {
+  return process.env.ATRIS_BUSINESS_ROOT || path.join(os.homedir(), 'arena', 'atris-business');
+}
+
 function getBusinessConfigPath() {
   const home = require('os').homedir();
   const dir = path.join(home, '.atris');
@@ -179,7 +183,7 @@ function buildBusinessCacheEntry(business, localSlug, existing = {}) {
   return entry;
 }
 
-function readBusinessFolderBindings(rootDir = path.join(os.homedir(), 'arena', 'atris-business')) {
+function readBusinessFolderBindings(rootDir = businessWorkspaceBase()) {
   const skip = new Set([
     '.git', '.DS_Store', 'archive', 'archives', '_archive', 'bench', 'deals',
     'node_modules', 'shelf', '_shelf', 'templates',
@@ -510,7 +514,7 @@ function resolveWorkspaceRoot(slug, options = {}) {
   if (options.noLocal) return null;
   if (options.here) return options.cwd || process.cwd();
   if (options.root) return path.join(options.root, slug);
-  return path.join(os.homedir(), 'arena', 'atris-business', slug);
+  return path.join(businessWorkspaceBase(), slug);
 }
 
 function createCanonicalBusinessWorkspace(targetRoot, bizMeta, options = {}) {
@@ -1851,7 +1855,7 @@ async function addBusiness(slug) {
 }
 
 async function listBusinesses(opts = {}) {
-  // --local mode: walk ~/arena/atris-business/ and show fleet status table
+  // --local mode: walk the configured business workspace folder
   // (no API calls, rate-limit safe). Different from API-mode below which lists
   // businesses cached from the API.
   if (opts.local) {
@@ -1877,7 +1881,7 @@ async function listBusinesses(opts = {}) {
 }
 
 /**
- * Walk ~/arena/atris-business/ and print a fleet status table for every
+ * Walk the configured business folder and print a fleet status table for every
  * customer workspace. Pure local, no API calls, no rate-limit risk.
  *
  * Classifies each dir as: ready, flat, unbound, nested, bare, or superseded.
@@ -1891,7 +1895,7 @@ function listBusinessesLocal(opts = {}) {
   const SKIP_DIRS = new Set(['deals', 'archive', 'archives', '_archive', 'templates', 'node_modules', '.git']);
   const SKIP_FILES = new Set(['.DS_Store', 'Thumbs.db']);
 
-  const rootDir = opts.root || path.join(os.homedir(), 'arena', 'atris-business');
+  const rootDir = opts.root || businessWorkspaceBase();
   const jsonMode = opts.json === true;
 
   if (!fs.existsSync(rootDir)) {
@@ -2609,7 +2613,7 @@ function parseBusinessDoctorOptions(args = []) {
   const options = {
     fix: args.includes('--fix'),
     json: args.includes('--json'),
-    root: path.join(os.homedir(), 'arena', 'atris-business'),
+    root: businessWorkspaceBase(),
   };
   const rootIdx = args.indexOf('--root');
   if (rootIdx !== -1 && args[rootIdx + 1]) {
@@ -2623,7 +2627,7 @@ function printBusinessDoctorHelp() {
   console.log('');
   console.log('Checks cloud-active businesses against:');
   console.log('  - ~/.atris/businesses.json');
-  console.log('  - ~/arena/atris-business/*/.atris/business.json');
+  console.log(`  - ${businessWorkspaceBase()}/*/.atris/business.json`);
   console.log('  - canonical slug + alias bindings');
   console.log('');
   console.log('--fix rewrites only safe local cache entries. It does not rename folders or touch cloud data.');
@@ -3454,7 +3458,7 @@ async function quickstart() {
      atris business init "My Company" --template saas
 
   2. Open the local workspace:
-     cd ~/arena/atris-business/my-company
+     cd ${businessWorkspaceBase()}/my-company
 
   3. See what Atris knows:
      atris
@@ -3675,6 +3679,7 @@ async function businessCommand(subcommand, ...args) {
 
 module.exports = {
   businessCommand,
+  businessWorkspaceBase,
   loadBusinesses,
   saveBusinesses,
   businessMatchesSlug,

package/commands/close.js

@@ -5,6 +5,7 @@ const { spawnSync } = require('child_process');
 const { knownCommands } = require('../lib/known-commands');
 const { readUsage, usagePath } = require('../lib/usage');
 const pulse = require('../lib/pulse');
+const { isOwner } = require('../utils/owner-identity');
 const { parseLessons } = require('./autopilot');
 
 const DAY_MS = 24 * 60 * 60 * 1000;
@@ -240,7 +241,7 @@ function parkedFlags(cwd = process.cwd(), options = {}) {
 }
 
 function ownerWaitRank(flag) {
-  return /^(you|me|operator|human|keshav)$/.test(String(flag.owner || '').toLowerCase()) ? 0 : 1;
+  return isOwner(flag.owner) ? 0 : 1;
 }
 
 function compareOpenFlags(a, b) {

package/commands/computer.js

@@ -23,8 +23,9 @@ const path = require('path');
 const readline = require('readline');
 const { spawnSync } = require('child_process');
 const { loadCredentials, decodeJwtClaims, promptUser, abortOnAuthFailure } = require('../utils/auth');
+const { resolveBackendRoot } = require('../utils/backend-root');
 const { apiRequestJson, getApiBaseUrl, getAppBaseUrl } = require('../utils/api');
-const { loadBusinesses, saveBusinesses } = require('./business');
+const { businessWorkspaceBase, loadBusinesses, saveBusinesses } = require('./business');
 const {
   engineLoginSeatError,
   formatEngineSeats,
@@ -37,6 +38,7 @@ const {
 const { consoleCommand, gatherAtrisContext, buildSystemPrompt } = require('./console');
 const { streamSession } = require('./serve');
 const { buildRemoteAtrisBootstrapCommand } = require('../lib/runtime-bootstrap');
+const { envForcesNonInteractive } = require('../lib/noninteractive');
 
 function getToken() {
   const creds = loadCredentials();
@@ -270,11 +272,11 @@ const ui = {
 };
 
 function useInteractiveCloudUi() {
-  return Boolean(process.stdin.isTTY && process.stdout.isTTY && !process.env.ATRIS_NO_INTERACTIVE);
+  return Boolean(process.stdin.isTTY && process.stdout.isTTY && !envForcesNonInteractive());
 }
 
 function useInteractiveTerminalUi() {
-  return Boolean(process.stdin.isTTY && process.stdout.isTTY && !process.env.ATRIS_NO_INTERACTIVE);
+  return Boolean(process.stdin.isTTY && process.stdout.isTTY && !envForcesNonInteractive());
 }
 
 async function readPipedStdin() {
@@ -517,7 +519,7 @@ function displayHomeRelativePath(targetPath) {
 }
 
 function recruitingBusinessWorkspacePath(slug = RECRUITING_BUSINESS_SLUG) {
-  const root = process.env.ATRIS_BUSINESS_ROOT || path.join(os.homedir(), 'arena', 'atris-business');
+  const root = businessWorkspaceBase();
   return path.join(root, slug);
 }
 
@@ -1371,11 +1373,12 @@ function printModeBanner(mode, root, lines = []) {
 
 function findAtrisCodeTerminal() {
   const envPath = process.env.ATRIS_CODE_PY;
+  const backend = resolveBackendRoot();
   const candidates = [
     envPath,
     path.join(__dirname, '..', 'cli', 'atris_code.py'),
     path.join(process.cwd(), 'cli', 'atris_code.py'),
-    path.join(os.homedir(), 'arena', 'atrisos-backend', 'cli', 'atris_code.py'),
+    ...(backend ? [path.join(backend, 'cli', 'atris_code.py')] : []),
   ].filter(Boolean);
 
   let dir = process.cwd();
@@ -2534,7 +2537,7 @@ async function computerCreate(token, args = [], defaults = {}) {
   console.log(`  atris computer --business ${owner} --workspace ${workspaceId}`);
   console.log('');
   console.log('Org workspace:');
-  console.log(`  cd ~/arena/atris-business/${owner}`);
+  console.log(`  cd ${businessWorkspaceBase()}/${owner}`);
   console.log('  atris member activate operator');
   console.log('  atris member activate validator');
   console.log('');
@@ -3500,7 +3503,7 @@ async function sendBusinessChat(token, ctx, message, sessionId, resetContext = f
 async function computerChat(token, ctx, initialOptions = {}) {
   if (!ctx) {
     console.error('Cloud computer mode requires a bound business workspace.');
-    console.error('Run this inside ~/arena/atris-business/<slug>/, or use `atris computer --local` for local mode.');
+    console.error('run this inside a bound business workspace, or use `atris computer --local` for local mode.');
     return;
   }
 
@@ -3741,7 +3744,7 @@ async function computerChat(token, ctx, initialOptions = {}) {
 async function computerLocalAtris(token, ctx, initialOptions = {}) {
   if (!ctx) {
     console.error('Atris local mode needs a bound business workspace for the cloud brain.');
-    console.error('Run inside ~/arena/atris-business/<slug>/, or use `atris computer local-byo`.');
+    console.error('run inside a bound business workspace, or use `atris computer local-byo`.');
     return;
   }
 
@@ -3976,7 +3979,7 @@ async function computerLocalAtris(token, ctx, initialOptions = {}) {
 async function computerProof(token, ctx, initialOptions = {}) {
   if (!ctx) {
     console.error('Atris computer proof needs a bound business workspace.');
-    console.error('Run inside ~/arena/atris-business/<slug>/ first.');
+    console.error('run inside a bound business workspace first.');
     process.exitCode = 1;
     return;
   }
@@ -4290,7 +4293,7 @@ async function runComputer(argv = process.argv.slice(3), deps = {}) {
     console.log('A business can be a company, lab, collective, community, artist, team, or project.');
     console.log('');
     console.log('First use:');
-    console.log('  cd ~/arena/atris-business/<business>');
+    console.log(`  cd ${businessWorkspaceBase()}/<business>`);
     console.log('  atris computer');
     console.log('  Choose Cloud workspace or Local folder, then type the outcome in plain English.');
     console.log('');
@@ -4470,6 +4473,8 @@ module.exports = {
   extractAttachedWorkspaceMismatch,
   contextForAttachedWorkspaceMismatch,
   printRecruitingLocalSyncOutcome,
+  useInteractiveCloudUi,
+  useInteractiveTerminalUi,
   // Hermetic parsing/formatting layer, exported for test/computer.test.js.
   parseComputerOptions,
   parseComputerCreateArgs,

package/commands/context-sync.js

@@ -64,7 +64,7 @@ async function businessStatus(slug) {
   const timeSince = manifest ? _timeSince(manifest.last_sync) : null;
 
   console.log('');
-  console.log(`${biz.name}` + (timeSince ? ` \u2014 last synced ${timeSince}` : ' \u2014 never synced'));
+  console.log(`${biz.name}` + (timeSince ? `: last synced ${timeSince}` : ': never synced'));
 
   // Determine local directory
   let localDir = null;
@@ -254,11 +254,11 @@ async function businessLog(slug) {
 
   const commits = result.data.commits || [];
   if (commits.length === 0) {
-    console.log(`\n  ${biz.name} \u2014 no history yet.\n`);
+    console.log(`\n  ${biz.name}: no history yet.\n`);
     return;
   }
 
-  console.log(`\n  ${biz.name} \u2014 history\n`);
+  console.log(`\n  ${biz.name}: history\n`);
 
   for (const commit of commits) {
     const date = _timeSince(commit.date) || commit.date;