fix(memory-core): split idempotencyKey from sessionKey in dreaming narrative

mushuiyu886 · mushuiyu886 · commit 05af679442ad · 2026-04-18T14:47:34.000+08:00
sessionKey uses a day-bucket for session reuse within the same calendar
day, while idempotencyKey includes the raw nowMs timestamp to stay
unique per run.  Previously both used the day-bucket, causing the
gateway to dedupe fresh narrative sweeps as stale cached results.

Also updates the test to assert the split key formats.
diff --git a/extensions/memory-core/src/dreaming-narrative.test.ts b/extensions/memory-core/src/dreaming-narrative.test.ts
@@ -585,7 +585,8 @@ describe("generateAndAppendDreamNarrative", () => {
     const logger = createMockLogger();
     const nowMs = Date.parse("2026-04-05T03:00:00Z");
     const workspaceHash = createHash("sha1").update(workspaceDir).digest("hex").slice(0, 12);
-    const expectedSessionKey = `dreaming-narrative-light-${workspaceHash}-${nowMs}`;
+    const expectedSessionKey = `dreaming-narrative-light-${workspaceHash}-2026-04-05`;
+    const expectedIdempotencyKey = `dreaming-narrative-light-${workspaceHash}-${nowMs}`;
 
     await generateAndAppendDreamNarrative({
       subagent,
@@ -601,7 +602,7 @@ describe("generateAndAppendDreamNarrative", () => {
 
     expect(subagent.run).toHaveBeenCalledOnce();
     expect(subagent.run.mock.calls[0][0]).toMatchObject({
-      idempotencyKey: expectedSessionKey,
+      idempotencyKey: expectedIdempotencyKey,
       sessionKey: expectedSessionKey,
       deliver: false,
     });
diff --git a/extensions/memory-core/src/dreaming-narrative.ts b/extensions/memory-core/src/dreaming-narrative.ts
@@ -138,6 +138,7 @@ function buildRequestScopedFallbackNarrative(data: NarrativePhaseData): string {
 async function startNarrativeRunOrFallback(params: {
   subagent: SubagentSurface;
   sessionKey: string;
+  idempotencyKey: string;
   message: string;
   data: NarrativePhaseData;
   workspaceDir: string;
@@ -147,7 +148,7 @@ async function startNarrativeRunOrFallback(params: {
 }): Promise<string | null> {
   try {
     const run = await params.subagent.run({
-      idempotencyKey: params.sessionKey,
+      idempotencyKey: params.idempotencyKey,
       sessionKey: params.sessionKey,
       message: params.message,
       extraSystemPrompt: NARRATIVE_SYSTEM_PROMPT,
@@ -191,6 +192,18 @@ function buildNarrativeSessionKey(params: {
   return `dreaming-narrative-${params.phase}-${workspaceHash}-${dayBucket}`;
 }
 
+function buildNarrativeIdempotencyKey(params: {
+  workspaceDir: string;
+  phase: NarrativePhaseData["phase"];
+  nowMs: number;
+}): string {
+  const workspaceHash = createHash("sha1").update(params.workspaceDir).digest("hex").slice(0, 12);
+  // Idempotency key must be unique per run so the gateway does not cache/dedupe
+  // fresh narrative sweeps within the same day-bucket session (see P1 review on
+  // PR #68437 — day-bucket idempotency caused stale cached narratives).
+  return `dreaming-narrative-${params.phase}-${workspaceHash}-${params.nowMs}`;
+}
+
 // ── Prompt building ────────────────────────────────────────────────────
 
 export function buildNarrativePrompt(data: NarrativePhaseData): string {
@@ -855,6 +868,11 @@ export async function generateAndAppendDreamNarrative(params: {
     phase: params.data.phase,
     nowMs,
   });
+  const idempotencyKey = buildNarrativeIdempotencyKey({
+    workspaceDir: params.workspaceDir,
+    phase: params.data.phase,
+    nowMs,
+  });
   const message = buildNarrativePrompt(params.data);
   let runId: string | null = null;
   let waitStatus: string | null = null;
@@ -863,6 +881,7 @@ export async function generateAndAppendDreamNarrative(params: {
     runId = await startNarrativeRunOrFallback({
       subagent: params.subagent,
       sessionKey,
+      idempotencyKey,
       message,
       data: params.data,
       workspaceDir: params.workspaceDir,
