lunel-cli 0.1.6 → 0.1.7

package/dist/index.js

@@ -8,9 +8,8 @@ import * as path from "path";
 import * as os from "os";
 import { spawn, execSync } from "child_process";
 import { createServer } from "net";
-import * as pty from "node-pty";
 const PROXY_URL = process.env.LUNEL_PROXY_URL || "https://gateway.lunel.dev";
-const VERSION = "0.1.4";
+const VERSION = "0.1.6";
 // Root directory - sandbox all file operations to this
 const ROOT_DIR = process.cwd();
 const terminals = new Map();
@@ -481,9 +480,8 @@ async function handleGitDiscard(payload) {
 // ============================================================================
 let dataChannel = null;
 function handleTerminalSpawn(payload) {
-    // Determine shell - prefer user's shell, fallback to common defaults
-    let shell = payload.shell || process.env.SHELL;
-    // Validate and find a working shell
+    // Find a working shell
+    let shell = payload.shell || process.env.SHELL || '';
     const possibleShells = os.platform() === 'win32'
         ? ['powershell.exe', 'cmd.exe']
         : [shell, '/bin/zsh', '/bin/bash', '/bin/sh'].filter(Boolean);
@@ -492,152 +490,64 @@ function handleTerminalSpawn(payload) {
         if (!candidate)
             continue;
         try {
-            if (os.platform() === 'win32') {
-                // On Windows, just use the shell name
-                shell = candidate;
-                break;
-            }
-            else {
-                // On Unix, check if file exists and is executable
+            if (os.platform() !== 'win32') {
                 execSync(`test -x "${candidate}"`, { stdio: 'ignore' });
-                shell = candidate;
-                break;
             }
+            shell = candidate;
+            break;
         }
         catch {
-            // Try next shell
+            // Try next
         }
     }
     if (!shell) {
         throw Object.assign(new Error('No valid shell found'), { code: 'ENOSHELL' });
     }
-    const cols = payload.cols || 80;
-    const rows = payload.rows || 24;
     const terminalId = `term-${Date.now()}-${Math.random().toString(36).substring(2, 8)}`;
-    // Filter out undefined values from env
+    // Clean environment
     const cleanEnv = {};
     for (const [key, value] of Object.entries(process.env)) {
         if (value !== undefined) {
             cleanEnv[key] = value;
         }
     }
-    cleanEnv['TERM'] = 'xterm-256color';
-    // Try PTY first, fallback to regular spawn if PTY fails (e.g., Node 24 compatibility)
-    let ptyProcess = null;
-    let fallbackProc = null;
-    try {
-        ptyProcess = pty.spawn(shell, [], {
-            name: 'xterm-256color',
-            cols,
-            rows,
-            cwd: ROOT_DIR,
-            env: cleanEnv,
-        });
-    }
-    catch (ptyErr) {
-        console.warn('PTY spawn failed, falling back to regular spawn:', ptyErr.message);
-        // Fallback to regular child_process spawn
-        fallbackProc = spawn(shell, [], {
-            cwd: ROOT_DIR,
-            env: cleanEnv,
-            stdio: ['pipe', 'pipe', 'pipe'],
-        });
-    }
-    if (ptyProcess) {
-        terminals.set(terminalId, {
-            pty: ptyProcess,
-            cols,
-            rows,
-        });
-        // Stream output to app via data channel
-        ptyProcess.onData((data) => {
-            if (dataChannel && dataChannel.readyState === WebSocket.OPEN) {
-                const msg = {
-                    v: 1,
-                    id: `evt-${Date.now()}`,
-                    ns: "terminal",
-                    action: "output",
-                    payload: { terminalId, data },
-                };
-                dataChannel.send(JSON.stringify(msg));
-            }
-        });
-        ptyProcess.onExit(({ exitCode }) => {
-            terminals.delete(terminalId);
-            if (dataChannel && dataChannel.readyState === WebSocket.OPEN) {
-                const msg = {
-                    v: 1,
-                    id: `evt-${Date.now()}`,
-                    ns: "terminal",
-                    action: "exit",
-                    payload: { terminalId, code: exitCode },
-                };
-                dataChannel.send(JSON.stringify(msg));
-            }
-        });
-    }
-    else if (fallbackProc) {
-        // Store fallback process with a wrapper that mimics PTY interface
-        const wrapperPty = {
-            write: (data) => fallbackProc.stdin?.write(data),
-            resize: (_cols, _rows) => { },
-            kill: (signal) => fallbackProc.kill(signal),
-            pid: fallbackProc.pid || 0,
-            cols,
-            rows,
-            process: shell,
-            handleFlowControl: false,
-            onData: (cb) => {
-                fallbackProc.stdout?.on('data', (d) => cb(d.toString()));
-                fallbackProc.stderr?.on('data', (d) => cb(d.toString()));
-                return { dispose: () => { } };
-            },
-            onExit: (cb) => {
-                fallbackProc.on('close', (code) => cb({ exitCode: code || 0 }));
-                return { dispose: () => { } };
-            },
-            clear: () => { },
-            pause: () => { },
-            resume: () => { },
-        };
-        terminals.set(terminalId, {
-            pty: wrapperPty,
-            cols,
-            rows,
-        });
-        // Stream output
-        const sendOutput = (data) => {
-            if (dataChannel && dataChannel.readyState === WebSocket.OPEN) {
-                const msg = {
-                    v: 1,
-                    id: `evt-${Date.now()}`,
-                    ns: "terminal",
-                    action: "output",
-                    payload: { terminalId, data: data.toString() },
-                };
-                dataChannel.send(JSON.stringify(msg));
-            }
-        };
-        fallbackProc.stdout?.on('data', sendOutput);
-        fallbackProc.stderr?.on('data', sendOutput);
-        fallbackProc.on('close', (code) => {
-            terminals.delete(terminalId);
-            if (dataChannel && dataChannel.readyState === WebSocket.OPEN) {
-                const msg = {
-                    v: 1,
-                    id: `evt-${Date.now()}`,
-                    ns: "terminal",
-                    action: "exit",
-                    payload: { terminalId, code: code || 0 },
-                };
-                dataChannel.send(JSON.stringify(msg));
-            }
-        });
-    }
-    else {
-        throw Object.assign(new Error('Failed to spawn terminal'), { code: 'ESPAWN' });
-    }
-    return { terminalId };
+    cleanEnv['TERM'] = 'dumb'; // Simple terminal - no escape codes
+    // Spawn shell process
+    const proc = spawn(shell, ['-i'], {
+        cwd: ROOT_DIR,
+        env: cleanEnv,
+        stdio: ['pipe', 'pipe', 'pipe'],
+    });
+    terminals.set(terminalId, { proc, shell });
+    // Stream output to app
+    const sendOutput = (data) => {
+        if (dataChannel && dataChannel.readyState === WebSocket.OPEN) {
+            const msg = {
+                v: 1,
+                id: `evt-${Date.now()}`,
+                ns: "terminal",
+                action: "output",
+                payload: { terminalId, data: data.toString() },
+            };
+            dataChannel.send(JSON.stringify(msg));
+        }
+    };
+    proc.stdout?.on('data', sendOutput);
+    proc.stderr?.on('data', sendOutput);
+    proc.on('close', (code) => {
+        terminals.delete(terminalId);
+        if (dataChannel && dataChannel.readyState === WebSocket.OPEN) {
+            const msg = {
+                v: 1,
+                id: `evt-${Date.now()}`,
+                ns: "terminal",
+                action: "exit",
+                payload: { terminalId, code: code || 0 },
+            };
+            dataChannel.send(JSON.stringify(msg));
+        }
+    });
+    return { terminalId, shell };
 }
 function handleTerminalWrite(payload) {
     const terminalId = payload.terminalId;
@@ -649,24 +559,11 @@ function handleTerminalWrite(payload) {
     const session = terminals.get(terminalId);
     if (!session)
         throw Object.assign(new Error("Terminal not found"), { code: "ENOTERM" });
-    session.pty.write(data);
+    session.proc.stdin?.write(data);
     return {};
 }
 function handleTerminalResize(payload) {
-    const terminalId = payload.terminalId;
-    const cols = payload.cols;
-    const rows = payload.rows;
-    if (!terminalId)
-        throw Object.assign(new Error("terminalId is required"), { code: "EINVAL" });
-    if (!cols || !rows)
-        throw Object.assign(new Error("cols and rows are required"), { code: "EINVAL" });
-    const session = terminals.get(terminalId);
-    if (!session)
-        throw Object.assign(new Error("Terminal not found"), { code: "ENOTERM" });
-    // Resize PTY
-    session.pty.resize(cols, rows);
-    session.cols = cols;
-    session.rows = rows;
+    // No-op for simple terminal - resize not supported without PTY
     return {};
 }
 function handleTerminalKill(payload) {
@@ -676,7 +573,7 @@ function handleTerminalKill(payload) {
     const session = terminals.get(terminalId);
     if (!session)
         throw Object.assign(new Error("Terminal not found"), { code: "ENOTERM" });
-    session.pty.kill();
+    session.proc.kill();
     terminals.delete(terminalId);
     return {};
 }
@@ -1473,7 +1370,7 @@ function connectWebSocket(code) {
         console.log("\nShutting down...");
         // Kill all terminals
         for (const [id, session] of terminals) {
-            session.pty.kill();
+            session.proc.kill();
         }
         terminals.clear();
         // Kill all managed processes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lunel-cli",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "author": [
     {
       "name": "Soham Bharambe",
@@ -26,7 +26,6 @@
   },
   "dependencies": {
     "ignore": "^6.0.2",
-    "node-pty": "^1.0.0",
     "qrcode-terminal": "^0.12.0",
     "ws": "^8.18.0"
   },