streaming commands like commit and expand

Author: Ademfcan

electron/ipc/vibe-handlers.js

@@ -18,6 +18,25 @@ function getVibeExecutablePath() {
   return join(appPath, "vibecommit", "win64", "vibe.exe");
 }
 
+// Helper function to get command-specific timeout values
+function getCommandTimeout(command) {
+  switch (command) {
+    case 'expand':
+      // Expand operations can be very large, especially for commits with many files
+      return 10 * 60 * 1000; // 10 minutes
+    case 'commit':
+    case 'improve':
+      // Commit operations can also be large when analyzing working directory changes
+      return 5 * 60 * 1000; // 5 minutes
+    case 'generate':
+    case 'info':
+    case 'help':
+    default:
+      // Default timeout for other commands
+      return 2 * 60 * 1000; // 2 minutes
+  }
+}
+
 // Register Vibe IPC handlers
 function registerVibeHandlers() {
   const logger = createLogger({ component: 'vibe-ipc' });
@@ -29,7 +48,10 @@ function registerVibeHandlers() {
       if (!parsed.success) {
         throw new Error(parsed.error.issues.map(i => i.message).join(', '));
       }
-      const { command, args, timeout = 30000, workingDirectory, apiKey } = parsed.data;
+      const { command, args, timeout, workingDirectory, apiKey } = parsed.data;
+      
+      // Set command-specific timeouts if not provided
+      const defaultTimeout = timeout || getCommandTimeout(command);
 
       // Resolve API key from secure store if not provided
       let resolvedApiKey = apiKey;
@@ -88,13 +110,13 @@ function registerVibeHandlers() {
           executablePath,
           [command, ...args],
           {
-            timeout,
+            timeout: defaultTimeout,
             maxBuffer: 1024 * 1024 * 10, // 10MB buffer
             cwd: workingDirectory || process.cwd(),
             env,
           },
         );
-        logger.info('vibe-execute-command success', { command, args, stdoutLength: stdout.length, stderrLength: stderr.length, workingDirectory, timeout });
+        logger.info('vibe-execute-command success', { command, args, stdoutLength: stdout.length, stderrLength: stderr.length, workingDirectory, timeout: defaultTimeout });
         return {
           success: true,
           stdout,
@@ -248,7 +270,10 @@ function registerVibeHandlers() {
     if (!parsed.success) {
       throw new Error(parsed.error.issues.map(i => i.message).join(', '));
     }
-    const { command, args, timeout = 30000, workingDirectory, apiKey } = parsed.data;
+    const { command, args, timeout, workingDirectory, apiKey } = parsed.data;
+    
+    // Set command-specific timeouts if not provided
+    const defaultTimeout = timeout || getCommandTimeout(command);
 
     // Resolve API key from secure store if not provided
     let resolvedApiKey = apiKey;
@@ -302,14 +327,14 @@ function registerVibeHandlers() {
         executablePath,
         [command, ...args],
         {
-          timeout,
+          timeout: defaultTimeout,
           maxBuffer: 1024 * 1024 * 10, // 10MB buffer
           cwd: workingDirectory || process.cwd(),
           env,
         },
       );
 
-      logger.info('vibe-run-command success', { command, args, stdoutLength: stdout.length, stderrLength: stderr.length, workingDirectory, timeout });
+      logger.info('vibe-run-command success', { command, args, stdoutLength: stdout.length, stderrLength: stderr.length, workingDirectory, timeout: defaultTimeout });
       return {
         success: true,
         stdout,

lib/vibe-command-executor.ts

@@ -44,11 +44,63 @@ export async function executeVibeCommandWithFlow(
     notifyExecutingCallbacks();
 
     try {
-      // Execute the command
-      const result = await executeVibeCommand(command, args, {
-        workingDirectory,
-        apiKey,
-      });
+      let result;
+      
+      // Use streaming execution for long-running commands like expand
+      if (command === 'expand' || command === 'commit') {
+        // Import streaming function
+        const { streamVibeCommand } = await import('@/lib/vibe-api');
+        
+        let lastOutput = '';
+        let lastError = '';
+        let hasError = false;
+        
+        try {
+          // Stream the command execution
+          for await (const event of streamVibeCommand(command, args, {
+            workingDirectory,
+            apiKey,
+          })) {
+            if (event.type === 'stdout') {
+              lastOutput += event.data || '';
+            } else if (event.type === 'stderr') {
+              lastError += event.data || '';
+            } else if (event.type === 'error') {
+              hasError = true;
+              throw new Error(event.data || 'Command failed');
+            }
+            
+            // Log progress for debugging
+            if (event.type === 'stdout' && event.data) {
+              console.log(`Vibe ${command} progress:`, event.data.substring(0, 100) + '...');
+            }
+          }
+          
+          // Create a result object compatible with executeVibeCommand
+          result = {
+            success: !hasError,
+            stdout: lastOutput,
+            stderr: lastError,
+            command,
+            args,
+            timestamp: new Date().toISOString(),
+          };
+        } catch (streamError: any) {
+          // If streaming fails, fall back to regular execution with longer timeout
+          console.warn(`Streaming execution failed for ${command}, falling back to regular execution:`, streamError);
+          result = await executeVibeCommand(command, args, {
+            workingDirectory,
+            apiKey,
+            timeout: 10 * 60 * 1000, // 10 minutes timeout for fallback
+          });
+        }
+      } else {
+        // Use regular execution for faster commands
+        result = await executeVibeCommand(command, args, {
+          workingDirectory,
+          apiKey,
+        });
+      }
 
       console.log(`Vibe command ${command} completed:`, result);