atris 2.4.0 → 2.5.1

package/bin/atris.js

@@ -1,12 +1,16 @@
 #!/usr/bin/env node
 
+// Catch-all for uncaught async errors — prevents silent crashes
+process.on('unhandledRejection', (err) => {
+  console.error(`\n✗ Unexpected error: ${err?.message || err}`);
+  process.exit(1);
+});
+
 const fs = require('fs');
 const path = require('path');
 const { exec, spawnSync } = require('child_process');
 const readline = require('readline');
 const os = require('os');
-const https = require('https');
-const http = require('http');
 const crypto = require('crypto');
 const PACKAGE_JSON_PATH = path.join(__dirname, '..', 'package.json');
 
@@ -21,15 +25,42 @@ try {
   // Ignore parse errors; fall back to unknown
 }
 
-const DEFAULT_CLIENT_ID = `AtrisCLI/${CLI_VERSION}`;
-const DEFAULT_USER_AGENT = `${DEFAULT_CLIENT_ID} (node ${process.version}; ${os.platform()} ${os.release()} ${os.arch()})`;
-
 // Update check utility
 const { checkForUpdates, showUpdateNotification, autoUpdate } = require('../utils/update-check');
 
 // State detection for smart default
 const { detectWorkspaceState, loadContext } = require('../lib/state-detection');
 
+// Journal & config utilities (canonical modules)
+const { getLogPath, ensureLogDirectory, createLogFile } = require('../lib/file-ops');
+const { getConfigPath, loadConfig, saveConfig, loadLogSyncState, saveLogSyncState } = require('../utils/config');
+
+// Auth & API (canonical modules — eliminates duplicate inline code)
+const {
+  decodeJwtClaims, getTokenExpiryEpochSeconds, shouldRefreshToken,
+  getCredentialsPath, saveCredentials, loadCredentials, deleteCredentials,
+  validateAccessToken: _validateAccessToken,
+  refreshAccessToken: _refreshAccessToken,
+  performTokenRefresh: _performTokenRefresh,
+  ensureValidCredentials: _ensureValidCredentials,
+  fetchMyAgents: _fetchMyAgents,
+  displayAccountSummary: _displayAccountSummary,
+  openBrowser, promptUser,
+} = require('../utils/auth');
+const {
+  getApiBaseUrl, getAppBaseUrl, buildApiUrl, httpRequest,
+  apiRequestJson, streamProChat, spawnClaudeCodeSession,
+  DEFAULT_CLIENT_ID, DEFAULT_USER_AGENT,
+} = require('../utils/api');
+
+// Bind DI wrappers (utils/auth uses dependency injection for apiRequestJson)
+const validateAccessToken = (token) => _validateAccessToken(token, apiRequestJson);
+const refreshAccessToken = (rt, p) => _refreshAccessToken(rt, p, apiRequestJson);
+const performTokenRefresh = (creds) => _performTokenRefresh(creds, apiRequestJson);
+const ensureValidCredentials = (opts) => _ensureValidCredentials(apiRequestJson, opts);
+const fetchMyAgents = (token) => _fetchMyAgents(token, apiRequestJson);
+const displayAccountSummary = () => _displayAccountSummary(apiRequestJson);
+
 // Run update check in background (non-blocking)
 // Skip for 'version' and 'update' commands to avoid redundant messages
 let updateCheckPromise = null;
@@ -39,12 +70,16 @@ if (!skipUpdateCheck && (!process.argv[2] || (process.argv[2] && !['version', 'u
     .then((updateInfo) => {
       // Show notification if update available (after command completes)
       if (updateInfo) {
-        // Auto-update in background, fall back to notification if it fails
-        setTimeout(() => {
-          if (!autoUpdate(updateInfo)) {
-            showUpdateNotification(updateInfo);
-          }
-        }, 100);
+        // Notify only — never auto-update mid-session (opt-in via ATRIS_AUTO_UPDATE=1)
+        if (process.env.ATRIS_AUTO_UPDATE === '1') {
+          setTimeout(() => {
+            if (!autoUpdate(updateInfo)) {
+              showUpdateNotification(updateInfo);
+            }
+          }, 100);
+        } else {
+          showUpdateNotification(updateInfo);
+        }
       }
       return updateInfo;
     })
@@ -56,52 +91,17 @@ if (!skipUpdateCheck && (!process.argv[2] || (process.argv[2] && !['version', 'u
 
 const command = process.argv[2];
 
-// Auto-sync skills on every command (fast — just file diffs, no network)
-try {
-  const { syncSkills } = require('../commands/sync');
-  const skillsUpdated = syncSkills({ silent: true });
-  if (skillsUpdated > 0) {
-    console.log(`⬆️  ${skillsUpdated} skill${skillsUpdated > 1 ? 's' : ''} updated`);
-  }
-} catch (e) {
-  // Non-critical
-}
-
-const TOKEN_REFRESH_BUFFER_SECONDS = 300; // Refresh ~5 minutes before expiry
-
-function decodeJwtClaims(token) {
-  if (!token || typeof token !== 'string') {
-    return null;
-  }
-  const parts = token.split('.');
-  if (parts.length < 2) {
-    return null;
-  }
+// Auto-sync skills only for commands that modify workspace state
+if (['init', 'update', 'sync', 'upgrade'].includes(command)) {
   try {
-    const normalized = parts[1].replace(/-/g, '+').replace(/_/g, '/');
-    const padded = normalized.padEnd(normalized.length + ((4 - (normalized.length % 4)) % 4), '=');
-    const decoded = Buffer.from(padded, 'base64').toString('utf8');
-    return JSON.parse(decoded);
-  } catch {
-    return null;
-  }
-}
-
-function getTokenExpiryEpochSeconds(token) {
-  const claims = decodeJwtClaims(token);
-  if (!claims || typeof claims.exp !== 'number') {
-    return null;
-  }
-  return claims.exp;
-}
-
-function shouldRefreshToken(token, bufferSeconds = TOKEN_REFRESH_BUFFER_SECONDS) {
-  const exp = getTokenExpiryEpochSeconds(token);
-  if (!exp) {
-    return false;
+    const { syncSkills } = require('../commands/sync');
+    const skillsUpdated = syncSkills({ silent: true });
+    if (skillsUpdated > 0) {
+      console.log(`⬆️  ${skillsUpdated} skill${skillsUpdated > 1 ? 's' : ''} updated`);
+    }
+  } catch (e) {
+    // Non-critical
   }
-  const nowSeconds = Math.floor(Date.now() / 1000);
-  return exp <= nowSeconds + bufferSeconds;
 }
 
 function searchJournal(keyword) {
@@ -124,25 +124,28 @@ function searchJournal(keyword) {
 
   // Recursively find all .md files in logs directory
   function walkDir(dir) {
-    const files = fs.readdirSync(dir);
+    let files;
+    try { files = fs.readdirSync(dir); } catch { return; }
     for (const file of files) {
-      const filePath = path.join(dir, file);
-      const stat = fs.statSync(filePath);
-      if (stat.isDirectory()) {
-        walkDir(filePath);
-      } else if (file.endsWith('.md')) {
-        const content = fs.readFileSync(filePath, 'utf8');
-        const lines = content.split('\n');
-        lines.forEach((line, idx) => {
-          if (line.toLowerCase().includes(keywordLower)) {
-            results.push({
-              file: path.relative(process.cwd(), filePath),
-              line: idx + 1,
-              content: line.trim()
-            });
-          }
-        });
-      }
+      try {
+        const filePath = path.join(dir, file);
+        const stat = fs.statSync(filePath);
+        if (stat.isDirectory()) {
+          walkDir(filePath);
+        } else if (file.endsWith('.md')) {
+          const content = fs.readFileSync(filePath, 'utf8');
+          const lines = content.split('\n');
+          lines.forEach((line, idx) => {
+            if (line.toLowerCase().includes(keywordLower)) {
+              results.push({
+                file: path.relative(process.cwd(), filePath),
+                line: idx + 1,
+                content: line.trim()
+              });
+            }
+          });
+        }
+      } catch { /* skip unreadable files */ }
     }
   }
 
@@ -160,6 +163,31 @@ function searchJournal(keyword) {
   }
 }
 
+function consoleCmd() {
+  const workspace = process.cwd();
+  const daemonScript = path.join(workspace, 'cli', 'atrisd.sh');
+
+  if (!fs.existsSync(daemonScript)) {
+    console.error('✗ Missing cli/atrisd.sh in this workspace.');
+    console.error('  Run this from your project root, or add cli/atrisd.sh first.');
+    process.exit(1);
+  }
+
+  const args = process.argv.slice(3);
+  const result = spawnSync('bash', [daemonScript, ...args], {
+    cwd: workspace,
+    stdio: 'inherit',
+    env: process.env,
+  });
+
+  if (result.error) {
+    console.error(`✗ Failed to start console: ${result.error.message}`);
+    process.exit(1);
+  }
+
+  process.exit(result.status ?? 0);
+}
+
 function showHelp() {
   console.log('');
   console.log('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━');
@@ -203,6 +231,7 @@ function showHelp() {
   console.log('  next       - Auto-advance to next step');
   console.log('');
   console.log('Cloud & agents:');
+  console.log('  console    - Start/attach always-on coding console (tmux daemon)');
   console.log('  agent      - Select which Atris agent to use');
   console.log('  chat       - Chat with the selected Atris agent');
   console.log('  login      - Authenticate (use --token <t> for non-interactive)');
@@ -326,30 +355,20 @@ if (command === 'help' || command === '--help' || command === '-h') {
   process.exit(0);
 }
 
-// Command handlers - must load BEFORE interactiveEntry() is called (TDZ issue)
+// Core command handlers — loaded eagerly (used by interactiveEntry default path)
 const { initAtris: initCmd } = require('../commands/init');
 const { syncAtris: syncCmd } = require('../commands/sync');
 const { logAtris: logCmd } = require('../commands/log');
-const { logSyncAtris: logSyncCmd } = require('../commands/log-sync');
-const { loginAtris: loginCmd, logoutAtris: logoutCmd, whoamiAtris: whoamiCmd, switchAccount: switchCmd, listAccountsCmd: accountsCmd } = require('../commands/auth');
-const { showVersion: versionCmd } = require('../commands/version');
-const { planAtris: planCmd, doAtris: doCmd, reviewAtris: reviewCmd } = require('../commands/workflow');
-const { visualizeAtris: visualizeCmd } = require('../commands/visualize');
-const { brainstormAtris: brainstormCmd } = require('../commands/brainstorm');
-const { autopilotAtris: autopilotCmd, autopilotFromTodo: autopilotFromTodoCmd } = require('../commands/autopilot');
 const { activateAtris: activateCmd } = require('../commands/activate');
 const { statusAtris: statusCmd } = require('../commands/status');
-const { analyticsAtris: analyticsCmd } = require('../commands/analytics');
-const { cleanAtris: cleanCmd } = require('../commands/clean');
-const { verifyAtris: verifyCmd } = require('../commands/verify');
-const { skillCommand: skillCmd } = require('../commands/skill');
-const { memberCommand: memberCmd } = require('../commands/member');
-const { pluginCommand: pluginCmd } = require('../commands/plugin');
+const { planAtris: planCmd, doAtris: doCmd, reviewAtris: reviewCmd } = require('../commands/workflow');
+
+// All other commands are lazy-loaded inline (require() only when invoked)
 
 // Check if this is a known command or natural language input
 const knownCommands = ['init', 'log', 'status', 'analytics', 'visualize', 'brainstorm', 'autopilot', 'plan', 'do', 'review',
-                       'activate', 'agent', 'chat', 'login', 'logout', 'whoami', 'switch', 'accounts', 'update', 'upgrade', 'version', 'help', 'next', 'atris',
-                       'clean', 'verify', 'search', 'skill', 'member', 'plugin',
+                       'activate', 'agent', 'chat', 'console', 'login', 'logout', 'whoami', 'switch', 'accounts', 'update', 'upgrade', 'version', 'help', 'next', 'atris',
+                       'clean', 'verify', 'search', 'skill', 'member', 'plugin', 'sync',
                        'gmail', 'calendar', 'twitter', 'slack', 'integrations'];
 
 // Check if command is an atris.md spec file - triggers welcome visualization
@@ -651,11 +670,11 @@ if (command === 'init') {
       process.exit(1);
     });
 } else if (command === 'agent') {
-  agentAtris();
+  agentAtris().then(() => process.exit(0)).catch((err) => { console.error(`\n✗ Error: ${err.message || err}`); process.exit(1); });
 } else if (command === 'log') {
   const subcommand = process.argv[3];
   if (subcommand === 'sync') {
-    logSyncCmd()
+    require('../commands/log-sync').logSyncAtris()
       .then(() => process.exit(0))
       .catch((error) => {
         console.error(`✗ Log sync failed: ${error.message || error}`);
@@ -666,10 +685,10 @@ if (command === 'init') {
   }
 } else if (command === 'activate') {
   activateCmd();
-} else if (command === 'update') {
+} else if (command === 'update' || command === 'sync') {
   syncCmd();
 } else if (command === 'upgrade') {
-  upgradeAtris();
+  upgradeAtris().then(() => process.exit(0)).catch((err) => { console.error(`\n✗ Error: ${err.message || err}`); process.exit(1); });
 } else if (command === 'chat') {
   chatAtris()
     .then(() => process.exit(0))
@@ -677,23 +696,25 @@ if (command === 'init') {
       console.error(`✗ Chat failed: ${error.message || error}`);
       process.exit(1);
     });
+} else if (command === 'console') {
+  consoleCmd();
 } else if (command === 'version') {
-  versionCmd();
+  require('../commands/version').showVersion();
 } else if (command === 'login') {
-  loginCmd();
+  require('../commands/auth').loginAtris();
 } else if (command === 'logout') {
-  logoutCmd();
+  require('../commands/auth').logoutAtris();
 } else if (command === 'whoami') {
-  whoamiCmd();
+  require('../commands/auth').whoamiAtris();
 } else if (command === 'switch') {
-  switchCmd();
+  require('../commands/auth').switchAccount();
 } else if (command === 'accounts') {
-  accountsCmd();
+  require('../commands/auth').listAccountsCmd();
 } else if (command === 'visualize') {
   console.log('ℹ️  "atris visualize" is a legacy helper. Visualization is now built into "atris plan".');
   console.log('   Prefer: atris plan');
   console.log('');
-  visualizeCmd();
+  require('../commands/visualize').visualizeAtris();
 } else if (command === 'autopilot') {
   const args = process.argv.slice(3);
   if (args.includes('--help') || args.includes('-h')) {
@@ -721,9 +742,9 @@ if (command === 'init') {
 
   let promise;
   if (fromTodo) {
-    promise = autopilotFromTodoCmd(options);
+    promise = require('../commands/autopilot').autopilotFromTodo(options);
   } else if (description) {
-    promise = autopilotCmd(description, options);
+    promise = require('../commands/autopilot').autopilotAtris(description, options);
   } else {
     console.log('Usage: atris autopilot "description" [--bug] [--verbose] [--iterations=N]');
     console.log('       atris autopilot --from-todo');
@@ -739,7 +760,7 @@ if (command === 'init') {
       process.exit(1);
     });
 } else if (command === 'brainstorm') {
-  brainstormCmd()
+  require('../commands/brainstorm').brainstormAtris()
     .then(() => process.exit(0))
     .catch((error) => {
       console.error(`✗ Brainstorm failed: ${error.message || error}`);
@@ -794,13 +815,13 @@ if (command === 'init') {
   const isQuick = process.argv.includes('--quick') || process.argv.includes('-q');
   statusCmd(isQuick);
 } else if (command === 'analytics') {
-  analyticsCmd();
+  require('../commands/analytics').analyticsAtris();
 } else if (command === 'clean') {
   const dryRun = process.argv.includes('--dry-run') || process.argv.includes('-n');
-  cleanCmd({ dryRun });
+  require('../commands/clean').cleanAtris({ dryRun });
 } else if (command === 'verify') {
   const taskId = process.argv[3] || null;
-  verifyCmd(taskId);
+  require('../commands/verify').verifyAtris(taskId);
 } else if (command === 'search') {
   const keyword = process.argv.slice(3).join(' ');
   searchJournal(keyword);
@@ -810,241 +831,51 @@ if (command === 'init') {
   const args = process.argv.slice(4);
   gmailCommand(subcommand, ...args)
     .then(() => process.exit(0))
-    .catch((err) => { console.error(err.message); process.exit(1); });
+    .catch((err) => { console.error(`✗ Error: ${err.message || err}`); process.exit(1); });
 } else if (command === 'calendar') {
   const { calendarCommand } = require('../commands/integrations');
   const subcommand = process.argv[3];
   const args = process.argv.slice(4);
   calendarCommand(subcommand, ...args)
     .then(() => process.exit(0))
-    .catch((err) => { console.error(err.message); process.exit(1); });
+    .catch((err) => { console.error(`✗ Error: ${err.message || err}`); process.exit(1); });
 } else if (command === 'twitter') {
   const { twitterCommand } = require('../commands/integrations');
   const subcommand = process.argv[3];
   const args = process.argv.slice(4);
   twitterCommand(subcommand, ...args)
     .then(() => process.exit(0))
-    .catch((err) => { console.error(err.message); process.exit(1); });
+    .catch((err) => { console.error(`✗ Error: ${err.message || err}`); process.exit(1); });
 } else if (command === 'slack') {
   const { slackCommand } = require('../commands/integrations');
   const subcommand = process.argv[3];
   const args = process.argv.slice(4);
   slackCommand(subcommand, ...args)
     .then(() => process.exit(0))
-    .catch((err) => { console.error(err.message); process.exit(1); });
+    .catch((err) => { console.error(`✗ Error: ${err.message || err}`); process.exit(1); });
 } else if (command === 'integrations') {
   const { integrationsStatus } = require('../commands/integrations');
   integrationsStatus()
     .then(() => process.exit(0))
-    .catch((err) => { console.error(err.message); process.exit(1); });
+    .catch((err) => { console.error(`✗ Error: ${err.message || err}`); process.exit(1); });
 } else if (command === 'skill') {
   const subcommand = process.argv[3];
   const args = process.argv.slice(4);
-  skillCmd(subcommand, ...args);
+  require('../commands/skill').skillCommand(subcommand, ...args);
 } else if (command === 'member') {
   const subcommand = process.argv[3];
   const args = process.argv.slice(4);
-  memberCmd(subcommand, ...args);
+  require('../commands/member').memberCommand(subcommand, ...args);
 } else if (command === 'plugin') {
   const subcommand = process.argv[3] || 'build';
   const args = process.argv.slice(4);
-  pluginCmd(subcommand, ...args);
+  require('../commands/plugin').pluginCommand(subcommand, ...args);
 } else {
   console.log(`Unknown command: ${command}`);
   console.log('Run "atris help" to see available commands');
   process.exit(1);
 }
 
-// NOTE: initAtris, syncAtris, logAtris, appendLog, logSyncAtris, showTodayLog, showRecentLogs
-// are legacy inline implementations. Routing now uses require('../commands/...') instead.
-// The journal utilities (getLogPath, ensureLogDirectory, createLogFile) are still used by
-// top-level code at lines ~393 and ~2553 via hoisting — do not remove without migrating those.
-function initAtris() {
-  const targetDir = path.join(process.cwd(), 'atris');
-  const teamDir = path.join(targetDir, 'team');
-  const sourceFile = path.join(__dirname, '..', 'atris.md');
-  const targetFile = path.join(targetDir, 'atris.md');
-
-  // Create atris/ folder structure
-  if (!fs.existsSync(targetDir)) {
-    fs.mkdirSync(targetDir, { recursive: true });
-    console.log('✓ Created atris/ folder');
-  } else {
-    console.log('✓ atris/ folder already exists');
-  }
-
-  // Create team/ subfolder
-  if (!fs.existsSync(teamDir)) {
-    fs.mkdirSync(teamDir, { recursive: true });
-    console.log('✓ Created atris/team/ folder');
-  }
-
-  // Create policies/ subfolder
-  const policiesDir = path.join(targetDir, 'policies');
-  if (!fs.existsSync(policiesDir)) {
-    fs.mkdirSync(policiesDir, { recursive: true });
-    console.log('✓ Created atris/policies/ folder');
-  }
-
-  // Create placeholder files
-  const gettingStartedFile = path.join(targetDir, 'GETTING_STARTED.md');
-  const personaFile = path.join(targetDir, 'PERSONA.md');
-  const mapFile = path.join(targetDir, 'MAP.md');
-  const taskContextsFile = path.join(targetDir, 'TASK_CONTEXTS.md');
-  const navigatorFile = path.join(teamDir, 'navigator.md');
-  const executorFile = path.join(teamDir, 'executor.md');
-  const validatorFile = path.join(teamDir, 'validator.md');
-  const launcherFile = path.join(teamDir, 'launcher.md');
-
-  const gettingStartedSource = path.join(__dirname, '..', 'GETTING_STARTED.md');
-  const personaSource = path.join(__dirname, '..', 'PERSONA.md');
-
-  // Copy GETTING_STARTED.md
-  if (!fs.existsSync(gettingStartedFile) && fs.existsSync(gettingStartedSource)) {
-    fs.copyFileSync(gettingStartedSource, gettingStartedFile);
-    console.log('✓ Created GETTING_STARTED.md');
-  }
-
-  // Copy PERSONA.md
-  if (!fs.existsSync(personaFile) && fs.existsSync(personaSource)) {
-    fs.copyFileSync(personaSource, personaFile);
-    console.log('✓ Created PERSONA.md');
-  }
-
-  if (!fs.existsSync(mapFile)) {
-    fs.writeFileSync(mapFile, '# MAP.md\n\n> Generated by your AI agent after reading atris.md\n\nRun your AI agent with atris.md to populate this file.\n');
-    console.log('✓ Created MAP.md placeholder');
-  }
-
-  if (!fs.existsSync(taskContextsFile)) {
-    fs.writeFileSync(taskContextsFile, '# TASK_CONTEXTS.md\n\n> Generated by your AI agent after reading atris.md\n\nRun your AI agent with atris.md to populate this file.\n');
-    console.log('✓ Created TASK_CONTEXTS.md placeholder');
-  }
-
-  // Copy agent templates from package (MEMBER.md directory format)
-  const members = ['navigator', 'executor', 'validator', 'launcher', 'brainstormer', 'researcher'];
-  members.forEach(name => {
-    const sourceFile = path.join(__dirname, '..', 'atris', 'team', name, 'MEMBER.md');
-    const memberDir = path.join(teamDir, name);
-    const targetFile = path.join(memberDir, 'MEMBER.md');
-    const legacyFile = path.join(teamDir, `${name}.md`);
-
-    if (fs.existsSync(targetFile) || fs.existsSync(legacyFile)) return;
-
-    if (fs.existsSync(sourceFile)) {
-      fs.mkdirSync(memberDir, { recursive: true });
-      fs.copyFileSync(sourceFile, targetFile);
-      console.log(`✓ Created team/${name}/MEMBER.md`);
-    }
-  });
-
-  // Copy policies from package
-  const antislopSource = path.join(__dirname, '..', 'atris', 'policies', 'ANTISLOP.md');
-  const antislopFile = path.join(policiesDir, 'ANTISLOP.md');
-  if (!fs.existsSync(antislopFile) && fs.existsSync(antislopSource)) {
-    fs.copyFileSync(antislopSource, antislopFile);
-    console.log('✓ Created policies/ANTISLOP.md');
-  }
-
-  // Copy atris.md to the folder
-  if (fs.existsSync(sourceFile)) {
-    fs.copyFileSync(sourceFile, targetFile);
-    console.log('✓ Copied atris.md to atris/ folder');
-    console.log('\nAtris initialized. Structure created:');
-    console.log('   atris/');
-    console.log('   ├── GETTING_STARTED.md (read this first!)');
-    console.log('   ├── PERSONA.md (agent personality)');
-    console.log('   ├── atris.md (AI agent instructions)');
-    console.log('   ├── MAP.md (placeholder)');
-    console.log('   ├── TASK_CONTEXTS.md (placeholder)');
-    console.log('   ├── team/');
-    console.log('   │   ├── navigator.md');
-    console.log('   │   ├── executor.md');
-    console.log('   │   ├── validator.md');
-    console.log('   │   └── launcher.md');
-    console.log('   └── policies/');
-    console.log('       └── ANTISLOP.md (output quality checklist)');
-    console.log('\nNext steps:');
-    console.log('1. Read atris/GETTING_STARTED.md for the full guide');
-    console.log('2. Open atris/atris.md and paste it to your AI agent');
-    console.log('3. Your agent will populate all placeholder files in ~10 mins');
-  } else {
-    console.error('✗ Error: atris.md not found in package');
-    process.exit(1);
-  }
-}
-
-function syncAtris() {
-  const targetDir = path.join(process.cwd(), 'atris');
-  const teamDir = path.join(targetDir, 'team');
-
-  // Check if atris/ folder exists
-  if (!fs.existsSync(targetDir)) {
-    console.error('✗ Error: atris/ folder not found. Run "atris init" first.');
-    process.exit(1);
-  }
-
-  // Ensure team folder exists
-  if (!fs.existsSync(teamDir)) {
-    fs.mkdirSync(teamDir, { recursive: true });
-  }
-
-  // Ensure policies folder exists
-  const policiesDir = path.join(targetDir, 'policies');
-  if (!fs.existsSync(policiesDir)) {
-    fs.mkdirSync(policiesDir, { recursive: true });
-    console.log('✓ Created atris/policies/ folder');
-  }
-
-  // Files to sync
-  const filesToSync = [
-    { source: 'atris.md', target: 'atris.md' },
-    { source: 'atrisDev.md', target: 'atrisDev.md' },
-    { source: 'PERSONA.md', target: 'PERSONA.md' },
-    { source: 'GETTING_STARTED.md', target: 'GETTING_STARTED.md' },
-    { source: 'atris/team/navigator/MEMBER.md', target: 'team/navigator/MEMBER.md' },
-    { source: 'atris/team/executor/MEMBER.md', target: 'team/executor/MEMBER.md' },
-    { source: 'atris/team/validator/MEMBER.md', target: 'team/validator/MEMBER.md' },
-    { source: 'atris/team/launcher/MEMBER.md', target: 'team/launcher/MEMBER.md' },
-    { source: 'atris/team/brainstormer/MEMBER.md', target: 'team/brainstormer/MEMBER.md' },
-    { source: 'atris/team/researcher/MEMBER.md', target: 'team/researcher/MEMBER.md' },
-    { source: 'atris/policies/ANTISLOP.md', target: 'policies/ANTISLOP.md' }
-  ];
-
-  let updated = 0;
-  let skipped = 0;
-
-  filesToSync.forEach(({ source, target }) => {
-    const sourceFile = path.join(__dirname, '..', source);
-    const targetFile = path.join(targetDir, target);
-
-    if (!fs.existsSync(sourceFile)) {
-      console.log(`⚠ Skipping ${source} (not found in package)`);
-      return;
-    }
-
-    const currentContent = fs.existsSync(targetFile) ? fs.readFileSync(targetFile, 'utf8') : '';
-    const newContent = fs.readFileSync(sourceFile, 'utf8');
-
-    if (currentContent === newContent) {
-      skipped++;
-      return;
-    }
-
-    fs.mkdirSync(path.dirname(targetFile), { recursive: true });
-    fs.copyFileSync(sourceFile, targetFile);
-    console.log(`✓ Updated ${target}`);
-    updated++;
-  });
-
-  if (updated === 0) {
-    console.log('✓ Already up to date');
-  } else {
-    console.log(`\n✓ Updated ${updated} file(s), ${skipped} unchanged`);
-    console.log('\nRun your AI agent again to use the latest specs and agent templates.');
-  }
-}
-
 async function upgradeAtris() {
   console.log('');
   console.log('┌─────────────────────────────────────────────────────────────┐');
@@ -1094,84 +925,21 @@ async function upgradeAtris() {
   }
 }
 
-// ============================================
-// Log System
-// ============================================
-
-function getLogPath(dateStr) {
-  const targetDir = path.join(process.cwd(), 'atris');
-  const date = dateStr ? new Date(dateStr) : new Date();
-  const year = date.getFullYear();
-  const month = String(date.getMonth() + 1).padStart(2, '0');
-  const day = String(date.getDate()).padStart(2, '0');
-  const dateFormatted = `${year}-${month}-${day}`; // YYYY-MM-DD in local time
-
-  const logsDir = path.join(targetDir, 'logs');
-  const yearDir = path.join(logsDir, year.toString());
-  const logFile = path.join(yearDir, `${dateFormatted}.md`);
-
-  return { logsDir, yearDir, logFile, dateFormatted };
-}
-
-function ensureLogDirectory() {
-  const { logsDir, yearDir } = getLogPath();
-
-  if (!fs.existsSync(logsDir)) {
-    fs.mkdirSync(logsDir, { recursive: true });
-  }
-
-  if (!fs.existsSync(yearDir)) {
-    fs.mkdirSync(yearDir, { recursive: true });
-  }
-}
-
-function createLogFile(logFile, dateFormatted) {
-  let carryInProgress = '';
-  let carryBacklog = '';
-  let carryInbox = '';
-
+function showVersion() {
   try {
-    const [y, m, d] = String(dateFormatted).split('-').map(Number);
-    if (Number.isFinite(y) && Number.isFinite(m) && Number.isFinite(d)) {
-      const prev = new Date(y, m - 1, d);
-      prev.setDate(prev.getDate() - 1);
-
-      const prevYear = prev.getFullYear();
-      const prevMonth = String(prev.getMonth() + 1).padStart(2, '0');
-      const prevDay = String(prev.getDate()).padStart(2, '0');
-      const prevDateFormatted = `${prevYear}-${prevMonth}-${prevDay}`;
-      const prevLogFile = path.join(process.cwd(), 'atris', 'logs', prevYear.toString(), `${prevDateFormatted}.md`);
-
-      if (fs.existsSync(prevLogFile)) {
-        const prevContent = fs.readFileSync(prevLogFile, 'utf8');
-
-        const escapeRegExp = (str) => str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-        const sectionBody = (headingLine) => {
-          const regex = new RegExp(
-            `## ${escapeRegExp(headingLine)}\\n([\\s\\S]*?)(?=\\n---|\\n## |$)`
-          );
-          const match = prevContent.match(regex);
-          return match ? match[1].trim() : '';
-        };
-
-        carryInProgress = sectionBody('In Progress 🔄');
-        carryBacklog = sectionBody('Backlog');
-        carryInbox = sectionBody('Inbox');
-      }
-    }
-  } catch {
-    // Best-effort carry-forward; never block journal creation.
+    const packageJson = JSON.parse(fs.readFileSync(PACKAGE_JSON_PATH, 'utf8'));
+    console.log(`atris v${packageJson.version}`);
+  } catch (error) {
+    console.error('✗ Error: Could not read package.json');
+    process.exit(1);
   }
-
-  const inProgressBody = carryInProgress ? `${carryInProgress}\n\n` : '';
-  const backlogBody = carryBacklog ? `${carryBacklog}\n\n` : '';
-  const inboxBody = carryInbox ? `${carryInbox}\n\n` : '';
-
-  const initialContent = `# Log — ${dateFormatted}\n\n## Completed ✅\n\n---\n\n## In Progress 🔄\n\n${inProgressBody}---\n\n## Backlog\n\n${backlogBody}---\n\n## Notes\n\n---\n\n## Inbox\n\n${inboxBody}\n`;
-  fs.writeFileSync(logFile, initialContent);
 }
 
-function logAtris() {
+// ============================================
+// Agent Selection
+// ============================================
+
+async function agentAtris() {
   const targetDir = path.join(process.cwd(), 'atris');
 
   // Check if atris/ folder exists
@@ -1180,1291 +948,138 @@ function logAtris() {
     process.exit(1);
   }
 
-  // Ensure log directory exists
-  ensureLogDirectory();
-  const { logFile, dateFormatted } = getLogPath();
+  // Check if logged in
+  const credentials = loadCredentials();
 
-  // Create log file if doesn't exist
-  if (!fs.existsSync(logFile)) {
-    createLogFile(logFile, dateFormatted);
+  if (!credentials || !credentials.token) {
+    console.error('✗ Error: Not logged in. Run "atris login" first.');
+    process.exit(1);
   }
 
-  // Start interactive logging session
-  console.log(`┌─────────────────────────────────────────────────────────┐`);
-  console.log(`│ Daily Log — ${dateFormatted}              [type "exit" to quit] │`);
-  console.log(`└─────────────────────────────────────────────────────────┘`);
-  console.log('');
+  console.log('🔍 Fetching your agents...\n');
 
-  const rl = readline.createInterface({
-    input: process.stdin,
-    output: process.stdout,
-    prompt: '> '
+  // Fetch agents from backend
+  const result = await apiRequestJson('/agent/my-agents', {
+    method: 'GET',
+    headers: {
+      'Authorization': `Bearer ${credentials.token}`,
+    },
   });
 
-  rl.prompt();
+  if (!result.ok) {
+    console.error(`✗ Error: ${result.error || 'Failed to fetch agents'}`);
+    process.exit(1);
+  }
 
-  rl.on('line', (line) => {
-    const input = line.trim();
+  const agents = result.data?.my_agents || [];
 
-    if (input.toLowerCase() === 'exit') {
-      console.log('\n✓ Log saved');
-      rl.close();
-      process.exit(0);
-    }
+  if (agents.length === 0) {
+    console.log('No agents found. Create one at https://atris.ai');
+    process.exit(0);
+  }
 
-    if (input) {
-      const entry = `- ${input}\n`;
-      fs.appendFileSync(logFile, entry);
+  // Show current selection
+  const config = loadConfig();
+  if (config.agent_id) {
+    const current = agents.find(a => a.id === config.agent_id);
+    if (current) {
+      console.log(`Current agent: ${current.name}\n`);
     }
+  }
 
-    rl.prompt();
+  // Display agents
+  console.log('Available agents:');
+  agents.forEach((agent, index) => {
+    console.log(`  ${index + 1}. ${agent.name}`);
   });
 
-  rl.on('close', () => {
+  console.log('');
+
+  // Prompt for selection
+  const answer = await promptUser('Select agent number (or press Enter to cancel): ');
+
+  if (!answer) {
+    console.log('Cancelled.');
     process.exit(0);
-  });
-}
+  }
 
-function appendLog(message) {
-  ensureLogDirectory();
-  const { logFile, dateFormatted } = getLogPath();
+  const selection = parseInt(answer, 10);
 
-  // Create log file if doesn't exist
-  if (!fs.existsSync(logFile)) {
-    createLogFile(logFile, dateFormatted);
-    console.log(`✓ Created log for ${dateFormatted}`);
+  if (isNaN(selection) || selection < 1 || selection > agents.length) {
+    console.error('✗ Invalid selection');
+    process.exit(1);
   }
 
-  // Append message with timestamp
-  const timestamp = new Date().toLocaleTimeString('en-US', { hour12: false });
-  const entry = `**${timestamp}** — ${message}\n\n`;
+  const selectedAgent = agents[selection - 1];
+
+  // Save to config
+  config.agent_id = selectedAgent.id;
+  config.agent_name = selectedAgent.name;
+  saveConfig(config);
 
-  fs.appendFileSync(logFile, entry);
-  console.log(`✓ Added to ${dateFormatted} log`);
+  console.log(`\n✓ Selected agent: ${selectedAgent.name}`);
+  console.log(`✓ Config saved to atris/.config`);
+  console.log(`\nYou can now use "atris chat" to talk with this agent.`);
 }
 
-async function logSyncAtris() {
-  const targetDir = path.join(process.cwd(), 'atris');
 
+async function chatAtris() {
+  // Get message from command line args
+  const message = process.argv.slice(3).join(' ').trim();
+
+  // Check atris/ exists
+  const targetDir = path.join(process.cwd(), 'atris');
   if (!fs.existsSync(targetDir)) {
-    throw new Error('atris/ folder not found. Run "atris init" first.');
+    console.error('✗ Error: atris/ folder not found. Run "atris init" first.');
+    process.exit(1);
   }
 
-  // Determine date (today by default, allow optional 4th arg or --date=)
-  let dateArg = process.argv[4];
-  if (dateArg && dateArg.startsWith('--date=')) {
-    dateArg = dateArg.split('=')[1];
+  // Check agent selected
+  const config = loadConfig();
+  if (!config.agent_id) {
+    console.error('✗ Error: No agent selected. Run "atris agent" first.');
+    process.exit(1);
   }
 
-  let { logsDir, yearDir, logFile, dateFormatted } = getLogPath(dateArg);
-  if (Number.isNaN(new Date(dateFormatted).getTime())) {
-    throw new Error(`Invalid date provided: ${dateArg}`);
+  // Check credentials
+  const credentials = loadCredentials();
+  if (!credentials || !credentials.token) {
+    console.error('✗ Error: Not logged in. Run "atris login" first.');
+    process.exit(1);
   }
 
-  // Ensure log directory and file exist
-  if (!fs.existsSync(logsDir)) {
-    fs.mkdirSync(logsDir, { recursive: true });
-  }
-  if (!fs.existsSync(yearDir)) {
-    fs.mkdirSync(yearDir, { recursive: true });
-  }
-  if (!fs.existsSync(logFile)) {
-    createLogFile(logFile, dateFormatted);
-    console.log(`Created local log template for ${dateFormatted}. Fill it in before syncing.`);
+  // If message provided, one-shot mode
+  if (message) {
+    await chatOnce(config, credentials, message);
+    return;
   }
 
-  let localContent = fs.readFileSync(logFile, 'utf8');
-  const localHash = computeContentHash(localContent);
-
-  // Ensure agent selected
-  const config = loadConfig();
-  if (!config.agent_id) {
-    throw new Error('No agent selected. Run "atris agent" first.');
-  }
+  // Otherwise, interactive mode
+  await chatInteractive(config, credentials);
+}
 
-  // Ensure credentials
-  const ensured = await ensureValidCredentials();
-  if (ensured.error) {
-    if (ensured.error === 'not_logged_in') {
-      throw new Error('Not logged in. Run "atris login" first.');
-    }
-    if (ensured.detail && ensured.detail.toLowerCase().includes('enotfound')) {
-      throw new Error('Unable to reach Atris API. Check your network connection.');
-    }
-    throw new Error(ensured.detail || ensured.error || 'Authentication failed');
-  }
+async function chatOnce(config, credentials, message) {
+  console.log(`\nAgent: ${config.agent_name || config.agent_id}`);
+  console.log('');
 
-  const credentials = ensured.credentials;
   const agentId = config.agent_id;
-  const agentLabel = config.agent_name || agentId;
-
-  console.log(`🔄 Syncing log for ${dateFormatted} with agent "${agentLabel}"`);
-
-  // Check existing remote entry (best effort)
-  const syncState = loadLogSyncState();
-  const knownRemoteUpdate = syncState[dateFormatted]?.updated_at || null;
-  const knownRemoteHash = syncState[dateFormatted]?.hash || null;
+  const apiUrl = getApiBaseUrl().replace(/\/api$/, '');
+  const endpoint = `${apiUrl}/api/agent/${agentId}/pro-chat`;
 
-  let remoteExists = false;
-  let remoteUpdatedAt = null;
-  let remoteContent = null;
-  let remoteHash = null;
-  const existing = await apiRequestJson(`/agents/${agentId}/journal/${dateFormatted}`, {
-    method: 'GET',
-    token: credentials.token,
+  const body = JSON.stringify({
+    message: message,
+    stream: true,
+    memory_enabled: true,
   });
 
-  if (existing.ok) {
-    remoteExists = true;
-    remoteUpdatedAt = existing.data?.updated_at || existing.data?.created_at || null;
-    remoteContent = typeof existing.data?.content === 'string' ? existing.data.content : null;
-    remoteHash = remoteContent ? computeContentHash(remoteContent) : null;
-
-    // Bidirectional sync: check if remote is newer
-    if (remoteUpdatedAt) {
-      const localStats = fs.statSync(logFile);
-      const localModified = localStats.mtime.toISOString();
-      const remoteTime = new Date(remoteUpdatedAt).getTime();
-      const localTime = new Date(localModified).getTime();
-
-      const remoteMatchesKnown = (knownRemoteUpdate && isSameTimestamp(remoteUpdatedAt, knownRemoteUpdate))
-        || (remoteHash && knownRemoteHash && remoteHash === knownRemoteHash);
-
-      if (remoteTime > localTime && !remoteMatchesKnown) {
-        const normalizedRemote = remoteContent ? remoteContent.replace(/\r\n/g, '\n') : null;
-        const normalizedLocal = localContent.replace(/\r\n/g, '\n');
-        if (normalizedRemote !== null && normalizedRemote.trim() === normalizedLocal.trim()) {
-          const remoteDate = new Date(remoteUpdatedAt);
-          if (!Number.isNaN(remoteDate.getTime())) {
-            fs.utimesSync(logFile, remoteDate, remoteDate);
-            const state = loadLogSyncState();
-            state[dateFormatted] = {
-              updated_at: remoteUpdatedAt,
-              hash: remoteHash || knownRemoteHash || computeContentHash(remoteContent || ''),
-            };
-            saveLogSyncState(state);
-          }
-          console.log('✓ Already synced (timestamps aligned with web)');
-          return;
-        }
-
-        // Try section-based merge
-        try {
-          const localSections = parseJournalSections(normalizedLocal);
-          const remoteSections = parseJournalSections(normalizedRemote || '');
-          const { merged, conflicts } = mergeSections(localSections, remoteSections, knownRemoteHash);
-
-          if (conflicts.length === 0) {
-            // Clean merge - auto-merge and continue
-            const mergedContent = reconstructJournal(merged);
-            fs.writeFileSync(logFile, mergedContent, 'utf8');
-            console.log('✓ Auto-merged web and local changes');
-            console.log(`   Merged sections: ${Object.keys(merged).filter(k => k !== '__header__').join(', ')}`);
-            // Update local content for push
-            localContent = mergedContent;
-          } else {
-            // Conflicts detected - prompt user
-            console.log('⚠️  Conflicting changes in same section(s)');
-            console.log(`   Conflicts: ${conflicts.join(', ')}`);
-            console.log(`   Remote updated: ${remoteUpdatedAt}`);
-            console.log(`   Local modified: ${localModified}`);
-            console.log('   Type "y" to replace local with web version, or "n" to keep local changes.');
-            console.log('');
-
-            if (typeof remoteContent === 'string') {
-              showLogDiff(logFile, remoteContent);
-            }
-
-            const answer = await promptUser('Overwrite local with web version? (y/n): ');
-
-            if (answer && answer.toLowerCase() === 'y') {
-              // Pull remote content
-              const pulledContent = existing.data?.content || '';
-              fs.writeFileSync(logFile, pulledContent, 'utf8');
-              remoteHash = computeContentHash(pulledContent);
-              console.log('✓ Local journal updated from web');
-              console.log(`🗒️  File: ${path.relative(process.cwd(), logFile)}`);
-              if (remoteUpdatedAt) {
-                const remoteDate = new Date(remoteUpdatedAt);
-                if (!Number.isNaN(remoteDate.getTime())) {
-                  fs.utimesSync(logFile, remoteDate, remoteDate);
-                }
-                const state = loadLogSyncState();
-                state[dateFormatted] = {
-                  updated_at: remoteUpdatedAt,
-                  hash: remoteHash || computeContentHash(pulledContent),
-                };
-                saveLogSyncState(state);
-              }
-              return;
-            } else {
-              console.log('⏩ Keeping local version, will push to web');
-            }
-          }
-        } catch (parseError) {
-          // Fallback to old prompt behavior if parsing fails
-          console.log('⚠️  Web version is newer than local version');
-          console.log(`   Remote updated: ${remoteUpdatedAt}`);
-          console.log(`   Local modified: ${localModified}`);
-          console.log('   Type "y" to replace your local file with the web version, or "n" to keep local changes and push them to the web.');
-          console.log('');
-
-          if (typeof remoteContent === 'string') {
-            showLogDiff(logFile, remoteContent);
-          }
-
-          const answer = await promptUser('Overwrite local with web version? (y/n): ');
-
-          if (answer && answer.toLowerCase() === 'y') {
-            // Pull remote content
-            const pulledContent = existing.data?.content || '';
-            fs.writeFileSync(logFile, pulledContent, 'utf8');
-            remoteHash = computeContentHash(pulledContent);
-            console.log('✓ Local journal updated from web');
-            console.log(`🗒️  File: ${path.relative(process.cwd(), logFile)}`);
-            if (remoteUpdatedAt) {
-              const remoteDate = new Date(remoteUpdatedAt);
-              if (!Number.isNaN(remoteDate.getTime())) {
-                fs.utimesSync(logFile, remoteDate, remoteDate);
-              }
-              const state = loadLogSyncState();
-              state[dateFormatted] = {
-                updated_at: remoteUpdatedAt,
-                hash: remoteHash || computeContentHash(pulledContent),
-              };
-              saveLogSyncState(state);
-            }
-            return;
-          } else {
-            console.log('⏩ Keeping local version, will push to web');
-          }
-        }
-      } else if (remoteTime > localTime && remoteMatchesKnown) {
-        console.log('⚠️  Web timestamp ahead due to clock skew (matches last sync); pushing local changes.');
-      } else if (remoteTime === localTime) {
-        console.log('✓ Already synced (local and web are identical)');
-        if (remoteUpdatedAt) {
-          const state = loadLogSyncState();
-          state[dateFormatted] = {
-            updated_at: remoteUpdatedAt,
-            hash: remoteHash || knownRemoteHash || computeContentHash(remoteContent || ''),
-          };
-          saveLogSyncState(state);
-        }
-        return;
-      }
-    }
-  } else if (!existing.status) {
-    throw new Error('Unable to reach Atris API. Check your network connection.');
-  } else if (existing.status && existing.status !== 404) {
-    throw new Error(existing.error || 'Failed to check existing journal entry');
-  }
-
-  const payload = {
-    content: localContent,
-    metadata: {
-      source: 'cli',
-      local_path: `logs/${dateFormatted}.md`,
-    },
-  };
-
-  const result = await apiRequestJson(`/agents/${agentId}/journal/${dateFormatted}`, {
-    method: 'PUT',
-    token: credentials.token,
-    body: payload,
-  });
-
-  if (!result.ok) {
-    if (!result.status) {
-      throw new Error('Unable to reach Atris API. Check your network connection.');
-    }
-    throw new Error(result.error || 'Failed to sync journal entry');
-  }
-
-  const data = result.data || {};
-  const updatedAt = data.updated_at || new Date().toISOString();
-
-  if (remoteExists) {
-    console.log(`✓ Updated journal entry (previous update: ${remoteUpdatedAt || 'unknown'})`);
-  } else {
-    console.log('✓ Created journal entry in Atris');
-  }
-
-  console.log(`🗒️  Local file: ${path.relative(process.cwd(), logFile)}`);
-  console.log(`🕒 Updated at: ${updatedAt}`);
-  const updatedDate = new Date(updatedAt);
-  if (!Number.isNaN(updatedDate.getTime())) {
-    fs.utimesSync(logFile, updatedDate, updatedDate);
-  }
-  const finalContent = fs.readFileSync(logFile, 'utf8');
-  const finalHash = computeContentHash(finalContent);
-  const finalState = loadLogSyncState();
-  finalState[dateFormatted] = {
-    updated_at: updatedAt,
-    hash: finalHash,
-  };
-  saveLogSyncState(finalState);
-}
-
-function showTodayLog() {
-  const { logFile, dateFormatted } = getLogPath();
-
-  if (!fs.existsSync(logFile)) {
-    console.log(`No log for today (${dateFormatted})`);
-    console.log('\nCreate one with: atris log "your message"');
-    process.exit(0);
-  }
-
-  const content = fs.readFileSync(logFile, 'utf8');
-  console.log(content);
-}
-
-function showRecentLogs() {
-  const { logsDir, yearDir } = getLogPath();
-
-  if (!fs.existsSync(logsDir) || !fs.existsSync(yearDir)) {
-    console.log('No logs found');
-    console.log('\nCreate one with: atris log "your message"');
-    process.exit(0);
-  }
-
-  // Get all log files in current year directory
-  const files = fs.readdirSync(yearDir)
-    .filter(f => f.endsWith('.md'))
-    .sort()
-    .reverse()
-    .slice(0, 3); // Last 3 days
-
-  if (files.length === 0) {
-    console.log('No logs found');
-    process.exit(0);
-  }
-
-  console.log(`\n📋 Last ${files.length} day(s) of logs:\n`);
-  console.log('='.repeat(60) + '\n');
-
-  files.reverse().forEach((file, index) => {
-    const filePath = path.join(yearDir, file);
-    const content = fs.readFileSync(filePath, 'utf8');
-    console.log(content);
-
-    // Add separator between days
-    if (index < files.length - 1) {
-      console.log('─'.repeat(60) + '\n');
-    }
-  });
-}
-
-// ============================================
-// Authentication & Credentials Management
-// ============================================
-
-function getCredentialsPath() {
-  const homeDir = os.homedir();
-  const atrisDir = path.join(homeDir, '.atris');
-
-  // Create .atris directory if it doesn't exist
-  if (!fs.existsSync(atrisDir)) {
-    fs.mkdirSync(atrisDir, { recursive: true });
-  }
-
-  return path.join(atrisDir, 'credentials.json');
-}
-
-function saveCredentials(token, refreshToken, email, userId, provider) {
-  const credentialsPath = getCredentialsPath();
-  const credentials = {
-    token,
-    refresh_token: refreshToken || null,
-    email: email || null,
-    user_id: userId || null,
-    provider: provider || null,
-    saved_at: new Date().toISOString()
-  };
-
-  fs.writeFileSync(credentialsPath, JSON.stringify(credentials, null, 2));
-}
-
-function loadCredentials() {
-  const credentialsPath = getCredentialsPath();
-
-  if (!fs.existsSync(credentialsPath)) {
-    return null;
-  }
-
-  try {
-    const data = fs.readFileSync(credentialsPath, 'utf8');
-    const parsed = JSON.parse(data);
-    if (!parsed.provider) {
-      parsed.provider = null;
-    }
-    if (!parsed.saved_at && parsed.created_at) {
-      parsed.saved_at = parsed.created_at;
-    }
-    return parsed;
-  } catch (error) {
-    return null;
-  }
-}
-
-function deleteCredentials() {
-  const credentialsPath = getCredentialsPath();
-
-  if (fs.existsSync(credentialsPath)) {
-    fs.unlinkSync(credentialsPath);
-  }
-}
-
-function getApiBaseUrl() {
-  const raw = process.env.ATRIS_API_URL || 'https://api.atris.ai/api';
-  return raw.replace(/\/$/, '');
-}
-
-function getAppBaseUrl() {
-  const raw = process.env.ATRIS_APP_URL || 'https://atris.ai';
-  return raw.replace(/\/$/, '');
-}
-
-function buildApiUrl(pathname) {
-  const base = getApiBaseUrl();
-  const normalizedPath = pathname.startsWith('/') ? pathname : `/${pathname}`;
-  return `${base}${normalizedPath}`;
-}
-
-async function apiRequestJson(pathname, options = {}) {
-  const url = buildApiUrl(pathname);
-  const headers = { ...(options.headers || {}) };
-  if (options.token) {
-    headers.Authorization = `Bearer ${options.token}`;
-  }
-  if (!headers['User-Agent'] && !headers['user-agent']) {
-    headers['User-Agent'] = DEFAULT_USER_AGENT;
-  }
-  if (!headers['X-Atris-Client']) {
-    headers['X-Atris-Client'] = DEFAULT_CLIENT_ID;
-  }
-
-  let bodyPayload;
-  if (options.body !== undefined && options.body !== null) {
-    if (typeof options.body === 'string' || Buffer.isBuffer(options.body)) {
-      bodyPayload = options.body;
-    } else {
-      bodyPayload = JSON.stringify(options.body);
-      if (!headers['Content-Type']) {
-        headers['Content-Type'] = 'application/json';
-      }
-    }
-  }
-
-  try {
-    const result = await httpRequest(url, {
-      method: options.method || 'GET',
-      headers,
-      body: bodyPayload,
-    });
-
-    const text = result.body.toString('utf8');
-    let data = null;
-    if (text) {
-      try {
-        data = JSON.parse(text);
-      } catch {
-        data = null;
-      }
-    }
-
-    const ok = result.status >= 200 && result.status < 300;
-    const errorMessage = !ok
-      ? (data && typeof data === 'object' && (data.detail || data.error || data.message)) || text || 'Request failed'
-      : undefined;
-
-    return {
-      ok,
-      status: result.status,
-      data,
-      text,
-      error: errorMessage,
-    };
-  } catch (error) {
-    return {
-      ok: false,
-      status: 0,
-      data: null,
-      text: '',
-      error: error.message || 'Network error',
-    };
-  }
-}
-
-function httpRequest(urlString, options) {
-  return new Promise((resolve, reject) => {
-    const parsed = new URL(urlString);
-    const isHttps = parsed.protocol === 'https:';
-    const transport = isHttps ? https : http;
-
-    const requestOptions = {
-      method: options.method || 'GET',
-      hostname: parsed.hostname,
-      port: parsed.port || (isHttps ? 443 : 80),
-      path: `${parsed.pathname}${parsed.search}`,
-      headers: { ...(options.headers || {}) },
-    };
-
-    const req = transport.request(requestOptions, (res) => {
-      const chunks = [];
-      res.on('data', (chunk) => chunks.push(chunk));
-      res.on('end', () => {
-        resolve({
-          status: res.statusCode || 0,
-          headers: res.headers,
-          body: Buffer.concat(chunks),
-        });
-      });
-    });
-
-    req.on('error', reject);
-
-    if (options.body) {
-      if (!req.hasHeader('Content-Length')) {
-        req.setHeader('Content-Length', Buffer.byteLength(options.body));
-      }
-      req.write(options.body);
-    }
-
-    req.end();
-  });
-}
-
-async function validateAccessToken(token) {
-  if (!token) {
-    return { ok: false, status: 0, error: 'Missing token' };
-  }
-  return apiRequestJson('/auth/validate', {
-    method: 'POST',
-    body: { token },
-    token,
-  });
-}
-
-async function refreshAccessToken(refreshToken, provider) {
-  if (!refreshToken) {
-    return { ok: false, status: 0, error: 'Missing refresh token' };
-  }
-  const body = { refresh_token: refreshToken };
-  if (provider) {
-    body.provider = provider;
-  }
-  return apiRequestJson('/auth/refresh', {
-    method: 'POST',
-    body,
-  });
-}
-
-async function performTokenRefresh(credentials, sourceLabel = 'refreshed') {
-  if (!credentials || !credentials.refresh_token) {
-    return { ok: false, error: 'missing_refresh_token' };
-  }
-
-  const refreshed = await refreshAccessToken(credentials.refresh_token, credentials.provider);
-  if (!refreshed.ok) {
-    return { ok: false, error: refreshed.error || 'Refresh request failed' };
-  }
-
-  const accessToken = refreshed.data?.access_token;
-  if (!accessToken) {
-    return { ok: false, error: 'No access token returned by refresh API' };
-  }
-
-  const newRefreshToken = refreshed.data?.refresh_token || credentials.refresh_token;
-  const refreshUser = refreshed.data?.user || null;
-  const provider = refreshed.data?.provider || credentials.provider;
-  const email = refreshUser?.email || credentials.email;
-  const userId = refreshUser?.id || credentials.user_id;
-
-  saveCredentials(accessToken, newRefreshToken, email, userId, provider);
-  let latestCreds = loadCredentials();
-
-  const validation = await validateAccessToken(accessToken);
-  let finalUser = refreshUser;
-
-  if (validation.ok && validation.data?.valid) {
-    finalUser = validation.data.user || refreshUser || null;
-    const updatedEmail = finalUser?.email || latestCreds?.email || email;
-    const updatedProvider = finalUser?.provider || latestCreds?.provider || provider;
-    const updatedUserId = finalUser?.id || latestCreds?.user_id || userId;
-
-    if (
-      !latestCreds ||
-      updatedEmail !== latestCreds.email ||
-      updatedProvider !== latestCreds.provider ||
-      updatedUserId !== latestCreds.user_id
-    ) {
-      saveCredentials(accessToken, newRefreshToken, updatedEmail, updatedUserId, updatedProvider);
-      latestCreds = loadCredentials();
-    }
-  }
-
-  return {
-    ok: true,
-    payload: {
-      credentials: latestCreds || loadCredentials(),
-      user: finalUser,
-      source: sourceLabel,
-    },
-  };
-}
-
-async function ensureValidCredentials(options = {}) {
-  let credentials = loadCredentials();
-  if (!credentials || !credentials.token) {
-    return { error: 'not_logged_in' };
-  }
-
-  if (credentials.refresh_token && shouldRefreshToken(credentials.token)) {
-    const proactive = await performTokenRefresh(credentials, 'proactive_refresh');
-    if (proactive.ok) {
-      return proactive.payload;
-    }
-    credentials = loadCredentials() || credentials;
-  }
-
-  const validation = await validateAccessToken(credentials.token);
-  if (validation.ok && validation.data?.valid) {
-    const user = validation.data.user || null;
-    const updatedEmail = user?.email || credentials.email;
-    const updatedProvider = user?.provider || credentials.provider;
-    const updatedUserId = user?.id || credentials.user_id;
-
-    if (
-      updatedEmail !== credentials.email ||
-      updatedProvider !== credentials.provider ||
-      updatedUserId !== credentials.user_id
-    ) {
-      saveCredentials(
-        credentials.token,
-        credentials.refresh_token,
-        updatedEmail,
-        updatedUserId,
-        updatedProvider
-      );
-    }
-
-    return {
-      credentials: loadCredentials(),
-      user,
-      source: 'access_token',
-    };
-  }
-
-  if (!credentials.refresh_token) {
-    return { error: 'token_invalid', detail: validation.error || 'Token expired' };
-  }
-
-  const refreshed = await performTokenRefresh(credentials, 'refreshed');
-  if (!refreshed.ok) {
-    return { error: 'refresh_failed', detail: refreshed.error };
-  }
-
-  return refreshed.payload;
-}
-
-async function fetchMyAgents(token) {
-  if (!token) {
-    return null;
-  }
-
-  const response = await apiRequestJson('/agent/my-agents', {
-    method: 'GET',
-    token,
-  });
-
-  if (!response.ok) {
-    if (response.status === 404) {
-      return null;
-    }
-    throw new Error(response.error || 'Failed to fetch agents');
-  }
-
-  return response.data;
-}
-
-async function displayAccountSummary() {
-  const ensured = await ensureValidCredentials();
-
-  if (ensured.error) {
-    console.log('Status: Not logged in');
-    if (ensured.detail) {
-      console.log(`Reason: ${ensured.detail}`);
-    }
-    return { error: ensured.error, detail: ensured.detail };
-  }
-
-  const { credentials, user } = ensured;
-  const email = user?.email || credentials.email || 'unknown';
-  const userId = user?.id || credentials.user_id || 'unknown';
-  const provider = user?.provider || credentials.provider || 'unknown';
-  const savedAt = credentials.saved_at || 'unknown';
-
-  console.log('Status: Logged in ✓');
-  console.log(`Email: ${email}`);
-  console.log(`User ID: ${userId}`);
-  console.log(`Provider: ${provider}`);
-  console.log(`Credentials saved: ${savedAt}`);
-  console.log(`Credential file: ${getCredentialsPath()}`);
-
-  try {
-    const agentsResponse = await fetchMyAgents(credentials.token);
-    if (agentsResponse && agentsResponse.my_agents) {
-      const agents = agentsResponse.my_agents;
-      const total = agentsResponse.total ?? agents.length;
-      console.log(`Agents: ${total}`);
-      agents.slice(0, 5).forEach((agent) => {
-        const name = agent.name || agent.id || 'Unnamed agent';
-        console.log(`  • ${name}`);
-      });
-      if (total > 5) {
-        console.log(`  …and ${total - 5} more`);
-      }
-    }
-  } catch (error) {
-    console.log(`Agents: Unable to load (${error.message})`);
-  }
-
-  return { credentials, user };
-}
-
-function openBrowser(url) {
-  const platform = os.platform();
-  let command;
-
-  if (platform === 'darwin') {
-    command = `open "${url}"`;
-  } else if (platform === 'win32') {
-    command = `start "${url}"`;
-  } else {
-    command = `xdg-open "${url}"`;
-  }
-
-  exec(command, (error) => {
-    if (error) {
-      console.log(`\nCouldn't open browser automatically. Please visit:\n${url}`);
-    }
-  });
-}
-
-function promptUser(question) {
-  const rl = readline.createInterface({
-    input: process.stdin,
-    output: process.stdout
-  });
-
-  return new Promise((resolve) => {
-    rl.question(question, (answer) => {
-      rl.close();
-      resolve(answer.trim());
-    });
-  });
-}
-
-async function loginAtris() {
-  try {
-    console.log('🔐 Login to AtrisOS\n');
-
-    const existing = loadCredentials();
-    if (existing) {
-      const label = existing.email || existing.user_id || 'unknown user';
-      console.log(`Already logged in as: ${label}`);
-      const confirm = await promptUser('Do you want to login again? (y/N): ');
-      if (confirm.toLowerCase() !== 'y') {
-        console.log('Login cancelled.');
-        process.exit(0);
-      }
-    }
-
-    console.log('Choose login method:');
-    console.log('  1. Browser OAuth (recommended)');
-    console.log('  2. Paste existing API token');
-    console.log('  3. Cancel');
-
-    const choice = await promptUser('\nEnter choice (1-3): ');
-
-    if (choice === '1') {
-      const loginUrl = `${getAppBaseUrl()}/auth/cli`;
-      console.log('\n🌐 Opening browser for OAuth login…');
-      console.log('If it does not open automatically, visit:');
-      console.log(loginUrl);
-      console.log('\nAfter signing in, copy the CLI code shown in the browser and paste it below.');
-      console.log('Codes expire after five minutes.\n');
-
-      openBrowser(loginUrl);
-
-      const code = await promptUser('Paste the CLI code here: ');
-      if (!code) {
-        console.error('✗ Error: Code is required');
-        process.exit(1);
-      }
-
-      const exchange = await apiRequestJson('/auth/cli/exchange', {
-        method: 'POST',
-        body: { code: code.trim() },
-      });
-
-      if (!exchange.ok || !exchange.data) {
-        console.error(`✗ Error: ${exchange.error || 'Invalid or expired code'}`);
-        process.exit(1);
-      }
-
-      const payload = exchange.data;
-      const token = payload.token;
-      const refreshToken = payload.refresh_token;
-
-      if (!token || !refreshToken) {
-        console.error('✗ Error: Backend did not return tokens. Please try again.');
-        process.exit(1);
-      }
-
-      const email = payload.email || existing?.email || null;
-      const userId = payload.user_id || existing?.user_id || null;
-      const provider = payload.provider || 'atris';
-
-      saveCredentials(token, refreshToken, email, userId, provider);
-      console.log('\n✓ Successfully logged in!');
-      await displayAccountSummary();
-      console.log('\nYou can now use cloud features with atris commands.');
-      process.exit(0);
-    } else if (choice === '2') {
-      console.log('\n📋 Manual Token Entry');
-      console.log('Get your token from: https://atris.ai/auth/cli\n');
-
-      const tokenInput = await promptUser('Paste your API token: ');
-
-      if (!tokenInput) {
-        console.error('✗ Error: Token is required');
-        process.exit(1);
-      }
-
-      const trimmed = tokenInput.trim();
-      saveCredentials(trimmed, null, existing?.email || null, existing?.user_id || null, existing?.provider || 'manual');
-      console.log('\nAttempting to validate token…\n');
-
-      const summary = await displayAccountSummary();
-      if (summary.error) {
-        console.log('\n⚠️ Token saved, but validation failed. You may need to relogin.');
-      } else {
-        console.log('\n✓ Token validated successfully.');
-      }
-
-      console.log('\nYou can now use cloud features with atris commands.');
-      process.exit(0);
-    } else {
-      console.log('Login cancelled.');
-      process.exit(0);
-    }
-  } catch (error) {
-    console.error(`\n✗ Login failed: ${error.message || error}`);
-    process.exit(1);
-  }
-}
-
-function logoutAtris() {
-  const credentials = loadCredentials();
-
-  if (!credentials) {
-    console.log('Not currently logged in.');
-    process.exit(0);
-  }
-
-  deleteCredentials();
-  console.log('✓ Successfully logged out');
-  console.log(`✓ Removed credentials from ${getCredentialsPath()}`);
-}
-
-async function whoamiAtris() {
-  try {
-    const summary = await displayAccountSummary();
-    if (summary.error) {
-      console.log('\nRun "atris login" to authenticate with AtrisOS.');
-      process.exit(1);
-    }
-    process.exit(0);
-  } catch (error) {
-    console.error(`✗ Failed to fetch account details: ${error.message || error}`);
-    process.exit(1);
-  }
-}
-
-function showVersion() {
-  try {
-    const packageJson = JSON.parse(fs.readFileSync(PACKAGE_JSON_PATH, 'utf8'));
-    console.log(`atris v${packageJson.version}`);
-  } catch (error) {
-    console.error('✗ Error: Could not read package.json');
-    process.exit(1);
-  }
-}
-
-// ============================================
-// Config Management
-// ============================================
-
-function getConfigPath() {
-  const targetDir = path.join(process.cwd(), 'atris');
-  return path.join(targetDir, '.config');
-}
-
-function loadConfig() {
-  const configPath = getConfigPath();
-
-  if (!fs.existsSync(configPath)) {
-    return {};
-  }
-
-  try {
-    const data = fs.readFileSync(configPath, 'utf8');
-    return JSON.parse(data);
-  } catch (error) {
-    return {};
-  }
-}
-
-function saveConfig(config) {
-  const configPath = getConfigPath();
-  const targetDir = path.dirname(configPath);
-
-  if (!fs.existsSync(targetDir)) {
-    console.error('✗ Error: atris/ folder not found. Run "atris init" first.');
-    process.exit(1);
-  }
-
-  fs.writeFileSync(configPath, JSON.stringify(config, null, 2));
-}
-
-function getLogSyncStatePath() {
-  const targetDir = path.join(process.cwd(), 'atris');
-  return path.join(targetDir, '.log_sync_state.json');
-}
-
-function loadLogSyncState() {
-  const statePath = getLogSyncStatePath();
-  if (!fs.existsSync(statePath)) {
-    return {};
-  }
-
-  try {
-    return JSON.parse(fs.readFileSync(statePath, 'utf8'));
-  } catch {
-    return {};
-  }
-}
-
-function saveLogSyncState(state) {
-  const statePath = getLogSyncStatePath();
-  fs.writeFileSync(statePath, JSON.stringify(state, null, 2));
-}
-
-function isSameTimestamp(a, b) {
-  if (!a || !b) return false;
-  const ta = new Date(a).getTime();
-  const tb = new Date(b).getTime();
-  if (Number.isNaN(ta) || Number.isNaN(tb)) return false;
-  return Math.abs(ta - tb) < 5;
-}
-
-function computeContentHash(content) {
-  if (typeof content !== 'string') {
-    return null;
-  }
-
-  const normalized = content.replace(/\r\n/g, '\n');
-  return crypto.createHash('sha256').update(normalized).digest('hex');
-}
-
-function parseJournalSections(content) {
-  const sections = {};
-  const lines = content.split('\n');
-  let currentSection = '__header__';
-  let currentContent = [];
-
-  for (const line of lines) {
-    if (line.startsWith('## ')) {
-      // Save previous section
-      if (currentContent.length > 0 || currentSection === '__header__') {
-        sections[currentSection] = currentContent.join('\n');
-      }
-      // Start new section
-      currentSection = line.substring(3).trim();
-      currentContent = [line];
-    } else {
-      currentContent.push(line);
-    }
-  }
-
-  // Save last section
-  if (currentContent.length > 0) {
-    sections[currentSection] = currentContent.join('\n');
-  }
-
-  return sections;
-}
-
-function mergeSections(localSections, remoteSections, knownRemoteHash) {
-  const merged = {};
-  const conflicts = [];
-
-  // Get all unique section names
-  const allSections = new Set([...Object.keys(localSections), ...Object.keys(remoteSections)]);
-
-  for (const section of allSections) {
-    const localContent = localSections[section] || '';
-    const remoteContent = remoteSections[section] || '';
-
-    if (localContent === remoteContent) {
-      // Same content, use either
-      merged[section] = localContent;
-    } else if (!remoteContent) {
-      // Only in local, keep local
-      merged[section] = localContent;
-    } else if (!localContent) {
-      // Only in remote, keep remote
-      merged[section] = remoteContent;
-    } else {
-      // Both exist but differ - check if remote matches known state
-      const remoteHash = computeContentHash(remoteContent);
-      if (knownRemoteHash && remoteHash === knownRemoteHash) {
-        // Remote hasn't changed since last sync, prefer local
-        merged[section] = localContent;
-      } else {
-        // Real conflict - mark for user review
-        conflicts.push(section);
-        merged[section] = localContent; // Default to local
-      }
-    }
-  }
-
-  return { merged, conflicts };
-}
-
-function reconstructJournal(sections) {
-  const parts = [];
-
-  // Header first
-  if (sections['__header__']) {
-    parts.push(sections['__header__']);
-  }
-
-  // Then all other sections in order (preserve original order where possible)
-  const sectionOrder = ['Completed ✅', 'In Progress 🔄', 'Backlog', 'Notes', 'Inbox', 'Timestamps', 'Lessons Learned'];
-
-  for (const section of sectionOrder) {
-    if (sections[section]) {
-      parts.push(sections[section]);
-    }
-  }
-
-  // Add any remaining sections not in the standard order
-  for (const [section, content] of Object.entries(sections)) {
-    if (section !== '__header__' && !sectionOrder.includes(section)) {
-      parts.push(content);
-    }
-  }
-
-  return parts.join('\n');
-}
-
-function showLogDiff(localPath, remoteContent) {
-  let tmpDir;
-  try {
-    tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'atris-diff-'));
-    const remotePath = path.join(tmpDir, 'remote.md');
-    fs.writeFileSync(remotePath, remoteContent, 'utf8');
-
-    const diffCommands = [
-      { cmd: 'git', args: ['--no-pager', 'diff', '--no-index', '--color=always', '--', localPath, remotePath] },
-      { cmd: 'diff', args: ['-u', localPath, remotePath] },
-    ];
-
-    let shown = false;
-    for (const { cmd, args } of diffCommands) {
-      const result = spawnSync(cmd, args, { encoding: 'utf8', stdio: ['ignore', 'pipe', 'pipe'] });
-      if (result.error || result.status === 127) {
-        continue;
-      }
-
-      const output = `${result.stdout || ''}${result.stderr || ''}`.trimEnd();
-      if (output) {
-        console.log('─────────────────────────────────────────────────────────────');
-        console.log('Diff (web -> local):');
-        process.stdout.write(output.endsWith('\n') ? output : `${output}\n`);
-        console.log('─────────────────────────────────────────────────────────────');
-        shown = true;
-        break;
-      }
-    }
-
-    if (!shown) {
-      console.log('─────────────────────────────────────────────────────────────');
-      console.log('Diff: (no textual diff available; files may be identical or differ only in whitespace)');
-      console.log('─────────────────────────────────────────────────────────────');
-    }
-  } catch (error) {
-    console.log('─────────────────────────────────────────────────────────────');
-    console.log(`Unable to show diff automatically (${error.message || error}).`);
-    console.log('─────────────────────────────────────────────────────────────');
-  } finally {
-    if (tmpDir) {
-      try {
-        fs.rmSync(tmpDir, { recursive: true, force: true });
-      } catch (_) {
-        // ignore cleanup errors
-      }
-    }
-  }
-}
-// ============================================
-// Agent Selection
-// ============================================
-
-async function agentAtris() {
-  const targetDir = path.join(process.cwd(), 'atris');
-
-  // Check if atris/ folder exists
-  if (!fs.existsSync(targetDir)) {
-    console.error('✗ Error: atris/ folder not found. Run "atris init" first.');
-    process.exit(1);
-  }
-
-  // Check if logged in
-  const credentials = loadCredentials();
-
-  if (!credentials || !credentials.token) {
-    console.error('✗ Error: Not logged in. Run "atris login" first.');
-    process.exit(1);
-  }
-
-  console.log('🔍 Fetching your agents...\n');
-
-  // Fetch agents from backend
-  const result = await apiRequestJson('/agent/my-agents', {
-    method: 'GET',
-    headers: {
-      'Authorization': `Bearer ${credentials.token}`,
-    },
-  });
-
-  if (!result.ok) {
-    console.error(`✗ Error: ${result.error || 'Failed to fetch agents'}`);
-    process.exit(1);
-  }
-
-  const agents = result.data?.my_agents || [];
-
-  if (agents.length === 0) {
-    console.log('No agents found. Create one at https://atris.ai');
-    process.exit(0);
-  }
-
-  // Show current selection
-  const config = loadConfig();
-  if (config.agent_id) {
-    const current = agents.find(a => a.id === config.agent_id);
-    if (current) {
-      console.log(`Current agent: ${current.name}\n`);
-    }
-  }
-
-  // Display agents
-  console.log('Available agents:');
-  agents.forEach((agent, index) => {
-    console.log(`  ${index + 1}. ${agent.name}`);
-  });
-
-  console.log('');
-
-  // Prompt for selection
-  const answer = await promptUser('Select agent number (or press Enter to cancel): ');
-
-  if (!answer) {
-    console.log('Cancelled.');
-    process.exit(0);
-  }
-
-  const selection = parseInt(answer, 10);
-
-  if (isNaN(selection) || selection < 1 || selection > agents.length) {
-    console.error('✗ Invalid selection');
-    process.exit(1);
-  }
-
-  const selectedAgent = agents[selection - 1];
-
-  // Save to config
-  config.agent_id = selectedAgent.id;
-  config.agent_name = selectedAgent.name;
-  saveConfig(config);
-
-  console.log(`\n✓ Selected agent: ${selectedAgent.name}`);
-  console.log(`✓ Config saved to atris/.config`);
-  console.log(`\nYou can now use "atris chat" to talk with this agent.`);
-}
-
-
-async function chatAtris() {
-  // Get message from command line args
-  const message = process.argv.slice(3).join(' ').trim();
-
-  // Check atris/ exists
-  const targetDir = path.join(process.cwd(), 'atris');
-  if (!fs.existsSync(targetDir)) {
-    console.error('✗ Error: atris/ folder not found. Run "atris init" first.');
-    process.exit(1);
-  }
-
-  // Check agent selected
-  const config = loadConfig();
-  if (!config.agent_id) {
-    console.error('✗ Error: No agent selected. Run "atris agent" first.');
-    process.exit(1);
-  }
-
-  // Check credentials
-  const credentials = loadCredentials();
-  if (!credentials || !credentials.token) {
-    console.error('✗ Error: Not logged in. Run "atris login" first.');
-    process.exit(1);
-  }
-
-  // If message provided, one-shot mode
-  if (message) {
-    await chatOnce(config, credentials, message);
-    return;
-  }
-
-  // Otherwise, interactive mode
-  await chatInteractive(config, credentials);
-}
-
-async function chatOnce(config, credentials, message) {
-  console.log(`\nAgent: ${config.agent_name || config.agent_id}`);
-  console.log('');
-
-  const agentId = config.agent_id;
-  const apiUrl = getApiBaseUrl().replace(/\/api$/, '');
-  const endpoint = `${apiUrl}/api/agent/${agentId}/pro-chat`;
-
-  const body = JSON.stringify({
-    message: message,
-    stream: true,
-    memory_enabled: true,
-  });
-
-  try {
-    await streamProChat(endpoint, credentials.token, body);
-    console.log('\n\n✓ Complete\n');
-  } catch (error) {
-    console.error(`\n✗ Error: ${error.message || error}`);
-    process.exit(1);
-  }
-}
+  try {
+    await streamProChat(endpoint, credentials.token, body);
+    console.log('\n\n✓ Complete\n');
+  } catch (error) {
+    console.error(`\n✗ Error: ${error.message || error}`);
+    process.exit(1);
+  }
+}
 
 async function chatInteractive(config, credentials) {
   return new Promise((resolve) => {
@@ -2678,153 +1293,3 @@ async function atrisDevEntry(userInput = null) {
   console.log('');
 }
 
-function spawnClaudeCodeSession(url, token, body) {
-  return new Promise((resolve, reject) => {
-    const parsed = new URL(url);
-    const isHttps = parsed.protocol === 'https:';
-    const transport = isHttps ? https : http;
-
-    const requestOptions = {
-      method: 'POST',
-      hostname: parsed.hostname,
-      port: parsed.port || (isHttps ? 443 : 80),
-      path: parsed.pathname,
-      headers: {
-        'Authorization': `Bearer ${token}`,
-        'Content-Type': 'application/json',
-        'Content-Length': Buffer.byteLength(body),
-      },
-    };
-
-    const req = transport.request(requestOptions, (res) => {
-      if (res.statusCode !== 200) {
-        const chunks = [];
-        res.on('data', (chunk) => chunks.push(chunk));
-        res.on('end', () => {
-          const text = Buffer.concat(chunks).toString();
-          reject(new Error(`HTTP ${res.statusCode}: ${text}`));
-        });
-        return;
-      }
-
-      const chunks = [];
-      res.on('data', (chunk) => chunks.push(chunk));
-      res.on('end', () => {
-        try {
-          const response = JSON.parse(Buffer.concat(chunks).toString());
-          // Session spawned - could return session ID, URL, etc
-          resolve(response);
-        } catch (e) {
-          resolve({ status: 'session_initiated' });
-        }
-      });
-
-      res.on('error', (err) => {
-        reject(err);
-      });
-    });
-
-    req.on('error', (err) => {
-      reject(err);
-    });
-
-    req.write(body);
-    req.end();
-  });
-}
-
-function streamProChat(url, token, body, showTools = false) {
-  return new Promise((resolve, reject) => {
-    const parsed = new URL(url);
-    const isHttps = parsed.protocol === 'https:';
-    const transport = isHttps ? https : http;
-
-    const requestOptions = {
-      method: 'POST',
-      hostname: parsed.hostname,
-      port: parsed.port || (isHttps ? 443 : 80),
-      path: parsed.pathname,
-      headers: {
-        'Authorization': `Bearer ${token}`,
-        'Content-Type': 'application/json',
-        'Content-Length': Buffer.byteLength(body),
-        'Accept': 'text/event-stream',
-      },
-    };
-
-    const req = transport.request(requestOptions, (res) => {
-      if (res.statusCode !== 200) {
-        const chunks = [];
-        res.on('data', (chunk) => chunks.push(chunk));
-        res.on('end', () => {
-          const text = Buffer.concat(chunks).toString();
-          reject(new Error(`HTTP ${res.statusCode}: ${text}`));
-        });
-        return;
-      }
-
-      let buffer = '';
-
-      res.on('data', (chunk) => {
-        buffer += chunk.toString();
-        const lines = buffer.split('\n');
-        buffer = lines.pop() || '';
-
-        for (const line of lines) {
-          if (line.startsWith('data: ')) {
-            const data = line.slice(6).trim();
-            if (!data || data === '[DONE]') continue;
-
-            try {
-              const msg = JSON.parse(data);
-
-              // Handle different message types from Claude SDK
-              if (msg.type === 'system_init' && showTools) {
-                console.log(`[System] Tools available: ${msg.tools?.join(', ') || 'none'}`);
-              } else if (msg.type === 'assistant') {
-                // Display assistant text response
-                if (msg.content && Array.isArray(msg.content)) {
-                  for (const block of msg.content) {
-                    if (block.type === 'text') {
-                      process.stdout.write(block.text);
-                    }
-                  }
-                }
-              } else if (msg.type === 'tool_use' && showTools) {
-                console.log(`\n[⚙️  Executing: ${msg.tool_name}]`);
-              } else if (msg.type === 'tool_result' && showTools) {
-                const preview = msg.content?.substring(0, 100) || '';
-                console.log(`[✓ Result]: ${preview}${msg.content?.length > 100 ? '...' : ''}`);
-              } else if (msg.type === 'result') {
-                // Final result
-                if (msg.result) {
-                  process.stdout.write(msg.result);
-                }
-              } else if (msg.chunk) {
-                // Legacy chunk format
-                process.stdout.write(msg.chunk);
-              }
-            } catch (e) {
-              // Ignore parse errors
-            }
-          }
-        }
-      });
-
-      res.on('end', () => {
-        resolve();
-      });
-
-      res.on('error', (err) => {
-        reject(err);
-      });
-    });
-
-    req.on('error', (err) => {
-      reject(err);
-    });
-
-    req.write(body);
-    req.end();
-  });
-}