@pushpalsdev/cli 1.0.93 → 1.0.95

package/dist/pushpals-cli.js

@@ -11,6 +11,7 @@ import {
   mkdirSync,
   readdirSync,
   readFileSync as readFileSync4,
+  renameSync,
   rmSync as rmSync2,
   writeFileSync
 } from "fs";
@@ -1978,8 +1979,29 @@ async function runCommandWithEnv(command, cwd, env, timeoutMs) {
     };
   }
 }
+function appendGitConfigEnv(env, key, value) {
+  const existingCount = Number.parseInt(String(env.GIT_CONFIG_COUNT ?? "0").trim(), 10);
+  const count = Number.isFinite(existingCount) && existingCount >= 0 ? existingCount : 0;
+  for (let index = 0;index < count; index++) {
+    if (String(env[`GIT_CONFIG_KEY_${index}`] ?? "") === key)
+      return env;
+  }
+  return {
+    ...env,
+    GIT_CONFIG_COUNT: String(count + 1),
+    [`GIT_CONFIG_KEY_${count}`]: key,
+    [`GIT_CONFIG_VALUE_${count}`]: value
+  };
+}
+function withWindowsGitSchannelEnv(env, platform = process.platform) {
+  if (platform !== "win32")
+    return env;
+  if (parseBooleanFlag(env.PUSHPALS_DISABLE_WINDOWS_GIT_SCHANNEL) === true)
+    return env;
+  return appendGitConfigEnv(env, "http.sslBackend", "schannel");
+}
 async function runGitWithEnv(args, cwd, env) {
-  return await runCommandWithEnv(["git", ...args], cwd, env);
+  return await runCommandWithEnv(["git", ...args], cwd, withWindowsGitSchannelEnv(env));
 }
 async function runGit(args, cwd) {
   return await runGitWithEnv(args, cwd, {
@@ -2264,15 +2286,59 @@ function resolveRuntimePlatformKey() {
   throw new Error(`Unsupported platform for embedded runtime binaries: ${process.platform}/${process.arch}`);
 }
 async function fetchLatestReleaseTag() {
-  const response = await fetchWithTimeout(`${GITHUB_API_URL}/releases/latest`, { headers: GITHUB_HEADERS }, 20000);
-  if (!response.ok) {
-    throw new Error(`Failed to resolve latest release tag (HTTP ${response.status})`);
+  try {
+    const response = await fetchWithTimeout(`${GITHUB_API_URL}/releases/latest`, { headers: GITHUB_HEADERS }, 20000);
+    if (!response.ok) {
+      throw new Error(`Failed to resolve latest release tag (HTTP ${response.status})`);
+    }
+    const payload = await response.json();
+    const tagName = String(payload.tag_name ?? "").trim();
+    if (!tagName)
+      throw new Error("Latest release payload did not include tag_name");
+    return tagName;
+  } catch (err) {
+    const fallback = await fetchLatestReleaseTagWithGitFallback(err);
+    if (fallback)
+      return fallback;
+    throw err;
   }
-  const payload = await response.json();
-  const tagName = String(payload.tag_name ?? "").trim();
-  if (!tagName)
-    throw new Error("Latest release payload did not include tag_name");
-  return tagName;
+}
+async function fetchLatestReleaseTagWithGitFallback(cause) {
+  const message = String(cause instanceof Error ? cause.message : cause ?? "");
+  if (process.platform !== "win32" || !/certificate|cert_|unable to verify|self[- ]signed|tls|ssl/i.test(message) && !/fetch failed/i.test(message)) {
+    return null;
+  }
+  console.warn("[pushpals] Bun could not verify the GitHub API certificate; resolving latest release tag with Git instead.");
+  const result = await runGitWithEnv([
+    "ls-remote",
+    "--tags",
+    "--refs",
+    `https://github.com/${GITHUB_OWNER}/${GITHUB_REPO}.git`,
+    "refs/tags/v*"
+  ], process.cwd(), {
+    ...process.env,
+    GIT_TERMINAL_PROMPT: "0",
+    GCM_INTERACTIVE: "Never"
+  });
+  if (!result.ok)
+    return null;
+  const tags = result.stdout.split(/\r?\n/g).map((line) => line.trim().match(/refs\/tags\/(v\d+\.\d+\.\d+(?:[-.][0-9A-Za-z.-]+)?)$/)?.[1]).filter((tag) => Boolean(tag));
+  return sortReleaseTagsDescending(tags)[0] ?? null;
+}
+function sortReleaseTagsDescending(tags) {
+  return [...new Set(tags)].sort((a, b) => compareReleaseTags(b, a));
+}
+function compareReleaseTags(a, b) {
+  const parse = (value) => String(value).replace(/^v/i, "").split(/[.-]/g).map((part) => Number.parseInt(part, 10)).map((part) => Number.isFinite(part) ? part : 0);
+  const left = parse(a);
+  const right = parse(b);
+  const max = Math.max(left.length, right.length, 3);
+  for (let index = 0;index < max; index++) {
+    const delta = (left[index] ?? 0) - (right[index] ?? 0);
+    if (delta !== 0)
+      return delta;
+  }
+  return a.localeCompare(b);
 }
 function resolvePreferredRuntimeReleaseTag(explicitTag, env = process.env) {
   const fromArg = String(explicitTag ?? "").trim();
@@ -2588,7 +2654,7 @@ function buildEmbeddedRuntimeEnv(baseEnv, opts) {
     const existing = env[key];
     return typeof existing !== "string" || existing.trim().length === 0;
   })) : {};
-  return {
+  const runtimeEnv = {
     ...inherited,
     PUSHPALS_REPO_ROOT_OVERRIDE: opts.repoRoot,
     PUSHPALS_PROJECT_ROOT_OVERRIDE: opts.repoRoot,
@@ -2609,6 +2675,7 @@ function buildEmbeddedRuntimeEnv(baseEnv, opts) {
     ...typeof env.PUSHPALS_DOCKER_BIN === "string" && env.PUSHPALS_DOCKER_BIN.trim() ? { PUSHPALS_DOCKER_BIN: env.PUSHPALS_DOCKER_BIN.trim() } : {},
     ...typeof env.PUSHPALS_DOCKER_BIN_ABSOLUTE === "string" && env.PUSHPALS_DOCKER_BIN_ABSOLUTE.trim() ? { PUSHPALS_DOCKER_BIN_ABSOLUTE: env.PUSHPALS_DOCKER_BIN_ABSOLUTE.trim() } : {}
   };
+  return withWindowsGitSchannelEnv(runtimeEnv, platform);
 }
 function parseBooleanFlag(raw) {
   const normalized = String(raw ?? "").trim().toLowerCase();
@@ -2752,13 +2819,51 @@ function readRemoteBuddyAutonomousEngineState(logPath) {
 async function downloadBinaryAsset(tag, assetName, outPath) {
   console.log(`[pushpals] Downloading embedded runtime binary ${assetName} from ${tag}...`);
   const url = `${GITHUB_RELEASE_URL}/${encodeURIComponent(tag)}/${assetName}`;
-  const response = await fetchWithTimeout(url, { headers: GITHUB_HEADERS }, 60000);
-  if (!response.ok) {
-    throw new Error(`Failed to download ${assetName} from ${tag} (HTTP ${response.status})`);
+  try {
+    const response = await fetchWithTimeout(url, { headers: GITHUB_HEADERS }, 60000);
+    if (!response.ok) {
+      throw new Error(`Failed to download ${assetName} from ${tag} (HTTP ${response.status})`);
+    }
+    const bytes = new Uint8Array(await response.arrayBuffer());
+    mkdirSync(dirname(outPath), { recursive: true });
+    await Bun.write(outPath, bytes);
+    return;
+  } catch (err) {
+    const fallback = await downloadBinaryAssetWithWindowsCurlFallback(url, outPath, err);
+    if (fallback)
+      return;
+    throw err;
+  }
+}
+async function downloadBinaryAssetWithWindowsCurlFallback(url, outPath, cause) {
+  if (process.platform !== "win32")
+    return false;
+  const message = String(cause instanceof Error ? cause.message : cause ?? "");
+  if (!/certificate|cert_|unable to verify|self[- ]signed|tls|ssl/i.test(message) && !/fetch failed/i.test(message)) {
+    return false;
   }
-  const bytes = new Uint8Array(await response.arrayBuffer());
+  const tmpPath = `${outPath}.download-${process.pid}-${Date.now()}.tmp`;
   mkdirSync(dirname(outPath), { recursive: true });
-  await Bun.write(outPath, bytes);
+  rmSync2(tmpPath, { force: true });
+  console.warn("[pushpals] Bun could not verify the GitHub release certificate; retrying download with Windows curl certificate handling.");
+  const result = await runCommandWithEnv([
+    "curl.exe",
+    "--fail",
+    "--location",
+    "--silent",
+    "--show-error",
+    "--ssl-no-revoke",
+    "--output",
+    tmpPath,
+    url
+  ], process.cwd(), process.env, 120000);
+  if (!result.ok || !existsSync5(tmpPath)) {
+    rmSync2(tmpPath, { force: true });
+    const detail = result.stderr || result.stdout || `exit ${result.exitCode}`;
+    throw new Error(`Windows curl fallback failed while downloading runtime binary: ${detail}`);
+  }
+  renameSync(tmpPath, outPath);
+  return true;
 }
 async function ensureRuntimeBinaries(runtimeRoot, runtimeTag) {
   const platformKey = resolveRuntimePlatformKey();

package/package.json

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

package/runtime/prompts/remotebuddy/remotebuddy_system_prompt.md

@@ -45,8 +45,8 @@ Execution policy:
   - `scope.read_anywhere` should default to `true` (do not set `false` unless user explicitly requested restrictive reading)
   - `scope.write_allowed` should default to `true`
   - `scope.write_globs` should be included as starting-point/relevance hints, not as hard write boundaries
-  - `scope.forbidden_globs` should be included only when specific paths must be blocked
-  - `scope.max_files_to_edit` should be included only when a cap is needed
+  - `scope.forbidden_globs` should be included only as review guardrail hints, not as hard write blockers
+  - `scope.max_files_to_edit` should be included only as a planning/review hint; WorkerPal write access is repo-sandbox-wide
 
 Quality gates:
 

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

@@ -4264,6 +4264,9 @@ var IDEATION_SYSTEM_PROMPT = loadPromptTemplate("remotebuddy/autonomy_ideation_s
 var SCORING_SYSTEM_PROMPT = loadPromptTemplate("remotebuddy/autonomy_scoring_system_prompt.md").trim();
 var PLANNING_SYSTEM_PROMPT = loadPromptTemplate("remotebuddy/autonomy_planning_system_prompt.md").trim();
 var IDEATION_TIMEOUT_RECOVERY_INSTRUCTION = "Previous ideation timed out before you returned JSON. For this round only, stay within the time budget: prioritize the top 1-3 highest-confidence candidates, keep reasoning brief, avoid exhaustive exploration, and return valid JSON as soon as possible.";
+var STARTUP_FAST_TICK_MAX_ATTEMPTS = 4;
+var STARTUP_FAST_TICK_MAX_DELAY_MS = 15000;
+var STARTUP_STALE_LOCK_AFTER_MS = 30000;
 var VISION_DOC_FNAME = "vision.md";
 var MAX_VISION_SECTION_CHARS = 1200;
 var DOCS_MIN_IMPACT_SIGNAL_FOR_NO_PENALTY = 0.45;
@@ -6100,6 +6103,92 @@ function buildEngineInspirationContext(params) {
     commit_history_hints: commitHistoryHints
   };
 }
+function compactIdeationText(value, maxChars) {
+  const text = asString2(value).trim();
+  if (text.length <= maxChars)
+    return text;
+  return `${text.slice(0, Math.max(0, maxChars - 1)).trimEnd()}...`;
+}
+function compactIdeationTextList(values, maxItems, maxChars) {
+  return values.slice(0, maxItems).map((value) => compactIdeationText(value, maxChars)).filter(Boolean);
+}
+function compactVisionContextForIdeationRetry(vision) {
+  const compactKeyItems = Object.fromEntries(Object.entries(vision.key_items).map(([key, value]) => [
+    key,
+    Array.isArray(value) ? compactIdeationTextList(value, 6, 260) : compactIdeationText(value, 260)
+  ]));
+  return {
+    one_sentence: compactIdeationText(vision.one_sentence, 360),
+    sections: vision.sections.slice(0, 4).map((section) => ({
+      number: section.number,
+      title: compactIdeationText(section.title, 160),
+      markdown: compactIdeationText(section.markdown, 500),
+      truncated: section.truncated || section.markdown.length > 500
+    })),
+    key_items: compactKeyItems,
+    section_numbers: vision.section_numbers.slice(0, 8),
+    truncated: vision.truncated
+  };
+}
+function compactEngineInspirationForIdeationRetry(context) {
+  return {
+    compiled_repo_objectives: context.compiled_repo_objectives.slice(0, 4).map((objective) => ({
+      id: objective.id,
+      title: objective.title,
+      weight: objective.weight,
+      section_ref: objective.section_ref,
+      category: objective.category,
+      success_criteria: compactIdeationTextList(objective.success_criteria, 3, 220),
+      validation_expectations: compactIdeationTextList(objective.validation_expectations, 3, 220)
+    })),
+    compiled_objectives: context.compiled_objectives.slice(0, 4).map((objective) => ({
+      id: objective.id,
+      title: compactIdeationText(objective.title, 220),
+      weight: objective.weight,
+      evidence: compactIdeationTextList(objective.evidence, 3, 220)
+    })),
+    opportunity_gaps: context.opportunity_gaps.slice(0, 4).map((gap) => ({
+      id: gap.id,
+      label: compactIdeationText(gap.label, 220),
+      score: gap.score,
+      evidence: compactIdeationTextList(gap.evidence, 3, 220)
+    })),
+    building_blocks: context.building_blocks.slice(0, 6).map((block) => ({
+      id: block.id,
+      algorithm: block.algorithm,
+      summary: compactIdeationText(block.summary, 260),
+      hypothesis: compactIdeationText(block.hypothesis, 260),
+      score: block.score,
+      objective_ids: block.objective_ids.slice(0, 3),
+      gap_ids: block.gap_ids.slice(0, 3),
+      candidate_shape: {
+        objective_type: block.candidate_shape.objective_type,
+        trigger_type: block.candidate_shape.trigger_type,
+        component_area: block.candidate_shape.component_area,
+        target_paths: block.candidate_shape.target_paths.slice(0, 4),
+        write_globs: block.candidate_shape.write_globs.slice(0, 4)
+      }
+    })),
+    source_patterns: context.source_patterns.slice(0, 4).map((pattern) => ({
+      id: pattern.id,
+      algorithm: pattern.algorithm,
+      summary: compactIdeationText(pattern.summary, 260),
+      tags: compactIdeationTextList(pattern.tags, 5, 80),
+      quality_score: pattern.quality_score,
+      freshness_score: pattern.freshness_score,
+      source_trust_score: pattern.source_trust_score
+    })),
+    commit_history_hints: context.commit_history_hints.slice(0, 4).map((hint) => ({
+      motif_id: hint.motif_id,
+      label: compactIdeationText(hint.label, 220),
+      count: hint.count,
+      signal: hint.signal,
+      objective_ids: hint.objective_ids.slice(0, 3),
+      gap_ids: hint.gap_ids.slice(0, 3),
+      sample_subjects: compactIdeationTextList(hint.sample_subjects, 3, 180)
+    }))
+  };
+}
 function selectVisionSectionRefs(sectionRefs) {
   const preferred = ["6", "7", "8", "4", "3", "0", "5"];
   const normalized = sectionRefs.map((value) => asString2(value)).filter(Boolean);
@@ -6199,7 +6288,7 @@ function buildRepoVisionFallbackCandidates(params) {
     const target = chooseRepoObjectiveTargetProfile(params.repoTargets ?? [], objective);
     const targetPaths = target?.target_paths ?? [objective.section_ref ? `vision.md` : "README.md"];
     const writeGlobs = target?.write_globs ?? targetPaths;
-    const componentArea = target?.component_area ?? (normalizeAutonomyComponentArea(pathDirname(targetPaths[0]) || targetPaths[0]) ?? "docs");
+    const componentArea = target?.component_area ?? normalizeAutonomyComponentArea(pathDirname(targetPaths[0]) || targetPaths[0]) ?? "docs";
     const triggerType = categoryTriggerType(objective.category, params.snapshotTopSignals);
     const signalIds = pickSignalIdsForTrigger(params.snapshotTopSignals, triggerType);
     const sectionRef = objective.section_ref || sectionRefs[0] || "";
@@ -6409,9 +6498,11 @@ class RemoteBuddyAutonomousEngine {
   cfg;
   runtimeEnabled = true;
   timer = null;
+  startupFastTickTimer = null;
   heartbeatTimer = null;
   inFlight = false;
   nextTickAtMs = 0;
+  startupFastTickAttemptsRemaining = 0;
   currentRunId = null;
   currentPhase = "idle";
   currentPhaseStartedAtMs = 0;
@@ -6441,6 +6532,8 @@ class RemoteBuddyAutonomousEngine {
     this.runtimeEnabled = Boolean(enabled);
     if (!this.runtimeEnabled) {
       this.nextTickAtMs = 0;
+      this.startupFastTickAttemptsRemaining = 0;
+      this.clearStartupFastTickTimer();
       if (!this.currentRunId) {
         this.lastOutcome = "skipped";
         this.lastDetail = "disabled_by_runtime_config";
@@ -6494,6 +6587,38 @@ class RemoteBuddyAutonomousEngine {
   lockStaleAfterMs() {
     return Math.max(this.phaseTimeoutMs("ideation") + 30000, this.cfg.heartbeatLogMs * 2, 120000);
   }
+  startupLockStaleAfterMs() {
+    return Math.min(this.lockStaleAfterMs(), Math.max(5000, Math.min(STARTUP_STALE_LOCK_AFTER_MS, Math.floor(this.cfg.tickIntervalMs / 4))));
+  }
+  lockStaleAfterMsForAcquire() {
+    return this.startupFastTickAttemptsRemaining > 0 ? this.startupLockStaleAfterMs() : this.lockStaleAfterMs();
+  }
+  startupFastTickDelayMs() {
+    return Math.max(1000, Math.min(STARTUP_FAST_TICK_MAX_DELAY_MS, Math.floor(this.cfg.tickIntervalMs / 10)));
+  }
+  clearStartupFastTickTimer() {
+    if (this.startupFastTickTimer) {
+      clearTimeout(this.startupFastTickTimer);
+      this.startupFastTickTimer = null;
+    }
+  }
+  scheduleStartupFastTick(reason) {
+    if (!this.runtimeEnabled || !this.timer || this.startupFastTickTimer)
+      return;
+    if (this.startupFastTickAttemptsRemaining <= 0)
+      return;
+    const delayMs = this.startupFastTickDelayMs();
+    this.startupFastTickAttemptsRemaining -= 1;
+    this.nextTickAtMs = Date.now() + delayMs;
+    console.log(`[RemoteBuddyAutonomousEngine] startup fast tick scheduled in ${delayMs}ms after ${reason} (remaining=${this.startupFastTickAttemptsRemaining}).`);
+    this.startupFastTickTimer = setTimeout(() => {
+      this.startupFastTickTimer = null;
+      if (!this.runtimeEnabled || !this.timer)
+        return;
+      this.nextTickAtMs = Date.now() + this.cfg.tickIntervalMs;
+      this.tick();
+    }, delayMs);
+  }
   cycleBudgetMs() {
     const ideationTimeoutMs = this.phaseTimeoutMs("ideation");
     const scoringTimeoutMs = this.phaseTimeoutMs("scoring");
@@ -6806,7 +6931,7 @@ class RemoteBuddyAutonomousEngine {
         sessionId: this.sessionId,
         runId,
         ttlMs,
-        staleAfterMs: this.lockStaleAfterMs()
+        staleAfterMs: this.lockStaleAfterMsForAcquire()
       })
     });
     if (res.ok)
@@ -7122,6 +7247,8 @@ ${JSON.stringify(input.messages ?? [])}`),
         outcomeDetail = lockResult.reason ? compactStatusDetail(`lock_not_acquired:${lockResult.reason}`) : "lock_not_acquired";
         return;
       }
+      this.startupFastTickAttemptsRemaining = 0;
+      this.clearStartupFastTickTimer();
       this.setPhase("prepare_worktree");
       const ready = await this.ensureAutonomyRepoReady(runId);
       if (!ready) {
@@ -7230,58 +7357,79 @@ ${JSON.stringify(input.messages ?? [])}`),
         return;
       }
       this.setPhase("ideation");
-      const ideationRecovery = this.consumeIdeationTimeoutRecovery();
-      if (ideationRecovery) {
-        console.warn(`[RemoteBuddyAutonomousEngine] tick ${runId}: applying one-shot ideation timeout recovery from ${ideationRecovery.previousRunId} after ${ideationRecovery.timeoutMs}ms timeout.`);
-      }
-      const ideationTopSignals = snapshot.top_signals.slice(0, ideationRecovery ? 10 : 16);
-      const ideationStateTraits = snapshot.state_traits.slice(0, ideationRecovery ? 14 : 24);
-      const ideationFeedbackPriors = snapshot.feedback_priors.slice(0, ideationRecovery ? 12 : 20);
-      const ideationEngineIdeaPriors = (snapshot.engine_idea_priors ?? []).slice(0, ideationRecovery ? 12 : 20);
-      const ideationOpenObjectives = snapshot.open_objectives.slice(0, ideationRecovery ? 12 : 20);
-      const ideationActiveCooldowns = snapshot.active_cooldowns.slice(0, ideationRecovery ? 12 : 20);
-      const ideationRepoTargets = repoTargets.slice(0, ideationRecovery ? 8 : repoTargets.length);
-      const ideationPhase = await this.llmPhase("ideation", runId, snapshot.snapshot_id, {
-        system: IDEATION_SYSTEM_PROMPT,
-        json: true,
-        maxTokens: ideationRecovery ? 1400 : 2800,
-        temperature: 0.2,
-        messages: [
-          ...ideationRecovery ? [
+      const buildIdeationInput = (ideationRecovery2, compactRetry) => {
+        const reduced = compactRetry || Boolean(ideationRecovery2);
+        const ideationTopSignals = snapshot.top_signals.slice(0, reduced ? 5 : 16);
+        const ideationStateTraits = snapshot.state_traits.slice(0, reduced ? 6 : 24);
+        const ideationFeedbackPriors = snapshot.feedback_priors.slice(0, reduced ? 4 : 20);
+        const ideationEngineIdeaPriors = (snapshot.engine_idea_priors ?? []).slice(0, reduced ? 4 : 20);
+        const ideationOpenObjectives = snapshot.open_objectives.slice(0, reduced ? 4 : 20);
+        const ideationActiveCooldowns = snapshot.active_cooldowns.slice(0, reduced ? 4 : 20);
+        const ideationRepoTargets = repoTargets.slice(0, reduced ? 4 : repoTargets.length);
+        return {
+          system: IDEATION_SYSTEM_PROMPT,
+          json: true,
+          maxTokens: reduced ? 900 : 2800,
+          temperature: 0.2,
+          messages: [
+            ...ideationRecovery2 ? [
+              {
+                role: "user",
+                content: `${IDEATION_TIMEOUT_RECOVERY_INSTRUCTION} Previous timed-out run: ${ideationRecovery2.previousRunId}. Timeout budget for this round: ${this.phaseTimeoutMs("ideation")}ms.`
+              }
+            ] : [],
             {
               role: "user",
-              content: `${IDEATION_TIMEOUT_RECOVERY_INSTRUCTION} Previous timed-out run: ${ideationRecovery.previousRunId}. Timeout budget for this round: ${this.phaseTimeoutMs("ideation")}ms.`
+              content: JSON.stringify({
+                snapshot: {
+                  snapshot_id: snapshot.snapshot_id,
+                  top_signals: ideationTopSignals,
+                  state_traits: ideationStateTraits,
+                  feedback_priors: ideationFeedbackPriors,
+                  engine_idea_priors: ideationEngineIdeaPriors,
+                  open_objectives: ideationOpenObjectives,
+                  active_cooldowns: ideationActiveCooldowns
+                },
+                vision: reduced ? compactVisionContextForIdeationRetry(visionContext) : visionContext,
+                repo_targets: ideationRepoTargets.map((target) => ({
+                  component_area: target.component_area,
+                  target_paths: target.target_paths,
+                  write_globs: target.write_globs,
+                  label: target.label,
+                  keywords: target.keywords.slice(0, reduced ? 4 : 8)
+                })),
+                engine_inspiration: reduced ? compactEngineInspirationForIdeationRetry(engineInspiration) : engineInspiration,
+                limits: {
+                  ideation_max_candidates: reduced ? Math.max(1, Math.min(3, this.cfg.ideationMaxCandidates)) : this.cfg.ideationMaxCandidates,
+                  min_confidence: this.cfg.minConfidence
+                }
+              }, null, reduced ? 0 : 2)
             }
-          ] : [],
-          {
-            role: "user",
-            content: JSON.stringify({
-              snapshot: {
-                snapshot_id: snapshot.snapshot_id,
-                top_signals: ideationTopSignals,
-                state_traits: ideationStateTraits,
-                feedback_priors: ideationFeedbackPriors,
-                engine_idea_priors: ideationEngineIdeaPriors,
-                open_objectives: ideationOpenObjectives,
-                active_cooldowns: ideationActiveCooldowns
-              },
-              vision: visionContext,
-              repo_targets: ideationRepoTargets.map((target) => ({
-                component_area: target.component_area,
-                target_paths: target.target_paths,
-                write_globs: target.write_globs,
-                label: target.label,
-                keywords: target.keywords.slice(0, 8)
-              })),
-              engine_inspiration: engineInspiration,
-              limits: {
-                ideation_max_candidates: this.cfg.ideationMaxCandidates,
-                min_confidence: this.cfg.minConfidence
-              }
-            }, null, 2)
-          }
-        ]
-      });
+          ]
+        };
+      };
+      let ideationRecovery = this.consumeIdeationTimeoutRecovery();
+      if (ideationRecovery) {
+        console.warn(`[RemoteBuddyAutonomousEngine] tick ${runId}: applying one-shot ideation timeout recovery from ${ideationRecovery.previousRunId} after ${ideationRecovery.timeoutMs}ms timeout.`);
+      }
+      let ideationPhase;
+      try {
+        ideationPhase = await this.llmPhase("ideation", runId, snapshot.snapshot_id, buildIdeationInput(ideationRecovery, Boolean(ideationRecovery)));
+      } catch (error) {
+        if (error instanceof Error && error.message === "autonomy ideation phase timeout" && !ideationRecovery) {
+          ideationRecovery = {
+            previousRunId: runId,
+            timedOutAt: new Date().toISOString(),
+            timeoutMs: this.phaseTimeoutMs("ideation")
+          };
+          this.pendingIdeationTimeoutRecovery = null;
+          console.warn(`[RemoteBuddyAutonomousEngine] tick ${runId}: ideation timed out; retrying once immediately with reduced context and budget-focused guidance.`);
+          ideationPhase = await this.llmPhase("ideation", runId, snapshot.snapshot_id, buildIdeationInput(ideationRecovery, true));
+          this.pendingIdeationTimeoutRecovery = null;
+        } else {
+          throw error;
+        }
+      }
       llmCalls.push(ideationPhase.llmCall);
       const ideationJson = ideationPhase.json;
       if (this.isSnapshotExpired(snapshot) || Date.now() > cycleDeadline) {
@@ -7907,6 +8055,9 @@ Scope:
         await this.releaseDispatchLock(runId);
       this.inFlight = false;
       this.markTickDone(outcome, outcomeDetail);
+      if (!lockAcquired && outcomeDetail.startsWith("lock_not_acquired")) {
+        this.scheduleStartupFastTick("dispatch lock contention");
+      }
     }
   }
   async enqueueFromAnalysis(instruction, autonomyCtx, originRequestId) {
@@ -7931,7 +8082,8 @@ Scope:
     if (!this.runtimeEnabled || this.timer)
       return;
     console.log(`[RemoteBuddyAutonomousEngine] Using dedicated autonomy worktree ${this.autonomyRepo} (remote=${this.gitRemote} integration=${this.integrationBranch} base=${this.baseBranch}).`);
-    this.nextTickAtMs = Date.now() + this.cfg.tickIntervalMs;
+    this.startupFastTickAttemptsRemaining = STARTUP_FAST_TICK_MAX_ATTEMPTS;
+    this.nextTickAtMs = Date.now();
     this.timer = setInterval(() => {
       this.nextTickAtMs = Date.now() + this.cfg.tickIntervalMs;
       this.tick();
@@ -7943,6 +8095,7 @@ Scope:
     this.tick();
   }
   stop() {
+    this.clearStartupFastTickTimer();
     if (this.timer) {
       clearInterval(this.timer);
       this.timer = null;
@@ -7951,6 +8104,7 @@ Scope:
       clearInterval(this.heartbeatTimer);
       this.heartbeatTimer = null;
     }
+    this.startupFastTickAttemptsRemaining = 0;
     this.nextTickAtMs = 0;
   }
 }
@@ -8281,7 +8435,7 @@ function buildExecutionGuidance(plan, targetPaths, requiredValidationSteps = [])
       lines.push(`- ${glob}`);
   }
   if (Array.isArray(plan.scope.forbidden_globs) && plan.scope.forbidden_globs.length > 0) {
-    lines.push("Forbidden globs:");
+    lines.push("Review guardrail hints:");
     for (const glob of plan.scope.forbidden_globs)
       lines.push(`- ${glob}`);
   }