@resolveio/server-lib 22.0.20 → 22.0.22

package/methods/ai-terminal.js

@@ -200,17 +200,33 @@ var AI_ASSISTANT_DATE_FALLBACKS = {
     date_created: 'createdAt',
     createdAt: 'date_created',
     date_invoice: 'date_invoiced',
-    date_invoiced: 'date_invoice'
+    date_invoiced: 'date_invoice',
+    date_last: 'date_next',
+    date_next: 'date_last',
+    date_treated: 'date_scheduled',
+    date_scheduled: 'date_treated'
 };
 var AI_ASSISTANT_DATE_EXPANSION_FIELDS = [
     'date',
     'date_start',
     'date_end',
     'date_original',
+    'date_next',
+    'date_last',
+    'date_scheduled',
+    'date_treated',
+    'date_completed',
+    'date_closed',
+    'date_due',
+    'date_paid',
+    'date_invoice',
+    'date_invoiced',
+    'date_updated',
     'date_created',
     'createdAt',
     'updatedAt'
 ];
+var AI_ASSISTANT_DATE_EXPANSION_SCHEMA_MAX_FIELDS = 12;
 var AI_ASSISTANT_BLOCKED_COLLECTIONS = new Set([
     'user-groups',
     'logged-in-users',
@@ -498,6 +514,7 @@ var AI_ASSISTANT_SYSTEM_PROMPT = [
     '- For invoice data, set permissionView to an invoice-capable route (ex: /invoice/list).',
     '- Do not use /report/* routes as permissionView for data directives; use a module route that matches the collection.',
     '- For revenue/sales/billing questions, use invoices and sum paid_total (fallback to grand_total) with date_paid and Paid/Closed status when available.',
+    '- For blend ticket summaries, use product = blend_name (fallback chemical), total volume = chemical_recipe_quantity, and unit = lb when blend_in_pounds is true otherwise gal.',
     '- For revenue answers, always state the metric/date basis used (paid_total/date_paid vs grand_total/date_invoice). If tool verification warns about ambiguity or partial months, call that out before totals.',
     '- For time-based "last/past N" breakdowns, use full completed calendar-period windows in UTC aligned to the requested grain (day/week/month/quarter/year) by default, and present concrete start/end dates.',
     '- For relative date ranges (last/past/recent), include an upper bound <= $$NOW unless the user specifies a future end date.',
@@ -1462,10 +1479,10 @@ function executeAiAssistantCodexRun(payload, context) {
                     insertResult = _d.sent();
                     assistantMessageId = (insertResult === null || insertResult === void 0 ? void 0 : insertResult._id) || (insertResult === null || insertResult === void 0 ? void 0 : insertResult.insertedId);
                     enqueueAssistantCodexRun(function () { return __awaiter(_this, void 0, void 0, function () {
-                        var runStart, steps, recordStep, progressTracker, streamProgress, assistantContent, toolResult, assistantDebug, directiveSource, requestClassification, dataQuestion, lastDirective, toolResponseDebug, toolError, termHints, collectionHints, fieldHints, collectionTokenization, collectionRanking, collectionSelection, collectionOverride, collectionNames, plannerEnabled, plannerOutput, plannerRaw, timingBreakdown, codexUsage, accumulateCodexUsage, contextRoute, contextMode, hintSeed, termExpansion, hintText, baseTokens, expandedTokens, baseWeights, expandedWeights, dbName, db, _a, routeHints, rankedCollections, hintCollections, assistantContext, prompt_1, workspaceRoot, codexConfig, runOptions, plannerPrompt, plannerStart, _b, responseText, directiveText, directive, directivePrompt, directiveStart, forcedDirective, _c, initialStart, directivePrompt, forcedStart, forcedDirective, _d, requestedCollection, cleanedResponseText, effectiveDirective, toolRequest, toolStart, toolResponse, _e, toolPayload, followupPrompt, followupStart, followupText, _f, error_2, error_3, finishedAt, finalNow, finishedAt, codexMs, draftingMs, finalMetadata, finalUsage, usageClientId, usageError_1, finalAssistantDoc, setPayload;
-                        var _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
-                        return __generator(this, function (_v) {
-                            switch (_v.label) {
+                        var runStart, steps, recordStep, progressTracker, streamProgress, assistantContent, toolResult, assistantDebug, directiveSource, requestClassification, dataQuestion, lastDirective, requestedTimeGrain, enforceDatedDirective, datedDirectiveRetryUsed, datedDirectiveResolved, toolResponseDebug, toolError, termHints, collectionHints, fieldHints, collectionTokenization, collectionRanking, collectionSelection, collectionOverride, collectionNames, plannerEnabled, plannerOutput, plannerRaw, timingBreakdown, codexUsage, accumulateCodexUsage, contextRoute, contextMode, hintSeed, termExpansion, hintText, baseTokens, expandedTokens, baseWeights, expandedWeights, dbName, db, _a, routeHints, rankedCollections, hintCollections, assistantContext, prompt_1, workspaceRoot, codexConfig, runOptions, plannerPrompt, plannerStart, _b, directiveStyleHint, directivePromptMode, responseText, directiveText, directive, directivePrompt, directiveStart, forcedDirective, _c, initialStart, directivePrompt, forcedStart, forcedDirective, _d, strictDirectivePrompt, strictStart, strictDirectiveText, strictDirective, strictDirectiveIsDated, shouldUseStrictDirective, _e, guardDirectivePrompt, guardStart, guardDirectiveText, guardDirective, _f, requestedCollection, cleanedResponseText, effectiveDirective, toolRequest, toolStart, toolResponse, _g, toolPayload, followupPrompt, followupStart, followupText, _h, error_2, error_3, finishedAt, finalNow, finishedAt, codexMs, draftingMs, finalMetadata, finalUsage, usageClientId, usageError_1, finalAssistantDoc, setPayload;
+                        var _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2;
+                        return __generator(this, function (_3) {
+                            switch (_3.label) {
                                 case 0:
                                     runStart = Date.now();
                                     if (aiWorkerDebug) {
@@ -1497,6 +1514,10 @@ function executeAiAssistantCodexRun(payload, context) {
                                     requestClassification = classifyAssistantRequestType(message);
                                     dataQuestion = requestClassification.dataQuestion;
                                     lastDirective = null;
+                                    requestedTimeGrain = null;
+                                    enforceDatedDirective = false;
+                                    datedDirectiveRetryUsed = false;
+                                    datedDirectiveResolved = false;
                                     toolResponseDebug = null;
                                     toolError = null;
                                     termHints = [];
@@ -1533,17 +1554,17 @@ function executeAiAssistantCodexRun(payload, context) {
                                         codexUsage.output_tokens += outputTokens;
                                         codexUsage.total_tokens += inputTokens + outputTokens;
                                     };
-                                    contextRoute = normalizeOptionalString((_g = input === null || input === void 0 ? void 0 : input.context) === null || _g === void 0 ? void 0 : _g.route);
-                                    contextMode = normalizeOptionalString((_h = input === null || input === void 0 ? void 0 : input.context) === null || _h === void 0 ? void 0 : _h.mode);
+                                    contextRoute = normalizeOptionalString((_j = input === null || input === void 0 ? void 0 : input.context) === null || _j === void 0 ? void 0 : _j.route);
+                                    contextMode = normalizeOptionalString((_k = input === null || input === void 0 ? void 0 : input.context) === null || _k === void 0 ? void 0 : _k.mode);
                                     recordStep('Queued', { requestId: requestId || undefined });
                                     recordStep('Planning: request classification', {
                                         type: requestClassification.type,
                                         source: requestClassification.source,
                                         dataQuestion: dataQuestion
                                     });
-                                    _v.label = 1;
+                                    _3.label = 1;
                                 case 1:
-                                    _v.trys.push([1, 34, 35, 36]);
+                                    _3.trys.push([1, 42, 43, 44]);
                                     hintSeed = [message, contextRoute].filter(Boolean).join(' ');
                                     termExpansion = expandAssistantTermSynonyms(hintSeed);
                                     hintText = termExpansion.expanded || hintSeed;
@@ -1564,19 +1585,19 @@ function executeAiAssistantCodexRun(payload, context) {
                                     recordStep('Planning: term expansion', {
                                         termMatches: termExpansion.matches.length ? termExpansion.matches : undefined
                                     });
-                                    _v.label = 2;
+                                    _3.label = 2;
                                 case 2:
-                                    _v.trys.push([2, 4, , 5]);
+                                    _3.trys.push([2, 4, , 5]);
                                     dbName = resolveAssistantDatabaseName(undefined, input.mongo);
                                     db = resolveio_server_app_1.ResolveIOServer.getMongoConnection().db(dbName);
                                     return [4 /*yield*/, listAssistantCollections(db, dbName)];
                                 case 3:
-                                    collectionNames = _v.sent();
+                                    collectionNames = _3.sent();
                                     collectionHints = resolveCollectionHintsFromTokens(expandedTokens, collectionNames, 5);
                                     collectionRanking = buildCollectionRankingDebugFromTokens(expandedTokens, collectionNames, 8);
                                     return [3 /*break*/, 5];
                                 case 4:
-                                    _a = _v.sent();
+                                    _a = _3.sent();
                                     collectionHints = [];
                                     collectionRanking = collectionRanking || ((collectionTokenization === null || collectionTokenization === void 0 ? void 0 : collectionTokenization.expandedTokens)
                                         ? buildCollectionRankingDebugFromTokens(collectionTokenization.expandedTokens || [], [], 0)
@@ -1612,7 +1633,7 @@ function executeAiAssistantCodexRun(payload, context) {
                                     prompt_1 = buildAssistantCodexPrompt(message, attachmentData.promptText, historyLines.join('\n'), assistantContext);
                                     return [4 /*yield*/, resolveAssistantWorkspaceRoot()];
                                 case 6:
-                                    workspaceRoot = _v.sent();
+                                    workspaceRoot = _3.sent();
                                     codexConfig = resolveCodexSettings({
                                         model: codexModel,
                                         fallbackModels: codexFallbackModels
@@ -1647,44 +1668,54 @@ function executeAiAssistantCodexRun(payload, context) {
                                         fieldHints: fieldHints,
                                         inputClientId: input.id_client
                                     });
-                                    _v.label = 7;
+                                    _3.label = 7;
                                 case 7:
-                                    _v.trys.push([7, 9, , 10]);
+                                    _3.trys.push([7, 9, , 10]);
                                     plannerStart = Date.now();
                                     return [4 /*yield*/, runCodexInWorkerThread(plannerPrompt, runOptions, codexConfig, streamProgress)];
                                 case 8:
-                                    plannerRaw = _v.sent();
+                                    plannerRaw = _3.sent();
                                     accumulateCodexUsage(plannerPrompt, plannerRaw);
                                     timingBreakdown.plannerMs = Date.now() - plannerStart;
                                     plannerOutput = parseJsonObject(plannerRaw);
                                     recordStep('Planning: planner result', { parsed: !!plannerOutput });
                                     return [3 /*break*/, 10];
                                 case 9:
-                                    _b = _v.sent();
+                                    _b = _3.sent();
                                     recordStep('Planning: planner result', { parsed: false });
                                     return [3 /*break*/, 10];
                                 case 10:
                                     requestClassification = classifyAssistantRequestType(message, plannerOutput || undefined);
                                     dataQuestion = requestClassification.dataQuestion;
+                                    requestedTimeGrain = resolveAssistantRequestedTimeGrain(message, plannerOutput || undefined);
+                                    enforceDatedDirective = shouldEnforceAssistantDatedDirective(message, plannerOutput || undefined, requestClassification);
+                                    directiveStyleHint = buildAssistantDirectiveStyleHint({
+                                        enforceDated: enforceDatedDirective,
+                                        requestedTimeGrain: requestedTimeGrain
+                                    });
+                                    directivePromptMode = enforceDatedDirective ? 'aggregate_only' : 'any';
+                                    datedDirectiveRetryUsed = false;
                                     recordStep('Planning: request classification', {
                                         type: requestClassification.type,
                                         source: requestClassification.source,
                                         plannerIntentType: requestClassification.plannerIntentType || undefined,
-                                        dataQuestion: dataQuestion
+                                        dataQuestion: dataQuestion,
+                                        reportStyle: enforceDatedDirective ? 'dated' : undefined,
+                                        timeGrain: requestedTimeGrain || undefined
                                     });
                                     responseText = '';
                                     directiveText = '';
                                     directive = null;
                                     if (!dataQuestion) return [3 /*break*/, 14];
                                     recordStep('Directive: determine tool', { type: 'data-question' });
-                                    directivePrompt = buildAssistantCodexDirectivePrompt(message, attachmentData.promptText, historyLines.join('\n'), assistantContext);
-                                    _v.label = 11;
+                                    directivePrompt = buildAssistantCodexDirectivePrompt(message, attachmentData.promptText, historyLines.join('\n'), assistantContext, directiveStyleHint, directivePromptMode);
+                                    _3.label = 11;
                                 case 11:
-                                    _v.trys.push([11, 13, , 14]);
+                                    _3.trys.push([11, 13, , 14]);
                                     directiveStart = Date.now();
                                     return [4 /*yield*/, runCodexInWorkerThread(directivePrompt, runOptions, codexConfig, streamProgress)];
                                 case 12:
-                                    directiveText = _v.sent();
+                                    directiveText = _3.sent();
                                     accumulateCodexUsage(directivePrompt, directiveText);
                                     timingBreakdown.directiveMs = Date.now() - directiveStart;
                                     forcedDirective = extractAssistantMongoDirective(directiveText);
@@ -1692,17 +1723,17 @@ function executeAiAssistantCodexRun(payload, context) {
                                         directive = forcedDirective;
                                         directiveSource = 'model';
                                         lastDirective = forcedDirective;
-                                        collectionSelection = buildCollectionSelectionDetail((collectionTokenization === null || collectionTokenization === void 0 ? void 0 : collectionTokenization.expandedTokens) || [], normalizeOptionalString((_j = directive.payload) === null || _j === void 0 ? void 0 : _j.collection) || '');
+                                        collectionSelection = buildCollectionSelectionDetail((collectionTokenization === null || collectionTokenization === void 0 ? void 0 : collectionTokenization.expandedTokens) || [], normalizeOptionalString((_l = directive.payload) === null || _l === void 0 ? void 0 : _l.collection) || '');
                                         recordStep('Directive resolved', {
                                             source: directiveSource,
                                             type: directive.type,
-                                            collection: normalizeOptionalString((_k = directive.payload) === null || _k === void 0 ? void 0 : _k.collection) || undefined,
-                                            permissionView: normalizeOptionalString((_l = directive.payload) === null || _l === void 0 ? void 0 : _l.permissionView) || undefined
+                                            collection: normalizeOptionalString((_m = directive.payload) === null || _m === void 0 ? void 0 : _m.collection) || undefined,
+                                            permissionView: normalizeOptionalString((_o = directive.payload) === null || _o === void 0 ? void 0 : _o.permissionView) || undefined
                                         });
                                     }
                                     return [3 /*break*/, 14];
                                 case 13:
-                                    _c = _v.sent();
+                                    _c = _3.sent();
                                     return [3 /*break*/, 14];
                                 case 14:
                                     if (!!directive) return [3 /*break*/, 16];
@@ -1710,33 +1741,33 @@ function executeAiAssistantCodexRun(payload, context) {
                                     initialStart = Date.now();
                                     return [4 /*yield*/, runCodexInWorkerThread(prompt_1, runOptions, codexConfig, streamProgress)];
                                 case 15:
-                                    responseText = _v.sent();
+                                    responseText = _3.sent();
                                     accumulateCodexUsage(prompt_1, responseText);
                                     timingBreakdown.initialResponseMs = Date.now() - initialStart;
                                     directive = extractAssistantMongoDirective(responseText);
                                     if (directive) {
                                         directiveSource = 'model';
                                         lastDirective = directive;
-                                        collectionSelection = buildCollectionSelectionDetail((collectionTokenization === null || collectionTokenization === void 0 ? void 0 : collectionTokenization.expandedTokens) || [], normalizeOptionalString((_m = directive.payload) === null || _m === void 0 ? void 0 : _m.collection) || '');
+                                        collectionSelection = buildCollectionSelectionDetail((collectionTokenization === null || collectionTokenization === void 0 ? void 0 : collectionTokenization.expandedTokens) || [], normalizeOptionalString((_p = directive.payload) === null || _p === void 0 ? void 0 : _p.collection) || '');
                                         recordStep('Directive resolved', {
                                             source: directiveSource,
                                             type: directive.type,
-                                            collection: normalizeOptionalString((_o = directive.payload) === null || _o === void 0 ? void 0 : _o.collection) || undefined,
-                                            permissionView: normalizeOptionalString((_p = directive.payload) === null || _p === void 0 ? void 0 : _p.permissionView) || undefined
+                                            collection: normalizeOptionalString((_q = directive.payload) === null || _q === void 0 ? void 0 : _q.collection) || undefined,
+                                            permissionView: normalizeOptionalString((_r = directive.payload) === null || _r === void 0 ? void 0 : _r.permissionView) || undefined
                                         });
                                     }
-                                    _v.label = 16;
+                                    _3.label = 16;
                                 case 16:
                                     if (!(!directive && dataQuestion)) return [3 /*break*/, 20];
                                     recordStep('Directive: forced retry', { mode: 'directive-only' });
-                                    directivePrompt = buildAssistantCodexDirectivePrompt(message, attachmentData.promptText, historyLines.join('\n'), assistantContext);
-                                    _v.label = 17;
+                                    directivePrompt = buildAssistantCodexDirectivePrompt(message, attachmentData.promptText, historyLines.join('\n'), assistantContext, directiveStyleHint, directivePromptMode);
+                                    _3.label = 17;
                                 case 17:
-                                    _v.trys.push([17, 19, , 20]);
+                                    _3.trys.push([17, 19, , 20]);
                                     forcedStart = Date.now();
                                     return [4 /*yield*/, runCodexInWorkerThread(directivePrompt, runOptions, codexConfig, streamProgress)];
                                 case 18:
-                                    directiveText = _v.sent();
+                                    directiveText = _3.sent();
                                     accumulateCodexUsage(directivePrompt, directiveText);
                                     timingBreakdown.forcedDirectiveMs = Date.now() - forcedStart;
                                     forcedDirective = extractAssistantMongoDirective(directiveText);
@@ -1744,26 +1775,108 @@ function executeAiAssistantCodexRun(payload, context) {
                                         directive = forcedDirective;
                                         directiveSource = 'forced';
                                         lastDirective = forcedDirective;
-                                        collectionSelection = buildCollectionSelectionDetail((collectionTokenization === null || collectionTokenization === void 0 ? void 0 : collectionTokenization.expandedTokens) || [], normalizeOptionalString((_q = directive.payload) === null || _q === void 0 ? void 0 : _q.collection) || '');
+                                        collectionSelection = buildCollectionSelectionDetail((collectionTokenization === null || collectionTokenization === void 0 ? void 0 : collectionTokenization.expandedTokens) || [], normalizeOptionalString((_s = directive.payload) === null || _s === void 0 ? void 0 : _s.collection) || '');
                                         recordStep('Directive resolved', {
                                             source: directiveSource,
                                             type: directive.type,
-                                            collection: normalizeOptionalString((_r = directive.payload) === null || _r === void 0 ? void 0 : _r.collection) || undefined,
-                                            permissionView: normalizeOptionalString((_s = directive.payload) === null || _s === void 0 ? void 0 : _s.permissionView) || undefined
+                                            collection: normalizeOptionalString((_t = directive.payload) === null || _t === void 0 ? void 0 : _t.collection) || undefined,
+                                            permissionView: normalizeOptionalString((_u = directive.payload) === null || _u === void 0 ? void 0 : _u.permissionView) || undefined
                                         });
                                     }
                                     return [3 /*break*/, 20];
                                 case 19:
-                                    _d = _v.sent();
+                                    _d = _3.sent();
                                     return [3 /*break*/, 20];
                                 case 20:
+                                    if (!(directive && enforceDatedDirective && !isAssistantDirectiveDated(directive))) return [3 /*break*/, 24];
+                                    recordStep('Directive: dated retry', {
+                                        currentType: directive.type,
+                                        timeGrain: requestedTimeGrain || undefined
+                                    });
+                                    strictDirectivePrompt = buildAssistantCodexDirectivePrompt(message, attachmentData.promptText, historyLines.join('\n'), assistantContext, buildAssistantDirectiveStyleHint({
+                                        enforceDated: true,
+                                        requestedTimeGrain: requestedTimeGrain,
+                                        strict: true
+                                    }), 'aggregate_only');
+                                    _3.label = 21;
+                                case 21:
+                                    _3.trys.push([21, 23, , 24]);
+                                    strictStart = Date.now();
+                                    return [4 /*yield*/, runCodexInWorkerThread(strictDirectivePrompt, runOptions, codexConfig, streamProgress)];
+                                case 22:
+                                    strictDirectiveText = _3.sent();
+                                    accumulateCodexUsage(strictDirectivePrompt, strictDirectiveText);
+                                    timingBreakdown.forcedDirectiveMs += Date.now() - strictStart;
+                                    strictDirective = extractAssistantMongoDirective(strictDirectiveText);
+                                    strictDirectiveIsDated = strictDirective ? isAssistantDirectiveDated(strictDirective) : false;
+                                    shouldUseStrictDirective = !!strictDirective && strictDirective.type === 'aggregate';
+                                    if (shouldUseStrictDirective && strictDirective) {
+                                        directive = strictDirective;
+                                        directiveSource = 'forced';
+                                        lastDirective = strictDirective;
+                                        datedDirectiveRetryUsed = true;
+                                        collectionSelection = buildCollectionSelectionDetail((collectionTokenization === null || collectionTokenization === void 0 ? void 0 : collectionTokenization.expandedTokens) || [], normalizeOptionalString((_v = directive.payload) === null || _v === void 0 ? void 0 : _v.collection) || '');
+                                        recordStep('Directive resolved', {
+                                            source: directiveSource,
+                                            type: directive.type,
+                                            collection: normalizeOptionalString((_w = directive.payload) === null || _w === void 0 ? void 0 : _w.collection) || undefined,
+                                            permissionView: normalizeOptionalString((_x = directive.payload) === null || _x === void 0 ? void 0 : _x.permissionView) || undefined,
+                                            reportStyle: strictDirectiveIsDated ? 'dated' : 'aggregate_fallback',
+                                            timeGrain: requestedTimeGrain || undefined
+                                        });
+                                    }
+                                    return [3 /*break*/, 24];
+                                case 23:
+                                    _e = _3.sent();
+                                    return [3 /*break*/, 24];
+                                case 24:
+                                    if (!(directive && enforceDatedDirective && directive.type === 'read')) return [3 /*break*/, 28];
+                                    recordStep('Directive: dated guard retry', {
+                                        currentType: directive.type,
+                                        timeGrain: requestedTimeGrain || undefined
+                                    });
+                                    guardDirectivePrompt = buildAssistantCodexDirectivePrompt(message, attachmentData.promptText, historyLines.join('\n'), assistantContext, buildAssistantDirectiveStyleHint({
+                                        enforceDated: true,
+                                        requestedTimeGrain: requestedTimeGrain,
+                                        strict: true
+                                    }), 'aggregate_only');
+                                    _3.label = 25;
+                                case 25:
+                                    _3.trys.push([25, 27, , 28]);
+                                    guardStart = Date.now();
+                                    return [4 /*yield*/, runCodexInWorkerThread(guardDirectivePrompt, runOptions, codexConfig, streamProgress)];
+                                case 26:
+                                    guardDirectiveText = _3.sent();
+                                    accumulateCodexUsage(guardDirectivePrompt, guardDirectiveText);
+                                    timingBreakdown.forcedDirectiveMs += Date.now() - guardStart;
+                                    guardDirective = extractAssistantMongoDirective(guardDirectiveText);
+                                    if (guardDirective && guardDirective.type === 'aggregate') {
+                                        directive = guardDirective;
+                                        directiveSource = 'forced';
+                                        lastDirective = guardDirective;
+                                        datedDirectiveRetryUsed = true;
+                                        collectionSelection = buildCollectionSelectionDetail((collectionTokenization === null || collectionTokenization === void 0 ? void 0 : collectionTokenization.expandedTokens) || [], normalizeOptionalString((_y = directive.payload) === null || _y === void 0 ? void 0 : _y.collection) || '');
+                                        recordStep('Directive resolved', {
+                                            source: directiveSource,
+                                            type: directive.type,
+                                            collection: normalizeOptionalString((_z = directive.payload) === null || _z === void 0 ? void 0 : _z.collection) || undefined,
+                                            permissionView: normalizeOptionalString((_0 = directive.payload) === null || _0 === void 0 ? void 0 : _0.permissionView) || undefined,
+                                            reportStyle: isAssistantDirectiveDated(guardDirective) ? 'dated' : 'aggregate_fallback',
+                                            timeGrain: requestedTimeGrain || undefined
+                                        });
+                                    }
+                                    return [3 /*break*/, 28];
+                                case 27:
+                                    _f = _3.sent();
+                                    return [3 /*break*/, 28];
+                                case 28:
                                     if (directive) {
-                                        requestedCollection = normalizeOptionalString((_t = directive.payload) === null || _t === void 0 ? void 0 : _t.collection);
+                                        requestedCollection = normalizeOptionalString((_1 = directive.payload) === null || _1 === void 0 ? void 0 : _1.collection);
                                         collectionOverride = resolveCollectionOverrideWithContext({
                                             message: message,
                                             collectionRanking: collectionRanking,
                                             requestedCollection: requestedCollection,
-                                            permissionView: normalizeOptionalString((_u = directive.payload) === null || _u === void 0 ? void 0 : _u.permissionView) || contextRoute,
+                                            permissionView: normalizeOptionalString((_2 = directive.payload) === null || _2 === void 0 ? void 0 : _2.permissionView) || contextRoute,
                                             collectionNames: collectionNames
                                         });
                                         if (collectionOverride) {
@@ -1775,11 +1888,12 @@ function executeAiAssistantCodexRun(payload, context) {
                                             });
                                         }
                                     }
+                                    datedDirectiveResolved = directive ? isAssistantDirectiveDated(directive) : false;
                                     cleanedResponseText = (directive === null || directive === void 0 ? void 0 : directive.cleaned) || responseText;
                                     if (cleanedResponseText) {
                                         assistantContent = sanitizeAssistantResponse(cleanedResponseText);
                                     }
-                                    if (!((directive === null || directive === void 0 ? void 0 : directive.payload) && AI_ASSISTANT_TOOL_MAX_STEPS > 0)) return [3 /*break*/, 32];
+                                    if (!((directive === null || directive === void 0 ? void 0 : directive.payload) && AI_ASSISTANT_TOOL_MAX_STEPS > 0)) return [3 /*break*/, 40];
                                     effectiveDirective = collectionOverride
                                         ? __assign(__assign({}, directive), { payload: __assign(__assign({}, (directive.payload || {})), { collection: collectionOverride.to }) }) : directive;
                                     toolRequest = buildAssistantToolRequest(effectiveDirective, input);
@@ -1789,21 +1903,21 @@ function executeAiAssistantCodexRun(payload, context) {
                                         collection: normalizeOptionalString(toolRequest === null || toolRequest === void 0 ? void 0 : toolRequest.collection) || undefined,
                                         permissionView: normalizeOptionalString(toolRequest === null || toolRequest === void 0 ? void 0 : toolRequest.permissionView) || undefined
                                     });
-                                    _v.label = 21;
-                                case 21:
-                                    _v.trys.push([21, 30, , 31]);
+                                    _3.label = 29;
+                                case 29:
+                                    _3.trys.push([29, 38, , 39]);
                                     toolStart = Date.now();
-                                    if (!(effectiveDirective.type === 'aggregate')) return [3 /*break*/, 23];
+                                    if (!(effectiveDirective.type === 'aggregate')) return [3 /*break*/, 31];
                                     return [4 /*yield*/, executeAiAssistantReportBuilderAggregate(toolRequest, context)];
-                                case 22:
-                                    _e = _v.sent();
-                                    return [3 /*break*/, 25];
-                                case 23: return [4 /*yield*/, executeAiAssistantReportBuilderRead(toolRequest, context)];
-                                case 24:
-                                    _e = _v.sent();
-                                    _v.label = 25;
-                                case 25:
-                                    toolResponse = _e;
+                                case 30:
+                                    _g = _3.sent();
+                                    return [3 /*break*/, 33];
+                                case 31: return [4 /*yield*/, executeAiAssistantReportBuilderRead(toolRequest, context)];
+                                case 32:
+                                    _g = _3.sent();
+                                    _3.label = 33;
+                                case 33:
+                                    toolResponse = _g;
                                     timingBreakdown.toolMs = Date.now() - toolStart;
                                     toolResponseDebug = (toolResponse === null || toolResponse === void 0 ? void 0 : toolResponse.debug) && typeof toolResponse.debug === 'object'
                                         ? toolResponse.debug
@@ -1818,43 +1932,43 @@ function executeAiAssistantCodexRun(payload, context) {
                                     progressTracker.push('Drafting response');
                                     recordStep('Drafting response');
                                     followupPrompt = buildAssistantCodexToolFollowupPrompt(message, attachmentData.promptText, historyLines.join('\n'), assistantContext, toolPayload.prompt);
-                                    _v.label = 26;
-                                case 26:
-                                    _v.trys.push([26, 28, , 29]);
+                                    _3.label = 34;
+                                case 34:
+                                    _3.trys.push([34, 36, , 37]);
                                     followupStart = Date.now();
                                     return [4 /*yield*/, runCodexInWorkerThread(followupPrompt, runOptions, codexConfig, streamProgress)];
-                                case 27:
-                                    followupText = _v.sent();
+                                case 35:
+                                    followupText = _3.sent();
                                     accumulateCodexUsage(followupPrompt, followupText);
                                     timingBreakdown.followupMs = Date.now() - followupStart;
                                     assistantContent = sanitizeAssistantResponse(followupText);
                                     assistantContent = applyAssistantDisplayTableToResponse(assistantContent, toolPayload.result.output.display);
-                                    return [3 /*break*/, 29];
-                                case 28:
-                                    _f = _v.sent();
+                                    return [3 /*break*/, 37];
+                                case 36:
+                                    _h = _3.sent();
                                     assistantContent = buildAssistantToolFallbackResponse(toolPayload.result);
-                                    return [3 /*break*/, 29];
-                                case 29: return [3 /*break*/, 31];
-                                case 30:
-                                    error_2 = _v.sent();
+                                    return [3 /*break*/, 37];
+                                case 37: return [3 /*break*/, 39];
+                                case 38:
+                                    error_2 = _3.sent();
                                     assistantContent = buildAssistantToolErrorMessage(error_2);
                                     toolError = error_2;
-                                    return [3 /*break*/, 31];
-                                case 31: return [3 /*break*/, 33];
-                                case 32:
+                                    return [3 /*break*/, 39];
+                                case 39: return [3 /*break*/, 41];
+                                case 40:
                                     progressTracker.push('Drafting response');
                                     recordStep('Drafting response');
-                                    _v.label = 33;
-                                case 33: return [3 /*break*/, 36];
-                                case 34:
-                                    error_3 = _v.sent();
+                                    _3.label = 41;
+                                case 41: return [3 /*break*/, 44];
+                                case 42:
+                                    error_3 = _3.sent();
                                     assistantContent = buildAssistantCodexErrorMessage(error_3);
                                     recordStep('Error', { message: normalizeOptionalString(error_3 === null || error_3 === void 0 ? void 0 : error_3.message) || 'Unknown error' });
-                                    return [3 /*break*/, 36];
-                                case 35:
+                                    return [3 /*break*/, 44];
+                                case 43:
                                     progressTracker.stop();
                                     return [7 /*endfinally*/];
-                                case 36:
+                                case 44:
                                     if (!assistantContent) {
                                         assistantContent = buildAssistantCodexErrorMessage(null);
                                     }
@@ -1890,6 +2004,10 @@ function executeAiAssistantCodexRun(payload, context) {
                                             requestTypeSource: requestClassification.source,
                                             plannerIntentType: requestClassification.plannerIntentType,
                                             dataQuestion: dataQuestion,
+                                            reportStyleIntent: enforceDatedDirective ? 'dated' : null,
+                                            requestedTimeGrain: requestedTimeGrain,
+                                            datedDirectiveRetryUsed: datedDirectiveRetryUsed,
+                                            datedDirectiveResolved: datedDirectiveResolved,
                                             directive: lastDirective,
                                             directiveSource: directiveSource,
                                             toolResult: toolResult,
@@ -1940,14 +2058,14 @@ function executeAiAssistantCodexRun(payload, context) {
                                         output_tokens: codexUsage.output_tokens,
                                         total_tokens: codexUsage.total_tokens
                                     } : null;
-                                    if (!finalUsage) return [3 /*break*/, 41];
+                                    if (!finalUsage) return [3 /*break*/, 49];
                                     return [4 /*yield*/, resolveClientId(conversation, input.id_client, context === null || context === void 0 ? void 0 : context.id_user)];
-                                case 37:
-                                    usageClientId = _v.sent();
-                                    if (!usageClientId) return [3 /*break*/, 41];
-                                    _v.label = 38;
-                                case 38:
-                                    _v.trys.push([38, 40, , 41]);
+                                case 45:
+                                    usageClientId = _3.sent();
+                                    if (!usageClientId) return [3 /*break*/, 49];
+                                    _3.label = 46;
+                                case 46:
+                                    _3.trys.push([46, 48, , 49]);
                                     return [4 /*yield*/, (0, openai_usage_ledger_manager_1.recordOpenAIUsage)({
                                             id_client: usageClientId,
                                             model: finalUsage.model,
@@ -1958,16 +2076,16 @@ function executeAiAssistantCodexRun(payload, context) {
                                             id_request: requestId || undefined,
                                             id_conversation: conversation._id
                                         })];
-                                case 39:
-                                    _v.sent();
-                                    return [3 /*break*/, 41];
-                                case 40:
-                                    usageError_1 = _v.sent();
+                                case 47:
+                                    _3.sent();
+                                    return [3 /*break*/, 49];
+                                case 48:
+                                    usageError_1 = _3.sent();
                                     console.error(new Date(), 'Failed to record codex usage', usageError_1);
-                                    return [3 /*break*/, 41];
-                                case 41:
+                                    return [3 /*break*/, 49];
+                                case 49:
                                     finalAssistantDoc = __assign(__assign(__assign(__assign({}, assistantDoc), { _id: assistantMessageId, content: assistantContent, metadata: finalMetadata }), (finalUsage ? { usage: finalUsage } : {})), { updatedAt: finalNow });
-                                    if (!assistantMessageId) return [3 /*break*/, 43];
+                                    if (!assistantMessageId) return [3 /*break*/, 51];
                                     setPayload = {
                                         content: assistantContent,
                                         metadata: finalMetadata,
@@ -1979,18 +2097,18 @@ function executeAiAssistantCodexRun(payload, context) {
                                     return [4 /*yield*/, ai_terminal_message_collection_1.AiTerminalMessages.updateOne({ _id: assistantMessageId }, {
                                             $set: setPayload
                                         })];
-                                case 42:
-                                    _v.sent();
-                                    _v.label = 43;
-                                case 43: return [4 /*yield*/, touchConversation(conversation._id, finalNow, assistantMessageId ? String(assistantMessageId) : undefined)];
-                                case 44:
-                                    _v.sent();
-                                    if (!(input.delete_files_after_run !== false)) return [3 /*break*/, 46];
+                                case 50:
+                                    _3.sent();
+                                    _3.label = 51;
+                                case 51: return [4 /*yield*/, touchConversation(conversation._id, finalNow, assistantMessageId ? String(assistantMessageId) : undefined)];
+                                case 52:
+                                    _3.sent();
+                                    if (!(input.delete_files_after_run !== false)) return [3 /*break*/, 54];
                                     return [4 /*yield*/, cleanupAttachments(attachmentData.attachments)];
-                                case 45:
-                                    _v.sent();
-                                    _v.label = 46;
-                                case 46: return [2 /*return*/, finalAssistantDoc];
+                                case 53:
+                                    _3.sent();
+                                    _3.label = 54;
+                                case 54: return [2 /*return*/, finalAssistantDoc];
                             }
                         });
                     }); });
@@ -2125,7 +2243,7 @@ function executeAiAssistantMongoRead(payload, context) {
                     _q.label = 8;
                 case 8:
                     if (!!documents.length) return [3 /*break*/, 10];
-                    expanded = expandQueryDateFallbacks(executedQuery);
+                    expanded = expandQueryDateFallbacks(executedQuery, schemaFields);
                     if (!expanded) return [3 /*break*/, 10];
                     fallbackMeta.dateFieldsExpanded = {
                         fields: expanded.fields,
@@ -2668,7 +2786,7 @@ function executeAiAssistantMongoAggregate(payload, context) {
                     _q.label = 10;
                 case 10:
                     if (!!documents.length) return [3 /*break*/, 12];
-                    expanded = expandAggregateDateMatchFallback(executedPipeline);
+                    expanded = expandAggregateDateMatchFallback(executedPipeline, schemaFields);
                     if (!expanded) return [3 /*break*/, 12];
                     fallbackMeta.dateFieldsExpanded = {
                         fields: expanded.fields,
@@ -3978,7 +4096,7 @@ function applyAssistantVerificationNotes(value, toolResult) {
         return content || value || '';
     }
     var normalizedLower = String(content || '').toLowerCase();
-    var missing = warnings.filter(function (warning) { return !normalizedLower.includes(String(warning).toLowerCase()); });
+    var missing = warnings.filter(function (warning) { return !hasAssistantEquivalentVerificationWarning(normalizedLower, warning); });
     if (!missing.length) {
         return content || value || '';
     }
@@ -3989,6 +4107,29 @@ function applyAssistantVerificationNotes(value, toolResult) {
     }
     return "".concat(content, "\n\n").concat(noteLines.join('\n')).trim();
 }
+function hasAssistantEquivalentVerificationWarning(contentLower, warning) {
+    var warningLower = normalizeOptionalString(warning).toLowerCase();
+    if (!warningLower) {
+        return false;
+    }
+    if (contentLower.includes(warningLower)) {
+        return true;
+    }
+    if (!warningLower.includes('changes monthly totals by')) {
+        return false;
+    }
+    var pctMatch = warningLower.match(/([0-9]+(?:\.[0-9]+)?)%/);
+    if (!pctMatch) {
+        return false;
+    }
+    if (!/date[_\s-]?paid/.test(warningLower) || !/date[_\s-]?invoice/.test(warningLower)) {
+        return false;
+    }
+    return contentLower.includes('changes monthly totals by')
+        && contentLower.includes("".concat(pctMatch[1], "%"))
+        && /date[_\s-]?paid/.test(contentLower)
+        && /date[_\s-]?invoice/.test(contentLower);
+}
 function applyAssistantDatedReportWindow(value, toolResult) {
     var content = normalizeOptionalString(value);
     var window = resolveAssistantDatedReportWindow(toolResult);
@@ -4105,6 +4246,18 @@ function buildAssistantDebugPayload(params) {
     if (params.dataQuestion) {
         notes.push('Detected a data request; tool call required.');
     }
+    if (params.reportStyleIntent === 'dated') {
+        notes.push("Report style intent: dated".concat(params.requestedTimeGrain ? " (".concat(params.requestedTimeGrain, ")") : '', "."));
+        if (params.datedDirectiveRetryUsed) {
+            notes.push('Retried directive generation to enforce dated report style.');
+        }
+        if (params.datedDirectiveResolved) {
+            notes.push('Directive includes time-based aggregate grouping.');
+        }
+        else {
+            notes.push('Directive did not include explicit time-based grouping.');
+        }
+    }
     if (params.directiveSource === 'forced') {
         notes.push('Assistant response omitted a REPORT_BUILDER_* directive; ran a directive-only pass.');
     }
@@ -4240,6 +4393,10 @@ function buildAssistantDebugPayload(params) {
             requestTypeSource: params.requestTypeSource,
             plannerIntentType: params.plannerIntentType || undefined,
             dataQuestion: params.dataQuestion,
+            reportStyleIntent: params.reportStyleIntent || undefined,
+            timeGrain: params.requestedTimeGrain || undefined,
+            datedDirectiveRetryUsed: params.datedDirectiveRetryUsed === true ? true : undefined,
+            datedDirectiveResolved: params.datedDirectiveResolved === true ? true : undefined,
             directiveSource: params.directiveSource
         },
         directive: directive ? {
@@ -5686,13 +5843,138 @@ function flattenForTable(doc, options) {
     });
     return result;
 }
+function normalizeAssistantComparableDateDisplayValue(value) {
+    if (value === null || value === undefined) {
+        return '';
+    }
+    if (value instanceof Date) {
+        return Number.isNaN(value.getTime()) ? '' : value.toISOString();
+    }
+    if (typeof value === 'number' && Number.isFinite(value)) {
+        var epochMs = value >= 1e11 ? value : value >= 1e9 ? value * 1000 : null;
+        if (epochMs !== null) {
+            var parsed_1 = new Date(epochMs);
+            if (!Number.isNaN(parsed_1.getTime())) {
+                return parsed_1.toISOString();
+            }
+        }
+        return String(value);
+    }
+    var text = String(value).trim();
+    if (!text) {
+        return '';
+    }
+    var parsed = Date.parse(text);
+    if (!Number.isNaN(parsed)) {
+        return new Date(parsed).toISOString();
+    }
+    return text.toLowerCase();
+}
+function shouldMergeAssistantDisplayDateField(rows, preferredField, candidateField) {
+    var preferredNonEmpty = 0;
+    var candidateNonEmpty = 0;
+    var overlap = 0;
+    var equalOverlap = 0;
+    rows.forEach(function (row) {
+        var preferredValue = row === null || row === void 0 ? void 0 : row[preferredField];
+        var candidateValue = row === null || row === void 0 ? void 0 : row[candidateField];
+        var preferredHasValue = !isEmptyDisplayValue(preferredValue);
+        var candidateHasValue = !isEmptyDisplayValue(candidateValue);
+        if (preferredHasValue) {
+            preferredNonEmpty += 1;
+        }
+        if (candidateHasValue) {
+            candidateNonEmpty += 1;
+        }
+        if (preferredHasValue && candidateHasValue) {
+            overlap += 1;
+            if (normalizeAssistantComparableDateDisplayValue(preferredValue)
+                === normalizeAssistantComparableDateDisplayValue(candidateValue)) {
+                equalOverlap += 1;
+            }
+        }
+    });
+    if (!candidateNonEmpty) {
+        return false;
+    }
+    if (!preferredNonEmpty) {
+        return true;
+    }
+    if (!overlap) {
+        return false;
+    }
+    return (equalOverlap / overlap) >= 0.8;
+}
+function coalesceAssistantDisplayDuplicateFields(rowsRaw) {
+    if (!Array.isArray(rowsRaw) || !rowsRaw.length) {
+        return Array.isArray(rowsRaw) ? rowsRaw : [];
+    }
+    var rows = rowsRaw.map(function (row) { return (__assign({}, (row || {}))); });
+    var collectKeys = function () {
+        var keySet = new Set();
+        rows.forEach(function (row) {
+            Object.keys(row || {}).forEach(function (key) {
+                if (key) {
+                    keySet.add(key);
+                }
+            });
+        });
+        return keySet;
+    };
+    var keys = collectKeys();
+    Array.from(keys).forEach(function (key) {
+        var _a = splitAssistantFieldPath(key), parent = _a.parent, leaf = _a.leaf;
+        if (!leaf || !/_string$/i.test(leaf)) {
+            return;
+        }
+        var baseLeaf = leaf.replace(/_string$/i, '');
+        var basePath = parent ? "".concat(parent, ".").concat(baseLeaf) : baseLeaf;
+        if (!keys.has(basePath)) {
+            return;
+        }
+        rows.forEach(function (row) {
+            var stringValue = row === null || row === void 0 ? void 0 : row[key];
+            if (!isEmptyDisplayValue(stringValue) && isEmptyDisplayValue(row === null || row === void 0 ? void 0 : row[basePath])) {
+                row[basePath] = stringValue;
+            }
+            delete row[key];
+        });
+    });
+    keys = collectKeys();
+    var mergeDateGroup = function (preferredOrder) {
+        var preferredField = preferredOrder.find(function (field) { return keys.has(field); });
+        if (!preferredField) {
+            return;
+        }
+        preferredOrder.forEach(function (candidateField) {
+            if (candidateField === preferredField || !keys.has(candidateField)) {
+                return;
+            }
+            if (!shouldMergeAssistantDisplayDateField(rows, preferredField, candidateField)) {
+                return;
+            }
+            rows.forEach(function (row) {
+                var candidateValue = row === null || row === void 0 ? void 0 : row[candidateField];
+                if (!isEmptyDisplayValue(candidateValue) && isEmptyDisplayValue(row === null || row === void 0 ? void 0 : row[preferredField])) {
+                    row[preferredField] = candidateValue;
+                }
+                delete row[candidateField];
+            });
+            keys.delete(candidateField);
+        });
+    };
+    mergeDateGroup(['createdAt', 'created_at', 'date_created', 'created_date', 'date']);
+    mergeDateGroup(['updatedAt', 'updated_at', 'date_updated', 'updated_date']);
+    return rows;
+}
 function buildDisplayTable(docs, options) {
-    var rowsRaw = Array.isArray(docs)
+    var rowsRawInitial = Array.isArray(docs)
         ? docs.map(function (doc) { return flattenForTable(doc, {
             includeIds: (options === null || options === void 0 ? void 0 : options.includeIds) === true,
             includeGroupFromId: (options === null || options === void 0 ? void 0 : options.includeGroupFromId) === true
         }); })
         : [];
+    var rowsRaw = coalesceAssistantDisplayDuplicateFields(rowsRawInitial);
     var stats = new Map();
     rowsRaw.forEach(function (row) {
         Object.keys(row).forEach(function (key) {
@@ -5826,12 +6108,31 @@ function resolveAssistantNumericValue(value) {
         return value;
     }
     if (typeof value === 'string') {
-        var cleaned = value.replace(/[^0-9.+-]/g, '');
-        if (!cleaned) {
+        var trimmed = value.trim();
+        if (!trimmed) {
+            return null;
+        }
+        var negative = false;
+        var candidate = trimmed;
+        var accountingMatch = candidate.match(/^\((.+)\)$/);
+        if (accountingMatch === null || accountingMatch === void 0 ? void 0 : accountingMatch[1]) {
+            negative = true;
+            candidate = accountingMatch[1].trim();
+        }
+        candidate = candidate.replace(/^\$/, '').replace(/,/g, '');
+        if (!candidate || !/^[+-]?(?:\d+|\d*\.\d+)%?$/.test(candidate) || !/[0-9]/.test(candidate)) {
             return null;
         }
-        var parsed = Number(cleaned);
-        return Number.isFinite(parsed) ? parsed : null;
+        var normalized = candidate.endsWith('%') ? candidate.slice(0, -1) : candidate;
+        var parsed = Number(normalized);
+        if (!Number.isFinite(parsed)) {
+            return null;
+        }
+        var signed = negative ? -parsed : parsed;
+        if (!Number.isFinite(signed)) {
+            return null;
+        }
+        return signed;
     }
     return null;
 }
@@ -6130,7 +6431,7 @@ function normalizeAssistantFindOptions(options) {
     var maxLimit = exportMode ? AI_ASSISTANT_MONGO_EXPORT_MAX_LIMIT : AI_ASSISTANT_MONGO_MAX_LIMIT;
     var defaultLimit = exportMode ? AI_ASSISTANT_MONGO_EXPORT_MAX_LIMIT : AI_ASSISTANT_MONGO_DEFAULT_LIMIT;
     var projection = sanitizeAssistantProjection(normalized.projection);
-    var sort = normalized.sort && Object.keys(normalized.sort).length ? normalized.sort : undefined;
+    var sort = sanitizeAssistantSort(normalized.sort);
     var limit = typeof normalized.limit === 'number'
         ? Math.min(Math.max(normalized.limit, 0), maxLimit)
         : defaultLimit;
@@ -6149,28 +6450,194 @@ function sanitizeAssistantProjection(projection) {
     if (!projection || typeof projection !== 'object') {
         return undefined;
     }
-    var keys = Object.keys(projection);
+    var sanitized = __assign({}, projection);
+    var keys = Object.keys(sanitized);
     if (!keys.length) {
         return undefined;
     }
     var hasInclude = false;
-    var hasExclude = false;
+    var hasNonIdExclude = false;
     keys.forEach(function (key) {
-        var value = projection[key];
+        var value = sanitized[key];
         if (value === 0 || value === false) {
-            hasExclude = true;
+            if (key !== '_id') {
+                hasNonIdExclude = true;
+            }
         }
         else if (value === 1 || value === true) {
             hasInclude = true;
         }
     });
-    if (hasInclude && !hasExclude) {
-        var onlyIds = keys.every(function (key) { return isAssistantIdField(key); });
+    if (hasInclude && !hasNonIdExclude) {
+        var includeKeys = keys.filter(function (key) {
+            var value = sanitized[key];
+            return value === 1 || value === true;
+        });
+        var dedupedIncludeKeys = dedupeAssistantFieldKeys(includeKeys);
+        if (dedupedIncludeKeys.length !== includeKeys.length) {
+            var includeSet_1 = new Set(dedupedIncludeKeys);
+            var next_2 = {};
+            keys.forEach(function (key) {
+                var value = sanitized[key];
+                if (value === 1 || value === true) {
+                    if (includeSet_1.has(key)) {
+                        next_2[key] = value;
+                    }
+                    return;
+                }
+                if (key === '_id' && (value === 0 || value === false)) {
+                    next_2[key] = value;
+                }
+            });
+            sanitized = next_2;
+            keys = Object.keys(sanitized);
+        }
+        var includeAfterDedupe = keys.filter(function (key) {
+            var value = sanitized[key];
+            return value === 1 || value === true;
+        });
+        var onlyIds = includeAfterDedupe.length > 0
+            && includeAfterDedupe.every(function (key) { return isAssistantIdField(key); });
         if (onlyIds) {
             return undefined;
         }
     }
-    return projection;
+    return sanitized;
+}
+function sanitizeAssistantSort(sort) {
+    if (!sort || typeof sort !== 'object') {
+        return undefined;
+    }
+    var keys = Object.keys(sort);
+    if (!keys.length) {
+        return undefined;
+    }
+    var dedupedKeys = dedupeAssistantFieldKeys(keys);
+    if (dedupedKeys.length === keys.length) {
+        return sort;
+    }
+    var keepSet = new Set(dedupedKeys);
+    var next = {};
+    keys.forEach(function (key) {
+        if (keepSet.has(key)) {
+            next[key] = sort[key];
+        }
+    });
+    return Object.keys(next).length ? next : undefined;
+}
+function splitAssistantFieldPath(fieldPath) {
+    var normalized = normalizeOptionalString(fieldPath);
+    if (!normalized) {
+        return { parent: '', leaf: '' };
+    }
+    var segments = normalized.split('.');
+    var leaf = segments.pop() || '';
+    var parent = segments.join('.');
+    return { parent: parent, leaf: leaf };
+}
+function getAssistantCreatedFieldRank(leaf) {
+    var normalized = normalizeFieldMatchKey(leaf);
+    if (normalized === 'createdat') {
+        return 1;
+    }
+    if (normalized === 'createddate') {
+        return 2;
+    }
+    if (normalized === 'datecreated') {
+        return 3;
+    }
+    if (normalized === 'created') {
+        return 4;
+    }
+    return 0;
+}
+function getAssistantUpdatedFieldRank(leaf) {
+    var normalized = normalizeFieldMatchKey(leaf);
+    if (normalized === 'updatedat') {
+        return 1;
+    }
+    if (normalized === 'updateddate') {
+        return 2;
+    }
+    if (normalized === 'dateupdated') {
+        return 3;
+    }
+    if (normalized === 'updated') {
+        return 4;
+    }
+    return 0;
+}
+function dedupeAssistantFieldKeys(fieldKeys) {
+    if (!Array.isArray(fieldKeys) || !fieldKeys.length) {
+        return [];
+    }
+    var keys = fieldKeys.filter(Boolean);
+    if (!keys.length) {
+        return [];
+    }
+    var keySet = new Set(keys);
+    var dropSet = new Set();
+    var preferByParent = function (entries, parent, key, rank) {
+        var current = entries.get(parent);
+        if (!current || rank < current.rank) {
+            if (current) {
+                dropSet.add(current.key);
+            }
+            entries.set(parent, { key: key, rank: rank });
+            return;
+        }
+        dropSet.add(key);
+    };
+    keys.forEach(function (key) {
+        var _a = splitAssistantFieldPath(key), parent = _a.parent, leaf = _a.leaf;
+        if (!leaf) {
+            return;
+        }
+        if (/_string$/i.test(leaf)) {
+            var baseLeaf = leaf.replace(/_string$/i, '');
+            var basePath = parent ? "".concat(parent, ".").concat(baseLeaf) : baseLeaf;
+            if (keySet.has(basePath)) {
+                dropSet.add(key);
+            }
+        }
+    });
+    var createdByParent = new Map();
+    var updatedByParent = new Map();
+    var dateByParent = new Map();
+    keys.forEach(function (key) {
+        if (dropSet.has(key)) {
+            return;
+        }
+        var _a = splitAssistantFieldPath(key), parent = _a.parent, leaf = _a.leaf;
+        if (!leaf) {
+            return;
+        }
+        var normalizedLeaf = normalizeFieldMatchKey(leaf);
+        if (normalizedLeaf === 'date') {
+            if (dateByParent.has(parent)) {
+                dropSet.add(key);
+            }
+            else {
+                dateByParent.set(parent, key);
+            }
+            return;
+        }
+        var createdRank = getAssistantCreatedFieldRank(leaf);
+        if (createdRank > 0) {
+            preferByParent(createdByParent, parent, key, createdRank);
+            return;
+        }
+        var updatedRank = getAssistantUpdatedFieldRank(leaf);
+        if (updatedRank > 0) {
+            preferByParent(updatedByParent, parent, key, updatedRank);
+        }
+    });
+    dateByParent.forEach(function (dateKey, parent) {
+        if (createdByParent.has(parent)) {
+            dropSet.add(dateKey);
+        }
+    });
+    return keys.filter(function (key) { return !dropSet.has(key); });
 }
 var AGG_MATCH_EXPR_OPERATORS = new Set(['$eq', '$ne', '$gt', '$gte', '$lt', '$lte']);
 var ASSISTANT_NOW_RELATIVE_PATTERN = /^\$\$NOW_(MINUS|PLUS)_([0-9]+)_(MINUTES?|HOURS?|DAYS?|WEEKS?|MONTHS?|YEARS?)$/i;
@@ -7329,6 +7796,126 @@ function extractExpressionFieldPaths(value) {
     visit(value);
     return results.filter(Boolean);
 }
+function hasAssistantDateGroupingOperator(value) {
+    if (Array.isArray(value)) {
+        return value.some(function (entry) { return hasAssistantDateGroupingOperator(entry); });
+    }
+    if (!value || typeof value !== 'object') {
+        return false;
+    }
+    var dateTrunc = value.$dateTrunc;
+    if (dateTrunc && typeof dateTrunc === 'object' && !Array.isArray(dateTrunc)) {
+        var unit = normalizeOptionalString(dateTrunc.unit).toLowerCase();
+        if (unit === 'day' || unit === 'week' || unit === 'month' || unit === 'quarter' || unit === 'year') {
+            return true;
+        }
+    }
+    var dateToString = value.$dateToString;
+    if (dateToString && typeof dateToString === 'object' && !Array.isArray(dateToString)) {
+        var format = normalizeOptionalString(dateToString.format);
+        if (/%[djmUVWYGy]/i.test(format)) {
+            return true;
+        }
+    }
+    var directDateOps = ['$year', '$month', '$week', '$isoWeek', '$isoWeekYear', '$dayOfMonth', '$dayOfYear', '$dateToParts'];
+    if (directDateOps.some(function (op) { return Object.prototype.hasOwnProperty.call(value, op); })) {
+        return true;
+    }
+    return Object.keys(value).some(function (key) { return hasAssistantDateGroupingOperator(value[key]); });
+}
+function isGroupFieldDerivedFromDateExpression(pipeline, groupIndex, groupPaths) {
+    var e_16, _a, e_17, _b;
+    if (!Array.isArray(pipeline) || groupIndex <= 0 || !groupPaths.length) {
+        return false;
+    }
+    var groupFields = new Set();
+    groupPaths.forEach(function (pathValue) {
+        var normalizedPath = normalizeOptionalString(pathValue);
+        if (!normalizedPath) {
+            return;
+        }
+        groupFields.add(normalizedPath);
+        var rootSegment = normalizedPath.split('.')[0];
+        if (rootSegment) {
+            groupFields.add(rootSegment);
+        }
+    });
+    if (!groupFields.size) {
+        return false;
+    }
+    var stageKeys = ['$addFields', '$set', '$project'];
+    for (var i = groupIndex - 1; i >= 0; i -= 1) {
+        var stage = pipeline[i];
+        if (!stage || typeof stage !== 'object') {
+            continue;
+        }
+        try {
+            for (var stageKeys_1 = (e_16 = 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_17 = 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;
+                        }
+                        if (hasAssistantDateGroupingOperator(payload[groupField])) {
+                            return true;
+                        }
+                    }
+                }
+                catch (e_17_1) { e_17 = { error: e_17_1 }; }
+                finally {
+                    try {
+                        if (groupFields_1_1 && !groupFields_1_1.done && (_b = groupFields_1.return)) _b.call(groupFields_1);
+                    }
+                    finally { if (e_17) throw e_17.error; }
+                }
+            }
+        }
+        catch (e_16_1) { e_16 = { error: e_16_1 }; }
+        finally {
+            try {
+                if (stageKeys_1_1 && !stageKeys_1_1.done && (_a = stageKeys_1.return)) _a.call(stageKeys_1);
+            }
+            finally { if (e_16) throw e_16.error; }
+        }
+    }
+    return false;
+}
+function isAssistantTimeGroupedAggregatePipeline(pipeline) {
+    if (!Array.isArray(pipeline) || !pipeline.length) {
+        return false;
+    }
+    var groupIndex = findAggregateGroupIndex(pipeline);
+    if (groupIndex === -1) {
+        return false;
+    }
+    var groupStage = pipeline[groupIndex];
+    var groupPayload = groupStage === null || groupStage === void 0 ? void 0 : groupStage.$group;
+    if (!groupPayload || typeof groupPayload !== 'object') {
+        return false;
+    }
+    var groupPaths = extractGroupFieldPaths(groupPayload);
+    if (groupPaths.some(function (field) { return /(date|time|created|updated|paid|invoice|timestamp|_at|month|quarter|week|year|day)/i.test(field); })) {
+        return true;
+    }
+    if (hasAssistantDateGroupingOperator(groupPayload === null || groupPayload === void 0 ? void 0 : groupPayload._id)) {
+        return true;
+    }
+    return isGroupFieldDerivedFromDateExpression(pipeline, groupIndex, groupPaths);
+}
+function isAssistantDirectiveDated(directive) {
+    var _a;
+    if (!directive || directive.type !== 'aggregate') {
+        return false;
+    }
+    var pipeline = Array.isArray((_a = directive.payload) === null || _a === void 0 ? void 0 : _a.pipeline) ? directive.payload.pipeline : [];
+    return isAssistantTimeGroupedAggregatePipeline(pipeline);
+}
 function findCommonPathPrefix(paths) {
     var _a;
     if (!paths.length) {
@@ -7387,7 +7974,7 @@ function isRegexMatchCondition(value) {
     return false;
 }
 function findRegexMatchInMatchObject(match, prefix) {
-    var e_16, _a, e_17, _b;
+    var e_18, _a, e_19, _b;
     if (prefix === void 0) { prefix = ''; }
     if (Array.isArray(match)) {
         try {
@@ -7399,12 +7986,12 @@ function findRegexMatchInMatchObject(match, prefix) {
                 }
             }
         }
-        catch (e_16_1) { e_16 = { error: e_16_1 }; }
+        catch (e_18_1) { e_18 = { error: e_18_1 }; }
         finally {
             try {
                 if (match_1_1 && !match_1_1.done && (_a = match_1.return)) _a.call(match_1);
             }
-            finally { if (e_16) throw e_16.error; }
+            finally { if (e_18) throw e_18.error; }
         }
         return null;
     }
@@ -7435,12 +8022,12 @@ function findRegexMatchInMatchObject(match, prefix) {
             }
         }
     }
-    catch (e_17_1) { e_17 = { error: e_17_1 }; }
+    catch (e_19_1) { e_19 = { error: e_19_1 }; }
     finally {
         try {
             if (keys_2_1 && !keys_2_1.done && (_b = keys_2.return)) _b.call(keys_2);
         }
-        finally { if (e_17) throw e_17.error; }
+        finally { if (e_19) throw e_19.error; }
     }
     return null;
 }
@@ -7664,7 +8251,7 @@ function collectMatchFieldsByCondition(match, predicate, prefix) {
     return results;
 }
 function findMatchConditionForField(match, targetField, prefix) {
-    var e_18, _a, e_19, _b;
+    var e_20, _a, e_21, _b;
     if (prefix === void 0) { prefix = ''; }
     if (!match || typeof match !== 'object') {
         return undefined;
@@ -7679,12 +8266,12 @@ function findMatchConditionForField(match, targetField, prefix) {
                 }
             }
         }
-        catch (e_18_1) { e_18 = { error: e_18_1 }; }
+        catch (e_20_1) { e_20 = { error: e_20_1 }; }
         finally {
             try {
                 if (match_2_1 && !match_2_1.done && (_a = match_2.return)) _a.call(match_2);
             }
-            finally { if (e_18) throw e_18.error; }
+            finally { if (e_20) throw e_20.error; }
         }
         return undefined;
     }
@@ -7711,12 +8298,12 @@ function findMatchConditionForField(match, targetField, prefix) {
             }
         }
     }
-    catch (e_19_1) { e_19 = { error: e_19_1 }; }
+    catch (e_21_1) { e_21 = { error: e_21_1 }; }
     finally {
         try {
             if (_d && !_d.done && (_b = _c.return)) _b.call(_c);
         }
-        finally { if (e_19) throw e_19.error; }
+        finally { if (e_21) throw e_21.error; }
     }
     return undefined;
 }
@@ -7759,7 +8346,7 @@ function detectIdLikeValue(value) {
     return false;
 }
 function detectChemicalIdFromProbe(probeDocs, fields) {
-    var e_20, _a, e_21, _b;
+    var e_22, _a, e_23, _b;
     if (!Array.isArray(probeDocs) || !probeDocs.length) {
         return false;
     }
@@ -7771,7 +8358,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_21 = 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_23 = 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)) {
@@ -7784,21 +8371,21 @@ function detectChemicalIdFromProbe(probeDocs, fields) {
                     }
                 }
             }
-            catch (e_21_1) { e_21 = { error: e_21_1 }; }
+            catch (e_23_1) { e_23 = { error: e_23_1 }; }
             finally {
                 try {
                     if (targets_1_1 && !targets_1_1.done && (_b = targets_1.return)) _b.call(targets_1);
                 }
-                finally { if (e_21) throw e_21.error; }
+                finally { if (e_23) throw e_23.error; }
             }
         }
     }
-    catch (e_20_1) { e_20 = { error: e_20_1 }; }
+    catch (e_22_1) { e_22 = { error: e_22_1 }; }
     finally {
         try {
             if (probeDocs_1_1 && !probeDocs_1_1.done && (_a = probeDocs_1.return)) _a.call(probeDocs_1);
         }
-        finally { if (e_20) throw e_20.error; }
+        finally { if (e_22) throw e_22.error; }
     }
     return false;
 }
@@ -8019,8 +8606,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_7, candidates_2, candidates_2_1, candidate, state_5, e_22_1;
-        var e_22, _a;
+        var query, db, dbName, idClient, idCustomer, isSuperAdmin, probeDocs, chemicalFields, targetField, condition, regex, sampleDocs, collectionNames, candidates, _loop_7, candidates_2, candidates_2_1, candidate, state_5, e_24_1;
+        var e_24, _a;
         var _b;
         return __generator(this, function (_c) {
             switch (_c.label) {
@@ -8133,14 +8720,14 @@ function applyChemicalNameLookupFallbackToQuery(params) {
                     return [3 /*break*/, 3];
                 case 6: return [3 /*break*/, 9];
                 case 7:
-                    e_22_1 = _c.sent();
-                    e_22 = { error: e_22_1 };
+                    e_24_1 = _c.sent();
+                    e_24 = { error: e_24_1 };
                     return [3 /*break*/, 9];
                 case 8:
                     try {
                         if (candidates_2_1 && !candidates_2_1.done && (_a = candidates_2.return)) _a.call(candidates_2);
                     }
-                    finally { if (e_22) throw e_22.error; }
+                    finally { if (e_24) throw e_24.error; }
                     return [7 /*endfinally*/];
                 case 9: return [2 /*return*/, null];
             }
@@ -8234,8 +8821,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_3, candidates_3_1, candidate, candidateHasClientScope, _b, candidateProbe, lookup, targetFieldType, normalizedIds, idsForQuery, e_23_1, e_24_1;
-        var e_24, _c, e_23, _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_3, candidates_3_1, candidate, candidateHasClientScope, _b, candidateProbe, lookup, targetFieldType, normalizedIds, idsForQuery, e_25_1, e_26_1;
+        var e_26, _c, e_25, _d;
         var _e;
         return __generator(this, function (_f) {
             switch (_f.label) {
@@ -8305,7 +8892,7 @@ function applyIdLookupFallbackToQuery(params) {
                     _f.label = 5;
                 case 5:
                     _f.trys.push([5, 14, 15, 16]);
-                    candidates_3 = (e_23 = void 0, __values(candidates)), candidates_3_1 = candidates_3.next();
+                    candidates_3 = (e_25 = void 0, __values(candidates)), candidates_3_1 = candidates_3.next();
                     _f.label = 6;
                 case 6:
                     if (!!candidates_3_1.done) return [3 /*break*/, 13];
@@ -8372,28 +8959,28 @@ function applyIdLookupFallbackToQuery(params) {
                     return [3 /*break*/, 6];
                 case 13: return [3 /*break*/, 16];
                 case 14:
-                    e_23_1 = _f.sent();
-                    e_23 = { error: e_23_1 };
+                    e_25_1 = _f.sent();
+                    e_25 = { error: e_25_1 };
                     return [3 /*break*/, 16];
                 case 15:
                     try {
                         if (candidates_3_1 && !candidates_3_1.done && (_d = candidates_3.return)) _d.call(candidates_3);
                     }
-                    finally { if (e_23) throw e_23.error; }
+                    finally { if (e_25) throw e_25.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_24_1 = _f.sent();
-                    e_24 = { error: e_24_1 };
+                    e_26_1 = _f.sent();
+                    e_26 = { error: e_26_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_24) throw e_24.error; }
+                    finally { if (e_26) throw e_26.error; }
                     return [7 /*endfinally*/];
                 case 20: return [2 /*return*/, null];
             }
@@ -8479,12 +9066,12 @@ function replaceAggregateDateField(pipeline, fromField, toField) {
             return value;
         }
         if (value && typeof value === 'object') {
-            var next_2 = {};
+            var next_3 = {};
             Object.keys(value).forEach(function (key) {
                 var nextKey = key === fromField ? toField : key;
-                next_2[nextKey] = replacer(value[key]);
+                next_3[nextKey] = replacer(value[key]);
             });
-            return next_2;
+            return next_3;
         }
         if (typeof value === 'string') {
             var fromRef = "$".concat(fromField);
@@ -9245,7 +9832,7 @@ function resolveAssistantReportBuilderBridgeCollection(collection) {
     throw new Error('AI assistant report builder bridge: Collection is not configured for report builder.');
 }
 function findQueryDateField(query) {
-    var e_25, _a, e_26, _b;
+    var e_27, _a, e_28, _b;
     if (!query || typeof query !== 'object') {
         return null;
     }
@@ -9259,12 +9846,12 @@ function findQueryDateField(query) {
                 }
             }
         }
-        catch (e_25_1) { e_25 = { error: e_25_1 }; }
+        catch (e_27_1) { e_27 = { error: e_27_1 }; }
         finally {
             try {
                 if (query_1_1 && !query_1_1.done && (_a = query_1.return)) _a.call(query_1);
             }
-            finally { if (e_25) throw e_25.error; }
+            finally { if (e_27) throw e_27.error; }
         }
         return null;
     }
@@ -9283,12 +9870,12 @@ function findQueryDateField(query) {
             }
         }
     }
-    catch (e_26_1) { e_26 = { error: e_26_1 }; }
+    catch (e_28_1) { e_28 = { error: e_28_1 }; }
     finally {
         try {
             if (_d && !_d.done && (_b = _c.return)) _b.call(_c);
         }
-        finally { if (e_26) throw e_26.error; }
+        finally { if (e_28) throw e_28.error; }
     }
     return null;
 }
@@ -9326,7 +9913,7 @@ function extractDateRangeConditions(query) {
     });
     return results;
 }
-function expandQueryDateFallbacks(query) {
+function expandQueryDateFallbacks(query, schemaFields) {
     if (!query || typeof query !== 'object') {
         return null;
     }
@@ -9359,21 +9946,16 @@ function expandQueryDateFallbacks(query) {
             }
             var dateConditions = extractDateRangeConditions(entry);
             dateConditions.forEach(function (condition) {
-                var fallback = AI_ASSISTANT_DATE_FALLBACKS[condition.field];
-                if (fallback && !existingFields.has(fallback)) {
-                    extended = __spreadArray(__spreadArray([], __read(extended), false), [replaceQueryField(entry, condition.field, fallback)], false);
-                    existingFields.add(fallback);
-                    pushField(fallback);
-                }
+                var expansions = buildDateFieldExpansionList(condition.field, schemaFields);
+                expansions.forEach(function (field) {
+                    if (existingFields.has(field)) {
+                        return;
+                    }
+                    extended = __spreadArray(__spreadArray([], __read(extended), false), [replaceQueryField(entry, condition.field, field)], false);
+                    existingFields.add(field);
+                    pushField(field);
+                });
             });
-            if (!existingFields.has('date_original')) {
-                var candidate = dateConditions.find(function (condition) { return condition.field.startsWith('date_') && condition.field !== 'date_original'; });
-                if (candidate) {
-                    extended = __spreadArray(__spreadArray([], __read(extended), false), [replaceQueryField(entry, candidate.field, 'date_original')], false);
-                    existingFields.add('date_original');
-                    pushField('date_original');
-                }
-            }
         });
         return extended;
     };
@@ -9417,11 +9999,12 @@ function expandQueryDateFallbacks(query) {
     }
     return { query: result.value, fields: addedFields };
 }
-function buildDateFieldExpansionList(field) {
+function buildDateFieldExpansionList(field, schemaFields) {
     var normalized = normalizeOptionalString(field);
     if (!normalized) {
         return [];
     }
+    var normalizedLower = normalized.toLowerCase();
     var expansions = new Set();
     var add = function (value) {
         if (value && value !== normalized) {
@@ -9432,15 +10015,46 @@ function buildDateFieldExpansionList(field) {
     if (fallback) {
         add(fallback);
     }
-    if (normalized.startsWith('date_') || normalized === 'date' || normalized.endsWith('_date')) {
+    if (normalizedLower.startsWith('date_')
+        || normalizedLower === 'date'
+        || normalizedLower.endsWith('_date')
+        || normalizedLower.includes('_date_')) {
         AI_ASSISTANT_DATE_EXPANSION_FIELDS.forEach(add);
     }
-    if (normalized === 'createdAt' || normalized === 'updatedAt') {
+    if (normalizedLower === 'createdat' || normalizedLower === 'updatedat') {
         AI_ASSISTANT_DATE_EXPANSION_FIELDS.forEach(add);
     }
+    var normalizedSchemaFields = Array.isArray(schemaFields)
+        ? schemaFields
+            .map(function (value) { return normalizeOptionalString(value); })
+            .filter(Boolean)
+        : [];
+    if (normalizedSchemaFields.length) {
+        var dateFieldPattern_1 = /(^|\.)(date($|_)|createdat$|updatedat$|[a-z0-9_]+_at$|[a-z0-9_]+_date$|[a-z0-9_]+_date_[a-z0-9_]*$)/i;
+        var addedFromSchema_1 = 0;
+        normalizedSchemaFields.forEach(function (schemaField) {
+            if (addedFromSchema_1 >= AI_ASSISTANT_DATE_EXPANSION_SCHEMA_MAX_FIELDS) {
+                return;
+            }
+            if (schemaField.includes('$')) {
+                return;
+            }
+            if (!dateFieldPattern_1.test(schemaField)) {
+                return;
+            }
+            if (schemaField === normalized) {
+                return;
+            }
+            var beforeSize = expansions.size;
+            add(schemaField);
+            if (expansions.size > beforeSize) {
+                addedFromSchema_1 += 1;
+            }
+        });
+    }
     return Array.from(expansions);
 }
-function expandAggregateDateMatchFallback(pipeline) {
+function expandAggregateDateMatchFallback(pipeline, schemaFields) {
     if (!Array.isArray(pipeline)) {
         return null;
     }
@@ -9473,7 +10087,7 @@ function expandAggregateDateMatchFallback(pipeline) {
             }
             var conditions = extractDateRangeConditions(entry);
             conditions.forEach(function (condition) {
-                var expansions = buildDateFieldExpansionList(condition.field);
+                var expansions = buildDateFieldExpansionList(condition.field, schemaFields);
                 expansions.forEach(function (field) {
                     if (existingFields.has(field)) {
                         return;
@@ -9510,7 +10124,7 @@ function resolveQueryDateFieldFallback(query) {
     return { from: dateField, to: fallback };
 }
 function containsForbiddenMongoOperators(value) {
-    var e_27, _a;
+    var e_29, _a;
     if (!value || typeof value !== 'object') {
         return false;
     }
@@ -9529,12 +10143,12 @@ function containsForbiddenMongoOperators(value) {
             }
         }
     }
-    catch (e_27_1) { e_27 = { error: e_27_1 }; }
+    catch (e_29_1) { e_29 = { error: e_29_1 }; }
     finally {
         try {
             if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
         }
-        finally { if (e_27) throw e_27.error; }
+        finally { if (e_29) throw e_29.error; }
     }
     return false;
 }
@@ -9969,8 +10583,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_28_1;
-        var _e, e_28, _f, _g;
+        var _a, _b, _c, _d, message, payload, status_1, e_30_1;
+        var _e, e_30, _f, _g;
         return __generator(this, function (_h) {
             switch (_h.label) {
                 case 0:
@@ -9997,8 +10611,8 @@ function waitForCodexWorkerMessage(worker, streamStatusHandler) {
                     return [3 /*break*/, 1];
                 case 4: return [3 /*break*/, 11];
                 case 5:
-                    e_28_1 = _h.sent();
-                    e_28 = { error: e_28_1 };
+                    e_30_1 = _h.sent();
+                    e_30 = { error: e_30_1 };
                     return [3 /*break*/, 11];
                 case 6:
                     _h.trys.push([6, , 9, 10]);
@@ -10009,7 +10623,7 @@ function waitForCodexWorkerMessage(worker, streamStatusHandler) {
                     _h.label = 8;
                 case 8: return [3 /*break*/, 10];
                 case 9:
-                    if (e_28) throw e_28.error;
+                    if (e_30) throw e_30.error;
                     return [7 /*endfinally*/];
                 case 10: return [7 /*endfinally*/];
                 case 11: throw new CodexWorkerBootstrapError('Codex worker exited before completing.');
@@ -10437,9 +11051,19 @@ var AI_ASSISTANT_DATA_REQUEST_PATTERNS = [
     /\bmissing\b/,
     /\bgroup(ed)? by\b/,
     /\bbreakdown\b/,
+    /\bby day\b/,
+    /\bby week\b/,
+    /\bby month\b/,
+    /\bby quarter\b/,
+    /\bby year\b/,
+    /\bby (time|date)\s+period\b/,
     /\bper day\b/,
     /\bper week\b/,
-    /\bper month\b/
+    /\bper month\b/,
+    /\bper quarter\b/,
+    /\bper year\b/,
+    /\bover the last\b/,
+    /\bpast\s+\d+\b/
 ];
 var AI_ASSISTANT_NAVIGATION_REQUEST_PATTERNS = [
     /\bwhere\b/,
@@ -10592,13 +11216,79 @@ function classifyAssistantRequestType(message, plannerOutput) {
         plannerIntentType: plannerIntentRaw || undefined
     };
 }
-function buildAssistantCodexDirectivePrompt(message, attachmentText, historyText, contextText) {
+function resolveAssistantRequestedTimeGrain(message, plannerOutput) {
+    var _a, _b;
+    var plannerGrain = normalizeOptionalString((_b = (_a = plannerOutput === null || plannerOutput === void 0 ? void 0 : plannerOutput.dataPlan) === null || _a === void 0 ? void 0 : _a.timeRange) === null || _b === void 0 ? void 0 : _b.grain).toLowerCase();
+    if (plannerGrain === 'day' || plannerGrain === 'week' || plannerGrain === 'month' || plannerGrain === 'quarter' || plannerGrain === 'year') {
+        return plannerGrain;
+    }
+    var text = normalizeOptionalString(message).toLowerCase();
+    if (!text) {
+        return null;
+    }
+    var mapping = [
+        { grain: 'quarter', pattern: /\b(quarter|quarters|quarterly|qoq)\b/i },
+        { grain: 'month', pattern: /\b(month|months|monthly|mom)\b/i },
+        { grain: 'week', pattern: /\b(week|weeks|weekly|wow)\b/i },
+        { grain: 'day', pattern: /\b(day|days|daily)\b/i },
+        { grain: 'year', pattern: /\b(year|years|yearly|yoy)\b/i }
+    ];
+    var match = mapping.find(function (entry) { return entry.pattern.test(text); });
+    return (match === null || match === void 0 ? void 0 : match.grain) || null;
+}
+function hasAssistantDatedLanguage(message) {
+    var text = normalizeOptionalString(message).toLowerCase();
+    if (!text) {
+        return false;
+    }
+    var patterns = [
+        /\b(by|per)\s+(day|week|month|quarter|year|time\s*period|date\s*period)\b/i,
+        /\b(over|across)\s+time\b/i,
+        /\btime\s*series\b/i,
+        /\btrend(?:ing|s)?\b/i,
+        /\b(last|past|previous|recent)\s+(?:\d+|one|two|three|four|five|six|seven|eight|nine|ten|eleven|twelve)\s+(day|week|month|quarter|year)s?\b/i,
+        /\bover\s+the\s+last\s+(?:\d+|one|two|three|four|five|six|seven|eight|nine|ten|eleven|twelve)\s+(day|week|month|quarter|year)s?\b/i,
+        /\bmonth\s+over\s+month\b/i,
+        /\bquarter\s+over\s+quarter\b/i,
+        /\byear\s+over\s+year\b/i
+    ];
+    return patterns.some(function (pattern) { return pattern.test(text); });
+}
+function shouldEnforceAssistantDatedDirective(message, plannerOutput, requestClassification) {
+    if (!(requestClassification === null || requestClassification === void 0 ? void 0 : requestClassification.dataQuestion)) {
+        return false;
+    }
+    if (resolveAssistantRequestedTimeGrain(message, plannerOutput)) {
+        return true;
+    }
+    return hasAssistantDatedLanguage(message);
+}
+function buildAssistantDirectiveStyleHint(params) {
+    if (!params.enforceDated) {
+        return '';
+    }
+    var grainLabel = params.requestedTimeGrain || 'time period';
+    return [
+        'Report style intent: Dated.',
+        "Requested time grain: ".concat(grainLabel, "."),
+        '- Return REPORT_BUILDER_AGG (not REPORT_BUILDER_READ).',
+        '- Ensure the pipeline groups by the requested time grain and requested breakdown dimensions.',
+        '- For "last/past N" windows, use full completed calendar-period bounds in UTC unless the user asks for period-to-date.',
+        params.strict ? '- STRICT: if unsure, still prefer REPORT_BUILDER_AGG.' : ''
+    ].filter(Boolean).join('\n');
+}
+function buildAssistantCodexDirectivePrompt(message, attachmentText, historyText, contextText, directiveStyleHintText, mode) {
+    if (mode === void 0) { mode = 'any'; }
     var trimmedContext = normalizeOptionalString(contextText);
     var contextBlock = trimmedContext ? "\n\nContext:\n".concat(trimmedContext) : '';
     var trimmedHistory = normalizeOptionalString(historyText);
     var historyBlock = trimmedHistory ? "\n\nConversation so far:\n".concat(trimmedHistory) : '';
-    var instruction = '\n\nInstruction:\nReturn ONLY a single REPORT_BUILDER_READ or REPORT_BUILDER_AGG directive line. Do not include any other text.';
-    return "System:\n".concat(AI_ASSISTANT_SYSTEM_PROMPT).concat(contextBlock).concat(historyBlock, "\n\nUser:\n").concat(message).concat(attachmentText || '').concat(instruction).trim();
+    var trimmedStyleHint = normalizeOptionalString(directiveStyleHintText);
+    var styleHintBlock = trimmedStyleHint ? "\n\nDirective style hints:\n".concat(trimmedStyleHint) : '';
+    var instruction = mode === 'aggregate_only'
+        ? '\n\nInstruction:\nReturn ONLY a single REPORT_BUILDER_AGG directive line. Do not include any other text.'
+        : '\n\nInstruction:\nReturn ONLY a single REPORT_BUILDER_READ or REPORT_BUILDER_AGG directive line. Do not include any other text.';
+    return "System:\n".concat(AI_ASSISTANT_SYSTEM_PROMPT).concat(contextBlock).concat(historyBlock).concat(styleHintBlock, "\n\nUser:\n").concat(message).concat(attachmentText || '').concat(instruction).trim();
 }
 function buildAssistantCodexPrompt(message, attachmentText, historyText, contextText) {
     var trimmedContext = normalizeOptionalString(contextText);
@@ -10615,7 +11305,7 @@ function resolveAssistantPlannerEnabled() {
     return raw === undefined ? true : raw === true;
 }
 function resolveAssistantPlannerKnownRoutes() {
-    var e_29, _a;
+    var e_31, _a;
     var _b;
     var routes = ((_b = resolveio_server_app_1.ResolveIOServer.getClientRoutes) === null || _b === void 0 ? void 0 : _b.call(resolveio_server_app_1.ResolveIOServer)) || [];
     var unique = new Set();
@@ -10628,12 +11318,12 @@ function resolveAssistantPlannerKnownRoutes() {
             }
         }
     }
-    catch (e_29_1) { e_29 = { error: e_29_1 }; }
+    catch (e_31_1) { e_31 = { error: e_31_1 }; }
     finally {
         try {
             if (routes_1_1 && !routes_1_1.done && (_a = routes_1.return)) _a.call(routes_1);
         }
-        finally { if (e_29) throw e_29.error; }
+        finally { if (e_31) throw e_31.error; }
     }
     return Array.from(unique).slice(0, AI_ASSISTANT_PLANNER_MAX_ROUTES);
 }
@@ -10876,7 +11566,7 @@ function normalizeRouteMatchKey(value) {
     return normalizeRouteKey(value).toLowerCase();
 }
 function buildClientRouteIndex() {
-    var e_30, _a;
+    var e_32, _a;
     var _b;
     var routes = ((_b = resolveio_server_app_1.ResolveIOServer.getClientRoutes) === null || _b === void 0 ? void 0 : _b.call(resolveio_server_app_1.ResolveIOServer)) || [];
     var set = new Set();
@@ -10895,12 +11585,12 @@ function buildClientRouteIndex() {
             }
         }
     }
-    catch (e_30_1) { e_30 = { error: e_30_1 }; }
+    catch (e_32_1) { e_32 = { error: e_32_1 }; }
     finally {
         try {
             if (routes_2_1 && !routes_2_1.done && (_a = routes_2.return)) _a.call(routes_2);
         }
-        finally { if (e_30) throw e_30.error; }
+        finally { if (e_32) throw e_32.error; }
     }
     return { set: set, map: map, size: routes.length };
 }
@@ -11041,7 +11731,7 @@ function sanitizeAssistantResponse(value) {
     return normalizeAssistantRoutes(normalizedCurrency);
 }
 function evaluateAssistantGuardrails(message) {
-    var e_31, _a;
+    var e_33, _a;
     var normalized = String(message || '').toLowerCase();
     var patterns = [
         {
@@ -11087,12 +11777,12 @@ function evaluateAssistantGuardrails(message) {
             }
         }
     }
-    catch (e_31_1) { e_31 = { error: e_31_1 }; }
+    catch (e_33_1) { e_33 = { error: e_33_1 }; }
     finally {
         try {
             if (patterns_1_1 && !patterns_1_1.done && (_a = patterns_1.return)) _a.call(patterns_1);
         }
-        finally { if (e_31) throw e_31.error; }
+        finally { if (e_33) throw e_33.error; }
     }
     return null;
 }
@@ -11207,7 +11897,7 @@ function tokenizeArithmeticExpression(expression) {
     return tokens;
 }
 function evaluateArithmeticExpression(expression) {
-    var e_32, _a, e_33, _b;
+    var e_34, _a, e_35, _b;
     var tokens = tokenizeArithmeticExpression(expression);
     if (!tokens || !tokens.length) {
         return null;
@@ -11264,12 +11954,12 @@ function evaluateArithmeticExpression(expression) {
             prevToken = token;
         }
     }
-    catch (e_32_1) { e_32 = { error: e_32_1 }; }
+    catch (e_34_1) { e_34 = { error: e_34_1 }; }
     finally {
         try {
             if (tokens_1_1 && !tokens_1_1.done && (_a = tokens_1.return)) _a.call(tokens_1);
         }
-        finally { if (e_32) throw e_32.error; }
+        finally { if (e_34) throw e_34.error; }
     }
     while (ops.length) {
         var op = ops.pop();
@@ -11309,12 +11999,12 @@ function evaluateArithmeticExpression(expression) {
             stack.push(Number(token));
         }
     }
-    catch (e_33_1) { e_33 = { error: e_33_1 }; }
+    catch (e_35_1) { e_35 = { error: e_35_1 }; }
     finally {
         try {
             if (output_1_1 && !output_1_1.done && (_b = output_1.return)) _b.call(output_1);
         }
-        finally { if (e_33) throw e_33.error; }
+        finally { if (e_35) throw e_35.error; }
     }
     if (stack.length !== 1 || Number.isNaN(stack[0])) {
         return null;
@@ -11498,8 +12188,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_34_1;
-        var e_34, _b;
+        var limits, totalBytes, totalChars, chunks, cleaned, attachments_1, attachments_1_1, attachment, localPath, safe, stat, ext, name_1, type, readable, content, _a, e_36_1;
+        var e_36, _b;
         return __generator(this, function (_c) {
             switch (_c.label) {
                 case 0:
@@ -11578,14 +12268,14 @@ function readAttachmentContents(attachments) {
                     return [3 /*break*/, 2];
                 case 10: return [3 /*break*/, 13];
                 case 11:
-                    e_34_1 = _c.sent();
-                    e_34 = { error: e_34_1 };
+                    e_36_1 = _c.sent();
+                    e_36 = { error: e_36_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_34) throw e_34.error; }
+                    finally { if (e_36) throw e_36.error; }
                     return [7 /*endfinally*/];
                 case 13: return [2 /*return*/, {
                         promptText: chunks.length ? "\n\nAttachments:\n".concat(chunks.join('\n\n')) : '',
@@ -11826,7 +12516,7 @@ function estimateUsage(messages, responseText, model) {
     };
 }
 function evaluateGuardrails(message) {
-    var e_35, _a;
+    var e_37, _a;
     var normalized = String(message || '').toLowerCase();
     var patterns = [
         { pattern: /\b(source\s*code|full\s*code|entire\s*code|repo\s*dump|repository|git\s*clone)\b/i, reason: 'Code access is restricted.' },
@@ -11848,12 +12538,12 @@ function evaluateGuardrails(message) {
             }
         }
     }
-    catch (e_35_1) { e_35 = { error: e_35_1 }; }
+    catch (e_37_1) { e_37 = { error: e_37_1 }; }
     finally {
         try {
             if (patterns_2_1 && !patterns_2_1.done && (_a = patterns_2.return)) _a.call(patterns_2);
         }
-        finally { if (e_35) throw e_35.error; }
+        finally { if (e_37) throw e_37.error; }
     }
     return null;
 }