n8n 2.40.4 → 2.41.0

package/dist/modules/instance-ai/instance-ai.service.js

@@ -10,7 +10,6 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InstanceAiService = exports.QuotaExhaustedStreamError = exports.QUOTA_EXHAUSTED_USER_MESSAGE = void 0;
-exports.buildContextResourcesBlock = buildContextResourcesBlock;
 exports.isAttachmentRejectedByProviderError = isAttachmentRejectedByProviderError;
 exports.getUserFacingErrorMessage = getUserFacingErrorMessage;
 exports.isMaskedStreamFailure = isMaskedStreamFailure;
@@ -39,8 +38,8 @@ const event_service_1 = require("../../events/event.service");
 const instance_ai_builder_delegate_adapter_1 = require("../../modules/agents/instance-ai-builder-delegate.adapter");
 const model_stream_stall_options_1 = require("../../modules/agents/model-stream-stall-options");
 const check_access_1 = require("../../permissions.ee/check-access");
-const publisher_service_1 = require("../../scaling/pubsub/publisher.service");
 const push_1 = require("../../push");
+const publisher_service_1 = require("../../scaling/pubsub/publisher.service");
 const ai_preference_service_1 = require("../../services/ai-preference.service");
 const ai_service_1 = require("../../services/ai.service");
 const instance_write_access_service_1 = require("../../services/instance-write-access.service");
@@ -53,6 +52,7 @@ const instance_context_service_1 = require("./instance-context.service");
 const composite_local_mcp_server_1 = require("./browser/composite-local-mcp-server");
 const instance_ai_browser_session_service_1 = require("./browser/instance-ai-browser-session.service");
 const canvas_node_context_flag_gate_1 = require("./canvas-node-context-flag-gate");
+const computer_use_availability_1 = require("./computer-use-availability");
 const drop_rejected_attachments_1 = require("./drop-rejected-attachments");
 const thread_credential_allowlist_service_1 = require("./eval/thread-credential-allowlist.service");
 const durable_event_log_1 = require("./event-bus/durable-event-log");
@@ -103,67 +103,6 @@ function buildSuspensionTraceOutputs(runId, suspension) {
         ...(message ? { message } : {}),
     };
 }
-function buildNodesAttachmentLine(attachment) {
-    const setLines = attachment.sets.map((set) => {
-        const names = set.nodes.map((node) => node.name ?? node.id);
-        const label = names.length === 1
-            ? `Node "${names[0]}"`
-            : `A chain of connected nodes: ${names.join(' → ')}`;
-        const input = set.inputNode
-            ? `, receiving input from "${set.inputNode.name ?? set.inputNode.id}"`
-            : '';
-        const output = set.outputNode
-            ? `, sending output to "${set.outputNode.name ?? set.outputNode.id}"`
-            : '';
-        const group = set.canvasGroupName
-            ? `, part of canvas group "${set.canvasGroupName}"`
-            : set.canvasGroupId
-                ? `, part of canvas group \`${set.canvasGroupId}\``
-                : '';
-        return `  - ${label}${input}${output}${group}.`;
-    });
-    const hasBoundary = attachment.sets.some((set) => set.inputNode ?? set.outputNode);
-    const boundaryNote = hasBoundary
-        ? '\n  The "receiving input from"/"sending output to" nodes show only where the selection connects; they are not part of the selection. Do not describe, inspect, or make claims about them — scope your answer to the selected nodes.'
-        : '';
-    return `- Selected nodes in workflow \`${attachment.workflowId}\`:\n${setLines.join('\n')}${boundaryNote}`;
-}
-function buildContextResourcesBlock(contextAttachments) {
-    if (contextAttachments.length === 0) {
-        return '';
-    }
-    const lines = contextAttachments.map((attachment) => {
-        if (attachment.type === 'nodes') {
-            return buildNodesAttachmentLine(attachment);
-        }
-        const name = attachment.name ? ` "${attachment.name}"` : '';
-        if (attachment.type === 'agent') {
-            if (attachment.pending) {
-                return `- New unsaved Agent artifact${name} (pending id: \`${attachment.id}\`, in project \`${attachment.projectId}\`).`;
-            }
-            return `- Agent${name} (id: \`${attachment.id}\`, in project \`${attachment.projectId}\`).`;
-        }
-        const execution = attachment.executionId
-            ? `, currently viewing its execution \`${attachment.executionId}\``
-            : '';
-        return `- Workflow${name} (id: \`${attachment.id}\`)${execution}.`;
-    });
-    const header = contextAttachments.some((attachment) => attachment.type === 'agent')
-        ? 'The user opened this conversation from the agent editor, where they are looking at:'
-        : 'The user opened this conversation from the workflow editor, where they are looking at:';
-    const pendingAgentGuidance = contextAttachments.some((attachment) => attachment.type === 'agent' && attachment.pending)
-        ? "Treat references such as “the agent” as this pending artifact. It has no persisted agent row yet. When the user asks to build or change it, use `build-agent`'s new-agent path with a name; do not pass its pending id as an existing `agentId`. The thread's pending target will make creation reuse that id."
-        : '';
-    const prose = [
-        header,
-        ...lines,
-        pendingAgentGuidance,
-        "Treat this purely as context. Until the user tells you what they need, don't read, inspect, run, or otherwise call tools on these resources, and don't make claims about their contents — just briefly acknowledge what they're working on and ask how you can help.",
-    ]
-        .filter(Boolean)
-        .join('\n');
-    return `${internal_messages_1.EDITOR_CONTEXT_OPEN_TAG}\n${JSON.stringify(contextAttachments)}\n\n${prose}\n${internal_messages_1.EDITOR_CONTEXT_CLOSE_TAG}`;
-}
 function isNamedResourceAttachment(attachment) {
     return attachment.type !== 'nodes' && Boolean(attachment.name);
 }
@@ -766,7 +705,7 @@ let InstanceAiService = class InstanceAiService {
             }
         }
     }
-    startRun(user, threadId, message, attachments, context, timeZone, pushRef, mode, promptVersion) {
+    startRun(user, threadId, message, attachments, context, timeZone, pushRef, mode, promptVersion, computerUseChannels, threadArtifacts) {
         if (promptVersion !== undefined &&
             (0, instance_ai_1.resolvePromptProfile)({ version: promptVersion }).fallbackFrom) {
             throw new bad_request_error_1.BadRequestError(`Unknown Instance AI prompt version "${promptVersion}"`);
@@ -780,12 +719,13 @@ let InstanceAiService = class InstanceAiService {
         if (timeZone) {
             this.runState.setTimeZone(threadId, timeZone);
         }
+        this.runState.setComputerUseChannels(threadId, computerUseChannels);
         this.runState.setBuildMode(threadId, mode);
         this.runState.setPromptVersion(threadId, promptVersion);
         if (pushRef !== undefined) {
             this.threadPushRef.set(threadId, pushRef);
         }
-        this.startExecuteRun(user, threadId, runId, message, abortController, attachments, context, messageGroupId, timeZone);
+        this.startExecuteRun(user, threadId, runId, message, abortController, attachments, context, messageGroupId, timeZone, false, undefined, undefined, undefined, threadArtifacts);
         return runId;
     }
     getMessageGroupId(threadId) {
@@ -1454,7 +1394,7 @@ let InstanceAiService = class InstanceAiService {
         const modelId = proxyBaseUrl && tokenManager
             ? await this.modelService.resolveProxyModel(user, proxyBaseUrl, tokenManager, proxyContext)
             : await this.modelService.resolveAgentModelConfig(user, proxyContext);
-        const { configEvalsEnabled, mcpConnectionsEnabled, conversationHistoryEnabled, progressiveBuildingEnabled, nodeUsageEnabled, folderExplorationEnabled, aiPreferencesEnabled, } = await this.adapterService.resolveExperimentGates(user);
+        const { configEvalsEnabled, mcpConnectionsEnabled, conversationHistoryEnabled, progressiveBuildingEnabled, nodeUsageEnabled, folderExplorationEnabled, aiPreferencesEnabled, instanceContextEnabled, } = await this.adapterService.resolveExperimentGates(user);
         const conversationHistory = conversationHistoryEnabled
             ? this.conversationHistoryService.forContext(user.id, boundProjectId, threadId)
             : undefined;
@@ -1475,6 +1415,7 @@ let InstanceAiService = class InstanceAiService {
             configEvalsEnabled,
             mcpConnectionsEnabled,
             nodeUsageEnabled,
+            instanceContextEnabled,
             conversationHistory,
             folderExplorationEnabled,
             modelId,
@@ -1548,31 +1489,16 @@ let InstanceAiService = class InstanceAiService {
             permissionMode: context.permissions?.fetchUrl,
             createCredentialPermissionMode: context.permissions?.createCredential,
         });
-        if (gatewayMcpServer || browserMcpServer) {
-            const capabilities = new Set();
-            if (gatewayMcpServer) {
-                for (const { name, enabled } of gatewayMcpServer.getStatus().toolCategories) {
-                    if (enabled) {
-                        capabilities.add(name);
-                    }
-                }
-            }
-            if (browserMcpServer) {
-                capabilities.add(instance_ai_gateway_service_1.BROWSER_TOOL_CATEGORY);
-            }
-            context.localGatewayStatus = {
-                status: 'connected',
-                capabilities: [...capabilities],
-            };
-        }
-        else if (localGatewayDisabledGlobally && !browserUseEnabledGlobally) {
-            context.localGatewayStatus = { status: 'disabledGlobally' };
-        }
-        else {
-            context.localGatewayStatus = {
-                status: localGatewayDisabledForUser ? 'disabled' : 'disconnected',
-            };
-        }
+        context.computerUseState = (0, computer_use_availability_1.resolveComputerUseState)({
+            localGatewayDisabledGlobally,
+            localGatewayDisabledForUser,
+            browserUseEnabledGlobally,
+            clientChannels: this.runState.getComputerUseChannels(threadId),
+            localComputerToolCategories: gatewayMcpServer
+                ? (0, computer_use_availability_1.enabledToolCategories)(gatewayMcpServer.getStatus().toolCategories)
+                : undefined,
+            browserConnected: browserMcpServer !== undefined,
+        });
         const taskStorage = new instance_ai_1.ThreadTaskStorage(memory);
         const iterationLog = this.dbIterationLogStorage;
         const workflowLoopStorage = new instance_ai_1.WorkflowLoopStorage(memory);
@@ -1585,7 +1511,7 @@ let InstanceAiService = class InstanceAiService {
         }
         const flagDisabledSkillIds = (0, instance_ai_1.disabledInstanceAiSkillIds)({
             configEvalsEnabled,
-            instanceContextEnabled: this.instanceAiConfig.instanceContextEnabled,
+            instanceContextEnabled,
         });
         const selectedSkills = await (0, instance_ai_1.loadInstanceAiPromptSkills)(selectedPrompt.profile);
         const selectedRuntimeSkills = selectedSkills.source;
@@ -1716,6 +1642,7 @@ let InstanceAiService = class InstanceAiService {
             orchestrationContext,
             conversationHistory,
             aiPreferencesEnabled,
+            instanceContextEnabled,
         };
     }
     getAgentExecutionService() {
@@ -2246,12 +2173,13 @@ let InstanceAiService = class InstanceAiService {
             return {};
         }
     }
-    async executeRun(user, threadId, runId, message, abortController, attachments, handoffContext, messageGroupId, timeZone, isReplanFollowUp = false, checkpoint, resumeReason, plannedBuild) {
+    async executeRun(user, threadId, runId, message, abortController, attachments, handoffContext, messageGroupId, timeZone, isReplanFollowUp = false, checkpoint, resumeReason, plannedBuild, threadArtifacts) {
         const fileAttachments = (attachments ?? []).filter((attachment) => attachment.type === 'file');
         const contextAttachments = await this.resolveContextAttachments(attachments, user);
         const signal = abortController.signal;
         let tracing;
         let promptVersion;
+        let modelId;
         let messageTraceFinalization;
         let aiCreatedWorkflowIds;
         let messageId = '';
@@ -2287,6 +2215,9 @@ let InstanceAiService = class InstanceAiService {
                     return resource;
                 });
             }
+            if (threadArtifacts?.artifacts.length) {
+                traceInput.threadArtifacts = threadArtifacts;
+            }
             if (messageGroupId) {
                 traceInput.messageGroupId = messageGroupId;
             }
@@ -2364,9 +2295,11 @@ let InstanceAiService = class InstanceAiService {
             }
             const executionPushRef = this.threadPushRef.get(threadId);
             const environment = await this.createExecutionEnvironment(user, threadId, runId, signal, messageGroupId, executionPushRef, proxyRunConfig);
-            const { context, memory, taskStorage, workflowTasks, plannedTaskService, modelId, orchestrationContext, conversationHistory, aiPreferencesEnabled, } = environment;
+            const { context, memory, taskStorage, workflowTasks, plannedTaskService, modelId: resolvedModelId, orchestrationContext, conversationHistory, aiPreferencesEnabled, instanceContextEnabled, } = environment;
+            modelId = resolvedModelId;
             promptVersion = orchestrationContext.promptConfiguration?.version;
             (0, instance_ai_1.setTracePromptVersion)(tracing, promptVersion);
+            (0, instance_ai_1.setTraceModelId)(tracing, modelId);
             aiCreatedWorkflowIds = context.aiCreatedWorkflowIds ??= new Set();
             const isPostPlanFollowUp = isReplanFollowUp || checkpoint?.isCheckpointFollowUp === true;
             orchestrationContext.currentUserMessage = message;
@@ -2430,7 +2363,6 @@ let InstanceAiService = class InstanceAiService {
             }
             await this.snapshotAttachedAgents(contextAttachments, orchestrationContext, tracing);
             const enrichedMessage = await this.buildMessageWithRunningTasks(threadId, message);
-            const contextResourcesBlock = buildContextResourcesBlock(contextAttachments);
             let handoffContextBlock = '';
             let agentPreviewTitleFallback;
             if (handoffContext?.source === 'agent-preview') {
@@ -2485,10 +2417,14 @@ let InstanceAiService = class InstanceAiService {
             }
             const instanceContext = await this.instanceContext.buildBlock({
                 user,
-                ...(context.projectId !== undefined ? { projectId: context.projectId } : {}),
+                scope: {
+                    surface: 'conversation',
+                    ...(context.projectId !== undefined ? { projectId: context.projectId } : {}),
+                },
                 cursor: (0, instance_context_service_1.readInstanceContextCursor)(thread?.metadata),
                 isMachineFollowUp: checkpoint?.isCheckpointFollowUp === true ||
                     plannedBuild?.isPlannedBuildFollowUp === true,
+                enabled: instanceContextEnabled,
             });
             const existingTasks = await taskStorage.get(threadId);
             if (existingTasks) {
@@ -2514,15 +2450,9 @@ let InstanceAiService = class InstanceAiService {
                 : attachmentManifest
                     ? `${enrichedMessage}\n\n${attachmentManifest}`
                     : enrichedMessage;
-            const messageWithContext = [
-                contextResourcesBlock,
-                handoffContextBlock,
-                setupStateBlock,
-                instanceContext?.block ?? '',
-                messageBody,
-            ]
-                .filter(Boolean)
-                .join('\n\n');
+            const threadArtifactsBlock = resumeReason === undefined
+                ? (0, internal_messages_1.buildThreadArtifactsBlock)(threadArtifacts, contextAttachments)
+                : '';
             const [boundProject, pastConversationsSection] = await Promise.all([
                 this.resolveBoundProject(context),
                 isOpeningTurn ? conversationHistory?.getPastConversationsSection() : undefined,
@@ -2531,16 +2461,19 @@ let InstanceAiService = class InstanceAiService {
             const aiPreferencesBlock = isOpeningTurn && aiPreferencesEnabled
                 ? await this.resolveAiPreferencesBlock(user.id, boundProject)
                 : undefined;
-            const messageWithProject = projectSection
-                ? (0, internal_messages_1.withProjectContext)(messageWithContext, projectSection)
-                : messageWithContext;
-            const messageWithPastConversations = pastConversationsSection
-                ? (0, internal_messages_1.withPastConversations)(messageWithProject, pastConversationsSection)
-                : messageWithProject;
-            const messageWithPreferences = aiPreferencesBlock
-                ? (0, internal_messages_1.withAiPreferences)(messageWithPastConversations, aiPreferencesBlock)
-                : messageWithPastConversations;
-            const fullMessage = (0, internal_messages_1.withCurrentDateTime)(messageWithPreferences, (0, instance_ai_1.getDateTimeSection)(timeZone ?? this.defaultTimeZone));
+            const threadContextBlock = (0, internal_messages_1.buildThreadContextBlock)([
+                instanceContext?.block ?? '',
+                threadArtifactsBlock,
+                projectSection ? (0, internal_messages_1.buildProjectContextBlock)(projectSection) : undefined,
+                pastConversationsSection
+                    ? (0, internal_messages_1.buildPastConversationsBlock)(pastConversationsSection)
+                    : undefined,
+                aiPreferencesBlock,
+                (0, internal_messages_1.buildCurrentDateTimeBlock)((0, instance_ai_1.getDateTimeSection)(timeZone ?? this.defaultTimeZone)),
+            ]);
+            const fullMessage = [handoffContextBlock, setupStateBlock, threadContextBlock, messageBody]
+                .filter(Boolean)
+                .join('\n\n');
             const promptBuildRun = tracing
                 ? await tracing.startChildRun(tracing.messageRun, {
                     name: 'prepare: prompt',
@@ -2876,7 +2809,7 @@ let InstanceAiService = class InstanceAiService {
                     }),
                 };
                 const archivedWorkflowIds = await this.temporaryWorkflowService.reapForRun(threadId, user, aiCreatedWorkflowIds, this.backgroundTasks.getRunningTasks(threadId).length);
-                this.publishRunFinish(threadId, runId, 'cancelled', cancellationReason, archivedWorkflowIds, user.id, { promptVersion });
+                this.publishRunFinish(threadId, runId, 'cancelled', cancellationReason, archivedWorkflowIds, user.id, { promptVersion, ...(modelId !== undefined ? { modelId } : {}) });
                 return;
             }
             const terminalError = await this.reclassifyMaskedStreamFailure(error, user, {
@@ -2929,7 +2862,12 @@ let InstanceAiService = class InstanceAiService {
                 }),
             };
             const archivedWorkflowIds = await this.temporaryWorkflowService.reapForRun(threadId, user, aiCreatedWorkflowIds, this.backgroundTasks.getRunningTasks(threadId).length);
-            this.publishRunFinish(threadId, runId, 'errored', userFacingErrorMessage, archivedWorkflowIds, user.id, { errorMessage, errorSource: 'exception', promptVersion });
+            this.publishRunFinish(threadId, runId, 'errored', userFacingErrorMessage, archivedWorkflowIds, user.id, {
+                errorMessage,
+                errorSource: 'exception',
+                promptVersion,
+                ...(modelId !== undefined ? { modelId } : {}),
+            });
         }
         finally {
             this.runState.clearActiveRun(threadId);
@@ -3380,6 +3318,7 @@ let InstanceAiService = class InstanceAiService {
                     errorInfo: { errorMessage: rebuildFailure, errorSource: 'exception' },
                     messageGroupId,
                     user: activeUser,
+                    ...(modelId !== undefined ? { modelId } : {}),
                 });
                 this.runState.clearActiveRun(threadId, resumeExecutionToken);
                 return null;
@@ -3416,6 +3355,7 @@ let InstanceAiService = class InstanceAiService {
         const promptVersion = opts.orchestrationContext?.promptConfiguration?.version ??
             this.runState.getPromptConfiguration(opts.threadId)?.version;
         (0, instance_ai_1.setTracePromptVersion)(opts.tracing, promptVersion);
+        (0, instance_ai_1.setTraceModelId)(opts.tracing, opts.modelId);
         let completedSetupWorkflowId;
         let skipPostRunCleanup = false;
         let resumeClaimed = false;
@@ -3641,10 +3581,12 @@ let InstanceAiService = class InstanceAiService {
             await this.tracing.finalizeRunTracing(opts.runId, opts.tracing, {
                 status: finalStatus,
                 outputText,
+                ...(opts.modelId !== undefined ? { modelId: opts.modelId } : {}),
             });
             messageTraceFinalization = {
                 status: finalStatus,
                 outputText,
+                ...(opts.modelId !== undefined ? { modelId: opts.modelId } : {}),
                 metadata: await this.tracing.buildMessageTraceMetadata(opts.threadId, opts.runId, {
                     status: finalStatus,
                 }),
@@ -3718,7 +3660,7 @@ let InstanceAiService = class InstanceAiService {
                     }),
                 };
                 const archivedWorkflowIds = await this.temporaryWorkflowService.reapForRun(opts.threadId, opts.user, undefined, this.backgroundTasks.getRunningTasks(opts.threadId).length);
-                this.publishRunFinish(opts.threadId, opts.runId, 'cancelled', cancellationReason, archivedWorkflowIds, opts.user.id, { promptVersion });
+                this.publishRunFinish(opts.threadId, opts.runId, 'cancelled', cancellationReason, archivedWorkflowIds, opts.user.id, { promptVersion, ...(opts.modelId !== undefined ? { modelId: opts.modelId } : {}) });
                 return;
             }
             const terminalError = await this.reclassifyMaskedStreamFailure(error, opts.user, {
@@ -3773,7 +3715,12 @@ let InstanceAiService = class InstanceAiService {
                 }),
             };
             const archivedWorkflowIds = await this.temporaryWorkflowService.reapForRun(opts.threadId, opts.user, undefined, this.backgroundTasks.getRunningTasks(opts.threadId).length);
-            this.publishRunFinish(opts.threadId, opts.runId, 'errored', userFacingErrorMessage, archivedWorkflowIds, opts.user.id, { errorMessage, errorSource: 'exception', promptVersion });
+            this.publishRunFinish(opts.threadId, opts.runId, 'errored', userFacingErrorMessage, archivedWorkflowIds, opts.user.id, {
+                errorMessage,
+                errorSource: 'exception',
+                promptVersion,
+                ...(opts.modelId !== undefined ? { modelId: opts.modelId } : {}),
+            });
         }
         finally {
             this.runState.clearActiveRun(opts.threadId, opts.resumeExecutionToken);
@@ -3849,6 +3796,7 @@ let InstanceAiService = class InstanceAiService {
                     reason,
                     messageGroupId: opts.messageGroupId,
                     user: opts.user,
+                    ...(opts.modelId !== undefined ? { modelId: opts.modelId } : {}),
                 });
                 return;
             }
@@ -3877,6 +3825,7 @@ let InstanceAiService = class InstanceAiService {
                     errorInfo: { errorMessage: outcome.errorMessage, errorSource },
                     messageGroupId: opts.messageGroupId,
                     user: opts.user,
+                    ...(opts.modelId !== undefined ? { modelId: opts.modelId } : {}),
                 });
                 return;
             default:
@@ -3894,6 +3843,7 @@ let InstanceAiService = class InstanceAiService {
         this.publishRunFinish(threadId, runId, status, args.reason, archivedWorkflowIds, args.user.id, {
             ...args.errorInfo,
             promptVersion: args.promptVersion,
+            ...(args.modelId !== undefined ? { modelId: args.modelId } : {}),
         });
     }
     async bestEffort(failureMessage, context, step) {
@@ -4020,7 +3970,10 @@ let InstanceAiService = class InstanceAiService {
             reason,
         });
         const archivedWorkflowIds = await this.temporaryWorkflowService.reapForRun(suspended.threadId, suspended.user, undefined, this.backgroundTasks.getRunningTasks(suspended.threadId).length);
-        this.publishRunFinish(suspended.threadId, suspended.runId, 'cancelled', reason, archivedWorkflowIds, suspended.user.id, { promptVersion: suspended.orchestrationContext?.promptConfiguration?.version });
+        this.publishRunFinish(suspended.threadId, suspended.runId, 'cancelled', reason, archivedWorkflowIds, suspended.user.id, {
+            promptVersion: suspended.orchestrationContext?.promptConfiguration?.version,
+            ...(suspended.modelId !== undefined ? { modelId: suspended.modelId } : {}),
+        });
         await this.tracing.maybeFinalizeRunTraceRoot(suspended.runId, {
             status: 'cancelled',
             reason,
@@ -4053,6 +4006,7 @@ let InstanceAiService = class InstanceAiService {
             thread_id: threadId,
             run_id: runId,
             ...(metadata?.promptVersion ? { prompt_version: metadata.promptVersion } : {}),
+            ...this.telemetryModelId(metadata?.modelId),
             status: effectiveStatus,
             ...(userId ? { user_id: userId } : {}),
         });
@@ -4062,12 +4016,17 @@ let InstanceAiService = class InstanceAiService {
                 thread_id: threadId,
                 run_id: runId,
                 ...(metadata?.promptVersion ? { prompt_version: metadata.promptVersion } : {}),
+                ...this.telemetryModelId(metadata?.modelId),
                 error_message: (0, telemetry_1.redactTelemetryText)(metadata?.errorMessage ?? reason ?? 'unknown'),
                 ...(metadata?.errorSource ? { error_source: metadata.errorSource } : {}),
                 ...(userId ? { user_id: userId } : {}),
             });
         }
     }
+    telemetryModelId(modelId) {
+        const id = (0, instance_ai_1.modelConfigId)(modelId);
+        return id ? { model_id: id } : {};
+    }
     createBrowserCredentialSetupTracker(runId, userId) {
         const getOrCreateAttempts = () => {
             let pending = this.pendingBrowserCredentialSetups.get(runId);
@@ -4149,7 +4108,11 @@ let InstanceAiService = class InstanceAiService {
         }
     }
     async finalizeRun(threadId, runId, status, options) {
-        this.publishRunFinish(threadId, runId, status, options?.errorReason, options?.archivedWorkflowIds, options?.userId, { ...options?.errorInfo, promptVersion: options?.promptVersion });
+        this.publishRunFinish(threadId, runId, status, options?.errorReason, options?.archivedWorkflowIds, options?.userId, {
+            ...options?.errorInfo,
+            promptVersion: options?.promptVersion,
+            ...(options?.modelId !== undefined ? { modelId: options.modelId } : {}),
+        });
         this.emitRunMetrics(threadId, status, options);
         if (status === 'completed' && options?.userId && options?.modelId) {
             void this.refineTitleIfNeeded(threadId, options.userId, options.modelId);
@@ -4214,6 +4177,7 @@ let InstanceAiService = class InstanceAiService {
                 executionMode: 'internal',
                 metadata: {
                     operation_name: 'thread_title',
+                    ...(0, instance_ai_1.modelIdTraceMetadata)(modelId),
                 },
             });
             let llmTitle;