slackhive 0.1.33 → 0.1.35

package/dist/commands/init.js

@@ -12,16 +12,11 @@ exports.init = init;
 const child_process_1 = require("child_process");
 const fs_1 = require("fs");
 const path_1 = require("path");
-const os_1 = require("os");
 const chalk_1 = __importDefault(require("chalk"));
 const ora_1 = __importDefault(require("ora"));
 const prompts_1 = __importDefault(require("prompts"));
 const REPO_URL = 'https://github.com/pelago-labs/slackhive.git';
-/**
- * Simple Claude installation detection for Linux.
- * Uses the binary directly without module path detection.
- */
-function detectClaudeInstallationLinux() {
+function detectClaudeBin() {
     let claudeBin;
     try {
         claudeBin = (0, child_process_1.execSync)('which claude', { encoding: 'utf-8' }).trim();
@@ -29,82 +24,64 @@ function detectClaudeInstallationLinux() {
     catch {
         throw new Error('Claude Code not found. Please install Claude Code first.');
     }
-    if (!claudeBin) {
+    if (!claudeBin)
         throw new Error('Claude Code not found. Please install Claude Code first.');
-    }
-    // For Linux, we don't need to detect the module path - just use the binary directly
-    // The Docker container will use the mounted binary
-    return { claudeBin, claudeModulePath: '' };
+    return claudeBin;
 }
 /**
- * Advanced Claude installation detection for macOS.
- * Finds both the binary and module directory automatically with symlink resolution.
+ * Parses a JSON credential blob and extracts OAuth tokens.
  */
-function detectClaudeInstallationMacOS() {
-    // Find Claude binary
-    let claudeBin;
+function parseOAuthFromJson(json) {
     try {
-        claudeBin = (0, child_process_1.execSync)('which claude', { encoding: 'utf-8' }).trim();
-    }
-    catch {
-        throw new Error('Claude Code not found. Please install Claude Code first.');
-    }
-    if (!claudeBin) {
-        throw new Error('Claude Code not found. Please install Claude Code first.');
-    }
-    let claudeModulePath;
-    // Check if it's a symlink and resolve it
-    if ((0, fs_1.existsSync)(claudeBin)) {
-        try {
-            const target = (0, fs_1.readlinkSync)(claudeBin);
-            // Handle relative paths
-            const resolvedTarget = target.startsWith('/') ? target : (0, path_1.join)((0, path_1.dirname)(claudeBin), target);
-            // Extract module directory from cli.js path
-            claudeModulePath = (0, path_1.dirname)(resolvedTarget);
-        }
-        catch {
-            // Not a symlink, try common installation paths
-            const possiblePaths = [
-                '/usr/local/lib/node_modules/@anthropic-ai/claude-code',
-                '/opt/homebrew/lib/node_modules/@anthropic-ai/claude-code',
-                (0, path_1.join)(process.env.HOME || '~', '.local/lib/node_modules/@anthropic-ai/claude-code'),
-                '/usr/lib/node_modules/@anthropic-ai/claude-code',
-            ];
-            claudeModulePath = '';
-            for (const path of possiblePaths) {
-                if ((0, fs_1.existsSync)(path) && (0, fs_1.existsSync)((0, path_1.join)(path, 'cli.js'))) {
-                    claudeModulePath = path;
-                    break;
-                }
-            }
+        const parsed = JSON.parse(json);
+        const oauth = parsed?.claudeAiOauth;
+        if (oauth?.accessToken && oauth?.refreshToken) {
+            return { accessToken: oauth.accessToken, refreshToken: oauth.refreshToken };
         }
     }
-    else {
-        throw new Error(`Claude binary not found at: ${claudeBin}`);
-    }
-    if (!claudeModulePath || !(0, fs_1.existsSync)((0, path_1.join)(claudeModulePath, 'cli.js'))) {
-        throw new Error('Could not find Claude Code module directory.');
-    }
-    // Verify required files exist
-    if (!(0, fs_1.existsSync)((0, path_1.join)(claudeModulePath, 'yoga.wasm'))) {
-        throw new Error(`Warning: yoga.wasm not found in ${claudeModulePath}`);
-    }
-    return { claudeBin, claudeModulePath };
+    catch { /* invalid json */ }
+    return null;
 }
 /**
- * Cross-platform Claude installation detection.
- * Uses different strategies based on the operating system.
+ * Extracts the OAuth credentials from the OS credential store.
+ * Tries macOS Keychain, then Linux secret-tool (GNOME Keyring).
+ * Returns access + refresh tokens, or null if not found.
  */
-function detectClaudeInstallation() {
-    const os = (0, os_1.platform)();
-    if (os === 'darwin') {
-        // macOS - use advanced detection with symlink resolution
-        return detectClaudeInstallationMacOS();
+function extractOAuthCredentials() {
+    // macOS: read from Keychain
+    try {
+        const creds = (0, child_process_1.execSync)('security find-generic-password -s "Claude Code-credentials" -w', {
+            encoding: 'utf-8',
+            stdio: ['pipe', 'pipe', 'ignore'],
+        }).trim();
+        const result = parseOAuthFromJson(creds);
+        if (result)
+            return result;
     }
-    else {
-        // Linux and other Unix-like systems - use simple detection
-        return detectClaudeInstallationLinux();
+    catch { /* not macOS or not found */ }
+    // Linux: try secret-tool (GNOME Keyring)
+    try {
+        const creds = (0, child_process_1.execSync)('secret-tool lookup service "Claude Code-credentials"', {
+            encoding: 'utf-8',
+            stdio: ['pipe', 'pipe', 'ignore'],
+        }).trim();
+        const result = parseOAuthFromJson(creds);
+        if (result)
+            return result;
     }
+    catch { /* not available */ }
+    // Fallback: read credentials file directly (headless Linux / no keyring)
+    try {
+        const credPath = (0, path_1.join)(process.env.HOME || '~', '.claude', '.credentials.json');
+        if ((0, fs_1.existsSync)(credPath)) {
+            const creds = (0, fs_1.readFileSync)(credPath, 'utf-8').trim();
+            const result = parseOAuthFromJson(creds);
+            if (result)
+                return result;
+        }
+    }
+    catch { /* file not readable or invalid */ }
+    return null;
 }
 /**
  * Runs `slackhive init` — interactive setup wizard.
@@ -116,10 +93,10 @@ async function init(opts) {
     const O = chalk_1.default.hex('#D97757').bold;
     const W = chalk_1.default.hex('#EBE6E0').bold;
     console.log('');
-    console.log('  ' + W('  │   │  '));
-    console.log('  ' + W('──┼───┼──'));
-    console.log('  ' + O('>') + W(' │──') + O('█') + W('│  '));
-    console.log('  ' + W('  │   │  '));
+    console.log('      ' + W('│   │'));
+    console.log('   ' + W('───┼───┼───'));
+    console.log('  ' + O('>') + W(' ──┼──') + O('█') + W('┼──'));
+    console.log('      ' + W('│   │'));
     console.log('');
     console.log(chalk_1.default.bold('  SlackHive') + chalk_1.default.gray(' — AI agent teams on Slack'));
     console.log('');
@@ -180,6 +157,7 @@ async function init(opts) {
             process.exit(1);
         }
         const questions = [];
+        let oauthCreds = null;
         if (authMode.mode === 'apikey') {
             questions.push({
                 type: 'text',
@@ -189,61 +167,33 @@ async function init(opts) {
             });
         }
         else {
-            // Claude subscription mode — detect installation automatically
+            // Claude subscription mode — extract OAuth token
             const claudeDir = (0, path_1.join)(process.env.HOME || '~', '.claude');
             if (!(0, fs_1.existsSync)(claudeDir)) {
                 console.log(chalk_1.default.yellow('\n  warning: ~/.claude not found. Run `claude login` first, then re-run `slackhive init`.'));
                 process.exit(1);
             }
             console.log(chalk_1.default.green('  ✓') + ' Found ~/.claude credentials');
-            // Auto-detect Claude installation paths
-            const spinner = (0, ora_1.default)('  Detecting Claude installation...').start();
-            try {
-                const { claudeBin, claudeModulePath } = detectClaudeInstallation();
-                spinner.succeed(`Found Claude at ${claudeBin}`);
-                // Set these for the .env file
-                questions.push({
-                    type: 'text',
-                    name: 'claudeBin',
-                    message: 'Path to claude binary',
-                    initial: claudeBin,
-                });
-                // Only ask for module path on macOS (Linux uses binary directly)
-                if (claudeModulePath) {
-                    questions.push({
-                        type: 'text',
-                        name: 'claudeModulePath',
-                        message: 'Path to claude module',
-                        initial: claudeModulePath,
-                    });
-                }
+            const spinner = (0, ora_1.default)('  Extracting OAuth credentials...').start();
+            oauthCreds = extractOAuthCredentials();
+            if (oauthCreds) {
+                spinner.succeed('OAuth credentials extracted');
             }
-            catch (error) {
-                spinner.fail('Could not detect Claude installation');
-                console.log(chalk_1.default.yellow(`  ${error}`));
-                console.log(chalk_1.default.gray('  Please provide paths manually:'));
-                let claudeBinDefault = '/usr/local/bin/claude';
-                try {
-                    const found = (0, child_process_1.execSync)('which claude', { encoding: 'utf-8' }).trim();
-                    if (found)
-                        claudeBinDefault = found;
-                }
-                catch { /* use default */ }
-                questions.push({
-                    type: 'text',
-                    name: 'claudeBin',
-                    message: 'Path to claude binary',
-                    initial: claudeBinDefault,
-                });
-                // Only ask for module path on macOS
-                if ((0, os_1.platform)() === 'darwin') {
-                    questions.push({
-                        type: 'text',
-                        name: 'claudeModulePath',
-                        message: 'Path to claude module directory',
-                        initial: '/usr/local/lib/node_modules/@anthropic-ai/claude-code',
-                    });
+            else {
+                spinner.warn('Could not auto-extract credentials from keychain');
+                console.log(chalk_1.default.gray('  On Linux/headless servers, paste your OAuth token manually.'));
+                console.log(chalk_1.default.gray('  Get it from a machine where you ran `claude login`:'));
+                console.log(chalk_1.default.gray('    security find-generic-password -s "Claude Code-credentials" -w'));
+                console.log('');
+                const tokenResponse = await (0, prompts_1.default)([
+                    { type: 'password', name: 'accessToken', message: 'OAuth access token (sk-ant-oat01-...)', validate: (v) => v.startsWith('sk-ant-oat') ? true : 'Must start with sk-ant-oat' },
+                    { type: 'password', name: 'refreshToken', message: 'OAuth refresh token (sk-ant-ort01-...)', validate: (v) => v.startsWith('sk-ant-ort') ? true : 'Must start with sk-ant-ort' },
+                ]);
+                if (!tokenResponse.accessToken || !tokenResponse.refreshToken) {
+                    console.log(chalk_1.default.red('\n  Setup cancelled. Use API Key mode instead on headless servers.'));
+                    process.exit(1);
                 }
+                oauthCreds = { accessToken: tokenResponse.accessToken, refreshToken: tokenResponse.refreshToken };
             }
         }
         questions.push({ type: 'text', name: 'adminUsername', message: 'Admin username', initial: 'admin' }, { type: 'password', name: 'adminPassword', message: 'Admin password', validate: (v) => v.length >= 6 ? true : 'At least 6 characters' }, { type: 'text', name: 'postgresPassword', message: 'Postgres password', initial: randomSecret().slice(0, 16) }, { type: 'text', name: 'redisPassword', message: 'Redis password', initial: randomSecret().slice(0, 16) });
@@ -257,11 +207,9 @@ async function init(opts) {
             envContent += `ANTHROPIC_API_KEY=${response.anthropicKey}\n`;
         }
         else {
-            envContent += `# Claude Code subscription — credentials from ~/.claude\n`;
-            envContent += `CLAUDE_BIN=${response.claudeBin}\n`;
-            if (response.claudeModulePath) {
-                envContent += `CLAUDE_MODULE_PATH=${response.claudeModulePath}\n`;
-            }
+            envContent += `# Claude Code subscription — OAuth credentials from keychain\n`;
+            envContent += `CLAUDE_CODE_OAUTH_TOKEN=${oauthCreds.accessToken}\n`;
+            envContent += `CLAUDE_CODE_OAUTH_REFRESH_TOKEN=${oauthCreds.refreshToken}\n`;
         }
         envContent += `\nPOSTGRES_DB=slackhive\n`;
         envContent += `POSTGRES_USER=slackhive\n`;
@@ -330,31 +278,42 @@ async function init(opts) {
             }
         }
         catch { /* non-fatal */ }
-        await runDockerBuild(dir, opts.dir);
-        // If containers didn't come up during build, retry once silently
+        // Remove stale Postgres volume if it exists — prevents password mismatch
+        // when re-running init with new credentials
         try {
-            (0, child_process_1.execSync)('docker compose up -d', { cwd: dir, stdio: 'ignore' });
+            (0, child_process_1.execSync)('docker compose down -v', { cwd: dir, stdio: 'ignore' });
         }
-        catch { /* non-fatal */ }
-        // Wait for web UI — up to 3 minutes
-        const webSpinner = (0, ora_1.default)('  Waiting for web UI to be ready...').start();
-        let ready = false;
-        for (let i = 0; i < 60; i++) {
+        catch { /* non-fatal — may not exist yet */ }
+        const buildOk = await runDockerBuild(dir, opts.dir);
+        if (buildOk) {
+            // If containers didn't come up during build, retry once silently
             try {
-                (0, child_process_1.execSync)('curl -sf http://localhost:3001/login', { stdio: 'ignore' });
-                ready = true;
-                break;
+                (0, child_process_1.execSync)('docker compose up -d', { cwd: dir, stdio: 'ignore' });
             }
-            catch {
-                await sleep(3000);
+            catch { /* non-fatal */ }
+            // Wait for web UI — up to 3 minutes
+            const webSpinner = (0, ora_1.default)('  Waiting for web UI to be ready...').start();
+            let ready = false;
+            for (let i = 0; i < 60; i++) {
+                try {
+                    (0, child_process_1.execSync)('curl -sf http://localhost:3001/login', { stdio: 'ignore' });
+                    ready = true;
+                    break;
+                }
+                catch {
+                    await sleep(3000);
+                }
+            }
+            if (ready) {
+                webSpinner.succeed('Web UI is ready');
+            }
+            else {
+                webReady = false;
+                webSpinner.stopAndPersist({ symbol: ' ' });
             }
-        }
-        if (ready) {
-            webSpinner.succeed('Web UI is ready');
         }
         else {
             webReady = false;
-            webSpinner.stopAndPersist({ symbol: ' ' });
         }
     }
     // ── Done ──────────────────────────────────────────────────────────────────
@@ -395,28 +354,71 @@ function runDockerBuild(cwd, displayDir) {
         const startTime = Date.now();
         const frames = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
         let frameIdx = 0;
-        let currentStep = 'Building images';
-        const spinnerInterval = setInterval(() => {
+        // Phased progress tracking
+        const phases = [
+            { name: 'Installing system packages', weight: 10, pattern: /apk add|fetch.*APKINDEX/i },
+            { name: 'Installing npm dependencies', weight: 30, pattern: /npm ci|npm install|added \d+ packages/i },
+            { name: 'Compiling TypeScript', weight: 10, pattern: /tsc|--skipLibCheck/i },
+            { name: 'Building web app', weight: 30, pattern: /next build|next\.config/i },
+            { name: 'Creating containers', weight: 10, pattern: /exporting to image|naming to|exporting layers/i },
+            { name: 'Starting services', weight: 10, pattern: /Container .*(Starting|Started|Healthy|Created)/i },
+        ];
+        let currentPhase = 0;
+        let phaseStartTime = Date.now();
+        function getProgress() {
+            let pct = 0;
+            for (let i = 0; i < currentPhase; i++)
+                pct += phases[i].weight;
+            // Add partial progress within current phase
+            if (currentPhase < phases.length) {
+                const elapsed = (Date.now() - phaseStartTime) / 1000;
+                const estimatedDuration = currentPhase === 1 ? 90 : currentPhase === 3 ? 100 : 30;
+                const partial = Math.min(0.9, elapsed / estimatedDuration);
+                pct += phases[currentPhase].weight * partial;
+            }
+            return Math.min(99, Math.round(pct));
+        }
+        function renderBar() {
+            const pct = getProgress();
+            const cols = process.stdout.columns || 80;
+            const barWidth = Math.min(20, Math.max(10, cols - 55));
+            const filled = Math.round((pct / 100) * barWidth);
+            const empty = barWidth - filled;
+            const bar = chalk_1.default.hex('#D97757')('█'.repeat(filled)) + chalk_1.default.gray('░'.repeat(empty));
             const elapsed = Math.floor((Date.now() - startTime) / 1000);
+            const phaseName = currentPhase < phases.length ? phases[currentPhase].name : 'Finishing';
             const frame = frames[frameIdx++ % frames.length];
-            const cols = process.stdout.columns || 80;
-            const line = `  ${chalk_1.default.hex('#D97757')(frame)} ${currentStep} ${chalk_1.default.gray(elapsed + 's')}`;
-            process.stdout.write(`\r\x1b[K${line.slice(0, cols - 1)}`);
+            const pctStr = String(pct).padStart(2);
+            return `  ${chalk_1.default.hex('#D97757')(frame)} ${bar} ${chalk_1.default.bold(pctStr + '%')} ${phaseName} ${chalk_1.default.gray('(' + elapsed + 's)')}`;
+        }
+        const spinnerInterval = setInterval(() => {
+            process.stdout.write(`\r\x1b[K${renderBar()}`);
         }, 80);
         let buf = '';
         const errorLines = [];
         const onData = (chunk) => {
-            buf += chunk.toString().replace(/\x1b\[[0-9;]*[a-zA-Z]/g, ''); // strip ANSI
+            buf += chunk.toString().replace(/\x1b\[[0-9;]*[a-zA-Z]/g, '');
             const lines = buf.split('\n');
             buf = lines.pop() ?? '';
             for (const raw of lines) {
                 const line = raw.trim();
                 if (!line)
                     continue;
-                // Extract meaningful step: "#5 [runner 3/6] RUN npm ci"
-                const stepMatch = /^#\d+\s+\[([^\]]+)\]\s+(.+)/.exec(line);
-                if (stepMatch) {
-                    currentStep = `${chalk_1.default.dim(stepMatch[1])} ${stepMatch[2].slice(0, 45)}`;
+                // Check if we've entered a new phase
+                for (let i = currentPhase + 1; i < phases.length; i++) {
+                    if (phases[i].pattern.test(line)) {
+                        // Print completed phases
+                        const elapsed = Math.floor((Date.now() - phaseStartTime) / 1000);
+                        process.stdout.write('\r\x1b[K');
+                        console.log('  ' + chalk_1.default.green('✓') + ' ' + phases[currentPhase].name + chalk_1.default.gray(` (${elapsed}s)`));
+                        // Skip intermediate phases
+                        for (let j = currentPhase + 1; j < i; j++) {
+                            console.log('  ' + chalk_1.default.green('✓') + ' ' + phases[j].name + chalk_1.default.gray(' (cached)'));
+                        }
+                        currentPhase = i;
+                        phaseStartTime = Date.now();
+                        break;
+                    }
                 }
                 if (/error/i.test(line))
                     errorLines.push(line);
@@ -428,33 +430,49 @@ function runDockerBuild(cwd, displayDir) {
             clearInterval(spinnerInterval);
             process.stdout.write('\r\x1b[K');
             if (code === 0) {
-                console.log('  ' + chalk_1.default.green('✓') + ' All services started');
-                resolve();
+                // Print any remaining phases as done
+                const elapsed = Math.floor((Date.now() - phaseStartTime) / 1000);
+                if (currentPhase < phases.length) {
+                    console.log('  ' + chalk_1.default.green('✓') + ' ' + phases[currentPhase].name + chalk_1.default.gray(` (${elapsed}s)`));
+                    for (let j = currentPhase + 1; j < phases.length; j++) {
+                        console.log('  ' + chalk_1.default.green('✓') + ' ' + phases[j].name);
+                    }
+                }
+                console.log('');
+                console.log('  ' + chalk_1.default.green('✓') + chalk_1.default.bold(' All services started'));
+                resolve(true);
                 return;
             }
+            console.log('  ' + chalk_1.default.red('✗') + ' Failed to start services');
+            console.log('');
             const allErrors = errorLines.join('\n').toLowerCase();
             if (allErrors.includes('no space left') || allErrors.includes('disk full')) {
-                console.log(chalk_1.default.yellow('  Docker is out of disk space.'));
-                console.log(chalk_1.default.gray('  Fix: docker system prune -a'));
+                console.log(chalk_1.default.yellow('  Cause: Docker is out of disk space.'));
+                console.log(chalk_1.default.gray('  Fix:   docker system prune -a'));
             }
             else if (allErrors.includes('port is already allocated') || allErrors.includes('address already in use')) {
                 const portMatch = /bind for .+:(\d+)/.exec(allErrors);
                 const port = portMatch ? portMatch[1] : 'a required port';
-                console.log(chalk_1.default.yellow(`  Port ${port} is already in use.`));
-                console.log(chalk_1.default.gray(`  Fix: stop the process on port ${port} and retry`));
+                console.log(chalk_1.default.yellow(`  Cause: Port ${port} is already in use.`));
+                console.log(chalk_1.default.gray(`  Fix:   stop the process on port ${port} and retry`));
             }
             else if (allErrors.includes('permission denied') || allErrors.includes('unauthorized')) {
-                console.log(chalk_1.default.yellow('  Docker permission denied — is Docker Desktop running?'));
+                console.log(chalk_1.default.yellow('  Cause: Docker permission denied — is Docker Desktop running?'));
             }
             else if (allErrors.includes('memory') || allErrors.includes('oom')) {
-                console.log(chalk_1.default.yellow('  Docker ran out of memory.'));
-                console.log(chalk_1.default.gray('  Fix: increase Docker Desktop memory to 4GB+ in Settings → Resources'));
+                console.log(chalk_1.default.yellow('  Cause: Docker ran out of memory.'));
+                console.log(chalk_1.default.gray('  Fix:   increase Docker Desktop memory to 4GB+ in Settings → Resources'));
+            }
+            else if (allErrors.includes('network') || allErrors.includes('timeout') || allErrors.includes('pull') || allErrors.includes('tls') || allErrors.includes('certificate')) {
+                console.log(chalk_1.default.yellow('  Cause: Network/TLS error — try restarting Docker Desktop.'));
             }
-            else if (allErrors.includes('network') || allErrors.includes('timeout') || allErrors.includes('pull')) {
-                console.log(chalk_1.default.yellow('  Network error while pulling images — check your connection and retry.'));
+            else if (errorLines.length > 0) {
+                console.log(chalk_1.default.gray('  Error details:'));
+                errorLines.slice(-5).forEach(l => console.log(chalk_1.default.red('    ' + l)));
             }
+            console.log('');
             console.log(chalk_1.default.gray(`  To retry: cd ${displayDir} && docker compose up -d --build`));
-            resolve();
+            resolve(false);
         });
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "slackhive",
-  "version": "0.1.33",
+  "version": "0.1.35",
   "description": "CLI to install and manage SlackHive — AI agent teams on Slack",
   "bin": {
     "slackhive": "./dist/index.js"