From f8123e4b6863952cfd9cf3f75b0fa3c178e5600a Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Sun, 26 Apr 2026 01:01:01 +0100
Subject: [PATCH] fix(ci): stabilize media and gateway tests

---
 src/agents/tools/media-tool-shared.ts               | 4 +++-
 src/gateway/server.chat.gateway-server-chat.test.ts | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/agents/tools/media-tool-shared.ts b/src/agents/tools/media-tool-shared.ts
index 61da2c3aac0..c26b2bcae29 100644
--- a/src/agents/tools/media-tool-shared.ts
+++ b/src/agents/tools/media-tool-shared.ts
@@ -427,7 +427,9 @@ export function resolveModelFromRegistry(params: {
   provider: string;
   modelId: string;
 }): Model<Api> {
-  const resolvedRef = normalizeModelRef(params.provider, params.modelId);
+  const resolvedRef = normalizeModelRef(params.provider, params.modelId, {
+    allowPluginNormalization: false,
+  });
   let model = params.modelRegistry.find(
     resolvedRef.provider,
     resolvedRef.model,
diff --git a/src/gateway/server.chat.gateway-server-chat.test.ts b/src/gateway/server.chat.gateway-server-chat.test.ts
index 8ecf891e961..3c20f7ffdea 100644
--- a/src/gateway/server.chat.gateway-server-chat.test.ts
+++ b/src/gateway/server.chat.gateway-server-chat.test.ts
@@ -108,7 +108,7 @@ describe("gateway server chat", () => {
       return await run(dir);
     } finally {
       testState.sessionStorePath = undefined;
-      await fs.rm(dir, { recursive: true, force: true });
+      await fs.rm(dir, { recursive: true, force: true, maxRetries: 5, retryDelay: 50 });
     }
   };