tmex-cli 0.4.3 → 0.4.5

package/dist/runtime/server.js

@@ -52814,6 +52814,8 @@ class LocalExternalTmuxConnection {
   hookReadAbort = null;
   hookBuffer = "";
   bellDedup = new Map;
+  closeNotified = false;
+  cleanupPromise = null;
   fsPaths = createRuntimeFsPaths({
     deviceId: "pending",
     sessionName: "pending",
@@ -52830,6 +52832,7 @@ class LocalExternalTmuxConnection {
   }
   async connect() {
     this.manualDisconnect = false;
+    this.closeNotified = false;
     this.device = this.deps.getDevice(this.deviceId);
     if (!this.device) {
       throw new Error(`Device not found: ${this.deviceId}`);
@@ -52853,7 +52856,8 @@ class LocalExternalTmuxConnection {
     updateDeviceRuntimeStatus(this.deviceId, {
       lastSeenAt: new Date().toISOString(),
       tmuxAvailable: true,
-      lastError: null
+      lastError: null,
+      lastErrorType: null
     });
     await this.requestSnapshotInternal();
   }
@@ -53137,6 +53141,20 @@ class LocalExternalTmuxConnection {
       ])
     ]);
     if (sessionRes.exitCode !== 0 || windowsRes.exitCode !== 0 || panesRes.exitCode !== 0) {
+      const stderrBlob = `${sessionRes.stderr}
+${windowsRes.stderr}
+${panesRes.stderr}`;
+      if (this.connected && !this.manualDisconnect && this.isTmuxServerGoneMessage(stderrBlob)) {
+        const message = stderrBlob.trim().split(/\r?\n/).find((line) => line.trim())?.trim() ?? "tmux server gone";
+        console.warn(`[local] tmux server gone during snapshot on ${this.deviceId}: ${message}`);
+        updateDeviceRuntimeStatus(this.deviceId, {
+          lastSeenAt: new Date().toISOString(),
+          tmuxAvailable: false,
+          lastError: message
+        });
+        this.shutdownInternal(true);
+        return;
+      }
       this.callbacks.onSnapshot({ deviceId: this.deviceId, session: null });
       return;
     }
@@ -53382,6 +53400,10 @@ class LocalExternalTmuxConnection {
       return result;
     }
     this.notifyRuntimeError(message);
+    if (this.connected && !this.manualDisconnect && this.isTmuxServerGoneMessage(message)) {
+      console.warn(`[local] tmux server gone on ${this.deviceId}: ${message}`);
+      this.shutdownInternal(true);
+    }
     throw new Error(message);
   }
   async notifyRuntimeError(message) {
@@ -53408,6 +53430,40 @@ class LocalExternalTmuxConnection {
     const normalized = message.toLowerCase();
     return normalized.includes("can't find window") || normalized.includes("can't find pane") || normalized.includes("no such window") || normalized.includes("no such pane");
   }
+  isTmuxServerGoneMessage(message) {
+    const normalized = message.toLowerCase();
+    return normalized.includes("no server running on") || normalized.includes("no sessions") || normalized.includes("lost server") || normalized.includes("can't find session") || normalized.includes("session not found") || normalized.includes("no such session");
+  }
+  async shutdownInternal(notifyClose) {
+    if (this.cleanupPromise) {
+      await this.cleanupPromise;
+      if (notifyClose && !this.closeNotified && !this.manualDisconnect) {
+        this.closeNotified = true;
+        this.callbacks.onClose();
+      }
+      return;
+    }
+    this.connected = false;
+    this.cleanupPromise = (async () => {
+      await this.stopAllPipeReaders().catch(() => {
+        return;
+      });
+      if (this.deps.enableHooks) {
+        await this.stopHooks().catch(() => {
+          return;
+        });
+      }
+      try {
+        rmSync(this.fsPaths.rootDir, { recursive: true, force: true });
+      } catch {}
+    })();
+    await this.cleanupPromise;
+    this.cleanupPromise = null;
+    if (notifyClose && !this.closeNotified && !this.manualDisconnect) {
+      this.closeNotified = true;
+      this.callbacks.onClose();
+    }
+  }
   recoverFromTargetMissingError(message) {
     const normalized = message.toLowerCase();
     if (normalized.includes("window")) {
@@ -53560,6 +53616,16 @@ function resolvePrivateKeyFromConfig(identityFiles, deps) {
   }
   return;
 }
+function resolvePrivateKeysFromConfig(identityFiles, deps) {
+  const privateKeys = [];
+  for (const identityFile of identityFiles) {
+    if (!deps.fileExists(identityFile)) {
+      continue;
+    }
+    privateKeys.push(deps.readTextFile(identityFile));
+  }
+  return privateKeys;
+}
 function resolveSshConfigRef(device, deps) {
   const ref = device.sshConfigRef?.trim();
   if (!ref) {
@@ -53572,6 +53638,21 @@ function resolveSshConfigRef(device, deps) {
   }
   return parseSshConfigOutput(result.stdout, deps.env);
 }
+function resolveImplicitIdentityFilesForAgentAuth(device, host, port, username, deps) {
+  if (device.authMode !== "agent" || device.sshConfigRef?.trim()) {
+    return [];
+  }
+  const target = username ? `${username}@${host}` : host;
+  try {
+    const result = deps.runSync(["ssh", "-G", "-p", String(port), target]);
+    if (result.exitCode !== 0) {
+      return [];
+    }
+    return parseSshConfigOutput(result.stdout, deps.env).identityFiles;
+  } catch {
+    return [];
+  }
+}
 async function resolveSshConnectConfig(device, decrypt2, inputDeps = {}) {
   const deps = {
     env: inputDeps.env ?? process.env,
@@ -53595,6 +53676,7 @@ async function resolveSshConnectConfig(device, decrypt2, inputDeps = {}) {
   const configAgent = resolveAgentFromConfig(resolvedConfig?.identityAgent, deps);
   const envAgent = resolveSshAgentSocket("auto", sshEnv);
   const configPrivateKey = resolvePrivateKeyFromConfig(resolvedConfig?.identityFiles ?? [], deps);
+  const implicitAgentFallbackPrivateKeys = resolvePrivateKeysFromConfig(resolveImplicitIdentityFilesForAgentAuth(device, host, port, username, deps), deps);
   switch (device.authMode) {
     case "password": {
       if (!device.passwordEnc) {
@@ -53626,7 +53708,24 @@ async function resolveSshConnectConfig(device, decrypt2, inputDeps = {}) {
       break;
     }
     case "agent": {
-      authConfig.agent = configAgent ?? resolveSshAgentSocket("agent", sshEnv);
+      const agent = configAgent ?? resolveSshAgentSocket("agent", sshEnv);
+      authConfig.agent = agent;
+      if (implicitAgentFallbackPrivateKeys.length > 0) {
+        const publicKeyFallbacks = implicitAgentFallbackPrivateKeys.map((key) => ({
+          type: "publickey",
+          username,
+          key
+        }));
+        const authHandler = [
+          {
+            type: "agent",
+            username,
+            agent
+          },
+          ...publicKeyFallbacks
+        ];
+        authConfig.authHandler = authHandler;
+      }
       break;
     }
     case "configRef": {
@@ -53810,7 +53909,8 @@ class SshExternalTmuxConnection {
     updateDeviceRuntimeStatus(this.deviceId, {
       lastSeenAt: new Date().toISOString(),
       tmuxAvailable: true,
-      lastError: null
+      lastError: null,
+      lastErrorType: null
     });
     await this.requestSnapshotInternal();
   }
@@ -54042,9 +54142,11 @@ class SshExternalTmuxConnection {
         this.handleHookChunk(data.toString());
       },
       onClose: () => {
-        if (!this.manualDisconnect) {
-          this.callbacks.onError(new Error("SSH hook reader closed unexpectedly"));
+        if (this.manualDisconnect) {
+          return;
         }
+        console.error("[ssh] hook reader channel closed unexpectedly, tearing down");
+        this.shutdownInternal(true);
       }
     });
     this.hookReadAbort = () => {
@@ -54172,6 +54274,20 @@ class SshExternalTmuxConnection {
       ])
     ]);
     if (sessionRes.exitCode !== 0 || windowsRes.exitCode !== 0 || panesRes.exitCode !== 0) {
+      const stderrBlob = `${sessionRes.stderr}
+${windowsRes.stderr}
+${panesRes.stderr}`;
+      if (this.connected && !this.manualDisconnect && this.isTmuxServerGoneMessage(stderrBlob)) {
+        const message = stderrBlob.trim().split(/\r?\n/).find((line) => line.trim())?.trim() ?? "tmux server gone";
+        console.warn(`[ssh] tmux server gone during snapshot on ${this.deviceId}: ${message}`);
+        updateDeviceRuntimeStatus(this.deviceId, {
+          lastSeenAt: new Date().toISOString(),
+          tmuxAvailable: false,
+          lastError: message
+        });
+        this.shutdownInternal(true);
+        return;
+      }
       this.callbacks.onSnapshot({ deviceId: this.deviceId, session: null });
       return;
     }
@@ -54331,9 +54447,17 @@ class SshExternalTmuxConnection {
         }
       },
       onClose: () => {
-        if (!this.manualDisconnect && this.paneReaders.has(paneId)) {
-          this.callbacks.onError(new Error(`SSH pane reader closed unexpectedly: ${paneId}`));
+        if (this.manualDisconnect) {
+          return;
+        }
+        const existing = this.paneReaders.get(paneId);
+        if (!existing) {
+          return;
         }
+        console.warn(`[ssh] pane reader channel closed for ${paneId}, resync on next snapshot`);
+        this.paneReaders.delete(paneId);
+        this.runShellAllowFailure(`rm -f ${quoteShellArg(existing.fifoPath)}`);
+        this.requestSnapshot();
       }
     });
     const handle = {
@@ -54409,6 +54533,10 @@ class SshExternalTmuxConnection {
       tmuxAvailable: false,
       lastError: message
     });
+    if (this.connected && !this.manualDisconnect && this.isTmuxServerGoneMessage(message)) {
+      console.warn(`[ssh] tmux server gone on ${this.deviceId}: ${message}`);
+      this.shutdownInternal(true);
+    }
     throw new Error(message);
   }
   async runTmuxAllowFailure(argv, timeoutMs = 1e4) {
@@ -54536,6 +54664,10 @@ printf '\\036TMEX_END %s %d\\036\\n' ${quoteShellArg(commandId)} $?
     const normalized = message.toLowerCase();
     return normalized.includes("can't find window") || normalized.includes("can't find pane") || normalized.includes("no such window") || normalized.includes("no such pane");
   }
+  isTmuxServerGoneMessage(message) {
+    const normalized = message.toLowerCase();
+    return normalized.includes("no server running on") || normalized.includes("no sessions") || normalized.includes("lost server") || normalized.includes("can't find session") || normalized.includes("session not found") || normalized.includes("no such session");
+  }
   recoverFromTargetMissingError(message) {
     const normalized = message.toLowerCase();
     if (normalized.includes("window")) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tmex-cli",
-  "version": "0.4.3",
+  "version": "0.4.5",
   "type": "module",
   "bin": {
     "tmex": "./bin/tmex.js",