@dmsdc-ai/aigentry-telepty 0.1.7 → 0.1.9

package/README.md

@@ -21,6 +21,7 @@ iwr -useb https://raw.githubusercontent.com/dmsdc-ai/aigentry-telepty/main/insta
 ```
 
 *These single commands will install the package globally and automatically configure it to run as a background service specific to your OS (`systemd` for Linux, `launchd` for macOS, or a detached background process for Windows).*
+The installer now stops older local telepty daemons before starting the new one, so updates do not leave duplicate background processes behind.
 
 ## Seamless Usage
 
@@ -56,6 +57,12 @@ npm run test:watch
 
 The automated suite covers config generation, daemon HTTP APIs, WebSocket attach/output flow, bus events, session deletion regressions, and CLI smoke tests against a real daemon process.
 
+If you ever need to manually clear stale local daemon processes:
+
+```bash
+telepty cleanup-daemons
+```
+
 ## Skill Installation
 
 The package installer opens the telepty skill TUI automatically when you run it in a terminal.

package/cli.js

@@ -9,6 +9,8 @@ const prompts = require('prompts');
 const updateNotifier = require('update-notifier');
 const pkg = require('./package.json');
 const { getConfig } = require('./auth');
+const { cleanupDaemonProcesses } = require('./daemon-control');
+const { attachInteractiveTerminal } = require('./interactive-terminal');
 const { runInteractiveSkillInstaller } = require('./skill-installer');
 const args = process.argv.slice(2);
 
@@ -31,6 +33,28 @@ const fetchWithAuth = (url, options = {}) => {
   return fetch(url, { ...options, headers });
 };
 
+async function getDaemonMeta(host = REMOTE_HOST) {
+  try {
+    const res = await fetchWithAuth(`http://${host}:${PORT}/api/meta`, {
+      signal: AbortSignal.timeout(1500)
+    });
+    if (!res.ok) {
+      return null;
+    }
+    return await res.json();
+  } catch {
+    return null;
+  }
+}
+
+function startDetachedDaemon() {
+  const cp = spawn(process.argv[0], [process.argv[1], 'daemon'], {
+    detached: true,
+    stdio: 'ignore'
+  });
+  cp.unref();
+}
+
 async function discoverSessions() {
   await ensureDaemonRunning();
   const hosts = ['127.0.0.1'];
@@ -70,51 +94,66 @@ async function discoverSessions() {
   return allSessions;
 }
 
-async function ensureDaemonRunning() {
+async function ensureDaemonRunning(options = {}) {
   if (REMOTE_HOST !== '127.0.0.1') return; // Only auto-start local daemon
+
+  const requiredCapabilities = options.requiredCapabilities || [];
+
   try {
-    const res = await fetchWithAuth(`${DAEMON_URL}/api/sessions`);
-    if (res.ok) return; // Already running
-  } catch (e) {
-    // Not running, let's start it
-    process.stdout.write('\x1b[33m⚙️ Auto-starting local telepty daemon...\x1b[0m\n');
-    const cp = spawn(process.argv[0], [process.argv[1], 'daemon'], {
-      detached: true,
-      stdio: 'ignore'
+    const meta = await getDaemonMeta('127.0.0.1');
+    const hasCapabilities = meta && requiredCapabilities.every((item) => meta.capabilities.includes(item));
+
+    const sessionsRes = await fetchWithAuth(`${DAEMON_URL}/api/sessions`, {
+      signal: AbortSignal.timeout(1500)
     });
-    cp.unref();
-    
-    // Wait a brief moment for the daemon to boot up
-    await new Promise(r => setTimeout(r, 1000));
+
+    if (sessionsRes.ok && hasCapabilities) {
+      return;
+    }
+
+    if (sessionsRes.ok && !meta) {
+      process.stdout.write('\x1b[33m⚙️ Found an older local telepty daemon. Restarting it...\x1b[0m\n');
+      cleanupDaemonProcesses();
+    } else if (sessionsRes.ok && meta) {
+      process.stdout.write('\x1b[33m⚙️ Found a local telepty daemon without the required features. Restarting it...\x1b[0m\n');
+      cleanupDaemonProcesses();
+    }
+  } catch (e) {
+    // Continue to auto-start below.
+  }
+
+  process.stdout.write('\x1b[33m⚙️ Auto-starting local telepty daemon...\x1b[0m\n');
+  cleanupDaemonProcesses();
+  startDetachedDaemon();
+  await new Promise(r => setTimeout(r, 1000));
+
+  const meta = await getDaemonMeta('127.0.0.1');
+  if (!meta || !requiredCapabilities.every((item) => meta.capabilities.includes(item))) {
+    console.error('❌ Failed to start a compatible local telepty daemon. Try `telepty cleanup-daemons` or rerun the installer.');
   }
 }
 
 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 {
@@ -164,11 +203,7 @@ async function manageInteractive() {
       try {
         execSync('npm install -g @dmsdc-ai/aigentry-telepty@latest', { stdio: 'inherit' });
         console.log('\n\x1b[32m✅ Update complete! Restarting daemon...\x1b[0m');
-        try {
-          const os = require('os');
-          if (os.platform() === 'win32') execSync('taskkill /IM node.exe /FI "WINDOWTITLE eq telepty daemon*" /F', { stdio: 'ignore' });
-          else execSync('pkill -f "telepty daemon"', { stdio: 'ignore' });
-        } catch(e) {}
+        cleanupDaemonProcesses();
       } catch (e) {
         console.error('\n❌ Update failed.\n');
       }
@@ -182,11 +217,8 @@ async function manageInteractive() {
 
     if (response.action === 'daemon') {
       console.log('\n\x1b[33mStarting daemon in background...\x1b[0m');
-      const cp = spawn(process.argv[0], [process.argv[1], 'daemon'], {
-        detached: true,
-        stdio: 'ignore'
-      });
-      cp.unref();
+      cleanupDaemonProcesses();
+      startDetachedDaemon();
       console.log('✅ Daemon started.\n');
       continue;
     }
@@ -317,16 +349,7 @@ async function main() {
     try {
       execSync('npm install -g @dmsdc-ai/aigentry-telepty@latest', { stdio: 'inherit' });
       console.log('\n\x1b[32m✅ Update complete! Restarting daemon...\x1b[0m');
-      
-      // Kill local daemon if running, so it auto-restarts on next command
-      try {
-        if (os.platform() === 'win32') {
-          execSync('taskkill /IM node.exe /FI "WINDOWTITLE eq telepty daemon*" /F', { stdio: 'ignore' });
-        } else {
-          execSync('pkill -f "telepty daemon"', { stdio: 'ignore' });
-        }
-      } catch (e) {} // Ignore if not running
-
+      cleanupDaemonProcesses();
       console.log('🎉 You are now using the latest version.');
     } catch (e) {
       console.error('\n❌ Update failed. Please try running: npm install -g @dmsdc-ai/aigentry-telepty@latest');
@@ -334,6 +357,16 @@ async function main() {
     return;
   }
 
+  if (cmd === 'cleanup-daemons') {
+    const results = cleanupDaemonProcesses();
+    console.log(`Stopped ${results.stopped.length} telepty daemon(s).`);
+    if (results.failed.length > 0) {
+      console.log(`Failed to stop ${results.failed.length} daemon(s).`);
+      process.exitCode = 1;
+    }
+    return;
+  }
+
   if (cmd === 'daemon') {
     console.log('Starting telepty daemon...');
     require('./daemon.js');
@@ -415,7 +448,7 @@ async function main() {
       sessionId = path.basename(command);
     }
 
-    await ensureDaemonRunning();
+    await ensureDaemonRunning({ requiredCapabilities: ['wrapped-sessions'] });
 
     // Register session with daemon
     try {
@@ -480,11 +513,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 +530,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 +581,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 +589,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 +611,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 {
@@ -758,6 +776,7 @@ Usage:
   telepty multicast <id1,id2> "<prompt>"         Inject text into multiple specific sessions
   telepty broadcast "<prompt>"                   Inject text into ALL active sessions
   telepty rename <old_id> <new_id>               Rename a session (updates terminal title too)
+  telepty cleanup-daemons                        Stop old local telepty daemon processes
   telepty listen                                 Listen to the event bus and print JSON to stdout
   telepty monitor                                Human-readable real-time billboard of bus events
   telepty update                                 Update telepty to the latest version

package/daemon-control.js

@@ -0,0 +1,223 @@
+'use strict';
+
+const fs = require('fs');
+const os = require('os');
+const path = require('path');
+const { execFileSync, execSync } = require('child_process');
+
+const TELEPTY_DIR = path.join(os.homedir(), '.telepty');
+const DAEMON_STATE_FILE = path.join(TELEPTY_DIR, 'daemon-state.json');
+
+function ensureTeleptyDir() {
+  fs.mkdirSync(TELEPTY_DIR, { recursive: true, mode: 0o700 });
+}
+
+function sleepMs(ms) {
+  const buffer = new SharedArrayBuffer(4);
+  const view = new Int32Array(buffer);
+  Atomics.wait(view, 0, 0, ms);
+}
+
+function isProcessRunning(pid) {
+  if (!Number.isInteger(pid) || pid <= 0) {
+    return false;
+  }
+
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch (error) {
+    return error.code === 'EPERM';
+  }
+}
+
+function readDaemonState() {
+  if (!fs.existsSync(DAEMON_STATE_FILE)) {
+    return null;
+  }
+
+  try {
+    return JSON.parse(fs.readFileSync(DAEMON_STATE_FILE, 'utf8'));
+  } catch {
+    return null;
+  }
+}
+
+function writeDaemonState(state) {
+  ensureTeleptyDir();
+  fs.writeFileSync(DAEMON_STATE_FILE, JSON.stringify(state, null, 2), { mode: 0o600 });
+}
+
+function clearDaemonState(expectedPid) {
+  if (!fs.existsSync(DAEMON_STATE_FILE)) {
+    return;
+  }
+
+  if (expectedPid === undefined) {
+    fs.rmSync(DAEMON_STATE_FILE, { force: true });
+    return;
+  }
+
+  const current = readDaemonState();
+  if (!current || current.pid === expectedPid) {
+    fs.rmSync(DAEMON_STATE_FILE, { force: true });
+  }
+}
+
+function claimDaemonState(details) {
+  ensureTeleptyDir();
+  const current = readDaemonState();
+
+  if (current && current.pid !== process.pid) {
+    if (isProcessRunning(current.pid)) {
+      return { claimed: false, current };
+    }
+
+    clearDaemonState(current.pid);
+  }
+
+  const state = {
+    pid: process.pid,
+    host: details.host,
+    port: details.port,
+    startedAt: new Date().toISOString(),
+    version: details.version
+  };
+  writeDaemonState(state);
+  return { claimed: true, state };
+}
+
+function isLikelyTeleptyDaemon(commandLine) {
+  const text = String(commandLine || '').toLowerCase();
+  if (!text) {
+    return false;
+  }
+
+  if (text.includes('telepty daemon')) {
+    return true;
+  }
+
+  if (text.includes('cli.js daemon')) {
+    return true;
+  }
+
+  return text.includes('daemon.js') && text.includes('aigentry-telepty');
+}
+
+function listUnixProcesses() {
+  const output = execSync('ps -axo pid=,command=', { encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'] });
+  return output.split('\n')
+    .map((line) => line.trim())
+    .filter(Boolean)
+    .map((line) => {
+      const match = line.match(/^(\d+)\s+(.*)$/);
+      if (!match) {
+        return null;
+      }
+      return { pid: Number(match[1]), commandLine: match[2] };
+    })
+    .filter(Boolean);
+}
+
+function listWindowsProcesses() {
+  const script = 'Get-CimInstance Win32_Process | Select-Object ProcessId,CommandLine | ConvertTo-Json -Compress';
+  const output = execFileSync('powershell.exe', ['-NoProfile', '-Command', script], {
+    encoding: 'utf8',
+    stdio: ['ignore', 'pipe', 'ignore']
+  }).trim();
+
+  if (!output) {
+    return [];
+  }
+
+  const records = JSON.parse(output);
+  const list = Array.isArray(records) ? records : [records];
+  return list
+    .map((item) => ({
+      pid: Number(item.ProcessId),
+      commandLine: item.CommandLine || ''
+    }))
+    .filter((item) => Number.isInteger(item.pid) && item.pid > 0);
+}
+
+function listDaemonProcesses() {
+  let processes = [];
+
+  try {
+    processes = process.platform === 'win32' ? listWindowsProcesses() : listUnixProcesses();
+  } catch {
+    return [];
+  }
+
+  return processes.filter((item) => item.pid !== process.pid && isLikelyTeleptyDaemon(item.commandLine));
+}
+
+function stopDaemonProcess(pid) {
+  if (!Number.isInteger(pid) || pid <= 0) {
+    return false;
+  }
+
+  try {
+    if (process.platform === 'win32') {
+      execFileSync('taskkill', ['/PID', String(pid), '/T', '/F'], { stdio: ['ignore', 'ignore', 'ignore'] });
+      return true;
+    }
+
+    process.kill(pid, 'SIGTERM');
+    const deadline = Date.now() + 1500;
+    while (Date.now() < deadline) {
+      if (!isProcessRunning(pid)) {
+        return true;
+      }
+      sleepMs(50);
+    }
+
+    process.kill(pid, 'SIGKILL');
+    return true;
+  } catch {
+    return !isProcessRunning(pid);
+  }
+}
+
+function cleanupDaemonProcesses() {
+  const targets = new Map();
+  const state = readDaemonState();
+
+  if (state && Number.isInteger(state.pid) && state.pid > 0 && state.pid !== process.pid) {
+    targets.set(state.pid, { pid: state.pid, source: 'state-file' });
+  }
+
+  for (const item of listDaemonProcesses()) {
+    if (!targets.has(item.pid)) {
+      targets.set(item.pid, { pid: item.pid, source: 'process-scan', commandLine: item.commandLine });
+    }
+  }
+
+  const stopped = [];
+  const failed = [];
+
+  for (const item of targets.values()) {
+    if (stopDaemonProcess(item.pid)) {
+      stopped.push(item);
+    } else {
+      failed.push(item);
+    }
+  }
+
+  const nextState = readDaemonState();
+  if (nextState && !isProcessRunning(nextState.pid)) {
+    clearDaemonState(nextState.pid);
+  }
+
+  return { stopped, failed };
+}
+
+module.exports = {
+  DAEMON_STATE_FILE,
+  claimDaemonState,
+  cleanupDaemonProcesses,
+  clearDaemonState,
+  isProcessRunning,
+  listDaemonProcesses,
+  readDaemonState
+};

package/daemon.js

@@ -4,6 +4,8 @@ const pty = require('node-pty');
 const os = require('os');
 const { WebSocketServer } = require('ws');
 const { getConfig } = require('./auth');
+const pkg = require('./package.json');
+const { claimDaemonState, clearDaemonState } = require('./daemon-control');
 
 const config = getConfig();
 const EXPECTED_TOKEN = config.authToken;
@@ -33,6 +35,14 @@ app.use((req, res, next) => {
 const PORT = process.env.PORT || 3848;
 
 const HOST = process.env.HOST || '0.0.0.0';
+process.title = 'telepty-daemon';
+
+const daemonClaim = claimDaemonState({ host: HOST, port: Number(PORT), version: pkg.version });
+if (!daemonClaim.claimed) {
+  const current = daemonClaim.current;
+  console.log(`[DAEMON] telepty daemon already running (pid ${current.pid}, port ${current.port}). Exiting.`);
+  process.exit(0);
+}
 
 const sessions = {};
 const STRIPPED_SESSION_ENV_KEYS = [
@@ -197,6 +207,17 @@ app.get('/api/sessions', (req, res) => {
   res.json(list);
 });
 
+app.get('/api/meta', (req, res) => {
+  res.json({
+    name: pkg.name,
+    version: pkg.version,
+    pid: process.pid,
+    host: HOST,
+    port: Number(PORT),
+    capabilities: ['sessions', 'wrapped-sessions', 'skill-installer', 'singleton-daemon']
+  });
+});
+
 app.post('/api/sessions/multicast/inject', (req, res) => {
   const { session_ids, prompt } = req.body;
   if (!prompt) return res.status(400).json({ error: 'prompt is required' });
@@ -396,6 +417,17 @@ const server = app.listen(PORT, HOST, () => {
   console.log(`🚀 aigentry-telepty daemon listening on http://${HOST}:${PORT}`);
 });
 
+server.on('error', (error) => {
+  clearDaemonState(process.pid);
+
+  if (error && error.code === 'EADDRINUSE') {
+    console.error(`[DAEMON] Port ${PORT} is already in use. Another process is blocking telepty.`);
+    process.exit(1);
+  }
+
+  throw error;
+});
+
 
 const wss = new WebSocketServer({ noServer: true });
 
@@ -522,3 +554,14 @@ server.on('upgrade', (req, socket, head) => {
     socket.destroy();
   }
 });
+
+function shutdown(code) {
+  clearDaemonState(process.pid);
+  process.exit(code);
+}
+
+process.on('SIGINT', () => shutdown(0));
+process.on('SIGTERM', () => shutdown(0));
+process.on('exit', () => {
+  clearDaemonState(process.pid);
+});

package/install.js

@@ -4,6 +4,7 @@ const { execSync, spawn } = require('child_process');
 const os = require('os');
 const fs = require('fs');
 const path = require('path');
+const { cleanupDaemonProcesses } = require('./daemon-control');
 const { runInteractiveSkillInstaller } = require('./skill-installer');
 
 console.log("🚀 Installing @dmsdc-ai/aigentry-telepty...");
@@ -26,6 +27,15 @@ function resolveInstalledPackageRoot() {
   }
 }
 
+function cleanupLocalDaemons() {
+  console.log('🧹 Cleaning up existing telepty daemons...');
+  const results = cleanupDaemonProcesses();
+  console.log(`   Stopped ${results.stopped.length} daemon(s).`);
+  if (results.failed.length > 0) {
+    console.warn(`   Could not stop ${results.failed.length} daemon(s).`);
+  }
+}
+
 async function installSkills() {
   if (!process.stdin.isTTY || !process.stdout.isTTY) {
     console.log('⏭️  Skipping interactive skill installation (no TTY).');
@@ -65,6 +75,7 @@ async function installSkills() {
   const platform = os.platform();
 
   if (platform === 'win32') {
+    cleanupLocalDaemons();
     console.log("⚙️ Setting up Windows background process...");
     const subprocess = spawn(teleptyPath, ['daemon'], {
       detached: true,
@@ -78,6 +89,8 @@ async function installSkills() {
     console.log("⚙️ Setting up macOS launchd service...");
     const plistPath = path.join(os.homedir(), 'Library', 'LaunchAgents', 'com.aigentry.telepty.plist');
     fs.mkdirSync(path.dirname(plistPath), { recursive: true });
+    try { execSync(`launchctl unload "${plistPath}" 2>/dev/null`); } catch(e){}
+    cleanupLocalDaemons();
 
     const plistContent = `<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
@@ -98,7 +111,6 @@ async function installSkills() {
 </plist>`;
 
     fs.writeFileSync(plistPath, plistContent);
-    try { execSync(`launchctl unload "${plistPath}" 2>/dev/null`); } catch(e){}
     run(`launchctl load "${plistPath}"`);
     console.log("✅ macOS LaunchAgent installed and started.");
 
@@ -108,6 +120,8 @@ async function installSkills() {
       execSync('systemctl --version', { stdio: 'ignore' });
       if (process.getuid && process.getuid() === 0) {
         console.log("⚙️ Setting up systemd service for Linux...");
+        try { execSync('systemctl stop telepty', { stdio: 'ignore' }); } catch(e) {}
+        cleanupLocalDaemons();
         const serviceContent = `[Unit]
 Description=Telepty Daemon
 After=network.target
@@ -133,6 +147,7 @@ WantedBy=multi-user.target`;
 
     // Fallback for Linux without systemd or non-root
     console.log("⚠️ Skipping systemd (no root or no systemd). Starting in background...");
+    cleanupLocalDaemons();
     const subprocess = spawn(teleptyPath, ['daemon'], {
       detached: true,
       stdio: 'ignore'

package/install.ps1

@@ -26,7 +26,13 @@ if (!$teleptyCmd) {
 }
 
 $teleptyPath = $teleptyCmd.Source
-Start-Process -FilePath node -ArgumentList "$teleptyPath daemon" -WindowStyle Hidden
+try {
+    & $teleptyPath cleanup-daemons | Out-Null
+} catch {
+    Write-Host "Warning: Could not clean up existing telepty daemons." -ForegroundColor Yellow
+}
+
+Start-Process -FilePath $teleptyPath -ArgumentList "daemon" -WindowStyle Hidden
 Write-Host "Success: Windows daemon started in background." -ForegroundColor Green
 
 Write-Host "`nInstallation complete! Telepty daemon is running." -ForegroundColor Cyan

package/install.sh

@@ -56,6 +56,9 @@ if command -v systemctl &> /dev/null && [ -d "/etc/systemd/system" ]; then
         SUDO_CMD=""
     fi
 
+    $SUDO_CMD systemctl stop telepty 2>/dev/null || true
+    "$TELEPTY_PATH" cleanup-daemons >/dev/null 2>&1 || true
+
     $SUDO_CMD bash -c "cat <<EOF > /etc/systemd/system/telepty.service
 [Unit]
 Description=Telepty Daemon
@@ -80,6 +83,8 @@ EOF"
 elif [[ "$OSTYPE" == "darwin"* ]]; then
     PLIST_PATH="$HOME/Library/LaunchAgents/com.aigentry.telepty.plist"
     mkdir -p "$HOME/Library/LaunchAgents"
+    launchctl unload "$PLIST_PATH" 2>/dev/null || true
+    "$TELEPTY_PATH" cleanup-daemons >/dev/null 2>&1 || true
     cat <<EOF > "$PLIST_PATH"
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
@@ -104,11 +109,11 @@ elif [[ "$OSTYPE" == "darwin"* ]]; then
 </dict>
 </plist>
 EOF
-    launchctl unload "$PLIST_PATH" 2>/dev/null || true
     launchctl load "$PLIST_PATH"
     echo "✅ macOS LaunchAgent installed and started. (Auto-starts on boot)"
 else
     echo "⚠️ Skipping OS-level service setup (Termux or missing systemd). Starting in background..."
+    "$TELEPTY_PATH" cleanup-daemons >/dev/null 2>&1 || true
     nohup $TELEPTY_PATH daemon > /dev/null 2>&1 &
     echo "✅ Daemon started in background. (Note: Will not auto-start on device reboot)"
 fi

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.9",
   "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/daemon-singleton.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/daemon-singleton.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/daemon-singleton.test.js test/cli.test.js test/skill-installer.test.js test/interactive-terminal.test.js"
   },
   "keywords": [],
   "author": "",