@getmonoceros/workbench 1.33.2 → 1.33.4

package/dist/bin.js

@@ -2239,6 +2239,10 @@ function runtimeSupportsHostKeyPinning(version) {
   if (!version) return false;
   return compareRuntimeVersions(version, MIN_RUNTIME_FOR_HOST_KEY_PINNING) >= 0;
 }
+function runtimeSupportsEntrypointSshd(version) {
+  if (!version) return false;
+  return compareRuntimeVersions(version, MIN_RUNTIME_FOR_ENTRYPOINT_SSHD) >= 0;
+}
 function descriptorOptionDefaults(options) {
   const out = {};
   for (const [key, spec] of Object.entries(options)) {
@@ -2365,7 +2369,7 @@ function deriveServiceName(image) {
   const noTag = lastSegment.split("@")[0].split(":")[0];
   return noTag.toLowerCase().replace(/[^a-z0-9_-]/g, "-");
 }
-var DEFAULT_BASE_IMAGE, override, BASE_IMAGE, RUNTIME_IMAGE_REPO, DEFAULT_RUNTIME_VERSION, MIN_RUNTIME_FOR_SSH_ATTACH, MIN_RUNTIME_FOR_HOST_KEY_PINNING, MIN_RUNTIME_FOR_BROWSER_BRIDGE, DESCRIPTORS, BUILTIN_LANGUAGES, LANGUAGE_CATALOG, LANGUAGE_SPEC_RE, SERVICE_CATALOG, DEFERRED_SERVICE_PROFILE;
+var DEFAULT_BASE_IMAGE, override, BASE_IMAGE, RUNTIME_IMAGE_REPO, DEFAULT_RUNTIME_VERSION, MIN_RUNTIME_FOR_SSH_ATTACH, MIN_RUNTIME_FOR_HOST_KEY_PINNING, MIN_RUNTIME_FOR_ENTRYPOINT_SSHD, MIN_RUNTIME_FOR_BROWSER_BRIDGE, DESCRIPTORS, BUILTIN_LANGUAGES, LANGUAGE_CATALOG, LANGUAGE_SPEC_RE, SERVICE_CATALOG, DEFERRED_SERVICE_PROFILE;
 var init_catalog = __esm({
   "src/create/catalog.ts"() {
     "use strict";
@@ -2374,7 +2378,7 @@ 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.5" : readFileSync3(
+    DEFAULT_RUNTIME_VERSION = true ? "1.3.6" : readFileSync3(
       fileURLToPath2(
         new URL("../../../../images/runtime/VERSION", import.meta.url)
       ),
@@ -2382,6 +2386,7 @@ var init_catalog = __esm({
     ).trim();
     MIN_RUNTIME_FOR_SSH_ATTACH = "1.2.0";
     MIN_RUNTIME_FOR_HOST_KEY_PINNING = "1.3.5";
+    MIN_RUNTIME_FOR_ENTRYPOINT_SSHD = "1.3.6";
     MIN_RUNTIME_FOR_BROWSER_BRIDGE = "1.3.3";
     DESCRIPTORS = loadDescriptorCatalogSync();
     BUILTIN_LANGUAGES = new Set(
@@ -2718,16 +2723,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 +2947,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 +2960,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 +2974,8 @@ async function setupSshAttach(opts) {
       opts.name,
       hostAlias,
       keys.privateKey,
-      opts.windowsDirectPort ?? null,
-      resolveWindowsDeps(opts.windows),
+      directPort,
+      winDeps,
       logger
     );
   } catch (err) {
@@ -3635,6 +3657,9 @@ function buildDevcontainerJson(opts, dockerMode = "rootful") {
   if (sshBridgePort !== null) {
     runArgs.push("-p", `127.0.0.1:${sshBridgePort}:${sshBridgePort}`);
   }
+  const overrideCommandField = runtimeSupportsEntrypointSshd(
+    opts.runtimeVersion
+  ) ? { overrideCommand: false } : {};
   return {
     name: opts.name,
     image: resolveRuntimeImage(opts.runtimeVersion),
@@ -3645,6 +3670,7 @@ function buildDevcontainerJson(opts, dockerMode = "rootful") {
     forwardPorts: ports,
     postCreateCommand: ".devcontainer/post-create.sh",
     ...sshPostStart,
+    ...overrideCommandField,
     ...containerEnvField ?? {},
     ...featuresField ?? {},
     ...customizationsField ?? {}
@@ -8612,7 +8638,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.4" : "dev";
   }
 });