Fix: use stricter isCronRunSessionKey in timer and sweep all agent stores

Gigi Agent · claude · Gigi Agent · commit 33ef6bb8a406 · 2026-02-09T11:34:30.000+01:00
- Replace overbroad isCronRunKey (/:run:/) in timer.ts with the stricter
  isCronRunSessionKey from sweeper.ts (/:cron:[^:]+:run:[^:]+$/)
- Update sweepStaleCronRunSessions to iterate over all configured agent
  session stores via listAgentIds(), not just the default agent

Co-Authored-By: Claude Opus 4.6 &lt;noreply@anthropic.com&gt;
diff --git a/src/cron/service/timer.ts b/src/cron/service/timer.ts
@@ -10,14 +10,10 @@ import {
 } from "./jobs.js";
 import { locked } from "./locked.js";
 import { ensureLoaded, persist } from "./store.js";
+import { isCronRunSessionKey } from "./sweeper.js";
 
 const MAX_TIMER_DELAY_MS = 60_000;
 
-/** True if the session key is a per-run cron key (contains `:run:`). */
-function isCronRunKey(key: string): boolean {
-  return /:run:/.test(key);
-}
-
 /**
  * Maximum wall-clock time for a single job execution. Acts as a safety net
  * on top of the per-provider / per-agent timeouts to prevent one stuck job
@@ -276,7 +272,7 @@ export async function onTimer(state: CronServiceState) {
           // Clean up the :run: session entry from the session store.
           if (
             result.sessionKey &&
-            isCronRunKey(result.sessionKey) &&
+            isCronRunSessionKey(result.sessionKey) &&
             (job.cleanup ?? "delete") === "delete" &&
             state.deps.cleanupCronRunSession
           ) {
@@ -519,7 +515,7 @@ export async function executeJob(
   // Clean up the :run: session entry from the session store.
   if (
     coreResult.sessionKey &&
-    isCronRunKey(coreResult.sessionKey) &&
+    isCronRunSessionKey(coreResult.sessionKey) &&
     (job.cleanup ?? "delete") === "delete" &&
     state.deps.cleanupCronRunSession
   ) {
diff --git a/src/gateway/server-cron.ts b/src/gateway/server-cron.ts
@@ -1,6 +1,6 @@
 import type { CliDeps } from "../cli/deps.js";
 import type { CronJob } from "../cron/types.js";
-import { resolveDefaultAgentId } from "../agents/agent-scope.js";
+import { listAgentIds, resolveDefaultAgentId } from "../agents/agent-scope.js";
 import { loadConfig } from "../config/config.js";
 import {
   resolveAgentMainSessionKey,
@@ -145,31 +145,33 @@ async function sweepStaleCronRunSessions(params: {
   log: { info: (obj: unknown, msg?: string) => void; warn: (obj: unknown, msg?: string) => void };
 }): Promise<number> {
   const { cfg, log } = params;
-  const agentId = resolveDefaultAgentId(cfg);
-  const sessStorePath = resolveStorePath(cfg.session?.store, { agentId });
+  const agentIds = listAgentIds(cfg);
   const now = Date.now();
   let removed = 0;
 
-  try {
-    await updateSessionStore(sessStorePath, (store) => {
-      for (const key of Object.keys(store)) {
-        if (!isCronRunSessionKey(key)) {
-          continue;
-        }
-        const entry = store[key];
-        const updatedAt = entry?.updatedAt ?? 0;
-        if (now - updatedAt > STALE_THRESHOLD_MS) {
-          delete store[key];
-          removed++;
+  for (const agentId of agentIds) {
+    const sessStorePath = resolveStorePath(cfg.session?.store, { agentId });
+    try {
+      await updateSessionStore(sessStorePath, (store) => {
+        for (const key of Object.keys(store)) {
+          if (!isCronRunSessionKey(key)) {
+            continue;
+          }
+          const entry = store[key];
+          const updatedAt = entry?.updatedAt ?? 0;
+          if (now - updatedAt > STALE_THRESHOLD_MS) {
+            delete store[key];
+            removed++;
+          }
         }
-      }
-    });
-  } catch (err) {
-    log.warn({ err: String(err) }, "cron: sweeper failed to update session store");
+      });
+    } catch (err) {
+      log.warn({ err: String(err), agentId }, "cron: sweeper failed to update session store");
+    }
   }
 
   if (removed > 0) {
-    log.info({ removed }, "cron: swept stale :run: session entries");
+    log.info({ removed, agentIds }, "cron: swept stale :run: session entries");
   }
   return removed;
 }
