indieclaw-agent 1.1.2 → 1.1.4

package/index.js

@@ -543,11 +543,88 @@ function handleTerminalStart(ws, { id }) {
     }
   }
 
-  // Fallback: child_process.spawn
   const { spawn } = require('child_process');
-  const proc = spawn(shell, ['-i'], {
+
+  // macOS: use Python pty module (script(1) fails with piped stdin on macOS)
+  if (os.platform() === 'darwin') {
+    const pythonScript = `
+import pty,os,sys,select,struct,fcntl,termios,signal
+m,s=pty.openpty()
+try:fcntl.ioctl(s,termios.TIOCSWINSZ,struct.pack('HHHH',24,80,0,0))
+except:pass
+p=os.fork()
+if p==0:
+    os.close(m);os.setsid();fcntl.ioctl(s,termios.TIOCSCTTY,0)
+    os.dup2(s,0);os.dup2(s,1);os.dup2(s,2)
+    if s>2:os.close(s)
+    sh=os.environ.get('SHELL','/bin/zsh')
+    os.execvp(sh,[sh])
+os.close(s);buf=b''
+MK=b'\\x1b]9999;';EN=b'\\x07'
+while True:
+    try:r,_,_=select.select([m,0],[],[])
+    except:break
+    if m in r:
+        try:d=os.read(m,16384)
+        except OSError:break
+        if not d:break
+        try:os.write(1,d)
+        except:break
+    if 0 in r:
+        try:d=os.read(0,4096)
+        except OSError:break
+        if not d:break
+        buf+=d
+        while MK in buf:
+            i=buf.index(MK)
+            if i>0:os.write(m,buf[:i]);buf=buf[i:]
+            try:j=buf.index(EN)
+            except ValueError:break
+            c=buf[len(MK):j].decode().split(',')
+            try:
+                fcntl.ioctl(m,termios.TIOCSWINSZ,struct.pack('HHHH',int(c[1]),int(c[0]),0,0))
+                os.kill(p,signal.SIGWINCH)
+            except:pass
+            buf=buf[j+1:]
+        if buf and MK not in buf:os.write(m,buf);buf=b''
+try:os.kill(p,signal.SIGTERM)
+except:pass
+try:os.waitpid(p,0)
+except:pass
+`;
+    const proc = spawn('python3', ['-u', '-c', pythonScript], {
+      cwd: os.homedir(),
+      env: { ...process.env, TERM: 'xterm-256color' },
+      stdio: ['pipe', 'pipe', 'pipe'],
+    });
+
+    proc._ws = ws;
+    proc._isPty = false;
+    proc._hasPtyResize = true;
+
+    proc.stdout.on('data', (data) => {
+      send(ws, { type: 'terminal.output', id, data: data.toString() });
+    });
+
+    proc.stderr.on('data', (data) => {
+      send(ws, { type: 'terminal.output', id, data: data.toString() });
+    });
+
+    proc.on('exit', (exitCode) => {
+      send(ws, { type: 'terminal.exit', id, exitCode: exitCode ?? 0 });
+      terminals.delete(id);
+    });
+
+    terminals.set(id, proc);
+    return reply(ws, id, { pid: proc.pid });
+  }
+
+  // Linux: use script(1) to allocate a real PTY
+  const scriptArgs = ['-q', '-c', shell, '/dev/null'];
+
+  const proc = spawn('script', scriptArgs, {
     cwd: os.homedir(),
-    env: { ...process.env, TERM: 'dumb' },
+    env: { ...process.env, TERM: 'xterm-256color' },
     stdio: ['pipe', 'pipe', 'pipe'],
   });
 
@@ -583,11 +660,13 @@ function handleTerminalInput(ws, { id, data }) {
 
 function handleTerminalResize(ws, { id, cols, rows }) {
   const term = terminals.get(id);
-  if (!term) return replyError(ws, id, 'Terminal not found');
+  if (!term) return;
   if (term._isPty && term.resize) {
     term.resize(cols, rows);
+  } else if (term._hasPtyResize) {
+    // Python PTY: send resize via custom OSC escape sequence
+    term.stdin.write(`\x1b]9999;${cols},${rows}\x07`);
   }
-  // fallback processes don't support resize
 }
 
 function handleTerminalStop(ws, { id }) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "indieclaw-agent",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "description": "Manage your server from your phone. Agent for the IndieClaw mobile app.",
   "main": "index.js",
   "bin": {