diff --git a/src/agents/subagent-registry-lifecycle.test.ts b/src/agents/subagent-registry-lifecycle.test.ts
index f49f0e09c2f..a12ed3e91da 100644
--- a/src/agents/subagent-registry-lifecycle.test.ts
+++ b/src/agents/subagent-registry-lifecycle.test.ts
@@ -1,4 +1,5 @@
 import { beforeEach, describe, expect, it, vi } from "vitest";
+import type { CallGatewayOptions } from "../gateway/call.js";
 import { SUBAGENT_ENDED_REASON_COMPLETE } from "./subagent-lifecycle-events.js";
 import { createSubagentRegistryLifecycleController } from "./subagent-registry-lifecycle.js";
 import type { SubagentRunRecord } from "./subagent-registry.types.js";
@@ -121,7 +122,9 @@ function createLifecycleController({
     emitSubagentEndedHookForRun: vi.fn(async () => {}),
     notifyContextEngineSubagentEnded: vi.fn(async () => {}),
     resumeSubagentRun: vi.fn(),
-    callGateway: gatewayMocks.callGateway,
+    callGateway: gatewayMocks.callGateway as <T = Record<string, unknown>>(
+      opts: CallGatewayOptions,
+    ) => Promise<T>,
     captureSubagentCompletionReply: vi.fn(async () => "final completion reply"),
     runSubagentAnnounceFlow: vi.fn(async () => true),
     warn: vi.fn(),
diff --git a/src/plugins/plugin-lru-cache.test.ts b/src/plugins/plugin-lru-cache.test.ts
index e514dcb3dd7..c4b003009ac 100644
--- a/src/plugins/plugin-lru-cache.test.ts
+++ b/src/plugins/plugin-lru-cache.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it } from "vitest";
-import { PluginLruCache } from "./plugin-lru-cache.js";
+import { PluginLruCache } from "./plugin-cache-primitives.js";
 
 describe("PluginLruCache", () => {
   it("evicts the least recently used entry", () => {
diff --git a/src/plugins/plugin-lru-cache.ts b/src/plugins/plugin-lru-cache.ts
deleted file mode 100644
index b67cde936cb..00000000000
--- a/src/plugins/plugin-lru-cache.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { PluginLruCache, type PluginLruCacheResult } from "./plugin-cache-primitives.js";