agent-messenger 2.8.0 → 2.10.0

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

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

@@ -16,7 +16,12 @@ export async function listAction(teamId: string, options: { pretty?: boolean }):
       process.exit(1)
     }
 
-    const client = await new TeamsClient().login({ token: cred.token, tokenExpiresAt: cred.tokenExpiresAt })
+    const client = await new TeamsClient().login({
+      token: cred.token,
+      tokenExpiresAt: cred.tokenExpiresAt,
+      accountType: cred.accountType,
+      region: cred.region,
+    })
     const channels = await client.listChannels(teamId)
 
     const output = channels.map((ch) => ({
@@ -42,7 +47,12 @@ export async function infoAction(teamId: string, channelId: string, options: { p
       process.exit(1)
     }
 
-    const client = await new TeamsClient().login({ token: cred.token, tokenExpiresAt: cred.tokenExpiresAt })
+    const client = await new TeamsClient().login({
+      token: cred.token,
+      tokenExpiresAt: cred.tokenExpiresAt,
+      accountType: cred.accountType,
+      region: cred.region,
+    })
     const channel = await client.getChannel(teamId, channelId)
 
     const output = {
@@ -72,7 +82,12 @@ export async function historyAction(
       process.exit(1)
     }
 
-    const client = await new TeamsClient().login({ token: cred.token, tokenExpiresAt: cred.tokenExpiresAt })
+    const client = await new TeamsClient().login({
+      token: cred.token,
+      tokenExpiresAt: cred.tokenExpiresAt,
+      accountType: cred.accountType,
+      region: cred.region,
+    })
     const messages = await client.getMessages(teamId, channelId, options.limit || 50)
 
     const output = messages.map((msg) => ({

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

@@ -24,7 +24,12 @@ export async function uploadAction(
       process.exit(1)
     }
 
-    const client = await new TeamsClient().login({ token: cred.token, tokenExpiresAt: cred.tokenExpiresAt })
+    const client = await new TeamsClient().login({
+      token: cred.token,
+      tokenExpiresAt: cred.tokenExpiresAt,
+      accountType: cred.accountType,
+      region: cred.region,
+    })
     const filePath = resolve(path)
     const file = await client.uploadFile(teamId, channelId, filePath)
 
@@ -52,7 +57,12 @@ export async function listAction(teamId: string, channelId: string, options: { p
       process.exit(1)
     }
 
-    const client = await new TeamsClient().login({ token: cred.token, tokenExpiresAt: cred.tokenExpiresAt })
+    const client = await new TeamsClient().login({
+      token: cred.token,
+      tokenExpiresAt: cred.tokenExpiresAt,
+      accountType: cred.accountType,
+      region: cred.region,
+    })
     const files = await client.listFiles(teamId, channelId)
 
     const output = files.map((file: TeamsFile) => ({
@@ -84,7 +94,12 @@ export async function infoAction(
       process.exit(1)
     }
 
-    const client = await new TeamsClient().login({ token: cred.token, tokenExpiresAt: cred.tokenExpiresAt })
+    const client = await new TeamsClient().login({
+      token: cred.token,
+      tokenExpiresAt: cred.tokenExpiresAt,
+      accountType: cred.accountType,
+      region: cred.region,
+    })
     const files = await client.listFiles(teamId, channelId)
     const fileData = files.find((f) => f.id === fileId)
 

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

@@ -22,7 +22,12 @@ export async function sendAction(
       process.exit(1)
     }
 
-    const client = await new TeamsClient().login({ token: cred.token, tokenExpiresAt: cred.tokenExpiresAt })
+    const client = await new TeamsClient().login({
+      token: cred.token,
+      tokenExpiresAt: cred.tokenExpiresAt,
+      accountType: cred.accountType,
+      region: cred.region,
+    })
     const message = await client.sendMessage(teamId, channelId, content)
 
     const output = {
@@ -52,7 +57,12 @@ export async function listAction(
       process.exit(1)
     }
 
-    const client = await new TeamsClient().login({ token: cred.token, tokenExpiresAt: cred.tokenExpiresAt })
+    const client = await new TeamsClient().login({
+      token: cred.token,
+      tokenExpiresAt: cred.tokenExpiresAt,
+      accountType: cred.accountType,
+      region: cred.region,
+    })
     const limit = options.limit || 50
     const messages = await client.getMessages(teamId, channelId, limit)
 
@@ -84,7 +94,12 @@ export async function getAction(
       process.exit(1)
     }
 
-    const client = await new TeamsClient().login({ token: cred.token, tokenExpiresAt: cred.tokenExpiresAt })
+    const client = await new TeamsClient().login({
+      token: cred.token,
+      tokenExpiresAt: cred.tokenExpiresAt,
+      accountType: cred.accountType,
+      region: cred.region,
+    })
     const message = await client.getMessage(teamId, channelId, messageId)
 
     if (!message) {
@@ -125,7 +140,12 @@ export async function deleteAction(
       process.exit(0)
     }
 
-    const client = await new TeamsClient().login({ token: cred.token, tokenExpiresAt: cred.tokenExpiresAt })
+    const client = await new TeamsClient().login({
+      token: cred.token,
+      tokenExpiresAt: cred.tokenExpiresAt,
+      accountType: cred.accountType,
+      region: cred.region,
+    })
     await client.deleteMessage(teamId, channelId, messageId)
 
     console.log(formatOutput({ deleted: messageId }, options.pretty))

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

@@ -23,7 +23,12 @@ export async function addAction(
       return
     }
 
-    const client = await new TeamsClient().login({ token: cred.token, tokenExpiresAt: cred.tokenExpiresAt })
+    const client = await new TeamsClient().login({
+      token: cred.token,
+      tokenExpiresAt: cred.tokenExpiresAt,
+      accountType: cred.accountType,
+      region: cred.region,
+    })
     await client.addReaction(teamId, channelId, messageId, emoji)
 
     console.log(
@@ -60,7 +65,12 @@ export async function removeAction(
       return
     }
 
-    const client = await new TeamsClient().login({ token: cred.token, tokenExpiresAt: cred.tokenExpiresAt })
+    const client = await new TeamsClient().login({
+      token: cred.token,
+      tokenExpiresAt: cred.tokenExpiresAt,
+      accountType: cred.accountType,
+      region: cred.region,
+    })
     await client.removeReaction(teamId, channelId, messageId, emoji)
 
     console.log(

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

@@ -8,7 +8,7 @@ test('snapshot: command is defined', () => {
 })
 
 test('snapshot: command has correct description', () => {
-  expect(snapshotCommand.description()).toContain('team state')
+  expect(snapshotCommand.description()).toContain('team overview')
 })
 
 test('snapshot: command has --channels-only option', () => {