@getmonoceros/workbench 1.11.5 → 1.11.6

package/dist/bin.js

@@ -3953,23 +3953,61 @@ var spawnDockerCompose = (args, cwd) => {
     child.on("exit", (code) => resolve(code ?? 0));
   });
 };
-var spawnBash = (args, cwd) => {
+var spawnDocker = (args) => {
   return new Promise((resolve, reject) => {
-    const child = spawn5("bash", args, {
-      cwd,
-      stdio: ["inherit", "pipe", "pipe"],
-      env: {
-        ...process.env,
-        MSYS_NO_PATHCONV: "1",
-        MSYS2_ARG_CONV_EXCL: "*"
-      }
+    const child = spawn5("docker", args, {
+      stdio: ["ignore", "pipe", "pipe"]
+    });
+    let stdout = "";
+    let stderr = "";
+    child.stdout?.on("data", (chunk) => {
+      stdout += chunk.toString("utf8");
+    });
+    child.stderr?.on("data", (chunk) => {
+      stderr += chunk.toString("utf8");
     });
-    child.stdout?.pipe(createSecretMaskStream()).pipe(process.stdout);
     child.stderr?.pipe(createSecretMaskStream()).pipe(process.stderr);
     child.on("error", reject);
-    child.on("exit", (code) => resolve(code ?? 0));
+    child.on(
+      "exit",
+      (code) => resolve({ exitCode: code ?? 0, stdout, stderr })
+    );
   });
 };
+async function findContainerIds(filters, exec = spawnDocker) {
+  const ids = /* @__PURE__ */ new Set();
+  for (const filter of filters) {
+    const result = await exec(["ps", "-aq", "--filter", filter]);
+    if (result.exitCode !== 0) continue;
+    for (const line of result.stdout.split(/\r?\n/)) {
+      const id = line.trim();
+      if (id) ids.add(id);
+    }
+  }
+  return [...ids];
+}
+async function cleanupDockerObjects(opts) {
+  const exec = opts.exec ?? spawnDocker;
+  const tag = opts.logTag ?? "cleanup";
+  opts.logger.info(`[${tag}] tearing down docker project ${opts.projectName}\u2026`);
+  const ids = await findContainerIds(opts.filters, exec);
+  let rmExit = 0;
+  if (ids.length > 0) {
+    opts.logger.info(`[${tag}] removing containers: ${ids.join(" ")}`);
+    const rmResult = await exec(["rm", "-f", ...ids]);
+    rmExit = rmResult.exitCode;
+  } else {
+    opts.logger.info(`[${tag}] no containers found`);
+  }
+  if (opts.network) {
+    const netResult = await exec(["network", "rm", opts.network]);
+    if (netResult.exitCode === 0) {
+      opts.logger.info(`[${tag}] network ${opts.network} removed`);
+    }
+  }
+  opts.logger.info(`[${tag}] docker cleanup done`);
+  return { exitCode: rmExit, removedIds: ids };
+}
 function dockerLocalFolderLabel(p) {
   if (process.platform !== "win32") return p;
   return p.replace(
@@ -4017,26 +4055,31 @@ async function runContainerCycle(root, opts) {
     logger.info(
       `Force-removing existing ${projectName} containers (volumes preserved)\u2026`
     );
-    const cleanupSpawn = opts.cleanupSpawn ?? spawnBash;
-    const script = [
-      `set -u`,
-      `echo "[cleanup] checking project ${projectName}\u2026"`,
-      `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)`,
-      // 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)`,
-      `if [ -n "$remaining_label" ] || [ -n "$remaining_name" ]; then echo "" >&2; echo "ERROR: containers under project ${projectName} reappeared after removal." >&2; echo "This typically means VS Code's Remote Containers extension is connected to" >&2; echo "this devcontainer and auto-recreated it. Close the dev container session" >&2; echo "in VS Code (Cmd+Shift+P \u2192 'Dev Containers: Close Remote Connection')" >&2; echo "and retry \\\`monoceros apply\\\`." >&2; exit 1; fi`,
-      `echo "[cleanup] done"`
-    ].join("; ");
-    const cleanupCode = await cleanupSpawn(["-c", script], root);
-    if (cleanupCode !== 0) return cleanupCode;
+    const exec = opts.dockerExec ?? spawnDocker;
+    const filters = [
+      `label=com.docker.compose.project=${projectName}`,
+      `name=^${projectName}-`
+    ];
+    const { exitCode: rmExit } = await cleanupDockerObjects({
+      projectName,
+      filters,
+      network: `${projectName}_default`,
+      logger,
+      exec
+    });
+    if (rmExit !== 0) return rmExit;
+    const remaining = await findContainerIds(filters, exec);
+    if (remaining.length > 0) {
+      const warn = logger.warn ?? logger.info;
+      warn(
+        `ERROR: containers under project ${projectName} reappeared after removal.
+This typically means VS Code's Remote Containers extension is connected
+to this devcontainer and auto-recreated it. Close the dev container
+session in VS Code (Cmd+Shift+P \u2192 'Dev Containers: Close Remote Connection')
+and retry \`monoceros apply\`.`
+      );
+      return 1;
+    }
     return runStart({
       root,
       ...opts.devcontainerSpawn ? { spawn: opts.devcontainerSpawn } : {},
@@ -4609,7 +4652,7 @@ ${sectionLine(label)}
   }
   const exitCode = await runContainerCycle(targetDir, {
     hasCompose: needsCompose(createOpts),
-    ...opts.cleanupSpawn !== void 0 ? { cleanupSpawn: opts.cleanupSpawn } : {},
+    ...opts.dockerExec !== void 0 ? { dockerExec: opts.dockerExec } : {},
     ...opts.devcontainerSpawn !== void 0 ? { devcontainerSpawn: opts.devcontainerSpawn } : {},
     logger
   });
@@ -4713,7 +4756,7 @@ async function persistPromptedIdentity(prompted, ymlPath, home, logger) {
 }
 
 // src/version.ts
-var CLI_VERSION = true ? "1.11.5" : "dev";
+var CLI_VERSION = true ? "1.11.6" : "dev";
 
 // src/commands/_dispatch.ts
 import { consola as consola12 } from "consola";
@@ -6170,39 +6213,20 @@ async function runRemove(opts) {
     );
   }
   const projectName = composeProjectName(containerPath);
-  const dockerSpawn = opts.dockerSpawn ?? spawnBash;
-  const script = [
-    `set -u`,
-    `echo "[remove] tearing down docker project ${projectName}\u2026"`,
-    // Compose-mode containers, identified by the compose project label.
-    `by_label=$(docker ps -aq --filter "label=com.docker.compose.project=${projectName}" 2>/dev/null || true)`,
-    // Devcontainer-cli containers (image-mode workspace + feature-
-    // build intermediates) all carry this label, value = the absolute
-    // container-dir path. Most reliable anchor we have, because
-    // @devcontainers/cli lets Docker assign random names like
-    // 'kind_cerf' — neither the project-name nor the vsc-<name>-
-    // prefix filters below catch those.
-    // 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)`,
-    // 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("; ");
-  const dockerExitCode = await dockerSpawn(["-c", script], home);
+  const dockerExec = opts.dockerExec ?? spawnDocker;
+  const { exitCode: dockerExitCode } = await cleanupDockerObjects({
+    projectName,
+    filters: [
+      `label=com.docker.compose.project=${projectName}`,
+      `label=devcontainer.local_folder=${dockerLocalFolderLabel(containerPath)}`,
+      `name=^${projectName}-`,
+      `name=^vsc-${opts.name}-`
+    ],
+    network: `${projectName}_default`,
+    logTag: "remove",
+    logger,
+    exec: dockerExec
+  });
   let backupPath = null;
   if (!opts.noBackup && (hasYml || hasContainer)) {
     const ts = (opts.now ?? /* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-");
@@ -6232,13 +6256,18 @@ async function runRemove(opts) {
       logger.info(
         `[remove] host-side rm hit ${code} on ${prettyPath(containerPath)}; using a throw-away alpine container to clean root-owned files\u2026`
       );
-      const exit = await dockerSpawn(
-        [
-          "-c",
-          `docker run --rm -v "${containerPath}":/target alpine:3.21 find /target -mindepth 1 -delete`
-        ],
-        home
-      );
+      const { exitCode: exit } = await dockerExec([
+        "run",
+        "--rm",
+        "-v",
+        `${containerPath}:/target`,
+        "alpine:3.21",
+        "find",
+        "/target",
+        "-mindepth",
+        "1",
+        "-delete"
+      ]);
       if (exit !== 0) {
         throw new Error(
           `docker-based cleanup of ${containerPath} exited ${exit}. Inspect with \`sudo ls -la ${containerPath}\` and clean manually.`