test(qa): avoid redacted config cleanup patch

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",

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: