@pushpalsdev/cli 1.0.70 → 1.0.72

package/dist/pushpals-cli.js

@@ -2983,17 +2983,20 @@ async function resolveSourceControlManagerGitProbe(cwd, env, platform = process.
     detail: candidates.join(", ") || "git"
   };
 }
-async function resolveWorkerpalDockerProbe(cwd, env, platform = process.platform) {
-  const resolvedDockerBinary = await resolveCommandPath(platform === "win32" ? "docker.exe" : "docker", cwd, env);
-  if (resolvedDockerBinary) {
-    prependExecutableDirToPath(env, resolvedDockerBinary, platform);
-    env.PUSHPALS_DOCKER_BIN = basename(resolvedDockerBinary);
-    env.PUSHPALS_DOCKER_BIN_ABSOLUTE = resolvedDockerBinary;
+async function resolveWorkerpalDockerProbe(cwd, env, platform = process.platform, runCommandWithEnvFn = runCommandWithEnv) {
+  const preconfiguredDockerBinary = env.PUSHPALS_DOCKER_BIN_ABSOLUTE ?? env.PUSHPALS_DOCKER_BIN;
+  if (preconfiguredDockerBinary) {
+    applyResolvedDockerBinaryToRuntimeEnv(env, preconfiguredDockerBinary, platform);
+  } else {
+    const resolvedDockerBinary = await resolveCommandPath(platform === "win32" ? "docker.exe" : "docker", cwd, env);
+    if (resolvedDockerBinary) {
+      applyResolvedDockerBinaryToRuntimeEnv(env, resolvedDockerBinary, platform);
+    }
   }
   const candidates = resolveRuntimeDockerExecutableCandidates(env, platform);
   const failures = [];
   for (const candidate of candidates) {
-    const result = await runCommandWithEnv([candidate, "version", "--format", "{{.Server.Version}}"], cwd, env, DOCKER_VERSION_PROBE_TIMEOUT_MS);
+    const result = await runCommandWithEnvFn([candidate, "version", "--format", "{{.Server.Version}}"], cwd, env, DOCKER_VERSION_PROBE_TIMEOUT_MS);
     if (result.ok) {
       const version = result.stdout.trim();
       return {
@@ -3068,6 +3071,13 @@ async function cleanupLingeringWorkerpalWarmContainers(opts) {
         removed: 0
       };
     }
+    if (isDockerCleanupTimeoutDetail(detail)) {
+      return {
+        ok: true,
+        detail: `docker cleanup timed out; skipped WorkerPal warm-container cleanup: ${detail}`,
+        removed: 0
+      };
+    }
     return {
       ok: false,
       detail: `failed to inspect lingering WorkerPal warm containers: ${detail}`,
@@ -3085,6 +3095,20 @@ async function cleanupLingeringWorkerpalWarmContainers(opts) {
   const remove = await runCommandWithEnvFn([dockerExecutable, "rm", "-f", ...containerIds], opts.repoRoot, opts.env, commandTimeoutMs);
   if (!remove.ok) {
     const detail = remove.stderr || remove.stdout || `exit ${remove.exitCode}`;
+    if (isDockerUnavailableDetail(detail)) {
+      return {
+        ok: true,
+        detail: `docker unavailable; skipped WorkerPal warm-container cleanup: ${detail}`,
+        removed: 0
+      };
+    }
+    if (isDockerCleanupTimeoutDetail(detail)) {
+      return {
+        ok: true,
+        detail: `docker cleanup timed out; skipped WorkerPal warm-container cleanup: ${detail}`,
+        removed: 0
+      };
+    }
     return {
       ok: false,
       detail: `failed to remove lingering WorkerPal warm containers: ${detail}`,
@@ -3129,6 +3153,14 @@ async function cleanupLocalWorkerpalSandboxImage(opts) {
         imageName
       };
     }
+    if (isDockerCleanupTimeoutDetail(detail)) {
+      return {
+        ok: true,
+        detail: `docker cleanup timed out; skipped WorkerPal sandbox image cleanup: ${detail}`,
+        removed: false,
+        imageName
+      };
+    }
     return {
       ok: false,
       detail: `failed to remove local WorkerPal sandbox image ${imageName}: ${detail}`,
@@ -3228,6 +3260,9 @@ async function cleanupLingeringPushPalsGitWorktrees(opts) {
 function isMissingDockerImageDetail(detail) {
   return /\b(no such object|no such image|not found)\b/i.test(String(detail ?? ""));
 }
+function isDockerCleanupTimeoutDetail(detail) {
+  return /\btimed out after \d+ms\b/i.test(String(detail ?? ""));
+}
 function isDockerUnavailableDetail(detail) {
   const text = String(detail ?? "");
   return /cannot connect to (the )?docker daemon/i.test(text) || /docker daemon is not running/i.test(text) || /failed to connect to the docker api/i.test(text) || /docker_engine/i.test(text) || /is the docker daemon running/i.test(text) || /docker(?:\.exe)?: command not found/i.test(text) || /spawn\s+docker(?:\.exe)?\s+ENOENT/i.test(text) || /docker(?:\.exe)?'?\s+is not recognized as an internal or external command/i.test(text);
@@ -5420,6 +5455,7 @@ export {
   shutdownEmbeddedServiceManagerGracefully,
   shouldRunEmbeddedRuntimeStartupPrechecks,
   shouldRestartEmbeddedService,
+  resolveWorkerpalDockerProbe,
   resolveWorkerExecutionReadiness,
   resolveWindowsWhereExecutableCandidatesForEnv,
   resolveWindowsShellExecutableCandidatesForEnv,
@@ -5441,6 +5477,7 @@ export {
   normalizeCliInteractiveMessage,
   normalizeChildProcessEnv,
   isDockerUnavailableDetail,
+  isDockerCleanupTimeoutDetail,
   isCliExitCommand,
   injectMonitoringHubBootstrap,
   formatWorkerExecutionReadinessLines,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushpalsdev/cli",
-  "version": "1.0.70",
+  "version": "1.0.72",
   "description": "PushPals terminal CLI for LocalBuddy -> RemoteBuddy orchestration",
   "license": "MIT",
   "repository": {