fix(memory-core): suppress request-scoped pre-cleanup warnings

yangchenghao · yangchenghao · commit 3b858f84b987 · 2026-05-19T17:40:55.000+08:00
diff --git a/extensions/memory-core/src/dreaming-narrative.test.ts b/extensions/memory-core/src/dreaming-narrative.test.ts
@@ -833,6 +833,7 @@ describe("generateAndAppendDreamNarrative", () => {
   it("falls back to a local narrative when subagent runtime is request-scoped", async () => {
     const workspaceDir = await createTempWorkspace("openclaw-dreaming-narrative-");
     const subagent = createMockSubagent("");
+    subagent.deleteSession.mockRejectedValueOnce(new RequestScopedSubagentRuntimeError());
     subagent.run.mockRejectedValue(new RequestScopedSubagentRuntimeError());
     const logger = createMockLogger();
 
@@ -850,6 +851,7 @@ describe("generateAndAppendDreamNarrative", () => {
     expect(logger.info).toHaveBeenCalledWith(expect.stringContaining("request-scoped"));
     expect(logger.warn).not.toHaveBeenCalledWith(expect.stringContaining("request-scoped"));
     expect(logger.warn).not.toHaveBeenCalledWith(expect.stringContaining(workspaceDir));
+    expect(logger.warn).not.toHaveBeenCalledWith(expect.stringContaining("narrative pre-cleanup"));
     expect(logger.warn).not.toHaveBeenCalledWith(
       expect.stringContaining("narrative session cleanup failed"),
     );
diff --git a/extensions/memory-core/src/dreaming-narrative.ts b/extensions/memory-core/src/dreaming-narrative.ts
@@ -910,9 +910,11 @@ export async function generateAndAppendDreamNarrative(params: {
         try {
           await params.subagent.deleteSession({ sessionKey: attemptSessionKey });
         } catch (preCleanupErr) {
-          params.logger.warn(
-            `memory-core: narrative pre-cleanup failed for ${params.data.phase} phase: ${formatErrorMessage(preCleanupErr)}`,
-          );
+          if (!isRequestScopedSubagentRuntimeError(preCleanupErr)) {
+            params.logger.warn(
+              `memory-core: narrative pre-cleanup failed for ${params.data.phase} phase: ${formatErrorMessage(preCleanupErr)}`,
+            );
+          }
         }
 
         const runId = await startNarrativeRunOrFallback({
diff --git a/extensions/memory-core/src/dreaming-phases.test.ts b/extensions/memory-core/src/dreaming-phases.test.ts
@@ -347,6 +347,7 @@ describe("memory-core dreaming phases", () => {
     expect(dreams).toContain("Move backups to S3 Glacier.");
     expect(logger.error).not.toHaveBeenCalled();
     expect(logger.info).toHaveBeenCalledWith(expect.stringContaining("request-scoped"));
+    expect(logger.warn).not.toHaveBeenCalledWith(expect.stringContaining("narrative pre-cleanup"));
     expect(subagent.deleteSession).toHaveBeenCalledOnce();
   });
 
