From 53594a90e438f25cea40b6e2510a2ba7c7ee9c32 Mon Sep 17 00:00:00 2001
From: oleg <me@olegivaniv.com>
Date: Wed, 30 Jul 2025 16:46:30 +0200
Subject: [PATCH] fix(editor): Include session_id in AI builder tracking
 (no-changelog) (#17830)

---
 .../components/AskAssistant/Agent/AskAssistantBuild.test.ts  | 3 +++
 .../src/components/AskAssistant/Agent/AskAssistantBuild.vue  | 3 +++
 packages/frontend/editor-ui/src/stores/builder.store.ts      | 5 +++++
 3 files changed, 11 insertions(+)

diff --git a/packages/frontend/editor-ui/src/components/AskAssistant/Agent/AskAssistantBuild.test.ts b/packages/frontend/editor-ui/src/components/AskAssistant/Agent/AskAssistantBuild.test.ts
index ab82ce0ba7..07deadce09 100644
--- a/packages/frontend/editor-ui/src/components/AskAssistant/Agent/AskAssistantBuild.test.ts
+++ b/packages/frontend/editor-ui/src/components/AskAssistant/Agent/AskAssistantBuild.test.ts
@@ -105,6 +105,7 @@ describe('AskAssistantBuild', () => {
 		builderStore.workflowMessages = [];
 		builderStore.toolMessages = [];
 		builderStore.workflowPrompt = workflowPrompt;
+		builderStore.trackingSessionId = 'app_session_id';
 
 		workflowsStore.workflowId = 'abc123';
 	});
@@ -187,6 +188,7 @@ describe('AskAssistantBuild', () => {
 				expect(trackMock).toHaveBeenCalledWith('User rated workflow generation', {
 					helpful: true,
 					workflow_id: 'abc123',
+					session_id: 'app_session_id',
 				});
 			});
 
@@ -203,6 +205,7 @@ describe('AskAssistantBuild', () => {
 
 				expect(trackMock).toHaveBeenCalledWith('User rated workflow generation', {
 					helpful: false,
+					session_id: 'app_session_id',
 					workflow_id: 'abc123',
 				});
 			});
diff --git a/packages/frontend/editor-ui/src/components/AskAssistant/Agent/AskAssistantBuild.vue b/packages/frontend/editor-ui/src/components/AskAssistant/Agent/AskAssistantBuild.vue
index 537b1a32bf..632e2f3c48 100644
--- a/packages/frontend/editor-ui/src/components/AskAssistant/Agent/AskAssistantBuild.vue
+++ b/packages/frontend/editor-ui/src/components/AskAssistant/Agent/AskAssistantBuild.vue
@@ -82,6 +82,7 @@ watch(
 
 						telemetry.track('Workflow modified by builder', {
 							tools_called: newToolMessages.map((toolMsg) => toolMsg.toolName),
+							session_id: builderStore.trackingSessionId,
 							start_workflow_json: currentWorkflowJson,
 							end_workflow_json: msg.codeSnippet,
 							workflow_id: workflowsStore.workflowId,
@@ -104,12 +105,14 @@ function onFeedback(feedback: RatingFeedback) {
 		telemetry.track('User rated workflow generation', {
 			helpful: feedback.rating === 'up',
 			workflow_id: workflowsStore.workflowId,
+			session_id: builderStore.trackingSessionId,
 		});
 	}
 	if (feedback.feedback) {
 		telemetry.track('User submitted workflow generation feedback', {
 			feedback: feedback.feedback,
 			workflow_id: workflowsStore.workflowId,
+			session_id: builderStore.trackingSessionId,
 		});
 	}
 }
diff --git a/packages/frontend/editor-ui/src/stores/builder.store.ts b/packages/frontend/editor-ui/src/stores/builder.store.ts
index d86e64bdb7..4e2c6931d3 100644
--- a/packages/frontend/editor-ui/src/stores/builder.store.ts
+++ b/packages/frontend/editor-ui/src/stores/builder.store.ts
@@ -59,6 +59,8 @@ export const useBuilderStore = defineStore(STORES.BUILDER, () => {
 	// Computed properties
 	const isAssistantEnabled = computed(() => settings.isAiAssistantEnabled);
 
+	const trackingSessionId = computed(() => rootStore.pushRef);
+
 	const workflowPrompt = computed(() => {
 		const firstUserMessage = chatMessages.value.find(
 			(msg) => msg.role === 'user' && msg.type === 'text',
@@ -173,6 +175,7 @@ export const useBuilderStore = defineStore(STORES.BUILDER, () => {
 
 		telemetry.track('Workflow generation errored', {
 			error: e.message,
+			session_id: trackingSessionId.value,
 			workflow_id: workflowsStore.workflowId,
 		});
 	}
@@ -228,6 +231,7 @@ export const useBuilderStore = defineStore(STORES.BUILDER, () => {
 		telemetry.track('User submitted builder message', {
 			source,
 			message: text,
+			session_id: trackingSessionId.value,
 			start_workflow_json: currentWorkflowJson,
 			workflow_id: workflowsStore.workflowId,
 		});
@@ -388,6 +392,7 @@ export const useBuilderStore = defineStore(STORES.BUILDER, () => {
 		workflowPrompt,
 		toolMessages,
 		workflowMessages,
+		trackingSessionId,
 
 		// Methods
 		updateWindowWidth,