@getmonoceros/workbench 1.11.3 → 1.11.5

package/dist/bin.js

@@ -3957,7 +3957,12 @@ var spawnBash = (args, cwd) => {
   return new Promise((resolve, reject) => {
     const child = spawn5("bash", args, {
       cwd,
-      stdio: ["inherit", "pipe", "pipe"]
+      stdio: ["inherit", "pipe", "pipe"],
+      env: {
+        ...process.env,
+        MSYS_NO_PATHCONV: "1",
+        MSYS2_ARG_CONV_EXCL: "*"
+      }
     });
     child.stdout?.pipe(createSecretMaskStream()).pipe(process.stdout);
     child.stderr?.pipe(createSecretMaskStream()).pipe(process.stderr);
@@ -3965,6 +3970,13 @@ var spawnBash = (args, cwd) => {
     child.on("exit", (code) => resolve(code ?? 0));
   });
 };
+function dockerLocalFolderLabel(p) {
+  if (process.platform !== "win32") return p;
+  return p.replace(
+    /^([A-Z]):/,
+    (_, drive) => `${drive.toLowerCase()}:`
+  );
+}
 function composeProjectName(root) {
   return `${path11.basename(root)}_devcontainer`;
 }
@@ -4012,7 +4024,11 @@ async function runContainerCycle(root, opts) {
       `by_label=$(docker ps -aq --filter "label=com.docker.compose.project=${projectName}" 2>/dev/null || true)`,
       `by_name=$(docker ps -aq --filter "name=^${projectName}-" 2>/dev/null || true)`,
       `to_remove=$(printf "%s\\n%s\\n" "$by_label" "$by_name" | sort -u | grep -v "^$" || true)`,
-      `if [ -n "$to_remove" ]; then echo "[cleanup] removing: $(echo $to_remove | tr "\\n" " ")"; docker rm -f $to_remove >/dev/null || true; else echo "[cleanup] no containers to remove"; fi`,
+      // Unquoted `$to_remove` so bash word-splitting joins the
+      // newline-separated IDs with single spaces on echo. A `tr "\n" " "`
+      // pipe here used to do the same job but tripped MSYS2's arg
+      // translation on Git Bash for Windows ("tr: extra operand").
+      `if [ -n "$to_remove" ]; then echo "[cleanup] removing:" $to_remove; docker rm -f $to_remove >/dev/null || true; else echo "[cleanup] no containers to remove"; fi`,
       `docker network rm ${projectName}_default 2>/dev/null && echo "[cleanup] network ${projectName}_default removed" || echo "[cleanup] network ${projectName}_default not present"`,
       `remaining_label=$(docker ps -aq --filter "label=com.docker.compose.project=${projectName}" 2>/dev/null || true)`,
       `remaining_name=$(docker ps -aq --filter "name=^${projectName}-" 2>/dev/null || true)`,
@@ -4697,7 +4713,7 @@ async function persistPromptedIdentity(prompted, ymlPath, home, logger) {
 }
 
 // src/version.ts
-var CLI_VERSION = true ? "1.11.3" : "dev";
+var CLI_VERSION = true ? "1.11.5" : "dev";
 
 // src/commands/_dispatch.ts
 import { consola as consola12 } from "consola";
@@ -6166,14 +6182,23 @@ async function runRemove(opts) {
     // @devcontainers/cli lets Docker assign random names like
     // 'kind_cerf' — neither the project-name nor the vsc-<name>-
     // prefix filters below catch those.
-    `by_dc_label=$(docker ps -aq --filter "label=devcontainer.local_folder=${containerPath}" 2>/dev/null || true)`,
+    // dockerLocalFolderLabel() lowercases the drive letter on Windows
+    // to match exactly what @devcontainers/cli stamps (`c:\…` vs our
+    // `path.join`-built `C:\…`). Docker label filters are strict
+    // byte-equality, so the case difference was leaving containers
+    // alive on `monoceros remove`.
+    `by_dc_label=$(docker ps -aq --filter "label=devcontainer.local_folder=${dockerLocalFolderLabel(containerPath)}" 2>/dev/null || true)`,
     // Container-name prefix fallback (catches half-broken state).
     `by_compose_name=$(docker ps -aq --filter "name=^${projectName}-" 2>/dev/null || true)`,
     // Image-mode devcontainer-cli name fallback (only kicks in when
     // the cli used a deterministic name — modern versions don't).
     `by_image_name=$(docker ps -aq --filter "name=^vsc-${opts.name}-" 2>/dev/null || true)`,
     `to_remove=$(printf "%s\\n%s\\n%s\\n%s\\n" "$by_label" "$by_dc_label" "$by_compose_name" "$by_image_name" | sort -u | grep -v "^$" || true)`,
-    `if [ -n "$to_remove" ]; then echo "[remove] removing containers: $(echo $to_remove | tr "\\n" " ")"; docker rm -f $to_remove >/dev/null || true; else echo "[remove] no containers found"; fi`,
+    // Unquoted `$to_remove` so bash word-splitting joins the
+    // newline-separated IDs with single spaces on echo. A `tr "\n" " "`
+    // pipe here used to do the same job but tripped MSYS2's arg
+    // translation on Git Bash for Windows ("tr: extra operand").
+    `if [ -n "$to_remove" ]; then echo "[remove] removing containers:" $to_remove; docker rm -f $to_remove >/dev/null || true; else echo "[remove] no containers found"; fi`,
     `docker network rm ${projectName}_default 2>/dev/null && echo "[remove] network ${projectName}_default removed" || true`,
     `echo "[remove] docker cleanup done"`
   ].join("; ");