s9n-devops-agent 2.0.18-dev.11 → 2.0.18-dev.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "s9n-devops-agent",
-  "version": "2.0.18-dev.11",
+  "version": "2.0.18-dev.13",
   "description": "CS_DevOpsAgent - Intelligent Git Automation System with multi-agent support and session management",
   "type": "module",
   "main": "src/cs-devops-agent-worker.js",

package/src/cs-devops-agent-worker.js

@@ -1008,10 +1008,20 @@ async function checkAndPerformRebase(repoRoot) {
     
     if (dirty) {
       log('Stashing uncommitted changes before rebase...');
-      const stashRes = await run('git', ['stash', 'push', '-m', `Auto-stash before rebase ${new Date().toISOString()}`]);
-      if (stashRes.ok) stashed = true;
-      else {
-        console.error('\x1b[31m✗ Failed to stash changes. Aborting rebase.\x1b[0m');
+      // Use -u to include untracked files, ensuring we capture everything status --porcelain sees
+      const stashRes = await run('git', ['stash', 'push', '-u', '-m', `Auto-stash before rebase ${new Date().toISOString()}`]);
+      
+      // Only mark as stashed if we actually saved something
+      // git stash returns 0 even if nothing to save, so we must check stdout
+      if (stashRes.ok && stashRes.stdout && stashRes.stdout.includes('Saved working directory')) {
+        stashed = true;
+        log('Changes stashed successfully.');
+      } else if (stashRes.ok && stashRes.stdout && stashRes.stdout.includes('No local changes to save')) {
+        stashed = false;
+        log('No changes needed stashing (git reported no local changes).');
+      } else {
+        console.error('\\x1b[31m✗ Failed to stash changes. Aborting rebase.\\x1b[0m');
+        if (stashRes.stdout) console.error(stashRes.stdout);
         busy = false;
         return false;
       }
@@ -1537,7 +1547,7 @@ function saveProjectSettings(settings, settingsPath) {
 // Display copyright and license information immediately
 console.log("\n" + "=".repeat(70));
 console.log("  CS_DevOpsAgent - Intelligent Git Automation System");
-console.log("  Version 2.0.18-dev.11 | Build 20260107");
+console.log("  Version 2.0.18-dev.13 | Build 20260107");
 console.log("  Copyright (c) 2026 SeKondBrain AI Labs Limited");
 console.log("  Author: Sachin Dev Duggal");
 console.log("  \n  Licensed under the MIT License");
@@ -1942,7 +1952,7 @@ console.log();
     
     // Split: Left (Interactive) 40%, Right (Logs) 60%
     // Ensure minimum widths
-    const leftPercent = 0.4;
+    const leftPercent = 0.3; // Reduce left panel to 30% to give more room for logs
     const leftWidth = Math.floor(width * leftPercent) - 2; 
     const rightWidth = width - leftWidth - 3; // -3 for separator " | "
     
@@ -1951,13 +1961,40 @@ console.log();
         // Or simple stacked? Let's just proceed, it will look messy but functional.
     }
 
+    // Helper to prepare view buffers with text wrapping
+    function getView(buffer, width, height) {
+        const view = [];
+        for (let i = buffer.length - 1; i >= 0; i--) {
+            if (view.length >= height) break;
+            
+            const line = buffer[i];
+            const plain = stripAnsi(line);
+            
+            if (plain.length <= width) {
+                view.unshift(line);
+            } else {
+                // Wrap long lines (using plain text to avoid ANSI artifacting)
+                const chunks = [];
+                for (let j = 0; j < plain.length; j += width) {
+                    chunks.push(plain.substring(j, j + width));
+                }
+                // Add chunks in reverse order so they appear correctly
+                for (let k = chunks.length - 1; k >= 0; k--) {
+                    if (view.length >= height) break;
+                    view.unshift(chunks[k]);
+                }
+            }
+        }
+        return view;
+    }
+
     // Prepare views (Bottom-Anchored)
-    const leftView = TUI.leftLogs.slice(-contentHeight);
-    const rightView = TUI.rightLogs.slice(-contentHeight);
+    const leftView = getView(TUI.leftLogs, leftWidth, contentHeight);
+    const rightView = getView(TUI.rightLogs, rightWidth, contentHeight);
     
     const leftEmpty = contentHeight - leftView.length;
     const rightEmpty = contentHeight - rightView.length;
-
+    
     // Draw Frame
     process.stdout.write('\x1b[2J');   // Clear
     process.stdout.write('\x1b[H');    // Home (standard ANSI)
@@ -1969,34 +2006,15 @@ console.log();
     
     // 2. Columns
     for (let i = 0; i < contentHeight; i++) {
-        let lLine = (i >= leftEmpty) ? leftView[i - leftEmpty] : '';
-        let rLine = (i >= rightEmpty) ? rightView[i - rightEmpty] : '';
-        
-        // Removing ANSI for length calculation is essential for alignment
-        const lPlain = stripAnsi(lLine);
-        const rPlain = stripAnsi(rLine);
-        
-        // Truncate to prevent wrapping and breaking layout
-        let lDisp = lLine;
-        let rDisp = rLine;
-        
-        if (lPlain.length > leftWidth) {
-            // Simple truncation (note: might cut ansi codes, but prevents layout break)
-            // We use the plain length to determine cut point
-            // For safety, we just display the plain truncated text to avoid hanging colors
-            lDisp = lPlain.substring(0, leftWidth - 3) + '...';
-        }
-        
-        if (rPlain.length > rightWidth) {
-            rDisp = rPlain.substring(0, rightWidth - 3) + '...';
-        }
+        let lDisp = (i >= leftEmpty) ? leftView[i - leftEmpty] : '';
+        let rDisp = (i >= rightEmpty) ? rightView[i - rightEmpty] : '';
         
-        // Pad using the length of the *displayed* string (re-strip to be sure)
-        const lDispLen = stripAnsi(lDisp).length;
-        const rDispLen = stripAnsi(rDisp).length;
+        // Pad to fill width
+        const lPlain = stripAnsi(lDisp);
+        const rPlain = stripAnsi(rDisp);
         
-        const lPad = Math.max(0, leftWidth - lDispLen);
-        const rPad = Math.max(0, rightWidth - rDispLen);
+        const lPad = Math.max(0, leftWidth - lPlain.length);
+        const rPad = Math.max(0, rightWidth - rPlain.length);
         
         process.stdout.write(lDisp + ' '.repeat(lPad));
         process.stdout.write('\x1b[90m │ \x1b[0m');