@resolveio/server-lib 22.3.205 → 22.3.206

package/methods/ai-terminal.js

@@ -1888,7 +1888,7 @@ function executeAiAssistantCodexRun(payload, context) {
                     insertResult = _d.sent();
                     assistantMessageId = (insertResult === null || insertResult === void 0 ? void 0 : insertResult._id) || (insertResult === null || insertResult === void 0 ? void 0 : insertResult.insertedId);
                     enqueueAssistantCodexRun(function () { return __awaiter(_this, void 0, void 0, function () {
-                        var runStart, fastModeEnabled, alwaysAllowProbeEnabled, plannerEnabled, runBudgetMs, assistantMongoMaxTimeMs, assistantSystemPrompt, runDeadlineMs, steps, recordStep, requestClassification, dataQuestion, progressTracker, streamProgress, remainingRunBudgetMs, hasRunBudget, applyCodexStageBudget, assistantContent, toolResult, assistantDebug, directiveSource, lastDirective, heuristicDirectivePrecomputed, usedDeterministicHeuristicFastPath, requestedTimeGrain, requestedBreakdownDimensions, enforceDatedDirective, enforceGroupedDirective, datedDirectiveRetryUsed, datedDirectiveResolved, toolResponseDebug, toolError, toolTelemetry, termHints, collectionHints, fieldHints, schemaHints, methodHints, publicationHints, collectionTokenization, collectionRanking, collectionSelection, collectionOverride, collectionNames, plannerUsed, plannerSkipReason, plannerOutput, plannerRaw, appDataRequestClassifierDebug, appDataRequestClassifierIntent, appDataRequestClassifierUnderstanding, timingBreakdown, codexUsage, accumulateCodexUsage, contextRoute, contextMode, hintSeed, termExpansion, hintText, baseTokens, expandedTokens, baseWeights, expandedWeights, dbName, db, surfaceHints, _a, allowedRoutes, rankedAllowedRoutes, routeHints, appCollectionHints, rankedCollectionHints, rankedCollections, hintCollections, schemaHintCollections, assistantContext, scoredAppDataIntentCandidates, shouldAttemptAppDataClassifier, classifierResult, classifierUsageClientId, usageError_1, hasDeterministicHeuristicFastPath, prompt_1, workspaceRoot, codexConfig, runOptions, plannerRunOptions, shouldRunPlanner, plannerBudgetAvailable, plannerPrompt, plannerStart, _b, preferListDirective, directiveStyleHint, directivePromptMode, responseText, directiveText, directive, heuristicDirectiveFastPath, directivePrompt, directiveStart, forcedDirective, error_2, initialStart, extractedDirective, error_3, directivePrompt, forcedStart, forcedDirective, error_4, strictDirectivePrompt, strictStart, strictDirectiveText, strictDirective, strictDirectiveIsDated, shouldUseStrictDirective, error_5, guardDirectivePrompt, guardStart, guardDirectiveText, guardDirective, error_6, groupedDirectivePrompt, groupedStart, groupedDirectiveText, groupedDirective, error_7, heuristicDirective, requestedCollection, allowCollectionOverride, cleanedResponseText, deniedModuleByIntent, permissionLabel, effectiveDirective, effectiveDirectiveMetadata, directiveAcknowledgementText, directiveProgressMessages, deterministicDataIntentDirective, rankedCollections_1, directiveHintsBase_1, buildToolRequestForDirective, executionDirective, probeFieldHints, aggregateProbeDisabled, probeEnabled, probeBudgetAllowed, probeDirective, probeRequest, probeStart, probeResponse, _c, probeDurationMs, probeRowCount, probeRewrite, probeError_1, probeDurationMs, probeErrorMessage, toolRequest, requestedToolCollection, toolStart, toolResponse, _d, toolDurationMs, toolPayload, resolvedToolCollection, zeroRowResult, followupCodexEnabled, skipFollowupCodex, followupPrompt, followupStart, followupText, _e, error_8, errorMessage, existingFinal, error_9, runBudgetExceeded, includeToolExecutionTelemetry, toolExecutionTelemetry, finishedAt, finalNow, finishedAt, codexMs, draftingMs, answerQualityEvidence, finalMetadata, finalUsage, finalUsageLedgerEntry, usageClientId, usageError_2, finalAssistantDoc, setPayload, finalizeError_1, failedAt, fallbackContent, failureMetadata, persistError_1, _f;
+                        var runStart, fastModeEnabled, alwaysAllowProbeEnabled, plannerEnabled, runBudgetMs, assistantMongoMaxTimeMs, assistantSystemPrompt, runDeadlineMs, steps, recordStep, requestClassification, dataQuestion, progressTracker, finalProgress, streamProgress, remainingRunBudgetMs, hasRunBudget, applyCodexStageBudget, assistantContent, toolResult, assistantDebug, directiveSource, lastDirective, heuristicDirectivePrecomputed, usedDeterministicHeuristicFastPath, requestedTimeGrain, requestedBreakdownDimensions, enforceDatedDirective, enforceGroupedDirective, datedDirectiveRetryUsed, datedDirectiveResolved, toolResponseDebug, toolError, toolTelemetry, termHints, collectionHints, fieldHints, schemaHints, methodHints, publicationHints, collectionTokenization, collectionRanking, collectionSelection, collectionOverride, collectionNames, plannerUsed, plannerSkipReason, plannerOutput, plannerRaw, appDataRequestClassifierDebug, appDataRequestClassifierIntent, appDataRequestClassifierUnderstanding, timingBreakdown, codexUsage, accumulateCodexUsage, contextRoute, contextMode, hintSeed, termExpansion, hintText, baseTokens, expandedTokens, baseWeights, expandedWeights, dbName, db, surfaceHints, _a, allowedRoutes, rankedAllowedRoutes, routeHints, appCollectionHints, rankedCollectionHints, rankedCollections, hintCollections, schemaHintCollections, assistantContext, scoredAppDataIntentCandidates, shouldAttemptAppDataClassifier, classifierResult, classifierUsageClientId, usageError_1, hasDeterministicHeuristicFastPath, prompt_1, workspaceRoot, codexConfig, runOptions, plannerRunOptions, shouldRunPlanner, plannerBudgetAvailable, plannerPrompt, plannerStart, _b, preferListDirective, directiveStyleHint, directivePromptMode, responseText, directiveText, directive, heuristicDirectiveFastPath, directivePrompt, directiveStart, forcedDirective, error_2, initialStart, extractedDirective, error_3, directivePrompt, forcedStart, forcedDirective, error_4, strictDirectivePrompt, strictStart, strictDirectiveText, strictDirective, strictDirectiveIsDated, shouldUseStrictDirective, error_5, guardDirectivePrompt, guardStart, guardDirectiveText, guardDirective, error_6, groupedDirectivePrompt, groupedStart, groupedDirectiveText, groupedDirective, error_7, heuristicDirective, requestedCollection, allowCollectionOverride, cleanedResponseText, deniedModuleByIntent, permissionLabel, effectiveDirective, effectiveDirectiveMetadata, directiveAcknowledgementText, directiveProgressMessages, deterministicDataIntentDirective, rankedCollections_1, directiveHintsBase_1, buildToolRequestForDirective, breakdownProgress, executionDirective, probeFieldHints, aggregateProbeDisabled, probeEnabled, probeBudgetAllowed, probeDirective, probeRequest, probeStart, probeResponse, _c, probeDurationMs, probeRowCount, probeRewrite, probeError_1, probeDurationMs, probeErrorMessage, toolRequest, requestedToolCollection, toolStart, toolResponse, _d, toolDurationMs, toolPayload, resolvedToolCollection, zeroRowResult, followupCodexEnabled, skipFollowupCodex, followupPrompt, followupStart, followupText, _e, error_8, errorMessage, existingFinal, error_9, runBudgetExceeded, includeToolExecutionTelemetry, toolExecutionTelemetry, finishedAt, finalNow, finishedAt, codexMs, draftingMs, answerQualityEvidence, finalMetadata, finalUsage, finalUsageLedgerEntry, usageClientId, usageError_2, finalAssistantDoc, setPayload, finalizeError_1, failedAt, fallbackContent, failureMetadata, persistError_1, _f;
                         var _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20;
                         return __generator(this, function (_21) {
                             switch (_21.label) {
@@ -1931,6 +1931,7 @@ function executeAiAssistantCodexRun(payload, context) {
                                     requestClassification = classifyAssistantRequestType(message);
                                     dataQuestion = requestClassification.dataQuestion;
                                     progressTracker = createAssistantProgressTracker(assistantMessageId, initialProgress);
+                                    finalProgress = initialProgress;
                                     streamProgress = createAssistantStreamProgressHandler(progressTracker, function () { return dataQuestion; });
                                     remainingRunBudgetMs = function () {
                                         if (!runDeadlineMs) {
@@ -2037,7 +2038,7 @@ function executeAiAssistantCodexRun(payload, context) {
                                     });
                                     _21.label = 1;
                                 case 1:
-                                    _21.trys.push([1, 76, 77, 78]);
+                                    _21.trys.push([1, 76, 77, 79]);
                                     hintSeed = [message, contextRoute].filter(Boolean).join(' ');
                                     termExpansion = expandAssistantTermSynonyms(hintSeed);
                                     hintText = termExpansion.expanded || hintSeed;
@@ -2753,6 +2754,10 @@ function executeAiAssistantCodexRun(payload, context) {
                                     else {
                                         progressTracker.push(deterministicDataIntentDirective ? AI_ASSISTANT_PROGRESS_DATA_RUNNING : AI_ASSISTANT_PROGRESS_DATA_LOOKUP);
                                     }
+                                    breakdownProgress = buildAssistantBreakdownProgressMessage(effectiveDirectiveMetadata.requestContract);
+                                    if (breakdownProgress) {
+                                        progressTracker.push(breakdownProgress);
+                                    }
                                     directiveProgressMessages.slice(0, 2).forEach(function (messageText) { return progressTracker.push(messageText); });
                                     executionDirective = effectiveDirective;
                                     probeFieldHints = [];
@@ -2992,16 +2997,17 @@ function executeAiAssistantCodexRun(payload, context) {
                                     progressTracker.push(AI_ASSISTANT_PROGRESS_DRAFT);
                                     recordStep('Drafting response');
                                     _21.label = 75;
-                                case 75: return [3 /*break*/, 78];
+                                case 75: return [3 /*break*/, 79];
                                 case 76:
                                     error_9 = _21.sent();
                                     assistantContent = buildAssistantCodexErrorMessage(error_9);
                                     recordStep('Error', { message: normalizeOptionalString(error_9 === null || error_9 === void 0 ? void 0 : error_9.message) || 'Unknown error' });
-                                    return [3 /*break*/, 78];
-                                case 77:
-                                    progressTracker.stop();
-                                    return [7 /*endfinally*/];
+                                    return [3 /*break*/, 79];
+                                case 77: return [4 /*yield*/, progressTracker.stop()];
                                 case 78:
+                                    finalProgress = _21.sent();
+                                    return [7 /*endfinally*/];
+                                case 79:
                                     runBudgetExceeded = runDeadlineMs ? Date.now() > runDeadlineMs : false;
                                     if (!assistantContent) {
                                         assistantContent = runBudgetExceeded
@@ -3045,9 +3051,9 @@ function executeAiAssistantCodexRun(payload, context) {
                                         });
                                     }
                                     finalNow = new Date();
-                                    _21.label = 79;
-                                case 79:
-                                    _21.trys.push([79, 91, , 102]);
+                                    _21.label = 80;
+                                case 80:
+                                    _21.trys.push([80, 92, , 103]);
                                     if (canViewDebug) {
                                         finishedAt = Date.now();
                                         codexMs = timingBreakdown.directiveMs
@@ -3134,7 +3140,7 @@ function executeAiAssistantCodexRun(payload, context) {
                                         toolError: toolError,
                                         now: finalNow
                                     });
-                                    finalMetadata = __assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign({ model: codexModel }, (codexFallbackModels.length ? { model_fallbacks: codexFallbackModels } : {})), (requestId ? { request_id: requestId } : {})), { pending: false }), (fastModeEnabled ? {
+                                    finalMetadata = __assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign({ model: codexModel }, (codexFallbackModels.length ? { model_fallbacks: codexFallbackModels } : {})), (requestId ? { request_id: requestId } : {})), { pending: false, progress: finalProgress }), (fastModeEnabled ? {
                                         fast_mode: true,
                                         run_budget_ms: runBudgetMs,
                                         run_budget_exhausted: runBudgetExceeded
@@ -3148,13 +3154,13 @@ function executeAiAssistantCodexRun(payload, context) {
                                         total_tokens: codexUsage.total_tokens
                                     } : null;
                                     finalUsageLedgerEntry = null;
-                                    if (!finalUsage) return [3 /*break*/, 84];
+                                    if (!finalUsage) return [3 /*break*/, 85];
                                     return [4 /*yield*/, resolveClientId(conversation, input.id_client, context === null || context === void 0 ? void 0 : context.id_user)];
-                                case 80:
-                                    usageClientId = _21.sent();
-                                    _21.label = 81;
                                 case 81:
-                                    _21.trys.push([81, 83, , 84]);
+                                    usageClientId = _21.sent();
+                                    _21.label = 82;
+                                case 82:
+                                    _21.trys.push([82, 84, , 85]);
                                     finalUsageLedgerEntry = buildAssistantAIRunUsageLedgerEntry({
                                         idClient: usageClientId || '',
                                         model: finalUsage.model,
@@ -3174,16 +3180,16 @@ function executeAiAssistantCodexRun(payload, context) {
                                         }
                                     });
                                     return [4 /*yield*/, (0, openai_usage_ledger_manager_1.recordOpenAIUsage)(finalUsageLedgerEntry)];
-                                case 82:
-                                    _21.sent();
-                                    return [3 /*break*/, 84];
                                 case 83:
+                                    _21.sent();
+                                    return [3 /*break*/, 85];
+                                case 84:
                                     usageError_2 = _21.sent();
                                     console.error(new Date(), 'Failed to record AI usage', usageError_2);
-                                    return [3 /*break*/, 84];
-                                case 84:
+                                    return [3 /*break*/, 85];
+                                case 85:
                                     finalAssistantDoc = __assign(__assign(__assign(__assign({}, assistantDoc), { _id: assistantMessageId, content: assistantContent, metadata: finalMetadata }), (finalUsage ? { usage: finalUsage } : {})), { updatedAt: finalNow });
-                                    if (!assistantMessageId) return [3 /*break*/, 86];
+                                    if (!assistantMessageId) return [3 /*break*/, 87];
                                     setPayload = {
                                         content: assistantContent,
                                         metadata: finalMetadata,
@@ -3193,11 +3199,11 @@ function executeAiAssistantCodexRun(payload, context) {
                                         setPayload.usage = finalUsage;
                                     }
                                     return [4 /*yield*/, updateAssistantMessageWithFallback(assistantMessageId, setPayload)];
-                                case 85:
+                                case 86:
                                     _21.sent();
-                                    _21.label = 86;
-                                case 86: return [4 /*yield*/, touchConversation(conversation._id, finalNow, assistantMessageId ? String(assistantMessageId) : undefined)];
-                                case 87:
+                                    _21.label = 87;
+                                case 87: return [4 /*yield*/, touchConversation(conversation._id, finalNow, assistantMessageId ? String(assistantMessageId) : undefined)];
+                                case 88:
                                     _21.sent();
                                     return [4 /*yield*/, recordAssistantAnswerAIRun({
                                             runId: buildAssistantAIRunId('codex_query', [conversation._id, assistantMessageId || requestId]),
@@ -3216,55 +3222,55 @@ function executeAiAssistantCodexRun(payload, context) {
                                             answerQuality: answerQualityEvidence,
                                             now: finalNow
                                         })];
-                                case 88:
+                                case 89:
                                     _21.sent();
-                                    if (!(input.delete_files_after_run !== false)) return [3 /*break*/, 90];
+                                    if (!(input.delete_files_after_run !== false)) return [3 /*break*/, 91];
                                     return [4 /*yield*/, cleanupAttachments(attachmentData.attachments)];
-                                case 89:
+                                case 90:
                                     _21.sent();
-                                    _21.label = 90;
-                                case 90: return [2 /*return*/, finalAssistantDoc];
-                                case 91:
+                                    _21.label = 91;
+                                case 91: return [2 /*return*/, finalAssistantDoc];
+                                case 92:
                                     finalizeError_1 = _21.sent();
                                     failedAt = new Date();
                                     fallbackContent = assistantContent || buildAssistantCodexErrorMessage(finalizeError_1);
                                     failureMetadata = __assign(__assign(__assign(__assign(__assign({ model: codexModel }, (codexFallbackModels.length ? { model_fallbacks: codexFallbackModels } : {})), (requestId ? { request_id: requestId } : {})), { pending: false, failed: true }), (toolExecutionTelemetry ? { tool_execution: toolExecutionTelemetry } : {})), { error_message: normalizeOptionalString(finalizeError_1 === null || finalizeError_1 === void 0 ? void 0 : finalizeError_1.message) || 'Unknown error' });
-                                    _21.label = 92;
-                                case 92:
-                                    _21.trys.push([92, 96, , 97]);
-                                    if (!assistantMessageId) return [3 /*break*/, 94];
+                                    _21.label = 93;
+                                case 93:
+                                    _21.trys.push([93, 97, , 98]);
+                                    if (!assistantMessageId) return [3 /*break*/, 95];
                                     return [4 /*yield*/, updateAssistantMessageWithFallback(assistantMessageId, {
                                             content: fallbackContent,
                                             metadata: failureMetadata,
                                             updatedAt: failedAt
                                         })];
-                                case 93:
+                                case 94:
                                     _21.sent();
-                                    _21.label = 94;
-                                case 94: return [4 /*yield*/, touchConversation(conversation._id, failedAt, assistantMessageId ? String(assistantMessageId) : undefined)];
-                                case 95:
-                                    _21.sent();
-                                    return [3 /*break*/, 97];
+                                    _21.label = 95;
+                                case 95: return [4 /*yield*/, touchConversation(conversation._id, failedAt, assistantMessageId ? String(assistantMessageId) : undefined)];
                                 case 96:
+                                    _21.sent();
+                                    return [3 /*break*/, 98];
+                                case 97:
                                     persistError_1 = _21.sent();
                                     console.error(new Date(), 'AI assistant finalize fallback update failed', persistError_1);
-                                    return [3 /*break*/, 97];
-                                case 97:
-                                    if (!(input.delete_files_after_run !== false)) return [3 /*break*/, 101];
-                                    _21.label = 98;
+                                    return [3 /*break*/, 98];
                                 case 98:
-                                    _21.trys.push([98, 100, , 101]);
-                                    return [4 /*yield*/, cleanupAttachments(attachmentData.attachments)];
+                                    if (!(input.delete_files_after_run !== false)) return [3 /*break*/, 102];
+                                    _21.label = 99;
                                 case 99:
-                                    _21.sent();
-                                    return [3 /*break*/, 101];
+                                    _21.trys.push([99, 101, , 102]);
+                                    return [4 /*yield*/, cleanupAttachments(attachmentData.attachments)];
                                 case 100:
-                                    _f = _21.sent();
-                                    return [3 /*break*/, 101];
+                                    _21.sent();
+                                    return [3 /*break*/, 102];
                                 case 101:
+                                    _f = _21.sent();
+                                    return [3 /*break*/, 102];
+                                case 102:
                                     console.error(new Date(), 'AI assistant run finalize failed:', finalizeError_1);
                                     return [2 /*return*/, __assign(__assign({}, assistantDoc), { _id: assistantMessageId, content: fallbackContent, metadata: failureMetadata, updatedAt: failedAt })];
-                                case 102: return [2 /*return*/];
+                                case 103: return [2 /*return*/];
                             }
                         });
                     }); });
@@ -7010,6 +7016,18 @@ function extractAssistantDataIntentCustomerText(message) {
     value = value.replace(/[^a-z0-9&.' -]+/gi, ' ');
     return normalizeOptionalString(value.replace(/\s+/g, ' '));
 }
+function doesAssistantDataIntentUseCustomerText(intent) {
+    if (!Array.isArray(intent.pipeline) || !intent.pipeline.length) {
+        return true;
+    }
+    var serialized = JSON.stringify([
+        intent.pipeline,
+        intent.acknowledgement,
+        intent.progress,
+        intent.dimensions
+    ]);
+    return serialized.includes('{{customer}}');
+}
 function resolveAssistantDataIntentDateWindow(message) {
     var text = normalizeOptionalString(message).toLowerCase();
     var now = new Date();
@@ -7623,6 +7641,17 @@ function normalizeAssistantDataRequestContract(value, intent, dateWindow, source
         source: source
     };
 }
+function normalizeAssistantBreakdownCandidateKey(value) {
+    return cleanAssistantRequestedDimensionText(value).replace(/[_-]+/g, ' ').replace(/\s+/g, ' ').trim();
+}
+function resolveAssistantBreakdownCandidateKey(text, breakdown) {
+    var granularity = normalizeAssistantBreakdownCandidateKey((breakdown === null || breakdown === void 0 ? void 0 : breakdown.granularity) || resolveAssistantTimeBreakdownGranularity(text));
+    if (granularity) {
+        return "time:".concat(granularity);
+    }
+    var dimension = normalizeAssistantBreakdownCandidateKey((breakdown === null || breakdown === void 0 ? void 0 : breakdown.dimension) || text);
+    return dimension ? "entity:".concat(dimension) : '';
+}
 function buildAssistantRequestedBreakdownCandidates(message, classifierContract) {
     var candidates = [];
     var seen = new Set();
@@ -7631,12 +7660,7 @@ function buildAssistantRequestedBreakdownCandidates(message, classifierContract)
         if (!normalized) {
             return;
         }
-        var key = [
-            (breakdown === null || breakdown === void 0 ? void 0 : breakdown.type) || '',
-            (breakdown === null || breakdown === void 0 ? void 0 : breakdown.granularity) || '',
-            (breakdown === null || breakdown === void 0 ? void 0 : breakdown.dimension) || '',
-            normalized
-        ].join(':');
+        var key = resolveAssistantBreakdownCandidateKey(normalized, breakdown);
         if (seen.has(key)) {
             return;
         }
@@ -7668,6 +7692,13 @@ function buildAssistantDataRequestClassifierCandidatePayload(candidate) {
             granularity: dimension.granularity || undefined,
             terms: (dimension.terms || []).slice(0, 12),
             field_hints: extractAssistantDataIntentExpressionFieldHints(dimension.groupId).slice(0, 8)
+        }); }),
+        filter_fields: buildAssistantAppDataFilterCandidates(intent).map(function (filterField) { return ({
+            id: filterField.id,
+            terms: filterField.terms.slice(0, 12),
+            fields: filterField.fields.slice(0, 8),
+            type: filterField.type || undefined,
+            operators: filterField.operators.slice(0, 8)
         }); })
     };
 }
@@ -7681,6 +7712,7 @@ function buildAssistantDataRequestClassifierMessages(params) {
         'Interpret date phrases like "this month", "last month", "until June 12", "through May", "past 30 days", and "last 6 months" as date_range or filters when clear.',
         'For time breakdowns, set type="time" and granularity to one of year, quarter, month, week, day, date.',
         'For configured dimensions, set type="entity" and dimension to the candidate dimension id.',
+        'For filters, use only candidate filter_fields or configured dimension ids; include field/value/operator but do not invent fields.',
         'If unsure, include an ambiguity instead of guessing.',
         'Always set output_format to "collapse_table".',
         'Return JSON only with keys: intent_id, domain, collection, operation, requested_breakdowns, date_range, measures, filters, output_format, ambiguities, confidence.'
@@ -7731,7 +7763,7 @@ function resolveAssistantDataRequestClassifierTimeoutMs(config) {
     if (raw && raw > 0) {
         return Math.max(250, Math.min((0, common_1.round)(raw), 5000));
     }
-    return 1800;
+    return 500;
 }
 function resolveAssistantDataRequestClassifierMaxTokens() {
     var serverConfig = resolveio_server_app_1.ResolveIOServer.getServerConfig() || {};
@@ -7890,13 +7922,11 @@ function buildAssistantDataRequestUnderstanding(message, intent, dateWindow, cla
     var addDimension = function (dimension) {
         var id = normalizeOptionalString(dimension.id);
         if (!id || seenDimensionIds.has(id)) {
-            return;
-        }
-        if ((dimension.type || '') === 'time' && dimensions.some(function (entry) { return (entry.type || '') === 'time'; })) {
-            return;
+            return false;
         }
         seenDimensionIds.add(id);
         dimensions.push(dimension);
+        return true;
     };
     requestedBreakdownCandidates.forEach(function (candidate) {
         var _a;
@@ -7939,6 +7969,9 @@ function buildAssistantDataRequestUnderstanding(message, intent, dateWindow, cla
             }
         });
         if (selected) {
+            if (!selected.dimension.groupId) {
+                ambiguities.push("Requested ".concat(requestedDimensionText, " breakdown matched ").concat(selected.dimension.id, ", but the app dimension has no group expression."));
+            }
             var dimension = __assign(__assign({}, selected.dimension), { type: selected.dimension.type || 'entity', requestedText: requestedDimensionText });
             addDimension(dimension);
             requestedBreakdowns.push({
@@ -7979,12 +8012,518 @@ function buildAssistantDataRequestUnderstanding(message, intent, dateWindow, cla
         }
     };
 }
+function inferAssistantDateWindowYear(value) {
+    var e_6, _a;
+    if (!value) {
+        return undefined;
+    }
+    if (value.year) {
+        return value.year;
+    }
+    try {
+        for (var _b = __values([value.start, value.end]), _c = _b.next(); !_c.done; _c = _b.next()) {
+            var dateValue = _c.value;
+            var parsed = new Date(normalizeOptionalString(dateValue));
+            if (!Number.isNaN(parsed.getTime())) {
+                return parsed.getUTCFullYear();
+            }
+        }
+    }
+    catch (e_6_1) { e_6 = { error: e_6_1 }; }
+    finally {
+        try {
+            if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+        }
+        finally { if (e_6) throw e_6.error; }
+    }
+    return undefined;
+}
+function resolveAssistantEffectiveDataIntentDateWindow(baseDateWindow, requestUnderstanding) {
+    var _a;
+    var contractDateRange = normalizeAssistantContractDateRange((_a = requestUnderstanding === null || requestUnderstanding === void 0 ? void 0 : requestUnderstanding.contract) === null || _a === void 0 ? void 0 : _a.date_range);
+    if (!contractDateRange) {
+        return baseDateWindow;
+    }
+    var effective = __assign(__assign({}, baseDateWindow), contractDateRange);
+    var year = inferAssistantDateWindowYear(effective);
+    if (year) {
+        effective.year = year;
+    }
+    return effective;
+}
 function extractAssistantDataIntentGroupKeys(groupId) {
     if (!groupId || typeof groupId !== 'object' || Array.isArray(groupId)) {
         return [];
     }
     return Object.keys(groupId).filter(Boolean);
 }
+function normalizeAssistantGroupKeyForComparison(value) {
+    return cleanAssistantRequestedDimensionText(value).replace(/[_-]+/g, ' ').replace(/\s+/g, ' ').trim();
+}
+function resolveAssistantBreakdownAppliedToGroup(breakdown, groupKeys) {
+    if (!breakdown || breakdown.type === 'unknown') {
+        return true;
+    }
+    var candidates = __spreadArray([
+        breakdown.dimension,
+        breakdown.granularity,
+        breakdown.requested_text,
+        breakdown.field_hint
+    ], __read((breakdown.field_hints || [])), false).map(function (value) { return normalizeAssistantGroupKeyForComparison(normalizeOptionalString(value)); })
+        .filter(Boolean);
+    return candidates.some(function (candidate) { return groupKeys.has(candidate); });
+}
+function resolveAssistantDroppedBreakdownAmbiguities(requestContract, pipeline) {
+    var _a;
+    var requestedBreakdowns = Array.isArray(requestContract === null || requestContract === void 0 ? void 0 : requestContract.requested_breakdowns)
+        ? requestContract.requested_breakdowns
+        : [];
+    if (!requestedBreakdowns.length) {
+        return [];
+    }
+    var groupStage = (_a = (Array.isArray(pipeline) ? pipeline : []).find(function (stage) { return !!(stage === null || stage === void 0 ? void 0 : stage.$group); })) === null || _a === void 0 ? void 0 : _a.$group;
+    var groupKeys = new Set(extractAssistantDataIntentGroupKeys(groupStage === null || groupStage === void 0 ? void 0 : groupStage._id)
+        .map(function (key) { return normalizeAssistantGroupKeyForComparison(key); })
+        .filter(Boolean));
+    return requestedBreakdowns
+        .filter(function (breakdown) { return !resolveAssistantBreakdownAppliedToGroup(breakdown, groupKeys); })
+        .map(function (breakdown) {
+        var label = formatAssistantRequestBreakdownLabel(breakdown) || breakdown.requested_text || 'requested';
+        return "Requested ".concat(label, " breakdown was not applied to the final aggregate group.");
+    });
+}
+function buildAssistantAppDataFilterCandidates(intent) {
+    var candidates = [];
+    var seen = new Set();
+    var add = function (candidate) {
+        var id = normalizeOptionalString(candidate.id);
+        var fields = mergeAssistantHintValues(candidate.fields || [])
+            .map(function (field) { return normalizeLookupPath(field); })
+            .filter(function (field) { return !!field && isAssistantProjectionKeyAllowed(field); });
+        if (!id || !fields.length) {
+            return;
+        }
+        var key = "".concat(cleanAssistantRequestedDimensionText(id), ":").concat(fields.join('|'));
+        if (seen.has(key)) {
+            return;
+        }
+        seen.add(key);
+        candidates.push({
+            id: id,
+            terms: mergeAssistantHintValues(__spreadArray([id], __read((candidate.terms || [])), false)).map(function (term) { return term.toLowerCase(); }),
+            fields: fields,
+            type: candidate.type || 'string',
+            operators: mergeAssistantHintValues(candidate.operators || ['eq', 'contains', 'in']).map(function (operator) { return operator.toLowerCase(); })
+        });
+    };
+    (intent.filterFields || []).forEach(add);
+    (intent.dimensions || []).forEach(function (dimension) {
+        if ((dimension.type || 'entity') === 'time') {
+            return;
+        }
+        var fields = extractAssistantDataIntentExpressionFieldHints(dimension.groupId)
+            .filter(function (field) { return isAssistantProjectionKeyAllowed(field); });
+        if (!fields.length) {
+            return;
+        }
+        add({
+            id: dimension.id,
+            terms: dimension.terms || [],
+            fields: fields,
+            type: 'string',
+            operators: ['eq', 'contains', 'in']
+        });
+    });
+    [
+        { id: 'quantity', field: intent.quantityField, type: 'number' },
+        { id: 'metric', field: intent.metricField, type: 'number' }
+    ].forEach(function (entry) {
+        var field = normalizeOptionalString(entry.field);
+        if (!field) {
+            return;
+        }
+        add({
+            id: field.split('.').pop() || entry.id,
+            terms: [entry.id, field],
+            fields: [field],
+            type: entry.type,
+            operators: ['eq', 'gt', 'gte', 'lt', 'lte']
+        });
+    });
+    return candidates;
+}
+function normalizeAssistantContractFilterToken(value) {
+    return normalizeOptionalString(value).toLowerCase().replace(/[_-]+/g, ' ').replace(/\s+/g, ' ').trim();
+}
+function normalizeAssistantContractFilterOperator(value) {
+    var normalized = normalizeOptionalString(value).toLowerCase().replace(/[^a-z0-9_$]+/g, '');
+    if (normalized === '$eq' || normalized === 'equals' || normalized === 'is') {
+        return 'eq';
+    }
+    if (normalized === '$in' || normalized === 'oneof' || normalized === 'anyof') {
+        return 'in';
+    }
+    if (normalized === '$regex' || normalized === 'like' || normalized === 'contains') {
+        return 'contains';
+    }
+    if (normalized === '$gt' || normalized === 'after' || normalized === 'greaterthan') {
+        return 'gt';
+    }
+    if (normalized === '$gte' || normalized === 'onorafter' || normalized === 'greaterthanorequal') {
+        return 'gte';
+    }
+    if (normalized === '$lt' || normalized === 'before' || normalized === 'lessthan') {
+        return 'lt';
+    }
+    if (normalized === '$lte' || normalized === 'onorbefore' || normalized === 'lessthanorequal') {
+        return 'lte';
+    }
+    return normalized || 'eq';
+}
+function extractAssistantFilterObjectValue(value) {
+    var e_7, _a;
+    if (!value || typeof value !== 'object' || Array.isArray(value) || value instanceof Date) {
+        return {
+            operator: 'eq',
+            values: Array.isArray(value) ? value : [value]
+        };
+    }
+    var operatorKeys = ['$eq', 'eq', 'equals', 'value', '$in', 'in', 'values', '$regex', 'contains', '$gt', 'gt', '$gte', 'gte', '$lt', 'lt', '$lte', 'lte'];
+    try {
+        for (var operatorKeys_1 = __values(operatorKeys), operatorKeys_1_1 = operatorKeys_1.next(); !operatorKeys_1_1.done; operatorKeys_1_1 = operatorKeys_1.next()) {
+            var key = operatorKeys_1_1.value;
+            if (!Object.prototype.hasOwnProperty.call(value, key)) {
+                continue;
+            }
+            var rawValue = value[key];
+            var operator = key === 'value' || key === 'values'
+                ? (key === 'values' ? 'in' : 'eq')
+                : normalizeAssistantContractFilterOperator(key);
+            return {
+                operator: operator,
+                values: Array.isArray(rawValue) ? rawValue : [rawValue]
+            };
+        }
+    }
+    catch (e_7_1) { e_7 = { error: e_7_1 }; }
+    finally {
+        try {
+            if (operatorKeys_1_1 && !operatorKeys_1_1.done && (_a = operatorKeys_1.return)) _a.call(operatorKeys_1);
+        }
+        finally { if (e_7) throw e_7.error; }
+    }
+    return {
+        operator: 'eq',
+        values: [value]
+    };
+}
+function resolveAssistantContractFilterSpec(filter) {
+    if (!filter || typeof filter !== 'object' || Array.isArray(filter)) {
+        return null;
+    }
+    var field = normalizeOptionalString(filter.field
+        || filter.field_hint
+        || filter.fieldHint
+        || filter.dimension
+        || filter.key
+        || filter.name);
+    var operator = normalizeAssistantContractFilterOperator(filter.operator || filter.op || '');
+    var rawValues = [];
+    if (Object.prototype.hasOwnProperty.call(filter, 'value')) {
+        rawValues = Array.isArray(filter.value) ? filter.value : [filter.value];
+    }
+    else if (Object.prototype.hasOwnProperty.call(filter, 'values')) {
+        operator = operator === 'eq' ? 'in' : operator;
+        rawValues = Array.isArray(filter.values) ? filter.values : [filter.values];
+    }
+    if (!field) {
+        var reserved_1 = new Set(['field', 'field_hint', 'fieldHint', 'field_hints', 'fieldHints', 'dimension', 'key', 'name', 'operator', 'op', 'value', 'values']);
+        var entries = Object.keys(filter).filter(function (key) { return !reserved_1.has(key) && !normalizeOptionalString(key).startsWith('$'); });
+        if (entries.length !== 1) {
+            return null;
+        }
+        field = entries[0];
+        var extracted = extractAssistantFilterObjectValue(filter[field]);
+        operator = extracted.operator;
+        rawValues = extracted.values;
+    }
+    var values = rawValues
+        .filter(function (value) { return value !== undefined && value !== null; })
+        .slice(0, 12);
+    if (!field || !values.length) {
+        return null;
+    }
+    return {
+        field: field,
+        operator: operator,
+        values: values,
+        raw: filter
+    };
+}
+function buildAssistantContractFilterSpecKey(spec) {
+    return __spreadArray([
+        normalizeAssistantContractFilterToken(spec.field),
+        normalizeAssistantContractFilterOperator(spec.operator)
+    ], __read(spec.values.map(function (value) { return normalizeAssistantContractFilterToken(value && typeof value === 'object' ? JSON.stringify(value) : value); })), false).filter(Boolean).join(':');
+}
+function resolveAssistantContractFilterKey(filter) {
+    var spec = resolveAssistantContractFilterSpec(filter);
+    return spec ? buildAssistantContractFilterSpecKey(spec) : normalizeAssistantContractFilterToken(formatAssistantContractFilterLabel(filter));
+}
+function collectAssistantContractFilterTokens(value, tokens) {
+    if (tokens === void 0) { tokens = []; }
+    if (value === undefined || value === null) {
+        return tokens;
+    }
+    if (Array.isArray(value)) {
+        value.forEach(function (entry) { return collectAssistantContractFilterTokens(entry, tokens); });
+        return tokens;
+    }
+    if (value && typeof value === 'object') {
+        Object.keys(value).forEach(function (key) {
+            var normalizedKey = normalizeAssistantContractFilterToken(key);
+            if (normalizedKey && !normalizedKey.startsWith('$') && !tokens.includes(normalizedKey)) {
+                tokens.push(normalizedKey);
+            }
+            collectAssistantContractFilterTokens(value[key], tokens);
+        });
+        return tokens;
+    }
+    var normalizedValue = normalizeAssistantContractFilterToken(value);
+    if (normalizedValue && !tokens.includes(normalizedValue)) {
+        tokens.push(normalizedValue);
+    }
+    return tokens;
+}
+function formatAssistantContractFilterLabel(filter) {
+    var labels = Object.keys(filter || {})
+        .map(function (key) {
+        var normalizedKey = normalizeAssistantContractFilterToken(key);
+        var value = filter[key];
+        var normalizedValue = value && typeof value === 'object'
+            ? normalizeAssistantContractFilterToken(JSON.stringify(value))
+            : normalizeAssistantContractFilterToken(value);
+        if (!normalizedKey) {
+            return '';
+        }
+        return normalizedValue ? "".concat(normalizedKey, "=").concat(normalizedValue) : normalizedKey;
+    })
+        .filter(Boolean);
+    return labels.length ? labels.join(', ') : 'requested';
+}
+function scoreAssistantFilterCandidate(spec, candidate) {
+    var requested = cleanAssistantRequestedDimensionText(spec.field);
+    if (!requested) {
+        return 0;
+    }
+    var score = 0;
+    var candidateId = cleanAssistantRequestedDimensionText(candidate.id);
+    if (requested === candidateId) {
+        score += 10;
+    }
+    else if (candidateId && containsAssistantHeuristicTerm(requested, candidateId)) {
+        score += 4;
+    }
+    (candidate.terms || []).forEach(function (term) {
+        var normalizedTerm = cleanAssistantRequestedDimensionText(term);
+        if (!normalizedTerm) {
+            return;
+        }
+        if (requested === normalizedTerm) {
+            score += normalizedTerm.includes(' ') ? 8 : 6;
+        }
+        else if (containsAssistantHeuristicTerm(requested, normalizedTerm)) {
+            score += normalizedTerm.includes(' ') ? 4 : 2;
+        }
+    });
+    (candidate.fields || []).forEach(function (field) {
+        var normalizedField = cleanAssistantRequestedDimensionText(field);
+        var leaf = cleanAssistantRequestedDimensionText(field.split('.').pop() || field);
+        if (requested === normalizedField || requested === leaf) {
+            score += 7;
+        }
+    });
+    return score;
+}
+function resolveAssistantFilterCandidate(spec, intent) {
+    var selected = null;
+    buildAssistantAppDataFilterCandidates(intent).forEach(function (candidate) {
+        var score = scoreAssistantFilterCandidate(spec, candidate);
+        if (score <= 0) {
+            return;
+        }
+        if (!selected || score > selected.score) {
+            selected = { candidate: candidate, score: score };
+        }
+    });
+    return (selected === null || selected === void 0 ? void 0 : selected.candidate) || null;
+}
+function coerceAssistantFilterValue(value, type) {
+    if (type === 'number') {
+        var numberValue = Number(value);
+        return Number.isFinite(numberValue) ? numberValue : undefined;
+    }
+    if (type === 'boolean') {
+        var normalized = normalizeOptionalString(value).toLowerCase();
+        if (['true', 'yes', 'active', '1'].includes(normalized)) {
+            return true;
+        }
+        if (['false', 'no', 'inactive', '0'].includes(normalized)) {
+            return false;
+        }
+        return typeof value === 'boolean' ? value : undefined;
+    }
+    if (type === 'date') {
+        var date = value instanceof Date ? value : new Date(normalizeOptionalString(value));
+        return Number.isNaN(date.getTime()) ? undefined : date;
+    }
+    var text = normalizeOptionalString(value);
+    return text ? text.slice(0, 160) : undefined;
+}
+function buildAssistantFieldFilterCondition(value, operator, type) {
+    var normalizedOperator = normalizeAssistantContractFilterOperator(operator);
+    var coerced = coerceAssistantFilterValue(value, type);
+    if (coerced === undefined) {
+        return undefined;
+    }
+    if (type === 'number' || type === 'date') {
+        if (normalizedOperator === 'gt') {
+            return { $gt: coerced };
+        }
+        if (normalizedOperator === 'gte') {
+            return { $gte: coerced };
+        }
+        if (normalizedOperator === 'lt') {
+            return { $lt: coerced };
+        }
+        if (normalizedOperator === 'lte') {
+            return { $lte: coerced };
+        }
+        return coerced;
+    }
+    if (type === 'boolean') {
+        return coerced;
+    }
+    var escaped = escapeRegexValue(String(coerced));
+    if (!escaped) {
+        return undefined;
+    }
+    return { $regex: escaped, $options: 'i' };
+}
+function buildAssistantContractFilterClause(spec, candidate) {
+    var operator = normalizeAssistantContractFilterOperator(spec.operator);
+    if (candidate.operators.length && !candidate.operators.includes(operator)) {
+        return null;
+    }
+    var fields = (candidate.fields || []).filter(function (field) { return isAssistantProjectionKeyAllowed(field); });
+    if (!fields.length) {
+        return null;
+    }
+    var clauses = [];
+    fields.forEach(function (field) {
+        spec.values.forEach(function (value) {
+            var _a;
+            var condition = buildAssistantFieldFilterCondition(value, operator === 'in' ? 'eq' : operator, candidate.type);
+            if (condition !== undefined) {
+                clauses.push((_a = {}, _a[field] = condition, _a));
+            }
+        });
+    });
+    if (!clauses.length) {
+        return null;
+    }
+    if (clauses.length === 1) {
+        return clauses[0];
+    }
+    return { $or: clauses };
+}
+function mergeAssistantMatchClauses(existingMatch, clauses) {
+    var cleanClauses = clauses.filter(function (clause) { return clause && typeof clause === 'object' && Object.keys(clause).length; });
+    if (!cleanClauses.length) {
+        return existingMatch;
+    }
+    var existingKeys = Object.keys(existingMatch || {});
+    if (!existingKeys.length) {
+        return cleanClauses.length === 1 ? cleanClauses[0] : { $and: cleanClauses };
+    }
+    return {
+        $and: __spreadArray([
+            (0, common_1.deepCopy)(existingMatch)
+        ], __read(cleanClauses), false)
+    };
+}
+function applyAssistantDataIntentContractFiltersToPipeline(pipeline, intent, requestContract) {
+    var _a;
+    var filters = Array.isArray(requestContract === null || requestContract === void 0 ? void 0 : requestContract.filters) ? requestContract.filters : [];
+    if (!filters.length || !Array.isArray(pipeline) || !pipeline.length) {
+        return { pipeline: pipeline, appliedFilterKeys: [] };
+    }
+    var clauses = [];
+    var appliedFilterKeys = [];
+    filters.forEach(function (filter) {
+        var spec = resolveAssistantContractFilterSpec(filter);
+        if (!spec) {
+            return;
+        }
+        var candidate = resolveAssistantFilterCandidate(spec, intent);
+        if (!candidate) {
+            return;
+        }
+        var clause = buildAssistantContractFilterClause(spec, candidate);
+        if (!clause) {
+            return;
+        }
+        clauses.push(clause);
+        appliedFilterKeys.push(buildAssistantContractFilterSpecKey(spec));
+    });
+    if (!clauses.length) {
+        return { pipeline: pipeline, appliedFilterKeys: [] };
+    }
+    var next = (0, common_1.deepCopy)(pipeline);
+    var groupIndex = findAggregateGroupIndex(next);
+    var preGroupLimit = groupIndex > -1 ? groupIndex : next.length;
+    var matchIndex = -1;
+    for (var index = 0; index < preGroupLimit; index += 1) {
+        if (((_a = next[index]) === null || _a === void 0 ? void 0 : _a.$match) && typeof next[index].$match === 'object') {
+            matchIndex = index;
+        }
+    }
+    if (matchIndex > -1) {
+        next[matchIndex].$match = mergeAssistantMatchClauses(next[matchIndex].$match, clauses);
+    }
+    else {
+        var insertIndex = groupIndex > -1 ? groupIndex : 0;
+        next.splice(insertIndex, 0, {
+            $match: clauses.length === 1 ? clauses[0] : { $and: clauses }
+        });
+    }
+    return { pipeline: next, appliedFilterKeys: appliedFilterKeys };
+}
+function resolveAssistantDroppedFilterAmbiguities(requestContract, pipeline, appliedFilterKeys) {
+    if (appliedFilterKeys === void 0) { appliedFilterKeys = []; }
+    var filters = Array.isArray(requestContract === null || requestContract === void 0 ? void 0 : requestContract.filters)
+        ? requestContract.filters
+        : [];
+    if (!filters.length) {
+        return [];
+    }
+    var pipelineText = normalizeAssistantContractFilterToken(JSON.stringify(pipeline || []));
+    var applied = new Set(appliedFilterKeys.map(function (key) { return normalizeAssistantContractFilterToken(key); }).filter(Boolean));
+    return filters
+        .filter(function (filter) {
+        var filterKey = normalizeAssistantContractFilterToken(resolveAssistantContractFilterKey(filter));
+        if (filterKey && applied.has(filterKey)) {
+            return false;
+        }
+        var tokens = collectAssistantContractFilterTokens(filter)
+            .filter(function (token) { return token.length >= 2 && !['and', 'or', 'eq', 'in', 'gte', 'lte', 'gt', 'lt'].includes(token); });
+        if (!tokens.length) {
+            return false;
+        }
+        return !tokens.every(function (token) { return pipelineText.includes(token); });
+    })
+        .map(function (filter) { return "Requested filter ".concat(formatAssistantContractFilterLabel(filter), " was not applied to the final aggregate pipeline."); });
+}
 function isAssistantProjectFieldFromGroupId(value) {
     return typeof value === 'string' && value.startsWith('$_id.');
 }
@@ -8065,10 +8604,13 @@ function buildAssistantAppDataIntentDirective(message, collectionNames, appId, o
     if (!intent) {
         return null;
     }
-    var customerText = extractAssistantDataIntentCustomerText(message);
-    var dateWindow = resolveAssistantDataIntentDateWindow(message);
+    var customerText = doesAssistantDataIntentUseCustomerText(intent)
+        ? extractAssistantDataIntentCustomerText(message)
+        : '';
+    var parsedDateWindow = resolveAssistantDataIntentDateWindow(message);
     var requestUnderstanding = (options === null || options === void 0 ? void 0 : options.appDataRequestUnderstanding)
-        || buildAssistantDataRequestUnderstanding(message, intent, dateWindow, (options === null || options === void 0 ? void 0 : options.appDataRequestContract) || null);
+        || buildAssistantDataRequestUnderstanding(message, intent, parsedDateWindow, (options === null || options === void 0 ? void 0 : options.appDataRequestContract) || null);
+    var dateWindow = resolveAssistantEffectiveDataIntentDateWindow(parsedDateWindow, requestUnderstanding);
     var templatedDimensions = requestUnderstanding.dimensions
         .map(function (dimension) { return applyAssistantDataIntentDimensionTemplate(dimension, { customerText: customerText, dateWindow: dateWindow }); })
         .filter(function (dimension) { return !!(dimension === null || dimension === void 0 ? void 0 : dimension.groupId); });
@@ -8097,8 +8639,15 @@ function buildAssistantAppDataIntentDirective(message, collectionNames, appId, o
     var pipeline = configuredPipeline.length
         ? configuredPipeline
         : buildAssistantGenericDataIntentPipeline(intent, customerText, dateWindow);
-    var finalPipeline = applyAssistantDataIntentDimensionsToPipeline(pipeline, templatedDimensions);
-    metadata.requestContract = __assign(__assign({}, requestUnderstanding.contract), { measures: buildAssistantDataRequestMeasures(intent, finalPipeline) });
+    var dimensionPipeline = applyAssistantDataIntentDimensionsToPipeline(pipeline, templatedDimensions);
+    var filterApplication = applyAssistantDataIntentContractFiltersToPipeline(dimensionPipeline, intent, requestUnderstanding.contract);
+    var finalPipeline = filterApplication.pipeline;
+    var droppedBreakdownAmbiguities = resolveAssistantDroppedBreakdownAmbiguities(requestUnderstanding.contract, finalPipeline);
+    var droppedFilterAmbiguities = resolveAssistantDroppedFilterAmbiguities(requestUnderstanding.contract, finalPipeline, filterApplication.appliedFilterKeys);
+    var droppedContractAmbiguities = mergeAssistantHintValues(droppedBreakdownAmbiguities, droppedFilterAmbiguities);
+    metadata.requestContract = __assign(__assign({}, requestUnderstanding.contract), { measures: buildAssistantDataRequestMeasures(intent, finalPipeline), ambiguities: mergeAssistantHintValues(requestUnderstanding.contract.ambiguities || [], droppedContractAmbiguities), confidence: droppedContractAmbiguities.length
+            ? Math.min(requestUnderstanding.contract.confidence || 0.65, 0.65)
+            : requestUnderstanding.contract.confidence });
     return { type: 'aggregate', payload: basePayload(finalPipeline), cleaned: '', rawLine: "HEURISTIC_AGG(app-data-intent:".concat(intent.id, ")"), metadata: metadata };
 }
 function isAssistantDeterministicHeuristicDirective(directive) {
@@ -8263,7 +8812,7 @@ function ensureAssistantDisplayColumns(display, requestedColumns) {
     return __assign(__assign({}, display), { columns: columns, rows: rows });
 }
 function resolveAssistantPipelineTimeGrain(pipeline) {
-    var e_6, _a;
+    var e_8, _a;
     if (!Array.isArray(pipeline) || !pipeline.length) {
         return null;
     }
@@ -8325,12 +8874,12 @@ function resolveAssistantPipelineTimeGrain(pipeline) {
             }
         }
     }
-    catch (e_6_1) { e_6 = { error: e_6_1 }; }
+    catch (e_8_1) { e_8 = { error: e_8_1 }; }
     finally {
         try {
             if (priority_1_1 && !priority_1_1.done && (_a = priority_1.return)) _a.call(priority_1);
         }
-        finally { if (e_6) throw e_6.error; }
+        finally { if (e_8) throw e_8.error; }
     }
     return null;
 }
@@ -9015,6 +9564,48 @@ function formatAssistantEvidenceDate(value) {
     }
     return normalized.slice(0, 10);
 }
+function formatAssistantRequestBreakdownLabel(value) {
+    var cleanLabel = function (label) { return normalizeOptionalString(label).replace(/[_-]+/g, ' ').replace(/\s+/g, ' ').trim(); };
+    if (!value || typeof value !== 'object') {
+        return cleanLabel(value);
+    }
+    var type = normalizeOptionalString(value.type).toLowerCase();
+    if (type === 'time') {
+        return cleanLabel(value.granularity)
+            || cleanLabel(value.requested_text)
+            || cleanLabel(value.dimension);
+    }
+    return cleanLabel(value.requested_text)
+        || cleanLabel(value.dimension)
+        || cleanLabel(value.field_hint);
+}
+function joinAssistantHumanList(values) {
+    var cleaned = normalizeAssistantProgress(values).map(function (value) { return value.toLowerCase(); });
+    if (!cleaned.length) {
+        return '';
+    }
+    if (cleaned.length === 1) {
+        return cleaned[0];
+    }
+    if (cleaned.length === 2) {
+        return "".concat(cleaned[0], " and ").concat(cleaned[1]);
+    }
+    return "".concat(cleaned.slice(0, -1).join(', '), ", and ").concat(cleaned[cleaned.length - 1]);
+}
+function resolveAssistantRequestBreakdownSummary(requestContract) {
+    var requestedBreakdowns = Array.isArray(requestContract === null || requestContract === void 0 ? void 0 : requestContract.requested_breakdowns)
+        ? requestContract.requested_breakdowns
+        : [];
+    var labels = requestedBreakdowns
+        .map(function (entry) { return formatAssistantRequestBreakdownLabel(entry); })
+        .filter(Boolean);
+    var joined = joinAssistantHumanList(labels);
+    return joined ? "by ".concat(joined) : '';
+}
+function buildAssistantBreakdownProgressMessage(requestContract) {
+    var breakdown = resolveAssistantRequestBreakdownSummary(requestContract);
+    return breakdown ? "Grouping and summarizing results ".concat(breakdown) : '';
+}
 function buildAssistantToolFallbackResponse(result) {
     var _a, _b;
     var rowCount = Math.max(0, Number(result.output.rowCount || 0));
@@ -9038,6 +9629,10 @@ function buildAssistantToolFallbackResponse(result) {
         lines.push("- Source: ".concat(source));
     }
     lines.push("- Rows returned: ".concat(rowCount));
+    var breakdown = resolveAssistantRequestBreakdownSummary(debug.requestContract);
+    if (breakdown) {
+        lines.push("- Summary breakdown: ".concat(breakdown));
+    }
     if (customerText) {
         lines.push("- Filter: ".concat(customerText));
     }
@@ -9047,13 +9642,11 @@ function buildAssistantToolFallbackResponse(result) {
     if (typeof result.output.total === 'number') {
         lines.push("- Total: ".concat(result.output.total));
     }
-    if (rowCount <= 0) {
-        var assumptions = Array.isArray(debug.assumptions)
-            ? debug.assumptions.map(function (entry) { return normalizeOptionalString(entry); }).filter(Boolean)
-            : [];
-        if (assumptions.length) {
-            lines.push("- Assumptions: ".concat(assumptions.slice(0, 3).join('; ')));
-        }
+    var assumptions = Array.isArray(debug.assumptions)
+        ? debug.assumptions.map(function (entry) { return normalizeOptionalString(entry); }).filter(Boolean)
+        : [];
+    if (assumptions.length) {
+        lines.push("- Assumptions: ".concat(assumptions.slice(0, 3).join('; ')));
     }
     var leadSummary = buildAssistantDisplayLeadSummary(result.output.display);
     if (leadSummary) {
@@ -9191,7 +9784,7 @@ function applyAssistantDatedReportWindow(value, toolResult) {
     return "".concat(line, "\n\n").concat(content).trim();
 }
 function resolveAssistantDatedReportWindow(toolResult) {
-    var e_7, _a;
+    var e_9, _a;
     var _b, _c, _d, _e, _f, _g, _h, _j;
     var verificationWindow = (_d = (_c = (_b = toolResult === null || toolResult === void 0 ? void 0 : toolResult.output) === null || _b === void 0 ? void 0 : _b.verification) === null || _c === void 0 ? void 0 : _c.metrics) === null || _d === void 0 ? void 0 : _d.window;
     var verificationStart = normalizeOptionalString(verificationWindow === null || verificationWindow === void 0 ? void 0 : verificationWindow.startDate);
@@ -9257,12 +9850,12 @@ function resolveAssistantDatedReportWindow(toolResult) {
             };
         }
     }
-    catch (e_7_1) { e_7 = { error: e_7_1 }; }
+    catch (e_9_1) { e_9 = { error: e_9_1 }; }
     finally {
         try {
             if (pipelineCandidates_1_1 && !pipelineCandidates_1_1.done && (_a = pipelineCandidates_1.return)) _a.call(pipelineCandidates_1);
         }
-        finally { if (e_7) throw e_7.error; }
+        finally { if (e_9) throw e_9.error; }
     }
     return null;
 }
@@ -9725,9 +10318,30 @@ function createAssistantProgressTracker(messageId, initialProgress) {
             progress = normalizeAssistantProgress(__spreadArray(__spreadArray([], __read(progress), false), [item], false));
             queueProgressUpdate();
         },
-        stop: function () {
-            stopped = true;
-        }
+        snapshot: function () { return __spreadArray([], __read(progress), false); },
+        stop: function () { return __awaiter(_this, void 0, void 0, function () {
+            var snapshot, _a;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        snapshot = __spreadArray([], __read(progress), false);
+                        if (!(messageId && snapshot.length)) return [3 /*break*/, 4];
+                        _b.label = 1;
+                    case 1:
+                        _b.trys.push([1, 3, , 4]);
+                        return [4 /*yield*/, updateAssistantProgress(messageId, snapshot)];
+                    case 2:
+                        _b.sent();
+                        return [3 /*break*/, 4];
+                    case 3:
+                        _a = _b.sent();
+                        return [3 /*break*/, 4];
+                    case 4:
+                        stopped = true;
+                        return [2 /*return*/, snapshot];
+                }
+            });
+        }); }
     };
 }
 function buildAssistantCodexErrorMessage(error) {
@@ -9941,7 +10555,7 @@ function getValueAtPath(obj, path) {
     return walk(obj, 0);
 }
 function hasArrayValueAtPath(docs, path) {
-    var e_8, _a;
+    var e_10, _a;
     if (!Array.isArray(docs) || !docs.length || !path) {
         return false;
     }
@@ -9954,17 +10568,17 @@ function hasArrayValueAtPath(docs, path) {
             }
         }
     }
-    catch (e_8_1) { e_8 = { error: e_8_1 }; }
+    catch (e_10_1) { e_10 = { error: e_10_1 }; }
     finally {
         try {
             if (docs_1_1 && !docs_1_1.done && (_a = docs_1.return)) _a.call(docs_1);
         }
-        finally { if (e_8) throw e_8.error; }
+        finally { if (e_10) throw e_10.error; }
     }
     return false;
 }
 function inferIdFieldStorageTypeFromDocs(docs, fieldPath) {
-    var e_9, _a, e_10, _b;
+    var e_11, _a, e_12, _b;
     if (!Array.isArray(docs) || !fieldPath) {
         return 'unknown';
     }
@@ -9977,7 +10591,7 @@ function inferIdFieldStorageTypeFromDocs(docs, fieldPath) {
                 : doc === null || doc === void 0 ? void 0 : doc[fieldPath];
             var queue = Array.isArray(value) ? value : [value];
             try {
-                for (var queue_1 = (e_10 = void 0, __values(queue)), queue_1_1 = queue_1.next(); !queue_1_1.done; queue_1_1 = queue_1.next()) {
+                for (var queue_1 = (e_12 = void 0, __values(queue)), queue_1_1 = queue_1.next(); !queue_1_1.done; queue_1_1 = queue_1.next()) {
                     var entry = queue_1_1.value;
                     if (entry === null || entry === undefined) {
                         continue;
@@ -9990,21 +10604,21 @@ function inferIdFieldStorageTypeFromDocs(docs, fieldPath) {
                     }
                 }
             }
-            catch (e_10_1) { e_10 = { error: e_10_1 }; }
+            catch (e_12_1) { e_12 = { error: e_12_1 }; }
             finally {
                 try {
                     if (queue_1_1 && !queue_1_1.done && (_b = queue_1.return)) _b.call(queue_1);
                 }
-                finally { if (e_10) throw e_10.error; }
+                finally { if (e_12) throw e_12.error; }
             }
         }
     }
-    catch (e_9_1) { e_9 = { error: e_9_1 }; }
+    catch (e_11_1) { e_11 = { error: e_11_1 }; }
     finally {
         try {
             if (docs_2_1 && !docs_2_1.done && (_a = docs_2.return)) _a.call(docs_2);
         }
-        finally { if (e_9) throw e_9.error; }
+        finally { if (e_11) throw e_11.error; }
     }
     return sawString ? 'string' : 'unknown';
 }
@@ -10099,7 +10713,7 @@ function normalizeLookupKeyValue(value) {
     return '';
 }
 function collectTopLevelIdFieldValues(docs, options) {
-    var e_11, _a, e_12, _b;
+    var e_13, _a, e_14, _b;
     if (!Array.isArray(docs) || !docs.length) {
         return [];
     }
@@ -10147,26 +10761,26 @@ function collectTopLevelIdFieldValues(docs, options) {
                 });
             };
             try {
-                for (var keys_1 = (e_12 = void 0, __values(keys)), keys_1_1 = keys_1.next(); !keys_1_1.done; keys_1_1 = keys_1.next()) {
+                for (var keys_1 = (e_14 = void 0, __values(keys)), keys_1_1 = keys_1.next(); !keys_1_1.done; keys_1_1 = keys_1.next()) {
                     var key = keys_1_1.value;
                     _loop_3(key);
                 }
             }
-            catch (e_12_1) { e_12 = { error: e_12_1 }; }
+            catch (e_14_1) { e_14 = { error: e_14_1 }; }
             finally {
                 try {
                     if (keys_1_1 && !keys_1_1.done && (_b = keys_1.return)) _b.call(keys_1);
                 }
-                finally { if (e_12) throw e_12.error; }
+                finally { if (e_14) throw e_14.error; }
             }
         }
     }
-    catch (e_11_1) { e_11 = { error: e_11_1 }; }
+    catch (e_13_1) { e_13 = { error: e_13_1 }; }
     finally {
         try {
             if (docs_3_1 && !docs_3_1.done && (_a = docs_3.return)) _a.call(docs_3);
         }
-        finally { if (e_11) throw e_11.error; }
+        finally { if (e_13) throw e_13.error; }
     }
     return Array.from(fieldMap.entries()).map(function (_a) {
         var _b = __read(_a, 2), field = _b[0], values = _b[1];
@@ -10287,8 +10901,8 @@ function resolveLookupMappingsForField(field, mappings) {
 }
 function applyIdLookupDisplayEnrichment(params) {
     return __awaiter(this, void 0, void 0, function () {
-        var docs, collection, db, dbName, idClient, idCustomer, isSuperAdmin, idFields, lookupMappings, allCollections, collectionProbeCache, collectionSchemaCache, lookupMeta, enrichedDocs, _loop_4, idFields_1, idFields_1_1, fieldEntry, e_13_1;
-        var e_13, _a;
+        var docs, collection, db, dbName, idClient, idCustomer, isSuperAdmin, idFields, lookupMappings, allCollections, collectionProbeCache, collectionSchemaCache, lookupMeta, enrichedDocs, _loop_4, idFields_1, idFields_1_1, fieldEntry, e_15_1;
+        var e_15, _a;
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
@@ -10312,8 +10926,8 @@ function applyIdLookupDisplayEnrichment(params) {
                     lookupMeta = [];
                     enrichedDocs = docs.map(function (doc) { return (__assign({}, doc)); });
                     _loop_4 = function (fieldEntry) {
-                        var values, baseToken, mappingMatches, candidateCollections, filteredCandidates, _loop_5, filteredCandidates_1, filteredCandidates_1_1, candidate, state_3, e_14_1;
-                        var e_14, _c;
+                        var values, baseToken, mappingMatches, candidateCollections, filteredCandidates, _loop_5, filteredCandidates_1, filteredCandidates_1_1, candidate, state_3, e_16_1;
+                        var e_16, _c;
                         return __generator(this, function (_d) {
                             switch (_d.label) {
                                 case 0:
@@ -10487,7 +11101,7 @@ function applyIdLookupDisplayEnrichment(params) {
                                     _d.label = 1;
                                 case 1:
                                     _d.trys.push([1, 6, 7, 8]);
-                                    filteredCandidates_1 = (e_14 = void 0, __values(filteredCandidates)), filteredCandidates_1_1 = filteredCandidates_1.next();
+                                    filteredCandidates_1 = (e_16 = void 0, __values(filteredCandidates)), filteredCandidates_1_1 = filteredCandidates_1.next();
                                     _d.label = 2;
                                 case 2:
                                     if (!!filteredCandidates_1_1.done) return [3 /*break*/, 5];
@@ -10503,14 +11117,14 @@ function applyIdLookupDisplayEnrichment(params) {
                                     return [3 /*break*/, 2];
                                 case 5: return [3 /*break*/, 8];
                                 case 6:
-                                    e_14_1 = _d.sent();
-                                    e_14 = { error: e_14_1 };
+                                    e_16_1 = _d.sent();
+                                    e_16 = { error: e_16_1 };
                                     return [3 /*break*/, 8];
                                 case 7:
                                     try {
                                         if (filteredCandidates_1_1 && !filteredCandidates_1_1.done && (_c = filteredCandidates_1.return)) _c.call(filteredCandidates_1);
                                     }
-                                    finally { if (e_14) throw e_14.error; }
+                                    finally { if (e_16) throw e_16.error; }
                                     return [7 /*endfinally*/];
                                 case 8: return [2 /*return*/];
                             }
@@ -10533,14 +11147,14 @@ function applyIdLookupDisplayEnrichment(params) {
                     return [3 /*break*/, 3];
                 case 6: return [3 /*break*/, 9];
                 case 7:
-                    e_13_1 = _b.sent();
-                    e_13 = { error: e_13_1 };
+                    e_15_1 = _b.sent();
+                    e_15 = { error: e_15_1 };
                     return [3 /*break*/, 9];
                 case 8:
                     try {
                         if (idFields_1_1 && !idFields_1_1.done && (_a = idFields_1.return)) _a.call(idFields_1);
                     }
-                    finally { if (e_13) throw e_13.error; }
+                    finally { if (e_15) throw e_15.error; }
                     return [7 /*endfinally*/];
                 case 9:
                     if (!lookupMeta.length) {
@@ -10559,7 +11173,7 @@ function applyIdLookupDisplayEnrichment(params) {
     });
 }
 function hasNonEmptyValue(docs, fieldPath, options) {
-    var e_15, _a;
+    var e_17, _a;
     if (!Array.isArray(docs) || !fieldPath) {
         return false;
     }
@@ -10576,12 +11190,12 @@ function hasNonEmptyValue(docs, fieldPath, options) {
             }
         }
     }
-    catch (e_15_1) { e_15 = { error: e_15_1 }; }
+    catch (e_17_1) { e_17 = { error: e_17_1 }; }
     finally {
         try {
             if (docs_4_1 && !docs_4_1.done && (_a = docs_4.return)) _a.call(docs_4);
         }
-        finally { if (e_15) throw e_15.error; }
+        finally { if (e_17) throw e_17.error; }
     }
     return false;
 }
@@ -13197,7 +13811,7 @@ function flattenAssistantExprClauses(expr) {
     return [expr];
 }
 function detectAssistantMonthWindowInExpr(expr, allowedDateFields) {
-    var e_16, _a;
+    var e_18, _a;
     var clauses = flattenAssistantExprClauses(expr);
     if (!clauses.length) {
         return null;
@@ -13271,12 +13885,12 @@ function detectAssistantMonthWindowInExpr(expr, allowedDateFields) {
                 return state_4.value;
         }
     }
-    catch (e_16_1) { e_16 = { error: e_16_1 }; }
+    catch (e_18_1) { e_18 = { error: e_18_1 }; }
     finally {
         try {
             if (lowerClauses_1_1 && !lowerClauses_1_1.done && (_a = lowerClauses_1.return)) _a.call(lowerClauses_1);
         }
-        finally { if (e_16) throw e_16.error; }
+        finally { if (e_18) throw e_18.error; }
     }
     return null;
 }
@@ -13339,7 +13953,7 @@ function resolveAssistantMonthlyGroupDateFields(pipeline) {
     return fields;
 }
 function detectAssistantMonthWindowFromPipeline(pipeline) {
-    var e_17, _a;
+    var e_19, _a;
     var _b;
     var monthlyFields = resolveAssistantMonthlyGroupDateFields(pipeline);
     var scanMatch = function (match) {
@@ -13367,12 +13981,12 @@ function detectAssistantMonthWindowFromPipeline(pipeline) {
             }
         }
     }
-    catch (e_17_1) { e_17 = { error: e_17_1 }; }
+    catch (e_19_1) { e_19 = { error: e_19_1 }; }
     finally {
         try {
             if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
         }
-        finally { if (e_17) throw e_17.error; }
+        finally { if (e_19) throw e_19.error; }
     }
     return null;
 }
@@ -13652,7 +14266,7 @@ function normalizeAssistantCustomerLookupProjectionPipeline(pipeline) {
         var nextProject = __assign({}, project);
         var stageChanged = false;
         Object.keys(nextProject).forEach(function (field) {
-            var e_18, _a;
+            var e_20, _a;
             var expression = nextProject[field];
             if (typeof expression !== 'string') {
                 return;
@@ -13688,12 +14302,12 @@ function normalizeAssistantCustomerLookupProjectionPipeline(pipeline) {
                     break;
                 }
             }
-            catch (e_18_1) { e_18 = { error: e_18_1 }; }
+            catch (e_20_1) { e_20 = { error: e_20_1 }; }
             finally {
                 try {
                     if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
                 }
-                finally { if (e_18) throw e_18.error; }
+                finally { if (e_20) throw e_20.error; }
             }
         });
         if (stageChanged) {
@@ -13866,7 +14480,7 @@ function matchContainsField(value, field) {
     });
 }
 function resolveAggregateCompletionFallback(pipeline) {
-    var e_19, _a;
+    var e_21, _a;
     if (!Array.isArray(pipeline)) {
         return null;
     }
@@ -13879,7 +14493,7 @@ function resolveAggregateCompletionFallback(pipeline) {
         }
         var addFields = stage.$addFields;
         try {
-            for (var _b = (e_19 = void 0, __values(Object.keys(addFields))), _c = _b.next(); !_c.done; _c = _b.next()) {
+            for (var _b = (e_21 = void 0, __values(Object.keys(addFields))), _c = _b.next(); !_c.done; _c = _b.next()) {
                 var key = _c.value;
                 if (!isCompletionFieldName(key)) {
                     continue;
@@ -13893,12 +14507,12 @@ function resolveAggregateCompletionFallback(pipeline) {
                 }
             }
         }
-        catch (e_19_1) { e_19 = { error: e_19_1 }; }
+        catch (e_21_1) { e_21 = { error: e_21_1 }; }
         finally {
             try {
                 if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
             }
-            finally { if (e_19) throw e_19.error; }
+            finally { if (e_21) throw e_21.error; }
         }
         if (candidateField) {
             break;
@@ -14054,7 +14668,7 @@ function buildCompletionFallbackSources(field) {
     ]);
 }
 function resolveAggregateCompletionExprFallback(pipeline) {
-    var e_20, _a;
+    var e_22, _a;
     if (!Array.isArray(pipeline)) {
         return null;
     }
@@ -14074,7 +14688,7 @@ function resolveAggregateCompletionExprFallback(pipeline) {
         }
         if (!candidateField) {
             try {
-                for (var _b = (e_20 = void 0, __values(Object.keys(matchStage))), _c = _b.next(); !_c.done; _c = _b.next()) {
+                for (var _b = (e_22 = void 0, __values(Object.keys(matchStage))), _c = _b.next(); !_c.done; _c = _b.next()) {
                     var key = _c.value;
                     if (key.startsWith('$')) {
                         continue;
@@ -14089,12 +14703,12 @@ function resolveAggregateCompletionExprFallback(pipeline) {
                     }
                 }
             }
-            catch (e_20_1) { e_20 = { error: e_20_1 }; }
+            catch (e_22_1) { e_22 = { error: e_22_1 }; }
             finally {
                 try {
                     if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
                 }
-                finally { if (e_20) throw e_20.error; }
+                finally { if (e_22) throw e_22.error; }
             }
         }
         if (!candidateField) {
@@ -14296,7 +14910,7 @@ function hasAssistantDateGroupingOperator(value) {
     return Object.keys(value).some(function (key) { return hasAssistantDateGroupingOperator(value[key]); });
 }
 function isGroupFieldDerivedFromDateExpression(pipeline, groupIndex, groupPaths) {
-    var e_21, _a, e_22, _b;
+    var e_23, _a, e_24, _b;
     if (!Array.isArray(pipeline) || groupIndex <= 0 || !groupPaths.length) {
         return false;
     }
@@ -14322,14 +14936,14 @@ function isGroupFieldDerivedFromDateExpression(pipeline, groupIndex, groupPaths)
             continue;
         }
         try {
-            for (var stageKeys_1 = (e_21 = void 0, __values(stageKeys)), stageKeys_1_1 = stageKeys_1.next(); !stageKeys_1_1.done; stageKeys_1_1 = stageKeys_1.next()) {
+            for (var stageKeys_1 = (e_23 = void 0, __values(stageKeys)), stageKeys_1_1 = stageKeys_1.next(); !stageKeys_1_1.done; stageKeys_1_1 = stageKeys_1.next()) {
                 var stageKey = stageKeys_1_1.value;
                 var payload = stage[stageKey];
                 if (!payload || typeof payload !== 'object' || Array.isArray(payload)) {
                     continue;
                 }
                 try {
-                    for (var groupFields_1 = (e_22 = void 0, __values(groupFields)), groupFields_1_1 = groupFields_1.next(); !groupFields_1_1.done; groupFields_1_1 = groupFields_1.next()) {
+                    for (var groupFields_1 = (e_24 = void 0, __values(groupFields)), groupFields_1_1 = groupFields_1.next(); !groupFields_1_1.done; groupFields_1_1 = groupFields_1.next()) {
                         var groupField = groupFields_1_1.value;
                         if (!Object.prototype.hasOwnProperty.call(payload, groupField)) {
                             continue;
@@ -14339,21 +14953,21 @@ function isGroupFieldDerivedFromDateExpression(pipeline, groupIndex, groupPaths)
                         }
                     }
                 }
-                catch (e_22_1) { e_22 = { error: e_22_1 }; }
+                catch (e_24_1) { e_24 = { error: e_24_1 }; }
                 finally {
                     try {
                         if (groupFields_1_1 && !groupFields_1_1.done && (_b = groupFields_1.return)) _b.call(groupFields_1);
                     }
-                    finally { if (e_22) throw e_22.error; }
+                    finally { if (e_24) throw e_24.error; }
                 }
             }
         }
-        catch (e_21_1) { e_21 = { error: e_21_1 }; }
+        catch (e_23_1) { e_23 = { error: e_23_1 }; }
         finally {
             try {
                 if (stageKeys_1_1 && !stageKeys_1_1.done && (_a = stageKeys_1.return)) _a.call(stageKeys_1);
             }
-            finally { if (e_21) throw e_21.error; }
+            finally { if (e_23) throw e_23.error; }
         }
     }
     return false;
@@ -14460,7 +15074,7 @@ function isRegexMatchCondition(value) {
     return false;
 }
 function findRegexMatchInMatchObject(match, prefix) {
-    var e_23, _a, e_24, _b;
+    var e_25, _a, e_26, _b;
     if (prefix === void 0) { prefix = ''; }
     if (Array.isArray(match)) {
         try {
@@ -14472,12 +15086,12 @@ function findRegexMatchInMatchObject(match, prefix) {
                 }
             }
         }
-        catch (e_23_1) { e_23 = { error: e_23_1 }; }
+        catch (e_25_1) { e_25 = { error: e_25_1 }; }
         finally {
             try {
                 if (match_1_1 && !match_1_1.done && (_a = match_1.return)) _a.call(match_1);
             }
-            finally { if (e_23) throw e_23.error; }
+            finally { if (e_25) throw e_25.error; }
         }
         return null;
     }
@@ -14508,12 +15122,12 @@ function findRegexMatchInMatchObject(match, prefix) {
             }
         }
     }
-    catch (e_24_1) { e_24 = { error: e_24_1 }; }
+    catch (e_26_1) { e_26 = { error: e_26_1 }; }
     finally {
         try {
             if (keys_2_1 && !keys_2_1.done && (_b = keys_2.return)) _b.call(keys_2);
         }
-        finally { if (e_24) throw e_24.error; }
+        finally { if (e_26) throw e_26.error; }
     }
     return null;
 }
@@ -14902,7 +15516,7 @@ function collectMatchFieldsByCondition(match, predicate, prefix) {
     return results;
 }
 function findMatchConditionForField(match, targetField, prefix) {
-    var e_25, _a, e_26, _b;
+    var e_27, _a, e_28, _b;
     if (prefix === void 0) { prefix = ''; }
     if (!match || typeof match !== 'object') {
         return undefined;
@@ -14917,12 +15531,12 @@ function findMatchConditionForField(match, targetField, prefix) {
                 }
             }
         }
-        catch (e_25_1) { e_25 = { error: e_25_1 }; }
+        catch (e_27_1) { e_27 = { error: e_27_1 }; }
         finally {
             try {
                 if (match_2_1 && !match_2_1.done && (_a = match_2.return)) _a.call(match_2);
             }
-            finally { if (e_25) throw e_25.error; }
+            finally { if (e_27) throw e_27.error; }
         }
         return undefined;
     }
@@ -14949,12 +15563,12 @@ function findMatchConditionForField(match, targetField, prefix) {
             }
         }
     }
-    catch (e_26_1) { e_26 = { error: e_26_1 }; }
+    catch (e_28_1) { e_28 = { error: e_28_1 }; }
     finally {
         try {
             if (_d && !_d.done && (_b = _c.return)) _b.call(_c);
         }
-        finally { if (e_26) throw e_26.error; }
+        finally { if (e_28) throw e_28.error; }
     }
     return undefined;
 }
@@ -15187,7 +15801,7 @@ function detectIdLikeValue(value) {
     return false;
 }
 function detectChemicalIdFromProbe(probeDocs, fields) {
-    var e_27, _a, e_28, _b;
+    var e_29, _a, e_30, _b;
     if (!Array.isArray(probeDocs) || !probeDocs.length) {
         return false;
     }
@@ -15199,7 +15813,7 @@ function detectChemicalIdFromProbe(probeDocs, fields) {
         for (var probeDocs_1 = __values(probeDocs), probeDocs_1_1 = probeDocs_1.next(); !probeDocs_1_1.done; probeDocs_1_1 = probeDocs_1.next()) {
             var doc = probeDocs_1_1.value;
             try {
-                for (var targets_1 = (e_28 = void 0, __values(targets)), targets_1_1 = targets_1.next(); !targets_1_1.done; targets_1_1 = targets_1.next()) {
+                for (var targets_1 = (e_30 = void 0, __values(targets)), targets_1_1 = targets_1.next(); !targets_1_1.done; targets_1_1 = targets_1.next()) {
                     var field = targets_1_1.value;
                     var value = getValueAtPath(doc, field);
                     if (Array.isArray(value)) {
@@ -15212,21 +15826,21 @@ function detectChemicalIdFromProbe(probeDocs, fields) {
                     }
                 }
             }
-            catch (e_28_1) { e_28 = { error: e_28_1 }; }
+            catch (e_30_1) { e_30 = { error: e_30_1 }; }
             finally {
                 try {
                     if (targets_1_1 && !targets_1_1.done && (_b = targets_1.return)) _b.call(targets_1);
                 }
-                finally { if (e_28) throw e_28.error; }
+                finally { if (e_30) throw e_30.error; }
             }
         }
     }
-    catch (e_27_1) { e_27 = { error: e_27_1 }; }
+    catch (e_29_1) { e_29 = { error: e_29_1 }; }
     finally {
         try {
             if (probeDocs_1_1 && !probeDocs_1_1.done && (_a = probeDocs_1.return)) _a.call(probeDocs_1);
         }
-        finally { if (e_27) throw e_27.error; }
+        finally { if (e_29) throw e_29.error; }
     }
     return false;
 }
@@ -15447,8 +16061,8 @@ function buildChemicalIdFieldCandidates(field) {
 }
 function applyChemicalNameLookupFallbackToQuery(params) {
     return __awaiter(this, void 0, void 0, function () {
-        var query, db, dbName, idClient, idCustomer, isSuperAdmin, probeDocs, chemicalFields, targetField, condition, regex, sampleDocs, collectionNames, candidates, _loop_8, candidates_1, candidates_1_1, candidate, state_5, e_29_1;
-        var e_29, _a;
+        var query, db, dbName, idClient, idCustomer, isSuperAdmin, probeDocs, chemicalFields, targetField, condition, regex, sampleDocs, collectionNames, candidates, _loop_8, candidates_1, candidates_1_1, candidate, state_5, e_31_1;
+        var e_31, _a;
         var _b;
         return __generator(this, function (_c) {
             switch (_c.label) {
@@ -15561,14 +16175,14 @@ function applyChemicalNameLookupFallbackToQuery(params) {
                     return [3 /*break*/, 3];
                 case 6: return [3 /*break*/, 9];
                 case 7:
-                    e_29_1 = _c.sent();
-                    e_29 = { error: e_29_1 };
+                    e_31_1 = _c.sent();
+                    e_31 = { error: e_31_1 };
                     return [3 /*break*/, 9];
                 case 8:
                     try {
                         if (candidates_1_1 && !candidates_1_1.done && (_a = candidates_1.return)) _a.call(candidates_1);
                     }
-                    finally { if (e_29) throw e_29.error; }
+                    finally { if (e_31) throw e_31.error; }
                     return [7 /*endfinally*/];
                 case 9: return [2 /*return*/, null];
             }
@@ -15668,8 +16282,8 @@ function lookupIdsForNameMatch(params) {
 }
 function applyIdLookupFallbackToQuery(params) {
     return __awaiter(this, void 0, void 0, function () {
-        var query, db, dbName, idClient, idCustomer, isSuperAdmin, probeDocs, conditions, collectionNames, _a, conditions_1, conditions_1_1, condition, regex, baseToken, targetFieldType, nextValue, localNameField, candidates, candidates_2, candidates_2_1, candidate, candidateHasClientScope, _b, candidateProbe, lookup, targetFieldType, normalizedIds, idsForQuery, e_30_1, e_31_1;
-        var e_31, _c, e_30, _d;
+        var query, db, dbName, idClient, idCustomer, isSuperAdmin, probeDocs, conditions, collectionNames, _a, conditions_1, conditions_1_1, condition, regex, baseToken, targetFieldType, nextValue, localNameField, candidates, candidates_2, candidates_2_1, candidate, candidateHasClientScope, _b, candidateProbe, lookup, targetFieldType, normalizedIds, idsForQuery, e_32_1, e_33_1;
+        var e_33, _c, e_32, _d;
         var _e;
         return __generator(this, function (_f) {
             switch (_f.label) {
@@ -15739,7 +16353,7 @@ function applyIdLookupFallbackToQuery(params) {
                     _f.label = 5;
                 case 5:
                     _f.trys.push([5, 14, 15, 16]);
-                    candidates_2 = (e_30 = void 0, __values(candidates)), candidates_2_1 = candidates_2.next();
+                    candidates_2 = (e_32 = void 0, __values(candidates)), candidates_2_1 = candidates_2.next();
                     _f.label = 6;
                 case 6:
                     if (!!candidates_2_1.done) return [3 /*break*/, 13];
@@ -15806,28 +16420,28 @@ function applyIdLookupFallbackToQuery(params) {
                     return [3 /*break*/, 6];
                 case 13: return [3 /*break*/, 16];
                 case 14:
-                    e_30_1 = _f.sent();
-                    e_30 = { error: e_30_1 };
+                    e_32_1 = _f.sent();
+                    e_32 = { error: e_32_1 };
                     return [3 /*break*/, 16];
                 case 15:
                     try {
                         if (candidates_2_1 && !candidates_2_1.done && (_d = candidates_2.return)) _d.call(candidates_2);
                     }
-                    finally { if (e_30) throw e_30.error; }
+                    finally { if (e_32) throw e_32.error; }
                     return [7 /*endfinally*/];
                 case 16:
                     conditions_1_1 = conditions_1.next();
                     return [3 /*break*/, 4];
                 case 17: return [3 /*break*/, 20];
                 case 18:
-                    e_31_1 = _f.sent();
-                    e_31 = { error: e_31_1 };
+                    e_33_1 = _f.sent();
+                    e_33 = { error: e_33_1 };
                     return [3 /*break*/, 20];
                 case 19:
                     try {
                         if (conditions_1_1 && !conditions_1_1.done && (_c = conditions_1.return)) _c.call(conditions_1);
                     }
-                    finally { if (e_31) throw e_31.error; }
+                    finally { if (e_33) throw e_33.error; }
                     return [7 /*endfinally*/];
                 case 20: return [2 /*return*/, null];
             }
@@ -16272,8 +16886,8 @@ function resolveAssistantSurfaceFileCandidates(baseName) {
 }
 function readFirstAssistantSurfaceFile(candidates) {
     return __awaiter(this, void 0, void 0, function () {
-        var candidates_3, candidates_3_1, candidate, normalized, _a, e_32_1;
-        var e_32, _b;
+        var candidates_3, candidates_3_1, candidate, normalized, _a, e_34_1;
+        var e_34, _b;
         return __generator(this, function (_c) {
             switch (_c.label) {
                 case 0:
@@ -16300,14 +16914,14 @@ function readFirstAssistantSurfaceFile(candidates) {
                     return [3 /*break*/, 1];
                 case 6: return [3 /*break*/, 9];
                 case 7:
-                    e_32_1 = _c.sent();
-                    e_32 = { error: e_32_1 };
+                    e_34_1 = _c.sent();
+                    e_34 = { error: e_34_1 };
                     return [3 /*break*/, 9];
                 case 8:
                     try {
                         if (candidates_3_1 && !candidates_3_1.done && (_b = candidates_3.return)) _b.call(candidates_3);
                     }
-                    finally { if (e_32) throw e_32.error; }
+                    finally { if (e_34) throw e_34.error; }
                     return [7 /*endfinally*/];
                 case 9: return [2 /*return*/, ''];
             }
@@ -16857,6 +17471,15 @@ function cloneAssistantHeuristicProfile(profile) {
                         preGroupStages: Array.isArray(dimension === null || dimension === void 0 ? void 0 : dimension.preGroupStages) ? (0, common_1.deepCopy)(dimension.preGroupStages) : undefined
                     }); }).filter(function (dimension) { return !!dimension.id && dimension.groupId !== undefined; })
                     : [],
+                filterFields: Array.isArray(entry === null || entry === void 0 ? void 0 : entry.filterFields)
+                    ? entry.filterFields.map(function (filterField) { return ({
+                        id: normalizeOptionalString(filterField === null || filterField === void 0 ? void 0 : filterField.id),
+                        terms: mergeAssistantHintValues((filterField === null || filterField === void 0 ? void 0 : filterField.terms) || []).map(function (term) { return term.toLowerCase(); }),
+                        fields: mergeAssistantHintValues((filterField === null || filterField === void 0 ? void 0 : filterField.fields) || []),
+                        type: normalizeAssistantAppDataFilterFieldType(filterField === null || filterField === void 0 ? void 0 : filterField.type),
+                        operators: mergeAssistantHintValues((filterField === null || filterField === void 0 ? void 0 : filterField.operators) || []).map(function (operator) { return operator.toLowerCase(); })
+                    }); }).filter(function (filterField) { return !!filterField.id && !!filterField.fields.length; })
+                    : [],
                 pipeline: Array.isArray(entry === null || entry === void 0 ? void 0 : entry.pipeline) ? (0, common_1.deepCopy)(entry.pipeline) : undefined,
                 options: (entry === null || entry === void 0 ? void 0 : entry.options) && typeof entry.options === 'object' && !Array.isArray(entry.options)
                     ? (0, common_1.deepCopy)(entry.options)
@@ -16957,6 +17580,13 @@ function normalizeAssistantAppDataDimensionType(value) {
     }
     return undefined;
 }
+function normalizeAssistantAppDataFilterFieldType(value) {
+    var normalized = normalizeOptionalString(value).toLowerCase();
+    if (normalized === 'string' || normalized === 'number' || normalized === 'boolean' || normalized === 'date') {
+        return normalized;
+    }
+    return undefined;
+}
 function normalizeAssistantHeuristicStringList(value) {
     if (Array.isArray(value)) {
         return mergeAssistantHintValues(value.map(function (entry) { return normalizeOptionalString(entry).toLowerCase(); }));
@@ -17064,6 +17694,50 @@ function normalizeAssistantAppDataDimensions(value) {
     });
     return dimensions;
 }
+function normalizeAssistantAppDataFilterFields(value) {
+    var entries = Array.isArray(value)
+        ? value.map(function (entry) { return ({ key: '', entry: entry }); })
+        : value && typeof value === 'object'
+            ? Object.keys(value).map(function (key) { return ({ key: key, entry: value[key] }); })
+            : [];
+    var fields = [];
+    entries.forEach(function (_a) {
+        var key = _a.key, entry = _a.entry;
+        if (!entry || typeof entry !== 'object' || Array.isArray(entry)) {
+            return;
+        }
+        var id = normalizeOptionalString(entry.id
+            || entry.filter_id
+            || entry.filterId
+            || key);
+        var rawFilterFields = entry.fields
+            || entry.field_hints
+            || entry.fieldHints
+            || entry.field
+            || [];
+        var filterFields = (Array.isArray(rawFilterFields)
+            ? mergeAssistantHintValues(rawFilterFields)
+            : normalizeOptionalString(rawFilterFields)
+                ? [normalizeOptionalString(rawFilterFields)]
+                : []).filter(function (field) { return isAssistantProjectionKeyAllowed(field); });
+        if (!id || !filterFields.length) {
+            return;
+        }
+        var terms = normalizeAssistantHeuristicStringList(entry.terms
+            || entry.aliases
+            || entry.phrases
+            || [id]).map(function (term) { return term.toLowerCase(); });
+        fields.push({
+            id: id,
+            terms: terms.length ? terms : [id.toLowerCase()],
+            fields: filterFields,
+            type: normalizeAssistantAppDataFilterFieldType(entry.type),
+            operators: normalizeAssistantHeuristicStringList(entry.operators || entry.ops || [])
+                .map(function (operator) { return operator.toLowerCase(); })
+        });
+    });
+    return fields;
+}
 function normalizeAssistantAppDataIntents(value) {
     var entries = Array.isArray(value) ? value : [];
     var intents = [];
@@ -17098,6 +17772,10 @@ function normalizeAssistantAppDataIntents(value) {
                 || entry.breakdown_dimensions
                 || entry.breakdownDimensions
                 || []),
+            filterFields: normalizeAssistantAppDataFilterFields(entry.filter_fields
+                || entry.filterFields
+                || entry.filters
+                || []),
             pipeline: Array.isArray(entry.pipeline) ? (0, common_1.deepCopy)(entry.pipeline) : undefined,
             options: entry.options && typeof entry.options === 'object' && !Array.isArray(entry.options)
                 ? (0, common_1.deepCopy)(entry.options)
@@ -17828,7 +18506,7 @@ function doesAssistantPreserveAnyTermMatch(text, terms) {
     return (Array.isArray(terms) ? terms : []).some(function (term) { return doesAssistantPreserveTermMatch(text, term); });
 }
 function shouldPreserveAssistantCollectionForRouteFromRules(params) {
-    var e_33, _a;
+    var e_35, _a;
     var _b, _c, _d, _e, _f, _g, _h;
     var routePreferred = normalizeAssistantCollectionOverrideName(params.routePreferredName);
     var requested = normalizeAssistantCollectionOverrideName(params.requestedCollection);
@@ -17860,12 +18538,12 @@ function shouldPreserveAssistantCollectionForRouteFromRules(params) {
             return true;
         }
     }
-    catch (e_33_1) { e_33 = { error: e_33_1 }; }
+    catch (e_35_1) { e_35 = { error: e_35_1 }; }
     finally {
         try {
             if (_k && !_k.done && (_a = _j.return)) _a.call(_j);
         }
-        finally { if (e_33) throw e_33.error; }
+        finally { if (e_35) throw e_35.error; }
     }
     return false;
 }
@@ -18756,7 +19434,7 @@ function resolveAssistantNestedPrefixCollectionCandidates(params) {
 function resolveAssistantNestedAggregateFallbacks(params) {
     return __awaiter(this, void 0, void 0, function () {
         var prefixes, collectionNames, fallbacks, seen, prefixes_1, prefixes_1_1, prefix, rewrite, candidates, candidates_4, candidates_4_1, candidate, normalizedPipeline, key;
-        var e_34, _a, e_35, _b;
+        var e_36, _a, e_37, _b;
         return __generator(this, function (_c) {
             switch (_c.label) {
                 case 0:
@@ -18786,7 +19464,7 @@ function resolveAssistantNestedAggregateFallbacks(params) {
                                 triedCollections: params.triedCollections
                             });
                             try {
-                                for (candidates_4 = (e_35 = void 0, __values(candidates)), candidates_4_1 = candidates_4.next(); !candidates_4_1.done; candidates_4_1 = candidates_4.next()) {
+                                for (candidates_4 = (e_37 = void 0, __values(candidates)), candidates_4_1 = candidates_4.next(); !candidates_4_1.done; candidates_4_1 = candidates_4.next()) {
                                     candidate = candidates_4_1.value;
                                     normalizedPipeline = normalizeAssistantAggregatePipeline(rewrite.pipeline, candidate);
                                     if (!normalizedPipeline.length || containsForbiddenMongoOperators(normalizedPipeline)) {
@@ -18808,21 +19486,21 @@ function resolveAssistantNestedAggregateFallbacks(params) {
                                     }
                                 }
                             }
-                            catch (e_35_1) { e_35 = { error: e_35_1 }; }
+                            catch (e_37_1) { e_37 = { error: e_37_1 }; }
                             finally {
                                 try {
                                     if (candidates_4_1 && !candidates_4_1.done && (_b = candidates_4.return)) _b.call(candidates_4);
                                 }
-                                finally { if (e_35) throw e_35.error; }
+                                finally { if (e_37) throw e_37.error; }
                             }
                         }
                     }
-                    catch (e_34_1) { e_34 = { error: e_34_1 }; }
+                    catch (e_36_1) { e_36 = { error: e_36_1 }; }
                     finally {
                         try {
                             if (prefixes_1_1 && !prefixes_1_1.done && (_a = prefixes_1.return)) _a.call(prefixes_1);
                         }
-                        finally { if (e_34) throw e_34.error; }
+                        finally { if (e_36) throw e_36.error; }
                     }
                     return [2 /*return*/, fallbacks];
             }
@@ -18954,8 +19632,8 @@ function resolveAssistantBridgeCollectionHintCandidates(requestedCollection, req
 }
 function resolveAssistantReportBuilderBridgeCollection(collection_1, db_1) {
     return __awaiter(this, arguments, void 0, function (collection, db, dbName, options) {
-        var normalized, resolutionPath, pushResolutionStep, finalizeResolution, requestHints, appId, requestedTokens, requestedTokenWeights, aliasCandidates, hintCandidates, alias, manager, hasManager, configuredCollectionNames, isConfiguredCollection, candidates, pushCandidate, base, reportCandidate, candidates_5, candidates_5_1, candidate, model, candidates_6, candidates_6_1, candidate, primaryCollectionHint, resolverTargets, resolverErrorLogged, resolverTargets_1, resolverTargets_1_1, resolverTarget, resolved, resolvedName, resolvedScore, resolvedModel, _a, e_36_1, candidates_7, candidates_7_1, candidate, e_37_1, candidates_8, candidates_8_1, candidate;
-        var e_38, _b, e_39, _c, e_36, _d, e_37, _e, e_40, _f;
+        var normalized, resolutionPath, pushResolutionStep, finalizeResolution, requestHints, appId, requestedTokens, requestedTokenWeights, aliasCandidates, hintCandidates, alias, manager, hasManager, configuredCollectionNames, isConfiguredCollection, candidates, pushCandidate, base, reportCandidate, candidates_5, candidates_5_1, candidate, model, candidates_6, candidates_6_1, candidate, primaryCollectionHint, resolverTargets, resolverErrorLogged, resolverTargets_1, resolverTargets_1_1, resolverTarget, resolved, resolvedName, resolvedScore, resolvedModel, _a, e_38_1, candidates_7, candidates_7_1, candidate, e_39_1, candidates_8, candidates_8_1, candidate;
+        var e_40, _b, e_41, _c, e_38, _d, e_39, _e, e_42, _f;
         var _g, _h;
         if (dbName === void 0) { dbName = ''; }
         return __generator(this, function (_j) {
@@ -19029,12 +19707,12 @@ function resolveAssistantReportBuilderBridgeCollection(collection_1, db_1) {
                                 }
                             }
                         }
-                        catch (e_38_1) { e_38 = { error: e_38_1 }; }
+                        catch (e_40_1) { e_40 = { error: e_40_1 }; }
                         finally {
                             try {
                                 if (candidates_5_1 && !candidates_5_1.done && (_b = candidates_5.return)) _b.call(candidates_5);
                             }
-                            finally { if (e_38) throw e_38.error; }
+                            finally { if (e_40) throw e_40.error; }
                         }
                     }
                     if (configuredCollectionNames.length) {
@@ -19049,12 +19727,12 @@ function resolveAssistantReportBuilderBridgeCollection(collection_1, db_1) {
                                 }
                             }
                         }
-                        catch (e_39_1) { e_39 = { error: e_39_1 }; }
+                        catch (e_41_1) { e_41 = { error: e_41_1 }; }
                         finally {
                             try {
                                 if (candidates_6_1 && !candidates_6_1.done && (_c = candidates_6.return)) _c.call(candidates_6);
                             }
-                            finally { if (e_39) throw e_39.error; }
+                            finally { if (e_41) throw e_41.error; }
                         }
                     }
                     primaryCollectionHint = normalizeOptionalString((_h = requestHints === null || requestHints === void 0 ? void 0 : requestHints.collectionHints) === null || _h === void 0 ? void 0 : _h[0]);
@@ -19115,14 +19793,14 @@ function resolveAssistantReportBuilderBridgeCollection(collection_1, db_1) {
                     return [3 /*break*/, 2];
                 case 7: return [3 /*break*/, 10];
                 case 8:
-                    e_36_1 = _j.sent();
-                    e_36 = { error: e_36_1 };
+                    e_38_1 = _j.sent();
+                    e_38 = { error: e_38_1 };
                     return [3 /*break*/, 10];
                 case 9:
                     try {
                         if (resolverTargets_1_1 && !resolverTargets_1_1.done && (_d = resolverTargets_1.return)) _d.call(resolverTargets_1);
                     }
-                    finally { if (e_36) throw e_36.error; }
+                    finally { if (e_38) throw e_38.error; }
                     return [7 /*endfinally*/];
                 case 10:
                     if (!db) return [3 /*break*/, 18];
@@ -19148,14 +19826,14 @@ function resolveAssistantReportBuilderBridgeCollection(collection_1, db_1) {
                     return [3 /*break*/, 12];
                 case 15: return [3 /*break*/, 18];
                 case 16:
-                    e_37_1 = _j.sent();
-                    e_37 = { error: e_37_1 };
+                    e_39_1 = _j.sent();
+                    e_39 = { error: e_39_1 };
                     return [3 /*break*/, 18];
                 case 17:
                     try {
                         if (candidates_7_1 && !candidates_7_1.done && (_e = candidates_7.return)) _e.call(candidates_7);
                     }
-                    finally { if (e_37) throw e_37.error; }
+                    finally { if (e_39) throw e_39.error; }
                     return [7 /*endfinally*/];
                 case 18:
                     try {
@@ -19166,12 +19844,12 @@ function resolveAssistantReportBuilderBridgeCollection(collection_1, db_1) {
                             }
                         }
                     }
-                    catch (e_40_1) { e_40 = { error: e_40_1 }; }
+                    catch (e_42_1) { e_42 = { error: e_42_1 }; }
                     finally {
                         try {
                             if (candidates_8_1 && !candidates_8_1.done && (_f = candidates_8.return)) _f.call(candidates_8);
                         }
-                        finally { if (e_40) throw e_40.error; }
+                        finally { if (e_42) throw e_42.error; }
                     }
                     throw new Error('AI assistant report builder bridge: No queryable collection could be resolved.');
             }
@@ -19179,7 +19857,7 @@ function resolveAssistantReportBuilderBridgeCollection(collection_1, db_1) {
     });
 }
 function findQueryDateField(query) {
-    var e_41, _a, e_42, _b;
+    var e_43, _a, e_44, _b;
     if (!query || typeof query !== 'object') {
         return null;
     }
@@ -19193,12 +19871,12 @@ function findQueryDateField(query) {
                 }
             }
         }
-        catch (e_41_1) { e_41 = { error: e_41_1 }; }
+        catch (e_43_1) { e_43 = { error: e_43_1 }; }
         finally {
             try {
                 if (query_1_1 && !query_1_1.done && (_a = query_1.return)) _a.call(query_1);
             }
-            finally { if (e_41) throw e_41.error; }
+            finally { if (e_43) throw e_43.error; }
         }
         return null;
     }
@@ -19217,12 +19895,12 @@ function findQueryDateField(query) {
             }
         }
     }
-    catch (e_42_1) { e_42 = { error: e_42_1 }; }
+    catch (e_44_1) { e_44 = { error: e_44_1 }; }
     finally {
         try {
             if (_d && !_d.done && (_b = _c.return)) _b.call(_c);
         }
-        finally { if (e_42) throw e_42.error; }
+        finally { if (e_44) throw e_44.error; }
     }
     return null;
 }
@@ -19510,7 +20188,7 @@ function resolveQueryDateFieldFallback(query) {
     return { from: dateField, to: fallback };
 }
 function containsForbiddenMongoOperators(value) {
-    var e_43, _a;
+    var e_45, _a;
     if (!value || typeof value !== 'object') {
         return false;
     }
@@ -19529,12 +20207,12 @@ function containsForbiddenMongoOperators(value) {
             }
         }
     }
-    catch (e_43_1) { e_43 = { error: e_43_1 }; }
+    catch (e_45_1) { e_45 = { error: e_45_1 }; }
     finally {
         try {
             if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
         }
-        finally { if (e_43) throw e_43.error; }
+        finally { if (e_45) throw e_45.error; }
     }
     return false;
 }
@@ -19719,7 +20397,7 @@ function splitAssistantPermissionTokenSets(value) {
     };
 }
 function isAssistantTokenSetSubset(subset, superset) {
-    var e_44, _a;
+    var e_46, _a;
     if (!subset.size) {
         return false;
     }
@@ -19731,12 +20409,12 @@ function isAssistantTokenSetSubset(subset, superset) {
             }
         }
     }
-    catch (e_44_1) { e_44 = { error: e_44_1 }; }
+    catch (e_46_1) { e_46 = { error: e_46_1 }; }
     finally {
         try {
             if (subset_1_1 && !subset_1_1.done && (_a = subset_1.return)) _a.call(subset_1);
         }
-        finally { if (e_44) throw e_44.error; }
+        finally { if (e_46) throw e_46.error; }
     }
     return true;
 }
@@ -20271,8 +20949,8 @@ function applyCodexStreamStatusHandler(runOptions, streamStatusHandler) {
 }
 function waitForCodexWorkerMessage(worker, streamStatusHandler) {
     return __awaiter(this, void 0, void 0, function () {
-        var _a, _b, _c, _d, message, payload, status_1, e_45_1;
-        var _e, e_45, _f, _g;
+        var _a, _b, _c, _d, message, payload, status_1, e_47_1;
+        var _e, e_47, _f, _g;
         return __generator(this, function (_h) {
             switch (_h.label) {
                 case 0:
@@ -20299,8 +20977,8 @@ function waitForCodexWorkerMessage(worker, streamStatusHandler) {
                     return [3 /*break*/, 1];
                 case 4: return [3 /*break*/, 11];
                 case 5:
-                    e_45_1 = _h.sent();
-                    e_45 = { error: e_45_1 };
+                    e_47_1 = _h.sent();
+                    e_47 = { error: e_47_1 };
                     return [3 /*break*/, 11];
                 case 6:
                     _h.trys.push([6, , 9, 10]);
@@ -20311,7 +20989,7 @@ function waitForCodexWorkerMessage(worker, streamStatusHandler) {
                     _h.label = 8;
                 case 8: return [3 /*break*/, 10];
                 case 9:
-                    if (e_45) throw e_45.error;
+                    if (e_47) throw e_47.error;
                     return [7 /*endfinally*/];
                 case 10: return [7 /*endfinally*/];
                 case 11: throw new CodexWorkerBootstrapError('AI worker exited before completing.');
@@ -20655,8 +21333,8 @@ function buildAssistantWorkspaceRootCandidates(params) {
 }
 function resolveAssistantWorkspaceRoot() {
     return __awaiter(this, void 0, void 0, function () {
-        var candidates, firstExisting, firstNestedGitRoot, candidates_9, candidates_9_1, candidate, _a, gitRoot, nestedGitRoots, e_46_1;
-        var e_46, _b;
+        var candidates, firstExisting, firstNestedGitRoot, candidates_9, candidates_9_1, candidate, _a, gitRoot, nestedGitRoots, e_48_1;
+        var e_48, _b;
         return __generator(this, function (_c) {
             switch (_c.label) {
                 case 0:
@@ -20703,14 +21381,14 @@ function resolveAssistantWorkspaceRoot() {
                     return [3 /*break*/, 2];
                 case 8: return [3 /*break*/, 11];
                 case 9:
-                    e_46_1 = _c.sent();
-                    e_46 = { error: e_46_1 };
+                    e_48_1 = _c.sent();
+                    e_48 = { error: e_48_1 };
                     return [3 /*break*/, 11];
                 case 10:
                     try {
                         if (candidates_9_1 && !candidates_9_1.done && (_b = candidates_9.return)) _b.call(candidates_9);
                     }
-                    finally { if (e_46) throw e_46.error; }
+                    finally { if (e_48) throw e_48.error; }
                     return [7 /*endfinally*/];
                 case 11:
                     if (firstNestedGitRoot) {
@@ -21118,7 +21796,7 @@ var AI_ASSISTANT_BREAKDOWN_DIMENSION_STOPWORDS = new Set([
     'by'
 ]);
 function normalizeAssistantBreakdownDimension(value) {
-    var e_47, _a;
+    var e_49, _a;
     var normalized = normalizeOptionalString(value)
         .toLowerCase()
         .replace(/[^a-z0-9_\s-]+/g, ' ')
@@ -21150,12 +21828,12 @@ function normalizeAssistantBreakdownDimension(value) {
             }
         }
     }
-    catch (e_47_1) { e_47 = { error: e_47_1 }; }
+    catch (e_49_1) { e_49 = { error: e_49_1 }; }
     finally {
         try {
             if (tokens_1_1 && !tokens_1_1.done && (_a = tokens_1.return)) _a.call(tokens_1);
         }
-        finally { if (e_47) throw e_47.error; }
+        finally { if (e_49) throw e_49.error; }
     }
     if (!kept.length) {
         return '';
@@ -21360,7 +22038,7 @@ function resolveAssistantPlannerEnabled(config) {
     return raw === undefined ? false : raw === true;
 }
 function resolveAssistantPlannerKnownRoutes(user, isSuperAdmin) {
-    var e_48, _a;
+    var e_50, _a;
     var _b;
     if (isSuperAdmin === void 0) { isSuperAdmin = false; }
     var routes = ((_b = resolveio_server_app_1.ResolveIOServer.getClientRoutes) === null || _b === void 0 ? void 0 : _b.call(resolveio_server_app_1.ResolveIOServer)) || [];
@@ -21374,12 +22052,12 @@ function resolveAssistantPlannerKnownRoutes(user, isSuperAdmin) {
             }
         }
     }
-    catch (e_48_1) { e_48 = { error: e_48_1 }; }
+    catch (e_50_1) { e_50 = { error: e_50_1 }; }
     finally {
         try {
             if (routes_1_1 && !routes_1_1.done && (_a = routes_1.return)) _a.call(routes_1);
         }
-        finally { if (e_48) throw e_48.error; }
+        finally { if (e_50) throw e_50.error; }
     }
     var normalizedRoutes = Array.from(unique);
     var allowedRoutes = collectAssistantAllowedRoutesForUser(user, normalizedRoutes, isSuperAdmin);
@@ -21755,7 +22433,7 @@ function normalizeRouteMatchKey(value) {
     return normalizeRouteKey(value).toLowerCase();
 }
 function buildClientRouteIndex() {
-    var e_49, _a;
+    var e_51, _a;
     var _b;
     var routes = mergeAssistantHintValues(((_b = resolveio_server_app_1.ResolveIOServer.getClientRoutes) === null || _b === void 0 ? void 0 : _b.call(resolveio_server_app_1.ResolveIOServer)) || [], AI_ASSISTANT_CORE_PUBLIC_ROUTES);
     var set = new Set();
@@ -21774,12 +22452,12 @@ function buildClientRouteIndex() {
             }
         }
     }
-    catch (e_49_1) { e_49 = { error: e_49_1 }; }
+    catch (e_51_1) { e_51 = { error: e_51_1 }; }
     finally {
         try {
             if (routes_2_1 && !routes_2_1.done && (_a = routes_2.return)) _a.call(routes_2);
         }
-        finally { if (e_49) throw e_49.error; }
+        finally { if (e_51) throw e_51.error; }
     }
     return { set: set, map: map, size: routes.length };
 }
@@ -22670,8 +23348,8 @@ function shouldSkipAssistantGitDiscoveryDirectory(name) {
 }
 function resolveAssistantWorkspaceGitRoots(workspaceRoot) {
     return __awaiter(this, void 0, void 0, function () {
-        var roots, seen, push, _a, configuredRoots, configuredRoots_1, configuredRoots_1_1, configuredRoot, _b, e_50_1, queue, queued, enqueue, next, entries, _c, entries_1, entries_1_1, entry, childName, candidate, gitPath, _d, e_51_1;
-        var e_50, _e, e_51, _f;
+        var roots, seen, push, _a, configuredRoots, configuredRoots_1, configuredRoots_1_1, configuredRoot, _b, e_52_1, queue, queued, enqueue, next, entries, _c, entries_1, entries_1_1, entry, childName, candidate, gitPath, _d, e_53_1;
+        var e_52, _e, e_53, _f;
         var _g;
         return __generator(this, function (_h) {
             switch (_h.label) {
@@ -22716,14 +23394,14 @@ function resolveAssistantWorkspaceGitRoots(workspaceRoot) {
                     return [3 /*break*/, 3];
                 case 6: return [3 /*break*/, 9];
                 case 7:
-                    e_50_1 = _h.sent();
-                    e_50 = { error: e_50_1 };
+                    e_52_1 = _h.sent();
+                    e_52 = { error: e_52_1 };
                     return [3 /*break*/, 9];
                 case 8:
                     try {
                         if (configuredRoots_1_1 && !configuredRoots_1_1.done && (_e = configuredRoots_1.return)) _e.call(configuredRoots_1);
                     }
-                    finally { if (e_50) throw e_50.error; }
+                    finally { if (e_52) throw e_52.error; }
                     return [7 /*endfinally*/];
                 case 9:
                     queue = [];
@@ -22763,7 +23441,7 @@ function resolveAssistantWorkspaceGitRoots(workspaceRoot) {
                     return [3 /*break*/, 14];
                 case 14:
                     _h.trys.push([14, 21, 22, 23]);
-                    entries_1 = (e_51 = void 0, __values(entries)), entries_1_1 = entries_1.next();
+                    entries_1 = (e_53 = void 0, __values(entries)), entries_1_1 = entries_1.next();
                     _h.label = 15;
                 case 15:
                     if (!!entries_1_1.done) return [3 /*break*/, 20];
@@ -22802,14 +23480,14 @@ function resolveAssistantWorkspaceGitRoots(workspaceRoot) {
                     return [3 /*break*/, 15];
                 case 20: return [3 /*break*/, 23];
                 case 21:
-                    e_51_1 = _h.sent();
-                    e_51 = { error: e_51_1 };
+                    e_53_1 = _h.sent();
+                    e_53 = { error: e_53_1 };
                     return [3 /*break*/, 23];
                 case 22:
                     try {
                         if (entries_1_1 && !entries_1_1.done && (_f = entries_1.return)) _f.call(entries_1);
                     }
-                    finally { if (e_51) throw e_51.error; }
+                    finally { if (e_53) throw e_53.error; }
                     return [7 /*endfinally*/];
                 case 23: return [3 /*break*/, 10];
                 case 24: return [2 /*return*/, roots];
@@ -23149,8 +23827,8 @@ function syncAssistantGitMirror(repoUrl) {
 }
 function resolveAssistantChangeHistoryGitRoots(workspaceRoot) {
     return __awaiter(this, void 0, void 0, function () {
-        var roots, repoUrls, mirroredRoots, repoUrls_1, repoUrls_1_1, repoUrl, mirrorRoot, e_52_1;
-        var e_52, _a;
+        var roots, repoUrls, mirroredRoots, repoUrls_1, repoUrls_1_1, repoUrl, mirrorRoot, e_54_1;
+        var e_54, _a;
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0: return [4 /*yield*/, resolveAssistantWorkspaceGitRoots(workspaceRoot)];
@@ -23184,14 +23862,14 @@ function resolveAssistantChangeHistoryGitRoots(workspaceRoot) {
                     return [3 /*break*/, 3];
                 case 6: return [3 /*break*/, 9];
                 case 7:
-                    e_52_1 = _b.sent();
-                    e_52 = { error: e_52_1 };
+                    e_54_1 = _b.sent();
+                    e_54 = { error: e_54_1 };
                     return [3 /*break*/, 9];
                 case 8:
                     try {
                         if (repoUrls_1_1 && !repoUrls_1_1.done && (_a = repoUrls_1.return)) _a.call(repoUrls_1);
                     }
-                    finally { if (e_52) throw e_52.error; }
+                    finally { if (e_54) throw e_54.error; }
                     return [7 /*endfinally*/];
                 case 9: return [2 /*return*/, mirroredRoots];
             }
@@ -23200,8 +23878,8 @@ function resolveAssistantChangeHistoryGitRoots(workspaceRoot) {
 }
 function resolveAssistantChangeHistoryFastPathResponse(params) {
     return __awaiter(this, void 0, void 0, function () {
-        var workspaceRoot, _a, gitRoots, featureKeywords, sawExecutionError, bestFallback, gitRoots_1, gitRoots_1_1, gitRoot, _b, branch, _c, _d, limit, historyDepth, rawHistory, commits, summary, hasKeywordMatches, _e, e_53_1;
-        var e_53, _f;
+        var workspaceRoot, _a, gitRoots, featureKeywords, sawExecutionError, bestFallback, gitRoots_1, gitRoots_1_1, gitRoot, _b, branch, _c, _d, limit, historyDepth, rawHistory, commits, summary, hasKeywordMatches, _e, e_55_1;
+        var e_55, _f;
         return __generator(this, function (_g) {
             switch (_g.label) {
                 case 0:
@@ -23323,14 +24001,14 @@ function resolveAssistantChangeHistoryFastPathResponse(params) {
                     return [3 /*break*/, 7];
                 case 20: return [3 /*break*/, 23];
                 case 21:
-                    e_53_1 = _g.sent();
-                    e_53 = { error: e_53_1 };
+                    e_55_1 = _g.sent();
+                    e_55 = { error: e_55_1 };
                     return [3 /*break*/, 23];
                 case 22:
                     try {
                         if (gitRoots_1_1 && !gitRoots_1_1.done && (_f = gitRoots_1.return)) _f.call(gitRoots_1);
                     }
-                    finally { if (e_53) throw e_53.error; }
+                    finally { if (e_55) throw e_55.error; }
                     return [7 /*endfinally*/];
                 case 23:
                     if (bestFallback) {
@@ -23511,7 +24189,7 @@ function sanitizeAssistantResponse(value) {
     return normalizeAssistantRoutes(normalizedCurrency);
 }
 function evaluateAssistantGuardrails(message) {
-    var e_54, _a;
+    var e_56, _a;
     var normalized = String(message || '').toLowerCase();
     var identityGuardrail = evaluateAssistantIdentityDisclosureGuardrail(normalized);
     if (identityGuardrail === null || identityGuardrail === void 0 ? void 0 : identityGuardrail.blocked) {
@@ -23556,12 +24234,12 @@ function evaluateAssistantGuardrails(message) {
             }
         }
     }
-    catch (e_54_1) { e_54 = { error: e_54_1 }; }
+    catch (e_56_1) { e_56 = { error: e_56_1 }; }
     finally {
         try {
             if (patterns_3_1 && !patterns_3_1.done && (_a = patterns_3.return)) _a.call(patterns_3);
         }
-        finally { if (e_54) throw e_54.error; }
+        finally { if (e_56) throw e_56.error; }
     }
     return null;
 }
@@ -23666,7 +24344,7 @@ function tokenizeArithmeticExpression(expression) {
     return tokens;
 }
 function evaluateArithmeticExpression(expression) {
-    var e_55, _a, e_56, _b;
+    var e_57, _a, e_58, _b;
     var tokens = tokenizeArithmeticExpression(expression);
     if (!tokens || !tokens.length) {
         return null;
@@ -23723,12 +24401,12 @@ function evaluateArithmeticExpression(expression) {
             prevToken = token;
         }
     }
-    catch (e_55_1) { e_55 = { error: e_55_1 }; }
+    catch (e_57_1) { e_57 = { error: e_57_1 }; }
     finally {
         try {
             if (tokens_2_1 && !tokens_2_1.done && (_a = tokens_2.return)) _a.call(tokens_2);
         }
-        finally { if (e_55) throw e_55.error; }
+        finally { if (e_57) throw e_57.error; }
     }
     while (ops.length) {
         var op = ops.pop();
@@ -23768,12 +24446,12 @@ function evaluateArithmeticExpression(expression) {
             stack.push(Number(token));
         }
     }
-    catch (e_56_1) { e_56 = { error: e_56_1 }; }
+    catch (e_58_1) { e_58 = { error: e_58_1 }; }
     finally {
         try {
             if (output_1_1 && !output_1_1.done && (_b = output_1.return)) _b.call(output_1);
         }
-        finally { if (e_56) throw e_56.error; }
+        finally { if (e_58) throw e_58.error; }
     }
     if (stack.length !== 1 || Number.isNaN(stack[0])) {
         return null;
@@ -23957,8 +24635,8 @@ function handleCodexUpload(id_conversation, file_name, content_base64, size, con
 }
 function readAttachmentContents(attachments) {
     return __awaiter(this, void 0, void 0, function () {
-        var limits, totalBytes, totalChars, chunks, cleaned, attachments_1, attachments_1_1, attachment, localPath, safe, stat, ext, name_1, type, readable, content, _a, e_57_1;
-        var e_57, _b;
+        var limits, totalBytes, totalChars, chunks, cleaned, attachments_1, attachments_1_1, attachment, localPath, safe, stat, ext, name_1, type, readable, content, _a, e_59_1;
+        var e_59, _b;
         return __generator(this, function (_c) {
             switch (_c.label) {
                 case 0:
@@ -24037,14 +24715,14 @@ function readAttachmentContents(attachments) {
                     return [3 /*break*/, 2];
                 case 10: return [3 /*break*/, 13];
                 case 11:
-                    e_57_1 = _c.sent();
-                    e_57 = { error: e_57_1 };
+                    e_59_1 = _c.sent();
+                    e_59 = { error: e_59_1 };
                     return [3 /*break*/, 13];
                 case 12:
                     try {
                         if (attachments_1_1 && !attachments_1_1.done && (_b = attachments_1.return)) _b.call(attachments_1);
                     }
-                    finally { if (e_57) throw e_57.error; }
+                    finally { if (e_59) throw e_59.error; }
                     return [7 /*endfinally*/];
                 case 13: return [2 /*return*/, {
                         promptText: chunks.length ? "\n\nAttachments:\n".concat(chunks.join('\n\n')) : '',
@@ -24469,7 +25147,7 @@ function sanitizeAssistantMessageSetPayload(setPayload) {
     return next;
 }
 function sanitizeMongoSafeObject(value) {
-    var e_58, _a;
+    var e_60, _a;
     if (value === null || value === undefined) {
         return value;
     }
@@ -24493,17 +25171,17 @@ function sanitizeMongoSafeObject(value) {
             out[key] = sanitizeMongoSafeObject(rawValue);
         }
     }
-    catch (e_58_1) { e_58 = { error: e_58_1 }; }
+    catch (e_60_1) { e_60 = { error: e_60_1 }; }
     finally {
         try {
             if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
         }
-        finally { if (e_58) throw e_58.error; }
+        finally { if (e_60) throw e_60.error; }
     }
     return out;
 }
 function restoreMongoSafeObject(value) {
-    var e_59, _a;
+    var e_61, _a;
     if (value === null || value === undefined) {
         return value;
     }
@@ -24527,12 +25205,12 @@ function restoreMongoSafeObject(value) {
             out[key] = restoreMongoSafeObject(rawValue);
         }
     }
-    catch (e_59_1) { e_59 = { error: e_59_1 }; }
+    catch (e_61_1) { e_61 = { error: e_61_1 }; }
     finally {
         try {
             if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
         }
-        finally { if (e_59) throw e_59.error; }
+        finally { if (e_61) throw e_61.error; }
     }
     return out;
 }
@@ -24710,7 +25388,7 @@ function recordAssistantAnswerAIRun(input) {
     });
 }
 function evaluateGuardrails(message) {
-    var e_60, _a;
+    var e_62, _a;
     var normalized = String(message || '').toLowerCase();
     var identityGuardrail = evaluateAssistantIdentityDisclosureGuardrail(normalized);
     if (identityGuardrail === null || identityGuardrail === void 0 ? void 0 : identityGuardrail.blocked) {
@@ -24736,12 +25414,12 @@ function evaluateGuardrails(message) {
             }
         }
     }
-    catch (e_60_1) { e_60 = { error: e_60_1 }; }
+    catch (e_62_1) { e_62 = { error: e_62_1 }; }
     finally {
         try {
             if (patterns_4_1 && !patterns_4_1.done && (_a = patterns_4.return)) _a.call(patterns_4);
         }
-        finally { if (e_60) throw e_60.error; }
+        finally { if (e_62) throw e_62.error; }
     }
     return null;
 }