@getmonoceros/workbench 1.38.13 → 1.38.15

package/dist/bin.js

@@ -4080,7 +4080,11 @@ function buildPostCreateScript(opts) {
       lines.push(
         `if [ ! -d "projects/${repo.path}" ]; then`,
         `  echo "\u2192 Cloning ${repo.path} from ${url}\u2026"`,
-        `  git clone "${url}" "projects/${repo.path}"`,
+        `  if ! git clone "${url}" "projects/${repo.path}"; then`,
+        `    echo "\u26A0 Could not clone ${repo.path} from ${url} \u2014 skipping." >&2`,
+        `    echo "  If it is private, set a token and re-apply (see the repo-access notice)." >&2`,
+        `    rm -rf "projects/${repo.path}"`,
+        `  fi`,
         `else`,
         `  echo "\u2192 projects/${repo.path} already exists, skipping clone"`,
         `fi`
@@ -4089,8 +4093,10 @@ function buildPostCreateScript(opts) {
         const safeName = repo.gitUser.name.replace(/"/g, '\\"');
         const safeEmail = repo.gitUser.email.replace(/"/g, '\\"');
         lines.push(
-          `git -C "projects/${repo.path}" config user.name "${safeName}"`,
-          `git -C "projects/${repo.path}" config user.email "${safeEmail}"`
+          `if [ -d "projects/${repo.path}/.git" ]; then`,
+          `  git -C "projects/${repo.path}" config user.name "${safeName}"`,
+          `  git -C "projects/${repo.path}" config user.email "${safeEmail}"`,
+          `fi`
         );
       }
     }
@@ -7234,6 +7240,7 @@ function buildSpawnOptions(opts) {
   if (opts.logSink) out.logSink = opts.logSink;
   if (opts.progressSink) out.progressSink = opts.progressSink;
   if (opts.silent) out.silent = true;
+  if (opts.quiet) out.quiet = true;
   return Object.keys(out).length > 0 ? out : void 0;
 }
 async function runUpWithBindRetry(attempt, baseSink, logger, opts = {}) {
@@ -8073,6 +8080,30 @@ var init_docker_mode = __esm({
   }
 });
 
+// src/devcontainer/daemon-ready.ts
+async function waitForDockerDaemon(options = {}) {
+  const exec = options.exec ?? defaultDockerExec;
+  const attempts = options.attempts ?? 12;
+  const delayMs = options.delayMs ?? 500;
+  const sleep = options.sleep ?? ((ms) => new Promise((resolve) => setTimeout(resolve, ms)));
+  for (let attempt = 0; attempt < attempts; attempt++) {
+    try {
+      const result = await exec(["ps", "-q"]);
+      if (result.exitCode === 0) return true;
+    } catch {
+    }
+    if (attempt === 0) options.onWait?.();
+    if (attempt < attempts - 1) await sleep(delayMs);
+  }
+  return false;
+}
+var init_daemon_ready = __esm({
+  "src/devcontainer/daemon-ready.ts"() {
+    "use strict";
+    init_proxy();
+  }
+});
+
 // src/devcontainer/identity.ts
 import { spawn as spawn9 } from "child_process";
 import { promises as fs14 } from "fs";
@@ -8438,6 +8469,17 @@ Fix the value in the env file (or the yml).`
     }
   }
   section("Scaffold");
+  const daemonReady = await waitForDockerDaemon({
+    exec: opts.dockerExec ?? defaultDockerExec,
+    onWait: () => (logger.warn ?? logger.info)(
+      "Waiting for the Docker daemon to become ready\u2026"
+    )
+  });
+  if (!daemonReady) {
+    (logger.warn ?? logger.info)(
+      "Docker daemon still not responding \u2014 continuing; the next docker step will report the error."
+    );
+  }
   const dockerMode = await detectDockerMode({
     ...opts.dockerInfoSpawn ? { spawn: opts.dockerInfoSpawn } : {}
   });
@@ -8811,6 +8853,7 @@ var init_apply = __esm({
     init_credentials();
     init_docker_mode();
     init_cli();
+    init_daemon_ready();
     init_proxy();
     init_dynamic();
     init_port_check();
@@ -9010,7 +9053,7 @@ var CLI_VERSION;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    CLI_VERSION = true ? "1.38.13" : "dev";
+    CLI_VERSION = true ? "1.38.15" : "dev";
   }
 });
 
@@ -12918,7 +12961,7 @@ async function bringContainerUp(name, openTool) {
     }
     const exitCode = await runStart({
       root: containerDir(args.name),
-      silent: true,
+      quiet: true,
       logger: { info: () => {
       } }
     });
@@ -12945,6 +12988,10 @@ async function bringContainerUp(name, openTool) {
     }
     if (exitCode === 0) {
       consola38.success(`Container '${args.name}' is up.`);
+    } else {
+      consola38.error(
+        `Container '${args.name}' failed to start (devcontainer up exited ${exitCode}).`
+      );
     }
     if (args.open && exitCode === 0) {
       try {