@pushpalsdev/cli 1.0.24 → 1.0.27

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),
@@ -1743,6 +1743,21 @@ function writeTextFileIfMissing(pathValue, text) {
   mkdirSync(dirname(pathValue), { recursive: true });
   writeFileSync(pathValue, text, "utf8");
 }
+function migrateEmbeddedRuntimeLocalToml(localTomlPath) {
+  if (!existsSync4(localTomlPath))
+    return;
+  let original;
+  try {
+    original = readFileSync4(localTomlPath, "utf8");
+  } catch {
+    return;
+  }
+  const updated = original.replace(/^(\[remotebuddy\.autonomy\]\r?\n)(enabled\s*=\s*false\s*\r?\n)/m, `$1enabled = true
+`);
+  if (updated !== original) {
+    writeFileSync(localTomlPath, updated, "utf8");
+  }
+}
 function copyRuntimeAssetBundle(source, runtimeRoot, force) {
   mkdirSync(runtimeRoot, { recursive: true });
   cpSync(source.envExamplePath, join2(runtimeRoot, ".env.example"), {
@@ -1782,12 +1797,14 @@ function seedRuntimePreflightAssets(runtimeRoot) {
   writeTextFileIfMissing(join2(runtimeRoot, ".env"), `# Local PushPals runtime environment
 `);
   const localExamplePath = join2(runtimeRoot, "configs", "local.example.toml");
+  const localTomlPath = join2(runtimeRoot, "configs", "local.toml");
   if (existsSync4(localExamplePath)) {
-    writeTextFileIfMissing(join2(runtimeRoot, "configs", "local.toml"), readFileSync4(localExamplePath, "utf8"));
+    writeTextFileIfMissing(localTomlPath, readFileSync4(localExamplePath, "utf8"));
   } else {
-    writeTextFileIfMissing(join2(runtimeRoot, "configs", "local.toml"), `# Local PushPals runtime overrides
+    writeTextFileIfMissing(localTomlPath, `# Local PushPals runtime overrides
 `);
   }
+  migrateEmbeddedRuntimeLocalToml(localTomlPath);
 }
 async function fetchTextFromUrl(url, timeoutMs = 20000) {
   const response = await fetchWithTimeout(url, { headers: GITHUB_HEADERS }, timeoutMs);
@@ -1845,12 +1862,14 @@ async function ensureRuntimeAssets(runtimeRoot, runtimeTag) {
   writeTextFileIfMissing(join2(runtimeRoot, ".env"), `# Local PushPals runtime environment
 `);
   const localExamplePath = join2(runtimeRoot, "configs", "local.example.toml");
+  const localTomlPath = join2(runtimeRoot, "configs", "local.toml");
   if (existsSync4(localExamplePath)) {
-    writeTextFileIfMissing(join2(runtimeRoot, "configs", "local.toml"), readFileSync4(localExamplePath, "utf8"));
+    writeTextFileIfMissing(localTomlPath, readFileSync4(localExamplePath, "utf8"));
   } else {
-    writeTextFileIfMissing(join2(runtimeRoot, "configs", "local.toml"), `# Local PushPals runtime overrides
+    writeTextFileIfMissing(localTomlPath, `# Local PushPals runtime overrides
 `);
   }
+  migrateEmbeddedRuntimeLocalToml(localTomlPath);
   console.log("[pushpals] Embedded runtime assets are ready.");
 }
 function resolveDeferredRuntimeTagHint(explicitTag) {
@@ -1895,6 +1914,35 @@ function runtimeBinaryFilename(serviceName, platformKey) {
   const extension = platformKey.startsWith("windows-") ? ".exe" : "";
   return `pushpals-runtime-${serviceToken}-${platformKey}${extension}`;
 }
+function resolveRuntimeBinaryInstallState(runtimeRoot, platformKey) {
+  const binDir = join2(runtimeRoot, "bin", platformKey);
+  const tagMarkerPath = join2(binDir, ".runtime-tag");
+  const installedTag = existsSync4(tagMarkerPath) ? readFileSync4(tagMarkerPath, "utf8").trim() : "";
+  return { binDir, tagMarkerPath, installedTag };
+}
+function cleanupLegacyRuntimeBinaryLayouts(runtimeRoot, platformKey, activeBinDir) {
+  const legacyRoot = join2(runtimeRoot, "bin");
+  if (!existsSync4(legacyRoot))
+    return;
+  let entries;
+  try {
+    entries = readdirSync(legacyRoot, { withFileTypes: true });
+  } catch {
+    return;
+  }
+  for (const entry of entries) {
+    if (!entry.isDirectory())
+      continue;
+    const candidateDir = join2(legacyRoot, entry.name);
+    if (candidateDir === activeBinDir)
+      continue;
+    if (!entry.name.endsWith(`-${platformKey}`))
+      continue;
+    try {
+      rmSync(candidateDir, { recursive: true, force: true });
+    } catch {}
+  }
+}
 function buildEmbeddedRuntimeEnv(baseEnv, opts) {
   const env = normalizeChildProcessEnv(baseEnv);
   const useRuntimeConfig = opts.useRuntimeConfig !== false;
@@ -2032,7 +2080,8 @@ async function downloadBinaryAsset(tag, assetName, outPath) {
 async function ensureRuntimeBinaries(runtimeRoot, runtimeTag) {
   const platformKey = resolveRuntimePlatformKey();
   console.log(`[pushpals] Preparing embedded runtime binaries for ${runtimeTag} (${platformKey})...`);
-  const binDir = join2(runtimeRoot, "bin", `${runtimeTag}-${platformKey}`);
+  const installState = resolveRuntimeBinaryInstallState(runtimeRoot, platformKey);
+  const { binDir, tagMarkerPath, installedTag } = installState;
   mkdirSync(binDir, { recursive: true });
   const runtimeBinaries = {
     server: join2(binDir, runtimeBinaryFilename("server", platformKey)),
@@ -2048,14 +2097,18 @@ async function ensureRuntimeBinaries(runtimeRoot, runtimeTag) {
     runtimeBinaries.workerpals,
     runtimeBinaries.sourceControlManager
   ];
+  const shouldRefreshAll = installedTag !== runtimeTag;
   let downloadedCount = 0;
   for (const binaryPath of requiredAssets) {
-    if (existsSync4(binaryPath))
+    if (!shouldRefreshAll && existsSync4(binaryPath))
       continue;
     const assetName = binaryPath.split(/[\\/]/).pop() || "";
     await downloadBinaryAsset(runtimeTag, assetName, binaryPath);
     downloadedCount++;
   }
+  writeFileSync(tagMarkerPath, `${runtimeTag}
+`, "utf8");
+  cleanupLegacyRuntimeBinaryLayouts(runtimeRoot, platformKey, binDir);
   if (process.platform !== "win32") {
     for (const binaryPath of requiredAssets) {
       try {
@@ -2430,10 +2483,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 +4016,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 +4055,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 +4084,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({
@@ -4262,8 +4379,10 @@ export {
   extractRemoteBuddySessionConsumerHealth,
   extractRemoteBuddyAutonomousEngineState,
   ensureWorkerpalDockerImageReady,
+  ensureRuntimeBinaries,
   downloadRuntimeAssetsFromSourceTag,
   copyTrackedRepoPath,
+  cleanupLingeringWorkerpalWarmContainers,
   bundledMonitoringHubNeedsRefresh,
   buildWorkerpalSandboxPaths,
   buildServiceStopCommand,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushpalsdev/cli",
-  "version": "1.0.24",
+  "version": "1.0.27",
   "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,