agent-messenger 2.23.1 → 2.23.3

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

@@ -14,6 +14,7 @@ import { WebexClient } from '../client'
 import { WebexCredentialManager } from '../credential-manager'
 import { loginWithPassword, WEB_CLIENT_ID, WEB_CLIENT_SECRET } from '../password-login'
 import { WebexTokenExtractor } from '../token-extractor'
+import type { WebexPerson } from '../types'
 import { WebexError } from '../types'
 
 interface ResolvedCredentials {
@@ -21,6 +22,10 @@ interface ResolvedCredentials {
   clientSecret: string
 }
 
+function formatAuthUser(person: WebexPerson) {
+  return { id: person.id, ref: person.ref, displayName: person.displayName, emails: person.emails }
+}
+
 async function openBrowser(url: string): Promise<void> {
   const { exec } = await import('node:child_process')
   const command =
@@ -170,7 +175,7 @@ async function loginWithToken(credManager: WebexCredentialManager, token: string
   console.log(
     formatOutput(
       {
-        user: { id: person.id, displayName: person.displayName, emails: person.emails },
+        user: formatAuthUser(person),
         authenticated: true,
       },
       pretty,
@@ -205,7 +210,7 @@ async function loginWithEmailPassword(
     formatOutput(
       {
         authenticated: true,
-        user: { id: person.id, displayName: person.displayName, emails: person.emails },
+        user: formatAuthUser(person),
       },
       options.pretty,
     ),
@@ -259,7 +264,7 @@ export async function oauthAction(options: OAuthOptions): Promise<void> {
     console.log(
       formatOutput(
         {
-          user: { id: person.id, displayName: person.displayName, emails: person.emails },
+          user: formatAuthUser(person),
           authenticated: true,
         },
         options.pretty,
@@ -308,7 +313,7 @@ async function finishDeviceGrant(credManager: WebexCredentialManager, options: O
       formatOutput(
         {
           authenticated: true,
-          user: { id: person.id, displayName: person.displayName, emails: person.emails },
+          user: formatAuthUser(person),
         },
         options.pretty,
       ),
@@ -364,7 +369,7 @@ export async function statusAction(options: { pretty?: boolean }): Promise<void>
         formatOutput(
           {
             authenticated: true,
-            user: { id: person.id, displayName: person.displayName, emails: person.emails },
+            user: formatAuthUser(person),
           },
           options.pretty,
         ),
@@ -436,11 +441,11 @@ export async function extractAction(options: {
       tokenType: 'extracted',
     })
 
-    let person: { id: string; displayName: string; emails: string[] } | null = null
+    let person: ReturnType<typeof formatAuthUser> | null = null
     try {
       const result = await client.testAuth()
       if (result.id) {
-        person = { id: result.id, displayName: result.displayName, emails: result.emails }
+        person = formatAuthUser(result)
       }
     } catch (authError) {
       const isAuthFailure =

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

@@ -3,20 +3,32 @@ import { afterEach, beforeEach, describe, expect, spyOn, it } from 'bun:test'
 import { WebexClient } from '../client'
 import { WebexError } from '../types'
 
+const restId = (type: string, ref: string) => Buffer.from(`ciscospark://us/${type}/${ref}`).toString('base64url')
+const member1Id = restId('MEMBERSHIP', 'person-1:room-1')
+const member2Id = restId('MEMBERSHIP', 'person-2:room-1')
+const person1Id = restId('PEOPLE', 'person-1')
+const person2Id = restId('PEOPLE', 'person-2')
+
 const mockMembers = [
   {
-    id: 'mem-1',
+    id: member1Id,
+    ref: 'person-1:room-1',
     roomId: 'room-1',
-    personId: 'person-1',
+    roomRef: 'room-1',
+    personId: person1Id,
+    personRef: 'person-1',
     personEmail: 'alice@example.com',
     personDisplayName: 'Alice',
     isModerator: true,
     created: '2024-01-01T00:00:00.000Z',
   },
   {
-    id: 'mem-2',
+    id: member2Id,
+    ref: 'person-2:room-1',
     roomId: 'room-1',
-    personId: 'person-2',
+    roomRef: 'room-1',
+    personId: person2Id,
+    personRef: 'person-2',
     personEmail: 'bob@example.com',
     personDisplayName: 'Bob',
     isModerator: false,
@@ -66,16 +78,20 @@ describe('member commands', () => {
     expect(consoleSpy).toHaveBeenCalledWith(
       JSON.stringify([
         {
-          id: 'mem-1',
-          personId: 'person-1',
+          id: member1Id,
+          ref: 'person-1:room-1',
+          personId: person1Id,
+          personRef: 'person-1',
           personEmail: 'alice@example.com',
           personDisplayName: 'Alice',
           isModerator: true,
           created: '2024-01-01T00:00:00.000Z',
         },
         {
-          id: 'mem-2',
-          personId: 'person-2',
+          id: member2Id,
+          ref: 'person-2:room-1',
+          personId: person2Id,
+          personRef: 'person-2',
           personEmail: 'bob@example.com',
           personDisplayName: 'Bob',
           isModerator: false,

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

@@ -12,7 +12,9 @@ export async function listAction(spaceId: string, options: { limit?: number; pre
 
     const output = members.map((m) => ({
       id: m.id,
+      ref: m.ref,
       personId: m.personId,
+      personRef: m.personRef,
       personEmail: m.personEmail,
       personDisplayName: m.personDisplayName,
       isModerator: m.isModerator,

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

@@ -1,26 +1,38 @@
 import { afterEach, beforeEach, expect, spyOn, it } from 'bun:test'
 
 import { WebexClient } from '../client'
+import { toRestId } from '../id-normalizer'
 import { WebexError } from '../types'
 
+const messageId = toRestId('msg_123', 'MESSAGE')
+const message2Id = toRestId('msg_124', 'MESSAGE')
+const roomId = toRestId('space_456', 'ROOM')
+const personId = toRestId('person_789', 'PEOPLE')
+
 const mockMessage = {
-  id: 'msg_123',
-  roomId: 'space_456',
+  id: messageId,
+  ref: 'msg_123',
+  roomId,
+  roomRef: 'space_456',
   roomType: 'group' as const,
   text: 'Hello world',
   html: '<p>Hello <a href="https://example.com">world</a></p>',
-  personId: 'person_789',
+  personId,
+  personRef: 'person_789',
   personEmail: 'user@example.com',
   created: '2025-01-29T10:00:00.000Z',
 }
 
 const mockMessage2 = {
-  id: 'msg_124',
-  roomId: 'space_456',
+  id: message2Id,
+  ref: 'msg_124',
+  roomId,
+  roomRef: 'space_456',
   roomType: 'group' as const,
   text: 'Second message',
   html: '<p>Second message</p>',
-  personId: 'person_789',
+  personId,
+  personRef: 'person_789',
   personEmail: 'user@example.com',
   created: '2025-01-29T10:01:00.000Z',
 }
@@ -78,10 +90,12 @@ it('calls sendMessage with correct args and outputs result', async () => {
     markdown: undefined,
   })
   expect(consoleLogSpy).toHaveBeenCalled()
-  const output = consoleLogSpy.mock.calls[0][0]
-  expect(output).toContain('msg_123')
-  expect(output).toContain('space_456')
-  expect(output).toContain('user@example.com')
+  const output = JSON.parse(consoleLogSpy.mock.calls[0][0] as string)
+  expect(output.id).toBe(messageId)
+  expect(output.ref).toBe('msg_123')
+  expect(output.roomId).toBe(roomId)
+  expect(output.roomRef).toBe('space_456')
+  expect(output.personEmail).toBe('user@example.com')
   expect(mockDispose).toHaveBeenCalled()
 })
 
@@ -115,8 +129,8 @@ it('calls sendDirectMessage with email and text', async () => {
     markdown: undefined,
   })
   expect(consoleLogSpy).toHaveBeenCalled()
-  const output = consoleLogSpy.mock.calls[0][0]
-  expect(output).toContain('msg_123')
+  const output = JSON.parse(consoleLogSpy.mock.calls[0][0] as string)
+  expect(output.ref).toBe('msg_123')
 })
 
 it('passes markdown option to sendDirectMessage when --markdown flag is set', async () => {
@@ -132,10 +146,10 @@ it('calls listMessages with limit and outputs array', async () => {
 
   expect(mockListMessages).toHaveBeenCalledWith('space_456', { max: 50 })
   expect(consoleLogSpy).toHaveBeenCalled()
-  const output = consoleLogSpy.mock.calls[0][0]
-  expect(output).toContain('msg_123')
-  expect(output).toContain('msg_124')
-  expect(output).toContain('https://example.com')
+  const output = JSON.parse(consoleLogSpy.mock.calls[0][0] as string)
+  expect(output[0].ref).toBe('msg_123')
+  expect(output[1].ref).toBe('msg_124')
+  expect(output[0].html).toContain('https://example.com')
 })
 
 it('calls getMessage with correct id and outputs result', async () => {
@@ -143,10 +157,10 @@ it('calls getMessage with correct id and outputs result', async () => {
 
   expect(mockGetMessage).toHaveBeenCalledWith('msg_123')
   expect(consoleLogSpy).toHaveBeenCalled()
-  const output = consoleLogSpy.mock.calls[0][0]
-  expect(output).toContain('msg_123')
-  expect(output).toContain('user@example.com')
-  expect(output).toContain('https://example.com')
+  const output = JSON.parse(consoleLogSpy.mock.calls[0][0] as string)
+  expect(output.ref).toBe('msg_123')
+  expect(output.personEmail).toBe('user@example.com')
+  expect(output.html).toContain('https://example.com')
 })
 
 it('calls deleteMessage and outputs deleted id when --force flag is set', async () => {
@@ -178,9 +192,9 @@ it('calls editMessage with roomId in args and outputs result', async () => {
     markdown: undefined,
   })
   expect(consoleLogSpy).toHaveBeenCalled()
-  const output = consoleLogSpy.mock.calls[0][0]
-  expect(output).toContain('msg_123')
-  expect(output).toContain('Updated message')
+  const output = JSON.parse(consoleLogSpy.mock.calls[0][0] as string)
+  expect(output.ref).toBe('msg_123')
+  expect(output.text).toBe('Updated message')
   expect(mockDispose).toHaveBeenCalled()
 })
 

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

@@ -9,7 +9,9 @@ import type { WebexMessage } from '../types'
 function formatMessageOutput(message: WebexMessage) {
   return {
     id: message.id,
+    ref: message.ref,
     roomId: message.roomId,
+    roomRef: message.roomRef,
     text: message.text,
     html: message.html,
     personEmail: message.personEmail,

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

@@ -3,32 +3,38 @@ import { afterEach, beforeEach, describe, expect, spyOn, it } from 'bun:test'
 import { WebexClient } from '../client'
 import { WebexError } from '../types'
 
+const restId = (type: string, ref: string) => Buffer.from(`ciscospark://us/${type}/${ref}`).toString('base64url')
+const space1Id = restId('ROOM', 'space-1')
+const space2Id = restId('ROOM', 'space-2')
+const member1Id = restId('MEMBERSHIP', 'person-1:space-1')
+const person1Id = restId('PEOPLE', 'person-1')
+
 const mockSpaces = [
   {
-    id: 'space-1',
+    id: space1Id,
     title: 'General',
     type: 'group',
     isLocked: false,
     lastActivity: '2024-01-15T00:00:00.000Z',
     created: '2024-01-01T00:00:00.000Z',
-    creatorId: 'person-1',
+    creatorId: person1Id,
   },
   {
-    id: 'space-2',
+    id: space2Id,
     title: 'Random',
     type: 'group',
     isLocked: false,
     lastActivity: '2024-01-14T00:00:00.000Z',
     created: '2024-01-01T00:00:00.000Z',
-    creatorId: 'person-1',
+    creatorId: person1Id,
   },
 ]
 
 const mockMyMemberships = [
   {
-    id: 'mem-1',
-    roomId: 'space-1',
-    personId: 'person-1',
+    id: member1Id,
+    roomId: space1Id,
+    personId: person1Id,
     personEmail: 'alice@example.com',
     personDisplayName: 'Alice',
     isModerator: true,
@@ -77,7 +83,8 @@ describe('snapshot command', () => {
     expect(consoleSpy).toHaveBeenCalled()
     const output = JSON.parse(consoleSpy.mock.calls[consoleSpy.mock.calls.length - 1][0])
     expect(output.spaces).toHaveLength(1)
-    expect(output.spaces[0].id).toBe('space-1')
+    expect(output.spaces[0].id).toBe(space1Id)
+    expect(output.spaces[0].ref).toBe('space-1')
     expect(output.spaces[0].title).toBe('General')
     expect(output.spaces[0].type).toBeUndefined()
     expect(output.hint).toBeDefined()
@@ -89,7 +96,8 @@ describe('snapshot command', () => {
     expect(consoleSpy).toHaveBeenCalled()
     const output = JSON.parse(consoleSpy.mock.calls[consoleSpy.mock.calls.length - 1][0])
     expect(output.spaces).toHaveLength(1)
-    expect(output.spaces[0].id).toBe('space-1')
+    expect(output.spaces[0].id).toBe(space1Id)
+    expect(output.spaces[0].ref).toBe('space-1')
     expect(output.spaces[0].title).toBe('General')
     expect(output.spaces[0].type).toBe('group')
     expect(output.spaces[0].lastActivity).toBe('2024-01-15T00:00:00.000Z')
@@ -101,7 +109,7 @@ describe('snapshot command', () => {
 
     const output = JSON.parse(consoleSpy.mock.calls[consoleSpy.mock.calls.length - 1][0])
     expect(output.spaces).toHaveLength(1)
-    expect(output.spaces[0].id).toBe('space-1')
+    expect(output.spaces[0].id).toBe(space1Id)
   })
 
   it('exits with code 1 when not authenticated', async () => {

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

@@ -4,6 +4,7 @@ import { handleError } from '@/shared/utils/error-handler'
 import { formatOutput } from '@/shared/utils/output'
 
 import { WebexClient } from '../client'
+import { toRef } from '../id-normalizer'
 
 export async function snapshotAction(options: { full?: boolean; pretty?: boolean }): Promise<void> {
   try {
@@ -19,11 +20,12 @@ export async function snapshotAction(options: { full?: boolean; pretty?: boolean
       spaces: options.full
         ? spaces.map((s) => ({
             id: s.id,
+            ref: toRef(s.id),
             title: s.title,
             type: s.type,
             lastActivity: s.lastActivity,
           }))
-        : spaces.map((s) => ({ id: s.id, title: s.title })),
+        : spaces.map((s) => ({ id: s.id, ref: toRef(s.id), title: s.title })),
     }
 
     if (!options.full) {

package/src/platforms/webex/commands/space.test.ts

@@ -3,36 +3,43 @@ import { afterEach, beforeEach, describe, expect, spyOn, it } from 'bun:test'
 import { WebexClient } from '../client'
 import { WebexError } from '../types'
 
+const restId = (type: string, ref: string) => Buffer.from(`ciscospark://us/${type}/${ref}`).toString('base64url')
+const space1Id = restId('ROOM', 'space-1')
+const space2Id = restId('ROOM', 'space-2')
+const person1Id = restId('PEOPLE', 'person-1')
+const person2Id = restId('PEOPLE', 'person-2')
+const teamId = restId('TEAM', 'team-abc')
+
 const mockSpaces = [
   {
-    id: 'space-1',
+    id: space1Id,
     title: 'General',
     type: 'group' as const,
     isLocked: false,
     lastActivity: '2024-01-02T00:00:00.000Z',
     created: '2024-01-01T00:00:00.000Z',
-    creatorId: 'person-1',
+    creatorId: person1Id,
   },
   {
-    id: 'space-2',
+    id: space2Id,
     title: 'Direct with Alice',
     type: 'direct' as const,
     isLocked: false,
     lastActivity: '2024-01-03T00:00:00.000Z',
     created: '2024-01-01T00:00:00.000Z',
-    creatorId: 'person-2',
+    creatorId: person2Id,
   },
 ]
 
 const mockSpace = {
-  id: 'space-1',
+  id: space1Id,
   title: 'General',
   type: 'group' as const,
   isLocked: false,
-  teamId: 'team-abc',
+  teamId,
   lastActivity: '2024-01-02T00:00:00.000Z',
   created: '2024-01-01T00:00:00.000Z',
-  creatorId: 'person-1',
+  creatorId: person1Id,
 }
 
 import { infoAction, listAction } from './space'
@@ -79,14 +86,16 @@ describe('listAction', () => {
     expect(consoleLogSpy).toHaveBeenCalledWith(
       JSON.stringify([
         {
-          id: 'space-1',
+          id: space1Id,
+          ref: 'space-1',
           title: 'General',
           type: 'group',
           lastActivity: '2024-01-02T00:00:00.000Z',
           created: '2024-01-01T00:00:00.000Z',
         },
         {
-          id: 'space-2',
+          id: space2Id,
+          ref: 'space-2',
           title: 'Direct with Alice',
           type: 'direct',
           lastActivity: '2024-01-03T00:00:00.000Z',
@@ -115,14 +124,16 @@ describe('listAction', () => {
       JSON.stringify(
         [
           {
-            id: 'space-1',
+            id: space1Id,
+            ref: 'space-1',
             title: 'General',
             type: 'group',
             lastActivity: '2024-01-02T00:00:00.000Z',
             created: '2024-01-01T00:00:00.000Z',
           },
           {
-            id: 'space-2',
+            id: space2Id,
+            ref: 'space-2',
             title: 'Direct with Alice',
             type: 'direct',
             lastActivity: '2024-01-03T00:00:00.000Z',
@@ -152,14 +163,17 @@ describe('infoAction', () => {
     expect(mockGetSpace).toHaveBeenCalledWith('space-1')
     expect(consoleLogSpy).toHaveBeenCalledWith(
       JSON.stringify({
-        id: 'space-1',
+        id: space1Id,
+        ref: 'space-1',
         title: 'General',
         type: 'group',
         isLocked: false,
-        teamId: 'team-abc',
+        teamId,
+        teamRef: 'team-abc',
         lastActivity: '2024-01-02T00:00:00.000Z',
         created: '2024-01-01T00:00:00.000Z',
-        creatorId: 'person-1',
+        creatorId: person1Id,
+        creatorRef: 'person-1',
       }),
     )
   })
@@ -171,8 +185,10 @@ describe('infoAction', () => {
 
     const output = JSON.parse(consoleLogSpy.mock.calls[0][0] as string) as {
       teamId: null
+      teamRef: null
     }
     expect(output.teamId).toBeNull()
+    expect(output.teamRef).toBeNull()
   })
 
   it('outputs pretty-printed JSON when pretty is true', async () => {
@@ -181,14 +197,17 @@ describe('infoAction', () => {
     expect(consoleLogSpy).toHaveBeenCalledWith(
       JSON.stringify(
         {
-          id: 'space-1',
+          id: space1Id,
+          ref: 'space-1',
           title: 'General',
           type: 'group',
           isLocked: false,
-          teamId: 'team-abc',
+          teamId,
+          teamRef: 'team-abc',
           lastActivity: '2024-01-02T00:00:00.000Z',
           created: '2024-01-01T00:00:00.000Z',
-          creatorId: 'person-1',
+          creatorId: person1Id,
+          creatorRef: 'person-1',
         },
         null,
         2,

package/src/platforms/webex/commands/space.ts

@@ -4,6 +4,7 @@ import { handleError } from '@/shared/utils/error-handler'
 import { formatOutput } from '@/shared/utils/output'
 
 import { WebexClient } from '../client'
+import { toRef } from '../id-normalizer'
 
 export async function listAction(options: { type?: string; limit?: number; pretty?: boolean }): Promise<void> {
   try {
@@ -11,6 +12,7 @@ export async function listAction(options: { type?: string; limit?: number; prett
     const spaces = await client.listSpaces({ type: options.type, max: options.limit })
     const output = spaces.map((s) => ({
       id: s.id,
+      ref: toRef(s.id),
       title: s.title,
       type: s.type,
       lastActivity: s.lastActivity,
@@ -28,13 +30,16 @@ export async function infoAction(spaceId: string, options: { pretty?: boolean })
     const space = await client.getSpace(spaceId)
     const output = {
       id: space.id,
+      ref: toRef(space.id),
       title: space.title,
       type: space.type,
       isLocked: space.isLocked,
       teamId: space.teamId || null,
+      teamRef: space.teamId ? toRef(space.teamId) : null,
       lastActivity: space.lastActivity,
       created: space.created,
       creatorId: space.creatorId,
+      creatorRef: toRef(space.creatorId),
     }
     console.log(formatOutput(output, options.pretty))
   } catch (error) {

package/src/platforms/webex/commands/whoami.test.ts

@@ -1,18 +1,24 @@
 import { afterEach, beforeEach, expect, spyOn, it } from 'bun:test'
 
 import { WebexClient } from '../client'
+import { toRestId } from '../id-normalizer'
 import { WebexError } from '../types'
 import { whoamiCommand } from './whoami'
 
+const orgId = Buffer.from('ciscospark://us/ORGANIZATION/org-123').toString('base64url')
+const personId = toRestId('person-123', 'PEOPLE')
+
 const mockUser = {
-  id: 'person-123',
+  id: personId,
+  ref: 'person-123',
   emails: ['test@example.com'],
   displayName: 'Test User',
   nickName: 'Testy',
   firstName: 'Test',
   lastName: 'User',
   avatar: 'https://example.com/avatar.jpg',
-  orgId: 'org-123',
+  orgId,
+  orgRef: 'org-123',
   type: 'person' as const,
   created: '2024-01-01T00:00:00.000Z',
 }
@@ -58,14 +64,16 @@ it('whoami calls testAuth and outputs user fields', async () => {
   // then: outputs all expected fields
   expect(consoleLogSpy).toHaveBeenCalledWith(
     JSON.stringify({
-      id: 'person-123',
+      id: personId,
+      ref: 'person-123',
       emails: ['test@example.com'],
       displayName: 'Test User',
       nickName: 'Testy',
       firstName: 'Test',
       lastName: 'User',
       avatar: 'https://example.com/avatar.jpg',
-      orgId: 'org-123',
+      orgId,
+      orgRef: 'org-123',
       type: 'person',
     }),
   )
@@ -80,14 +88,16 @@ it('whoami outputs pretty-printed JSON when --pretty flag is passed', async () =
   expect(consoleLogSpy).toHaveBeenCalledWith(
     JSON.stringify(
       {
-        id: 'person-123',
+        id: personId,
+        ref: 'person-123',
         emails: ['test@example.com'],
         displayName: 'Test User',
         nickName: 'Testy',
         firstName: 'Test',
         lastName: 'User',
         avatar: 'https://example.com/avatar.jpg',
-        orgId: 'org-123',
+        orgId,
+        orgRef: 'org-123',
         type: 'person',
       },
       null,

package/src/platforms/webex/commands/whoami.ts

@@ -12,6 +12,7 @@ export async function whoamiAction(options: { pretty?: boolean }): Promise<void>
 
     const output = {
       id: user.id,
+      ref: user.ref,
       emails: user.emails,
       displayName: user.displayName,
       nickName: user.nickName,
@@ -19,6 +20,7 @@ export async function whoamiAction(options: { pretty?: boolean }): Promise<void>
       lastName: user.lastName,
       avatar: user.avatar,
       orgId: user.orgId,
+      orgRef: user.orgRef,
       type: user.type,
     }
     console.log(formatOutput(output, options.pretty))