github-mirror/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2026-10-17 05:29:44 +02:00
Code Issues Actions 14 Packages Projects Releases Wiki Activity Graph

refactor(core): Build system agent queue input in one place (no-changelog)

Browse Source 
sendMessage and prepareChatMessage now share one queueInput builder.
The payload rules for options, attachments, message ids and hidden
turns are in one place.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Jaakko Husso 2026-10-16 21:54:23 +03:00 committed by GitHub
parent 509b359a6d
commit 2f5e116dc6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 38 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
packages/cli/src/modules/agents/system-agents/system-agent-execution.service.ts
View File

@ -40,6 +40,17 @@ type SuspendedToolCall = Extract<
export type SystemAgentThreadStatus = 'running' | 'suspended' | 'idle';
type SystemQueueInput = Parameters<AgentMessageQueueService['enqueue']>[0];
interface SystemMessageInput {
message: string;
attachments?: StoredAttachmentRef[];
options?: SystemAgentTurnOptions;
messageId?: string;
/** A machine turn: it stays out of the transcript. */
hidden?: boolean;
}
interface ResumeParams {
agentId: string;
user: User;
@ -275,34 +286,11 @@ export class SystemAgentExecutionService {
* While a turn runs, the caller can steer the queued message into it.
* A `hidden` message is a machine turn: it stays out of the transcript.
*/
async sendMessage(params: {
agentId: string;
user: User;
threadId: string;
message: string;
attachments?: StoredAttachmentRef[];
options?: SystemAgentTurnOptions;
messageId?: string;
hidden?: boolean;
}) {
async sendMessage(
params: SystemMessageInput & { agentId: string; user: User; threadId: string },
) {
const thread = await this.getUsableThread(params.agentId, params.user, params.threadId);
return await this.messageQueue.enqueue({
agentId: params.agentId,
projectId: thread.projectId,
threadId: thread.id,
sessionMode: 'existing',
source: SYSTEM_CHAT_SOURCE,
payload: {
kind: 'system',
userId: params.user.id,
message: params.message,
resourceId: this.resourceIdFor(params.user),
...(params.attachments?.length ? { attachments: params.attachments } : {}),
...(params.messageId ? { messageId: params.messageId } : {}),
...(params.options ? { options: params.options } : {}),
...(params.hidden ? { hidden: true } : {}),
},
});
return await this.messageQueue.enqueue(this.queueInput(thread, params.user, params));
}
/**
@ -477,7 +465,7 @@ export class SystemAgentExecutionService {
threadId: string,
projectId: string,
) => Promise<StoredAttachmentRef[] | undefined>;
}): Promise<Parameters<AgentMessageQueueService['enqueue']>[0]> {
}): Promise<SystemQueueInput> {
this.assertRegistered(params.agentId);
const existing = params.sessionId
? await this.threadRepository.findOwnedById(params.agentId, params.user.id, params.sessionId)
@ -499,20 +487,35 @@ export class SystemAgentExecutionService {
const options =
(await provider.chatTurnOptions?.(params.user, thread, params.clientContext)) ?? {};
const attachments = await params.storeAttachments?.(thread.id, thread.projectId);
return this.queueInput(thread, params.user, {
message: params.message,
messageId: params.messageId,
attachments,
options,
});
}
/** The queue input of a system message in an existing thread. */
private queueInput(
thread: AgentExecutionThread,
user: User,
input: SystemMessageInput,
): SystemQueueInput {
return {
agentId: params.agentId,
agentId: thread.agentId,
projectId: thread.projectId,
threadId: thread.id,
sessionMode: 'existing',
source: SYSTEM_CHAT_SOURCE,
payload: {
kind: 'system',
userId: params.user.id,
message: params.message,
resourceId: this.resourceIdFor(params.user),
...(params.messageId ? { messageId: params.messageId } : {}),
...(attachments?.length ? { attachments } : {}),
options,
userId: user.id,
message: input.message,
resourceId: this.resourceIdFor(user),
...(input.attachments?.length ? { attachments: input.attachments } : {}),
...(input.messageId ? { messageId: input.messageId } : {}),
...(input.options ? { options: input.options } : {}),
...(input.hidden ? { hidden: true } : {}),
},
};
}