atris 3.74.9 → 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/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);

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);
   }
 }

package/commands/zen.js

@@ -58,14 +58,15 @@ function makeOut(calm) {
 }
 
 // Name the three biggest places so a large count reads as "mostly agent
-// notes in atris/" rather than an unexplained total.
+// notes in atris/" rather than an unexplained total. A lone fourth place is
+// named too, since "and 1 more place" takes as much room and says less.
 function teamLine(n, places = []) {
   if (!n) return 'no unsaved team notes.';
   const head = n === 1 ? '1 unsaved team note left in place' : `${n} unsaved team notes left in place`;
   if (!places.length) return `${head}.`;
-  const named = places.slice(0, 3).map((p) => `${p.place} ${p.count}`);
+  const named = places.slice(0, places.length === 4 ? 4 : 3).map((p) => `${p.place} ${p.count}`);
   const rest = places.length - named.length;
-  if (rest) named.push(`and ${rest} more ${rest === 1 ? 'place' : 'places'}`);
+  if (rest) named.push(`and ${rest} more places`);
   return `${head}: ${named.join(', ')}.`;
 }
 

package/lib/auto-accept-certified.js

@@ -1099,7 +1099,7 @@ function sniffedProtectedLane(task) {
 function deniedTagOf(task) {
   const tag = String((task && task.tag) || '').trim().toLowerCase();
   return [...DENIED_TAGS].find((d) =>
-    tag === d || tag.split(/[^a-z0-9]+/).some((w) => w === d || w.replace(/s$/, '') === d)) || null;
+    tag === d || tag.split(/[^a-z0-9]+/).some((w) => w === d || w.replace(/s$/, '') === d || w === d.replace(/s$/, ''))) || null;
 }
 
 function protectedLaneOf(task) {
@@ -1197,8 +1197,7 @@ function evaluateAutoAccept(task, options = {}) {
   // exact-match cousins: match denied lanes on whole words with a plural
   // strip, so a tag variant never slips money/deploy work past the human.
   const tag = String(task.tag || '').trim().toLowerCase();
-  const deniedTag = [...DENIED_TAGS].find((d) =>
-    tag === d || tag.split(/[^a-z0-9]+/).some((w) => w === d || w.replace(/s$/, '') === d));
+  const deniedTag = deniedTagOf(task);
   if (deniedTag) return { eligible: false, ref, reason: `denied_tag_${deniedTag}` };
 
   // A protected lane declared in prose is not a protection, it is a note.

package/lib/autoland.js

@@ -187,13 +187,14 @@ function cronMarker(root) {
 }
 
 function buildCronLine(root) {
+  const quote = (value) => `'${value.replace(/'/g, "'\\''")}'`;
   const node = process.execPath;
   const bin = path.join(root, 'bin', 'atris.js');
   const cliBin = fs.existsSync(bin) ? bin : 'atris';
   const logDir = path.join(stateHome(), '.atris', 'overnight');
   const logFile = path.join(logDir, `autoland-${path.basename(root)}.log`);
-  const invoke = cliBin.endsWith('.js') ? `${node} ${cliBin}` : cliBin;
-  return `14 * * * * cd ${root} && ${invoke} autoland tick >> ${logFile} 2>&1 # ${cronMarker(root)}`;
+  const invoke = cliBin.endsWith('.js') ? `${quote(node)} ${quote(cliBin)}` : cliBin;
+  return `14 * * * * cd ${quote(root)} && ${invoke} autoland tick >> ${quote(logFile)} 2>&1 # ${cronMarker(root)}`;
 }
 
 function readCrontab() {
@@ -499,7 +500,7 @@ function dejargon(line, options = {}) {
     .replace(/--([a-z][a-z-]*)/g, (_match, flag) => flag.replace(/-/g, ' '))
     .replace(/\b[a-z0-9]+(?:_[a-z0-9]+)+\b/gi, match => match.replace(/_/g, ' '))
     .replace(/\b[a-z]+(?:[A-Z][A-Za-z0-9]*)+\b/g, match => match.replace(/([a-z0-9])([A-Z])/g, '$1 $2'));
-  if (options.preserveTickets !== true) value = value.replace(/\bCLI-\d+\b/g, '');
+  if (options.preserveTickets !== true) value = value.replace(/\(\s*CLI-\d+\s*\)|\bCLI-\d+\b/g, '');
   return value.replace(/\s+/g, ' ').trim();
 }
 

package/lib/campaign-loop.js

@@ -50,6 +50,14 @@ function readBrief(root, campaignId) {
   }
 }
 
+function objectiveWithBrief(objective, brief) {
+  if (!brief) return objective;
+  // Mission objectives also become titles and log lines, so keep them on one line.
+  const line = objective.replace(/\s+/g, ' ').trim();
+  const briefLine = brief.replace(/\s+/g, ' ').trim();
+  return line.includes(briefLine) ? line : `${line} ${briefLine}`;
+}
+
 function rankCampaignMembers(view, rsiSummary = null, events = null) {
   const seats = Array.isArray(view && view.seats) ? view.seats.map((s) => s.member).filter(Boolean) : [];
   const candidates = [...new Set([view && view.owner, ...seats].filter(Boolean))];
@@ -180,7 +188,7 @@ async function askOwner(root, view, prompt) {
 
 // Run one atris command and resolve with its exit code and output.
 // A live step an engine prints while a mission runs: "<member> <hh:mm>  <what it is doing>".
-const ACTIVITY_LINE = /^\s*[a-z0-9][a-z0-9-]*\s+\d{1,2}:\d{2}\s{2,}\S/i;
+const ACTIVITY_LINE = /^\s*[a-z0-9][a-z0-9._-]*\s+\d{1,2}:\d{2}\s{2,}\S/i;
 
 function runCli(args, { cwd, env = process.env, onLine = null } = {}) {
   return new Promise((resolve) => {
@@ -258,7 +266,7 @@ function makeLoop(root, options = {}, deps = {}) {
     proposals.forEach((proposal, index) => {
       const missionId = proposalId(proposal.objective);
       const key = claimKey(proposal.objective);
-      if (brief && !proposal.objective.includes(brief)) proposal.objective = `${proposal.objective}\n\n${brief}`;
+      proposal.objective = objectiveWithBrief(proposal.objective, brief);
       append(id, 'mission_proposed', { mission_id: missionId, member: proposal.member, objective: proposal.objective, verify: proposal.verify, estimate_usd: proposal.estimate_usd || undefined }, proposal.member);
       append(id, 'mission_claimed', { mission_id: missionId, claim_key: key }, proposal.member);
       if (index === 0) append(id, 'step', { mission_id: missionId, ...plan }, current.owner);
@@ -282,7 +290,7 @@ function makeLoop(root, options = {}, deps = {}) {
     const current = view(id);
     const reserve = work.estimate_usd || defaultReserve(current);
     const brief = (deps.brief ? deps.brief(id) : readBrief(root, id)).trim();
-    const objective = brief && !work.objective.includes(brief) ? `${work.objective}\n\n${brief}` : work.objective;
+    const objective = objectiveWithBrief(work.objective, brief);
     const started = await cli([
       'mission', 'start', objective, '--mission-id', work.mission_id, '--owner', work.member,
       '--runner', runner, '--verify', work.verify || current.judge, '--campaign', id, '--reserve', String(reserve),
@@ -299,7 +307,7 @@ function makeLoop(root, options = {}, deps = {}) {
       append(id, 'mission_vetoed', { mission_id: work.mission_id, reason: why.slice(0, 200) }, current.owner);
       return { mission_id: work.mission_id, started: false };
     }
-    log(`  ${work.mission_id} started for ${work.member}: ${work.objective}`);
+    log(`  ${work.mission_id} started for ${work.member}: ${objective}`);
     // The engine's live steps ("researcher 06:47  editing stable.mjs") pass through to
     // the campaign's own output, so a screen watching the run can show the work.
     const stepsBefore = (view(id).missions.find((m) => m.id === work.mission_id) || {}).steps || 0;

package/lib/card.js

@@ -114,7 +114,7 @@ function buildCard(spec = {}, opts = {}) {
 </style></head>
 <body><div class="card">${main}${foot}</div></body></html>`;
 
-  return { html, width: size.w, height: size.h, kind, theme: spec.theme || 'atris', size: spec.size || 'og' };
+  return { html, width: size.w, height: size.h, kind, theme: themes[spec.theme] ? spec.theme : 'atris', size: spec.size || 'og' };
 }
 
 module.exports = { buildCard, SIZES, KINDS };

package/lib/chat-log-scan.js

@@ -310,7 +310,7 @@ function scanChatLogs(options = {}) {
     scope: options.global === true ? 'global' : 'workspace',
     window_hours: maxAgeHours,
     sources: {
-      ax_dirs: axLogDirs(cwd),
+      ax_dirs: axLogDirs(cwd, { global: options.global === true }),
       cursor_roots: cursorTranscriptRoots(cwd),
     },
     summary: {

package/lib/first-minute.js

@@ -1058,6 +1058,7 @@ function speakFirstMinute({
     log(JSON.stringify(freshMinuteJson(folderName(root), visible, { root }), null, 2));
     return 2;
   }
+  if (asJson) return speakKeepWorkingMinute({ root, asJson, log });
   const screen = buildFirstMinute({
     root,
     fresh: isFresh,