From 264b37e9d292efb2567f10c376fb558c691c6773 Mon Sep 17 00:00:00 2001
From: Vincent Koc <vincentkoc@ieee.org>
Date: Tue, 23 Jun 2026 01:23:27 +0200
Subject: [PATCH] test(qa): avoid redacted config cleanup patch

---
 extensions/qa-lab/src/scenario-catalog.test.ts           | 8 ++++++++
 qa/scenarios/runtime/long-context-progress-watchdog.yaml | 8 +++++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/extensions/qa-lab/src/scenario-catalog.test.ts b/extensions/qa-lab/src/scenario-catalog.test.ts
index 5539827ceadc..f1757e06fccc 100644
--- a/extensions/qa-lab/src/scenario-catalog.test.ts
+++ b/extensions/qa-lab/src/scenario-catalog.test.ts
@@ -311,6 +311,14 @@ describe("qa scenario catalog", () => {
     expect(
       JSON.stringify(readQaScenarioById("gateway-restart-inflight-run").execution.flow),
     ).toContain("liveTurnTimeoutMs(env, 180000)");
+    const longContextFlow = JSON.stringify(
+      readQaScenarioById("long-context-progress-watchdog").execution.flow,
+    );
+    expect(longContextFlow).toContain("originalCodexPluginEnabled");
+    expect(longContextFlow).not.toContain(
+      "originalPluginAllow === undefined ? null : originalPluginAllow",
+    );
+    expect(longContextFlow).not.toContain("{ ...originalCodexPluginEntry, enabled:");
     expect(readQaScenarioExecutionConfig("long-context-progress-watchdog")).toMatchObject({
       requiredProviderMode: "live-frontier",
       harnessRuntime: "codex",
diff --git a/qa/scenarios/runtime/long-context-progress-watchdog.yaml b/qa/scenarios/runtime/long-context-progress-watchdog.yaml
index c156c9efcdf6..04216aeca309 100644
--- a/qa/scenarios/runtime/long-context-progress-watchdog.yaml
+++ b/qa/scenarios/runtime/long-context-progress-watchdog.yaml
@@ -56,6 +56,9 @@ flow:
         - set: originalCodexPluginEntry
           value:
             expr: originalSnapshot.config.plugins?.entries?.codex
+        - set: originalCodexPluginEnabled
+          value:
+            expr: "originalCodexPluginEntry && typeof originalCodexPluginEntry === 'object' ? originalCodexPluginEntry.enabled : undefined"
         - try:
             actions:
               - call: patchConfig
@@ -137,11 +140,10 @@ flow:
                       ref: env
                     patch:
                       plugins:
-                        allow:
-                          expr: "originalPluginAllow === undefined ? null : originalPluginAllow"
                         entries:
                           codex:
-                            expr: "originalCodexPluginEntry === undefined ? null : { ...originalCodexPluginEntry, enabled: originalCodexPluginEntry.enabled === undefined ? null : originalCodexPluginEntry.enabled }"
+                            enabled:
+                              expr: "originalCodexPluginEnabled === undefined ? null : originalCodexPluginEnabled"
                       agents:
                         defaults:
                           models: