diff --git a/tests/runner-e2e/chat-full-catalog-testops-manifest.json b/tests/runner-e2e/chat-full-catalog-testops-manifest.json
index 1cf3ddcf7c0..9a96c67fd40 100644
--- a/tests/runner-e2e/chat-full-catalog-testops-manifest.json
+++ b/tests/runner-e2e/chat-full-catalog-testops-manifest.json
@@ -1,6 +1,6 @@
 {
   "schema": "paperclip.chat-full-catalog-testops-manifest/v1",
-  "targetSha": "5f5e2ca8f18063d051c3d948105f0049562fe4ce",
+  "targetSha": "249b487a2d2451763913038cc009f7090580d1f1",
   "metadataSourceSha": "de0941835cc8f0d01c982574ee258e110babdbeb",
   "profile": "runner-opencode",
   "model": "openrouter/deepseek/deepseek-v4.1-flash-1017",
@@ -172,7 +172,7 @@
       "baseTargetSha": "3b66c3c144360ddf32714a0742fd774b8ceafb16",
       "previousTargetSha": "ab2019e976076ec0eb60b026844f3d9211cb0208",
       "definitionSourceSha": "de0941835cc8f0d01c982574ee258e110babdbeb",
-      "candidateDescriptorSha256": "640743a65be417330144b66858704e1e378fe2edf26a7977910d1756fde9b692",
+      "candidateDescriptorSha256": "e9c59dade7aeffd5b23c05b66bf52ed11988a897d8a160e75d0435052733abf6",
       "changedDefinitionFiles": [
         {
           "path": "tests/runner-e2e/chat-scenarios/companies.yaml",
@@ -308,7 +308,7 @@
           "key": "app-permissions.ask-before-action",
           "field": "oracleVersion",
           "previous": "paperclip.chat-catalog.external.v1",
-          "current": "paperclip.chat-catalog.app-review.v5"
+          "current": "paperclip.chat-catalog.app-review.v6"
         },
         {
           "key": "app-permissions.test-as-agent",
@@ -635,7 +635,7 @@
           "key": "secrets.configure-company-secret",
           "field": "oracleVersion",
           "previous": "paperclip.chat-catalog.external.v1",
-          "current": "paperclip.chat-catalog.company-secret-controller-baseline.v3"
+          "current": "paperclip.chat-catalog.company-secret-controller-baseline.v4"
         },
         {
           "key": "secrets.personal-secret",
@@ -694,7 +694,7 @@
           "key": "secrets.personal-secret",
           "field": "oracleVersion",
           "previous": "paperclip.chat-catalog.external.v1",
-          "current": "paperclip.chat-catalog.personal-secret.v4"
+          "current": "paperclip.chat-catalog.personal-secret.v5"
         },
         {
           "key": "skills.author-skill",
@@ -1008,7 +1008,7 @@
           "key": "app-permissions.ask-before-action",
           "field": "oracleVersion",
           "previous": "paperclip.chat-catalog.external.v1",
-          "current": "paperclip.chat-catalog.app-review.v5"
+          "current": "paperclip.chat-catalog.app-review.v6"
         },
         {
           "key": "app-permissions.test-as-agent",
@@ -1311,7 +1311,7 @@
           "key": "secrets.configure-company-secret",
           "field": "oracleVersion",
           "previous": "paperclip.chat-catalog.external.v1",
-          "current": "paperclip.chat-catalog.company-secret-controller-baseline.v3"
+          "current": "paperclip.chat-catalog.company-secret-controller-baseline.v4"
         },
         {
           "key": "secrets.personal-secret",
@@ -1381,7 +1381,7 @@
           "key": "secrets.personal-secret",
           "field": "oracleVersion",
           "previous": "paperclip.chat-catalog.external.v1",
-          "current": "paperclip.chat-catalog.personal-secret.v4"
+          "current": "paperclip.chat-catalog.personal-secret.v5"
         },
         {
           "key": "skills.author-skill",
@@ -1745,7 +1745,7 @@
       },
       "candidateLauncherSnapshot": {
         "path": "fixtures/chat-repair-candidate-launcher.txt",
-        "targetSha": "5f5e2ca8f18063d051c3d948105f0049562fe4ce",
+        "targetSha": "249b487a2d2451763913038cc009f7090580d1f1",
         "sourcePath": "tests/runner-e2e/launch.ts",
         "gitBlobOid": "dba1467e211611f37937e9e1fc4c0c5be4329cbc"
       }
@@ -3366,7 +3366,7 @@
         "questions-and-approvals/tool-review"
       ],
       "checks": null,
-      "oracleVersion": "paperclip.chat-catalog.app-review.v5",
+      "oracleVersion": "paperclip.chat-catalog.app-review.v6",
       "sourceFiles": [
         "chat-catalog-domains/external-app-review.ts",
         "chat-catalog-domains/external-app-review-outcomes.ts",
@@ -11080,7 +11080,7 @@
         "connection-setup/credentials"
       ],
       "checks": null,
-      "oracleVersion": "paperclip.chat-catalog.company-secret-controller-baseline.v3",
+      "oracleVersion": "paperclip.chat-catalog.company-secret-controller-baseline.v4",
       "sourceFiles": [
         "chat-catalog-domains/external-company-secret.ts",
         "chat-catalog-domains/external-secret-question.ts",
@@ -11196,7 +11196,7 @@
         "secrets/user-secrets"
       ],
       "checks": null,
-      "oracleVersion": "paperclip.chat-catalog.personal-secret.v4",
+      "oracleVersion": "paperclip.chat-catalog.personal-secret.v5",
       "sourceFiles": [
         "chat-catalog-domains/external-personal-secret.ts",
         "chat-catalog-domains/external-secret-question.ts",
diff --git a/tests/runner-e2e/chat-full-catalog-testops-manifest.test.mjs b/tests/runner-e2e/chat-full-catalog-testops-manifest.test.mjs
index 4f5a2615d6d..bc9d6342819 100644
--- a/tests/runner-e2e/chat-full-catalog-testops-manifest.test.mjs
+++ b/tests/runner-e2e/chat-full-catalog-testops-manifest.test.mjs
@@ -103,7 +103,7 @@ test('repair source metadata binds the corrected candidate and explicit changed
   const repair = manifest.source.repairMetadata;
   assert.equal(repair.baseTargetSha, '3b66c3c144360ddf32714a0742fd774b8ceafb16');
   assert.equal(repair.previousTargetSha, 'ab2019e976076ec0eb60b026844f3d9211cb0208');
-  assert.equal(manifest.targetSha, '5f5e2ca8f18063d051c3d948105f0049562fe4ce');
+  assert.equal(manifest.targetSha, '249b487a2d2451763913038cc009f7090580d1f1');
   assert.equal(repair.definitionSourceSha, manifest.metadataSourceSha);
   assert.equal(repair.candidateDescriptorSnapshot, 'fixtures/chat-repair-candidate-descriptors.json');
   const descriptorBytes = readFileSync(new URL(repair.candidateDescriptorSnapshot, import.meta.url));
diff --git a/tests/runner-e2e/fixtures/chat-repair-candidate-descriptors.json b/tests/runner-e2e/fixtures/chat-repair-candidate-descriptors.json
index 114c4bcc91e..ec69e699e25 100644
--- a/tests/runner-e2e/fixtures/chat-repair-candidate-descriptors.json
+++ b/tests/runner-e2e/fixtures/chat-repair-candidate-descriptors.json
@@ -830,7 +830,7 @@
       "../../ui/src/components/task-chat/TaskChatComposer.tsx",
       "chat-scenarios/app-permissions.yaml"
     ],
-    "oracleVersion": "paperclip.chat-catalog.app-review.v5",
+    "oracleVersion": "paperclip.chat-catalog.app-review.v6",
     "expectedRunCount": 6,
     "expectedHumanMessageCount": 3,
     "minimumRunCount": 6,
@@ -4905,7 +4905,7 @@
       "chat-flow.ts",
       "chat-scenarios/secrets.yaml"
     ],
-    "oracleVersion": "paperclip.chat-catalog.company-secret-controller-baseline.v3",
+    "oracleVersion": "paperclip.chat-catalog.company-secret-controller-baseline.v4",
     "expectedRunCount": 2,
     "expectedHumanMessageCount": 2,
     "turnTimeoutMs": 120000,
@@ -4981,7 +4981,7 @@
       "../../ui/src/pages/secrets/SetMyUserSecretDialog.tsx",
       "chat-scenarios/secrets.yaml"
     ],
-    "oracleVersion": "paperclip.chat-catalog.personal-secret.v4",
+    "oracleVersion": "paperclip.chat-catalog.personal-secret.v5",
     "expectedRunCount": 3,
     "expectedHumanMessageCount": 2,
     "minimumRunCount": 3,