diff --git a/src/gateway/server.test.ts b/src/gateway/server.test.ts
index 6eb6a46..3229d77 100644
--- a/src/gateway/server.test.ts
+++ b/src/gateway/server.test.ts
@@ -43,6 +43,12 @@ const mockModelClient = {
     stopReason: 'end_turn',
     usage: { inputTokens: 10, outputTokens: 5 },
   })),
+  setTier: vi.fn(() => true),
+  getTier: vi.fn(() => 'default' as const),
+  getLabel: vi.fn((tier: string) => tier),
+  setTierStrict: vi.fn(),
+  addTierChangeListener: vi.fn(),
+  removeTierChangeListener: vi.fn(),
 };
 
 const mockToolRegistry = {
diff --git a/src/gateway/server.ts b/src/gateway/server.ts
index eb5d6cf..c373eae 100644
--- a/src/gateway/server.ts
+++ b/src/gateway/server.ts
@@ -431,7 +431,7 @@ export class GatewayServer {
           return;
         }
         const provider = pushToken.provider === 'fcm' ? 'fcm' : 'apns';
-        const normalizedPushToken = {
+        const normalizedPushToken: NonNullable<NodeConnectionState['pushToken']> = {
           provider,
           token: pushToken.token,
           topic: pushToken.topic,