Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions packages/extension-agent/src/trigger/executor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -306,8 +306,7 @@ export class ChatLunaAgentTriggerExecutor {
if ('result' in routed) return { result: routed.result }
session = buildVirtualSession(routed.bot, parsed.routing, {
message: action.message,
messageName: action.messageName,
requestId
messageName: action.messageName
})
} else {
const routed = resolveBot(
Expand All @@ -319,8 +318,7 @@ export class ChatLunaAgentTriggerExecutor {
if ('result' in routed) return { result: routed.result }
session = buildVirtualSession(routed.bot, target as WakeupRouting, {
message: action.message,
messageName: action.messageName,
requestId
messageName: action.messageName
})
}

Expand Down Expand Up @@ -447,7 +445,6 @@ export class ChatLunaAgentTriggerExecutor {
},
{
message: getMessageContent(reply.content),
requestId: session.messageId,
messageName: action.messageName
}
)
Expand Down
3 changes: 1 addition & 2 deletions packages/extension-agent/src/trigger/session.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import type { WakeupAction, WakeupRouting } from '../types'
export function buildVirtualSession(
bot: Session['bot'],
routing: WakeupRouting,
action: Pick<WakeupAction, 'message' | 'messageName' | 'requestId'>
action: Pick<WakeupAction, 'message' | 'messageName'>
) {
const event: Partial<Universal.Event> = {
type: 'message',
Expand All @@ -23,7 +23,6 @@ export function buildVirtualSession(
name: routing.username ?? action.messageName ?? 'trigger'
},
message: {
id: action.requestId,
content: getMessageContent(action.message),
elements:
typeof action.message === 'string'
Expand Down
6 changes: 1 addition & 5 deletions packages/extension-agent/tests/trigger_session.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ describe('buildVirtualSession', () => {
isDirect: false
},
{
requestId: 'req',
messageName: 'trigger',
message: [
{ type: 'text', text: 'hello' },
Expand All @@ -39,7 +38,6 @@ describe('buildVirtualSession', () => {
name: string
}
message: {
id: string
content: string
elements: Array<{ type: string }>
}
Expand All @@ -53,7 +51,7 @@ describe('buildVirtualSession', () => {
expect(event.event.channel.type).to.equal(0)
expect(event.event.user.id).to.equal('user')
expect(event.event.user.name).to.equal('trigger')
expect(event.event.message.id).to.equal('req')
expect(event.event.message).to.not.have.property('id')
expect(event.event.message.content).to.equal('hello')
expect(event.event.message.elements).to.have.length(2)
expect(event.event.message.elements[0].type).to.equal('text')
Expand All @@ -73,7 +71,6 @@ describe('buildVirtualSession', () => {
isDirect: false
},
{
requestId: 'req',
message: 'hello'
}
) as {
Expand Down Expand Up @@ -116,7 +113,6 @@ describe('buildVirtualSession', () => {
isDirect: true
},
{
requestId: 'req',
message: 'hello'
}
) as {
Expand Down