@getmonoceros/workbench 1.29.0 → 1.29.2

package/dist/bin.js

@@ -5288,7 +5288,7 @@ function runCapture(cmd, args) {
     child.on("exit", (code) => resolve({ stdout, exitCode: code ?? 0 }));
   });
 }
-function realIsWsl() {
+function isWsl() {
   try {
     if (process.env.WSL_DISTRO_NAME) return true;
     const rel = readFileSync4(
@@ -5300,7 +5300,7 @@ function realIsWsl() {
     return false;
   }
 }
-async function realResolveWindowsProfile() {
+async function resolveWindowsProfile() {
   try {
     const r = await runCapture("cmd.exe", ["/c", "echo %USERPROFILE%"]);
     const homeWin = r.stdout.replace(/\r/g, "").trim();
@@ -5326,8 +5326,8 @@ async function realLockWindowsKey(winKeyPath, user) {
 }
 function resolveWindowsDeps(d) {
   return {
-    isWsl: d?.isWsl ?? realIsWsl,
-    resolveProfile: d?.resolveProfile ?? realResolveWindowsProfile,
+    isWsl: d?.isWsl ?? isWsl,
+    resolveProfile: d?.resolveProfile ?? resolveWindowsProfile,
     lockKey: d?.lockKey ?? realLockWindowsKey
   };
 }
@@ -5400,7 +5400,9 @@ async function setupWindowsBridge(name, hostAlias, privateKey, deps, logger) {
   }
   const monoDir = path13.join(profile.homeWsl, ".ssh", "monoceros");
   await fs10.mkdir(monoDir, { recursive: true });
-  await fs10.copyFile(privateKey, path13.join(monoDir, name));
+  const keyDst = path13.join(monoDir, name);
+  await fs10.rm(keyDst, { force: true });
+  await fs10.copyFile(privateKey, keyDst);
   const keyWin = `${profile.homeWin}\\.ssh\\monoceros\\${name}`;
   await upsertMarkedBlock(
     path13.join(profile.homeWsl, ".ssh", "config"),
@@ -7978,11 +7980,23 @@ function resolveOnPath(bin) {
   }
   return null;
 }
-function resolveEditorBinary(tool) {
+async function resolveEditorBinary(tool) {
   if (resolveOnPath(tool.bin)) return tool.bin;
   if (process.platform === "darwin" && existsSync13(tool.macAppBin)) {
     return tool.macAppBin;
   }
+  if (isWsl()) {
+    const candidates = [`/mnt/c/Program Files/${tool.winInstallSubpath}`];
+    const profile = await resolveWindowsProfile();
+    if (profile) {
+      candidates.push(
+        `${profile.homeWsl}/AppData/Local/Programs/${tool.winInstallSubpath}`
+      );
+    }
+    for (const candidate of candidates) {
+      if (existsSync13(candidate)) return candidate;
+    }
+  }
   return null;
 }
 function realLaunch(bin, args) {
@@ -8024,7 +8038,7 @@ async function runOpen(opts) {
     );
   }
   const resolve = opts.binResolver ?? resolveEditorBinary;
-  const bin = resolve(editor);
+  const bin = await resolve(editor);
   if (!bin) {
     const where = process.platform === "darwin" ? " on PATH or in /Applications" : " on PATH";
     throw new Error(
@@ -8050,12 +8064,14 @@ var init_open = __esm({
         label: "VS Code",
         bin: "code",
         macAppBin: "/Applications/Visual Studio Code.app/Contents/Resources/app/bin/code",
-        setupHint: `install the Remote-SSH extension and run "Shell Command: Install 'code' command in PATH"`
+        winInstallSubpath: "Microsoft VS Code/bin/code",
+        setupHint: `install the Remote-SSH extension; on macOS also run "Shell Command: Install 'code' command in PATH"`
       },
       codium: {
         label: "VS Codium",
         bin: "codium",
         macAppBin: "/Applications/VSCodium.app/Contents/Resources/app/bin/codium",
+        winInstallSubpath: "VSCodium/bin/codium",
         setupHint: 'install the "Open Remote - SSH" extension (the codium CLI ships with the app)'
       }
     };
@@ -8068,7 +8084,7 @@ var CLI_VERSION;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    CLI_VERSION = true ? "1.29.0" : "dev";
+    CLI_VERSION = true ? "1.29.2" : "dev";
   }
 });