n8n 2.41.4 → 2.42.1

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

@@ -8,11 +8,13 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+var InstanceAiService_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InstanceAiService = exports.QuotaExhaustedStreamError = exports.QUOTA_EXHAUSTED_USER_MESSAGE = void 0;
 exports.isAttachmentRejectedByProviderError = isAttachmentRejectedByProviderError;
 exports.getUserFacingErrorMessage = getUserFacingErrorMessage;
 exports.isMaskedStreamFailure = isMaskedStreamFailure;
+exports.resolveOperatorPromptVersion = resolveOperatorPromptVersion;
 const agents_1 = require("@n8n/agents");
 const sandbox_1 = require("@n8n/agents/sandbox");
 const api_types_1 = require("@n8n/api-types");
@@ -26,6 +28,7 @@ const instance_ai_1 = require("@n8n/instance-ai");
 const confirmation_payload_1 = require("@n8n/instance-ai/confirmation-payload");
 const telemetry_1 = require("@n8n/telemetry");
 const get_error_message_1 = require("@n8n/utils/errors/get-error-message");
+const is_record_1 = require("@n8n/utils/is-record");
 const lazy_import_1 = require("@n8n/utils/lazy-import");
 const workflow_sdk_1 = require("@n8n/workflow-sdk");
 const n8n_core_1 = require("n8n-core");
@@ -36,6 +39,7 @@ const bad_request_error_1 = require("../../errors/response-errors/bad-request.er
 const forbidden_error_1 = require("../../errors/response-errors/forbidden.error");
 const event_service_1 = require("../../events/event.service");
 const instance_ai_builder_delegate_adapter_1 = require("../../modules/agents/instance-ai-builder-delegate.adapter");
+const instance_ai_agent_context_adapter_1 = require("../../modules/agents/instance-ai-agent-context.adapter");
 const model_stream_stall_options_1 = require("../../modules/agents/model-stream-stall-options");
 const check_access_1 = require("../../permissions.ee/check-access");
 const push_1 = require("../../push");
@@ -44,14 +48,13 @@ 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");
 const proxy_token_manager_1 = require("../../services/proxy-token-manager");
-const url_service_1 = require("../../services/url.service");
+const backend_services_1 = require("@n8n/backend-services");
 const telemetry_2 = require("../../telemetry");
 const utils_1 = require("../../utils");
 const agent_preview_handoff_1 = require("./agent-preview-handoff");
 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");
@@ -79,6 +82,8 @@ const mcp_1 = require("./mcp");
 const observability_1 = require("./observability");
 const planned_task_action_runner_1 = require("./planned-task-action-runner");
 const instance_ai_event_log_repository_1 = require("./repositories/instance-ai-event-log.repository");
+const instance_ai_observation_cursor_repository_1 = require("./repositories/instance-ai-observation-cursor.repository");
+const instance_ai_observation_repository_1 = require("./repositories/instance-ai-observation.repository");
 const instance_ai_pending_confirmation_repository_1 = require("./repositories/instance-ai-pending-confirmation.repository");
 const instance_ai_thread_grant_repository_1 = require("./repositories/instance-ai-thread-grant.repository");
 const sandbox_2 = require("./sandbox");
@@ -282,14 +287,21 @@ const MAX_CONCURRENT_BACKGROUND_TASKS_PER_THREAD = 5;
 const UNLIMITED_CONCURRENCY = -1;
 const MAX_CONSECUTIVE_FAILED_INTERNAL_FOLLOW_UPS = 3;
 const TITLE_REFINE_HISTORY_LIMIT = 50;
-let InstanceAiService = class InstanceAiService {
+function resolveOperatorPromptVersion(configured) {
+    const version = configured?.trim();
+    if (!version)
+        return undefined;
+    (0, instance_ai_1.assertInstanceAiPromptVersion)(version);
+    return version;
+}
+let InstanceAiService = InstanceAiService_1 = class InstanceAiService {
     get mcpClientManager() {
         if (!this._mcpClientManager) {
             this._mcpClientManager = new instance_ai_1.McpClientManager(this._ssrfProtectionConfig.enabled ? this._ssrfProtectionService : undefined, { onToolCallSettled: (event) => this.trackMcpToolCall(event) });
         }
         return this._mcpClientManager;
     }
-    constructor(logger, globalConfig, instanceSettings, adapterService, eventBus, eventLog, interruptedRunSweeper, settingsService, gatewayService, browserSessionService, memoryService, agentMemory, checkpointStore, aiService, threadGrantRepo, pendingConfirmationRepo, urlService, eventLogRepository, dbIterationLogStorage, instanceWriteAccess, telemetry, mcpRegistryService, userRepository, temporaryWorkflowService, errorReporter, ssrfProtectionConfig, ssrfProtectionService, eventService, evalCredentialAllowlists, runProbe, modelService, creditService, publisher, instanceAiErrorReporter, canvasNodeContextFlagGate, push, conversationHistoryService, instanceContext, aiPreferenceService) {
+    constructor(logger, globalConfig, instanceSettings, adapterService, eventBus, eventLog, interruptedRunSweeper, settingsService, gatewayService, browserSessionService, memoryService, agentMemory, checkpointStore, aiService, threadGrantRepo, pendingConfirmationRepo, observationRepo, observationCursorRepo, urlService, eventLogRepository, dbIterationLogStorage, instanceWriteAccess, telemetry, mcpRegistryService, userRepository, temporaryWorkflowService, errorReporter, ssrfProtectionConfig, ssrfProtectionService, eventService, evalCredentialAllowlists, runProbe, modelService, creditService, publisher, instanceAiErrorReporter, push, conversationHistoryService, instanceContext, aiPreferenceService) {
         this.instanceSettings = instanceSettings;
         this.adapterService = adapterService;
         this.eventBus = eventBus;
@@ -304,6 +316,8 @@ let InstanceAiService = class InstanceAiService {
         this.aiService = aiService;
         this.threadGrantRepo = threadGrantRepo;
         this.pendingConfirmationRepo = pendingConfirmationRepo;
+        this.observationRepo = observationRepo;
+        this.observationCursorRepo = observationCursorRepo;
         this.urlService = urlService;
         this.eventLogRepository = eventLogRepository;
         this.dbIterationLogStorage = dbIterationLogStorage;
@@ -319,7 +333,6 @@ let InstanceAiService = class InstanceAiService {
         this.creditService = creditService;
         this.publisher = publisher;
         this.instanceAiErrorReporter = instanceAiErrorReporter;
-        this.canvasNodeContextFlagGate = canvasNodeContextFlagGate;
         this.push = push;
         this.conversationHistoryService = conversationHistoryService;
         this.instanceContext = instanceContext;
@@ -661,6 +674,27 @@ let InstanceAiService = class InstanceAiService {
                 : {}),
         };
     }
+    async getThreadMemory(userId, threadId) {
+        const thread = await this.agentMemory.getThread(threadId);
+        if (!thread || thread.resourceId !== userId) {
+            throw new forbidden_error_1.ForbiddenError('Not authorized for this thread');
+        }
+        const [observations, cursor] = await Promise.all([
+            this.observationRepo.findActiveForThread(threadId),
+            this.observationCursorRepo.findForThread(threadId),
+        ]);
+        return {
+            observations: observations.map(({ marker, text, tokenCount }) => ({
+                marker,
+                text,
+                tokenCount,
+            })),
+            cursor: cursor && {
+                lastObservedMessageId: cursor.lastObservedMessageId,
+                lastObservedAt: cursor.lastObservedAt.toISOString(),
+            },
+        };
+    }
     getRunDebug(runId) {
         return this.runDebugBuffer.get(runId);
     }
@@ -707,7 +741,7 @@ let InstanceAiService = class InstanceAiService {
             }
         }
     }
-    startRun(user, threadId, message, attachments, context, timeZone, pushRef, mode, promptVersion, computerUseChannels, threadArtifacts) {
+    startRun(user, threadId, message, attachments, context, timeZone, pushRef, mode, promptVersion, computerUseChannels, threadArtifacts, observerThresholdTokens) {
         if (promptVersion !== undefined &&
             (0, instance_ai_1.resolvePromptProfile)({ version: promptVersion }).fallbackFrom) {
             throw new bad_request_error_1.BadRequestError(`Unknown Instance AI prompt version "${promptVersion}"`);
@@ -724,6 +758,7 @@ let InstanceAiService = class InstanceAiService {
         this.runState.setComputerUseChannels(threadId, computerUseChannels);
         this.runState.setBuildMode(threadId, mode);
         this.runState.setPromptVersion(threadId, promptVersion);
+        this.runState.setObserverThresholdTokens(threadId, observerThresholdTokens);
         if (pushRef !== undefined) {
             this.threadPushRef.set(threadId, pushRef);
         }
@@ -1187,7 +1222,8 @@ let InstanceAiService = class InstanceAiService {
     createAgentMemoryOptions(user, threadId, runId) {
         return {
             observationalMemory: {
-                observerThresholdTokens: this.instanceAiConfig.observerMessageTokens,
+                observerThresholdTokens: this.runState.getObserverThresholdTokens(threadId) ??
+                    this.instanceAiConfig.observerMessageTokens,
                 reflectorThresholdTokens: this.instanceAiConfig.reflectorObservationTokens,
                 midRunObservation: this.instanceAiConfig.midRunObservation,
                 onTaskUsage: async (report) => {
@@ -1379,7 +1415,11 @@ let InstanceAiService = class InstanceAiService {
             });
         }
     }
-    async createExecutionEnvironment(user, threadId, runId, abortSignal, messageGroupId, pushRef, proxyRunConfig) {
+    areMcpConnectionsAvailable() {
+        return (di_1.Container.get(backend_common_1.ModuleRegistry).isActive('mcp-registry') &&
+            this.settingsService.isMcpAccessEnabled());
+    }
+    async createExecutionEnvironment(user, threadId, runId, abortSignal, messageGroupId, pushRef, proxyRunConfig, instanceContextGates, experimentGates) {
         const memory = this.agentMemory;
         const boundProjectId = await memory.getThreadProjectId(threadId);
         if (!boundProjectId) {
@@ -1388,6 +1428,7 @@ let InstanceAiService = class InstanceAiService {
         const adminSettings = await this.settingsService.getAdminSettings();
         const localGatewayDisabledGlobally = adminSettings.localGatewayDisabled;
         const browserUseEnabledGlobally = adminSettings.browserUseEnabled;
+        const mcpConnectionsAvailable = this.areMcpConnectionsAvailable();
         const localGatewayDisabledForUser = await this.settingsService.isLocalGatewayDisabledForUser(user.id);
         const userGateway = this.gatewayService.findGateway(user.id);
         await this.creditService.ensureQuotaLockApplied(user);
@@ -1396,15 +1437,20 @@ 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, setupPanelEnabled, setupPanelVariant, nodeUsageEnabled, folderExplorationEnabled, aiPreferencesEnabled, instanceContextEnabled, } = await this.adapterService.resolveExperimentGates(user);
+        const gates = experimentGates ?? (await this.adapterService.resolveExperimentGates(user));
+        const { configEvalsEnabled, conversationHistoryEnabled, progressiveBuildingEnabled, conciseStyleEnabled, setupPanelEnabled, setupPanelVariant, folderExplorationEnabled, credentialDescriptionsEnabled, aiPreferencesEnabled, } = gates;
         this.runState.setSetupPanelEnabled(threadId, setupPanelEnabled);
+        const { instanceContextEnabled, nodeUsageEnabled } = instanceContextGates ?? gates;
         const conversationHistory = conversationHistoryEnabled
             ? this.conversationHistoryService.forContext(user.id, boundProjectId, threadId)
             : undefined;
+        const mode = this.runState.getBuildMode(threadId) ??
+            (progressiveBuildingEnabled ? 'progressive' : 'default');
         const selectedPrompt = (0, instance_ai_1.resolvePromptProfile)({
-            version: this.runState.getPromptVersion(threadId),
-            mode: this.runState.getBuildMode(threadId) ??
-                (progressiveBuildingEnabled ? 'progressive' : 'default'),
+            version: this.runState.getPromptVersion(threadId) ??
+                resolveOperatorPromptVersion(this.instanceAiConfig.promptVersion) ??
+                (conciseStyleEnabled && mode === 'default' ? instance_ai_1.CONCISE_PROMPT_VERSION : undefined),
+            mode,
         });
         const buildMode = selectedPrompt.profile.mode;
         this.runState.setBuildMode(threadId, buildMode);
@@ -1415,16 +1461,18 @@ let InstanceAiService = class InstanceAiService {
             pushRef,
             threadId,
             projectId: boundProjectId,
-            credentialIdAllowlist: this.evalCredentialAllowlists.get(threadId),
+            getCredentialIdAllowlist: () => this.evalCredentialAllowlists.get(threadId),
             shouldBypassCredentialTest: (credentialId) => this.evalCredentialAllowlists.shouldBypassTest(threadId, credentialId),
             configEvalsEnabled,
             setupPanelVariant,
-            mcpConnectionsEnabled,
+            mcpConnectionsAvailable,
             nodeUsageEnabled,
             instanceContextEnabled,
             conversationHistory,
             folderExplorationEnabled,
             onboardingThread,
+            credentialDescriptionsEnabled,
+            aiPreferencesEnabled,
             modelId,
         });
         this.gatewayService.applyToolPolicy(user.id);
@@ -1623,8 +1671,6 @@ let InstanceAiService = class InstanceAiService {
             runtimeSkills,
             runtimeSkillCatalog: allRuntimeSkills,
             oauth2CallbackUrl: this.oauth2CallbackUrl,
-            webhookBaseUrl: this.webhookBaseUrl,
-            formBaseUrl: this.formBaseUrl,
             cancelBackgroundTask: async (taskId) => this.cancelBackgroundTask(threadId, taskId),
             touchRun: () => this.runState.touchActiveRun(threadId),
             touchBackgroundTask: (taskId) => this.backgroundTasks.touchTask(threadId, taskId),
@@ -1650,6 +1696,7 @@ let InstanceAiService = class InstanceAiService {
             conversationHistory,
             aiPreferencesEnabled,
             instanceContextEnabled,
+            nodeUsageEnabled,
         };
     }
     getAgentExecutionService() {
@@ -1662,6 +1709,16 @@ let InstanceAiService = class InstanceAiService {
             return null;
         }
     }
+    async bindAgentContextReader(context, user) {
+        const projectId = context.projectId;
+        if (!projectId)
+            return;
+        if (!(await (0, check_access_1.userHasScopes)(user, ['agent:read'], false, { projectId })))
+            return;
+        if (!di_1.Container.get(backend_common_1.ModuleRegistry).isActive('agents'))
+            return;
+        context.agentContextService = di_1.Container.get(instance_ai_agent_context_adapter_1.InstanceAiAgentContextAdapterService).createReader(user, projectId);
+    }
     async bindAgentPreviewSession(context, user) {
         await (0, instance_ai_1.resolveAgentPreviewSession)(context);
         const projectId = context.projectId;
@@ -1675,7 +1732,7 @@ let InstanceAiService = class InstanceAiService {
             const service = this.getAgentExecutionService();
             if (!service)
                 return null;
-            const detail = await service.getThreadDetail(ref.threadId, projectId, ref.agentId);
+            const detail = await service.getThreadDetail(ref.threadId, projectId, ref.agentId, user.id);
             if (!detail)
                 return null;
             const transcript = (0, format_preview_context_1.formatPreviewSessionContext)(detail.thread, detail.executions, ref.executionId);
@@ -2156,16 +2213,15 @@ let InstanceAiService = class InstanceAiService {
             });
         }
     }
-    async resolveContextAttachments(attachments, user) {
+    resolveContextAttachments(attachments, nodeContextEnabled) {
         const attachmentsOrEmpty = attachments ?? [];
         const workflowAttachments = attachmentsOrEmpty.filter((attachment) => attachment.type === 'workflow');
         const agentAttachments = attachmentsOrEmpty.filter((attachment) => attachment.type === 'agent');
         const nodeAttachments = attachmentsOrEmpty.filter((attachment) => attachment.type === 'nodes');
-        const canvasNodeContextEnabled = nodeAttachments.length > 0 && (await this.canvasNodeContextFlagGate.isEnabled(user));
         return [
             ...workflowAttachments,
             ...agentAttachments,
-            ...(canvasNodeContextEnabled ? nodeAttachments : []),
+            ...(nodeContextEnabled ? nodeAttachments : []),
         ];
     }
     async readThreadProvenance(userId, threadId) {
@@ -2182,7 +2238,8 @@ let InstanceAiService = class InstanceAiService {
     }
     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 experimentGates = await this.adapterService.resolveExperimentGates(user);
+        const contextAttachments = this.resolveContextAttachments(attachments, experimentGates.nodeContextEnabled);
         const signal = abortController.signal;
         let tracing;
         let promptVersion;
@@ -2194,6 +2251,11 @@ let InstanceAiService = class InstanceAiService {
         let turnHadFileAttachments = false;
         const turnStartedAt = new Date();
         let errorReporterExecutionToken;
+        let contextTurn;
+        let contextResult;
+        let contextSegmentReported = false;
+        const observedContextWork = new instance_ai_1.WorkSummaryAccumulator();
+        const contextEventBus = this.observeInstanceContextEvents(observedContextWork);
         try {
             errorReporterExecutionToken = this.instanceAiErrorReporter.beginRun(runId);
             messageId = (0, nanoid_1.nanoid)();
@@ -2301,8 +2363,8 @@ let InstanceAiService = class InstanceAiService {
                 return;
             }
             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: resolvedModelId, orchestrationContext, conversationHistory, aiPreferencesEnabled, instanceContextEnabled, } = environment;
+            const environment = await this.createExecutionEnvironment(user, threadId, runId, signal, messageGroupId, executionPushRef, proxyRunConfig, undefined, experimentGates);
+            const { context, memory, taskStorage, workflowTasks, plannedTaskService, modelId: resolvedModelId, orchestrationContext, conversationHistory, aiPreferencesEnabled, instanceContextEnabled, nodeUsageEnabled, } = environment;
             modelId = resolvedModelId;
             promptVersion = orchestrationContext.promptConfiguration?.version;
             (0, instance_ai_1.setTracePromptVersion)(tracing, promptVersion);
@@ -2384,6 +2446,7 @@ let InstanceAiService = class InstanceAiService {
                 }
                 const resolved = await (0, agent_preview_handoff_1.resolveAgentPreviewHandoff)(handoffContext, {
                     projectId,
+                    userId: user.id,
                     getThreadDetail: agentExecutionService.getThreadDetail.bind(agentExecutionService),
                 });
                 handoffContextBlock = resolved.block;
@@ -2426,6 +2489,7 @@ let InstanceAiService = class InstanceAiService {
                             },
                 });
             }
+            const isMachineFollowUp = checkpoint?.isCheckpointFollowUp === true || plannedBuild?.isPlannedBuildFollowUp === true;
             const instanceContext = await this.instanceContext.buildBlock({
                 user,
                 scope: {
@@ -2433,10 +2497,26 @@ let InstanceAiService = class InstanceAiService {
                     ...(context.projectId !== undefined ? { projectId: context.projectId } : {}),
                 },
                 cursor: (0, instance_context_service_1.readInstanceContextCursor)(thread?.metadata),
-                isMachineFollowUp: checkpoint?.isCheckpointFollowUp === true ||
-                    plannedBuild?.isPlannedBuildFollowUp === true,
+                isMachineFollowUp,
                 enabled: instanceContextEnabled,
             });
+            const contextInjection = (0, instance_context_service_1.toContextInjection)(instanceContext);
+            contextTurn = {
+                userId: user.id,
+                threadId,
+                runId,
+                injection: contextInjection,
+                instanceContextEnabled,
+                nodeUsageEnabled,
+            };
+            if ((0, instance_context_service_1.shouldTraceContextInjection)(contextInjection)) {
+                this.eventBus.publish(threadId, {
+                    type: 'instance-context',
+                    runId,
+                    agentId: (0, instance_ai_1.orchestratorAgentId)(runId),
+                    payload: { injection: contextInjection },
+                });
+            }
             const existingTasks = await taskStorage.get(threadId);
             if (existingTasks) {
                 this.eventBus.publish(threadId, {
@@ -2469,18 +2549,24 @@ let InstanceAiService = class InstanceAiService {
                 isOpeningTurn ? conversationHistory?.getPastConversationsSection() : undefined,
             ]);
             const projectSection = boundProject ? (0, internal_messages_1.getProjectContextSection)(boundProject) : undefined;
-            const aiPreferencesBlock = isOpeningTurn && aiPreferencesEnabled
-                ? await this.resolveAiPreferencesBlock(user.id, boundProject)
+            const aiPreferencesTurn = aiPreferencesEnabled && resumeReason === undefined && !isMachineFollowUp
+                ? await this.resolveAiPreferencesTurn(user.id, boundProject, threadId)
                 : undefined;
             const threadContextBlock = (0, internal_messages_1.buildThreadContextBlock)([
-                instanceContext?.block ?? '',
+                instanceContext.state === 'injected' ? instanceContext.block : '',
                 onboardingSkill ? (0, internal_messages_1.buildOnboardingSkillBlock)(onboardingSkill) : undefined,
                 threadArtifactsBlock,
                 projectSection ? (0, internal_messages_1.buildProjectContextBlock)(projectSection) : undefined,
+                resumeReason === undefined
+                    ? (0, internal_messages_1.buildInstanceUrlsBlock)({
+                        webhookBaseUrl: this.webhookBaseUrl,
+                        formBaseUrl: this.formBaseUrl,
+                    })
+                    : undefined,
                 pastConversationsSection
                     ? (0, internal_messages_1.buildPastConversationsBlock)(pastConversationsSection)
                     : undefined,
-                aiPreferencesBlock,
+                aiPreferencesTurn?.block,
                 (0, internal_messages_1.buildCurrentDateTimeBlock)((0, instance_ai_1.getDateTimeSection)(timeZone ?? this.defaultTimeZone)),
             ]);
             const fullMessage = [handoffContextBlock, setupStateBlock, threadContextBlock, messageBody]
@@ -2562,12 +2648,13 @@ let InstanceAiService = class InstanceAiService {
             const agent = await this.createAgentFromEnvironment(environment, threadId, runId, user, tracing);
             const streamOptions = this.buildOrchestratorAgentStreamOptions(user, threadId, runId, signal);
             streamReached = true;
-            if (instanceContext) {
+            if (instanceContext.state === 'injected') {
+                const injectedCursor = instanceContext.cursor;
                 try {
                     await (0, instance_ai_1.patchThread)(memory, {
                         threadId,
                         update: ({ metadata }) => ({
-                            metadata: { ...metadata, [instance_context_service_1.INSTANCE_CONTEXT_CURSOR]: instanceContext.cursor },
+                            metadata: { ...metadata, [instance_context_service_1.INSTANCE_CONTEXT_CURSOR]: injectedCursor },
                         }),
                     });
                 }
@@ -2575,6 +2662,15 @@ let InstanceAiService = class InstanceAiService {
                     this.logger.warn('Failed to store the instance-context cursor', { error });
                 }
             }
+            if (aiPreferencesTurn) {
+                this.eventBus.publish(threadId, {
+                    type: 'preferences-applied',
+                    runId,
+                    agentId: (0, instance_ai_1.orchestratorAgentId)(runId),
+                    userId: user.id,
+                    payload: aiPreferencesTurn.payload,
+                });
+            }
             const result = tracing
                 ? await tracing.withActiveSpan(tracing.actorRun, async () => {
                     return await (0, instance_ai_1.streamAgentRun)(agent, streamInput, streamOptions, {
@@ -2582,7 +2678,7 @@ let InstanceAiService = class InstanceAiService {
                         runId,
                         agentId: (0, instance_ai_1.orchestratorAgentId)(runId),
                         signal,
-                        eventBus: this.eventBus,
+                        eventBus: contextEventBus,
                         logger: this.logger,
                         onActivity: () => this.runState.touchActiveRun(threadId),
                         stopSignal,
@@ -2593,18 +2689,45 @@ let InstanceAiService = class InstanceAiService {
                     runId,
                     agentId: (0, instance_ai_1.orchestratorAgentId)(runId),
                     signal,
-                    eventBus: this.eventBus,
+                    eventBus: contextEventBus,
                     logger: this.logger,
                     onActivity: () => this.runState.touchActiveRun(threadId),
                     stopSignal,
                 });
+            contextResult = result;
+            if (aiPreferencesTurn) {
+                this.telemetry.track(telemetry_1.TELEMETRY_EVENT.CONTEXT.PREFERENCES_APPLIED_TO_TURN, {
+                    count: aiPreferencesTurn.payload.preferences.length,
+                    scope_types: [...new Set(aiPreferencesTurn.payload.preferences.map((p) => p.scope))],
+                    rendered_length: aiPreferencesTurn.payload.renderedLength,
+                    surface: 'aia',
+                    injected_this_turn: aiPreferencesTurn.payload.injectedThisTurn,
+                    turn_latency_ms: Date.now() - turnStartedAt.getTime(),
+                    ...(result.usage ? { turn_token_count: result.usage.promptTokens } : {}),
+                });
+            }
             if (result.status === 'suspended') {
                 this.emitRunMetrics(threadId, 'suspended', {
                     modelId,
                     workSummary: result.workSummary,
                     usage: result.usage,
                 });
+                const suspendedReach = (0, instance_ai_1.deriveInstanceContextReach)(result.workSummary?.toolCalls ?? []);
+                contextSegmentReported = true;
+                this.emitInstanceContextTurn(contextTurn, {
+                    segment: 'suspended',
+                    status: 'suspended',
+                    reach: suspendedReach,
+                    workSummary: result.workSummary,
+                    usage: result.usage,
+                });
                 if (result.suspension) {
+                    const suspendedContext = {
+                        injection: contextInjection,
+                        instanceContextEnabled,
+                        nodeUsageEnabled,
+                        reachSoFar: suspendedReach,
+                    };
                     this.runState.suspendRun(threadId, {
                         runId,
                         agentRunId: result.agentRunId,
@@ -2626,7 +2749,9 @@ let InstanceAiService = class InstanceAiService {
                         checkpoint,
                         plannedBuild,
                         runHandoff: runControl.state,
+                        instanceContext: suspendedContext,
                     });
+                    await this.persistSuspendedInstanceContext(result.agentRunId, suspendedContext);
                     await this.suspendedThreads.persistPendingConfirmation({
                         requestId: result.suspension.requestId,
                         threadId,
@@ -2756,6 +2881,15 @@ let InstanceAiService = class InstanceAiService {
                 }),
             };
             const archivedWorkflowIds = await this.temporaryWorkflowService.reapForRun(threadId, user, aiCreatedWorkflowIds, this.backgroundTasks.getRunningTasks(threadId).length);
+            const contextReach = (0, instance_ai_1.deriveInstanceContextReach)(result.workSummary?.toolCalls ?? []);
+            contextSegmentReported = true;
+            this.emitInstanceContextTurn(contextTurn, {
+                segment: 'whole',
+                status: result.status,
+                reach: contextReach,
+                workSummary: result.workSummary,
+                usage: result.usage,
+            });
             await this.finalizeRun(threadId, runId, result.status, {
                 promptVersion,
                 userId: user.id,
@@ -2763,6 +2897,7 @@ let InstanceAiService = class InstanceAiService {
                 archivedWorkflowIds,
                 workSummary: result.workSummary,
                 usage: result.usage,
+                contextReach,
                 errorReason: userFacingErrorMessage,
                 ...(result.status === 'errored'
                     ? {
@@ -2789,10 +2924,25 @@ let InstanceAiService = class InstanceAiService {
             }
         }
         catch (error) {
+            if (signal.aborted && this.shouldPreserveHitlOnShutdown(runId))
+                return;
+            const contextWork = contextResult
+                ? contextResult.workSummary
+                : observedContextWork.toSummary();
+            const contextReach = contextTurn
+                ? (0, instance_ai_1.deriveInstanceContextReach)(contextWork?.toolCalls ?? [])
+                : undefined;
+            if (contextTurn && contextReach && !contextSegmentReported) {
+                contextSegmentReported = true;
+                this.emitInstanceContextTurn(contextTurn, {
+                    segment: 'whole',
+                    status: signal.aborted ? 'cancelled' : 'errored',
+                    reach: contextReach,
+                    workSummary: contextWork,
+                    usage: contextResult?.usage,
+                });
+            }
             if (signal.aborted) {
-                if (this.shouldPreserveHitlOnShutdown(runId)) {
-                    return;
-                }
                 if (!streamReached) {
                     await this.persistInterruptedUserMessage(threadId, user.id, message, turnStartedAt);
                 }
@@ -2821,7 +2971,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, ...(modelId !== undefined ? { modelId } : {}) });
+                this.publishRunFinish(threadId, runId, 'cancelled', cancellationReason, archivedWorkflowIds, user.id, { promptVersion, contextReach, ...(modelId !== undefined ? { modelId } : {}) });
                 return;
             }
             const terminalError = await this.reclassifyMaskedStreamFailure(error, user, {
@@ -2878,6 +3028,7 @@ let InstanceAiService = class InstanceAiService {
                 errorMessage,
                 errorSource: 'exception',
                 promptVersion,
+                contextReach,
                 ...(modelId !== undefined ? { modelId } : {}),
             });
         }
@@ -3057,6 +3208,7 @@ let InstanceAiService = class InstanceAiService {
         if (tracing) {
             environment.orchestrationContext.tracing = tracing;
         }
+        await this.bindAgentContextReader(environment.context, user);
         await this.bindAgentPreviewSession(environment.context, user);
         const mcpServers = await this.buildMcpServers(user, threadId, runId, tracing, environment.orchestrationContext.messageGroupId);
         const { agent, mcpConnectionFailures } = await (0, instance_ai_1.createInstanceAgent)({
@@ -3093,8 +3245,8 @@ let InstanceAiService = class InstanceAiService {
         this.subscribeToAgentErrors(agent, threadId, runId);
         return agent;
     }
-    async buildFreshInstanceAgent(user, threadId, runId, abortSignal, tracing, messageGroupId, pushRef) {
-        const environment = await this.createExecutionEnvironment(user, threadId, runId, abortSignal, messageGroupId, pushRef);
+    async buildFreshInstanceAgent(user, threadId, runId, abortSignal, tracing, messageGroupId, pushRef, instanceContextGates) {
+        const environment = await this.createExecutionEnvironment(user, threadId, runId, abortSignal, messageGroupId, pushRef, undefined, instanceContextGates);
         const agent = await this.createAgentFromEnvironment(environment, threadId, runId, user, tracing);
         return {
             agent,
@@ -3106,10 +3258,14 @@ let InstanceAiService = class InstanceAiService {
         const user = await this.revalidateActiveUser(orphan.userId);
         if (!user)
             return { kind: 'no-user' };
+        let instanceContext;
         try {
             const state = await this.checkpointStore.load(orphan.checkpointKey);
             if (!state)
                 return { kind: 'no-checkpoint' };
+            const storedContext = instance_ai_1.suspendedInstanceContextSchema.safeParse(state.persistence?.hostMetadata?.instanceContext);
+            if (storedContext.success)
+                instanceContext = storedContext.data;
             const mode = api_types_1.instanceAiBuildModeSchema.safeParse(state.persistence?.hostMetadata?.buildMode);
             this.runState.setBuildMode(orphan.threadId, mode.success ? mode.data : 'default');
             const version = state.persistence?.hostMetadata?.promptVersion;
@@ -3121,7 +3277,7 @@ let InstanceAiService = class InstanceAiService {
         const abortController = new AbortController();
         let environment;
         try {
-            environment = await this.createExecutionEnvironment(user, orphan.threadId, orphan.runId, abortController.signal, orphan.messageGroupId ?? undefined, this.threadPushRef.get(orphan.threadId));
+            environment = await this.createExecutionEnvironment(user, orphan.threadId, orphan.runId, abortController.signal, orphan.messageGroupId ?? undefined, this.threadPushRef.get(orphan.threadId), undefined, instanceContext);
         }
         catch (error) {
             return { kind: 'env-failure', error };
@@ -3139,6 +3295,7 @@ let InstanceAiService = class InstanceAiService {
             state: {
                 runId: orphan.runId,
                 agentRunId: orphan.checkpointKey,
+                instanceContext,
                 agent,
                 orchestrationContext: environment.orchestrationContext,
                 threadId: orphan.threadId,
@@ -3204,8 +3361,96 @@ let InstanceAiService = class InstanceAiService {
             return undefined;
         }
     }
-    async resolveAiPreferencesBlock(userId, project) {
-        return await this.bestEffort('Instance AI failed to read the AI preferences for this turn', { userId }, async () => (0, ai_preference_service_1.renderAiPreferencesBlock)(await this.aiPreferenceService.getApplicable(userId, project ? [project] : [])));
+    async resolveAiPreferencesTurn(userId, project, threadId) {
+        const resolved = await this.bestEffort('Instance AI failed to read the AI preferences for this turn', { userId }, async () => {
+            const preferences = await this.aiPreferenceService.getApplicable(userId, project ? [project] : []);
+            return { preferences, rendered: (0, ai_preference_service_1.renderAiPreferencesBlock)(preferences) };
+        });
+        if (!resolved) {
+            return {
+                block: undefined,
+                payload: { preferences: [], renderedLength: 0, injectedThisTurn: false },
+            };
+        }
+        const history = await this.bestEffort('Instance AI failed to read the last AI preferences block of this thread', { threadId }, async () => await this.findAiPreferencesHistory(threadId));
+        const lastBlock = history?.block;
+        const savedSinceLastBlock = history?.savedSinceLastBlock === true;
+        const { preferences, rendered } = resolved;
+        const freshBlock = rendered ??
+            (lastBlock !== undefined || savedSinceLastBlock ? ai_preference_service_1.AI_PREFERENCES_CLEARED_BLOCK : undefined);
+        if (freshBlock === undefined) {
+            return {
+                block: undefined,
+                payload: (0, ai_preference_service_1.buildAppliedPreferencesPayload)({
+                    preferences,
+                    renderedLength: 0,
+                    injectedThisTurn: false,
+                }),
+            };
+        }
+        if (!savedSinceLastBlock &&
+            lastBlock !== undefined &&
+            (0, internal_messages_1.asStoredThreadContextSection)(freshBlock) === lastBlock) {
+            const carriedFromRunId = await this.bestEffort('Instance AI failed to resolve which run sent the AI preferences block', { threadId }, async () => await this.eventLog.getLastPreferencesInjectionRunId(threadId));
+            return {
+                block: undefined,
+                payload: (0, ai_preference_service_1.buildAppliedPreferencesPayload)({
+                    preferences,
+                    renderedLength: freshBlock.length,
+                    injectedThisTurn: false,
+                    ...(carriedFromRunId ? { carriedFromRunId } : {}),
+                }),
+            };
+        }
+        return {
+            block: freshBlock,
+            payload: (0, ai_preference_service_1.buildAppliedPreferencesPayload)({
+                preferences,
+                renderedLength: freshBlock.length,
+                injectedThisTurn: true,
+            }),
+        };
+    }
+    async findAiPreferencesHistory(threadId) {
+        const history = await this.getReplayedMessages(threadId);
+        let savedSinceLastBlock = false;
+        for (let i = history.length - 1; i >= 0; i--) {
+            const m = history[i];
+            if (!('role' in m))
+                continue;
+            if (m.role === 'assistant' && Array.isArray(m.content)) {
+                savedSinceLastBlock ||= m.content.some((part) => part.type === 'tool-call' &&
+                    part.toolName === 'save_user_preference' &&
+                    part.state === 'resolved' &&
+                    (0, is_record_1.isRecord)(part.output) &&
+                    part.output.ok === true);
+            }
+            if (m.role !== 'user')
+                continue;
+            const block = (0, internal_messages_1.extractAiPreferencesBlock)(this.extractStoredMessageText(m.content));
+            if (block !== undefined)
+                return { block, savedSinceLastBlock };
+        }
+        return { savedSinceLastBlock };
+    }
+    async getReplayedMessages(threadId) {
+        const cursor = await this.agentMemory.getCursor(threadId);
+        if (cursor) {
+            const observations = await this.agentMemory.getActiveObservationLog({
+                observationScopeId: threadId,
+                limit: 1,
+                order: 'desc',
+            });
+            if (observations.length > 0) {
+                return await this.agentMemory.getMessagesForObservationScope(threadId, {
+                    since: {
+                        sinceCreatedAt: cursor.lastObservedAt,
+                        sinceMessageId: cursor.lastObservedMessageId,
+                    },
+                });
+            }
+        }
+        return await this.agentMemory.getMessages(threadId);
     }
     async canAccessAgentPreviewHandoff(user, projectId) {
         const requiredScopes = ['agent:read', 'agent:update'];
@@ -3216,9 +3461,9 @@ let InstanceAiService = class InstanceAiService {
             throw new forbidden_error_1.ForbiddenError('You do not have permission to load or edit agent previews in this project.');
         }
     }
-    async rebuildAgentForResume(user, threadId, runId, abortController, tracing, runHandoff, messageGroupId) {
+    async rebuildAgentForResume(user, threadId, runId, abortController, tracing, runHandoff, messageGroupId, instanceContextGates) {
         try {
-            const rebuilt = await this.buildFreshInstanceAgent(user, threadId, runId, abortController.signal, tracing, messageGroupId, this.threadPushRef.get(threadId));
+            const rebuilt = await this.buildFreshInstanceAgent(user, threadId, runId, abortController.signal, tracing, messageGroupId, this.threadPushRef.get(threadId), instanceContextGates);
             (0, instance_ai_1.createOrchestratorRunControl)(rebuilt.orchestrationContext, runHandoff ?? {});
             return {
                 agent: rebuilt.agent,
@@ -3244,7 +3489,7 @@ let InstanceAiService = class InstanceAiService {
             });
             return null;
         }
-        const { agent, runId, agentRunId, threadId, user, toolCallId, toolName, suspendPayload, abortController, tracing, modelId, messageGroupId, checkpoint, plannedBuild, runHandoff, orchestrationContext, } = suspended;
+        const { agent, runId, agentRunId, threadId, user, toolCallId, toolName, suspendPayload, abortController, tracing, modelId, messageGroupId, checkpoint, plannedBuild, runHandoff, orchestrationContext, instanceContext, } = suspended;
         if (user.id !== requestingUserId)
             return null;
         const activeRun = this.runState.getActiveRun(threadId);
@@ -3313,7 +3558,7 @@ let InstanceAiService = class InstanceAiService {
         let resumeModelId = modelId;
         let resumeOrchestrationContext = orchestrationContext;
         if (data.autoSetup || data.connectedSlugs?.length) {
-            const rebuilt = await this.rebuildAgentForResume(activeUser, threadId, runId, abortController, effectiveTracing, runHandoff, messageGroupId);
+            const rebuilt = await this.rebuildAgentForResume(activeUser, threadId, runId, abortController, effectiveTracing, runHandoff, messageGroupId, instanceContext);
             if (!rebuilt) {
                 const rebuildFailure = 'Agent rebuild failed';
                 await this.tracing.finalizeDetachedTraceRun(`resume-rebuild:${runId}`, unregisteredResumeTracing, {
@@ -3359,6 +3604,7 @@ let InstanceAiService = class InstanceAiService {
             messageGroupId,
             resumeTracing,
             unregisteredResumeTracing,
+            instanceContext,
         });
         return { ok: true, runId };
     }
@@ -3373,6 +3619,11 @@ let InstanceAiService = class InstanceAiService {
         let resumeClaimed = false;
         let resumeTraceRegistered = false;
         let errorReporterExecutionToken;
+        const contextTurn = this.instanceContextTurnBinding(opts);
+        let contextResult;
+        let contextSegmentReported = false;
+        const observedContextWork = new instance_ai_1.WorkSummaryAccumulator();
+        const contextEventBus = this.observeInstanceContextEvents(observedContextWork);
         let resumedRunProducedOutput = false;
         const onResumeClaimed = async () => {
             if (resumeClaimed)
@@ -3417,7 +3668,7 @@ let InstanceAiService = class InstanceAiService {
                         runId: opts.runId,
                         agentId: (0, instance_ai_1.orchestratorAgentId)(opts.runId),
                         signal: opts.signal,
-                        eventBus: this.eventBus,
+                        eventBus: contextEventBus,
                         logger: this.logger,
                         agentRunId: opts.agentRunId,
                         onActivity: () => this.runState.touchActiveRun(opts.threadId),
@@ -3429,12 +3680,13 @@ let InstanceAiService = class InstanceAiService {
                     runId: opts.runId,
                     agentId: (0, instance_ai_1.orchestratorAgentId)(opts.runId),
                     signal: opts.signal,
-                    eventBus: this.eventBus,
+                    eventBus: contextEventBus,
                     logger: this.logger,
                     agentRunId: opts.agentRunId,
                     onActivity: () => this.runState.touchActiveRun(opts.threadId),
                     stopSignal,
                 });
+            contextResult = result;
             if (!resumeClaimed) {
                 skipPostRunCleanup = true;
                 const claimError = result.error ?? new Error('Resume checkpoint claim did not complete');
@@ -3447,8 +3699,23 @@ let InstanceAiService = class InstanceAiService {
                     workSummary: result.workSummary,
                     usage: result.usage,
                 });
+                const resumedSegmentReach = (0, instance_ai_1.deriveInstanceContextReach)(result.workSummary?.toolCalls ?? []);
+                const resumedSuspendedReach = (0, instance_ai_1.mergeInstanceContextReach)(opts.instanceContext?.reachSoFar, resumedSegmentReach);
+                if (contextTurn) {
+                    contextSegmentReported = true;
+                    this.emitInstanceContextTurn(contextTurn, {
+                        segment: 'suspended',
+                        status: 'suspended',
+                        reach: resumedSegmentReach,
+                        workSummary: result.workSummary,
+                        usage: result.usage,
+                    });
+                }
                 if (result.suspension) {
                     const resumeMessageGroupId = this.tracing.getMessageGroupId(opts.runId);
+                    const suspendedContext = opts.instanceContext
+                        ? { ...opts.instanceContext, reachSoFar: resumedSuspendedReach }
+                        : undefined;
                     this.runState.suspendRun(opts.threadId, {
                         runId: opts.runId,
                         agentRunId: result.agentRunId,
@@ -3470,7 +3737,9 @@ let InstanceAiService = class InstanceAiService {
                         checkpoint: opts.checkpoint,
                         plannedBuild: opts.plannedBuild,
                         runHandoff: runControl.state,
+                        instanceContext: suspendedContext,
                     });
+                    await this.persistSuspendedInstanceContext(result.agentRunId, suspendedContext);
                     await this.suspendedThreads.persistPendingConfirmation({
                         requestId: result.suspension.requestId,
                         threadId: opts.threadId,
@@ -3604,6 +3873,18 @@ let InstanceAiService = class InstanceAiService {
                 }),
             };
             const archivedWorkflowIds = await this.temporaryWorkflowService.reapForRun(opts.threadId, opts.user, undefined, this.backgroundTasks.getRunningTasks(opts.threadId).length);
+            const resumedSegmentReach = (0, instance_ai_1.deriveInstanceContextReach)(result.workSummary?.toolCalls ?? []);
+            const resumedContextReach = (0, instance_ai_1.mergeInstanceContextReach)(opts.instanceContext?.reachSoFar, resumedSegmentReach);
+            if (contextTurn) {
+                contextSegmentReported = true;
+                this.emitInstanceContextTurn(contextTurn, {
+                    segment: 'resumed',
+                    status: result.status,
+                    reach: resumedSegmentReach,
+                    workSummary: result.workSummary,
+                    usage: result.usage,
+                });
+            }
             await this.finalizeRun(opts.threadId, opts.runId, result.status, {
                 promptVersion,
                 userId: opts.user.id,
@@ -3611,6 +3892,7 @@ let InstanceAiService = class InstanceAiService {
                 archivedWorkflowIds,
                 workSummary: result.workSummary,
                 usage: result.usage,
+                contextReach: resumedContextReach,
                 errorReason: userFacingErrorMessage,
                 ...(result.status === 'errored'
                     ? {
@@ -3643,10 +3925,26 @@ let InstanceAiService = class InstanceAiService {
                 await this.settleUnclaimedResume(opts, error, 'exception', promptVersion);
                 return;
             }
+            if (opts.signal.aborted && this.shouldPreserveHitlOnShutdown(opts.runId))
+                return;
+            const contextWork = contextResult
+                ? contextResult.workSummary
+                : observedContextWork.toSummary();
+            const segmentReach = (0, instance_ai_1.deriveInstanceContextReach)(contextWork?.toolCalls ?? []);
+            const contextReach = contextTurn
+                ? (0, instance_ai_1.mergeInstanceContextReach)(opts.instanceContext?.reachSoFar, segmentReach)
+                : undefined;
+            if (contextTurn && !contextSegmentReported) {
+                contextSegmentReported = true;
+                this.emitInstanceContextTurn(contextTurn, {
+                    segment: 'resumed',
+                    status: opts.signal.aborted ? 'cancelled' : 'errored',
+                    reach: segmentReach,
+                    workSummary: contextWork,
+                    usage: contextResult?.usage,
+                });
+            }
             if (opts.signal.aborted) {
-                if (this.shouldPreserveHitlOnShutdown(opts.runId)) {
-                    return;
-                }
                 const messageGroupId = this.tracing.getMessageGroupId(opts.runId);
                 const runTimeout = this.liveness.consumeRunTimeout(opts.runId);
                 const cancellationReason = runTimeout.timedOut
@@ -3672,7 +3970,11 @@ 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, ...(opts.modelId !== undefined ? { modelId: opts.modelId } : {}) });
+                this.publishRunFinish(opts.threadId, opts.runId, 'cancelled', cancellationReason, archivedWorkflowIds, opts.user.id, {
+                    promptVersion,
+                    contextReach,
+                    ...(opts.modelId !== undefined ? { modelId: opts.modelId } : {}),
+                });
                 return;
             }
             const terminalError = await this.reclassifyMaskedStreamFailure(error, opts.user, {
@@ -3731,6 +4033,7 @@ let InstanceAiService = class InstanceAiService {
                 errorMessage,
                 errorSource: 'exception',
                 promptVersion,
+                contextReach,
                 ...(opts.modelId !== undefined ? { modelId: opts.modelId } : {}),
             });
         }
@@ -3984,6 +4287,7 @@ let InstanceAiService = class InstanceAiService {
         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,
+            contextReach: suspended.instanceContext?.reachSoFar,
             ...(suspended.modelId !== undefined ? { modelId: suspended.modelId } : {}),
         });
         await this.tracing.maybeFinalizeRunTraceRoot(suspended.runId, {
@@ -4012,6 +4316,7 @@ let InstanceAiService = class InstanceAiService {
                         ? { reason }
                         : {}),
                 ...(hasArchived ? { archivedWorkflowIds } : {}),
+                ...(metadata?.contextReach ? { contextReach: metadata.contextReach } : {}),
             },
         });
         this.telemetry.track('instance_ai_run_finished', {
@@ -4124,12 +4429,92 @@ let InstanceAiService = class InstanceAiService {
             ...options?.errorInfo,
             promptVersion: options?.promptVersion,
             ...(options?.modelId !== undefined ? { modelId: options.modelId } : {}),
+            contextReach: options?.contextReach,
         });
         this.emitRunMetrics(threadId, status, options);
         if (status === 'completed' && options?.userId && options?.modelId) {
             void this.refineTitleIfNeeded(threadId, options.userId, options.modelId);
         }
     }
+    async persistSuspendedInstanceContext(checkpointKey, instanceContext) {
+        if (!instanceContext)
+            return;
+        try {
+            const state = await this.checkpointStore.load(checkpointKey);
+            if (!state?.persistence)
+                return;
+            await this.checkpointStore.save(checkpointKey, {
+                ...state,
+                persistence: {
+                    ...state.persistence,
+                    hostMetadata: { ...state.persistence.hostMetadata, instanceContext },
+                },
+            });
+        }
+        catch (error) {
+            this.logger.warn('Failed to store context for the suspended run', {
+                checkpointKey,
+                error: (0, get_error_message_1.getErrorMessage)(error),
+            });
+        }
+    }
+    instanceContextTurnBinding(opts) {
+        if (!opts.instanceContext)
+            return undefined;
+        return {
+            userId: opts.user.id,
+            threadId: opts.threadId,
+            runId: opts.runId,
+            injection: opts.instanceContext.injection,
+            instanceContextEnabled: opts.instanceContext.instanceContextEnabled,
+            nodeUsageEnabled: opts.instanceContext.nodeUsageEnabled,
+        };
+    }
+    observeInstanceContextEvents(workSummary) {
+        return {
+            publish: (threadId, event) => {
+                workSummary.observe(event);
+                this.eventBus.publish(threadId, event);
+            },
+            subscribe: (threadId, handler) => this.eventBus.subscribe(threadId, handler),
+        };
+    }
+    emitInstanceContextTurn(turn, input) {
+        const { injection } = turn;
+        this.telemetry.track(telemetry_1.TELEMETRY_EVENT.INSTANCE_AI.INSTANCE_CONTEXT_TURN, {
+            user_id: turn.userId,
+            thread_id: turn.threadId,
+            run_id: turn.runId,
+            surface: 'aia',
+            segment: input.segment,
+            instance_context_enabled: turn.instanceContextEnabled,
+            node_usage_enabled: turn.nodeUsageEnabled,
+            ...(injection.state === 'absent'
+                ? { block_state: injection.state, absence_reason: injection.reason }
+                : {
+                    block_state: injection.state,
+                    block_is_update: injection.isUpdate,
+                    block_inventory_rows: injection.legs.inventory,
+                    block_event_rows: injection.legs.events,
+                    block_run_rows: injection.legs.runs,
+                    block_chars: injection.chars,
+                    block_tokens_estimated: Math.ceil(injection.chars / InstanceAiService_1.BLOCK_CHARS_PER_TOKEN),
+                }),
+            context_depth: input.reach.surfaces.reduce((deepest, surface) => Math.max(deepest, api_types_1.INSTANCE_CONTEXT_SURFACE_DEPTH[surface]), 0),
+            context_surfaces: input.reach.surfaces,
+            asked_clarifying_question: input.workSummary?.askedClarifyingQuestion ?? false,
+            tool_calls: input.workSummary?.totalToolCalls ?? 0,
+            ...(input.usage
+                ? {
+                    turn_prompt_tokens: input.usage.promptTokens,
+                    turn_completion_tokens: input.usage.completionTokens,
+                    turn_total_tokens: input.usage.totalTokens,
+                    turn_cost_usd: input.usage.costUsd,
+                }
+                : {}),
+            status: input.status,
+        });
+    }
     emitRunMetrics(threadId, status, options) {
         const startedAt = this.runState.getActiveRun(threadId)?.startedAt;
         this.eventService.emit('instance-ai-run-finished', {
@@ -4284,14 +4669,15 @@ let InstanceAiService = class InstanceAiService {
     }
 };
 exports.InstanceAiService = InstanceAiService;
+InstanceAiService.BLOCK_CHARS_PER_TOKEN = 4;
 __decorate([
     (0, decorators_1.OnPubSubEvent)('relay-instance-ai-task-control', { instanceType: 'main' }),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object]),
     __metadata("design:returntype", Promise)
 ], InstanceAiService.prototype, "handleRelayTaskControl", null);
-exports.InstanceAiService = InstanceAiService = __decorate([
+exports.InstanceAiService = InstanceAiService = InstanceAiService_1 = __decorate([
     (0, di_1.Service)(),
-    __metadata("design:paramtypes", [backend_common_1.Logger, config_1.GlobalConfig, n8n_core_1.InstanceSettings, instance_ai_adapter_service_1.InstanceAiAdapterService, in_process_event_bus_1.InProcessEventBus, durable_event_log_1.DurableEventLog, interrupted_run_sweeper_1.InterruptedRunSweeper, instance_ai_settings_service_1.InstanceAiSettingsService, instance_ai_gateway_service_1.InstanceAiGatewayService, instance_ai_browser_session_service_1.InstanceAiBrowserSessionService, instance_ai_memory_service_1.InstanceAiMemoryService, typeorm_agent_memory_1.TypeORMAgentMemory, typeorm_agent_checkpoint_store_1.TypeORMAgentCheckpointStore, ai_service_1.AiService, instance_ai_thread_grant_repository_1.InstanceAiThreadGrantRepository, instance_ai_pending_confirmation_repository_1.InstanceAiPendingConfirmationRepository, url_service_1.UrlService, instance_ai_event_log_repository_1.InstanceAiEventLogRepository, db_iteration_log_storage_1.DbIterationLogStorage, instance_write_access_service_1.InstanceWriteAccessService, telemetry_2.Telemetry, mcp_1.InstanceAiMcpRegistryService, db_1.UserRepository, instance_ai_temporary_workflow_service_1.InstanceAiTemporaryWorkflowService, n8n_core_1.ErrorReporter, config_1.SsrfProtectionConfig, backend_network_1.SsrfProtectionService, event_service_1.EventService, thread_credential_allowlist_service_1.EvalThreadCredentialAllowlistService, instance_ai_run_probe_1.InstanceAiRunProbe, instance_ai_model_service_1.InstanceAiModelService, instance_ai_credit_service_1.InstanceAiCreditService, publisher_service_1.Publisher, instance_ai_error_reporter_service_1.InstanceAiErrorReporterService, canvas_node_context_flag_gate_1.CanvasNodeContextFlagGate, push_1.Push, instance_ai_conversation_history_service_1.InstanceAiConversationHistoryService, instance_context_service_1.InstanceContextService, ai_preference_service_1.AiPreferenceService])
+    __metadata("design:paramtypes", [backend_common_1.Logger, config_1.GlobalConfig, n8n_core_1.InstanceSettings, instance_ai_adapter_service_1.InstanceAiAdapterService, in_process_event_bus_1.InProcessEventBus, durable_event_log_1.DurableEventLog, interrupted_run_sweeper_1.InterruptedRunSweeper, instance_ai_settings_service_1.InstanceAiSettingsService, instance_ai_gateway_service_1.InstanceAiGatewayService, instance_ai_browser_session_service_1.InstanceAiBrowserSessionService, instance_ai_memory_service_1.InstanceAiMemoryService, typeorm_agent_memory_1.TypeORMAgentMemory, typeorm_agent_checkpoint_store_1.TypeORMAgentCheckpointStore, ai_service_1.AiService, instance_ai_thread_grant_repository_1.InstanceAiThreadGrantRepository, instance_ai_pending_confirmation_repository_1.InstanceAiPendingConfirmationRepository, instance_ai_observation_repository_1.InstanceAiObservationRepository, instance_ai_observation_cursor_repository_1.InstanceAiObservationCursorRepository, backend_services_1.UrlService, instance_ai_event_log_repository_1.InstanceAiEventLogRepository, db_iteration_log_storage_1.DbIterationLogStorage, instance_write_access_service_1.InstanceWriteAccessService, telemetry_2.Telemetry, mcp_1.InstanceAiMcpRegistryService, db_1.UserRepository, instance_ai_temporary_workflow_service_1.InstanceAiTemporaryWorkflowService, n8n_core_1.ErrorReporter, config_1.SsrfProtectionConfig, backend_network_1.SsrfProtectionService, event_service_1.EventService, thread_credential_allowlist_service_1.EvalThreadCredentialAllowlistService, instance_ai_run_probe_1.InstanceAiRunProbe, instance_ai_model_service_1.InstanceAiModelService, instance_ai_credit_service_1.InstanceAiCreditService, publisher_service_1.Publisher, instance_ai_error_reporter_service_1.InstanceAiErrorReporterService, push_1.Push, instance_ai_conversation_history_service_1.InstanceAiConversationHistoryService, instance_context_service_1.InstanceContextService, ai_preference_service_1.AiPreferenceService])
 ], InstanceAiService);
 //# sourceMappingURL=instance-ai.service.js.map