@runfusion/fusion 0.59.0 → 0.60.0

package/dist/bin.js

@@ -1219,6 +1219,12 @@ var init_settings_schema = __esm({
       titleSummarizerGlobalProvider: void 0,
       titleSummarizerGlobalModelId: void 0,
       /*
+      FNXC:Settings-MergerModel 2026-07-13-07:52:
+      Global merger baseline lane (provider/model/thinking) is independent of executor/planner/reviewer so operators can pin a merge-capable model under Settings → Global Models without changing other lanes. Undefined falls through to defaultProvider/defaultModelId at resolve time.
+      */
+      mergerGlobalProvider: void 0,
+      mergerGlobalModelId: void 0,
+      /*
       FNXC:Settings-ThinkingLevel 2026-07-10-00:00:
       Global model lanes can override the default thinking effort independently. Undefined preserves the existing inheritance to `defaultThinkingLevel`.
       */
@@ -1226,6 +1232,7 @@ var init_settings_schema = __esm({
       planningGlobalThinkingLevel: void 0,
       validatorGlobalThinkingLevel: void 0,
       titleSummarizerGlobalThinkingLevel: void 0,
+      mergerGlobalThinkingLevel: void 0,
       // Daemon mode settings
       daemonToken: void 0,
       daemonPort: 4040,
@@ -1416,6 +1423,11 @@ var init_settings_schema = __esm({
       */
       openMobileTasksInPopup: false,
       /*
+      FNXC:TaskPopupViewGating 2026-07-13-00:00:
+      Default off preserves current always-visible task-detail popup behavior. When true, the dashboard render gate shows each open task-detail FloatingWindow only on the Board/List view where it was opened without clearing popup snapshots or their shared persisted geometry.
+      */
+      taskPopupsBoardListOnly: false,
+      /*
       FNXC:TaskCardCostBadge 2026-07-11-12:15:
       Default off preserves existing board-card density. When true, the dashboard may render a read-time derived cost badge only for tasks with positive token usage; unavailable pricing remains the guess-free “—” sentinel.
       */
@@ -1617,6 +1629,13 @@ var init_settings_schema = __esm({
       titleSummarizerFallbackProvider: void 0,
       titleSummarizerFallbackModelId: void 0,
       titleSummarizerFallbackThinkingLevel: void 0,
+      /*
+      FNXC:Settings-MergerModel 2026-07-13-07:52:
+      Merger model lane stays project-scoped (not workflow-moved) like title summarizer: Settings → Project Models can override the global merger baseline without binding the choice to a workflow graph.
+      */
+      mergerProvider: void 0,
+      mergerModelId: void 0,
+      mergerThinkingLevel: void 0,
       prTitlePromptInstructions: void 0,
       prDescriptionPromptInstructions: void 0,
       scripts: void 0,
@@ -2666,6 +2685,22 @@ function resolveTitleSummarizerSettingsModel(settings) {
     settings
   );
 }
+function resolveMergerSettingsModel(settings) {
+  return applyTestModeOverrides(
+    pickFirstModelPair(
+      {
+        provider: settings?.mergerProvider,
+        modelId: settings?.mergerModelId
+      },
+      {
+        provider: settings?.mergerGlobalProvider,
+        modelId: settings?.mergerGlobalModelId
+      },
+      resolveProjectDefaultModel(settings)
+    ),
+    settings
+  );
+}
 function resolveTaskExecutionModel(task, settings) {
   return applyTestModeOverrides(
     pickFirstModelPair(
@@ -93683,6 +93718,7 @@ __export(src_exports, {
   resolveMaxReworkCycles: () => resolveMaxReworkCycles,
   resolveMemoryBackend: () => resolveMemoryBackend,
   resolveMemoryInstructionContext: () => resolveMemoryInstructionContext,
+  resolveMergerSettingsModel: () => resolveMergerSettingsModel,
   resolveOptionalReviewRevisionBudget: () => resolveOptionalReviewRevisionBudget,
   resolveOptionalStepRevisionBudget: () => resolveOptionalStepRevisionBudget,
   resolvePersistAgentThinkingLog: () => resolvePersistAgentThinkingLog,
@@ -140730,7 +140766,12 @@ function resolveTitleSummarizerThinkingLevel(settings) {
   );
 }
 function resolveMergerThinkingLevel(settings) {
-  return firstThinkingLevel2(settings?.defaultThinkingLevelOverride, settings?.defaultThinkingLevel);
+  return firstThinkingLevel2(
+    settings?.mergerThinkingLevel,
+    settings?.mergerGlobalThinkingLevel,
+    settings?.defaultThinkingLevelOverride,
+    settings?.defaultThinkingLevel
+  );
 }
 function resolveExecutorFallbackThinkingLevel(taskThinkingLevel, settings) {
   return firstThinkingLevel2(
@@ -140910,8 +140951,8 @@ function resolveMergerSessionModel(settings, assignedAgentRuntimeConfig) {
       modelId: TEST_MODE_RESOLVED.modelId
     };
   }
-  const defaultModel = resolveProjectDefaultModel(settings);
-  return pickSettingsThenRuntimeModel(defaultModel, assignedAgentRuntimeConfig);
+  const mergerModel = resolveMergerSettingsModel(settings);
+  return pickSettingsThenRuntimeModel(mergerModel, assignedAgentRuntimeConfig);
 }
 async function createResolvedAgentSession(options) {
   const { sessionPurpose, pluginRunner, runtimeHint, runAuditor, settings, ...runtimeOptionsRaw } = options;
@@ -152028,7 +152069,9 @@ function readHeartbeatTimerRepairMetadata(agent) {
   return {
     repairedAt: typeof candidate.repairedAt === "string" ? candidate.repairedAt : void 0,
     staleAtRepair: typeof candidate.staleAtRepair === "boolean" ? candidate.staleAtRepair : void 0,
-    staleRepairReason: typeof candidate.staleRepairReason === "string" ? candidate.staleRepairReason : void 0
+    staleRepairReason: typeof candidate.staleRepairReason === "string" ? candidate.staleRepairReason : void 0,
+    consecutiveNonAdvancingRearms: typeof candidate.consecutiveNonAdvancingRearms === "number" ? candidate.consecutiveNonAdvancingRearms : void 0,
+    nonAdvancingEscalated: typeof candidate.nonAdvancingEscalated === "boolean" ? candidate.nonAdvancingEscalated : void 0
   };
 }
 var MAX_HEARTBEAT_WORKTREE_ACQUISITION_RETRIES, MAX_HEARTBEAT_ERROR_RECOVERY_ATTEMPTS, HEARTBEAT_ERROR_RECOVERY_METADATA_KEY, HEARTBEAT_ERROR_RETRY_EXHAUSTED_PAUSE_REASON, HEARTBEAT_ERROR_UNRECOVERABLE_PAUSE_REASON, promptSizeLog, REPORTS_STALE_INTERVAL_MULTIPLIER, MIN_HEARTBEAT_STALENESS_MS, agentSoulWordsCache, HEARTBEAT_SYSTEM_PROMPT, HEARTBEAT_NO_TASK_SYSTEM_PROMPT, HEARTBEAT_PROCEDURE_STRICT, HEARTBEAT_PROCEDURE_LITE, HEARTBEAT_PROCEDURE_OFF, HEARTBEAT_PROCEDURE, HEARTBEAT_NO_TASK_PROCEDURE_STRICT, HEARTBEAT_NO_TASK_PROCEDURE_LITE, HEARTBEAT_NO_TASK_PROCEDURE_OFF, heartbeatDoneParams, HeartbeatMonitor, OVERDUE_FIRE_JITTER_MS, HeartbeatTriggerScheduler;
@@ -154990,7 +155033,13 @@ ${trimPromptMd(taskDetail.prompt, promptTemplate)}` : "No PROMPT.md available.",
        *  Absent (legacy/no executor wiring) → treated as never effectively executing. */
       isAgentEffectivelyExecuting;
       timerAuditIntervalHandle = null;
+      timerAuditWatchdogHandle = null;
+      lastAuditRanAtMs = 0;
+      nonAdvancingRearmState = /* @__PURE__ */ new Map();
       static TIMER_AUDIT_INTERVAL_MS = 6e4;
+      static TIMER_AUDIT_WATCHDOG_INTERVAL_MS = 6e4;
+      static TIMER_AUDIT_WATCHDOG_STALE_MS = _HeartbeatTriggerScheduler.TIMER_AUDIT_INTERVAL_MS * 3;
+      static NON_ADVANCING_REARM_ESCALATION_THRESHOLD = 3;
       static DEFAULT_REPAIR_STALE_MULTIPLIER = 2;
       static DEFAULT_HEARTBEAT_TIMEOUT_MS = 6e4;
       constructor(store, callback, taskStore, options) {
@@ -155007,13 +155056,52 @@ ${trimPromptMd(taskDetail.prompt, promptTemplate)}` : "No PROMPT.md available.",
       start() {
         if (this.running) return;
         this.running = true;
+        this.lastAuditRanAtMs = Date.now();
         this.watchAssignments();
         this.watchAgentLifecycle();
         void this.auditTimerRegistrations("start");
+        this.armTimerAuditInterval();
+        this.armTimerAuditWatchdog();
+        heartbeatLog.log("HeartbeatTriggerScheduler started");
+      }
+      armTimerAuditInterval() {
+        if (this.timerAuditIntervalHandle) {
+          clearInterval(this.timerAuditIntervalHandle);
+          this.timerAuditIntervalHandle = null;
+        }
+        if (!this.running) {
+          return;
+        }
         this.timerAuditIntervalHandle = setInterval(() => {
           void this.auditTimerRegistrations("interval");
         }, _HeartbeatTriggerScheduler.TIMER_AUDIT_INTERVAL_MS);
-        heartbeatLog.log("HeartbeatTriggerScheduler started");
+      }
+      armTimerAuditWatchdog() {
+        if (this.timerAuditWatchdogHandle) {
+          clearInterval(this.timerAuditWatchdogHandle);
+          this.timerAuditWatchdogHandle = null;
+        }
+        if (!this.running) {
+          return;
+        }
+        this.timerAuditWatchdogHandle = setInterval(() => {
+          void this.checkTimerAuditLiveness();
+        }, _HeartbeatTriggerScheduler.TIMER_AUDIT_WATCHDOG_INTERVAL_MS);
+      }
+      async checkTimerAuditLiveness() {
+        if (!this.running) {
+          return;
+        }
+        const now = Date.now();
+        const elapsedMs = this.lastAuditRanAtMs > 0 ? now - this.lastAuditRanAtMs : Number.POSITIVE_INFINITY;
+        if (elapsedMs <= _HeartbeatTriggerScheduler.TIMER_AUDIT_WATCHDOG_STALE_MS) {
+          return;
+        }
+        heartbeatLog.warn(
+          `Heartbeat timer audit watchdog re-armed stalled auditor reason=heartbeat-audit-watchdog-rearmed elapsedMs=${elapsedMs} thresholdMs=${_HeartbeatTriggerScheduler.TIMER_AUDIT_WATCHDOG_STALE_MS}`
+        );
+        this.armTimerAuditInterval();
+        await this.auditTimerRegistrations("interval");
       }
       /**
        * Stop the scheduler and clear all timers.
@@ -155036,6 +155124,12 @@ ${trimPromptMd(taskDetail.prompt, promptTemplate)}` : "No PROMPT.md available.",
           clearInterval(this.timerAuditIntervalHandle);
           this.timerAuditIntervalHandle = null;
         }
+        if (this.timerAuditWatchdogHandle) {
+          clearInterval(this.timerAuditWatchdogHandle);
+          this.timerAuditWatchdogHandle = null;
+        }
+        this.lastAuditRanAtMs = 0;
+        this.nonAdvancingRearmState.clear();
         heartbeatLog.log("HeartbeatTriggerScheduler stopped");
       }
       /**
@@ -155180,6 +155274,7 @@ ${trimPromptMd(taskDetail.prompt, promptTemplate)}` : "No PROMPT.md available.",
       unregisterAgent(agentId) {
         this.registrationEpochs.set(agentId, (this.registrationEpochs.get(agentId) ?? 0) + 1);
         this.pendingAssignments.delete(agentId);
+        this.nonAdvancingRearmState.delete(agentId);
         if (this.timers.has(agentId)) {
           this.clearAgentTimer(agentId);
           heartbeatLog.log(`Unregistered timer for ${agentId}`);
@@ -155501,7 +155596,7 @@ ${trimPromptMd(taskDetail.prompt, promptTemplate)}` : "No PROMPT.md available.",
         );
         return { reaped: true, elapsedMs, thresholdMs };
       }
-      async markRepairMetadata(agent, staleAtRepair, staleRepairReason) {
+      async markRepairMetadata(agent, staleAtRepair, staleRepairReason, options) {
         const updater = this.store.updateAgent;
         if (typeof updater !== "function") {
           return;
@@ -155511,9 +155606,11 @@ ${trimPromptMd(taskDetail.prompt, promptTemplate)}` : "No PROMPT.md available.",
         const nextRepair = {
           repairedAt,
           staleAtRepair,
-          ...staleAtRepair && staleRepairReason ? { staleRepairReason } : {}
+          ...staleAtRepair && staleRepairReason ? { staleRepairReason } : {},
+          ...typeof options?.consecutiveNonAdvancingRearms === "number" ? { consecutiveNonAdvancingRearms: options.consecutiveNonAdvancingRearms } : {},
+          ...options?.nonAdvancingEscalated ? { nonAdvancingEscalated: true } : {}
         };
-        const didChange = existing.repairedAt !== nextRepair.repairedAt || existing.staleAtRepair !== nextRepair.staleAtRepair || existing.staleRepairReason !== nextRepair.staleRepairReason;
+        const didChange = existing.repairedAt !== nextRepair.repairedAt || existing.staleAtRepair !== nextRepair.staleAtRepair || existing.staleRepairReason !== nextRepair.staleRepairReason || existing.consecutiveNonAdvancingRearms !== nextRepair.consecutiveNonAdvancingRearms || existing.nonAdvancingEscalated !== nextRepair.nonAdvancingEscalated;
         if (!didChange) {
           return;
         }
@@ -155523,6 +155620,7 @@ ${trimPromptMd(taskDetail.prompt, promptTemplate)}` : "No PROMPT.md available.",
       }
       async auditTimerRegistrations(reason = "interval") {
         if (!this.running) return;
+        this.lastAuditRanAtMs = Date.now();
         try {
           const settings = this.taskStore && typeof this.taskStore.getSettings === "function" ? await this.taskStore.getSettings() : null;
           const staleMultiplier = this.resolveRepairStaleMultiplier(settings);
@@ -155532,6 +155630,7 @@ ${trimPromptMd(taskDetail.prompt, promptTemplate)}` : "No PROMPT.md available.",
           let zombieRearmedCount = 0;
           for (const agent of agents) {
             if (!this.isTimerEligibleAgent(agent)) {
+              this.nonAdvancingRearmState.delete(agent.id);
               if (this.timers.has(agent.id)) {
                 this.unregisterAgent(agent.id);
                 heartbeatLog.log(`Timer audit cleared orphaned timer for non-eligible agent ${agent.id} (audit:${reason})`);
@@ -155542,7 +155641,10 @@ ${trimPromptMd(taskDetail.prompt, promptTemplate)}` : "No PROMPT.md available.",
             const staleThresholdMs = this.getRepairStaleThresholdMs(agent, staleMultiplier);
             const elapsedMs = getHeartbeatAgeMs(agent);
             const staleAtRepair = Number.isFinite(elapsedMs) && elapsedMs > staleThresholdMs;
-            if (hasTimerEntry && !staleAtRepair) continue;
+            if (hasTimerEntry && !staleAtRepair) {
+              this.nonAdvancingRearmState.delete(agent.id);
+              continue;
+            }
             const isZombieRearm = hasTimerEntry && staleAtRepair;
             const activeRun = await this.store.getActiveHeartbeatRun(agent.id);
             const activeRunId = activeRun?.id ?? null;
@@ -155551,6 +155653,7 @@ ${trimPromptMd(taskDetail.prompt, promptTemplate)}` : "No PROMPT.md available.",
             let activeRunThresholdMs = Number.NaN;
             if (activeRun) {
               if (settings?.globalPause || settings?.enginePaused) {
+                this.nonAdvancingRearmState.delete(agent.id);
                 heartbeatLog.log(`Timer audit skipped re-arm for ${agent.id} (active run)`);
                 continue;
               }
@@ -155559,15 +155662,34 @@ ${trimPromptMd(taskDetail.prompt, promptTemplate)}` : "No PROMPT.md available.",
               activeRunElapsedMs = reapResult.elapsedMs;
               activeRunThresholdMs = reapResult.thresholdMs;
               if (!reapedActiveRun) {
+                this.nonAdvancingRearmState.delete(agent.id);
                 heartbeatLog.log(`Timer audit skipped re-arm for ${agent.id} (active run)`);
                 continue;
               }
             }
+            let consecutiveNonAdvancingRearms;
+            let nonAdvancingEscalated = false;
+            let escalationReason;
+            if (isZombieRearm && !settings?.globalPause && !settings?.enginePaused) {
+              const heartbeatMarker = typeof agent.lastHeartbeatAt === "string" ? agent.lastHeartbeatAt : null;
+              const previous = this.nonAdvancingRearmState.get(agent.id);
+              consecutiveNonAdvancingRearms = previous && previous.lastHeartbeatAt === heartbeatMarker ? previous.count + 1 : 1;
+              this.nonAdvancingRearmState.set(agent.id, { lastHeartbeatAt: heartbeatMarker, count: consecutiveNonAdvancingRearms });
+              nonAdvancingEscalated = consecutiveNonAdvancingRearms >= _HeartbeatTriggerScheduler.NON_ADVANCING_REARM_ESCALATION_THRESHOLD;
+              if (nonAdvancingEscalated) {
+                escalationReason = `heartbeat-rearm-nonadvancing-escalated: ${consecutiveNonAdvancingRearms} consecutive zombie re-arms without lastHeartbeatAt advancing`;
+              }
+            } else {
+              this.nonAdvancingRearmState.delete(agent.id);
+            }
             this.registerAgent(agent.id, this.getAgentTimerConfig(agent), {
               lastHeartbeatAt: agent.lastHeartbeatAt
             });
-            const staleRepairReason = staleAtRepair ? isZombieRearm ? `zombie-timer-rearmed: no heartbeat for ${Math.round(elapsedMs / 1e3)}s while a timer entry remained present (threshold ${Math.round(staleThresholdMs / 1e3)}s)` : `No heartbeat for ${Math.round(elapsedMs / 1e3)}s before timer audit repair (threshold ${Math.round(staleThresholdMs / 1e3)}s)` : void 0;
-            await this.markRepairMetadata(agent, staleAtRepair, staleRepairReason);
+            const staleRepairReason = staleAtRepair ? escalationReason ? `${escalationReason}; zombie-timer-rearmed: no heartbeat for ${Math.round(elapsedMs / 1e3)}s while a timer entry remained present (threshold ${Math.round(staleThresholdMs / 1e3)}s)` : isZombieRearm ? `zombie-timer-rearmed: no heartbeat for ${Math.round(elapsedMs / 1e3)}s while a timer entry remained present (threshold ${Math.round(staleThresholdMs / 1e3)}s)` : `No heartbeat for ${Math.round(elapsedMs / 1e3)}s before timer audit repair (threshold ${Math.round(staleThresholdMs / 1e3)}s)` : void 0;
+            await this.markRepairMetadata(agent, staleAtRepair, staleRepairReason, {
+              consecutiveNonAdvancingRearms,
+              nonAdvancingEscalated
+            });
             rearmedCount++;
             if (isZombieRearm) zombieRearmedCount++;
             if (reapedActiveRun && activeRunId) {
@@ -155575,7 +155697,11 @@ ${trimPromptMd(taskDetail.prompt, promptTemplate)}` : "No PROMPT.md available.",
                 `Timer audit re-armed after stale-run reap reason=timer-audit-rearmed agentId=${agent.id} runId=${activeRunId} elapsedMs=${activeRunElapsedMs} thresholdMs=${activeRunThresholdMs}`
               );
             }
-            if (isZombieRearm) {
+            if (nonAdvancingEscalated) {
+              heartbeatLog.warn(
+                `Timer audit escalated non-advancing zombie re-arm reason=heartbeat-rearm-nonadvancing-escalated agentId=${agent.id} count=${consecutiveNonAdvancingRearms} threshold=${_HeartbeatTriggerScheduler.NON_ADVANCING_REARM_ESCALATION_THRESHOLD} (audit:${reason}): ${staleRepairReason}`
+              );
+            } else if (isZombieRearm) {
               heartbeatLog.warn(`Timer audit force re-armed non-advancing agent ${agent.id} reason=zombie-timer-rearmed (audit:${reason}): ${staleRepairReason}`);
             } else if (staleAtRepair) {
               heartbeatLog.warn(`Timer re-armed stale agent ${agent.id} (audit:${reason}): ${staleRepairReason ?? "heartbeat exceeded stale threshold before repair"}`);
@@ -191099,12 +191225,43 @@ function canonicalizePath2(path11) {
     return resolvePath(path11);
   }
 }
+function countExecuteRequeueTerminalSteps(live) {
+  return live.steps?.filter((step) => step.status === "done" || step.status === "skipped").length ?? 0;
+}
+function parseExecuteRequeueLoopProgressSignature(signature) {
+  if (!signature) return null;
+  try {
+    const parsed = JSON.parse(signature);
+    if (typeof parsed.terminalStepCount !== "number" || typeof parsed.totalSteps !== "number") return null;
+    return {
+      terminalStepCount: parsed.terminalStepCount,
+      totalSteps: parsed.totalSteps
+    };
+  } catch {
+    return null;
+  }
+}
 function buildExecuteRequeueLoopSignature(live) {
   return JSON.stringify({
-    currentStep: live.currentStep ?? null,
-    steps: live.steps?.map((step) => step.status) ?? []
+    terminalStepCount: countExecuteRequeueTerminalSteps(live),
+    totalSteps: live.steps?.length ?? 0
   });
 }
+function buildExecuteRequeueLoopHighWaterSignature(live, previousSignature) {
+  const current = parseExecuteRequeueLoopProgressSignature(buildExecuteRequeueLoopSignature(live));
+  const currentTerminalStepCount = current?.terminalStepCount ?? countExecuteRequeueTerminalSteps(live);
+  const totalSteps = current?.totalSteps ?? (live.steps?.length ?? 0);
+  const previous = parseExecuteRequeueLoopProgressSignature(previousSignature);
+  const previousTerminalStepCount = previous?.terminalStepCount ?? currentTerminalStepCount;
+  const madeForwardProgress = previous != null && currentTerminalStepCount > previousTerminalStepCount;
+  return {
+    madeForwardProgress,
+    signature: JSON.stringify({
+      terminalStepCount: Math.max(previousTerminalStepCount, currentTerminalStepCount),
+      totalSteps
+    })
+  };
+}
 function isTransientMissingTaskJsonError(error48, task) {
   if (error48 instanceof TaskDeletedError) {
     return false;
@@ -197672,8 +197829,8 @@ Graph value: ${failureValue}` : ""}`, budget.key),
               await this.persistTokenUsage(task.id);
               return;
             }
-            const signature = buildExecuteRequeueLoopSignature(live);
-            const nextCount = live.executeRequeueLoopSignature === signature ? (live.executeRequeueLoopCount ?? 0) + 1 : 1;
+            const { signature, madeForwardProgress } = buildExecuteRequeueLoopHighWaterSignature(live, live.executeRequeueLoopSignature);
+            const nextCount = madeForwardProgress || live.executeRequeueLoopSignature == null ? 1 : (live.executeRequeueLoopCount ?? 0) + 1;
             if (live.executeRequeueLoopCount !== nextCount || live.executeRequeueLoopSignature !== signature) {
               await this.store.updateTask(task.id, {
                 executeRequeueLoopCount: nextCount,