devbonzai 2.2.306 → 2.2.308

package/cli.js

@@ -71,7 +71,15 @@ async function main() {
   const utilsSrc = path.join(__dirname, 'templates', 'utils');
   const utilsDest = path.join(bonzaiDir, 'utils');
   copyDirectory(utilsSrc, utilsDest);
-  
+
+  // Copy terminal-test.html
+  console.log('📝 Copying terminal-test.html...');
+  const terminalTestSrc = path.join(__dirname, 'templates', 'terminal-test.html');
+  const terminalTestDest = path.join(bonzaiDir, 'terminal-test.html');
+  if (fs.existsSync(terminalTestSrc)) {
+    fs.copyFileSync(terminalTestSrc, terminalTestDest);
+  }
+
   // Write .ignore file in bonzai directory
   const ignoreTargetPath = path.join(bonzaiDir, '.ignore');
   
@@ -109,8 +117,8 @@ async function main() {
   packageJson.dependencies.express = "^4.18.2";
   packageJson.dependencies.cors = "^2.8.5";
   packageJson.dependencies["@babel/parser"] = "^7.23.0";
-  packageJson.dependencies["node-pty"] = "^1.0.0";
   packageJson.dependencies.ws = "^8.16.0";
+  packageJson.dependencies["node-pty"] = "^1.1.0";
   
   // Add script to run receiver
   if (!packageJson.scripts) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "devbonzai",
-  "version": "2.2.306",
+  "version": "2.2.308",
   "description": "Quickly set up a local file server in any repository for browser-based file access",
   "main": "cli.js",
   "bin": {
@@ -22,10 +22,10 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "express": "^4.18.2",
-    "cors": "^2.8.5",
     "@babel/parser": "^7.23.0",
-    "node-pty": "^1.0.0",
+    "cors": "^2.8.5",
+    "express": "^4.18.2",
+    "node-pty": "^1.1.0",
     "ws": "^8.16.0"
   }
 }

package/templates/handlers/index.js

@@ -9,7 +9,7 @@ function indexHandler(req, res) {
       'POST /open-cursor': 'Open Cursor (body: {path, line?})',
       'POST /shutdown': 'Gracefully shutdown the server',
       'POST /scan_code_quality': 'Scan code quality (body: {projectPath})',
-      'WS /terminal?cwd=<path>': 'WebSocket terminal connection (optional cwd query param)'
+      'WS /terminal': 'Interactive terminal via WebSocket'
     },
     example: 'Try: /list or /read?path=README.md'
   });

package/templates/handlers/terminal.js

@@ -1,97 +1,106 @@
 const pty = require('node-pty');
-const fs = require('fs');
 
 // Store active terminal sessions
 const terminals = new Map();
 
-function handleTerminalConnection(ws, workingDirectory) {
-  // Use user's default shell, fallback to /bin/zsh
-  const shell = process.platform === 'win32' ? 'powershell.exe' : (process.env.SHELL || '/bin/zsh');
-  const cwd = workingDirectory || process.env.HOME;
-  
-  // Debug logging
-  console.log('🖥️  Terminal session starting...');
-  console.log('    Shell:', shell, '| Exists:', fs.existsSync(shell));
-  console.log('    CWD:', cwd, '| Exists:', fs.existsSync(cwd));
-  
+// Get default shell based on platform
+function getDefaultShell() {
+  if (process.platform === 'win32') {
+    return process.env.COMSPEC || 'powershell.exe';
+  }
+  return process.env.SHELL || '/bin/bash';
+}
+
+// Create a new terminal session
+function createTerminal(sessionId, cols = 80, rows = 24) {
+  const shell = getDefaultShell();
+
   const ptyProcess = pty.spawn(shell, [], {
     name: 'xterm-256color',
-    cols: 80,
-    rows: 24,
-    cwd: cwd,
-    env: {
-      ...process.env,
-      TERM: 'xterm-256color',
-      COLORTERM: 'truecolor',
-    },
+    cols,
+    rows,
+    cwd: process.env.HOME || process.cwd(),
+    env: { ...process.env, TERM: 'xterm-256color' }
   });
 
-  const terminalId = Date.now().toString();
-  terminals.set(terminalId, { pty: ptyProcess, ws });
+  terminals.set(sessionId, {
+    pty: ptyProcess,
+    buffer: ''
+  });
 
-  // Send PTY output to WebSocket
-  ptyProcess.onData((data) => {
-    try {
-      if (ws.readyState === 1) { // WebSocket.OPEN
-        ws.send(data);
+  return ptyProcess;
+}
+
+// HTTP handler for terminal info
+function terminalHandler(req, res) {
+  res.json({
+    message: 'Terminal WebSocket API',
+    usage: {
+      websocket: 'ws://localhost:3001/terminal',
+      events: {
+        'input': 'Send terminal input (data: string)',
+        'resize': 'Resize terminal (cols: number, rows: number)',
+        'output': 'Receive terminal output'
       }
-    } catch (err) {
-      console.error('Error sending to WebSocket:', err);
     }
   });
+}
+
+// WebSocket handler for terminal sessions
+function setupTerminalWebSocket(wss) {
+  wss.on('connection', (ws) => {
+    const sessionId = Date.now().toString();
+    let ptyProcess;
 
-  // Handle incoming messages from WebSocket
-  ws.on('message', (msg) => {
     try {
-      const message = msg.toString();
-      
-      // Check if it's a resize command
-      if (message.startsWith('\x1b[8;')) {
-        // Parse resize: ESC[8;rows;colst
-        const match = message.match(/\x1b\[8;(\d+);(\d+)t/);
-        if (match) {
-          const rows = parseInt(match[1], 10);
-          const cols = parseInt(match[2], 10);
-          ptyProcess.resize(cols, rows);
-          return;
-        }
-      }
-      
-      // Check for JSON resize command
-      if (message.startsWith('{')) {
-        try {
-          const json = JSON.parse(message);
-          if (json.type === 'resize' && json.cols && json.rows) {
-            ptyProcess.resize(json.cols, json.rows);
-            return;
-          }
-        } catch (e) {
-          // Not JSON, treat as regular input
-        }
-      }
-      
-      // Regular terminal input
-      ptyProcess.write(message);
+      ptyProcess = createTerminal(sessionId);
+      console.log(`Terminal session ${sessionId} started`);
     } catch (err) {
-      console.error('Error processing message:', err);
+      console.error('Failed to create terminal:', err.message);
+      ws.send(JSON.stringify({ type: 'error', message: 'Failed to create terminal: ' + err.message }));
+      ws.close();
+      return;
     }
-  });
 
-  // Clean up on WebSocket close
-  ws.on('close', () => {
-    console.log('🖥️  Terminal session closed');
-    ptyProcess.kill();
-    terminals.delete(terminalId);
-  });
+    // Send terminal output to WebSocket client
+    ptyProcess.onData((data) => {
+      try {
+        ws.send(JSON.stringify({ type: 'output', data }));
+      } catch (e) {
+        // Client disconnected
+      }
+    });
 
-  // Handle PTY exit
-  ptyProcess.onExit(({ exitCode, signal }) => {
-    console.log(`🖥️  Terminal process exited (code: ${exitCode}, signal: ${signal})`);
-    terminals.delete(terminalId);
-    if (ws.readyState === 1) {
+    ptyProcess.onExit(({ exitCode }) => {
+      ws.send(JSON.stringify({ type: 'exit', exitCode }));
       ws.close();
-    }
+    });
+
+    // Handle incoming messages from client
+    ws.on('message', (message) => {
+      try {
+        const msg = JSON.parse(message);
+
+        switch (msg.type) {
+          case 'input':
+            ptyProcess.write(msg.data);
+            break;
+          case 'resize':
+            ptyProcess.resize(msg.cols, msg.rows);
+            break;
+        }
+      } catch (e) {
+        console.error('Terminal message error:', e);
+      }
+    });
+
+    // Cleanup on disconnect
+    ws.on('close', () => {
+      console.log(`Terminal session ${sessionId} closed`);
+      ptyProcess.kill();
+      terminals.delete(sessionId);
+    });
   });
 }
 
-module.exports = { handleTerminalConnection };
+module.exports = { terminalHandler, setupTerminalWebSocket };

package/templates/receiver.js

@@ -1,9 +1,9 @@
 #!/usr/bin/env node
 
-const express = require('./node_modules/express');
-const cors = require('./node_modules/cors');
-const WebSocket = require('./node_modules/ws');
-const { ROOT } = require('./config');
+const express = require('express');
+const cors = require('cors');
+const http = require('http');
+const { WebSocketServer } = require('ws');
 
 // Import handlers
 const indexHandler = require('./handlers/index');
@@ -13,9 +13,14 @@ const deleteHandler = require('./handlers/delete');
 const openCursorHandler = require('./handlers/open-cursor');
 const shutdownHandler = require('./handlers/shutdown');
 const scanCodeQualityHandler = require('./handlers/scan_code_quality');
-const { handleTerminalConnection } = require('./handlers/terminal');
+const { terminalHandler, setupTerminalWebSocket } = require('./handlers/terminal');
 
 const app = express();
+const server = http.createServer(app);
+
+// WebSocket server for terminal
+const wss = new WebSocketServer({ server, path: '/terminal' });
+setupTerminalWebSocket(wss);
 
 app.use(cors());
 app.use(express.json());
@@ -28,32 +33,11 @@ app.post('/delete', deleteHandler);
 app.post('/open-cursor', openCursorHandler);
 app.post('/shutdown', shutdownHandler);
 app.post('/scan_code_quality', scanCodeQualityHandler);
+app.get('/terminal', terminalHandler);
 
 const port = 3001;
-const server = app.listen(port, () => {
+server.listen(port, () => {
   console.log('📂 File server running on http://localhost:' + port);
+  console.log('🖥️  Terminal WebSocket available at ws://localhost:' + port + '/terminal');
 });
 
-// WebSocket server for terminal
-const wss = new WebSocket.Server({ 
-  server,
-  path: '/terminal'
-});
-
-wss.on('connection', (ws, req) => {
-  // Extract working directory from query string if provided
-  let workingDirectory = ROOT;
-  
-  if (req.url) {
-    const urlMatch = req.url.match(/[?&]cwd=([^&]+)/);
-    if (urlMatch) {
-      try {
-        workingDirectory = decodeURIComponent(urlMatch[1]);
-      } catch (e) {
-        console.warn('Invalid cwd parameter, using default:', e.message);
-      }
-    }
-  }
-  
-  handleTerminalConnection(ws, workingDirectory);
-});

package/templates/terminal-test.html

@@ -0,0 +1,104 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Terminal Test</title>
+  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/xterm@5.3.0/css/xterm.css" />
+  <style>
+    body {
+      margin: 0;
+      padding: 20px;
+      background: #1e1e1e;
+      font-family: sans-serif;
+    }
+    h1 {
+      color: #fff;
+      margin-bottom: 10px;
+    }
+    #status {
+      color: #888;
+      margin-bottom: 10px;
+    }
+    #terminal {
+      height: 400px;
+    }
+  </style>
+</head>
+<body>
+  <h1>Terminal Test</h1>
+  <div id="status">Connecting...</div>
+  <div id="terminal"></div>
+
+  <script src="https://cdn.jsdelivr.net/npm/xterm@5.3.0/lib/xterm.min.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/xterm-addon-fit@0.8.0/lib/xterm-addon-fit.min.js"></script>
+  <script>
+    const term = new Terminal({
+      cursorBlink: true,
+      fontSize: 14,
+      fontFamily: 'Menlo, Monaco, "Courier New", monospace',
+      theme: {
+        background: '#1e1e1e',
+        foreground: '#d4d4d4'
+      }
+    });
+
+    const fitAddon = new FitAddon.FitAddon();
+    term.loadAddon(fitAddon);
+
+    const terminalEl = document.getElementById('terminal');
+    const statusEl = document.getElementById('status');
+
+    term.open(terminalEl);
+    fitAddon.fit();
+
+    // Connect to WebSocket
+    const ws = new WebSocket('ws://localhost:3001/terminal');
+
+    ws.onopen = () => {
+      statusEl.textContent = 'Connected';
+      statusEl.style.color = '#4ec9b0';
+
+      // Send initial size
+      ws.send(JSON.stringify({
+        type: 'resize',
+        cols: term.cols,
+        rows: term.rows
+      }));
+    };
+
+    ws.onmessage = (event) => {
+      const msg = JSON.parse(event.data);
+      if (msg.type === 'output') {
+        term.write(msg.data);
+      } else if (msg.type === 'exit') {
+        statusEl.textContent = 'Session ended (exit code: ' + msg.exitCode + ')';
+        statusEl.style.color = '#f48771';
+      }
+    };
+
+    ws.onclose = () => {
+      statusEl.textContent = 'Disconnected';
+      statusEl.style.color = '#f48771';
+    };
+
+    ws.onerror = (err) => {
+      statusEl.textContent = 'Connection error';
+      statusEl.style.color = '#f48771';
+    };
+
+    // Send input to server
+    term.onData((data) => {
+      ws.send(JSON.stringify({ type: 'input', data }));
+    });
+
+    // Handle resize
+    window.addEventListener('resize', () => {
+      fitAddon.fit();
+      ws.send(JSON.stringify({
+        type: 'resize',
+        cols: term.cols,
+        rows: term.rows
+      }));
+    });
+  </script>
+</body>
+</html>