agent-messenger 2.10.1 → 2.11.0

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

@@ -1,6 +1,6 @@
-import { afterEach, beforeEach, describe, expect, test } from 'bun:test'
+import { afterEach, beforeEach, describe, expect, it, mock } from 'bun:test'
 import { existsSync, rmSync } from 'node:fs'
-import { mkdir, stat } from 'node:fs/promises'
+import { mkdir, stat, writeFile } from 'node:fs/promises'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
 
@@ -50,7 +50,7 @@ describe('SlackBotCredentialManager', () => {
   })
 
   describe('load', () => {
-    test('returns empty config when no file exists', async () => {
+    it('returns empty config when no file exists', async () => {
       const config = await manager.load()
 
       expect(config.current).toBeNull()
@@ -59,7 +59,7 @@ describe('SlackBotCredentialManager', () => {
   })
 
   describe('save and load', () => {
-    test('persists config to file', async () => {
+    it('persists config to file', async () => {
       const config = {
         current: { workspace_id: 'T123', bot_id: 'deploy' },
         workspaces: {
@@ -81,11 +81,11 @@ describe('SlackBotCredentialManager', () => {
   })
 
   describe('getCredentials', () => {
-    test('returns null when no credentials exist', async () => {
+    it('returns null when no credentials exist', async () => {
       expect(await manager.getCredentials()).toBeNull()
     })
 
-    test('returns current bot credentials', async () => {
+    it('returns current bot credentials', async () => {
       await manager.setCredentials(CREDS_A)
 
       const creds = await manager.getCredentials()
@@ -93,7 +93,7 @@ describe('SlackBotCredentialManager', () => {
       expect(creds).toEqual(CREDS_A)
     })
 
-    test('returns specific bot by id', async () => {
+    it('returns specific bot by id', async () => {
       await manager.setCredentials(CREDS_A)
       await manager.setCredentials(CREDS_B)
 
@@ -102,7 +102,7 @@ describe('SlackBotCredentialManager', () => {
       expect(creds).toEqual(CREDS_A)
     })
 
-    test('returns specific bot by workspace_id/bot_id', async () => {
+    it('returns specific bot by workspace_id/bot_id', async () => {
       await manager.setCredentials(CREDS_A)
       await manager.setCredentials(CREDS_C)
 
@@ -111,7 +111,7 @@ describe('SlackBotCredentialManager', () => {
       expect(creds).toEqual(CREDS_A)
     })
 
-    test('returns null for ambiguous bot_id across workspaces', async () => {
+    it('returns null for ambiguous bot_id across workspaces', async () => {
       await manager.setCredentials(CREDS_A)
       await manager.setCredentials(CREDS_C)
 
@@ -120,7 +120,7 @@ describe('SlackBotCredentialManager', () => {
       expect(creds).toBeNull()
     })
 
-    test('env vars take precedence over file', async () => {
+    it('env vars take precedence over file', async () => {
       await manager.setCredentials(CREDS_A)
 
       process.env.E2E_SLACKBOT_TOKEN = 'xoxb-env-token'
@@ -136,7 +136,7 @@ describe('SlackBotCredentialManager', () => {
   })
 
   describe('setCredentials', () => {
-    test('stores bot and sets as current', async () => {
+    it('stores bot and sets as current', async () => {
       await manager.setCredentials(CREDS_A)
 
       const config = await manager.load()
@@ -144,7 +144,7 @@ describe('SlackBotCredentialManager', () => {
       expect(config.workspaces.T123.bots.deploy.token).toBe('xoxb-token-a')
     })
 
-    test('stores multiple bots in same workspace', async () => {
+    it('stores multiple bots in same workspace', async () => {
       await manager.setCredentials(CREDS_A)
       await manager.setCredentials(CREDS_B)
 
@@ -153,7 +153,7 @@ describe('SlackBotCredentialManager', () => {
       expect(config.current).toEqual({ workspace_id: 'T123', bot_id: 'alert' })
     })
 
-    test('stores bots across workspaces', async () => {
+    it('stores bots across workspaces', async () => {
       await manager.setCredentials(CREDS_A)
       await manager.setCredentials(CREDS_C)
 
@@ -163,7 +163,7 @@ describe('SlackBotCredentialManager', () => {
   })
 
   describe('listAll', () => {
-    test('returns all bots with current flag', async () => {
+    it('returns all bots with current flag', async () => {
       await manager.setCredentials(CREDS_A)
       await manager.setCredentials(CREDS_B)
 
@@ -176,7 +176,7 @@ describe('SlackBotCredentialManager', () => {
   })
 
   describe('setCurrent', () => {
-    test('switches current bot', async () => {
+    it('switches current bot', async () => {
       await manager.setCredentials(CREDS_A)
       await manager.setCredentials(CREDS_B)
 
@@ -187,13 +187,13 @@ describe('SlackBotCredentialManager', () => {
       expect(creds?.bot_id).toBe('deploy')
     })
 
-    test('returns false for unknown bot', async () => {
+    it('returns false for unknown bot', async () => {
       expect(await manager.setCurrent('nonexistent')).toBe(false)
     })
   })
 
   describe('removeBot', () => {
-    test('removes a bot by id', async () => {
+    it('removes a bot by id', async () => {
       await manager.setCredentials(CREDS_A)
       await manager.setCredentials(CREDS_B)
 
@@ -204,7 +204,7 @@ describe('SlackBotCredentialManager', () => {
       expect(Object.keys(config.workspaces.T123.bots)).toEqual(['alert'])
     })
 
-    test('removes workspace when last bot removed', async () => {
+    it('removes workspace when last bot removed', async () => {
       await manager.setCredentials(CREDS_A)
 
       await manager.removeBot('deploy')
@@ -213,7 +213,7 @@ describe('SlackBotCredentialManager', () => {
       expect(config.workspaces.T123).toBeUndefined()
     })
 
-    test('clears current when current bot removed', async () => {
+    it('clears current when current bot removed', async () => {
       await manager.setCredentials(CREDS_A)
 
       await manager.removeBot('deploy')
@@ -222,11 +222,11 @@ describe('SlackBotCredentialManager', () => {
       expect(config.current).toBeNull()
     })
 
-    test('returns false for unknown bot', async () => {
+    it('returns false for unknown bot', async () => {
       expect(await manager.removeBot('nonexistent')).toBe(false)
     })
 
-    test('returns false for ambiguous bot_id across workspaces', async () => {
+    it('returns false for ambiguous bot_id across workspaces', async () => {
       await manager.setCredentials(CREDS_A)
       await manager.setCredentials(CREDS_C)
 
@@ -240,7 +240,7 @@ describe('SlackBotCredentialManager', () => {
   })
 
   describe('clearCredentials', () => {
-    test('removes all credentials', async () => {
+    it('removes all credentials', async () => {
       await manager.setCredentials(CREDS_A)
       await manager.setCredentials(CREDS_B)
 
@@ -253,7 +253,7 @@ describe('SlackBotCredentialManager', () => {
   })
 
   describe('file permissions', () => {
-    test('saves file with secure permissions (600)', async () => {
+    it('saves file with secure permissions (600)', async () => {
       await manager.setCredentials(CREDS_A)
 
       const credPath = join(tempDir, 'slackbot-credentials.json')
@@ -262,4 +262,64 @@ describe('SlackBotCredentialManager', () => {
       expect(stats.mode & 0o777).toBe(0o600)
     })
   })
+
+  describe('schema validation', () => {
+    let stderrSpy: ReturnType<typeof mock>
+    let originalWrite: typeof process.stderr.write
+
+    beforeEach(() => {
+      originalWrite = process.stderr.write
+      stderrSpy = mock(() => true)
+      process.stderr.write = stderrSpy as unknown as typeof process.stderr.write
+    })
+
+    afterEach(() => {
+      process.stderr.write = originalWrite
+    })
+
+    it('returns empty config on invalid JSON', async () => {
+      const credPath = join(tempDir, 'slackbot-credentials.json')
+      await writeFile(credPath, '{not valid json')
+
+      const config = await manager.load()
+
+      expect(config.current).toBeNull()
+      expect(config.workspaces).toEqual({})
+    })
+
+    it('preserves entries when stored token does not match xoxb- prefix and warns to stderr', async () => {
+      const credPath = join(tempDir, 'slackbot-credentials.json')
+      await writeFile(
+        credPath,
+        JSON.stringify({
+          current: { workspace_id: 'T123', bot_id: 'deploy' },
+          workspaces: {
+            T123: {
+              workspace_id: 'T123',
+              workspace_name: 'Acme',
+              bots: {
+                deploy: { bot_id: 'deploy', bot_name: 'Deploy Bot', token: 'legacy-token-without-prefix' },
+              },
+            },
+          },
+        }),
+      )
+
+      const config = await manager.load()
+
+      expect(config.current).toEqual({ workspace_id: 'T123', bot_id: 'deploy' })
+      expect(config.workspaces['T123']?.bots['deploy']?.token).toBe('legacy-token-without-prefix')
+      expect(stderrSpy).toHaveBeenCalled()
+    })
+
+    it('returns empty config when JSON is valid but not an object', async () => {
+      const credPath = join(tempDir, 'slackbot-credentials.json')
+      await writeFile(credPath, JSON.stringify(['not', 'an', 'object']))
+
+      const config = await manager.load()
+
+      expect(config.current).toBeNull()
+      expect(config.workspaces).toEqual({})
+    })
+  })
 })

package/src/platforms/slackbot/credential-manager.ts

@@ -4,6 +4,7 @@ import { homedir } from 'node:os'
 import { join } from 'node:path'
 
 import type { SlackBotConfig, SlackBotCredentials, SlackBotWorkspace } from './types'
+import { SlackBotConfigSchema } from './types'
 
 export class SlackBotCredentialManager {
   private configDir: string
@@ -20,12 +21,41 @@ export class SlackBotCredentialManager {
     }
 
     const content = await readFile(this.credentialsPath, 'utf-8')
-    return JSON.parse(content) as SlackBotConfig
+    let json: unknown
+    try {
+      json = JSON.parse(content)
+    } catch {
+      return { current: null, workspaces: {} }
+    }
+    const parsed = SlackBotConfigSchema.safeParse(json)
+    if (parsed.success) {
+      return parsed.data
+    }
+    // Schema validation failed (e.g., a stored token from a third-party tool does not
+    // start with xoxb-, or a future schema added new required fields). Fall back to the
+    // raw object to preserve existing entries; the runtime will surface real auth errors
+    // when the token is actually used. This matches pre-validation behavior so upgrades
+    // never silently empty a user's credentials file.
+    process.stderr.write(
+      `[agent-slackbot] Warning: credentials file at ${this.credentialsPath} did not match the expected schema. Using raw values; run "auth set" to fix.\n`,
+    )
+    return this.coerceLooseConfig(json)
+  }
+
+  private coerceLooseConfig(raw: unknown): SlackBotConfig {
+    if (!raw || typeof raw !== 'object') {
+      return { current: null, workspaces: {} }
+    }
+    const obj = raw as Partial<SlackBotConfig>
+    return {
+      current: obj.current ?? null,
+      workspaces: obj.workspaces ?? {},
+    }
   }
 
   async save(config: SlackBotConfig): Promise<void> {
     await mkdir(this.configDir, { recursive: true })
-    await writeFile(this.credentialsPath, JSON.stringify(config, null, 2))
+    await writeFile(this.credentialsPath, JSON.stringify(config, null, 2), { mode: 0o600 })
     await chmod(this.credentialsPath, 0o600)
   }
 

package/src/platforms/slackbot/index.test.ts

@@ -0,0 +1,59 @@
+import { expect, it } from 'bun:test'
+
+import {
+  SlackBotClient,
+  SlackBotConfigSchema,
+  SlackBotCredentialManager,
+  SlackBotCredentialsSchema,
+  SlackBotError,
+  SlackBotListener,
+  SlackChannelSchema,
+  SlackFileSchema,
+  SlackMessageSchema,
+  SlackReactionSchema,
+  SlackUserSchema,
+} from '@/platforms/slackbot/index'
+
+it('SlackBotClient is exported from barrel', () => {
+  expect(typeof SlackBotClient).toBe('function')
+})
+
+it('SlackBotError is exported from barrel', () => {
+  expect(typeof SlackBotError).toBe('function')
+})
+
+it('SlackBotCredentialManager is exported from barrel', () => {
+  expect(typeof SlackBotCredentialManager).toBe('function')
+})
+
+it('SlackBotListener is exported from barrel', () => {
+  expect(typeof SlackBotListener).toBe('function')
+})
+
+it('SlackBotConfigSchema is exported from barrel', () => {
+  expect(typeof SlackBotConfigSchema.parse).toBe('function')
+})
+
+it('SlackBotCredentialsSchema is exported from barrel', () => {
+  expect(typeof SlackBotCredentialsSchema.parse).toBe('function')
+})
+
+it('SlackChannelSchema is exported from barrel', () => {
+  expect(typeof SlackChannelSchema.parse).toBe('function')
+})
+
+it('SlackMessageSchema is exported from barrel', () => {
+  expect(typeof SlackMessageSchema.parse).toBe('function')
+})
+
+it('SlackUserSchema is exported from barrel', () => {
+  expect(typeof SlackUserSchema.parse).toBe('function')
+})
+
+it('SlackReactionSchema is exported from barrel', () => {
+  expect(typeof SlackReactionSchema.parse).toBe('function')
+})
+
+it('SlackFileSchema is exported from barrel', () => {
+  expect(typeof SlackFileSchema.parse).toBe('function')
+})

package/src/platforms/slackbot/index.ts

@@ -1,19 +1,43 @@
 export { SlackBotClient } from './client'
 export { SlackBotCredentialManager } from './credential-manager'
-export {
+export { SlackBotListener } from './listener'
+export type { SlackBotListenerOptions } from './listener'
+export type {
   SlackBotConfig,
-  SlackBotConfigSchema,
   SlackBotCredentials,
+  SlackBotListenerEventMap,
+  SlackChannel,
+  SlackFile,
+  SlackMessage,
+  SlackReaction,
+  SlackSocketModeAck,
+  SlackSocketModeAppMentionEvent,
+  SlackSocketModeChannelEvent,
+  SlackSocketModeDisconnectEnvelope,
+  SlackSocketModeDisconnectReason,
+  SlackSocketModeEnvelope,
+  SlackSocketModeEvent,
+  SlackSocketModeEventsApiArgs,
+  SlackSocketModeEventsApiEnvelope,
+  SlackSocketModeGenericEnvelope,
+  SlackSocketModeGenericEvent,
+  SlackSocketModeHelloEnvelope,
+  SlackSocketModeInteractiveArgs,
+  SlackSocketModeInteractiveEnvelope,
+  SlackSocketModeMemberChannelEvent,
+  SlackSocketModeMessageEvent,
+  SlackSocketModeReactionEvent,
+  SlackSocketModeSlashCommandArgs,
+  SlackSocketModeSlashCommandEnvelope,
+  SlackUser,
+} from './types'
+export {
+  SlackBotConfigSchema,
   SlackBotCredentialsSchema,
   SlackBotError,
-  SlackChannel,
   SlackChannelSchema,
-  SlackFile,
   SlackFileSchema,
-  SlackMessage,
   SlackMessageSchema,
-  SlackReaction,
   SlackReactionSchema,
-  SlackUser,
   SlackUserSchema,
 } from './types'