@getmonoceros/workbench 1.33.1 → 1.33.3

package/dist/bin.js

@@ -2374,14 +2374,14 @@ var init_catalog = __esm({
     override = process.env.MONOCEROS_BASE_IMAGE_OVERRIDE?.trim();
     BASE_IMAGE = override && override.length > 0 ? override : DEFAULT_BASE_IMAGE;
     RUNTIME_IMAGE_REPO = "ghcr.io/getmonoceros/monoceros-runtime";
-    DEFAULT_RUNTIME_VERSION = true ? "1.3.4" : readFileSync3(
+    DEFAULT_RUNTIME_VERSION = true ? "1.3.5" : readFileSync3(
       fileURLToPath2(
         new URL("../../../../images/runtime/VERSION", import.meta.url)
       ),
       "utf8"
     ).trim();
     MIN_RUNTIME_FOR_SSH_ATTACH = "1.2.0";
-    MIN_RUNTIME_FOR_HOST_KEY_PINNING = "1.3.4";
+    MIN_RUNTIME_FOR_HOST_KEY_PINNING = "1.3.5";
     MIN_RUNTIME_FOR_BROWSER_BRIDGE = "1.3.3";
     DESCRIPTORS = loadDescriptorCatalogSync();
     BUILTIN_LANGUAGES = new Set(
@@ -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) {
@@ -3592,8 +3609,10 @@ function buildDevcontainerJson(opts, dockerMode = "rootful") {
       }
     }
   } : void 0;
-  const sshPostStart = runtimeSupportsSshAttach(opts.runtimeVersion) ? { postStartCommand: "sudo /usr/local/bin/monoceros-sshd-up.sh" } : {};
   const sshBridgePort = windowsBridgePort(opts);
+  const sshPostStart = runtimeSupportsSshAttach(opts.runtimeVersion) ? {
+    postStartCommand: `sudo /usr/local/bin/monoceros-sshd-up.sh${sshBridgePort !== null ? ` ${sshBridgePort}` : ""}`
+  } : {};
   const workspaceEnv = {
     ...featureWorkspaceEnv(resolvedFeatures),
     ...sshBridgePort ? { MONOCEROS_SSH_PUBLISH_PORT: String(sshBridgePort) } : {}
@@ -6589,6 +6608,7 @@ async function runBridgeDaemon(opts) {
   const dockerExec = opts.dockerExec ?? spawnDocker;
   const lifecheckMs = opts.lifecheckMs ?? 5e3;
   await fsp5.mkdir(relayDir(root), { recursive: true });
+  await fsp5.rm(relayUrlFile(root), { force: true });
   await fsp5.writeFile(bridgePidFile(root), String(process.pid));
   const watcher = watchRelayUrl({
     urlFile: relayUrlFile(root),
@@ -8108,7 +8128,7 @@ Fix the value in the env file (or the yml).`
         targetDir,
         home,
         // Direct-port Windows block only when the runtime publishes the port
-        // (>= 1.3.4); otherwise the Windows block keeps the ProxyCommand.
+        // (>= 1.3.5); otherwise the Windows block keeps the ProxyCommand.
         windowsDirectPort: runtimeSupportsHostKeyPinning(
           createOpts.runtimeVersion
         ) ? windowsSshPort(opts.name) : null,
@@ -8609,7 +8629,7 @@ var CLI_VERSION;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    CLI_VERSION = true ? "1.33.1" : "dev";
+    CLI_VERSION = true ? "1.33.3" : "dev";
   }
 });