@pushpalsdev/cli 1.1.19 → 1.1.20

package/dist/pushpals-cli.js

@@ -1040,6 +1040,7 @@ function loadPushPalsConfig(options = {}) {
         enabled: parseBoolEnv("REMOTEBUDDY_AUTONOMY_ENABLED") ?? asBoolean(remoteAutonomyNode.enabled, true),
         killSwitchEnabled: parseBoolEnv("REMOTEBUDDY_AUTONOMY_KILL_SWITCH_ENABLED") ?? asBoolean(remoteAutonomyNode.kill_switch_enabled, false),
         tickIntervalMs: Math.max(5000, asInt(parseIntEnv("REMOTEBUDDY_AUTONOMY_TICK_INTERVAL_MS") ?? remoteAutonomyNode.tick_interval_ms, 120000)),
+        startupGraceMs: Math.max(0, asInt(parseIntEnv("REMOTEBUDDY_AUTONOMY_STARTUP_GRACE_MS") ?? remoteAutonomyNode.startup_grace_ms, 120000)),
         heartbeatLogMs: Math.max(1000, asInt(parseIntEnv("REMOTEBUDDY_AUTONOMY_HEARTBEAT_LOG_MS") ?? remoteAutonomyNode.heartbeat_log_ms, 30000)),
         visionContextMaxChars: Math.max(1000, Math.min(1e6, asInt(parseIntEnv("REMOTEBUDDY_AUTONOMY_VISION_CONTEXT_MAX_CHARS") ?? remoteAutonomyNode.vision_context_max_chars, 65536))),
         ideationBudgetMs: Math.max(1000, asInt(parseIntEnv("REMOTEBUDDY_AUTONOMY_IDEATION_BUDGET_MS") ?? remoteAutonomyNode.ideation_budget_ms, 20000)),
@@ -1648,7 +1649,8 @@ var DEFAULT_STARTUP_GIT_PROBE_TIMEOUT_MS = 5000;
 var DEFAULT_STARTUP_GIT_REMOTE_TIMEOUT_MS = 1e4;
 var DEFAULT_EMBEDDED_SERVICE_LAUNCH_WARN_MS = 5000;
 var EMBEDDED_SERVICE_RESTART_MAX_ATTEMPTS = 4;
-var WORKERPAL_STARTUP_READINESS_PROBE_MAX_MS = 15000;
+var DEFAULT_WORKERPAL_STARTUP_READINESS_PROBE_MAX_MS = 5000;
+var WORKERPAL_STARTUP_READINESS_PROBE_MAX_MS_ENV = "PUSHPALS_WORKERPAL_STARTUP_READINESS_PROBE_MAX_MS";
 var BLOCKING_WORKERPAL_IMAGE_BUILD_ENV = "PUSHPALS_BLOCKING_WORKERPAL_IMAGE_BUILD";
 var CLI_SESSION_JOB_LOG_MAX_CHARS = 700;
 var CLI_SESSION_SHOW_JOB_EVENTS_ENV = "PUSHPALS_CLI_SHOW_JOB_EVENTS";
@@ -1681,6 +1683,13 @@ function formatTimestampedCliLine(line, at = new Date) {
 function isTruthyCliEnvValue(value) {
   return /^(1|true|yes|on)$/i.test(String(value ?? "").trim());
 }
+function parseCliIntEnv(name, env = process.env) {
+  const raw = env[name];
+  if (raw == null || String(raw).trim() === "")
+    return null;
+  const parsed = Number.parseInt(String(raw), 10);
+  return Number.isFinite(parsed) ? parsed : null;
+}
 function shouldShowCliSessionOperationalEvents(env = process.env) {
   return isTruthyCliEnvValue(env[CLI_SESSION_SHOW_JOB_EVENTS_ENV]);
 }
@@ -3899,8 +3908,12 @@ async function precheckWorkerpalDockerAvailability(opts) {
 function resolveWorkerpalCapacityTimeoutMs(config) {
   return Math.max(config.remotebuddy.waitForWorkerpalMs, config.remotebuddy.workerpalStartupTimeoutMs, config.remotebuddy.workerpalDocker ? config.workerpals.dockerAgentStartupTimeoutMs + 15000 : 0, 1e4);
 }
+function resolveWorkerpalStartupReadinessProbeMaxMs(env = process.env) {
+  const configured = parseCliIntEnv(WORKERPAL_STARTUP_READINESS_PROBE_MAX_MS_ENV, env);
+  return Math.max(1000, configured ?? DEFAULT_WORKERPAL_STARTUP_READINESS_PROBE_MAX_MS);
+}
 function resolveWorkerpalStartupReadinessProbeTimeoutMs(config) {
-  return Math.max(5000, Math.min(resolveWorkerpalCapacityTimeoutMs(config), WORKERPAL_STARTUP_READINESS_PROBE_MAX_MS));
+  return Math.max(1000, Math.min(resolveWorkerpalCapacityTimeoutMs(config), resolveWorkerpalStartupReadinessProbeMaxMs()));
 }
 function shouldPrepareEmbeddedWorkerpalDockerImageBlocking(opts = {}) {
   const env = opts.env ?? process.env;
@@ -6082,6 +6095,7 @@ export {
   shouldPrepareEmbeddedWorkerpalDockerImageBlocking,
   shouldDeferRemoteBuddySessionConsumerReadiness,
   runCommandWithEnv,
+  resolveWorkerpalStartupReadinessProbeMaxMs,
   resolveWorkerpalDockerProbe,
   resolveWorkerExecutionReadiness,
   resolveWindowsWhereExecutableCandidatesForEnv,

package/package.json

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

package/runtime/configs/default.toml

@@ -75,6 +75,7 @@ session_id = "remotebuddy-dev"
 enabled = true
 kill_switch_enabled = false
 tick_interval_ms = 300000
+startup_grace_ms = 120000
 heartbeat_log_ms = 30000
 vision_context_max_chars = 65536
 ideation_budget_ms = 20000

package/runtime/sandbox/.pushpals-remotebuddy-fallback.js

@@ -1323,6 +1323,7 @@ function loadPushPalsConfig(options = {}) {
         enabled: parseBoolEnv("REMOTEBUDDY_AUTONOMY_ENABLED") ?? asBoolean(remoteAutonomyNode.enabled, true),
         killSwitchEnabled: parseBoolEnv("REMOTEBUDDY_AUTONOMY_KILL_SWITCH_ENABLED") ?? asBoolean(remoteAutonomyNode.kill_switch_enabled, false),
         tickIntervalMs: Math.max(5000, asInt(parseIntEnv("REMOTEBUDDY_AUTONOMY_TICK_INTERVAL_MS") ?? remoteAutonomyNode.tick_interval_ms, 120000)),
+        startupGraceMs: Math.max(0, asInt(parseIntEnv("REMOTEBUDDY_AUTONOMY_STARTUP_GRACE_MS") ?? remoteAutonomyNode.startup_grace_ms, 120000)),
         heartbeatLogMs: Math.max(1000, asInt(parseIntEnv("REMOTEBUDDY_AUTONOMY_HEARTBEAT_LOG_MS") ?? remoteAutonomyNode.heartbeat_log_ms, 30000)),
         visionContextMaxChars: Math.max(1000, Math.min(1e6, asInt(parseIntEnv("REMOTEBUDDY_AUTONOMY_VISION_CONTEXT_MAX_CHARS") ?? remoteAutonomyNode.vision_context_max_chars, 65536))),
         ideationBudgetMs: Math.max(1000, asInt(parseIntEnv("REMOTEBUDDY_AUTONOMY_IDEATION_BUDGET_MS") ?? remoteAutonomyNode.ideation_budget_ms, 20000)),
@@ -6569,6 +6570,7 @@ class RemoteBuddyAutonomousEngine {
   cfg;
   runtimeEnabled = true;
   timer = null;
+  startupGraceTimer = null;
   startupFastTickTimer = null;
   heartbeatTimer = null;
   inFlight = false;
@@ -6641,7 +6643,8 @@ class RemoteBuddyAutonomousEngine {
       console.log(`[RemoteBuddyAutonomousEngine] heartbeat: status=running run=${this.currentRunId} phase=${this.currentPhase} run_elapsed_ms=${runElapsedMs} phase_elapsed_ms=${phaseElapsedMs}`);
       return;
     }
-    const nextTickInMs = this.timer && this.nextTickAtMs > 0 ? Math.max(0, this.nextTickAtMs - now) : 0;
+    const hasScheduledTick = Boolean(this.timer || this.startupGraceTimer || this.startupFastTickTimer);
+    const nextTickInMs = hasScheduledTick && this.nextTickAtMs > 0 ? Math.max(0, this.nextTickAtMs - now) : 0;
     const lastAgeMs = this.lastCompletedAtMs > 0 ? Math.max(0, now - this.lastCompletedAtMs) : -1;
     console.log(`[RemoteBuddyAutonomousEngine] heartbeat: status=idle last_outcome=${this.lastOutcome} detail=${this.lastDetail} last_tick_age_ms=${lastAgeMs} next_tick_in_ms=${nextTickInMs}`);
   }
@@ -6667,6 +6670,15 @@ class RemoteBuddyAutonomousEngine {
   startupFastTickDelayMs() {
     return Math.max(1000, Math.min(STARTUP_FAST_TICK_MAX_DELAY_MS, Math.floor(this.cfg.tickIntervalMs / 10)));
   }
+  startupGraceMs() {
+    return Math.max(0, this.cfg.startupGraceMs ?? 0);
+  }
+  clearStartupGraceTimer() {
+    if (this.startupGraceTimer) {
+      clearTimeout(this.startupGraceTimer);
+      this.startupGraceTimer = null;
+    }
+  }
   clearStartupFastTickTimer() {
     if (this.startupFastTickTimer) {
       clearTimeout(this.startupFastTickTimer);
@@ -8160,22 +8172,42 @@ Scope:
     });
   }
   start() {
-    if (!this.runtimeEnabled || this.timer)
+    if (!this.runtimeEnabled || this.timer || this.startupGraceTimer)
       return;
     console.log(`[RemoteBuddyAutonomousEngine] Using dedicated autonomy worktree ${this.autonomyRepo} (remote=${this.gitRemote} integration=${this.integrationBranch} base=${this.baseBranch}).`);
     this.startupFastTickAttemptsRemaining = STARTUP_FAST_TICK_MAX_ATTEMPTS;
-    this.nextTickAtMs = Date.now();
-    this.timer = setInterval(() => {
-      this.nextTickAtMs = Date.now() + this.cfg.tickIntervalMs;
-      this.tick();
-    }, this.cfg.tickIntervalMs);
+    const startInterval = () => {
+      if (this.timer)
+        return;
+      this.timer = setInterval(() => {
+        this.nextTickAtMs = Date.now() + this.cfg.tickIntervalMs;
+        this.tick();
+      }, this.cfg.tickIntervalMs);
+    };
+    const firstTickDelayMs = this.startupGraceMs();
+    this.nextTickAtMs = Date.now() + firstTickDelayMs;
     this.heartbeatTimer = setInterval(() => {
       this.logHeartbeat();
     }, this.cfg.heartbeatLogMs);
     this.logHeartbeat();
+    if (firstTickDelayMs > 0) {
+      console.log(`[RemoteBuddyAutonomousEngine] startup autonomy tick delayed by ${firstTickDelayMs}ms to leave cold-start capacity available for user work.`);
+      this.startupGraceTimer = setTimeout(() => {
+        this.startupGraceTimer = null;
+        if (!this.runtimeEnabled)
+          return;
+        startInterval();
+        this.nextTickAtMs = Date.now() + this.cfg.tickIntervalMs;
+        this.tick();
+      }, firstTickDelayMs);
+      return;
+    }
+    startInterval();
+    this.nextTickAtMs = Date.now() + this.cfg.tickIntervalMs;
     this.tick();
   }
   stop() {
+    this.clearStartupGraceTimer();
     this.clearStartupFastTickTimer();
     if (this.timer) {
       clearInterval(this.timer);
@@ -9014,7 +9046,7 @@ class RemoteBuddyOrchestrator {
     console.log(`[RemoteBuddy] Budgets: interactive=${this.executionBudgetInteractiveMs}ms normal=${this.executionBudgetNormalMs}ms background=${this.executionBudgetBackgroundMs}ms finalization=${this.finalizationBudgetMs}ms`);
     console.log(`[RemoteBuddy] Failure log fetch on job failures: ${this.fetchFailureLogsOnJobFailure ? "on" : "off"}`);
     console.log(`[RemoteBuddy] Persistent memory: ${this.memoryEnabled ? "on" : "off"} crossSession=${this.memoryIncludeCrossSession ? "on" : "off"} recallItems=${this.memoryMaxRecallItems} recallChars=${this.memoryMaxRecallChars} retentionDays=${this.memoryRetentionDays}`);
-    console.log(`[RemoteBuddy] Autonomous engine: ${CONFIG.remotebuddy.autonomy.enabled ? "enabled" : "disabled"} tick=${CONFIG.remotebuddy.autonomy.tickIntervalMs}ms maxConcurrentObjectives=${CONFIG.remotebuddy.autonomy.maxConcurrentObjectives} maxDispatchPerHour=${CONFIG.remotebuddy.autonomy.maxDispatchPerHour} exploreRate=${CONFIG.remotebuddy.autonomy.exploreRate.toFixed(2)} allowDirtyWorktree=${CONFIG.remotebuddy.autonomy.allowDirtyWorktree ? "on" : "off"}`);
+    console.log(`[RemoteBuddy] Autonomous engine: ${CONFIG.remotebuddy.autonomy.enabled ? "enabled" : "disabled"} tick=${CONFIG.remotebuddy.autonomy.tickIntervalMs}ms startupGrace=${CONFIG.remotebuddy.autonomy.startupGraceMs}ms maxConcurrentObjectives=${CONFIG.remotebuddy.autonomy.maxConcurrentObjectives} maxDispatchPerHour=${CONFIG.remotebuddy.autonomy.maxDispatchPerHour} exploreRate=${CONFIG.remotebuddy.autonomy.exploreRate.toFixed(2)} allowDirtyWorktree=${CONFIG.remotebuddy.autonomy.allowDirtyWorktree ? "on" : "off"}`);
     console.log(`[RemoteBuddy] Autonomy runtime-config polling: every ${this.autonomyConfigPollMs}ms`);
   }
   async emitStartupStatus() {

package/runtime/sandbox/apps/workerpals/src/docker_executor.ts

@@ -34,6 +34,7 @@ import type {
   DockerWarmShellResult,
   DockerWarmStartupContext,
 } from "./backends/types.js";
+import { resolveFreshWorktreeBaseRef } from "./worktree_base_ref.js";
 
 const DEFAULT_OPENHANDS_MODEL = "local-model";
 const DEFAULT_CONFIG = loadPushPalsConfig();
@@ -2106,7 +2107,27 @@ export class DockerExecutor {
       reviewAgent && typeof reviewAgent.resolutionType === "string"
         ? reviewAgent.resolutionType.trim().toLowerCase()
         : "";
-    if (resolutionType !== "merge_conflict") return this.options.baseRef;
+    if (resolutionType !== "merge_conflict") {
+      return resolveFreshWorktreeBaseRef({
+        requestedRef: this.options.baseRef,
+        integrationBranch:
+          this.config.sourceControlManager.mainBranch ||
+          this.config.workerpals.baseRef ||
+          this.options.baseRef,
+        sourceBaseBranch: this.config.sourceControlManager.baseBranch,
+        git: (args) => this.runGitBaseRefCommand(args),
+        log: (level, message) => {
+          const line = `[DockerExecutor] ${message}`;
+          if (level === "warn") {
+            console.warn(line);
+            onLog?.("stderr", line);
+          } else {
+            console.log(line);
+            onLog?.("stdout", line);
+          }
+        },
+      });
+    }
 
     const normalizedHeadRef = normalizeMergeConflictHeadRef(reviewAgent?.prHeadRef);
     if (!normalizedHeadRef) {
@@ -2150,6 +2171,26 @@ export class DockerExecutor {
     return remoteRef;
   }
 
+  private async runGitBaseRefCommand(
+    args: string[],
+  ): Promise<{ ok: boolean; stdout: string; stderr: string }> {
+    const proc = Bun.spawn(["git", ...args], {
+      cwd: this.options.repo,
+      stdout: "pipe",
+      stderr: "pipe",
+    });
+    const [exitCode, stdout, stderr] = await Promise.all([
+      proc.exited,
+      new Response(proc.stdout).text(),
+      new Response(proc.stderr).text(),
+    ]);
+    return {
+      ok: exitCode === 0,
+      stdout,
+      stderr,
+    };
+  }
+
   /**
    * Pull the Docker image
    */

package/runtime/sandbox/apps/workerpals/src/workerpals_main.ts

@@ -47,6 +47,7 @@ import { DockerExecutionExhaustedError, DockerExecutor } from "./docker_executor
 import { forceDeleteWorktreePath } from "./common/worktree_cleanup.js";
 import { WorkerServerTransport, type WorkerHeartbeatPayload } from "./common/server_transport.js";
 import { DEFAULT_DOCKER_TIMEOUT_MS, parseDockerTimeoutMs } from "./timeout_policy.js";
+import { resolveFreshWorktreeBaseRef } from "./worktree_base_ref.js";
 
 type CommitRef = {
   branch: string;
@@ -314,6 +315,8 @@ async function reportWorkerLlmUsage(
 }
 
 function integrationBranchName(): string {
+  const configuredIntegrationBranch = CONFIG.sourceControlManager.mainBranch.trim();
+  if (configuredIntegrationBranch) return configuredIntegrationBranch;
   const configuredBaseRef = CONFIG.workerpals.baseRef.trim();
   if (!configuredBaseRef) return "main_agents";
   return configuredBaseRef.replace(/^origin\//, "").trim() || "main_agents";
@@ -665,33 +668,17 @@ async function runJob(
 }
 
 async function resolveWorktreeBaseRef(repo: string, requestedRef: string): Promise<string> {
-  const integrationBranch = integrationBranchName();
-  const integrationRemoteRef = `origin/${integrationBranch}`;
-  const candidates = new Set<string>([
+  return resolveFreshWorktreeBaseRef({
     requestedRef,
-    integrationRemoteRef,
-    integrationBranch,
-    "HEAD",
-  ]);
-  if (requestedRef.startsWith("origin/")) {
-    const branch = requestedRef.slice("origin/".length);
-    const fetchResult = await git(repo, ["fetch", "origin", branch, "--quiet"]);
-    if (!fetchResult.ok) {
-      console.warn(
-        `[WorkerPals] Could not refresh ${requestedRef}; continuing with local refs (${fetchResult.stderr || fetchResult.stdout})`,
-      );
-    }
-    candidates.add(branch);
-  } else if (requestedRef !== "HEAD") {
-    candidates.add(`origin/${requestedRef}`);
-  }
-
-  for (const ref of candidates) {
-    const parsed = await git(repo, ["rev-parse", "--verify", "--quiet", ref]);
-    if (parsed.ok) return ref;
-  }
-
-  return "HEAD";
+    integrationBranch: integrationBranchName(),
+    sourceBaseBranch: CONFIG.sourceControlManager.baseBranch,
+    git: (args) => git(repo, args),
+    log: (level, message) => {
+      const line = `[WorkerPals] ${message}`;
+      if (level === "warn") console.warn(line);
+      else console.log(line);
+    },
+  });
 }
 
 async function createIsolatedWorktree(

package/runtime/sandbox/apps/workerpals/src/worktree_base_ref.ts

@@ -0,0 +1,141 @@
+export type GitBaseRefCommandResult = {
+  ok: boolean;
+  stdout?: string;
+  stderr?: string;
+};
+
+export type GitBaseRefCommand = (args: string[]) => Promise<GitBaseRefCommandResult>;
+
+export type WorktreeBaseRefLogLevel = "info" | "warn";
+
+export type ResolveFreshWorktreeBaseRefOptions = {
+  requestedRef: string;
+  integrationBranch: string;
+  sourceBaseBranch: string;
+  remote?: string;
+  git: GitBaseRefCommand;
+  log?: (level: WorktreeBaseRefLogLevel, message: string) => void;
+};
+
+function normalizeBranchName(value: string): string {
+  return value
+    .trim()
+    .replace(/^refs\/heads\//, "")
+    .replace(/^origin\//, "")
+    .replace(/^\/+|\/+$/g, "");
+}
+
+function normalizeRequestedRef(value: string): string {
+  return value.trim() || "HEAD";
+}
+
+function remoteRef(remote: string, branch: string): string {
+  return `${remote}/${branch}`;
+}
+
+function isIntegrationBaseRequest(ref: string, integrationBranch: string, remote: string): boolean {
+  const normalized = normalizeRequestedRef(ref);
+  const branch = normalizeBranchName(normalized);
+  return (
+    branch === integrationBranch ||
+    normalized === remoteRef(remote, integrationBranch) ||
+    normalized === `refs/remotes/${remote}/${integrationBranch}`
+  );
+}
+
+async function fetchRemoteBranch(
+  git: GitBaseRefCommand,
+  remote: string,
+  branch: string,
+): Promise<GitBaseRefCommandResult> {
+  if (!remote || !branch || branch === "HEAD") return { ok: true };
+  return git(["fetch", remote, branch, "--quiet"]);
+}
+
+async function refExists(git: GitBaseRefCommand, ref: string): Promise<boolean> {
+  const result = await git(["rev-parse", "--verify", "--quiet", ref]);
+  return result.ok;
+}
+
+async function isAncestor(
+  git: GitBaseRefCommand,
+  ancestorRef: string,
+  descendantRef: string,
+): Promise<boolean> {
+  const result = await git(["merge-base", "--is-ancestor", ancestorRef, descendantRef]);
+  return result.ok;
+}
+
+export async function resolveExistingWorktreeBaseRef(
+  options: Omit<ResolveFreshWorktreeBaseRefOptions, "sourceBaseBranch" | "log">,
+): Promise<string> {
+  const remote = (options.remote ?? "origin").trim() || "origin";
+  const requestedRef = normalizeRequestedRef(options.requestedRef);
+  const integrationBranch = normalizeBranchName(options.integrationBranch) || "main_agents";
+  const integrationRemoteRef = remoteRef(remote, integrationBranch);
+  const candidates = new Set<string>([
+    requestedRef,
+    integrationRemoteRef,
+    integrationBranch,
+    "HEAD",
+  ]);
+
+  if (requestedRef.startsWith(`${remote}/`)) {
+    const branch = requestedRef.slice(`${remote}/`.length);
+    await fetchRemoteBranch(options.git, remote, branch);
+    candidates.add(branch);
+  } else if (requestedRef !== "HEAD") {
+    candidates.add(remoteRef(remote, requestedRef));
+  }
+
+  for (const ref of candidates) {
+    if (await refExists(options.git, ref)) return ref;
+  }
+
+  return "HEAD";
+}
+
+export async function resolveFreshWorktreeBaseRef(
+  options: ResolveFreshWorktreeBaseRefOptions,
+): Promise<string> {
+  const remote = (options.remote ?? "origin").trim() || "origin";
+  const requestedRef = normalizeRequestedRef(options.requestedRef);
+  const integrationBranch = normalizeBranchName(options.integrationBranch) || "main_agents";
+  const sourceBaseBranch = normalizeBranchName(options.sourceBaseBranch) || "main";
+  const resolvedRef = await resolveExistingWorktreeBaseRef({
+    requestedRef,
+    integrationBranch,
+    remote,
+    git: options.git,
+  });
+
+  if (
+    !sourceBaseBranch ||
+    sourceBaseBranch === integrationBranch ||
+    !isIntegrationBaseRequest(requestedRef, integrationBranch, remote)
+  ) {
+    return resolvedRef;
+  }
+
+  const sourceBaseRef = remoteRef(remote, sourceBaseBranch);
+  const fetchSource = await fetchRemoteBranch(options.git, remote, sourceBaseBranch);
+  if (!fetchSource.ok) {
+    options.log?.(
+      "warn",
+      `Could not refresh ${sourceBaseRef}; checking local ref before keeping ${resolvedRef} (${fetchSource.stderr || fetchSource.stdout || "fetch failed"}).`,
+    );
+  }
+
+  if (!(await refExists(options.git, sourceBaseRef))) return resolvedRef;
+
+  if (resolvedRef !== "HEAD" && (await refExists(options.git, resolvedRef))) {
+    const sourceAlreadyIncluded = await isAncestor(options.git, sourceBaseRef, resolvedRef);
+    if (sourceAlreadyIncluded) return resolvedRef;
+  }
+
+  options.log?.(
+    "warn",
+    `Worktree base ${resolvedRef} does not contain ${sourceBaseRef}; using ${sourceBaseRef} for new WorkerPal jobs to avoid stale integration-branch checkouts.`,
+  );
+  return sourceBaseRef;
+}

package/runtime/sandbox/configs/default.toml

@@ -75,6 +75,7 @@ session_id = "remotebuddy-dev"
 enabled = true
 kill_switch_enabled = false
 tick_interval_ms = 300000
+startup_grace_ms = 120000
 heartbeat_log_ms = 30000
 vision_context_max_chars = 65536
 ideation_budget_ms = 20000

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

@@ -128,6 +128,7 @@ export interface PushPalsConfig {
       enabled: boolean;
       killSwitchEnabled: boolean;
       tickIntervalMs: number;
+      startupGraceMs: number;
       heartbeatLogMs: number;
       visionContextMaxChars: number;
       ideationBudgetMs: number;
@@ -1671,6 +1672,14 @@ export function loadPushPalsConfig(options: LoadOptions = {}): PushPalsConfig {
             120_000,
           ),
         ),
+        startupGraceMs: Math.max(
+          0,
+          asInt(
+            parseIntEnv("REMOTEBUDDY_AUTONOMY_STARTUP_GRACE_MS") ??
+              remoteAutonomyNode.startup_grace_ms,
+            120_000,
+          ),
+        ),
         heartbeatLogMs: Math.max(
           1_000,
           asInt(