atris 3.15.56 → 3.15.57

package/bin/atris.js

@@ -1567,7 +1567,7 @@ if (command === 'init') {
   searchJournal(keyword);
 } else if (command === 'xp') {
   require('../commands/xp').xpCommand(...process.argv.slice(3))
-    .then(() => process.exit(0))
+    .then(() => { process.exitCode = 0; })
     .catch((err) => { console.error(`✗ Error: ${err.message || err}`); process.exit(1); });
 } else if (command === 'play') {
   require('../commands/play').playCommand(...process.argv.slice(3))

package/commands/computer.js

@@ -2550,34 +2550,56 @@ async function streamBusinessChatResult(token, ctx, executionId, rl = null, opti
 
       errors = 0;
       let done = false;
-      for (const event of (events.data?.events || [])) {
-        fromIndex++;
-        if (event.type === 'assistant_text' && event.content) {
-          sawVisibleOutput = true;
-          process.stdout.write(event.content);
-        } else if (event.type === 'result' && event.result && !sawVisibleOutput) {
-          sawVisibleOutput = true;
-          process.stdout.write(String(event.result));
-        } else if (!options.quiet && event.type === 'tool_use' && event.tool) {
-          const arg = event.input?.file_path || event.input?.path || event.input?.pattern || event.input?.command || '';
-          if (arg) {
-            console.log(`\n  [${event.tool}] ${String(arg).slice(0, 120)}`);
-          } else {
-            console.log(`\n  [${event.tool}]`);
+      const emitEvents = (items, { showTools = true } = {}) => {
+        let batchDone = false;
+        for (const event of (items || [])) {
+          if ((event.type === 'assistant_text' || event.type === 'text') && event.content) {
+            sawVisibleOutput = true;
+            process.stdout.write(event.content);
+          } else if (event.type === 'result' && event.result && !sawVisibleOutput) {
+            sawVisibleOutput = true;
+            process.stdout.write(String(event.result));
+          } else if (showTools && !options.quiet && event.type === 'tool_use' && event.tool) {
+            const arg = event.input?.file_path || event.input?.path || event.input?.pattern || event.input?.command || '';
+            if (arg) {
+              console.log(`\n  [${event.tool}] ${String(arg).slice(0, 120)}`);
+            } else {
+              console.log(`\n  [${event.tool}]`);
+            }
+          } else if (event.type === 'error') {
+            if (event.error) console.error(`\n${event.error}`);
+            terminalStatus = 'error';
+            batchDone = true;
+            break;
+          } else if (event.type === 'complete') {
+            terminalStatus = 'completed';
+            batchDone = true;
+            break;
           }
-        } else if (event.type === 'error') {
-          if (event.error) console.error(`\n${event.error}`);
-          terminalStatus = 'error';
-          done = true;
-          break;
-        } else if (event.type === 'complete') {
-          terminalStatus = 'completed';
-          done = true;
-          break;
         }
+        return batchDone;
+      };
+
+      const batch = events.data?.events || [];
+      done = emitEvents(batch);
+      const nextIndex = events.data?.next_index;
+      if (Number.isInteger(nextIndex) && nextIndex >= fromIndex) {
+        fromIndex = nextIndex;
+      } else {
+        fromIndex += batch.length;
       }
 
       if (done || ['completed', 'error', 'failed', 'cancelled'].includes(events.data?.status)) {
+        if (!sawVisibleOutput && events.data?.status === 'completed') {
+          const fullEvents = await apiRequestJson(
+            `/business/${ctx.businessId}/chat/events?execution_id=${executionId}&workspace_id=${ctx.workspaceId}&from_index=0`,
+            { method: 'GET', token, timeoutMs: 60000 }
+          );
+          if (fullEvents.ok) {
+            emitEvents(fullEvents.data?.events || [], { showTools: false });
+          }
+        }
+
         if (!process.stdout.write('\n')) {
           // no-op: keep line handling stable
         }

package/commands/integrations.js

@@ -614,6 +614,31 @@ function printImessageDoctor(result, json = false) {
   }
 }
 
+function boundedImessageLimit(value) {
+  const parsed = Number(value || 20);
+  if (!Number.isFinite(parsed)) return 20;
+  return Math.max(1, Math.min(100, Math.trunc(parsed)));
+}
+
+function printImessageRows(result, options = {}) {
+  if (options.json) {
+    const rows = String(result.stdout || '').trim();
+    let messages = [];
+    try {
+      messages = rows ? JSON.parse(rows) : [];
+    } catch {
+      messages = [];
+    }
+    console.log(JSON.stringify({
+      ok: result.status === 0,
+      count: Array.isArray(messages) ? messages.length : 0,
+      messages: Array.isArray(messages) ? messages : [],
+    }, null, 2));
+    return;
+  }
+  console.log(String(result.stdout || '').trim() || 'No recent messages found.');
+}
+
 function imessageRecent(handle, options = {}) {
   if (!handle) {
     console.error('Usage: atris imessage recent <phone-or-email> [--limit 20]');
@@ -625,7 +650,7 @@ function imessageRecent(handle, options = {}) {
     process.exit(1);
   }
 
-  const limit = Number(options.limit || 20);
+  const limit = boundedImessageLimit(options.limit);
   const chatDb = path.join(os.homedir(), 'Library', 'Messages', 'chat.db');
   const sql = `
     SELECT datetime(m.date/1000000000 + 978307200, 'unixepoch', 'localtime') AS ts,
@@ -635,14 +660,44 @@ function imessageRecent(handle, options = {}) {
     JOIN handle h ON h.rowid = m.handle_id
     WHERE h.id = '${String(handle).replace(/'/g, "''")}'
     ORDER BY m.date DESC
-    LIMIT ${Math.max(1, Math.min(100, limit))};
+    LIMIT ${limit};
   `;
-  const result = spawnSync('sqlite3', ['-readonly', chatDb, sql], { encoding: 'utf8' });
+  const sqliteArgs = options.json ? ['-json', '-readonly', chatDb, sql] : ['-readonly', chatDb, sql];
+  const result = spawnSync('sqlite3', sqliteArgs, { encoding: 'utf8' });
+  if (result.status !== 0) {
+    console.error(result.stderr || 'Failed to read Messages database.');
+    process.exit(1);
+  }
+  printImessageRows(result, options);
+}
+
+function imessageLatest(options = {}) {
+  const doctor = imessageDoctor();
+  if (!doctor.connected) {
+    printImessageDoctor(doctor, Boolean(options.json));
+    process.exit(1);
+  }
+
+  const limit = boundedImessageLimit(options.limit);
+  const chatDb = path.join(os.homedir(), 'Library', 'Messages', 'chat.db');
+  const sql = `
+    SELECT datetime(m.date/1000000000 + 978307200, 'unixepoch', 'localtime') AS ts,
+           CASE m.is_from_me WHEN 1 THEN 'me' ELSE COALESCE(h.id, 'unknown') END AS sender,
+           COALESCE(h.id, 'unknown') AS handle,
+           replace(replace(COALESCE(m.text,''), char(10), ' '), char(13), ' ') AS text
+    FROM message m
+    LEFT JOIN handle h ON h.rowid = m.handle_id
+    WHERE length(COALESCE(m.text,'')) > 0
+    ORDER BY m.date DESC
+    LIMIT ${limit};
+  `;
+  const sqliteArgs = options.json ? ['-json', '-readonly', chatDb, sql] : ['-readonly', chatDb, sql];
+  const result = spawnSync('sqlite3', sqliteArgs, { encoding: 'utf8' });
   if (result.status !== 0) {
     console.error(result.stderr || 'Failed to read Messages database.');
     process.exit(1);
   }
-  console.log(result.stdout.trim() || 'No recent messages found.');
+  printImessageRows(result, options);
 }
 
 function escapeSqlString(value) {
@@ -1169,12 +1224,22 @@ async function imessageCommand(subcommand, ...args) {
       break;
     }
     case 'recent': {
-      const handle = args[0];
       const limitFlag = args.findIndex((x) => x === '--limit');
       const limit = limitFlag >= 0 ? args[limitFlag + 1] : 20;
+      const handle = args.find((arg) => arg && !arg.startsWith('--') && arg !== String(limit));
+      if (!handle) {
+        imessageLatest({ limit, json: args.includes('--json') });
+        break;
+      }
       imessageRecent(handle, { limit, json: args.includes('--json') });
       break;
     }
+    case 'latest': {
+      const limitFlag = args.findIndex((x) => x === '--limit');
+      const limit = limitFlag >= 0 ? args[limitFlag + 1] : 20;
+      imessageLatest({ limit, json: args.includes('--json') });
+      break;
+    }
     case 'lookup': {
       imessageLookup(args);
       break;
@@ -1188,6 +1253,7 @@ async function imessageCommand(subcommand, ...args) {
       console.log('  atris imessage doctor [--json]   - Check local Messages access');
       console.log('  atris imessage lookup --name <name> [--json] [--refresh]');
       console.log('  atris imessage recent <handle>   - Read recent local messages');
+      console.log('  atris imessage latest [--limit 20] [--json] - Read latest local messages');
       console.log('  atris imessage send --to <handle> --text <text> --approved [--json] [--receipt]');
   }
 }

package/commands/skill.js

@@ -88,6 +88,39 @@ function findAllSkills(skillsDir) {
   return skills;
 }
 
+function localSkillsDir() {
+  return path.join(process.cwd(), 'atris', 'skills');
+}
+
+function bundledSkillsDir() {
+  return path.join(__dirname, '..', 'atris', 'skills');
+}
+
+function readableSkillRoots() {
+  const roots = [localSkillsDir(), bundledSkillsDir()];
+  const seen = new Set();
+  return roots.filter((root) => {
+    if (!root || !fs.existsSync(root)) return false;
+    const real = fs.realpathSync(root);
+    if (seen.has(real)) return false;
+    seen.add(real);
+    return true;
+  });
+}
+
+function findReadableSkills() {
+  const seen = new Set();
+  const skills = [];
+  for (const root of readableSkillRoots()) {
+    for (const skill of findAllSkills(root)) {
+      if (seen.has(skill.folder)) continue;
+      seen.add(skill.folder);
+      skills.push(skill);
+    }
+  }
+  return skills;
+}
+
 // --- Audit Checks ---
 
 function runAuditChecks(skill) {
@@ -355,11 +388,10 @@ function generateTags(folderName, description) {
 // --- Subcommand Handlers ---
 
 function skillList() {
-  const skillsDir = path.join(process.cwd(), 'atris', 'skills');
-  const skills = findAllSkills(skillsDir);
+  const skills = findReadableSkills();
 
   if (skills.length === 0) {
-    console.log('No skills found in atris/skills/. Run "atris init" first.');
+    console.log('No skills found in local or bundled Atris skill roots.');
     return;
   }
 
@@ -396,15 +428,14 @@ function skillList() {
 }
 
 function skillAudit(name) {
-  const skillsDir = path.join(process.cwd(), 'atris', 'skills');
-  const allSkills = findAllSkills(skillsDir);
+  const allSkills = findReadableSkills();
 
   const targets = name === '--all'
     ? allSkills
     : allSkills.filter(s => s.folder === name || s.leafFolder === name);
 
   if (targets.length === 0) {
-    console.error(`Skill "${name}" not found. Run "atris skill list" to see available skills.`);
+    console.error(`Skill "${name}" not found. Run "atris skill list" to see available local and bundled skills.`);
     process.exit(1);
   }
 

package/commands/xp.js

@@ -7,6 +7,7 @@ const crypto = require('crypto');
 const { spawnSync } = require('child_process');
 
 const DEFAULT_GRAPH_DAYS = 365;
+const MAX_SYNC_GRAPH_DAYS = 370;
 const INTENSITY_CHARS = [' ', '.', ':', '*', '#'];
 const ROW_LABELS = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'];
 const TASK_EPISODES_FILE = path.join('.atris', 'state', 'task_episodes.jsonl');
@@ -210,6 +211,38 @@ function combineAgentXpContributionGraphs(graphs, windowDays = DEFAULT_GRAPH_DAY
   return graphFromDailyTotals(totals, windowDays);
 }
 
+function sanitizeContributionGraphForSync(graph) {
+  if (!graph || typeof graph !== 'object') return null;
+  const rawDays = Array.isArray(graph.days) ? graph.days : [];
+  const days = rawDays
+    .slice(-MAX_SYNC_GRAPH_DAYS)
+    .map((day) => {
+      const date = typeof day?.date === 'string' && /^\d{4}-\d{2}-\d{2}$/.test(day.date)
+        ? day.date
+        : null;
+      if (!date) return null;
+      const xp = Math.max(0, asNumber(day.xp ?? day.total_xp));
+      return {
+        date,
+        xp,
+        total_xp: Math.max(0, asNumber(day.total_xp, xp)),
+        intensity: Math.max(0, Math.min(4, asNumber(day.intensity))),
+      };
+    })
+    .filter(Boolean);
+  if (days.length === 0) return null;
+  return {
+    schema: 'atris.agent_xp_contribution_graph.v1',
+    metric_label: AGENT_XP_LABEL,
+    window_days: days.length,
+    total_xp: days.reduce((sum, day) => sum + day.xp, 0),
+    active_days: days.filter(day => day.xp > 0).length,
+    first_date: days[0]?.date || null,
+    last_date: days[days.length - 1]?.date || null,
+    days,
+  };
+}
+
 function currentForm(payload) {
   const arenas = payload.current_form_by_arena || {};
   const local = arenas.local_workspace || {};
@@ -1945,6 +1978,7 @@ function buildAgentXpSyncPacket(args = []) {
   const publicXp = earnedAgentXp(totalXp);
   const currentForm = currentFormScore(totalXp);
   const levelProgress = agentXpLevelProgress(publicXp);
+  const contributionGraph = sanitizeContributionGraphForSync(projection.contribution_graph);
   const workspaceRootHash = sha256(workspaces.map(item => item.workspace_root_hash || item.name).sort().join(':'));
   const entry = {
     user_id: player,
@@ -1964,6 +1998,7 @@ function buildAgentXpSyncPacket(args = []) {
     lock_reason: eligible ? null : 'not_enough_trusted_proof',
     public_adjustment: null,
     next_move: eligible ? 'Play the next proof-backed AgentXP mission.' : 'Complete one proof-backed AgentXP rep.',
+    contribution_graph: contributionGraph,
   };
   const packet = {
     schema: 'atris.agentxp_sync_packet.v1',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "atris",
-  "version": "3.15.56",
+  "version": "3.15.57",
   "main": "bin/atris.js",
   "bin": {
     "atris": "bin/atris.js",