tmex-cli 0.4.4 → 0.4.5

package/dist/runtime/server.js

@@ -53616,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) {
@@ -53628,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,
@@ -53651,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) {
@@ -53682,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": {

package/package.json

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