atris 2.6.0 → 2.6.1

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

@@ -698,6 +698,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 +881,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') {

package/commands/context-sync.js

@@ -0,0 +1,226 @@
+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 (hashes only)
+  const result = await apiRequestJson(
+    `/businesses/${biz.businessId}/workspaces/${biz.workspaceId}/snapshot?include_content=false`,
+    { method: 'GET', token: biz.token }
+  );
+
+  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 = {};
+  for (const file of (result.data.files || [])) {
+    if (file.path && !file.binary) {
+      remoteFiles[file.path] = { hash: file.hash, size: file.size || 0 };
+    }
+  }
+
+  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 };

package/commands/pull.js

@@ -7,6 +7,7 @@ const { loadConfig } = require('../utils/config');
 const { getLogPath } = require('../lib/file-ops');
 const { parseJournalSections, mergeSections, reconstructJournal } = require('../lib/journal');
 const { loadBusinesses } = require('./business');
+const { loadManifest, saveManifest, computeFileHash, buildManifest, computeLocalHashes, threeWayCompare } = require('../lib/manifest');
 
 async function pullAtris() {
   const arg = process.argv[3];
@@ -77,13 +78,14 @@ async function pullBusiness(slug) {
     process.exit(1);
   }
 
+  const force = process.argv.includes('--force');
+
   // Determine output directory
   const intoIdx = process.argv.indexOf('--into');
   let outputDir;
   if (intoIdx !== -1 && process.argv[intoIdx + 1]) {
     outputDir = path.resolve(process.argv[intoIdx + 1]);
   } else {
-    // Default: atris/{slug}/ in current directory, or just {slug}/ if no atris/ folder
     const atrisDir = path.join(process.cwd(), 'atris');
     if (fs.existsSync(atrisDir)) {
       outputDir = path.join(atrisDir, slug);
@@ -93,15 +95,15 @@ async function pullBusiness(slug) {
   }
 
   // Resolve business ID — check local config first, then API
-  let businessId, workspaceId, businessName;
+  let businessId, workspaceId, businessName, resolvedSlug;
   const businesses = loadBusinesses();
 
   if (businesses[slug]) {
     businessId = businesses[slug].business_id;
     workspaceId = businesses[slug].workspace_id;
     businessName = businesses[slug].name || slug;
+    resolvedSlug = businesses[slug].slug || slug;
   } else {
-    // Try to find by slug via API
     const listResult = await apiRequestJson('/businesses/', { method: 'GET', token: creds.token });
     if (!listResult.ok) {
       console.error(`Failed to fetch businesses: ${listResult.errorMessage || listResult.status}`);
@@ -117,8 +119,8 @@ async function pullBusiness(slug) {
     businessId = match.id;
     workspaceId = match.workspace_id;
     businessName = match.name;
+    resolvedSlug = match.slug;
 
-    // Auto-save for next time
     businesses[slug] = {
       business_id: businessId,
       workspace_id: workspaceId,
@@ -135,25 +137,29 @@ async function pullBusiness(slug) {
     process.exit(1);
   }
 
+  // Load manifest (last sync state)
+  const manifest = loadManifest(resolvedSlug || slug);
+  const timeSince = manifest ? _timeSince(manifest.last_sync) : null;
+
   console.log('');
-  console.log(`Pulling ${businessName}...`);
+  console.log(`Pulling ${businessName}...` + (timeSince ? `  (last synced ${timeSince})` : ''));
 
-  // Snapshot — one API call gets everything
+  // Get remote snapshot (large workspaces can take 60s+)
   const result = await apiRequestJson(
     `/businesses/${businessId}/workspaces/${workspaceId}/snapshot?include_content=true`,
-    { method: 'GET', token: creds.token }
+    { method: 'GET', token: creds.token, timeoutMs: 120000 }
   );
 
   if (!result.ok) {
     const msg = result.errorMessage || `HTTP ${result.status}`;
     if (result.status === 409) {
-      console.error(`\nComputer is sleeping. Wake it first, then pull again.`);
+      console.error(`\n  Computer is sleeping. Wake it first, then pull again.`);
     } else if (result.status === 403) {
-      console.error(`\nAccess denied. You're not a member of "${slug}".`);
+      console.error(`\n  Access denied. You're not a member of "${slug}".`);
     } else if (result.status === 404) {
-      console.error(`\nBusiness "${slug}" not found.`);
+      console.error(`\n  Business "${slug}" not found.`);
     } else {
-      console.error(`\nPull failed: ${msg}`);
+      console.error(`\n  Pull failed: ${msg}`);
     }
     process.exit(1);
   }
@@ -164,45 +170,117 @@ async function pullBusiness(slug) {
     return;
   }
 
-  // Write files to local directory
-  let written = 0;
-  let skipped = 0;
-
+  // Build remote file map {path: {hash, size, content}}
+  const remoteFiles = {};
+  const remoteContent = {};
   for (const file of files) {
-    if (!file.path || file.content === null || file.content === undefined) {
-      skipped++;
-      continue;
-    }
-    if (file.binary) {
-      skipped++;
-      continue;
-    }
+    if (!file.path || file.binary || file.content === null || file.content === undefined) continue;
+    remoteFiles[file.path] = { hash: file.hash || computeFileHash(file.content), size: file.size || 0 };
+    remoteContent[file.path] = file.content;
+  }
+
+  // Compute local file hashes
+  const localFiles = fs.existsSync(outputDir) ? computeLocalHashes(outputDir) : {};
 
-    const localPath = path.join(outputDir, file.path.replace(/^\//, ''));
-    const localDir = path.dirname(localPath);
+  // Three-way compare
+  const baseFiles = (manifest && manifest.files) ? manifest.files : {};
+  const diff = threeWayCompare(localFiles, remoteFiles, manifest);
+
+  // Apply changes
+  let pulled = 0;
+  let conflictCount = 0;
+  let unchangedCount = diff.unchanged.length;
+
+  console.log('');
+
+  // Pull files that changed remotely (and we didn't change locally)
+  for (const p of [...diff.toPull, ...diff.newRemote]) {
+    const content = remoteContent[p];
+    if (!content && content !== '') continue;
+    const localPath = path.join(outputDir, p.replace(/^\//, ''));
+    fs.mkdirSync(path.dirname(localPath), { recursive: true });
+    fs.writeFileSync(localPath, content);
+    const label = diff.newRemote.includes(p) ? 'new on computer' : 'updated on computer';
+    const icon = diff.newRemote.includes(p) ? '+' : '\u2193';
+    console.log(`  ${icon} ${p.replace(/^\//, '')}  ${label}`);
+    pulled++;
+  }
 
-    // Check if unchanged
-    if (fs.existsSync(localPath)) {
-      const existing = fs.readFileSync(localPath, 'utf8');
-      if (existing === file.content) {
-        skipped++;
-        continue;
+  // Handle conflicts
+  for (const p of diff.conflicts) {
+    if (force) {
+      // Force mode: pull remote version, overwrite local
+      const content = remoteContent[p];
+      if (!content && content !== '') continue;
+      const localPath = path.join(outputDir, p.replace(/^\//, ''));
+      fs.mkdirSync(path.dirname(localPath), { recursive: true });
+      fs.writeFileSync(localPath, content);
+      console.log(`  ! ${p.replace(/^\//, '')}  overwritten (--force)`);
+      pulled++;
+    } else {
+      // Save remote version alongside local
+      const content = remoteContent[p];
+      if (content || content === '') {
+        const localPath = path.join(outputDir, p.replace(/^\//, '') + '.remote');
+        fs.mkdirSync(path.dirname(localPath), { recursive: true });
+        fs.writeFileSync(localPath, content);
       }
+      console.log(`  \u26A0 ${p.replace(/^\//, '')}  CONFLICT \u2014 both you and the computer changed this`);
+      console.log(`    \u2192 Remote version saved as ${p.replace(/^\//, '')}.remote`);
+      conflictCount++;
     }
+  }
 
-    fs.mkdirSync(localDir, { recursive: true });
-    fs.writeFileSync(localPath, file.content);
-    written++;
+  // Warn about remote deletions
+  for (const p of diff.deletedRemote) {
+    console.log(`  - ${p.replace(/^\//, '')}  deleted on computer`);
   }
 
-  console.log('');
-  if (written > 0) {
-    console.log(`  ${written} file${written > 1 ? 's' : ''} pulled to ${outputDir}`);
+  // Show unchanged
+  if (unchangedCount > 0 && pulled === 0 && conflictCount === 0 && diff.deletedRemote.length === 0) {
+    console.log('  Already up to date.');
   }
-  if (skipped > 0) {
-    console.log(`  ${skipped} unchanged`);
+
+  // Summary
+  console.log('');
+  const parts = [];
+  if (pulled > 0) parts.push(`${pulled} pulled`);
+  if (diff.newRemote.length > 0 && !parts.some(p => p.includes('pulled'))) parts.push(`${diff.newRemote.length} new`);
+  if (unchangedCount > 0) parts.push(`${unchangedCount} unchanged`);
+  if (conflictCount > 0) parts.push(`${conflictCount} conflict${conflictCount > 1 ? 's' : ''}`);
+  if (diff.deletedRemote.length > 0) parts.push(`${diff.deletedRemote.length} deleted remotely`);
+  if (parts.length > 0) console.log(`  ${parts.join(', ')}.`);
+
+  // Get current commit hash from remote (for manifest)
+  let commitHash = null;
+  try {
+    const headResult = await apiRequestJson(
+      `/businesses/${businessId}/workspaces/${workspaceId}/git/head`,
+      { method: 'GET', token: creds.token }
+    );
+    if (headResult.ok && headResult.data && headResult.data.commit) {
+      commitHash = headResult.data.commit;
+    }
+  } catch {
+    // Git might not be initialized yet — that's fine
   }
-  console.log(`\n  Total: ${files.length} files (${result.data.total_size} bytes)`);
+
+  // Save manifest
+  const newManifest = buildManifest(remoteFiles, commitHash);
+  saveManifest(resolvedSlug || slug, newManifest);
+}
+
+
+function _timeSince(isoString) {
+  if (!isoString) return null;
+  const diff = Date.now() - new Date(isoString).getTime();
+  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`;
 }