fix(cron): always emit before_agent_reply phase for cron triggers (#93530)

fsdwen · claude · fsdwen · commit ddd03887c51f · 2026-06-16T18:59:24.000+08:00
When no before_agent_reply hook is registered, the phase notification
is gated behind hookRunner.hasHooks(), so the cron pre-execution
watchdog never receives the 'execution' stage signal and fires
prematurely.

Move notifyExecutionPhase('before_agent_reply') outside the hasHooks
guard so the watchdog always learns the agent entered execution for
cron triggers. Hook execution remains guarded.

Also fix the same pattern in the CLI runner.

Co-Authored-By: Claude &lt;noreply@anthropic.com&gt;
diff --git a/src/agents/cli-runner.ts b/src/agents/cli-runner.ts
@@ -378,6 +378,14 @@ async function runCliAgentInternal(params: RunCliAgentParams): Promise<EmbeddedA
   if (params.trigger === "cron") {
     const startedAt = Date.now();
     const hookRunner = getGlobalHookRunner();
+    // Always notify the watchdog that the CLI agent reached the execution
+    // phase, even when no before_agent_reply hooks are registered, so the
+    // pre-execution timeout is always cleared for cron triggers.
+    params.onExecutionPhase?.({
+      phase: "before_agent_reply",
+      provider: params.provider,
+      model: params.model ?? "",
+    });
     if (hookRunner?.hasHooks("before_agent_reply")) {
       const hookContext = {
         runId: params.runId,
@@ -389,11 +397,6 @@ async function runCliAgentInternal(params: RunCliAgentParams): Promise<EmbeddedA
         trigger: params.trigger,
         ...buildAgentHookContextChannelFields(params),
       } as const;
-      params.onExecutionPhase?.({
-        phase: "before_agent_reply",
-        provider: params.provider,
-        model: params.model ?? "",
-      });
       const hookResult = await hookRunner.runBeforeAgentReply(
         { cleanedBody: params.prompt },
         hookContext,
@@ -417,12 +420,12 @@ async function runCliAgentInternal(params: RunCliAgentParams): Promise<EmbeddedA
           },
         };
       }
-      params.onExecutionPhase?.({
-        phase: "runtime_plugins",
-        provider: params.provider,
-        model: params.model ?? "",
-      });
     }
+    params.onExecutionPhase?.({
+      phase: "runtime_plugins",
+      provider: params.provider,
+      model: params.model ?? "",
+    });
   }
   const { prepareCliRunContext } = await import("./cli-runner/prepare.runtime.js");
   const context = await prepareCliRunContext(params);
diff --git a/src/agents/embedded-agent-runner/run.ts b/src/agents/embedded-agent-runner/run.ts
@@ -834,26 +834,31 @@ async function runEmbeddedAgentInternal(
         trigger: params.trigger,
         ...buildAgentHookContextChannelFields(params),
       };
-      if (params.trigger === "cron" && hookRunner?.hasHooks("before_agent_reply")) {
+      if (params.trigger === "cron") {
+        // Notify the watchdog that the agent reached the execution phase
+        // even when no before_agent_reply hooks are registered, so the
+        // pre-execution timeout is always cleared for cron triggers.
         notifyExecutionPhase("before_agent_reply", { provider, model: modelId });
-        const hookResult = await hookRunner.runBeforeAgentReply(
-          { cleanedBody: params.prompt },
-          hookCtx,
-        );
-        if (hookResult?.handled) {
-          return {
-            payloads: buildHandledReplyPayloads(hookResult.reply),
-            meta: {
-              durationMs: Date.now() - started,
-              agentMeta: {
-                sessionId: params.sessionId,
-                provider,
-                model: modelId,
+        if (hookRunner?.hasHooks("before_agent_reply")) {
+          const hookResult = await hookRunner.runBeforeAgentReply(
+            { cleanedBody: params.prompt },
+            hookCtx,
+          );
+          if (hookResult?.handled) {
+            return {
+              payloads: buildHandledReplyPayloads(hookResult.reply),
+              meta: {
+                durationMs: Date.now() - started,
+                agentMeta: {
+                  sessionId: params.sessionId,
+                  provider,
+                  model: modelId,
+                },
+                finalAssistantVisibleText: hookResult.reply?.text ?? SILENT_REPLY_TOKEN,
+                finalAssistantRawText: hookResult.reply?.text ?? SILENT_REPLY_TOKEN,
               },
-              finalAssistantVisibleText: hookResult.reply?.text ?? SILENT_REPLY_TOKEN,
-              finalAssistantRawText: hookResult.reply?.text ?? SILENT_REPLY_TOKEN,
-            },
-          };
+            };
+          }
         }
         notifyExecutionPhase("runtime_plugins", { provider, model: modelId });
       }
diff --git a/src/cron/service/agent-watchdog.ts b/src/cron/service/agent-watchdog.ts
@@ -129,11 +129,7 @@ export function createCronAgentWatchdog(params: {
       startPreExecutionTimeout();
       return;
     }
-    // Any phase notification proves the runner is alive and making progress.
-    // Clear the pre-execution timeout even for pre_execution stages so that
-    // conditionally-emitted phases (e.g. before_agent_reply gated behind
-    // hookRunner.hasHooks) do not cause false timeouts.
-    if (stage !== undefined || info.firstModelCallStarted) {
+    if (stage === "execution" || info.firstModelCallStarted) {
       state = "executing";
       clearPreExecutionTimeout();
     }

Original file line number	Diff line number	Diff line change
`@@ -129,11 +129,7 @@ export function createCronAgentWatchdog(params: {`
`129`	`129`	`startPreExecutionTimeout();`
`130`	`130`	`return;`
`131`	`131`	`}`
`132`		`- // Any phase notification proves the runner is alive and making progress.`
`133`		`- // Clear the pre-execution timeout even for pre_execution stages so that`
`134`		`- // conditionally-emitted phases (e.g. before_agent_reply gated behind`
`135`		`- // hookRunner.hasHooks) do not cause false timeouts.`
`136`		`- if (stage !== undefined \|\| info.firstModelCallStarted) {`
	`132`	`+ if (stage === "execution" \|\| info.firstModelCallStarted) {`
`137`	`133`	`state = "executing";`
`138`	`134`	`clearPreExecutionTimeout();`
`139`	`135`	`}`