teleportation-cli 1.1.4 → 1.2.0

package/teleportation-cli.cjs

@@ -7,7 +7,7 @@ const path = require('path');
 const { execSync } = require('child_process');
 const os = require('os');
 
-const CLI_VERSION = '1.1.3';
+const CLI_VERSION = '1.1.4';
 const HOME_DIR = os.homedir();
 // Teleportation project directory (for development)
 // In production, hooks will be installed globally
@@ -20,7 +20,8 @@ const c = {
   yellow: (text) => '\x1b[1;33m' + text + '\x1b[0m',
   blue: (text) => '\x1b[0;34m' + text + '\x1b[0m',
   purple: (text) => '\x1b[0;35m' + text + '\x1b[0m',
-  cyan: (text) => '\x1b[0;36m' + text + '\x1b[0m'
+  cyan: (text) => '\x1b[0;36m' + text + '\x1b[0m',
+  dim: (text) => '\x1b[2m' + text + '\x1b[0m'
 };
 
 // Configuration manager
@@ -206,9 +207,19 @@ function commandHelp() {
   console.log('  ' + c.green('status') + '           Check system status and connectivity\n');
 
   console.log(c.yellow('Authentication:'));
-  console.log('  ' + c.green('login') + '            Authenticate with API key or token');
+  console.log('  ' + c.green('login') + '            Authenticate with API key or JWT token');
+  console.log('    ' + c.dim('--api-key, -k <key>     Legacy API key authentication'));
+  console.log('    ' + c.dim('--refresh-token, -rt    JWT authentication (copy from web UI)'));
+  console.log('    ' + c.dim('--relay-url, -r <url>   Override relay URL'));
+  console.log('  ' + c.green('claim') + '            Link an old API key to your account');
   console.log('  ' + c.green('github connect') + '   Save GitHub token for repo access (used by remote sessions)');
-  console.log('  ' + c.green('logout') + '           Clear saved credentials\n');
+  console.log('  ' + c.green('logout') + '           Clear saved credentials');
+  console.log('');
+  console.log('  ' + c.dim('JWT Login (Recommended):'));
+  console.log('    ' + c.dim('1. Sign in at app.teleportation.dev'));
+  console.log('    ' + c.dim('2. Go to Settings > CLI Authentication'));
+  console.log('    ' + c.dim('3. Copy your refresh token'));
+  console.log('    ' + c.dim('4. Run: teleportation login --refresh-token <token>\n'));
 
   console.log(c.yellow('Setup Commands:'));
   console.log('  ' + c.green('on') + '               Enable remote control hooks');
@@ -257,6 +268,13 @@ function commandHelp() {
   console.log('  ' + c.green('remote pull') + '        Pull results from remote session');
   console.log('  ' + c.green('remote help') + '        Show remote commands help\n');
 
+  console.log(c.yellow('Session Teleportation:'));
+  console.log('  ' + c.green('teleport start') + '     Teleport current session to cloud');
+  console.log('  ' + c.green('teleport list') + '      List active teleports');
+  console.log('  ' + c.green('teleport status') + '    Show teleport status');
+  console.log('  ' + c.green('teleport stop') + '      Stop a teleport and create PR');
+  console.log('  ' + c.green('teleport help') + '      Show teleport commands help\n');
+
   console.log(c.yellow('Session Isolation:'));
   console.log('  ' + c.green('worktree create') + '  Create isolated worktree for a session');
   console.log('  ' + c.green('worktree list') + '    List all session worktrees');
@@ -285,55 +303,65 @@ function commandHelp() {
 
 async function commandOn() {
   console.log(c.yellow('🚀 Enabling Teleportation Remote Control...\n'));
-  
+
   try {
-    // Use installer module
-    const installerPath = path.join(TELEPORTATION_DIR, 'lib', 'install', 'installer.js');
-    const { install, checkNodeVersion, checkClaudeCode } = await import('file://' + installerPath);
-    
-    // Pre-flight checks
-    const nodeCheck = checkNodeVersion();
-    if (!nodeCheck.valid) {
-      console.log(c.red(`❌ ${nodeCheck.error}\n`));
-      return;
-    }
-    console.log(c.green(`✅ Node.js ${nodeCheck.version}\n`));
-    
-    const claudeCheck = checkClaudeCode();
-    if (!claudeCheck.valid) {
-      console.log(c.yellow(`⚠️  ${claudeCheck.error}\n`));
-      console.log(c.cyan('   Continuing anyway...\n'));
+    // Try UHR first, fall back to legacy installer
+    const uhrInstallerPath = path.join(TELEPORTATION_DIR, 'lib', 'install', 'uhr-installer.js');
+    const { isUhrAvailable, installViaUhr } = await import('file://' + uhrInstallerPath);
+
+    if (await isUhrAvailable()) {
+      console.log(c.dim('  Using UHR (Universal Hook Registry)...'));
+      const manifestPath = path.join(TELEPORTATION_DIR, 'teleportation.uhr.json');
+      const hooksDir = path.join(TELEPORTATION_DIR, '.claude', 'hooks');
+      const uhrResult = await installViaUhr(manifestPath, hooksDir);
+
+      if (uhrResult.success) {
+        console.log(c.green('\n🎉 Teleportation Remote Control ENABLED!'));
+        console.log(c.cyan('\nInstalled via UHR (Universal Hook Registry)'));
+        if (uhrResult.warnings.length > 0) {
+          uhrResult.warnings.forEach(w => console.log(c.yellow(`  ⚠️  ${w}`)));
+        }
+      } else {
+        console.log(c.yellow(`  ⚠️  UHR install failed: ${uhrResult.reason}`));
+        console.log(c.dim('  Falling back to legacy installer...'));
+        await _legacyInstall();
+      }
     } else {
-      console.log(c.green(`✅ Claude Code found: ${claudeCheck.path}\n`));
+      await _legacyInstall();
     }
-    
-    // Install hooks
-    const sourceHooksDir = path.join(TELEPORTATION_DIR, '.claude', 'hooks');
-    if (!fs.existsSync(sourceHooksDir)) {
-      console.log(c.red(`❌ Hooks not found at ${sourceHooksDir}\n`));
-      return;
-    }
-    
-    const result = await install(sourceHooksDir);
-    
-    console.log(c.green('\n🎉 Teleportation Remote Control ENABLED!'));
-    console.log(c.cyan('\nInstallation Summary:'));
-    console.log(`  Hooks verified: ${c.green(result.hooksVerified)}`);
-    console.log(`  Daemon installed: ${c.green(result.daemonInstalled + ' files')}`);
-    console.log(`  Settings file: ${c.green(result.settingsFile)}`);
-    console.log(`  Hooks directory: ${c.green(result.hooksDir)}`);
-    console.log(`  Daemon directory: ${c.green(result.daemonDir)}`);
+
     console.log(c.cyan('\nNext steps:'));
     console.log('  1. Login: teleportation login');
     console.log('  2. Check status: teleportation status');
     console.log('  3. Run diagnostics: teleportation doctor\n');
-    
+
   } catch (error) {
     console.log(c.red(`❌ Installation failed: ${error.message}\n`));
     process.exit(1);
   }
 }
 
+async function _legacyInstall(options = {}) {
+  const installerPath = path.join(TELEPORTATION_DIR, 'lib', 'install', 'installer.js');
+  const { install } = await import('file://' + installerPath);
+  const sourceHooksDir = path.join(TELEPORTATION_DIR, '.claude', 'hooks');
+
+  const result = await install(sourceHooksDir, options);
+
+  console.log(c.green('\n🎉 Teleportation Remote Control ENABLED!'));
+  console.log(c.cyan('\nInstallation Summary:'));
+  if (result.hooksInstalled > 0) {
+    console.log(`  Claude Code hooks: ${c.green(result.hooksInstalled)} installed`);
+  }
+  if (result.geminiHooksInstalled > 0) {
+    console.log(`  Gemini CLI hooks: ${c.green(result.geminiHooksInstalled)} installed`);
+  }
+  console.log(`  Daemon installed: ${c.green(result.daemonInstalled + ' files')}`);
+  console.log(`  Settings file: ${c.green(result.settingsFile)}`);
+
+  return result;
+}
+
 /**
  * Setup wizard - guided onboarding for new users
  * Creates backup before making changes, validates API key, installs hooks
@@ -447,7 +475,18 @@ async function commandSetup() {
 
     // Step 2: Configuration
     console.log('\n' + c.purple('Step 2 of 5: Configuration\n'));
-    console.log(`  Relay URL: ${c.cyan(relayUrl)}`);
+    
+    // Choose assistants (PRD-0024 Parity)
+    console.log('  Which AI coding assistants do you use?');
+    console.log('  1. Claude Code only');
+    console.log('  2. Gemini CLI only');
+    console.log('  3. Both');
+    
+    const assistantChoice = await question('\n  Select option (1-3, default: Both): ');
+    const includeClaude = assistantChoice === '1' || assistantChoice === '3' || !assistantChoice;
+    const includeGemini = assistantChoice === '2' || assistantChoice === '3' || !assistantChoice;
+
+    console.log(`\n  Relay URL: ${c.cyan(relayUrl)}`);
 
     // Test relay connectivity
     console.log(c.cyan('  Testing connectivity...'));
@@ -494,14 +533,50 @@ async function commandSetup() {
 
     // Step 3: Install Hooks
     console.log('\n' + c.purple('Step 3 of 5: Installing Hooks\n'));
-    console.log('  Installing Claude Code hooks to ~/.claude/hooks/');
+    console.log('  Installing Teleportation hooks...');
 
     try {
-      const installerPath = path.join(TELEPORTATION_DIR, 'lib', 'install', 'installer.js');
-      const { install } = await import('file://' + installerPath);
-      const sourceHooksDir = path.join(TELEPORTATION_DIR, '.claude', 'hooks');
-      const result = await install(sourceHooksDir);
-      console.log(c.green(`  ✅ ${result.hooksVerified} hooks installed successfully`));
+      // Try UHR first for Claude Code hooks
+      let uhrInstalled = false;
+      if (includeClaude) {
+        try {
+          const uhrInstallerPath = path.join(TELEPORTATION_DIR, 'lib', 'install', 'uhr-installer.js');
+          const { isUhrAvailable, installViaUhr } = await import('file://' + uhrInstallerPath);
+
+          if (await isUhrAvailable()) {
+            console.log(c.dim('  Using UHR (Universal Hook Registry)...'));
+            const manifestPath = path.join(TELEPORTATION_DIR, 'teleportation.uhr.json');
+            const hooksDir = path.join(TELEPORTATION_DIR, '.claude', 'hooks');
+            const uhrResult = await installViaUhr(manifestPath, hooksDir);
+
+            if (uhrResult.success) {
+              console.log(c.green('  ✅ Claude Code hooks installed via UHR'));
+              if (uhrResult.warnings.length > 0) {
+                uhrResult.warnings.forEach(w => console.log(c.yellow(`  ⚠️  ${w}`)));
+              }
+              uhrInstalled = true;
+            }
+          }
+        } catch (e) {
+          // UHR not available, fall through to legacy
+        }
+      }
+
+      if (!uhrInstalled) {
+        // Legacy installer fallback
+        const installerPath = path.join(TELEPORTATION_DIR, 'lib', 'install', 'installer.js');
+        const { install } = await import('file://' + installerPath);
+        const sourceHooksDir = path.join(TELEPORTATION_DIR, '.claude', 'hooks');
+
+        const result = await install(sourceHooksDir, { includeClaude, includeGemini });
+
+        if (result.hooksInstalled > 0) {
+          console.log(c.green(`  ✅ ${result.hooksInstalled} Claude Code hooks installed`));
+        }
+        if (result.geminiHooksInstalled > 0) {
+          console.log(c.green(`  ✅ ${result.geminiHooksInstalled} Gemini CLI hooks installed`));
+        }
+      }
     } catch (e) {
       console.log(c.red(`  ❌ Failed to install hooks: ${e.message}`));
       console.log(c.yellow('\n  Would you like to restore your previous configuration?'));
@@ -686,24 +761,42 @@ async function commandBackup(args) {
   }
 }
 
-function commandOff() {
+async function commandOff() {
   console.log(c.yellow('🛑 Disabling Teleportation Remote Control...\n'));
-  
-  // Remove settings.json
-  if (fs.existsSync(config.globalSettings)) {
-    fs.unlinkSync(config.globalSettings);
-    console.log(c.green('✅ Removed ~/.claude/settings.json'));
+
+  // Try UHR uninstall first
+  let uhrUninstalled = false;
+  try {
+    const uhrInstallerPath = path.join(TELEPORTATION_DIR, 'lib', 'install', 'uhr-installer.js');
+    const { isUhrAvailable, uninstallViaUhr } = await import('file://' + uhrInstallerPath);
+
+    if (await isUhrAvailable()) {
+      const result = await uninstallViaUhr('teleportation');
+      if (result.success) {
+        console.log(c.green('✅ Uninstalled via UHR'));
+        uhrUninstalled = true;
+      }
+    }
+  } catch (e) {
+    // UHR not available or failed, fall through to manual removal
   }
-  
-  // Remove hooks
-  if (fs.existsSync(config.globalHooks)) {
-    const hooks = fs.readdirSync(config.globalHooks).filter(f => f.endsWith('.mjs'));
-    hooks.forEach(hook => {
-      fs.unlinkSync(path.join(config.globalHooks, hook));
-    });
-    console.log(c.green(`✅ Removed ${hooks.length} hooks`));
+
+  if (!uhrUninstalled) {
+    // Manual removal fallback
+    if (fs.existsSync(config.globalSettings)) {
+      fs.unlinkSync(config.globalSettings);
+      console.log(c.green('✅ Removed ~/.claude/settings.json'));
+    }
+
+    if (fs.existsSync(config.globalHooks)) {
+      const hooks = fs.readdirSync(config.globalHooks).filter(f => f.endsWith('.mjs'));
+      hooks.forEach(hook => {
+        fs.unlinkSync(path.join(config.globalHooks, hook));
+      });
+      console.log(c.green(`✅ Removed ${hooks.length} hooks`));
+    }
   }
-  
+
   console.log(c.yellow('\n🛑 Teleportation Remote Control DISABLED'));
   console.log(c.cyan('Services are still running. Stop with: ./teleportation stop\n'));
 }
@@ -784,8 +877,13 @@ async function commandStatus() {
         if (result.valid) {
           console.log('  ' + c.green('✅') + ' API key validated');
         } else {
-          console.log('  ' + c.red('❌') + ` API key invalid: ${result.error}`);
-          issues.push('API key is invalid. Create a new one at app.teleportation.dev/api-keys');
+          if (result.isOrphan) {
+            console.log('  ' + c.yellow('⚠️') + ` API key not linked: ${result.error}`);
+            warnings.push('Your API key is not linked to an account. Run `teleportation claim` to link it.');
+          } else {
+            console.log('  ' + c.red('❌') + ` API key invalid: ${result.error}`);
+            issues.push('API key is invalid. Create a new one at app.teleportation.dev/api-keys');
+          }
         }
       } catch (e) {
         console.log('  ' + c.yellow('⚠️') + ' Could not validate API key');
@@ -798,13 +896,32 @@ async function commandStatus() {
   const hooksConfigured = config.isConfigured();
 
   if (hooksConfigured) {
-    console.log('  ' + c.green('✅') + ' Enabled in Claude Code settings');
+    console.log('  ' + c.green('✅') + ' Claude Code hooks installed');
     const hookFiles = fs.readdirSync(config.globalHooks).filter(f => f.endsWith('.mjs'));
-    console.log('  ' + c.green('✅') + ` ${hookFiles.length} hook files installed`);
-    console.log('     Directory: ~/.claude/hooks/');
+    console.log('     ' + c.green('•') + ` ${hookFiles.length} files in ~/.claude/hooks/`);
+  } else {
+    console.log('  ' + c.red('❌') + ' Claude Code hooks not installed');
+    issues.push('Run `teleportation setup` to install Claude hooks');
+  }
+
+  // Gemini Hooks Status (Parity)
+  const globalGeminiHooks = path.join(HOME_DIR, '.gemini', 'hooks');
+  const globalGeminiSettings = path.join(HOME_DIR, '.gemini', 'settings.json');
+  const geminiHooksConfigured = fs.existsSync(globalGeminiSettings) && fs.existsSync(globalGeminiHooks);
+
+  if (geminiHooksConfigured) {
+    console.log('  ' + c.green('✅') + ' Gemini CLI hooks installed');
+    const geminiFiles = fs.readdirSync(globalGeminiHooks).filter(f => f.endsWith('.mjs'));
+    console.log('     ' + c.green('•') + ` ${geminiFiles.length} files in ~/.gemini/hooks/`);
   } else {
-    console.log('  ' + c.red('❌') + ' Hooks not installed');
-    issues.push('Run `teleportation setup` to install hooks');
+    try {
+      const { execSync } = require('child_process');
+      execSync('which gemini', { stdio: 'ignore' });
+      console.log('  ' + c.yellow('⚠️') + ' Gemini CLI found but hooks not installed');
+      warnings.push('Run `teleportation setup` to install Gemini hooks');
+    } catch (e) {
+      // Gemini not installed, don't nag about hooks
+    }
   }
 
   // Config/credentials sync check
@@ -1101,22 +1218,43 @@ async function commandTest() {
   // Test 3: Relay service
   console.log(c.yellow('Test 3: Relay API Service'));
   const relayUrl = creds.RELAY_API_URL || 'https://api.teleportation.dev';
-  if (checkService('relay', 3030) && checkServiceHealth(relayUrl)) {
+  const isLocalRelay = relayUrl.includes('localhost') || relayUrl.includes('127.0.0.1');
+  
+  const relayHealthy = checkServiceHealth(relayUrl);
+  // Only check local port if we expect a local relay
+  const relayPortOpen = isLocalRelay ? checkService('relay', 3030) : true;
+
+  if (relayPortOpen && relayHealthy) {
     console.log(c.green('  ✅ PASS - Relay API running and healthy\n'));
     passed++;
   } else {
-    console.log(c.red('  ❌ FAIL - Relay API not running or unhealthy\n'));
+    if (isLocalRelay && !relayPortOpen) {
+      console.log(c.red('  ❌ FAIL - Local relay process not running (port 3030)\n'));
+    } else if (!relayHealthy) {
+      console.log(c.red(`  ❌ FAIL - Relay API unreachable at ${relayUrl}\n`));
+    } else {
+      console.log(c.red('  ❌ FAIL - Relay API issue\n'));
+    }
     failed++;
   }
   
   // Test 4: Storage service
   console.log(c.yellow('Test 4: Storage API Service'));
-  if (checkService('storage', 3040) && checkServiceHealth('http://localhost:3040')) {
-    console.log(c.green('  ✅ PASS - Storage API running and healthy\n'));
-    passed++;
+  // Storage is usually local for dev, but might be remote in future. 
+  // For now, only check if we are in local dev mode (implied by local relay) or if explicitly checking local ports.
+  // Actually, CLI users might not need Storage API directly running if using production relay (which handles storage).
+  
+  if (isLocalRelay) {
+    if (checkService('storage', 3040) && checkServiceHealth('http://localhost:3040')) {
+      console.log(c.green('  ✅ PASS - Local Storage API running and healthy\n'));
+      passed++;
+    } else {
+      console.log(c.red('  ❌ FAIL - Local Storage API not running or unhealthy\n'));
+      failed++;
+    }
   } else {
-    console.log(c.red('  ❌ FAIL - Storage API not running or unhealthy\n'));
-    failed++;
+    console.log(c.green('  ✅ PASS - Using Remote Relay (Storage managed by Relay)\n'));
+    passed++;
   }
   
   // Test 5: Hook execution
@@ -1124,8 +1262,28 @@ async function commandTest() {
   try {
     const testHook = path.join(config.globalHooks, 'pre_tool_use.mjs');
     if (fs.existsSync(testHook)) {
-      const testInput = '{"session_id":"test","tool_name":"Read","tool_input":{}}';
-      const envVars = `RELAY_API_URL="${creds.RELAY_API_URL || 'http://localhost:3030'}" RELAY_API_KEY="${creds.RELAY_API_KEY || 'dev-key-123'}"`;
+      const testInput = '{"session_id":"test","tool_name":"Read","tool_input":{"file_path":"test.txt"}}';
+      const relayUrl = creds.RELAY_API_URL || 'http://localhost:3030';
+      const relayKey = creds.RELAY_API_KEY || 'dev-key-123';
+      const envVars = `RELAY_API_URL="${relayUrl}" RELAY_API_KEY="${relayKey}"`;
+      
+      // Register test session first so it appears correctly in UI
+      try {
+        await fetch(`${relayUrl}/api/sessions/register`, {
+          method: 'POST',
+          headers: {
+            'Content-Type': 'application/json',
+            'Authorization': `Bearer ${relayKey}`
+          },
+          body: JSON.stringify({
+            session_id: 'test',
+            meta: { project_name: 'teleportation-test', hostname: os.hostname() }
+          })
+        });
+      } catch (e) {
+        // Ignore registration errors for the hook test
+      }
+
       execSync(`echo '${testInput}' | ${envVars} node ${testHook}`, { stdio: 'ignore' });
       console.log(c.green('  ✅ PASS - Hook executes successfully\n'));
       passed++;
@@ -1158,50 +1316,74 @@ async function commandDoctor() {
   let checksPassed = 0;
   let checksFailed = 0;
   
-  // Check 1: Claude Code installation
-  console.log(c.yellow('1. Claude Code Installation'));
+  // Check 1: Assistant installations
+  console.log(c.yellow('1. Assistant Installations'));
+  let anyAssistantFound = false;
+  
+  // 1.1 Claude Code
   try {
     const claudeCodePath = execSync('which claude', { encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'] }).trim();
     if (claudeCodePath) {
-      console.log(c.green(`   ✅ Found: ${claudeCodePath}\n`));
-      checksPassed++;
-    } else {
-      console.log(c.yellow('   ⚠️  Claude Code not found in PATH\n'));
-      issues.push('Claude Code not found');
-      recommendations.push('Install Claude Code or add it to your PATH');
-      checksFailed++;
+      console.log(c.green(`   ✅ Claude Code: ${claudeCodePath}`));
+      anyAssistantFound = true;
     }
-  } catch (e) {
-    console.log(c.yellow('   ⚠️  Could not detect Claude Code installation\n'));
-    issues.push('Claude Code detection failed');
+  } catch (e) {}
+
+  // 1.2 Gemini CLI
+  try {
+    const geminiPath = execSync('which gemini', { encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'] }).trim();
+    if (geminiPath) {
+      console.log(c.green(`   ✅ Gemini CLI: ${geminiPath}`));
+      anyAssistantFound = true;
+    }
+  } catch (e) {}
+
+  if (anyAssistantFound) {
+    console.log('');
+    checksPassed++;
+  } else {
+    console.log(c.red('   ❌ No supported AI coding assistants found (Claude/Gemini)\n'));
+    issues.push('No AI assistants found');
+    recommendations.push('Install Claude Code or Gemini CLI');
     checksFailed++;
   }
   
   // Check 2: Hooks installation
   console.log(c.yellow('2. Hooks Installation'));
+  
+  // 2.1 Claude Hooks
   const hooksConfigured = config.isConfigured();
   if (hooksConfigured) {
     const hookFiles = fs.readdirSync(config.globalHooks).filter(f => f.endsWith('.mjs'));
-    console.log(c.green(`   ✅ ${hookFiles.length} hooks installed\n`));
-    hookFiles.forEach(f => {
-      const hookPath = path.join(config.globalHooks, f);
-      const stats = fs.statSync(hookPath);
-      const isExecutable = (stats.mode & parseInt('111', 8)) !== 0;
-      if (isExecutable) {
-        console.log(c.green(`      • ${f} (executable)\n`));
-      } else {
-        console.log(c.yellow(`      • ${f} (not executable)\n`));
-        issues.push(`Hook ${f} is not executable`);
-        recommendations.push(`Run: chmod +x ${hookPath}`);
-      }
-    });
-    checksPassed++;
+    console.log(c.green(`   ✅ Claude: ${hookFiles.length} hooks installed`));
   } else {
-    console.log(c.red('   ❌ Hooks not configured\n'));
-    issues.push('Hooks not installed');
-    recommendations.push('Run: teleportation on');
-    checksFailed++;
+    console.log(c.dim('   - Claude: hooks not installed'));
+  }
+
+  // 2.2 Gemini Hooks
+  const globalGeminiHooks = path.join(HOME_DIR, '.gemini', 'hooks');
+  const globalGeminiSettings = path.join(HOME_DIR, '.gemini', 'settings.json');
+  if (fs.existsSync(globalGeminiSettings) && fs.existsSync(globalGeminiHooks)) {
+    const geminiFiles = fs.readdirSync(globalGeminiHooks).filter(f => f.endsWith('.mjs'));
+    console.log(c.green(`   ✅ Gemini: ${geminiFiles.length} hooks installed`));
+  } else {
+    console.log(c.dim('   - Gemini: hooks not installed'));
+  }
+
+  // 2.3 UHR availability
+  try {
+    const uhrInstallerPath = path.join(TELEPORTATION_DIR, 'lib', 'install', 'uhr-installer.js');
+    const { isUhrAvailable } = await import('file://' + uhrInstallerPath);
+    if (await isUhrAvailable()) {
+      console.log(c.green('   ✅ UHR (Universal Hook Registry) available'));
+    } else {
+      console.log(c.dim('   - UHR not installed (using legacy installer)'));
+    }
+  } catch (e) {
+    console.log(c.dim('   - UHR check skipped'));
   }
+  console.log('');
+  checksPassed++;
   
   // Check 3: Credentials
   console.log(c.yellow('3. Credentials'));
@@ -1627,6 +1809,7 @@ async function commandLogin(args) {
 async function performLogin(manager, flags, positional) {
   let apiKey = flags['api-key'] || flags.k;
   let token = flags.token || flags.t;
+  let refreshToken = flags['refresh-token'] || flags.rt;
   const relayApiUrl = flags['relay-url'] || flags.r || process.env.RELAY_API_URL || 'https://api.teleportation.dev';
 
   // Create backup before modifying credentials (only if credentials exist)
@@ -1685,8 +1868,23 @@ async function performLogin(manager, flags, positional) {
       console.log(c.green('✅ Successfully authenticated with API key!\n'));
       console.log(c.cyan('Credentials saved to ~/.teleportation/credentials\n'));
 
-      // Auto-start daemon
-      console.log(c.cyan('Starting daemon for remote commands...'));
+      // Kill any orphaned Claude processes spawned by the old daemon
+      // These would be running tasks with old credentials
+      try {
+        const { execSync } = require('child_process');
+        // Kill Claude processes spawned in task mode (have TELEPORTATION_TASK_MODE in their environment)
+        // pkill returns exit code 1 if no processes found, so we ignore errors
+        execSync('pkill -f "claude.*-p.*--output-format" 2>/dev/null || true', { stdio: 'ignore' });
+        if (process.env.DEBUG) {
+          console.log(c.dim('Cleaned up any orphaned Claude task processes.'));
+        }
+      } catch (e) {
+        // Ignore errors - cleanup is best-effort
+      }
+
+      // Restart daemon to pick up new credentials
+      // (If daemon was running with old credentials, restart ensures it uses new ones)
+      console.log(c.cyan('Restarting daemon with new credentials...'));
       try {
         const lifecyclePath = path.join(TELEPORTATION_DIR, 'lib', 'daemon', 'lifecycle.js');
         const { access } = await import('fs/promises');
@@ -1695,16 +1893,120 @@ async function performLogin(manager, flags, positional) {
         } catch {
           throw new Error('Daemon module not found. Please reinstall: npm install -g teleportation-cli');
         }
-        const { startDaemon } = await import('file://' + lifecyclePath);
-        const result = await startDaemon({ detached: true, silent: true });
-        console.log(c.green(`✅ Daemon started (PID: ${result.pid})\n`));
+        const { restartDaemon } = await import('file://' + lifecyclePath);
+        const result = await restartDaemon({ stopTimeout: 5000, force: true });
+        if (result.wasRunning) {
+          console.log(c.green(`✅ Daemon restarted with new credentials (PID: ${result.pid})\n`));
+        } else {
+          console.log(c.green(`✅ Daemon started (PID: ${result.pid})\n`));
+        }
       } catch (e) {
-        if (e.message && e.message.includes('already running')) {
-          console.log(c.green('✅ Daemon already running\n'));
+        console.log(c.yellow(`⚠️  Could not start daemon: ${e.message}`));
+        console.log(c.cyan('You can start it manually with: teleportation daemon start\n'));
+      }
+
+      console.log(c.yellow('⚠️  Restart Claude Code to apply changes to current session.\n'));
+      return;
+    } catch (error) {
+      console.log(c.red(`❌ Error: ${error.message}\n`));
+      process.exit(1);
+    }
+  }
+
+  // If refresh token provided via flag (PRD-0019: JWT authentication)
+  if (refreshToken) {
+    console.log(c.yellow('Authenticating with JWT refresh token...\n'));
+
+    try {
+      // Call POST /api/auth/refresh to validate and get access token
+      console.log(c.cyan('Validating refresh token...'));
+      const refreshResponse = await fetch(`${relayApiUrl}/api/auth/refresh`, {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+        },
+        body: JSON.stringify({ refreshToken }),
+      });
+
+      if (!refreshResponse.ok) {
+        const errorData = await refreshResponse.json().catch(() => ({}));
+        if (refreshResponse.status === 401) {
+          console.log(c.red('❌ Invalid or expired refresh token.'));
+          console.log(c.cyan('   Get a new token from https://app.teleportation.dev\n'));
+        } else if (refreshResponse.status === 503) {
+          console.log(c.red('❌ JWT authentication is not enabled on this relay.'));
+          console.log(c.cyan('   Use --api-key for API key authentication instead.\n'));
         } else {
-          console.log(c.yellow(`⚠️  Could not start daemon: ${e.message}`));
-          console.log(c.cyan('You can start it manually with: teleportation daemon start\n'));
+          console.log(c.red(`❌ Failed to validate token: ${errorData.message || refreshResponse.statusText}\n`));
+        }
+        process.exit(1);
+      }
+
+      const tokenData = await refreshResponse.json();
+
+      // Calculate when access token expires (server returns expiresIn in seconds)
+      const accessTokenExpiresAt = Date.now() + (tokenData.expiresIn * 1000);
+
+      // Save credentials with JWT tokens
+      const existingCredsForMerge = await manager.load().catch(() => null);
+      const credentials = {
+        ...(existingCredsForMerge && typeof existingCredsForMerge === 'object' ? existingCredsForMerge : {}),
+        // JWT token fields
+        refreshToken: tokenData.refreshToken, // Store the new rotated refresh token
+        accessToken: tokenData.accessToken,
+        accessTokenExpiresAt: accessTokenExpiresAt,
+        refreshTokenId: tokenData.refreshTokenId,
+        // Metadata
+        relayApiUrl: relayApiUrl,
+        authenticatedAt: Date.now(),
+        method: 'jwt',
+        // Clear legacy API key (optional - could keep for backward compat)
+        // apiKey: undefined,
+      };
+
+      await manager.save(credentials);
+
+      // Also sync config to match credentials
+      try {
+        const configManagerPath = path.join(TELEPORTATION_DIR, 'lib', 'config', 'manager.js');
+        const { setConfigValue } = await import('file://' + configManagerPath);
+        await setConfigValue('relay.url', relayApiUrl);
+      } catch (configErr) {
+        // Non-fatal - just warn
+        console.log(c.yellow(`⚠️  Could not sync config: ${configErr.message}`));
+      }
+
+      console.log(c.green('✅ Successfully authenticated with JWT!\n'));
+      console.log(c.cyan('Credentials saved to ~/.teleportation/credentials'));
+      console.log(c.dim(`Access token expires in ${Math.floor(tokenData.expiresIn / 60)} minutes (auto-refreshes)\n`));
+
+      // Kill any orphaned Claude processes spawned by the old daemon
+      try {
+        const { execSync } = require('child_process');
+        execSync('pkill -f "claude.*-p.*--output-format" 2>/dev/null || true', { stdio: 'ignore' });
+      } catch (e) { /* Ignore */ }
+
+      // Restart daemon to pick up new credentials
+      // (If daemon was running with old credentials, restart ensures it uses new ones)
+      console.log(c.cyan('Restarting daemon with new credentials...'));
+      try {
+        const lifecyclePath = path.join(TELEPORTATION_DIR, 'lib', 'daemon', 'lifecycle.js');
+        const { access } = await import('fs/promises');
+        try {
+          await access(lifecyclePath);
+        } catch {
+          throw new Error('Daemon module not found. Please reinstall: npm install -g teleportation-cli');
+        }
+        const { restartDaemon } = await import('file://' + lifecyclePath);
+        const result = await restartDaemon({ stopTimeout: 5000, force: true });
+        if (result.wasRunning) {
+          console.log(c.green(`✅ Daemon restarted with new credentials (PID: ${result.pid})\n`));
+        } else {
+          console.log(c.green(`✅ Daemon started (PID: ${result.pid})\n`));
         }
+      } catch (e) {
+        console.log(c.yellow(`⚠️  Could not start daemon: ${e.message}`));
+        console.log(c.cyan('You can start it manually with: teleportation daemon start\n'));
       }
 
       console.log(c.yellow('⚠️  Restart Claude Code to apply changes to current session.\n'));
@@ -1715,7 +2017,7 @@ async function performLogin(manager, flags, positional) {
     }
   }
 
-  // If token provided via flag
+  // If token provided via flag (legacy - direct access token)
   if (token) {
     console.log(c.yellow('Authenticating with token...\n'));
     
@@ -1745,8 +2047,15 @@ async function performLogin(manager, flags, positional) {
       console.log(c.green('✅ Successfully authenticated with token!\n'));
       console.log(c.cyan('Credentials saved to ~/.teleportation/credentials\n'));
 
-      // Auto-start daemon
-      console.log(c.cyan('Starting daemon for remote commands...'));
+      // Kill any orphaned Claude processes spawned by the old daemon
+      try {
+        const { execSync } = require('child_process');
+        execSync('pkill -f "claude.*-p.*--output-format" 2>/dev/null || true', { stdio: 'ignore' });
+      } catch (e) { /* Ignore */ }
+
+      // Restart daemon to pick up new credentials
+      // (If daemon was running with old credentials, restart ensures it uses new ones)
+      console.log(c.cyan('Restarting daemon with new credentials...'));
       try {
         const lifecyclePath = path.join(TELEPORTATION_DIR, 'lib', 'daemon', 'lifecycle.js');
         const { access } = await import('fs/promises');
@@ -1755,16 +2064,16 @@ async function performLogin(manager, flags, positional) {
         } catch {
           throw new Error('Daemon module not found. Please reinstall: npm install -g teleportation-cli');
         }
-        const { startDaemon } = await import('file://' + lifecyclePath);
-        const result = await startDaemon({ detached: true, silent: true });
-        console.log(c.green(`✅ Daemon started (PID: ${result.pid})\n`));
-      } catch (e) {
-        if (e.message && e.message.includes('already running')) {
-          console.log(c.green('✅ Daemon already running\n'));
+        const { restartDaemon } = await import('file://' + lifecyclePath);
+        const result = await restartDaemon({ stopTimeout: 5000, force: true });
+        if (result.wasRunning) {
+          console.log(c.green(`✅ Daemon restarted with new credentials (PID: ${result.pid})\n`));
         } else {
-          console.log(c.yellow(`⚠️  Could not start daemon: ${e.message}`));
-          console.log(c.cyan('You can start it manually with: teleportation daemon start\n'));
+          console.log(c.green(`✅ Daemon started (PID: ${result.pid})\n`));
         }
+      } catch (e) {
+        console.log(c.yellow(`⚠️  Could not start daemon: ${e.message}`));
+        console.log(c.cyan('You can start it manually with: teleportation daemon start\n'));
       }
 
       console.log(c.yellow('⚠️  Restart Claude Code to apply changes to current session.\n'));
@@ -1792,8 +2101,10 @@ async function performLogin(manager, flags, positional) {
       
       if (!input || input.trim() === '') {
         console.log(c.yellow('\n⚠️  No API key provided.'));
-        console.log(c.cyan('   Use --api-key flag or --token flag for non-interactive login.\n'));
-        console.log(c.cyan('   Example: teleportation login --api-key YOUR_KEY\n'));
+        console.log(c.cyan('   Use --api-key or --refresh-token flag for non-interactive login.\n'));
+        console.log(c.cyan('   Examples:'));
+        console.log(c.cyan('     teleportation login --api-key YOUR_KEY'));
+        console.log(c.cyan('     teleportation login --refresh-token YOUR_JWT_TOKEN\n'));
         resolve();
         return;
       }
@@ -1825,8 +2136,15 @@ async function performLogin(manager, flags, positional) {
         console.log(c.green('✅ Successfully authenticated!\n'));
         console.log(c.cyan('Credentials saved to ~/.teleportation/credentials\n'));
 
-        // Auto-start daemon
-        console.log(c.cyan('Starting daemon for remote commands...'));
+        // Kill any orphaned Claude processes spawned by the old daemon
+        try {
+          const { execSync } = require('child_process');
+          execSync('pkill -f "claude.*-p.*--output-format" 2>/dev/null || true', { stdio: 'ignore' });
+        } catch (e) { /* Ignore */ }
+
+        // Restart daemon to pick up new credentials
+        // (If daemon was running with old credentials, restart ensures it uses new ones)
+        console.log(c.cyan('Restarting daemon with new credentials...'));
         try {
           const lifecyclePath = path.join(TELEPORTATION_DIR, 'lib', 'daemon', 'lifecycle.js');
           const { access } = await import('fs/promises');
@@ -1835,16 +2153,16 @@ async function performLogin(manager, flags, positional) {
           } catch {
             throw new Error('Daemon module not found. Please reinstall: npm install -g teleportation-cli');
           }
-          const { startDaemon } = await import('file://' + lifecyclePath);
-          const result = await startDaemon({ detached: true, silent: true });
-          console.log(c.green(`✅ Daemon started (PID: ${result.pid})\n`));
-        } catch (e) {
-          if (e.message && e.message.includes('already running')) {
-            console.log(c.green('✅ Daemon already running\n'));
+          const { restartDaemon } = await import('file://' + lifecyclePath);
+          const result = await restartDaemon({ stopTimeout: 5000, force: true });
+          if (result.wasRunning) {
+            console.log(c.green(`✅ Daemon restarted with new credentials (PID: ${result.pid})\n`));
           } else {
-            console.log(c.yellow(`⚠️  Could not start daemon: ${e.message}`));
-            console.log(c.cyan('You can start it manually with: teleportation daemon start\n'));
+            console.log(c.green(`✅ Daemon started (PID: ${result.pid})\n`));
           }
+        } catch (e) {
+          console.log(c.yellow(`⚠️  Could not start daemon: ${e.message}`));
+          console.log(c.cyan('You can start it manually with: teleportation daemon start\n'));
         }
 
         resolve();
@@ -2036,6 +2354,30 @@ async function validateGitHubToken(token) {
   return response.json();
 }
 
+/**
+ * Claim an orphan API key by opening the dashboard
+ */
+async function commandClaim() {
+  console.log(c.purple('Teleportation: Claim Orphan API Key\n'));
+  
+  const frontendUrl = process.env.FRONTEND_URL || 'https://app.teleportation.dev';
+  const claimUrl = `${frontendUrl}/api-keys`;
+  
+  console.log(c.cyan('If you have an old API key from before you logged in, you can link it'));
+  console.log(c.cyan('to your account to migrate all your past sessions.\n'));
+  
+  console.log(c.yellow(`Opening your browser to ${claimUrl}...\n`));
+  
+  try {
+    const { exec } = require('child_process');
+    const startCmd = process.platform === 'darwin' ? 'open' : process.platform === 'win32' ? 'start' : 'xdg-open';
+    exec(`${startCmd} ${claimUrl}`);
+  } catch (err) {
+    console.log(c.red(`❌ Failed to open browser: ${err.message}`));
+    console.log(c.cyan(`Please visit ${claimUrl} manually to claim your key.`));
+  }
+}
+
 async function commandGithub(args) {
   const subCommand = args[0] || 'help';
   const { flags } = parseFlags(args.slice(1));
@@ -2340,6 +2682,89 @@ async function commandRemote(args) {
   }
 }
 
+async function commandTeleport(args) {
+  const subCommand = args[0] || 'help';
+
+  // Parse flags
+  const { flags, positional } = parseFlags(args.slice(1));
+
+  try {
+    // Dynamically import teleport commands
+    const teleportCommandsPath = path.join(TELEPORTATION_DIR, 'lib', 'cli', 'teleport-commands.js');
+    const {
+      commandTeleportStart,
+      commandTeleportStatus,
+      commandTeleportList,
+      commandTeleportStop,
+      commandTeleportHelp
+    } = await import('file://' + teleportCommandsPath);
+
+    switch (subCommand) {
+      case 'start':
+        // Parse: teleportation teleport start --task "description" [--provider sprites|daytona] [--target-coder claude-code|gemini-cli] [--mode pause|fork]
+        await commandTeleportStart({
+          sessionId: flags['session-id'] || flags.id,
+          task: flags.task,
+          cwd: flags.cwd || process.cwd(),
+          provider: flags.provider,
+          targetCoder: flags['target-coder'] || flags.coder || 'claude-code',
+          mode: flags.mode || 'pause',
+        });
+        break;
+
+      case 'status':
+        // Parse: teleportation teleport status <teleport-id>
+        const statusTeleportId = positional[0] || flags['teleport-id'] || flags.id;
+        if (!statusTeleportId) {
+          console.log(c.red('❌ Error: Teleport ID is required\n'));
+          console.log(c.cyan('Usage: teleportation teleport status <teleport-id>\n'));
+          process.exit(1);
+        }
+        await commandTeleportStatus(statusTeleportId);
+        break;
+
+      case 'list':
+      case 'ls':
+        // Parse: teleportation teleport list [--status running|completed|failed]
+        await commandTeleportList({
+          status: flags.status,
+        });
+        break;
+
+      case 'stop':
+        // Parse: teleportation teleport stop <teleport-id> [--create-pr] [--base-branch main]
+        const stopTeleportId = positional[0] || flags['teleport-id'] || flags.id;
+        if (!stopTeleportId) {
+          console.log(c.red('❌ Error: Teleport ID is required\n'));
+          console.log(c.cyan('Usage: teleportation teleport stop <teleport-id> [--create-pr]\n'));
+          process.exit(1);
+        }
+        await commandTeleportStop(stopTeleportId, {
+          createPR: flags['create-pr'] || false,
+          baseBranch: flags['base-branch'],
+        });
+        break;
+
+      case 'help':
+      case '--help':
+      case '-h':
+        commandTeleportHelp();
+        break;
+
+      default:
+        console.log(c.red(`Unknown teleport command: ${subCommand}\n`));
+        console.log(c.cyan('Run "teleportation teleport help" for available commands\n'));
+        process.exit(1);
+    }
+  } catch (error) {
+    console.log(c.red(`❌ Teleport command failed: ${error.message}\n`));
+    if (process.env.DEBUG) {
+      console.error(error.stack);
+    }
+    process.exit(1);
+  }
+}
+
 async function commandDaemon(args) {
   const subCommand = args[0] || 'status';
 
@@ -2675,334 +3100,75 @@ async function commandInboxAck(id) {
 }
 
 /**
- * Install hooks globally to ~/.claude/hooks/
- * This command copies hooks from the teleportation project to the global location
- * and merges settings into ~/.claude/settings.json
+ * Install hooks globally to ~/.claude/hooks/ and ~/.gemini/hooks/
+ * This command uses the unified installer logic.
  */
 async function commandInstallHooks() {
   console.log(c.purple('🔧 Installing Teleportation Hooks Globally\n'));
 
-  const globalHooksDir = path.join(HOME_DIR, '.claude', 'hooks');
-  const globalSettings = path.join(HOME_DIR, '.claude', 'settings.json');
-  const sourceHooksDir = path.join(TELEPORTATION_DIR, '.claude', 'hooks');
-
-  // List of hooks to install
-  const hooks = [
-    'pre_tool_use.mjs',
-    'post_tool_use.mjs',
-    'permission_request.mjs',
-    'stop.mjs',
-    'session_start.mjs',
-    'session_end.mjs',
-    'notification.mjs',
-    'user_prompt_submit.mjs',
-    'config-loader.mjs',
-    'session-register.mjs',
-    'heartbeat.mjs'  // Spawned by session-register.mjs, needs to be in hooks directory
-  ];
-
-  // Step 1: Ensure directories exist
-  console.log(c.yellow('Step 1: Creating directories...\n'));
   try {
-    if (!fs.existsSync(path.join(HOME_DIR, '.claude'))) {
-      fs.mkdirSync(path.join(HOME_DIR, '.claude'), { recursive: true });
-    }
-    if (!fs.existsSync(globalHooksDir)) {
-      fs.mkdirSync(globalHooksDir, { recursive: true });
-    }
-    console.log(c.green('  ✅ ~/.claude/hooks/ directory ready\n'));
-  } catch (e) {
-    console.log(c.red(`  ❌ Failed to create directories: ${e.message}\n`));
-    process.exit(1);
-  }
-
-  // Step 2: Copy hook files
-  console.log(c.yellow('Step 2: Copying hooks...\n'));
-  let installed = 0;
-  let failed = 0;
-
-  for (const hook of hooks) {
-    const src = path.join(sourceHooksDir, hook);
-    const dest = path.join(globalHooksDir, hook);
-
+    // Try UHR first
+    let installed = false;
     try {
-      if (!fs.existsSync(src)) {
-        console.log(c.yellow(`  ⚠️  ${hook} not found in source, skipping`));
-        continue;
+      const uhrInstallerPath = path.join(TELEPORTATION_DIR, 'lib', 'install', 'uhr-installer.js');
+      const { isUhrAvailable, installViaUhr } = await import('file://' + uhrInstallerPath);
+
+      if (await isUhrAvailable()) {
+        console.log(c.dim('  Using UHR (Universal Hook Registry)...'));
+        const manifestPath = path.join(TELEPORTATION_DIR, 'teleportation.uhr.json');
+        const hooksDir = path.join(TELEPORTATION_DIR, '.claude', 'hooks');
+        const uhrResult = await installViaUhr(manifestPath, hooksDir);
+
+        if (uhrResult.success) {
+          console.log(c.green('  ✅ Hooks installed via UHR'));
+          if (uhrResult.warnings.length > 0) {
+            uhrResult.warnings.forEach(w => console.log(c.yellow(`  ⚠️  ${w}`)));
+          }
+          installed = true;
+        } else {
+          console.log(c.yellow(`  ⚠️  UHR install failed: ${uhrResult.reason}`));
+          console.log(c.dim('  Falling back to legacy installer...'));
+        }
       }
-
-      fs.copyFileSync(src, dest);
-      fs.chmodSync(dest, 0o755); // Make executable
-      console.log(c.green(`  ✅ ${hook}`));
-      installed++;
     } catch (e) {
-      console.log(c.red(`  ❌ ${hook}: ${e.message}`));
-      failed++;
+      // UHR not available
     }
-  }
 
-  console.log(`\n  Installed: ${c.green(installed)}, Failed: ${failed > 0 ? c.red(failed) : '0'}\n`);
-
-  // Step 2.5: Install lib files that hooks depend on (metadata.js, etc.)
-  console.log(c.yellow('Step 2.5: Installing lib files...\n'));
-  try {
-    const installerPath = path.join(TELEPORTATION_DIR, 'lib', 'install', 'installer.js');
-    if (fs.existsSync(installerPath)) {
-      const installer = await import('file://' + installerPath);
-      const libResult = await installer.installLibFiles();
-      if (libResult.installed.length > 0) {
-        libResult.installed.forEach(file => {
-          console.log(c.green(`  ✅ ${file}`));
-        });
-      }
-      if (libResult.failed.length > 0) {
-        libResult.failed.forEach(({ file, error }) => {
-          console.log(c.yellow(`  ⚠️  ${file}: ${error}`));
-        });
-      }
-      console.log(`\n  Lib files installed: ${c.green(libResult.installed.length)}, Failed: ${libResult.failed.length > 0 ? c.yellow(libResult.failed.length) : '0'}\n`);
-    } else {
-      console.log(c.yellow('  ⚠️  Installer module not found, skipping lib files\n'));
-    }
-  } catch (e) {
-    console.log(c.yellow(`  ⚠️  Failed to install lib files: ${e.message}\n`));
-  }
-
-  // Step 3: Update settings.json
-  console.log(c.yellow('Step 3: Updating Claude Code settings...\n'));
-
-  try {
-    // Use SettingsManager for proper hook management
-    const settingsManagerPath = path.join(TELEPORTATION_DIR, 'lib', 'settings', 'manager.js');
-    const { SettingsManager } = await import('file://' + settingsManagerPath);
-    const settingsManager = new SettingsManager(globalSettings);
-
-    // Remove ALL existing Teleportation hooks (regardless of path)
-    // This prevents accumulation of hooks from different installation locations
-    const removeResult = await settingsManager.removeTeleportationHooks();
-    if (removeResult.hooksRemoved > 0) {
-      console.log(c.cyan(`  Removed ${removeResult.hooksRemoved} existing Teleportation hook(s)\n`));
-    }
-
-    // Add new hooks pointing to global hooks directory
-    const addResult = await settingsManager.addHooks(globalHooksDir);
-    console.log(c.green(`  ✅ Added ${addResult.hooksAdded} hook(s) to settings\n`));
-
-    // Deduplicate in case there are any remaining duplicates
-    const dedupeResult = await settingsManager.deduplicate();
-    if (dedupeResult.duplicatesRemoved > 0) {
-      console.log(c.cyan(`  Removed ${dedupeResult.duplicatesRemoved} duplicate hook(s)\n`));
-    }
-  } catch (e) {
-    console.log(c.red(`  ❌ Failed to update settings: ${e.message}\n`));
-
-    try {
-      // Fallback to manual merge if SettingsManager fails
-      console.log(c.yellow('  Attempting fallback method...\n'));
-
-    const quotePath = (p) => JSON.stringify(p);
-
-    const hooksConfig = {
-      PreToolUse: [{
-        matcher: ".*",
-        hooks: [{
-          type: "command",
-          command: `node ${quotePath(path.join(globalHooksDir, 'pre_tool_use.mjs'))}`
-        }]
-      }],
-      PostToolUse: [{
-        matcher: ".*",
-        hooks: [{
-          type: "command",
-          command: `node ${quotePath(path.join(globalHooksDir, 'post_tool_use.mjs'))}`
-        }]
-      }],
-      PermissionRequest: [{
-        matcher: ".*",
-        hooks: [{
-          type: "command",
-          command: `node ${quotePath(path.join(globalHooksDir, 'permission_request.mjs'))}`
-        }]
-      }],
-      Stop: [{
-        matcher: ".*",
-        hooks: [{
-          type: "command",
-          command: `node ${quotePath(path.join(globalHooksDir, 'stop.mjs'))}`
-        }]
-      }],
-      SessionStart: [{
-        matcher: ".*",
-        hooks: [{
-          type: "command",
-          command: `node ${quotePath(path.join(globalHooksDir, 'session_start.mjs'))}`
-        }]
-      }],
-      SessionEnd: [{
-        matcher: ".*",
-        hooks: [{
-          type: "command",
-          command: `node ${quotePath(path.join(globalHooksDir, 'session_end.mjs'))}`
-        }]
-      }],
-      Notification: [{
-        matcher: ".*",
-        hooks: [{
-          type: "command",
-          command: `node ${quotePath(path.join(globalHooksDir, 'notification.mjs'))}`
-        }]
-      }],
-      UserPromptSubmit: [{
-        matcher: ".*",
-        hooks: [{
-          type: "command",
-          command: `node ${quotePath(path.join(globalHooksDir, 'user_prompt_submit.mjs'))}`
-        }]
-      }]
-    };
+    if (!installed) {
+      // Legacy installer fallback
+      const installerPath = path.join(TELEPORTATION_DIR, 'lib', 'install', 'installer.js');
+      const { install } = await import('file://' + installerPath);
+      const sourceHooksDir = path.join(TELEPORTATION_DIR, '.claude', 'hooks');
 
-    let existingSettings = {};
+      const result = await install(sourceHooksDir);
 
-    // Load existing settings if present
-    if (fs.existsSync(globalSettings)) {
-      try {
-        const content = fs.readFileSync(globalSettings, 'utf8');
-        existingSettings = JSON.parse(content);
-        console.log(c.cyan('  Found existing settings, merging...\n'));
-      } catch (err) {
-        console.log(c.yellow(`  ⚠️  Could not parse existing settings, creating new...\n`));
+      if (result.hooksInstalled > 0) {
+        console.log(c.green(`  ✅ ${result.hooksInstalled} Claude Code hooks installed`));
+        console.log(c.dim('     Directory: ~/.claude/hooks/'));
       }
-    }
-
-    // Load isTeleportationHook pattern for filtering
-    let isTeleportationHook;
-    try {
-      const settingsManagerPath = path.join(TELEPORTATION_DIR, 'lib', 'settings', 'manager.js');
-      const settingsModule = await import('file://' + settingsManagerPath);
-      isTeleportationHook = settingsModule.isTeleportationHook;
-    } catch (err) {
-      // Log the specific error for debugging
-      console.log(c.yellow(`  ⚠️  Could not load SettingsManager: ${err.message}`));
-      console.log(c.yellow('  Using simplified hook detection pattern\n'));
-
-      // More robust fallback pattern matching the regex in SettingsManager
-      // Matches: .claude/hooks/(pre_tool_use|post_tool_use|permission_request|stop|session_start|session_end|notification|user_prompt_submit).mjs
-      isTeleportationHook = (cmd) => {
-        if (!cmd || typeof cmd !== 'string') return false;
-        return /\.claude\/hooks\/(pre_tool_use|post_tool_use|permission_request|stop|session_start|session_end|notification|user_prompt_submit)\.mjs/.test(cmd);
-      };
-    }
-
-    // Merge hooks - preserve NON-teleportation user hooks, remove ALL teleportation hooks
-    const mergeHookArrays = (existing, incoming) => {
-      if (!existing || !Array.isArray(existing)) return incoming;
-      if (!incoming || !Array.isArray(incoming)) return existing;
-
-      // Filter out ALL teleportation hooks (regardless of path)
-      const nonTeleportationHooks = existing.filter(matcher => {
-        if (!matcher.hooks || !Array.isArray(matcher.hooks)) return true;
-        // Keep matcher only if it has non-teleportation hooks
-        return !matcher.hooks.every(h => h.command && isTeleportationHook(h.command));
-      });
-
-      // Combine: existing (non-teleportation) + incoming (new teleportation hooks)
-      return [...nonTeleportationHooks, ...incoming];
-    };
-
-    // Merge all hook types with warnings about user hooks
-    const mergedHooks = { ...(existingSettings.hooks || {}) };
-    let hasUserHooks = false;
-    
-    for (const [hookType, hookConfig] of Object.entries(hooksConfig)) {
-      const existingHooksForType = existingSettings.hooks?.[hookType] || [];
-      
-      // Find user-defined hooks (not from teleportation)
-      const userHooks = existingHooksForType.filter(h => {
-        if (!h.hooks || !Array.isArray(h.hooks)) return true;
-        // Keep only hooks that are NOT teleportation hooks
-        return !h.hooks.every(hh => hh.command && isTeleportationHook(hh.command));
-      });
-      
-      if (userHooks.length > 0) {
-        hasUserHooks = true;
-        console.log(c.yellow(`  ⚠️  Preserving ${userHooks.length} custom ${hookType} hook(s):`));
-        userHooks.forEach(h => {
-          const cmds = (h.hooks || []).map(hh => hh.command || 'unknown');
-          cmds.forEach(cmd => console.log(c.dim(`     • ${cmd}`)));
-        });
-        console.log('');
+      if (result.geminiHooksInstalled > 0) {
+        console.log(c.green(`  ✅ ${result.geminiHooksInstalled} Gemini CLI hooks installed`));
+        console.log(c.dim('     Directory: ~/.gemini/hooks/'));
       }
-      
-      mergedHooks[hookType] = mergeHookArrays(existingHooksForType, hookConfig);
-    }
-    
-    if (hasUserHooks) {
-      console.log(c.cyan('  Your custom hooks will continue to work alongside Teleportation hooks.\n'));
-    }
-
-    const mergedSettings = {
-      ...existingSettings,
-      hooks: mergedHooks
-    };
-
-    // Write settings
-    fs.writeFileSync(globalSettings, JSON.stringify(mergedSettings, null, 2));
-    console.log(c.green('  ✅ ~/.claude/settings.json updated\n'));
-
-    // Deduplicate in fallback path (Gap #2)
-    console.log(c.yellow('  Running deduplication check...\n'));
-    let duplicatesRemoved = 0;
-
-    for (const [hookType, matchers] of Object.entries(mergedSettings.hooks || {})) {
-      if (!Array.isArray(matchers)) continue;
-
-      const seenCommands = new Set();
-      const uniqueMatchers = [];
 
-      for (const matcher of matchers) {
-        const commands = (matcher.hooks || []).map(h => h.command).filter(Boolean);
-        const isUnique = !commands.some(cmd => seenCommands.has(cmd));
-
-        if (isUnique) {
-          uniqueMatchers.push(matcher);
-          commands.forEach(cmd => seenCommands.add(cmd));
-        } else {
-          duplicatesRemoved++;
-        }
+      if (result.libFilesInstalled > 0) {
+        console.log(c.green(`  ✅ ${result.libFilesInstalled} shared library files installed`));
       }
-
-      mergedSettings.hooks[hookType] = uniqueMatchers;
     }
 
-    if (duplicatesRemoved > 0) {
-      fs.writeFileSync(globalSettings, JSON.stringify(mergedSettings, null, 2));
-      console.log(c.cyan(`  Removed ${duplicatesRemoved} duplicate(s) in fallback\n`));
-    } else {
-      console.log(c.green('  ✅ No duplicates found\n'));
-    }
-    } catch (fallbackErr) {
-      console.log(c.red(`  ❌ Fallback also failed: ${fallbackErr.message}\n`));
-      console.log(c.red('  Please report this issue at: https://github.com/dundas/teleportation-private/issues\n'));
-      process.exit(1);
-    }
-  }
-
-  // Summary
-  console.log(c.cyan('╭─────────────────────────────────────────────────────╮'));
-  console.log(c.cyan('│                                                     │'));
-  console.log(c.cyan('│   🎉 ') + c.green('Hooks Installed Successfully!') + c.cyan('               │'));
-  console.log(c.cyan('│                                                     │'));
-  console.log(c.cyan('│   Hooks location: ~/.claude/hooks/                  │'));
-  console.log(c.cyan('│   Settings: ~/.claude/settings.json                 │'));
-  console.log(c.cyan('│                                                     │'));
-  console.log(c.cyan('│   ') + c.yellow('⚠️  Restart Claude Code') + c.cyan(' to activate hooks.      │'));
-  console.log(c.cyan('│                                                     │'));
-  console.log(c.cyan('╰─────────────────────────────────────────────────────╯\n'));
+    console.log(c.cyan('\n╭─────────────────────────────────────────────────────╮'));
+    console.log(c.cyan('│                                                     │'));
+    console.log(c.cyan('│   🎉 ') + c.green('Hooks Installed Successfully!') + c.cyan('               │'));
+    console.log(c.cyan('│                                                     │'));
+    console.log(c.cyan('│   ') + c.yellow('⚠️  Important:') + c.cyan(' Restart your AI assistants to     │'));
+    console.log(c.cyan('│      activate the new hooks.                       │'));
+    console.log(c.cyan('│                                                     │'));
+    console.log(c.cyan('╰─────────────────────────────────────────────────────╯\n'));
 
-  console.log(c.cyan('Next steps:'));
-  console.log('  1. If not logged in: teleportation login');
-  console.log('  2. Check status: teleportation status');
-  console.log('  3. Restart Claude Code to apply hooks\n');
+  } catch (error) {
+    console.log(c.red(`\n❌ Installation failed: ${error.message}\n`));
+    process.exit(1);
+  }
 }
 
 async function commandCommand() {
@@ -3301,7 +3467,7 @@ const command = process.argv[2] || 'help';
 const args = process.argv.slice(3);
 
 // Handle async commands that need to complete before exit
-const asyncCommands = ['login', 'logout', 'status', 'test', 'env', 'config', 'daemon', 'away', 'back', 'daemon-status', 'command', 'inbox', 'inbox-ack', 'install-hooks', 'update', 'remote'];
+const asyncCommands = ['login', 'logout', 'status', 'test', 'env', 'config', 'daemon', 'away', 'back', 'daemon-status', 'command', 'inbox', 'inbox-ack', 'install-hooks', 'update', 'remote', 'off'];
 // Keep this list in sync with switch cases below
 asyncCommands.push('github');
 if (asyncCommands.includes(command)) {
@@ -3335,7 +3501,10 @@ try {
       });
       break;
     case 'off':
-      commandOff();
+      commandOff().catch(err => {
+        console.log(c.red('Error: ' + err.message));
+        process.exit(1);
+      });
       break;
     case 'status':
       commandStatus().catch(err => {
@@ -3394,6 +3563,12 @@ try {
         process.exit(1);
       });
       break;
+    case 'claim':
+      commandClaim().catch(err => {
+        console.error(c.red('❌ Error:'), err.message);
+        process.exit(1);
+      });
+      break;
     case 'github':
       commandGithub(args).catch(err => {
         console.error(c.red('❌ Error:'), err.message);
@@ -3472,6 +3647,12 @@ try {
         process.exit(1);
       });
       break;
+    case 'teleport':
+      commandTeleport(args).catch(err => {
+        console.error(c.red('❌ Error:'), err.message);
+        process.exit(1);
+      });
+      break;
     case 'version':
     case '--version':
     case '-v':