From 6429fa0a7f5ed029bbb5eca2a18e2af1e5cdd286 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 16 Apr 2026 17:28:51 +0100
Subject: [PATCH] test: keep prompt cache PR gate green

---
 CHANGELOG.md                                |  1 +
 test/helpers/plugins/tts-contract-suites.ts | 43 +++++++++++----------
 2 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bcd38712d24..0ab1ae9321c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -47,6 +47,7 @@ Docs: https://docs.openclaw.ai
 - Codex/app-server: parse Desktop-originated app-server user agents such as `Codex Desktop/0.118.0`, keeping the version gate working when the Codex CLI inherits a multi-word originator. (#64666) Thanks @cyrusaf.
 - Cron/announce delivery: keep isolated announce `NO_REPLY` stripping case-insensitive across direct and text delivery, preserve structured media-only sends when a caption strips silent, and derive main-session awareness from the cleaned payloads so silent captions no longer leak stale `NO_REPLY` text. (#65016) Thanks @BKF-Gitty.
 - Sessions/Codex: skip redundant `delivery-mirror` transcript appends only when the latest assistant message has the same visible text, preventing duplicate visible replies on Codex-backed turns without suppressing repeated answers across turns. (#67185) Thanks @andyylin.
+- Auto-reply/prompt-cache: keep volatile inbound chat IDs out of the stable system prompt so task-scoped adapters can reuse prompt caches across runs, while preserving conversation metadata for the user turn and media-only messages. (#65071) Thanks @MonkeyLeeT.
 
 ## 2026.4.15-beta.1
 
diff --git a/test/helpers/plugins/tts-contract-suites.ts b/test/helpers/plugins/tts-contract-suites.ts
index 7ca6f01cdfa..f30997ed9bd 100644
--- a/test/helpers/plugins/tts-contract-suites.ts
+++ b/test/helpers/plugins/tts-contract-suites.ts
@@ -643,27 +643,6 @@ export function describeTtsConfigContract() {
       });
 
       it("passes cfg into auto-selection so model-provider Google keys can configure TTS", () => {
-        const cfg = asLegacyOpenClawConfig({
-          agents: { defaults: { model: { primary: "openai/gpt-4o-mini" } } },
-          models: {
-            providers: {
-              google: {
-                apiKey: "model-provider-google-key",
-              },
-            },
-          },
-          messages: {
-            tts: {
-              providers: {
-                microsoft: {
-                  enabled: false,
-                },
-              },
-            },
-          },
-        });
-        const config = resolveTtsConfig(cfg);
-        const prefsPath = `/tmp/tts-prefs-google-model-provider-${Date.now()}.json`;
         withEnv(
           {
             OPENAI_API_KEY: undefined,
@@ -674,6 +653,28 @@ export function describeTtsConfigContract() {
             GOOGLE_API_KEY: undefined,
           },
           () => {
+            const cfg = asLegacyOpenClawConfig({
+              agents: { defaults: { model: { primary: "openai/gpt-4o-mini" } } },
+              models: {
+                providers: {
+                  google: {
+                    apiKey: "model-provider-google-key",
+                  },
+                },
+              },
+              messages: {
+                tts: {
+                  providers: {
+                    microsoft: {
+                      enabled: false,
+                    },
+                  },
+                },
+              },
+            });
+            const config = resolveTtsConfig(cfg);
+            const prefsPath = `/tmp/tts-prefs-google-model-provider-${Date.now()}.json`;
+
             expect(getTtsProvider(config, prefsPath)).toBe("google");
           },
         );