@dmsdc-ai/aigentry-telepty 0.1.89 → 0.1.91

package/cli.js

@@ -357,6 +357,61 @@ function startDetachedDaemon() {
   cp.unref();
 }
 
+async function waitForDaemonHealth(maxMs = 5000) {
+  const deadline = Date.now() + maxMs;
+  while (Date.now() < deadline) {
+    try {
+      const meta = await getDaemonMeta('127.0.0.1');
+      if (meta && meta.version) return meta;
+    } catch {}
+    await new Promise(r => setTimeout(r, 300));
+  }
+  return null;
+}
+
+async function restartDaemonGraceful(options = {}) {
+  const maxAttempts = options.maxAttempts || 3;
+  const requiredCapabilities = options.requiredCapabilities || [];
+
+  for (let attempt = 1; attempt <= maxAttempts; attempt++) {
+    // (a) Kill existing daemon processes
+    const results = cleanupDaemonProcesses();
+
+    // (b) Wait up to 3s for old processes to fully exit
+    if (results.stopped.length > 0) {
+      const { isProcessRunning } = require('./daemon-control');
+      const killDeadline = Date.now() + 3000;
+      for (const item of results.stopped) {
+        while (Date.now() < killDeadline && isProcessRunning(item.pid)) {
+          await new Promise(r => setTimeout(r, 100));
+        }
+      }
+    }
+
+    // (c) Start new daemon
+    startDetachedDaemon();
+
+    // (d) Wait for new daemon to respond with correct version
+    const meta = await waitForDaemonHealth(5000);
+    if (meta && meta.version === pkg.version) {
+      const hasCapabilities = requiredCapabilities.every(c => (meta.capabilities || []).includes(c));
+      if (hasCapabilities || requiredCapabilities.length === 0) {
+        return { success: true, meta, attempt };
+      }
+    }
+
+    // Retry with backoff
+    if (attempt < maxAttempts) {
+      const backoff = 1000 * attempt;
+      process.stdout.write(`\x1b[33m⚠️ Daemon restart attempt ${attempt}/${maxAttempts} failed. Retrying in ${backoff / 1000}s...\x1b[0m\n`);
+      await new Promise(r => setTimeout(r, backoff));
+    }
+  }
+
+  console.error(`\x1b[31m❌ Daemon restart failed after ${maxAttempts} attempts. Run "telepty daemon" manually to start.\x1b[0m`);
+  return { success: false, meta: null, attempt: maxAttempts };
+}
+
 function renderInteractiveHeader() {
   const runtimeInfo = getRuntimeInfo(__dirname);
   console.clear();
@@ -403,14 +458,13 @@ async function repairLocalDaemon(options = {}) {
     return { stopped: results.stopped.length, failed: results.failed.length, meta: null };
   }
 
-  startDetachedDaemon();
-  await new Promise((resolve) => setTimeout(resolve, 1000));
-  const meta = await getDaemonMeta('127.0.0.1');
-  const versionMatch = meta && meta.version === pkg.version;
-  if (meta && !versionMatch) {
-    process.stdout.write(`\x1b[33m⚠️ Daemon restarted but version mismatch (running v${meta.version}, expected v${pkg.version})\x1b[0m\n`);
-  }
-  return { stopped: results.stopped.length, failed: results.failed.length, meta, versionMatch };
+  const restartResult = await restartDaemonGraceful();
+  return {
+    stopped: results.stopped.length,
+    failed: results.failed.length,
+    meta: restartResult.meta,
+    versionMatch: restartResult.success
+  };
 }
 
 function getDiscoveryHosts() {
@@ -477,30 +531,22 @@ async function ensureDaemonRunning(options = {}) {
       // Version mismatch: running daemon is older than installed CLI
       if (meta && meta.version !== pkg.version) {
         process.stdout.write(`\x1b[33m⚙️ Daemon version mismatch (running v${meta.version}, installed v${pkg.version}). Restarting...\x1b[0m\n`);
-        cleanupDaemonProcesses();
+        await restartDaemonGraceful({ requiredCapabilities });
+        return;
       } else {
         return;
       }
     } else 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. Open telepty and choose "Repair local daemon", or rerun the installer.');
-  }
+  await restartDaemonGraceful({ requiredCapabilities });
 }
 
 async function manageInteractiveAttach(sessionId, targetHost) {

package/package.json

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