fix: keep stalled session retry in accessor boundary

849261680 · 849261680 · commit a8442e4571b8 · 2026-06-27T06:54:17.000+08:00
diff --git a/src/auto-reply/reply/agent-runner-execution.ts b/src/auto-reply/reply/agent-runner-execution.ts
@@ -344,7 +344,7 @@ function isAbortLikeRunFailure(value: unknown): boolean {
     typeof value === "string"
       ? value
       : value && typeof value === "object" && "message" in value
-        ? String((value as { message?: unknown }).message ?? "")
+        ? (readStringValue((value as { message?: unknown }).message) ?? "")
         : "";
   return /aborted/i.test(message);
 }
diff --git a/src/auto-reply/reply/agent-runner-session-reset.ts b/src/auto-reply/reply/agent-runner-session-reset.ts
@@ -44,10 +44,10 @@ export async function resetReplyRunSession(params: {
   onActiveSessionEntry: (entry: SessionEntry) => void;
   onNewSession: (newSessionId: string, nextSessionFile: string) => void;
 }): Promise<boolean> {
-  if (!params.sessionKey || !params.activeSessionStore || !params.storePath) {
+  if (!params.sessionKey || !params.storePath) {
     return false;
   }
-  const prevEntry = params.activeSessionStore[params.sessionKey] ?? params.activeSessionEntry;
+  const prevEntry = params.activeSessionStore?.[params.sessionKey] ?? params.activeSessionEntry;
   if (!prevEntry) {
     return false;
   }
@@ -89,7 +89,9 @@ export async function resetReplyRunSession(params: {
     params.messageThreadId,
   );
   nextEntry.sessionFile = nextSessionFile;
-  params.activeSessionStore[params.sessionKey] = nextEntry;
+  if (params.activeSessionStore) {
+    params.activeSessionStore[params.sessionKey] = nextEntry;
+  }
   try {
     await deps.persistSessionResetLifecycle({
       agentId,
diff --git a/src/auto-reply/reply/agent-runner.ts b/src/auto-reply/reply/agent-runner.ts
@@ -23,7 +23,6 @@ import { deriveContextPromptTokens, hasNonzeroUsage, normalizeUsage } from "../.
 import { enqueueCommitmentExtraction } from "../../commitments/runtime.js";
 import type { OpenClawConfig } from "../../config/config.js";
 import {
-  loadSessionStore,
   resolveSessionPluginStatusLines,
   resolveSessionPluginTraceLines,
   type SessionEntry,
@@ -365,7 +364,6 @@ function shouldAutoResetRetryStalledDirectSession(params: {
     params.isHeartbeat ||
     !params.sessionKey ||
     !params.storePath ||
-    !params.activeSessionStore ||
     !isDirectChatSession({
       sessionKey: params.sessionKey,
       sessionEntry: params.activeSessionEntry,
@@ -1330,7 +1328,7 @@ export async function runReplyAgent(params: {
   } = params;
 
   let activeSessionEntry = sessionEntry;
-  let activeSessionStore = sessionStore;
+  const activeSessionStore = sessionStore;
   let activeIsNewSession = isNewSession;
   const effectiveResetTriggered = resetTriggered === true;
   const activeRunQueueMode = effectiveResetTriggered ? "interrupt" : resolvedQueue.mode;
@@ -1351,16 +1349,6 @@ export async function runReplyAgent(params: {
       config: followupRun.run.config,
       attributes: traceAttributes,
     });
-  const ensureActiveSessionStore = (): Record<string, SessionEntry> | undefined => {
-    if (activeSessionStore || !storePath || !sessionKey) {
-      return activeSessionStore;
-    }
-    // Gateway direct turns can arrive with a session entry but no mutable store;
-    // reset/retry must still rotate the canonical persisted session.
-    activeSessionStore = loadSessionStore(storePath, { skipCache: true });
-    activeSessionEntry = activeSessionStore[sessionKey] ?? activeSessionEntry;
-    return activeSessionStore;
-  };
   const effectiveShouldSteer = !isHeartbeat && !effectiveResetTriggered && shouldSteer;
   const effectiveShouldFollowup = !effectiveResetTriggered && shouldFollowup;
   const typingSignals = createTypingSignaler({
@@ -1875,23 +1863,18 @@ export async function runReplyAgent(params: {
         toolProgressDetail,
         replyMediaContext,
         isRestartRecoveryArmed,
-        shouldDeferRunFailure: (outcome) => {
-          const resetRetrySessionStore =
-            !activeSessionStore && isReplayableStalledDirectSessionAbort(outcome.runResult.meta)
-              ? ensureActiveSessionStore()
-              : activeSessionStore;
-          return shouldAutoResetRetryStalledDirectSession({
+        shouldDeferRunFailure: (outcome) =>
+          shouldAutoResetRetryStalledDirectSession({
             isHeartbeat,
             sessionKey,
             storePath,
-            activeSessionStore: resetRetrySessionStore,
+            activeSessionStore,
             activeSessionEntry,
             sessionCtx,
             runOutcome: outcome,
             blockReplyPipeline,
             pendingToolTasks,
-          });
-        },
+          }),
       });
     let runOutcome = await traceAgentPhase("reply.run_agent_turn", runAgentTurn);
 
@@ -1906,17 +1889,12 @@ export async function runReplyAgent(params: {
       await blockReplyPipeline.flush({ force: true });
     }
 
-    const resetRetryNeedsSessionStore =
-      !activeSessionStore && isReplayableStalledDirectSessionAbort(runOutcome.runResult.meta);
-    const resetRetrySessionStore = resetRetryNeedsSessionStore
-      ? ensureActiveSessionStore()
-      : activeSessionStore;
     if (
       shouldAutoResetRetryStalledDirectSession({
         isHeartbeat,
         sessionKey,
         storePath,
-        activeSessionStore: resetRetrySessionStore,
+        activeSessionStore,
         activeSessionEntry,
         sessionCtx,
         runOutcome,

Original file line number	Diff line number	Diff line change
`@@ -344,7 +344,7 @@ function isAbortLikeRunFailure(value: unknown): boolean {`
`344`	`344`	`typeof value === "string"`
`345`	`345`	`? value`
`346`	`346`	`: value && typeof value === "object" && "message" in value`
`347`		`- ? String((value as { message?: unknown }).message ?? "")`
	`347`	`+ ? (readStringValue((value as { message?: unknown }).message) ?? "")`
`348`	`348`	`: "";`
`349`	`349`	`return /aborted/i.test(message);`
`350`	`350`	`}`