atris 3.74.8 → 3.74.10

package/commands/auth.js

@@ -1,4 +1,4 @@
-const { AGENT_TOKEN_EXPIRED_DETAIL, decodeJwtClaims, loadCredentials, saveCredentials, saveAgentClientCredentials, preserveAgentClientLogin, deleteCredentials, getCredentialsPath, openBrowser, promptUser, displayAccountSummary, ensureValidCredentials, loadProfile, listProfiles, profileNameFromEmail, deleteProfile, saveProfile, getTokenExpiryEpochSeconds, getTerminalSessionId, setSessionProfile, getSessionProfile, cleanStaleSessions, getSessionsDir } = require('../utils/auth');
+const { AGENT_TOKEN_EXPIRED_DETAIL, assertSafeLoginWrite, decodeJwtClaims, loadCredentials, saveCredentials, saveAgentClientCredentials, preserveAgentClientLogin, deleteCredentials, getCredentialsPath, openBrowser, promptUser, displayAccountSummary, ensureValidCredentials, loadProfile, listProfiles, profileNameFromEmail, deleteProfile, saveProfile, getTokenExpiryEpochSeconds, getTerminalSessionId, setSessionProfile, getSessionProfile, cleanStaleSessions, getSessionsDir } = require('../utils/auth');
 const { getAppBaseUrl, getApiBaseUrl, apiRequestJson } = require('../utils/api');
 const { isNonInteractive, wantsJson } = require('../lib/noninteractive');
 const { hasFlag, readFlag } = require('../lib/arg-parser');
@@ -939,6 +939,7 @@ function activeProfileName(credentials) {
 function writeGlobalCredentials(profile) {
   const kept = preserveAgentClientLogin();
   const credentialsPath = getCredentialsPath();
+  assertSafeLoginWrite(credentialsPath);
   fs.writeFileSync(credentialsPath, JSON.stringify(profile, null, 2));
   try { fs.chmodSync(credentialsPath, 0o600); } catch {}
   return kept;
@@ -1167,7 +1168,7 @@ function resolveProfile() {
       const profile = loadProfile(p);
       return profile?.email?.toLowerCase().includes(q);
     });
-  if (match) {
+  if (match && loadProfile(match)) {
     process.stdout.write(match);
     process.exit(0);
   }
@@ -1251,7 +1252,7 @@ function shellInit() {
     '  if [[ $? -eq 0 && "$_tty" == /dev/* ]]; then echo "$_tty"; return; fi',
     '}',
     'atris() {',
-    '  if [[ "$1" == "switch" && -n "$2" && "$2" != "--"* ]]; then',
+    '  if [[ "$1" == "switch" && -n "$2" && "$2" != "-"* ]]; then',
     '    local _profile',
     '    _profile=$(command atris _resolve "$2" 2>/dev/null)',
     '    if [[ $? -eq 0 && -n "$_profile" ]]; then',

package/commands/computer.js

@@ -3547,25 +3547,27 @@ async function computerChat(token, ctx, initialOptions = {}) {
   }
 
   if (scriptedInput !== null) {
-    for (const rawLine of scriptedInput.split(/\r?\n/)) {
+    const messages = oneShotMessage ? [scriptedInput] : scriptedInput.split(/\r?\n/);
+    for (const rawLine of messages) {
       const line = String(rawLine || '').trim();
       if (!line) continue;
-      if (line === '/exit' || line === '/quit') break;
-      if (line.startsWith('/run ')) {
+      const isCommand = line.startsWith('/') && !/[\r\n]/.test(line);
+      if (isCommand && (line === '/exit' || line === '/quit')) break;
+      if (isCommand && line.startsWith('/run ')) {
         await computerRun(token, line.slice(5), ctx);
         continue;
       }
-      if (line === '/pwd') {
+      if (isCommand && line === '/pwd') {
         await computerRun(token, 'pwd', ctx);
         continue;
       }
-      if (line === '/audit' || line.startsWith('/audit ')) {
+      if (isCommand && (line === '/audit' || line.startsWith('/audit '))) {
         const rawLimit = line.split(/\s+/, 2)[1];
         const limit = rawLimit ? Number.parseInt(rawLimit, 10) : 10;
         await computerAudit(token, ctx, Number.isFinite(limit) ? limit : 10);
         continue;
       }
-      if (line.startsWith('/')) {
+      if (isCommand) {
         const command = line.split(/\s+/, 1)[0];
         if (!KNOWN_CHAT_COMMANDS.has(command)) {
           console.log(`Unknown command: ${command}`);
@@ -3573,7 +3575,7 @@ async function computerChat(token, ctx, initialOptions = {}) {
         }
         continue;
       }
-      sessionId = await sendBusinessChat(token, ctx, line, sessionId, false, null, {
+      sessionId = await sendBusinessChat(token, ctx, oneShotMessage ? rawLine : line, sessionId, false, null, {
         worker,
         model,
         systemPrompt: chatSystemPrompt,

package/commands/context-sync.js

@@ -204,7 +204,8 @@ async function businessDiff(slug) {
     const localContent = fs.readFileSync(localPath, 'utf8');
 
     if (f.isNew) {
-      console.log(`  + ${f.path.replace(/^\//, '')}  (new file, ${localContent.split('\n').length} lines)`);
+      const lineCount = localContent.split('\n').length - (localContent.endsWith('\n') ? 1 : 0);
+      console.log(`  + ${f.path.replace(/^\//, '')}  (new file, ${lineCount} lines)`);
     } else {
       // Show a simple line-count diff
       console.log(`  ~ ${f.path.replace(/^\//, '')}  (modified)`);

package/commands/gm.js

@@ -797,19 +797,20 @@ function tail(text, used, width) {
   return clip(text, Math.max(10, width - used));
 }
 
-// Last guard on width: a long line breaks after a comma onto an indented
-// line; anything still too long ends in "...".
+// Last guard on width, in terminal columns: a long line breaks after a
+// comma onto an indented line; anything still too long ends in "...".
 function fitLines(lines, width) {
+  const { displayWidth, sliceColumns } = require('../lib/text-table');
   const out = [];
   for (const line of lines) {
     let rest = line;
-    while (rest.length > width) {
-      const cut = rest.lastIndexOf(', ', width - 1);
+    while (displayWidth(rest) > width) {
+      const cut = rest.lastIndexOf(', ', sliceColumns(rest, width).length - 1);
       if (cut <= 0) break;
       out.push(rest.slice(0, cut + 1));
       rest = `  ${rest.slice(cut + 2)}`;
     }
-    out.push(rest.length > width ? `${rest.slice(0, width - 3)}...` : rest);
+    out.push(displayWidth(rest) > width ? `${sliceColumns(rest, width - 3)}...` : rest);
   }
   return out;
 }
@@ -830,13 +831,30 @@ function boardWorkspaceRoot(args = []) {
   return taskDb.workspaceRoot(path.resolve(workspaceArg));
 }
 
+// The team page's cells (role, ovr, engine) for each roster member, read
+// only when the board draws its box in a terminal; null otherwise.
+function boardCells(board, workspaceRoot, ratings) {
+  if (!process.stdout.isTTY || !workspaceRoot) return null;
+  return require('../lib/gm-bet').teamCells(workspaceRoot, board.roster.map(r => r.name), { ratings });
+}
+
 function loadBoard(workspaceRoot, options = {}) {
+  return loadSeasonBoard(workspaceRoot, options).board;
+}
+
+// The board and every member's rating (gm-season memberRatings, the same
+// numbers the orb's team page reads) from one read of the season.
+function loadSeasonBoard(workspaceRoot, options = {}) {
   const season = require('../lib/gm-season');
-  return season.seasonBoard(season.loadSeason(workspaceRoot, { lastSeen: options.lastSeen }), options);
+  const played = season.loadSeason(workspaceRoot, { lastSeen: options.lastSeen });
+  return { board: season.seasonBoard(played, options), ratings: season.memberRatings(played.outcomes || []) };
 }
 
 // One screen, about 40 rows at most. Pure: board in, lines out.
-function renderBoardLines(board, { interactive = false, width = termWidth() } = {}) {
+// In a terminal, given the team page's cells, the roster is the orb's team
+// table as a divided box (member, role, ovr, engine, status); piped, or when
+// the box cannot fit the width, it keeps the plain columns.
+function renderBoardLines(board, { interactive = false, width = termWidth(), bordered = Boolean(process.stdout.isTTY), cells = null } = {}) {
   const { clockLabel } = require('../lib/gm-season');
   const lines = [];
   const nameW = nameWidth([
@@ -856,7 +874,12 @@ function renderBoardLines(board, { interactive = false, width = termWidth() } =
   lines.push('');
 
   lines.push('roster, last 30 days');
-  if (board.roster.length) {
+  const boxed = bordered && cells && board.roster.length
+    ? require('../lib/gm-bet').teamBox(board.roster.map(r => ({ member: r.name, status: r.status })), cells, { width: width - 2 })
+    : null;
+  if (boxed) {
+    lines.push(...boxed.split('\n').map(line => `  ${line}`));
+  } else if (board.roster.length) {
     lines.push(`  ${pad('name', nameW)}${pad('ovr', 8)}${pad('form', 7)}${pad('record', 18)}status`);
     for (const row of board.roster) {
       const record = `landed ${row.landed} of ${row.jobs}`;
@@ -913,9 +936,10 @@ function renderBoardLines(board, { interactive = false, width = termWidth() } =
   }
   lines.push('');
 
-  lines.push('key: ovr 60 to 99 = share of finished jobs landed, rookie under 3 finished,');
+  lines.push(`key: ovr 60 to 99 = share of finished jobs landed, ${boxed ? 'new' : 'rookie'} under 3 finished,`);
   lines.push('     stricter than the website rating on purpose (drops and abandons count)');
-  lines.push('     form: last 5, newest right: k landed, d dropped, x sent back, a abandoned');
+  if (boxed) lines.push('     ·· = nothing to show yet: no finished job, no role, or no pinned model');
+  else lines.push('     form: last 5, newest right: k landed, d dropped, x sent back, a abandoned');
   lines.push('     hours: claim to result. on a job: moved in the last 6h. review: pending');
   if (interactive) for (const line of PLAY_KEYS) lines.push(line);
   else lines.push('     run atris gm in a terminal to play');
@@ -990,9 +1014,10 @@ function printLeague() {
 }
 
 function printBoard(args = []) {
-  const board = loadBoard(boardWorkspaceRoot(args));
+  const root = boardWorkspaceRoot(args);
+  const { board, ratings } = loadSeasonBoard(root);
   if (board.error) return failRead(board.error);
-  console.log(renderBoardLines(board).join('\n'));
+  console.log(renderBoardLines(board, { cells: boardCells(board, root, ratings) }).join('\n'));
   return undefined;
 }
 
@@ -1107,11 +1132,11 @@ async function gmPlay(args = []) {
         leagueRowsSeen = [...board.rows, ...(board.hidden_clubs || [])];
         write(renderLeagueLines(board, { interactive: true }).join('\n'));
       } else {
-        const board = loadBoard(workspaceRoot, { seen, lastSeen });
+        const { board, ratings } = loadSeasonBoard(workspaceRoot, { seen, lastSeen });
         lastBoard = board;
         seen = new Set(board.last_plays.map(play => play.id));
         stuck = board.stuck || [];
-        write(renderBoardLines(board, { interactive: true }).join('\n'));
+        write(renderBoardLines(board, { interactive: true, cells: boardCells(board, workspaceRoot, ratings) }).join('\n'));
         season.writeLastSeen(workspaceRoot, board.now);
       }
     } catch (err) {
@@ -1986,9 +2011,11 @@ async function gmCommand(...args) {
 }
 
 module.exports = {
+  boardCells,
   displayCommand,
   ensureStarterMission,
   gmCommand,
+  loadSeasonBoard,
   pickClub,
   playAction,
   renderBoardLines,

package/commands/integrations.js

@@ -1226,7 +1226,8 @@ async function calendarSearch(args = []) {
 }
 
 async function calendarToday() {
-  await calendarRange("Today's events", { days: 1 });
+  const { start, end } = localDayBounds();
+  await calendarRange("Today's events", { timeMin: start.toISOString(), timeMax: end.toISOString() });
 }
 
 async function calendarYesterday() {

package/commands/member.js

@@ -3,7 +3,7 @@ const path = require('path');
 const crypto = require('crypto');
 const os = require('os');
 const { execFileSync, spawnSync } = require('child_process');
-const { loadCredentials } = require('../utils/auth');
+const { loadCredentials, ensureFreshCredentials } = require('../utils/auth');
 const { resolveBackendRoot } = require('../utils/backend-root');
 const { apiRequestJson } = require('../utils/api');
 const { runAliveTick } = require('../lib/member-alive');
@@ -4942,7 +4942,7 @@ async function memberPush(name) {
     process.exit(1);
   }
 
-  const creds = loadCredentials();
+  const creds = await ensureFreshCredentials(apiRequestJson);
   if (!creds || !creds.token) {
     console.error('Not logged in. Run: atris login');
     process.exit(1);
@@ -5007,7 +5007,7 @@ async function memberPush(name) {
 // --- PULL subcommand ---
 
 async function memberPull(nameOrAgentId) {
-  const creds = loadCredentials();
+  const creds = await ensureFreshCredentials(apiRequestJson);
   if (!creds || !creds.token) {
     console.error('Not logged in. Run: atris login');
     process.exit(1);
@@ -11664,6 +11664,44 @@ async function memberStandupWalk(room, args = []) {
   return payload;
 }
 
+// The team page's cells (role, ovr, engine) per standup member, read only
+// when the standup can draw its table (a terminal); --json never carries
+// them. ovr comes from gm-season memberRatings, as on the orb's team page.
+function standupTableData(standup, cwd = process.cwd()) {
+  if (!process.stdout.isTTY) return { bordered: false };
+  const season = require('../lib/gm-season');
+  const root = require('../lib/task-db').workspaceRoot(path.resolve(cwd));
+  let ratings = new Map();
+  try {
+    const played = season.loadSeason(root, { lastSeen: null });
+    if (played && !played.error) ratings = season.memberRatings(played.outcomes || []);
+  } catch { ratings = new Map(); }
+  const cells = require('../lib/gm-bet').teamCells(root, standup.map((s) => s.member), { ratings });
+  return { bordered: true, cells };
+}
+
+// The standup: in a terminal the orb's team table as a divided box
+// (member, role, ovr, engine, status) with each member's found and push
+// lines under it; piped, or when the box cannot fit, the boxes it always had.
+function memberStandupLines(standup, { bordered = false, width = process.stdout.columns, cells = null } = {}) {
+  if (bordered && cells && standup.length) {
+    const table = require('../lib/gm-bet').teamBox(standup.map((s) => ({ member: s.member, status: s.status })), cells, { width: Number(width) - 2 });
+    if (table) {
+      return [
+        ...table.split('\n').map((line) => `  ${line}`),
+        ...standup.flatMap((s) => [`  ${s.member}`, `    found: ${s.latest_update}`, `    push:  ${s.next_push}`]),
+      ];
+    }
+  }
+  return standup.flatMap((s, idx) => [
+    `+-----------------------------------------------------------------------+`,
+    `| ${idx + 1}. ${s.member.toUpperCase()} (${s.role}) · ${s.status} · engine:${s.engine}`,
+    `|    Found:   ${s.latest_update}`,
+    `|    Push:    ${s.next_push}`,
+    `+-----------------------------------------------------------------------+`,
+  ]);
+}
+
 async function memberRoom(...args) {
   if (hasFlag(args, '--help') || hasFlag(args, '-h')) {
     console.log('Usage: atris member [day|standup|room] [--walk] [--limit N] [--decisions "y|idea|n"] [--json]');
@@ -11680,13 +11718,7 @@ async function memberRoom(...args) {
     ? `Your team runs on ${teamEngines.length > 1 ? `${teamEngines.slice(0, -1).join(', ')} and ${teamEngines[teamEngines.length - 1]}` : teamEngines[0]}.`
     : 'Your team picks an engine for each job.';
 
-  const standupRows = room.standup.flatMap((s, idx) => [
-    `+-----------------------------------------------------------------------+`,
-    `| ${idx + 1}. ${s.member.toUpperCase()} (${s.role}) · ${s.status} · engine:${s.engine}`,
-    `|    Found:   ${s.latest_update}`,
-    `|    Push:    ${s.next_push}`,
-    `+-----------------------------------------------------------------------+`,
-  ]);
+  const standupRows = memberStandupLines(room.standup, standupTableData(room.standup));
 
   const handoffRows = room.handoffs.length
     ? room.handoffs.map((h) => `  - ${h.from} -> ${h.to}: ${h.summary} (run: ${h.next_command})`)
@@ -12019,6 +12051,8 @@ async function memberCommand(subcommand, ...args) {
 
 module.exports = {
   logDateForScan,
+  memberStandupLines,
+  standupTableData,
   memberRunDefaultWallSeconds,
   memberRunWantsReferee,
   proposalPromptForGoal,

package/commands/ninety-nine.js

@@ -20,19 +20,26 @@ const {
   sessionStatus,
   sessionsToday,
   healthToday,
-  healthSummary,
 } = require('../lib/ninety-nine');
 
 function usage() {
   return [
     'usage: atris 99 focus <25|50|90>',
     '       atris 99 meditate <10|20|30>',
+    '       atris 99                         show the timer and today',
+    '       atris 99 <25|50|90>              start focus',
+    '       atris 99 <10|20|30>              start meditation',
+    '       atris 99 f <25|50|90>',
+    '       atris 99 m <10|20|30>',
+    '       atris 99 start <focus|meditate> <minutes>',
+    '       atris 99 again                   repeat the last finished session',
     '       atris 99 stop [note words]',
     '       atris 99 pause',
     '       atris 99 resume',
     '       atris 99 status [--json]',
     '       atris 99 today [--json]',
     '       atris 99 sync [--dry-run]',
+    '       atris 99 help | --help',
     '',
     'sync is off without a sync block in ~/.atris/99/config.json (ATRIS_99_CONFIG overrides it).',
     'personal: {"sync":{"target":"personal","app_slug":"project-99"}}',
@@ -152,6 +159,23 @@ function appendRecord(logPath, previousText, record) {
   return previousText + line;
 }
 
+function todayLine(result) {
+  return `Today: ${result.counts.focus} focus, ${result.counts.meditate} meditate, ${result.finished_minutes} min`;
+}
+
+function kindName(kind) {
+  return kind === 'focus' ? 'Focus' : 'Meditate';
+}
+
+function timeLeft(session, time) {
+  const seconds = sessionStatus(session, time).running.remaining_seconds;
+  return `${Math.floor(seconds / 60)}:${String(seconds % 60).padStart(2, '0')}`;
+}
+
+function localEndTime(end) {
+  return end.toLocaleTimeString('en-US', { hour: 'numeric', minute: '2-digit', hour12: true });
+}
+
 function ninetyNineAtris(args = process.argv.slice(3), {
   log = console.log,
   now = () => new Date(),
@@ -161,32 +185,48 @@ function ninetyNineAtris(args = process.argv.slice(3), {
   request,
   credentials,
 } = {}) {
-  const [action, ...rest] = args;
+  let [action, ...rest] = args;
+  const overview = args.length === 0;
   // Words after stop belong to its note, including the word "help".
   if ((action !== 'stop' && argsWantHelp(args)) || (action === 'stop' && ['--help', '-h'].includes(rest[0]))) {
     log(usage());
     return 0;
   }
   if (action === 'sync') return syncNinetyNine(rest, { log, logPath, configPath, statePath, request, credentials });
+  if (action === 'start' && ['focus', 'meditate', 'f', 'm'].includes(rest[0])) [action, ...rest] = rest;
+  if (action === 'f') action = 'focus';
+  if (action === 'm') action = 'meditate';
+  for (const kind of ['focus', 'meditate']) {
+    if (validLength(kind, Number(action)) && String(Number(action)) === action) {
+      rest.unshift(action);
+      action = kind;
+      break;
+    }
+  }
   const json = rest.includes('--json');
   if (action === 'focus' || action === 'meditate') {
+    const lengths = action === 'focus' ? '25 | 50 | 90' : '10 | 20 | 30';
+    if (rest.length === 0) {
+      log(`Pick a length: atris 99 ${action} ${lengths}`);
+      return 1;
+    }
     if (rest.length !== 1 || !validLength(action, Number(rest[0])) || String(Number(rest[0])) !== rest[0]) {
-      log(action === 'focus' ? 'choose focus 25, 50, or 90 minutes' : 'choose meditate 10, 20, or 30 minutes');
-      return 2;
+      log(`Allowed ${action} lengths: ${lengths.replaceAll(' | ', ', ')} minutes.`);
+      return 1;
     }
   } else if (action === 'status' || action === 'today') {
     if (rest.length > 1 || (rest.length === 1 && !json)) {
       log(`usage: atris 99 ${action} [--json]`);
       return 2;
     }
-  } else if (action === 'pause' || action === 'resume') {
+  } else if (action === 'pause' || action === 'resume' || action === 'again') {
     if (rest.length) {
       log(`usage: atris 99 ${action}`);
       return 2;
     }
-  } else if (action !== 'stop') {
-    log(usage());
-    return 2;
+  } else if (action !== 'stop' && !overview) {
+    log(`Unknown: ${action}. Try: atris 99 help`);
+    return 1;
   }
 
   let lock;
@@ -222,55 +262,75 @@ function ninetyNineAtris(args = process.argv.slice(3), {
 
     if (action === 'stop') {
       if (!stopTarget) {
-        log('nothing running');
+        log('Nothing running. Start one: atris 99 50');
         return 1;
       }
       const end = endRecord(stopTarget, time, rest.join(' '));
       appendRecord(file, text, end);
-      log(`${stopTarget.kind} ${end.status}: ${end.status === 'done' ? stopTarget.planned_min : 0} finished minutes`);
+      records.push(end);
+      log(end.status === 'done'
+        ? `${kindName(stopTarget.kind)} ${stopTarget.planned_min} done.`
+        : "Stopped early, so it doesn't count.");
+      log(todayLine(sessionsToday(foldSessions(records), time)));
       return 0;
     }
 
     sessions = foldSessions(records);
     active = runningSession(sessions, time);
-    if (action === 'focus' || action === 'meditate') {
+    if (action === 'again') {
+      const previous = sessions.filter((session) => session.status === 'done')
+        .sort((a, b) => Date.parse(b.ended_at) - Date.parse(a.ended_at))[0];
+      if (!previous) {
+        log('No finished session yet. Try: atris 99 50');
+        return 1;
+      }
+      action = previous.kind;
+      rest = [String(previous.planned_min)];
+    }
+    if (overview) {
+      if (!active) log('Nothing running.');
+      else log(`${kindName(active.kind)} · ${timeLeft(active, time)} left${active.status === 'paused' ? ' · paused' : ''}`);
+      log(todayLine(sessionsToday(sessions, time)));
+      log('Start: atris 99 50   Again: atris 99 again   Help: atris 99 help');
+    } else if (action === 'focus' || action === 'meditate') {
       if (active) {
         log('a session is already running; use atris 99 stop first');
         return 1;
       }
       appendRecord(file, text, startRecord(action, Number(rest[0]), time, randomUUID()));
-      log(`${action} started for ${rest[0]} minutes`);
+      const end = new Date(time.getTime() + Number(rest[0]) * 60000);
+      log(`${kindName(action)} ${rest[0]} started. Ends at ${localEndTime(end)}.`);
     } else if (action === 'pause' || action === 'resume') {
-      let record;
-      try {
-        record = action === 'pause' ? pauseRecord(active, time) : resumeRecord(active, time);
-      } catch (error) {
-        log(error.message);
+      if (!active) {
+        log('Nothing running. Start one: atris 99 50');
+        return 1;
+      }
+      if (action === 'pause' && active.status === 'paused') {
+        log('Already paused. Resume: atris 99 resume');
+        return 1;
+      }
+      if (action === 'resume' && active.status !== 'paused') {
+        log('Not paused.');
         return 1;
       }
+      const record = action === 'pause' ? pauseRecord(active, time) : resumeRecord(active, time);
       appendRecord(file, text, record);
-      log(`${active.kind} ${action === 'pause' ? 'paused' : 'resumed'}`);
+      if (action === 'pause') log(`Paused. ${timeLeft(active, time)} left.`);
+      else {
+        const end = new Date(Date.parse(active.planned_end_at) + time.getTime() - Date.parse(active.paused_at));
+        log(`Resumed. Ends at ${localEndTime(end)}.`);
+      }
     } else if (action === 'status') {
       const result = sessionStatus(active, time);
       if (json) log(JSON.stringify(result));
       else if (!active) log('nothing running');
-      else {
-        const seconds = result.running.remaining_seconds;
-        log(`${active.kind}: ${Math.floor(seconds / 60)}:${String(seconds % 60).padStart(2, '0')} left${active.status === 'paused' ? ' (paused)' : ''}`);
-      }
+      else log(`${kindName(active.kind)} · ${timeLeft(active, time)} left${active.status === 'paused' ? ' · paused' : ''}`);
     } else {
       const result = sessionsToday(sessions, time);
       const health = healthToday(records, time);
       if (health) result.health_day = health;
       if (json) log(JSON.stringify(result));
-      else {
-        for (const session of result.sessions) {
-          log(`${session.kind} ${session.planned_min} minutes: ${session.status}`);
-        }
-        log(`${result.finished_minutes} finished minutes today`);
-        log(`Today: ${result.counts.focus} focus, ${result.counts.meditate} meditate, ${result.finished_minutes} min`);
-        if (health) log(healthSummary(health));
-      }
+      else log(todayLine(result));
     }
     return 0;
   } catch (error) {

package/commands/orb.js

@@ -153,7 +153,7 @@ function unknownOrbFlags(args = []) {
 function tailLines(text, count = 60) {
   const lines = String(text || '').split(/\r?\n/);
   if (lines[lines.length - 1] === '') lines.pop();
-  return lines.slice(-count).join('\n');
+  return lines.slice(Math.max(0, lines.length - count)).join('\n');
 }
 
 async function runOrb(args = []) {

package/commands/pull.js

@@ -1,6 +1,6 @@
 const fs = require('fs');
 const path = require('path');
-const { loadCredentials, abortOnAuthFailure } = require('../utils/auth');
+const { ensureFreshCredentials, abortOnAuthFailure } = require('../utils/auth');
 const { apiRequestJson } = require('../utils/api');
 const { findAllMembers } = require('./member');
 const { loadConfig } = require('../utils/config');
@@ -158,7 +158,7 @@ async function pullAtris() {
     process.exit(1);
   }
 
-  const creds = loadCredentials();
+  const creds = await ensureFreshCredentials(apiRequestJson);
   if (!creds || !creds.token) {
     console.error('Not logged in. Run: atris login');
     process.exit(1);
@@ -206,7 +206,7 @@ async function pullAtris() {
 
 async function pullBusiness(slug) {
   const elapsedMs = startTimer();
-  const creds = loadCredentials();
+  const creds = await ensureFreshCredentials(apiRequestJson);
   if (!creds || !creds.token) {
     console.error('Not logged in. Run: atris login');
     process.exit(1);

package/commands/push.js

@@ -1,7 +1,7 @@
 const fs = require('fs');
 const path = require('path');
 const readline = require('readline');
-const { loadCredentials, abortOnAuthFailure } = require('../utils/auth');
+const { ensureFreshCredentials, abortOnAuthFailure } = require('../utils/auth');
 const { apiRequestJson } = require('../utils/api');
 const { loadBusinesses, saveBusinesses, businessMatchesSlug } = require('./business');
 const { loadManifest, saveManifest, buildManifest, computeLocalHashes, isIgnoredSyncPath, filterSyncFiles } = require('../lib/manifest');
@@ -457,7 +457,7 @@ async function pushAtris() {
   const timeoutSec = parsePushTimeoutSec(process.argv);
   let onlyPrefixes = null;
 
-  const creds = loadCredentials();
+  const creds = await ensureFreshCredentials(apiRequestJson);
   if (!creds || !creds.token) { console.error('Not logged in. Run: atris login'); process.exit(1); }
 
   // Determine source directory

package/commands/skill.js

@@ -549,6 +549,11 @@ function skillFix(name) {
   const skillsDir = path.join(process.cwd(), 'atris', 'skills');
   const allSkills = findAllSkills(skillsDir);
 
+  if (allSkills.length === 0) {
+    console.error('No skills found in atris/skills/.');
+    process.exit(1);
+  }
+
   const targets = name === '--all'
     ? allSkills
     : allSkills.filter(s => s.folder === name || s.leafFolder === name);

package/commands/soul.js

@@ -28,7 +28,8 @@ function readFile(filePath) {
 }
 
 function countFiles(dir) {
-  try { return fs.readdirSync(dir, { recursive: true }).filter(f => !f.startsWith('.')).length; } catch { return 0; }
+  const isFile = (f) => { try { return fs.statSync(path.join(dir, f)).isFile(); } catch { return false; } }; // a dead link skips itself, not the count
+  try { return fs.readdirSync(dir, { recursive: true }).filter(f => !f.startsWith('.') && isFile(f)).length; } catch { return 0; }
 }
 
 // ── Soul snapshot ──────────────────────────────────────

package/commands/stream.js

@@ -268,7 +268,8 @@ function makeEvent({ ts, agent, event, summary, raw, source, root }) {
   const ms = timestampMs(ts);
   if (!ms) return null;
   const cleanAgent = sanitizeAgent(agent);
-  const cleanSummary = sanitizeSummary(summary, cleanAgent);
+  // Snapshot headings are complete lines, not agent-prefixed activity.
+  const cleanSummary = sanitizeSummary(summary, event === 'snapshot' ? '' : cleanAgent);
   return {
     ts: new Date(ms).toISOString(),
     ms,
@@ -755,7 +756,7 @@ function renderJsonLine(record) {
     ts: record.ts,
     agent: sanitizeAgent(record.agent),
     event: record.event,
-    summary: sanitizeSummary(record.summary, record.agent),
+    summary: sanitizeSummary(record.summary, record.event === 'snapshot' ? '' : record.agent),
     raw: record.raw || null,
   });
 }

package/commands/strings.js

@@ -292,7 +292,7 @@ function stringsCommand(argv) {
   Pairs with 'atris slop' (how copy reads), strings governs what words you ship.
   The registry lives in .atris/strings.json. Wire 'check --staged' into the pre-commit gate.
 `);
-  return 0;
+  return !sub || ['help', '--help', '-h'].includes(sub) ? 0 : 2;
 }
 
 module.exports = {

package/commands/unknowns.js

@@ -377,7 +377,7 @@ function normalizeQuestions(payload, problem) {
 }
 
 function fallbackQuestions(problem) {
-  const subject = (clipLine(problem, 90) || 'this problem').replace(/[?!.]+$/, '');
+  const subject = clipLine((String(problem || '').trim() || 'this problem').replace(/[?!.]+$/, ''), 90);
   return [
     {
       question: `What existing code path already owns "${subject}"?`,

package/commands/workflow.js

@@ -1902,7 +1902,7 @@ async function executeAgentSDKFast(userInput) {
   } catch (error) {
     console.error(`✗ Error: ${error.message}`);
     console.log('');
-    console.log('💡 Hosted turns use https://api.atris.ai. For local development, set ATRIS_API_BASE to your own backend URL.');
+    console.log('💡 start your local backend at http://127.0.0.1:8000.');
     process.exit(1);
   }
 }