@pushpalsdev/cli 1.0.47 → 1.0.48

package/dist/pushpals-cli.js

@@ -1523,6 +1523,9 @@ var MONITOR_POLL_MS = 2000;
 var HTTP_TIMEOUT_MS = 2500;
 var LOCALBUDDY_TIMEOUT_MS = 4000;
 var SSE_RECONNECT_MS = 1500;
+var DOCKER_VERSION_PROBE_TIMEOUT_MS = 1e4;
+var WORKERPAL_IMAGE_INSPECT_TIMEOUT_MS = 15000;
+var WORKERPAL_IMAGE_BUILD_TIMEOUT_MS = 10 * 60000;
 var DEFAULT_RUNTIME_BOOT_TIMEOUT_MS = 90000;
 var DEFAULT_RUNTIME_BOOT_POLL_MS = 1000;
 var DEFAULT_SERVER_BOOT_TIMEOUT_MS = 20000;
@@ -2948,7 +2951,7 @@ async function resolveWorkerpalDockerProbe(cwd, env, platform = process.platform
   const candidates = resolveRuntimeDockerExecutableCandidates(env, platform);
   const failures = [];
   for (const candidate of candidates) {
-    const result = await runCommandWithEnv([candidate, "version", "--format", "{{.Server.Version}}"], cwd, env);
+    const result = await runCommandWithEnv([candidate, "version", "--format", "{{.Server.Version}}"], cwd, env, DOCKER_VERSION_PROBE_TIMEOUT_MS);
     if (result.ok) {
       const version = result.stdout.trim();
       return {
@@ -3127,7 +3130,10 @@ async function cleanupLingeringPushPalsGitWorktrees(opts) {
     removed
   };
 }
-async function inspectDockerImageRuntimeTag(dockerExecutable, imageName, cwd, env) {
+function isMissingDockerImageDetail(detail) {
+  return /\b(no such object|no such image|not found)\b/i.test(String(detail ?? ""));
+}
+async function inspectDockerImageRuntimeTag(dockerExecutable, imageName, cwd, env, timeoutMs = WORKERPAL_IMAGE_INSPECT_TIMEOUT_MS) {
   const inspect = await runCommandWithEnv([
     dockerExecutable,
     "image",
@@ -3135,11 +3141,23 @@ async function inspectDockerImageRuntimeTag(dockerExecutable, imageName, cwd, en
     "--format",
     `{{ index .Config.Labels "${WORKERPAL_SANDBOX_RUNTIME_TAG_LABEL}" }}`,
     imageName
-  ], cwd, env);
-  if (!inspect.ok)
-    return "";
+  ], cwd, env, timeoutMs);
+  if (!inspect.ok) {
+    const detail = inspect.stderr || inspect.stdout || `exit ${inspect.exitCode}`;
+    if (isMissingDockerImageDetail(detail)) {
+      return { status: "missing", runtimeTag: "" };
+    }
+    return {
+      status: "failed",
+      runtimeTag: "",
+      detail: `failed to inspect local WorkerPal sandbox image ${imageName}: ${detail}`
+    };
+  }
   const value = inspect.stdout.trim();
-  return value === "<no value>" ? "" : value;
+  return {
+    status: "ok",
+    runtimeTag: value === "<no value>" ? "" : value
+  };
 }
 async function ensureWorkerpalDockerImageReady(opts) {
   const runtimeTag = String(opts.runtimeTag ?? "").trim();
@@ -3160,7 +3178,15 @@ async function ensureWorkerpalDockerImageReady(opts) {
   const dockerExecutable = resolveConfiguredDockerExecutable(opts.env, opts.platform ?? process.platform);
   const inspectImageRuntimeTagFn = opts.inspectImageRuntimeTagFn ?? inspectDockerImageRuntimeTag;
   const runCommandWithEnvFn = opts.runCommandWithEnvFn ?? runCommandWithEnv;
-  const existingRuntimeTag = await inspectImageRuntimeTagFn(dockerExecutable, opts.dockerImage, sandbox.root, opts.env);
+  console.log(`[pushpals] Checking WorkerPal sandbox image ${opts.dockerImage} for runtimeTag=${runtimeTag}...`);
+  const inspection = await inspectImageRuntimeTagFn(dockerExecutable, opts.dockerImage, sandbox.root, opts.env);
+  if (inspection.status === "failed") {
+    return {
+      ok: false,
+      detail: inspection.detail
+    };
+  }
+  const existingRuntimeTag = inspection.runtimeTag;
   if (existingRuntimeTag === runtimeTag) {
     return {
       ok: true,
@@ -3180,7 +3206,7 @@ async function ensureWorkerpalDockerImageReady(opts) {
     "-t",
     opts.dockerImage,
     "."
-  ], sandbox.root, opts.env);
+  ], sandbox.root, opts.env, WORKERPAL_IMAGE_BUILD_TIMEOUT_MS);
   if (!build.ok) {
     const detail = build.stderr || build.stdout || `docker build exited ${build.exitCode}`;
     return {

package/package.json

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