@dmsdc-ai/aigentry-telepty 0.1.7 → 0.1.8

package/cli.js

@@ -9,6 +9,7 @@ const prompts = require('prompts');
 const updateNotifier = require('update-notifier');
 const pkg = require('./package.json');
 const { getConfig } = require('./auth');
+const { attachInteractiveTerminal } = require('./interactive-terminal');
 const { runInteractiveSkillInstaller } = require('./skill-installer');
 const args = process.argv.slice(2);
 
@@ -92,29 +93,24 @@ async function ensureDaemonRunning() {
 async function manageInteractiveAttach(sessionId, targetHost) {
   const wsUrl = `ws://${targetHost}:${PORT}/api/sessions/${encodeURIComponent(sessionId)}?token=${encodeURIComponent(TOKEN)}`;
   const ws = new WebSocket(wsUrl);
-  let inputHandler = null;
-  let resizeHandler = null;
+  let cleanupTerminal = null;
   return new Promise((resolve) => {
     ws.on('open', () => {
       // Set Ghostty tab title to show session ID
       process.stdout.write(`\x1b]0;⚡ telepty :: ${sessionId}\x07`);
       console.log(`\n\x1b[32mEntered room '${sessionId}'.\x1b[0m\n`);
-      if (process.stdin.isTTY) process.stdin.setRawMode(true);
-      inputHandler = (d) => ws.send(JSON.stringify({ type: 'input', data: d.toString() }));
-      resizeHandler = () => ws.send(JSON.stringify({ type: 'resize', cols: process.stdout.columns, rows: process.stdout.rows }));
-      process.stdin.on('data', inputHandler);
-      process.stdout.on('resize', resizeHandler);
-      resizeHandler();
+      cleanupTerminal = attachInteractiveTerminal(process.stdin, process.stdout, {
+        onData: (d) => ws.send(JSON.stringify({ type: 'input', data: d.toString() })),
+        onResize: () => ws.send(JSON.stringify({ type: 'resize', cols: process.stdout.columns, rows: process.stdout.rows }))
+      });
     });
     ws.on('message', m => {
       const msg = JSON.parse(m);
       if (msg.type === 'output') process.stdout.write(msg.data);
     });
     ws.on('close', async () => {
-      if (process.stdin.isTTY) process.stdin.setRawMode(false);
       process.stdout.write(`\x1b]0;\x07`); // Restore default terminal title
-      if (inputHandler) process.stdin.off('data', inputHandler);
-      if (resizeHandler) process.stdout.off('resize', resizeHandler);
+      if (cleanupTerminal) cleanupTerminal();
 
       // Check if other clients are still attached before destroying
       try {
@@ -480,11 +476,13 @@ async function main() {
     process.stdout.write(`\x1b]0;⚡ telepty :: ${sessionId}\x07`);
     console.log(`\x1b[32m⚡ '${command}' is now session '\x1b[36m${sessionId}\x1b[32m'. Inject allowed.\x1b[0m\n`);
 
-    // Enter raw mode and relay stdin to local PTY
-    if (process.stdin.isTTY) process.stdin.setRawMode(true);
-
-    process.stdin.on('data', (data) => {
-      child.write(data.toString());
+    const cleanupTerminal = attachInteractiveTerminal(process.stdin, process.stdout, {
+      onData: (data) => {
+        child.write(data.toString());
+      },
+      onResize: () => {
+        child.resize(process.stdout.columns, process.stdout.rows);
+      }
     });
 
     // Relay PTY output to current terminal + send to daemon for attach clients
@@ -495,14 +493,9 @@ async function main() {
       }
     });
 
-    // Handle terminal resize
-    process.stdout.on('resize', () => {
-      child.resize(process.stdout.columns, process.stdout.rows);
-    });
-
     // Handle child exit
     child.onExit(({ exitCode }) => {
-      if (process.stdin.isTTY) process.stdin.setRawMode(false);
+      cleanupTerminal();
       process.stdout.write(`\x1b]0;\x07`);
       console.log(`\n\x1b[33mSession '${sessionId}' exited (code ${exitCode}).\x1b[0m`);
 
@@ -551,8 +544,7 @@ async function main() {
 
     const wsUrl = `ws://${targetHost}:${PORT}/api/sessions/${encodeURIComponent(sessionId)}?token=${encodeURIComponent(TOKEN)}`;
     const ws = new WebSocket(wsUrl);
-    let inputHandler = null;
-    let resizeHandler = null;
+    let cleanupTerminal = null;
 
     ws.on('open', () => {
       // Set Ghostty tab title to show session ID
@@ -560,25 +552,18 @@ async function main() {
       process.stdout.write(`\x1b]0;⚡ telepty :: ${sessionId}${hostSuffix}\x07`);
       console.log(`\x1b[32mEntered room '${sessionId}'${hostSuffix ? ` (${targetHost})` : ''}.\x1b[0m\n`);
 
-      if (process.stdin.isTTY) {
-        process.stdin.setRawMode(true);
-      }
-
-      inputHandler = (data) => {
-        ws.send(JSON.stringify({ type: 'input', data: data.toString() }));
-      };
-      process.stdin.on('data', inputHandler);
-
-      resizeHandler = () => {
-        ws.send(JSON.stringify({
-          type: 'resize',
-          cols: process.stdout.columns,
-          rows: process.stdout.rows
-        }));
-      };
-
-      process.stdout.on('resize', resizeHandler);
-      resizeHandler(); // Initial resize
+      cleanupTerminal = attachInteractiveTerminal(process.stdin, process.stdout, {
+        onData: (data) => {
+          ws.send(JSON.stringify({ type: 'input', data: data.toString() }));
+        },
+        onResize: () => {
+          ws.send(JSON.stringify({
+            type: 'resize',
+            cols: process.stdout.columns,
+            rows: process.stdout.rows
+          }));
+        }
+      });
     });
 
     ws.on('message', (message) => {
@@ -589,12 +574,8 @@ async function main() {
     });
 
     ws.on('close', async (code, reason) => {
-      if (process.stdin.isTTY) {
-        process.stdin.setRawMode(false);
-      }
       process.stdout.write(`\x1b]0;\x07`); // Restore default terminal title
-      if (inputHandler) process.stdin.off('data', inputHandler);
-      if (resizeHandler) process.stdout.off('resize', resizeHandler);
+      if (cleanupTerminal) cleanupTerminal();
 
       // Check if other clients are still attached before destroying
       try {

package/interactive-terminal.js

@@ -0,0 +1,54 @@
+'use strict';
+
+function removeListener(stream, eventName, handler) {
+  if (!handler || !stream) {
+    return;
+  }
+
+  if (typeof stream.off === 'function') {
+    stream.off(eventName, handler);
+    return;
+  }
+
+  if (typeof stream.removeListener === 'function') {
+    stream.removeListener(eventName, handler);
+  }
+}
+
+function attachInteractiveTerminal(input, output, handlers = {}) {
+  const { onData = null, onResize = null } = handlers;
+
+  if (input && input.isTTY && typeof input.setRawMode === 'function') {
+    input.setRawMode(true);
+  }
+
+  if (input && typeof input.resume === 'function') {
+    input.resume();
+  }
+
+  if (input && onData) {
+    input.on('data', onData);
+  }
+
+  if (output && onResize) {
+    output.on('resize', onResize);
+    onResize();
+  }
+
+  return () => {
+    removeListener(input, 'data', onData);
+    removeListener(output, 'resize', onResize);
+
+    if (input && input.isTTY && typeof input.setRawMode === 'function') {
+      input.setRawMode(false);
+    }
+
+    if (input && typeof input.pause === 'function') {
+      input.pause();
+    }
+  };
+}
+
+module.exports = {
+  attachInteractiveTerminal
+};

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@dmsdc-ai/aigentry-telepty",
-  "version": "0.1.7",
+  "version": "0.1.8",
   "main": "daemon.js",
   "bin": {
     "telepty": "cli.js",
     "telepty-install": "install.js"
   },
   "scripts": {
-    "test": "node --test test/auth.test.js test/daemon.test.js test/cli.test.js test/skill-installer.test.js",
-    "test:watch": "node --test --watch test/auth.test.js test/daemon.test.js test/cli.test.js test/skill-installer.test.js",
-    "test:ci": "node --test --test-reporter=spec test/auth.test.js test/daemon.test.js test/cli.test.js test/skill-installer.test.js"
+    "test": "node --test test/auth.test.js test/daemon.test.js test/cli.test.js test/skill-installer.test.js test/interactive-terminal.test.js",
+    "test:watch": "node --test --watch test/auth.test.js test/daemon.test.js test/cli.test.js test/skill-installer.test.js test/interactive-terminal.test.js",
+    "test:ci": "node --test --test-reporter=spec test/auth.test.js test/daemon.test.js test/cli.test.js test/skill-installer.test.js test/interactive-terminal.test.js"
   },
   "keywords": [],
   "author": "",