@getmonoceros/workbench 1.32.0 → 1.33.0

package/dist/bin.js

@@ -2235,6 +2235,10 @@ function runtimeSupportsBrowserBridge(version) {
   if (!version) return false;
   return compareRuntimeVersions(version, MIN_RUNTIME_FOR_BROWSER_BRIDGE) >= 0;
 }
+function runtimeSupportsHostKeyPinning(version) {
+  if (!version) return false;
+  return compareRuntimeVersions(version, MIN_RUNTIME_FOR_HOST_KEY_PINNING) >= 0;
+}
 function descriptorOptionDefaults(options) {
   const out = {};
   for (const [key, spec] of Object.entries(options)) {
@@ -2361,7 +2365,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_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_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";
@@ -2370,13 +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.3" : readFileSync3(
+    DEFAULT_RUNTIME_VERSION = true ? "1.3.4" : 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_BROWSER_BRIDGE = "1.3.3";
     DESCRIPTORS = loadDescriptorCatalogSync();
     BUILTIN_LANGUAGES = new Set(
@@ -2638,9 +2643,398 @@ var init_claude_settings = __esm({
   }
 });
 
+// src/devcontainer/ssh-attach.ts
+import { spawn as spawn4 } from "child_process";
+import { promises as fs7 } from "fs";
+import { existsSync as existsSync6, readFileSync as readFileSync4 } from "fs";
+import os2 from "os";
+import path9 from "path";
+function sshHomeDir(home) {
+  return path9.join(home, "ssh");
+}
+function sshConfigEntryPath(home, name) {
+  return path9.join(sshHomeDir(home), "config.d", name);
+}
+function sshProxyScriptPath(home, name) {
+  return path9.join(sshHomeDir(home), `exec-${name}.sh`);
+}
+function privateKeyPath(targetDir) {
+  return path9.join(targetDir, ".monoceros", "ssh", "id_ed25519");
+}
+async function ensureKeypair(targetDir, name, keygen, logger) {
+  const privateKey = privateKeyPath(targetDir);
+  const publicKey = `${privateKey}.pub`;
+  if (existsSync6(privateKey) && existsSync6(publicKey)) {
+    return { privateKey, publicKey };
+  }
+  await fs7.mkdir(path9.dirname(privateKey), { recursive: true });
+  try {
+    const res = await keygen([
+      "-t",
+      "ed25519",
+      "-N",
+      "",
+      "-f",
+      privateKey,
+      "-C",
+      `monoceros-${name}`,
+      "-q"
+    ]);
+    if (res.exitCode !== 0) {
+      logger.warn(
+        `ssh-keygen failed (exit ${res.exitCode})${res.stderr ? `: ${res.stderr.trim()}` : ""}; IDE SSH attach not set up.`
+      );
+      return null;
+    }
+  } catch (err) {
+    logger.warn(
+      `ssh-keygen not runnable (${err instanceof Error ? err.message : String(err)}); IDE SSH attach not set up.`
+    );
+    return null;
+  }
+  return { privateKey, publicKey };
+}
+function proxyScriptContent(name, targetDir) {
+  return `#!/bin/sh
+# Generated by Monoceros (ADR 0022) - do not edit.
+# Portless SSH transport into the running dev container '${name}'.
+# Resolves the container by the devcontainer.local_folder label (the
+# same handle 'monoceros shell' uses), so it follows rebuilds.
+set -e
+# GUI launchers (IDEs, Claude Desktop) start a ProxyCommand with a
+# minimal PATH: on macOS launchd hands out only /usr/bin:/bin:/usr/sbin:
+# /sbin, so a bare \`docker\` (Docker Desktop installs it under
+# /usr/local/bin or /opt/homebrew/bin) isn't found. Prepend the common
+# Docker locations so the same script works from a login shell and a GUI
+# launcher alike.
+PATH="/usr/local/bin:/opt/homebrew/bin:/Applications/Docker.app/Contents/Resources/bin:$PATH"
+cid=$(docker ps -q \\
+  --filter "label=devcontainer.local_folder=${targetDir}" \\
+  --filter status=running | head -n1)
+if [ -z "$cid" ]; then
+  echo "monoceros: dev container '${name}' is not running. Start it with: monoceros apply ${name}" >&2
+  exit 1
+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.
+# Attach an SSH-capable IDE (Codium, IntelliJ, Zed) to host
+# '${hostAlias}', or run: ssh ${hostAlias}
+Host ${hostAlias}
+    User node
+    IdentityFile "${privateKey}"
+    IdentitiesOnly yes
+    StrictHostKeyChecking no
+    UserKnownHostsFile /dev/null
+    ProxyCommand "${proxyScript}"
+`;
+}
+async function ensureInclude(userSshDir, home) {
+  const configPath = path9.join(userSshDir, "config");
+  const includeTarget = path9.join(sshHomeDir(home), "config.d", "*");
+  const includeLine = `Include "${includeTarget}"`;
+  await fs7.mkdir(userSshDir, { recursive: true });
+  let existing = "";
+  try {
+    existing = await fs7.readFile(configPath, "utf8");
+  } catch {
+    existing = "";
+  }
+  if (existing.includes(includeTarget)) return;
+  const banner = "# Added by Monoceros (ADR 0022): per-container SSH attach entries.";
+  const prefix = `${banner}
+${includeLine}
+`;
+  const next = existing.length > 0 ? `${prefix}
+${existing}` : prefix;
+  await fs7.writeFile(configPath, next, { mode: 384 });
+  await fs7.chmod(configPath, 384).catch(() => {
+  });
+}
+function runCapture(cmd, args) {
+  return new Promise((resolve, reject) => {
+    const child = spawn4(cmd, args, {
+      stdio: ["ignore", "pipe", "ignore"]
+    });
+    let stdout = "";
+    child.stdout.on("data", (c) => {
+      stdout += c.toString();
+    });
+    child.on("error", reject);
+    child.on("exit", (code) => resolve({ stdout, exitCode: code ?? 0 }));
+  });
+}
+function isWsl() {
+  try {
+    if (process.env.WSL_DISTRO_NAME) return true;
+    const rel = readFileSync4(
+      "/proc/sys/kernel/osrelease",
+      "utf8"
+    ).toLowerCase();
+    return rel.includes("microsoft") || rel.includes("wsl");
+  } catch {
+    return false;
+  }
+}
+async function resolveWindowsProfile() {
+  try {
+    const r = await runCapture("cmd.exe", ["/c", "echo %USERPROFILE%"]);
+    const homeWin = r.stdout.replace(/\r/g, "").trim();
+    if (r.exitCode !== 0 || !homeWin || homeWin.includes("%USERPROFILE%")) {
+      return null;
+    }
+    const w = await runCapture("wslpath", ["-u", homeWin]);
+    const homeWsl = w.stdout.trim();
+    const user = homeWin.split("\\").pop() ?? "";
+    if (w.exitCode !== 0 || !homeWsl || !user) return null;
+    return { homeWsl, homeWin, user };
+  } catch {
+    return null;
+  }
+}
+async function realLockWindowsKey(winKeyPath, user) {
+  await runCapture("icacls.exe", [
+    winKeyPath,
+    "/inheritance:r",
+    "/grant:r",
+    `${user}:R`
+  ]);
+}
+function resolveWindowsDeps(d) {
+  return {
+    isWsl: d?.isWsl ?? isWsl,
+    resolveProfile: d?.resolveProfile ?? resolveWindowsProfile,
+    lockKey: d?.lockKey ?? realLockWindowsKey
+  };
+}
+function windowsSshPort(name) {
+  let h = 0;
+  for (let i = 0; i < name.length; i++) {
+    h = h * 31 + name.charCodeAt(i) >>> 0;
+  }
+  return 49152 + h % 16384;
+}
+function windowsHostBlock(hostAlias, keyWin, port) {
+  return [
+    `Host ${hostAlias}`,
+    `    HostName 127.0.0.1`,
+    `    Port ${port}`,
+    `    User node`,
+    `    IdentityFile ${keyWin}`,
+    `    IdentitiesOnly yes`,
+    `    StrictHostKeyChecking no`,
+    `    UserKnownHostsFile NUL`
+  ].join("\n");
+}
+function escapeRegExp2(s) {
+  return s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+function blockMarkers(hostAlias) {
+  return {
+    begin: `# >>> monoceros ${hostAlias} >>>`,
+    end: `# <<< monoceros ${hostAlias} <<<`
+  };
+}
+async function upsertMarkedBlock(configPath, hostAlias, body) {
+  const { begin, end } = blockMarkers(hostAlias);
+  const section = `${begin}
+${body}
+${end}`;
+  await fs7.mkdir(path9.dirname(configPath), { recursive: true });
+  let existing = "";
+  try {
+    existing = await fs7.readFile(configPath, "utf8");
+  } catch {
+    existing = "";
+  }
+  const re = new RegExp(`${escapeRegExp2(begin)}[\\s\\S]*?${escapeRegExp2(end)}`);
+  if (re.test(existing)) {
+    await fs7.writeFile(configPath, existing.replace(re, section));
+    return;
+  }
+  const sep = existing.length === 0 || existing.endsWith("\n") ? "" : "\n";
+  await fs7.writeFile(configPath, `${existing}${sep}${section}
+`);
+}
+async function removeMarkedBlock(configPath, hostAlias) {
+  let existing = "";
+  try {
+    existing = await fs7.readFile(configPath, "utf8");
+  } catch {
+    return;
+  }
+  const { begin, end } = blockMarkers(hostAlias);
+  const re = new RegExp(
+    `\\n?${escapeRegExp2(begin)}[\\s\\S]*?${escapeRegExp2(end)}\\n?`,
+    "g"
+  );
+  await fs7.writeFile(
+    configPath,
+    existing.replace(re, "\n").replace(/\n{3,}/g, "\n\n")
+  );
+}
+async function setupWindowsBridge(name, hostAlias, privateKey, deps, logger) {
+  if (!deps.isWsl()) return;
+  const profile = await deps.resolveProfile();
+  if (!profile) {
+    logger.warn(
+      "WSL detected but the Windows user profile could not be resolved; skipping the Windows SSH bridge."
+    );
+    return;
+  }
+  const monoDir = path9.join(profile.homeWsl, ".ssh", "monoceros");
+  await fs7.mkdir(monoDir, { recursive: true });
+  const keyDst = path9.join(monoDir, name);
+  await fs7.rm(keyDst, { force: true });
+  await fs7.copyFile(privateKey, keyDst);
+  const keyWin = `${profile.homeWin}\\.ssh\\monoceros\\${name}`;
+  await upsertMarkedBlock(
+    path9.join(profile.homeWsl, ".ssh", "config"),
+    hostAlias,
+    windowsHostBlock(hostAlias, keyWin, windowsSshPort(name))
+  );
+  await deps.lockKey(keyWin, profile.user);
+  logger.info(
+    `Windows SSH bridge ready: \`ssh ${hostAlias}\` (Codium/Gateway too).`
+  );
+}
+async function removeWindowsBridge(name, hostAlias, deps) {
+  if (!deps.isWsl()) return;
+  const profile = await deps.resolveProfile();
+  if (!profile) return;
+  await fs7.rm(path9.join(profile.homeWsl, ".ssh", "monoceros", name), {
+    force: true
+  });
+  await removeMarkedBlock(
+    path9.join(profile.homeWsl, ".ssh", "config"),
+    hostAlias
+  );
+}
+async function setupSshAttach(opts) {
+  const hostAlias = `monoceros-${opts.name}`;
+  const logger = opts.logger ?? { info: () => {
+  }, warn: () => {
+  } };
+  const keygen = opts.keygen ?? realKeygen;
+  const userSshDir = opts.userSshDir ?? path9.join(os2.homedir(), ".ssh");
+  const keys = await ensureKeypair(opts.targetDir, opts.name, keygen, logger);
+  if (!keys) return { hostAlias, configured: false };
+  const proxyScript = sshProxyScriptPath(opts.home, opts.name);
+  const configEntry = sshConfigEntryPath(opts.home, opts.name);
+  await fs7.mkdir(path9.dirname(proxyScript), { recursive: true });
+  await fs7.mkdir(path9.dirname(configEntry), { recursive: true });
+  await fs7.writeFile(
+    proxyScript,
+    proxyScriptContent(opts.name, opts.targetDir),
+    { mode: 493 }
+  );
+  await fs7.chmod(proxyScript, 493).catch(() => {
+  });
+  await fs7.writeFile(
+    configEntry,
+    configEntryContent(opts.name, hostAlias, keys.privateKey, proxyScript)
+  );
+  await ensureInclude(userSshDir, opts.home);
+  try {
+    await setupWindowsBridge(
+      opts.name,
+      hostAlias,
+      keys.privateKey,
+      resolveWindowsDeps(opts.windows),
+      logger
+    );
+  } catch (err) {
+    logger.warn(
+      `Windows SSH bridge skipped: ${err instanceof Error ? err.message : String(err)}`
+    );
+  }
+  return { hostAlias, configured: true };
+}
+async function upsertKnownHost(knownHostsPath, hostId, typeAndKey) {
+  await fs7.mkdir(path9.dirname(knownHostsPath), { recursive: true });
+  let existing = "";
+  try {
+    existing = await fs7.readFile(knownHostsPath, "utf8");
+  } catch {
+    existing = "";
+  }
+  const kept = existing.split("\n").filter((l) => l.trim().length > 0 && l.split(/\s+/)[0] !== hostId);
+  const next = `${[...kept, `${hostId} ${typeAndKey}`].join("\n")}
+`;
+  await fs7.writeFile(knownHostsPath, next);
+}
+async function recordHostKey(opts) {
+  const pubPath = path9.join(
+    opts.targetDir,
+    ".monoceros",
+    "ssh",
+    "host",
+    "ssh_host_ed25519_key.pub"
+  );
+  let line = "";
+  try {
+    line = (await fs7.readFile(pubPath, "utf8")).trim();
+  } catch {
+    return;
+  }
+  const parts = line.split(/\s+/);
+  if (parts.length < 2) return;
+  const typeAndKey = `${parts[0]} ${parts[1]}`;
+  const userSshDir = opts.userSshDir ?? path9.join(os2.homedir(), ".ssh");
+  await upsertKnownHost(
+    path9.join(userSshDir, "known_hosts"),
+    `monoceros-${opts.name}`,
+    typeAndKey
+  );
+  const deps = resolveWindowsDeps(opts.windows);
+  if (deps.isWsl()) {
+    const profile = await deps.resolveProfile();
+    if (profile) {
+      await upsertKnownHost(
+        path9.join(profile.homeWsl, ".ssh", "known_hosts"),
+        `[127.0.0.1]:${windowsSshPort(opts.name)}`,
+        typeAndKey
+      );
+    }
+  }
+}
+async function removeSshAttach(home, name, windows) {
+  await fs7.rm(sshProxyScriptPath(home, name), { force: true });
+  await fs7.rm(sshConfigEntryPath(home, name), { force: true });
+  try {
+    await removeWindowsBridge(
+      name,
+      `monoceros-${name}`,
+      resolveWindowsDeps(windows)
+    );
+  } catch {
+  }
+}
+var realKeygen;
+var init_ssh_attach = __esm({
+  "src/devcontainer/ssh-attach.ts"() {
+    "use strict";
+    realKeygen = (args) => {
+      return new Promise((resolve, reject) => {
+        const child = spawn4("ssh-keygen", args, {
+          stdio: ["ignore", "ignore", "pipe"]
+        });
+        let stderr = "";
+        child.stderr.on("data", (chunk) => {
+          stderr += chunk.toString();
+        });
+        child.on("error", reject);
+        child.on("exit", (code) => resolve({ exitCode: code ?? 0, stderr }));
+      });
+    };
+  }
+});
+
 // src/create/opencode-config.ts
-import { existsSync as existsSync6, promises as fsp3 } from "fs";
-import path9 from "path";
+import { existsSync as existsSync7, promises as fsp3 } from "fs";
+import path10 from "path";
 import { consola } from "consola";
 function parseOpencodeModel(model) {
   const idx = model.indexOf("/");
@@ -2659,16 +3053,16 @@ async function writeOpencodeConfig(targetDir, containerName2, features) {
   const apiToken = str("apiToken");
   const npm = str("npm");
   const baseUrl = str("baseUrl");
-  const file = path9.join(
+  const file = path10.join(
     targetDir,
     "home",
     ".config",
     "opencode",
     "opencode.json"
   );
-  await fsp3.mkdir(path9.dirname(file), { recursive: true });
+  await fsp3.mkdir(path10.dirname(file), { recursive: true });
   let config = {};
-  if (existsSync6(file)) {
+  if (existsSync7(file)) {
     try {
       const txt = await fsp3.readFile(file, "utf8");
       if (txt.trim()) {
@@ -2799,8 +3193,8 @@ var init_opencode_config = __esm({
 });
 
 // src/create/scaffold.ts
-import { existsSync as existsSync7, promises as fs7 } from "fs";
-import path10 from "path";
+import { existsSync as existsSync8, promises as fs8 } from "fs";
+import path11 from "path";
 function deriveRepoName(url) {
   const lastSep = Math.max(url.lastIndexOf("/"), url.lastIndexOf(":"));
   const tail = url.slice(lastSep + 1);
@@ -2929,7 +3323,7 @@ function featuresSourceRoot() {
   const override2 = process.env.MONOCEROS_FEATURES_DIR_OVERRIDE?.trim();
   if (override2 && override2.length > 0) return override2;
   const checkout = workbenchCheckoutRoot();
-  return checkout ? path10.join(checkout, "components", "features") : null;
+  return checkout ? path11.join(checkout, "components", "features") : null;
 }
 function resolveFeatures(opts) {
   const resolved = [];
@@ -2978,8 +3372,8 @@ function resolveFeatures(opts) {
         const { paths, files } = descriptorPersistentHome(descriptor);
         const workspaceEnv = descriptor?.feature?.workspaceEnv ?? [];
         const sourceRoot = featuresSourceRoot();
-        const localSourceDir = sourceRoot ? path10.join(sourceRoot, name) : null;
-        if (descriptor && localSourceDir && existsSync7(localSourceDir)) {
+        const localSourceDir = sourceRoot ? path11.join(sourceRoot, name) : null;
+        if (descriptor && localSourceDir && existsSync8(localSourceDir)) {
           resolved.push({
             devcontainerKey: `./features/${name}`,
             options,
@@ -3153,6 +3547,9 @@ function ideStateVolumesForRuntime(name, version) {
     (v) => compareRuntimeVersions(version, v.minRuntime) >= 0
   );
 }
+function windowsBridgePort(opts) {
+  return runtimeSupportsHostKeyPinning(opts.runtimeVersion) && isWsl() ? windowsSshPort(opts.name) : null;
+}
 function buildDevcontainerJson(opts, dockerMode = "rootful") {
   const resolvedFeatures = resolveFeatures(opts);
   const features = {};
@@ -3185,7 +3582,11 @@ function buildDevcontainerJson(opts, dockerMode = "rootful") {
     }
   } : void 0;
   const sshPostStart = runtimeSupportsSshAttach(opts.runtimeVersion) ? { postStartCommand: "sudo /usr/local/bin/monoceros-sshd-up.sh" } : {};
-  const workspaceEnv = featureWorkspaceEnv(resolvedFeatures);
+  const sshBridgePort = windowsBridgePort(opts);
+  const workspaceEnv = {
+    ...featureWorkspaceEnv(resolvedFeatures),
+    ...sshBridgePort ? { MONOCEROS_SSH_PUBLISH_PORT: String(sshBridgePort) } : {}
+  };
   const containerEnvField = Object.keys(workspaceEnv).length > 0 ? { containerEnv: workspaceEnv } : void 0;
   if (needsCompose(opts)) {
     const eagerServices = opts.services.filter((s) => !serviceDefersStart(s.name)).map((s) => s.name);
@@ -3218,6 +3619,9 @@ function buildDevcontainerJson(opts, dockerMode = "rootful") {
     runArgs.push("--network=monoceros-proxy");
     runArgs.push(`--network-alias=${opts.name}`);
   }
+  if (sshBridgePort !== null) {
+    runArgs.push("-p", `127.0.0.1:${sshBridgePort}:${sshBridgePort}`);
+  }
   return {
     name: opts.name,
     image: resolveRuntimeImage(opts.runtimeVersion),
@@ -3248,6 +3652,7 @@ function composeVolumeSource(spec, serviceName) {
 function buildComposeYaml(opts, dockerMode = "rootful") {
   void dockerMode;
   const hasPorts = (opts.ports?.length ?? 0) > 0;
+  const sshBridgePort = windowsBridgePort(opts);
   const lines = ["services:"];
   const ideVolumes = ideStateVolumesForRuntime(opts.name, opts.runtimeVersion);
   lines.push("  workspace:");
@@ -3256,6 +3661,10 @@ function buildComposeYaml(opts, dockerMode = "rootful") {
   lines.push("    command: 'sleep infinity'");
   lines.push("    cap_add:");
   lines.push("      - NET_ADMIN");
+  if (sshBridgePort !== null) {
+    lines.push("    ports:");
+    lines.push(`      - "127.0.0.1:${sshBridgePort}:${sshBridgePort}"`);
+  }
   if (hasPorts) {
     lines.push("    networks:");
     lines.push("      default: {}");
@@ -3280,7 +3689,8 @@ function buildComposeYaml(opts, dockerMode = "rootful") {
   }
   const wsEnv = {
     ...serviceConnectionEnv(opts.services),
-    ...featureWorkspaceEnv(resolvedFeatures)
+    ...featureWorkspaceEnv(resolvedFeatures),
+    ...sshBridgePort ? { MONOCEROS_SSH_PUBLISH_PORT: String(sshBridgePort) } : {}
   };
   const wsEnvKeys = Object.keys(wsEnv);
   if (wsEnvKeys.length > 0) {
@@ -3558,125 +3968,125 @@ function buildPostCreateScript(opts) {
   return lines.join("\n") + "\n";
 }
 async function writePostCreateScript(devcontainerDir, opts) {
-  const dest = path10.join(devcontainerDir, "post-create.sh");
-  await fs7.writeFile(dest, buildPostCreateScript(opts));
-  await fs7.chmod(dest, 493);
+  const dest = path11.join(devcontainerDir, "post-create.sh");
+  await fs8.writeFile(dest, buildPostCreateScript(opts));
+  await fs8.chmod(dest, 493);
 }
 async function writeIfChanged(filePath, content) {
   try {
-    if (await fs7.readFile(filePath, "utf8") === content) return false;
+    if (await fs8.readFile(filePath, "utf8") === content) return false;
   } catch {
   }
-  await fs7.writeFile(filePath, content);
+  await fs8.writeFile(filePath, content);
   return true;
 }
 async function writeScaffold(opts, targetDir, scaffoldOpts = {}) {
   const dockerMode = scaffoldOpts.dockerMode ?? "rootful";
-  const devcontainerDir = path10.join(targetDir, ".devcontainer");
-  const monocerosDir = path10.join(targetDir, ".monoceros");
-  const projectsDir = path10.join(targetDir, "projects");
-  const homeDir = path10.join(targetDir, "home");
-  const dataDir = path10.join(targetDir, "data");
-  await fs7.mkdir(devcontainerDir, { recursive: true });
-  await fs7.mkdir(monocerosDir, { recursive: true });
-  await fs7.mkdir(projectsDir, { recursive: true });
-  await fs7.mkdir(homeDir, { recursive: true });
+  const devcontainerDir = path11.join(targetDir, ".devcontainer");
+  const monocerosDir = path11.join(targetDir, ".monoceros");
+  const projectsDir = path11.join(targetDir, "projects");
+  const homeDir = path11.join(targetDir, "home");
+  const dataDir = path11.join(targetDir, "data");
+  await fs8.mkdir(devcontainerDir, { recursive: true });
+  await fs8.mkdir(monocerosDir, { recursive: true });
+  await fs8.mkdir(projectsDir, { recursive: true });
+  await fs8.mkdir(homeDir, { recursive: true });
   if (needsCompose(opts)) {
-    await fs7.mkdir(dataDir, { recursive: true });
+    await fs8.mkdir(dataDir, { recursive: true });
     for (const svc of opts.services) {
       const hasDataVolume = svc.volumes.some((v) => v.split(":")[0] === "data");
       if (hasDataVolume) {
-        await fs7.mkdir(path10.join(dataDir, svc.name), { recursive: true });
+        await fs8.mkdir(path11.join(dataDir, svc.name), { recursive: true });
       }
     }
   }
-  const containerGitignore = path10.join(targetDir, ".gitignore");
-  await fs7.writeFile(
+  const containerGitignore = path11.join(targetDir, ".gitignore");
+  await fs8.writeFile(
     containerGitignore,
     "/home/\n/.monoceros/\n/data/\n/AGENTS.md\n/CLAUDE.md\n"
   );
-  const gitkeep = path10.join(projectsDir, ".gitkeep");
-  if (!existsSync7(gitkeep)) {
-    await fs7.writeFile(gitkeep, "");
+  const gitkeep = path11.join(projectsDir, ".gitkeep");
+  if (!existsSync8(gitkeep)) {
+    await fs8.writeFile(gitkeep, "");
   }
-  await fs7.writeFile(
-    path10.join(monocerosDir, ".gitignore"),
+  await fs8.writeFile(
+    path11.join(monocerosDir, ".gitignore"),
     "git-credentials*\ngitconfig\n"
   );
   const devcontainerJson = buildDevcontainerJson(opts, dockerMode);
   await writeIfChanged(
-    path10.join(devcontainerDir, "devcontainer.json"),
+    path11.join(devcontainerDir, "devcontainer.json"),
     JSON.stringify(devcontainerJson, null, 2) + "\n"
   );
-  const featuresDir = path10.join(devcontainerDir, "features");
-  if (existsSync7(featuresDir)) {
-    await fs7.rm(featuresDir, { recursive: true, force: true });
+  const featuresDir = path11.join(devcontainerDir, "features");
+  if (existsSync8(featuresDir)) {
+    await fs8.rm(featuresDir, { recursive: true, force: true });
   }
   const resolvedFeatures = resolveFeatures(opts);
   for (const f of resolvedFeatures) {
     if (!f.localSourceDir || !f.localName) continue;
-    const dest = path10.join(featuresDir, f.localName);
-    await fs7.mkdir(dest, { recursive: true });
-    const entries = await fs7.readdir(f.localSourceDir, { withFileTypes: true });
+    const dest = path11.join(featuresDir, f.localName);
+    await fs8.mkdir(dest, { recursive: true });
+    const entries = await fs8.readdir(f.localSourceDir, { withFileTypes: true });
     for (const entry2 of entries) {
       if (!entry2.isFile()) continue;
       if (entry2.name === "component.yml" || entry2.name === "devcontainer-feature.json") {
         continue;
       }
-      await fs7.cp(
-        path10.join(f.localSourceDir, entry2.name),
-        path10.join(dest, entry2.name)
+      await fs8.cp(
+        path11.join(f.localSourceDir, entry2.name),
+        path11.join(dest, entry2.name)
       );
     }
     if (f.generatedManifest) {
-      await fs7.writeFile(
-        path10.join(dest, "devcontainer-feature.json"),
+      await fs8.writeFile(
+        path11.join(dest, "devcontainer-feature.json"),
         JSON.stringify(f.generatedManifest, null, 2) + "\n"
       );
     }
   }
   for (const f of resolvedFeatures) {
     for (const sub of f.persistentHomePaths) {
-      await fs7.mkdir(path10.join(homeDir, sub), { recursive: true });
+      await fs8.mkdir(path11.join(homeDir, sub), { recursive: true });
     }
     for (const entry2 of f.persistentHomeFiles) {
-      const filePath = path10.join(homeDir, entry2.path);
-      await fs7.mkdir(path10.dirname(filePath), { recursive: true });
-      if (!existsSync7(filePath)) {
-        await fs7.writeFile(filePath, entry2.initialContent);
+      const filePath = path11.join(homeDir, entry2.path);
+      await fs8.mkdir(path11.dirname(filePath), { recursive: true });
+      if (!existsSync8(filePath)) {
+        await fs8.writeFile(filePath, entry2.initialContent);
       }
     }
   }
   await writeClaudePermissionMode(targetDir, opts.features);
   await writeOpencodeConfig(targetDir, opts.name, opts.features);
   await writePostCreateScript(devcontainerDir, opts);
-  const composePath = path10.join(devcontainerDir, "compose.yaml");
+  const composePath = path11.join(devcontainerDir, "compose.yaml");
   if (needsCompose(opts)) {
     await writeIfChanged(composePath, buildComposeYaml(opts, dockerMode));
-  } else if (existsSync7(composePath)) {
-    await fs7.rm(composePath);
+  } else if (existsSync8(composePath)) {
+    await fs8.rm(composePath);
   }
-  const workspacePath = path10.join(targetDir, `${opts.name}.code-workspace`);
+  const workspacePath = path11.join(targetDir, `${opts.name}.code-workspace`);
   let existingWorkspace;
   try {
-    const raw = await fs7.readFile(workspacePath, "utf8");
+    const raw = await fs8.readFile(workspacePath, "utf8");
     existingWorkspace = JSON.parse(raw);
   } catch {
     existingWorkspace = void 0;
   }
   const generated = buildCodeWorkspaceJson(opts);
   const merged = mergeCodeWorkspace(existingWorkspace, generated);
-  await fs7.writeFile(workspacePath, JSON.stringify(merged, null, 2) + "\n");
-  const vscodeDir = path10.join(targetDir, ".vscode");
-  const settingsPath = path10.join(vscodeDir, "settings.json");
+  await fs8.writeFile(workspacePath, JSON.stringify(merged, null, 2) + "\n");
+  const vscodeDir = path11.join(targetDir, ".vscode");
+  const settingsPath = path11.join(vscodeDir, "settings.json");
   let existingSettings;
   try {
-    existingSettings = JSON.parse(await fs7.readFile(settingsPath, "utf8"));
+    existingSettings = JSON.parse(await fs8.readFile(settingsPath, "utf8"));
   } catch {
     existingSettings = void 0;
   }
-  await fs7.mkdir(vscodeDir, { recursive: true });
-  await fs7.writeFile(
+  await fs8.mkdir(vscodeDir, { recursive: true });
+  await fs8.writeFile(
     settingsPath,
     JSON.stringify(mergeVscodeSettings(existingSettings), null, 2) + "\n"
   );
@@ -3690,6 +4100,7 @@ var init_scaffold = __esm({
     init_load_sync();
     init_generate_manifest();
     init_claude_settings();
+    init_ssh_attach();
     init_opencode_config();
     init_catalog();
     APT_PACKAGE_NAME_RE2 = /^[a-z0-9][a-z0-9.+-]*$/;
@@ -4193,10 +4604,10 @@ var init_yml = __esm({
 });
 
 // src/modify/index.ts
-import { promises as fs8 } from "fs";
+import { promises as fs9 } from "fs";
 import { consola as consola2 } from "consola";
 import { createPatch } from "diff";
-import path11 from "path";
+import path12 from "path";
 function runAddLanguage(input) {
   const spec = parseLanguageSpec(input.language);
   if (!spec || !BUILTIN_LANGUAGES.has(spec.name) && !LANGUAGE_CATALOG[spec.name]) {
@@ -4450,7 +4861,7 @@ async function tryCloneInRunningContainer(input, entry2) {
   logger.info(
     `Cloned ${entry2.url} into /workspaces/${containerName2}/${targetRel} inside the running container.`
   );
-  void path11;
+  void path12;
 }
 function shquote(value) {
   return `'${value.replace(/'/g, `'\\''`)}'`;
@@ -4662,7 +5073,7 @@ async function mutate(opts, apply) {
   const logger = opts.logger ?? defaultLogger();
   let oldText;
   try {
-    oldText = await fs8.readFile(ymlPath, "utf8");
+    oldText = await fs9.readFile(ymlPath, "utf8");
   } catch {
     throw new Error(
       `No such config: ${ymlPath}. Run \`monoceros init <template> ${opts.name}\` first.`
@@ -4687,7 +5098,7 @@ async function mutate(opts, apply) {
       return { status: "aborted" };
     }
   }
-  await fs8.writeFile(ymlPath, newText, "utf8");
+  await fs9.writeFile(ymlPath, newText, "utf8");
   logger.success(`Updated ${ymlPath}.`);
   logger.info(
     `Run \`monoceros apply ${opts.name}\` to rebuild the dev-container and pick up the change.`
@@ -5235,8 +5646,8 @@ var init_add_service = __esm({
 });
 
 // src/config/state.ts
-import { promises as fs9 } from "fs";
-import path12 from "path";
+import { promises as fs10 } from "fs";
+import path13 from "path";
 function buildStateFile(opts) {
   return {
     schemaVersion: CONFIG_SCHEMA_VERSION,
@@ -5247,20 +5658,20 @@ function buildStateFile(opts) {
   };
 }
 function stateFilePath(targetDir) {
-  return path12.join(targetDir, ".monoceros", "state.json");
+  return path13.join(targetDir, ".monoceros", "state.json");
 }
 async function readStateFile(targetDir) {
   try {
-    const content = await fs9.readFile(stateFilePath(targetDir), "utf8");
+    const content = await fs10.readFile(stateFilePath(targetDir), "utf8");
     return JSON.parse(content);
   } catch {
     return void 0;
   }
 }
 async function writeStateFile(targetDir, state) {
-  const monocerosDir = path12.join(targetDir, ".monoceros");
-  await fs9.mkdir(monocerosDir, { recursive: true });
-  await fs9.writeFile(
+  const monocerosDir = path13.join(targetDir, ".monoceros");
+  await fs10.mkdir(monocerosDir, { recursive: true });
+  await fs10.writeFile(
     stateFilePath(targetDir),
     JSON.stringify(state, null, 2) + "\n"
   );
@@ -5366,15 +5777,15 @@ var init_transform = __esm({
 });
 
 // src/devcontainer/browser-bridge.ts
-import { spawn as spawn4 } from "child_process";
-import { existsSync as existsSync8, promises as fsp4, readFileSync as readFileSync4 } from "fs";
+import { spawn as spawn5 } from "child_process";
+import { existsSync as existsSync9, promises as fsp4, readFileSync as readFileSync5 } from "fs";
 import http from "http";
-import path13 from "path";
+import path14 from "path";
 function relayDir(root) {
-  return path13.join(root, RELAY_DIRNAME);
+  return path14.join(root, RELAY_DIRNAME);
 }
 function relayUrlFile(root) {
-  return path13.join(relayDir(root), "url");
+  return path14.join(relayDir(root), "url");
 }
 function parseCallbackTarget(authUrl) {
   try {
@@ -5416,7 +5827,7 @@ function openInBrowser(url) {
   const platform = process.platform;
   const [cmd, args] = platform === "darwin" ? ["open", [url]] : platform === "win32" ? ["cmd", ["/c", "start", "", url]] : ["xdg-open", [url]];
   try {
-    const child = spawn4(cmd, args, {
+    const child = spawn5(cmd, args, {
       stdio: "ignore",
       detached: true
     });
@@ -5428,7 +5839,7 @@ function openInBrowser(url) {
 }
 async function startBrowserBridge(opts) {
   const dir = relayDir(opts.root);
-  const relayScript = path13.join(dir, "xdg-open");
+  const relayScript = path14.join(dir, "xdg-open");
   const urlFile = relayUrlFile(opts.root);
   await fsp4.mkdir(dir, { recursive: true });
   await fsp4.rm(urlFile, { force: true });
@@ -5487,10 +5898,10 @@ function watchRelayUrl(opts) {
     servers.push(server);
   };
   const poll = setInterval(() => {
-    if (!existsSync8(opts.urlFile)) return;
+    if (!existsSync9(opts.urlFile)) return;
     let content = "";
     try {
-      content = readFileSync4(opts.urlFile, "utf8");
+      content = readFileSync5(opts.urlFile, "utf8");
     } catch {
       return;
     }
@@ -5622,19 +6033,19 @@ var init_runtime_pull_hint = __esm({
 });
 
 // src/devcontainer/cli.ts
-import { spawn as spawn5 } from "child_process";
-import { readFileSync as readFileSync5 } from "fs";
+import { spawn as spawn6 } from "child_process";
+import { readFileSync as readFileSync6 } from "fs";
 import { createRequire } from "module";
-import path14 from "path";
+import path15 from "path";
 function devcontainerCliPath() {
   if (cachedBinaryPath) return cachedBinaryPath;
   const pkgJsonPath = require_.resolve("@devcontainers/cli/package.json");
-  const pkg = JSON.parse(readFileSync5(pkgJsonPath, "utf8"));
+  const pkg = JSON.parse(readFileSync6(pkgJsonPath, "utf8"));
   const binEntry = typeof pkg.bin === "string" ? pkg.bin : pkg.bin?.devcontainer ?? "";
   if (!binEntry) {
     throw new Error("Could not resolve @devcontainers/cli bin entry.");
   }
-  cachedBinaryPath = path14.resolve(path14.dirname(pkgJsonPath), binEntry);
+  cachedBinaryPath = path15.resolve(path15.dirname(pkgJsonPath), binEntry);
   return cachedBinaryPath;
 }
 var require_, cachedBinaryPath, spawnDevcontainer;
@@ -5650,7 +6061,7 @@ var init_cli = __esm({
       const env = { ...process.env, DOCKER_CLI_HINTS: "false" };
       return new Promise((resolve, reject) => {
         if (options.interactive) {
-          const child2 = spawn5(process.execPath, [binPath, ...args], {
+          const child2 = spawn6(process.execPath, [binPath, ...args], {
             cwd,
             env,
             stdio: "inherit"
@@ -5659,7 +6070,7 @@ var init_cli = __esm({
           child2.on("exit", (code) => resolve(code ?? 0));
           return;
         }
-        const child = spawn5(process.execPath, [binPath, ...args], {
+        const child = spawn6(process.execPath, [binPath, ...args], {
           cwd,
           env,
           stdio: ["ignore", "pipe", "pipe"]
@@ -5707,14 +6118,14 @@ var init_cli = __esm({
 });
 
 // src/devcontainer/compose.ts
-import { spawn as spawn6 } from "child_process";
-import { existsSync as existsSync9 } from "fs";
-import path15 from "path";
+import { spawn as spawn7 } from "child_process";
+import { existsSync as existsSync10 } from "fs";
+import path16 from "path";
 import { Writable } from "stream";
 import { consola as consola10 } from "consola";
 function spawnDockerComposeTo(opts) {
   return (args, cwd) => new Promise((resolve, reject) => {
-    const child = spawn6("docker", ["compose", ...args], {
+    const child = spawn7("docker", ["compose", ...args], {
       cwd,
       stdio: ["inherit", "pipe", "pipe"]
     });
@@ -5778,22 +6189,22 @@ async function cleanupDockerObjects(opts) {
   return { exitCode: rmExit, removedIds: ids };
 }
 function composeProjectName(root) {
-  return `${path15.basename(root)}_devcontainer`;
+  return `${path16.basename(root)}_devcontainer`;
 }
 function assertDevcontainer(root) {
-  if (!existsSync9(path15.join(root, ".devcontainer"))) {
+  if (!existsSync10(path16.join(root, ".devcontainer"))) {
     throw new Error(
       `No .devcontainer/ at ${root}. Run \`monoceros apply <name>\` first.`
     );
   }
 }
 function isComposeMode(root) {
-  return existsSync9(path15.join(root, ".devcontainer", "compose.yaml"));
+  return existsSync10(path16.join(root, ".devcontainer", "compose.yaml"));
 }
 function resolveCompose(root) {
   assertDevcontainer(root);
-  const composeFile = path15.join(root, ".devcontainer", "compose.yaml");
-  if (!existsSync9(composeFile)) {
+  const composeFile = path16.join(root, ".devcontainer", "compose.yaml");
+  if (!existsSync10(composeFile)) {
     throw new Error(
       `No compose.yaml at ${composeFile}. \`monoceros logs\` tails compose service logs, which require services configured via \`monoceros add-service <name> <svc>\`. For a bare container, use \`monoceros shell <name>\` or read logs/<app>.log.`
     );
@@ -6001,7 +6412,7 @@ function imageContainerFilter(root) {
 async function stopImageContainer(opts) {
   const exec = opts.dockerExec ?? spawnDocker;
   const logger = opts.logger ?? { info: (msg) => consola10.info(msg) };
-  const name = path15.basename(opts.root);
+  const name = path16.basename(opts.root);
   const ps = await exec([
     "ps",
     "-q",
@@ -6022,7 +6433,7 @@ async function stopImageContainer(opts) {
 async function statusImageContainer(opts) {
   const exec = opts.dockerExec ?? spawnDocker;
   const logger = opts.logger ?? { info: (msg) => consola10.info(msg) };
-  const name = path15.basename(opts.root);
+  const name = path16.basename(opts.root);
   const res = await exec([
     "ps",
     "-a",
@@ -6064,7 +6475,7 @@ var init_compose = __esm({
     init_proxy();
     spawnDockerCompose = (args, cwd) => {
       return new Promise((resolve, reject) => {
-        const child = spawn6("docker", ["compose", ...args], {
+        const child = spawn7("docker", ["compose", ...args], {
           cwd,
           stdio: ["inherit", "pipe", "pipe"]
         });
@@ -6076,7 +6487,7 @@ var init_compose = __esm({
     };
     spawnDocker = (args) => {
       return new Promise((resolve, reject) => {
-        const child = spawn6("docker", args, {
+        const child = spawn7("docker", args, {
           stdio: ["ignore", "pipe", "pipe"]
         });
         let stdout = "";
@@ -6090,454 +6501,121 @@ var init_compose = __esm({
         child.on("error", reject);
         child.on(
           "exit",
-          (code) => resolve({ exitCode: code ?? 0, stdout, stderr })
-        );
-      });
-    };
-    BIND_SOURCE_MISSING_RE = /bind source path does not exist/i;
-    BIND_RETRY_ATTEMPTS = 3;
-    BIND_RETRY_DELAY_MS = 500;
-  }
-});
-
-// src/devcontainer/bridge-daemon.ts
-import { spawn as spawn7 } from "child_process";
-import {
-  existsSync as existsSync10,
-  mkdirSync,
-  promises as fsp5,
-  readFileSync as readFileSync6,
-  writeFileSync
-} from "fs";
-import path16 from "path";
-function bridgePidFile(root) {
-  return path16.join(relayDir(root), "daemon.pid");
-}
-function pidAlive(pid) {
-  try {
-    process.kill(pid, 0);
-    return true;
-  } catch {
-    return false;
-  }
-}
-function runningBridgePid(root) {
-  const file = bridgePidFile(root);
-  if (!existsSync10(file)) return null;
-  let pid = NaN;
-  try {
-    pid = Number(readFileSync6(file, "utf8").trim());
-  } catch {
-    return null;
-  }
-  return Number.isInteger(pid) && pid > 0 && pidAlive(pid) ? pid : null;
-}
-function spawnBridgeDaemon(root) {
-  try {
-    if (runningBridgePid(root) !== null) return;
-    const self = process.argv[1];
-    if (!self) return;
-    mkdirSync(relayDir(root), { recursive: true });
-    const child = spawn7(process.execPath, [self, "__bridge", root], {
-      detached: true,
-      stdio: "ignore"
-    });
-    if (typeof child.pid === "number") {
-      try {
-        writeFileSync(bridgePidFile(root), String(child.pid));
-      } catch {
-      }
-    }
-    child.unref();
-  } catch {
-  }
-}
-async function stopBridgeDaemon(root) {
-  const pid = runningBridgePid(root);
-  if (pid !== null) {
-    try {
-      process.kill(pid, "SIGTERM");
-    } catch {
-    }
-  }
-  await fsp5.rm(bridgePidFile(root), { force: true });
-}
-async function runBridgeDaemon(opts) {
-  const { root } = opts;
-  const dockerExec = opts.dockerExec ?? spawnDocker;
-  const lifecheckMs = opts.lifecheckMs ?? 5e3;
-  await fsp5.mkdir(relayDir(root), { recursive: true });
-  await fsp5.writeFile(bridgePidFile(root), String(process.pid));
-  const watcher = watchRelayUrl({
-    urlFile: relayUrlFile(root),
-    root,
-    spawn: opts.spawn ?? spawnDevcontainer
-  });
-  await new Promise((resolve) => {
-    let done = false;
-    const finish = () => {
-      if (done) return;
-      done = true;
-      resolve();
-    };
-    const lifecheck = setInterval(() => {
-      void isWorkspaceRunning(root, dockerExec).then((up) => {
-        if (!up) {
-          clearInterval(lifecheck);
-          finish();
-        }
-      }).catch(() => {
-      });
-    }, lifecheckMs);
-    const onSignal = () => {
-      clearInterval(lifecheck);
-      finish();
-    };
-    process.once("SIGTERM", onSignal);
-    process.once("SIGINT", onSignal);
-  });
-  watcher.dispose();
-  await fsp5.rm(bridgePidFile(root), { force: true });
-}
-var init_bridge_daemon = __esm({
-  "src/devcontainer/bridge-daemon.ts"() {
-    "use strict";
-    init_browser_bridge();
-    init_cli();
-    init_compose();
-  }
-});
-
-// src/devcontainer/ssh-attach.ts
-import { spawn as spawn8 } from "child_process";
-import { promises as fs10 } from "fs";
-import { existsSync as existsSync11, readFileSync as readFileSync7 } from "fs";
-import os2 from "os";
-import path17 from "path";
-function sshHomeDir(home) {
-  return path17.join(home, "ssh");
-}
-function sshConfigEntryPath(home, name) {
-  return path17.join(sshHomeDir(home), "config.d", name);
-}
-function sshProxyScriptPath(home, name) {
-  return path17.join(sshHomeDir(home), `exec-${name}.sh`);
-}
-function privateKeyPath(targetDir) {
-  return path17.join(targetDir, ".monoceros", "ssh", "id_ed25519");
-}
-async function ensureKeypair(targetDir, name, keygen, logger) {
-  const privateKey = privateKeyPath(targetDir);
-  const publicKey = `${privateKey}.pub`;
-  if (existsSync11(privateKey) && existsSync11(publicKey)) {
-    return { privateKey, publicKey };
-  }
-  await fs10.mkdir(path17.dirname(privateKey), { recursive: true });
-  try {
-    const res = await keygen([
-      "-t",
-      "ed25519",
-      "-N",
-      "",
-      "-f",
-      privateKey,
-      "-C",
-      `monoceros-${name}`,
-      "-q"
-    ]);
-    if (res.exitCode !== 0) {
-      logger.warn(
-        `ssh-keygen failed (exit ${res.exitCode})${res.stderr ? `: ${res.stderr.trim()}` : ""}; IDE SSH attach not set up.`
-      );
-      return null;
-    }
-  } catch (err) {
-    logger.warn(
-      `ssh-keygen not runnable (${err instanceof Error ? err.message : String(err)}); IDE SSH attach not set up.`
-    );
-    return null;
-  }
-  return { privateKey, publicKey };
-}
-function proxyScriptContent(name, targetDir) {
-  return `#!/bin/sh
-# Generated by Monoceros (ADR 0022) - do not edit.
-# Portless SSH transport into the running dev container '${name}'.
-# Resolves the container by the devcontainer.local_folder label (the
-# same handle 'monoceros shell' uses), so it follows rebuilds.
-set -e
-# GUI launchers (IDEs, Claude Desktop) start a ProxyCommand with a
-# minimal PATH: on macOS launchd hands out only /usr/bin:/bin:/usr/sbin:
-# /sbin, so a bare \`docker\` (Docker Desktop installs it under
-# /usr/local/bin or /opt/homebrew/bin) isn't found. Prepend the common
-# Docker locations so the same script works from a login shell and a GUI
-# launcher alike.
-PATH="/usr/local/bin:/opt/homebrew/bin:/Applications/Docker.app/Contents/Resources/bin:$PATH"
-cid=$(docker ps -q \\
-  --filter "label=devcontainer.local_folder=${targetDir}" \\
-  --filter status=running | head -n1)
-if [ -z "$cid" ]; then
-  echo "monoceros: dev container '${name}' is not running. Start it with: monoceros apply ${name}" >&2
-  exit 1
-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.
-# Attach an SSH-capable IDE (Codium, IntelliJ, Zed) to host
-# '${hostAlias}', or run: ssh ${hostAlias}
-Host ${hostAlias}
-    User node
-    IdentityFile "${privateKey}"
-    IdentitiesOnly yes
-    StrictHostKeyChecking no
-    UserKnownHostsFile /dev/null
-    ProxyCommand "${proxyScript}"
-`;
-}
-async function ensureInclude(userSshDir, home) {
-  const configPath = path17.join(userSshDir, "config");
-  const includeTarget = path17.join(sshHomeDir(home), "config.d", "*");
-  const includeLine = `Include "${includeTarget}"`;
-  await fs10.mkdir(userSshDir, { recursive: true });
-  let existing = "";
-  try {
-    existing = await fs10.readFile(configPath, "utf8");
-  } catch {
-    existing = "";
-  }
-  if (existing.includes(includeTarget)) return;
-  const banner = "# Added by Monoceros (ADR 0022): per-container SSH attach entries.";
-  const prefix = `${banner}
-${includeLine}
-`;
-  const next = existing.length > 0 ? `${prefix}
-${existing}` : prefix;
-  await fs10.writeFile(configPath, next, { mode: 384 });
-  await fs10.chmod(configPath, 384).catch(() => {
-  });
-}
-function runCapture(cmd, args) {
-  return new Promise((resolve, reject) => {
-    const child = spawn8(cmd, args, {
-      stdio: ["ignore", "pipe", "ignore"]
-    });
-    let stdout = "";
-    child.stdout.on("data", (c) => {
-      stdout += c.toString();
-    });
-    child.on("error", reject);
-    child.on("exit", (code) => resolve({ stdout, exitCode: code ?? 0 }));
-  });
+          (code) => resolve({ exitCode: code ?? 0, stdout, stderr })
+        );
+      });
+    };
+    BIND_SOURCE_MISSING_RE = /bind source path does not exist/i;
+    BIND_RETRY_ATTEMPTS = 3;
+    BIND_RETRY_DELAY_MS = 500;
+  }
+});
+
+// src/devcontainer/bridge-daemon.ts
+import { spawn as spawn8 } from "child_process";
+import {
+  existsSync as existsSync11,
+  mkdirSync,
+  promises as fsp5,
+  readFileSync as readFileSync7,
+  writeFileSync
+} from "fs";
+import path17 from "path";
+function bridgePidFile(root) {
+  return path17.join(relayDir(root), "daemon.pid");
 }
-function isWsl() {
+function pidAlive(pid) {
   try {
-    if (process.env.WSL_DISTRO_NAME) return true;
-    const rel = readFileSync7(
-      "/proc/sys/kernel/osrelease",
-      "utf8"
-    ).toLowerCase();
-    return rel.includes("microsoft") || rel.includes("wsl");
+    process.kill(pid, 0);
+    return true;
   } catch {
     return false;
   }
 }
-async function resolveWindowsProfile() {
+function runningBridgePid(root) {
+  const file = bridgePidFile(root);
+  if (!existsSync11(file)) return null;
+  let pid = NaN;
   try {
-    const r = await runCapture("cmd.exe", ["/c", "echo %USERPROFILE%"]);
-    const homeWin = r.stdout.replace(/\r/g, "").trim();
-    if (r.exitCode !== 0 || !homeWin || homeWin.includes("%USERPROFILE%")) {
-      return null;
-    }
-    const w = await runCapture("wslpath", ["-u", homeWin]);
-    const homeWsl = w.stdout.trim();
-    const user = homeWin.split("\\").pop() ?? "";
-    if (w.exitCode !== 0 || !homeWsl || !user) return null;
-    return { homeWsl, homeWin, user };
+    pid = Number(readFileSync7(file, "utf8").trim());
   } catch {
     return null;
   }
+  return Number.isInteger(pid) && pid > 0 && pidAlive(pid) ? pid : null;
 }
-async function realLockWindowsKey(winKeyPath, user) {
-  await runCapture("icacls.exe", [
-    winKeyPath,
-    "/inheritance:r",
-    "/grant:r",
-    `${user}:R`
-  ]);
-}
-function resolveWindowsDeps(d) {
-  return {
-    isWsl: d?.isWsl ?? isWsl,
-    resolveProfile: d?.resolveProfile ?? resolveWindowsProfile,
-    lockKey: d?.lockKey ?? realLockWindowsKey
-  };
-}
-function windowsHostBlock(hostAlias, keyWin) {
-  return [
-    `Host ${hostAlias}`,
-    `    User node`,
-    `    IdentityFile ${keyWin}`,
-    `    IdentitiesOnly yes`,
-    `    StrictHostKeyChecking no`,
-    `    UserKnownHostsFile NUL`,
-    `    ProxyCommand docker exec -i ${hostAlias} socat - TCP:127.0.0.1:22`
-  ].join("\n");
-}
-function escapeRegExp2(s) {
-  return s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-}
-function blockMarkers(hostAlias) {
-  return {
-    begin: `# >>> monoceros ${hostAlias} >>>`,
-    end: `# <<< monoceros ${hostAlias} <<<`
-  };
-}
-async function upsertMarkedBlock(configPath, hostAlias, body) {
-  const { begin, end } = blockMarkers(hostAlias);
-  const section = `${begin}
-${body}
-${end}`;
-  await fs10.mkdir(path17.dirname(configPath), { recursive: true });
-  let existing = "";
-  try {
-    existing = await fs10.readFile(configPath, "utf8");
-  } catch {
-    existing = "";
-  }
-  const re = new RegExp(`${escapeRegExp2(begin)}[\\s\\S]*?${escapeRegExp2(end)}`);
-  if (re.test(existing)) {
-    await fs10.writeFile(configPath, existing.replace(re, section));
-    return;
-  }
-  const sep = existing.length === 0 || existing.endsWith("\n") ? "" : "\n";
-  await fs10.writeFile(configPath, `${existing}${sep}${section}
-`);
-}
-async function removeMarkedBlock(configPath, hostAlias) {
-  let existing = "";
+function spawnBridgeDaemon(root) {
   try {
-    existing = await fs10.readFile(configPath, "utf8");
+    if (runningBridgePid(root) !== null) return;
+    const self = process.argv[1];
+    if (!self) return;
+    mkdirSync(relayDir(root), { recursive: true });
+    const child = spawn8(process.execPath, [self, "__bridge", root], {
+      detached: true,
+      stdio: "ignore"
+    });
+    if (typeof child.pid === "number") {
+      try {
+        writeFileSync(bridgePidFile(root), String(child.pid));
+      } catch {
+      }
+    }
+    child.unref();
   } catch {
-    return;
   }
-  const { begin, end } = blockMarkers(hostAlias);
-  const re = new RegExp(
-    `\\n?${escapeRegExp2(begin)}[\\s\\S]*?${escapeRegExp2(end)}\\n?`,
-    "g"
-  );
-  await fs10.writeFile(
-    configPath,
-    existing.replace(re, "\n").replace(/\n{3,}/g, "\n\n")
-  );
 }
-async function setupWindowsBridge(name, hostAlias, privateKey, deps, logger) {
-  if (!deps.isWsl()) return;
-  const profile = await deps.resolveProfile();
-  if (!profile) {
-    logger.warn(
-      "WSL detected but the Windows user profile could not be resolved; skipping the Windows SSH bridge."
-    );
-    return;
+async function stopBridgeDaemon(root) {
+  const pid = runningBridgePid(root);
+  if (pid !== null) {
+    try {
+      process.kill(pid, "SIGTERM");
+    } catch {
+    }
   }
-  const monoDir = path17.join(profile.homeWsl, ".ssh", "monoceros");
-  await fs10.mkdir(monoDir, { recursive: true });
-  const keyDst = path17.join(monoDir, name);
-  await fs10.rm(keyDst, { force: true });
-  await fs10.copyFile(privateKey, keyDst);
-  const keyWin = `${profile.homeWin}\\.ssh\\monoceros\\${name}`;
-  await upsertMarkedBlock(
-    path17.join(profile.homeWsl, ".ssh", "config"),
-    hostAlias,
-    windowsHostBlock(hostAlias, keyWin)
-  );
-  await deps.lockKey(keyWin, profile.user);
-  logger.info(
-    `Windows SSH bridge ready: \`ssh ${hostAlias}\` (Codium/Gateway too).`
-  );
+  await fsp5.rm(bridgePidFile(root), { force: true });
 }
-async function removeWindowsBridge(name, hostAlias, deps) {
-  if (!deps.isWsl()) return;
-  const profile = await deps.resolveProfile();
-  if (!profile) return;
-  await fs10.rm(path17.join(profile.homeWsl, ".ssh", "monoceros", name), {
-    force: true
+async function runBridgeDaemon(opts) {
+  const { root } = opts;
+  const dockerExec = opts.dockerExec ?? spawnDocker;
+  const lifecheckMs = opts.lifecheckMs ?? 5e3;
+  await fsp5.mkdir(relayDir(root), { recursive: true });
+  await fsp5.writeFile(bridgePidFile(root), String(process.pid));
+  const watcher = watchRelayUrl({
+    urlFile: relayUrlFile(root),
+    root,
+    spawn: opts.spawn ?? spawnDevcontainer
   });
-  await removeMarkedBlock(
-    path17.join(profile.homeWsl, ".ssh", "config"),
-    hostAlias
-  );
-}
-async function setupSshAttach(opts) {
-  const hostAlias = `monoceros-${opts.name}`;
-  const logger = opts.logger ?? { info: () => {
-  }, warn: () => {
-  } };
-  const keygen = opts.keygen ?? realKeygen;
-  const userSshDir = opts.userSshDir ?? path17.join(os2.homedir(), ".ssh");
-  const keys = await ensureKeypair(opts.targetDir, opts.name, keygen, logger);
-  if (!keys) return { hostAlias, configured: false };
-  const proxyScript = sshProxyScriptPath(opts.home, opts.name);
-  const configEntry = sshConfigEntryPath(opts.home, opts.name);
-  await fs10.mkdir(path17.dirname(proxyScript), { recursive: true });
-  await fs10.mkdir(path17.dirname(configEntry), { recursive: true });
-  await fs10.writeFile(
-    proxyScript,
-    proxyScriptContent(opts.name, opts.targetDir),
-    { mode: 493 }
-  );
-  await fs10.chmod(proxyScript, 493).catch(() => {
+  await new Promise((resolve) => {
+    let done = false;
+    const finish = () => {
+      if (done) return;
+      done = true;
+      resolve();
+    };
+    const lifecheck = setInterval(() => {
+      void isWorkspaceRunning(root, dockerExec).then((up) => {
+        if (!up) {
+          clearInterval(lifecheck);
+          finish();
+        }
+      }).catch(() => {
+      });
+    }, lifecheckMs);
+    const onSignal = () => {
+      clearInterval(lifecheck);
+      finish();
+    };
+    process.once("SIGTERM", onSignal);
+    process.once("SIGINT", onSignal);
   });
-  await fs10.writeFile(
-    configEntry,
-    configEntryContent(opts.name, hostAlias, keys.privateKey, proxyScript)
-  );
-  await ensureInclude(userSshDir, opts.home);
-  try {
-    await setupWindowsBridge(
-      opts.name,
-      hostAlias,
-      keys.privateKey,
-      resolveWindowsDeps(opts.windows),
-      logger
-    );
-  } catch (err) {
-    logger.warn(
-      `Windows SSH bridge skipped: ${err instanceof Error ? err.message : String(err)}`
-    );
-  }
-  return { hostAlias, configured: true };
-}
-async function removeSshAttach(home, name, windows) {
-  await fs10.rm(sshProxyScriptPath(home, name), { force: true });
-  await fs10.rm(sshConfigEntryPath(home, name), { force: true });
-  try {
-    await removeWindowsBridge(
-      name,
-      `monoceros-${name}`,
-      resolveWindowsDeps(windows)
-    );
-  } catch {
-  }
+  watcher.dispose();
+  await fsp5.rm(bridgePidFile(root), { force: true });
 }
-var realKeygen;
-var init_ssh_attach = __esm({
-  "src/devcontainer/ssh-attach.ts"() {
+var init_bridge_daemon = __esm({
+  "src/devcontainer/bridge-daemon.ts"() {
     "use strict";
-    realKeygen = (args) => {
-      return new Promise((resolve, reject) => {
-        const child = spawn8("ssh-keygen", args, {
-          stdio: ["ignore", "ignore", "pipe"]
-        });
-        let stderr = "";
-        child.stderr.on("data", (chunk) => {
-          stderr += chunk.toString();
-        });
-        child.on("error", reject);
-        child.on("exit", (code) => resolve({ exitCode: code ?? 0, stderr }));
-      });
-    };
+    init_browser_bridge();
+    init_cli();
+    init_compose();
   }
 });
 
@@ -8155,6 +8233,19 @@ Fix the value in the env file (or the yml).`
       if (runtimeSupportsBrowserBridge(createOpts.runtimeVersion)) {
         spawnBridgeDaemon(targetDir);
       }
+      if (runtimeSupportsHostKeyPinning(createOpts.runtimeVersion)) {
+        try {
+          await recordHostKey({
+            name: opts.name,
+            targetDir,
+            ...opts.sshUserSshDir ? { userSshDir: opts.sshUserSshDir } : {}
+          });
+        } catch (err) {
+          (logger.warn ?? logger.info)(
+            `Recording the SSH host key skipped: ${err instanceof Error ? err.message : String(err)}`
+          );
+        }
+      }
       const summaryLines = buildApplySummary(createOpts);
       if (summaryLines.length > 0) {
         const formatted = formatApplySummary(summaryLines);
@@ -8502,7 +8593,7 @@ var CLI_VERSION;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    CLI_VERSION = true ? "1.32.0" : "dev";
+    CLI_VERSION = true ? "1.33.0" : "dev";
   }
 });