agent-messenger 1.4.0 → 1.6.0

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

@@ -47,9 +47,15 @@ beforeEach(() => {
   clientDeleteMessageSpy = spyOn(TeamsClient.prototype, 'deleteMessage').mockResolvedValue(undefined)
 
   credManagerLoadSpy = spyOn(TeamsCredentialManager.prototype, 'loadConfig').mockResolvedValue({
-    token: 'test_token',
-    current_team: 'team_123',
-    teams: { team_123: { team_id: 'team_123', team_name: 'Test Team' } },
+    current_account: 'work',
+    accounts: {
+      work: {
+        token: 'test_token',
+        account_type: 'work' as const,
+        current_team: 'team_123',
+        teams: { team_123: { team_id: 'team_123', team_name: 'Test Team' } },
+      },
+    },
   })
 })
 

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

@@ -13,14 +13,14 @@ export async function sendAction(
 ): Promise<void> {
   try {
     const credManager = new TeamsCredentialManager()
-    const config = await credManager.loadConfig()
+    const cred = await credManager.getTokenWithExpiry()
 
-    if (!config?.token) {
+    if (!cred) {
       console.log(formatOutput({ error: 'Not authenticated. Run "auth extract" first.' }, options.pretty))
       process.exit(1)
     }
 
-    const client = new TeamsClient(config.token, config.token_expires_at)
+    const client = new TeamsClient(cred.token, cred.tokenExpiresAt)
     const message = await client.sendMessage(teamId, channelId, content)
 
     const output = {
@@ -43,14 +43,14 @@ export async function listAction(
 ): Promise<void> {
   try {
     const credManager = new TeamsCredentialManager()
-    const config = await credManager.loadConfig()
+    const cred = await credManager.getTokenWithExpiry()
 
-    if (!config?.token) {
+    if (!cred) {
       console.log(formatOutput({ error: 'Not authenticated. Run "auth extract" first.' }, options.pretty))
       process.exit(1)
     }
 
-    const client = new TeamsClient(config.token, config.token_expires_at)
+    const client = new TeamsClient(cred.token, cred.tokenExpiresAt)
     const limit = options.limit || 50
     const messages = await client.getMessages(teamId, channelId, limit)
 
@@ -75,14 +75,14 @@ export async function getAction(
 ): Promise<void> {
   try {
     const credManager = new TeamsCredentialManager()
-    const config = await credManager.loadConfig()
+    const cred = await credManager.getTokenWithExpiry()
 
-    if (!config?.token) {
+    if (!cred) {
       console.log(formatOutput({ error: 'Not authenticated. Run "auth extract" first.' }, options.pretty))
       process.exit(1)
     }
 
-    const client = new TeamsClient(config.token, config.token_expires_at)
+    const client = new TeamsClient(cred.token, cred.tokenExpiresAt)
     const message = await client.getMessage(teamId, channelId, messageId)
 
     if (!message) {
@@ -111,9 +111,9 @@ export async function deleteAction(
 ): Promise<void> {
   try {
     const credManager = new TeamsCredentialManager()
-    const config = await credManager.loadConfig()
+    const cred = await credManager.getTokenWithExpiry()
 
-    if (!config?.token) {
+    if (!cred) {
       console.log(formatOutput({ error: 'Not authenticated. Run "auth extract" first.' }, options.pretty))
       process.exit(1)
     }
@@ -123,7 +123,7 @@ export async function deleteAction(
       process.exit(0)
     }
 
-    const client = new TeamsClient(config.token, config.token_expires_at)
+    const client = new TeamsClient(cred.token, cred.tokenExpiresAt)
     await client.deleteMessage(teamId, channelId, messageId)
 
     console.log(formatOutput({ deleted: messageId }, options.pretty))

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

@@ -11,9 +11,15 @@ beforeEach(() => {
   clientAddReactionSpy = spyOn(TeamsClient.prototype, 'addReaction').mockResolvedValue(undefined)
   clientRemoveReactionSpy = spyOn(TeamsClient.prototype, 'removeReaction').mockResolvedValue(undefined)
   credManagerLoadConfigSpy = spyOn(TeamsCredentialManager.prototype, 'loadConfig').mockResolvedValue({
-    token: 'test-token',
-    current_team: null,
-    teams: {},
+    current_account: 'work',
+    accounts: {
+      work: {
+        token: 'test-token',
+        account_type: 'work' as const,
+        current_team: null,
+        teams: {},
+      },
+    },
   })
 })
 

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

@@ -13,14 +13,14 @@ export async function addAction(
 ): Promise<void> {
   try {
     const credManager = new TeamsCredentialManager()
-    const config = await credManager.loadConfig()
+    const cred = await credManager.getTokenWithExpiry()
 
-    if (!config?.token) {
+    if (!cred) {
       console.log(formatOutput({ error: 'Not authenticated. Run "auth extract" first.' }, options.pretty))
       process.exit(1)
     }
 
-    const client = new TeamsClient(config.token, config.token_expires_at)
+    const client = new TeamsClient(cred.token, cred.tokenExpiresAt)
     await client.addReaction(teamId, channelId, messageId, emoji)
 
     console.log(
@@ -49,14 +49,14 @@ export async function removeAction(
 ): Promise<void> {
   try {
     const credManager = new TeamsCredentialManager()
-    const config = await credManager.loadConfig()
+    const cred = await credManager.getTokenWithExpiry()
 
-    if (!config?.token) {
+    if (!cred) {
       console.log(formatOutput({ error: 'Not authenticated. Run "auth extract" first.' }, options.pretty))
       process.exit(1)
     }
 
-    const client = new TeamsClient(config.token, config.token_expires_at)
+    const client = new TeamsClient(cred.token, cred.tokenExpiresAt)
     await client.removeReaction(teamId, channelId, messageId, emoji)
 
     console.log(

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

@@ -15,14 +15,15 @@ export async function snapshotAction(options: {
 }): Promise<void> {
   try {
     const credManager = new TeamsCredentialManager()
-    const config = await credManager.loadConfig()
+    const cred = await credManager.getTokenWithExpiry()
 
-    if (!config?.token) {
+    if (!cred) {
       console.log(formatOutput({ error: 'Not authenticated. Run "auth extract" first.' }, options.pretty))
       process.exit(1)
     }
 
-    const teamId = options.teamId || config.current_team
+    const currentTeam = await credManager.getCurrentTeam()
+    const teamId = options.teamId || currentTeam?.team_id
     if (!teamId) {
       console.log(
         formatOutput({ error: 'No current team set. Run "team switch" first or use --team-id.' }, options.pretty),
@@ -30,7 +31,7 @@ export async function snapshotAction(options: {
       process.exit(1)
     }
 
-    const client = new TeamsClient(config.token, config.token_expires_at)
+    const client = new TeamsClient(cred.token, cred.tokenExpiresAt)
     const messageLimit = options.limit || 20
 
     const snapshot: Record<string, unknown> = {}
@@ -91,8 +92,7 @@ export async function snapshotAction(options: {
   }
 }
 
-export const snapshotCommand = new Command()
-  .name('snapshot')
+export const snapshotCommand = new Command('snapshot')
   .description('Get comprehensive team state for AI agents')
   .option('--channels-only', 'Include only channels (exclude messages and members)')
   .option('--users-only', 'Include only members (exclude channels and messages)')

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

@@ -26,11 +26,17 @@ beforeEach(() => {
   })
 
   credManagerLoadConfigSpy = spyOn(TeamsCredentialManager.prototype, 'loadConfig').mockResolvedValue({
-    token: 'test-token',
-    current_team: 'team-1',
-    teams: {
-      'team-1': { team_id: 'team-1', team_name: 'Team One' },
-      'team-2': { team_id: 'team-2', team_name: 'Team Two' },
+    current_account: 'work',
+    accounts: {
+      work: {
+        token: 'test-token',
+        account_type: 'work' as const,
+        current_team: 'team-1',
+        teams: {
+          'team-1': { team_id: 'team-1', team_name: 'Team One' },
+          'team-2': { team_id: 'team-2', team_name: 'Team Two' },
+        },
+      },
     },
   })
 
@@ -59,12 +65,13 @@ test('list: returns teams with current marker', async () => {
   const config = await credManager.loadConfig()
 
   // when: checking teams
-  expect(config?.teams).toBeDefined()
-  expect(Object.keys(config!.teams)).toHaveLength(2)
+  const account = config!.accounts.work
+  expect(account.teams).toBeDefined()
+  expect(Object.keys(account.teams)).toHaveLength(2)
 
   // then: teams are returned
-  expect(config!.teams['team-1']).toBeDefined()
-  expect(config!.teams['team-2']).toBeDefined()
+  expect(account.teams['team-1']).toBeDefined()
+  expect(account.teams['team-2']).toBeDefined()
 })
 
 test('list: marks current team', async () => {
@@ -77,7 +84,7 @@ test('list: marks current team', async () => {
   expect(current?.team_id).toBe('team-1')
 
   // then: current team is marked
-  expect(config!.current_team).toBe('team-1')
+  expect(config!.accounts.work.current_team).toBe('team-1')
 })
 
 test('info: returns team details', async () => {
@@ -129,7 +136,7 @@ test('current: returns current team info', async () => {
 
   // then: current team is returned
   expect(current?.team_id).toBe('team-1')
-  expect(config!.current_team).toBe('team-1')
+  expect(config!.accounts.work.current_team).toBe('team-1')
 })
 
 test('remove: removes team from config', async () => {
@@ -138,7 +145,7 @@ test('remove: removes team from config', async () => {
   const config = await credManager.loadConfig()
 
   // when: removing team
-  delete config!.teams['team-2']
+  delete config!.accounts.work.teams['team-2']
   await credManager.saveConfig(config!)
 
   // then: saveConfig is called

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

@@ -7,13 +7,13 @@ import { TeamsCredentialManager } from '../credential-manager'
 export async function listAction(options: { pretty?: boolean }): Promise<void> {
   try {
     const credManager = new TeamsCredentialManager()
-    const config = await credManager.loadConfig()
-    const teams = config?.teams ? Object.values(config.teams) : []
+    const account = await credManager.getCurrentAccount()
+    const teams = account?.teams ? Object.values(account.teams) : []
 
     const output = teams.map((team) => ({
       id: team.team_id,
       name: team.team_name,
-      current: team.team_id === config?.current_team,
+      current: team.team_id === account?.current_team,
     }))
 
     console.log(formatOutput(output, options.pretty))
@@ -25,14 +25,14 @@ export async function listAction(options: { pretty?: boolean }): Promise<void> {
 export async function infoAction(teamId: string, options: { pretty?: boolean }): Promise<void> {
   try {
     const credManager = new TeamsCredentialManager()
-    const config = await credManager.loadConfig()
+    const cred = await credManager.getTokenWithExpiry()
 
-    if (!config?.token) {
+    if (!cred) {
       console.log(formatOutput({ error: 'Not authenticated. Run "auth extract" first.' }, options.pretty))
       process.exit(1)
     }
 
-    const client = new TeamsClient(config.token, config.token_expires_at)
+    const client = new TeamsClient(cred.token, cred.tokenExpiresAt)
     const team = await client.getTeam(teamId)
 
     const output = {
@@ -50,14 +50,14 @@ export async function infoAction(teamId: string, options: { pretty?: boolean }):
 export async function switchAction(teamId: string, options: { pretty?: boolean }): Promise<void> {
   try {
     const credManager = new TeamsCredentialManager()
-    const config = await credManager.loadConfig()
+    const account = await credManager.getCurrentAccount()
 
-    if (!config?.teams?.[teamId]) {
+    if (!account?.teams?.[teamId]) {
       console.log(formatOutput({ error: `Team not found: ${teamId}` }, options.pretty))
       process.exit(1)
     }
 
-    const team = config.teams[teamId]
+    const team = account.teams[teamId]
     await credManager.setCurrentTeam(teamId, team.team_name)
     console.log(formatOutput({ current: teamId }, options.pretty))
   } catch (error) {
@@ -68,26 +68,14 @@ export async function switchAction(teamId: string, options: { pretty?: boolean }
 export async function currentAction(options: { pretty?: boolean }): Promise<void> {
   try {
     const credManager = new TeamsCredentialManager()
-    const config = await credManager.loadConfig()
+    const currentTeam = await credManager.getCurrentTeam()
 
-    if (!config?.current_team) {
+    if (!currentTeam) {
       console.log(formatOutput({ error: 'No current team set. Run "auth extract" first.' }, options.pretty))
       process.exit(1)
     }
 
-    const team = config.teams[config.current_team]
-
-    if (!team) {
-      console.log(formatOutput({ error: 'Current team not found in configuration.' }, options.pretty))
-      process.exit(1)
-    }
-
-    const output = {
-      team_id: team.team_id,
-      team_name: team.team_name,
-    }
-
-    console.log(formatOutput(output, options.pretty))
+    console.log(formatOutput({ team_id: currentTeam.team_id, team_name: currentTeam.team_name }, options.pretty))
   } catch (error) {
     handleError(error as Error)
   }
@@ -103,15 +91,21 @@ export async function removeAction(teamId: string, options: { pretty?: boolean }
       process.exit(1)
     }
 
-    if (!config.teams[teamId]) {
+    const account = await credManager.getCurrentAccount()
+    if (!account) {
+      console.log(formatOutput({ error: 'No active account.' }, options.pretty))
+      process.exit(1)
+    }
+
+    if (!account.teams[teamId]) {
       console.log(formatOutput({ error: `Team not found: ${teamId}` }, options.pretty))
       process.exit(1)
     }
 
-    delete config.teams[teamId]
+    delete account.teams[teamId]
 
-    if (config.current_team === teamId) {
-      config.current_team = null
+    if (account.current_team === teamId) {
+      account.current_team = null
     }
 
     await credManager.saveConfig(config)

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

@@ -7,14 +7,14 @@ import { TeamsCredentialManager } from '../credential-manager'
 async function listAction(teamId: string, options: { pretty?: boolean }): Promise<void> {
   try {
     const credManager = new TeamsCredentialManager()
-    const config = await credManager.loadConfig()
+    const cred = await credManager.getTokenWithExpiry()
 
-    if (!config?.token) {
+    if (!cred) {
       console.log(formatOutput({ error: 'Not authenticated. Run "auth extract" first.' }, options.pretty))
       process.exit(1)
     }
 
-    const client = new TeamsClient(config.token, config.token_expires_at)
+    const client = new TeamsClient(cred.token, cred.tokenExpiresAt)
     const users = await client.listUsers(teamId)
 
     const output = users.map((user) => ({
@@ -33,14 +33,14 @@ async function listAction(teamId: string, options: { pretty?: boolean }): Promis
 async function infoAction(userId: string, options: { pretty?: boolean }): Promise<void> {
   try {
     const credManager = new TeamsCredentialManager()
-    const config = await credManager.loadConfig()
+    const cred = await credManager.getTokenWithExpiry()
 
-    if (!config?.token) {
+    if (!cred) {
       console.log(formatOutput({ error: 'Not authenticated. Run "auth extract" first.' }, options.pretty))
       process.exit(1)
     }
 
-    const client = new TeamsClient(config.token, config.token_expires_at)
+    const client = new TeamsClient(cred.token, cred.tokenExpiresAt)
     const user = await client.getUser(userId)
 
     const output = {
@@ -59,14 +59,14 @@ async function infoAction(userId: string, options: { pretty?: boolean }): Promis
 async function meAction(options: { pretty?: boolean }): Promise<void> {
   try {
     const credManager = new TeamsCredentialManager()
-    const config = await credManager.loadConfig()
+    const cred = await credManager.getTokenWithExpiry()
 
-    if (!config?.token) {
+    if (!cred) {
       console.log(formatOutput({ error: 'Not authenticated. Run "auth extract" first.' }, options.pretty))
       process.exit(1)
     }
 
-    const client = new TeamsClient(config.token, config.token_expires_at)
+    const client = new TeamsClient(cred.token, cred.tokenExpiresAt)
     const user = await client.testAuth()
 
     const output = {

package/src/platforms/teams/credential-manager.test.ts

@@ -33,10 +33,16 @@ describe('TeamsCredentialManager', () => {
     testDirs.push(testConfigDir)
     const manager = new TeamsCredentialManager(testConfigDir)
     const config = {
-      token: 'test-token',
-      current_team: 'team-123',
-      teams: {
-        'team-123': { team_id: 'team-123', team_name: 'Test Team' },
+      current_account: 'work',
+      accounts: {
+        work: {
+          token: 'test-token',
+          current_team: 'team-123',
+          account_type: 'work' as const,
+          teams: {
+            'team-123': { team_id: 'team-123', team_name: 'Test Team' },
+          },
+        },
       },
     }
 
@@ -59,7 +65,7 @@ describe('TeamsCredentialManager', () => {
 
   test('setToken saves token to config', async () => {
     const manager = setup()
-    await manager.setToken('test-token-123')
+    await manager.setToken('test-token-123', 'work')
 
     const token = await manager.getToken()
     expect(token).toBe('test-token-123')
@@ -68,11 +74,11 @@ describe('TeamsCredentialManager', () => {
   test('setToken saves token with expiry', async () => {
     const manager = setup()
     const expiresAt = '2025-12-31T23:59:59Z'
-    await manager.setToken('test-token-123', expiresAt)
+    await manager.setToken('test-token-123', 'work', expiresAt)
 
     const config = await manager.loadConfig()
-    expect(config?.token).toBe('test-token-123')
-    expect(config?.token_expires_at).toBe(expiresAt)
+    expect(config?.accounts?.work?.token).toBe('test-token-123')
+    expect(config?.accounts?.work?.token_expires_at).toBe(expiresAt)
   })
 
   test('getCurrentTeam returns null when not set', async () => {
@@ -83,10 +89,10 @@ describe('TeamsCredentialManager', () => {
 
   test('getCurrentTeam returns null when current_team is set but team not in teams record', async () => {
     const manager = setup()
-    await manager.setToken('test-token')
+    await manager.setToken('test-token', 'work')
     const config = await manager.loadConfig()
-    if (config) {
-      config.current_team = 'non-existent-team'
+    if (config?.accounts?.work) {
+      config.accounts.work.current_team = 'non-existent-team'
       await manager.saveConfig(config)
     }
 
@@ -96,7 +102,7 @@ describe('TeamsCredentialManager', () => {
 
   test('setCurrentTeam saves team info', async () => {
     const manager = setup()
-    await manager.setToken('test-token')
+    await manager.setToken('test-token', 'work')
     await manager.setCurrentTeam('team-456', 'My Team')
 
     const team = await manager.getCurrentTeam()
@@ -105,7 +111,7 @@ describe('TeamsCredentialManager', () => {
 
   test('setCurrentTeam updates existing team', async () => {
     const manager = setup()
-    await manager.setToken('test-token')
+    await manager.setToken('test-token', 'work')
     await manager.setCurrentTeam('team-1', 'Team One')
     await manager.setCurrentTeam('team-2', 'Team Two')
 
@@ -113,13 +119,13 @@ describe('TeamsCredentialManager', () => {
     expect(team).toEqual({ team_id: 'team-2', team_name: 'Team Two' })
 
     const config = await manager.loadConfig()
-    expect(config?.teams['team-1']).toEqual({ team_id: 'team-1', team_name: 'Team One' })
-    expect(config?.teams['team-2']).toEqual({ team_id: 'team-2', team_name: 'Team Two' })
+    expect(config?.accounts?.work?.teams['team-1']).toEqual({ team_id: 'team-1', team_name: 'Team One' })
+    expect(config?.accounts?.work?.teams['team-2']).toEqual({ team_id: 'team-2', team_name: 'Team Two' })
   })
 
   test('clearCredentials removes all credentials', async () => {
     const manager = setup()
-    await manager.setToken('test-token', '2025-12-31T23:59:59Z')
+    await manager.setToken('test-token', 'work', '2025-12-31T23:59:59Z')
     await manager.setCurrentTeam('team-123', 'Test Team')
 
     await manager.clearCredentials()
@@ -136,7 +142,7 @@ describe('TeamsCredentialManager', () => {
 
   test('isTokenExpired returns true when no token_expires_at is set', async () => {
     const manager = setup()
-    await manager.setToken('test-token')
+    await manager.setToken('test-token', 'work')
 
     const expired = await manager.isTokenExpired()
     expect(expired).toBe(true)
@@ -145,7 +151,7 @@ describe('TeamsCredentialManager', () => {
   test('isTokenExpired returns true when token is expired', async () => {
     const manager = setup()
     const pastDate = new Date(Date.now() - 60000).toISOString()
-    await manager.setToken('test-token', pastDate)
+    await manager.setToken('test-token', 'work', pastDate)
 
     const expired = await manager.isTokenExpired()
     expect(expired).toBe(true)
@@ -154,7 +160,7 @@ describe('TeamsCredentialManager', () => {
   test('isTokenExpired returns false when token is not expired', async () => {
     const manager = setup()
     const futureDate = new Date(Date.now() + 3600000).toISOString()
-    await manager.setToken('test-token', futureDate)
+    await manager.setToken('test-token', 'work', futureDate)
 
     const expired = await manager.isTokenExpired()
     expect(expired).toBe(false)
@@ -162,14 +168,14 @@ describe('TeamsCredentialManager', () => {
 
   test('multiple operations preserve existing data', async () => {
     const manager = setup()
-    await manager.setToken('token-1', '2025-12-31T23:59:59Z')
+    await manager.setToken('token-1', 'work', '2025-12-31T23:59:59Z')
     await manager.setCurrentTeam('team-1', 'Team One')
 
-    await manager.setToken('token-2')
+    await manager.setToken('token-2', 'work')
 
     const config = await manager.loadConfig()
-    expect(config?.token).toBe('token-2')
-    expect(config?.current_team).toBe('team-1')
-    expect(config?.teams['team-1']).toEqual({ team_id: 'team-1', team_name: 'Team One' })
+    expect(config?.accounts?.work?.token).toBe('token-2')
+    expect(config?.accounts?.work?.current_team).toBe('team-1')
+    expect(config?.accounts?.work?.teams['team-1']).toEqual({ team_id: 'team-1', team_name: 'Team One' })
   })
 })