maistro 1.0.402 → 1.0.410

package/dist/app.js

@@ -2,20 +2,22 @@ import { resolve, basename, extname, join } from 'node:path';
 import { existsSync, mkdirSync, writeFileSync } from 'node:fs';
 import { readFile } from 'node:fs/promises';
 import { homedir } from 'node:os';
-import { exec } from 'node:child_process';
+import { exec, spawn } from 'node:child_process';
 import { Orchestrator } from './orchestrator.js';
 import { InteractiveUI, formatTaskStatus, formatTaskStatusIcon, formatStatusName, formatBlockedStatus, progressBar } from './ui.js';
 import { refinePlan, generateReadme, discoverRequirements, buildProjectContext, formatContextForDecomposition, detectDependencies } from './planner.js';
 import { isTaskBlocked } from './taskQueue.js';
-import { isClaudeCodeInstalled, isClaudeCodeAuthenticated, testClaudeInteraction, launchClaudeLogin, } from './config.js';
+import { isClaudeCodeInstalled, isClaudeCodeAuthenticated, testClaudeInteraction, launchClaudeLogin, loadConfig, saveConfig, } from './config.js';
 import { initLogger, getLogger } from './logger.js';
 import { VERSION } from './version.js';
+import { buildHeaderWithLogo } from './logo.js';
 import { addImageFromFile, addImageFromUrl, addImageFromPaste, getImages, deleteImage, looksLikeImagePath, looksLikeImageUrl, formatImageSize, sanitizeImageId, generatePasteImageId, extractImageUrls, processDescriptionImageUrls, } from './imageManager.js';
 import { InputBox, getDisplayWidth, charIndexAtDisplayColumn } from './inputBox.js';
 import { startCaffeinate, stopCaffeinate, isCaffeinateAvailable } from './caffeinate.js';
 import { getPreventSleep, setPreventSleep, getConfigPath, detectTerminal, getShiftEnterEnabled, setShiftEnterEnabled, configureTerminalShiftEnter, removeTerminalShiftEnter, getNewlineHint, getCmdVPasteEnabled, setCmdVPasteEnabled, configureTerminalCmdVPaste, removeTerminalCmdVPaste, getCmdVPasteInstructions, } from './config.js';
 import { hasClipboardImage, saveClipboardImage, cleanupTempImage } from './clipboard.js';
-import { isGitRepo } from './git.js';
+import { isGitRepo, ensureEnvInGitignore } from './git.js';
+import { validateApiKeys } from './apiKeyValidator.js';
 import { UI, TipsManager } from './constants.js';
 import { getUpdateNotice, checkForUpdates, performUpdate, isAutoUpdatePromptEnabled, isAutoUpdateEnabled, } from './versionCheck.js';
 /**
@@ -226,8 +228,9 @@ export class MaistroApp {
             await this.handleUpdateCheck();
         }
         // Run doctor check on every startup (skip if MAISTRO_SKIP_DOCTOR is set)
+        // Pass fullCheck=false to skip interaction test if it has already passed once
         if (!process.env.MAISTRO_SKIP_DOCTOR) {
-            const configured = await this.handleDoctor();
+            const configured = await this.handleDoctor(false);
             if (!configured) {
                 getLogger()?.info('Exit: not configured');
                 getLogger()?.session('end');
@@ -312,8 +315,8 @@ export class MaistroApp {
             console.log('\x1b[90mAuto-updating...\x1b[0m');
             const updateResult = await performUpdate();
             if (updateResult.success) {
-                console.log(`\x1b[32m✓ Updated successfully!\x1b[0m`);
-                console.log(`\x1b[90mPlease restart maistro to use the new version.\x1b[0m\n`);
+                this.restartAfterUpdate();
+                return; // Won't reach here, but for clarity
             }
             else {
                 console.log(`\x1b[31m✗ Update failed: ${updateResult.error}\x1b[0m`);
@@ -333,8 +336,8 @@ export class MaistroApp {
         }
         // Prompt user to update
         const choice = await this.ui.quickPick([
+            { key: 'yes', label: 'Yes', description: 'Update and restart automatically' },
             { key: 'no', label: 'No', description: 'Continue with current version' },
-            { key: 'yes', label: 'Yes', description: 'Run npm update -g maistro' },
         ], 'Update now?');
         if (choice !== 'yes') {
             console.log('\x1b[90mContinuing with current version...\x1b[0m\n');
@@ -343,18 +346,49 @@ export class MaistroApp {
         console.log('\n\x1b[90mUpdating...\x1b[0m');
         const updateResult = await performUpdate();
         if (updateResult.success) {
-            console.log(`\x1b[32m✓ Updated successfully!\x1b[0m`);
-            console.log(`\x1b[90mPlease restart maistro to use the new version.\x1b[0m\n`);
+            this.restartAfterUpdate();
+            return; // Won't reach here, but for clarity
         }
         else {
             console.log(`\x1b[31m✗ Update failed: ${updateResult.error}\x1b[0m`);
             console.log(`\x1b[90mContinuing with current version...\x1b[0m\n`);
         }
     }
+    /**
+     * Restart maistro after update by spawning a new process and exiting
+     */
+    restartAfterUpdate() {
+        console.log(`\x1b[32m✓ Updated successfully!\x1b[0m`);
+        console.log(`\x1b[90mRestarting maistro...\x1b[0m\n`);
+        // Get the original command arguments (skip node and script path)
+        const args = process.argv.slice(2);
+        // Spawn new maistro process with same arguments
+        // Use stdio: 'inherit' so the new process takes over the terminal
+        const child = spawn(process.argv[0], [process.argv[1], ...args], {
+            stdio: 'inherit',
+            detached: false,
+            env: {
+                ...process.env,
+                // Skip update check on restart to avoid infinite loop
+                MAISTRO_SKIP_UPDATE_CHECK: '1',
+            },
+        });
+        // Exit current process once child starts
+        child.on('spawn', () => {
+            process.exit(0);
+        });
+        // If spawn fails, exit with error
+        child.on('error', (err) => {
+            console.error(`\x1b[31m✗ Failed to restart: ${err.message}\x1b[0m`);
+            console.log(`\x1b[90mPlease restart maistro manually.\x1b[0m\n`);
+            process.exit(1);
+        });
+    }
     /**
      * Run doctor check - verify Claude Code CLI installation and authentication
+     * @param fullCheck - If true, always run interaction test (step 3). If false, skip if already passed once.
      */
-    async handleDoctor() {
+    async handleDoctor(fullCheck = true) {
         console.log('\n\x1b[1m── Doctor ──\x1b[0m\n');
         // Step 1: Check Claude Code CLI
         console.log('\x1b[36m1.\x1b[0m Checking Claude Code CLI...');
@@ -380,6 +414,14 @@ export class MaistroApp {
         }
         console.log('   \x1b[32m✓ Claude Code authenticated\x1b[0m');
         // Step 3: Test Claude Code interaction (with tool use)
+        // Skip if: not a full check AND interaction test has passed before
+        const config = loadConfig();
+        const skipInteractionTest = !fullCheck && config.interactionTestPassed === true;
+        if (skipInteractionTest) {
+            console.log('\n\x1b[32m✓ All checks passed!\x1b[0m');
+            console.log('\x1b[90mMaistro uses Claude Code CLI with your subscription for all operations.\x1b[0m\n');
+            return true;
+        }
         console.log('\n\x1b[36m3.\x1b[0m Testing Claude Code interaction...');
         const interactionTest = await testClaudeInteraction();
         if (!interactionTest.success) {
@@ -406,6 +448,11 @@ export class MaistroApp {
             }
             return false;
         }
+        // Cache successful interaction test
+        saveConfig({
+            ...config,
+            interactionTestPassed: true,
+        });
         console.log('   \x1b[32m✓ Claude Code interaction working\x1b[0m');
         console.log('\n\x1b[32m✓ All checks passed!\x1b[0m');
         console.log('\x1b[90mMaistro uses Claude Code CLI with your subscription for all operations.\x1b[0m\n');
@@ -664,7 +711,7 @@ export class MaistroApp {
         });
         if (skipChoice === 's' || skipChoice === null) {
             // Even when skipping discovery, still check for dependencies
-            await this.handleDependencyDetection();
+            await this.handleDependencyDetection(goal);
             return null; // Skip discovery
         }
         // Show analyzing screen with spinner
@@ -681,7 +728,7 @@ export class MaistroApp {
             console.log('\x1b[90mProceeding with direct planning...\x1b[0m\n');
             await new Promise(r => setTimeout(r, 1500));
             // Still check for dependencies even when discovery fails
-            await this.handleDependencyDetection();
+            await this.handleDependencyDetection(goal);
             return null;
         }
         // Ask each question one at a time (full-screen for each)
@@ -698,7 +745,7 @@ export class MaistroApp {
             answers[question.id] = answer;
         }
         // Run dependency detection after discovery questions
-        const depResult = await this.handleDependencyDetection();
+        const depResult = await this.handleDependencyDetection(goal);
         if (depResult === null) {
             // User cancelled during dependency collection
             return null;
@@ -894,15 +941,16 @@ export class MaistroApp {
     }
     /**
      * Detect and collect missing external dependencies
+     * @param goal - The user's goal text to detect mentioned dependencies
      * Returns the collected values or null if user cancelled
      */
-    async handleDependencyDetection() {
+    async handleDependencyDetection(goal) {
         // Show scanning screen with spinner
         this.ui.clear();
         this.showHeader();
         console.log('\x1b[1m── Scanning for Dependencies ──\x1b[0m\n');
         const spinner = this.ui.spinner('Scanning project for external dependencies...');
-        const result = await detectDependencies(this.projectPath);
+        const result = await detectDependencies(this.projectPath, goal);
         spinner.stop();
         if (result.dependencies.length === 0) {
             console.log('\x1b[90mNo external dependencies detected.\x1b[0m\n');
@@ -986,12 +1034,102 @@ export class MaistroApp {
                 collectedValues[dep.id] = value.trim();
             }
         }
-        // Save collected values to .env file
+        // Validate and save collected values
         if (Object.keys(collectedValues).length > 0) {
-            await this.saveDependenciesToEnv(collectedValues);
+            const validationResult = await this.validateCollectedKeys(collectedValues, missing);
+            if (validationResult === 'cancel') {
+                return null;
+            }
+            // validationResult contains the final values (possibly updated after retries)
+            await this.saveDependenciesToEnv(validationResult);
+            return validationResult;
         }
         return collectedValues;
     }
+    /**
+     * Validate collected API keys against their respective services
+     * Returns the validated values (possibly updated after retries), or 'cancel' if user cancelled
+     */
+    async validateCollectedKeys(values, deps) {
+        let currentValues = { ...values };
+        let validationResults;
+        // Validation loop - allows retrying failed keys
+        while (true) {
+            // Show validation spinner
+            this.ui.clear();
+            this.showHeader();
+            console.log('\x1b[1m── Validating Credentials ──\x1b[0m\n');
+            const spinner = this.ui.spinner('Validating API keys...');
+            validationResults = await validateApiKeys(currentValues, { timeout: 5000 });
+            spinner.stop();
+            // Display results
+            this.ui.clear();
+            this.showHeader();
+            console.log('\x1b[1m── Validation Results ──\x1b[0m\n');
+            for (const [envVar, result] of Object.entries(validationResults.results)) {
+                const dep = deps.find(d => d.id === envVar);
+                const name = dep?.name || envVar;
+                if (result.valid) {
+                    console.log(`\x1b[32m✓\x1b[0m ${name}`);
+                    if (result.skipped) {
+                        console.log(`  \x1b[90m(${result.message})\x1b[0m`);
+                    }
+                }
+                else {
+                    console.log(`\x1b[31m✗\x1b[0m ${name}`);
+                    console.log(`  \x1b[90m${result.error || result.message}\x1b[0m`);
+                }
+            }
+            console.log('');
+            // If all passed, continue
+            if (validationResults.allPassed) {
+                await new Promise(r => setTimeout(r, 1000));
+                return currentValues;
+            }
+            // Some validations failed - offer choices
+            const choice = await this.ui.quickPick([
+                { key: 'r', label: 'Retry failed', description: 'Re-enter values for failed keys' },
+                { key: 's', label: 'Save anyway', description: 'Save values despite validation failure' },
+                { key: 'c', label: 'Cancel', description: 'Discard all values' },
+            ], 'Some validations failed. What would you like to do?', undefined, { showInput: false });
+            if (choice === 'c' || choice === null) {
+                return 'cancel';
+            }
+            if (choice === 's') {
+                return currentValues;
+            }
+            // choice === 'r' - retry failed keys
+            const failedKeys = Object.entries(validationResults.results)
+                .filter(([, result]) => !result.valid)
+                .map(([key]) => key);
+            for (const envVar of failedKeys) {
+                const dep = deps.find(d => d.id === envVar);
+                if (!dep)
+                    continue;
+                // Build instructions string
+                let instructions = '';
+                if (dep.obtainInstructions) {
+                    instructions += `\n\n\x1b[90m${dep.obtainInstructions}\x1b[0m`;
+                }
+                if (dep.obtainUrl) {
+                    instructions += `\n\x1b[90m→ ${dep.obtainUrl}\x1b[0m`;
+                }
+                if (dep.valueFormat) {
+                    instructions += `\n\x1b[90mFormat: ${dep.valueFormat}\x1b[0m`;
+                }
+                const value = await this.fullScreenTextInput({
+                    title: 'Retry Failed Key',
+                    subtitle: `Re-enter value for \x1b[1m${dep.name}\x1b[0m${instructions}`,
+                    placeholder: dep.valueFormat || 'enter value...',
+                    hint: 'Enter to continue, Esc to skip',
+                    initialValue: currentValues[envVar],
+                });
+                if (value !== null && value.trim()) {
+                    currentValues[envVar] = value.trim();
+                }
+            }
+        }
+    }
     /**
      * Save collected dependency values to .env file
      */
@@ -1029,6 +1167,11 @@ export class MaistroApp {
         }
         try {
             writeFileSync(envPath, envContent);
+            // Ensure .env is in .gitignore to prevent accidental commit of secrets
+            const gitignoreResult = await ensureEnvInGitignore(this.projectPath);
+            if (gitignoreResult.success && gitignoreResult.output.includes('Added')) {
+                console.log(`\x1b[32m✓ Added .env to .gitignore\x1b[0m`);
+            }
             console.log(`\x1b[32m✓ Saved ${Object.keys(values).length} ${Object.keys(values).length === 1 ? 'value' : 'values'} to .env\x1b[0m\n`);
         }
         catch (err) {
@@ -1052,15 +1195,10 @@ export class MaistroApp {
     }
     showHeader() {
         const versionStr = `v${VERSION}`;
-        // Center the version string within the box (37 chars inner width)
-        const padding = Math.max(0, Math.floor((35 - versionStr.length) / 2));
-        const paddedVersion = ' '.repeat(padding) + versionStr + ' '.repeat(35 - padding - versionStr.length);
-        console.log('\n\x1b[1m\x1b[36m╭─────────────────────────────────────╮\x1b[0m');
-        console.log('\x1b[1m\x1b[36m│\x1b[0m            \x1b[1mM A I S T R O\x1b[0m            \x1b[1m\x1b[36m│\x1b[0m');
-        console.log('\x1b[1m\x1b[36m│\x1b[0m  \x1b[90mClaude Code Orchestration Maestro\x1b[0m  \x1b[1m\x1b[36m│\x1b[0m');
-        console.log(`\x1b[1m\x1b[36m│\x1b[0m \x1b[90m${paddedVersion}\x1b[0m \x1b[1m\x1b[36m│\x1b[0m`);
-        console.log('\x1b[1m\x1b[36m╰─────────────────────────────────────╯\x1b[0m\n');
-        console.log(`\x1b[90mProject: ${this.projectPath}\x1b[0m\n`);
+        const headerLines = buildHeaderWithLogo(versionStr, this.projectPath);
+        for (const line of headerLines) {
+            console.log(line);
+        }
     }
     /**
      * Render plan view content (header, progress, tasks, commands)
@@ -2286,23 +2424,28 @@ export class MaistroApp {
             console.log(`  ${line}`);
         });
         console.log('');
-        // Acceptance criteria with pass/fail status
-        if (task.acceptanceCriteria && task.acceptanceCriteria.length > 0) {
+        // Acceptance criteria with pass/fail status (includes code quality as implicit criterion)
+        if (task.acceptanceCriteriaResults && task.acceptanceCriteriaResults.length > 0) {
             console.log(`\x1b[90mAcceptance Criteria:\x1b[0m`);
-            task.acceptanceCriteria.forEach((criterion, i) => {
-                // Check if we have validation results
-                const result = task.acceptanceCriteriaResults?.find(r => r.criterion === criterion);
-                let statusIcon = '\x1b[90m○\x1b[0m'; // Not yet validated
-                if (result) {
-                    statusIcon = result.passed ? '\x1b[32m✓\x1b[0m' : '\x1b[31m✗\x1b[0m';
-                }
-                console.log(`  ${statusIcon} ${i + 1}. ${criterion}`);
-                if (result && !result.passed && result.explanation) {
+            task.acceptanceCriteriaResults.forEach((result, i) => {
+                const statusIcon = result.passed ? '\x1b[32m✓\x1b[0m' : '\x1b[31m✗\x1b[0m';
+                console.log(`  ${statusIcon} ${i + 1}. ${result.criterion}`);
+                if (!result.passed && result.explanation) {
                     console.log(`     \x1b[31m↳ ${result.explanation}\x1b[0m`);
                 }
             });
             console.log('');
         }
+        else if (task.acceptanceCriteria && task.acceptanceCriteria.length > 0) {
+            // Show acceptance criteria without results (not yet validated)
+            console.log(`\x1b[90mAcceptance Criteria:\x1b[0m`);
+            task.acceptanceCriteria.forEach((criterion, i) => {
+                console.log(`  \x1b[90m○\x1b[0m ${i + 1}. ${criterion}`);
+            });
+            // Code quality is always checked as implicit criterion
+            console.log(`  \x1b[90m○\x1b[0m ${task.acceptanceCriteria.length + 1}. Code Quality: No debugging code, no copy/paste issues, no code smells`);
+            console.log('');
+        }
         // Result summary for completed tasks
         if (isCompleted && task.resultSummary) {
             console.log(`\x1b[32m── Result Summary ──\x1b[0m\n`);
@@ -2784,7 +2927,7 @@ export class MaistroApp {
      * Uses virtual screen approach: keeps state in memory, full clear+redraw on every change
      */
     async fullScreenTextInput(options) {
-        const { title, subtitle, placeholder = 'type your answer...', hint = 'Enter to continue, Esc to cancel' } = options;
+        const { title, subtitle, placeholder = 'type your answer...', hint = 'Enter to continue, Esc to cancel', initialValue } = options;
         // Build header lines
         const { buildMaistroHeader, simpleTextInput } = await import('./screen.js');
         const headerLines = buildMaistroHeader(`v${VERSION}`, this.projectPath);
@@ -2794,6 +2937,7 @@ export class MaistroApp {
             subtitle,
             placeholder,
             hint,
+            initialValue,
         });
         return result;
     }
@@ -3924,7 +4068,7 @@ ${detection.projectContext}`;
         });
     }
     /**
-     * Handle clear plan command - clears goal and all tasks, keeps logs
+     * Handle clear plan command - clears goal, all tasks, and logs
      * Returns true if plan was cleared and should return to init flow
      */
     async handleClearPlan() {
@@ -3945,8 +4089,9 @@ ${detection.projectContext}`;
             const truncatedGoal = goal.length > 60 ? goal.slice(0, 57) + '...' : goal;
             console.log(`  • Goal: \x1b[33m${truncatedGoal}\x1b[0m`);
         }
-        console.log(`  • ${tasks.length} task${tasks.length !== 1 ? 's' : ''}\n`);
-        console.log('\x1b[90mLogs and images will be preserved.\x1b[0m\n');
+        console.log(`  • ${tasks.length} task${tasks.length !== 1 ? 's' : ''}`);
+        console.log(`  • All task logs\n`);
+        console.log('\x1b[90mImages will be preserved.\x1b[0m\n');
         const choice = await this.ui.quickPick([
             { key: 'clear', label: 'Clear plan' },
             { key: 'cancel', label: 'Cancel' },
@@ -3954,7 +4099,7 @@ ${detection.projectContext}`;
         if (choice === 'clear') {
             const result = await orchestrator.clearPlan();
             if (result.success) {
-                console.log('\n\x1b[32m✓ Plan cleared\x1b[0m\n');
+                console.log('\n\x1b[32m✓ Plan and logs cleared\x1b[0m\n');
                 await this.ui.waitForKey('Press any key to continue...');
                 return true;
             }
@@ -4625,9 +4770,6 @@ ${detection.projectContext}`;
         let editTaskFlag = false;
         let editTaskIndex = -1;
         let taskEditWarning = null;
-        // Track task completion for notifications
-        let lastCompletedTaskId = null;
-        let taskCompletionNotification = null;
         // Render function
         const render = async () => {
             needsRender = false;
@@ -4664,10 +4806,6 @@ ${detection.projectContext}`;
                 hint = taskEditWarning;
                 hintColor = '\x1b[33m';
             }
-            else if (taskCompletionNotification) {
-                hint = taskCompletionNotification;
-                hintColor = '\x1b[32m';
-            }
             else {
                 hint = 'Esc pause · ↑↓ navigate · Enter details · e edit';
                 hintColor = '\x1b[90m';
@@ -4837,19 +4975,11 @@ ${detection.projectContext}`;
                         this.executionState.lastCompletedTask = task;
                     }
                 }
-                // Show notification if user is browsing other tasks
-                if (userNavigated && this.selectedTaskIndex !== tasks.findIndex(t => t.id === task.id)) {
-                    const status = success ? '✓' : '✗';
-                    taskCompletionNotification = `${status} Task completed: ${task.title.slice(0, 30)}${task.title.length > 30 ? '...' : ''}`;
-                    lastCompletedTaskId = task.id;
+                // Always move cursor to the completed task so user sees the summary
+                const completedTaskIndex = tasks.findIndex(t => t.id === task.id);
+                if (completedTaskIndex >= 0) {
+                    this.selectedTaskIndex = completedTaskIndex;
                     needsRender = true;
-                    // Clear notification after 3 seconds
-                    setTimeout(() => {
-                        if (lastCompletedTaskId === task.id) {
-                            taskCompletionNotification = null;
-                            needsRender = true;
-                        }
-                    }, 3000);
                 }
             },
             onOutput: (line) => {