@getmonoceros/workbench 1.33.0 → 1.33.2

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(
@@ -2817,15 +2817,25 @@ function windowsSshPort(name) {
   return 49152 + h % 16384;
 }
 function windowsHostBlock(hostAlias, keyWin, port) {
-  return [
+  const head = [
     `Host ${hostAlias}`,
-    `    HostName 127.0.0.1`,
-    `    Port ${port}`,
     `    User node`,
     `    IdentityFile ${keyWin}`,
     `    IdentitiesOnly yes`,
     `    StrictHostKeyChecking no`,
     `    UserKnownHostsFile NUL`
+  ];
+  if (port !== null) {
+    return [
+      `Host ${hostAlias}`,
+      `    HostName 127.0.0.1`,
+      `    Port ${port}`,
+      ...head.slice(1)
+    ].join("\n");
+  }
+  return [
+    ...head,
+    `    ProxyCommand docker exec -i ${hostAlias} socat - TCP:127.0.0.1:22`
   ].join("\n");
 }
 function escapeRegExp2(s) {
@@ -2875,7 +2885,7 @@ async function removeMarkedBlock(configPath, hostAlias) {
     existing.replace(re, "\n").replace(/\n{3,}/g, "\n\n")
   );
 }
-async function setupWindowsBridge(name, hostAlias, privateKey, deps, logger) {
+async function setupWindowsBridge(name, hostAlias, privateKey, directPort, deps, logger) {
   if (!deps.isWsl()) return;
   const profile = await deps.resolveProfile();
   if (!profile) {
@@ -2893,7 +2903,7 @@ async function setupWindowsBridge(name, hostAlias, privateKey, deps, logger) {
   await upsertMarkedBlock(
     path9.join(profile.homeWsl, ".ssh", "config"),
     hostAlias,
-    windowsHostBlock(hostAlias, keyWin, windowsSshPort(name))
+    windowsHostBlock(hostAlias, keyWin, directPort)
   );
   await deps.lockKey(keyWin, profile.user);
   logger.info(
@@ -2942,6 +2952,7 @@ async function setupSshAttach(opts) {
       opts.name,
       hostAlias,
       keys.privateKey,
+      opts.windowsDirectPort ?? null,
       resolveWindowsDeps(opts.windows),
       logger
     );
@@ -3581,8 +3592,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) } : {}
@@ -6578,6 +6591,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),
@@ -8096,6 +8110,11 @@ Fix the value in the env file (or the yml).`
         name: opts.name,
         targetDir,
         home,
+        // Direct-port Windows block only when the runtime publishes the port
+        // (>= 1.3.5); otherwise the Windows block keeps the ProxyCommand.
+        windowsDirectPort: runtimeSupportsHostKeyPinning(
+          createOpts.runtimeVersion
+        ) ? windowsSshPort(opts.name) : null,
         ...opts.sshKeygen ? { keygen: opts.sshKeygen } : {},
         ...opts.sshUserSshDir ? { userSshDir: opts.sshUserSshDir } : {},
         logger: idLogger
@@ -8593,7 +8612,7 @@ var CLI_VERSION;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    CLI_VERSION = true ? "1.33.0" : "dev";
+    CLI_VERSION = true ? "1.33.2" : "dev";
   }
 });