maistro 1.2.6 → 1.2.8

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;IAoH5B;;;OAGG;YACW,iBAAiB;IAiE/B;;OAEG;IACH,OAAO,CAAC,kBAAkB;IA4C1B;;;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;;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;IA4PpC;;;;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"}
+{"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;IAoH5B;;;OAGG;YACW,iBAAiB;IAiE/B;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAyC1B;;;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;;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;IA6MpC;;;;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

@@ -388,11 +388,12 @@ export class MaistroApp {
         this.ui.close();
         // Get the original command arguments (skip node and script path)
         const args = process.argv.slice(2);
-        // Spawn new maistro process in detached mode so it becomes the session leader
-        // This ensures proper terminal control handoff
+        // Spawn new maistro process (NOT detached) with inherited stdio.
+        // The parent stays alive but idle - the shell waits for the parent,
+        // while the child takes over the terminal. This prevents the shell
+        // and child from competing for stdin (which happens with detached mode).
         const child = spawn(process.argv[0], [process.argv[1], ...args], {
             stdio: 'inherit',
-            detached: true,
             env: {
                 ...process.env,
                 // Skip update check on restart to avoid infinite loop
@@ -401,14 +402,11 @@ export class MaistroApp {
                 MAISTRO_IS_RESTART: '1',
             },
         });
-        // Unreference the child so parent can exit independently
-        child.unref();
-        // Exit immediately - the detached child will take over
-        // Using setImmediate to ensure the spawn completes first
-        setImmediate(() => {
-            process.exit(0);
+        // When child exits, parent exits with the same code
+        child.on('exit', (code) => {
+            process.exit(code ?? 0);
         });
-        // If spawn fails before we exit, show error
+        // If spawn fails, show 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`);
@@ -2772,8 +2770,6 @@ export class MaistroApp {
         this.showHeader();
         console.log(`\x1b[1m── Discussion ──\x1b[0m\n\x1b[90mYou: ${userInput.length > 100 ? userInput.slice(0, 97) + '...' : userInput}\x1b[0m\n`);
         let hasOutput = false;
-        let inJsonBlock = false;
-        let jsonBlockBuffer = '';
         // Set up abort controller for cancellation
         const abortController = new AbortController();
         let escPendingCancel = false;
@@ -2837,62 +2833,11 @@ export class MaistroApp {
             conversationHistory: [],
             cwd: this.projectPath,
             abortSignal: abortController.signal,
-            onOutput: (text) => {
-                if (!hasOutput) {
-                    currentSpinner?.stop(); // Stop spinner on first output
-                    hasOutput = true;
-                }
-                // Filter out JSON code blocks from display (they contain task data)
-                // We need to handle streaming where text comes in chunks
-                let remaining = text;
-                while (remaining.length > 0) {
-                    if (inJsonBlock) {
-                        // Look for end of JSON block
-                        const endIndex = remaining.indexOf('```');
-                        if (endIndex !== -1) {
-                            // Found end of JSON block
-                            jsonBlockBuffer += remaining.slice(0, endIndex);
-                            remaining = remaining.slice(endIndex + 3);
-                            inJsonBlock = false;
-                            // Don't output the JSON block content
-                        }
-                        else {
-                            // Still in JSON block, buffer it
-                            jsonBlockBuffer += remaining;
-                            remaining = '';
-                        }
-                    }
-                    else {
-                        // Look for start of JSON block
-                        const jsonStartIndex = remaining.indexOf('```json');
-                        if (jsonStartIndex !== -1) {
-                            // Output text before JSON block
-                            const beforeJson = remaining.slice(0, jsonStartIndex);
-                            if (beforeJson) {
-                                process.stdout.write(beforeJson);
-                            }
-                            remaining = remaining.slice(jsonStartIndex + 7); // Skip ```json
-                            inJsonBlock = true;
-                            jsonBlockBuffer = '';
-                        }
-                        else {
-                            // No JSON block, check for partial match at end
-                            const partialMatch = remaining.endsWith('`') || remaining.endsWith('``') || remaining.endsWith('```') || remaining.endsWith('```j') || remaining.endsWith('```js') || remaining.endsWith('```jso');
-                            if (partialMatch) {
-                                // Hold back potential partial match
-                                const holdBack = remaining.match(/`+j?s?o?n?$/)?.[0]?.length || 0;
-                                if (holdBack > 0 && remaining.length > holdBack) {
-                                    process.stdout.write(remaining.slice(0, -holdBack));
-                                }
-                                remaining = '';
-                            }
-                            else {
-                                process.stdout.write(remaining);
-                                remaining = '';
-                            }
-                        }
-                    }
-                }
+            onOutput: (_text) => {
+                // Track that output was received but don't display it yet.
+                // Keep the spinner running until planTasks() completes so the user
+                // sees a progress indicator instead of static intermediate text.
+                hasOutput = true;
             },
         });
         // Clean up Escape key handling
@@ -2901,9 +2846,9 @@ export class MaistroApp {
         if (escCancelTimeout) {
             clearTimeout(escCancelTimeout);
         }
-        // Stop spinner if no output was streamed (error case)
-        if (!hasOutput) {
-            currentSpinner?.stop();
+        // Stop spinner now that planning is complete
+        if (currentSpinner) {
+            currentSpinner.stop();
         }
         // Handle abort - return to main view without error
         if (result.aborted) {
@@ -2911,17 +2856,21 @@ export class MaistroApp {
             await new Promise(r => setTimeout(r, 500));
             return null;
         }
-        if (hasOutput) {
-            console.log('\n'); // New line after streamed output
-        }
         if (!result.success) {
             console.log(`\x1b[31mError: ${result.error}\x1b[0m\n`);
             await new Promise(r => setTimeout(r, 1500));
             return null;
         }
-        // Only print result if we didn't stream it
-        if (!hasOutput && result.response) {
-            console.log(`${result.response}\n`);
+        // Display response text (filtered to remove JSON blocks) if it's a text-only
+        // response (no questions or tasks). For questions/tasks, the UI handles display.
+        const hasQuestions = result.questions && result.questions.length > 0;
+        const hasTasks = result.tasks && result.tasks.length > 0;
+        if (!hasQuestions && !hasTasks && result.response) {
+            // Strip JSON code blocks from the response for display
+            const displayText = result.response.replace(/```json[\s\S]*?```/g, '').trim();
+            if (displayText) {
+                console.log(`${displayText}\n`);
+            }
         }
         // Check for structured questions first (from new JSON format)
         if (result.questions && result.questions.length > 0) {