Fix CLI login typechecking

Author: brandonkachen

cli/src/__tests__/e2e/first-time-login.test.ts

@@ -8,11 +8,15 @@ import {
 
 import type { Logger } from '@codebuff/common/types/contracts/logger'
 
-const createLogger = (): Logger & Record<string, ReturnType<typeof mock>> => ({
-  info: mock(() => {}),
-  error: mock(() => {}),
-  warn: mock(() => {}),
-  debug: mock(() => {}),
+type MockLogger = {
+  [K in keyof Logger]: ReturnType<typeof mock> & Logger[K]
+}
+
+const createLogger = (): MockLogger => ({
+  info: mock(() => {}) as ReturnType<typeof mock> & Logger['info'],
+  error: mock(() => {}) as ReturnType<typeof mock> & Logger['error'],
+  warn: mock(() => {}) as ReturnType<typeof mock> & Logger['warn'],
+  debug: mock(() => {}) as ReturnType<typeof mock> & Logger['debug'],
 })
 
 describe('First-Time Login Flow (helpers)', () => {
@@ -87,11 +91,12 @@ describe('First-Time Login Flow (helpers)', () => {
     )
 
     expect(result.status).toBe('success')
+    if (result.status !== 'success') {
+      throw new Error(`Expected polling success but received ${result.status}`)
+    }
     expect(result.attempts).toBe(3)
-    expect(result).toHaveProperty('user')
-    expect(
-      (result as { user: { id: string } }).user.id,
-    ).toBe('new-user-123')
+    const user = result.user as { id?: unknown }
+    expect(user?.id).toBe('new-user-123')
     expect(fetchMock.mock.calls.length).toBe(3)
   })
 

cli/src/__tests__/e2e/logout-relogin-flow.test.ts

@@ -10,8 +10,6 @@ import {
   type User,
 } from '../../utils/auth'
 
-import type { Logger } from '@codebuff/common/types/contracts/logger'
-
 const ORIGINAL_USER: User = {
   id: 'user-001',
   name: 'CLI Tester',
@@ -28,13 +26,6 @@ const RELOGIN_USER: User = {
   fingerprintHash: 'fingerprint-hash-new',
 }
 
-const createLogger = (): Logger & Record<string, ReturnType<typeof mock>> => ({
-  info: mock(() => {}),
-  error: mock(() => {}),
-  warn: mock(() => {}),
-  debug: mock(() => {}),
-})
-
 describe('Logout and Re-login helpers', () => {
   let tempConfigDir: string
 
@@ -64,7 +55,7 @@ describe('Logout and Re-login helpers', () => {
     const credentialsPath = path.join(tempConfigDir, 'credentials.json')
     expect(fs.existsSync(credentialsPath)).toBe(true)
 
-    const result = await logoutUser(createLogger())
+    const result = await logoutUser()
     expect(result).toBe(true)
     expect(fs.existsSync(credentialsPath)).toBe(false)
   })
@@ -76,7 +67,7 @@ describe('Logout and Re-login helpers', () => {
     const firstLoaded = getUserCredentials()
     expect(firstLoaded?.authToken).toBe('token-original')
 
-    await logoutUser(createLogger())
+    await logoutUser()
     expect(getUserCredentials()).toBeNull()
 
     saveUserCredentials(RELOGIN_USER)
@@ -88,10 +79,10 @@ describe('Logout and Re-login helpers', () => {
   test('logoutUser is idempotent when credentials are already missing', async () => {
     mockConfigPaths()
 
-    const resultFirst = await logoutUser(createLogger())
+    const resultFirst = await logoutUser()
     expect(resultFirst).toBe(true)
 
-    const resultSecond = await logoutUser(createLogger())
+    const resultSecond = await logoutUser()
     expect(resultSecond).toBe(true)
   })
 })

cli/src/__tests__/e2e/returning-user-auth.test.ts

@@ -98,10 +98,9 @@ describe('Returning User Authentication helpers', () => {
       logger,
     })
 
-    expect(result).toEqual({
-      id: RETURNING_USER.id,
-      email: RETURNING_USER.email,
-    })
+    expect(RETURNING_USER.id).toBeDefined()
+    expect(result.id).toBe(RETURNING_USER.id!)
+    expect(result.email).toBe(RETURNING_USER.email)
     expect(mockGetUserInfoFromApiKey).toHaveBeenCalledTimes(1)
   })
 })

cli/src/__tests__/integration/login-polling-working.test.ts

@@ -5,11 +5,15 @@ import { generateLoginUrl, pollLoginStatus } from '../../login/login-flow'
 import type { Logger } from '@codebuff/common/types/contracts/logger'
 import type { LoginUrlResponse } from '../../login/login-flow'
 
-const createLogger = (): Logger & Record<string, ReturnType<typeof mock>> => ({
-  info: mock(() => {}),
-  error: mock(() => {}),
-  warn: mock(() => {}),
-  debug: mock(() => {}),
+type MockLogger = {
+  [K in keyof Logger]: ReturnType<typeof mock> & Logger[K]
+}
+
+const createLogger = (): MockLogger => ({
+  info: mock(() => {}) as ReturnType<typeof mock> & Logger['info'],
+  error: mock(() => {}) as ReturnType<typeof mock> & Logger['error'],
+  warn: mock(() => {}) as ReturnType<typeof mock> & Logger['warn'],
+  debug: mock(() => {}) as ReturnType<typeof mock> & Logger['debug'],
 })
 
 const createClock = () => {
@@ -63,6 +67,9 @@ describe('Login Polling (Working)', () => {
     )
 
     expect(result.status).toBe('success')
+    if (result.status !== 'success') {
+      throw new Error(`Expected polling success but received ${result.status}`)
+    }
     expect(result.attempts).toBe(2)
     expect(fetchMock.mock.calls.length).toBe(2)
   })
@@ -131,6 +138,9 @@ describe('Login Polling (Working)', () => {
     )
 
     expect(result.status).toBe('success')
+    if (result.status !== 'success') {
+      throw new Error(`Expected polling success but received ${result.status}`)
+    }
     expect(fetchMock.mock.calls.length).toBe(1)
   })
 
@@ -200,12 +210,20 @@ describe('Login Polling (Working)', () => {
     )
 
     expect(result.status).toBe('success')
+    if (result.status !== 'success') {
+      throw new Error(`Expected polling success but received ${result.status}`)
+    }
     expect(fetchMock.mock.calls.length).toBeGreaterThan(1)
-    expect(
-      logger.error.mock.calls.some(([payload]) =>
-        JSON.stringify(payload).includes('network failed'),
-      ),
-    ).toBe(true)
+    const errorCalls = logger.error.mock.calls as Array<
+      Parameters<Logger['error']>
+    >
+    const sawNetworkFailure = errorCalls.some(([payload]) => {
+      if (!payload || typeof payload !== 'object') {
+        return false
+      }
+      return JSON.stringify(payload as any).includes('network failed')
+    })
+    expect(sawNetworkFailure).toBe(true)
   })
 
   test('P0: fetchLoginUrl wrapper - should hit backend and return payload', async () => {

cli/src/hooks/use-auth-query.ts

@@ -26,6 +26,11 @@ interface ValidateAuthParams {
   logger?: Logger
 }
 
+type ValidatedUserInfo = {
+  id: string
+  email: string
+}
+
 /**
  * Validates an API key by calling the backend
  *
@@ -36,18 +41,20 @@ export async function validateApiKey({
   apiKey,
   getUserInfoFromApiKey = defaultGetUserInfoFromApiKey,
   logger = defaultLogger,
-}: ValidateAuthParams) {
+}: ValidateAuthParams): Promise<ValidatedUserInfo> {
+  const requestedFields = ['id', 'email'] as const
+
   logger.info(
     {
       apiKeyPrefix: apiKey.substring(0, 10) + '...',
-      fields: ['id', 'email'],
+      fields: requestedFields,
     },
     '🔐 Validating API key via getUserInfoFromApiKey',
   )
 
   const authResult = await getUserInfoFromApiKey({
     apiKey,
-    fields: ['id', 'email'],
+    fields: requestedFields,
     logger,
   })
 

cli/src/login/login-flow.ts

@@ -205,8 +205,9 @@ export async function pollLoginStatus(
       continue
     }
 
-    const user = (data as Record<string, unknown> | null)?.user
-    if (user && typeof user === 'object') {
+    const rawUser = (data as { user?: unknown } | null)?.user
+    if (rawUser && typeof rawUser === 'object') {
+      const user = rawUser as Record<string, unknown>
       logger.info(
         {
           attempts,