agent-messenger 2.23.2 → 2.23.4

package/src/platforms/webex/types.test.ts

@@ -73,10 +73,13 @@ it('WebexSpaceSchema rejects invalid type', () => {
 it('WebexMessageSchema validates valid message', () => {
   const result = WebexMessageSchema.safeParse({
     id: 'Y2lzY29zcGFyazovL3VzL01FU1NBR0UvbXNn',
+    ref: 'msg',
     roomId: 'Y2lzY29zcGFyazovL3VzL1JPT00vYWJj',
+    roomRef: 'abc',
     roomType: 'group',
     text: 'Hello world',
     personId: 'Y2lzY29zcGFyazovL3VzL1BFT1BMRS9hYmM',
+    personRef: 'abc',
     personEmail: 'user@example.com',
     created: '2024-01-15T10:30:00.000Z',
   })
@@ -86,17 +89,22 @@ it('WebexMessageSchema validates valid message', () => {
 it('WebexMessageSchema validates message with optional fields', () => {
   const result = WebexMessageSchema.safeParse({
     id: 'Y2lzY29zcGFyazovL3VzL01FU1NBR0UvbXNn',
+    ref: 'msg',
     roomId: 'Y2lzY29zcGFyazovL3VzL1JPT00vYWJj',
+    roomRef: 'abc',
     roomType: 'group',
     text: 'Hello world',
     markdown: '**Hello world**',
     html: '<strong>Hello world</strong>',
     files: ['https://webexapis.com/v1/contents/file1'],
     personId: 'Y2lzY29zcGFyazovL3VzL1BFT1BMRS9hYmM',
+    personRef: 'abc',
     personEmail: 'user@example.com',
     created: '2024-01-15T10:30:00.000Z',
     parentId: 'Y2lzY29zcGFyazovL3VzL01FU1NBR0UvcGFyZW50',
+    parentRef: 'parent',
     mentionedPeople: ['Y2lzY29zcGFyazovL3VzL1BFT1BMRS9tZW50aW9u'],
+    mentionedPeopleRefs: ['mention'],
   })
   expect(result.success).toBe(true)
 })
@@ -125,9 +133,11 @@ it('WebexMessageSchema rejects invalid roomType', () => {
 it('WebexPersonSchema validates valid person', () => {
   const result = WebexPersonSchema.safeParse({
     id: 'Y2lzY29zcGFyazovL3VzL1BFT1BMRS9hYmM',
+    ref: 'abc',
     emails: ['user@example.com'],
     displayName: 'Test User',
     orgId: 'Y2lzY29zcGFyazovL3VzL09SR0FOSVpBVElPTi9vcmc',
+    orgRef: 'org',
     type: 'person',
     created: '2024-01-01T00:00:00.000Z',
   })
@@ -137,6 +147,7 @@ it('WebexPersonSchema validates valid person', () => {
 it('WebexPersonSchema validates person with optional fields', () => {
   const result = WebexPersonSchema.safeParse({
     id: 'Y2lzY29zcGFyazovL3VzL1BFT1BMRS9hYmM',
+    ref: 'abc',
     emails: ['user@example.com', 'user@work.com'],
     displayName: 'Test User',
     nickName: 'Tester',
@@ -144,6 +155,7 @@ it('WebexPersonSchema validates person with optional fields', () => {
     lastName: 'User',
     avatar: 'https://example.com/avatar.jpg',
     orgId: 'Y2lzY29zcGFyazovL3VzL09SR0FOSVpBVElPTi9vcmc',
+    orgRef: 'org',
     type: 'person',
     created: '2024-01-01T00:00:00.000Z',
   })
@@ -153,9 +165,11 @@ it('WebexPersonSchema validates person with optional fields', () => {
 it('WebexPersonSchema validates bot type', () => {
   const result = WebexPersonSchema.safeParse({
     id: 'Y2lzY29zcGFyazovL3VzL1BFT1BMRS9ib3Q',
+    ref: 'bot',
     emails: ['bot@webex.bot'],
     displayName: 'My Bot',
     orgId: 'Y2lzY29zcGFyazovL3VzL09SR0FOSVpBVElPTi9vcmc',
+    orgRef: 'org',
     type: 'bot',
     created: '2024-01-01T00:00:00.000Z',
   })
@@ -185,8 +199,11 @@ it('WebexPersonSchema rejects invalid type', () => {
 it('WebexMembershipSchema validates valid membership', () => {
   const result = WebexMembershipSchema.safeParse({
     id: 'Y2lzY29zcGFyazovL3VzL01FTUJFUlNISVAvbWVt',
+    ref: 'mem',
     roomId: 'Y2lzY29zcGFyazovL3VzL1JPT00vYWJj',
+    roomRef: 'abc',
     personId: 'Y2lzY29zcGFyazovL3VzL1BFT1BMRS9hYmM',
+    personRef: 'abc',
     personEmail: 'user@example.com',
     personDisplayName: 'Test User',
     isModerator: false,
@@ -198,8 +215,11 @@ it('WebexMembershipSchema validates valid membership', () => {
 it('WebexMembershipSchema validates moderator membership', () => {
   const result = WebexMembershipSchema.safeParse({
     id: 'Y2lzY29zcGFyazovL3VzL01FTUJFUlNISVAvbWVt',
+    ref: 'mem',
     roomId: 'Y2lzY29zcGFyazovL3VzL1JPT00vYWJj',
+    roomRef: 'abc',
     personId: 'Y2lzY29zcGFyazovL3VzL1BFT1BMRS9hYmM',
+    personRef: 'abc',
     personEmail: 'moderator@example.com',
     personDisplayName: 'Moderator User',
     isModerator: true,

package/src/platforms/webex/types.ts

@@ -1,3 +1,10 @@
+import type {
+  AttachmentAction,
+  DecryptedMessage,
+  DeletedMessage,
+  MembershipActivity,
+  RoomActivity,
+} from 'webex-message-handler'
 import { z } from 'zod'
 
 export interface WebexSpace {
@@ -13,21 +20,27 @@ export interface WebexSpace {
 
 export interface WebexMessage {
   id: string
+  ref: string
   roomId: string
+  roomRef: string
   roomType: 'group' | 'direct'
   text?: string
   markdown?: string
   html?: string
   files?: string[]
   personId: string
+  personRef: string
   personEmail: string
   created: string
   parentId?: string
+  parentRef?: string
   mentionedPeople?: string[]
+  mentionedPeopleRefs?: string[]
 }
 
 export interface WebexPerson {
   id: string
+  ref: string
   emails: string[]
   displayName: string
   nickName?: string
@@ -35,14 +48,18 @@ export interface WebexPerson {
   lastName?: string
   avatar?: string
   orgId: string
+  orgRef: string
   type: 'person' | 'bot'
   created: string
 }
 
 export interface WebexMembership {
   id: string
+  ref: string
   roomId: string
+  roomRef: string
   personId: string
+  personRef: string
   personEmail: string
   personDisplayName: string
   isModerator: boolean
@@ -61,6 +78,47 @@ export interface WebexConfig {
   encryptionKeys?: Record<string, string>
 }
 
+export type WebexMessageEvent = DecryptedMessage & {
+  ref: string
+  parentRef?: string
+  roomRef: string
+  personRef: string
+  mentionedPeopleRefs: string[]
+}
+
+export type WebexDeletedMessageEvent = DeletedMessage & {
+  messageRef: string
+  roomRef: string
+  personRef: string
+}
+
+export type WebexMembershipEvent = MembershipActivity & {
+  ref: string
+  actorRef: string
+  personRef: string
+  roomRef: string
+}
+
+export type WebexAttachmentActionEvent = AttachmentAction & {
+  ref: string
+  messageRef: string
+  personRef: string
+  roomRef: string
+}
+
+export type WebexRoomEvent = RoomActivity & {
+  ref: string
+  roomRef: string
+  actorRef: string
+}
+
+export type WebexRealtimeEvent =
+  | WebexMessageEvent
+  | WebexDeletedMessageEvent
+  | WebexMembershipEvent
+  | WebexAttachmentActionEvent
+  | WebexRoomEvent
+
 export class WebexError extends Error {
   code: string
 
@@ -84,21 +142,27 @@ export const WebexSpaceSchema = z.object({
 
 export const WebexMessageSchema = z.object({
   id: z.string(),
+  ref: z.string(),
   roomId: z.string(),
+  roomRef: z.string(),
   roomType: z.enum(['group', 'direct']),
   text: z.string().optional(),
   markdown: z.string().optional(),
   html: z.string().optional(),
   files: z.array(z.string()).optional(),
   personId: z.string(),
+  personRef: z.string(),
   personEmail: z.string(),
   created: z.string(),
   parentId: z.string().optional(),
+  parentRef: z.string().optional(),
   mentionedPeople: z.array(z.string()).optional(),
+  mentionedPeopleRefs: z.array(z.string()).optional(),
 })
 
 export const WebexPersonSchema = z.object({
   id: z.string(),
+  ref: z.string(),
   emails: z.array(z.string()),
   displayName: z.string(),
   nickName: z.string().optional(),
@@ -106,14 +170,18 @@ export const WebexPersonSchema = z.object({
   lastName: z.string().optional(),
   avatar: z.string().optional(),
   orgId: z.string(),
+  orgRef: z.string(),
   type: z.enum(['person', 'bot']),
   created: z.string(),
 })
 
 export const WebexMembershipSchema = z.object({
   id: z.string(),
+  ref: z.string(),
   roomId: z.string(),
+  roomRef: z.string(),
   personId: z.string(),
+  personRef: z.string(),
   personEmail: z.string(),
   personDisplayName: z.string(),
   isModerator: z.boolean(),

package/src/platforms/webex/typings/webex-message-handler.d.ts

@@ -155,6 +155,8 @@ declare module 'webex-message-handler' {
   export interface DecryptedMessage {
     /** Mercury activity UUID. Works as parentId for threaded replies. */
     id: string
+    /** Raw UUID ref for `id`. */
+    ref: string
     /**
      * Full Conversation-service activity URL, when present on the raw Mercury
      * activity (e.g. for an outbound "acknowledge" read-receipt). Undefined if
@@ -163,8 +165,14 @@ declare module 'webex-message-handler' {
     url?: string
     /** Parent activity UUID for threaded replies. Undefined if not a thread reply. */
     parentId?: string
+    /** Raw UUID ref for `parentId`. Undefined when `parentId` is absent. */
+    parentRef?: string
     roomId: string
+    /** Raw UUID ref for `roomId`. */
+    roomRef: string
     personId: string
+    /** Raw UUID ref for `personId`. */
+    personRef: string
     personEmail: string
     text: string
     html?: string
@@ -172,6 +180,8 @@ declare module 'webex-message-handler' {
     roomType?: string
     /** Person UUIDs mentioned via @mention in the message. */
     mentionedPeople: string[]
+    /** Raw UUID refs for `mentionedPeople`, index-aligned. */
+    mentionedPeopleRefs: string[]
     /** Group mention types (e.g. "all") in the message. */
     mentionedGroups: string[]
     /** File URLs attached to the message. Empty if no files. */
@@ -181,19 +191,33 @@ declare module 'webex-message-handler' {
 
   export interface DeletedMessage {
     messageId: string
+    /** Raw UUID ref for `messageId`. */
+    messageRef: string
     roomId: string
+    /** Raw UUID ref for `roomId`. */
+    roomRef: string
     personId: string
+    /** Raw UUID ref for `personId`. */
+    personRef: string
   }
 
   export interface MembershipActivity {
-    /** Activity ID. */
+    /** Activity ID (raw Mercury activity UUID). */
     id: string
+    /** Raw UUID ref for `id`. Equal to `id` since the activity id is already raw. */
+    ref: string
     /** ID of the person who performed the action. */
     actorId: string
+    /** Raw UUID ref for `actorId`. */
+    actorRef: string
     /** ID of the member affected. */
     personId: string
+    /** Raw UUID ref for `personId`. */
+    personRef: string
     /** Conversation/space ID. */
     roomId: string
+    /** Raw UUID ref for `roomId`. */
+    roomRef: string
     /** Membership action: "add", "leave", "assignModerator", or "unassignModerator". */
     action: string
     /** ISO 8601 timestamp. */
@@ -207,14 +231,22 @@ declare module 'webex-message-handler' {
   export interface AttachmentAction {
     /** Activity ID. */
     id: string
+    /** Raw UUID ref for `id`. */
+    ref: string
     /** ID of the message the card was attached to. */
     messageId: string
+    /** Raw UUID ref for `messageId`. Empty when `messageId` is empty. */
+    messageRef: string
     /** ID of the person who submitted the card. */
     personId: string
+    /** Raw UUID ref for `personId`. */
+    personRef: string
     /** Email of the person who submitted the card. */
     personEmail: string
     /** Conversation/space ID. */
     roomId: string
+    /** Raw UUID ref for `roomId`. */
+    roomRef: string
     /** Card form input values. */
     inputs: Record<string, unknown>
     /** ISO 8601 timestamp. */
@@ -224,12 +256,18 @@ declare module 'webex-message-handler' {
   }
 
   export interface RoomActivity {
-    /** Activity ID. */
+    /** Activity ID (raw Mercury activity UUID). */
     id: string
+    /** Raw UUID ref for `id`. Equal to `id` since the activity id is already raw. */
+    ref: string
     /** Conversation/space ID. */
     roomId: string
+    /** Raw UUID ref for `roomId`. */
+    roomRef: string
     /** ID of the person who performed the action. */
     actorId: string
+    /** Raw UUID ref for `actorId`. */
+    actorRef: string
     /** Room action: "created" or "updated". */
     action: string
     /** ISO 8601 timestamp. */

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

@@ -5,7 +5,6 @@ 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'
 
@@ -40,9 +39,9 @@ export async function uploadAction(
 
     return {
       id: message.id,
-      ref: toRef(message.id),
+      ref: message.ref,
       roomId: message.roomId,
-      roomRef: toRef(message.roomId),
+      roomRef: message.roomRef,
       files: message.files,
       created: message.created,
     }

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

@@ -2,7 +2,6 @@ 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'
 
@@ -29,9 +28,9 @@ export async function listAction(space: string, options: BotOption & { max?: str
     return {
       members: members.map((m) => ({
         id: m.id,
-        ref: toRef(m.id),
+        ref: m.ref,
         personId: m.personId,
-        personRef: toRef(m.personId),
+        personRef: m.personRef,
         personEmail: m.personEmail,
         personDisplayName: m.personDisplayName,
         isModerator: m.isModerator,

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

@@ -2,7 +2,6 @@ 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'
@@ -33,9 +32,9 @@ interface MessageResult {
 function formatMessage(message: WebexMessage): MessageResult {
   return {
     id: message.id,
-    ref: toRef(message.id),
+    ref: message.ref,
     roomId: message.roomId,
-    roomRef: toRef(message.roomId),
+    roomRef: message.roomRef,
     text: message.text,
     markdown: message.markdown,
     html: message.html,
@@ -88,9 +87,9 @@ export async function repliesAction(
     return {
       messages: messages.map((msg) => ({
         id: msg.id,
-        ref: toRef(msg.id),
+        ref: msg.ref,
         roomId: msg.roomId,
-        roomRef: toRef(msg.roomId),
+        roomRef: msg.roomRef,
         text: msg.text,
         personEmail: msg.personEmail,
         created: msg.created,
@@ -125,9 +124,9 @@ export async function listAction(space: string, options: BotOption & { max?: str
     return {
       messages: messages.map((msg) => ({
         id: msg.id,
-        ref: toRef(msg.id),
+        ref: msg.ref,
         roomId: msg.roomId,
-        roomRef: toRef(msg.roomId),
+        roomRef: msg.roomRef,
         text: msg.text,
         personEmail: msg.personEmail,
         created: msg.created,

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

@@ -34,7 +34,7 @@ export async function snapshotAction(options: BotOption & { full?: boolean; max?
     const result: SnapshotResult = {
       bot: {
         id: me.id,
-        ref: toRef(me.id),
+        ref: me.ref,
         displayName: me.displayName,
         emails: me.emails,
       },

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

@@ -12,9 +12,11 @@ const mockListPeople = mock(() =>
   Promise.resolve([
     {
       id: personId,
+      ref: 'p1',
       emails: ['alice@example.com'],
       displayName: 'Alice',
       orgId,
+      orgRef: 'o1',
       type: 'person' as const,
       created: '',
     },
@@ -24,9 +26,11 @@ const mockListPeople = mock(() =>
 const mockGetPerson = mock(() =>
   Promise.resolve({
     id: personId,
+    ref: 'p1',
     emails: ['alice@example.com'],
     displayName: 'Alice',
     orgId,
+    orgRef: 'o1',
     type: 'person' as const,
     created: '2024-01-01T00:00:00Z',
   }),

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

@@ -2,7 +2,6 @@ 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'
@@ -33,7 +32,7 @@ interface UserResult {
 function formatPerson(person: WebexPerson): UserResult {
   return {
     id: person.id,
-    ref: toRef(person.id),
+    ref: person.ref,
     emails: person.emails,
     displayName: person.displayName,
     nickName: person.nickName,
@@ -41,7 +40,7 @@ function formatPerson(person: WebexPerson): UserResult {
     lastName: person.lastName,
     avatar: person.avatar,
     orgId: person.orgId,
-    orgRef: toRef(person.orgId),
+    orgRef: person.orgRef,
     type: person.type,
     created: person.created,
   }
@@ -58,7 +57,7 @@ export async function listAction(
     return {
       users: people.map((p) => ({
         id: p.id,
-        ref: toRef(p.id),
+        ref: p.ref,
         emails: p.emails,
         displayName: p.displayName,
         type: p.type,

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

@@ -2,7 +2,6 @@ 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'
 
@@ -25,12 +24,12 @@ export async function whoamiAction(options: BotOption): Promise<WhoamiResult> {
     const info = await client.testAuth()
     return {
       id: info.id,
-      ref: toRef(info.id),
+      ref: info.ref,
       emails: info.emails,
       displayName: info.displayName,
       avatar: info.avatar,
       orgId: info.orgId,
-      orgRef: toRef(info.orgId),
+      orgRef: info.orgRef,
       type: info.type,
       created: info.created,
     }

package/src/platforms/webexbot/index.ts

@@ -6,5 +6,16 @@ export { WebexBotListener } from './listener'
 export type { WebexBotListenerOptions } from './listener'
 export type { WebexBotConfig, WebexBotCredentials, WebexBotEntry, WebexBotListenerEventMap } from './types'
 export { WebexBotConfigSchema, WebexBotCredentialsSchema, WebexBotEntrySchema, WebexBotError } from './types'
-export type { WebexMembership, WebexMessage, WebexPerson, WebexSpace } from '../webex/types'
+export type {
+  WebexAttachmentActionEvent,
+  WebexDeletedMessageEvent,
+  WebexMembership,
+  WebexMembershipEvent,
+  WebexMessage,
+  WebexMessageEvent,
+  WebexPerson,
+  WebexRealtimeEvent,
+  WebexRoomEvent,
+  WebexSpace,
+} from '../webex/types'
 export { WebexMembershipSchema, WebexMessageSchema, WebexPersonSchema, WebexSpaceSchema } from '../webex/types'

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

@@ -37,9 +37,9 @@ export class WebexAdapter implements PlatformAdapter {
     return messages
       .map((msg) => ({
         id: msg.id,
-        ref: toRef(msg.id),
+        ref: msg.ref,
         channelId: msg.roomId,
-        channelRef: toRef(msg.roomId),
+        channelRef: msg.roomRef,
         author: msg.personEmail,
         content: msg.text ?? '',
         timestamp: msg.created,