@getmonoceros/workbench 1.33.2 → 1.33.3

package/dist/bin.js

@@ -2718,16 +2718,25 @@ fi
 exec docker exec -i "$cid" socat - TCP:127.0.0.1:22
 `;
 }
-function configEntryContent(name, hostAlias, privateKey, proxyScript) {
-  return `# Generated by Monoceros (ADR 0022) - do not edit.
+function configEntryContent(name, hostAlias, privateKey, proxyScript, directPort) {
+  const head = `# Generated by Monoceros (ADR 0022) - do not edit.
 # Attach an SSH-capable IDE (Codium, IntelliJ, Zed) to host
 # '${hostAlias}', or run: ssh ${hostAlias}
-Host ${hostAlias}
-    User node
+Host ${hostAlias}`;
+  const common = `    User node
     IdentityFile "${privateKey}"
     IdentitiesOnly yes
     StrictHostKeyChecking no
-    UserKnownHostsFile /dev/null
+    UserKnownHostsFile /dev/null`;
+  if (directPort !== null) {
+    return `${head}
+    HostName 127.0.0.1
+    Port ${directPort}
+${common}
+`;
+  }
+  return `${head}
+${common}
     ProxyCommand "${proxyScript}"
 `;
 }
@@ -2933,6 +2942,8 @@ async function setupSshAttach(opts) {
   if (!keys) return { hostAlias, configured: false };
   const proxyScript = sshProxyScriptPath(opts.home, opts.name);
   const configEntry = sshConfigEntryPath(opts.home, opts.name);
+  const winDeps = resolveWindowsDeps(opts.windows);
+  const directPort = winDeps.isWsl() ? opts.windowsDirectPort ?? null : null;
   await fs7.mkdir(path9.dirname(proxyScript), { recursive: true });
   await fs7.mkdir(path9.dirname(configEntry), { recursive: true });
   await fs7.writeFile(
@@ -2944,7 +2955,13 @@ async function setupSshAttach(opts) {
   });
   await fs7.writeFile(
     configEntry,
-    configEntryContent(opts.name, hostAlias, keys.privateKey, proxyScript)
+    configEntryContent(
+      opts.name,
+      hostAlias,
+      keys.privateKey,
+      proxyScript,
+      directPort
+    )
   );
   await ensureInclude(userSshDir, opts.home);
   try {
@@ -2952,8 +2969,8 @@ async function setupSshAttach(opts) {
       opts.name,
       hostAlias,
       keys.privateKey,
-      opts.windowsDirectPort ?? null,
-      resolveWindowsDeps(opts.windows),
+      directPort,
+      winDeps,
       logger
     );
   } catch (err) {
@@ -8612,7 +8629,7 @@ var CLI_VERSION;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    CLI_VERSION = true ? "1.33.2" : "dev";
+    CLI_VERSION = true ? "1.33.3" : "dev";
   }
 });