@resolveio/server-lib 22.3.201 → 22.3.203

package/methods/ai-terminal.js

@@ -6937,15 +6937,29 @@ function resolveAssistantDataIntentDateWindow(message) {
         december: 11,
         dec: 11
     };
+    var boundedEndMatch = text.match(/\b(?:until|through|thru|to)\s+(january|jan|february|feb|march|mar|april|apr|may|june|jun|july|jul|august|aug|september|sep|october|oct|november|nov|december|dec)\s+([0-9]{1,2})(?:,?\s+([0-9]{4}))?\b/);
+    if (boundedEndMatch) {
+        var endMonth = monthNames[boundedEndMatch[1]];
+        var endDay = Math.max(1, Math.min(31, Number(boundedEndMatch[2]) || 1));
+        var year_1 = Number(boundedEndMatch[3]) || now.getUTCFullYear();
+        var start = /\b(?:this|current)\s+month\b/.test(text)
+            ? new Date(Date.UTC(year_1, endMonth, 1, 0, 0, 0, 0)).toISOString()
+            : undefined;
+        return {
+            start: start,
+            end: new Date(Date.UTC(year_1, endMonth, endDay, 23, 59, 59, 999)).toISOString(),
+            year: year_1
+        };
+    }
     var monthMatch = text.match(/\b(january|jan|february|feb|march|mar|april|apr|may|june|jun|july|jul|august|aug|september|sep|october|oct|november|nov|december|dec)\s+([0-9]{4})\b/);
     if (monthMatch) {
         var month = monthNames[monthMatch[1]];
-        var year_1 = Number(monthMatch[2]);
-        if (Number.isFinite(year_1) && month >= 0) {
+        var year_2 = Number(monthMatch[2]);
+        if (Number.isFinite(year_2) && month >= 0) {
             return {
-                start: new Date(Date.UTC(year_1, month, 1, 0, 0, 0, 0)).toISOString(),
-                end: new Date(Date.UTC(year_1, month + 1, 0, 23, 59, 59, 999)).toISOString(),
-                year: year_1
+                start: new Date(Date.UTC(year_2, month, 1, 0, 0, 0, 0)).toISOString(),
+                end: new Date(Date.UTC(year_2, month + 1, 0, 23, 59, 59, 999)).toISOString(),
+                year: year_2
             };
         }
     }
@@ -7039,13 +7053,15 @@ function buildAssistantDataIntentMatchStage(customerText, dateField, dateWindow,
             })
         });
     }
-    if (dateField && dateWindow.start && dateWindow.end) {
-        and.push((_a = {},
-            _a[dateField] = {
-                $gte: dateWindow.start,
-                $lte: dateWindow.end
-            },
-            _a));
+    if (dateField && (dateWindow.start || dateWindow.end)) {
+        var dateQuery = {};
+        if (dateWindow.start) {
+            dateQuery.$gte = dateWindow.start;
+        }
+        if (dateWindow.end) {
+            dateQuery.$lte = dateWindow.end;
+        }
+        and.push((_a = {}, _a[dateField] = dateQuery, _a));
     }
     return and.length ? { $match: { $and: and } } : { $match: {} };
 }
@@ -7144,6 +7160,365 @@ function buildAssistantGenericDataIntentPipeline(intent, customerText, dateWindo
     });
     return pipeline;
 }
+function cleanAssistantRequestedDimensionText(value) {
+    var text = normalizeOptionalString(value).toLowerCase();
+    text = text.replace(/^(?:the|a|an|each|every|all)\s+/i, '');
+    text = text.replace(/\s+(?:for|from|to|until|through|during|where|with|and|or|this|last|past|current)\s+.*$/i, '');
+    text = text.replace(/[^a-z0-9_ -]+/gi, ' ');
+    return normalizeOptionalString(text.replace(/\s+/g, ' ')).toLowerCase();
+}
+function extractAssistantRequestedBreakdownDimensionTexts(message) {
+    var e_5, _a;
+    var text = normalizeOptionalString(message).toLowerCase();
+    if (!text) {
+        return [];
+    }
+    var extracted = extractAssistantRequestedBreakdownDimensions(text)
+        .map(function (value) { return cleanAssistantRequestedDimensionText(value); })
+        .filter(Boolean);
+    if (extracted.length) {
+        return mergeAssistantHintValues(extracted);
+    }
+    var patterns = [
+        /\b(?:group(?:ed)?|break(?:\s*down)?|broken\s+down|split)\s+by\s+([a-z0-9][a-z0-9_ -]{0,50}?)(?=\s+(?:for|from|to|until|through|during|this|last|past|current|where|with|and|or)\b|[,.!?;]|$)/i,
+        /\bby\s+([a-z0-9][a-z0-9_ -]{0,50}?)(?=\s+(?:for|from|to|until|through|during|this|last|past|current|where|with|and|or)\b|[,.!?;]|$)/i,
+        /\bper\s+([a-z0-9][a-z0-9_ -]{0,50}?)(?=\s+(?:for|from|to|until|through|during|this|last|past|current|where|with|and|or)\b|[,.!?;]|$)/i
+    ];
+    var results = [];
+    try {
+        for (var patterns_2 = __values(patterns), patterns_2_1 = patterns_2.next(); !patterns_2_1.done; patterns_2_1 = patterns_2.next()) {
+            var pattern = patterns_2_1.value;
+            var match = text.match(pattern);
+            var dimensionText = cleanAssistantRequestedDimensionText((match === null || match === void 0 ? void 0 : match[1]) || '');
+            if (dimensionText) {
+                results.push(dimensionText);
+            }
+        }
+    }
+    catch (e_5_1) { e_5 = { error: e_5_1 }; }
+    finally {
+        try {
+            if (patterns_2_1 && !patterns_2_1.done && (_a = patterns_2.return)) _a.call(patterns_2);
+        }
+        finally { if (e_5) throw e_5.error; }
+    }
+    return mergeAssistantHintValues(results);
+}
+function scoreAssistantDataDimensionMatch(requestedDimensionText, dimension) {
+    var requested = cleanAssistantRequestedDimensionText(requestedDimensionText);
+    if (!requested) {
+        return 0;
+    }
+    var score = 0;
+    var id = cleanAssistantRequestedDimensionText(dimension.id);
+    if (id && requested === id) {
+        score += 10;
+    }
+    else if (id && containsAssistantHeuristicTerm(requested, id)) {
+        score += 4;
+    }
+    (dimension.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;
+        }
+    });
+    return score;
+}
+function resolveAssistantTimeBreakdownGranularity(requestedDimensionText) {
+    var requested = cleanAssistantRequestedDimensionText(requestedDimensionText);
+    if (!requested) {
+        return '';
+    }
+    if (/\b(quarter|quarters|quarterly|qtr|qtrs)\b/i.test(requested)) {
+        return 'quarter';
+    }
+    if (/\b(month|months|monthly)\b/i.test(requested)) {
+        return 'month';
+    }
+    if (/\b(week|weeks|weekly)\b/i.test(requested)) {
+        return 'week';
+    }
+    if (/\b(day|days|daily|date)\b/i.test(requested)) {
+        return requested === 'date' ? 'date' : 'day';
+    }
+    if (/\b(year|years|yearly|annual|annually)\b/i.test(requested)) {
+        return 'year';
+    }
+    return '';
+}
+function buildAssistantTimeBreakdownGroupExpression(granularity, dateField) {
+    var dateOperand = "$".concat(dateField);
+    if (granularity === 'quarter') {
+        return {
+            $concat: [
+                { $toString: { $year: dateOperand } },
+                '-Q',
+                { $toString: { $ceil: { $divide: [{ $month: dateOperand }, 3] } } }
+            ]
+        };
+    }
+    var format = granularity === 'year'
+        ? '%Y'
+        : granularity === 'week'
+            ? '%Y-W%U'
+            : granularity === 'day' || granularity === 'date'
+                ? '%Y-%m-%d'
+                : '%Y-%m';
+    return {
+        $dateToString: {
+            format: format,
+            date: dateOperand
+        }
+    };
+}
+function buildAssistantDataIntentTimeDimension(requestedDimensionText, intent) {
+    var _a, _b, _c;
+    var granularity = resolveAssistantTimeBreakdownGranularity(requestedDimensionText);
+    var dateField = normalizeOptionalString(intent.dateField);
+    if (!granularity || !dateField) {
+        return null;
+    }
+    var id = granularity === 'date' ? 'date' : granularity;
+    return {
+        id: id,
+        type: 'time',
+        granularity: granularity,
+        requestedText: requestedDimensionText,
+        terms: [id, requestedDimensionText].filter(Boolean),
+        groupId: (_a = {},
+            _a[id] = buildAssistantTimeBreakdownGroupExpression(granularity, dateField),
+            _a),
+        project: (_b = {},
+            _b[id] = "$_id.".concat(id),
+            _b),
+        sort: (_c = {},
+            _c[id] = 1,
+            _c)
+    };
+}
+function extractAssistantDataIntentExpressionFieldHints(value, hints) {
+    if (hints === void 0) { hints = new Set(); }
+    if (typeof value === 'string') {
+        if (value.startsWith('$') && !value.startsWith('$$') && !value.startsWith('$_id.')) {
+            var path_1 = normalizeOptionalString(value.slice(1));
+            if (path_1) {
+                hints.add(path_1);
+            }
+        }
+        return Array.from(hints);
+    }
+    if (Array.isArray(value)) {
+        value.forEach(function (entry) { return extractAssistantDataIntentExpressionFieldHints(entry, hints); });
+        return Array.from(hints);
+    }
+    if (value && typeof value === 'object') {
+        Object.keys(value).forEach(function (key) { return extractAssistantDataIntentExpressionFieldHints(value[key], hints); });
+    }
+    return Array.from(hints);
+}
+function buildAssistantDataRequestMeasures(intent, pipeline) {
+    var _a;
+    var measures = [];
+    var add = function (value) {
+        var normalized = normalizeOptionalString(value);
+        if (normalized && !measures.includes(normalized)) {
+            measures.push(normalized);
+        }
+    };
+    var groupIndex = findAggregateGroupIndex(pipeline || []);
+    if (groupIndex > -1) {
+        var groupStage = (_a = pipeline[groupIndex]) === null || _a === void 0 ? void 0 : _a.$group;
+        if (groupStage && typeof groupStage === 'object') {
+            Object.keys(groupStage).forEach(function (key) {
+                if (key === '_id') {
+                    return;
+                }
+                if (/^(first|last|min|max)_/i.test(key) || /_ids?$/i.test(key) || key === 'blend_ids') {
+                    return;
+                }
+                add(key);
+            });
+        }
+    }
+    add(intent.quantityField ? intent.quantityField.split('.').pop() || intent.quantityField : '');
+    add(intent.metricField ? intent.metricField.split('.').pop() || intent.metricField : '');
+    if (!measures.length) {
+        add('row_count');
+    }
+    return measures;
+}
+function buildAssistantDataRequestUnderstanding(message, intent, dateWindow) {
+    var requestedDimensionTexts = extractAssistantRequestedBreakdownDimensionTexts(message);
+    var dimensions = [];
+    var requestedBreakdowns = [];
+    var ambiguities = [];
+    var seenDimensionIds = new Set();
+    var addDimension = function (dimension) {
+        var id = normalizeOptionalString(dimension.id);
+        if (!id || seenDimensionIds.has(id)) {
+            return;
+        }
+        seenDimensionIds.add(id);
+        dimensions.push(dimension);
+    };
+    requestedDimensionTexts.forEach(function (requestedDimensionText) {
+        var timeDimension = buildAssistantDataIntentTimeDimension(requestedDimensionText, intent);
+        if (timeDimension) {
+            addDimension(timeDimension);
+            requestedBreakdowns.push({
+                type: 'time',
+                requested_text: requestedDimensionText,
+                dimension: timeDimension.id,
+                granularity: timeDimension.granularity,
+                field_hint: intent.dateField
+            });
+            return;
+        }
+        if (resolveAssistantTimeBreakdownGranularity(requestedDimensionText) && !intent.dateField) {
+            ambiguities.push("Requested ".concat(requestedDimensionText, " breakdown, but this app data intent has no date field."));
+            requestedBreakdowns.push({
+                type: 'unknown',
+                requested_text: requestedDimensionText,
+                granularity: resolveAssistantTimeBreakdownGranularity(requestedDimensionText)
+            });
+            return;
+        }
+        var selected = null;
+        (intent.dimensions || []).forEach(function (dimension) {
+            var score = scoreAssistantDataDimensionMatch(requestedDimensionText, dimension);
+            if (score <= 0) {
+                return;
+            }
+            if (!selected || score > selected.score) {
+                selected = { dimension: dimension, score: score };
+            }
+        });
+        if (selected) {
+            var dimension = __assign(__assign({}, selected.dimension), { type: selected.dimension.type || 'entity', requestedText: requestedDimensionText });
+            addDimension(dimension);
+            requestedBreakdowns.push({
+                type: 'entity',
+                requested_text: requestedDimensionText,
+                dimension: dimension.id,
+                field_hints: extractAssistantDataIntentExpressionFieldHints(dimension.groupId)
+            });
+            return;
+        }
+        ambiguities.push("Requested ".concat(requestedDimensionText, " breakdown did not match a configured app dimension."));
+        requestedBreakdowns.push({
+            type: 'unknown',
+            requested_text: requestedDimensionText
+        });
+    });
+    var confidence = requestedBreakdowns.length && !ambiguities.length
+        ? 0.9
+        : requestedBreakdowns.length
+            ? 0.65
+            : 0.75;
+    return {
+        dimensions: dimensions,
+        contract: {
+            intent_type: 'data_summary',
+            domain: intent.id || intent.collection,
+            operation: 'aggregate',
+            requested_breakdowns: requestedBreakdowns,
+            date_range: dateWindow.start || dateWindow.end ? __assign({}, dateWindow) : null,
+            measures: [],
+            filters: [],
+            output_format: 'collapse_table',
+            ambiguities: ambiguities,
+            confidence: confidence,
+            source: 'fast_app_data_request_contract'
+        }
+    };
+}
+function extractAssistantDataIntentGroupKeys(groupId) {
+    if (!groupId || typeof groupId !== 'object' || Array.isArray(groupId)) {
+        return [];
+    }
+    return Object.keys(groupId).filter(Boolean);
+}
+function isAssistantProjectFieldFromGroupId(value) {
+    return typeof value === 'string' && value.startsWith('$_id.');
+}
+function applyAssistantDataIntentDimensionTemplate(dimension, params) {
+    return __assign(__assign({}, dimension), { groupId: removeUndefinedAssistantPipelineValues(applyAssistantDataIntentPipelineTemplate(dimension.groupId, params)), project: dimension.project
+            ? removeUndefinedAssistantPipelineValues(applyAssistantDataIntentPipelineTemplate(dimension.project, params))
+            : undefined, sort: dimension.sort
+            ? removeUndefinedAssistantPipelineValues(applyAssistantDataIntentPipelineTemplate(dimension.sort, params))
+            : undefined, preGroupStages: Array.isArray(dimension.preGroupStages)
+            ? removeUndefinedAssistantPipelineValues(applyAssistantDataIntentPipelineTemplate(dimension.preGroupStages, params))
+            : undefined });
+}
+function applyAssistantDataIntentDimensionsToPipeline(pipeline, dimensions) {
+    var selectedDimensions = (Array.isArray(dimensions) ? dimensions : []).filter(function (dimension) { return !!(dimension === null || dimension === void 0 ? void 0 : dimension.groupId); });
+    if (!selectedDimensions.length || !Array.isArray(pipeline) || !pipeline.length) {
+        return pipeline;
+    }
+    var next = (0, common_1.deepCopy)(pipeline);
+    var groupIndex = findAggregateGroupIndex(next);
+    if (groupIndex === -1) {
+        return next;
+    }
+    selectedDimensions.forEach(function (dimension) {
+        if (Array.isArray(dimension.preGroupStages) && dimension.preGroupStages.length) {
+            next.splice.apply(next, __spreadArray([groupIndex, 0], __read((0, common_1.deepCopy)(dimension.preGroupStages)), false));
+            groupIndex += dimension.preGroupStages.length;
+        }
+    });
+    var groupStage = next[groupIndex];
+    if (!(groupStage === null || groupStage === void 0 ? void 0 : groupStage.$group) || typeof groupStage.$group !== 'object') {
+        return next;
+    }
+    var oldGroupKeys = new Set(extractAssistantDataIntentGroupKeys(groupStage.$group._id));
+    var combinedGroupId = {};
+    selectedDimensions.forEach(function (dimension) {
+        if (dimension.groupId && typeof dimension.groupId === 'object' && !Array.isArray(dimension.groupId)) {
+            Object.assign(combinedGroupId, (0, common_1.deepCopy)(dimension.groupId));
+        }
+    });
+    var newGroupKeys = new Set(extractAssistantDataIntentGroupKeys(combinedGroupId));
+    groupStage.$group._id = combinedGroupId;
+    var projectIndex = next.findIndex(function (stage, index) { return index > groupIndex && !!(stage === null || stage === void 0 ? void 0 : stage.$project); });
+    if (projectIndex > -1 && next[projectIndex].$project && typeof next[projectIndex].$project === 'object') {
+        var project_1 = next[projectIndex].$project;
+        oldGroupKeys.forEach(function (key) {
+            if (!newGroupKeys.has(key) && isAssistantProjectFieldFromGroupId(project_1[key])) {
+                delete project_1[key];
+            }
+        });
+        selectedDimensions.forEach(function (dimension) {
+            if (dimension.project) {
+                Object.assign(project_1, (0, common_1.deepCopy)(dimension.project));
+            }
+        });
+    }
+    var sortIndex = next.findIndex(function (stage, index) { return index > groupIndex && !!(stage === null || stage === void 0 ? void 0 : stage.$sort); });
+    if (sortIndex > -1) {
+        var combinedSort_1 = {};
+        selectedDimensions.forEach(function (dimension) {
+            if (dimension.sort && typeof dimension.sort === 'object' && !Array.isArray(dimension.sort)) {
+                Object.keys(dimension.sort).forEach(function (key) {
+                    var _a;
+                    if (!Object.prototype.hasOwnProperty.call(combinedSort_1, key)) {
+                        combinedSort_1[key] = (0, common_1.deepCopy)((_a = dimension.sort) === null || _a === void 0 ? void 0 : _a[key]);
+                    }
+                });
+            }
+        });
+        if (Object.keys(combinedSort_1).length) {
+            next[sortIndex].$sort = combinedSort_1;
+        }
+    }
+    return next;
+}
 function buildAssistantAppDataIntentDirective(message, collectionNames, appId) {
     if (collectionNames === void 0) { collectionNames = []; }
     var intent = selectAssistantAppDataIntent(message, collectionNames, appId);
@@ -7152,6 +7527,10 @@ function buildAssistantAppDataIntentDirective(message, collectionNames, appId) {
     }
     var customerText = extractAssistantDataIntentCustomerText(message);
     var dateWindow = resolveAssistantDataIntentDateWindow(message);
+    var requestUnderstanding = buildAssistantDataRequestUnderstanding(message, intent, dateWindow);
+    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); });
     var acknowledgementText = buildAssistantDataIntentAcknowledgement(intent, customerText, dateWindow);
     var progress = intent.progress.map(function (entry) {
         return entry
@@ -7166,7 +7545,18 @@ function buildAssistantAppDataIntentDirective(message, collectionNames, appId) {
         assumptions: intent.assumptions,
         fallbackCollections: intent.fallbackCollections,
         customerText: customerText,
-        dateWindow: dateWindow
+        dateWindow: dateWindow,
+        requestedDimension: templatedDimensions[0] ? {
+            id: templatedDimensions[0].id,
+            terms: templatedDimensions[0].terms
+        } : null,
+        requestedDimensions: templatedDimensions.map(function (dimension) { return ({
+            id: dimension.id,
+            type: dimension.type || 'entity',
+            granularity: dimension.granularity || undefined,
+            terms: dimension.terms
+        }); }),
+        requestContract: requestUnderstanding.contract
     };
     var basePayload = function (pipeline) { return ({
         collection: intent.collection,
@@ -7178,7 +7568,9 @@ function buildAssistantAppDataIntentDirective(message, collectionNames, appId) {
     var pipeline = configuredPipeline.length
         ? configuredPipeline
         : buildAssistantGenericDataIntentPipeline(intent, customerText, dateWindow);
-    return { type: 'aggregate', payload: basePayload(pipeline), cleaned: '', rawLine: "HEURISTIC_AGG(app-data-intent:".concat(intent.id, ")"), metadata: metadata };
+    var finalPipeline = applyAssistantDataIntentDimensionsToPipeline(pipeline, templatedDimensions);
+    metadata.requestContract = __assign(__assign({}, requestUnderstanding.contract), { measures: buildAssistantDataRequestMeasures(intent, finalPipeline) });
+    return { type: 'aggregate', payload: basePayload(finalPipeline), cleaned: '', rawLine: "HEURISTIC_AGG(app-data-intent:".concat(intent.id, ")"), metadata: metadata };
 }
 function isAssistantDeterministicHeuristicDirective(directive) {
     return isAssistantSchemaHoursHeuristicDirective(directive)
@@ -7334,7 +7726,7 @@ function ensureAssistantDisplayColumns(display, requestedColumns) {
     return __assign(__assign({}, display), { columns: columns, rows: rows });
 }
 function resolveAssistantPipelineTimeGrain(pipeline) {
-    var e_5, _a;
+    var e_6, _a;
     if (!Array.isArray(pipeline) || !pipeline.length) {
         return null;
     }
@@ -7396,12 +7788,12 @@ function resolveAssistantPipelineTimeGrain(pipeline) {
             }
         }
     }
-    catch (e_5_1) { e_5 = { error: e_5_1 }; }
+    catch (e_6_1) { e_6 = { error: e_6_1 }; }
     finally {
         try {
             if (priority_1_1 && !priority_1_1.done && (_a = priority_1.return)) _a.call(priority_1);
         }
-        finally { if (e_5) throw e_5.error; }
+        finally { if (e_6) throw e_6.error; }
     }
     return null;
 }
@@ -7883,7 +8275,7 @@ function buildAssistantToolResultPayload(directive, toolResponse, requestMessage
         ? toolResponse.verification
         : undefined;
     var directiveMetadata = directive.metadata && typeof directive.metadata === 'object' ? directive.metadata : {};
-    var mergedDebug = __assign(__assign(__assign(__assign(__assign(__assign(__assign({}, ((toolResponse === null || toolResponse === void 0 ? void 0 : toolResponse.debug) && typeof toolResponse.debug === 'object' ? toolResponse.debug : {})), (normalizeOptionalString(directiveMetadata.intentId) ? { intentId: normalizeOptionalString(directiveMetadata.intentId) } : {})), (normalizeOptionalString(directiveMetadata.acknowledgementText) ? { acknowledgementText: normalizeOptionalString(directiveMetadata.acknowledgementText) } : {})), (normalizeOptionalString(directiveMetadata.recipeUsed) ? { recipeUsed: normalizeOptionalString(directiveMetadata.recipeUsed) } : {})), (normalizeOptionalString(directiveMetadata.customerText) ? { customerText: normalizeOptionalString(directiveMetadata.customerText) } : {})), (directiveMetadata.dateWindow && typeof directiveMetadata.dateWindow === 'object' ? { dateWindow: directiveMetadata.dateWindow } : {})), (Array.isArray(directiveMetadata.assumptions) && directiveMetadata.assumptions.length ? { assumptions: directiveMetadata.assumptions } : {}));
+    var mergedDebug = __assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign({}, ((toolResponse === null || toolResponse === void 0 ? void 0 : toolResponse.debug) && typeof toolResponse.debug === 'object' ? toolResponse.debug : {})), (normalizeOptionalString(directiveMetadata.intentId) ? { intentId: normalizeOptionalString(directiveMetadata.intentId) } : {})), (normalizeOptionalString(directiveMetadata.acknowledgementText) ? { acknowledgementText: normalizeOptionalString(directiveMetadata.acknowledgementText) } : {})), (normalizeOptionalString(directiveMetadata.recipeUsed) ? { recipeUsed: normalizeOptionalString(directiveMetadata.recipeUsed) } : {})), (normalizeOptionalString(directiveMetadata.customerText) ? { customerText: normalizeOptionalString(directiveMetadata.customerText) } : {})), (directiveMetadata.dateWindow && typeof directiveMetadata.dateWindow === 'object' ? { dateWindow: directiveMetadata.dateWindow } : {})), (directiveMetadata.requestContract && typeof directiveMetadata.requestContract === 'object' ? { requestContract: directiveMetadata.requestContract } : {})), (Array.isArray(directiveMetadata.requestedDimensions) && directiveMetadata.requestedDimensions.length ? { requestedDimensions: directiveMetadata.requestedDimensions } : {})), (Array.isArray(directiveMetadata.assumptions) && directiveMetadata.assumptions.length ? { assumptions: directiveMetadata.assumptions } : {}));
     var result = {
         type: directive.type === 'aggregate' ? 'mongo_agg' : 'mongo_read',
         input: directivePayload,
@@ -8262,7 +8654,7 @@ function applyAssistantDatedReportWindow(value, toolResult) {
     return "".concat(line, "\n\n").concat(content).trim();
 }
 function resolveAssistantDatedReportWindow(toolResult) {
-    var e_6, _a;
+    var e_7, _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);
@@ -8328,12 +8720,12 @@ function resolveAssistantDatedReportWindow(toolResult) {
             };
         }
     }
-    catch (e_6_1) { e_6 = { error: e_6_1 }; }
+    catch (e_7_1) { e_7 = { error: e_7_1 }; }
     finally {
         try {
             if (pipelineCandidates_1_1 && !pipelineCandidates_1_1.done && (_a = pipelineCandidates_1.return)) _a.call(pipelineCandidates_1);
         }
-        finally { if (e_6) throw e_6.error; }
+        finally { if (e_7) throw e_7.error; }
     }
     return null;
 }
@@ -8471,14 +8863,14 @@ function buildAssistantDebugPayload(params) {
         else {
             notes.push("Report builder bridge collection: ".concat(from, " -> ").concat(to, "."));
         }
-        var path_1 = Array.isArray(fallbackInfo.reportBuilderBridge.resolutionPath)
+        var path_2 = Array.isArray(fallbackInfo.reportBuilderBridge.resolutionPath)
             ? fallbackInfo.reportBuilderBridge.resolutionPath
                 .map(function (entry) { return normalizeOptionalString(entry); })
                 .filter(Boolean)
                 .join(' -> ')
             : '';
-        if (path_1) {
-            notes.push("Bridge resolution path: ".concat(path_1, "."));
+        if (path_2) {
+            notes.push("Bridge resolution path: ".concat(path_2, "."));
         }
     }
     if ((_w = fallbackInfo === null || fallbackInfo === void 0 ? void 0 : fallbackInfo.reportFallback) === null || _w === void 0 ? void 0 : _w.used) {
@@ -9012,7 +9404,7 @@ function getValueAtPath(obj, path) {
     return walk(obj, 0);
 }
 function hasArrayValueAtPath(docs, path) {
-    var e_7, _a;
+    var e_8, _a;
     if (!Array.isArray(docs) || !docs.length || !path) {
         return false;
     }
@@ -9025,17 +9417,17 @@ function hasArrayValueAtPath(docs, path) {
             }
         }
     }
-    catch (e_7_1) { e_7 = { error: e_7_1 }; }
+    catch (e_8_1) { e_8 = { error: e_8_1 }; }
     finally {
         try {
             if (docs_1_1 && !docs_1_1.done && (_a = docs_1.return)) _a.call(docs_1);
         }
-        finally { if (e_7) throw e_7.error; }
+        finally { if (e_8) throw e_8.error; }
     }
     return false;
 }
 function inferIdFieldStorageTypeFromDocs(docs, fieldPath) {
-    var e_8, _a, e_9, _b;
+    var e_9, _a, e_10, _b;
     if (!Array.isArray(docs) || !fieldPath) {
         return 'unknown';
     }
@@ -9048,7 +9440,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_9 = 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_10 = 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;
@@ -9061,21 +9453,21 @@ function inferIdFieldStorageTypeFromDocs(docs, fieldPath) {
                     }
                 }
             }
-            catch (e_9_1) { e_9 = { error: e_9_1 }; }
+            catch (e_10_1) { e_10 = { error: e_10_1 }; }
             finally {
                 try {
                     if (queue_1_1 && !queue_1_1.done && (_b = queue_1.return)) _b.call(queue_1);
                 }
-                finally { if (e_9) throw e_9.error; }
+                finally { if (e_10) throw e_10.error; }
             }
         }
     }
-    catch (e_8_1) { e_8 = { error: e_8_1 }; }
+    catch (e_9_1) { e_9 = { error: e_9_1 }; }
     finally {
         try {
             if (docs_2_1 && !docs_2_1.done && (_a = docs_2.return)) _a.call(docs_2);
         }
-        finally { if (e_8) throw e_8.error; }
+        finally { if (e_9) throw e_9.error; }
     }
     return sawString ? 'string' : 'unknown';
 }
@@ -9170,7 +9562,7 @@ function normalizeLookupKeyValue(value) {
     return '';
 }
 function collectTopLevelIdFieldValues(docs, options) {
-    var e_10, _a, e_11, _b;
+    var e_11, _a, e_12, _b;
     if (!Array.isArray(docs) || !docs.length) {
         return [];
     }
@@ -9218,26 +9610,26 @@ function collectTopLevelIdFieldValues(docs, options) {
                 });
             };
             try {
-                for (var keys_1 = (e_11 = 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_12 = 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_11_1) { e_11 = { error: e_11_1 }; }
+            catch (e_12_1) { e_12 = { error: e_12_1 }; }
             finally {
                 try {
                     if (keys_1_1 && !keys_1_1.done && (_b = keys_1.return)) _b.call(keys_1);
                 }
-                finally { if (e_11) throw e_11.error; }
+                finally { if (e_12) throw e_12.error; }
             }
         }
     }
-    catch (e_10_1) { e_10 = { error: e_10_1 }; }
+    catch (e_11_1) { e_11 = { error: e_11_1 }; }
     finally {
         try {
             if (docs_3_1 && !docs_3_1.done && (_a = docs_3.return)) _a.call(docs_3);
         }
-        finally { if (e_10) throw e_10.error; }
+        finally { if (e_11) throw e_11.error; }
     }
     return Array.from(fieldMap.entries()).map(function (_a) {
         var _b = __read(_a, 2), field = _b[0], values = _b[1];
@@ -9358,8 +9750,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_12_1;
-        var e_12, _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_13_1;
+        var e_13, _a;
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
@@ -9383,8 +9775,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_13_1;
-                        var e_13, _c;
+                        var values, baseToken, mappingMatches, candidateCollections, filteredCandidates, _loop_5, filteredCandidates_1, filteredCandidates_1_1, candidate, state_3, e_14_1;
+                        var e_14, _c;
                         return __generator(this, function (_d) {
                             switch (_d.label) {
                                 case 0:
@@ -9558,7 +9950,7 @@ function applyIdLookupDisplayEnrichment(params) {
                                     _d.label = 1;
                                 case 1:
                                     _d.trys.push([1, 6, 7, 8]);
-                                    filteredCandidates_1 = (e_13 = void 0, __values(filteredCandidates)), filteredCandidates_1_1 = filteredCandidates_1.next();
+                                    filteredCandidates_1 = (e_14 = void 0, __values(filteredCandidates)), filteredCandidates_1_1 = filteredCandidates_1.next();
                                     _d.label = 2;
                                 case 2:
                                     if (!!filteredCandidates_1_1.done) return [3 /*break*/, 5];
@@ -9574,14 +9966,14 @@ function applyIdLookupDisplayEnrichment(params) {
                                     return [3 /*break*/, 2];
                                 case 5: return [3 /*break*/, 8];
                                 case 6:
-                                    e_13_1 = _d.sent();
-                                    e_13 = { error: e_13_1 };
+                                    e_14_1 = _d.sent();
+                                    e_14 = { error: e_14_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_13) throw e_13.error; }
+                                    finally { if (e_14) throw e_14.error; }
                                     return [7 /*endfinally*/];
                                 case 8: return [2 /*return*/];
                             }
@@ -9604,14 +9996,14 @@ function applyIdLookupDisplayEnrichment(params) {
                     return [3 /*break*/, 3];
                 case 6: return [3 /*break*/, 9];
                 case 7:
-                    e_12_1 = _b.sent();
-                    e_12 = { error: e_12_1 };
+                    e_13_1 = _b.sent();
+                    e_13 = { error: e_13_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_12) throw e_12.error; }
+                    finally { if (e_13) throw e_13.error; }
                     return [7 /*endfinally*/];
                 case 9:
                     if (!lookupMeta.length) {
@@ -9630,7 +10022,7 @@ function applyIdLookupDisplayEnrichment(params) {
     });
 }
 function hasNonEmptyValue(docs, fieldPath, options) {
-    var e_14, _a;
+    var e_15, _a;
     if (!Array.isArray(docs) || !fieldPath) {
         return false;
     }
@@ -9647,12 +10039,12 @@ function hasNonEmptyValue(docs, fieldPath, options) {
             }
         }
     }
-    catch (e_14_1) { e_14 = { error: e_14_1 }; }
+    catch (e_15_1) { e_15 = { error: e_15_1 }; }
     finally {
         try {
             if (docs_4_1 && !docs_4_1.done && (_a = docs_4.return)) _a.call(docs_4);
         }
-        finally { if (e_14) throw e_14.error; }
+        finally { if (e_15) throw e_15.error; }
     }
     return false;
 }
@@ -12268,7 +12660,7 @@ function flattenAssistantExprClauses(expr) {
     return [expr];
 }
 function detectAssistantMonthWindowInExpr(expr, allowedDateFields) {
-    var e_15, _a;
+    var e_16, _a;
     var clauses = flattenAssistantExprClauses(expr);
     if (!clauses.length) {
         return null;
@@ -12342,12 +12734,12 @@ function detectAssistantMonthWindowInExpr(expr, allowedDateFields) {
                 return state_4.value;
         }
     }
-    catch (e_15_1) { e_15 = { error: e_15_1 }; }
+    catch (e_16_1) { e_16 = { error: e_16_1 }; }
     finally {
         try {
             if (lowerClauses_1_1 && !lowerClauses_1_1.done && (_a = lowerClauses_1.return)) _a.call(lowerClauses_1);
         }
-        finally { if (e_15) throw e_15.error; }
+        finally { if (e_16) throw e_16.error; }
     }
     return null;
 }
@@ -12410,7 +12802,7 @@ function resolveAssistantMonthlyGroupDateFields(pipeline) {
     return fields;
 }
 function detectAssistantMonthWindowFromPipeline(pipeline) {
-    var e_16, _a;
+    var e_17, _a;
     var _b;
     var monthlyFields = resolveAssistantMonthlyGroupDateFields(pipeline);
     var scanMatch = function (match) {
@@ -12438,12 +12830,12 @@ function detectAssistantMonthWindowFromPipeline(pipeline) {
             }
         }
     }
-    catch (e_16_1) { e_16 = { error: e_16_1 }; }
+    catch (e_17_1) { e_17 = { error: e_17_1 }; }
     finally {
         try {
             if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
         }
-        finally { if (e_16) throw e_16.error; }
+        finally { if (e_17) throw e_17.error; }
     }
     return null;
 }
@@ -12723,7 +13115,7 @@ function normalizeAssistantCustomerLookupProjectionPipeline(pipeline) {
         var nextProject = __assign({}, project);
         var stageChanged = false;
         Object.keys(nextProject).forEach(function (field) {
-            var e_17, _a;
+            var e_18, _a;
             var expression = nextProject[field];
             if (typeof expression !== 'string') {
                 return;
@@ -12759,12 +13151,12 @@ function normalizeAssistantCustomerLookupProjectionPipeline(pipeline) {
                     break;
                 }
             }
-            catch (e_17_1) { e_17 = { error: e_17_1 }; }
+            catch (e_18_1) { e_18 = { error: e_18_1 }; }
             finally {
                 try {
                     if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
                 }
-                finally { if (e_17) throw e_17.error; }
+                finally { if (e_18) throw e_18.error; }
             }
         });
         if (stageChanged) {
@@ -12937,7 +13329,7 @@ function matchContainsField(value, field) {
     });
 }
 function resolveAggregateCompletionFallback(pipeline) {
-    var e_18, _a;
+    var e_19, _a;
     if (!Array.isArray(pipeline)) {
         return null;
     }
@@ -12950,7 +13342,7 @@ function resolveAggregateCompletionFallback(pipeline) {
         }
         var addFields = stage.$addFields;
         try {
-            for (var _b = (e_18 = void 0, __values(Object.keys(addFields))), _c = _b.next(); !_c.done; _c = _b.next()) {
+            for (var _b = (e_19 = void 0, __values(Object.keys(addFields))), _c = _b.next(); !_c.done; _c = _b.next()) {
                 var key = _c.value;
                 if (!isCompletionFieldName(key)) {
                     continue;
@@ -12964,12 +13356,12 @@ function resolveAggregateCompletionFallback(pipeline) {
                 }
             }
         }
-        catch (e_18_1) { e_18 = { error: e_18_1 }; }
+        catch (e_19_1) { e_19 = { error: e_19_1 }; }
         finally {
             try {
                 if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
             }
-            finally { if (e_18) throw e_18.error; }
+            finally { if (e_19) throw e_19.error; }
         }
         if (candidateField) {
             break;
@@ -13125,7 +13517,7 @@ function buildCompletionFallbackSources(field) {
     ]);
 }
 function resolveAggregateCompletionExprFallback(pipeline) {
-    var e_19, _a;
+    var e_20, _a;
     if (!Array.isArray(pipeline)) {
         return null;
     }
@@ -13145,7 +13537,7 @@ function resolveAggregateCompletionExprFallback(pipeline) {
         }
         if (!candidateField) {
             try {
-                for (var _b = (e_19 = void 0, __values(Object.keys(matchStage))), _c = _b.next(); !_c.done; _c = _b.next()) {
+                for (var _b = (e_20 = void 0, __values(Object.keys(matchStage))), _c = _b.next(); !_c.done; _c = _b.next()) {
                     var key = _c.value;
                     if (key.startsWith('$')) {
                         continue;
@@ -13160,12 +13552,12 @@ function resolveAggregateCompletionExprFallback(pipeline) {
                     }
                 }
             }
-            catch (e_19_1) { e_19 = { error: e_19_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_19) throw e_19.error; }
+                finally { if (e_20) throw e_20.error; }
             }
         }
         if (!candidateField) {
@@ -13367,7 +13759,7 @@ function hasAssistantDateGroupingOperator(value) {
     return Object.keys(value).some(function (key) { return hasAssistantDateGroupingOperator(value[key]); });
 }
 function isGroupFieldDerivedFromDateExpression(pipeline, groupIndex, groupPaths) {
-    var e_20, _a, e_21, _b;
+    var e_21, _a, e_22, _b;
     if (!Array.isArray(pipeline) || groupIndex <= 0 || !groupPaths.length) {
         return false;
     }
@@ -13393,14 +13785,14 @@ function isGroupFieldDerivedFromDateExpression(pipeline, groupIndex, groupPaths)
             continue;
         }
         try {
-            for (var stageKeys_1 = (e_20 = 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_21 = 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_21 = 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_22 = 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;
@@ -13410,21 +13802,21 @@ function isGroupFieldDerivedFromDateExpression(pipeline, groupIndex, groupPaths)
                         }
                     }
                 }
-                catch (e_21_1) { e_21 = { error: e_21_1 }; }
+                catch (e_22_1) { e_22 = { error: e_22_1 }; }
                 finally {
                     try {
                         if (groupFields_1_1 && !groupFields_1_1.done && (_b = groupFields_1.return)) _b.call(groupFields_1);
                     }
-                    finally { if (e_21) throw e_21.error; }
+                    finally { if (e_22) throw e_22.error; }
                 }
             }
         }
-        catch (e_20_1) { e_20 = { error: e_20_1 }; }
+        catch (e_21_1) { e_21 = { error: e_21_1 }; }
         finally {
             try {
                 if (stageKeys_1_1 && !stageKeys_1_1.done && (_a = stageKeys_1.return)) _a.call(stageKeys_1);
             }
-            finally { if (e_20) throw e_20.error; }
+            finally { if (e_21) throw e_21.error; }
         }
     }
     return false;
@@ -13531,7 +13923,7 @@ function isRegexMatchCondition(value) {
     return false;
 }
 function findRegexMatchInMatchObject(match, prefix) {
-    var e_22, _a, e_23, _b;
+    var e_23, _a, e_24, _b;
     if (prefix === void 0) { prefix = ''; }
     if (Array.isArray(match)) {
         try {
@@ -13543,12 +13935,12 @@ function findRegexMatchInMatchObject(match, prefix) {
                 }
             }
         }
-        catch (e_22_1) { e_22 = { error: e_22_1 }; }
+        catch (e_23_1) { e_23 = { error: e_23_1 }; }
         finally {
             try {
                 if (match_1_1 && !match_1_1.done && (_a = match_1.return)) _a.call(match_1);
             }
-            finally { if (e_22) throw e_22.error; }
+            finally { if (e_23) throw e_23.error; }
         }
         return null;
     }
@@ -13579,12 +13971,12 @@ function findRegexMatchInMatchObject(match, prefix) {
             }
         }
     }
-    catch (e_23_1) { e_23 = { error: e_23_1 }; }
+    catch (e_24_1) { e_24 = { error: e_24_1 }; }
     finally {
         try {
             if (keys_2_1 && !keys_2_1.done && (_b = keys_2.return)) _b.call(keys_2);
         }
-        finally { if (e_23) throw e_23.error; }
+        finally { if (e_24) throw e_24.error; }
     }
     return null;
 }
@@ -13973,7 +14365,7 @@ function collectMatchFieldsByCondition(match, predicate, prefix) {
     return results;
 }
 function findMatchConditionForField(match, targetField, prefix) {
-    var e_24, _a, e_25, _b;
+    var e_25, _a, e_26, _b;
     if (prefix === void 0) { prefix = ''; }
     if (!match || typeof match !== 'object') {
         return undefined;
@@ -13988,12 +14380,12 @@ function findMatchConditionForField(match, targetField, prefix) {
                 }
             }
         }
-        catch (e_24_1) { e_24 = { error: e_24_1 }; }
+        catch (e_25_1) { e_25 = { error: e_25_1 }; }
         finally {
             try {
                 if (match_2_1 && !match_2_1.done && (_a = match_2.return)) _a.call(match_2);
             }
-            finally { if (e_24) throw e_24.error; }
+            finally { if (e_25) throw e_25.error; }
         }
         return undefined;
     }
@@ -14020,12 +14412,12 @@ function findMatchConditionForField(match, targetField, prefix) {
             }
         }
     }
-    catch (e_25_1) { e_25 = { error: e_25_1 }; }
+    catch (e_26_1) { e_26 = { error: e_26_1 }; }
     finally {
         try {
             if (_d && !_d.done && (_b = _c.return)) _b.call(_c);
         }
-        finally { if (e_25) throw e_25.error; }
+        finally { if (e_26) throw e_26.error; }
     }
     return undefined;
 }
@@ -14258,7 +14650,7 @@ function detectIdLikeValue(value) {
     return false;
 }
 function detectChemicalIdFromProbe(probeDocs, fields) {
-    var e_26, _a, e_27, _b;
+    var e_27, _a, e_28, _b;
     if (!Array.isArray(probeDocs) || !probeDocs.length) {
         return false;
     }
@@ -14270,7 +14662,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_27 = 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_28 = 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)) {
@@ -14283,21 +14675,21 @@ function detectChemicalIdFromProbe(probeDocs, fields) {
                     }
                 }
             }
-            catch (e_27_1) { e_27 = { error: e_27_1 }; }
+            catch (e_28_1) { e_28 = { error: e_28_1 }; }
             finally {
                 try {
                     if (targets_1_1 && !targets_1_1.done && (_b = targets_1.return)) _b.call(targets_1);
                 }
-                finally { if (e_27) throw e_27.error; }
+                finally { if (e_28) throw e_28.error; }
             }
         }
     }
-    catch (e_26_1) { e_26 = { error: e_26_1 }; }
+    catch (e_27_1) { e_27 = { error: e_27_1 }; }
     finally {
         try {
             if (probeDocs_1_1 && !probeDocs_1_1.done && (_a = probeDocs_1.return)) _a.call(probeDocs_1);
         }
-        finally { if (e_26) throw e_26.error; }
+        finally { if (e_27) throw e_27.error; }
     }
     return false;
 }
@@ -14518,8 +14910,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_28_1;
-        var e_28, _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_29_1;
+        var e_29, _a;
         var _b;
         return __generator(this, function (_c) {
             switch (_c.label) {
@@ -14632,14 +15024,14 @@ function applyChemicalNameLookupFallbackToQuery(params) {
                     return [3 /*break*/, 3];
                 case 6: return [3 /*break*/, 9];
                 case 7:
-                    e_28_1 = _c.sent();
-                    e_28 = { error: e_28_1 };
+                    e_29_1 = _c.sent();
+                    e_29 = { error: e_29_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_28) throw e_28.error; }
+                    finally { if (e_29) throw e_29.error; }
                     return [7 /*endfinally*/];
                 case 9: return [2 /*return*/, null];
             }
@@ -14739,8 +15131,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_29_1, e_30_1;
-        var e_30, _c, e_29, _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_30_1, e_31_1;
+        var e_31, _c, e_30, _d;
         var _e;
         return __generator(this, function (_f) {
             switch (_f.label) {
@@ -14810,7 +15202,7 @@ function applyIdLookupFallbackToQuery(params) {
                     _f.label = 5;
                 case 5:
                     _f.trys.push([5, 14, 15, 16]);
-                    candidates_2 = (e_29 = void 0, __values(candidates)), candidates_2_1 = candidates_2.next();
+                    candidates_2 = (e_30 = void 0, __values(candidates)), candidates_2_1 = candidates_2.next();
                     _f.label = 6;
                 case 6:
                     if (!!candidates_2_1.done) return [3 /*break*/, 13];
@@ -14877,28 +15269,28 @@ function applyIdLookupFallbackToQuery(params) {
                     return [3 /*break*/, 6];
                 case 13: return [3 /*break*/, 16];
                 case 14:
-                    e_29_1 = _f.sent();
-                    e_29 = { error: e_29_1 };
+                    e_30_1 = _f.sent();
+                    e_30 = { error: e_30_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_29) throw e_29.error; }
+                    finally { if (e_30) throw e_30.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_30_1 = _f.sent();
-                    e_30 = { error: e_30_1 };
+                    e_31_1 = _f.sent();
+                    e_31 = { error: e_31_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_30) throw e_30.error; }
+                    finally { if (e_31) throw e_31.error; }
                     return [7 /*endfinally*/];
                 case 20: return [2 /*return*/, null];
             }
@@ -15343,8 +15735,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_31_1;
-        var e_31, _b;
+        var candidates_3, candidates_3_1, candidate, normalized, _a, e_32_1;
+        var e_32, _b;
         return __generator(this, function (_c) {
             switch (_c.label) {
                 case 0:
@@ -15371,14 +15763,14 @@ function readFirstAssistantSurfaceFile(candidates) {
                     return [3 /*break*/, 1];
                 case 6: return [3 /*break*/, 9];
                 case 7:
-                    e_31_1 = _c.sent();
-                    e_31 = { error: e_31_1 };
+                    e_32_1 = _c.sent();
+                    e_32 = { error: e_32_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_31) throw e_31.error; }
+                    finally { if (e_32) throw e_32.error; }
                     return [7 /*endfinally*/];
                 case 9: return [2 /*return*/, ''];
             }
@@ -15911,6 +16303,23 @@ function cloneAssistantHeuristicProfile(profile) {
                 progress: mergeAssistantHintValues((entry === null || entry === void 0 ? void 0 : entry.progress) || []),
                 acknowledgement: normalizeOptionalString(entry === null || entry === void 0 ? void 0 : entry.acknowledgement) || undefined,
                 assumptions: mergeAssistantHintValues((entry === null || entry === void 0 ? void 0 : entry.assumptions) || []),
+                dimensions: Array.isArray(entry === null || entry === void 0 ? void 0 : entry.dimensions)
+                    ? entry.dimensions.map(function (dimension) { return ({
+                        id: normalizeOptionalString(dimension === null || dimension === void 0 ? void 0 : dimension.id),
+                        type: normalizeAssistantAppDataDimensionType(dimension === null || dimension === void 0 ? void 0 : dimension.type),
+                        granularity: normalizeOptionalString(dimension === null || dimension === void 0 ? void 0 : dimension.granularity) || undefined,
+                        requestedText: normalizeOptionalString(dimension === null || dimension === void 0 ? void 0 : dimension.requestedText) || undefined,
+                        terms: mergeAssistantHintValues((dimension === null || dimension === void 0 ? void 0 : dimension.terms) || []).map(function (term) { return term.toLowerCase(); }),
+                        groupId: (0, common_1.deepCopy)(dimension === null || dimension === void 0 ? void 0 : dimension.groupId),
+                        project: (dimension === null || dimension === void 0 ? void 0 : dimension.project) && typeof dimension.project === 'object' && !Array.isArray(dimension.project)
+                            ? (0, common_1.deepCopy)(dimension.project)
+                            : undefined,
+                        sort: (dimension === null || dimension === void 0 ? void 0 : dimension.sort) && typeof dimension.sort === 'object' && !Array.isArray(dimension.sort)
+                            ? (0, common_1.deepCopy)(dimension.sort)
+                            : undefined,
+                        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; })
+                    : [],
                 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)
@@ -16004,6 +16413,13 @@ function normalizeAssistantDisplayDateFormat(value) {
     }
     return undefined;
 }
+function normalizeAssistantAppDataDimensionType(value) {
+    var normalized = normalizeOptionalString(value).toLowerCase();
+    if (normalized === 'time' || normalized === 'entity') {
+        return normalized;
+    }
+    return undefined;
+}
 function normalizeAssistantHeuristicStringList(value) {
     if (Array.isArray(value)) {
         return mergeAssistantHintValues(value.map(function (entry) { return normalizeOptionalString(entry).toLowerCase(); }));
@@ -16062,6 +16478,55 @@ function normalizeAssistantCollectionTermHints(value) {
     });
     return hints;
 }
+function normalizeAssistantAppDataDimensions(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 dimensions = [];
+    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.dimension_id
+            || entry.dimensionId
+            || key);
+        var groupId = entry.group_id !== undefined
+            ? entry.group_id
+            : entry.groupId !== undefined
+                ? entry.groupId
+                : entry.group;
+        if (!id || groupId === undefined) {
+            return;
+        }
+        var terms = normalizeAssistantHeuristicStringList(entry.terms
+            || entry.aliases
+            || entry.phrases
+            || [id]).map(function (term) { return term.toLowerCase(); });
+        dimensions.push({
+            id: id,
+            type: normalizeAssistantAppDataDimensionType(entry.type),
+            granularity: normalizeOptionalString(entry.granularity) || undefined,
+            terms: terms.length ? terms : [id.toLowerCase()],
+            groupId: (0, common_1.deepCopy)(groupId),
+            project: entry.project && typeof entry.project === 'object' && !Array.isArray(entry.project)
+                ? (0, common_1.deepCopy)(entry.project)
+                : undefined,
+            sort: entry.sort && typeof entry.sort === 'object' && !Array.isArray(entry.sort)
+                ? (0, common_1.deepCopy)(entry.sort)
+                : undefined,
+            preGroupStages: Array.isArray(entry.pre_group_stages)
+                ? (0, common_1.deepCopy)(entry.pre_group_stages)
+                : Array.isArray(entry.preGroupStages)
+                    ? (0, common_1.deepCopy)(entry.preGroupStages)
+                    : undefined
+        });
+    });
+    return dimensions;
+}
 function normalizeAssistantAppDataIntents(value) {
     var entries = Array.isArray(value) ? value : [];
     var intents = [];
@@ -16092,6 +16557,10 @@ function normalizeAssistantAppDataIntents(value) {
                 || entry.acknowledgement_template
                 || entry.acknowledgementTemplate) || undefined,
             assumptions: mergeAssistantHintValues(Array.isArray(entry.assumptions) ? entry.assumptions : []),
+            dimensions: normalizeAssistantAppDataDimensions(entry.dimensions
+                || entry.breakdown_dimensions
+                || entry.breakdownDimensions
+                || []),
             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)
@@ -16822,7 +17291,7 @@ function doesAssistantPreserveAnyTermMatch(text, terms) {
     return (Array.isArray(terms) ? terms : []).some(function (term) { return doesAssistantPreserveTermMatch(text, term); });
 }
 function shouldPreserveAssistantCollectionForRouteFromRules(params) {
-    var e_32, _a;
+    var e_33, _a;
     var _b, _c, _d, _e, _f, _g, _h;
     var routePreferred = normalizeAssistantCollectionOverrideName(params.routePreferredName);
     var requested = normalizeAssistantCollectionOverrideName(params.requestedCollection);
@@ -16854,12 +17323,12 @@ function shouldPreserveAssistantCollectionForRouteFromRules(params) {
             return true;
         }
     }
-    catch (e_32_1) { e_32 = { error: e_32_1 }; }
+    catch (e_33_1) { e_33 = { error: e_33_1 }; }
     finally {
         try {
             if (_k && !_k.done && (_a = _j.return)) _a.call(_j);
         }
-        finally { if (e_32) throw e_32.error; }
+        finally { if (e_33) throw e_33.error; }
     }
     return false;
 }
@@ -17750,7 +18219,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_33, _a, e_34, _b;
+        var e_34, _a, e_35, _b;
         return __generator(this, function (_c) {
             switch (_c.label) {
                 case 0:
@@ -17780,7 +18249,7 @@ function resolveAssistantNestedAggregateFallbacks(params) {
                                 triedCollections: params.triedCollections
                             });
                             try {
-                                for (candidates_4 = (e_34 = void 0, __values(candidates)), candidates_4_1 = candidates_4.next(); !candidates_4_1.done; candidates_4_1 = candidates_4.next()) {
+                                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()) {
                                     candidate = candidates_4_1.value;
                                     normalizedPipeline = normalizeAssistantAggregatePipeline(rewrite.pipeline, candidate);
                                     if (!normalizedPipeline.length || containsForbiddenMongoOperators(normalizedPipeline)) {
@@ -17802,21 +18271,21 @@ function resolveAssistantNestedAggregateFallbacks(params) {
                                     }
                                 }
                             }
-                            catch (e_34_1) { e_34 = { error: e_34_1 }; }
+                            catch (e_35_1) { e_35 = { error: e_35_1 }; }
                             finally {
                                 try {
                                     if (candidates_4_1 && !candidates_4_1.done && (_b = candidates_4.return)) _b.call(candidates_4);
                                 }
-                                finally { if (e_34) throw e_34.error; }
+                                finally { if (e_35) throw e_35.error; }
                             }
                         }
                     }
-                    catch (e_33_1) { e_33 = { error: e_33_1 }; }
+                    catch (e_34_1) { e_34 = { error: e_34_1 }; }
                     finally {
                         try {
                             if (prefixes_1_1 && !prefixes_1_1.done && (_a = prefixes_1.return)) _a.call(prefixes_1);
                         }
-                        finally { if (e_33) throw e_33.error; }
+                        finally { if (e_34) throw e_34.error; }
                     }
                     return [2 /*return*/, fallbacks];
             }
@@ -17948,8 +18417,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_35_1, candidates_7, candidates_7_1, candidate, e_36_1, candidates_8, candidates_8_1, candidate;
-        var e_37, _b, e_38, _c, e_35, _d, e_36, _e, e_39, _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_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 _g, _h;
         if (dbName === void 0) { dbName = ''; }
         return __generator(this, function (_j) {
@@ -18023,12 +18492,12 @@ function resolveAssistantReportBuilderBridgeCollection(collection_1, db_1) {
                                 }
                             }
                         }
-                        catch (e_37_1) { e_37 = { error: e_37_1 }; }
+                        catch (e_38_1) { e_38 = { error: e_38_1 }; }
                         finally {
                             try {
                                 if (candidates_5_1 && !candidates_5_1.done && (_b = candidates_5.return)) _b.call(candidates_5);
                             }
-                            finally { if (e_37) throw e_37.error; }
+                            finally { if (e_38) throw e_38.error; }
                         }
                     }
                     if (configuredCollectionNames.length) {
@@ -18043,12 +18512,12 @@ function resolveAssistantReportBuilderBridgeCollection(collection_1, db_1) {
                                 }
                             }
                         }
-                        catch (e_38_1) { e_38 = { error: e_38_1 }; }
+                        catch (e_39_1) { e_39 = { error: e_39_1 }; }
                         finally {
                             try {
                                 if (candidates_6_1 && !candidates_6_1.done && (_c = candidates_6.return)) _c.call(candidates_6);
                             }
-                            finally { if (e_38) throw e_38.error; }
+                            finally { if (e_39) throw e_39.error; }
                         }
                     }
                     primaryCollectionHint = normalizeOptionalString((_h = requestHints === null || requestHints === void 0 ? void 0 : requestHints.collectionHints) === null || _h === void 0 ? void 0 : _h[0]);
@@ -18109,14 +18578,14 @@ function resolveAssistantReportBuilderBridgeCollection(collection_1, db_1) {
                     return [3 /*break*/, 2];
                 case 7: return [3 /*break*/, 10];
                 case 8:
-                    e_35_1 = _j.sent();
-                    e_35 = { error: e_35_1 };
+                    e_36_1 = _j.sent();
+                    e_36 = { error: e_36_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_35) throw e_35.error; }
+                    finally { if (e_36) throw e_36.error; }
                     return [7 /*endfinally*/];
                 case 10:
                     if (!db) return [3 /*break*/, 18];
@@ -18142,14 +18611,14 @@ function resolveAssistantReportBuilderBridgeCollection(collection_1, db_1) {
                     return [3 /*break*/, 12];
                 case 15: return [3 /*break*/, 18];
                 case 16:
-                    e_36_1 = _j.sent();
-                    e_36 = { error: e_36_1 };
+                    e_37_1 = _j.sent();
+                    e_37 = { error: e_37_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_36) throw e_36.error; }
+                    finally { if (e_37) throw e_37.error; }
                     return [7 /*endfinally*/];
                 case 18:
                     try {
@@ -18160,12 +18629,12 @@ function resolveAssistantReportBuilderBridgeCollection(collection_1, db_1) {
                             }
                         }
                     }
-                    catch (e_39_1) { e_39 = { error: e_39_1 }; }
+                    catch (e_40_1) { e_40 = { error: e_40_1 }; }
                     finally {
                         try {
                             if (candidates_8_1 && !candidates_8_1.done && (_f = candidates_8.return)) _f.call(candidates_8);
                         }
-                        finally { if (e_39) throw e_39.error; }
+                        finally { if (e_40) throw e_40.error; }
                     }
                     throw new Error('AI assistant report builder bridge: No queryable collection could be resolved.');
             }
@@ -18173,7 +18642,7 @@ function resolveAssistantReportBuilderBridgeCollection(collection_1, db_1) {
     });
 }
 function findQueryDateField(query) {
-    var e_40, _a, e_41, _b;
+    var e_41, _a, e_42, _b;
     if (!query || typeof query !== 'object') {
         return null;
     }
@@ -18187,12 +18656,12 @@ function findQueryDateField(query) {
                 }
             }
         }
-        catch (e_40_1) { e_40 = { error: e_40_1 }; }
+        catch (e_41_1) { e_41 = { error: e_41_1 }; }
         finally {
             try {
                 if (query_1_1 && !query_1_1.done && (_a = query_1.return)) _a.call(query_1);
             }
-            finally { if (e_40) throw e_40.error; }
+            finally { if (e_41) throw e_41.error; }
         }
         return null;
     }
@@ -18211,12 +18680,12 @@ function findQueryDateField(query) {
             }
         }
     }
-    catch (e_41_1) { e_41 = { error: e_41_1 }; }
+    catch (e_42_1) { e_42 = { error: e_42_1 }; }
     finally {
         try {
             if (_d && !_d.done && (_b = _c.return)) _b.call(_c);
         }
-        finally { if (e_41) throw e_41.error; }
+        finally { if (e_42) throw e_42.error; }
     }
     return null;
 }
@@ -18504,7 +18973,7 @@ function resolveQueryDateFieldFallback(query) {
     return { from: dateField, to: fallback };
 }
 function containsForbiddenMongoOperators(value) {
-    var e_42, _a;
+    var e_43, _a;
     if (!value || typeof value !== 'object') {
         return false;
     }
@@ -18523,12 +18992,12 @@ function containsForbiddenMongoOperators(value) {
             }
         }
     }
-    catch (e_42_1) { e_42 = { error: e_42_1 }; }
+    catch (e_43_1) { e_43 = { error: e_43_1 }; }
     finally {
         try {
             if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
         }
-        finally { if (e_42) throw e_42.error; }
+        finally { if (e_43) throw e_43.error; }
     }
     return false;
 }
@@ -18713,7 +19182,7 @@ function splitAssistantPermissionTokenSets(value) {
     };
 }
 function isAssistantTokenSetSubset(subset, superset) {
-    var e_43, _a;
+    var e_44, _a;
     if (!subset.size) {
         return false;
     }
@@ -18725,12 +19194,12 @@ function isAssistantTokenSetSubset(subset, superset) {
             }
         }
     }
-    catch (e_43_1) { e_43 = { error: e_43_1 }; }
+    catch (e_44_1) { e_44 = { error: e_44_1 }; }
     finally {
         try {
             if (subset_1_1 && !subset_1_1.done && (_a = subset_1.return)) _a.call(subset_1);
         }
-        finally { if (e_43) throw e_43.error; }
+        finally { if (e_44) throw e_44.error; }
     }
     return true;
 }
@@ -19265,8 +19734,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_44_1;
-        var _e, e_44, _f, _g;
+        var _a, _b, _c, _d, message, payload, status_1, e_45_1;
+        var _e, e_45, _f, _g;
         return __generator(this, function (_h) {
             switch (_h.label) {
                 case 0:
@@ -19293,8 +19762,8 @@ function waitForCodexWorkerMessage(worker, streamStatusHandler) {
                     return [3 /*break*/, 1];
                 case 4: return [3 /*break*/, 11];
                 case 5:
-                    e_44_1 = _h.sent();
-                    e_44 = { error: e_44_1 };
+                    e_45_1 = _h.sent();
+                    e_45 = { error: e_45_1 };
                     return [3 /*break*/, 11];
                 case 6:
                     _h.trys.push([6, , 9, 10]);
@@ -19305,7 +19774,7 @@ function waitForCodexWorkerMessage(worker, streamStatusHandler) {
                     _h.label = 8;
                 case 8: return [3 /*break*/, 10];
                 case 9:
-                    if (e_44) throw e_44.error;
+                    if (e_45) throw e_45.error;
                     return [7 /*endfinally*/];
                 case 10: return [7 /*endfinally*/];
                 case 11: throw new CodexWorkerBootstrapError('AI worker exited before completing.');
@@ -19649,8 +20118,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_45_1;
-        var e_45, _b;
+        var candidates, firstExisting, firstNestedGitRoot, candidates_9, candidates_9_1, candidate, _a, gitRoot, nestedGitRoots, e_46_1;
+        var e_46, _b;
         return __generator(this, function (_c) {
             switch (_c.label) {
                 case 0:
@@ -19697,14 +20166,14 @@ function resolveAssistantWorkspaceRoot() {
                     return [3 /*break*/, 2];
                 case 8: return [3 /*break*/, 11];
                 case 9:
-                    e_45_1 = _c.sent();
-                    e_45 = { error: e_45_1 };
+                    e_46_1 = _c.sent();
+                    e_46 = { error: e_46_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_45) throw e_45.error; }
+                    finally { if (e_46) throw e_46.error; }
                     return [7 /*endfinally*/];
                 case 11:
                     if (firstNestedGitRoot) {
@@ -20112,7 +20581,7 @@ var AI_ASSISTANT_BREAKDOWN_DIMENSION_STOPWORDS = new Set([
     'by'
 ]);
 function normalizeAssistantBreakdownDimension(value) {
-    var e_46, _a;
+    var e_47, _a;
     var normalized = normalizeOptionalString(value)
         .toLowerCase()
         .replace(/[^a-z0-9_\s-]+/g, ' ')
@@ -20144,12 +20613,12 @@ function normalizeAssistantBreakdownDimension(value) {
             }
         }
     }
-    catch (e_46_1) { e_46 = { error: e_46_1 }; }
+    catch (e_47_1) { e_47 = { error: e_47_1 }; }
     finally {
         try {
             if (tokens_1_1 && !tokens_1_1.done && (_a = tokens_1.return)) _a.call(tokens_1);
         }
-        finally { if (e_46) throw e_46.error; }
+        finally { if (e_47) throw e_47.error; }
     }
     if (!kept.length) {
         return '';
@@ -20172,10 +20641,10 @@ function extractAssistantRequestedBreakdownDimensions(message) {
         results.push(normalized);
     };
     var patterns = [
-        /\bgroup(?:ed)?\s+by\s+([a-z0-9_-]+(?:\s+[a-z0-9_-]+){0,2})(?=\s+(?:by|per|for|of|in|with|and|or)\b|[,.!?;]|$)/gi,
-        /\bbreak(?:\s+up|\s*down)?\b[\s\S]{0,80}?\bby\s+([a-z0-9_-]+(?:\s+[a-z0-9_-]+){0,2})(?=\s+(?:by|per|for|of|in|with|and|or)\b|[,.!?;]|$)/gi,
-        /\b(?:by|per)\s+(?:each\s+)?([a-z0-9_-]+(?:\s+[a-z0-9_-]+){0,2})(?=\s+(?:by|per|for|of|in|with|and|or)\b|[,.!?;]|$)/gi,
-        /\bfor\s+each\s+([a-z0-9_-]+(?:\s+[a-z0-9_-]+){0,2})(?=\s+(?:by|per|for|of|in|with|and|or)\b|[,.!?;]|$)/gi
+        /\bgroup(?:ed)?\s+by\s+([a-z0-9_-]+(?:\s+(?!(?:by|per|for|of|in|with|and|or)\b)[a-z0-9_-]+){0,2})(?=\s+(?:by|per|for|of|in|with|and|or)\b|[,.!?;]|$)/gi,
+        /\bbreak(?:\s+up|\s*down)?\b[\s\S]{0,80}?\bby\s+([a-z0-9_-]+(?:\s+(?!(?:by|per|for|of|in|with|and|or)\b)[a-z0-9_-]+){0,2})(?=\s+(?:by|per|for|of|in|with|and|or)\b|[,.!?;]|$)/gi,
+        /\b(?:by|per)\s+(?:each\s+)?([a-z0-9_-]+(?:\s+(?!(?:by|per|for|of|in|with|and|or)\b)[a-z0-9_-]+){0,2})(?=\s+(?:by|per|for|of|in|with|and|or)\b|[,.!?;]|$)/gi,
+        /\bfor\s+each\s+([a-z0-9_-]+(?:\s+(?!(?:by|per|for|of|in|with|and|or)\b)[a-z0-9_-]+){0,2})(?=\s+(?:by|per|for|of|in|with|and|or)\b|[,.!?;]|$)/gi
     ];
     patterns.forEach(function (pattern) {
         var match = pattern.exec(text);
@@ -20354,7 +20823,7 @@ function resolveAssistantPlannerEnabled(config) {
     return raw === undefined ? false : raw === true;
 }
 function resolveAssistantPlannerKnownRoutes(user, isSuperAdmin) {
-    var e_47, _a;
+    var e_48, _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)) || [];
@@ -20368,12 +20837,12 @@ function resolveAssistantPlannerKnownRoutes(user, isSuperAdmin) {
             }
         }
     }
-    catch (e_47_1) { e_47 = { error: e_47_1 }; }
+    catch (e_48_1) { e_48 = { error: e_48_1 }; }
     finally {
         try {
             if (routes_1_1 && !routes_1_1.done && (_a = routes_1.return)) _a.call(routes_1);
         }
-        finally { if (e_47) throw e_47.error; }
+        finally { if (e_48) throw e_48.error; }
     }
     var normalizedRoutes = Array.from(unique);
     var allowedRoutes = collectAssistantAllowedRoutesForUser(user, normalizedRoutes, isSuperAdmin);
@@ -20749,7 +21218,7 @@ function normalizeRouteMatchKey(value) {
     return normalizeRouteKey(value).toLowerCase();
 }
 function buildClientRouteIndex() {
-    var e_48, _a;
+    var e_49, _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();
@@ -20768,12 +21237,12 @@ function buildClientRouteIndex() {
             }
         }
     }
-    catch (e_48_1) { e_48 = { error: e_48_1 }; }
+    catch (e_49_1) { e_49 = { error: e_49_1 }; }
     finally {
         try {
             if (routes_2_1 && !routes_2_1.done && (_a = routes_2.return)) _a.call(routes_2);
         }
-        finally { if (e_48) throw e_48.error; }
+        finally { if (e_49) throw e_49.error; }
     }
     return { set: set, map: map, size: routes.length };
 }
@@ -21664,8 +22133,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_49_1, queue, queued, enqueue, next, entries, _c, entries_1, entries_1_1, entry, childName, candidate, gitPath, _d, e_50_1;
-        var e_49, _e, e_50, _f;
+        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 _g;
         return __generator(this, function (_h) {
             switch (_h.label) {
@@ -21710,14 +22179,14 @@ function resolveAssistantWorkspaceGitRoots(workspaceRoot) {
                     return [3 /*break*/, 3];
                 case 6: return [3 /*break*/, 9];
                 case 7:
-                    e_49_1 = _h.sent();
-                    e_49 = { error: e_49_1 };
+                    e_50_1 = _h.sent();
+                    e_50 = { error: e_50_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_49) throw e_49.error; }
+                    finally { if (e_50) throw e_50.error; }
                     return [7 /*endfinally*/];
                 case 9:
                     queue = [];
@@ -21757,7 +22226,7 @@ function resolveAssistantWorkspaceGitRoots(workspaceRoot) {
                     return [3 /*break*/, 14];
                 case 14:
                     _h.trys.push([14, 21, 22, 23]);
-                    entries_1 = (e_50 = void 0, __values(entries)), entries_1_1 = entries_1.next();
+                    entries_1 = (e_51 = void 0, __values(entries)), entries_1_1 = entries_1.next();
                     _h.label = 15;
                 case 15:
                     if (!!entries_1_1.done) return [3 /*break*/, 20];
@@ -21796,14 +22265,14 @@ function resolveAssistantWorkspaceGitRoots(workspaceRoot) {
                     return [3 /*break*/, 15];
                 case 20: return [3 /*break*/, 23];
                 case 21:
-                    e_50_1 = _h.sent();
-                    e_50 = { error: e_50_1 };
+                    e_51_1 = _h.sent();
+                    e_51 = { error: e_51_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_50) throw e_50.error; }
+                    finally { if (e_51) throw e_51.error; }
                     return [7 /*endfinally*/];
                 case 23: return [3 /*break*/, 10];
                 case 24: return [2 /*return*/, roots];
@@ -22143,8 +22612,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_51_1;
-        var e_51, _a;
+        var roots, repoUrls, mirroredRoots, repoUrls_1, repoUrls_1_1, repoUrl, mirrorRoot, e_52_1;
+        var e_52, _a;
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0: return [4 /*yield*/, resolveAssistantWorkspaceGitRoots(workspaceRoot)];
@@ -22178,14 +22647,14 @@ function resolveAssistantChangeHistoryGitRoots(workspaceRoot) {
                     return [3 /*break*/, 3];
                 case 6: return [3 /*break*/, 9];
                 case 7:
-                    e_51_1 = _b.sent();
-                    e_51 = { error: e_51_1 };
+                    e_52_1 = _b.sent();
+                    e_52 = { error: e_52_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_51) throw e_51.error; }
+                    finally { if (e_52) throw e_52.error; }
                     return [7 /*endfinally*/];
                 case 9: return [2 /*return*/, mirroredRoots];
             }
@@ -22194,8 +22663,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_52_1;
-        var e_52, _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_53_1;
+        var e_53, _f;
         return __generator(this, function (_g) {
             switch (_g.label) {
                 case 0:
@@ -22317,14 +22786,14 @@ function resolveAssistantChangeHistoryFastPathResponse(params) {
                     return [3 /*break*/, 7];
                 case 20: return [3 /*break*/, 23];
                 case 21:
-                    e_52_1 = _g.sent();
-                    e_52 = { error: e_52_1 };
+                    e_53_1 = _g.sent();
+                    e_53 = { error: e_53_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_52) throw e_52.error; }
+                    finally { if (e_53) throw e_53.error; }
                     return [7 /*endfinally*/];
                 case 23:
                     if (bestFallback) {
@@ -22505,7 +22974,7 @@ function sanitizeAssistantResponse(value) {
     return normalizeAssistantRoutes(normalizedCurrency);
 }
 function evaluateAssistantGuardrails(message) {
-    var e_53, _a;
+    var e_54, _a;
     var normalized = String(message || '').toLowerCase();
     var identityGuardrail = evaluateAssistantIdentityDisclosureGuardrail(normalized);
     if (identityGuardrail === null || identityGuardrail === void 0 ? void 0 : identityGuardrail.blocked) {
@@ -22539,8 +23008,8 @@ function evaluateAssistantGuardrails(message) {
         }
     ];
     try {
-        for (var patterns_2 = __values(patterns), patterns_2_1 = patterns_2.next(); !patterns_2_1.done; patterns_2_1 = patterns_2.next()) {
-            var entry = patterns_2_1.value;
+        for (var patterns_3 = __values(patterns), patterns_3_1 = patterns_3.next(); !patterns_3_1.done; patterns_3_1 = patterns_3.next()) {
+            var entry = patterns_3_1.value;
             if (entry.pattern.test(normalized)) {
                 return {
                     blocked: true,
@@ -22550,12 +23019,12 @@ function evaluateAssistantGuardrails(message) {
             }
         }
     }
-    catch (e_53_1) { e_53 = { error: e_53_1 }; }
+    catch (e_54_1) { e_54 = { error: e_54_1 }; }
     finally {
         try {
-            if (patterns_2_1 && !patterns_2_1.done && (_a = patterns_2.return)) _a.call(patterns_2);
+            if (patterns_3_1 && !patterns_3_1.done && (_a = patterns_3.return)) _a.call(patterns_3);
         }
-        finally { if (e_53) throw e_53.error; }
+        finally { if (e_54) throw e_54.error; }
     }
     return null;
 }
@@ -22660,7 +23129,7 @@ function tokenizeArithmeticExpression(expression) {
     return tokens;
 }
 function evaluateArithmeticExpression(expression) {
-    var e_54, _a, e_55, _b;
+    var e_55, _a, e_56, _b;
     var tokens = tokenizeArithmeticExpression(expression);
     if (!tokens || !tokens.length) {
         return null;
@@ -22717,12 +23186,12 @@ function evaluateArithmeticExpression(expression) {
             prevToken = token;
         }
     }
-    catch (e_54_1) { e_54 = { error: e_54_1 }; }
+    catch (e_55_1) { e_55 = { error: e_55_1 }; }
     finally {
         try {
             if (tokens_2_1 && !tokens_2_1.done && (_a = tokens_2.return)) _a.call(tokens_2);
         }
-        finally { if (e_54) throw e_54.error; }
+        finally { if (e_55) throw e_55.error; }
     }
     while (ops.length) {
         var op = ops.pop();
@@ -22762,12 +23231,12 @@ function evaluateArithmeticExpression(expression) {
             stack.push(Number(token));
         }
     }
-    catch (e_55_1) { e_55 = { error: e_55_1 }; }
+    catch (e_56_1) { e_56 = { error: e_56_1 }; }
     finally {
         try {
             if (output_1_1 && !output_1_1.done && (_b = output_1.return)) _b.call(output_1);
         }
-        finally { if (e_55) throw e_55.error; }
+        finally { if (e_56) throw e_56.error; }
     }
     if (stack.length !== 1 || Number.isNaN(stack[0])) {
         return null;
@@ -22951,8 +23420,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_56_1;
-        var e_56, _b;
+        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;
         return __generator(this, function (_c) {
             switch (_c.label) {
                 case 0:
@@ -23031,14 +23500,14 @@ function readAttachmentContents(attachments) {
                     return [3 /*break*/, 2];
                 case 10: return [3 /*break*/, 13];
                 case 11:
-                    e_56_1 = _c.sent();
-                    e_56 = { error: e_56_1 };
+                    e_57_1 = _c.sent();
+                    e_57 = { error: e_57_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_56) throw e_56.error; }
+                    finally { if (e_57) throw e_57.error; }
                     return [7 /*endfinally*/];
                 case 13: return [2 /*return*/, {
                         promptText: chunks.length ? "\n\nAttachments:\n".concat(chunks.join('\n\n')) : '',
@@ -23463,7 +23932,7 @@ function sanitizeAssistantMessageSetPayload(setPayload) {
     return next;
 }
 function sanitizeMongoSafeObject(value) {
-    var e_57, _a;
+    var e_58, _a;
     if (value === null || value === undefined) {
         return value;
     }
@@ -23487,17 +23956,17 @@ function sanitizeMongoSafeObject(value) {
             out[key] = sanitizeMongoSafeObject(rawValue);
         }
     }
-    catch (e_57_1) { e_57 = { error: e_57_1 }; }
+    catch (e_58_1) { e_58 = { error: e_58_1 }; }
     finally {
         try {
             if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
         }
-        finally { if (e_57) throw e_57.error; }
+        finally { if (e_58) throw e_58.error; }
     }
     return out;
 }
 function restoreMongoSafeObject(value) {
-    var e_58, _a;
+    var e_59, _a;
     if (value === null || value === undefined) {
         return value;
     }
@@ -23521,12 +23990,12 @@ function restoreMongoSafeObject(value) {
             out[key] = restoreMongoSafeObject(rawValue);
         }
     }
-    catch (e_58_1) { e_58 = { error: e_58_1 }; }
+    catch (e_59_1) { e_59 = { error: e_59_1 }; }
     finally {
         try {
             if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
         }
-        finally { if (e_58) throw e_58.error; }
+        finally { if (e_59) throw e_59.error; }
     }
     return out;
 }
@@ -23704,7 +24173,7 @@ function recordAssistantAnswerAIRun(input) {
     });
 }
 function evaluateGuardrails(message) {
-    var e_59, _a;
+    var e_60, _a;
     var normalized = String(message || '').toLowerCase();
     var identityGuardrail = evaluateAssistantIdentityDisclosureGuardrail(normalized);
     if (identityGuardrail === null || identityGuardrail === void 0 ? void 0 : identityGuardrail.blocked) {
@@ -23719,8 +24188,8 @@ function evaluateGuardrails(message) {
         { pattern: /\b(exploit|bypass|malware|phishing|ransomware|ddos)\b/i, reason: 'Security abuse is restricted.' }
     ];
     try {
-        for (var patterns_3 = __values(patterns), patterns_3_1 = patterns_3.next(); !patterns_3_1.done; patterns_3_1 = patterns_3.next()) {
-            var entry = patterns_3_1.value;
+        for (var patterns_4 = __values(patterns), patterns_4_1 = patterns_4.next(); !patterns_4_1.done; patterns_4_1 = patterns_4.next()) {
+            var entry = patterns_4_1.value;
             if (entry.pattern.test(normalized)) {
                 return {
                     blocked: true,
@@ -23730,12 +24199,12 @@ function evaluateGuardrails(message) {
             }
         }
     }
-    catch (e_59_1) { e_59 = { error: e_59_1 }; }
+    catch (e_60_1) { e_60 = { error: e_60_1 }; }
     finally {
         try {
-            if (patterns_3_1 && !patterns_3_1.done && (_a = patterns_3.return)) _a.call(patterns_3);
+            if (patterns_4_1 && !patterns_4_1.done && (_a = patterns_4.return)) _a.call(patterns_4);
         }
-        finally { if (e_59) throw e_59.error; }
+        finally { if (e_60) throw e_60.error; }
     }
     return null;
 }