agent-messenger 1.15.0 → 2.0.0

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

@@ -48,13 +48,13 @@ describe('DiscordClient', () => {
   }
 
   describe('constructor', () => {
-    test('requires token', () => {
-      expect(() => new DiscordClient('')).toThrow(DiscordError)
-      expect(() => new DiscordClient('')).toThrow('Token is required')
+    test('requires token', async () => {
+      await expect(new DiscordClient().login({ token: '' })).rejects.toThrow(DiscordError)
+      await expect(new DiscordClient().login({ token: '' })).rejects.toThrow('Token is required')
     })
 
-    test('accepts valid token', () => {
-      const client = new DiscordClient('test-token')
+    test('accepts valid token', async () => {
+      const client = await new DiscordClient().login({ token: 'test-token' })
       expect(client).toBeInstanceOf(DiscordClient)
     })
   })
@@ -68,7 +68,7 @@ describe('DiscordClient', () => {
         avatar: 'abc123',
       })
 
-      const client = new DiscordClient('test-token')
+      const client = await new DiscordClient().login({ token: 'test-token' })
       const user = await client.testAuth()
 
       expect(user.id).toBe('123456789')
@@ -83,7 +83,7 @@ describe('DiscordClient', () => {
     test('throws DiscordError on API error', async () => {
       mockResponse({ message: 'Unauthorized', code: 401 }, 401)
 
-      const client = new DiscordClient('bad-token')
+      const client = await new DiscordClient().login({ token: 'bad-token' })
       await expect(client.testAuth()).rejects.toThrow(DiscordError)
     })
   })
@@ -95,7 +95,7 @@ describe('DiscordClient', () => {
         { id: '222', name: 'Server Two' },
       ])
 
-      const client = new DiscordClient('test-token')
+      const client = await new DiscordClient().login({ token: 'test-token' })
       const servers = await client.listServers()
 
       expect(servers).toHaveLength(2)
@@ -108,7 +108,7 @@ describe('DiscordClient', () => {
     test('returns server info', async () => {
       mockResponse({ id: '111', name: 'Test Server' })
 
-      const client = new DiscordClient('test-token')
+      const client = await new DiscordClient().login({ token: 'test-token' })
       const server = await client.getServer('111')
 
       expect(server.id).toBe('111')
@@ -124,7 +124,7 @@ describe('DiscordClient', () => {
         { id: 'ch2', guild_id: '111', name: 'random', type: 0 },
       ])
 
-      const client = new DiscordClient('test-token')
+      const client = await new DiscordClient().login({ token: 'test-token' })
       const channels = await client.listChannels('111')
 
       expect(channels).toHaveLength(2)
@@ -137,7 +137,7 @@ describe('DiscordClient', () => {
     test('returns channel info', async () => {
       mockResponse({ id: 'ch1', guild_id: '111', name: 'general', type: 0 })
 
-      const client = new DiscordClient('test-token')
+      const client = await new DiscordClient().login({ token: 'test-token' })
       const channel = await client.getChannel('ch1')
 
       expect(channel.id).toBe('ch1')
@@ -156,7 +156,7 @@ describe('DiscordClient', () => {
         timestamp: '2024-01-01T00:00:00.000Z',
       })
 
-      const client = new DiscordClient('test-token')
+      const client = await new DiscordClient().login({ token: 'test-token' })
       const message = await client.sendMessage('ch1', 'Hello world')
 
       expect(message.content).toBe('Hello world')
@@ -178,7 +178,7 @@ describe('DiscordClient', () => {
         },
       ])
 
-      const client = new DiscordClient('test-token')
+      const client = await new DiscordClient().login({ token: 'test-token' })
       const messages = await client.getMessages('ch1', 50)
 
       expect(messages).toHaveLength(1)
@@ -189,7 +189,7 @@ describe('DiscordClient', () => {
     test('uses default limit of 50', async () => {
       mockResponse([])
 
-      const client = new DiscordClient('test-token')
+      const client = await new DiscordClient().login({ token: 'test-token' })
       await client.getMessages('ch1')
 
       expect(fetchCalls[0].url).toBe('https://discord.com/api/v10/channels/ch1/messages?limit=50')
@@ -206,7 +206,7 @@ describe('DiscordClient', () => {
         timestamp: '2024-01-01T00:00:00.000Z',
       })
 
-      const client = new DiscordClient('test-token')
+      const client = await new DiscordClient().login({ token: 'test-token' })
       const message = await client.getMessage('ch1', 'msg1')
 
       expect(message.id).toBe('msg1')
@@ -218,7 +218,7 @@ describe('DiscordClient', () => {
     test('deletes message', async () => {
       mockResponse(null, 204)
 
-      const client = new DiscordClient('test-token')
+      const client = await new DiscordClient().login({ token: 'test-token' })
       await client.deleteMessage('ch1', 'msg1')
 
       expect(fetchCalls[0].url).toBe('https://discord.com/api/v10/channels/ch1/messages/msg1')
@@ -230,7 +230,7 @@ describe('DiscordClient', () => {
     test('adds reaction to message', async () => {
       mockResponse(null, 204)
 
-      const client = new DiscordClient('test-token')
+      const client = await new DiscordClient().login({ token: 'test-token' })
       await client.addReaction('ch1', 'msg1', '👍')
 
       expect(fetchCalls[0].url).toBe(
@@ -244,7 +244,7 @@ describe('DiscordClient', () => {
     test('removes reaction from message', async () => {
       mockResponse(null, 204)
 
-      const client = new DiscordClient('test-token')
+      const client = await new DiscordClient().login({ token: 'test-token' })
       await client.removeReaction('ch1', 'msg1', '👍')
 
       expect(fetchCalls[0].url).toBe(
@@ -258,7 +258,7 @@ describe('DiscordClient', () => {
     test('returns list of server members', async () => {
       mockResponse([{ user: { id: 'u1', username: 'user1' } }, { user: { id: 'u2', username: 'user2' } }])
 
-      const client = new DiscordClient('test-token')
+      const client = await new DiscordClient().login({ token: 'test-token' })
       const users = await client.listUsers('111')
 
       expect(users).toHaveLength(2)
@@ -271,7 +271,7 @@ describe('DiscordClient', () => {
     test('returns user info', async () => {
       mockResponse({ id: 'u1', username: 'testuser' })
 
-      const client = new DiscordClient('test-token')
+      const client = await new DiscordClient().login({ token: 'test-token' })
       const user = await client.getUser('u1')
 
       expect(user.id).toBe('u1')
@@ -301,7 +301,7 @@ describe('DiscordClient', () => {
         ],
       })
 
-      const client = new DiscordClient('test-token')
+      const client = await new DiscordClient().login({ token: 'test-token' })
       const file = await client.uploadFile('ch1', tempFile)
 
       expect(file.filename).toBe('test-upload.txt')
@@ -331,7 +331,7 @@ describe('DiscordClient', () => {
         },
       ])
 
-      const client = new DiscordClient('test-token')
+      const client = await new DiscordClient().login({ token: 'test-token' })
       const files = await client.listFiles('ch1')
 
       expect(files).toHaveLength(1)
@@ -352,7 +352,7 @@ describe('DiscordClient', () => {
         'X-RateLimit-Bucket': 'user-bucket',
       })
 
-      const client = new DiscordClient('test-token')
+      const client = await new DiscordClient().login({ token: 'test-token' })
       await client.testAuth()
 
       const startTime = Date.now()
@@ -367,7 +367,7 @@ describe('DiscordClient', () => {
       mockResponse({ message: 'Rate limited', retry_after: 0.1 }, 429, { 'Retry-After': '0.1' })
       mockResponse({ id: '123', username: 'user' })
 
-      const client = new DiscordClient('test-token')
+      const client = await new DiscordClient().login({ token: 'test-token' })
       const user = await client.testAuth()
 
       expect(user.id).toBe('123')
@@ -381,7 +381,7 @@ describe('DiscordClient', () => {
       })
       mockResponse({ id: '123', username: 'user' })
 
-      const client = new DiscordClient('test-token')
+      const client = await new DiscordClient().login({ token: 'test-token' })
       const user = await client.testAuth()
 
       expect(user.id).toBe('123')
@@ -393,7 +393,7 @@ describe('DiscordClient', () => {
         mockResponse({ message: 'Rate limited' }, 429, { 'Retry-After': '0.01' })
       }
 
-      const client = new DiscordClient('test-token')
+      const client = await new DiscordClient().login({ token: 'test-token' })
       await expect(client.testAuth()).rejects.toThrow(DiscordError)
       expect(fetchCalls.length).toBeLessThanOrEqual(4)
     })
@@ -404,7 +404,7 @@ describe('DiscordClient', () => {
       mockResponse({ message: 'Internal Server Error' }, 500)
       mockResponse({ id: '123', username: 'user' })
 
-      const client = new DiscordClient('test-token')
+      const client = await new DiscordClient().login({ token: 'test-token' })
       const user = await client.testAuth()
 
       expect(user.id).toBe('123')
@@ -414,7 +414,7 @@ describe('DiscordClient', () => {
     test('does not retry on 4xx client errors (except 429)', async () => {
       mockResponse({ message: 'Not Found' }, 404)
 
-      const client = new DiscordClient('test-token')
+      const client = await new DiscordClient().login({ token: 'test-token' })
       await expect(client.testAuth()).rejects.toThrow(DiscordError)
       expect(fetchCalls.length).toBe(1)
     })
@@ -424,7 +424,7 @@ describe('DiscordClient', () => {
       mockResponse({ message: 'Error' }, 500)
       mockResponse({ id: '123', username: 'user' })
 
-      const client = new DiscordClient('test-token')
+      const client = await new DiscordClient().login({ token: 'test-token' })
       const startTime = Date.now()
       await client.testAuth()
       const elapsed = Date.now() - startTime
@@ -439,7 +439,7 @@ describe('DiscordClient', () => {
       mockResponse([])
       mockResponse([])
 
-      const client = new DiscordClient('test-token')
+      const client = await new DiscordClient().login({ token: 'test-token' })
       await client.getMessages('123456789')
       await client.getMessages('987654321')
 

package/src/platforms/discord/client.ts

@@ -39,15 +39,38 @@ const MAX_RETRIES = 3
 const BASE_BACKOFF_MS = 100
 
 export class DiscordClient {
-  private token: string
+  private token: string | null = null
   private buckets: Map<string, RateLimitBucket> = new Map()
   private globalRateLimitUntil: number = 0
 
-  constructor(token: string) {
+  async login(credentials?: { token: string }): Promise<this> {
+    if (credentials) {
+      if (!credentials.token) {
+        throw new DiscordError('Token is required', 'missing_token')
+      }
+      this.token = credentials.token
+      return this
+    }
+
+    const { ensureDiscordAuth } = await import('./ensure-auth')
+    await ensureDiscordAuth()
+    const { DiscordCredentialManager } = await import('./credential-manager')
+    const credManager = new DiscordCredentialManager()
+    const token = await credManager.getToken()
     if (!token) {
-      throw new DiscordError('Token is required', 'missing_token')
+      throw new DiscordError(
+        'No Discord credentials found. Make sure Discord desktop app is installed and logged in.',
+        'no_credentials',
+      )
     }
-    this.token = token
+    return this.login({ token })
+  }
+
+  private ensureAuth(): string {
+    if (!this.token) {
+      throw new DiscordError('Not authenticated. Call .login() first.', 'not_authenticated')
+    }
+    return this.token
   }
 
   private getBucketKey(method: string, path: string): string {
@@ -110,7 +133,7 @@ export class DiscordClient {
     for (let attempt = 0; attempt <= MAX_RETRIES; attempt++) {
       await this.waitForRateLimit(bucketKey)
 
-      const headers: Record<string, string> = getDiscordHeaders(this.token)
+      const headers: Record<string, string> = getDiscordHeaders(this.ensureAuth())
 
       const options: RequestInit = {
         method,
@@ -163,7 +186,7 @@ export class DiscordClient {
 
     await this.waitForRateLimit(bucketKey)
 
-    const headers = getDiscordHeaders(this.token)
+    const headers = getDiscordHeaders(this.ensureAuth())
     const response = await fetch(url, {
       method: 'POST',
       headers,
@@ -406,4 +429,8 @@ export class DiscordClient {
       archived,
     })
   }
+
+  async gatewayConnect(): Promise<{ token: string }> {
+    return { token: this.ensureAuth() }
+  }
 }

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

@@ -57,14 +57,14 @@ test('extract: calls DiscordTokenExtractor', async () => {
 })
 
 test('extract: validates token with DiscordClient', async () => {
-  const client = new DiscordClient('test-token-123')
+  const client = await new DiscordClient().login({ token: 'test-token-123' })
   const authInfo = await client.testAuth()
   expect(authInfo).toBeDefined()
   expect(authInfo.id).toBe('user-123')
 })
 
 test('extract: discovers servers', async () => {
-  const client = new DiscordClient('test-token-123')
+  const client = await new DiscordClient().login({ token: 'test-token-123' })
   const servers = await client.listServers()
   expect(servers).toHaveLength(2)
   expect(servers[0].id).toBe('server-1')

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

@@ -52,7 +52,7 @@ export async function extractAction(options: { pretty?: boolean; debug?: boolean
     }
 
     try {
-      const client = new DiscordClient(extracted.token)
+      const client = await new DiscordClient().login({ token: extracted.token })
 
       if (options.debug) {
         console.error(`[debug] Testing token validity...`)
@@ -160,7 +160,7 @@ export async function statusAction(options: { pretty?: boolean }): Promise<void>
     let valid = false
 
     try {
-      const client = new DiscordClient(config.token)
+      const client = await new DiscordClient().login({ token: config.token })
       authInfo = await client.testAuth()
       valid = true
     } catch {

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

@@ -74,7 +74,7 @@ afterEach(() => {
 
 test('list: returns text channels (type=0) from server', async () => {
   // given: discord client with channels
-  const client = new DiscordClient('test-token')
+  const client = await new DiscordClient().login({ token: 'test-token' })
   const channels = await client.listChannels('server-1')
 
   // when: filtering text channels
@@ -88,7 +88,7 @@ test('list: returns text channels (type=0) from server', async () => {
 
 test('list: includes channel metadata', async () => {
   // given: discord client with channels
-  const client = new DiscordClient('test-token')
+  const client = await new DiscordClient().login({ token: 'test-token' })
   const channels = await client.listChannels('server-1')
   const textChannels = channels.filter((ch) => ch.type === 0)
 
@@ -104,7 +104,7 @@ test('list: includes channel metadata', async () => {
 
 test('info: returns channel details', async () => {
   // given: discord client with channel data
-  const client = new DiscordClient('test-token')
+  const client = await new DiscordClient().login({ token: 'test-token' })
   const channel = await client.getChannel('ch-1')
 
   // when: getting channel info
@@ -119,7 +119,7 @@ test('info: returns channel details', async () => {
 
 test('info: throws error for non-existent channel', async () => {
   // given: discord client
-  const client = new DiscordClient('test-token')
+  const client = await new DiscordClient().login({ token: 'test-token' })
 
   // when: getting non-existent channel
   // then: error is thrown
@@ -133,7 +133,7 @@ test('info: throws error for non-existent channel', async () => {
 
 test('history: returns messages in reverse chronological order', async () => {
   // given: discord client with messages
-  const client = new DiscordClient('test-token')
+  const client = await new DiscordClient().login({ token: 'test-token' })
   const messages = await client.getMessages('ch-1', 50)
 
   // when: getting message history
@@ -149,7 +149,7 @@ test('history: returns messages in reverse chronological order', async () => {
 
 test('history: includes message metadata', async () => {
   // given: discord client with messages
-  const client = new DiscordClient('test-token')
+  const client = await new DiscordClient().login({ token: 'test-token' })
   const messages = await client.getMessages('ch-1', 50)
 
   // when: checking message properties

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

@@ -16,7 +16,7 @@ export async function listAction(options: { pretty?: boolean }): Promise<void> {
       process.exit(1)
     }
 
-    const client = new DiscordClient(config.token)
+    const client = await new DiscordClient().login({ token: config.token })
     const channels = await client.listChannels(config.current_server)
 
     const textChannels = channels.filter((ch) => ch.type === 0)
@@ -45,7 +45,7 @@ export async function infoAction(channelId: string, options: { pretty?: boolean
       process.exit(1)
     }
 
-    const client = new DiscordClient(config.token)
+    const client = await new DiscordClient().login({ token: config.token })
     const channel = await client.getChannel(channelId)
 
     const output = {
@@ -73,7 +73,7 @@ export async function historyAction(channelId: string, options: { limit?: number
       process.exit(1)
     }
 
-    const client = new DiscordClient(config.token)
+    const client = await new DiscordClient().login({ token: config.token })
     const messages = await client.getMessages(channelId, options.limit || 50)
 
     const output = messages.map((msg) => ({

package/src/platforms/discord/commands/dm.ts

@@ -17,7 +17,7 @@ export async function listAction(options: { pretty?: boolean }): Promise<void> {
       process.exit(1)
     }
 
-    const client = new DiscordClient(config.token)
+    const client = await new DiscordClient().login({ token: config.token })
     const channels = await client.listDMChannels()
 
     const output = channels.map((channel: DiscordDMChannel) => ({
@@ -47,7 +47,7 @@ export async function createAction(userId: string, options: { pretty?: boolean }
       process.exit(1)
     }
 
-    const client = new DiscordClient(config.token)
+    const client = await new DiscordClient().login({ token: config.token })
     const channel = await client.createDM(userId)
 
     const output = {

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

@@ -23,7 +23,7 @@ export async function uploadAction(
       process.exit(1)
     }
 
-    const client = new DiscordClient(config.token)
+    const client = await new DiscordClient().login({ token: config.token })
 
     const filePath = resolve(path)
     const file = await client.uploadFile(channelId, filePath)
@@ -52,7 +52,7 @@ export async function listAction(channelId: string, options: { pretty?: boolean
       process.exit(1)
     }
 
-    const client = new DiscordClient(config.token)
+    const client = await new DiscordClient().login({ token: config.token })
     const files = await client.listFiles(channelId)
 
     const output = files.map((file: DiscordFile) => ({
@@ -79,7 +79,7 @@ export async function infoAction(channelId: string, fileId: string, options: { p
       process.exit(1)
     }
 
-    const client = new DiscordClient(config.token)
+    const client = await new DiscordClient().login({ token: config.token })
     const files = await client.listFiles(channelId)
     const fileData = files.find((f) => f.id === fileId)
 

package/src/platforms/discord/commands/friend.test.ts

@@ -64,7 +64,7 @@ afterEach(() => {
 
 test('list: returns all relationships', async () => {
   // given: discord client with relationships
-  const client = new DiscordClient('test-token')
+  const client = await new DiscordClient().login({ token: 'test-token' })
   const relationships = await client.getRelationships()
 
   // when: getting all relationships
@@ -76,7 +76,7 @@ test('list: returns all relationships', async () => {
 
 test('list: includes relationship metadata', async () => {
   // given: discord client with relationships
-  const client = new DiscordClient('test-token')
+  const client = await new DiscordClient().login({ token: 'test-token' })
   const relationships = await client.getRelationships()
 
   // when: checking relationship properties
@@ -92,7 +92,7 @@ test('list: includes relationship metadata', async () => {
 
 test('list: filters friends (type=1)', async () => {
   // given: discord client with relationships
-  const client = new DiscordClient('test-token')
+  const client = await new DiscordClient().login({ token: 'test-token' })
   const relationships = await client.getRelationships()
 
   // when: filtering friends
@@ -106,7 +106,7 @@ test('list: filters friends (type=1)', async () => {
 
 test('list: includes optional nickname', async () => {
   // given: discord client with relationships
-  const client = new DiscordClient('test-token')
+  const client = await new DiscordClient().login({ token: 'test-token' })
   const relationships = await client.getRelationships()
 
   // when: checking for nickname
@@ -120,7 +120,7 @@ test('list: includes optional nickname', async () => {
 
 test('list: distinguishes relationship types', async () => {
   // given: discord client with relationships
-  const client = new DiscordClient('test-token')
+  const client = await new DiscordClient().login({ token: 'test-token' })
   const relationships = await client.getRelationships()
 
   // when: grouping by type

package/src/platforms/discord/commands/friend.ts

@@ -16,7 +16,7 @@ async function listAction(options: { pretty?: boolean }): Promise<void> {
       process.exit(1)
     }
 
-    const client = new DiscordClient(config.token)
+    const client = await new DiscordClient().login({ token: config.token })
     const relationships = await client.getRelationships()
 
     const output = relationships.map((rel) => ({

package/src/platforms/discord/commands/member.test.ts

@@ -55,7 +55,7 @@ afterEach(() => {
 })
 
 test('search: returns members matching query', async () => {
-  const client = new DiscordClient('test-token')
+  const client = await new DiscordClient().login({ token: 'test-token' })
   const members = await client.searchMembers('guild-1', 'alice', 10)
 
   expect(members).toBeDefined()
@@ -65,7 +65,7 @@ test('search: returns members matching query', async () => {
 })
 
 test('search: includes member metadata', async () => {
-  const client = new DiscordClient('test-token')
+  const client = await new DiscordClient().login({ token: 'test-token' })
   const members = await client.searchMembers('guild-1', 'alice', 10)
 
   const member = members[0]
@@ -83,7 +83,7 @@ test('search: includes member metadata', async () => {
 })
 
 test('search: respects limit parameter', async () => {
-  const client = new DiscordClient('test-token')
+  const client = await new DiscordClient().login({ token: 'test-token' })
 
   await client.searchMembers('guild-1', 'alice', 5)
 
@@ -91,7 +91,7 @@ test('search: respects limit parameter', async () => {
 })
 
 test('search: uses default limit of 10', async () => {
-  const client = new DiscordClient('test-token')
+  const client = await new DiscordClient().login({ token: 'test-token' })
 
   const members = await client.searchMembers('guild-1', 'alice')
 

package/src/platforms/discord/commands/member.ts

@@ -20,7 +20,7 @@ async function searchAction(
       process.exit(1)
     }
 
-    const client = new DiscordClient(config.token)
+    const client = await new DiscordClient().login({ token: config.token })
     const limit = options.limit ? parseInt(options.limit, 10) : 10
     const members = await client.searchMembers(guildId, query, limit)
 

package/src/platforms/discord/commands/mention.test.ts

@@ -48,7 +48,7 @@ afterEach(() => {
 
 test('getMentions: returns mentions', async () => {
   // given: discord client
-  const client = new DiscordClient('test-token')
+  const client = await new DiscordClient().login({ token: 'test-token' })
 
   // when: getting mentions
   const mentions = await client.getMentions()
@@ -64,7 +64,7 @@ test('getMentions: returns mentions', async () => {
 
 test('getMentions: respects limit option', async () => {
   // given: discord client with limit option
-  const client = new DiscordClient('test-token')
+  const client = await new DiscordClient().login({ token: 'test-token' })
   clientGetMentionsSpy.mockResolvedValue([
     {
       id: 'msg-1',
@@ -87,7 +87,7 @@ test('getMentions: respects limit option', async () => {
 
 test('getMentions: respects guildId option', async () => {
   // given: discord client with guildId option
-  const client = new DiscordClient('test-token')
+  const client = await new DiscordClient().login({ token: 'test-token' })
   clientGetMentionsSpy.mockResolvedValue([
     {
       id: 'msg-1',
@@ -112,7 +112,7 @@ test('getMentions: respects guildId option', async () => {
 
 test('getMentions: includes mention metadata', async () => {
   // given: discord client with mentions
-  const client = new DiscordClient('test-token')
+  const client = await new DiscordClient().login({ token: 'test-token' })
   const mentions = await client.getMentions()
 
   // when: checking mention properties

package/src/platforms/discord/commands/mention.ts

@@ -16,7 +16,7 @@ export async function listAction(options: { limit?: number; guild?: string; pret
       process.exit(1)
     }
 
-    const client = new DiscordClient(config.token)
+    const client = await new DiscordClient().login({ token: config.token })
     const mentions = await client.getMentions({
       limit: options.limit,
       guildId: options.guild,