@dmsdc-ai/aigentry-telepty 0.1.70 → 0.1.72

package/cli.js

@@ -643,6 +643,11 @@ async function main() {
       allowArgs.splice(idIndex, 2);
     }
 
+    // Extract --auto-restart flag
+    const autoRestartIndex = allowArgs.indexOf('--auto-restart');
+    const autoRestart = autoRestartIndex !== -1;
+    if (autoRestart) allowArgs.splice(autoRestartIndex, 1);
+
     // Strip optional -- separator for backward compat
     const sepIndex = allowArgs.indexOf('--');
     if (sepIndex !== -1) allowArgs.splice(sepIndex, 1);
@@ -708,13 +713,60 @@ async function main() {
 
     // Spawn local PTY (preserves isTTY, env, shell config)
     const pty = require('node-pty');
-    const child = pty.spawn(command, cmdArgs, {
-      name: 'xterm-256color',
-      cols: process.stdout.columns || 80,
-      rows: process.stdout.rows || 30,
-      cwd: process.cwd(),
-      env: { ...process.env, TELEPTY_SESSION_ID: sessionId }
-    });
+    const sessionCwd = process.cwd();
+    const sessionEnv = { ...process.env, TELEPTY_SESSION_ID: sessionId };
+    let child = null;
+    let sessionStartTime = Date.now();
+    let crashCount = 0;
+    const MAX_CRASHES = 3;
+    const DEATH_LOG_PATH = path.join(os.homedir(), '.telepty', 'logs', 'session-deaths.log');
+
+    function logSessionDeath(exitCode, signal, duration) {
+      try {
+        fs.mkdirSync(path.dirname(DEATH_LOG_PATH), { recursive: true });
+        const entry = `[${new Date().toISOString()}] session=${sessionId} command=${command} exit=${exitCode} signal=${signal || 'none'} duration=${Math.round(duration / 1000)}s crashes=${crashCount}\n`;
+        fs.appendFileSync(DEATH_LOG_PATH, entry);
+      } catch {}
+    }
+
+    function emitDeathEvent(exitCode, signal, willRestart) {
+      if (wsReady && daemonWs && daemonWs.readyState === 1) {
+        daemonWs.send(JSON.stringify({
+          type: 'session_died',
+          session_id: sessionId,
+          exitCode, signal: signal || null,
+          duration: Date.now() - sessionStartTime,
+          crashCount,
+          willRestart,
+          timestamp: new Date().toISOString()
+        }));
+      }
+    }
+
+    function emitRestartEvent(attempt) {
+      if (wsReady && daemonWs && daemonWs.readyState === 1) {
+        daemonWs.send(JSON.stringify({
+          type: 'session_restarted',
+          session_id: sessionId,
+          attempt,
+          timestamp: new Date().toISOString()
+        }));
+      }
+    }
+
+    function spawnChild() {
+      child = pty.spawn(command, cmdArgs, {
+        name: 'xterm-256color',
+        cols: process.stdout.columns || 80,
+        rows: process.stdout.rows || 30,
+        cwd: sessionCwd,
+        env: sessionEnv
+      });
+      sessionStartTime = Date.now();
+      return child;
+    }
+
+    spawnChild();
 
     // Prompt-ready detection for safe inject delivery
     const PROMPT_PATTERNS = {
@@ -726,10 +778,19 @@ async function main() {
     const promptPattern = PROMPT_PATTERNS[cmdBase] || /[❯>$#%]\s*$/;
     let promptReady = false;  // wait for CLI prompt before accepting inject
     const injectQueue = [];
+    let lastUserInputTime = 0;  // timestamp of last user keystroke
+    const IDLE_THRESHOLD = 2000; // ms after last user input to consider idle
+
+    function isIdle() {
+      return promptReady && (Date.now() - lastUserInputTime > IDLE_THRESHOLD);
+    }
 
     let queueFlushTimer = null;
+    let idleCheckTimer = null;
+
     function flushInjectQueue() {
       if (queueFlushTimer) { clearTimeout(queueFlushTimer); queueFlushTimer = null; }
+      if (idleCheckTimer) { clearInterval(idleCheckTimer); idleCheckTimer = null; }
       if (injectQueue.length === 0) return;
       const batch = injectQueue.splice(0);
       let delay = 0;
@@ -739,14 +800,23 @@ async function main() {
       }
       promptReady = false;
     }
-    function scheduleQueueFlush() {
-      if (queueFlushTimer) return;
-      queueFlushTimer = setTimeout(() => {
-        queueFlushTimer = null;
-        if (injectQueue.length > 0) {
+    function scheduleIdleFlush() {
+      if (idleCheckTimer) return;
+      // Poll every 500ms for idle state
+      idleCheckTimer = setInterval(() => {
+        if (isIdle() && injectQueue.length > 0) {
           flushInjectQueue();
         }
-      }, 15000);
+      }, 500);
+      // Safety: flush after 15s regardless (prevent stuck queue)
+      if (!queueFlushTimer) {
+        queueFlushTimer = setTimeout(() => {
+          queueFlushTimer = null;
+          if (injectQueue.length > 0) {
+            flushInjectQueue();
+          }
+        }, 15000);
+      }
     }
 
     // Connect to daemon WebSocket with auto-reconnect
@@ -806,15 +876,18 @@ async function main() {
               injectQueue.push(msg.data);
               if (queueFlushTimer) { clearTimeout(queueFlushTimer); queueFlushTimer = null; }
               flushInjectQueue();
-            } else if (isCr || promptReady) {
+            } else if (isCr && isIdle()) {
+              // CR when idle — write immediately
+              child.write(msg.data);
+            } else if (!isCr && isIdle()) {
+              // Text when idle — write immediately
               child.write(msg.data);
-              if (!isCr && msg.data.length > 1) {
-                promptReady = false;
-                lastInjectTextTime = Date.now();
-              }
+              promptReady = false;
+              lastInjectTextTime = Date.now();
             } else {
+              // Not idle (user typing or CLI busy) — queue for safe delivery
               injectQueue.push(msg.data);
-              scheduleQueueFlush();
+              scheduleIdleFlush();
             }
           } else if (msg.type === 'resize') {
             child.resize(msg.cols, msg.rows);
@@ -855,6 +928,7 @@ async function main() {
 
     const cleanupTerminal = attachInteractiveTerminal(process.stdin, process.stdout, {
       onData: (data) => {
+        lastUserInputTime = Date.now();
         child.write(data.toString());
       },
       onResize: () => {
@@ -917,14 +991,64 @@ async function main() {
       }
     });
 
-    // Handle child exit
-    child.onExit(({ exitCode }) => {
-      if (!closeAllowSession()) {
-        return;
-      }
-      console.log(`\n\x1b[33mSession '${sessionId}' exited (code ${exitCode}).\x1b[0m`);
-      exitAllowSession(exitCode || 0);
-    });
+    // Handle child exit with death tracking + auto-restart
+    function attachChildExitHandler() {
+      child.onExit(({ exitCode, signal }) => {
+        const duration = Date.now() - sessionStartTime;
+        const isAbnormal = exitCode !== 0 || signal;
+        const durationStr = duration > 60000 ? `${Math.round(duration / 60000)}m ${Math.round((duration % 60000) / 1000)}s` : `${Math.round(duration / 1000)}s`;
+
+        logSessionDeath(exitCode, signal, duration);
+
+        if (isAbnormal && autoRestart && crashCount < MAX_CRASHES) {
+          crashCount++;
+          const backoffMs = Math.min(1000 * Math.pow(2, crashCount - 1), 8000);
+          const willRestart = true;
+          emitDeathEvent(exitCode, signal, willRestart);
+          console.log(`\n\x1b[33m⚠️ Session '${sessionId}' died (code ${exitCode}, signal ${signal || 'none'}, ${durationStr}). Restarting in ${backoffMs}ms (attempt ${crashCount}/${MAX_CRASHES})...\x1b[0m`);
+
+          setTimeout(() => {
+            try {
+              spawnChild();
+              // Re-attach output relay, prompt detection, and exit handler
+              child.onData((data) => {
+                const rewritten = rewriteTitleSequences(data);
+                process.stdout.write(rewritten);
+                if (wsReady && daemonWs.readyState === 1) {
+                  daemonWs.send(JSON.stringify({ type: 'output', data }));
+                }
+                if (promptPattern.test(data)) {
+                  promptReady = true;
+                  flushInjectQueue();
+                  if (wsReady && daemonWs.readyState === 1) {
+                    daemonWs.send(JSON.stringify({ type: 'ready' }));
+                  }
+                }
+              });
+              attachChildExitHandler();
+              emitRestartEvent(crashCount);
+              console.log(`\x1b[32m✅ Session '${sessionId}' restarted (attempt ${crashCount}).\x1b[0m\n`);
+              // Reset crash counter if session survives 30s
+              setTimeout(() => { if (crashCount > 0) crashCount = 0; }, 30000);
+            } catch (err) {
+              console.error(`\x1b[31m❌ Failed to restart session '${sessionId}': ${err.message}\x1b[0m`);
+              emitDeathEvent(exitCode, signal, false);
+              if (!closeAllowSession()) return;
+              exitAllowSession(exitCode || 1);
+            }
+          }, backoffMs);
+        } else {
+          if (isAbnormal && autoRestart && crashCount >= MAX_CRASHES) {
+            console.log(`\n\x1b[31m❌ Session '${sessionId}' crashed ${MAX_CRASHES} times. Giving up.\x1b[0m`);
+          }
+          emitDeathEvent(exitCode, signal, false);
+          if (!closeAllowSession()) return;
+          console.log(`\n\x1b[33mSession '${sessionId}' exited (code ${exitCode}${signal ? ', signal ' + signal : ''}, ${durationStr}).\x1b[0m`);
+          exitAllowSession(exitCode || 0);
+        }
+      });
+    }
+    attachChildExitHandler();
 
     for (const signalName of ['SIGTERM', 'SIGHUP', 'SIGQUIT']) {
       const handler = () => {
@@ -2093,7 +2217,7 @@ Discuss the following topic from your project's perspective. Engage with other s
 Usage:
   telepty daemon                                 Start the background daemon
   telepty spawn --id <id> <command> [args...]    Spawn a new background CLI
-  telepty allow [--id <id>] <command> [args...]       Allow inject on a CLI
+  telepty allow [--id <id>] [--auto-restart] <command> [args...]  Allow inject on a CLI (auto-restart on crash)
   telepty list                                   List all active sessions across discovered hosts
   telepty attach [id[@host]]                     Attach to a session (Interactive picker if no ID)
   telepty inject [--no-enter] [--from <id>] [--reply-to <id>] <id[@host]> "<prompt>"    Inject text into a single session

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dmsdc-ai/aigentry-telepty",
-  "version": "0.1.70",
+  "version": "0.1.72",
   "main": "daemon.js",
   "bin": {
     "aigentry-telepty": "install.js",