fix(clownfish): address review for ghcrawl-143801-autonomous-smoke (1)

openclaw-clownfish[bot] · agent-merkava · openclaw-clownfish[bot] · commit eb04aad6e069 · 2026-06-13T23:43:55.000Z
Co-authored-by: Merkava &lt;263752781+agent-merkava@users.noreply.github.com&gt;
diff --git a/src/infra/heartbeat-runner.isolated-session-mirror.test.ts b/src/infra/heartbeat-runner.isolated-session-mirror.test.ts
@@ -40,24 +40,28 @@ function latestDeliveryRequest(): DeliveryRequest {
   return request as DeliveryRequest;
 }
 
+function makeIsolatedLastTargetConfig(tmpDir: string, storePath: string): OpenClawConfig {
+  return {
+    agents: {
+      list: [{ id: "main", default: true }],
+      defaults: {
+        workspace: tmpDir,
+        heartbeat: {
+          every: "5m",
+          target: "last",
+          isolatedSession: true,
+        },
+      },
+    },
+    channels: { whatsapp: { allowFrom: ["*"] } },
+    session: { store: storePath },
+  };
+}
+
 describe("runHeartbeatOnce - isolated heartbeat outbound session mirror", () => {
   it("uses the isolated run key for outbound delivery while base session owns target and state", async () => {
     await withTempHeartbeatSandbox(async ({ tmpDir, storePath, replySpy }) => {
-      const cfg: OpenClawConfig = {
-        agents: {
-          list: [{ id: "main", default: true }],
-          defaults: {
-            workspace: tmpDir,
-            heartbeat: {
-              every: "5m",
-              target: "last",
-              isolatedSession: true,
-            },
-          },
-        },
-        channels: { whatsapp: { allowFrom: ["*"] } },
-        session: { store: storePath },
-      };
+      const cfg = makeIsolatedLastTargetConfig(tmpDir, storePath);
       const baseSessionKey = resolveMainSessionKey(cfg);
       const isolatedSessionKey = `${baseSessionKey}:heartbeat`;
       const nowMs = Date.now();
@@ -123,4 +127,52 @@ describe("runHeartbeatOnce - isolated heartbeat outbound session mirror", () =>
       expect(store[isolatedSessionKey]?.lastHeartbeatText).toBeUndefined();
     });
   });
+
+  it("keeps the base policy key when wake re-entry starts from the isolated key", async () => {
+    await withTempHeartbeatSandbox(async ({ tmpDir, storePath, replySpy }) => {
+      const cfg = makeIsolatedLastTargetConfig(tmpDir, storePath);
+      const baseSessionKey = resolveMainSessionKey(cfg);
+      const isolatedSessionKey = `${baseSessionKey}:heartbeat`;
+      const nowMs = Date.now();
+
+      await fs.writeFile(
+        storePath,
+        JSON.stringify({
+          [isolatedSessionKey]: {
+            sessionId: "isolated-session",
+            updatedAt: nowMs - 1_000,
+            lastChannel: "whatsapp",
+            lastProvider: "whatsapp",
+            lastTo: "+15551234567",
+            heartbeatIsolatedBaseSessionKey: baseSessionKey,
+          },
+        }),
+        "utf-8",
+      );
+      replySpy.mockResolvedValueOnce({ text: "Wake result needs attention." });
+
+      const result = await runHeartbeatOnce({
+        cfg,
+        sessionKey: isolatedSessionKey,
+        deps: {
+          getReplyFromConfig: replySpy,
+          getQueueSize: () => 0,
+          nowMs: () => nowMs,
+        },
+      });
+
+      expect(result.status).toBe("ran");
+      expect(replySpy.mock.calls[0]?.[0]).toMatchObject({
+        SessionKey: isolatedSessionKey,
+      });
+      expect(latestDeliveryRequest()).toMatchObject({
+        channel: "whatsapp",
+        to: "+15551234567",
+        session: {
+          key: isolatedSessionKey,
+          policyKey: baseSessionKey,
+        },
+      });
+    });
+  });
 });
diff --git a/src/infra/heartbeat-runner.ts b/src/infra/heartbeat-runner.ts
@@ -1559,6 +1559,7 @@ export async function runHeartbeatOnce(opts: {
   }
 
   let runSessionKey = sessionKey;
+  let outboundPolicySessionKey: string | undefined;
   if (useIsolatedSession) {
     const configuredSession = resolveHeartbeatSession(cfg, agentId, heartbeat);
     // Collapse only the repeated `:heartbeat` suffixes introduced by wake-triggered
@@ -1628,6 +1629,7 @@ export async function runHeartbeatOnce(opts: {
       }
     }
     runSessionKey = isolatedSessionKey;
+    outboundPolicySessionKey = isolatedBaseSessionKey;
   }
   // Update task last run times AFTER successful heartbeat completion
   const updateTaskTimestamps = async () => {
@@ -1708,7 +1710,7 @@ export async function runHeartbeatOnce(opts: {
     cfg,
     agentId,
     sessionKey: runSessionKey,
-    policySessionKey: runSessionKey === sessionKey ? undefined : sessionKey,
+    policySessionKey: outboundPolicySessionKey,
   });
   const canAttemptHeartbeatOk = Boolean(
     !hasDueCommitments && visibility.showOk && delivery.channel !== "none" && delivery.to,

Original file line number	Diff line number	Diff line change
`@@ -1559,6 +1559,7 @@ export async function runHeartbeatOnce(opts: {`
`1559`	`1559`	`}`
`1560`	`1560`
`1561`	`1561`	`let runSessionKey = sessionKey;`
	`1562`	`+ let outboundPolicySessionKey: string \| undefined;`
`1562`	`1563`	`if (useIsolatedSession) {`
`1563`	`1564`	`const configuredSession = resolveHeartbeatSession(cfg, agentId, heartbeat);`
`1564`	`1565`	// Collapse only the repeated `:heartbeat` suffixes introduced by wake-triggered
`@@ -1628,6 +1629,7 @@ export async function runHeartbeatOnce(opts: {`
`1628`	`1629`	`}`
`1629`	`1630`	`}`
`1630`	`1631`	`runSessionKey = isolatedSessionKey;`
	`1632`	`+ outboundPolicySessionKey = isolatedBaseSessionKey;`
`1631`	`1633`	`}`
`1632`	`1634`	`// Update task last run times AFTER successful heartbeat completion`
`1633`	`1635`	`const updateTaskTimestamps = async () => {`
`@@ -1708,7 +1710,7 @@ export async function runHeartbeatOnce(opts: {`
`1708`	`1710`	`cfg,`
`1709`	`1711`	`agentId,`
`1710`	`1712`	`sessionKey: runSessionKey,`
`1711`		`- policySessionKey: runSessionKey === sessionKey ? undefined : sessionKey,`
	`1713`	`+ policySessionKey: outboundPolicySessionKey,`
`1712`	`1714`	`});`
`1713`	`1715`	`const canAttemptHeartbeatOk = Boolean(`
`1714`	`1716`	`!hasDueCommitments && visibility.showOk && delivery.channel !== "none" && delivery.to,`