@resolveio/server-lib 20.15.8 → 20.16.0

package/methods/ai-terminal.js

@@ -109,16 +109,21 @@ exports.loadAiTerminalMethods = loadAiTerminalMethods;
 exports.executeAiAssistantMongoRead = executeAiAssistantMongoRead;
 exports.executeAiAssistantMongoAggregate = executeAiAssistantMongoAggregate;
 exports.extractAssistantMongoDirective = extractAssistantMongoDirective;
+exports.normalizeIdsForTargetField = normalizeIdsForTargetField;
 exports.serializeMongoValue = serializeMongoValue;
 exports.flattenForTable = flattenForTable;
 exports.buildDisplayTable = buildDisplayTable;
 exports.formatDisplayTableMarkdown = formatDisplayTableMarkdown;
+exports.stripQueryFieldPathsDeep = stripQueryFieldPathsDeep;
+exports.stripScopedFieldsFromPipeline = stripScopedFieldsFromPipeline;
+exports.rewriteEmbeddedMatchObjects = rewriteEmbeddedMatchObjects;
 var fs_1 = require("fs");
 var events_1 = require("events");
 var os = require("os");
 var path = require("path");
 var promises_1 = require("timers/promises");
 var worker_threads_1 = require("worker_threads");
+var mongodb_1 = require("mongodb");
 var simpl_schema_1 = require("simpl-schema");
 var resolveio_server_app_1 = require("../resolveio-server-app");
 var user_collection_1 = require("../collections/user.collection");
@@ -142,9 +147,17 @@ var AI_ASSISTANT_TOOL_MAX_STEPS = 1;
 var AI_ASSISTANT_DISPLAY_MAX_COLUMNS = 12;
 var AI_ASSISTANT_DISPLAY_PREVIEW_MAX_ROWS = 20;
 var AI_ASSISTANT_DISPLAY_STRING_LIMIT = 160;
+var AI_ASSISTANT_ID_DISPLAY_LOOKUP_MAX_FIELDS = 4;
+var AI_ASSISTANT_ID_DISPLAY_LOOKUP_MAX_IDS = 60;
+var AI_ASSISTANT_ID_DISPLAY_LOOKUP_MAX_COLLECTIONS = 3;
 var AI_ASSISTANT_PROGRESS_PLACEHOLDER = 'Planning...';
 var AI_ASSISTANT_PROGRESS_TICK_MS = 5000;
 var AI_ASSISTANT_READ_PREFERENCE = 'secondary';
+var AI_ASSISTANT_PROBE_LIMIT = 3;
+var AI_ASSISTANT_COLLECTION_OVERRIDE_SCORE_GAP = 20;
+var AI_ASSISTANT_COLLECTION_OVERRIDE_MIN_SCORE = 20;
+var AI_ASSISTANT_ID_LOOKUP_MAX_RESULTS = 20;
+var AI_ASSISTANT_ID_LOOKUP_CANDIDATE_LIMIT = 4;
 var AI_ASSISTANT_NAME_MATCH_FALLBACK_MAX_FIELDS = 12;
 var AI_ASSISTANT_PROGRESS_TICKS = [
     'Grabbing Data',
@@ -176,6 +189,15 @@ var AI_ASSISTANT_DATE_FALLBACKS = {
     date_invoice: 'date_invoiced',
     date_invoiced: 'date_invoice'
 };
+var AI_ASSISTANT_DATE_EXPANSION_FIELDS = [
+    'date',
+    'date_start',
+    'date_end',
+    'date_original',
+    'date_created',
+    'createdAt',
+    'updatedAt'
+];
 var AI_ASSISTANT_BLOCKED_COLLECTIONS = new Set([
     'user-groups',
     'logged-in-users',
@@ -202,6 +224,7 @@ var AI_ASSISTANT_SENSITIVE_FIELDS = [
     'roles'
 ];
 var AI_ASSISTANT_CLIENT_SCOPE_CACHE = new Map();
+var AI_ASSISTANT_FIELD_INDEX_CACHE = new Map();
 var AI_ASSISTANT_COLLECTION_CACHE = new Map();
 var AI_ASSISTANT_COLLECTION_CACHE_TTL_MS = 5 * 60 * 1000;
 var AI_ASSISTANT_COLLECTION_STOPWORDS = new Set([
@@ -247,11 +270,72 @@ var AI_ASSISTANT_COLLECTION_STOPWORDS = new Set([
     'missing',
     'overdue'
 ]);
+var AI_ASSISTANT_COLLECTION_DOMAIN_TOKENS = new Set([
+    'blend',
+    'blends',
+    'chemical',
+    'chemicals',
+    'invoice',
+    'invoices',
+    'work',
+    'order',
+    'orders',
+    'delivery',
+    'deliveries',
+    'truck',
+    'treating',
+    'route',
+    'routes',
+    'well',
+    'wells',
+    'sample',
+    'samples',
+    'customer',
+    'customers'
+]);
+var AI_ASSISTANT_COLLECTION_GENERIC_TOKENS = new Set([
+    'ticket',
+    'tickets',
+    'report',
+    'reports',
+    'summary',
+    'summarize',
+    'recent',
+    'last',
+    'new',
+    'created',
+    'date',
+    'list',
+    'show'
+]);
+var AI_ASSISTANT_FIELD_TOKEN_SYNONYMS = {
+    volume: ['quantity', 'qty', 'amount', 'gallons', 'gallon', 'liters', 'liter', 'litre'],
+    quantity: ['volume', 'qty', 'amount', 'gallons', 'gallon'],
+    product: ['item', 'chemical', 'material', 'blend', 'name', 'title', 'label'],
+    customer: ['client', 'account', 'company'],
+    well: ['location', 'site', 'pad', 'api'],
+    batch: ['lot'],
+    lot: ['batch'],
+    date: ['created', 'createdat', 'created_at', 'date_created', 'updated', 'updatedat', 'updated_at', 'date_updated'],
+    total: ['sum', 'amount', 'total_amount', 'total_quantity']
+};
+var AI_ASSISTANT_ID_LOOKUP_HINTS = {
+    customer: ['customers', 'customer-versions'],
+    chemical: ['chemicals', 'chemical-versions'],
+    well: ['wells', 'well-groups', 'production-locations', 'locations'],
+    location: ['locations', 'production-locations'],
+    invoice: ['invoices']
+};
 var AI_ASSISTANT_TERM_SYNONYMS = [
     {
         label: 'truck treating jobs',
         pattern: /\btruck\s+treating\s+jobs?\b/i,
         expansions: ['truck treating deliveries', 'truck-treating-deliveries', 'truck treating route events']
+    },
+    {
+        label: 'blend tickets',
+        pattern: /\bblend(?:ing)?\s+tickets?\b/i,
+        expansions: ['chemical blends', 'chemical-blends', 'report-chemical-blends', 'blend batches']
     }
 ];
 var AI_ASSISTANT_SYSTEM_PROMPT = [
@@ -265,7 +349,9 @@ var AI_ASSISTANT_SYSTEM_PROMPT = [
     '- Do not assist with hacking, bypassing security, or abuse.',
     'Accuracy & tools:',
     '- Step 1 (always): determine the target collections/models/modules/workflows using context, routes, and collection hints. Assume the user is non-technical and will not provide internal names.',
+    '- Never use *.versions collections for normal requests. Only use a .versions collection when explicitly investigating a bug by checking the last ~5 updates.',
     '- Planning stage: regex/keyword scan the codebase for collectionName/model definitions, methods, publications, and Angular routes/modules to map user wording to internal names.',
+    '- If permissionView starts with /report/, prefer the report-* collection when both report and base collections exist.',
     '- Map user wording to internal collections/fields yourself. Do not ask for property names unless required to run a query.',
     '- Use term hints from context (synonym expansions) when mapping user language to collections.',
     '- Do not guess or invent collections/fields. If unsure, verify in the codebase or run a small Mongo read (limit 1-5) to learn the shape.',
@@ -273,11 +359,14 @@ var AI_ASSISTANT_SYSTEM_PROMPT = [
     '- For any data request (counts, lists, breakdowns, recent/last items), you MUST run a MONGO_READ or MONGO_AGG before answering.',
     '- Ask at most one clarifying question only when required to run a query or resolve missing details.',
     '- If a field starts with id_ and refers to another collection, treat it as a foreign key and look up the related record when needed.',
+    '- When resolving id_* fields, prefer lookup definitions from collection schemas/report-builder lookup tables to choose the target collection and name fields.',
     '- When the user provides a customer, well, or chemical name, use case-insensitive regex matching to find it. Assume the name exists and try to match it before asking questions.',
     '- Use the codebase context to choose correct collections/fields/workflows and use MONGO_READ/MONGO_AGG to answer with real data when needed.',
     '- Process (fast path): Queue -> Planning -> Grabbing Data -> Drafting response. Use regex/keyword matching to identify collections/models, draft a minimal query, run the tool, then format a table. This should be fast; avoid extra narration.',
     '- Assume a relevant collection exists; if verification reads return zero data, report no data found instead of interrogating the user.',
     '- Never claim "no data exists" unless you resolved a collection and executed a legitimate query (with fallback date fields when needed) that returned zero rows.',
+    '- If a query returns zero rows, run a tiny probe read (limit 1-3) to validate fields and adjust filters/projection before concluding.',
+    '- For name-based filters, run a quick existence check with only the date filter first; if records exist, adjust name matching (tokenized regex or ID lookup) instead of concluding no data.',
     '- For direct questions, answer first. Ask a single follow-up only if required to proceed.',
     'Data Presentation:',
     '- Output plain Markdown (NO triple backticks).',
@@ -413,6 +502,12 @@ function drainAssistantCodexRunQueue() {
     });
 }
 function loadAiTerminalMethods(methodManager) {
+    var codexWorkerIndex = resolveSingleWorkerTarget(process.env.AI_ASSISTANT_CODEX_WORKER_INDEX
+        || process.env.CODEX_WORKER_INDEX
+        || process.env.WORKER_CODEX_INDEX);
+    var codexWorkerInstance = resolveSingleWorkerTarget(process.env.AI_ASSISTANT_CODEX_WORKER_INSTANCE
+        || process.env.CODEX_WORKER_INSTANCE
+        || process.env.WORKER_CODEX_INSTANCE);
     methodManager.methods({
         aiTerminalConversationCreate: {
             check: new simpl_schema_1.default({
@@ -644,17 +739,12 @@ function loadAiTerminalMethods(methodManager) {
                 });
             }
         },
-        aiCoderTerminalRunCodex: {
-            check: new simpl_schema_1.default({
+        aiCoderTerminalRunCodex: __assign(__assign(__assign({ check: new simpl_schema_1.default({
                 payload: {
                     type: Object,
                     blackbox: true
                 }
-            }),
-            forceWorker: true,
-            maxConcurrencyPerInstance: 1,
-            timeoutOverride: resolveCodexTimeoutMs() + 15000,
-            function: function (payload) {
+            }), forceWorker: true, workerQueue: 'codex' }, (codexWorkerIndex ? { targetWorkerIndex: codexWorkerIndex } : {})), (codexWorkerInstance ? { targetWorkerInstance: codexWorkerInstance } : {})), { maxConcurrencyPerInstance: 1, timeoutOverride: resolveCodexTimeoutMs() + 15000, function: function (payload) {
                 return __awaiter(this, void 0, void 0, function () {
                     return __generator(this, function (_a) {
                         switch (_a.label) {
@@ -663,8 +753,7 @@ function loadAiTerminalMethods(methodManager) {
                         }
                     });
                 });
-            }
-        },
+            } }),
         aiAssistantMongoRead: {
             check: new simpl_schema_1.default({
                 payload: {
@@ -1049,10 +1138,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, dataQuestion, lastDirective, toolResponseDebug, toolError, termHints, collectionHints, collectionTokenization, collectionRanking, collectionSelection, timingBreakdown, contextRoute, contextMode, hintSeed, termExpansion, hintText, baseTokens, expandedTokens, dbName, db, collectionNames, _a, assistantContext, prompt_1, workspaceRoot, codexConfig, runOptions, responseText, directiveText, directive, directivePrompt, directiveStart, forcedDirective, _b, initialStart, directivePrompt, forcedStart, forcedDirective, _c, cleanedResponseText, toolRequest, toolStart, toolResponse, _d, toolPayload, followupPrompt, followupStart, followupText, _e, error_2, error_3, finalNow, finishedAt, codexMs, draftingMs, finalMetadata, finalAssistantDoc;
-                        var _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
-                        return __generator(this, function (_s) {
-                            switch (_s.label) {
+                        var runStart, steps, recordStep, progressTracker, streamProgress, assistantContent, toolResult, assistantDebug, directiveSource, dataQuestion, lastDirective, toolResponseDebug, toolError, termHints, collectionHints, collectionTokenization, collectionRanking, collectionSelection, collectionOverride, collectionNames, timingBreakdown, contextRoute, contextMode, hintSeed, termExpansion, hintText, baseTokens, expandedTokens, baseWeights, expandedWeights, dbName, db, _a, assistantContext, prompt_1, workspaceRoot, codexConfig, runOptions, responseText, directiveText, directive, directivePrompt, directiveStart, forcedDirective, _b, initialStart, directivePrompt, forcedStart, forcedDirective, _c, requestedCollection, cleanedResponseText, effectiveDirective, toolRequest, toolStart, toolResponse, _d, toolPayload, followupPrompt, followupStart, followupText, _e, error_2, error_3, finalNow, finishedAt, codexMs, draftingMs, finalMetadata, finalAssistantDoc;
+                        var _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
+                        return __generator(this, function (_u) {
+                            switch (_u.label) {
                                 case 0:
                                     runStart = Date.now();
                                     steps = [];
@@ -1079,6 +1168,8 @@ function executeAiAssistantCodexRun(payload, context) {
                                     collectionTokenization = null;
                                     collectionRanking = null;
                                     collectionSelection = null;
+                                    collectionOverride = null;
+                                    collectionNames = [];
                                     timingBreakdown = {
                                         directiveMs: 0,
                                         initialResponseMs: 0,
@@ -1089,37 +1180,42 @@ function executeAiAssistantCodexRun(payload, context) {
                                     contextRoute = normalizeOptionalString((_f = input === null || input === void 0 ? void 0 : input.context) === null || _f === void 0 ? void 0 : _f.route);
                                     contextMode = normalizeOptionalString((_g = input === null || input === void 0 ? void 0 : input.context) === null || _g === void 0 ? void 0 : _g.mode);
                                     recordStep('Queued', { requestId: requestId || undefined });
-                                    _s.label = 1;
+                                    _u.label = 1;
                                 case 1:
-                                    _s.trys.push([1, 30, 31, 32]);
+                                    _u.trys.push([1, 30, 31, 32]);
                                     hintSeed = [message, contextRoute].filter(Boolean).join(' ');
                                     termExpansion = expandAssistantTermSynonyms(hintSeed);
                                     hintText = termExpansion.expanded || hintSeed;
                                     termHints = termExpansion.matches.map(function (match) { return "".concat(match.term, " -> ").concat(match.expansions.join(', ')); });
                                     baseTokens = tokenizeCollectionText(hintSeed);
                                     expandedTokens = tokenizeCollectionText(hintText);
+                                    baseWeights = computeCollectionTokenWeights(baseTokens);
+                                    expandedWeights = computeCollectionTokenWeights(expandedTokens);
                                     collectionTokenization = {
                                         baseText: hintSeed || undefined,
                                         expandedText: hintText || undefined,
                                         baseTokens: baseTokens.length ? baseTokens : undefined,
-                                        expandedTokens: expandedTokens.length ? expandedTokens : undefined
+                                        expandedTokens: expandedTokens.length ? expandedTokens : undefined,
+                                        baseTokenWeights: baseTokens.length ? baseWeights.weights : undefined,
+                                        expandedTokenWeights: expandedTokens.length ? expandedWeights.weights : undefined,
+                                        hasDomainTokens: expandedTokens.length ? expandedWeights.hasDomain : undefined
                                     };
                                     recordStep('Planning: term expansion', {
                                         termMatches: termExpansion.matches.length ? termExpansion.matches : undefined
                                     });
-                                    _s.label = 2;
+                                    _u.label = 2;
                                 case 2:
-                                    _s.trys.push([2, 4, , 5]);
+                                    _u.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 = _s.sent();
+                                    collectionNames = _u.sent();
                                     collectionHints = resolveCollectionHintsFromTokens(expandedTokens, collectionNames, 5);
                                     collectionRanking = buildCollectionRankingDebugFromTokens(expandedTokens, collectionNames, 8);
                                     return [3 /*break*/, 5];
                                 case 4:
-                                    _a = _s.sent();
+                                    _a = _u.sent();
                                     collectionHints = [];
                                     collectionRanking = collectionRanking || ((collectionTokenization === null || collectionTokenization === void 0 ? void 0 : collectionTokenization.expandedTokens)
                                         ? buildCollectionRankingDebugFromTokens(collectionTokenization.expandedTokens || [], [], 0)
@@ -1142,7 +1238,7 @@ function executeAiAssistantCodexRun(payload, context) {
                                     prompt_1 = buildAssistantCodexPrompt(message, attachmentData.promptText, historyLines.join('\n'), assistantContext);
                                     return [4 /*yield*/, resolveAssistantWorkspaceRoot()];
                                 case 6:
-                                    workspaceRoot = _s.sent();
+                                    workspaceRoot = _u.sent();
                                     codexConfig = resolveCodexSettings();
                                     runOptions = {
                                         timeoutMs: resolveCodexTimeoutMs(),
@@ -1163,13 +1259,13 @@ function executeAiAssistantCodexRun(payload, context) {
                                     if (!dataQuestion) return [3 /*break*/, 10];
                                     recordStep('Directive: determine tool', { type: 'data-question' });
                                     directivePrompt = buildAssistantCodexDirectivePrompt(message, attachmentData.promptText, historyLines.join('\n'), assistantContext);
-                                    _s.label = 7;
+                                    _u.label = 7;
                                 case 7:
-                                    _s.trys.push([7, 9, , 10]);
+                                    _u.trys.push([7, 9, , 10]);
                                     directiveStart = Date.now();
                                     return [4 /*yield*/, runCodexInWorkerThread(directivePrompt, runOptions, codexConfig, streamProgress)];
                                 case 8:
-                                    directiveText = _s.sent();
+                                    directiveText = _u.sent();
                                     timingBreakdown.directiveMs = Date.now() - directiveStart;
                                     forcedDirective = extractAssistantMongoDirective(directiveText);
                                     if (forcedDirective) {
@@ -1186,7 +1282,7 @@ function executeAiAssistantCodexRun(payload, context) {
                                     }
                                     return [3 /*break*/, 10];
                                 case 9:
-                                    _b = _s.sent();
+                                    _b = _u.sent();
                                     return [3 /*break*/, 10];
                                 case 10:
                                     if (!!directive) return [3 /*break*/, 12];
@@ -1194,7 +1290,7 @@ function executeAiAssistantCodexRun(payload, context) {
                                     initialStart = Date.now();
                                     return [4 /*yield*/, runCodexInWorkerThread(prompt_1, runOptions, codexConfig, streamProgress)];
                                 case 11:
-                                    responseText = _s.sent();
+                                    responseText = _u.sent();
                                     timingBreakdown.initialResponseMs = Date.now() - initialStart;
                                     directive = extractAssistantMongoDirective(responseText);
                                     if (directive) {
@@ -1208,18 +1304,18 @@ function executeAiAssistantCodexRun(payload, context) {
                                             permissionView: normalizeOptionalString((_o = directive.payload) === null || _o === void 0 ? void 0 : _o.permissionView) || undefined
                                         });
                                     }
-                                    _s.label = 12;
+                                    _u.label = 12;
                                 case 12:
                                     if (!(!directive && dataQuestion)) return [3 /*break*/, 16];
                                     recordStep('Directive: forced retry', { mode: 'directive-only' });
                                     directivePrompt = buildAssistantCodexDirectivePrompt(message, attachmentData.promptText, historyLines.join('\n'), assistantContext);
-                                    _s.label = 13;
+                                    _u.label = 13;
                                 case 13:
-                                    _s.trys.push([13, 15, , 16]);
+                                    _u.trys.push([13, 15, , 16]);
                                     forcedStart = Date.now();
                                     return [4 /*yield*/, runCodexInWorkerThread(directivePrompt, runOptions, codexConfig, streamProgress)];
                                 case 14:
-                                    directiveText = _s.sent();
+                                    directiveText = _u.sent();
                                     timingBreakdown.forcedDirectiveMs = Date.now() - forcedStart;
                                     forcedDirective = extractAssistantMongoDirective(directiveText);
                                     if (forcedDirective) {
@@ -1236,41 +1332,61 @@ function executeAiAssistantCodexRun(payload, context) {
                                     }
                                     return [3 /*break*/, 16];
                                 case 15:
-                                    _c = _s.sent();
+                                    _c = _u.sent();
                                     return [3 /*break*/, 16];
                                 case 16:
+                                    if (directive) {
+                                        requestedCollection = normalizeOptionalString((_s = directive.payload) === null || _s === void 0 ? void 0 : _s.collection);
+                                        collectionOverride = resolveCollectionOverrideWithContext({
+                                            message: message,
+                                            collectionRanking: collectionRanking,
+                                            requestedCollection: requestedCollection,
+                                            permissionView: normalizeOptionalString((_t = directive.payload) === null || _t === void 0 ? void 0 : _t.permissionView) || contextRoute,
+                                            collectionNames: collectionNames
+                                        });
+                                        if (collectionOverride) {
+                                            recordStep('Planning: collection override', {
+                                                from: collectionOverride.from || undefined,
+                                                to: collectionOverride.to,
+                                                reason: collectionOverride.reason,
+                                                scoreGap: collectionOverride.toScore - collectionOverride.fromScore
+                                            });
+                                        }
+                                    }
                                     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*/, 28];
-                                    toolRequest = buildAssistantToolRequest(directive, input);
+                                    effectiveDirective = collectionOverride
+                                        ? __assign(__assign({}, directive), { payload: __assign(__assign({}, (directive.payload || {})), { collection: collectionOverride.to }) }) : directive;
+                                    toolRequest = buildAssistantToolRequest(effectiveDirective, input);
                                     progressTracker.push('Grabbing Data');
                                     recordStep('Grabbing Data: start', {
-                                        type: directive.type,
+                                        type: effectiveDirective.type,
                                         collection: normalizeOptionalString(toolRequest === null || toolRequest === void 0 ? void 0 : toolRequest.collection) || undefined,
                                         permissionView: normalizeOptionalString(toolRequest === null || toolRequest === void 0 ? void 0 : toolRequest.permissionView) || undefined
                                     });
-                                    _s.label = 17;
+                                    _u.label = 17;
                                 case 17:
-                                    _s.trys.push([17, 26, , 27]);
+                                    _u.trys.push([17, 26, , 27]);
                                     toolStart = Date.now();
-                                    if (!(directive.type === 'aggregate')) return [3 /*break*/, 19];
+                                    if (!(effectiveDirective.type === 'aggregate')) return [3 /*break*/, 19];
                                     return [4 /*yield*/, executeAiAssistantMongoAggregate(toolRequest, context)];
                                 case 18:
-                                    _d = _s.sent();
+                                    _d = _u.sent();
                                     return [3 /*break*/, 21];
                                 case 19: return [4 /*yield*/, executeAiAssistantMongoRead(toolRequest, context)];
                                 case 20:
-                                    _d = _s.sent();
-                                    _s.label = 21;
+                                    _d = _u.sent();
+                                    _u.label = 21;
                                 case 21:
                                     toolResponse = _d;
                                     timingBreakdown.toolMs = Date.now() - toolStart;
                                     toolResponseDebug = (toolResponse === null || toolResponse === void 0 ? void 0 : toolResponse.debug) && typeof toolResponse.debug === 'object'
                                         ? toolResponse.debug
                                         : null;
-                                    toolPayload = buildAssistantToolResultPayload(directive, toolResponse);
+                                    toolPayload = buildAssistantToolResultPayload(effectiveDirective, toolResponse);
                                     toolResult = toolPayload.result;
                                     recordStep('Grabbing Data: complete', {
                                         rowCount: toolPayload.result.output.rowCount,
@@ -1280,23 +1396,23 @@ function executeAiAssistantCodexRun(payload, context) {
                                     progressTracker.push('Drafting response');
                                     recordStep('Drafting response');
                                     followupPrompt = buildAssistantCodexToolFollowupPrompt(message, attachmentData.promptText, historyLines.join('\n'), assistantContext, toolPayload.prompt);
-                                    _s.label = 22;
+                                    _u.label = 22;
                                 case 22:
-                                    _s.trys.push([22, 24, , 25]);
+                                    _u.trys.push([22, 24, , 25]);
                                     followupStart = Date.now();
                                     return [4 /*yield*/, runCodexInWorkerThread(followupPrompt, runOptions, codexConfig, streamProgress)];
                                 case 23:
-                                    followupText = _s.sent();
+                                    followupText = _u.sent();
                                     timingBreakdown.followupMs = Date.now() - followupStart;
                                     assistantContent = sanitizeAssistantResponse(followupText);
                                     return [3 /*break*/, 25];
                                 case 24:
-                                    _e = _s.sent();
+                                    _e = _u.sent();
                                     assistantContent = buildAssistantToolFallbackResponse(toolPayload.result);
                                     return [3 /*break*/, 25];
                                 case 25: return [3 /*break*/, 27];
                                 case 26:
-                                    error_2 = _s.sent();
+                                    error_2 = _u.sent();
                                     assistantContent = buildAssistantToolErrorMessage(error_2, directive, toolRequest);
                                     toolError = error_2;
                                     return [3 /*break*/, 27];
@@ -1304,10 +1420,10 @@ function executeAiAssistantCodexRun(payload, context) {
                                 case 28:
                                     progressTracker.push('Drafting response');
                                     recordStep('Drafting response');
-                                    _s.label = 29;
+                                    _u.label = 29;
                                 case 29: return [3 /*break*/, 32];
                                 case 30:
-                                    error_3 = _s.sent();
+                                    error_3 = _u.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*/, 32];
@@ -1333,6 +1449,7 @@ function executeAiAssistantCodexRun(payload, context) {
                                             toolResult: toolResult,
                                             toolResponseDebug: toolResponseDebug,
                                             toolError: toolError,
+                                            collectionOverride: collectionOverride,
                                             trace: {
                                                 steps: steps,
                                                 planning: {
@@ -1342,7 +1459,8 @@ function executeAiAssistantCodexRun(payload, context) {
                                                     collectionHints: collectionHints.length ? collectionHints : undefined,
                                                     collectionTokenization: collectionTokenization || undefined,
                                                     collectionRanking: collectionRanking || undefined,
-                                                    collectionSelection: collectionSelection || undefined
+                                                    collectionSelection: collectionSelection || undefined,
+                                                    collectionOverride: collectionOverride || undefined
                                                 },
                                                 timings: {
                                                     startedAt: new Date(runStart).toISOString(),
@@ -1370,16 +1488,16 @@ function executeAiAssistantCodexRun(payload, context) {
                                             }
                                         })];
                                 case 33:
-                                    _s.sent();
-                                    _s.label = 34;
+                                    _u.sent();
+                                    _u.label = 34;
                                 case 34: return [4 /*yield*/, touchConversation(conversation._id, finalNow, assistantMessageId ? String(assistantMessageId) : undefined)];
                                 case 35:
-                                    _s.sent();
+                                    _u.sent();
                                     if (!(input.delete_files_after_run !== false)) return [3 /*break*/, 37];
                                     return [4 /*yield*/, cleanupAttachments(attachmentData.attachments)];
                                 case 36:
-                                    _s.sent();
-                                    _s.label = 37;
+                                    _u.sent();
+                                    _u.label = 37;
                                 case 37: return [2 /*return*/, finalAssistantDoc];
                             }
                         });
@@ -1393,10 +1511,10 @@ function executeAiAssistantCodexRun(payload, context) {
 }
 function executeAiAssistantMongoRead(payload, context) {
     return __awaiter(this, void 0, void 0, function () {
-        var input, rawCollection, dbName, db, collectionResolution, collection, _a, user, isSuperAdmin, customerId, baseQuery, userId, normalizedClient, shouldScopeByClient, _b, clientScopedQuery, scopedQuery, normalized, findOptions, documents, executedQuery, fallbackMeta, dateFallback, fallbackQuery, fallbackDocs, expanded, fallbackDocs, total, sanitizedDocuments, includeIds, requestedFields, fieldAliases, displayDocs, priorityFields, display;
-        var _c, _d;
-        return __generator(this, function (_e) {
-            switch (_e.label) {
+        var input, rawCollection, dbName, db, collectionResolution, collection, schemaFields, _a, user, isSuperAdmin, customerId, fallbackMeta, baseQuery, stripped, userId, normalizedClient, shouldScopeByClient, _b, strippedClient, clientScopedQuery, scopedQuery, normalized, findOptions, documents, executedQuery, probeDocs, dateFallback, fallbackQuery, fallbackDocs, expanded, fallbackDocs, nameFallback, fallbackDocs, _c, chemicalLookup, fallbackDocs, queryFields, _d, aliases, rewrittenQuery, fallbackDocs, _e, idLookup, fallbackDocs, baseCollection, fallbackPayload, fallbackResult, existingFallbacks, nameFields, dateFields, diagnostics, queryNoName, _f, queryNoDate, _g, _h, _j, _k, allCollections, base, alt, altCount, _l, total, sanitizedDocuments, requestedFields, missingFields, _m, projectionAliases, expandedProjection, refreshedDocs, includeIds, fieldAliases, displayDocs, idLookupDisplay, priorityFields, display;
+        var _o, _p;
+        return __generator(this, function (_q) {
+            switch (_q.label) {
                 case 0:
                     input = payload || {};
                     rawCollection = normalizeOptionalString(input.collection);
@@ -1407,16 +1525,27 @@ function executeAiAssistantMongoRead(payload, context) {
                     db = resolveio_server_app_1.ResolveIOServer.getMongoConnection().db(dbName);
                     return [4 /*yield*/, resolveAssistantCollectionName(db, dbName, rawCollection)];
                 case 1:
-                    collectionResolution = _e.sent();
+                    collectionResolution = _q.sent();
                     collection = collectionResolution.name || rawCollection;
+                    schemaFields = getCollectionSchemaFieldNames(collection);
                     return [4 /*yield*/, ensureAssistantReadAccess(context, input.permissionView, collection)];
                 case 2:
-                    _a = _e.sent(), user = _a.user, isSuperAdmin = _a.isSuperAdmin;
+                    _a = _q.sent(), user = _a.user, isSuperAdmin = _a.isSuperAdmin;
                     if (!isSuperAdmin && AI_ASSISTANT_BLOCKED_COLLECTIONS.has(collection)) {
                         throw new Error('AI assistant mongo read: Access denied.');
                     }
-                    customerId = normalizeOptionalString((_c = user === null || user === void 0 ? void 0 : user.other) === null || _c === void 0 ? void 0 : _c.id_customer);
+                    customerId = normalizeOptionalString((_o = user === null || user === void 0 ? void 0 : user.other) === null || _o === void 0 ? void 0 : _o.id_customer);
+                    fallbackMeta = {};
                     baseQuery = normalizeMongoQuery(input.query);
+                    if (!isSuperAdmin && customerId) {
+                        stripped = stripQueryFieldPathsDeepWithMeta(baseQuery, ['id_customer', 'other.id_customer']);
+                        baseQuery = stripped.value;
+                        fallbackMeta.scopeStrip = {
+                            attempted: true,
+                            fields: ['id_customer', 'other.id_customer'],
+                            used: stripped.changed
+                        };
+                    }
                     if (!isSuperAdmin && (collection === 'users' || collection === 'user-versions')) {
                         userId = normalizeOptionalString(user === null || user === void 0 ? void 0 : user._id);
                         if (!userId) {
@@ -1430,13 +1559,22 @@ function executeAiAssistantMongoRead(payload, context) {
                     if (!(!isSuperAdmin && normalizedClient)) return [3 /*break*/, 4];
                     return [4 /*yield*/, collectionHasClientIndex(db, dbName, collection)];
                 case 3:
-                    _b = _e.sent();
+                    _b = _q.sent();
                     return [3 /*break*/, 5];
                 case 4:
                     _b = false;
-                    _e.label = 5;
+                    _q.label = 5;
                 case 5:
                     shouldScopeByClient = _b;
+                    if (!isSuperAdmin && shouldScopeByClient) {
+                        strippedClient = stripQueryFieldPathsDeepWithMeta(baseQuery, ['id_client']);
+                        baseQuery = strippedClient.value;
+                        fallbackMeta.scopeStripClient = {
+                            attempted: true,
+                            fields: ['id_client'],
+                            used: strippedClient.changed
+                        };
+                    }
                     clientScopedQuery = shouldScopeByClient
                         ? applyClientScopeFilter(baseQuery, normalizedClient, isSuperAdmin)
                         : baseQuery;
@@ -1445,26 +1583,26 @@ function executeAiAssistantMongoRead(payload, context) {
                     findOptions = __assign(__assign({}, normalized.findOptions), { readPreference: AI_ASSISTANT_READ_PREFERENCE });
                     return [4 /*yield*/, db.collection(collection).find(scopedQuery, findOptions).toArray()];
                 case 6:
-                    documents = _e.sent();
+                    documents = _q.sent();
                     executedQuery = scopedQuery;
-                    fallbackMeta = {};
-                    if (!!documents.length) return [3 /*break*/, 10];
+                    probeDocs = null;
+                    if (!!documents.length) return [3 /*break*/, 8];
                     dateFallback = resolveQueryDateFieldFallback(scopedQuery);
                     if (!dateFallback) return [3 /*break*/, 8];
                     fallbackQuery = replaceQueryField(scopedQuery, dateFallback.from, dateFallback.to);
                     fallbackMeta.dateField = __assign(__assign({}, dateFallback), { attempted: true, used: false });
                     return [4 /*yield*/, db.collection(collection).find(fallbackQuery, findOptions).toArray()];
                 case 7:
-                    fallbackDocs = _e.sent();
+                    fallbackDocs = _q.sent();
                     if (fallbackDocs.length) {
                         documents = fallbackDocs;
                         executedQuery = fallbackQuery;
                         fallbackMeta.dateField.used = true;
                     }
-                    _e.label = 8;
+                    _q.label = 8;
                 case 8:
                     if (!!documents.length) return [3 /*break*/, 10];
-                    expanded = expandQueryDateFallbacks(scopedQuery);
+                    expanded = expandQueryDateFallbacks(executedQuery);
                     if (!expanded) return [3 /*break*/, 10];
                     fallbackMeta.dateFieldsExpanded = {
                         fields: expanded.fields,
@@ -1473,30 +1611,334 @@ function executeAiAssistantMongoRead(payload, context) {
                     };
                     return [4 /*yield*/, db.collection(collection).find(expanded.query, findOptions).toArray()];
                 case 9:
-                    fallbackDocs = _e.sent();
+                    fallbackDocs = _q.sent();
                     if (fallbackDocs.length) {
                         documents = fallbackDocs;
                         executedQuery = expanded.query;
                         fallbackMeta.dateFieldsExpanded.used = true;
                     }
-                    _e.label = 10;
+                    _q.label = 10;
                 case 10:
-                    total = null;
-                    if (!normalized.includeTotal) return [3 /*break*/, 12];
-                    return [4 /*yield*/, db.collection(collection).countDocuments(executedQuery, { readPreference: AI_ASSISTANT_READ_PREFERENCE })];
+                    if (!!documents.length) return [3 /*break*/, 12];
+                    nameFallback = resolveReadNameMatchFallback(executedQuery);
+                    if (!nameFallback) return [3 /*break*/, 12];
+                    fallbackMeta.nameMatch = {
+                        field: nameFallback.field,
+                        fields: nameFallback.fields,
+                        attempted: true,
+                        used: false
+                    };
+                    return [4 /*yield*/, db.collection(collection).find(nameFallback.query, findOptions).toArray()];
                 case 11:
-                    total = _e.sent();
-                    _e.label = 12;
+                    fallbackDocs = _q.sent();
+                    if (fallbackDocs.length) {
+                        documents = fallbackDocs;
+                        executedQuery = nameFallback.query;
+                        fallbackMeta.nameMatch.used = true;
+                    }
+                    _q.label = 12;
                 case 12:
+                    if (!!documents.length) return [3 /*break*/, 17];
+                    _c = probeDocs;
+                    if (_c) return [3 /*break*/, 14];
+                    return [4 /*yield*/, fetchAssistantProbeDocs({
+                            db: db,
+                            collection: collection,
+                            idClient: normalizedClient,
+                            idCustomer: customerId,
+                            isSuperAdmin: isSuperAdmin,
+                            includeClientScope: shouldScopeByClient
+                        })];
+                case 13:
+                    _c = (_q.sent());
+                    _q.label = 14;
+                case 14:
+                    probeDocs = _c;
+                    return [4 /*yield*/, applyChemicalNameLookupFallbackToQuery({
+                            query: executedQuery,
+                            db: db,
+                            dbName: dbName,
+                            idClient: normalizedClient,
+                            idCustomer: customerId,
+                            isSuperAdmin: isSuperAdmin,
+                            probeDocs: probeDocs || undefined
+                        })];
+                case 15:
+                    chemicalLookup = _q.sent();
+                    if (!chemicalLookup) return [3 /*break*/, 17];
+                    fallbackMeta.chemicalLookup = __assign(__assign({}, chemicalLookup.meta), { attempted: true, used: false });
+                    return [4 /*yield*/, db.collection(collection).find(chemicalLookup.query, findOptions).toArray()];
+                case 16:
+                    fallbackDocs = _q.sent();
+                    if (fallbackDocs.length) {
+                        documents = fallbackDocs;
+                        executedQuery = chemicalLookup.query;
+                        fallbackMeta.chemicalLookup.used = true;
+                    }
+                    _q.label = 17;
+                case 17:
+                    if (!!documents.length) return [3 /*break*/, 21];
+                    queryFields = extractQueryFieldPaths(executedQuery).filter(function (field) { return !isAssistantIdField(field); });
+                    if (!queryFields.length) return [3 /*break*/, 21];
+                    _d = probeDocs;
+                    if (_d) return [3 /*break*/, 19];
+                    return [4 /*yield*/, fetchAssistantProbeDocs({
+                            db: db,
+                            collection: collection,
+                            idClient: normalizedClient,
+                            idCustomer: customerId,
+                            isSuperAdmin: isSuperAdmin,
+                            includeClientScope: shouldScopeByClient
+                        })];
+                case 18:
+                    _d = (_q.sent());
+                    _q.label = 19;
+                case 19:
+                    probeDocs = _d;
+                    if (!probeDocs.length) return [3 /*break*/, 21];
+                    aliases = resolveFieldAliases(probeDocs, queryFields, schemaFields);
+                    if (!Object.keys(aliases).length) return [3 /*break*/, 21];
+                    fallbackMeta.queryFieldAliases = {
+                        aliases: aliases,
+                        attempted: true,
+                        used: false
+                    };
+                    rewrittenQuery = Object.entries(aliases)
+                        .reduce(function (acc, _a) {
+                        var _b = __read(_a, 2), from = _b[0], to = _b[1];
+                        return replaceFieldPathDeep(acc, from, to);
+                    }, executedQuery);
+                    return [4 /*yield*/, db.collection(collection).find(rewrittenQuery, findOptions).toArray()];
+                case 20:
+                    fallbackDocs = _q.sent();
+                    if (fallbackDocs.length) {
+                        documents = fallbackDocs;
+                        executedQuery = rewrittenQuery;
+                        fallbackMeta.queryFieldAliases.used = true;
+                    }
+                    _q.label = 21;
+                case 21:
+                    if (!!documents.length) return [3 /*break*/, 26];
+                    _e = probeDocs;
+                    if (_e) return [3 /*break*/, 23];
+                    return [4 /*yield*/, fetchAssistantProbeDocs({
+                            db: db,
+                            collection: collection,
+                            idClient: normalizedClient,
+                            idCustomer: customerId,
+                            isSuperAdmin: isSuperAdmin,
+                            includeClientScope: shouldScopeByClient
+                        })];
+                case 22:
+                    _e = (_q.sent());
+                    _q.label = 23;
+                case 23:
+                    probeDocs = _e;
+                    return [4 /*yield*/, applyIdLookupFallbackToQuery({
+                            query: executedQuery,
+                            db: db,
+                            dbName: dbName,
+                            idClient: normalizedClient,
+                            idCustomer: customerId,
+                            isSuperAdmin: isSuperAdmin,
+                            probeDocs: probeDocs || undefined
+                        })];
+                case 24:
+                    idLookup = _q.sent();
+                    if (!idLookup) return [3 /*break*/, 26];
+                    fallbackMeta.idLookup = __assign(__assign({}, idLookup.meta), { attempted: true, used: false });
+                    return [4 /*yield*/, db.collection(collection).find(idLookup.query, findOptions).toArray()];
+                case 25:
+                    fallbackDocs = _q.sent();
+                    if (fallbackDocs.length) {
+                        documents = fallbackDocs;
+                        executedQuery = idLookup.query;
+                        fallbackMeta.idLookup.used = true;
+                    }
+                    _q.label = 26;
+                case 26:
+                    if (!!documents.length) return [3 /*break*/, 29];
+                    return [4 /*yield*/, resolveBaseCollectionFromReport(db, dbName, collection)];
+                case 27:
+                    baseCollection = _q.sent();
+                    if (!(baseCollection && baseCollection !== collection)) return [3 /*break*/, 29];
+                    fallbackPayload = __assign(__assign({}, input), { collection: baseCollection });
+                    return [4 /*yield*/, executeAiAssistantMongoRead(fallbackPayload, context)];
+                case 28:
+                    fallbackResult = _q.sent();
+                    if (Array.isArray(fallbackResult === null || fallbackResult === void 0 ? void 0 : fallbackResult.documents) && fallbackResult.documents.length) {
+                        if (isSuperAdmin && (fallbackResult === null || fallbackResult === void 0 ? void 0 : fallbackResult.debug) && typeof fallbackResult.debug === 'object') {
+                            existingFallbacks = fallbackResult.debug.fallbacks && typeof fallbackResult.debug.fallbacks === 'object'
+                                ? fallbackResult.debug.fallbacks
+                                : {};
+                            fallbackResult.debug.fallbacks = __assign(__assign({}, existingFallbacks), { reportFallback: {
+                                    from: collection,
+                                    to: baseCollection,
+                                    used: true
+                                } });
+                        }
+                        return [2 /*return*/, fallbackResult];
+                    }
+                    if (isSuperAdmin) {
+                        fallbackMeta.reportFallback = { from: collection, to: baseCollection, attempted: true, used: false };
+                    }
+                    _q.label = 29;
+                case 29:
+                    if (!(!documents.length && isSuperAdmin)) return [3 /*break*/, 46];
+                    nameFields = collectMatchFieldsByCondition(executedQuery, function (field, condition) { return isRegexMatchCondition(condition)
+                        || (typeof condition === 'string' && shouldApplyAssistantNameRegex(field)); });
+                    dateFields = collectMatchFieldsByCondition(executedQuery, function (_field, condition) { return isDateCondition(condition); });
+                    diagnostics = {
+                        nameFields: nameFields.length ? nameFields : undefined,
+                        dateFields: dateFields.length ? dateFields : undefined
+                    };
+                    _q.label = 30;
+                case 30:
+                    _q.trys.push([30, 35, , 36]);
+                    if (!nameFields.length) return [3 /*break*/, 32];
+                    queryNoName = stripMatchFields(executedQuery, nameFields);
+                    _f = diagnostics;
+                    return [4 /*yield*/, db.collection(collection).countDocuments(queryNoName, {
+                            readPreference: AI_ASSISTANT_READ_PREFERENCE
+                        })];
+                case 31:
+                    _f.recentCount = _q.sent();
+                    _q.label = 32;
+                case 32:
+                    if (!dateFields.length) return [3 /*break*/, 34];
+                    queryNoDate = stripMatchFields(executedQuery, dateFields);
+                    _g = diagnostics;
+                    return [4 /*yield*/, db.collection(collection).countDocuments(queryNoDate, {
+                            readPreference: AI_ASSISTANT_READ_PREFERENCE
+                        })];
+                case 33:
+                    _g.nameMatchCount = _q.sent();
+                    _q.label = 34;
+                case 34: return [3 /*break*/, 36];
+                case 35:
+                    _h = _q.sent();
+                    return [3 /*break*/, 36];
+                case 36:
+                    _q.trys.push([36, 39, , 40]);
+                    _j = probeDocs;
+                    if (_j) return [3 /*break*/, 38];
+                    return [4 /*yield*/, fetchAssistantProbeDocs({
+                            db: db,
+                            collection: collection,
+                            idClient: normalizedClient,
+                            idCustomer: customerId,
+                            isSuperAdmin: isSuperAdmin,
+                            includeClientScope: shouldScopeByClient
+                        })];
+                case 37:
+                    _j = (_q.sent());
+                    _q.label = 38;
+                case 38:
+                    probeDocs = _j;
+                    if (probeDocs.length && nameFields.length) {
+                        diagnostics.chemicalIdDetected = detectChemicalIdFromProbe(probeDocs, nameFields);
+                    }
+                    return [3 /*break*/, 40];
+                case 39:
+                    _k = _q.sent();
+                    return [3 /*break*/, 40];
+                case 40:
+                    _q.trys.push([40, 44, , 45]);
+                    return [4 /*yield*/, listAssistantCollections(db, dbName)];
+                case 41:
+                    allCollections = _q.sent();
+                    base = stripVersionSuffix(collection.startsWith('report-') ? collection.slice('report-'.length) : collection);
+                    alt = collection.startsWith('report-') ? base : "report-".concat(base);
+                    if (!(alt && alt !== collection && allCollections.includes(alt))) return [3 /*break*/, 43];
+                    return [4 /*yield*/, db.collection(alt).countDocuments({}, { readPreference: AI_ASSISTANT_READ_PREFERENCE })];
+                case 42:
+                    altCount = _q.sent();
+                    diagnostics.alternateCollection = alt;
+                    diagnostics.alternateCollectionCount = altCount;
+                    _q.label = 43;
+                case 43: return [3 /*break*/, 45];
+                case 44:
+                    _l = _q.sent();
+                    return [3 /*break*/, 45];
+                case 45:
+                    fallbackMeta.zeroDiagnostics = diagnostics;
+                    _q.label = 46;
+                case 46:
+                    total = null;
+                    if (!normalized.includeTotal) return [3 /*break*/, 48];
+                    return [4 /*yield*/, db.collection(collection).countDocuments(executedQuery, { readPreference: AI_ASSISTANT_READ_PREFERENCE })];
+                case 47:
+                    total = _q.sent();
+                    _q.label = 48;
+                case 48:
                     sanitizedDocuments = isSuperAdmin
                         ? documents
                         : documents.map(function (doc) { return redactSensitiveFields((0, common_1.deepCopy)(doc)); });
-                    includeIds = ((_d = input.options) === null || _d === void 0 ? void 0 : _d.includeIds) === true;
-                    requestedFields = resolveProjectionRequestedFields(normalized.findOptions.projection);
-                    fieldAliases = resolveFieldAliases(sanitizedDocuments, requestedFields);
+                    requestedFields = resolveProjectionRequestedFields(findOptions.projection);
+                    if (!(sanitizedDocuments.length && requestedFields.length)) return [3 /*break*/, 52];
+                    missingFields = requestedFields.filter(function (field) { return !hasNonEmptyValue(sanitizedDocuments, field, { treatObjectLikeAsEmpty: true }); });
+                    if (!missingFields.length) return [3 /*break*/, 52];
+                    _m = probeDocs;
+                    if (_m) return [3 /*break*/, 50];
+                    return [4 /*yield*/, fetchAssistantProbeDocs({
+                            db: db,
+                            collection: collection,
+                            idClient: normalizedClient,
+                            idCustomer: customerId,
+                            isSuperAdmin: isSuperAdmin,
+                            includeClientScope: shouldScopeByClient
+                        })];
+                case 49:
+                    _m = (_q.sent());
+                    _q.label = 50;
+                case 50:
+                    probeDocs = _m;
+                    if (!probeDocs.length) return [3 /*break*/, 52];
+                    projectionAliases = resolveFieldAliases(probeDocs, missingFields, schemaFields);
+                    if (!Object.keys(projectionAliases).length) return [3 /*break*/, 52];
+                    fallbackMeta.projectionAliases = {
+                        aliases: projectionAliases,
+                        attempted: true,
+                        used: false
+                    };
+                    expandedProjection = expandProjectionWithAliases(findOptions.projection, projectionAliases);
+                    if (!(expandedProjection && expandedProjection !== findOptions.projection)) return [3 /*break*/, 52];
+                    findOptions = __assign(__assign({}, findOptions), { projection: expandedProjection });
+                    normalized.findOptions.projection = expandedProjection;
+                    return [4 /*yield*/, db.collection(collection).find(executedQuery, findOptions).toArray()];
+                case 51:
+                    refreshedDocs = _q.sent();
+                    if (refreshedDocs.length) {
+                        documents = refreshedDocs;
+                        sanitizedDocuments = isSuperAdmin
+                            ? refreshedDocs
+                            : refreshedDocs.map(function (doc) { return redactSensitiveFields((0, common_1.deepCopy)(doc)); });
+                        fallbackMeta.projectionAliases.used = true;
+                    }
+                    _q.label = 52;
+                case 52:
+                    includeIds = ((_p = input.options) === null || _p === void 0 ? void 0 : _p.includeIds) === true;
+                    fieldAliases = resolveFieldAliases(sanitizedDocuments, requestedFields, schemaFields);
                     displayDocs = Object.keys(fieldAliases).length
                         ? applyFieldAliasesForDisplay(sanitizedDocuments, fieldAliases)
                         : sanitizedDocuments;
+                    return [4 /*yield*/, applyIdLookupDisplayEnrichment({
+                            docs: displayDocs,
+                            collection: collection,
+                            db: db,
+                            dbName: dbName,
+                            idClient: normalizedClient,
+                            idCustomer: customerId,
+                            isSuperAdmin: isSuperAdmin
+                        })];
+                case 53:
+                    idLookupDisplay = _q.sent();
+                    if (idLookupDisplay === null || idLookupDisplay === void 0 ? void 0 : idLookupDisplay.docs) {
+                        displayDocs = idLookupDisplay.docs;
+                    }
+                    if (idLookupDisplay === null || idLookupDisplay === void 0 ? void 0 : idLookupDisplay.meta) {
+                        fallbackMeta.idDisplayLookup = idLookupDisplay.meta;
+                    }
                     priorityFields = requestedFields.length
                         ? __spreadArray(__spreadArray([], __read(requestedFields), false), __read(AI_ASSISTANT_DISPLAY_PRIORITY_FIELDS), false) : AI_ASSISTANT_DISPLAY_PRIORITY_FIELDS;
                     display = buildDisplayTable(displayDocs, {
@@ -1533,10 +1975,10 @@ function executeAiAssistantMongoRead(payload, context) {
 }
 function executeAiAssistantMongoAggregate(payload, context) {
     return __awaiter(this, void 0, void 0, function () {
-        var input, rawCollection, dbName, db, collectionResolution, collection, _a, user, isSuperAdmin, customerId, baseQuery, userId, normalizedClient, shouldScopeByClient, _b, clientScopedQuery, scopedQuery, normalizedPipeline, pipelineWithScope, normalizedOptions, limitedPipeline, dateField, aggregateOptions, documents, executedPipeline, fallbackMeta, fallback, fallbackPipeline, fallbackDocs, createdFallback, createdPipeline, createdDocs, completionFallback, fallbackPipeline, fallbackDocs, completionExprFallback, fallbackPipeline, fallbackDocs, unwindFallback, fallbackPipeline, fallbackDocs, nameFallback, fallbackPipeline, fallbackDocs, sanitizedDocuments, includeIds, display;
-        var _c, _d;
-        return __generator(this, function (_e) {
-            switch (_e.label) {
+        var input, rawCollection, dbName, db, collectionResolution, collection, schemaFields, _a, user, isSuperAdmin, customerId, fallbackMeta, baseQuery, stripped, userId, normalizedClient, shouldScopeByClient, _b, clientScopedQuery, scopedQuery, normalizedPipeline, sanitizedPipeline, strippedPipeline, pipelineWithScope, normalizedOptions, limitedPipeline, dateField, aggregateOptions, documents, executedPipeline, probeDocs, fallback, fallbackPipeline, fallbackDocs, createdFallback, createdPipeline, createdDocs, expanded, expandedDocs, completionFallback, fallbackPipeline, fallbackDocs, completionExprFallback, fallbackPipeline, fallbackDocs, unwindFallback, fallbackPipeline, fallbackDocs, nameFallback, fallbackPipeline, fallbackDocs, _c, _loop_1, i, state_1, matchFields_1, _d, aliases, rewrittenPipeline, fallbackDocs, _loop_2, i, state_2, baseCollection, fallbackPayload, fallbackResult, existingFallbacks, matchStages, diagnostics, combinedMatch, nameFields, dateFields, queryNoName, _e, queryNoDate, _f, _g, _h, _j, allCollections, base, alt, altCount, _k, sanitizedDocuments, includeIds, displayDocs, idLookupDisplay, display;
+        var _l, _m;
+        return __generator(this, function (_o) {
+            switch (_o.label) {
                 case 0:
                     input = payload || {};
                     rawCollection = normalizeOptionalString(input.collection);
@@ -1547,16 +1989,27 @@ function executeAiAssistantMongoAggregate(payload, context) {
                     db = resolveio_server_app_1.ResolveIOServer.getMongoConnection().db(dbName);
                     return [4 /*yield*/, resolveAssistantCollectionName(db, dbName, rawCollection)];
                 case 1:
-                    collectionResolution = _e.sent();
+                    collectionResolution = _o.sent();
                     collection = collectionResolution.name || rawCollection;
+                    schemaFields = getCollectionSchemaFieldNames(collection);
                     return [4 /*yield*/, ensureAssistantReadAccess(context, input.permissionView, collection)];
                 case 2:
-                    _a = _e.sent(), user = _a.user, isSuperAdmin = _a.isSuperAdmin;
+                    _a = _o.sent(), user = _a.user, isSuperAdmin = _a.isSuperAdmin;
                     if (!isSuperAdmin && AI_ASSISTANT_BLOCKED_COLLECTIONS.has(collection)) {
                         throw new Error('AI assistant mongo aggregate: Access denied.');
                     }
-                    customerId = normalizeOptionalString((_c = user === null || user === void 0 ? void 0 : user.other) === null || _c === void 0 ? void 0 : _c.id_customer);
+                    customerId = normalizeOptionalString((_l = user === null || user === void 0 ? void 0 : user.other) === null || _l === void 0 ? void 0 : _l.id_customer);
+                    fallbackMeta = {};
                     baseQuery = normalizeMongoQuery(input.query);
+                    if (!isSuperAdmin && customerId) {
+                        stripped = stripQueryFieldPathsDeepWithMeta(baseQuery, ['id_customer', 'other.id_customer']);
+                        baseQuery = stripped.value;
+                        fallbackMeta.scopeStrip = {
+                            attempted: true,
+                            fields: ['id_customer', 'other.id_customer'],
+                            used: stripped.changed
+                        };
+                    }
                     if (!isSuperAdmin && (collection === 'users' || collection === 'user-versions')) {
                         userId = normalizeOptionalString(user === null || user === void 0 ? void 0 : user._id);
                         if (!userId) {
@@ -1570,11 +2023,11 @@ function executeAiAssistantMongoAggregate(payload, context) {
                     if (!(!isSuperAdmin && normalizedClient)) return [3 /*break*/, 4];
                     return [4 /*yield*/, collectionHasClientIndex(db, dbName, collection)];
                 case 3:
-                    _b = _e.sent();
+                    _b = _o.sent();
                     return [3 /*break*/, 5];
                 case 4:
                     _b = false;
-                    _e.label = 5;
+                    _o.label = 5;
                 case 5:
                     shouldScopeByClient = _b;
                     clientScopedQuery = shouldScopeByClient
@@ -1582,7 +2035,17 @@ function executeAiAssistantMongoAggregate(payload, context) {
                         : baseQuery;
                     scopedQuery = applyCustomerScopeFilter(clientScopedQuery, collection, customerId, isSuperAdmin);
                     normalizedPipeline = normalizeAssistantAggregatePipeline(input.pipeline);
-                    pipelineWithScope = buildAssistantAggregatePipeline(scopedQuery, normalizedPipeline);
+                    sanitizedPipeline = normalizedPipeline;
+                    if (!isSuperAdmin && customerId) {
+                        strippedPipeline = stripScopedFieldsFromPipelineWithMeta(normalizedPipeline, ['id_customer', 'other.id_customer']);
+                        sanitizedPipeline = strippedPipeline.pipeline;
+                        fallbackMeta.scopeStripPipeline = {
+                            attempted: true,
+                            fields: ['id_customer', 'other.id_customer'],
+                            used: strippedPipeline.changed
+                        };
+                    }
+                    pipelineWithScope = buildAssistantAggregatePipeline(scopedQuery, sanitizedPipeline);
                     normalizedOptions = normalizeAssistantAggregateOptions(input.options);
                     limitedPipeline = applyAssistantAggregateLimit(pipelineWithScope, normalizedOptions.limit, normalizedOptions.maxLimit, normalizedOptions.defaultLimit);
                     dateField = findAggregateDateField(limitedPipeline);
@@ -1594,9 +2057,9 @@ function executeAiAssistantMongoAggregate(payload, context) {
                             .aggregate(limitedPipeline, aggregateOptions)
                             .toArray()];
                 case 6:
-                    documents = _e.sent();
+                    documents = _o.sent();
                     executedPipeline = limitedPipeline;
-                    fallbackMeta = {};
+                    probeDocs = null;
                     if (!(!documents.length && dateField)) return [3 /*break*/, 10];
                     fallback = resolveAggregateDateFieldFallback(limitedPipeline);
                     if (!fallback) return [3 /*break*/, 8];
@@ -1607,13 +2070,13 @@ function executeAiAssistantMongoAggregate(payload, context) {
                             .aggregate(fallbackPipeline, aggregateOptions)
                             .toArray()];
                 case 7:
-                    fallbackDocs = _e.sent();
+                    fallbackDocs = _o.sent();
                     if (fallbackDocs.length) {
                         documents = fallbackDocs;
                         executedPipeline = fallbackPipeline;
                         fallbackMeta.dateField.used = true;
                     }
-                    _e.label = 8;
+                    _o.label = 8;
                 case 8:
                     if (!(!documents.length && dateField !== 'createdAt')) return [3 /*break*/, 10];
                     createdFallback = { from: dateField, to: 'createdAt', attempted: true, used: false };
@@ -1624,17 +2087,38 @@ function executeAiAssistantMongoAggregate(payload, context) {
                             .aggregate(createdPipeline, aggregateOptions)
                             .toArray()];
                 case 9:
-                    createdDocs = _e.sent();
+                    createdDocs = _o.sent();
                     if (createdDocs.length) {
                         documents = createdDocs;
                         executedPipeline = createdPipeline;
                         fallbackMeta.dateFieldCreatedAt.used = true;
                     }
-                    _e.label = 10;
+                    _o.label = 10;
                 case 10:
-                    if (!!documents.length) return [3 /*break*/, 14];
+                    if (!!documents.length) return [3 /*break*/, 12];
+                    expanded = expandAggregateDateMatchFallback(executedPipeline);
+                    if (!expanded) return [3 /*break*/, 12];
+                    fallbackMeta.dateFieldsExpanded = {
+                        fields: expanded.fields,
+                        attempted: true,
+                        used: false
+                    };
+                    if (!!containsForbiddenMongoOperators(expanded.pipeline)) return [3 /*break*/, 12];
+                    return [4 /*yield*/, db.collection(collection)
+                            .aggregate(expanded.pipeline, aggregateOptions)
+                            .toArray()];
+                case 11:
+                    expandedDocs = _o.sent();
+                    if (expandedDocs.length) {
+                        documents = expandedDocs;
+                        executedPipeline = expanded.pipeline;
+                        fallbackMeta.dateFieldsExpanded.used = true;
+                    }
+                    _o.label = 12;
+                case 12:
+                    if (!!documents.length) return [3 /*break*/, 16];
                     completionFallback = resolveAggregateCompletionFallback(executedPipeline);
-                    if (!completionFallback) return [3 /*break*/, 12];
+                    if (!completionFallback) return [3 /*break*/, 14];
                     fallbackMeta.completion = {
                         field: completionFallback.field,
                         sources: completionFallback.sources,
@@ -1644,22 +2128,22 @@ function executeAiAssistantMongoAggregate(payload, context) {
                         strategy: 'addFields'
                     };
                     fallbackPipeline = buildAggregateCompletionFallbackPipeline(executedPipeline, completionFallback);
-                    if (!(fallbackPipeline.length && !containsForbiddenMongoOperators(fallbackPipeline))) return [3 /*break*/, 12];
+                    if (!(fallbackPipeline.length && !containsForbiddenMongoOperators(fallbackPipeline))) return [3 /*break*/, 14];
                     return [4 /*yield*/, db.collection(collection)
                             .aggregate(fallbackPipeline, aggregateOptions)
                             .toArray()];
-                case 11:
-                    fallbackDocs = _e.sent();
+                case 13:
+                    fallbackDocs = _o.sent();
                     if (fallbackDocs.length) {
                         documents = fallbackDocs;
                         executedPipeline = fallbackPipeline;
                         fallbackMeta.completion.used = true;
                     }
-                    _e.label = 12;
-                case 12:
-                    if (!!documents.length) return [3 /*break*/, 14];
+                    _o.label = 14;
+                case 14:
+                    if (!!documents.length) return [3 /*break*/, 16];
                     completionExprFallback = resolveAggregateCompletionExprFallback(executedPipeline);
-                    if (!completionExprFallback) return [3 /*break*/, 14];
+                    if (!completionExprFallback) return [3 /*break*/, 16];
                     fallbackMeta.completion = {
                         field: completionExprFallback.field,
                         sources: completionExprFallback.sources,
@@ -1669,40 +2153,40 @@ function executeAiAssistantMongoAggregate(payload, context) {
                         strategy: 'expr'
                     };
                     fallbackPipeline = buildAggregateCompletionExprFallbackPipeline(executedPipeline, completionExprFallback);
-                    if (!(fallbackPipeline.length && !containsForbiddenMongoOperators(fallbackPipeline))) return [3 /*break*/, 14];
+                    if (!(fallbackPipeline.length && !containsForbiddenMongoOperators(fallbackPipeline))) return [3 /*break*/, 16];
                     return [4 /*yield*/, db.collection(collection)
                             .aggregate(fallbackPipeline, aggregateOptions)
                             .toArray()];
-                case 13:
-                    fallbackDocs = _e.sent();
+                case 15:
+                    fallbackDocs = _o.sent();
                     if (fallbackDocs.length) {
                         documents = fallbackDocs;
                         executedPipeline = fallbackPipeline;
                         fallbackMeta.completion.used = true;
                     }
-                    _e.label = 14;
-                case 14:
-                    if (!(documents.length <= 1)) return [3 /*break*/, 16];
+                    _o.label = 16;
+                case 16:
+                    if (!(documents.length <= 1)) return [3 /*break*/, 18];
                     unwindFallback = resolveAggregateUnwindFallback(executedPipeline);
-                    if (!unwindFallback) return [3 /*break*/, 16];
+                    if (!unwindFallback) return [3 /*break*/, 18];
                     fallbackMeta.unwind = { path: unwindFallback.path, attempted: true, used: false };
                     fallbackPipeline = buildAggregateUnwindFallbackPipeline(executedPipeline, unwindFallback);
-                    if (!!containsForbiddenMongoOperators(fallbackPipeline)) return [3 /*break*/, 16];
+                    if (!!containsForbiddenMongoOperators(fallbackPipeline)) return [3 /*break*/, 18];
                     return [4 /*yield*/, db.collection(collection)
                             .aggregate(fallbackPipeline, aggregateOptions)
                             .toArray()];
-                case 15:
-                    fallbackDocs = _e.sent();
+                case 17:
+                    fallbackDocs = _o.sent();
                     if (fallbackDocs.length > documents.length) {
                         documents = fallbackDocs;
                         executedPipeline = fallbackPipeline;
                         fallbackMeta.unwind.used = true;
                     }
-                    _e.label = 16;
-                case 16:
-                    if (!!documents.length) return [3 /*break*/, 18];
+                    _o.label = 18;
+                case 18:
+                    if (!!documents.length) return [3 /*break*/, 20];
                     nameFallback = resolveAggregateNameMatchFallback(executedPipeline);
-                    if (!nameFallback) return [3 /*break*/, 18];
+                    if (!nameFallback) return [3 /*break*/, 20];
                     fallbackMeta.nameMatch = {
                         field: nameFallback.field,
                         fields: nameFallback.fields,
@@ -1710,24 +2194,346 @@ function executeAiAssistantMongoAggregate(payload, context) {
                         used: false
                     };
                     fallbackPipeline = buildAggregateNameMatchFallbackPipeline(executedPipeline, nameFallback);
-                    if (!(fallbackPipeline.length && !containsForbiddenMongoOperators(fallbackPipeline))) return [3 /*break*/, 18];
+                    if (!(fallbackPipeline.length && !containsForbiddenMongoOperators(fallbackPipeline))) return [3 /*break*/, 20];
                     return [4 /*yield*/, db.collection(collection)
                             .aggregate(fallbackPipeline, aggregateOptions)
                             .toArray()];
-                case 17:
-                    fallbackDocs = _e.sent();
+                case 19:
+                    fallbackDocs = _o.sent();
                     if (fallbackDocs.length) {
                         documents = fallbackDocs;
                         executedPipeline = fallbackPipeline;
                         fallbackMeta.nameMatch.used = true;
                     }
-                    _e.label = 18;
-                case 18:
+                    _o.label = 20;
+                case 20:
+                    if (!!documents.length) return [3 /*break*/, 26];
+                    _c = probeDocs;
+                    if (_c) return [3 /*break*/, 22];
+                    return [4 /*yield*/, fetchAssistantProbeDocs({
+                            db: db,
+                            collection: collection,
+                            idClient: normalizedClient,
+                            idCustomer: customerId,
+                            isSuperAdmin: isSuperAdmin,
+                            includeClientScope: shouldScopeByClient
+                        })];
+                case 21:
+                    _c = (_o.sent());
+                    _o.label = 22;
+                case 22:
+                    probeDocs = _c;
+                    _loop_1 = function (i) {
+                        var stage, chemicalLookup, rewrittenPipeline, fallbackDocs;
+                        return __generator(this, function (_p) {
+                            switch (_p.label) {
+                                case 0:
+                                    stage = executedPipeline[i];
+                                    if (!stage || typeof stage !== 'object' || !stage.$match || typeof stage.$match !== 'object') {
+                                        return [2 /*return*/, "continue"];
+                                    }
+                                    return [4 /*yield*/, applyChemicalNameLookupFallbackToQuery({
+                                            query: stage.$match,
+                                            db: db,
+                                            dbName: dbName,
+                                            idClient: normalizedClient,
+                                            idCustomer: customerId,
+                                            isSuperAdmin: isSuperAdmin,
+                                            probeDocs: probeDocs || undefined
+                                        })];
+                                case 1:
+                                    chemicalLookup = _p.sent();
+                                    if (!chemicalLookup) {
+                                        return [2 /*return*/, "continue"];
+                                    }
+                                    fallbackMeta.chemicalLookup = __assign(__assign({}, chemicalLookup.meta), { attempted: true, used: false, stage: i });
+                                    rewrittenPipeline = executedPipeline.map(function (current, index) { return (index === i ? { $match: chemicalLookup.query } : current); });
+                                    if (!!containsForbiddenMongoOperators(rewrittenPipeline)) return [3 /*break*/, 3];
+                                    return [4 /*yield*/, db.collection(collection)
+                                            .aggregate(rewrittenPipeline, aggregateOptions)
+                                            .toArray()];
+                                case 2:
+                                    fallbackDocs = _p.sent();
+                                    if (fallbackDocs.length) {
+                                        documents = fallbackDocs;
+                                        executedPipeline = rewrittenPipeline;
+                                        fallbackMeta.chemicalLookup.used = true;
+                                        return [2 /*return*/, "break"];
+                                    }
+                                    _p.label = 3;
+                                case 3: return [2 /*return*/];
+                            }
+                        });
+                    };
+                    i = 0;
+                    _o.label = 23;
+                case 23:
+                    if (!(i < (executedPipeline || []).length)) return [3 /*break*/, 26];
+                    return [5 /*yield**/, _loop_1(i)];
+                case 24:
+                    state_1 = _o.sent();
+                    if (state_1 === "break")
+                        return [3 /*break*/, 26];
+                    _o.label = 25;
+                case 25:
+                    i += 1;
+                    return [3 /*break*/, 23];
+                case 26:
+                    if (!!documents.length) return [3 /*break*/, 30];
+                    matchFields_1 = new Set();
+                    (executedPipeline || []).forEach(function (stage) {
+                        if (stage && typeof stage === 'object' && stage.$match && typeof stage.$match === 'object') {
+                            extractQueryFieldPaths(stage.$match)
+                                .filter(function (field) { return !isAssistantIdField(field); })
+                                .forEach(function (field) { return matchFields_1.add(field); });
+                        }
+                    });
+                    if (!matchFields_1.size) return [3 /*break*/, 30];
+                    _d = probeDocs;
+                    if (_d) return [3 /*break*/, 28];
+                    return [4 /*yield*/, fetchAssistantProbeDocs({
+                            db: db,
+                            collection: collection,
+                            idClient: normalizedClient,
+                            idCustomer: customerId,
+                            isSuperAdmin: isSuperAdmin,
+                            includeClientScope: shouldScopeByClient
+                        })];
+                case 27:
+                    _d = (_o.sent());
+                    _o.label = 28;
+                case 28:
+                    probeDocs = _d;
+                    if (!probeDocs.length) return [3 /*break*/, 30];
+                    aliases = resolveFieldAliases(probeDocs, Array.from(matchFields_1), schemaFields);
+                    if (!Object.keys(aliases).length) return [3 /*break*/, 30];
+                    fallbackMeta.queryFieldAliases = {
+                        aliases: aliases,
+                        attempted: true,
+                        used: false
+                    };
+                    rewrittenPipeline = Object.entries(aliases)
+                        .reduce(function (acc, _a) {
+                        var _b = __read(_a, 2), from = _b[0], to = _b[1];
+                        return replaceFieldPathDeep(acc, from, to);
+                    }, executedPipeline);
+                    if (!!containsForbiddenMongoOperators(rewrittenPipeline)) return [3 /*break*/, 30];
+                    return [4 /*yield*/, db.collection(collection)
+                            .aggregate(rewrittenPipeline, aggregateOptions)
+                            .toArray()];
+                case 29:
+                    fallbackDocs = _o.sent();
+                    if (fallbackDocs.length) {
+                        documents = fallbackDocs;
+                        executedPipeline = rewrittenPipeline;
+                        fallbackMeta.queryFieldAliases.used = true;
+                    }
+                    _o.label = 30;
+                case 30:
+                    if (!!documents.length) return [3 /*break*/, 34];
+                    _loop_2 = function (i) {
+                        var stage, _q, idLookup, rewrittenPipeline, fallbackDocs;
+                        return __generator(this, function (_r) {
+                            switch (_r.label) {
+                                case 0:
+                                    stage = executedPipeline[i];
+                                    if (!stage || typeof stage !== 'object' || !stage.$match || typeof stage.$match !== 'object') {
+                                        return [2 /*return*/, "continue"];
+                                    }
+                                    _q = probeDocs;
+                                    if (_q) return [3 /*break*/, 2];
+                                    return [4 /*yield*/, fetchAssistantProbeDocs({
+                                            db: db,
+                                            collection: collection,
+                                            idClient: normalizedClient,
+                                            idCustomer: customerId,
+                                            isSuperAdmin: isSuperAdmin,
+                                            includeClientScope: shouldScopeByClient
+                                        })];
+                                case 1:
+                                    _q = (_r.sent());
+                                    _r.label = 2;
+                                case 2:
+                                    probeDocs = _q;
+                                    return [4 /*yield*/, applyIdLookupFallbackToQuery({
+                                            query: stage.$match,
+                                            db: db,
+                                            dbName: dbName,
+                                            idClient: normalizedClient,
+                                            idCustomer: customerId,
+                                            isSuperAdmin: isSuperAdmin,
+                                            probeDocs: probeDocs || undefined
+                                        })];
+                                case 3:
+                                    idLookup = _r.sent();
+                                    if (!idLookup) {
+                                        return [2 /*return*/, "continue"];
+                                    }
+                                    fallbackMeta.idLookup = __assign(__assign({}, idLookup.meta), { attempted: true, used: false, stage: i });
+                                    rewrittenPipeline = executedPipeline.map(function (current, index) { return (index === i ? { $match: idLookup.query } : current); });
+                                    if (!!containsForbiddenMongoOperators(rewrittenPipeline)) return [3 /*break*/, 5];
+                                    return [4 /*yield*/, db.collection(collection)
+                                            .aggregate(rewrittenPipeline, aggregateOptions)
+                                            .toArray()];
+                                case 4:
+                                    fallbackDocs = _r.sent();
+                                    if (fallbackDocs.length) {
+                                        documents = fallbackDocs;
+                                        executedPipeline = rewrittenPipeline;
+                                        fallbackMeta.idLookup.used = true;
+                                        return [2 /*return*/, "break"];
+                                    }
+                                    _r.label = 5;
+                                case 5: return [2 /*return*/];
+                            }
+                        });
+                    };
+                    i = 0;
+                    _o.label = 31;
+                case 31:
+                    if (!(i < (executedPipeline || []).length)) return [3 /*break*/, 34];
+                    return [5 /*yield**/, _loop_2(i)];
+                case 32:
+                    state_2 = _o.sent();
+                    if (state_2 === "break")
+                        return [3 /*break*/, 34];
+                    _o.label = 33;
+                case 33:
+                    i += 1;
+                    return [3 /*break*/, 31];
+                case 34:
+                    if (!!documents.length) return [3 /*break*/, 37];
+                    return [4 /*yield*/, resolveBaseCollectionFromReport(db, dbName, collection)];
+                case 35:
+                    baseCollection = _o.sent();
+                    if (!(baseCollection && baseCollection !== collection)) return [3 /*break*/, 37];
+                    fallbackPayload = __assign(__assign({}, input), { collection: baseCollection });
+                    return [4 /*yield*/, executeAiAssistantMongoAggregate(fallbackPayload, context)];
+                case 36:
+                    fallbackResult = _o.sent();
+                    if (Array.isArray(fallbackResult === null || fallbackResult === void 0 ? void 0 : fallbackResult.documents) && fallbackResult.documents.length) {
+                        if (isSuperAdmin && (fallbackResult === null || fallbackResult === void 0 ? void 0 : fallbackResult.debug) && typeof fallbackResult.debug === 'object') {
+                            existingFallbacks = fallbackResult.debug.fallbacks && typeof fallbackResult.debug.fallbacks === 'object'
+                                ? fallbackResult.debug.fallbacks
+                                : {};
+                            fallbackResult.debug.fallbacks = __assign(__assign({}, existingFallbacks), { reportFallback: {
+                                    from: collection,
+                                    to: baseCollection,
+                                    used: true
+                                } });
+                        }
+                        return [2 /*return*/, fallbackResult];
+                    }
+                    if (isSuperAdmin) {
+                        fallbackMeta.reportFallback = { from: collection, to: baseCollection, attempted: true, used: false };
+                    }
+                    _o.label = 37;
+                case 37:
+                    if (!(!documents.length && isSuperAdmin)) return [3 /*break*/, 54];
+                    matchStages = (executedPipeline || []).filter(function (stage) { return stage && typeof stage === 'object' && stage.$match && typeof stage.$match === 'object'; });
+                    diagnostics = {};
+                    if (!matchStages.length) return [3 /*break*/, 54];
+                    combinedMatch = matchStages.reduce(function (acc, stage) { return ({ $and: __spreadArray(__spreadArray([], __read((acc.$and || [])), false), [stage.$match], false) }); }, { $and: [] });
+                    nameFields = collectMatchFieldsByCondition(combinedMatch, function (field, condition) { return isRegexMatchCondition(condition)
+                        || (typeof condition === 'string' && shouldApplyAssistantNameRegex(field)); });
+                    dateFields = collectMatchFieldsByCondition(combinedMatch, function (_field, condition) { return isDateCondition(condition); });
+                    diagnostics.nameFields = nameFields.length ? nameFields : undefined;
+                    diagnostics.dateFields = dateFields.length ? dateFields : undefined;
+                    _o.label = 38;
+                case 38:
+                    _o.trys.push([38, 43, , 44]);
+                    if (!nameFields.length) return [3 /*break*/, 40];
+                    queryNoName = stripMatchFields(combinedMatch, nameFields);
+                    _e = diagnostics;
+                    return [4 /*yield*/, db.collection(collection).countDocuments(queryNoName, {
+                            readPreference: AI_ASSISTANT_READ_PREFERENCE
+                        })];
+                case 39:
+                    _e.recentCount = _o.sent();
+                    _o.label = 40;
+                case 40:
+                    if (!dateFields.length) return [3 /*break*/, 42];
+                    queryNoDate = stripMatchFields(combinedMatch, dateFields);
+                    _f = diagnostics;
+                    return [4 /*yield*/, db.collection(collection).countDocuments(queryNoDate, {
+                            readPreference: AI_ASSISTANT_READ_PREFERENCE
+                        })];
+                case 41:
+                    _f.nameMatchCount = _o.sent();
+                    _o.label = 42;
+                case 42: return [3 /*break*/, 44];
+                case 43:
+                    _g = _o.sent();
+                    return [3 /*break*/, 44];
+                case 44:
+                    _o.trys.push([44, 47, , 48]);
+                    _h = probeDocs;
+                    if (_h) return [3 /*break*/, 46];
+                    return [4 /*yield*/, fetchAssistantProbeDocs({
+                            db: db,
+                            collection: collection,
+                            idClient: normalizedClient,
+                            idCustomer: customerId,
+                            isSuperAdmin: isSuperAdmin,
+                            includeClientScope: shouldScopeByClient
+                        })];
+                case 45:
+                    _h = (_o.sent());
+                    _o.label = 46;
+                case 46:
+                    probeDocs = _h;
+                    if (probeDocs.length && nameFields.length) {
+                        diagnostics.chemicalIdDetected = detectChemicalIdFromProbe(probeDocs, nameFields);
+                    }
+                    return [3 /*break*/, 48];
+                case 47:
+                    _j = _o.sent();
+                    return [3 /*break*/, 48];
+                case 48:
+                    _o.trys.push([48, 52, , 53]);
+                    return [4 /*yield*/, listAssistantCollections(db, dbName)];
+                case 49:
+                    allCollections = _o.sent();
+                    base = stripVersionSuffix(collection.startsWith('report-') ? collection.slice('report-'.length) : collection);
+                    alt = collection.startsWith('report-') ? base : "report-".concat(base);
+                    if (!(alt && alt !== collection && allCollections.includes(alt))) return [3 /*break*/, 51];
+                    return [4 /*yield*/, db.collection(alt).countDocuments({}, { readPreference: AI_ASSISTANT_READ_PREFERENCE })];
+                case 50:
+                    altCount = _o.sent();
+                    diagnostics.alternateCollection = alt;
+                    diagnostics.alternateCollectionCount = altCount;
+                    _o.label = 51;
+                case 51: return [3 /*break*/, 53];
+                case 52:
+                    _k = _o.sent();
+                    return [3 /*break*/, 53];
+                case 53:
+                    fallbackMeta.zeroDiagnostics = diagnostics;
+                    _o.label = 54;
+                case 54:
                     sanitizedDocuments = isSuperAdmin
                         ? documents
                         : documents.map(function (doc) { return redactSensitiveFields((0, common_1.deepCopy)(doc)); });
-                    includeIds = ((_d = input.options) === null || _d === void 0 ? void 0 : _d.includeIds) === true;
-                    display = buildDisplayTable(sanitizedDocuments, {
+                    includeIds = ((_m = input.options) === null || _m === void 0 ? void 0 : _m.includeIds) === true;
+                    displayDocs = sanitizedDocuments;
+                    return [4 /*yield*/, applyIdLookupDisplayEnrichment({
+                            docs: displayDocs,
+                            collection: collection,
+                            db: db,
+                            dbName: dbName,
+                            idClient: normalizedClient,
+                            idCustomer: customerId,
+                            isSuperAdmin: isSuperAdmin
+                        })];
+                case 55:
+                    idLookupDisplay = _o.sent();
+                    if (idLookupDisplay === null || idLookupDisplay === void 0 ? void 0 : idLookupDisplay.docs) {
+                        displayDocs = idLookupDisplay.docs;
+                    }
+                    if (idLookupDisplay === null || idLookupDisplay === void 0 ? void 0 : idLookupDisplay.meta) {
+                        fallbackMeta.idDisplayLookup = idLookupDisplay.meta;
+                    }
+                    display = buildDisplayTable(displayDocs, {
                         includeIds: includeIds,
                         maxColumns: AI_ASSISTANT_DISPLAY_MAX_COLUMNS,
                         maxRows: normalizedOptions.limit || sanitizedDocuments.length,
@@ -1901,7 +2707,7 @@ function buildAssistantToolFallbackResponse(result) {
     return lines.join('\n').trim();
 }
 function buildAssistantDebugPayload(params) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3;
     var notes = [];
     if (params.dataQuestion) {
         notes.push('Detected a data request; tool call required.');
@@ -1909,18 +2715,24 @@ function buildAssistantDebugPayload(params) {
     if (params.directiveSource === 'forced') {
         notes.push('Assistant response omitted a MONGO_* directive; ran a directive-only pass.');
     }
+    if ((_a = params.collectionOverride) === null || _a === void 0 ? void 0 : _a.to) {
+        var from = params.collectionOverride.from ? "\"".concat(params.collectionOverride.from, "\"") : '(none)';
+        var to = "\"".concat(params.collectionOverride.to, "\"");
+        var reason = params.collectionOverride.reason ? " (".concat(params.collectionOverride.reason, ")") : '';
+        notes.push("Collection override: ".concat(from, " -> ").concat(to).concat(reason, "."));
+    }
     var directive = params.directive;
     var directivePayload = (directive === null || directive === void 0 ? void 0 : directive.payload) || {};
     var rawCollection = normalizeOptionalString(directivePayload === null || directivePayload === void 0 ? void 0 : directivePayload.collection);
-    var debugCollectionRequested = normalizeOptionalString((_a = params.toolResponseDebug) === null || _a === void 0 ? void 0 : _a.collectionRequested);
-    var debugCollectionResolved = normalizeOptionalString((_b = params.toolResponseDebug) === null || _b === void 0 ? void 0 : _b.collectionResolved);
-    var debugCollection = normalizeOptionalString((_c = params.toolResponseDebug) === null || _c === void 0 ? void 0 : _c.collection);
+    var debugCollectionRequested = normalizeOptionalString((_b = params.toolResponseDebug) === null || _b === void 0 ? void 0 : _b.collectionRequested);
+    var debugCollectionResolved = normalizeOptionalString((_c = params.toolResponseDebug) === null || _c === void 0 ? void 0 : _c.collectionResolved);
+    var debugCollection = normalizeOptionalString((_d = params.toolResponseDebug) === null || _d === void 0 ? void 0 : _d.collection);
     var requestedCollection = debugCollectionRequested || rawCollection;
     var resolvedCollection = debugCollectionResolved || debugCollection || requestedCollection;
-    var matchedCollection = typeof ((_d = params.toolResponseDebug) === null || _d === void 0 ? void 0 : _d.collectionMatched) === 'boolean'
+    var matchedCollection = typeof ((_e = params.toolResponseDebug) === null || _e === void 0 ? void 0 : _e.collectionMatched) === 'boolean'
         ? params.toolResponseDebug.collectionMatched
         : undefined;
-    var candidateCollections = Array.isArray((_e = params.toolResponseDebug) === null || _e === void 0 ? void 0 : _e.collectionCandidates)
+    var candidateCollections = Array.isArray((_f = params.toolResponseDebug) === null || _f === void 0 ? void 0 : _f.collectionCandidates)
         ? params.toolResponseDebug.collectionCandidates.filter(Boolean)
         : [];
     if (requestedCollection && resolvedCollection && requestedCollection !== resolvedCollection) {
@@ -1929,27 +2741,27 @@ function buildAssistantDebugPayload(params) {
     else if (matchedCollection === false && candidateCollections.length) {
         notes.push("No direct collection match; candidates: ".concat(candidateCollections.join(', '), "."));
     }
-    if (((_f = params.toolResult) === null || _f === void 0 ? void 0 : _f.type) === 'mongo_agg') {
+    if (((_g = params.toolResult) === null || _g === void 0 ? void 0 : _g.type) === 'mongo_agg') {
         notes.push('Used aggregation for grouped/breakdown request.');
     }
-    else if (((_g = params.toolResult) === null || _g === void 0 ? void 0 : _g.type) === 'mongo_read') {
+    else if (((_h = params.toolResult) === null || _h === void 0 ? void 0 : _h.type) === 'mongo_read') {
         notes.push('Used read query for list/count request.');
     }
-    var fallbackInfo = (_h = params.toolResponseDebug) === null || _h === void 0 ? void 0 : _h.fallbacks;
-    if ((_j = fallbackInfo === null || fallbackInfo === void 0 ? void 0 : fallbackInfo.dateField) === null || _j === void 0 ? void 0 : _j.used) {
+    var fallbackInfo = (_j = params.toolResponseDebug) === null || _j === void 0 ? void 0 : _j.fallbacks;
+    if ((_k = fallbackInfo === null || fallbackInfo === void 0 ? void 0 : fallbackInfo.dateField) === null || _k === void 0 ? void 0 : _k.used) {
         notes.push("Retried with date field fallback ".concat(fallbackInfo.dateField.from, " -> ").concat(fallbackInfo.dateField.to, "."));
     }
-    if ((_k = fallbackInfo === null || fallbackInfo === void 0 ? void 0 : fallbackInfo.dateFieldCreatedAt) === null || _k === void 0 ? void 0 : _k.used) {
+    if ((_l = fallbackInfo === null || fallbackInfo === void 0 ? void 0 : fallbackInfo.dateFieldCreatedAt) === null || _l === void 0 ? void 0 : _l.used) {
         notes.push("Retried with date field fallback ".concat(fallbackInfo.dateFieldCreatedAt.from, " -> ").concat(fallbackInfo.dateFieldCreatedAt.to, "."));
     }
-    if ((_l = fallbackInfo === null || fallbackInfo === void 0 ? void 0 : fallbackInfo.completion) === null || _l === void 0 ? void 0 : _l.used) {
+    if ((_m = fallbackInfo === null || fallbackInfo === void 0 ? void 0 : fallbackInfo.completion) === null || _m === void 0 ? void 0 : _m.used) {
         var sources = Array.isArray(fallbackInfo.completion.sources)
             ? fallbackInfo.completion.sources.join(', ')
             : fallbackInfo.completion.field;
         var strategy = fallbackInfo.completion.strategy ? " (".concat(fallbackInfo.completion.strategy, ")") : '';
         notes.push("Applied completion fallback".concat(strategy, ": ").concat(sources, "."));
     }
-    if ((_m = fallbackInfo === null || fallbackInfo === void 0 ? void 0 : fallbackInfo.dateFieldsExpanded) === null || _m === void 0 ? void 0 : _m.used) {
+    if ((_o = fallbackInfo === null || fallbackInfo === void 0 ? void 0 : fallbackInfo.dateFieldsExpanded) === null || _o === void 0 ? void 0 : _o.used) {
         var fields = Array.isArray(fallbackInfo.dateFieldsExpanded.fields)
             ? fallbackInfo.dateFieldsExpanded.fields.join(', ')
             : String(fallbackInfo.dateFieldsExpanded.fields || '');
@@ -1957,17 +2769,69 @@ function buildAssistantDebugPayload(params) {
             notes.push("Expanded date fields: ".concat(fields, "."));
         }
     }
-    if ((_o = fallbackInfo === null || fallbackInfo === void 0 ? void 0 : fallbackInfo.unwind) === null || _o === void 0 ? void 0 : _o.used) {
+    if ((_p = fallbackInfo === null || fallbackInfo === void 0 ? void 0 : fallbackInfo.queryFieldAliases) === null || _p === void 0 ? void 0 : _p.used) {
+        var entries = fallbackInfo.queryFieldAliases.aliases
+            ? Object.entries(fallbackInfo.queryFieldAliases.aliases)
+                .map(function (_a) {
+                var _b = __read(_a, 2), from = _b[0], to = _b[1];
+                return "".concat(from, " -> ").concat(to);
+            })
+                .join(', ')
+            : '';
+        if (entries) {
+            notes.push("Rewrote query fields: ".concat(entries, "."));
+        }
+    }
+    if ((_q = fallbackInfo === null || fallbackInfo === void 0 ? void 0 : fallbackInfo.projectionAliases) === null || _q === void 0 ? void 0 : _q.used) {
+        var entries = fallbackInfo.projectionAliases.aliases
+            ? Object.entries(fallbackInfo.projectionAliases.aliases)
+                .map(function (_a) {
+                var _b = __read(_a, 2), from = _b[0], to = _b[1];
+                return "".concat(from, " -> ").concat(to);
+            })
+                .join(', ')
+            : '';
+        if (entries) {
+            notes.push("Expanded projection fields: ".concat(entries, "."));
+        }
+    }
+    if ((_r = fallbackInfo === null || fallbackInfo === void 0 ? void 0 : fallbackInfo.unwind) === null || _r === void 0 ? void 0 : _r.used) {
         notes.push("Applied unwind fallback on ".concat(fallbackInfo.unwind.path, "."));
     }
-    if ((_p = fallbackInfo === null || fallbackInfo === void 0 ? void 0 : fallbackInfo.nameMatch) === null || _p === void 0 ? void 0 : _p.used) {
+    if ((_s = fallbackInfo === null || fallbackInfo === void 0 ? void 0 : fallbackInfo.nameMatch) === null || _s === void 0 ? void 0 : _s.used) {
         var fields = Array.isArray(fallbackInfo.nameMatch.fields)
             ? fallbackInfo.nameMatch.fields.join(', ')
             : fallbackInfo.nameMatch.field;
         notes.push("Expanded name match fields: ".concat(fields, "."));
     }
+    if ((_t = fallbackInfo === null || fallbackInfo === void 0 ? void 0 : fallbackInfo.chemicalLookup) === null || _t === void 0 ? void 0 : _t.used) {
+        var collection = fallbackInfo.chemicalLookup.collection ? " in ".concat(fallbackInfo.chemicalLookup.collection) : '';
+        notes.push("Applied chemical lookup".concat(collection, "."));
+    }
+    if ((_u = fallbackInfo === null || fallbackInfo === void 0 ? void 0 : fallbackInfo.reportFallback) === null || _u === void 0 ? void 0 : _u.used) {
+        var from = fallbackInfo.reportFallback.from || 'report';
+        var to = fallbackInfo.reportFallback.to || 'base';
+        notes.push("Report fallback: ".concat(from, " -> ").concat(to, "."));
+    }
+    if ((_v = fallbackInfo === null || fallbackInfo === void 0 ? void 0 : fallbackInfo.idLookup) === null || _v === void 0 ? void 0 : _v.used) {
+        var field = fallbackInfo.idLookup.field || 'id';
+        var strategy = fallbackInfo.idLookup.strategy || 'lookup';
+        var collection = fallbackInfo.idLookup.collection ? " in ".concat(fallbackInfo.idLookup.collection) : '';
+        var detail = fallbackInfo.idLookup.nameField ? " via ".concat(fallbackInfo.idLookup.nameField) : '';
+        notes.push("Resolved ".concat(field, " by ").concat(strategy).concat(collection).concat(detail, "."));
+    }
+    if ((_w = fallbackInfo === null || fallbackInfo === void 0 ? void 0 : fallbackInfo.idDisplayLookup) === null || _w === void 0 ? void 0 : _w.used) {
+        var lookups = Array.isArray(fallbackInfo.idDisplayLookup.lookups)
+            ? fallbackInfo.idDisplayLookup.lookups
+            : [];
+        var summary = lookups
+            .map(function (entry) { return (entry === null || entry === void 0 ? void 0 : entry.displayField) || (entry === null || entry === void 0 ? void 0 : entry.field); })
+            .filter(Boolean)
+            .join(', ');
+        notes.push(summary ? "Resolved id lookups for display: ".concat(summary, ".") : 'Resolved id lookups for display.');
+    }
     if (params.toolError) {
-        var errorMessage = ((_q = params.toolError) === null || _q === void 0 ? void 0 : _q.message) || String(params.toolError || '');
+        var errorMessage = ((_x = params.toolError) === null || _x === void 0 ? void 0 : _x.message) || String(params.toolError || '');
         if (errorMessage) {
             notes.push("Tool error: ".concat(errorMessage));
         }
@@ -1982,18 +2846,19 @@ function buildAssistantDebugPayload(params) {
             payload: directivePayload,
             rawLine: directive.rawLine
         } : null,
+        collectionOverride: params.collectionOverride || undefined,
         collection: resolvedCollection || requestedCollection || undefined,
         collectionRequested: requestedCollection || undefined,
         collectionResolved: resolvedCollection || undefined,
         collectionMatched: matchedCollection,
         collectionCandidates: candidateCollections.length ? candidateCollections : undefined,
-        collectionScore: typeof ((_r = params.toolResponseDebug) === null || _r === void 0 ? void 0 : _r.collectionScore) === 'number'
+        collectionScore: typeof ((_y = params.toolResponseDebug) === null || _y === void 0 ? void 0 : _y.collectionScore) === 'number'
             ? params.toolResponseDebug.collectionScore
             : undefined,
-        query: ((_s = params.toolResponseDebug) === null || _s === void 0 ? void 0 : _s.query) || undefined,
-        pipeline: ((_t = params.toolResponseDebug) === null || _t === void 0 ? void 0 : _t.executedPipeline) || ((_u = params.toolResponseDebug) === null || _u === void 0 ? void 0 : _u.originalPipeline) || undefined,
-        options: ((_v = params.toolResponseDebug) === null || _v === void 0 ? void 0 : _v.options) || undefined,
-        fallbacks: ((_w = params.toolResponseDebug) === null || _w === void 0 ? void 0 : _w.fallbacks) || undefined,
+        query: ((_z = params.toolResponseDebug) === null || _z === void 0 ? void 0 : _z.query) || undefined,
+        pipeline: ((_0 = params.toolResponseDebug) === null || _0 === void 0 ? void 0 : _0.executedPipeline) || ((_1 = params.toolResponseDebug) === null || _1 === void 0 ? void 0 : _1.originalPipeline) || undefined,
+        options: ((_2 = params.toolResponseDebug) === null || _2 === void 0 ? void 0 : _2.options) || undefined,
+        fallbacks: ((_3 = params.toolResponseDebug) === null || _3 === void 0 ? void 0 : _3.fallbacks) || undefined,
         notes: notes
     };
     if (params.trace && typeof params.trace === 'object') {
@@ -2260,76 +3125,698 @@ function tokenizeFieldKey(value) {
 function normalizeFieldMatchKey(value) {
     return tokenizeFieldKey(value).join('');
 }
+function getCollectionSchemaFieldNames(collectionName) {
+    var _a;
+    var normalized = normalizeOptionalString(collectionName);
+    if (!normalized) {
+        return [];
+    }
+    try {
+        var collection = (_a = resolveio_server_app_1.ResolveIOServer.getMongoManager()) === null || _a === void 0 ? void 0 : _a.collection(normalized);
+        var schema = collection === null || collection === void 0 ? void 0 : collection.simplschema;
+        var fields_1 = schema && typeof schema.schema === 'function'
+            ? Object.keys(schema.schema())
+            : [];
+        var rbSchema = collection === null || collection === void 0 ? void 0 : collection.rbSchema;
+        if (rbSchema && typeof rbSchema === 'object') {
+            Object.keys(rbSchema).forEach(function (field) {
+                if (field && !fields_1.includes(field)) {
+                    fields_1.push(field);
+                }
+            });
+        }
+        return fields_1;
+    }
+    catch (_b) {
+        return [];
+    }
+}
+function getCollectionLookupMappings(collectionName) {
+    var _a;
+    var normalized = normalizeOptionalString(collectionName);
+    if (!normalized) {
+        return [];
+    }
+    try {
+        var collection = (_a = resolveio_server_app_1.ResolveIOServer.getMongoManager()) === null || _a === void 0 ? void 0 : _a.collection(normalized);
+        var rbSchema_1 = collection === null || collection === void 0 ? void 0 : collection.rbSchema;
+        if (!rbSchema_1 || typeof rbSchema_1 !== 'object') {
+            return [];
+        }
+        var mappings_1 = [];
+        Object.keys(rbSchema_1).forEach(function (key) {
+            var entry = rbSchema_1[key];
+            if (!entry || typeof entry !== 'object') {
+                return;
+            }
+            var lookupCollection = normalizeOptionalString(entry.lookup_collection);
+            var localKey = normalizeOptionalString(entry.local_key);
+            if (!lookupCollection || !localKey) {
+                return;
+            }
+            var lookupKey = normalizeOptionalString(entry.lookup_key) || '_id';
+            mappings_1.push({ localKey: localKey, lookupCollection: lookupCollection, lookupKey: lookupKey });
+        });
+        return mappings_1;
+    }
+    catch (_b) {
+        return [];
+    }
+}
+function normalizeLookupPath(value) {
+    var trimmed = normalizeOptionalString(value);
+    if (!trimmed) {
+        return '';
+    }
+    return trimmed
+        .replace(/\.\$\./g, '.')
+        .replace(/\.\$/g, '.')
+        .replace(/\.\d+\./g, '.')
+        .replace(/\.\d+$/g, '')
+        .replace(/\.+/g, '.')
+        .replace(/^\./, '')
+        .replace(/\.$/, '');
+}
+function isUnsafeFieldAlias(requestedTokens, candidateTokens) {
+    var reqSet = new Set(requestedTokens);
+    var candSet = new Set(candidateTokens);
+    var hasReqCreated = reqSet.has('created') || reqSet.has('create');
+    var hasReqUpdated = reqSet.has('updated') || reqSet.has('update') || reqSet.has('modified') || reqSet.has('modify');
+    var hasCandCreated = candSet.has('created') || candSet.has('create');
+    var hasCandUpdated = candSet.has('updated') || candSet.has('update') || candSet.has('modified') || candSet.has('modify');
+    if (hasReqCreated && hasCandUpdated && !hasCandCreated) {
+        return true;
+    }
+    if (hasReqUpdated && hasCandCreated && !hasCandUpdated) {
+        return true;
+    }
+    return false;
+}
+function expandFieldTokens(tokens) {
+    var expanded = new Set();
+    tokens.forEach(function (token) {
+        if (!token) {
+            return;
+        }
+        expanded.add(token);
+        var synonyms = AI_ASSISTANT_FIELD_TOKEN_SYNONYMS[token];
+        if (Array.isArray(synonyms)) {
+            synonyms.forEach(function (synonym) {
+                if (synonym) {
+                    expanded.add(synonym);
+                }
+            });
+        }
+    });
+    return Array.from(expanded);
+}
 function getValueAtPath(obj, path) {
-    var e_1, _a;
     if (!obj || typeof obj !== 'object') {
         return undefined;
     }
     var parts = String(path || '').split('.').filter(Boolean);
-    var current = obj;
-    try {
-        for (var parts_1 = __values(parts), parts_1_1 = parts_1.next(); !parts_1_1.done; parts_1_1 = parts_1.next()) {
-            var part = parts_1_1.value;
-            if (!current || typeof current !== 'object') {
+    var walk = function (current, index) {
+        if (index >= parts.length) {
+            return current;
+        }
+        var part = parts[index];
+        if (Array.isArray(current)) {
+            var numeric = Number(part);
+            if (!Number.isNaN(numeric) && current[numeric] !== undefined) {
+                return walk(current[numeric], index + 1);
+            }
+            var values = current.map(function (entry) { return walk(entry, index); }).filter(function (value) { return value !== undefined; });
+            if (!values.length) {
                 return undefined;
             }
-            current = current[part];
+            return values.length === 1 ? values[0] : values;
         }
-    }
-    catch (e_1_1) { e_1 = { error: e_1_1 }; }
-    finally {
-        try {
-            if (parts_1_1 && !parts_1_1.done && (_a = parts_1.return)) _a.call(parts_1);
+        if (!current || typeof current !== 'object') {
+            return undefined;
         }
-        finally { if (e_1) throw e_1.error; }
-    }
-    return current;
+        return walk(current[part], index + 1);
+    };
+    return walk(obj, 0);
 }
-function hasNonEmptyValue(docs, fieldPath, options) {
-    var e_2, _a;
+function inferIdFieldStorageTypeFromDocs(docs, fieldPath) {
+    var e_1, _a, e_2, _b;
     if (!Array.isArray(docs) || !fieldPath) {
-        return false;
+        return 'unknown';
     }
-    var usePath = fieldPath.includes('.');
+    var sawString = false;
     try {
         for (var docs_1 = __values(docs), docs_1_1 = docs_1.next(); !docs_1_1.done; docs_1_1 = docs_1.next()) {
             var doc = docs_1_1.value;
-            var value = usePath ? getValueAtPath(doc, fieldPath) : doc === null || doc === void 0 ? void 0 : doc[fieldPath];
-            if ((options === null || options === void 0 ? void 0 : options.treatObjectLikeAsEmpty) && isDisplayObjectLike(value)) {
-                continue;
+            var value = fieldPath.includes('.')
+                ? getValueAtPath(doc, fieldPath)
+                : doc === null || doc === void 0 ? void 0 : doc[fieldPath];
+            var queue = Array.isArray(value) ? value : [value];
+            try {
+                for (var queue_1 = (e_2 = void 0, __values(queue)), queue_1_1 = queue_1.next(); !queue_1_1.done; queue_1_1 = queue_1.next()) {
+                    var entry = queue_1_1.value;
+                    if (entry === null || entry === undefined) {
+                        continue;
+                    }
+                    if (isMongoObjectId(entry)) {
+                        return 'objectId';
+                    }
+                    if (typeof entry === 'string' && entry.trim()) {
+                        sawString = true;
+                    }
+                }
             }
-            if (!isEmptyDisplayValue(value)) {
-                return true;
+            catch (e_2_1) { e_2 = { error: e_2_1 }; }
+            finally {
+                try {
+                    if (queue_1_1 && !queue_1_1.done && (_b = queue_1.return)) _b.call(queue_1);
+                }
+                finally { if (e_2) throw e_2.error; }
             }
         }
     }
-    catch (e_2_1) { e_2 = { error: e_2_1 }; }
+    catch (e_1_1) { e_1 = { error: e_1_1 }; }
     finally {
         try {
             if (docs_1_1 && !docs_1_1.done && (_a = docs_1.return)) _a.call(docs_1);
         }
-        finally { if (e_2) throw e_2.error; }
+        finally { if (e_1) throw e_1.error; }
     }
-    return false;
+    return sawString ? 'string' : 'unknown';
 }
-function collectFieldCandidates(docs) {
-    var candidates = new Map();
-    if (!Array.isArray(docs)) {
-        return candidates;
+function normalizeIdsForTargetField(ids, targetDocs, targetFieldPath, targetFieldTypeOverride) {
+    if (!Array.isArray(ids) || !ids.length) {
+        return [];
     }
-    var addCandidate = function (path, value) {
-        if (!path) {
+    var targetType = targetFieldTypeOverride
+        || inferIdFieldStorageTypeFromDocs(targetDocs || [], targetFieldPath);
+    var normalized = [];
+    var seenStrings = new Set();
+    var seenObjectIds = new Set();
+    var pushString = function (value) {
+        var text = String(value || '').trim();
+        if (!text || seenStrings.has(text)) {
             return;
         }
-        var entry = candidates.get(path) || {
-            nonEmpty: 0,
-            objectLike: 0,
-            normalized: normalizeFieldMatchKey(path)
-        };
-        if (!isEmptyDisplayValue(value)) {
-            entry.nonEmpty += 1;
+        seenStrings.add(text);
+        normalized.push(text);
+    };
+    var pushObjectId = function (value) {
+        if (!isMongoObjectId(value)) {
+            return;
         }
-        if (isDisplayObjectLike(value)) {
+        var hex = typeof value.toHexString === 'function' ? value.toHexString() : String(value || '');
+        if (!hex || seenObjectIds.has(hex)) {
+            return;
+        }
+        seenObjectIds.add(hex);
+        normalized.push(value);
+    };
+    ids.forEach(function (value) {
+        if (value === null || value === undefined) {
+            return;
+        }
+        if (targetType === 'string') {
+            if (isMongoObjectId(value)) {
+                var hex = typeof value.toHexString === 'function' ? value.toHexString() : String(value || '');
+                pushString(hex);
+                return;
+            }
+            pushString(value);
+            return;
+        }
+        if (targetType === 'objectId') {
+            if (isMongoObjectId(value)) {
+                pushObjectId(value);
+                return;
+            }
+            if (typeof value === 'string' && isObjectIdString(value)) {
+                try {
+                    pushObjectId(new mongodb_1.ObjectId(value));
+                }
+                catch (_a) {
+                    return;
+                }
+            }
+            return;
+        }
+        if (isMongoObjectId(value)) {
+            pushObjectId(value);
+            var hex = typeof value.toHexString === 'function' ? value.toHexString() : String(value || '');
+            if (hex) {
+                pushString(hex);
+            }
+            return;
+        }
+        if (typeof value === 'string' && isObjectIdString(value)) {
+            try {
+                pushObjectId(new mongodb_1.ObjectId(value));
+            }
+            catch (_b) {
+                // Ignore invalid object id conversions.
+            }
+            pushString(value);
+            return;
+        }
+        pushString(value);
+    });
+    return normalized;
+}
+function normalizeLookupKeyValue(value) {
+    if (value === null || value === undefined) {
+        return '';
+    }
+    if (isMongoObjectId(value)) {
+        return typeof value.toHexString === 'function' ? value.toHexString() : String(value);
+    }
+    if (typeof value === 'string') {
+        return value.trim();
+    }
+    return '';
+}
+function collectTopLevelIdFieldValues(docs, options) {
+    var e_3, _a, e_4, _b;
+    if (!Array.isArray(docs) || !docs.length) {
+        return [];
+    }
+    var maxFields = typeof (options === null || options === void 0 ? void 0 : options.maxFields) === 'number'
+        ? Math.max(options.maxFields, 0)
+        : AI_ASSISTANT_ID_DISPLAY_LOOKUP_MAX_FIELDS;
+    var maxIds = typeof (options === null || options === void 0 ? void 0 : options.maxIds) === 'number'
+        ? Math.max(options.maxIds, 0)
+        : AI_ASSISTANT_ID_DISPLAY_LOOKUP_MAX_IDS;
+    var fieldMap = new Map();
+    try {
+        for (var docs_2 = __values(docs), docs_2_1 = docs_2.next(); !docs_2_1.done; docs_2_1 = docs_2.next()) {
+            var doc = docs_2_1.value;
+            if (!doc || typeof doc !== 'object') {
+                continue;
+            }
+            var keys = Object.keys(doc);
+            var _loop_3 = function (key) {
+                if (!key || key === '_id' || key === '__v') {
+                    return "continue";
+                }
+                if (!isAssistantIdField(key)) {
+                    return "continue";
+                }
+                var value = doc[key];
+                var values = Array.isArray(value) ? value : [value];
+                if (!fieldMap.has(key)) {
+                    if (maxFields && fieldMap.size >= maxFields) {
+                        return "continue";
+                    }
+                    fieldMap.set(key, new Set());
+                }
+                var bucket = fieldMap.get(key);
+                if (!bucket) {
+                    return "continue";
+                }
+                values.forEach(function (entry) {
+                    if (entry === null || entry === undefined) {
+                        return;
+                    }
+                    if (bucket.size >= maxIds) {
+                        return;
+                    }
+                    bucket.add(entry);
+                });
+            };
+            try {
+                for (var keys_1 = (e_4 = void 0, __values(keys)), keys_1_1 = keys_1.next(); !keys_1_1.done; keys_1_1 = keys_1.next()) {
+                    var key = keys_1_1.value;
+                    _loop_3(key);
+                }
+            }
+            catch (e_4_1) { e_4 = { error: e_4_1 }; }
+            finally {
+                try {
+                    if (keys_1_1 && !keys_1_1.done && (_b = keys_1.return)) _b.call(keys_1);
+                }
+                finally { if (e_4) throw e_4.error; }
+            }
+        }
+    }
+    catch (e_3_1) { e_3 = { error: e_3_1 }; }
+    finally {
+        try {
+            if (docs_2_1 && !docs_2_1.done && (_a = docs_2.return)) _a.call(docs_2);
+        }
+        finally { if (e_3) throw e_3.error; }
+    }
+    return Array.from(fieldMap.entries()).map(function (_a) {
+        var _b = __read(_a, 2), field = _b[0], values = _b[1];
+        return ({
+            field: field,
+            values: Array.from(values)
+        });
+    });
+}
+function resolveLookupDisplayField(baseToken, probeDocs, schemaFields) {
+    var e_5, _a, e_6, _b;
+    var normalizedBase = normalizeOptionalString(baseToken);
+    if (!normalizedBase) {
+        return null;
+    }
+    var candidates = buildNameLookupFields(normalizedBase, probeDocs || []);
+    var schema = Array.isArray(schemaFields) ? schemaFields : [];
+    if (schema.length) {
+        var schemaCandidates = candidates.filter(function (candidate) { return schema.includes(candidate); });
+        if (schemaCandidates.length) {
+            try {
+                for (var schemaCandidates_1 = __values(schemaCandidates), schemaCandidates_1_1 = schemaCandidates_1.next(); !schemaCandidates_1_1.done; schemaCandidates_1_1 = schemaCandidates_1.next()) {
+                    var candidate = schemaCandidates_1_1.value;
+                    if (hasNonEmptyValue(probeDocs || [], candidate, { treatObjectLikeAsEmpty: true })) {
+                        return candidate;
+                    }
+                }
+            }
+            catch (e_5_1) { e_5 = { error: e_5_1 }; }
+            finally {
+                try {
+                    if (schemaCandidates_1_1 && !schemaCandidates_1_1.done && (_a = schemaCandidates_1.return)) _a.call(schemaCandidates_1);
+                }
+                finally { if (e_5) throw e_5.error; }
+            }
+            return schemaCandidates[0];
+        }
+    }
+    try {
+        for (var candidates_1 = __values(candidates), candidates_1_1 = candidates_1.next(); !candidates_1_1.done; candidates_1_1 = candidates_1.next()) {
+            var candidate = candidates_1_1.value;
+            if (hasNonEmptyValue(probeDocs || [], candidate, { treatObjectLikeAsEmpty: true })) {
+                return candidate;
+            }
+        }
+    }
+    catch (e_6_1) { e_6 = { error: e_6_1 }; }
+    finally {
+        try {
+            if (candidates_1_1 && !candidates_1_1.done && (_b = candidates_1.return)) _b.call(candidates_1);
+        }
+        finally { if (e_6) throw e_6.error; }
+    }
+    return candidates.length ? candidates[0] : null;
+}
+function resolveLookupMappingsForField(field, mappings) {
+    var normalizedField = normalizeLookupPath(field);
+    if (!normalizedField) {
+        return [];
+    }
+    return mappings.filter(function (mapping) { return normalizeLookupPath(mapping.localKey) === normalizedField; });
+}
+function applyIdLookupDisplayEnrichment(params) {
+    return __awaiter(this, void 0, void 0, function () {
+        var docs, collection, db, dbName, idClient, idCustomer, isSuperAdmin, idFields, lookupMappings, allCollections, collectionProbeCache, collectionSchemaCache, lookupMeta, enrichedDocs, _loop_4, idFields_1, idFields_1_1, fieldEntry, e_7_1;
+        var e_7, _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    docs = params.docs, collection = params.collection, db = params.db, dbName = params.dbName, idClient = params.idClient, idCustomer = params.idCustomer, isSuperAdmin = params.isSuperAdmin;
+                    if (!Array.isArray(docs) || !docs.length) {
+                        return [2 /*return*/, { docs: docs }];
+                    }
+                    idFields = collectTopLevelIdFieldValues(docs, {
+                        maxFields: AI_ASSISTANT_ID_DISPLAY_LOOKUP_MAX_FIELDS,
+                        maxIds: AI_ASSISTANT_ID_DISPLAY_LOOKUP_MAX_IDS
+                    });
+                    if (!idFields.length) {
+                        return [2 /*return*/, { docs: docs }];
+                    }
+                    lookupMappings = getCollectionLookupMappings(collection);
+                    return [4 /*yield*/, listAssistantCollections(db, dbName)];
+                case 1:
+                    allCollections = _b.sent();
+                    collectionProbeCache = new Map();
+                    collectionSchemaCache = new Map();
+                    lookupMeta = [];
+                    enrichedDocs = docs.map(function (doc) { return (__assign({}, doc)); });
+                    _loop_4 = function (fieldEntry) {
+                        var values, baseToken, mappingMatches, candidateCollections, filteredCandidates, _loop_5, filteredCandidates_1, filteredCandidates_1_1, candidate, state_3, e_8_1;
+                        var e_8, _c;
+                        return __generator(this, function (_d) {
+                            switch (_d.label) {
+                                case 0:
+                                    values = fieldEntry.values || [];
+                                    if (!values.length) {
+                                        return [2 /*return*/, "continue"];
+                                    }
+                                    baseToken = normalizeIdFieldBase(fieldEntry.field);
+                                    if (!baseToken) {
+                                        return [2 /*return*/, "continue"];
+                                    }
+                                    mappingMatches = resolveLookupMappingsForField(fieldEntry.field, lookupMappings);
+                                    candidateCollections = mappingMatches.length
+                                        ? mappingMatches.map(function (entry) { return entry.lookupCollection; })
+                                        : resolveIdLookupCandidates(baseToken, allCollections);
+                                    filteredCandidates = candidateCollections
+                                        .filter(function (candidate) { return !!candidate; })
+                                        .filter(function (candidate) { return candidate !== collection; })
+                                        .filter(function (candidate) { return !candidate.endsWith('.versions'); })
+                                        .filter(function (candidate) { return isSuperAdmin || !AI_ASSISTANT_BLOCKED_COLLECTIONS.has(candidate); })
+                                        .slice(0, AI_ASSISTANT_ID_DISPLAY_LOOKUP_MAX_COLLECTIONS);
+                                    if (!filteredCandidates.length) {
+                                        return [2 /*return*/, "continue"];
+                                    }
+                                    _loop_5 = function (candidate) {
+                                        var probeDocs, candidateHasClientScope, _e, schemaFields, nameField, mapping, lookupKey, idsForQuery, query, candidateHasClientScope, _f, lookupDocs, nameMap, displayField;
+                                        var _g, _h;
+                                        return __generator(this, function (_j) {
+                                            switch (_j.label) {
+                                                case 0:
+                                                    probeDocs = collectionProbeCache.get(candidate);
+                                                    if (!!probeDocs) return [3 /*break*/, 5];
+                                                    if (!idClient) return [3 /*break*/, 2];
+                                                    return [4 /*yield*/, collectionHasClientIndex(db, dbName, candidate)];
+                                                case 1:
+                                                    _e = _j.sent();
+                                                    return [3 /*break*/, 3];
+                                                case 2:
+                                                    _e = false;
+                                                    _j.label = 3;
+                                                case 3:
+                                                    candidateHasClientScope = _e;
+                                                    return [4 /*yield*/, fetchAssistantProbeDocs({
+                                                            db: db,
+                                                            collection: candidate,
+                                                            idClient: idClient,
+                                                            idCustomer: idCustomer,
+                                                            isSuperAdmin: isSuperAdmin,
+                                                            includeClientScope: candidateHasClientScope
+                                                        })];
+                                                case 4:
+                                                    probeDocs = _j.sent();
+                                                    collectionProbeCache.set(candidate, probeDocs);
+                                                    _j.label = 5;
+                                                case 5:
+                                                    schemaFields = collectionSchemaCache.get(candidate)
+                                                        || getCollectionSchemaFieldNames(candidate);
+                                                    collectionSchemaCache.set(candidate, schemaFields);
+                                                    nameField = resolveLookupDisplayField(baseToken, probeDocs, schemaFields);
+                                                    if (!nameField) {
+                                                        return [2 /*return*/, "continue"];
+                                                    }
+                                                    mapping = mappingMatches.find(function (entry) { return entry.lookupCollection === candidate; });
+                                                    lookupKey = normalizeOptionalString(mapping === null || mapping === void 0 ? void 0 : mapping.lookupKey) || '_id';
+                                                    idsForQuery = normalizeIdsForTargetField(values, probeDocs, lookupKey);
+                                                    if (!idsForQuery.length) {
+                                                        return [2 /*return*/, "continue"];
+                                                    }
+                                                    query = (_g = {}, _g[lookupKey] = { $in: idsForQuery }, _g);
+                                                    if (!!isSuperAdmin) return [3 /*break*/, 9];
+                                                    if (!idClient) return [3 /*break*/, 7];
+                                                    return [4 /*yield*/, collectionHasClientIndex(db, dbName, candidate)];
+                                                case 6:
+                                                    _f = _j.sent();
+                                                    return [3 /*break*/, 8];
+                                                case 7:
+                                                    _f = false;
+                                                    _j.label = 8;
+                                                case 8:
+                                                    candidateHasClientScope = _f;
+                                                    if (candidateHasClientScope) {
+                                                        query = applyClientScopeFilter(query, idClient, isSuperAdmin);
+                                                    }
+                                                    query = applyCustomerScopeFilter(query, candidate, idCustomer, isSuperAdmin);
+                                                    _j.label = 9;
+                                                case 9: return [4 /*yield*/, db.collection(candidate).find(query, {
+                                                        projection: (_h = {}, _h[lookupKey] = 1, _h[nameField] = 1, _h),
+                                                        limit: AI_ASSISTANT_ID_DISPLAY_LOOKUP_MAX_IDS,
+                                                        readPreference: AI_ASSISTANT_READ_PREFERENCE
+                                                    }).toArray()];
+                                                case 10:
+                                                    lookupDocs = _j.sent();
+                                                    if (!lookupDocs.length) {
+                                                        return [2 /*return*/, "continue"];
+                                                    }
+                                                    nameMap = new Map();
+                                                    lookupDocs.forEach(function (doc) {
+                                                        var _a, _b;
+                                                        var key = normalizeLookupKeyValue((_a = getValueAtPath(doc, lookupKey)) !== null && _a !== void 0 ? _a : doc === null || doc === void 0 ? void 0 : doc[lookupKey]);
+                                                        if (!key) {
+                                                            return;
+                                                        }
+                                                        var nameValue = (_b = getValueAtPath(doc, nameField)) !== null && _b !== void 0 ? _b : doc === null || doc === void 0 ? void 0 : doc[nameField];
+                                                        if (isEmptyDisplayValue(nameValue)) {
+                                                            return;
+                                                        }
+                                                        if (!nameMap.has(key)) {
+                                                            nameMap.set(key, nameValue);
+                                                        }
+                                                    });
+                                                    if (!nameMap.size) {
+                                                        return [2 /*return*/, "continue"];
+                                                    }
+                                                    displayField = baseToken;
+                                                    enrichedDocs = enrichedDocs.map(function (doc) {
+                                                        var _a;
+                                                        var rawValue = doc === null || doc === void 0 ? void 0 : doc[fieldEntry.field];
+                                                        if (rawValue === undefined || rawValue === null) {
+                                                            return doc;
+                                                        }
+                                                        if (!displayField || !isEmptyDisplayValue(doc === null || doc === void 0 ? void 0 : doc[displayField])) {
+                                                            return doc;
+                                                        }
+                                                        var valuesToResolve = Array.isArray(rawValue) ? rawValue : [rawValue];
+                                                        var resolved = valuesToResolve
+                                                            .map(function (value) { return nameMap.get(normalizeLookupKeyValue(value)); })
+                                                            .filter(function (value) { return !isEmptyDisplayValue(value); });
+                                                        if (!resolved.length) {
+                                                            return doc;
+                                                        }
+                                                        return __assign(__assign({}, doc), (_a = {}, _a[displayField] = resolved.length === 1 ? resolved[0] : resolved, _a));
+                                                    });
+                                                    lookupMeta.push({
+                                                        field: fieldEntry.field,
+                                                        displayField: displayField,
+                                                        collection: candidate,
+                                                        nameField: nameField,
+                                                        idCount: values.length,
+                                                        matched: nameMap.size,
+                                                        strategy: mapping ? 'schema' : 'token'
+                                                    });
+                                                    return [2 /*return*/, "break"];
+                                            }
+                                        });
+                                    };
+                                    _d.label = 1;
+                                case 1:
+                                    _d.trys.push([1, 6, 7, 8]);
+                                    filteredCandidates_1 = (e_8 = void 0, __values(filteredCandidates)), filteredCandidates_1_1 = filteredCandidates_1.next();
+                                    _d.label = 2;
+                                case 2:
+                                    if (!!filteredCandidates_1_1.done) return [3 /*break*/, 5];
+                                    candidate = filteredCandidates_1_1.value;
+                                    return [5 /*yield**/, _loop_5(candidate)];
+                                case 3:
+                                    state_3 = _d.sent();
+                                    if (state_3 === "break")
+                                        return [3 /*break*/, 5];
+                                    _d.label = 4;
+                                case 4:
+                                    filteredCandidates_1_1 = filteredCandidates_1.next();
+                                    return [3 /*break*/, 2];
+                                case 5: return [3 /*break*/, 8];
+                                case 6:
+                                    e_8_1 = _d.sent();
+                                    e_8 = { error: e_8_1 };
+                                    return [3 /*break*/, 8];
+                                case 7:
+                                    try {
+                                        if (filteredCandidates_1_1 && !filteredCandidates_1_1.done && (_c = filteredCandidates_1.return)) _c.call(filteredCandidates_1);
+                                    }
+                                    finally { if (e_8) throw e_8.error; }
+                                    return [7 /*endfinally*/];
+                                case 8: return [2 /*return*/];
+                            }
+                        });
+                    };
+                    _b.label = 2;
+                case 2:
+                    _b.trys.push([2, 7, 8, 9]);
+                    idFields_1 = __values(idFields), idFields_1_1 = idFields_1.next();
+                    _b.label = 3;
+                case 3:
+                    if (!!idFields_1_1.done) return [3 /*break*/, 6];
+                    fieldEntry = idFields_1_1.value;
+                    return [5 /*yield**/, _loop_4(fieldEntry)];
+                case 4:
+                    _b.sent();
+                    _b.label = 5;
+                case 5:
+                    idFields_1_1 = idFields_1.next();
+                    return [3 /*break*/, 3];
+                case 6: return [3 /*break*/, 9];
+                case 7:
+                    e_7_1 = _b.sent();
+                    e_7 = { error: e_7_1 };
+                    return [3 /*break*/, 9];
+                case 8:
+                    try {
+                        if (idFields_1_1 && !idFields_1_1.done && (_a = idFields_1.return)) _a.call(idFields_1);
+                    }
+                    finally { if (e_7) throw e_7.error; }
+                    return [7 /*endfinally*/];
+                case 9:
+                    if (!lookupMeta.length) {
+                        return [2 /*return*/, { docs: enrichedDocs }];
+                    }
+                    return [2 /*return*/, {
+                            docs: enrichedDocs,
+                            meta: {
+                                attempted: true,
+                                used: true,
+                                lookups: lookupMeta
+                            }
+                        }];
+            }
+        });
+    });
+}
+function hasNonEmptyValue(docs, fieldPath, options) {
+    var e_9, _a;
+    if (!Array.isArray(docs) || !fieldPath) {
+        return false;
+    }
+    var usePath = fieldPath.includes('.');
+    try {
+        for (var docs_3 = __values(docs), docs_3_1 = docs_3.next(); !docs_3_1.done; docs_3_1 = docs_3.next()) {
+            var doc = docs_3_1.value;
+            var value = usePath ? getValueAtPath(doc, fieldPath) : doc === null || doc === void 0 ? void 0 : doc[fieldPath];
+            if ((options === null || options === void 0 ? void 0 : options.treatObjectLikeAsEmpty) && isDisplayObjectLike(value)) {
+                continue;
+            }
+            if (!isEmptyDisplayValue(value)) {
+                return true;
+            }
+        }
+    }
+    catch (e_9_1) { e_9 = { error: e_9_1 }; }
+    finally {
+        try {
+            if (docs_3_1 && !docs_3_1.done && (_a = docs_3.return)) _a.call(docs_3);
+        }
+        finally { if (e_9) throw e_9.error; }
+    }
+    return false;
+}
+function collectFieldCandidates(docs) {
+    var candidates = new Map();
+    if (!Array.isArray(docs)) {
+        return candidates;
+    }
+    var addCandidate = function (path, value) {
+        if (!path) {
+            return;
+        }
+        var entry = candidates.get(path) || {
+            nonEmpty: 0,
+            objectLike: 0,
+            normalized: normalizeFieldMatchKey(path)
+        };
+        if (!isEmptyDisplayValue(value)) {
+            entry.nonEmpty += 1;
+        }
+        if (isDisplayObjectLike(value)) {
             entry.objectLike += 1;
         }
         candidates.set(path, entry);
@@ -2344,6 +3831,17 @@ function collectFieldCandidates(docs) {
             }
             var value = doc[key];
             addCandidate(key, value);
+            if (Array.isArray(value)) {
+                var nestedSamples = value.filter(function (entry) { return isPlainObject(entry); }).slice(0, 3);
+                nestedSamples.forEach(function (entry) {
+                    Object.keys(entry).slice(0, 50).forEach(function (nestedKey) {
+                        if (!nestedKey) {
+                            return;
+                        }
+                        addCandidate("".concat(key, ".").concat(nestedKey), entry[nestedKey]);
+                    });
+                });
+            }
             if (isPlainObject(value) && !isMongoObjectId(value) && !(value instanceof Date)) {
                 var nestedKeys = Object.keys(value).slice(0, 50);
                 nestedKeys.forEach(function (nestedKey) {
@@ -2357,7 +3855,7 @@ function collectFieldCandidates(docs) {
     });
     return candidates;
 }
-function resolveFieldAliases(docs, requestedFields) {
+function resolveFieldAliases(docs, requestedFields, schemaFields) {
     var aliases = {};
     if (!Array.isArray(docs) || !requestedFields.length) {
         return aliases;
@@ -2367,11 +3865,24 @@ function resolveFieldAliases(docs, requestedFields) {
         return aliases;
     }
     var candidates = collectFieldCandidates(docs);
+    var schemaFieldList = Array.isArray(schemaFields) ? schemaFields.filter(Boolean) : [];
+    var candidateFieldList = schemaFieldList.length ? schemaFieldList : Array.from(candidates.keys());
     missing.forEach(function (field) {
         var normalizedRequested = normalizeFieldMatchKey(field);
         if (!normalizedRequested) {
             return;
         }
+        var requestedBaseTokens = tokenizeFieldKey(field);
+        var requestedHasType = requestedBaseTokens.includes('type');
+        var hasNonTypeCandidate = requestedBaseTokens.length
+            ? candidateFieldList.some(function (candidateField) {
+                var tokens = tokenizeFieldKey(candidateField);
+                if (tokens.includes('type')) {
+                    return false;
+                }
+                return requestedBaseTokens.some(function (token) { return tokens.includes(token); });
+            })
+            : false;
         var bestPath = '';
         var bestScore = 0;
         candidates.forEach(function (stats, path) {
@@ -2381,6 +3892,13 @@ function resolveFieldAliases(docs, requestedFields) {
             if (isAssistantIdField(path)) {
                 return;
             }
+            var candidateTokens = tokenizeFieldKey(path);
+            if (isUnsafeFieldAlias(requestedBaseTokens, candidateTokens)) {
+                return;
+            }
+            if (!requestedHasType && candidateTokens.includes('type') && hasNonTypeCandidate) {
+                return;
+            }
             var normalizedCandidate = stats.normalized || normalizeFieldMatchKey(path);
             if (!normalizedCandidate) {
                 return;
@@ -2393,11 +3911,17 @@ function resolveFieldAliases(docs, requestedFields) {
                 score = 70;
             }
             else {
-                var candidateTokens_1 = tokenizeFieldKey(path);
-                var requestedTokens = tokenizeFieldKey(field);
-                var overlap = requestedTokens.filter(function (token) { return candidateTokens_1.includes(token); }).length;
+                var requestedTokens = expandFieldTokens(requestedBaseTokens);
+                var overlap = requestedTokens.filter(function (token) { return candidateTokens.includes(token); }).length;
+                var baseOverlap = requestedBaseTokens.filter(function (token) { return candidateTokens.includes(token); }).length;
                 if (overlap > 0) {
-                    score = 40 + overlap * 5;
+                    score = 40 + overlap * 10;
+                    if (baseOverlap === 0) {
+                        score += 10;
+                    }
+                    if (requestedBaseTokens.length <= 2) {
+                        score += 10;
+                    }
                 }
             }
             var objectRatio = stats.objectLike / Math.max(stats.nonEmpty, 1);
@@ -2462,45 +3986,156 @@ function resolveProjectionRequestedFields(projection) {
     }
     return keys.filter(function (key) { return !isAssistantIdField(key); });
 }
-function formatDisplayColumnName(column) {
-    var trimmed = String(column || '').trim();
-    if (!trimmed) {
-        return '';
-    }
-    if (trimmed === '_id') {
-        return 'id';
-    }
-    if (trimmed === '_group') {
-        return 'Group';
-    }
-    var normalized = trimmed.replace(/[\s_]+/g, '').toLowerCase();
-    if (normalized === 'createdat') {
-        return 'Created At';
+function isInclusiveProjection(projection) {
+    if (!projection || typeof projection !== 'object') {
+        return false;
     }
-    if (normalized === 'updatedat') {
-        return 'Updated At';
+    var keys = Object.keys(projection);
+    if (!keys.length) {
+        return false;
     }
-    var parts = trimmed.split('.');
-    var base = parts[parts.length - 1] || trimmed;
-    if ((base === 'name' || base === 'title' || base === 'label') && parts.length > 1) {
-        return parts[parts.length - 2]
-            .replace(/[_-]+/g, ' ')
-            .replace(/([a-z0-9])([A-Z])/g, '$1 $2')
-            .replace(/\s+/g, ' ')
-            .trim()
-            .replace(/\b\w/g, function (char) { return char.toUpperCase(); });
+    var hasInclude = false;
+    var hasExclude = false;
+    keys.forEach(function (key) {
+        var value = projection[key];
+        if (value === 0 || value === false) {
+            hasExclude = true;
+        }
+        else if (value === 1 || value === true) {
+            hasInclude = true;
+        }
+    });
+    return hasInclude && !hasExclude;
+}
+function expandProjectionWithAliases(projection, aliases) {
+    if (!projection || !isInclusiveProjection(projection) || !aliases || !Object.keys(aliases).length) {
+        return projection;
     }
-    return base
-        .replace(/[_-]+/g, ' ')
-        .replace(/([a-z0-9])([A-Z])/g, '$1 $2')
-        .replace(/\s+/g, ' ')
-        .trim()
-        .replace(/\b\w/g, function (char) { return char.toUpperCase(); });
+    var next = __assign({}, projection);
+    Object.keys(aliases).forEach(function (target) {
+        var source = aliases[target];
+        if (!source) {
+            return;
+        }
+        if (!Object.prototype.hasOwnProperty.call(next, source)) {
+            next[source] = 1;
+        }
+    });
+    return next;
 }
-function truncateDisplayText(value, maxLength) {
-    if (maxLength === void 0) { maxLength = AI_ASSISTANT_DISPLAY_STRING_LIMIT; }
-    if (!value) {
-        return value;
+function collectQueryFieldPaths(value, fields) {
+    if (!value || typeof value !== 'object' || value instanceof Date || value instanceof RegExp || isMongoObjectId(value)) {
+        return;
+    }
+    if (Array.isArray(value)) {
+        value.forEach(function (entry) { return collectQueryFieldPaths(entry, fields); });
+        return;
+    }
+    Object.keys(value).forEach(function (key) {
+        var entry = value[key];
+        if (key.startsWith('$')) {
+            collectQueryFieldPaths(entry, fields);
+            return;
+        }
+        fields.add(key);
+        if (entry && typeof entry === 'object' && !Array.isArray(entry) && !isMongoObjectId(entry) && !(entry instanceof Date)) {
+            var nestedKeys = Object.keys(entry).filter(function (nested) { return !nested.startsWith('$'); });
+            nestedKeys.forEach(function (nested) {
+                fields.add("".concat(key, ".").concat(nested));
+            });
+        }
+    });
+}
+function extractQueryFieldPaths(query) {
+    var fields = new Set();
+    collectQueryFieldPaths(query, fields);
+    return Array.from(fields).filter(Boolean);
+}
+function replaceFieldPathDeep(value, fromField, toField) {
+    if (Array.isArray(value)) {
+        return value.map(function (entry) { return replaceFieldPathDeep(entry, fromField, toField); });
+    }
+    if (value instanceof Date || isMongoObjectId(value)) {
+        return value;
+    }
+    if (value && typeof value === 'object') {
+        var next_1 = {};
+        Object.keys(value).forEach(function (key) {
+            var nextKey = key === fromField ? toField : key;
+            next_1[nextKey] = replaceFieldPathDeep(value[key], fromField, toField);
+        });
+        return next_1;
+    }
+    if (typeof value === 'string') {
+        if (value.startsWith("$".concat(fromField))) {
+            return "$".concat(toField).concat(value.slice(fromField.length + 1));
+        }
+        return value;
+    }
+    return value;
+}
+function replaceQueryFieldCondition(query, field, condition) {
+    if (Array.isArray(query)) {
+        return query.map(function (entry) { return replaceQueryFieldCondition(entry, field, condition); });
+    }
+    if (!query || typeof query !== 'object') {
+        return query;
+    }
+    var next = __assign({}, query);
+    Object.keys(next).forEach(function (key) {
+        if (key === field) {
+            next[key] = condition;
+            return;
+        }
+        if (key.startsWith('$')) {
+            next[key] = replaceQueryFieldCondition(next[key], field, condition);
+            return;
+        }
+        if (next[key] && typeof next[key] === 'object') {
+            next[key] = replaceQueryFieldCondition(next[key], field, condition);
+        }
+    });
+    return next;
+}
+function formatDisplayColumnName(column) {
+    var trimmed = String(column || '').trim();
+    if (!trimmed) {
+        return '';
+    }
+    if (trimmed === '_id') {
+        return 'id';
+    }
+    if (trimmed === '_group') {
+        return 'Group';
+    }
+    var normalized = trimmed.replace(/[\s_]+/g, '').toLowerCase();
+    if (normalized === 'createdat') {
+        return 'Created At';
+    }
+    if (normalized === 'updatedat') {
+        return 'Updated At';
+    }
+    var parts = trimmed.split('.');
+    var base = parts[parts.length - 1] || trimmed;
+    if ((base === 'name' || base === 'title' || base === 'label') && parts.length > 1) {
+        return parts[parts.length - 2]
+            .replace(/[_-]+/g, ' ')
+            .replace(/([a-z0-9])([A-Z])/g, '$1 $2')
+            .replace(/\s+/g, ' ')
+            .trim()
+            .replace(/\b\w/g, function (char) { return char.toUpperCase(); });
+    }
+    return base
+        .replace(/[_-]+/g, ' ')
+        .replace(/([a-z0-9])([A-Z])/g, '$1 $2')
+        .replace(/\s+/g, ' ')
+        .trim()
+        .replace(/\b\w/g, function (char) { return char.toUpperCase(); });
+}
+function truncateDisplayText(value, maxLength) {
+    if (maxLength === void 0) { maxLength = AI_ASSISTANT_DISPLAY_STRING_LIMIT; }
+    if (!value) {
+        return value;
     }
     if (value.length <= maxLength) {
         return value;
@@ -2866,10 +4501,12 @@ function normalizeAssistantAggregatePipeline(pipeline) {
         .map(function (stage) {
         var next = __assign({}, stage);
         if (next.$match && typeof next.$match === 'object') {
-            next.$match = applyAssistantNameRegexToQuery(next.$match);
+            var rewritten = rewriteEmbeddedMatchObjects(next.$match);
+            next.$match = applyAssistantNameRegexToQuery(rewritten);
         }
         if (next.$geoNear && typeof next.$geoNear === 'object' && next.$geoNear.query) {
-            next.$geoNear = __assign(__assign({}, next.$geoNear), { query: applyAssistantNameRegexToQuery(next.$geoNear.query) });
+            var rewritten = rewriteEmbeddedMatchObjects(next.$geoNear.query);
+            next.$geoNear = __assign(__assign({}, next.$geoNear), { query: applyAssistantNameRegexToQuery(rewritten) });
         }
         return next;
     });
@@ -3000,7 +4637,7 @@ function matchContainsField(value, field) {
     });
 }
 function resolveAggregateCompletionFallback(pipeline) {
-    var e_3, _a;
+    var e_10, _a;
     if (!Array.isArray(pipeline)) {
         return null;
     }
@@ -3013,7 +4650,7 @@ function resolveAggregateCompletionFallback(pipeline) {
         }
         var addFields = stage.$addFields;
         try {
-            for (var _b = (e_3 = void 0, __values(Object.keys(addFields))), _c = _b.next(); !_c.done; _c = _b.next()) {
+            for (var _b = (e_10 = void 0, __values(Object.keys(addFields))), _c = _b.next(); !_c.done; _c = _b.next()) {
                 var key = _c.value;
                 if (!isCompletionFieldName(key)) {
                     continue;
@@ -3027,12 +4664,12 @@ function resolveAggregateCompletionFallback(pipeline) {
                 }
             }
         }
-        catch (e_3_1) { e_3 = { error: e_3_1 }; }
+        catch (e_10_1) { e_10 = { error: e_10_1 }; }
         finally {
             try {
                 if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
             }
-            finally { if (e_3) throw e_3.error; }
+            finally { if (e_10) throw e_10.error; }
         }
         if (candidateField) {
             break;
@@ -3188,7 +4825,7 @@ function buildCompletionFallbackSources(field) {
     ]);
 }
 function resolveAggregateCompletionExprFallback(pipeline) {
-    var e_4, _a;
+    var e_11, _a;
     if (!Array.isArray(pipeline)) {
         return null;
     }
@@ -3208,7 +4845,7 @@ function resolveAggregateCompletionExprFallback(pipeline) {
         }
         if (!candidateField) {
             try {
-                for (var _b = (e_4 = void 0, __values(Object.keys(matchStage))), _c = _b.next(); !_c.done; _c = _b.next()) {
+                for (var _b = (e_11 = void 0, __values(Object.keys(matchStage))), _c = _b.next(); !_c.done; _c = _b.next()) {
                     var key = _c.value;
                     if (key.startsWith('$')) {
                         continue;
@@ -3223,12 +4860,12 @@ function resolveAggregateCompletionExprFallback(pipeline) {
                     }
                 }
             }
-            catch (e_4_1) { e_4 = { error: e_4_1 }; }
+            catch (e_11_1) { e_11 = { error: e_11_1 }; }
             finally {
                 try {
                     if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
                 }
-                finally { if (e_4) throw e_4.error; }
+                finally { if (e_11) throw e_11.error; }
             }
         }
         if (!candidateField) {
@@ -3398,7 +5035,7 @@ function isRegexMatchCondition(value) {
     return false;
 }
 function findRegexMatchInMatchObject(match, prefix) {
-    var e_5, _a, e_6, _b;
+    var e_12, _a, e_13, _b;
     if (prefix === void 0) { prefix = ''; }
     if (Array.isArray(match)) {
         try {
@@ -3410,12 +5047,12 @@ function findRegexMatchInMatchObject(match, prefix) {
                 }
             }
         }
-        catch (e_5_1) { e_5 = { error: e_5_1 }; }
+        catch (e_12_1) { e_12 = { error: e_12_1 }; }
         finally {
             try {
                 if (match_1_1 && !match_1_1.done && (_a = match_1.return)) _a.call(match_1);
             }
-            finally { if (e_5) throw e_5.error; }
+            finally { if (e_12) throw e_12.error; }
         }
         return null;
     }
@@ -3424,8 +5061,8 @@ function findRegexMatchInMatchObject(match, prefix) {
     }
     var keys = Object.keys(match);
     try {
-        for (var keys_1 = __values(keys), keys_1_1 = keys_1.next(); !keys_1_1.done; keys_1_1 = keys_1.next()) {
-            var key = keys_1_1.value;
+        for (var keys_2 = __values(keys), keys_2_1 = keys_2.next(); !keys_2_1.done; keys_2_1 = keys_2.next()) {
+            var key = keys_2_1.value;
             var value = match[key];
             if (key.startsWith('$')) {
                 var found = findRegexMatchInMatchObject(value, prefix);
@@ -3446,12 +5083,12 @@ function findRegexMatchInMatchObject(match, prefix) {
             }
         }
     }
-    catch (e_6_1) { e_6 = { error: e_6_1 }; }
+    catch (e_13_1) { e_13 = { error: e_13_1 }; }
     finally {
         try {
-            if (keys_1_1 && !keys_1_1.done && (_b = keys_1.return)) _b.call(keys_1);
+            if (keys_2_1 && !keys_2_1.done && (_b = keys_2.return)) _b.call(keys_2);
         }
-        finally { if (e_6) throw e_6.error; }
+        finally { if (e_13) throw e_13.error; }
     }
     return null;
 }
@@ -3500,6 +5137,9 @@ function expandNameFieldCandidates(field) {
         push(withPrefix("".concat(leaf, ".name")));
         push(withPrefix("".concat(leaf, ".label")));
         push(withPrefix("".concat(leaf, ".product")));
+        if (normalized.includes('blend_chemicals')) {
+            ['chemical', 'chemical_name', 'chemicalName', 'product', 'product_name', 'productName'].forEach(push);
+        }
     }
     if (leafLower.includes('customer')) {
         [
@@ -3564,6 +5204,32 @@ function resolveAggregateNameMatchFallback(pipeline) {
     }
     return null;
 }
+function resolveReadNameMatchFallback(query) {
+    if (!query || typeof query !== 'object') {
+        return null;
+    }
+    var found = findRegexMatchInMatchObject(query);
+    if (!found || !shouldApplyAssistantNameRegex(found.field) || isAssistantIdField(found.field)) {
+        return null;
+    }
+    var fields = expandNameFieldCandidates(found.field);
+    if (fields.length <= 1) {
+        return null;
+    }
+    var baseMatch = stripMatchField(query, found.field);
+    var orConditions = fields.map(function (field) {
+        var _a;
+        return (_a = {}, _a[field] = found.condition, _a);
+    });
+    var nextMatch = isEmptyMatchValue(baseMatch)
+        ? { $or: orConditions }
+        : { $and: [baseMatch, { $or: orConditions }] };
+    return {
+        query: nextMatch,
+        field: found.field,
+        fields: fields
+    };
+}
 function isEmptyMatchValue(value) {
     if (value === null || value === undefined) {
         return true;
@@ -3605,11 +5271,775 @@ function stripMatchField(match, field) {
             if (!isEmptyMatchValue(stripped)) {
                 result[key] = stripped;
             }
-            return;
-        }
-        result[key] = value;
+            return;
+        }
+        result[key] = value;
+    });
+    return result;
+}
+function collectMatchFieldsByCondition(match, predicate, prefix) {
+    if (prefix === void 0) { prefix = ''; }
+    var results = [];
+    if (Array.isArray(match)) {
+        match.forEach(function (entry) {
+            results.push.apply(results, __spreadArray([], __read(collectMatchFieldsByCondition(entry, predicate, prefix)), false));
+        });
+        return results;
+    }
+    if (!match || typeof match !== 'object') {
+        return results;
+    }
+    Object.keys(match).forEach(function (key) {
+        var value = match[key];
+        if (key.startsWith('$')) {
+            results.push.apply(results, __spreadArray([], __read(collectMatchFieldsByCondition(value, predicate, prefix)), false));
+            return;
+        }
+        var currentPath = prefix ? "".concat(prefix, ".").concat(key) : key;
+        if (predicate(currentPath, value)) {
+            results.push(currentPath);
+        }
+        if (value && typeof value === 'object') {
+            results.push.apply(results, __spreadArray([], __read(collectMatchFieldsByCondition(value, predicate, currentPath)), false));
+        }
+    });
+    return results;
+}
+function findMatchConditionForField(match, targetField, prefix) {
+    var e_14, _a, e_15, _b;
+    if (prefix === void 0) { prefix = ''; }
+    if (!match || typeof match !== 'object') {
+        return undefined;
+    }
+    if (Array.isArray(match)) {
+        try {
+            for (var match_2 = __values(match), match_2_1 = match_2.next(); !match_2_1.done; match_2_1 = match_2.next()) {
+                var entry = match_2_1.value;
+                var found = findMatchConditionForField(entry, targetField, prefix);
+                if (found !== undefined) {
+                    return found;
+                }
+            }
+        }
+        catch (e_14_1) { e_14 = { error: e_14_1 }; }
+        finally {
+            try {
+                if (match_2_1 && !match_2_1.done && (_a = match_2.return)) _a.call(match_2);
+            }
+            finally { if (e_14) throw e_14.error; }
+        }
+        return undefined;
+    }
+    try {
+        for (var _c = __values(Object.keys(match)), _d = _c.next(); !_d.done; _d = _c.next()) {
+            var key = _d.value;
+            var value = match[key];
+            if (key.startsWith('$')) {
+                var found = findMatchConditionForField(value, targetField, prefix);
+                if (found !== undefined) {
+                    return found;
+                }
+                continue;
+            }
+            var currentPath = prefix ? "".concat(prefix, ".").concat(key) : key;
+            if (currentPath === targetField) {
+                return value;
+            }
+            if (value && typeof value === 'object') {
+                var found = findMatchConditionForField(value, targetField, currentPath);
+                if (found !== undefined) {
+                    return found;
+                }
+            }
+        }
+    }
+    catch (e_15_1) { e_15 = { error: e_15_1 }; }
+    finally {
+        try {
+            if (_d && !_d.done && (_b = _c.return)) _b.call(_c);
+        }
+        finally { if (e_15) throw e_15.error; }
+    }
+    return undefined;
+}
+function stripMatchFields(match, fields) {
+    var result = match;
+    fields.forEach(function (field) {
+        result = stripMatchField(result, field);
+    });
+    return result;
+}
+function isDateCondition(value) {
+    if (!value) {
+        return false;
+    }
+    if (value instanceof Date) {
+        return true;
+    }
+    if (typeof value === 'object' && !Array.isArray(value)) {
+        return hasDateRangeOperators(value);
+    }
+    return false;
+}
+function isChemicalFieldPath(field) {
+    var normalized = normalizeOptionalString(field).toLowerCase();
+    return normalized.includes('chemical');
+}
+function detectIdLikeValue(value) {
+    if (!value) {
+        return false;
+    }
+    if (isMongoObjectId(value)) {
+        return true;
+    }
+    if (typeof value === 'string' && isObjectIdString(value)) {
+        return true;
+    }
+    if (isPlainObject(value)) {
+        return true;
+    }
+    return false;
+}
+function detectChemicalIdFromProbe(probeDocs, fields) {
+    var e_16, _a, e_17, _b;
+    if (!Array.isArray(probeDocs) || !probeDocs.length) {
+        return false;
+    }
+    var targets = fields.filter(function (field) { return isChemicalFieldPath(field); });
+    if (!targets.length) {
+        return false;
+    }
+    try {
+        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_17 = 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)) {
+                        if (value.some(function (entry) { return detectIdLikeValue(entry); })) {
+                            return true;
+                        }
+                    }
+                    else if (detectIdLikeValue(value)) {
+                        return true;
+                    }
+                }
+            }
+            catch (e_17_1) { e_17 = { error: e_17_1 }; }
+            finally {
+                try {
+                    if (targets_1_1 && !targets_1_1.done && (_b = targets_1.return)) _b.call(targets_1);
+                }
+                finally { if (e_17) throw e_17.error; }
+            }
+        }
+    }
+    catch (e_16_1) { e_16 = { error: e_16_1 }; }
+    finally {
+        try {
+            if (probeDocs_1_1 && !probeDocs_1_1.done && (_a = probeDocs_1.return)) _a.call(probeDocs_1);
+        }
+        finally { if (e_16) throw e_16.error; }
+    }
+    return false;
+}
+function isEmptyQueryValue(value) {
+    if (value === null || value === undefined) {
+        return true;
+    }
+    if (Array.isArray(value)) {
+        return value.length === 0;
+    }
+    if (typeof value === 'object') {
+        return Object.keys(value).length === 0;
+    }
+    return false;
+}
+function stripQueryFieldPathsDeepWithMeta(query, fieldsToStrip) {
+    var fieldSet = new Set((fieldsToStrip || []).filter(Boolean));
+    var stripValue = function (value, prefix) {
+        if (Array.isArray(value)) {
+            var changed_1 = false;
+            var nextArray = value
+                .map(function (entry) {
+                var stripped = stripValue(entry, prefix);
+                if (stripped.changed) {
+                    changed_1 = true;
+                }
+                return stripped.value;
+            })
+                .filter(function (entry) { return !isEmptyQueryValue(entry); });
+            if (nextArray.length !== value.length) {
+                changed_1 = true;
+            }
+            return { value: nextArray, changed: changed_1 };
+        }
+        if (!value || typeof value !== 'object' || value instanceof Date || value instanceof RegExp || isMongoObjectId(value)) {
+            return { value: value, changed: false };
+        }
+        var result = {};
+        var changed = false;
+        var keys = Object.keys(value);
+        keys.forEach(function (key) {
+            var entry = value[key];
+            if (key.startsWith('$')) {
+                if (Array.isArray(entry) && (key === '$and' || key === '$or' || key === '$nor')) {
+                    var stripped = stripValue(entry, prefix);
+                    var arrayValue = Array.isArray(stripped.value) ? stripped.value : [];
+                    if (arrayValue.length === 0) {
+                        changed = true;
+                        return;
+                    }
+                    if (arrayValue.length !== entry.length || stripped.changed) {
+                        changed = true;
+                    }
+                    result[key] = arrayValue;
+                    return;
+                }
+                if (entry && typeof entry === 'object') {
+                    var stripped = stripValue(entry, prefix);
+                    if (stripped.changed) {
+                        changed = true;
+                    }
+                    result[key] = stripped.value;
+                    return;
+                }
+                result[key] = entry;
+                return;
+            }
+            var currentPath = prefix ? "".concat(prefix, ".").concat(key) : key;
+            if (fieldSet.has(currentPath)) {
+                changed = true;
+                return;
+            }
+            if (entry && typeof entry === 'object') {
+                var stripped = stripValue(entry, currentPath);
+                if (stripped.changed) {
+                    changed = true;
+                }
+                if (!isEmptyQueryValue(stripped.value)) {
+                    result[key] = stripped.value;
+                }
+                else {
+                    changed = true;
+                }
+                return;
+            }
+            result[key] = entry;
+        });
+        var resultKeys = Object.keys(result);
+        if (resultKeys.length === 1 && (resultKeys[0] === '$and' || resultKeys[0] === '$or')) {
+            var only = result[resultKeys[0]];
+            if (Array.isArray(only) && only.length === 1) {
+                return { value: only[0], changed: true };
+            }
+        }
+        return { value: result, changed: changed };
+    };
+    return stripValue(query, '');
+}
+function stripQueryFieldPathsDeep(query, fieldsToStrip) {
+    return stripQueryFieldPathsDeepWithMeta(query, fieldsToStrip).value;
+}
+function stripScopedFieldsFromPipelineWithMeta(pipeline, fieldsToStrip) {
+    if (!Array.isArray(pipeline)) {
+        return { pipeline: [], changed: false };
+    }
+    var changed = false;
+    var nextPipeline = pipeline.map(function (stage) {
+        if (!stage || typeof stage !== 'object') {
+            return stage;
+        }
+        var nextStage = stage;
+        if (stage.$match && typeof stage.$match === 'object') {
+            var stripped = stripQueryFieldPathsDeepWithMeta(stage.$match, fieldsToStrip);
+            if (stripped.changed) {
+                changed = true;
+            }
+            nextStage = __assign(__assign({}, nextStage), { $match: stripped.value });
+        }
+        if (stage.$geoNear && typeof stage.$geoNear === 'object' && stage.$geoNear.query) {
+            var stripped = stripQueryFieldPathsDeepWithMeta(stage.$geoNear.query, fieldsToStrip);
+            if (stripped.changed) {
+                changed = true;
+            }
+            nextStage = __assign(__assign({}, nextStage), { $geoNear: __assign(__assign({}, stage.$geoNear), { query: stripped.value }) });
+        }
+        return nextStage;
+    });
+    return { pipeline: nextPipeline, changed: changed };
+}
+function stripScopedFieldsFromPipeline(pipeline, fieldsToStrip) {
+    return stripScopedFieldsFromPipelineWithMeta(pipeline, fieldsToStrip).pipeline;
+}
+function isIdLookupCondition(value) {
+    if (!value) {
+        return false;
+    }
+    if (value instanceof RegExp) {
+        return true;
+    }
+    if (typeof value === 'string') {
+        return !isObjectIdString(value.trim());
+    }
+    if (typeof value === 'object') {
+        return Object.prototype.hasOwnProperty.call(value, '$regex');
+    }
+    return false;
+}
+function collectIdFieldConditions(match) {
+    var results = [];
+    var visit = function (value) {
+        if (Array.isArray(value)) {
+            value.forEach(function (entry) { return visit(entry); });
+            return;
+        }
+        if (!value || typeof value !== 'object') {
+            return;
+        }
+        Object.keys(value).forEach(function (key) {
+            var entry = value[key];
+            if (key.startsWith('$')) {
+                visit(entry);
+                return;
+            }
+            if (isAssistantIdField(key) && isIdLookupCondition(entry)) {
+                results.push({ field: key, condition: entry });
+                return;
+            }
+            if (entry && typeof entry === 'object') {
+                visit(entry);
+            }
+        });
+    };
+    visit(match);
+    return results;
+}
+function resolveLocalNameFieldFromDocs(docs, baseToken) {
+    var normalizedBase = normalizeOptionalString(baseToken);
+    if (!normalizedBase || !Array.isArray(docs) || !docs.length) {
+        return null;
+    }
+    if (hasNonEmptyValue(docs, normalizedBase, { treatObjectLikeAsEmpty: true })) {
+        return normalizedBase;
+    }
+    var aliases = resolveFieldAliases(docs, [normalizedBase]);
+    return aliases[normalizedBase] || null;
+}
+function buildIdFieldNameFallbackQuery(query, idField, nameField, condition) {
+    var _a, _b;
+    var baseMatch = stripMatchField(query, idField);
+    var orConditions = [
+        (_a = {}, _a[idField] = condition, _a),
+        (_b = {}, _b[nameField] = condition, _b)
+    ];
+    var nextMatch = isEmptyMatchValue(baseMatch)
+        ? { $or: orConditions }
+        : { $and: [baseMatch, { $or: orConditions }] };
+    return nextMatch;
+}
+function buildChemicalIdFieldCandidates(field) {
+    var normalized = normalizeOptionalString(field);
+    if (!normalized) {
+        return [];
+    }
+    var parts = normalized.split('.').filter(Boolean);
+    var leaf = parts[parts.length - 1] || normalized;
+    var prefix = parts.length > 1 ? parts.slice(0, -1).join('.') : '';
+    var withPrefix = function (value) { return (prefix ? "".concat(prefix, ".").concat(value) : value); };
+    var candidates = new Set();
+    candidates.add(normalized);
+    if (!leaf.startsWith('id_')) {
+        candidates.add(withPrefix('id_chemical'));
+        candidates.add(withPrefix('chemical_id'));
+        candidates.add(withPrefix('chemicalId'));
+        candidates.add(withPrefix('idChemical'));
+    }
+    return Array.from(candidates);
+}
+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_6, candidates_2, candidates_2_1, candidate, state_4, e_18_1;
+        var e_18, _a;
+        var _b;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
+                case 0:
+                    query = params.query, db = params.db, dbName = params.dbName, idClient = params.idClient, idCustomer = params.idCustomer, isSuperAdmin = params.isSuperAdmin, probeDocs = params.probeDocs;
+                    chemicalFields = collectMatchFieldsByCondition(query, function (field, condition) { return (isRegexMatchCondition(condition) && isChemicalFieldPath(field)); });
+                    if (!chemicalFields.length) {
+                        return [2 /*return*/, null];
+                    }
+                    targetField = chemicalFields[0];
+                    condition = findMatchConditionForField(query, targetField);
+                    regex = buildRegexFromCondition(condition);
+                    if (!regex) {
+                        return [2 /*return*/, null];
+                    }
+                    sampleDocs = Array.isArray(probeDocs) ? probeDocs : [];
+                    if (!detectChemicalIdFromProbe(sampleDocs, [targetField])) {
+                        return [2 /*return*/, null];
+                    }
+                    return [4 /*yield*/, listAssistantCollections(db, dbName)];
+                case 1:
+                    collectionNames = _c.sent();
+                    candidates = resolveIdLookupCandidates('chemical', collectionNames);
+                    _loop_6 = function (candidate) {
+                        var candidateHasClientScope, _d, candidateProbe, lookup, idFields, baseMatch, orConditions, nextMatch;
+                        return __generator(this, function (_e) {
+                            switch (_e.label) {
+                                case 0:
+                                    if (!candidate) {
+                                        return [2 /*return*/, "continue"];
+                                    }
+                                    if (!isSuperAdmin && AI_ASSISTANT_BLOCKED_COLLECTIONS.has(candidate)) {
+                                        return [2 /*return*/, "continue"];
+                                    }
+                                    if (!idClient) return [3 /*break*/, 2];
+                                    return [4 /*yield*/, collectionHasClientIndex(db, dbName, candidate)];
+                                case 1:
+                                    _d = _e.sent();
+                                    return [3 /*break*/, 3];
+                                case 2:
+                                    _d = false;
+                                    _e.label = 3;
+                                case 3:
+                                    candidateHasClientScope = _d;
+                                    return [4 /*yield*/, fetchAssistantProbeDocs({
+                                            db: db,
+                                            collection: candidate,
+                                            idClient: idClient,
+                                            idCustomer: idCustomer,
+                                            isSuperAdmin: isSuperAdmin,
+                                            includeClientScope: candidateHasClientScope
+                                        })];
+                                case 4:
+                                    candidateProbe = _e.sent();
+                                    return [4 /*yield*/, lookupIdsForNameMatch({
+                                            db: db,
+                                            dbName: dbName,
+                                            collection: candidate,
+                                            baseToken: 'chemical',
+                                            regex: regex,
+                                            idClient: idClient,
+                                            idCustomer: idCustomer,
+                                            isSuperAdmin: isSuperAdmin,
+                                            probeDocs: candidateProbe
+                                        })];
+                                case 5:
+                                    lookup = _e.sent();
+                                    if ((_b = lookup === null || lookup === void 0 ? void 0 : lookup.ids) === null || _b === void 0 ? void 0 : _b.length) {
+                                        idFields = buildChemicalIdFieldCandidates(targetField);
+                                        baseMatch = stripMatchField(query, targetField);
+                                        orConditions = idFields.map(function (field) {
+                                            var _a;
+                                            return (_a = {}, _a[field] = { $in: lookup.ids }, _a);
+                                        });
+                                        nextMatch = isEmptyMatchValue(baseMatch)
+                                            ? { $or: orConditions }
+                                            : { $and: [baseMatch, { $or: orConditions }] };
+                                        return [2 /*return*/, { value: {
+                                                    query: nextMatch,
+                                                    meta: {
+                                                        field: targetField,
+                                                        strategy: 'chemical_lookup',
+                                                        collection: candidate,
+                                                        ids: lookup.ids.length,
+                                                        fields: lookup.fields,
+                                                        idFields: idFields
+                                                    }
+                                                } }];
+                                    }
+                                    return [2 /*return*/];
+                            }
+                        });
+                    };
+                    _c.label = 2;
+                case 2:
+                    _c.trys.push([2, 7, 8, 9]);
+                    candidates_2 = __values(candidates), candidates_2_1 = candidates_2.next();
+                    _c.label = 3;
+                case 3:
+                    if (!!candidates_2_1.done) return [3 /*break*/, 6];
+                    candidate = candidates_2_1.value;
+                    return [5 /*yield**/, _loop_6(candidate)];
+                case 4:
+                    state_4 = _c.sent();
+                    if (typeof state_4 === "object")
+                        return [2 /*return*/, state_4.value];
+                    _c.label = 5;
+                case 5:
+                    candidates_2_1 = candidates_2.next();
+                    return [3 /*break*/, 3];
+                case 6: return [3 /*break*/, 9];
+                case 7:
+                    e_18_1 = _c.sent();
+                    e_18 = { error: e_18_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_18) throw e_18.error; }
+                    return [7 /*endfinally*/];
+                case 9: return [2 /*return*/, null];
+            }
+        });
+    });
+}
+function resolveIdLookupCandidates(baseToken, collectionNames) {
+    var normalizedBase = normalizeOptionalString(baseToken).toLowerCase();
+    if (!normalizedBase || !Array.isArray(collectionNames) || !collectionNames.length) {
+        return [];
+    }
+    var candidates = new Set();
+    var hints = AI_ASSISTANT_ID_LOOKUP_HINTS[normalizedBase] || [];
+    hints.forEach(function (hint) {
+        if (collectionNames.includes(hint)) {
+            candidates.add(hint);
+        }
+    });
+    var tokens = tokenizeCollectionText(normalizedBase);
+    var ranked = collectionNames
+        .map(function (name) { return ({ name: name, score: scoreCollectionMatch(tokens, name) }); })
+        .filter(function (entry) { return entry.score > 0; })
+        .sort(function (a, b) { return b.score - a.score; })
+        .slice(0, AI_ASSISTANT_ID_LOOKUP_CANDIDATE_LIMIT);
+    ranked.forEach(function (entry) { return candidates.add(entry.name); });
+    return Array.from(candidates);
+}
+function buildNameLookupFields(baseToken, docs) {
+    var normalizedBase = normalizeOptionalString(baseToken);
+    var candidates = expandNameFieldCandidates(normalizedBase);
+    if (!Array.isArray(docs) || !docs.length) {
+        return candidates;
+    }
+    var available = collectFieldCandidates(docs);
+    var filtered = candidates.filter(function (field) {
+        var stats = available.get(field);
+        return !!stats && stats.nonEmpty > 0;
+    });
+    return filtered.length ? filtered : candidates;
+}
+function lookupIdsForNameMatch(params) {
+    return __awaiter(this, void 0, void 0, function () {
+        var db, dbName, collection, baseToken, regex, idClient, idCustomer, isSuperAdmin, probeDocs, fields, query, hasClient, normalizedCustomer, hasCustomer, projection, docs, ids;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    db = params.db, dbName = params.dbName, collection = params.collection, baseToken = params.baseToken, regex = params.regex, idClient = params.idClient, idCustomer = params.idCustomer, isSuperAdmin = params.isSuperAdmin, probeDocs = params.probeDocs;
+                    fields = buildNameLookupFields(baseToken, probeDocs);
+                    if (!fields.length) {
+                        return [2 /*return*/, null];
+                    }
+                    query = { $or: fields.map(function (field) {
+                            var _a;
+                            return (_a = {}, _a[field] = regex, _a);
+                        }) };
+                    if (!!isSuperAdmin) return [3 /*break*/, 3];
+                    return [4 /*yield*/, collectionHasClientIndex(db, dbName, collection)];
+                case 1:
+                    hasClient = _a.sent();
+                    if (hasClient) {
+                        query = applyClientScopeFilter(query, idClient, isSuperAdmin);
+                    }
+                    normalizedCustomer = normalizeOptionalString(idCustomer);
+                    if (!(normalizedCustomer && collection !== 'customers')) return [3 /*break*/, 3];
+                    return [4 /*yield*/, collectionHasFieldIndex(db, dbName, collection, 'id_customer')];
+                case 2:
+                    hasCustomer = _a.sent();
+                    if (hasCustomer) {
+                        query = applyCustomerScopeFilter(query, collection, normalizedCustomer, isSuperAdmin);
+                    }
+                    _a.label = 3;
+                case 3:
+                    projection = { _id: 1 };
+                    fields.forEach(function (field) {
+                        projection[field] = 1;
+                    });
+                    return [4 /*yield*/, db.collection(collection)
+                            .find(query, {
+                            projection: projection,
+                            limit: AI_ASSISTANT_ID_LOOKUP_MAX_RESULTS,
+                            readPreference: AI_ASSISTANT_READ_PREFERENCE
+                        })
+                            .toArray()];
+                case 4:
+                    docs = _a.sent();
+                    ids = docs.map(function (doc) { return doc === null || doc === void 0 ? void 0 : doc._id; }).filter(Boolean);
+                    return [2 /*return*/, ids.length ? { ids: ids, fields: fields } : null];
+            }
+        });
+    });
+}
+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_19_1, e_20_1;
+        var e_20, _c, e_19, _d;
+        var _e;
+        return __generator(this, function (_f) {
+            switch (_f.label) {
+                case 0:
+                    query = params.query, db = params.db, dbName = params.dbName, idClient = params.idClient, idCustomer = params.idCustomer, isSuperAdmin = params.isSuperAdmin, probeDocs = params.probeDocs;
+                    conditions = collectIdFieldConditions(query);
+                    if (!conditions.length) {
+                        return [2 /*return*/, null];
+                    }
+                    _a = params.collectionNames;
+                    if (_a) return [3 /*break*/, 2];
+                    return [4 /*yield*/, listAssistantCollections(db, dbName)];
+                case 1:
+                    _a = (_f.sent());
+                    _f.label = 2;
+                case 2:
+                    collectionNames = _a;
+                    _f.label = 3;
+                case 3:
+                    _f.trys.push([3, 18, 19, 20]);
+                    conditions_1 = __values(conditions), conditions_1_1 = conditions_1.next();
+                    _f.label = 4;
+                case 4:
+                    if (!!conditions_1_1.done) return [3 /*break*/, 17];
+                    condition = conditions_1_1.value;
+                    regex = buildRegexFromCondition(condition.condition);
+                    if (!regex) {
+                        return [3 /*break*/, 16];
+                    }
+                    baseToken = normalizeIdFieldBase(condition.field);
+                    if (!baseToken) {
+                        return [3 /*break*/, 16];
+                    }
+                    if (baseToken === 'customer' && idCustomer) {
+                        targetFieldType = inferIdFieldStorageTypeFromDocs(probeDocs || [], condition.field);
+                        nextValue = idCustomer;
+                        if (targetFieldType === 'objectId' && isObjectIdString(idCustomer)) {
+                            try {
+                                nextValue = new mongodb_1.ObjectId(idCustomer);
+                            }
+                            catch (_g) {
+                                nextValue = idCustomer;
+                            }
+                        }
+                        return [2 /*return*/, {
+                                query: replaceQueryFieldCondition(query, condition.field, nextValue),
+                                meta: {
+                                    field: condition.field,
+                                    strategy: 'customer_scope',
+                                    value: idCustomer,
+                                    targetFieldType: targetFieldType
+                                }
+                            }];
+                    }
+                    localNameField = resolveLocalNameFieldFromDocs(probeDocs || [], baseToken);
+                    if (localNameField) {
+                        return [2 /*return*/, {
+                                query: buildIdFieldNameFallbackQuery(query, condition.field, localNameField, regex),
+                                meta: {
+                                    field: condition.field,
+                                    strategy: 'local_name',
+                                    nameField: localNameField
+                                }
+                            }];
+                    }
+                    candidates = resolveIdLookupCandidates(baseToken, collectionNames);
+                    _f.label = 5;
+                case 5:
+                    _f.trys.push([5, 14, 15, 16]);
+                    candidates_3 = (e_19 = void 0, __values(candidates)), candidates_3_1 = candidates_3.next();
+                    _f.label = 6;
+                case 6:
+                    if (!!candidates_3_1.done) return [3 /*break*/, 13];
+                    candidate = candidates_3_1.value;
+                    if (!candidate) {
+                        return [3 /*break*/, 12];
+                    }
+                    if (!isSuperAdmin && AI_ASSISTANT_BLOCKED_COLLECTIONS.has(candidate)) {
+                        return [3 /*break*/, 12];
+                    }
+                    if (!idClient) return [3 /*break*/, 8];
+                    return [4 /*yield*/, collectionHasClientIndex(db, dbName, candidate)];
+                case 7:
+                    _b = _f.sent();
+                    return [3 /*break*/, 9];
+                case 8:
+                    _b = false;
+                    _f.label = 9;
+                case 9:
+                    candidateHasClientScope = _b;
+                    return [4 /*yield*/, fetchAssistantProbeDocs({
+                            db: db,
+                            collection: candidate,
+                            idClient: idClient,
+                            idCustomer: idCustomer,
+                            isSuperAdmin: isSuperAdmin,
+                            includeClientScope: candidateHasClientScope
+                        })];
+                case 10:
+                    candidateProbe = _f.sent();
+                    return [4 /*yield*/, lookupIdsForNameMatch({
+                            db: db,
+                            dbName: dbName,
+                            collection: candidate,
+                            baseToken: baseToken,
+                            regex: regex,
+                            idClient: idClient,
+                            idCustomer: idCustomer,
+                            isSuperAdmin: isSuperAdmin,
+                            probeDocs: candidateProbe
+                        })];
+                case 11:
+                    lookup = _f.sent();
+                    if ((_e = lookup === null || lookup === void 0 ? void 0 : lookup.ids) === null || _e === void 0 ? void 0 : _e.length) {
+                        targetFieldType = inferIdFieldStorageTypeFromDocs(probeDocs || [], condition.field);
+                        normalizedIds = normalizeIdsForTargetField(lookup.ids, probeDocs || [], condition.field, targetFieldType);
+                        idsForQuery = normalizedIds.length ? normalizedIds : lookup.ids;
+                        return [2 /*return*/, {
+                                query: replaceQueryFieldCondition(query, condition.field, { $in: idsForQuery }),
+                                meta: {
+                                    field: condition.field,
+                                    strategy: 'lookup',
+                                    collection: candidate,
+                                    ids: lookup.ids.length,
+                                    idsNormalized: normalizedIds.length,
+                                    targetFieldType: targetFieldType,
+                                    fields: lookup.fields
+                                }
+                            }];
+                    }
+                    _f.label = 12;
+                case 12:
+                    candidates_3_1 = candidates_3.next();
+                    return [3 /*break*/, 6];
+                case 13: return [3 /*break*/, 16];
+                case 14:
+                    e_19_1 = _f.sent();
+                    e_19 = { error: e_19_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_19) throw e_19.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_20_1 = _f.sent();
+                    e_20 = { error: e_20_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_20) throw e_20.error; }
+                    return [7 /*endfinally*/];
+                case 20: return [2 /*return*/, null];
+            }
+        });
     });
-    return result;
 }
 function buildAggregateNameMatchFallbackPipeline(pipeline, fallback) {
     var _a;
@@ -3690,12 +6120,12 @@ function replaceAggregateDateField(pipeline, fromField, toField) {
             return value;
         }
         if (value && typeof value === 'object') {
-            var next_1 = {};
+            var next_2 = {};
             Object.keys(value).forEach(function (key) {
                 var nextKey = key === fromField ? toField : key;
-                next_1[nextKey] = replacer(value[key]);
+                next_2[nextKey] = replacer(value[key]);
             });
-            return next_1;
+            return next_2;
         }
         if (typeof value === 'string') {
             if (value.startsWith("$".concat(fromField))) {
@@ -3712,7 +6142,8 @@ function normalizeMongoQuery(query) {
     if (containsForbiddenMongoOperators(normalized)) {
         throw new Error('AI assistant mongo read: Query contains restricted operators.');
     }
-    return applyAssistantNameRegexToQuery(normalized);
+    var rewritten = rewriteEmbeddedMatchObjects(normalized);
+    return applyAssistantNameRegexToQuery(rewritten);
 }
 function shouldApplyAssistantNameRegex(field) {
     var normalized = String(field || '').toLowerCase().trim();
@@ -3742,6 +6173,14 @@ function shouldApplyAssistantNameRegex(field) {
 function escapeRegexValue(value) {
     return value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
 }
+function buildTokenizedRegex(value) {
+    var tokens = tokenizeFieldKey(value).filter(function (token) { return token.length; });
+    if (tokens.length <= 1) {
+        return new RegExp(escapeRegexValue(value), 'i');
+    }
+    var tokenPattern = tokens.map(function (token) { return escapeRegexValue(token); }).join('[\\s\\-_]*.*');
+    return new RegExp(tokenPattern, 'i');
+}
 function applyAssistantNameRegexToQuery(query) {
     if (Array.isArray(query)) {
         return query.map(function (entry) { return applyAssistantNameRegexToQuery(entry); });
@@ -3758,7 +6197,7 @@ function applyAssistantNameRegexToQuery(query) {
         }
         if (typeof value === 'string' && shouldApplyAssistantNameRegex(key)) {
             var trimmed = value.trim();
-            result[key] = trimmed ? new RegExp(escapeRegexValue(trimmed), 'i') : value;
+            result[key] = trimmed ? buildTokenizedRegex(trimmed) : value;
             return;
         }
         if (value && typeof value === 'object') {
@@ -3769,6 +6208,127 @@ function applyAssistantNameRegexToQuery(query) {
     });
     return result;
 }
+function isObjectIdString(value) {
+    return /^[a-f0-9]{24}$/i.test(value);
+}
+function isPlainMatchObject(value) {
+    return isPlainObject(value)
+        && !isMongoObjectId(value)
+        && !(value instanceof Date)
+        && !(value instanceof RegExp);
+}
+function hasOperatorKeys(value) {
+    if (!value || typeof value !== 'object') {
+        return false;
+    }
+    return Object.keys(value).some(function (key) { return key.startsWith('$'); });
+}
+function rewriteEmbeddedMatchObjects(query) {
+    var rewriteValue = function (value, allowArrayRewrite, inOperator) {
+        if (inOperator === void 0) { inOperator = false; }
+        if (Array.isArray(value)) {
+            if (!allowArrayRewrite) {
+                return value;
+            }
+            return value.map(function (entry) { return rewriteValue(entry, true, inOperator); });
+        }
+        if (!value || typeof value !== 'object' || value instanceof Date || value instanceof RegExp || isMongoObjectId(value)) {
+            return value;
+        }
+        var result = {};
+        Object.keys(value).forEach(function (key) {
+            var entry = value[key];
+            if (key.startsWith('$')) {
+                result[key] = rewriteValue(entry, true, true);
+                return;
+            }
+            if (!inOperator && isPlainMatchObject(entry) && !Array.isArray(entry) && !hasOperatorKeys(entry)) {
+                var flattened = flattenMatchObject(entry, key, inOperator);
+                Object.assign(result, flattened);
+                return;
+            }
+            if (isPlainMatchObject(entry) && !Array.isArray(entry)) {
+                result[key] = rewriteValue(entry, true, inOperator);
+                return;
+            }
+            if (Array.isArray(entry)) {
+                result[key] = allowArrayRewrite ? entry.map(function (item) { return rewriteValue(item, true, inOperator); }) : entry;
+                return;
+            }
+            result[key] = entry;
+        });
+        return result;
+    };
+    var flattenMatchObject = function (value, prefix, inOperator) {
+        var result = {};
+        Object.keys(value || {}).forEach(function (key) {
+            var entry = value[key];
+            var currentPath = "".concat(prefix, ".").concat(key);
+            if (isPlainMatchObject(entry) && !Array.isArray(entry) && !hasOperatorKeys(entry)) {
+                var flattened = flattenMatchObject(entry, currentPath, inOperator);
+                Object.assign(result, flattened);
+                return;
+            }
+            if (isPlainMatchObject(entry) && !Array.isArray(entry)) {
+                result[currentPath] = rewriteValue(entry, true, inOperator);
+                return;
+            }
+            if (Array.isArray(entry)) {
+                result[currentPath] = entry;
+                return;
+            }
+            result[currentPath] = entry;
+        });
+        return result;
+    };
+    return rewriteValue(query, true);
+}
+function buildRegexFromCondition(condition) {
+    if (!condition) {
+        return null;
+    }
+    if (condition instanceof RegExp) {
+        return condition;
+    }
+    if (typeof condition === 'string') {
+        var trimmed = condition.trim();
+        if (!trimmed || isObjectIdString(trimmed)) {
+            return null;
+        }
+        return new RegExp(escapeRegexValue(trimmed), 'i');
+    }
+    if (typeof condition === 'object') {
+        var raw = condition.$regex;
+        if (raw !== undefined) {
+            var source = String(raw);
+            var options = typeof condition.$options === 'string'
+                ? condition.$options
+                : 'i';
+            try {
+                return new RegExp(source, options);
+            }
+            catch (_a) {
+                return new RegExp(escapeRegexValue(source), 'i');
+            }
+        }
+    }
+    return null;
+}
+function normalizeIdFieldBase(field) {
+    var normalized = normalizeOptionalString(field).toLowerCase();
+    if (!normalized) {
+        return '';
+    }
+    var parts = normalized.split('.').filter(Boolean);
+    var last = parts[parts.length - 1] || normalized;
+    if (last.startsWith('id_')) {
+        return last.slice(3);
+    }
+    if (normalized.startsWith('id_')) {
+        return normalized.slice(3);
+    }
+    return last;
+}
 function normalizeCollectionKey(value) {
     return String(value || '').toLowerCase().replace(/[^a-z0-9]/g, '');
 }
@@ -3803,6 +6363,19 @@ function tokenizeCollectionText(value) {
     });
     return Array.from(new Set(tokens));
 }
+function computeCollectionTokenWeights(tokens) {
+    var unique = Array.from(new Set(tokens));
+    var hasDomain = unique.some(function (token) { return AI_ASSISTANT_COLLECTION_DOMAIN_TOKENS.has(token); });
+    var weights = {};
+    unique.forEach(function (token) {
+        if (hasDomain && AI_ASSISTANT_COLLECTION_GENERIC_TOKENS.has(token)) {
+            weights[token] = 0.4;
+            return;
+        }
+        weights[token] = 1;
+    });
+    return { weights: weights, hasDomain: hasDomain };
+}
 function expandAssistantTermSynonyms(text) {
     var base = normalizeOptionalString(text);
     if (!base) {
@@ -3855,7 +6428,7 @@ function listAssistantCollections(db, dbName) {
         });
     });
 }
-function scoreCollectionMatch(requestedTokens, candidateName) {
+function scoreCollectionMatch(requestedTokens, candidateName, tokenWeights) {
     if (!requestedTokens.length) {
         return 0;
     }
@@ -3865,8 +6438,10 @@ function scoreCollectionMatch(requestedTokens, candidateName) {
     }
     var score = 0;
     requestedTokens.forEach(function (token) {
+        var _a;
         if (candidateTokens.includes(token)) {
-            score += 10;
+            var weight = (_a = tokenWeights === null || tokenWeights === void 0 ? void 0 : tokenWeights[token]) !== null && _a !== void 0 ? _a : 1;
+            score += 10 * weight;
         }
     });
     var requestedKey = normalizeCollectionKey(requestedTokens.join('-'));
@@ -3877,12 +6452,17 @@ function scoreCollectionMatch(requestedTokens, candidateName) {
     else if (requestedKey && (candidateKey.includes(requestedKey) || requestedKey.includes(candidateKey))) {
         score += 20;
     }
+    if (isVersionCollectionName(candidateName)) {
+        score -= 15;
+    }
     return score;
 }
-function scoreCollectionMatchDetailed(requestedTokens, candidateName) {
+function scoreCollectionMatchDetailed(requestedTokens, candidateName, tokenWeights) {
     var candidateTokens = tokenizeCollectionText(candidateName);
     var tokenMatches = requestedTokens.filter(function (token) { return candidateTokens.includes(token); });
-    var score = tokenMatches.length * 10;
+    var weights = tokenWeights || {};
+    var tokenScore = tokenMatches.reduce(function (sum, token) { var _a; return sum + 10 * ((_a = weights[token]) !== null && _a !== void 0 ? _a : 1); }, 0);
+    var score = tokenScore;
     var requestedKey = normalizeCollectionKey(requestedTokens.join('-'));
     var candidateKey = normalizeCollectionKey(candidateName);
     var keyMatch = null;
@@ -3894,11 +6474,20 @@ function scoreCollectionMatchDetailed(requestedTokens, candidateName) {
         score += 20;
         keyMatch = 'partial';
     }
+    if (isVersionCollectionName(candidateName)) {
+        score -= 15;
+    }
     return {
         score: score,
         tokenMatches: tokenMatches,
         keyMatch: keyMatch,
-        candidateTokens: candidateTokens
+        candidateTokens: candidateTokens,
+        tokenScore: tokenScore,
+        tokenWeights: tokenMatches.reduce(function (acc, token) {
+            var _a;
+            acc[token] = (_a = weights[token]) !== null && _a !== void 0 ? _a : 1;
+            return acc;
+        }, {})
     };
 }
 function resolveCollectionHintsFromTokens(tokens, collectionNames, max) {
@@ -3906,8 +6495,9 @@ function resolveCollectionHintsFromTokens(tokens, collectionNames, max) {
     if (!tokens.length || !collectionNames.length) {
         return [];
     }
+    var weights = computeCollectionTokenWeights(tokens).weights;
     return collectionNames
-        .map(function (name) { return ({ name: name, score: scoreCollectionMatch(tokens, name) }); })
+        .map(function (name) { return ({ name: name, score: scoreCollectionMatch(tokens, name, weights) }); })
         .filter(function (entry) { return entry.score > 0; })
         .sort(function (a, b) { return b.score - a.score; })
         .slice(0, Math.max(max, 0))
@@ -3916,21 +6506,26 @@ function resolveCollectionHintsFromTokens(tokens, collectionNames, max) {
 function buildCollectionRankingDebugFromTokens(tokens, collectionNames, max) {
     if (max === void 0) { max = 8; }
     var requestedKey = normalizeCollectionKey(tokens.join('-'));
+    var _a = computeCollectionTokenWeights(tokens), weights = _a.weights, hasDomain = _a.hasDomain;
     if (!tokens.length || !collectionNames.length) {
         return {
             tokens: tokens,
             requestedKey: requestedKey,
+            hasDomain: hasDomain,
+            tokenWeights: weights,
             ranked: []
         };
     }
     var ranked = collectionNames
-        .map(function (name) { return (__assign({ name: name }, scoreCollectionMatchDetailed(tokens, name))); })
+        .map(function (name) { return (__assign({ name: name }, scoreCollectionMatchDetailed(tokens, name, weights))); })
         .filter(function (entry) { return entry.score > 0; })
         .sort(function (a, b) { return b.score - a.score; })
         .slice(0, Math.max(max, 0));
     return {
         tokens: tokens,
         requestedKey: requestedKey,
+        hasDomain: hasDomain,
+        tokenWeights: weights,
         ranked: ranked
     };
 }
@@ -3939,13 +6534,187 @@ function buildCollectionSelectionDetail(tokens, collection) {
     if (!trimmed) {
         return null;
     }
-    var detail = scoreCollectionMatchDetailed(tokens, trimmed);
+    var weights = computeCollectionTokenWeights(tokens).weights;
+    var detail = scoreCollectionMatchDetailed(tokens, trimmed, weights);
     return {
         collection: trimmed,
         score: detail.score,
         tokenMatches: detail.tokenMatches,
         keyMatch: detail.keyMatch,
-        candidateTokens: detail.candidateTokens
+        candidateTokens: detail.candidateTokens,
+        tokenScore: detail.tokenScore,
+        tokenWeights: detail.tokenWeights
+    };
+}
+function isVersionCollectionName(value) {
+    var normalized = normalizeOptionalString(value).toLowerCase();
+    return normalized.endsWith('.versions') || normalized.endsWith('-versions') || normalized.includes('.versions.');
+}
+function stripVersionSuffix(value) {
+    var normalized = normalizeOptionalString(value);
+    if (!normalized) {
+        return '';
+    }
+    if (normalized.endsWith('.versions')) {
+        return normalized.slice(0, -'.versions'.length);
+    }
+    if (normalized.endsWith('-versions')) {
+        return normalized.slice(0, -'-versions'.length);
+    }
+    return normalized;
+}
+function shouldAllowVersionCollections(message) {
+    var normalized = normalizeOptionalString(message).toLowerCase();
+    if (!normalized) {
+        return false;
+    }
+    if (!normalized.includes('bug')) {
+        return false;
+    }
+    return /(last\s*(5|five)\s+updates|version|history|audit)/i.test(normalized);
+}
+function resolveReportCollectionName(permissionView, collectionNames, currentCollection) {
+    var normalizedView = normalizeOptionalString(permissionView).toLowerCase();
+    if (!normalizedView.startsWith('/report/')) {
+        return null;
+    }
+    var current = stripVersionSuffix(normalizeOptionalString(currentCollection));
+    var reportCollection = current.startsWith('report-') ? current : "report-".concat(current);
+    if (collectionNames.includes(reportCollection)) {
+        return reportCollection;
+    }
+    var routeTail = normalizedView.replace('/report/', '').replace(/\//g, '-');
+    var routeCandidate = routeTail ? "report-".concat(routeTail) : '';
+    if (routeCandidate && collectionNames.includes(routeCandidate)) {
+        return routeCandidate;
+    }
+    return null;
+}
+function resolveBaseCollectionFromReport(db, dbName, collection) {
+    return __awaiter(this, void 0, void 0, function () {
+        var normalized, base, names;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    normalized = normalizeOptionalString(collection);
+                    if (!normalized.startsWith('report-')) {
+                        return [2 /*return*/, null];
+                    }
+                    base = stripVersionSuffix(normalized.slice('report-'.length));
+                    if (!base) {
+                        return [2 /*return*/, null];
+                    }
+                    return [4 /*yield*/, listAssistantCollections(db, dbName)];
+                case 1:
+                    names = _a.sent();
+                    return [2 /*return*/, names.includes(base) ? base : null];
+            }
+        });
+    });
+}
+function resolveCollectionOverrideWithContext(params) {
+    var requested = normalizeOptionalString(params.requestedCollection);
+    var allowVersions = shouldAllowVersionCollections(params.message);
+    var collectionNames = Array.isArray(params.collectionNames) ? params.collectionNames : [];
+    var permissionView = normalizeOptionalString(params.permissionView);
+    if (permissionView) {
+        var reportPreferred = resolveReportCollectionName(permissionView, collectionNames, requested);
+        if (reportPreferred && reportPreferred !== requested) {
+            return {
+                from: requested,
+                to: reportPreferred,
+                fromScore: 0,
+                toScore: 0,
+                reason: 'report route preference'
+            };
+        }
+    }
+    if (!allowVersions && isVersionCollectionName(requested)) {
+        var base = stripVersionSuffix(requested);
+        if (base && collectionNames.includes(base)) {
+            return {
+                from: requested,
+                to: base,
+                fromScore: 0,
+                toScore: 0,
+                reason: 'avoid versions collection'
+            };
+        }
+    }
+    var rankingOverride = resolveAssistantCollectionOverride(params.collectionRanking, requested);
+    if (rankingOverride) {
+        if (!allowVersions && isVersionCollectionName(rankingOverride.to)) {
+            var base = stripVersionSuffix(rankingOverride.to);
+            if (base && collectionNames.includes(base)) {
+                return {
+                    from: requested,
+                    to: base,
+                    fromScore: rankingOverride.fromScore,
+                    toScore: rankingOverride.toScore,
+                    reason: 'avoid versions collection'
+                };
+            }
+        }
+        return rankingOverride;
+    }
+    return null;
+}
+function pickPreferredCollectionCandidate(ranked) {
+    if (!Array.isArray(ranked) || !ranked.length) {
+        return null;
+    }
+    var top = ranked[0];
+    if (!top) {
+        return null;
+    }
+    if (!isVersionCollectionName(top.name)) {
+        return top;
+    }
+    var nonVersion = ranked.find(function (entry) { return entry && !isVersionCollectionName(entry.name); });
+    if (nonVersion && nonVersion.score >= top.score - 5) {
+        return nonVersion;
+    }
+    return top;
+}
+function resolveAssistantCollectionOverride(collectionRanking, currentCollection) {
+    var _a, _b;
+    var ranked = Array.isArray(collectionRanking === null || collectionRanking === void 0 ? void 0 : collectionRanking.ranked) ? collectionRanking === null || collectionRanking === void 0 ? void 0 : collectionRanking.ranked : [];
+    if (!ranked.length) {
+        return null;
+    }
+    var top = pickPreferredCollectionCandidate(ranked);
+    if (!top || top.score < AI_ASSISTANT_COLLECTION_OVERRIDE_MIN_SCORE) {
+        return null;
+    }
+    var current = normalizeOptionalString(currentCollection);
+    if (!current) {
+        return {
+            from: '',
+            to: top.name,
+            fromScore: 0,
+            toScore: top.score,
+            reason: 'no collection specified'
+        };
+    }
+    if (current === top.name) {
+        return null;
+    }
+    var currentScore = (_b = (_a = ranked.find(function (entry) { return entry.name === current; })) === null || _a === void 0 ? void 0 : _a.score) !== null && _b !== void 0 ? _b : 0;
+    var scoreGap = top.score - currentScore;
+    var currentIsVersion = isVersionCollectionName(current);
+    var topIsVersion = isVersionCollectionName(top.name);
+    if (scoreGap < AI_ASSISTANT_COLLECTION_OVERRIDE_SCORE_GAP && !(currentIsVersion && !topIsVersion)) {
+        return null;
+    }
+    var reason = currentIsVersion && !topIsVersion
+        ? 'preferred non-version collection'
+        : "higher score (".concat(top.score, " vs ").concat(currentScore, ")");
+    return {
+        from: current,
+        to: top.name,
+        fromScore: currentScore,
+        toScore: top.score,
+        reason: reason
     };
 }
 function findBestCollectionMatch(requested, collectionNames) {
@@ -3994,7 +6763,7 @@ function resolveAssistantCollectionName(db, dbName, requested) {
     });
 }
 function findQueryDateField(query) {
-    var e_7, _a, e_8, _b;
+    var e_21, _a, e_22, _b;
     if (!query || typeof query !== 'object') {
         return null;
     }
@@ -4008,12 +6777,12 @@ function findQueryDateField(query) {
                 }
             }
         }
-        catch (e_7_1) { e_7 = { error: e_7_1 }; }
+        catch (e_21_1) { e_21 = { error: e_21_1 }; }
         finally {
             try {
                 if (query_1_1 && !query_1_1.done && (_a = query_1.return)) _a.call(query_1);
             }
-            finally { if (e_7) throw e_7.error; }
+            finally { if (e_21) throw e_21.error; }
         }
         return null;
     }
@@ -4032,12 +6801,12 @@ function findQueryDateField(query) {
             }
         }
     }
-    catch (e_8_1) { e_8 = { error: e_8_1 }; }
+    catch (e_22_1) { e_22 = { error: e_22_1 }; }
     finally {
         try {
             if (_d && !_d.done && (_b = _c.return)) _b.call(_c);
         }
-        finally { if (e_8) throw e_8.error; }
+        finally { if (e_22) throw e_22.error; }
     }
     return null;
 }
@@ -4128,15 +6897,15 @@ function expandQueryDateFallbacks(query) {
     };
     var visit = function (value) {
         if (Array.isArray(value)) {
-            var changed_1 = false;
+            var changed_2 = false;
             var nextArray = value.map(function (entry) {
                 var visited = visit(entry);
                 if (visited.changed) {
-                    changed_1 = true;
+                    changed_2 = true;
                 }
                 return visited.value;
             });
-            return { value: changed_1 ? nextArray : value, changed: changed_1 };
+            return { value: changed_2 ? nextArray : value, changed: changed_2 };
         }
         if (!value || typeof value !== 'object') {
             return { value: value, changed: false };
@@ -4166,6 +6935,87 @@ function expandQueryDateFallbacks(query) {
     }
     return { query: result.value, fields: addedFields };
 }
+function buildDateFieldExpansionList(field) {
+    var normalized = normalizeOptionalString(field);
+    if (!normalized) {
+        return [];
+    }
+    var expansions = new Set();
+    var add = function (value) {
+        if (value && value !== normalized) {
+            expansions.add(value);
+        }
+    };
+    var fallback = AI_ASSISTANT_DATE_FALLBACKS[normalized];
+    if (fallback) {
+        add(fallback);
+    }
+    if (normalized.startsWith('date_') || normalized === 'date' || normalized.endsWith('_date')) {
+        AI_ASSISTANT_DATE_EXPANSION_FIELDS.forEach(add);
+    }
+    if (normalized === 'createdAt' || normalized === 'updatedAt') {
+        AI_ASSISTANT_DATE_EXPANSION_FIELDS.forEach(add);
+    }
+    return Array.from(expansions);
+}
+function expandAggregateDateMatchFallback(pipeline) {
+    if (!Array.isArray(pipeline)) {
+        return null;
+    }
+    var _loop_7 = function (i) {
+        var stage = pipeline[i];
+        if (!stage || typeof stage !== 'object' || !stage.$match || typeof stage.$match !== 'object') {
+            return "continue";
+        }
+        var matchStage = stage.$match;
+        var orArray = Array.isArray(matchStage.$or) ? matchStage.$or : null;
+        if (!orArray || !orArray.length) {
+            return "continue";
+        }
+        var existingFields = new Set();
+        orArray.forEach(function (entry) {
+            if (!entry || typeof entry !== 'object' || Array.isArray(entry)) {
+                return;
+            }
+            Object.keys(entry).forEach(function (key) {
+                if (!key.startsWith('$')) {
+                    existingFields.add(key);
+                }
+            });
+        });
+        var expandedOr = __spreadArray([], __read(orArray), false);
+        var addedFields = new Set();
+        orArray.forEach(function (entry) {
+            if (!entry || typeof entry !== 'object' || Array.isArray(entry)) {
+                return;
+            }
+            var conditions = extractDateRangeConditions(entry);
+            conditions.forEach(function (condition) {
+                var expansions = buildDateFieldExpansionList(condition.field);
+                expansions.forEach(function (field) {
+                    if (existingFields.has(field)) {
+                        return;
+                    }
+                    expandedOr = __spreadArray(__spreadArray([], __read(expandedOr), false), [replaceQueryField(entry, condition.field, field)], false);
+                    existingFields.add(field);
+                    addedFields.add(field);
+                });
+            });
+        });
+        if (!addedFields.size) {
+            return { value: null };
+        }
+        var nextMatch = __assign(__assign({}, matchStage), { $or: expandedOr });
+        var updated = pipeline.map(function (current, index) { return (index === i ? { $match: nextMatch } : current); });
+        return { value: { pipeline: updated, fields: Array.from(addedFields) } };
+    };
+    for (var i = 0; i < pipeline.length; i += 1) {
+        var state_5 = _loop_7(i);
+        if (typeof state_5 === "object")
+            return state_5.value;
+    }
+    return null;
+}
 function resolveQueryDateFieldFallback(query) {
     var dateField = findQueryDateField(query);
     if (!dateField) {
@@ -4178,7 +7028,7 @@ function resolveQueryDateFieldFallback(query) {
     return { from: dateField, to: fallback };
 }
 function containsForbiddenMongoOperators(value) {
-    var e_9, _a;
+    var e_23, _a;
     if (!value || typeof value !== 'object') {
         return false;
     }
@@ -4197,12 +7047,12 @@ function containsForbiddenMongoOperators(value) {
             }
         }
     }
-    catch (e_9_1) { e_9 = { error: e_9_1 }; }
+    catch (e_23_1) { e_23 = { error: e_23_1 }; }
     finally {
         try {
             if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
         }
-        finally { if (e_9) throw e_9.error; }
+        finally { if (e_23) throw e_23.error; }
     }
     return false;
 }
@@ -4211,9 +7061,49 @@ function buildClientScopeCacheKey(dbName, collection) {
     var normalizedCollection = normalizeOptionalString(collection).toLowerCase();
     return "".concat(normalizedDb || 'db', ":").concat(normalizedCollection);
 }
+function buildFieldIndexCacheKey(dbName, collection, field) {
+    var normalizedDb = normalizeOptionalString(dbName).toLowerCase();
+    var normalizedCollection = normalizeOptionalString(collection).toLowerCase();
+    var normalizedField = normalizeOptionalString(field).toLowerCase();
+    return "".concat(normalizedDb || 'db', ":").concat(normalizedCollection, ":").concat(normalizedField);
+}
+function collectionHasFieldIndex(db, dbName, collection, field) {
+    return __awaiter(this, void 0, void 0, function () {
+        var normalizedCollection, normalizedField, cacheKey, cached, indexes, hasIndex, _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    normalizedCollection = normalizeOptionalString(collection);
+                    normalizedField = normalizeOptionalString(field);
+                    if (!normalizedCollection || !normalizedField) {
+                        return [2 /*return*/, false];
+                    }
+                    cacheKey = buildFieldIndexCacheKey(dbName, normalizedCollection, normalizedField);
+                    cached = AI_ASSISTANT_FIELD_INDEX_CACHE.get(cacheKey);
+                    if (typeof cached === 'boolean') {
+                        return [2 /*return*/, cached];
+                    }
+                    _b.label = 1;
+                case 1:
+                    _b.trys.push([1, 3, , 4]);
+                    return [4 /*yield*/, db.collection(normalizedCollection).indexes()];
+                case 2:
+                    indexes = _b.sent();
+                    hasIndex = Array.isArray(indexes)
+                        && indexes.some(function (entry) { return (entry === null || entry === void 0 ? void 0 : entry.key) && Object.prototype.hasOwnProperty.call(entry.key, normalizedField); });
+                    AI_ASSISTANT_FIELD_INDEX_CACHE.set(cacheKey, hasIndex);
+                    return [2 /*return*/, hasIndex];
+                case 3:
+                    _a = _b.sent();
+                    return [2 /*return*/, false];
+                case 4: return [2 /*return*/];
+            }
+        });
+    });
+}
 function collectionHasClientIndex(db, dbName, collection) {
     return __awaiter(this, void 0, void 0, function () {
-        var normalizedCollection, cacheKey, cached, indexes, hasIndex, _a;
+        var normalizedCollection, cacheKey, cached, hasIndex, _a;
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
@@ -4229,11 +7119,9 @@ function collectionHasClientIndex(db, dbName, collection) {
                     _b.label = 1;
                 case 1:
                     _b.trys.push([1, 3, , 4]);
-                    return [4 /*yield*/, db.collection(normalizedCollection).indexes()];
+                    return [4 /*yield*/, collectionHasFieldIndex(db, dbName, normalizedCollection, 'id_client')];
                 case 2:
-                    indexes = _b.sent();
-                    hasIndex = Array.isArray(indexes)
-                        && indexes.some(function (entry) { return (entry === null || entry === void 0 ? void 0 : entry.key) && Object.prototype.hasOwnProperty.call(entry.key, 'id_client'); });
+                    hasIndex = _b.sent();
                     AI_ASSISTANT_CLIENT_SCOPE_CACHE.set(cacheKey, hasIndex);
                     return [2 /*return*/, hasIndex];
                 case 3:
@@ -4275,6 +7163,25 @@ function applyCustomerScopeFilter(query, collection, idCustomer, isSuperAdmin) {
         $and: [query, (_a = {}, _a[customerField] = normalizedCustomer, _a)]
     };
 }
+function buildAssistantProbeQuery(collection, idClient, idCustomer, isSuperAdmin, includeClientScope) {
+    if (isSuperAdmin === void 0) { isSuperAdmin = false; }
+    if (includeClientScope === void 0) { includeClientScope = false; }
+    var query = {};
+    if (includeClientScope) {
+        query = applyClientScopeFilter(query, idClient, isSuperAdmin);
+    }
+    return applyCustomerScopeFilter(query, collection, idCustomer, isSuperAdmin);
+}
+function fetchAssistantProbeDocs(params) {
+    var db = params.db, collection = params.collection, idClient = params.idClient, idCustomer = params.idCustomer, isSuperAdmin = params.isSuperAdmin, includeClientScope = params.includeClientScope;
+    var probeQuery = buildAssistantProbeQuery(collection, idClient, idCustomer, isSuperAdmin, includeClientScope);
+    return db.collection(collection)
+        .find(probeQuery, {
+        limit: AI_ASSISTANT_PROBE_LIMIT,
+        readPreference: AI_ASSISTANT_READ_PREFERENCE
+    })
+        .toArray();
+}
 function userHasViewPermission(user, view) {
     var _a, _b, _c;
     if (!user || !view) {
@@ -4436,8 +7343,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_10_1;
-        var _e, e_10, _f, _g;
+        var _a, _b, _c, _d, message, payload, status_1, e_24_1;
+        var _e, e_24, _f, _g;
         return __generator(this, function (_h) {
             switch (_h.label) {
                 case 0:
@@ -4464,8 +7371,8 @@ function waitForCodexWorkerMessage(worker, streamStatusHandler) {
                     return [3 /*break*/, 1];
                 case 4: return [3 /*break*/, 11];
                 case 5:
-                    e_10_1 = _h.sent();
-                    e_10 = { error: e_10_1 };
+                    e_24_1 = _h.sent();
+                    e_24 = { error: e_24_1 };
                     return [3 /*break*/, 11];
                 case 6:
                     _h.trys.push([6, , 9, 10]);
@@ -4476,7 +7383,7 @@ function waitForCodexWorkerMessage(worker, streamStatusHandler) {
                     _h.label = 8;
                 case 8: return [3 /*break*/, 10];
                 case 9:
-                    if (e_10) throw e_10.error;
+                    if (e_24) throw e_24.error;
                     return [7 /*endfinally*/];
                 case 10: return [7 /*endfinally*/];
                 case 11: throw new CodexWorkerBootstrapError('Codex worker exited before completing.');
@@ -4864,7 +7771,7 @@ function normalizeRouteMatchKey(value) {
     return normalizeRouteKey(value).toLowerCase();
 }
 function buildClientRouteIndex() {
-    var e_11, _a;
+    var e_25, _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();
@@ -4883,12 +7790,12 @@ function buildClientRouteIndex() {
             }
         }
     }
-    catch (e_11_1) { e_11 = { error: e_11_1 }; }
+    catch (e_25_1) { e_25 = { error: e_25_1 }; }
     finally {
         try {
             if (routes_1_1 && !routes_1_1.done && (_a = routes_1.return)) _a.call(routes_1);
         }
-        finally { if (e_11) throw e_11.error; }
+        finally { if (e_25) throw e_25.error; }
     }
     return { set: set, map: map, size: routes.length };
 }
@@ -4978,6 +7885,20 @@ function sanitizeAssistantResponse(value) {
         }
         return /^i\s+(can|will|['’]ll|am going to|['’]m going to)\s+(pull|run|query|get|fetch|look up|retrieve|grab)\b/i.test(normalized);
     };
+    var isInternalPlanLine = function (line) {
+        var trimmed = line.trim();
+        if (!trimmed || trimmed.length > 120) {
+            return false;
+        }
+        var normalized = trimmed.toLowerCase();
+        var hasPhrase = /schema[-\s]?probe|query rewrite|id[-\s]?lookup|collection override|probe read|tiny probe|fallback plan/i.test(normalized);
+        if (!hasPhrase) {
+            return false;
+        }
+        var isBulletish = /^[-*•]+\s+/.test(trimmed);
+        var isPlanish = /^(plan|planning|approach|strategy|steps?|todo|checklist)\b/i.test(trimmed);
+        return isBulletish || isPlanish;
+    };
     var cleanedLines = [];
     withoutBlocks.split('\n').forEach(function (line) {
         var trimmed = line.trim();
@@ -4988,6 +7909,9 @@ function sanitizeAssistantResponse(value) {
         if (isTentativeQueryLine(line)) {
             return;
         }
+        if (isInternalPlanLine(line)) {
+            return;
+        }
         if (/^work ticket summary:/i.test(trimmed)) {
             return;
         }
@@ -5014,7 +7938,7 @@ function sanitizeAssistantResponse(value) {
     return normalizeAssistantRoutes(normalizedCurrency);
 }
 function evaluateAssistantGuardrails(message) {
-    var e_12, _a;
+    var e_26, _a;
     var normalized = String(message || '').toLowerCase();
     var patterns = [
         {
@@ -5060,12 +7984,12 @@ function evaluateAssistantGuardrails(message) {
             }
         }
     }
-    catch (e_12_1) { e_12 = { error: e_12_1 }; }
+    catch (e_26_1) { e_26 = { error: e_26_1 }; }
     finally {
         try {
             if (patterns_1_1 && !patterns_1_1.done && (_a = patterns_1.return)) _a.call(patterns_1);
         }
-        finally { if (e_12) throw e_12.error; }
+        finally { if (e_26) throw e_26.error; }
     }
     return null;
 }
@@ -5180,7 +8104,7 @@ function tokenizeArithmeticExpression(expression) {
     return tokens;
 }
 function evaluateArithmeticExpression(expression) {
-    var e_13, _a, e_14, _b;
+    var e_27, _a, e_28, _b;
     var tokens = tokenizeArithmeticExpression(expression);
     if (!tokens || !tokens.length) {
         return null;
@@ -5237,12 +8161,12 @@ function evaluateArithmeticExpression(expression) {
             prevToken = token;
         }
     }
-    catch (e_13_1) { e_13 = { error: e_13_1 }; }
+    catch (e_27_1) { e_27 = { error: e_27_1 }; }
     finally {
         try {
             if (tokens_1_1 && !tokens_1_1.done && (_a = tokens_1.return)) _a.call(tokens_1);
         }
-        finally { if (e_13) throw e_13.error; }
+        finally { if (e_27) throw e_27.error; }
     }
     while (ops.length) {
         var op = ops.pop();
@@ -5282,12 +8206,12 @@ function evaluateArithmeticExpression(expression) {
             stack.push(Number(token));
         }
     }
-    catch (e_14_1) { e_14 = { error: e_14_1 }; }
+    catch (e_28_1) { e_28 = { error: e_28_1 }; }
     finally {
         try {
             if (output_1_1 && !output_1_1.done && (_b = output_1.return)) _b.call(output_1);
         }
-        finally { if (e_14) throw e_14.error; }
+        finally { if (e_28) throw e_28.error; }
     }
     if (stack.length !== 1 || Number.isNaN(stack[0])) {
         return null;
@@ -5471,8 +8395,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_15_1;
-        var e_15, _b;
+        var limits, totalBytes, totalChars, chunks, cleaned, attachments_1, attachments_1_1, attachment, localPath, safe, stat, ext, name_1, type, readable, content, _a, e_29_1;
+        var e_29, _b;
         return __generator(this, function (_c) {
             switch (_c.label) {
                 case 0:
@@ -5551,14 +8475,14 @@ function readAttachmentContents(attachments) {
                     return [3 /*break*/, 2];
                 case 10: return [3 /*break*/, 13];
                 case 11:
-                    e_15_1 = _c.sent();
-                    e_15 = { error: e_15_1 };
+                    e_29_1 = _c.sent();
+                    e_29 = { error: e_29_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_15) throw e_15.error; }
+                    finally { if (e_29) throw e_29.error; }
                     return [7 /*endfinally*/];
                 case 13: return [2 /*return*/, {
                         promptText: chunks.length ? "\n\nAttachments:\n".concat(chunks.join('\n\n')) : '',
@@ -5679,6 +8603,17 @@ function normalizeOptionalString(value) {
     var raw = typeof value === 'string' ? value.trim() : '';
     return raw || '';
 }
+function resolveSingleWorkerTarget(value) {
+    var normalized = normalizeOptionalString(value);
+    if (!normalized) {
+        return '';
+    }
+    var parts = normalized.split(',').map(function (part) { return part.trim(); }).filter(Boolean);
+    if (parts.length !== 1) {
+        return '';
+    }
+    return parts[0];
+}
 function normalizeConversationMode(value) {
     var normalized = normalizeOptionalString(value).toLowerCase();
     if (normalized === 'codex') {
@@ -5735,7 +8670,7 @@ function estimateUsage(messages, responseText, model) {
     };
 }
 function evaluateGuardrails(message) {
-    var e_16, _a;
+    var e_30, _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.' },
@@ -5757,12 +8692,12 @@ function evaluateGuardrails(message) {
             }
         }
     }
-    catch (e_16_1) { e_16 = { error: e_16_1 }; }
+    catch (e_30_1) { e_30 = { error: e_30_1 }; }
     finally {
         try {
             if (patterns_2_1 && !patterns_2_1.done && (_a = patterns_2.return)) _a.call(patterns_2);
         }
-        finally { if (e_16) throw e_16.error; }
+        finally { if (e_30) throw e_30.error; }
     }
     return null;
 }