atris 2.6.0 → 2.6.2

package/GETTING_STARTED.md

@@ -164,8 +164,8 @@ This syncs your local `atris.md` and agent templates to the latest version. Re-r
 ## Need Help?
 
 - **Full spec:** Read `atris.md` for technical details
-- **Issues:** https://github.com/atrislabs/atris.md/issues
-- **Docs:** https://github.com/atrislabs/atris.md
+- **Issues:** https://github.com/atrislabs/atris/issues
+- **Docs:** https://github.com/atrislabs/atris
 
 ---
 

package/atris/GETTING_STARTED.md

@@ -164,8 +164,8 @@ This syncs your local `atris.md` and agent templates to the latest version. Re-r
 ## Need Help?
 
 - **Full spec:** Read `atris.md` for technical details
-- **Issues:** https://github.com/atrislabs/atris.md/issues
-- **Docs:** https://github.com/atrislabs/atris.md
+- **Issues:** https://github.com/atrislabs/atris/issues
+- **Docs:** https://github.com/atrislabs/atris
 
 ---
 

package/bin/atris.js

@@ -211,6 +211,7 @@ function showHelp() {
   console.log('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━');
   console.log('');
   console.log('Setup:');
+  console.log('  setup      - Guided first-time setup (login, pick business, pull)');
   console.log('  init       - Initialize Atris in current project');
   console.log('  update     - Update local files to latest version');
   console.log('  upgrade    - Install latest Atris from npm');
@@ -246,6 +247,14 @@ function showHelp() {
   console.log('');
   console.log('Sync:');
   console.log('  pull       - Pull journals + member data from cloud');
+  console.log('  clean-workspace <slug> - Analyze & remove junk files from a workspace (alias: cw)');
+  console.log('');
+  console.log('Business:');
+  console.log('  business add <slug>    - Connect a business');
+  console.log('  business list          - Show connected businesses');
+  console.log('  business remove <slug> - Disconnect a business');
+  console.log('  business health <slug> - Health report (members, workspace, issues)');
+  console.log('  business audit         - One-line health summary of all businesses');
   console.log('');
   console.log('Cloud & agents:');
   console.log('  console    - Start/attach always-on coding console (tmux daemon)');
@@ -387,7 +396,7 @@ const { planAtris: planCmd, doAtris: doCmd, reviewAtris: reviewCmd } = require('
 const knownCommands = ['init', 'log', 'status', 'analytics', 'visualize', 'brainstorm', 'autopilot', 'run', 'plan', 'do', 'review',
                        'activate', 'agent', 'chat', 'console', 'login', 'logout', 'whoami', 'switch', 'use', 'accounts', '_resolve', '_profile-email', 'shell-init', 'update', 'upgrade', 'version', 'help', 'next', 'atris',
                        'clean', 'verify', 'search', 'skill', 'member', 'plugin', 'experiments', 'pull', 'push', 'business', 'sync',
-                       'gmail', 'calendar', 'twitter', 'slack', 'integrations'];
+                       'gmail', 'calendar', 'twitter', 'slack', 'integrations', 'setup', 'clean-workspace', 'cw'];
 
 // Check if command is an atris.md spec file - triggers welcome visualization
 function isSpecFile(cmd) {
@@ -698,6 +707,11 @@ if (command === 'init') {
         console.error(`✗ Log sync failed: ${error.message || error}`);
         process.exit(1);
       });
+  } else if (subcommand && subcommand !== '--help' && !subcommand.startsWith('-')) {
+    // Business log: atris log <business-slug>
+    require('../commands/context-sync').businessLog(subcommand)
+      .then(() => process.exit(0))
+      .catch((err) => { console.error(`\n✗ Error: ${err.message || err}`); process.exit(1); });
   } else {
     logCmd();
   }
@@ -876,9 +890,17 @@ if (command === 'init') {
       process.exit(1);
     });
 } else if (command === 'status') {
-  const isQuick = process.argv.includes('--quick') || process.argv.includes('-q');
-  const isJson = process.argv.includes('--json');
-  statusCmd(isQuick, isJson);
+  const subcommand = process.argv[3];
+  if (subcommand && !subcommand.startsWith('-')) {
+    // Business status: atris status <business-slug>
+    require('../commands/context-sync').businessStatus(subcommand)
+      .then(() => process.exit(0))
+      .catch((err) => { console.error(`\n✗ Error: ${err.message || err}`); process.exit(1); });
+  } else {
+    const isQuick = process.argv.includes('--quick') || process.argv.includes('-q');
+    const isJson = process.argv.includes('--json');
+    statusCmd(isQuick, isJson);
+  }
 } else if (command === 'analytics') {
   require('../commands/analytics').analyticsAtris();
 } else if (command === 'clean') {
@@ -945,6 +967,11 @@ if (command === 'init') {
   require('../commands/business').businessCommand(subcommand, ...args)
     .then(() => process.exit(0))
     .catch((err) => { console.error(`\n✗ Error: ${err.message || err}`); process.exit(1); });
+} else if (command === 'clean-workspace' || command === 'cw') {
+  const { cleanWorkspace } = require('../commands/workspace-clean');
+  cleanWorkspace()
+    .then(() => process.exit(0))
+    .catch((err) => { console.error(`\n✗ Error: ${err.message || err}`); process.exit(1); });
 } else if (command === 'plugin') {
   const subcommand = process.argv[3] || 'build';
   const args = process.argv.slice(4);
@@ -953,6 +980,10 @@ if (command === 'init') {
   const subcommand = process.argv[3];
   const args = process.argv.slice(4);
   require('../commands/experiments').experimentsCommand(subcommand, ...args);
+} else if (command === 'setup') {
+  require('../commands/setup').setupAtris()
+    .then(() => process.exit(0))
+    .catch((err) => { console.error(`\n✗ Error: ${err.message || err}`); process.exit(1); });
 } else {
   console.log(`Unknown command: ${command}`);
   console.log('Run "atris help" to see available commands');

package/commands/business.js

@@ -111,6 +111,242 @@ async function removeBusiness(slug) {
   console.log(`\nRemoved "${name}"`);
 }
 
+// ---------------------------------------------------------------------------
+// Resolve a slug to a business ID using local cache or API lookup
+// ---------------------------------------------------------------------------
+async function resolveSlug(slug, creds) {
+  // Check local cache first
+  const businesses = loadBusinesses();
+  if (businesses[slug]) {
+    return businesses[slug];
+  }
+
+  // Try by-slug endpoint
+  const result = await apiRequestJson(`/businesses/by-slug/${slug}/`, {
+    method: 'GET',
+    token: creds.token,
+  });
+  if (result.ok && result.data) {
+    return { business_id: result.data.id, workspace_id: result.data.workspace_id, name: result.data.name, slug: result.data.slug };
+  }
+
+  // Fallback: list all and match
+  const listResult = await apiRequestJson('/businesses/', { method: 'GET', token: creds.token });
+  if (listResult.ok && Array.isArray(listResult.data)) {
+    const match = listResult.data.find(b => b.slug === slug || b.name.toLowerCase() === slug.toLowerCase());
+    if (match) {
+      return { business_id: match.id, workspace_id: match.workspace_id, name: match.name, slug: match.slug };
+    }
+  }
+
+  return null;
+}
+
+// ---------------------------------------------------------------------------
+// Helper: format relative time
+// ---------------------------------------------------------------------------
+function relativeTime(dateStr) {
+  if (!dateStr) return 'unknown';
+  const diff = Date.now() - new Date(dateStr).getTime();
+  const days = Math.floor(diff / (1000 * 60 * 60 * 24));
+  if (days <= 0) return 'today';
+  if (days === 1) return '1d ago';
+  return `${days}d ago`;
+}
+
+// ---------------------------------------------------------------------------
+// Helper: activity bar
+// ---------------------------------------------------------------------------
+function activityBar(daysSinceActive, width = 10) {
+  const filled = Math.max(0, Math.min(width, width - Math.floor(daysSinceActive / 3)));
+  return '\u2501'.repeat(filled) + '\u2591'.repeat(width - filled);
+}
+
+// ---------------------------------------------------------------------------
+// atris business health <slug>
+// ---------------------------------------------------------------------------
+async function businessHealth(slug) {
+  if (!slug) {
+    console.error('Usage: atris business health <slug>');
+    process.exit(1);
+  }
+
+  const creds = loadCredentials();
+  if (!creds || !creds.token) {
+    console.error('Not logged in. Run: atris login');
+    process.exit(1);
+  }
+
+  const biz = await resolveSlug(slug, creds);
+  if (!biz) {
+    console.error(`Business "${slug}" not found.`);
+    process.exit(1);
+  }
+
+  const bizId = biz.business_id;
+  const wsId = biz.workspace_id;
+
+  // Fetch dashboard and workspace snapshot in parallel
+  const fetchOpts = { method: 'GET', token: creds.token, timeoutMs: 120000 };
+  const [dashResult, wsResult] = await Promise.all([
+    apiRequestJson(`/businesses/${bizId}/dashboard/`, fetchOpts),
+    wsId
+      ? apiRequestJson(`/businesses/${bizId}/workspaces/${wsId}/snapshot?include_content=false`, fetchOpts)
+      : Promise.resolve({ ok: false }),
+  ]);
+
+  const dashboard = dashResult.ok ? dashResult.data : null;
+  const workspace = wsResult.ok ? wsResult.data : null;
+
+  const name = dashboard?.business?.name || biz.name || slug;
+
+  console.log('');
+  console.log(`Business Health: ${name}`);
+  console.log('\u2501'.repeat(26 + name.length));
+  console.log('');
+
+  // Workspace stats
+  const files = workspace?.files || [];
+  const totalSize = files.reduce((sum, f) => sum + (f.size || 0), 0);
+  const fileSizeStr = totalSize > 1024 ? `${Math.round(totalSize / 1024)}KB` : `${totalSize}B`;
+  console.log(`  Workspace:  ${files.length} files, ${fileSizeStr}`);
+
+  // Members
+  const members = dashboard?.roster?.members || dashboard?.members || dashboard?.business?.members || [];
+  const humanMembers = members.filter(m => !m.is_agent && m.role !== 'agent');
+  const agentMembers = members.filter(m => m.is_agent || m.role === 'agent');
+  const memberCountStr = members.length > 0
+    ? `${members.length} (${humanMembers.length} human, ${agentMembers.length} agent)`
+    : `${members.length}`;
+  console.log(`  Members:    ${memberCountStr}`);
+
+  // Apps
+  const apps = dashboard?.business?.apps || dashboard?.apps || [];
+  console.log(`  Apps:       ${Array.isArray(apps) ? apps.length : 0}`);
+
+  // Status
+  const status = dashboard?.business?.status || dashboard?.status || 'unknown';
+  console.log(`  Status:     ${status}`);
+
+  // Member activity
+  if (members.length > 0) {
+    console.log('');
+    console.log('  Member Activity:');
+    for (const m of members) {
+      const memberName = m.display_name || m.name || m.email || 'Unknown';
+      const role = m.role || 'member';
+      const lastActive = m.atris?.last_active || m.last_active || m.last_login || m.joined_at || m.created_at;
+      const daysSince = lastActive ? Math.floor((Date.now() - new Date(lastActive).getTime()) / (1000 * 60 * 60 * 24)) : 999;
+      const bar = activityBar(daysSince);
+      const label = daysSince <= 1 ? 'active' : `last active ${relativeTime(lastActive)}`;
+      console.log(`    ${memberName.padEnd(18)} ${role.padEnd(8)} ${bar} ${label}`);
+    }
+  }
+
+  // Workspace breakdown by directory
+  if (files.length > 0) {
+    console.log('');
+    console.log('  Workspace Breakdown:');
+    const dirSizes = {};
+    for (const f of files) {
+      const filePath = f.path || f.name || '';
+      const dir = filePath.includes('/') ? filePath.split('/')[0] + '/' : '/';
+      dirSizes[dir] = (dirSizes[dir] || 0) + (f.size || 0);
+    }
+    const maxDirSize = Math.max(...Object.values(dirSizes), 1);
+    const sortedDirs = Object.entries(dirSizes).sort((a, b) => b[1] - a[1]);
+    for (const [dir, size] of sortedDirs) {
+      const sizeStr = size > 1024 ? `${Math.round(size / 1024)}KB` : `${size}B`;
+      const barLen = Math.max(1, Math.round((size / maxDirSize) * 10));
+      console.log(`    ${dir.padEnd(12)} ${sizeStr.padStart(5)}   ${'█'.repeat(barLen)}`);
+    }
+  }
+
+  // Issues
+  console.log('');
+  console.log('  Issues:');
+  let hasIssues = false;
+  const humanMembers2 = members.filter(m => m.role !== 'agent');
+  for (const m of humanMembers2) {
+    const lastActive = m.atris?.last_active || m.last_active || m.last_login || m.joined_at || m.created_at;
+    const daysSince = lastActive ? Math.floor((Date.now() - new Date(lastActive).getTime()) / (1000 * 60 * 60 * 24)) : 999;
+    if (daysSince >= 30) {
+      const memberName = m.display_name || m.name || m.email || 'Unknown';
+      console.log(`    \u26A0 ${memberName} inactive for ${daysSince}+ days`);
+      hasIssues = true;
+    }
+  }
+
+  // Check for workspace bloat (arbitrary threshold: >500KB or >100 files)
+  if (totalSize > 500 * 1024) {
+    console.log(`    \u26A0 Workspace large (${fileSizeStr})`);
+    hasIssues = true;
+  }
+  if (files.length > 100) {
+    console.log(`    \u26A0 Workspace has ${files.length} files (consider cleanup)`);
+    hasIssues = true;
+  }
+  if (!hasIssues) {
+    console.log('    \u2713 Workspace clean (no bloat detected)');
+  }
+
+  console.log('');
+}
+
+// ---------------------------------------------------------------------------
+// atris business audit
+// ---------------------------------------------------------------------------
+async function businessAudit() {
+  const creds = loadCredentials();
+  if (!creds || !creds.token) {
+    console.error('Not logged in. Run: atris login');
+    process.exit(1);
+  }
+
+  const listResult = await apiRequestJson('/businesses/', { method: 'GET', token: creds.token });
+  if (!listResult.ok || !Array.isArray(listResult.data)) {
+    console.error(`Failed to fetch businesses: ${listResult.error || 'unknown error'}`);
+    process.exit(1);
+  }
+
+  const businesses = listResult.data;
+
+  console.log('');
+  console.log('Business Audit');
+  console.log('\u2501'.repeat(14));
+  console.log('');
+
+  for (const biz of businesses) {
+    const name = biz.name || biz.slug || 'Unknown';
+    const memberCount = typeof biz.member_count === 'number' ? biz.member_count : (Array.isArray(biz.members) ? biz.members.length : 0);
+    const appCount = typeof biz.app_count === 'number' ? biz.app_count : (Array.isArray(biz.apps) ? biz.apps.length : 0);
+
+    // Determine activity status
+    const status = biz.status || 'unknown';
+    const isActive = status === 'active' || (memberCount > 1 && appCount > 0);
+    const hasContent = memberCount > 1 || appCount > 0;
+
+    let icon, activityLabel;
+    if (isActive) {
+      icon = '\u2713';
+      activityLabel = appCount > 0 ? 'active' : 'idle';
+    } else if (hasContent) {
+      icon = '\u26A0';
+      activityLabel = 'inactive';
+    } else {
+      icon = '\u25CB';
+      activityLabel = 'inactive';
+    }
+
+    const memberStr = memberCount === 1 ? '1 member' : `${memberCount} members`;
+    const appStr = appCount === 1 ? '1 app' : `${appCount} apps`;
+
+    console.log(`  ${icon} ${name.padEnd(16)} ${memberStr.padEnd(12)} ${appStr.padEnd(8)} ${activityLabel}`);
+  }
+
+  console.log('');
+}
+
 async function businessCommand(subcommand, ...args) {
   switch (subcommand) {
     case 'add':
@@ -124,9 +360,15 @@ async function businessCommand(subcommand, ...args) {
     case 'rm':
       await removeBusiness(args[0]);
       break;
+    case 'health':
+      await businessHealth(args[0]);
+      break;
+    case 'audit':
+      await businessAudit();
+      break;
     default:
-      console.log('Usage: atris business <add|list|remove> [slug]');
+      console.log('Usage: atris business <add|list|remove|health|audit> [slug]');
   }
 }
 
-module.exports = { businessCommand, loadBusinesses, saveBusinesses, getBusinessConfigPath };
+module.exports = { businessCommand, businessHealth, businessAudit, loadBusinesses, saveBusinesses, getBusinessConfigPath };

package/commands/context-sync.js

@@ -0,0 +1,228 @@
+const fs = require('fs');
+const path = require('path');
+const { loadCredentials } = require('../utils/auth');
+const { apiRequestJson } = require('../utils/api');
+const { loadBusinesses } = require('./business');
+const { loadManifest, computeLocalHashes, threeWayCompare } = require('../lib/manifest');
+
+/**
+ * Resolve a business slug to its IDs. Shared helper.
+ */
+async function resolveBusiness(slug) {
+  const creds = loadCredentials();
+  if (!creds || !creds.token) {
+    console.error('Not logged in. Run: atris login');
+    process.exit(1);
+  }
+
+  const businesses = loadBusinesses();
+  if (businesses[slug]) {
+    return {
+      businessId: businesses[slug].business_id,
+      workspaceId: businesses[slug].workspace_id,
+      name: businesses[slug].name || slug,
+      slug: businesses[slug].slug || slug,
+      token: creds.token,
+    };
+  }
+
+  const listResult = await apiRequestJson('/businesses/', { method: 'GET', token: creds.token });
+  if (!listResult.ok) {
+    console.error(`Failed to fetch businesses: ${listResult.errorMessage || listResult.status}`);
+    process.exit(1);
+  }
+  const match = (listResult.data || []).find(
+    b => b.slug === slug || b.name.toLowerCase() === slug.toLowerCase()
+  );
+  if (!match) {
+    console.error(`Business "${slug}" not found.`);
+    process.exit(1);
+  }
+  return {
+    businessId: match.id,
+    workspaceId: match.workspace_id,
+    name: match.name,
+    slug: match.slug,
+    token: creds.token,
+  };
+}
+
+
+/**
+ * atris status <business-slug>
+ * Shows what's different locally vs remote without transferring.
+ */
+async function businessStatus(slug) {
+  const biz = await resolveBusiness(slug);
+
+  if (!biz.workspaceId) {
+    console.error(`Business "${slug}" has no workspace.`);
+    process.exit(1);
+  }
+
+  const manifest = loadManifest(biz.slug);
+  const timeSince = manifest ? _timeSince(manifest.last_sync) : null;
+
+  console.log('');
+  console.log(`${biz.name}` + (timeSince ? ` \u2014 last synced ${timeSince}` : ' \u2014 never synced'));
+
+  // Determine local directory
+  const atrisDir = path.join(process.cwd(), 'atris', slug);
+  const cwdDir = path.join(process.cwd(), slug);
+  let localDir = null;
+  if (fs.existsSync(atrisDir)) localDir = atrisDir;
+  else if (fs.existsSync(cwdDir)) localDir = cwdDir;
+
+  // Get remote snapshot with content (needed for reliable hash computation)
+  const result = await apiRequestJson(
+    `/businesses/${biz.businessId}/workspaces/${biz.workspaceId}/snapshot?include_content=true`,
+    { method: 'GET', token: biz.token, timeoutMs: 120000 }
+  );
+
+  if (!result.ok) {
+    if (result.status === 409) {
+      console.log('  Computer is sleeping. Wake it first.');
+    } else {
+      console.error(`  Failed to get remote state: ${result.errorMessage || result.status}`);
+    }
+    process.exit(1);
+  }
+
+  const remoteFiles = {};
+  const crypto = require('crypto');
+  for (const file of (result.data.files || [])) {
+    if (file.path && !file.binary && file.content != null) {
+      const rawBytes = Buffer.from(file.content, 'utf-8');
+      remoteFiles[file.path] = { hash: crypto.createHash('sha256').update(rawBytes).digest('hex'), size: rawBytes.length };
+    }
+  }
+
+  const localFiles = localDir ? computeLocalHashes(localDir) : {};
+  const diff = threeWayCompare(localFiles, remoteFiles, manifest);
+
+  console.log('');
+
+  // You changed
+  const youChanged = [...diff.toPush, ...diff.newLocal];
+  if (youChanged.length > 0) {
+    console.log('  You changed:');
+    for (const p of youChanged) {
+      const label = diff.newLocal.includes(p) ? '(new)' : '';
+      console.log(`    ${p.replace(/^\//, '')} ${label}`);
+    }
+  }
+
+  // Computer changed
+  const computerChanged = [...diff.toPull, ...diff.newRemote];
+  if (computerChanged.length > 0) {
+    console.log('  Computer changed:');
+    for (const p of computerChanged) {
+      const label = diff.newRemote.includes(p) ? '(new)' : '';
+      console.log(`    ${p.replace(/^\//, '')} ${label}`);
+    }
+  }
+
+  // Conflicts
+  if (diff.conflicts.length > 0) {
+    console.log('  Conflicts:');
+    for (const p of diff.conflicts) {
+      console.log(`    ${p.replace(/^\//, '')}`);
+    }
+  } else if (youChanged.length > 0 || computerChanged.length > 0) {
+    console.log('  Conflicts:          (none)');
+  }
+
+  // Remote deletions
+  if (diff.deletedRemote.length > 0) {
+    console.log('  Deleted on computer:');
+    for (const p of diff.deletedRemote) {
+      console.log(`    ${p.replace(/^\//, '')}`);
+    }
+  }
+
+  if (youChanged.length === 0 && computerChanged.length === 0 && diff.conflicts.length === 0) {
+    if (!localDir) {
+      console.log('  No local copy found. Run: atris pull ' + slug);
+    } else {
+      console.log('  Everything up to date.');
+    }
+  }
+
+  console.log('');
+}
+
+
+/**
+ * atris log <business-slug>
+ * Shows human-readable commit history.
+ */
+async function businessLog(slug) {
+  const biz = await resolveBusiness(slug);
+
+  if (!biz.workspaceId) {
+    console.error(`Business "${slug}" has no workspace.`);
+    process.exit(1);
+  }
+
+  const limit = 20;
+  const pathFilter = process.argv.includes('--path') ? process.argv[process.argv.indexOf('--path') + 1] : null;
+
+  const params = `limit=${limit}` + (pathFilter ? `&path=${encodeURIComponent(pathFilter)}` : '');
+  const result = await apiRequestJson(
+    `/businesses/${biz.businessId}/workspaces/${biz.workspaceId}/git/log?${params}`,
+    { method: 'GET', token: biz.token }
+  );
+
+  if (!result.ok) {
+    if (result.status === 409) {
+      console.log('\n  Computer is sleeping. Wake it first.\n');
+    } else {
+      console.error(`\n  Failed to get history: ${result.errorMessage || result.status}\n`);
+    }
+    process.exit(1);
+  }
+
+  const commits = result.data.commits || [];
+  if (commits.length === 0) {
+    console.log(`\n  ${biz.name} \u2014 no history yet.\n`);
+    return;
+  }
+
+  console.log(`\n  ${biz.name} \u2014 history\n`);
+
+  for (const commit of commits) {
+    const date = _timeSince(commit.date) || commit.date;
+    const msg = commit.message || '';
+
+    // Parse actor from message format "actor/name: message"
+    const colonIdx = msg.indexOf(': ');
+    let actor = '';
+    let description = msg;
+    if (colonIdx > 0 && colonIdx < 40) {
+      actor = msg.substring(0, colonIdx);
+      description = msg.substring(colonIdx + 2);
+    }
+
+    const actorDisplay = actor ? `  ${actor}` : '';
+    console.log(`  ${date.padEnd(12)} ${actorDisplay}`);
+    console.log(`               ${description}`);
+    console.log('');
+  }
+}
+
+
+function _timeSince(isoString) {
+  if (!isoString) return null;
+  const diff = Date.now() - new Date(isoString).getTime();
+  if (diff < 0) return 'just now';
+  const mins = Math.floor(diff / 60000);
+  if (mins < 1) return 'just now';
+  if (mins < 60) return `${mins}m ago`;
+  const hours = Math.floor(mins / 60);
+  if (hours < 24) return `${hours}h ago`;
+  const days = Math.floor(hours / 24);
+  return `${days}d ago`;
+}
+
+
+module.exports = { businessStatus, businessLog };