atris 3.15.31 → 3.15.37

package/commands/lifecycle.js

@@ -2,6 +2,7 @@ const fs = require('fs');
 const path = require('path');
 const { loadCredentials } = require('../utils/auth');
 const { apiRequestJson } = require('../utils/api');
+const { loadBusinesses, saveBusinesses, businessMatchesSlug } = require('./business');
 
 /**
  * Resolve business slug from CLI arg or local .atris/business.json.
@@ -22,6 +23,69 @@ function resolveSlug() {
   return slug;
 }
 
+async function resolveBusiness(token, slug) {
+  const businesses = loadBusinesses();
+
+  const listResult = await apiRequestJson('/business/', { method: 'GET', token });
+  if (listResult.ok && Array.isArray(listResult.data)) {
+    const match = listResult.data.find((business) =>
+      businessMatchesSlug(business, slug, { includeName: true })
+    );
+    if (match && match.id) {
+      businesses[slug] = {
+        business_id: match.id,
+        workspace_id: match.workspace_id,
+        name: match.name || slug,
+        slug: match.slug || slug,
+        canonical_slug: match.slug || slug,
+        added_at: businesses[slug]?.added_at || new Date().toISOString(),
+        updated_at: new Date().toISOString(),
+      };
+      saveBusinesses(businesses);
+      return businesses[slug];
+    }
+  }
+
+  const wanted = String(slug || '').toLowerCase();
+  return businesses[slug] || Object.values(businesses).find((entry) =>
+    entry
+      && (
+        String(entry.slug || '').toLowerCase() === wanted
+        || String(entry.canonical_slug || '').toLowerCase() === wanted
+        || String(entry.name || '').toLowerCase() === wanted
+      )
+  ) || null;
+}
+
+async function activateBusinessWorkspace(token, business) {
+  if (!business?.business_id || !business?.workspace_id) return;
+  const result = await apiRequestJson(`/business/${business.business_id}/workspaces/${business.workspace_id}/activate`, {
+    method: 'POST',
+    token,
+    body: {},
+  });
+  if (!result.ok && result.status !== 409) {
+    throw new Error(`Failed to activate business workspace: ${result.errorMessage || result.error || result.status}`);
+  }
+}
+
+async function waitForBusinessComputer(token, business, maxWait = 90000) {
+  const start = Date.now();
+  while (Date.now() - start < maxWait) {
+    await new Promise((r) => setTimeout(r, 3000));
+
+    const status = await apiRequestJson(`/business/${business.business_id}/ai-computer/status`, {
+      method: 'GET',
+      token,
+    });
+
+    if (status.ok && status.data && status.data.status === 'running' && status.data.endpoint) {
+      return status.data;
+    }
+  }
+  return null;
+}
+
 /**
  * Pause a workspace to save compute (storage only mode).
  * @returns {Promise<void>}
@@ -39,6 +103,23 @@ async function sleepAtris() {
   const creds = loadCredentials();
   if (!creds || !creds.token) { console.error('Not logged in. Run: atris login'); process.exit(1); }
 
+  const business = await resolveBusiness(creds.token, slug);
+  if (business?.business_id) {
+    const result = await apiRequestJson(`/business/${business.business_id}/ai-computer/sleep`, {
+      method: 'POST',
+      token: creds.token,
+      body: {},
+    });
+
+    if (!result.ok) {
+      console.error(`Failed to sleep business computer: ${result.error || result.errorMessage || result.status}`);
+      process.exit(1);
+    }
+
+    console.log(`Business computer '${business.name || slug}' is now sleeping. Files persist. Wake it with: atris wake ${slug}`);
+    return;
+  }
+
   const result = await apiRequestJson(`/workspace/${slug}/sleep`, {
     method: 'POST',
     token: creds.token,
@@ -70,6 +151,40 @@ async function wakeAtris() {
   const creds = loadCredentials();
   if (!creds || !creds.token) { console.error('Not logged in. Run: atris login'); process.exit(1); }
 
+  const business = await resolveBusiness(creds.token, slug);
+  if (business?.business_id) {
+    if (business.workspace_id) {
+      await activateBusinessWorkspace(creds.token, business);
+    }
+
+    const result = await apiRequestJson(`/business/${business.business_id}/ai-computer/wake`, {
+      method: 'POST',
+      token: creds.token,
+      body: {},
+    });
+
+    if (!result.ok) {
+      console.error(`Failed to wake business computer: ${result.error || result.errorMessage || result.status}`);
+      process.exit(1);
+    }
+
+    console.log(`Waking business computer '${business.name || slug}'...`);
+
+    if (result.data && result.data.status === 'running' && result.data.endpoint) {
+      console.log(`Business computer '${business.name || slug}' is alive. Agents resuming.`);
+      return;
+    }
+
+    const running = await waitForBusinessComputer(creds.token, business);
+    if (running) {
+      console.log(`Business computer '${business.name || slug}' is alive. Agents resuming.`);
+      return;
+    }
+
+    console.log('Still starting up. Check with: atris computer status --business ' + slug);
+    return;
+  }
+
   const result = await apiRequestJson(`/workspace/${slug}/wake`, {
     method: 'POST',
     token: creds.token,

package/commands/mission.js

@@ -707,7 +707,8 @@ function worktreeReceipt(before, after, { verifier = '' } = {}) {
 // ---------------------------------------------------------------------------
 // `atris mission run <id>` — bounded local headless loop. v0.1.
 // Spawns `claude -p --resume <session>` per tick. Honors cadence, active-hours,
-// rate-limit info, and a flock per mission. Only consumes max-ticks on `ran`.
+// rate-limit info, and a flock per mission. `max-ticks` bounds total attempts;
+// `ran_ticks` separately reports ticks that actually made progress.
 // ---------------------------------------------------------------------------
 
 const MISSION_RUN_DEFAULTS = {
@@ -1284,7 +1285,7 @@ async function runMission(args) {
     const sessionLabel = skipWorker ? 'caller-session' : (sessionId || `pending=${pendingSessionId}`);
     console.error(`[mission run] ${mission.id}\n  objective: ${mission.objective}\n  lane: ${frozen.lane}\n  cadence: ${cadence} (${cadenceSeconds}s)\n  max_ticks: ${effectiveMaxTicks}, max_wall: ${maxWallSeconds}s\n  session: ${sessionLabel}`);
 
-    while (ranTicks < effectiveMaxTicks) {
+    while (ticks.length < effectiveMaxTicks) {
       const elapsedSec = (Date.now() - startedAt) / 1000;
       const remainingWall = maxWallSeconds - elapsedSec;
       if (remainingWall <= 0) { pauseReason = 'max-wall-reached'; break; }
@@ -1462,12 +1463,17 @@ async function runMission(args) {
       }
       const remainingMs = remainingWall * 1000 - 1;
       sleepMs = Math.min(Math.max(0, sleepMs), Math.max(0, remainingMs));
-      if (sleepMs > 0 && ranTicks < effectiveMaxTicks) {
+      if (sleepMs > 0 && ticks.length < effectiveMaxTicks) {
         try { await sleep(sleepMs, controller.signal); }
         catch (e) { if (e.code === 'ABORTED') { pauseReason = 'aborted'; break; } throw e; }
       }
     }
 
+    if (!pauseReason && ticks.length >= effectiveMaxTicks) {
+      const lastTick = ticks[ticks.length - 1];
+      if (lastTick && lastTick.status !== 'ran') pauseReason = 'max-ticks-reached';
+    }
+
     if (pauseReason && !['complete', 'ready', 'max-wall-reached'].includes(pauseReason)) {
       mission = saveMission({
         ...mission,

package/commands/play.js

@@ -7,7 +7,7 @@ const { spawnSync } = require('child_process');
 const { getSessionProfile, loadCredentials } = require('../utils/auth');
 
 const AGENTXP_LEADERBOARD_URL = 'https://api.atris.ai/api/agentxp/leaderboard';
-const AGENTXP_GLOBAL_SYNC_RULE = 'Use the owner-provided sync token first; fallback is atris login before sync.';
+const AGENTXP_GLOBAL_SYNC_RULE = 'Run atris login, then sync. Owner-provided sync tokens are guided-demo fallback only.';
 
 function showHelp() {
   console.log('');
@@ -257,9 +257,9 @@ function starterMissionPrompt(player) {
 
 function globalSyncCommands(player) {
   return [
-    `atris xp sync --local --as ${player} --token <owner-provided-token>`,
     'atris login',
-    `atris xp sync --local --as ${player}`,
+    'atris xp sync --local',
+    'atris xp sync --local --token <owner-provided-token>',
   ];
 }
 
@@ -431,7 +431,7 @@ function render(state) {
   console.log('');
   console.log('Win condition: real artifact + verifier + human accept.');
   console.log('XP rule: no proof, no AgentXP; accept/revise stays human-gated.');
-  console.log('Global sync: use owner token first; fallback to atris login before hosted leaderboard sync.');
+  console.log('Global sync: run atris login, then sync; owner tokens are guided-demo fallback only.');
   console.log(`Leaderboard: ${state.leaderboard_url}`);
   console.log('');
   console.log('Next commands:');

package/commands/pull.js

@@ -933,12 +933,12 @@ async function pullBusiness(slug) {
           const relativePath = path.relative(path.dirname(symlinkPath), fullPath);
 
           // Business skills override init skills (remove existing symlink if present)
-          if (fs.existsSync(symlinkPath)) {
-            try {
-              const stat = fs.lstatSync(symlinkPath);
-              if (stat.isSymbolicLink()) fs.unlinkSync(symlinkPath);
-              else continue; // Don't overwrite real directories
-            } catch { continue; }
+          try {
+            const stat = fs.lstatSync(symlinkPath);
+            if (stat.isSymbolicLink()) fs.unlinkSync(symlinkPath);
+            else continue; // Don't overwrite real directories
+          } catch (err) {
+            if (err && err.code !== 'ENOENT') continue;
           }
           try {
             fs.symlinkSync(relativePath, symlinkPath);
@@ -959,7 +959,11 @@ async function pullBusiness(slug) {
     // Count wired skills
     const wiredSkills = fs.readdirSync(claudeSkillsDir).filter(f => {
       const p = path.join(claudeSkillsDir, f);
-      return fs.statSync(p).isDirectory();
+      try {
+        return fs.statSync(p).isDirectory();
+      } catch {
+        return false;
+      }
     });
     if (wiredSkills.length > 0) {
       console.log(`  Wired ${wiredSkills.length} skills → .claude/skills/`);