maistro 1.0.422 → 1.0.448

package/dist/app.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"AAiOA,qBAAa,UAAU;IACrB,OAAO,CAAC,EAAE,CAAgB;IAC1B,OAAO,CAAC,YAAY,CAA6B;IACjD,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,aAAa,CAAS;IAG9B,OAAO,CAAC,cAAc,CAA+B;gBAEzC,WAAW,GAAE,MAAY;IAsBrC,OAAO,CAAC,eAAe;IASvB;;;OAGG;YACW,qBAAqB;IA+CnC;;OAEG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAyG5B;;;OAGG;YACW,iBAAiB;IA8D/B;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAgC1B;;;OAGG;IACG,YAAY,CAAC,SAAS,UAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAqFtD;;;OAGG;YACW,iBAAiB;IAwD/B;;OAEG;YACW,sBAAsB;IAsCpC;;;OAGG;YACW,iBAAiB;IAoB/B;;;OAGG;YACW,oBAAoB;IAkClC;;OAEG;YACW,qBAAqB;IA4BnC;;OAEG;YACW,gBAAgB;IAoB9B;;;OAGG;YACW,qBAAqB;IAoEnC;;;OAGG;YACW,eAAe;IAyH7B;;;OAGG;YACW,uBAAuB;IAyErC;;OAEG;YACW,4BAA4B;IAiE1C;;OAEG;YACW,oBAAoB;IAgElC;;;;OAIG;YACW,yBAAyB;IAgIvC;;;OAGG;YACW,qBAAqB;IAmHnC;;OAEG;IACH,OAAO,CAAC,sBAAsB;IAW9B;;OAEG;YACW,mBAAmB;IA0BjC;;OAEG;YACW,qBAAqB;IAiDnC;;OAEG;IACH,OAAO,CAAC,cAAc;IAatB,OAAO,CAAC,UAAU;IAQlB;;;;;;OAMG;IACH,OAAO,CAAC,qBAAqB;IA0J7B,OAAO,CAAC,iBAAiB,CAAM;IAC/B,OAAO,CAAC,gBAAgB,CAAK;IAE7B;;;OAGG;YACW,YAAY;IAoS1B;;;OAGG;IACH,OAAO,CAAC,gBAAgB;IA2CxB;;OAEG;YACW,aAAa;IA2lB3B;;;OAGG;YACW,iBAAiB;IAgI/B;;OAEG;YACW,cAAc;IAwU5B,OAAO,CAAC,YAAY,CAAgB;IACpC,OAAO,CAAC,YAAY,CAAM;IAC1B,OAAO,CAAC,aAAa,CAAS;IAE9B;;OAEG;YACW,gBAAgB;IAkB9B;;OAEG;YACW,gBAAgB;IAe9B;;;OAGG;YACW,WAAW;IAsEzB;;;OAGG;YACW,mBAAmB;IA8BjC;;;OAGG;YACW,cAAc;IAkB5B;;;;OAIG;YACW,6BAA6B;IAqI3C;;;OAGG;YACW,aAAa;IA+B3B;;;;OAIG;YACW,sBAAsB;IA4LpC;;;;OAIG;YACW,sBAAsB;YA0GtB,UAAU;IA4HxB,OAAO,CAAC,YAAY;IAiEpB;;;OAGG;YACW,eAAe;IAqD7B;;OAEG;YACW,cAAc;IAsO5B;;OAEG;YACW,oBAAoB;IAwBlC;;OAEG;YACW,eAAe;IAU7B;;OAEG;YACW,wBAAwB;YAsBxB,gBAAgB;IA4B9B,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAsD;IAEpF;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAoB3B;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAO1B;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAS1B;;OAEG;IACH,OAAO,CAAC,iBAAiB;IAKzB;;OAEG;IACH,OAAO,CAAC,oBAAoB;IAqB5B;;OAEG;IACH,OAAO,CAAC,uBAAuB;IAQ/B;;OAEG;IACH,OAAO,CAAC,eAAe;IASvB;;OAEG;IACH,OAAO,CAAC,sBAAsB;YAoEhB,SAAS;YAiIT,sBAAsB;CAgbrC"}
+{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"AAiOA,qBAAa,UAAU;IACrB,OAAO,CAAC,EAAE,CAAgB;IAC1B,OAAO,CAAC,YAAY,CAA6B;IACjD,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,aAAa,CAAS;IAG9B,OAAO,CAAC,cAAc,CAA+B;gBAEzC,WAAW,GAAE,MAAY;IAsBrC,OAAO,CAAC,eAAe;IASvB;;;OAGG;YACW,qBAAqB;IA+CnC;;OAEG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAyG5B;;;OAGG;YACW,iBAAiB;IA8D/B;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAuC1B;;;OAGG;IACG,YAAY,CAAC,SAAS,UAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAqFtD;;;OAGG;YACW,iBAAiB;IAwD/B;;OAEG;YACW,sBAAsB;IAsCpC;;;OAGG;YACW,iBAAiB;IAoB/B;;;OAGG;YACW,oBAAoB;IAkClC;;OAEG;YACW,qBAAqB;IA4BnC;;OAEG;YACW,gBAAgB;IAoB9B;;;OAGG;YACW,qBAAqB;IAoEnC;;;OAGG;YACW,eAAe;IAyH7B;;;OAGG;YACW,uBAAuB;IAyErC;;OAEG;YACW,4BAA4B;IAiE1C;;OAEG;YACW,oBAAoB;IAgElC;;;;OAIG;YACW,yBAAyB;IAgIvC;;;OAGG;YACW,qBAAqB;IAmHnC;;OAEG;IACH,OAAO,CAAC,sBAAsB;IAW9B;;OAEG;YACW,mBAAmB;IA0BjC;;OAEG;YACW,qBAAqB;IAiDnC;;OAEG;IACH,OAAO,CAAC,cAAc;IAatB,OAAO,CAAC,UAAU;IAQlB;;;;;;OAMG;IACH,OAAO,CAAC,qBAAqB;IA2J7B,OAAO,CAAC,iBAAiB,CAAM;IAC/B,OAAO,CAAC,gBAAgB,CAAK;IAE7B;;;OAGG;YACW,YAAY;IAqT1B;;;OAGG;IACH,OAAO,CAAC,gBAAgB;IA2CxB;;OAEG;YACW,aAAa;IAsmB3B;;;OAGG;YACW,iBAAiB;IAgI/B;;OAEG;YACW,cAAc;IAwU5B,OAAO,CAAC,YAAY,CAAgB;IACpC,OAAO,CAAC,YAAY,CAAM;IAC1B,OAAO,CAAC,aAAa,CAAS;IAE9B;;OAEG;YACW,gBAAgB;IAkB9B;;OAEG;YACW,gBAAgB;IAe9B;;;OAGG;YACW,WAAW;IAsEzB;;;OAGG;YACW,mBAAmB;IA8BjC;;;OAGG;YACW,cAAc;IAkB5B;;;;OAIG;YACW,6BAA6B;IAqI3C;;;OAGG;YACW,aAAa;IA+B3B;;;;OAIG;YACW,sBAAsB;IAwPpC;;;;OAIG;YACW,sBAAsB;YA0GtB,UAAU;IA4HxB,OAAO,CAAC,YAAY;IAmFpB;;;OAGG;YACW,eAAe;IAqD7B;;OAEG;YACW,cAAc;IAsO5B;;OAEG;YACW,oBAAoB;IAwBlC;;OAEG;YACW,eAAe;IAU7B;;OAEG;YACW,wBAAwB;YAsBxB,gBAAgB;IA4B9B,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAsD;IAEpF;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAoB3B;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAO1B;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAS1B;;OAEG;IACH,OAAO,CAAC,iBAAiB;IAKzB;;OAEG;IACH,OAAO,CAAC,oBAAoB;IAqB5B;;OAEG;IACH,OAAO,CAAC,uBAAuB;IAQ/B;;OAEG;IACH,OAAO,CAAC,eAAe;IASvB;;OAEG;IACH,OAAO,CAAC,sBAAsB;YAoEhB,SAAS;YAiIT,sBAAsB;CAkcrC"}

package/dist/app.js

@@ -13,7 +13,7 @@ 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 { startCaffeinate, stopCaffeinate, isCaffeinateAvailable, isCaffeinateRunning } 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, ensureEnvInGitignore } from './git.js';
@@ -371,6 +371,8 @@ export class MaistroApp {
     restartAfterUpdate() {
         console.log(`\x1b[32m✓ Updated successfully!\x1b[0m`);
         console.log(`\x1b[90mRestarting maistro...\x1b[0m\n`);
+        // Ensure terminal is in a clean state before spawning
+        this.ui.disableRawMode();
         // Get the original command arguments (skip node and script path)
         const args = process.argv.slice(2);
         // Spawn new maistro process with same arguments
@@ -384,9 +386,13 @@ export class MaistroApp {
                 MAISTRO_SKIP_UPDATE_CHECK: '1',
             },
         });
-        // Exit current process once child starts
+        // Exit current process after a delay to let child fully attach to terminal
+        // The 'spawn' event fires early, before stdio is fully inherited.
+        // Exiting too quickly can cause EIO errors when the child tries to use stdin.
         child.on('spawn', () => {
-            process.exit(0);
+            setTimeout(() => {
+                process.exit(0);
+            }, 200);
         });
         // If spawn fails, exit with error
         child.on('error', (err) => {
@@ -1308,7 +1314,7 @@ export class MaistroApp {
         if (this.executionState?.isExecuting) {
             this.renderExecutionSection(termWidth);
         }
-        // Show progress bar with total duration
+        // Show progress bar with total duration and caffeinate indicator
         // Calculate total duration: completed tasks + current task elapsed (if executing)
         const completedDurationMs = tasks.reduce((sum, t) => sum + (t.durationMs || 0), 0);
         const currentTaskElapsedMs = this.executionState?.isExecuting
@@ -1316,7 +1322,8 @@ export class MaistroApp {
             : 0;
         const totalDurationMs = completedDurationMs + currentTaskElapsedMs;
         const durationStr = totalDurationMs > 0 ? ` • ${this.formatDuration(totalDurationMs)}` : '';
-        console.log(`${progressBar(status.tasks.completed, status.tasks.total, 30, status.tasks.skipped)}${durationStr}\n`);
+        const mainCaffeinateIndicator = isCaffeinateRunning() ? '  \x1b[33m☕ caffeinating\x1b[0m' : '';
+        console.log(`${progressBar(status.tasks.completed, status.tasks.total, 30, status.tasks.skipped)}${durationStr}${mainCaffeinateIndicator}\n`);
         // Calculate viewport for tasks
         const termRows = process.stdout.rows || 24;
         // Fixed overhead: header(~7) + progress(2) + position indicator(1) + failed section(variable) + commands(2) + input(4 base) + margins
@@ -1356,7 +1363,7 @@ export class MaistroApp {
             }
             // Get visible slice of tasks
             const visibleTasks = tasks.slice(this.taskScrollOffset, this.taskScrollOffset + maxVisibleTasks);
-            this.displayTasks(visibleTasks, this.taskScrollOffset, selectedIndex, tasks);
+            this.displayTasks(visibleTasks, this.taskScrollOffset, selectedIndex, tasks, this.executionState?.phase);
             // Show scroll down indicator
             const belowCount = totalTasks - this.taskScrollOffset - visibleTasks.length;
             if (belowCount > 0) {
@@ -1485,12 +1492,31 @@ export class MaistroApp {
             const availableRows = Math.max(6, termRows - fixedOverhead);
             const maxVisibleTasks = Math.min(UI.MAX_VISIBLE_TASKS, Math.max(UI.MIN_VISIBLE_TASKS, Math.floor(availableRows / UI.LINES_PER_TASK)));
             // Auto-scroll to first relevant task if no manual selection yet
-            // Priority: executing task > first pending task > last task
+            // Priority: last completed task (to show summary) > first pending task > last task
             const executingTaskIndex = tasks.findIndex(t => t.status === 'in_progress');
             const firstPendingIndex = tasks.findIndex(t => t.status === 'pending');
             if (this.selectedTaskIndex === -1) {
-                if (executingTaskIndex >= 0) {
-                    this.selectedTaskIndex = executingTaskIndex;
+                if (executingTaskIndex > 0) {
+                    // When a task is executing, select the last completed task before it
+                    // This allows users to see the achievement summary
+                    let lastCompletedIndex = -1;
+                    for (let i = executingTaskIndex - 1; i >= 0; i--) {
+                        if (tasks[i].status === 'completed') {
+                            lastCompletedIndex = i;
+                            break;
+                        }
+                    }
+                    if (lastCompletedIndex >= 0) {
+                        this.selectedTaskIndex = lastCompletedIndex;
+                    }
+                    else {
+                        // No completed task before executing one, select executing task
+                        this.selectedTaskIndex = executingTaskIndex;
+                    }
+                }
+                else if (executingTaskIndex === 0) {
+                    // First task is executing, select it
+                    this.selectedTaskIndex = 0;
                 }
                 else if (firstPendingIndex >= 0) {
                     // Default to first pending task - shows what's next to be done
@@ -2010,6 +2036,16 @@ export class MaistroApp {
                     }, 50);
                     return;
                 }
+                // Partial CSI sequence (ESC [) - wait for final character(s)
+                // This handles cases where escape sequences arrive character-by-character (e.g., in PTY tests)
+                if (key === '\x1b[' || (key.startsWith('\x1b[') && key.length < 4 && !/[A-Za-z~]$/.test(key))) {
+                    escapeBuffer = key;
+                    escapeTimeout = setTimeout(() => {
+                        // Timeout - discard partial sequence
+                        escapeBuffer = '';
+                    }, 50);
+                    return;
+                }
                 // Clear escape pending states on any other input
                 if ((escPendingClear || escPendingPause) && key !== '\x1b') {
                     if (escTimeout) {
@@ -3156,6 +3192,30 @@ export class MaistroApp {
         if (!hasOutput && result.response) {
             console.log(`${result.response}\n`);
         }
+        // Check for structured questions first (from new JSON format)
+        if (result.questions && result.questions.length > 0) {
+            // Use the existing discovery question UI to present questions
+            const answers = {};
+            const totalQuestions = result.questions.length;
+            for (let i = 0; i < result.questions.length; i++) {
+                const question = result.questions[i];
+                const answer = await this.askDiscoveryQuestionRequired(question, i + 1, totalQuestions, '' // No summary needed for plan refinement
+                );
+                if (answer === null) {
+                    // User cancelled - return to main view
+                    return null;
+                }
+                answers[question.id] = answer;
+            }
+            // Format answers as full text and continue conversation
+            const answerText = Object.entries(answers)
+                .map(([id, value]) => {
+                const q = result.questions.find(q => q.id === id);
+                return `${q?.question || id}: ${value}`;
+            })
+                .join('\n');
+            return this.handleInlineDiscussion(answerText, currentTasks, goal);
+        }
         // Return updated tasks if any (or null if no changes)
         if (result.updatedTasks && result.updatedTasks.length > 0) {
             // Process any image URLs in the updated task descriptions
@@ -3172,8 +3232,28 @@ export class MaistroApp {
             await new Promise(r => setTimeout(r, 500));
             return tasksWithImages;
         }
-        // No task changes - just wait briefly and return
-        await new Promise(r => setTimeout(r, 300));
+        // No task changes and no structured questions - allow text input for follow-up
+        if (hasOutput && result.response) {
+            // Fall back to text input
+            console.log(''); // Add spacing
+            const followUp = await this.ui.promptWithEscape('\x1b[90mReply to continue discussion (Enter to go back):\x1b[0m ', '');
+            if (followUp && followUp.trim()) {
+                // User wants to continue the conversation - recursively call with follow-up
+                return this.handleInlineDiscussion(followUp.trim(), currentTasks, goal);
+            }
+            // Empty input or Escape - return to main view
+        }
+        else if (hasOutput) {
+            // No result.response available - simple text input fallback
+            console.log(''); // Add spacing
+            const followUp = await this.ui.promptWithEscape('\x1b[90mReply to continue discussion (Enter to go back):\x1b[0m ', '');
+            if (followUp && followUp.trim()) {
+                return this.handleInlineDiscussion(followUp.trim(), currentTasks, goal);
+            }
+        }
+        else {
+            await new Promise(r => setTimeout(r, 300));
+        }
         return null;
     }
     /**
@@ -3377,7 +3457,7 @@ ${detection.projectContext}`;
             getLogger()?.error('handleInit error', { error: String(err), stack: err instanceof Error ? err.stack : undefined });
         }
     }
-    displayTasks(tasks, startIndex = 0, selectedIndex = -1, allTasks) {
+    displayTasks(tasks, startIndex = 0, selectedIndex = -1, allTasks, executionPhase) {
         const termWidth = process.stdout.columns || 80;
         // Helper to get visible length (strip ANSI codes)
         const visibleLength = (s) => s.replace(/\x1b\[[0-9;]*m/g, '').length;
@@ -3389,15 +3469,27 @@ ${detection.projectContext}`;
                 ? formatBlockedStatus()
                 : formatTaskStatusIcon(task.status, task.failureType);
             // Format status name in brackets
+            // For in_progress tasks, show the current phase (Implementation/Validation/Committing)
+            // Default to 'executing' (Implementation) if no phase is provided but task is in_progress
+            const phaseForStatus = task.status === 'in_progress' ? (executionPhase ?? 'executing') : undefined;
             const statusBracket = blocked
                 ? ' \x1b[31m[Blocked]\x1b[0m'
-                : ` [${formatStatusName(task.status, task.failureType)}]`;
+                : ` [${formatStatusName(task.status, task.failureType, phaseForStatus)}]`;
+            // Format task duration for completed and in_progress tasks
+            let durationStr = '';
+            if (task.status === 'completed' && task.durationMs) {
+                durationStr = `  \x1b[90m${this.formatDuration(task.durationMs)}\x1b[0m`;
+            }
+            else if (task.status === 'in_progress' && this.executionState?.taskStartTime) {
+                const elapsed = Date.now() - this.executionState.taskStartTime;
+                durationStr = `  \x1b[36m${this.formatDuration(elapsed)}\x1b[0m`;
+            }
             const taskNum = startIndex + i + 1;
             const isSelected = (startIndex + i) === selectedIndex;
             const cursor = isSelected ? '\x1b[36m▶\x1b[0m ' : '  ';
             // Build line template and measure total visible length
             const prefix = `${cursor}${statusIcon} ${taskNum}. `;
-            const suffix = statusBracket;
+            const suffix = statusBracket + durationStr;
             const prefixLen = visibleLength(prefix);
             const suffixLen = visibleLength(suffix);
             // Calculate max title length (leave 1 char margin for safety)
@@ -3410,10 +3502,10 @@ ${detection.projectContext}`;
             }
             // Output the line
             if (isSelected) {
-                console.log(`${cursor}${statusIcon} \x1b[1;36m${taskNum}.\x1b[0m \x1b[1;36m${title}\x1b[0m${statusBracket}`);
+                console.log(`${cursor}${statusIcon} \x1b[1;36m${taskNum}.\x1b[0m \x1b[1;36m${title}\x1b[0m${statusBracket}${durationStr}`);
             }
             else {
-                console.log(`${cursor}${statusIcon} \x1b[1m${taskNum}.\x1b[0m ${title}${statusBracket}`);
+                console.log(`${cursor}${statusIcon} \x1b[1m${taskNum}.\x1b[0m ${title}${statusBracket}${durationStr}`);
             }
             // Show 5-line result summary preview for selected completed tasks
             if (isSelected && task.status === 'completed' && task.resultSummary) {
@@ -3938,7 +4030,7 @@ ${detection.projectContext}`;
                 validating: '\x1b[33mValidating\x1b[0m',
                 committing: '\x1b[32mCommitting\x1b[0m',
             }[this.executionState.phase];
-            console.log(`${taskBar}       📋 \x1b[1mTask ${this.executionState.currentTaskIndex + 1}\x1b[0m  ${phaseLabel}  \x1b[90m(${taskElapsed})\x1b[0m`);
+            console.log(`${taskBar}  📋 \x1b[1mTask ${this.executionState.currentTaskIndex + 1}\x1b[0m  ${phaseLabel}  \x1b[90m(${taskElapsed})\x1b[0m`);
         }
     }
     // ==================== END EXECUTION STATE MANAGEMENT ====================
@@ -4130,11 +4222,31 @@ ${detection.projectContext}`;
                 return;
             const failed = tasks.filter(t => t.status === 'failed');
             const allDone = tasks.every(t => t.status === 'completed' || t.status === 'skipped');
-            // Update selected task to current executing task (only if user hasn't navigated)
+            // Update selected task to last completed task (only if user hasn't navigated)
+            // This shows the achievement summary for the most recently completed task
+            // while the next task is executing
             if (!userNavigated) {
-                const executingTask = tasks.find(t => t.status === 'in_progress');
-                if (executingTask) {
-                    this.selectedTaskIndex = tasks.findIndex(t => t.id === executingTask.id);
+                const executingTaskIndex = tasks.findIndex(t => t.status === 'in_progress');
+                if (executingTaskIndex > 0) {
+                    // Find the last completed task before the executing one
+                    let lastCompletedIndex = -1;
+                    for (let i = executingTaskIndex - 1; i >= 0; i--) {
+                        if (tasks[i].status === 'completed') {
+                            lastCompletedIndex = i;
+                            break;
+                        }
+                    }
+                    if (lastCompletedIndex >= 0) {
+                        this.selectedTaskIndex = lastCompletedIndex;
+                    }
+                    else {
+                        // No completed task before executing one, select the executing task
+                        this.selectedTaskIndex = executingTaskIndex;
+                    }
+                }
+                else if (executingTaskIndex === 0) {
+                    // First task is executing, select it
+                    this.selectedTaskIndex = 0;
                 }
             }
             // Clear and render