diff --git a/extensions/codex/src/app-server/run-attempt.context-engine.test.ts b/extensions/codex/src/app-server/run-attempt.context-engine.test.ts
index 6235fbb22aa..803ecdae2b0 100644
--- a/extensions/codex/src/app-server/run-attempt.context-engine.test.ts
+++ b/extensions/codex/src/app-server/run-attempt.context-engine.test.ts
@@ -240,12 +240,12 @@ function optionalString(value: unknown): string {
   return typeof value === "string" ? value : "";
 }
 
-function requireFirstCallArg<T = unknown>(mock: unknown, label: string): T {
+function requireFirstCallArg(mock: unknown, label: string): unknown {
   const call = (mock as MockCallReader).mock.calls.at(0);
   if (!call) {
     throw new Error(`expected ${label} to be called`);
   }
-  return call[0] as T;
+  return call[0];
 }
 
 function requireRequestParams(
@@ -314,17 +314,16 @@ describe("runCodexAppServerAttempt context-engine lifecycle", () => {
       throw new Error("expected bootstrap hook");
     }
     expect(contextEngine.bootstrap).toHaveBeenCalledTimes(1);
-    const bootstrapParams = requireFirstCallArg<
-      Parameters<NonNullable<ContextEngine["bootstrap"]>>[0]
-    >(contextEngine.bootstrap, "bootstrap");
+    const bootstrapParams = requireFirstCallArg(contextEngine.bootstrap, "bootstrap") as Parameters<
+      NonNullable<ContextEngine["bootstrap"]>
+    >[0];
     expect(bootstrapParams.sessionId).toBe(sessionId);
     expect(bootstrapParams.sessionKey).toBe("agent:main:session-1");
 
     expect(contextEngine.assemble).toHaveBeenCalledTimes(1);
-    const assembleParams = requireFirstCallArg<Parameters<ContextEngine["assemble"]>[0]>(
-      contextEngine.assemble,
-      "assemble",
-    );
+    const assembleParams = requireFirstCallArg(contextEngine.assemble, "assemble") as Parameters<
+      ContextEngine["assemble"]
+    >[0];
     expect(assembleParams.sessionId).toBe(sessionId);
     expect(assembleParams.sessionKey).toBe("agent:main:session-1");
     expect(assembleParams.tokenBudget).toBe(321);
@@ -392,9 +391,9 @@ describe("runCodexAppServerAttempt context-engine lifecycle", () => {
     await run;
 
     expect(afterTurn).toHaveBeenCalledTimes(1);
-    const afterTurnCall = requireFirstCallArg<
-      Parameters<NonNullable<ContextEngine["afterTurn"]>>[0]
-    >(afterTurn, "afterTurn");
+    const afterTurnCall = requireFirstCallArg(afterTurn, "afterTurn") as Parameters<
+      NonNullable<ContextEngine["afterTurn"]>
+    >[0];
     expect(afterTurnCall.sessionId).toBe(sessionId);
     expect(afterTurnCall.sessionKey).toBe("agent:main:session-1");
     expect(afterTurnCall.prePromptMessageCount).toBe(0);
diff --git a/extensions/mattermost/src/mattermost/monitor.inbound-system-event.test.ts b/extensions/mattermost/src/mattermost/monitor.inbound-system-event.test.ts
index e861128bcc2..85405f0014c 100644
--- a/extensions/mattermost/src/mattermost/monitor.inbound-system-event.test.ts
+++ b/extensions/mattermost/src/mattermost/monitor.inbound-system-event.test.ts
@@ -480,10 +480,10 @@ describe("mattermost inbound user posts", () => {
       groupResolution?: unknown;
       onRecordError?: unknown;
     };
-    const [recordCall] =
-      (runtimeCore.channel.session.recordInboundSession.mock.calls[0] as
-        | [RecordedInboundSessionCall]
-        | undefined) ?? [];
+    const recordCalls = runtimeCore.channel.session.recordInboundSession.mock.calls as unknown as [
+      RecordedInboundSessionCall,
+    ][];
+    const recordCall = recordCalls[0]?.[0];
     expect(recordCall?.sessionKey).toBe("mattermost:default:channel:chan-1");
     const updateLastRoute = recordCall?.updateLastRoute;
     expect(updateLastRoute?.sessionKey).toBe("mattermost:default:channel:chan-1");