@pushpalsdev/cli 1.0.86 → 1.0.94

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

@@ -86,11 +86,13 @@ class CommunicationManager {
   sessionId;
   from;
   authToken;
+  fetchImpl;
   constructor(opts) {
     this.serverUrl = opts.serverUrl;
     this.sessionId = opts.sessionId;
     this.from = opts.from;
     this.authToken = opts.authToken ?? null;
+    this.fetchImpl = opts.fetchImpl ?? fetch;
   }
   headers() {
     const headers = { "Content-Type": "application/json" };
@@ -132,7 +134,7 @@ class CommunicationManager {
         body.turnId = meta.turnId;
       if (meta.parentId)
         body.parentId = meta.parentId;
-      const response = await fetch(this.commandUrl(sessionId), {
+      const response = await this.fetchImpl(this.commandUrl(sessionId), {
         method: "POST",
         headers: this.headers(),
         body: JSON.stringify(body)
@@ -588,7 +590,8 @@ function validateScopeInvariants(componentArea, targetPathsInput, writeGlobsInpu
   const scopeSeeds = collectScopeSeedPaths(targetPathsInput, writeGlobsInput);
   const normalizedComponentArea = normalizeAutonomyComponentArea(componentArea) ?? deriveAutonomyComponentArea(targetPathsInput, writeGlobsInput);
   const allowMultipleComponentRoots = options?.allowMultipleComponentRoots === true;
-  if (!normalizedComponentArea && scopeSeeds.length > 1 && !allowMultipleComponentRoots) {
+  const hintsOnly = options?.hintsOnly === true;
+  if (!hintsOnly && !normalizedComponentArea && scopeSeeds.length > 1 && !allowMultipleComponentRoots) {
     errors.push(`scope spans multiple component roots: ${scopeSeeds.slice(0, 6).join(", ")}`);
   }
   const rootPrefix = normalizedComponentArea ? componentRootPrefix(normalizedComponentArea) : "";
@@ -600,7 +603,7 @@ function validateScopeInvariants(componentArea, targetPathsInput, writeGlobsInpu
       errors.push(`invalid target_path: ${String(raw ?? "")}`);
       continue;
     }
-    if (rootPrefix && !underRoot(normalized, rootPrefix)) {
+    if (!hintsOnly && rootPrefix && !underRoot(normalized, rootPrefix)) {
       errors.push(`target_path outside component root: ${normalized}`);
       continue;
     }
@@ -621,20 +624,20 @@ function validateScopeInvariants(componentArea, targetPathsInput, writeGlobsInpu
       errors.push(`invalid write_glob: ${String(raw ?? "")}`);
       continue;
     }
-    if (hasForbiddenBroadGlob(normalized)) {
+    if (!hintsOnly && hasForbiddenBroadGlob(normalized)) {
       errors.push(`forbidden broad write_glob: ${normalized}`);
       continue;
     }
     const prefix = literalPrefix(normalized);
-    if (!prefix) {
+    if (!hintsOnly && !prefix) {
       errors.push(`write_glob literal prefix cannot be empty: ${normalized}`);
       continue;
     }
-    if (rootPrefix && !underRoot(prefix, rootPrefix)) {
+    if (!hintsOnly && rootPrefix && !underRoot(prefix, rootPrefix)) {
       errors.push(`write_glob outside component root: ${normalized}`);
       continue;
     }
-    if (!normalizedTargetPaths.some((targetPath) => targetPath === prefix || targetPath.startsWith(`${prefix}/`))) {
+    if (!hintsOnly && !normalizedTargetPaths.some((targetPath) => targetPath === prefix || targetPath.startsWith(`${prefix}/`))) {
       errors.push(`write_glob prefix does not align with target_paths: ${normalized}`);
       continue;
     }
@@ -647,14 +650,14 @@ function validateScopeInvariants(componentArea, targetPathsInput, writeGlobsInpu
   if ((options?.requireWriteGlobs ?? true) && normalizedWriteGlobs.length === 0) {
     errors.push("write_globs must be provided and non-empty");
   }
-  if (normalizedTargetPaths.length > 0 && normalizedWriteGlobs.length > 0) {
+  if (!hintsOnly && normalizedTargetPaths.length > 0 && normalizedWriteGlobs.length > 0) {
     for (const targetPath of normalizedTargetPaths) {
       const covered = normalizedWriteGlobs.some((glob) => matchesGlob(targetPath, glob));
       if (!covered)
         errors.push(`target_path not covered by write_globs: ${targetPath}`);
     }
   }
-  if (!normalizedComponentArea && !allowMultipleComponentRoots) {
+  if (!hintsOnly && !normalizedComponentArea && !allowMultipleComponentRoots) {
     errors.push("component_area could not be derived from scope");
   }
   const breadth = classifyGlobBreadth(normalizedWriteGlobs);
@@ -1357,7 +1360,7 @@ function loadPushPalsConfig(options = {}) {
           const parsed = Number.parseFloat(String(firstNonEmpty(process.env.REMOTEBUDDY_AUTONOMY_ALERT_AUTONOMY_FAILURE_RATE_THRESHOLD, asString(remoteAutonomyNode.alert_autonomy_failure_rate_threshold, "0.45"), "0.45")));
           return Number.isFinite(parsed) ? parsed : 0.45;
         })())),
-        allowReadAnywhere: parseBoolEnv("REMOTEBUDDY_AUTONOMY_ALLOW_READ_ANYWHERE") ?? asBoolean(remoteAutonomyNode.allow_read_anywhere, false),
+        allowReadAnywhere: parseBoolEnv("REMOTEBUDDY_AUTONOMY_ALLOW_READ_ANYWHERE") ?? asBoolean(remoteAutonomyNode.allow_read_anywhere, true),
         prFeedbackCommentRows: Math.max(1, Math.min(200, asInt(parseIntEnv("REMOTEBUDDY_AUTONOMY_PR_FEEDBACK_COMMENT_ROWS") ?? remoteAutonomyNode.pr_feedback_comment_rows, 16))),
         prFeedbackCommentChars: Math.max(32, Math.min(20000, asInt(parseIntEnv("REMOTEBUDDY_AUTONOMY_PR_FEEDBACK_COMMENT_CHARS") ?? remoteAutonomyNode.pr_feedback_comment_chars, 600))),
         prFeedbackSummaryChars: Math.max(32, Math.min(20000, asInt(parseIntEnv("REMOTEBUDDY_AUTONOMY_PR_FEEDBACK_SUMMARY_CHARS") ?? remoteAutonomyNode.pr_feedback_summary_chars, 600))),
@@ -4257,15 +4260,13 @@ var POLICY = {
   }
 };
 var RISK_ORDER = { low: 0, medium: 1, high: 2 };
-var BREADTH_ORDER = {
-  narrow: 0,
-  medium: 1,
-  broad: 2
-};
 var IDEATION_SYSTEM_PROMPT = loadPromptTemplate("remotebuddy/autonomy_ideation_system_prompt.md").trim();
 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;
@@ -4996,7 +4997,8 @@ function chooseRepoObjectiveTargetProfile(profiles, objective) {
 function adaptCandidateShapeToRepo(params) {
   const shape = params.shape;
   const scopeValidation = validateScopeInvariants(shape.component_area, shape.target_paths, shape.write_globs, {
-    requireWriteGlobs: true
+    requireWriteGlobs: true,
+    hintsOnly: true
   });
   const pathsExist = params.repoRoot && scopeValidation.ok ? findMissingRepoTargetPaths(params.repoRoot, scopeValidation.normalizedTargetPaths).length === 0 : scopeValidation.ok;
   if (scopeValidation.ok && pathsExist) {
@@ -5782,7 +5784,7 @@ ${pattern.tags.join(" ")}`.toLowerCase();
   const targetPaths = asStringArray2(metadataShape.target_paths ?? metadataShape.targetPaths ?? metadata.target_paths);
   const writeGlobs = asStringArray2(metadataShape.write_globs ?? metadataShape.writeGlobs ?? metadata.write_globs);
   const validationIdeas = asStringArray2(metadataShape.expected_validation ?? metadataShape.expectedValidation ?? metadata.expected_validation ?? pattern.validationIdeas);
-  const scopeCheck = validateScopeInvariants(componentArea, targetPaths.length > 0 ? targetPaths : defaults.target_paths, writeGlobs.length > 0 ? writeGlobs : defaults.write_globs, { requireWriteGlobs: true });
+  const scopeCheck = validateScopeInvariants(componentArea, targetPaths.length > 0 ? targetPaths : defaults.target_paths, writeGlobs.length > 0 ? writeGlobs : defaults.write_globs, { requireWriteGlobs: true, hintsOnly: true });
   return adaptCandidateShapeToRepo({
     shape: {
       objective_type: objectiveType,
@@ -6101,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);
@@ -6200,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] || "";
@@ -6217,7 +6305,7 @@ function buildRepoVisionFallbackCandidates(params) {
       component_area: componentArea,
       target_paths: targetPaths,
       scope: {
-        read_anywhere: false,
+        read_anywhere: true,
         write_globs: writeGlobs
       },
       risk_level: "low",
@@ -6271,7 +6359,7 @@ function buildEngineFallbackCandidates(params) {
       component_area: candidateShape.component_area,
       target_paths: candidateShape.target_paths,
       scope: {
-        read_anywhere: false,
+        read_anywhere: true,
         write_globs: candidateShape.write_globs
       },
       risk_level: candidateShape.risk_level,
@@ -6410,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;
@@ -6442,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";
@@ -6495,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");
@@ -6807,7 +6931,7 @@ class RemoteBuddyAutonomousEngine {
         sessionId: this.sessionId,
         runId,
         ttlMs,
-        staleAfterMs: this.lockStaleAfterMs()
+        staleAfterMs: this.lockStaleAfterMsForAcquire()
       })
     });
     if (res.ok)
@@ -7123,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) {
@@ -7231,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) {
@@ -7367,15 +7514,11 @@ ${JSON.stringify(input.messages ?? [])}`),
             recordDropReason(`${source}_risk_exceeds_policy`);
             continue;
           }
-          const scopeValidation = validateScopeInvariants(candidate.component_area, candidate.target_paths, candidate.scope.write_globs, { requireWriteGlobs: true });
+          const scopeValidation = validateScopeInvariants(candidate.component_area, candidate.target_paths, candidate.scope.write_globs, { requireWriteGlobs: true, hintsOnly: true });
           if (!scopeValidation.ok) {
             recordDropReason(`${source}_scope_validation_failed`);
             continue;
           }
-          if (BREADTH_ORDER[scopeValidation.breadth] > BREADTH_ORDER[policy.maxBreadth]) {
-            recordDropReason(`${source}_scope_breadth_exceeds_policy`);
-            continue;
-          }
           if (candidate.scope.read_anywhere && !this.cfg.allowReadAnywhere) {
             recordDropReason(`${source}_read_anywhere_not_allowed`);
             continue;
@@ -7912,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) {
@@ -7936,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();
@@ -7948,6 +8095,7 @@ Scope:
     this.tick();
   }
   stop() {
+    this.clearStartupFastTickTimer();
     if (this.timer) {
       clearInterval(this.timer);
       this.timer = null;
@@ -7956,6 +8104,7 @@ Scope:
       clearInterval(this.heartbeatTimer);
       this.heartbeatTimer = null;
     }
+    this.startupFastTickAttemptsRemaining = 0;
     this.nextTickAtMs = 0;
   }
 }
@@ -8266,12 +8415,13 @@ function buildExecutionGuidance(plan, targetPaths, requiredValidationSteps = [])
   const lines = [];
   const targets = normalizePathHints(targetPaths.length > 0 ? targetPaths : plan.scope.write_globs ?? []);
   if (targets.length > 0) {
-    lines.push("Target paths:");
+    lines.push("Target paths / starting points:");
     for (const path of targets)
       lines.push(`- ${path}`);
     lines.push("Path handling:");
     lines.push("- Treat all target paths as repo-relative to the current working directory.");
     lines.push("- Do not prepend a leading slash to target paths.");
+    lines.push("- These paths are relevance hints, not hard write boundaries; edit the behavior-owning files needed for the task and explain any expansion.");
   }
   lines.push("Scope:");
   lines.push(`- read_anywhere: ${plan.scope.read_anywhere ? "true" : "false"}`);
@@ -8280,12 +8430,12 @@ function buildExecutionGuidance(plan, targetPaths, requiredValidationSteps = [])
     lines.push(`- max_files_to_edit: ${plan.scope.max_files_to_edit}`);
   }
   if (Array.isArray(plan.scope.write_globs) && plan.scope.write_globs.length > 0) {
-    lines.push("Write globs:");
+    lines.push("Write intent hints:");
     for (const glob of plan.scope.write_globs)
       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}`);
   }
@@ -8556,6 +8706,7 @@ class RemoteBuddyOrchestrator {
   server;
   sessionId;
   authToken;
+  fetchImpl;
   repo;
   jobsDbPath;
   workerOnlineTtlMs;
@@ -8624,6 +8775,7 @@ class RemoteBuddyOrchestrator {
     this.server = opts.server;
     this.sessionId = opts.sessionId;
     this.authToken = opts.authToken;
+    this.fetchImpl = opts.fetchImpl ?? fetch;
     this.brain = opts.brain;
     this.idempotency = opts.idempotency;
     this.persistentMemory = opts.persistentMemory;
@@ -8687,7 +8839,8 @@ class RemoteBuddyOrchestrator {
       serverUrl: this.server,
       sessionId: this.sessionId,
       authToken: this.authToken,
-      from: `agent:${this.agentId}`
+      from: `agent:${this.agentId}`,
+      fetchImpl: this.fetchImpl
     });
     this.autonomousEngine = new RemoteBuddyAutonomousEngine({
       server: this.server,
@@ -8749,7 +8902,7 @@ class RemoteBuddyOrchestrator {
   async ensureSessionWithRetry(sessionId = this.sessionId, maxRetries = 20, baseDelayMs = 500, maxDelayMs = 5000) {
     for (let attempt = 1;attempt <= maxRetries && !this.disposed; attempt++) {
       try {
-        const res = await fetch(`${this.server}/sessions`, {
+        const res = await this.fetchImpl(`${this.server}/sessions`, {
           method: "POST",
           headers: this.authHeaders(),
           body: JSON.stringify({ sessionId })
@@ -8796,7 +8949,7 @@ class RemoteBuddyOrchestrator {
   }
   async fetchJobLogs(jobId, limit = 80) {
     try {
-      const res = await fetch(`${this.server}/jobs/${jobId}/logs?limit=${Math.max(1, Math.min(500, limit))}`, {
+      const res = await this.fetchImpl(`${this.server}/jobs/${jobId}/logs?limit=${Math.max(1, Math.min(500, limit))}`, {
         method: "GET",
         headers: this.authHeaders()
       });
@@ -8812,7 +8965,7 @@ class RemoteBuddyOrchestrator {
   }
   async fetchJobToolRuns(jobId, limit = 20) {
     try {
-      const res = await fetch(`${this.server}/jobs/${jobId}/tool-runs?limit=${Math.max(1, Math.min(100, limit))}`, {
+      const res = await this.fetchImpl(`${this.server}/jobs/${jobId}/tool-runs?limit=${Math.max(1, Math.min(100, limit))}`, {
         method: "GET",
         headers: this.authHeaders()
       });
@@ -8868,7 +9021,7 @@ class RemoteBuddyOrchestrator {
     query.set("feedbackLimit", "3");
     const suffix = query.toString();
     try {
-      const res = await fetch(`${this.server}/autonomy/insights${suffix ? `?${suffix}` : ""}`, {
+      const res = await this.fetchImpl(`${this.server}/autonomy/insights${suffix ? `?${suffix}` : ""}`, {
         method: "GET",
         headers: this.authHeaders()
       });
@@ -9169,7 +9322,7 @@ Please reply with the missing details and I will enqueue a follow-up request.` :
         payload.dedupeKey = dedupeKey;
       if (targetWorkerId)
         payload.targetWorkerId = targetWorkerId;
-      const res = await fetch(`${this.server}/jobs/enqueue`, {
+      const res = await this.fetchImpl(`${this.server}/jobs/enqueue`, {
         method: "POST",
         headers: this.authHeaders(),
         body: JSON.stringify(payload)
@@ -9439,7 +9592,7 @@ Please reply with the missing details and I will enqueue a follow-up request.` :
   }
   async fetchWorkers() {
     try {
-      const res = await fetch(`${this.server}/workers?ttlMs=${this.workerOnlineTtlMs}`, {
+      const res = await this.fetchImpl(`${this.server}/workers?ttlMs=${this.workerOnlineTtlMs}`, {
         method: "GET",
         headers: this.authHeaders()
       });
@@ -9453,7 +9606,7 @@ Please reply with the missing details and I will enqueue a follow-up request.` :
   }
   async fetchWorkerAutoscaleSnapshot() {
     try {
-      const res = await fetch(`${this.server}/workers/autoscale?ttlMs=${this.workerOnlineTtlMs}`, {
+      const res = await this.fetchImpl(`${this.server}/workers/autoscale?ttlMs=${this.workerOnlineTtlMs}`, {
         method: "GET",
         headers: this.authHeaders()
       });
@@ -9715,7 +9868,7 @@ Please reply with the missing details and I will enqueue a follow-up request.` :
     const prompt = String(request.prompt ?? "").trim();
     if (!prompt) {
       console.warn(`[RemoteBuddy] Request ${requestId} missing prompt; marking failed`);
-      await fetch(`${this.server}/requests/${requestId}/fail`, {
+      await this.fetchImpl(`${this.server}/requests/${requestId}/fail`, {
         method: "POST",
         headers: this.authHeaders(),
         body: JSON.stringify({ message: "Request missing prompt" })
@@ -9749,7 +9902,7 @@ Please reply with the missing details and I will enqueue a follow-up request.` :
           plan.job_kind = "task.execute";
           plan.lane = "worker";
         }
-        plan.scope.read_anywhere = false;
+        plan.scope.read_anywhere = true;
         plan.scope.write_allowed = true;
         plan.scope.write_globs = [...autonomyMetadata.writeGlobs];
       }
@@ -9774,7 +9927,7 @@ Please reply with the missing details and I will enqueue a follow-up request.` :
         if (scopeCoverage.addedGlobs.length > 0) {
           console.warn(`[RemoteBuddy] Planner write_globs did not cover target paths. Added scope globs: ${scopeCoverage.addedGlobs.join(", ")}`);
         }
-        if (forceWorker) {
+        if (forceWorker && !autonomyMetadata) {
           const concreteTargetCount = targetPaths.filter((entry) => entry && entry !== ".").length;
           if (concreteTargetCount > 0) {
             const currentMax = Number.isFinite(Number(plan.scope.max_files_to_edit)) && Number(plan.scope.max_files_to_edit) > 0 ? Math.floor(Number(plan.scope.max_files_to_edit)) : 0;
@@ -9783,9 +9936,6 @@ Please reply with the missing details and I will enqueue a follow-up request.` :
             }
           }
         }
-        if (autonomyMetadata && (!plan.scope.write_globs || plan.scope.write_globs.length === 0)) {
-          throw new Error("Autonomy-origin request requires non-empty planning.scope.write_globs before task dispatch.");
-        }
         if (plan.acceptance_criteria.length === 0) {
           plan.acceptance_criteria = ["Produce a correct and helpful result for the user request."];
         }
@@ -9844,7 +9994,7 @@ Please reply with the missing details and I will enqueue a follow-up request.` :
             await this.assistantMessage(requestSessionId, "Should I have a WorkerPal implement this? Reply to confirm and I'll enqueue the work, or clarify what you'd like focused on.", { turnId, correlationId: requestId, from: eventFrom });
           }
         }
-        await fetch(`${this.server}/requests/${requestId}/complete`, {
+        await this.fetchImpl(`${this.server}/requests/${requestId}/complete`, {
           method: "POST",
           headers: this.authHeaders(),
           body: JSON.stringify({
@@ -9875,7 +10025,7 @@ Please reply with the missing details and I will enqueue a follow-up request.` :
             correlationId: requestId,
             from: eventFrom
           });
-          await fetch(`${this.server}/requests/${requestId}/fail`, {
+          await this.fetchImpl(`${this.server}/requests/${requestId}/fail`, {
             method: "POST",
             headers: this.authHeaders(),
             body: JSON.stringify({
@@ -10010,7 +10160,7 @@ Please reply with the missing details and I will enqueue a follow-up request.` :
         await this.assistantMessage(requestSessionId, "I could not queue this WorkerPal task. No task was started.", { turnId, correlationId: requestId, from: eventFrom });
         this.rememberPersistentMemory("job_enqueue_failed", `enqueue_failed lane=${lane} intent=${plan.intent}`, requestId, requestSessionId);
       }
-      await fetch(`${this.server}/requests/${requestId}/complete`, {
+      await this.fetchImpl(`${this.server}/requests/${requestId}/complete`, {
         method: "POST",
         headers: this.authHeaders(),
         body: JSON.stringify({
@@ -10041,7 +10191,7 @@ Please reply with the missing details and I will enqueue a follow-up request.` :
         correlationId: requestId,
         from: eventFrom
       });
-      await fetch(`${this.server}/requests/${requestId}/fail`, {
+      await this.fetchImpl(`${this.server}/requests/${requestId}/fail`, {
         method: "POST",
         headers: this.authHeaders(),
         body: JSON.stringify({
@@ -10056,7 +10206,7 @@ Please reply with the missing details and I will enqueue a follow-up request.` :
     while (!this.disposed) {
       try {
         await this.maybeAutoscaleWorkers();
-        const res = await fetch(`${this.server}/requests/claim`, {
+        const res = await this.fetchImpl(`${this.server}/requests/claim`, {
           method: "POST",
           headers: this.authHeaders(),
           body: JSON.stringify({ agentId: this.agentId })