agentgui 1.0.489 → 1.0.491

package/lib/ws-handlers-session.js

@@ -123,8 +123,16 @@ export function register(router, deps) {
         } catch {
           agents = output.split('\n')
             .map(line => line.trim())
-            .filter(line => line && !line.startsWith('-') && !line.startsWith('#'))
-            .map(line => ({ id: line.toLowerCase().replace(/\s+/g, '-'), name: line }));
+            .filter(line => {
+              if (!line || line.startsWith('-') || line.startsWith('#')) return false;
+              if (/active agents?$/.test(line)) return false;
+              if (line.endsWith(':') && (line.includes('agents') || line.includes('agent'))) return false;
+              return true;
+            })
+            .map(line => {
+              let name = line.replace(/\s*-\s*inherit\s*$/, '').trim();
+              return { id: name.toLowerCase().replace(/\s+/g, '-'), name };
+            });
         }
         if (Array.isArray(agents) && agents.length > 0) {
           return { subAgents: agents };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agentgui",
-  "version": "1.0.489",
+  "version": "1.0.491",
   "description": "Multi-agent ACP client with real-time communication",
   "type": "module",
   "main": "server.js",
@@ -32,6 +32,7 @@
     "form-data": "^4.0.5",
     "fsbrowse": "^0.2.18",
     "google-auth-library": "^10.5.0",
+    "node-pty": "^1.0.0",
     "onnxruntime-node": "1.21.0",
     "opencode-ai": "^1.2.15",
     "puppeteer-core": "^24.37.5",

package/server.js

@@ -4090,33 +4090,79 @@ wsRouter.onLegacy((data, ws) => {
     if (ws.terminalProc) {
       try { ws.terminalProc.kill(); } catch(e) {}
     }
-    const { spawn } = require('child_process');
-    const shell = process.env.SHELL || '/bin/bash';
-    const cwd = data.cwd || process.env.STARTUP_CWD || process.env.HOME || '/';
-    const proc = spawn(shell, [], { cwd, env: { ...process.env, TERM: 'xterm-256color', COLORTERM: 'truecolor' }, stdio: ['pipe', 'pipe', 'pipe'] });
-    ws.terminalProc = proc;
-    proc.stdout.on('data', (chunk) => {
-      if (ws.readyState === 1) ws.send(JSON.stringify({ type: 'terminal_output', data: chunk.toString('base64'), encoding: 'base64' }));
-    });
-    proc.stderr.on('data', (chunk) => {
-      if (ws.readyState === 1) ws.send(JSON.stringify({ type: 'terminal_output', data: chunk.toString('base64'), encoding: 'base64' }));
-    });
-    proc.on('exit', (code) => {
-      if (ws.readyState === 1) ws.send(JSON.stringify({ type: 'terminal_exit', code }));
-      ws.terminalProc = null;
-    });
-    proc.on('error', (err) => {
-      console.error('[TERMINAL] Spawn error (contained):', err.message);
-      if (ws.readyState === 1) ws.send(JSON.stringify({ type: 'terminal_exit', code: 1, error: err.message }));
-      ws.terminalProc = null;
-    });
-    proc.stdin.on('error', () => {});
-    proc.stdout.on('error', () => {});
-    proc.stderr.on('error', () => {});
-    ws.send(JSON.stringify({ type: 'terminal_started', timestamp: Date.now() }));
+    try {
+      const pty = require('node-pty');
+      const shell = process.env.SHELL || '/bin/bash';
+      const cwd = data.cwd || process.env.STARTUP_CWD || process.env.HOME || '/';
+      const proc = pty.spawn(shell, [], {
+        name: 'xterm-256color',
+        cols: data.cols || 80,
+        rows: data.rows || 24,
+        cwd: cwd,
+        env: { ...process.env, TERM: 'xterm-256color', COLORTERM: 'truecolor' }
+      });
+      ws.terminalProc = proc;
+      ws.terminalPty = true;
+      proc.on('data', (chunk) => {
+        if (ws.readyState === 1) ws.send(JSON.stringify({ type: 'terminal_output', data: chunk.toString('base64'), encoding: 'base64' }));
+      });
+      proc.on('exit', (code) => {
+        if (ws.readyState === 1) ws.send(JSON.stringify({ type: 'terminal_exit', code }));
+        ws.terminalProc = null;
+      });
+      proc.on('error', (err) => {
+        console.error('[TERMINAL] PTY error (contained):', err.message);
+        if (ws.readyState === 1) ws.send(JSON.stringify({ type: 'terminal_exit', code: 1, error: err.message }));
+        ws.terminalProc = null;
+      });
+      ws.send(JSON.stringify({ type: 'terminal_started', timestamp: Date.now() }));
+    } catch (e) {
+      console.error('[TERMINAL] Failed to spawn PTY, falling back to pipes:', e.message);
+      const { spawn } = require('child_process');
+      const shell = process.env.SHELL || '/bin/bash';
+      const cwd = data.cwd || process.env.STARTUP_CWD || process.env.HOME || '/';
+      const proc = spawn(shell, ['-i'], { cwd, env: { ...process.env, TERM: 'xterm-256color', COLORTERM: 'truecolor' }, stdio: ['pipe', 'pipe', 'pipe'] });
+      ws.terminalProc = proc;
+      ws.terminalPty = false;
+      proc.stdout.on('data', (chunk) => {
+        if (ws.readyState === 1) ws.send(JSON.stringify({ type: 'terminal_output', data: chunk.toString('base64'), encoding: 'base64' }));
+      });
+      proc.stderr.on('data', (chunk) => {
+        if (ws.readyState === 1) ws.send(JSON.stringify({ type: 'terminal_output', data: chunk.toString('base64'), encoding: 'base64' }));
+      });
+      proc.on('exit', (code) => {
+        if (ws.readyState === 1) ws.send(JSON.stringify({ type: 'terminal_exit', code }));
+        ws.terminalProc = null;
+      });
+      proc.on('error', (err) => {
+        console.error('[TERMINAL] Spawn error (contained):', err.message);
+        if (ws.readyState === 1) ws.send(JSON.stringify({ type: 'terminal_exit', code: 1, error: err.message }));
+        ws.terminalProc = null;
+      });
+      proc.stdin.on('error', () => {});
+      proc.stdout.on('error', () => {});
+      proc.stderr.on('error', () => {});
+      ws.send(JSON.stringify({ type: 'terminal_started', timestamp: Date.now() }));
+    }
   } else if (data.type === 'terminal_input') {
-    if (ws.terminalProc && ws.terminalProc.stdin.writable) {
-      try { ws.terminalProc.stdin.write(Buffer.from(data.data, 'base64')); } catch (e) {}
+    if (ws.terminalProc) {
+      try {
+        const input = Buffer.from(data.data, 'base64');
+        if (ws.terminalPty) {
+          ws.terminalProc.write(input);
+        } else if (ws.terminalProc.stdin && ws.terminalProc.stdin.writable) {
+          ws.terminalProc.stdin.write(input);
+        }
+      } catch (e) {}
+    }
+  } else if (data.type === 'terminal_resize') {
+    if (ws.terminalProc && ws.terminalPty) {
+      try {
+        const { cols, rows } = data;
+        if (cols && rows && typeof ws.terminalProc.resize === 'function') {
+          ws.terminalProc.resize(cols, rows);
+        }
+      } catch (e) {}
     }
   } else if (data.type === 'terminal_stop') {
     if (ws.terminalProc) {

package/static/js/client.js

@@ -1581,7 +1581,7 @@ class AgentGUIClient {
       let finalPrompt = prompt;
       if (subAgent && agentId === 'claude-code') {
         const displaySubAgent = subAgent.split('-·-')[0];
-        finalPrompt = `use ${displaySubAgent} subagent to ${prompt} optimize for speech keep it short optimize for clarity`;
+        finalPrompt = `use ${displaySubAgent} subagent to ${prompt}`;
       }
       const streamBody = { id: conversationId, content: finalPrompt, agentId };
       if (model) streamBody.model = model;

package/static/js/terminal.js

@@ -42,9 +42,29 @@
       }
     });
 
+    term.onResize(function(size) {
+      if (ws && ws.readyState === WebSocket.OPEN) {
+        ws.send(JSON.stringify({ type: 'terminal_resize', cols: size.cols, rows: size.rows }));
+      }
+    });
+
+    var resizeTimer;
     window.addEventListener('resize', function() {
-      if (fitAddon) try { fitAddon.fit(); } catch(_) {}
+      if (fitAddon) {
+        try { fitAddon.fit(); } catch(_) {}
+        clearTimeout(resizeTimer);
+        resizeTimer = setTimeout(function() {
+          if (term && ws && ws.readyState === WebSocket.OPEN) {
+            ws.send(JSON.stringify({ type: 'terminal_resize', cols: term.cols, rows: term.rows }));
+          }
+        }, 200);
+      }
     });
+
+    output.addEventListener('click', function() {
+      if (term && term.focus) term.focus();
+    });
+
     return true;
   }
 
@@ -52,18 +72,22 @@
     console.log('Terminal: Connecting to WebSocket');
     if (ws && ws.readyState === WebSocket.OPEN) {
       console.log('Terminal: Sending terminal_start command');
-      ws.send(JSON.stringify({ type: 'terminal_start', cwd: window.__STARTUP_CWD || undefined }));
+      var dims = term ? { cols: term.cols, rows: term.rows } : { cols: 80, rows: 24 };
+      ws.send(JSON.stringify({ type: 'terminal_start', cwd: window.__STARTUP_CWD || undefined, cols: dims.cols, rows: dims.rows }));
+      setTimeout(function() { if (term && term.focus) term.focus(); }, 100);
       return;
     }
     if (ws && ws.readyState === WebSocket.CONNECTING) {
       console.log('Terminal: WebSocket already connecting');
       return;
     }
-    
+
     ws = new WebSocket(getWsUrl());
     ws.onopen = function() {
       console.log('Terminal: WebSocket connected, starting terminal');
-      ws.send(JSON.stringify({ type: 'terminal_start', cwd: window.__STARTUP_CWD || undefined }));
+      var dims = term ? { cols: term.cols, rows: term.rows } : { cols: 80, rows: 24 };
+      ws.send(JSON.stringify({ type: 'terminal_start', cwd: window.__STARTUP_CWD || undefined, cols: dims.cols, rows: dims.rows }));
+      setTimeout(function() { if (term && term.focus) term.focus(); }, 100);
     };
     ws.onmessage = function(e) {
       try {