agent-messenger 2.23.1 → 2.23.2

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

@@ -2,13 +2,16 @@ import { Command } from 'commander'
 
 import { cliOutput } from '@/shared/utils/cli-output'
 
+import { toRef } from '../../webex/id-normalizer'
 import type { WebexMessage } from '../../webex/types'
 import type { BotOption } from './shared'
 import { getClient } from './shared'
 
 interface MessageResult {
   id?: string
+  ref?: string
   roomId?: string
+  roomRef?: string
   text?: string
   markdown?: string
   html?: string
@@ -16,7 +19,9 @@ interface MessageResult {
   created?: string
   messages?: Array<{
     id: string
+    ref: string
     roomId: string
+    roomRef: string
     text?: string
     personEmail: string
     created: string
@@ -28,7 +33,9 @@ interface MessageResult {
 function formatMessage(message: WebexMessage): MessageResult {
   return {
     id: message.id,
+    ref: toRef(message.id),
     roomId: message.roomId,
+    roomRef: toRef(message.roomId),
     text: message.text,
     markdown: message.markdown,
     html: message.html,
@@ -81,7 +88,9 @@ export async function repliesAction(
     return {
       messages: messages.map((msg) => ({
         id: msg.id,
+        ref: toRef(msg.id),
         roomId: msg.roomId,
+        roomRef: toRef(msg.roomId),
         text: msg.text,
         personEmail: msg.personEmail,
         created: msg.created,
@@ -116,7 +125,9 @@ export async function listAction(space: string, options: BotOption & { max?: str
     return {
       messages: messages.map((msg) => ({
         id: msg.id,
+        ref: toRef(msg.id),
         roomId: msg.roomId,
+        roomRef: toRef(msg.roomId),
         text: msg.text,
         personEmail: msg.personEmail,
         created: msg.created,

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

@@ -2,17 +2,20 @@ import { Command } from 'commander'
 
 import { cliOutput } from '@/shared/utils/cli-output'
 
+import { toRef } from '../../webex/id-normalizer'
 import type { BotOption } from './shared'
 import { getClient } from './shared'
 
 interface SnapshotResult {
   bot?: {
     id: string
+    ref: string
     displayName: string
     emails: string[]
   }
   spaces?: Array<{
     id: string
+    ref: string
     title: string
     type?: 'group' | 'direct'
     lastActivity?: string
@@ -31,12 +34,19 @@ export async function snapshotAction(options: BotOption & { full?: boolean; max?
     const result: SnapshotResult = {
       bot: {
         id: me.id,
+        ref: toRef(me.id),
         displayName: me.displayName,
         emails: me.emails,
       },
       spaces: options.full
-        ? spaces.map((s) => ({ id: 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,
+            type: s.type,
+            lastActivity: s.lastActivity,
+          }))
+        : spaces.map((s) => ({ id: s.id, ref: toRef(s.id), title: s.title })),
     }
 
     if (!options.full) {

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

@@ -2,20 +2,25 @@ import { Command } from 'commander'
 
 import { cliOutput } from '@/shared/utils/cli-output'
 
+import { toRef } from '../../webex/id-normalizer'
 import type { BotOption } from './shared'
 import { getClient } from './shared'
 
 interface SpaceResult {
   id?: string
+  ref?: string
   title?: string
   type?: 'group' | 'direct'
   isLocked?: boolean
   teamId?: string | null
+  teamRef?: string | null
   lastActivity?: string
   created?: string
   creatorId?: string
+  creatorRef?: string
   spaces?: Array<{
     id: string
+    ref: string
     title: string
     type: 'group' | 'direct'
     lastActivity: string
@@ -33,6 +38,7 @@ export async function listAction(options: BotOption & { max?: string; type?: str
     return {
       spaces: spaces.map((s) => ({
         id: s.id,
+        ref: toRef(s.id),
         title: s.title,
         type: s.type,
         lastActivity: s.lastActivity,
@@ -50,13 +56,16 @@ export async function infoAction(spaceId: string, options: BotOption): Promise<S
     const space = await client.getSpace(spaceId)
     return {
       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),
     }
   } catch (error) {
     return { error: (error as Error).message }

package/src/platforms/webexbot/commands/user.test.ts

@@ -4,13 +4,17 @@ import { mkdir } from 'node:fs/promises'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
 
+const restId = (type: string, ref: string) => Buffer.from(`ciscospark://us/${type}/${ref}`).toString('base64url')
+const personId = restId('PEOPLE', 'p1')
+const orgId = restId('ORGANIZATION', 'o1')
+
 const mockListPeople = mock(() =>
   Promise.resolve([
     {
-      id: 'p1',
+      id: personId,
       emails: ['alice@example.com'],
       displayName: 'Alice',
-      orgId: 'o1',
+      orgId,
       type: 'person' as const,
       created: '',
     },
@@ -19,10 +23,10 @@ const mockListPeople = mock(() =>
 
 const mockGetPerson = mock(() =>
   Promise.resolve({
-    id: 'p1',
+    id: personId,
     emails: ['alice@example.com'],
     displayName: 'Alice',
-    orgId: 'o1',
+    orgId,
     type: 'person' as const,
     created: '2024-01-01T00:00:00Z',
   }),
@@ -65,13 +69,15 @@ describe('webexbot user commands', () => {
 
     expect(result.users).toHaveLength(1)
     expect(result.users?.[0].displayName).toBe('Alice')
+    expect(result.users?.[0].ref).toBe('p1')
     expect(mockListPeople).toHaveBeenCalled()
   })
 
   it('gets a person by id', async () => {
     const result = await infoAction('p1', { _credManager: manager })
 
-    expect(result.id).toBe('p1')
+    expect(result.id).toBe(personId)
+    expect(result.ref).toBe('p1')
     expect(result.displayName).toBe('Alice')
   })
 })

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

@@ -2,12 +2,14 @@ import { Command } from 'commander'
 
 import { cliOutput } from '@/shared/utils/cli-output'
 
+import { toRef } from '../../webex/id-normalizer'
 import type { WebexPerson } from '../../webex/types'
 import type { BotOption } from './shared'
 import { getClient } from './shared'
 
 interface UserResult {
   id?: string
+  ref?: string
   emails?: string[]
   displayName?: string
   nickName?: string
@@ -15,10 +17,12 @@ interface UserResult {
   lastName?: string
   avatar?: string
   orgId?: string
+  orgRef?: string
   type?: 'person' | 'bot'
   created?: string
   users?: Array<{
     id: string
+    ref: string
     emails: string[]
     displayName: string
     type: 'person' | 'bot'
@@ -29,6 +33,7 @@ interface UserResult {
 function formatPerson(person: WebexPerson): UserResult {
   return {
     id: person.id,
+    ref: toRef(person.id),
     emails: person.emails,
     displayName: person.displayName,
     nickName: person.nickName,
@@ -36,6 +41,7 @@ function formatPerson(person: WebexPerson): UserResult {
     lastName: person.lastName,
     avatar: person.avatar,
     orgId: person.orgId,
+    orgRef: toRef(person.orgId),
     type: person.type,
     created: person.created,
   }
@@ -52,6 +58,7 @@ export async function listAction(
     return {
       users: people.map((p) => ({
         id: p.id,
+        ref: toRef(p.id),
         emails: p.emails,
         displayName: p.displayName,
         type: p.type,

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

@@ -2,15 +2,18 @@ import { Command } from 'commander'
 
 import { cliOutput } from '@/shared/utils/cli-output'
 
+import { toRef } from '../../webex/id-normalizer'
 import type { BotOption } from './shared'
 import { getClient } from './shared'
 
 interface WhoamiResult {
   id?: string
+  ref?: string
   emails?: string[]
   displayName?: string
   avatar?: string
   orgId?: string
+  orgRef?: string
   type?: 'person' | 'bot'
   created?: string
   error?: string
@@ -22,10 +25,12 @@ export async function whoamiAction(options: BotOption): Promise<WhoamiResult> {
     const info = await client.testAuth()
     return {
       id: info.id,
+      ref: toRef(info.id),
       emails: info.emails,
       displayName: info.displayName,
       avatar: info.avatar,
       orgId: info.orgId,
+      orgRef: toRef(info.orgId),
       type: info.type,
       created: info.created,
     }

package/src/platforms/webexbot/index.ts

@@ -1,7 +1,7 @@
 export { WebexBotClient } from './client'
 export { WebexBotCredentialManager } from './credential-manager'
-export { fromRestId, toRestId } from '../webex/id-normalizer'
-export type { WebexRestIdType } from '../webex/id-normalizer'
+export { decodeWebexId, fromRestId, toRef, toRestId } from '../webex/id-normalizer'
+export type { DecodedWebexId, WebexRestIdType } from '../webex/id-normalizer'
 export { WebexBotListener } from './listener'
 export type { WebexBotListenerOptions } from './listener'
 export type { WebexBotConfig, WebexBotCredentials, WebexBotEntry, WebexBotListenerEventMap } from './types'

package/src/tui/adapters/types.ts

@@ -1,12 +1,15 @@
 export interface UnifiedChannel {
   id: string
+  ref?: string
   name: string
   parentId?: string
 }
 
 export interface UnifiedMessage {
   id: string
+  ref?: string
   channelId: string
+  channelRef?: string
   author: string
   content: string
   timestamp: string

package/src/tui/adapters/webex-adapter.ts

@@ -3,6 +3,7 @@ import { exec } from 'node:child_process'
 import { getWebexAppCredentials } from '@/platforms/webex/app-config'
 import { WebexClient } from '@/platforms/webex/client'
 import { WebexCredentialManager } from '@/platforms/webex/credential-manager'
+import { toRef } from '@/platforms/webex/id-normalizer'
 
 import type { AuthHint, AuthIO, PlatformAdapter, UnifiedChannel, UnifiedMessage } from './types'
 
@@ -25,6 +26,7 @@ export class WebexAdapter implements PlatformAdapter {
     const spaces = await this.client!.listSpaces()
     return spaces.map((space) => ({
       id: space.id,
+      ref: toRef(space.id),
       name: space.title,
     }))
   }
@@ -35,7 +37,9 @@ export class WebexAdapter implements PlatformAdapter {
     return messages
       .map((msg) => ({
         id: msg.id,
+        ref: toRef(msg.id),
         channelId: msg.roomId,
+        channelRef: toRef(msg.roomId),
         author: msg.personEmail,
         content: msg.text ?? '',
         timestamp: msg.created,