fix(cron): restore suspended lanes to default concurrency

vincentkoc · vincentkoc · commit e844d1d6e56b · 2026-05-25T20:39:37.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -35,6 +35,7 @@ Docs: https://docs.openclaw.ai
 - Plugins/perf: reuse derived plugin metadata snapshots for the lifetime of the process so reply-time skill setup no longer rescans plugin metadata on every turn.
 - Discord/OpenAI voice: keep wake-name master consults using the current speaker context after ignored ambient transcripts and shorten the default capture silence grace.
 - Doctor: skip redundant Gateway restart prompts when a recent supervisor restart leaves the Gateway healthy. Fixes #86518. (#86533) Thanks @liaoyl830.
+- Cron: restore suspended cron lanes to the configured/default concurrency instead of falling back to one after quota or circuit-breaker auto-resume.
 - Gateway: keep session-only Control UI tool-start mirrors flowing during diagnostic queue pressure instead of silently dropping non-terminal tool updates.
 - Agents/memory: return optional not-found context for missing date-only daily memory reads instead of logging benign first-run `ENOENT` failures. Fixes #82928. Thanks @galiniliev.
 - Discord: merge streamed text captions into following media block replies so captions and attachments send as one message. (#86487) Thanks @neeravmakwana.
diff --git a/src/agents/session-suspension.test.ts b/src/agents/session-suspension.test.ts
@@ -1,4 +1,5 @@
 import { afterEach, describe, expect, it, vi } from "vitest";
+import { DEFAULT_CRON_MAX_CONCURRENT_RUNS } from "../config/cron-limits.js";
 import type { OpenClawConfig } from "../config/types.openclaw.js";
 import { CommandLane } from "../process/lanes.js";
 
@@ -23,12 +24,12 @@ vi.mock("./command/session.js", () => ({
   }),
 }));
 
-async function suspendMainLane(ttlMs: number, cfg: OpenClawConfig) {
+async function suspendLane(ttlMs: number, cfg: OpenClawConfig, laneId: CommandLane) {
   const { suspendSession } = await import("./session-suspension.js");
   await suspendSession({
     cfg,
     sessionId: "session-1",
-    laneId: CommandLane.Main,
+    laneId,
     reason: "quota_exhausted",
     failedProvider: "anthropic",
     failedModel: "claude-opus-4-6",
@@ -40,6 +41,8 @@ describe("session suspension", () => {
   afterEach(async () => {
     const { cancelLaneAutoResume } = await import("./session-suspension.js");
     cancelLaneAutoResume(CommandLane.Main);
+    cancelLaneAutoResume(CommandLane.Cron);
+    cancelLaneAutoResume(CommandLane.CronNested);
     vi.useRealTimers();
     sessionStoreMocks.updateSessionStoreEntry.mockClear();
     commandQueueMocks.setCommandLaneConcurrency.mockClear();
@@ -51,7 +54,7 @@ describe("session suspension", () => {
       agents: { defaults: { maxConcurrent: 4 } },
     } as OpenClawConfig;
 
-    await suspendMainLane(100, cfg);
+    await suspendLane(100, cfg, CommandLane.Main);
 
     expect(commandQueueMocks.setCommandLaneConcurrency).toHaveBeenCalledWith(CommandLane.Main, 0);
 
@@ -63,6 +66,44 @@ describe("session suspension", () => {
     );
   });
 
+  it("auto-resumes cron lanes to the cron concurrency default", async () => {
+    vi.useFakeTimers();
+
+    await suspendLane(100, {} as OpenClawConfig, CommandLane.CronNested);
+
+    expect(commandQueueMocks.setCommandLaneConcurrency).toHaveBeenCalledWith(
+      CommandLane.CronNested,
+      0,
+    );
+
+    await vi.advanceTimersByTimeAsync(100);
+
+    expect(commandQueueMocks.setCommandLaneConcurrency).toHaveBeenLastCalledWith(
+      CommandLane.CronNested,
+      DEFAULT_CRON_MAX_CONCURRENT_RUNS,
+    );
+  });
+
+  it("auto-resumes cron lanes to configured and clamped cron concurrency", async () => {
+    vi.useFakeTimers();
+
+    await suspendLane(100, { cron: { maxConcurrentRuns: 3 } } as OpenClawConfig, CommandLane.Cron);
+    await vi.advanceTimersByTimeAsync(100);
+
+    expect(commandQueueMocks.setCommandLaneConcurrency).toHaveBeenLastCalledWith(
+      CommandLane.Cron,
+      3,
+    );
+
+    await suspendLane(100, { cron: { maxConcurrentRuns: 0 } } as OpenClawConfig, CommandLane.Cron);
+    await vi.advanceTimersByTimeAsync(100);
+
+    expect(commandQueueMocks.setCommandLaneConcurrency).toHaveBeenLastCalledWith(
+      CommandLane.Cron,
+      1,
+    );
+  });
+
   it("maps failover reasons to persisted suspension reasons", async () => {
     const { testing } = await import("./session-suspension.js");
 
diff --git a/src/agents/session-suspension.ts b/src/agents/session-suspension.ts
@@ -1,5 +1,6 @@
 import path from "node:path";
 import { resolveAgentMaxConcurrent, resolveSubagentMaxConcurrent } from "../config/agent-limits.js";
+import { resolveCronMaxConcurrentRuns } from "../config/cron-limits.js";
 import { updateSessionStoreEntry } from "../config/sessions.js";
 import type { OpenClawConfig } from "../config/types.openclaw.js";
 import { createSubsystemLogger } from "../logging/subsystem.js";
@@ -23,10 +24,8 @@ function resolveLaneResumeConcurrency(cfg: OpenClawConfig | undefined, laneId: s
     case "subagent":
       return resolveSubagentMaxConcurrent(cfg);
     case "cron":
-    case "cron-nested": {
-      const raw = cfg?.cron?.maxConcurrentRuns;
-      return typeof raw === "number" && Number.isFinite(raw) ? Math.max(1, Math.floor(raw)) : 1;
-    }
+    case "cron-nested":
+      return resolveCronMaxConcurrentRuns(cfg?.cron);
     default:
       return DEFAULT_CUSTOM_LANE_RESUME_CONCURRENCY;
   }
diff --git a/src/cron/service/timer.regression.test.ts b/src/cron/service/timer.regression.test.ts
@@ -1002,6 +1002,7 @@ describe("cron service timer regressions", () => {
     const state = createCronServiceState({
       cronEnabled: true,
       storePath: store.storePath,
+      cronConfig: { maxConcurrentRuns: 1 },
       log: noopLogger,
       nowMs: () => now,
       enqueueSystemEvent: vi.fn(),
@@ -1013,7 +1014,6 @@ describe("cron service timer regressions", () => {
         now += params.job.id === first.id ? 50 : 20;
         return { status: "ok" as const, summary: "ok" };
       }),
-      cronConfig: { maxConcurrentRuns: 1 },
     });
 
     await onTimer(state);
