agent-messenger 2.9.0 → 2.10.1

package/src/platforms/teams/client.test.ts

@@ -55,18 +55,18 @@ describe('TeamsClient', () => {
 
   describe('login', () => {
     test('requires token', async () => {
-      await expect(new TeamsClient().login({ token: '' })).rejects.toThrow(TeamsError)
-      await expect(new TeamsClient().login({ token: '' })).rejects.toThrow('Token is required')
+      await expect(new TeamsClient().login({ token: '', region: 'emea' })).rejects.toThrow(TeamsError)
+      await expect(new TeamsClient().login({ token: '', region: 'emea' })).rejects.toThrow('Token is required')
     })
 
     test('accepts valid token', async () => {
-      const client = await new TeamsClient().login({ token: 'test-token' })
+      const client = await new TeamsClient().login({ token: 'test-token', region: 'emea' })
       expect(client).toBeInstanceOf(TeamsClient)
     })
 
     test('accepts token with expiry time', async () => {
       const expiresAt = new Date(Date.now() + 3600000).toISOString()
-      const client = await new TeamsClient().login({ token: 'test-token', tokenExpiresAt: expiresAt })
+      const client = await new TeamsClient().login({ token: 'test-token', tokenExpiresAt: expiresAt, region: 'emea' })
       expect(client).toBeInstanceOf(TeamsClient)
     })
   })
@@ -74,7 +74,11 @@ describe('TeamsClient', () => {
   describe('token expiry', () => {
     test('throws when token is expired', async () => {
       const expiredAt = new Date(Date.now() - 1000).toISOString()
-      const client = await new TeamsClient().login({ token: 'expired-token', tokenExpiresAt: expiredAt })
+      const client = await new TeamsClient().login({
+        token: 'expired-token',
+        tokenExpiresAt: expiredAt,
+        region: 'emea',
+      })
 
       await expect(client.testAuth()).rejects.toThrow(TeamsError)
       await expect(client.testAuth()).rejects.toThrow('Token has expired')
@@ -87,7 +91,7 @@ describe('TeamsClient', () => {
         locale: 'en-us',
       })
 
-      const client = await new TeamsClient().login({ token: 'valid-token', tokenExpiresAt: expiresAt })
+      const client = await new TeamsClient().login({ token: 'valid-token', tokenExpiresAt: expiresAt, region: 'emea' })
       const user = await client.testAuth()
 
       expect(user.id).toBe('ME')
@@ -102,7 +106,7 @@ describe('TeamsClient', () => {
         locale: 'en-us',
       })
 
-      const client = await new TeamsClient().login({ token: 'test-token' })
+      const client = await new TeamsClient().login({ token: 'test-token', region: 'emea' })
       const user = await client.testAuth()
 
       expect(user.id).toBe('ME')
@@ -117,7 +121,7 @@ describe('TeamsClient', () => {
     test('throws TeamsError on API error', async () => {
       mockResponse({ message: 'Unauthorized', code: 'unauthorized' }, 401)
 
-      const client = await new TeamsClient().login({ token: 'bad-token' })
+      const client = await new TeamsClient().login({ token: 'bad-token', region: 'emea' })
       await expect(client.testAuth()).rejects.toThrow(TeamsError)
     })
   })
@@ -153,7 +157,7 @@ describe('TeamsClient', () => {
         ],
       })
 
-      const client = await new TeamsClient().login({ token: 'test-token' })
+      const client = await new TeamsClient().login({ token: 'test-token', region: 'emea' })
       const teams = await client.listTeams()
 
       expect(teams).toHaveLength(2)
@@ -169,7 +173,7 @@ describe('TeamsClient', () => {
     test('returns team info', async () => {
       mockResponse({ id: '111', name: 'Test Team', description: 'A test team' })
 
-      const client = await new TeamsClient().login({ token: 'test-token' })
+      const client = await new TeamsClient().login({ token: 'test-token', region: 'emea' })
       const team = await client.getTeam('111')
 
       expect(team.id).toBe('111')
@@ -185,7 +189,7 @@ describe('TeamsClient', () => {
         { id: 'ch2', team_id: '111', name: 'Random', type: 'standard' },
       ])
 
-      const client = await new TeamsClient().login({ token: 'test-token' })
+      const client = await new TeamsClient().login({ token: 'test-token', region: 'emea' })
       const channels = await client.listChannels('111')
 
       expect(channels).toHaveLength(2)
@@ -198,7 +202,7 @@ describe('TeamsClient', () => {
     test('returns channel info', async () => {
       mockResponse({ id: 'ch1', team_id: '111', name: 'General', type: 'standard' })
 
-      const client = await new TeamsClient().login({ token: 'test-token' })
+      const client = await new TeamsClient().login({ token: 'test-token', region: 'emea' })
       const channel = await client.getChannel('111', 'ch1')
 
       expect(channel.id).toBe('ch1')
@@ -217,7 +221,7 @@ describe('TeamsClient', () => {
         timestamp: '2024-01-01T00:00:00.000Z',
       })
 
-      const client = await new TeamsClient().login({ token: 'test-token' })
+      const client = await new TeamsClient().login({ token: 'test-token', region: 'emea' })
       const message = await client.sendMessage('111', 'ch1', 'Hello world')
 
       expect(message.content).toBe('Hello world')
@@ -239,7 +243,7 @@ describe('TeamsClient', () => {
         },
       ])
 
-      const client = await new TeamsClient().login({ token: 'test-token' })
+      const client = await new TeamsClient().login({ token: 'test-token', region: 'emea' })
       const messages = await client.getMessages('111', 'ch1', 50)
 
       expect(messages).toHaveLength(1)
@@ -252,7 +256,7 @@ describe('TeamsClient', () => {
     test('uses default limit of 50', async () => {
       mockResponse([])
 
-      const client = await new TeamsClient().login({ token: 'test-token' })
+      const client = await new TeamsClient().login({ token: 'test-token', region: 'emea' })
       await client.getMessages('111', 'ch1')
 
       expect(fetchCalls[0].url).toBe(
@@ -271,7 +275,7 @@ describe('TeamsClient', () => {
         timestamp: '2024-01-01T00:00:00.000Z',
       })
 
-      const client = await new TeamsClient().login({ token: 'test-token' })
+      const client = await new TeamsClient().login({ token: 'test-token', region: 'emea' })
       const message = await client.getMessage('111', 'ch1', 'msg1')
 
       expect(message.id).toBe('msg1')
@@ -285,7 +289,7 @@ describe('TeamsClient', () => {
     test('deletes message', async () => {
       mockResponse(null, 204)
 
-      const client = await new TeamsClient().login({ token: 'test-token' })
+      const client = await new TeamsClient().login({ token: 'test-token', region: 'emea' })
       await client.deleteMessage('111', 'ch1', 'msg1')
 
       expect(fetchCalls[0].url).toBe(
@@ -299,7 +303,7 @@ describe('TeamsClient', () => {
     test('adds reaction to message', async () => {
       mockResponse(null, 204)
 
-      const client = await new TeamsClient().login({ token: 'test-token' })
+      const client = await new TeamsClient().login({ token: 'test-token', region: 'emea' })
       await client.addReaction('111', 'ch1', 'msg1', 'like')
 
       expect(fetchCalls[0].url).toBe(
@@ -314,7 +318,7 @@ describe('TeamsClient', () => {
     test('removes reaction from message', async () => {
       mockResponse(null, 204)
 
-      const client = await new TeamsClient().login({ token: 'test-token' })
+      const client = await new TeamsClient().login({ token: 'test-token', region: 'emea' })
       await client.removeReaction('111', 'ch1', 'msg1', 'like')
 
       expect(fetchCalls[0].url).toBe(
@@ -331,7 +335,7 @@ describe('TeamsClient', () => {
         { id: 'u2', displayName: 'User 2', email: 'user2@example.com' },
       ])
 
-      const client = await new TeamsClient().login({ token: 'test-token' })
+      const client = await new TeamsClient().login({ token: 'test-token', region: 'emea' })
       const users = await client.listUsers('111')
 
       expect(users).toHaveLength(2)
@@ -344,7 +348,7 @@ describe('TeamsClient', () => {
     test('returns user info', async () => {
       mockResponse({ id: 'u1', displayName: 'Test User', email: 'test@example.com' })
 
-      const client = await new TeamsClient().login({ token: 'test-token' })
+      const client = await new TeamsClient().login({ token: 'test-token', region: 'emea' })
       const user = await client.getUser('u1')
 
       expect(user.id).toBe('u1')
@@ -365,7 +369,7 @@ describe('TeamsClient', () => {
         url: 'https://teams.microsoft.com/files/file1',
       })
 
-      const client = await new TeamsClient().login({ token: 'test-token' })
+      const client = await new TeamsClient().login({ token: 'test-token', region: 'emea' })
       const file = await client.uploadFile('111', 'ch1', tempFile)
 
       expect(file.name).toBe('test-teams-upload.txt')
@@ -381,7 +385,7 @@ describe('TeamsClient', () => {
         { id: 'file2', name: 'image.png', size: 2048, url: 'https://example.com/image.png' },
       ])
 
-      const client = await new TeamsClient().login({ token: 'test-token' })
+      const client = await new TeamsClient().login({ token: 'test-token', region: 'emea' })
       const files = await client.listFiles('111', 'ch1')
 
       expect(files).toHaveLength(2)
@@ -401,7 +405,7 @@ describe('TeamsClient', () => {
         'X-RateLimit-Reset': String(Date.now() / 1000 + 60),
       })
 
-      const client = await new TeamsClient().login({ token: 'test-token' })
+      const client = await new TeamsClient().login({ token: 'test-token', region: 'emea' })
       await client.testAuth()
 
       const startTime = Date.now()
@@ -416,7 +420,7 @@ describe('TeamsClient', () => {
       mockResponse({ message: 'Rate limited' }, 429, { 'Retry-After': '0.1' })
       mockResponse({ userDetails: JSON.stringify({ name: 'User' }), locale: 'en-us' })
 
-      const client = await new TeamsClient().login({ token: 'test-token' })
+      const client = await new TeamsClient().login({ token: 'test-token', region: 'emea' })
       const user = await client.testAuth()
 
       expect(user.id).toBe('ME')
@@ -428,7 +432,7 @@ describe('TeamsClient', () => {
         mockResponse({ message: 'Rate limited' }, 429, { 'Retry-After': '0.01' })
       }
 
-      const client = await new TeamsClient().login({ token: 'test-token' })
+      const client = await new TeamsClient().login({ token: 'test-token', region: 'emea' })
       await expect(client.testAuth()).rejects.toThrow(TeamsError)
       expect(fetchCalls.length).toBeLessThanOrEqual(4)
     })
@@ -439,7 +443,7 @@ describe('TeamsClient', () => {
       mockResponse({ message: 'Internal Server Error' }, 500)
       mockResponse({ userDetails: JSON.stringify({ name: 'User' }), locale: 'en-us' })
 
-      const client = await new TeamsClient().login({ token: 'test-token' })
+      const client = await new TeamsClient().login({ token: 'test-token', region: 'emea' })
       const user = await client.testAuth()
 
       expect(user.id).toBe('ME')
@@ -449,7 +453,7 @@ describe('TeamsClient', () => {
     test('does not retry on 4xx client errors (except 429)', async () => {
       mockResponse({ message: 'Not Found' }, 404)
 
-      const client = await new TeamsClient().login({ token: 'test-token' })
+      const client = await new TeamsClient().login({ token: 'test-token', region: 'emea' })
       await expect(client.testAuth()).rejects.toThrow(TeamsError)
       expect(fetchCalls.length).toBe(1)
     })
@@ -459,7 +463,7 @@ describe('TeamsClient', () => {
       mockResponse({ message: 'Error' }, 500)
       mockResponse({ userDetails: JSON.stringify({ name: 'User' }), locale: 'en-us' })
 
-      const client = await new TeamsClient().login({ token: 'test-token' })
+      const client = await new TeamsClient().login({ token: 'test-token', region: 'emea' })
       const startTime = Date.now()
       await client.testAuth()
       const elapsed = Date.now() - startTime
@@ -474,7 +478,7 @@ describe('TeamsClient', () => {
       mockResponse([])
       mockResponse([])
 
-      const client = await new TeamsClient().login({ token: 'test-token' })
+      const client = await new TeamsClient().login({ token: 'test-token', region: 'emea' })
       await client.getMessages('team1', 'ch1')
       await client.getMessages('team2', 'ch2')
 

package/src/platforms/teams/client.ts

@@ -2,7 +2,15 @@ import { readFile } from 'node:fs/promises'
 import { basename } from 'node:path'
 
 import { TeamsCredentialManager } from './credential-manager'
-import type { TeamsChannel, TeamsFile, TeamsMessage, TeamsTeam, TeamsUser } from './types'
+import type {
+  TeamsAccountType,
+  TeamsChannel,
+  TeamsFile,
+  TeamsMessage,
+  TeamsRegion,
+  TeamsTeam,
+  TeamsUser,
+} from './types'
 import { TeamsError } from './types'
 
 interface RateLimitBucket {
@@ -10,18 +18,28 @@ interface RateLimitBucket {
   resetAt: number
 }
 
-const MSG_API_BASE = 'https://emea.ng.msg.teams.microsoft.com/v1'
+const PERSONAL_MSG_API_BASE = 'https://msgapi.teams.live.com/v1'
 const CSA_API_BASE = 'https://teams.microsoft.com/api'
 const MAX_RETRIES = 3
 const BASE_BACKOFF_MS = 100
+const DEFAULT_REGION: TeamsRegion = 'amer'
+const REGIONS: TeamsRegion[] = ['amer', 'emea', 'apac']
 
 export class TeamsClient {
   private token: string | null = null
   private tokenExpiresAt?: Date
+  private isPersonalAccount: boolean = false
+  private region: TeamsRegion = DEFAULT_REGION
+  private regionDiscovered: boolean = false
   private buckets: Map<string, RateLimitBucket> = new Map()
   private globalRateLimitUntil: number = 0
 
-  async login(credentials?: { token: string; tokenExpiresAt?: string }): Promise<this> {
+  async login(credentials?: {
+    token: string
+    tokenExpiresAt?: string
+    accountType?: TeamsAccountType
+    region?: TeamsRegion
+  }): Promise<this> {
     if (credentials) {
       if (!credentials.token) {
         throw new TeamsError('Token is required', 'missing_token')
@@ -30,6 +48,11 @@ export class TeamsClient {
       if (credentials.tokenExpiresAt) {
         this.tokenExpiresAt = new Date(credentials.tokenExpiresAt)
       }
+      this.isPersonalAccount = credentials.accountType === 'personal'
+      if (credentials.region) {
+        this.region = credentials.region
+        this.regionDiscovered = true
+      }
       return this
     }
 
@@ -43,7 +66,16 @@ export class TeamsClient {
         'no_credentials',
       )
     }
-    return this.login({ token: creds.token, tokenExpiresAt: creds.tokenExpiresAt })
+    return this.login({
+      token: creds.token,
+      tokenExpiresAt: creds.tokenExpiresAt,
+      accountType: creds.accountType,
+      region: creds.region,
+    })
+  }
+
+  getRegion(): TeamsRegion {
+    return this.region
   }
 
   private ensureAuth(): string {
@@ -108,12 +140,47 @@ export class TeamsClient {
     return new Promise((resolve) => setTimeout(resolve, ms))
   }
 
-  private async request<T>(method: string, path: string, body?: unknown, baseUrl: string = MSG_API_BASE): Promise<T> {
+  private getMsgApiBase(): string {
+    if (this.isPersonalAccount) return PERSONAL_MSG_API_BASE
+    return `https://${this.region}.ng.msg.teams.microsoft.com/v1`
+  }
+
+  private async discoverRegion(): Promise<void> {
+    if (this.isPersonalAccount) {
+      this.regionDiscovered = true
+      return
+    }
+
+    const token = this.ensureAuth()
+
+    for (const region of REGIONS) {
+      try {
+        const response = await fetch(`https://${region}.ng.msg.teams.microsoft.com/v1/users/ME/properties`, {
+          headers: {
+            'X-Skypetoken': token,
+          },
+        })
+
+        if (response.ok || response.status !== 403) {
+          this.region = region
+          break
+        }
+      } catch {}
+    }
+
+    this.regionDiscovered = true
+  }
+
+  private async request<T>(method: string, path: string, body?: unknown, baseUrl?: string): Promise<T> {
     if (this.isTokenExpired()) {
       throw new TeamsError('Token has expired. Run "auth extract" to refresh.', 'token_expired')
     }
 
-    const url = `${baseUrl}${path}`
+    if (baseUrl === undefined && !this.regionDiscovered) {
+      await this.discoverRegion()
+    }
+
+    const url = `${baseUrl ?? this.getMsgApiBase()}${path}`
     const bucketKey = this.getBucketKey(method, path)
 
     for (let attempt = 0; attempt <= MAX_RETRIES; attempt++) {
@@ -144,7 +211,7 @@ export class TeamsClient {
         const errorBody = (await response.json().catch(() => null)) as {
           message?: string
         } | null
-        throw new TeamsError(errorBody?.message ?? 'Rate limited', 'rate_limited')
+        throw new TeamsError(errorBody?.message || 'Rate limited', 'rate_limited')
       }
 
       if (response.status >= 500 && attempt < MAX_RETRIES) {
@@ -158,7 +225,7 @@ export class TeamsClient {
           code?: string | number
         } | null
         throw new TeamsError(
-          errorBody?.message ?? `HTTP ${response.status}`,
+          errorBody?.message || `HTTP ${response.status}`,
           errorBody?.code?.toString() ?? `http_${response.status}`,
         )
       }
@@ -173,12 +240,16 @@ export class TeamsClient {
     throw new TeamsError('Request failed after retries', 'max_retries')
   }
 
-  private async requestFormData<T>(path: string, formData: FormData, baseUrl: string = MSG_API_BASE): Promise<T> {
+  private async requestFormData<T>(path: string, formData: FormData, baseUrl?: string): Promise<T> {
     if (this.isTokenExpired()) {
       throw new TeamsError('Token has expired. Run "auth extract" to refresh.', 'token_expired')
     }
 
-    const url = `${baseUrl}${path}`
+    if (baseUrl === undefined && !this.regionDiscovered) {
+      await this.discoverRegion()
+    }
+
+    const url = `${baseUrl ?? this.getMsgApiBase()}${path}`
     const bucketKey = this.getBucketKey('POST', path)
 
     await this.waitForRateLimit(bucketKey)
@@ -199,7 +270,7 @@ export class TeamsClient {
         code?: string | number
       } | null
       throw new TeamsError(
-        errorBody?.message ?? `HTTP ${response.status}`,
+        errorBody?.message || `HTTP ${response.status}`,
         errorBody?.code?.toString() ?? `http_${response.status}`,
       )
     }
@@ -210,13 +281,14 @@ export class TeamsClient {
   async testAuth(): Promise<TeamsUser> {
     interface UserProperties {
       userDetails?: string
+      primaryMemberName?: string
       locale?: string
     }
     const props = await this.request<UserProperties>('GET', '/users/ME/properties')
     const userDetails = props.userDetails ? JSON.parse(props.userDetails) : {}
     return {
       id: 'ME',
-      displayName: userDetails.name || 'Teams User',
+      displayName: userDetails.name || props.primaryMemberName || 'Teams User',
     }
   }
 
@@ -272,7 +344,7 @@ export class TeamsClient {
   async sendMessage(teamId: string, channelId: string, content: string): Promise<TeamsMessage> {
     return this.request<TeamsMessage>(
       'POST',
-      `/csa/emea/api/v2/teams/${teamId}/channels/${channelId}/messages`,
+      `/csa/${this.region}/api/v2/teams/${teamId}/channels/${channelId}/messages`,
       { content },
       CSA_API_BASE,
     )
@@ -281,7 +353,7 @@ export class TeamsClient {
   async getMessages(teamId: string, channelId: string, limit: number = 50): Promise<TeamsMessage[]> {
     return this.request<TeamsMessage[]>(
       'GET',
-      `/csa/emea/api/v2/teams/${teamId}/channels/${channelId}/messages?limit=${limit}`,
+      `/csa/${this.region}/api/v2/teams/${teamId}/channels/${channelId}/messages?limit=${limit}`,
       undefined,
       CSA_API_BASE,
     )
@@ -290,7 +362,7 @@ export class TeamsClient {
   async getMessage(teamId: string, channelId: string, messageId: string): Promise<TeamsMessage> {
     return this.request<TeamsMessage>(
       'GET',
-      `/csa/emea/api/v2/teams/${teamId}/channels/${channelId}/messages/${messageId}`,
+      `/csa/${this.region}/api/v2/teams/${teamId}/channels/${channelId}/messages/${messageId}`,
       undefined,
       CSA_API_BASE,
     )
@@ -299,7 +371,7 @@ export class TeamsClient {
   async deleteMessage(teamId: string, channelId: string, messageId: string): Promise<void> {
     return this.request<void>(
       'DELETE',
-      `/csa/emea/api/v2/teams/${teamId}/channels/${channelId}/messages/${messageId}`,
+      `/csa/${this.region}/api/v2/teams/${teamId}/channels/${channelId}/messages/${messageId}`,
       undefined,
       CSA_API_BASE,
     )
@@ -308,7 +380,7 @@ export class TeamsClient {
   async addReaction(teamId: string, channelId: string, messageId: string, emoji: string): Promise<void> {
     return this.request<void>(
       'POST',
-      `/csa/emea/api/v2/teams/${teamId}/channels/${channelId}/messages/${messageId}/reactions`,
+      `/csa/${this.region}/api/v2/teams/${teamId}/channels/${channelId}/messages/${messageId}/reactions`,
       { emoji },
       CSA_API_BASE,
     )
@@ -317,7 +389,7 @@ export class TeamsClient {
   async removeReaction(teamId: string, channelId: string, messageId: string, emoji: string): Promise<void> {
     return this.request<void>(
       'DELETE',
-      `/csa/emea/api/v2/teams/${teamId}/channels/${channelId}/messages/${messageId}/reactions/${emoji}`,
+      `/csa/${this.region}/api/v2/teams/${teamId}/channels/${channelId}/messages/${messageId}/reactions/${emoji}`,
       undefined,
       CSA_API_BASE,
     )
@@ -339,7 +411,7 @@ export class TeamsClient {
     formData.append('file', new Blob([fileBuffer]), filename)
 
     return this.requestFormData<TeamsFile>(
-      `/csa/emea/api/v2/teams/${teamId}/channels/${channelId}/files`,
+      `/csa/${this.region}/api/v2/teams/${teamId}/channels/${channelId}/files`,
       formData,
       CSA_API_BASE,
     )
@@ -348,7 +420,7 @@ export class TeamsClient {
   async listFiles(teamId: string, channelId: string): Promise<TeamsFile[]> {
     return this.request<TeamsFile[]>(
       'GET',
-      `/csa/emea/api/v2/teams/${teamId}/channels/${channelId}/files`,
+      `/csa/${this.region}/api/v2/teams/${teamId}/channels/${channelId}/files`,
       undefined,
       CSA_API_BASE,
     )

package/src/platforms/teams/commands/auth.test.ts

@@ -12,6 +12,7 @@ let credManagerLoadConfigSpy: ReturnType<typeof spyOn>
 let credManagerSaveConfigSpy: ReturnType<typeof spyOn>
 let credManagerClearCredentialsSpy: ReturnType<typeof spyOn>
 let credManagerIsTokenExpiredSpy: ReturnType<typeof spyOn>
+let clientGetRegionSpy: ReturnType<typeof spyOn>
 
 beforeEach(() => {
   extractorExtractSpy = spyOn(TeamsTokenExtractor.prototype, 'extract').mockResolvedValue([
@@ -29,6 +30,8 @@ beforeEach(() => {
     { id: 'team-2', name: 'Team Two' },
   ])
 
+  clientGetRegionSpy = spyOn(TeamsClient.prototype, 'getRegion').mockReturnValue('emea')
+
   credManagerLoadConfigSpy = spyOn(TeamsCredentialManager.prototype, 'loadConfig').mockResolvedValue(null)
 
   credManagerSaveConfigSpy = spyOn(TeamsCredentialManager.prototype, 'saveConfig').mockResolvedValue(undefined)
@@ -48,6 +51,7 @@ afterEach(() => {
   credManagerSaveConfigSpy?.mockRestore()
   credManagerClearCredentialsSpy?.mockRestore()
   credManagerIsTokenExpiredSpy?.mockRestore()
+  clientGetRegionSpy?.mockRestore()
 })
 
 test('extract: calls TeamsTokenExtractor', async () => {
@@ -59,7 +63,7 @@ test('extract: calls TeamsTokenExtractor', async () => {
 })
 
 test('extract: validates token with TeamsClient', async () => {
-  const client = await new TeamsClient().login({ token: 'test-skype-token-123' })
+  const client = await new TeamsClient().login({ token: 'test-skype-token-123', region: 'emea' })
   const authInfo = await client.testAuth()
   expect(authInfo).toBeDefined()
   expect(authInfo.id).toBe('user-123')
@@ -67,7 +71,7 @@ test('extract: validates token with TeamsClient', async () => {
 })
 
 test('extract: discovers teams', async () => {
-  const client = await new TeamsClient().login({ token: 'test-skype-token-123' })
+  const client = await new TeamsClient().login({ token: 'test-skype-token-123', region: 'emea' })
   const teams = await client.listTeams()
   expect(teams).toHaveLength(2)
   expect(teams[0].id).toBe('team-1')

package/src/platforms/teams/commands/auth.ts

@@ -16,7 +16,8 @@ export async function extractAction(options: { pretty?: boolean; debug?: boolean
       return
     }
 
-    const extractor = new TeamsTokenExtractor()
+    const debugLog = options.debug ? (msg: string) => debug(`[debug] ${msg}`) : undefined
+    const extractor = new TeamsTokenExtractor(undefined, undefined, debugLog)
 
     if (process.platform === 'darwin') {
       console.log('')
@@ -72,7 +73,7 @@ export async function extractAction(options: { pretty?: boolean; debug?: boolean
       }
 
       try {
-        const client = await new TeamsClient().login({ token })
+        const client = await new TeamsClient().login({ token, accountType })
         const authInfo = await client.testAuth()
         const teams = await client.listTeams()
 
@@ -88,6 +89,7 @@ export async function extractAction(options: { pretty?: boolean; debug?: boolean
         const account: TeamsAccount = {
           token,
           token_expires_at: new Date(Date.now() + 60 * 60 * 1000).toISOString(),
+          region: client.getRegion(),
           account_type: accountType,
           user_name: authInfo.displayName,
           current_team: teams[0]?.id ?? null,
@@ -191,6 +193,7 @@ async function extractManualToken(token: string, options: { pretty?: boolean; de
     const account: TeamsAccount = {
       token,
       token_expires_at: new Date(Date.now() + 60 * 60 * 1000).toISOString(),
+      region: client.getRegion(),
       account_type: accountType,
       user_name: authInfo.displayName,
       current_team: teams[0].id,
@@ -295,6 +298,8 @@ export async function statusAction(options: { pretty?: boolean }): Promise<void>
           const client = await new TeamsClient().login({
             token: account.token,
             tokenExpiresAt: account.token_expires_at ?? undefined,
+            accountType: account.account_type,
+            region: account.region,
           })
           const authInfo = await client.testAuth()
           displayName = authInfo.displayName

package/src/platforms/teams/commands/channel.test.ts

@@ -67,7 +67,7 @@ afterEach(() => {
 
 test('list: returns channels from team', async () => {
   // given
-  const client = await new TeamsClient().login({ token: 'test-token' })
+  const client = await new TeamsClient().login({ token: 'test-token', region: 'emea' })
 
   // when
   const channels = await client.listChannels('team-1')
@@ -80,7 +80,7 @@ test('list: returns channels from team', async () => {
 
 test('list: includes channel metadata', async () => {
   // given
-  const client = await new TeamsClient().login({ token: 'test-token' })
+  const client = await new TeamsClient().login({ token: 'test-token', region: 'emea' })
   const channels = await client.listChannels('team-1')
 
   // when
@@ -95,7 +95,7 @@ test('list: includes channel metadata', async () => {
 
 test('info: returns channel details', async () => {
   // given
-  const client = await new TeamsClient().login({ token: 'test-token' })
+  const client = await new TeamsClient().login({ token: 'test-token', region: 'emea' })
 
   // when
   const channel = await client.getChannel('team-1', 'ch-1')
@@ -108,7 +108,7 @@ test('info: returns channel details', async () => {
 
 test('info: throws error for non-existent channel', async () => {
   // given
-  const client = await new TeamsClient().login({ token: 'test-token' })
+  const client = await new TeamsClient().login({ token: 'test-token', region: 'emea' })
 
   // when/then
   try {
@@ -121,7 +121,7 @@ test('info: throws error for non-existent channel', async () => {
 
 test('history: returns messages', async () => {
   // given
-  const client = await new TeamsClient().login({ token: 'test-token' })
+  const client = await new TeamsClient().login({ token: 'test-token', region: 'emea' })
 
   // when
   const messages = await client.getMessages('team-1', 'ch-1', 50)
@@ -136,7 +136,7 @@ test('history: returns messages', async () => {
 
 test('history: includes message metadata', async () => {
   // given
-  const client = await new TeamsClient().login({ token: 'test-token' })
+  const client = await new TeamsClient().login({ token: 'test-token', region: 'emea' })
   const messages = await client.getMessages('team-1', 'ch-1', 50)
 
   // when