@pushpalsdev/cli 1.0.24 → 1.0.25

package/dist/pushpals-cli.js

@@ -637,7 +637,7 @@ function loadPushPalsConfig(options = {}) {
       workerpalOnlineTtlMs: Math.max(1000, asInt(parseIntEnv("REMOTEBUDDY_WORKERPAL_ONLINE_TTL_MS") ?? remoteNode.workerpal_online_ttl_ms, 15000)),
       waitForWorkerpalMs: Math.max(0, asInt(parseIntEnv("REMOTEBUDDY_WAIT_FOR_WORKERPAL_MS") ?? remoteNode.wait_for_workerpal_ms, 15000)),
       autoSpawnWorkerpals: parseBoolEnv("REMOTEBUDDY_AUTO_SPAWN_WORKERPALS") ?? asBoolean(remoteNode.auto_spawn_workerpals, true),
-      maxWorkerpals: Math.max(1, asInt(remoteNode.max_workerpals, 20)),
+      maxWorkerpals: Math.max(1, asInt(parseIntEnv("REMOTEBUDDY_MAX_WORKERPALS") ?? remoteNode.max_workerpals, 20)),
       workerpalStartupTimeoutMs: Math.max(1000, asInt(parseIntEnv("REMOTEBUDDY_WORKERPAL_STARTUP_TIMEOUT_MS") ?? remoteNode.workerpal_startup_timeout_ms, 1e4)),
       workerpalDocker: parseBoolEnv("REMOTEBUDDY_WORKERPAL_DOCKER") ?? asBoolean(remoteNode.workerpal_docker, true),
       workerpalRequireDocker: parseBoolEnv("REMOTEBUDDY_WORKERPAL_REQUIRE_DOCKER") ?? asBoolean(remoteNode.workerpal_require_docker, true),
@@ -2430,10 +2430,54 @@ async function resolveWorkerpalDockerProbe(cwd, env, platform = process.platform
 }
 var WORKERPAL_SANDBOX_RUNTIME_TAG_LABEL = "pushpals.runtime_tag";
 var WORKERPAL_SANDBOX_COMPONENT_LABEL = "pushpals.component=workerpals-sandbox";
+var WORKERPAL_WARM_COMPONENT_LABEL = "pushpals.component=workerpals-warm";
 function resolveConfiguredDockerExecutable(env, platform = process.platform) {
   const configured = String(env.PUSHPALS_DOCKER_BIN_ABSOLUTE ?? env.PUSHPALS_DOCKER_BIN ?? (platform === "win32" ? "docker.exe" : "docker")).trim();
   return configured || (platform === "win32" ? "docker.exe" : "docker");
 }
+async function cleanupLingeringWorkerpalWarmContainers(opts) {
+  const runCommandWithEnvFn = opts.runCommandWithEnvFn ?? runCommandWithEnv;
+  const dockerExecutable = resolveConfiguredDockerExecutable(opts.env, opts.platform ?? process.platform);
+  const list = await runCommandWithEnvFn([
+    dockerExecutable,
+    "ps",
+    "-aq",
+    "--filter",
+    `label=${WORKERPAL_WARM_COMPONENT_LABEL}`,
+    "--filter",
+    `label=pushpals.repo=${opts.repoRoot}`
+  ], opts.repoRoot, opts.env);
+  if (!list.ok) {
+    const detail = list.stderr || list.stdout || `exit ${list.exitCode}`;
+    return {
+      ok: false,
+      detail: `failed to inspect lingering WorkerPal warm containers: ${detail}`,
+      removed: 0
+    };
+  }
+  const containerIds = list.stdout.split(/\s+/).map((value) => value.trim()).filter(Boolean);
+  if (containerIds.length === 0) {
+    return {
+      ok: true,
+      detail: "no lingering WorkerPal warm containers found",
+      removed: 0
+    };
+  }
+  const remove = await runCommandWithEnvFn([dockerExecutable, "rm", "-f", ...containerIds], opts.repoRoot, opts.env);
+  if (!remove.ok) {
+    const detail = remove.stderr || remove.stdout || `exit ${remove.exitCode}`;
+    return {
+      ok: false,
+      detail: `failed to remove lingering WorkerPal warm containers: ${detail}`,
+      removed: 0
+    };
+  }
+  return {
+    ok: true,
+    detail: `removed ${containerIds.length} lingering WorkerPal warm container(s)`,
+    removed: containerIds.length
+  };
+}
 async function inspectDockerImageRuntimeTag(dockerExecutable, imageName, cwd, env) {
   const inspect = await runCommandWithEnv([
     dockerExecutable,
@@ -3919,6 +3963,24 @@ async function main() {
   let autoStartedServices = [];
   let pushpalsLogPath;
   let resolvedRuntimeTagForAutoStart = preparedRuntime.runtimeTag || parsed.runtimeTag || "";
+  const cleanupWorkerpalWarmContainersIfNeeded = async (phase) => {
+    if (workerpalDockerPrecheck.status === "failed")
+      return;
+    if (!config.remotebuddy.autoSpawnWorkerpals || !config.remotebuddy.workerpalDocker || !config.remotebuddy.workerpalRequireDocker) {
+      return;
+    }
+    const cleanup = await cleanupLingeringWorkerpalWarmContainers({
+      repoRoot,
+      env: workerpalDockerPrecheck.env
+    });
+    if (!cleanup.ok) {
+      console.warn(`[pushpals] WorkerPal warm-container cleanup warning (${phase}): ${cleanup.detail}`);
+      return;
+    }
+    if (cleanup.removed > 0) {
+      console.log(`[pushpals] ${cleanup.detail} (${phase}).`);
+    }
+  };
   const stopAutoStartedServices = () => {
     if (autoStartedServices.length === 0)
       return;
@@ -3940,6 +4002,7 @@ async function main() {
       console.warn(`[pushpals] ${shutdown.detail}`);
     }
     await stopRuntimeServicesGracefully(services);
+    await cleanupWorkerpalWarmContainersIfNeeded("cli shutdown");
   };
   let serverHealthy = await probeServer(serverUrl);
   const serverWasAlreadyHealthy = serverHealthy;
@@ -3968,6 +4031,7 @@ async function main() {
     detail: `No connected RemoteBuddy session consumer found for session ${sessionId}`
   };
   if (!serverHealthy) {
+    await cleanupWorkerpalWarmContainersIfNeeded("startup preflight");
     if (!parsed.noAutoStart) {
       try {
         const startedRuntime = await autoStartRuntimeServices({
@@ -4264,6 +4328,7 @@ export {
   ensureWorkerpalDockerImageReady,
   downloadRuntimeAssetsFromSourceTag,
   copyTrackedRepoPath,
+  cleanupLingeringWorkerpalWarmContainers,
   bundledMonitoringHubNeedsRefresh,
   buildWorkerpalSandboxPaths,
   buildServiceStopCommand,

package/package.json

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

package/runtime/configs/default.toml

@@ -40,7 +40,7 @@ status_heartbeat_ms = 120000
 workerpal_online_ttl_ms = 15000
 wait_for_workerpal_ms = 15000
 auto_spawn_workerpals = true
-max_workerpals = 10
+max_workerpals = 3
 workerpal_startup_timeout_ms = 10000
 workerpal_docker = true
 workerpal_require_docker = true
@@ -143,8 +143,8 @@ docker_warm_max_attempts = 3
 docker_warm_retry_backoff_ms = 2000
 docker_job_max_attempts = 2
 docker_job_retry_backoff_ms = 3000
-docker_warm_memory_mb = 2048
-docker_warm_cpus = 2
+docker_warm_memory_mb = 1024
+docker_warm_cpus = 1
 file_modifying_jobs = ["task.execute"]
 output_max_chars = 196608
 output_max_lines = 600

package/runtime/configs/local.example.toml

@@ -23,7 +23,7 @@ codex_timeout_ms = 120000
 reasoning_effort = "high"
 
 [remotebuddy]
-max_workerpals = 10
+max_workerpals = 3
 crash_restart_enabled = true
 crash_restart_max_restarts = 3
 crash_restart_backoff_ms = 3000
@@ -59,8 +59,8 @@ openhands_stuck_guard_explore_limit = 18
 openhands_stuck_guard_min_elapsed_ms = 180000
 openhands_stuck_guard_broad_scan_limit = 2
 openhands_stuck_guard_no_progress_max_ms = 300000
-docker_warm_memory_mb = 2048
-docker_warm_cpus = 2
+docker_warm_memory_mb = 1024
+docker_warm_cpus = 1
 file_modifying_jobs = ["task.execute"]
 output_max_chars = 196608
 output_max_lines = 600

package/runtime/sandbox/configs/default.toml

@@ -40,7 +40,7 @@ status_heartbeat_ms = 120000
 workerpal_online_ttl_ms = 15000
 wait_for_workerpal_ms = 15000
 auto_spawn_workerpals = true
-max_workerpals = 10
+max_workerpals = 3
 workerpal_startup_timeout_ms = 10000
 workerpal_docker = true
 workerpal_require_docker = true
@@ -143,8 +143,8 @@ docker_warm_max_attempts = 3
 docker_warm_retry_backoff_ms = 2000
 docker_job_max_attempts = 2
 docker_job_retry_backoff_ms = 3000
-docker_warm_memory_mb = 2048
-docker_warm_cpus = 2
+docker_warm_memory_mb = 1024
+docker_warm_cpus = 1
 file_modifying_jobs = ["task.execute"]
 output_max_chars = 196608
 output_max_lines = 600

package/runtime/sandbox/configs/local.example.toml

@@ -23,7 +23,7 @@ codex_timeout_ms = 120000
 reasoning_effort = "high"
 
 [remotebuddy]
-max_workerpals = 10
+max_workerpals = 3
 crash_restart_enabled = true
 crash_restart_max_restarts = 3
 crash_restart_backoff_ms = 3000
@@ -59,8 +59,8 @@ openhands_stuck_guard_explore_limit = 18
 openhands_stuck_guard_min_elapsed_ms = 180000
 openhands_stuck_guard_broad_scan_limit = 2
 openhands_stuck_guard_no_progress_max_ms = 300000
-docker_warm_memory_mb = 2048
-docker_warm_cpus = 2
+docker_warm_memory_mb = 1024
+docker_warm_cpus = 1
 file_modifying_jobs = ["task.execute"]
 output_max_chars = 196608
 output_max_lines = 600

package/runtime/sandbox/packages/shared/src/config.ts

@@ -1508,7 +1508,10 @@ export function loadPushPalsConfig(options: LoadOptions = {}): PushPalsConfig {
         asBoolean(remoteNode.auto_spawn_workerpals, true),
       maxWorkerpals: Math.max(
         1,
-        asInt(remoteNode.max_workerpals, 20),
+        asInt(
+          parseIntEnv("REMOTEBUDDY_MAX_WORKERPALS") ?? remoteNode.max_workerpals,
+          20,
+        ),
       ),
       workerpalStartupTimeoutMs: Math.max(
         1_000,