feat: Add and update telemetry events

packages/cli/src/events/__tests__/telemetry-event-relay.test.ts

@@ -882,6 +882,10 @@ describe('TelemetryEventRelay', () => {
 				num_tags: 0,
 				public_api: false,
 				sharing_role: undefined,
+				meta: undefined, // workflow.meta is undefined in mock
+				workflow_edited_no_pos: false,
+				credential_edited: false,
+				ai_builder_assisted: false,
 			});
 		});
 

packages/cli/src/events/maps/relay.event-map.ts

@@ -86,6 +86,8 @@ export type RelayEventMap = {
 		user: UserLike;
 		workflow: IWorkflowDb;
 		publicApi: boolean;
+		previousWorkflow?: IWorkflowDb;
+		aiBuilderAssisted?: boolean;
 	};
 
 	'workflow-activated': {

packages/cli/src/events/relays/telemetry.event-relay.ts

@@ -10,7 +10,7 @@ import { PROJECT_OWNER_ROLE_SLUG } from '@n8n/permissions';
 import { snakeCase } from 'change-case';
 import { BinaryDataConfig, InstanceSettings } from 'n8n-core';
 import type { ExecutionStatus, INodesGraphResult, ITelemetryTrackProperties } from 'n8n-workflow';
-import { TelemetryHelpers } from 'n8n-workflow';
+import { hasCredentialChanges, hasNonPositionalChanges, TelemetryHelpers } from 'n8n-workflow';
 import os from 'node:os';
 import { get as pslGet } from 'psl';
 
@@ -621,7 +621,13 @@ export class TelemetryEventRelay extends EventRelay {
 		});
 	}
 
-	private async workflowSaved({ user, workflow, publicApi }: RelayEventMap['workflow-saved']) {
+	private async workflowSaved({
+		user,
+		workflow,
+		publicApi,
+		previousWorkflow,
+		aiBuilderAssisted,
+	}: RelayEventMap['workflow-saved']) {
 		const isCloudDeployment = this.globalConfig.deployment.type === 'cloud';
 
 		const { nodeGraph } = TelemetryHelpers.generateNodesGraph(workflow, this.nodeTypes, {
@@ -654,6 +660,18 @@ export class TelemetryEventRelay extends EventRelay {
 			(note) => note.overlapping,
 		).length;
 
+		let workflowEditedNoPos = false;
+		let credentialEdited = false;
+		if (previousWorkflow) {
+			workflowEditedNoPos = hasNonPositionalChanges(
+				previousWorkflow.nodes,
+				workflow.nodes,
+				previousWorkflow.connections,
+				workflow.connections,
+			);
+			credentialEdited = hasCredentialChanges(previousWorkflow.nodes, workflow.nodes);
+		}
+
 		this.telemetry.track('User saved workflow', {
 			user_id: user.id,
 			workflow_id: workflow.id,
@@ -665,6 +683,9 @@ export class TelemetryEventRelay extends EventRelay {
 			public_api: publicApi,
 			sharing_role: userRole,
 			meta: JSON.stringify(workflow.meta),
+			workflow_edited_no_pos: workflowEditedNoPos,
+			credential_edited: credentialEdited,
+			ai_builder_assisted: aiBuilderAssisted ?? false,
 		});
 	}
 
@@ -813,13 +834,17 @@ export class TelemetryEventRelay extends EventRelay {
 							manualExecEventProperties.is_managed = credential.isManaged;
 						}
 					}
+					const destinationNodeName = runData.data.startData?.destinationNode.nodeName;
 					const telemetryPayload: ITelemetryTrackProperties = {
 						...manualExecEventProperties,
-						node_type: TelemetryHelpers.getNodeTypeForName(
-							workflow,
-							runData.data.startData?.destinationNode.nodeName,
-						)?.type,
-						node_id: nodeGraphResult.nameIndices[runData.data.startData?.destinationNode.nodeName],
+						node_type: TelemetryHelpers.getNodeTypeForName(workflow, destinationNodeName)?.type,
+						node_id: nodeGraphResult.nameIndices[destinationNodeName],
+						node_role: TelemetryHelpers.getNodeRole(
+							destinationNodeName,
+							workflow.connections,
+							this.nodeTypes,
+							workflow.nodes,
+						),
 					};
 
 					this.telemetry.track('Manual node exec finished', telemetryPayload);

packages/cli/src/workflows/workflow.request.ts

@@ -27,6 +27,7 @@ export declare namespace WorkflowRequest {
 		projectId: string;
 		parentFolderId?: string;
 		uiContext?: string;
+		aiBuilderAssisted?: boolean;
 	}>;
 
 	// TODO: Use a discriminator when CAT-1809 lands

packages/cli/src/workflows/workflow.service.ts

@@ -226,6 +226,7 @@ export class WorkflowService {
 			forceSave?: boolean;
 			publicApi?: boolean;
 			publishIfActive?: boolean;
+			aiBuilderAssisted?: boolean;
 		} = {},
 	): Promise<WorkflowEntity> {
 		const {
@@ -234,6 +235,7 @@ export class WorkflowService {
 			forceSave = false,
 			publicApi = false,
 			publishIfActive = false,
+			aiBuilderAssisted = false,
 		} = options;
 		const workflow = await this.workflowFinderService.findWorkflowForUser(
 			workflowId,
@@ -414,6 +416,8 @@ export class WorkflowService {
 			user,
 			workflow: updatedWorkflow,
 			publicApi,
+			previousWorkflow: workflow,
+			aiBuilderAssisted,
 		});
 
 		// Activate workflow if requested, or

packages/cli/src/workflows/workflows.controller.ts

@@ -420,7 +420,7 @@ export class WorkflowsController {
 		const forceSave = req.query.forceSave === 'true';
 
 		let updateData = new WorkflowEntity();
-		const { tags, parentFolderId, ...rest } = req.body;
+		const { tags, parentFolderId, aiBuilderAssisted, ...rest } = req.body;
 
 		// TODO: Add zod validation for entire `rest` object before assigning to `updateData`
 		if (
@@ -445,6 +445,7 @@ export class WorkflowsController {
 			tagIds: tags,
 			parentFolderId,
 			forceSave: isSharingEnabled ? forceSave : true,
+			aiBuilderAssisted,
 		});
 
 		const scopes = await this.workflowService.getWorkflowScopes(req.user, workflowId);

packages/frontend/@n8n/rest-api-client/src/api/workflows.ts

@@ -38,6 +38,7 @@ export interface WorkflowDataUpdate {
 	meta?: WorkflowMetadata;
 	parentFolderId?: string;
 	uiContext?: string;
+	aiBuilderAssisted?: boolean;
 }
 
 export interface WorkflowDataCreate extends WorkflowDataUpdate {

packages/frontend/editor-ui/src/app/composables/useRunWorkflow.test.ts

@@ -45,6 +45,19 @@ vi.mock('@/app/stores/workflows.store', () => {
 		nodesIssuesExist: false,
 		executionWaitingForWebhook: false,
 		workflowObject: { id: '123' } as Workflow,
+		workflowValidationIssues: [],
+		workflow: {
+			nodes: [],
+			id: '',
+			name: '',
+			active: false,
+			isArchived: false,
+			createdAt: '',
+			updatedAt: '',
+			connections: {},
+			versionId: '',
+			activeVersionId: null,
+		},
 		getNodeByName: vi
 			.fn()
 			.mockImplementation((name) =>

packages/frontend/editor-ui/src/app/composables/useWorkflowSaving.ts

@@ -30,6 +30,7 @@ import { useTemplatesStore } from '@/features/workflows/templates/templates.stor
 import { useFocusPanelStore } from '@/app/stores/focusPanel.store';
 import { injectWorkflowState, type WorkflowState } from '@/app/composables/useWorkflowState';
 import { getResourcePermissions } from '@n8n/permissions';
+import { useBuilderStore } from '@/features/ai/assistant/builder.store';
 
 export function useWorkflowSaving({
 	router,
@@ -47,6 +48,7 @@ export function useWorkflowSaving({
 	const telemetry = useTelemetry();
 	const nodeHelpers = useNodeHelpers();
 	const templatesStore = useTemplatesStore();
+	const builderStore = useBuilderStore();
 	const { getWorkflowDataToSave, checkConflictingWebhooks, getWorkflowProjectRole } =
 		useWorkflowHelpers();
 
@@ -220,6 +222,9 @@ export function useWorkflowSaving({
 
 			workflowDataRequest.versionId = workflowsStore.workflowVersionId;
 
+			// Check if AI Builder made edits since last save
+			workflowDataRequest.aiBuilderAssisted = builderStore.getAiBuilderMadeEdits();
+
 			const deactivateReason = await getWorkflowDeactivationInfo(
 				currentWorkflow,
 				workflowDataRequest,
@@ -255,6 +260,9 @@ export function useWorkflowSaving({
 			uiStore.removeActiveAction('workflowSaving');
 			void useExternalHooks().run('workflow.afterUpdate', { workflowData });
 
+			// Reset AI Builder edits flag only after successful save
+			builderStore.resetAiBuilderMadeEdits();
+
 			return true;
 		} catch (error) {
 			console.error(error);

packages/frontend/editor-ui/src/features/ai/assistant/builder.store.test.ts

@@ -430,6 +430,20 @@ describe('AI Builder store', () => {
 		builderStore.resetBuilderChat();
 		expect(builderStore.chatMessages).toEqual([]);
 		expect(builderStore.builderThinkingMessage).toBeUndefined();
+
+		// Verify last_user_message_id is reset (tracked via trackWorkflowBuilderJourney)
+		track.mockClear();
+		builderStore.trackWorkflowBuilderJourney('user_clicked_todo');
+		expect(track).toHaveBeenCalledWith('Workflow builder journey', {
+			workflow_id: 'test-workflow-id',
+			session_id: expect.any(String),
+			event_type: 'user_clicked_todo',
+		});
+		// Should NOT have last_user_message_id after reset
+		expect(track).not.toHaveBeenCalledWith(
+			'Workflow builder journey',
+			expect.objectContaining({ last_user_message_id: expect.any(String) }),
+		);
 	});
 
 	describe('isAIBuilderEnabled computed property', () => {
@@ -1709,6 +1723,120 @@ describe('AI Builder store', () => {
 		});
 	});
 
+	describe('trackWorkflowBuilderJourney', () => {
+		it('tracks event with workflow_id, session_id, and event_type (without last_user_message_id when no message sent)', () => {
+			const builderStore = useBuilderStore();
+
+			builderStore.trackWorkflowBuilderJourney('user_clicked_todo');
+
+			expect(track).toHaveBeenCalledWith('Workflow builder journey', {
+				workflow_id: 'test-workflow-id',
+				session_id: expect.any(String),
+				event_type: 'user_clicked_todo',
+			});
+		});
+
+		it('includes last_user_message_id after user sends a message', async () => {
+			const builderStore = useBuilderStore();
+
+			apiSpy.mockImplementationOnce((_ctx, _payload, onMessage, onDone) => {
+				onMessage({
+					messages: [{ type: 'message', role: 'assistant', text: 'Hello!' }],
+					sessionId: 'test-session',
+				});
+				onDone();
+			});
+
+			builderStore.sendChatMessage({ text: 'test' });
+			await vi.waitFor(() => expect(builderStore.streaming).toBe(false));
+
+			track.mockClear();
+			builderStore.trackWorkflowBuilderJourney('user_clicked_todo');
+
+			expect(track).toHaveBeenCalledWith('Workflow builder journey', {
+				workflow_id: 'test-workflow-id',
+				session_id: expect.any(String),
+				event_type: 'user_clicked_todo',
+				last_user_message_id: expect.any(String),
+			});
+		});
+
+		it('includes event_properties when provided', () => {
+			const builderStore = useBuilderStore();
+
+			builderStore.trackWorkflowBuilderJourney('user_clicked_todo', {
+				node_type: 'n8n-nodes-base.httpRequest',
+				type: 'parameters',
+			});
+
+			expect(track).toHaveBeenCalledWith('Workflow builder journey', {
+				workflow_id: 'test-workflow-id',
+				session_id: expect.any(String),
+				event_type: 'user_clicked_todo',
+				event_properties: {
+					node_type: 'n8n-nodes-base.httpRequest',
+					type: 'parameters',
+				},
+			});
+		});
+
+		it('omits event_properties when empty object provided', () => {
+			const builderStore = useBuilderStore();
+
+			builderStore.trackWorkflowBuilderJourney('field_focus_placeholder_in_ndv', {});
+
+			expect(track).toHaveBeenCalledWith('Workflow builder journey', {
+				workflow_id: 'test-workflow-id',
+				session_id: expect.any(String),
+				event_type: 'field_focus_placeholder_in_ndv',
+			});
+		});
+
+		it('omits event_properties when not provided', () => {
+			const builderStore = useBuilderStore();
+
+			builderStore.trackWorkflowBuilderJourney('no_placeholder_values_left');
+
+			expect(track).toHaveBeenCalledWith('Workflow builder journey', {
+				workflow_id: 'test-workflow-id',
+				session_id: expect.any(String),
+				event_type: 'no_placeholder_values_left',
+			});
+		});
+
+		it('includes both event_properties and last_user_message_id when both are present', async () => {
+			const builderStore = useBuilderStore();
+
+			apiSpy.mockImplementationOnce((_ctx, _payload, onMessage, onDone) => {
+				onMessage({
+					messages: [{ type: 'message', role: 'assistant', text: 'Hello!' }],
+					sessionId: 'test-session',
+				});
+				onDone();
+			});
+
+			builderStore.sendChatMessage({ text: 'test' });
+			await vi.waitFor(() => expect(builderStore.streaming).toBe(false));
+
+			track.mockClear();
+			builderStore.trackWorkflowBuilderJourney('user_clicked_todo', {
+				node_type: 'n8n-nodes-base.httpRequest',
+				type: 'parameters',
+			});
+
+			expect(track).toHaveBeenCalledWith('Workflow builder journey', {
+				workflow_id: 'test-workflow-id',
+				session_id: expect.any(String),
+				event_type: 'user_clicked_todo',
+				event_properties: {
+					node_type: 'n8n-nodes-base.httpRequest',
+					type: 'parameters',
+				},
+				last_user_message_id: expect.any(String),
+			});
+		});
+	});
+
 	describe('abortStreaming telemetry', () => {
 		it('tracks end of response with aborted flag when aborting', () => {
 			const builderStore = useBuilderStore();