@resolveio/server-lib 20.15.9 → 20.16.0

package/methods/ai-terminal.js

@@ -147,6 +147,9 @@ 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';
@@ -346,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.',
@@ -354,12 +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).',
@@ -495,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({
@@ -726,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) {
@@ -745,8 +753,7 @@ function loadAiTerminalMethods(methodManager) {
                         }
                     });
                 });
-            }
-        },
+            } }),
         aiAssistantMongoRead: {
             check: new simpl_schema_1.default({
                 payload: {
@@ -1131,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, collectionOverride, timingBreakdown, contextRoute, contextMode, hintSeed, termExpansion, hintText, baseTokens, expandedTokens, baseWeights, expandedWeights, dbName, db, collectionNames, _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;
-                        return __generator(this, function (_t) {
-                            switch (_t.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 = [];
@@ -1162,6 +1169,7 @@ function executeAiAssistantCodexRun(payload, context) {
                                     collectionRanking = null;
                                     collectionSelection = null;
                                     collectionOverride = null;
+                                    collectionNames = [];
                                     timingBreakdown = {
                                         directiveMs: 0,
                                         initialResponseMs: 0,
@@ -1172,9 +1180,9 @@ 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 });
-                                    _t.label = 1;
+                                    _u.label = 1;
                                 case 1:
-                                    _t.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;
@@ -1195,19 +1203,19 @@ function executeAiAssistantCodexRun(payload, context) {
                                     recordStep('Planning: term expansion', {
                                         termMatches: termExpansion.matches.length ? termExpansion.matches : undefined
                                     });
-                                    _t.label = 2;
+                                    _u.label = 2;
                                 case 2:
-                                    _t.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 = _t.sent();
+                                    collectionNames = _u.sent();
                                     collectionHints = resolveCollectionHintsFromTokens(expandedTokens, collectionNames, 5);
                                     collectionRanking = buildCollectionRankingDebugFromTokens(expandedTokens, collectionNames, 8);
                                     return [3 /*break*/, 5];
                                 case 4:
-                                    _a = _t.sent();
+                                    _a = _u.sent();
                                     collectionHints = [];
                                     collectionRanking = collectionRanking || ((collectionTokenization === null || collectionTokenization === void 0 ? void 0 : collectionTokenization.expandedTokens)
                                         ? buildCollectionRankingDebugFromTokens(collectionTokenization.expandedTokens || [], [], 0)
@@ -1230,7 +1238,7 @@ function executeAiAssistantCodexRun(payload, context) {
                                     prompt_1 = buildAssistantCodexPrompt(message, attachmentData.promptText, historyLines.join('\n'), assistantContext);
                                     return [4 /*yield*/, resolveAssistantWorkspaceRoot()];
                                 case 6:
-                                    workspaceRoot = _t.sent();
+                                    workspaceRoot = _u.sent();
                                     codexConfig = resolveCodexSettings();
                                     runOptions = {
                                         timeoutMs: resolveCodexTimeoutMs(),
@@ -1251,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);
-                                    _t.label = 7;
+                                    _u.label = 7;
                                 case 7:
-                                    _t.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 = _t.sent();
+                                    directiveText = _u.sent();
                                     timingBreakdown.directiveMs = Date.now() - directiveStart;
                                     forcedDirective = extractAssistantMongoDirective(directiveText);
                                     if (forcedDirective) {
@@ -1274,7 +1282,7 @@ function executeAiAssistantCodexRun(payload, context) {
                                     }
                                     return [3 /*break*/, 10];
                                 case 9:
-                                    _b = _t.sent();
+                                    _b = _u.sent();
                                     return [3 /*break*/, 10];
                                 case 10:
                                     if (!!directive) return [3 /*break*/, 12];
@@ -1282,7 +1290,7 @@ function executeAiAssistantCodexRun(payload, context) {
                                     initialStart = Date.now();
                                     return [4 /*yield*/, runCodexInWorkerThread(prompt_1, runOptions, codexConfig, streamProgress)];
                                 case 11:
-                                    responseText = _t.sent();
+                                    responseText = _u.sent();
                                     timingBreakdown.initialResponseMs = Date.now() - initialStart;
                                     directive = extractAssistantMongoDirective(responseText);
                                     if (directive) {
@@ -1296,18 +1304,18 @@ function executeAiAssistantCodexRun(payload, context) {
                                             permissionView: normalizeOptionalString((_o = directive.payload) === null || _o === void 0 ? void 0 : _o.permissionView) || undefined
                                         });
                                     }
-                                    _t.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);
-                                    _t.label = 13;
+                                    _u.label = 13;
                                 case 13:
-                                    _t.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 = _t.sent();
+                                    directiveText = _u.sent();
                                     timingBreakdown.forcedDirectiveMs = Date.now() - forcedStart;
                                     forcedDirective = extractAssistantMongoDirective(directiveText);
                                     if (forcedDirective) {
@@ -1324,12 +1332,18 @@ function executeAiAssistantCodexRun(payload, context) {
                                     }
                                     return [3 /*break*/, 16];
                                 case 15:
-                                    _c = _t.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 = resolveAssistantCollectionOverride(collectionRanking, requestedCollection);
+                                        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,
@@ -1353,19 +1367,19 @@ function executeAiAssistantCodexRun(payload, context) {
                                         collection: normalizeOptionalString(toolRequest === null || toolRequest === void 0 ? void 0 : toolRequest.collection) || undefined,
                                         permissionView: normalizeOptionalString(toolRequest === null || toolRequest === void 0 ? void 0 : toolRequest.permissionView) || undefined
                                     });
-                                    _t.label = 17;
+                                    _u.label = 17;
                                 case 17:
-                                    _t.trys.push([17, 26, , 27]);
+                                    _u.trys.push([17, 26, , 27]);
                                     toolStart = Date.now();
                                     if (!(effectiveDirective.type === 'aggregate')) return [3 /*break*/, 19];
                                     return [4 /*yield*/, executeAiAssistantMongoAggregate(toolRequest, context)];
                                 case 18:
-                                    _d = _t.sent();
+                                    _d = _u.sent();
                                     return [3 /*break*/, 21];
                                 case 19: return [4 /*yield*/, executeAiAssistantMongoRead(toolRequest, context)];
                                 case 20:
-                                    _d = _t.sent();
-                                    _t.label = 21;
+                                    _d = _u.sent();
+                                    _u.label = 21;
                                 case 21:
                                     toolResponse = _d;
                                     timingBreakdown.toolMs = Date.now() - toolStart;
@@ -1382,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);
-                                    _t.label = 22;
+                                    _u.label = 22;
                                 case 22:
-                                    _t.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 = _t.sent();
+                                    followupText = _u.sent();
                                     timingBreakdown.followupMs = Date.now() - followupStart;
                                     assistantContent = sanitizeAssistantResponse(followupText);
                                     return [3 /*break*/, 25];
                                 case 24:
-                                    _e = _t.sent();
+                                    _e = _u.sent();
                                     assistantContent = buildAssistantToolFallbackResponse(toolPayload.result);
                                     return [3 /*break*/, 25];
                                 case 25: return [3 /*break*/, 27];
                                 case 26:
-                                    error_2 = _t.sent();
+                                    error_2 = _u.sent();
                                     assistantContent = buildAssistantToolErrorMessage(error_2, directive, toolRequest);
                                     toolError = error_2;
                                     return [3 /*break*/, 27];
@@ -1406,10 +1420,10 @@ function executeAiAssistantCodexRun(payload, context) {
                                 case 28:
                                     progressTracker.push('Drafting response');
                                     recordStep('Drafting response');
-                                    _t.label = 29;
+                                    _u.label = 29;
                                 case 29: return [3 /*break*/, 32];
                                 case 30:
-                                    error_3 = _t.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];
@@ -1474,16 +1488,16 @@ function executeAiAssistantCodexRun(payload, context) {
                                             }
                                         })];
                                 case 33:
-                                    _t.sent();
-                                    _t.label = 34;
+                                    _u.sent();
+                                    _u.label = 34;
                                 case 34: return [4 /*yield*/, touchConversation(conversation._id, finalNow, assistantMessageId ? String(assistantMessageId) : undefined)];
                                 case 35:
-                                    _t.sent();
+                                    _u.sent();
                                     if (!(input.delete_files_after_run !== false)) return [3 /*break*/, 37];
                                     return [4 /*yield*/, cleanupAttachments(attachmentData.attachments)];
                                 case 36:
-                                    _t.sent();
-                                    _t.label = 37;
+                                    _u.sent();
+                                    _u.label = 37;
                                 case 37: return [2 /*return*/, finalAssistantDoc];
                             }
                         });
@@ -1497,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, fallbackMeta, baseQuery, stripped, userId, normalizedClient, shouldScopeByClient, _b, strippedClient, clientScopedQuery, scopedQuery, normalized, findOptions, documents, executedQuery, probeDocs, dateFallback, fallbackQuery, fallbackDocs, expanded, fallbackDocs, nameFallback, fallbackDocs, queryFields, _c, aliases, rewrittenQuery, fallbackDocs, _d, idLookup, fallbackDocs, total, sanitizedDocuments, requestedFields, missingFields, _e, projectionAliases, expandedProjection, refreshedDocs, includeIds, fieldAliases, displayDocs, priorityFields, display;
-        var _f, _g;
-        return __generator(this, function (_h) {
-            switch (_h.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);
@@ -1511,15 +1525,16 @@ function executeAiAssistantMongoRead(payload, context) {
                     db = resolveio_server_app_1.ResolveIOServer.getMongoConnection().db(dbName);
                     return [4 /*yield*/, resolveAssistantCollectionName(db, dbName, rawCollection)];
                 case 1:
-                    collectionResolution = _h.sent();
+                    collectionResolution = _q.sent();
                     collection = collectionResolution.name || rawCollection;
+                    schemaFields = getCollectionSchemaFieldNames(collection);
                     return [4 /*yield*/, ensureAssistantReadAccess(context, input.permissionView, collection)];
                 case 2:
-                    _a = _h.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((_f = user === null || user === void 0 ? void 0 : user.other) === null || _f === void 0 ? void 0 : _f.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) {
@@ -1544,11 +1559,11 @@ function executeAiAssistantMongoRead(payload, context) {
                     if (!(!isSuperAdmin && normalizedClient)) return [3 /*break*/, 4];
                     return [4 /*yield*/, collectionHasClientIndex(db, dbName, collection)];
                 case 3:
-                    _b = _h.sent();
+                    _b = _q.sent();
                     return [3 /*break*/, 5];
                 case 4:
                     _b = false;
-                    _h.label = 5;
+                    _q.label = 5;
                 case 5:
                     shouldScopeByClient = _b;
                     if (!isSuperAdmin && shouldScopeByClient) {
@@ -1568,7 +1583,7 @@ 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 = _h.sent();
+                    documents = _q.sent();
                     executedQuery = scopedQuery;
                     probeDocs = null;
                     if (!!documents.length) return [3 /*break*/, 8];
@@ -1578,13 +1593,13 @@ function executeAiAssistantMongoRead(payload, context) {
                     fallbackMeta.dateField = __assign(__assign({}, dateFallback), { attempted: true, used: false });
                     return [4 /*yield*/, db.collection(collection).find(fallbackQuery, findOptions).toArray()];
                 case 7:
-                    fallbackDocs = _h.sent();
+                    fallbackDocs = _q.sent();
                     if (fallbackDocs.length) {
                         documents = fallbackDocs;
                         executedQuery = fallbackQuery;
                         fallbackMeta.dateField.used = true;
                     }
-                    _h.label = 8;
+                    _q.label = 8;
                 case 8:
                     if (!!documents.length) return [3 /*break*/, 10];
                     expanded = expandQueryDateFallbacks(executedQuery);
@@ -1596,13 +1611,13 @@ function executeAiAssistantMongoRead(payload, context) {
                     };
                     return [4 /*yield*/, db.collection(collection).find(expanded.query, findOptions).toArray()];
                 case 9:
-                    fallbackDocs = _h.sent();
+                    fallbackDocs = _q.sent();
                     if (fallbackDocs.length) {
                         documents = fallbackDocs;
                         executedQuery = expanded.query;
                         fallbackMeta.dateFieldsExpanded.used = true;
                     }
-                    _h.label = 10;
+                    _q.label = 10;
                 case 10:
                     if (!!documents.length) return [3 /*break*/, 12];
                     nameFallback = resolveReadNameMatchFallback(executedQuery);
@@ -1615,17 +1630,15 @@ function executeAiAssistantMongoRead(payload, context) {
                     };
                     return [4 /*yield*/, db.collection(collection).find(nameFallback.query, findOptions).toArray()];
                 case 11:
-                    fallbackDocs = _h.sent();
+                    fallbackDocs = _q.sent();
                     if (fallbackDocs.length) {
                         documents = fallbackDocs;
                         executedQuery = nameFallback.query;
                         fallbackMeta.nameMatch.used = true;
                     }
-                    _h.label = 12;
+                    _q.label = 12;
                 case 12:
-                    if (!!documents.length) return [3 /*break*/, 16];
-                    queryFields = extractQueryFieldPaths(executedQuery).filter(function (field) { return !isAssistantIdField(field); });
-                    if (!queryFields.length) return [3 /*break*/, 16];
+                    if (!!documents.length) return [3 /*break*/, 17];
                     _c = probeDocs;
                     if (_c) return [3 /*break*/, 14];
                     return [4 /*yield*/, fetchAssistantProbeDocs({
@@ -1637,13 +1650,54 @@ function executeAiAssistantMongoRead(payload, context) {
                             includeClientScope: shouldScopeByClient
                         })];
                 case 13:
-                    _c = (_h.sent());
-                    _h.label = 14;
+                    _c = (_q.sent());
+                    _q.label = 14;
                 case 14:
                     probeDocs = _c;
-                    if (!probeDocs.length) return [3 /*break*/, 16];
-                    aliases = resolveFieldAliases(probeDocs, queryFields);
-                    if (!Object.keys(aliases).length) return [3 /*break*/, 16];
+                    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,
@@ -1655,18 +1709,18 @@ function executeAiAssistantMongoRead(payload, context) {
                         return replaceFieldPathDeep(acc, from, to);
                     }, executedQuery);
                     return [4 /*yield*/, db.collection(collection).find(rewrittenQuery, findOptions).toArray()];
-                case 15:
-                    fallbackDocs = _h.sent();
+                case 20:
+                    fallbackDocs = _q.sent();
                     if (fallbackDocs.length) {
                         documents = fallbackDocs;
                         executedQuery = rewrittenQuery;
                         fallbackMeta.queryFieldAliases.used = true;
                     }
-                    _h.label = 16;
-                case 16:
-                    if (!!documents.length) return [3 /*break*/, 21];
-                    _d = probeDocs;
-                    if (_d) return [3 /*break*/, 18];
+                    _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,
@@ -1675,11 +1729,11 @@ function executeAiAssistantMongoRead(payload, context) {
                             isSuperAdmin: isSuperAdmin,
                             includeClientScope: shouldScopeByClient
                         })];
-                case 17:
-                    _d = (_h.sent());
-                    _h.label = 18;
-                case 18:
-                    probeDocs = _d;
+                case 22:
+                    _e = (_q.sent());
+                    _q.label = 23;
+                case 23:
+                    probeDocs = _e;
                     return [4 /*yield*/, applyIdLookupFallbackToQuery({
                             query: executedQuery,
                             db: db,
@@ -1689,36 +1743,143 @@ function executeAiAssistantMongoRead(payload, context) {
                             isSuperAdmin: isSuperAdmin,
                             probeDocs: probeDocs || undefined
                         })];
-                case 19:
-                    idLookup = _h.sent();
-                    if (!idLookup) return [3 /*break*/, 21];
+                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 20:
-                    fallbackDocs = _h.sent();
+                case 25:
+                    fallbackDocs = _q.sent();
                     if (fallbackDocs.length) {
                         documents = fallbackDocs;
                         executedQuery = idLookup.query;
                         fallbackMeta.idLookup.used = true;
                     }
-                    _h.label = 21;
-                case 21:
+                    _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*/, 23];
+                    if (!normalized.includeTotal) return [3 /*break*/, 48];
                     return [4 /*yield*/, db.collection(collection).countDocuments(executedQuery, { readPreference: AI_ASSISTANT_READ_PREFERENCE })];
-                case 22:
-                    total = _h.sent();
-                    _h.label = 23;
-                case 23:
+                case 47:
+                    total = _q.sent();
+                    _q.label = 48;
+                case 48:
                     sanitizedDocuments = isSuperAdmin
                         ? documents
                         : documents.map(function (doc) { return redactSensitiveFields((0, common_1.deepCopy)(doc)); });
                     requestedFields = resolveProjectionRequestedFields(findOptions.projection);
-                    if (!(sanitizedDocuments.length && requestedFields.length)) return [3 /*break*/, 27];
+                    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*/, 27];
-                    _e = probeDocs;
-                    if (_e) return [3 /*break*/, 25];
+                    if (!missingFields.length) return [3 /*break*/, 52];
+                    _m = probeDocs;
+                    if (_m) return [3 /*break*/, 50];
                     return [4 /*yield*/, fetchAssistantProbeDocs({
                             db: db,
                             collection: collection,
@@ -1727,26 +1888,26 @@ function executeAiAssistantMongoRead(payload, context) {
                             isSuperAdmin: isSuperAdmin,
                             includeClientScope: shouldScopeByClient
                         })];
-                case 24:
-                    _e = (_h.sent());
-                    _h.label = 25;
-                case 25:
-                    probeDocs = _e;
-                    if (!probeDocs.length) return [3 /*break*/, 27];
-                    projectionAliases = resolveFieldAliases(probeDocs, missingFields);
-                    if (!Object.keys(projectionAliases).length) return [3 /*break*/, 27];
+                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*/, 27];
+                    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 26:
-                    refreshedDocs = _h.sent();
+                case 51:
+                    refreshedDocs = _q.sent();
                     if (refreshedDocs.length) {
                         documents = refreshedDocs;
                         sanitizedDocuments = isSuperAdmin
@@ -1754,13 +1915,30 @@ function executeAiAssistantMongoRead(payload, context) {
                             : refreshedDocs.map(function (doc) { return redactSensitiveFields((0, common_1.deepCopy)(doc)); });
                         fallbackMeta.projectionAliases.used = true;
                     }
-                    _h.label = 27;
-                case 27:
-                    includeIds = ((_g = input.options) === null || _g === void 0 ? void 0 : _g.includeIds) === true;
-                    fieldAliases = resolveFieldAliases(sanitizedDocuments, requestedFields);
+                    _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, {
@@ -1797,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, 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, matchFields_1, _c, aliases, rewrittenPipeline, fallbackDocs, _loop_1, i, state_1, sanitizedDocuments, includeIds, display;
-        var _d, _e;
-        return __generator(this, function (_f) {
-            switch (_f.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);
@@ -1811,15 +1989,16 @@ function executeAiAssistantMongoAggregate(payload, context) {
                     db = resolveio_server_app_1.ResolveIOServer.getMongoConnection().db(dbName);
                     return [4 /*yield*/, resolveAssistantCollectionName(db, dbName, rawCollection)];
                 case 1:
-                    collectionResolution = _f.sent();
+                    collectionResolution = _o.sent();
                     collection = collectionResolution.name || rawCollection;
+                    schemaFields = getCollectionSchemaFieldNames(collection);
                     return [4 /*yield*/, ensureAssistantReadAccess(context, input.permissionView, collection)];
                 case 2:
-                    _a = _f.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((_d = user === null || user === void 0 ? void 0 : user.other) === null || _d === void 0 ? void 0 : _d.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) {
@@ -1844,11 +2023,11 @@ function executeAiAssistantMongoAggregate(payload, context) {
                     if (!(!isSuperAdmin && normalizedClient)) return [3 /*break*/, 4];
                     return [4 /*yield*/, collectionHasClientIndex(db, dbName, collection)];
                 case 3:
-                    _b = _f.sent();
+                    _b = _o.sent();
                     return [3 /*break*/, 5];
                 case 4:
                     _b = false;
-                    _f.label = 5;
+                    _o.label = 5;
                 case 5:
                     shouldScopeByClient = _b;
                     clientScopedQuery = shouldScopeByClient
@@ -1878,7 +2057,7 @@ function executeAiAssistantMongoAggregate(payload, context) {
                             .aggregate(limitedPipeline, aggregateOptions)
                             .toArray()];
                 case 6:
-                    documents = _f.sent();
+                    documents = _o.sent();
                     executedPipeline = limitedPipeline;
                     probeDocs = null;
                     if (!(!documents.length && dateField)) return [3 /*break*/, 10];
@@ -1891,13 +2070,13 @@ function executeAiAssistantMongoAggregate(payload, context) {
                             .aggregate(fallbackPipeline, aggregateOptions)
                             .toArray()];
                 case 7:
-                    fallbackDocs = _f.sent();
+                    fallbackDocs = _o.sent();
                     if (fallbackDocs.length) {
                         documents = fallbackDocs;
                         executedPipeline = fallbackPipeline;
                         fallbackMeta.dateField.used = true;
                     }
-                    _f.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 };
@@ -1908,13 +2087,13 @@ function executeAiAssistantMongoAggregate(payload, context) {
                             .aggregate(createdPipeline, aggregateOptions)
                             .toArray()];
                 case 9:
-                    createdDocs = _f.sent();
+                    createdDocs = _o.sent();
                     if (createdDocs.length) {
                         documents = createdDocs;
                         executedPipeline = createdPipeline;
                         fallbackMeta.dateFieldCreatedAt.used = true;
                     }
-                    _f.label = 10;
+                    _o.label = 10;
                 case 10:
                     if (!!documents.length) return [3 /*break*/, 12];
                     expanded = expandAggregateDateMatchFallback(executedPipeline);
@@ -1929,13 +2108,13 @@ function executeAiAssistantMongoAggregate(payload, context) {
                             .aggregate(expanded.pipeline, aggregateOptions)
                             .toArray()];
                 case 11:
-                    expandedDocs = _f.sent();
+                    expandedDocs = _o.sent();
                     if (expandedDocs.length) {
                         documents = expandedDocs;
                         executedPipeline = expanded.pipeline;
                         fallbackMeta.dateFieldsExpanded.used = true;
                     }
-                    _f.label = 12;
+                    _o.label = 12;
                 case 12:
                     if (!!documents.length) return [3 /*break*/, 16];
                     completionFallback = resolveAggregateCompletionFallback(executedPipeline);
@@ -1954,13 +2133,13 @@ function executeAiAssistantMongoAggregate(payload, context) {
                             .aggregate(fallbackPipeline, aggregateOptions)
                             .toArray()];
                 case 13:
-                    fallbackDocs = _f.sent();
+                    fallbackDocs = _o.sent();
                     if (fallbackDocs.length) {
                         documents = fallbackDocs;
                         executedPipeline = fallbackPipeline;
                         fallbackMeta.completion.used = true;
                     }
-                    _f.label = 14;
+                    _o.label = 14;
                 case 14:
                     if (!!documents.length) return [3 /*break*/, 16];
                     completionExprFallback = resolveAggregateCompletionExprFallback(executedPipeline);
@@ -1979,13 +2158,13 @@ function executeAiAssistantMongoAggregate(payload, context) {
                             .aggregate(fallbackPipeline, aggregateOptions)
                             .toArray()];
                 case 15:
-                    fallbackDocs = _f.sent();
+                    fallbackDocs = _o.sent();
                     if (fallbackDocs.length) {
                         documents = fallbackDocs;
                         executedPipeline = fallbackPipeline;
                         fallbackMeta.completion.used = true;
                     }
-                    _f.label = 16;
+                    _o.label = 16;
                 case 16:
                     if (!(documents.length <= 1)) return [3 /*break*/, 18];
                     unwindFallback = resolveAggregateUnwindFallback(executedPipeline);
@@ -1997,13 +2176,13 @@ function executeAiAssistantMongoAggregate(payload, context) {
                             .aggregate(fallbackPipeline, aggregateOptions)
                             .toArray()];
                 case 17:
-                    fallbackDocs = _f.sent();
+                    fallbackDocs = _o.sent();
                     if (fallbackDocs.length > documents.length) {
                         documents = fallbackDocs;
                         executedPipeline = fallbackPipeline;
                         fallbackMeta.unwind.used = true;
                     }
-                    _f.label = 18;
+                    _o.label = 18;
                 case 18:
                     if (!!documents.length) return [3 /*break*/, 20];
                     nameFallback = resolveAggregateNameMatchFallback(executedPipeline);
@@ -2020,15 +2199,87 @@ function executeAiAssistantMongoAggregate(payload, context) {
                             .aggregate(fallbackPipeline, aggregateOptions)
                             .toArray()];
                 case 19:
-                    fallbackDocs = _f.sent();
+                    fallbackDocs = _o.sent();
                     if (fallbackDocs.length) {
                         documents = fallbackDocs;
                         executedPipeline = fallbackPipeline;
                         fallbackMeta.nameMatch.used = true;
                     }
-                    _f.label = 20;
+                    _o.label = 20;
                 case 20:
-                    if (!!documents.length) return [3 /*break*/, 24];
+                    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') {
@@ -2037,9 +2288,9 @@ function executeAiAssistantMongoAggregate(payload, context) {
                                 .forEach(function (field) { return matchFields_1.add(field); });
                         }
                     });
-                    if (!matchFields_1.size) return [3 /*break*/, 24];
-                    _c = probeDocs;
-                    if (_c) return [3 /*break*/, 22];
+                    if (!matchFields_1.size) return [3 /*break*/, 30];
+                    _d = probeDocs;
+                    if (_d) return [3 /*break*/, 28];
                     return [4 /*yield*/, fetchAssistantProbeDocs({
                             db: db,
                             collection: collection,
@@ -2048,14 +2299,14 @@ function executeAiAssistantMongoAggregate(payload, context) {
                             isSuperAdmin: isSuperAdmin,
                             includeClientScope: shouldScopeByClient
                         })];
-                case 21:
-                    _c = (_f.sent());
-                    _f.label = 22;
-                case 22:
-                    probeDocs = _c;
-                    if (!probeDocs.length) return [3 /*break*/, 24];
-                    aliases = resolveFieldAliases(probeDocs, Array.from(matchFields_1));
-                    if (!Object.keys(aliases).length) return [3 /*break*/, 24];
+                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,
@@ -2066,31 +2317,31 @@ function executeAiAssistantMongoAggregate(payload, context) {
                         var _b = __read(_a, 2), from = _b[0], to = _b[1];
                         return replaceFieldPathDeep(acc, from, to);
                     }, executedPipeline);
-                    if (!!containsForbiddenMongoOperators(rewrittenPipeline)) return [3 /*break*/, 24];
+                    if (!!containsForbiddenMongoOperators(rewrittenPipeline)) return [3 /*break*/, 30];
                     return [4 /*yield*/, db.collection(collection)
                             .aggregate(rewrittenPipeline, aggregateOptions)
                             .toArray()];
-                case 23:
-                    fallbackDocs = _f.sent();
+                case 29:
+                    fallbackDocs = _o.sent();
                     if (fallbackDocs.length) {
                         documents = fallbackDocs;
                         executedPipeline = rewrittenPipeline;
                         fallbackMeta.queryFieldAliases.used = true;
                     }
-                    _f.label = 24;
-                case 24:
-                    if (!!documents.length) return [3 /*break*/, 28];
-                    _loop_1 = function (i) {
-                        var stage, _g, idLookup, rewrittenPipeline, fallbackDocs;
-                        return __generator(this, function (_h) {
-                            switch (_h.label) {
+                    _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"];
                                     }
-                                    _g = probeDocs;
-                                    if (_g) return [3 /*break*/, 2];
+                                    _q = probeDocs;
+                                    if (_q) return [3 /*break*/, 2];
                                     return [4 /*yield*/, fetchAssistantProbeDocs({
                                             db: db,
                                             collection: collection,
@@ -2100,10 +2351,10 @@ function executeAiAssistantMongoAggregate(payload, context) {
                                             includeClientScope: shouldScopeByClient
                                         })];
                                 case 1:
-                                    _g = (_h.sent());
-                                    _h.label = 2;
+                                    _q = (_r.sent());
+                                    _r.label = 2;
                                 case 2:
-                                    probeDocs = _g;
+                                    probeDocs = _q;
                                     return [4 /*yield*/, applyIdLookupFallbackToQuery({
                                             query: stage.$match,
                                             db: db,
@@ -2114,7 +2365,7 @@ function executeAiAssistantMongoAggregate(payload, context) {
                                             probeDocs: probeDocs || undefined
                                         })];
                                 case 3:
-                                    idLookup = _h.sent();
+                                    idLookup = _r.sent();
                                     if (!idLookup) {
                                         return [2 /*return*/, "continue"];
                                     }
@@ -2125,37 +2376,164 @@ function executeAiAssistantMongoAggregate(payload, context) {
                                             .aggregate(rewrittenPipeline, aggregateOptions)
                                             .toArray()];
                                 case 4:
-                                    fallbackDocs = _h.sent();
+                                    fallbackDocs = _r.sent();
                                     if (fallbackDocs.length) {
                                         documents = fallbackDocs;
                                         executedPipeline = rewrittenPipeline;
                                         fallbackMeta.idLookup.used = true;
                                         return [2 /*return*/, "break"];
                                     }
-                                    _h.label = 5;
+                                    _r.label = 5;
                                 case 5: return [2 /*return*/];
                             }
                         });
                     };
                     i = 0;
-                    _f.label = 25;
-                case 25:
-                    if (!(i < (executedPipeline || []).length)) return [3 /*break*/, 28];
-                    return [5 /*yield**/, _loop_1(i)];
-                case 26:
-                    state_1 = _f.sent();
-                    if (state_1 === "break")
-                        return [3 /*break*/, 28];
-                    _f.label = 27;
-                case 27:
+                    _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*/, 25];
-                case 28:
+                    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 = ((_e = input.options) === null || _e === void 0 ? void 0 : _e.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,
@@ -2329,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, _x, _y, _z, _0;
+    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.');
@@ -2426,15 +2804,34 @@ function buildAssistantDebugPayload(params) {
             : fallbackInfo.nameMatch.field;
         notes.push("Expanded name match fields: ".concat(fields, "."));
     }
-    if ((_t = fallbackInfo === null || fallbackInfo === void 0 ? void 0 : fallbackInfo.idLookup) === null || _t === void 0 ? void 0 : _t.used) {
+    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 = ((_u = params.toolError) === null || _u === void 0 ? void 0 : _u.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));
         }
@@ -2455,13 +2852,13 @@ function buildAssistantDebugPayload(params) {
         collectionResolved: resolvedCollection || undefined,
         collectionMatched: matchedCollection,
         collectionCandidates: candidateCollections.length ? candidateCollections : undefined,
-        collectionScore: typeof ((_v = params.toolResponseDebug) === null || _v === void 0 ? void 0 : _v.collectionScore) === 'number'
+        collectionScore: typeof ((_y = params.toolResponseDebug) === null || _y === void 0 ? void 0 : _y.collectionScore) === 'number'
             ? params.toolResponseDebug.collectionScore
             : undefined,
-        query: ((_w = params.toolResponseDebug) === null || _w === void 0 ? void 0 : _w.query) || undefined,
-        pipeline: ((_x = params.toolResponseDebug) === null || _x === void 0 ? void 0 : _x.executedPipeline) || ((_y = params.toolResponseDebug) === null || _y === void 0 ? void 0 : _y.originalPipeline) || undefined,
-        options: ((_z = params.toolResponseDebug) === null || _z === void 0 ? void 0 : _z.options) || undefined,
-        fallbacks: ((_0 = params.toolResponseDebug) === null || _0 === void 0 ? void 0 : _0.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') {
@@ -2728,6 +3125,93 @@ 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) {
@@ -2897,15 +3381,406 @@ function normalizeIdsForTargetField(ids, targetDocs, targetFieldPath, targetFiel
     });
     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_3, _a;
+    var e_9, _a;
     if (!Array.isArray(docs) || !fieldPath) {
         return false;
     }
     var usePath = fieldPath.includes('.');
     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;
+        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;
@@ -2915,12 +3790,12 @@ function hasNonEmptyValue(docs, fieldPath, options) {
             }
         }
     }
-    catch (e_3_1) { e_3 = { error: e_3_1 }; }
+    catch (e_9_1) { e_9 = { error: e_9_1 }; }
     finally {
         try {
-            if (docs_2_1 && !docs_2_1.done && (_a = docs_2.return)) _a.call(docs_2);
+            if (docs_3_1 && !docs_3_1.done && (_a = docs_3.return)) _a.call(docs_3);
         }
-        finally { if (e_3) throw e_3.error; }
+        finally { if (e_9) throw e_9.error; }
     }
     return false;
 }
@@ -2980,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;
@@ -2990,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) {
@@ -3004,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;
@@ -3016,11 +3911,9 @@ function resolveFieldAliases(docs, requestedFields) {
                 score = 70;
             }
             else {
-                var candidateTokens_1 = tokenizeFieldKey(path);
-                var requestedBaseTokens = tokenizeFieldKey(field);
                 var requestedTokens = expandFieldTokens(requestedBaseTokens);
-                var overlap = requestedTokens.filter(function (token) { return candidateTokens_1.includes(token); }).length;
-                var baseOverlap = requestedBaseTokens.filter(function (token) { return candidateTokens_1.includes(token); }).length;
+                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 * 10;
                     if (baseOverlap === 0) {
@@ -3744,7 +4637,7 @@ function matchContainsField(value, field) {
     });
 }
 function resolveAggregateCompletionFallback(pipeline) {
-    var e_4, _a;
+    var e_10, _a;
     if (!Array.isArray(pipeline)) {
         return null;
     }
@@ -3757,7 +4650,7 @@ function resolveAggregateCompletionFallback(pipeline) {
         }
         var addFields = stage.$addFields;
         try {
-            for (var _b = (e_4 = 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;
@@ -3771,12 +4664,12 @@ function resolveAggregateCompletionFallback(pipeline) {
                 }
             }
         }
-        catch (e_4_1) { e_4 = { error: e_4_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_4) throw e_4.error; }
+            finally { if (e_10) throw e_10.error; }
         }
         if (candidateField) {
             break;
@@ -3932,7 +4825,7 @@ function buildCompletionFallbackSources(field) {
     ]);
 }
 function resolveAggregateCompletionExprFallback(pipeline) {
-    var e_5, _a;
+    var e_11, _a;
     if (!Array.isArray(pipeline)) {
         return null;
     }
@@ -3952,7 +4845,7 @@ function resolveAggregateCompletionExprFallback(pipeline) {
         }
         if (!candidateField) {
             try {
-                for (var _b = (e_5 = 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;
@@ -3967,12 +4860,12 @@ function resolveAggregateCompletionExprFallback(pipeline) {
                     }
                 }
             }
-            catch (e_5_1) { e_5 = { error: e_5_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_5) throw e_5.error; }
+                finally { if (e_11) throw e_11.error; }
             }
         }
         if (!candidateField) {
@@ -4142,7 +5035,7 @@ function isRegexMatchCondition(value) {
     return false;
 }
 function findRegexMatchInMatchObject(match, prefix) {
-    var e_6, _a, e_7, _b;
+    var e_12, _a, e_13, _b;
     if (prefix === void 0) { prefix = ''; }
     if (Array.isArray(match)) {
         try {
@@ -4154,12 +5047,12 @@ function findRegexMatchInMatchObject(match, prefix) {
                 }
             }
         }
-        catch (e_6_1) { e_6 = { error: e_6_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_6) throw e_6.error; }
+            finally { if (e_12) throw e_12.error; }
         }
         return null;
     }
@@ -4168,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);
@@ -4190,12 +5083,12 @@ function findRegexMatchInMatchObject(match, prefix) {
             }
         }
     }
-    catch (e_7_1) { e_7 = { error: e_7_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_7) throw e_7.error; }
+        finally { if (e_13) throw e_13.error; }
     }
     return null;
 }
@@ -4384,6 +5277,173 @@ function stripMatchField(match, field) {
     });
     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;
@@ -4579,6 +5639,155 @@ function buildIdFieldNameFallbackQuery(query, idField, nameField, condition) {
         : { $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) {
@@ -4666,8 +5875,8 @@ function lookupIdsForNameMatch(params) {
 }
 function applyIdLookupFallbackToQuery(params) {
     return __awaiter(this, void 0, void 0, function () {
-        var query, db, dbName, idClient, idCustomer, isSuperAdmin, probeDocs, conditions, collectionNames, _a, conditions_1, conditions_1_1, condition, regex, baseToken, targetFieldType, nextValue, localNameField, candidates, candidates_1, candidates_1_1, candidate, candidateHasClientScope, _b, candidateProbe, lookup, targetFieldType, normalizedIds, idsForQuery, e_8_1, e_9_1;
-        var e_9, _c, e_8, _d;
+        var query, db, dbName, idClient, idCustomer, isSuperAdmin, probeDocs, conditions, collectionNames, _a, conditions_1, conditions_1_1, condition, regex, baseToken, targetFieldType, nextValue, localNameField, candidates, candidates_3, candidates_3_1, candidate, candidateHasClientScope, _b, candidateProbe, lookup, targetFieldType, normalizedIds, idsForQuery, e_19_1, e_20_1;
+        var e_20, _c, e_19, _d;
         var _e;
         return __generator(this, function (_f) {
             switch (_f.label) {
@@ -4737,11 +5946,11 @@ function applyIdLookupFallbackToQuery(params) {
                     _f.label = 5;
                 case 5:
                     _f.trys.push([5, 14, 15, 16]);
-                    candidates_1 = (e_8 = void 0, __values(candidates)), candidates_1_1 = candidates_1.next();
+                    candidates_3 = (e_19 = void 0, __values(candidates)), candidates_3_1 = candidates_3.next();
                     _f.label = 6;
                 case 6:
-                    if (!!candidates_1_1.done) return [3 /*break*/, 13];
-                    candidate = candidates_1_1.value;
+                    if (!!candidates_3_1.done) return [3 /*break*/, 13];
+                    candidate = candidates_3_1.value;
                     if (!candidate) {
                         return [3 /*break*/, 12];
                     }
@@ -4800,32 +6009,32 @@ function applyIdLookupFallbackToQuery(params) {
                     }
                     _f.label = 12;
                 case 12:
-                    candidates_1_1 = candidates_1.next();
+                    candidates_3_1 = candidates_3.next();
                     return [3 /*break*/, 6];
                 case 13: return [3 /*break*/, 16];
                 case 14:
-                    e_8_1 = _f.sent();
-                    e_8 = { error: e_8_1 };
+                    e_19_1 = _f.sent();
+                    e_19 = { error: e_19_1 };
                     return [3 /*break*/, 16];
                 case 15:
                     try {
-                        if (candidates_1_1 && !candidates_1_1.done && (_d = candidates_1.return)) _d.call(candidates_1);
+                        if (candidates_3_1 && !candidates_3_1.done && (_d = candidates_3.return)) _d.call(candidates_3);
                     }
-                    finally { if (e_8) throw e_8.error; }
+                    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_9_1 = _f.sent();
-                    e_9 = { error: e_9_1 };
+                    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_9) throw e_9.error; }
+                    finally { if (e_20) throw e_20.error; }
                     return [7 /*endfinally*/];
                 case 20: return [2 /*return*/, null];
             }
@@ -4964,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); });
@@ -4980,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') {
@@ -5007,12 +6224,13 @@ function hasOperatorKeys(value) {
     return Object.keys(value).some(function (key) { return key.startsWith('$'); });
 }
 function rewriteEmbeddedMatchObjects(query) {
-    var rewriteValue = function (value, allowArrayRewrite) {
+    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); });
+            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;
@@ -5021,38 +6239,38 @@ function rewriteEmbeddedMatchObjects(query) {
         Object.keys(value).forEach(function (key) {
             var entry = value[key];
             if (key.startsWith('$')) {
-                result[key] = rewriteValue(entry, true);
+                result[key] = rewriteValue(entry, true, true);
                 return;
             }
-            if (isPlainMatchObject(entry) && !Array.isArray(entry) && !hasOperatorKeys(entry)) {
-                var flattened = flattenMatchObject(entry, key);
+            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);
+                result[key] = rewriteValue(entry, true, inOperator);
                 return;
             }
             if (Array.isArray(entry)) {
-                result[key] = allowArrayRewrite ? entry.map(function (item) { return rewriteValue(item, true); }) : 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) {
+    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);
+                var flattened = flattenMatchObject(entry, currentPath, inOperator);
                 Object.assign(result, flattened);
                 return;
             }
             if (isPlainMatchObject(entry) && !Array.isArray(entry)) {
-                result[currentPath] = rewriteValue(entry, true);
+                result[currentPath] = rewriteValue(entry, true, inOperator);
                 return;
             }
             if (Array.isArray(entry)) {
@@ -5234,6 +6452,9 @@ function scoreCollectionMatch(requestedTokens, candidateName, tokenWeights) {
     else if (requestedKey && (candidateKey.includes(requestedKey) || requestedKey.includes(candidateKey))) {
         score += 20;
     }
+    if (isVersionCollectionName(candidateName)) {
+        score -= 15;
+    }
     return score;
 }
 function scoreCollectionMatchDetailed(requestedTokens, candidateName, tokenWeights) {
@@ -5253,6 +6474,9 @@ function scoreCollectionMatchDetailed(requestedTokens, candidateName, tokenWeigh
         score += 20;
         keyMatch = 'partial';
     }
+    if (isVersionCollectionName(candidateName)) {
+        score -= 15;
+    }
     return {
         score: score,
         tokenMatches: tokenMatches,
@@ -5326,6 +6550,115 @@ 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;
@@ -5430,7 +6763,7 @@ function resolveAssistantCollectionName(db, dbName, requested) {
     });
 }
 function findQueryDateField(query) {
-    var e_10, _a, e_11, _b;
+    var e_21, _a, e_22, _b;
     if (!query || typeof query !== 'object') {
         return null;
     }
@@ -5444,12 +6777,12 @@ function findQueryDateField(query) {
                 }
             }
         }
-        catch (e_10_1) { e_10 = { error: e_10_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_10) throw e_10.error; }
+            finally { if (e_21) throw e_21.error; }
         }
         return null;
     }
@@ -5468,12 +6801,12 @@ function findQueryDateField(query) {
             }
         }
     }
-    catch (e_11_1) { e_11 = { error: e_11_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_11) throw e_11.error; }
+        finally { if (e_22) throw e_22.error; }
     }
     return null;
 }
@@ -5629,7 +6962,7 @@ function expandAggregateDateMatchFallback(pipeline) {
     if (!Array.isArray(pipeline)) {
         return null;
     }
-    var _loop_2 = function (i) {
+    var _loop_7 = function (i) {
         var stage = pipeline[i];
         if (!stage || typeof stage !== 'object' || !stage.$match || typeof stage.$match !== 'object') {
             return "continue";
@@ -5677,9 +7010,9 @@ function expandAggregateDateMatchFallback(pipeline) {
         return { value: { pipeline: updated, fields: Array.from(addedFields) } };
     };
     for (var i = 0; i < pipeline.length; i += 1) {
-        var state_2 = _loop_2(i);
-        if (typeof state_2 === "object")
-            return state_2.value;
+        var state_5 = _loop_7(i);
+        if (typeof state_5 === "object")
+            return state_5.value;
     }
     return null;
 }
@@ -5695,7 +7028,7 @@ function resolveQueryDateFieldFallback(query) {
     return { from: dateField, to: fallback };
 }
 function containsForbiddenMongoOperators(value) {
-    var e_12, _a;
+    var e_23, _a;
     if (!value || typeof value !== 'object') {
         return false;
     }
@@ -5714,12 +7047,12 @@ function containsForbiddenMongoOperators(value) {
             }
         }
     }
-    catch (e_12_1) { e_12 = { error: e_12_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_12) throw e_12.error; }
+        finally { if (e_23) throw e_23.error; }
     }
     return false;
 }
@@ -6010,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_13_1;
-        var _e, e_13, _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:
@@ -6038,8 +7371,8 @@ function waitForCodexWorkerMessage(worker, streamStatusHandler) {
                     return [3 /*break*/, 1];
                 case 4: return [3 /*break*/, 11];
                 case 5:
-                    e_13_1 = _h.sent();
-                    e_13 = { error: e_13_1 };
+                    e_24_1 = _h.sent();
+                    e_24 = { error: e_24_1 };
                     return [3 /*break*/, 11];
                 case 6:
                     _h.trys.push([6, , 9, 10]);
@@ -6050,7 +7383,7 @@ function waitForCodexWorkerMessage(worker, streamStatusHandler) {
                     _h.label = 8;
                 case 8: return [3 /*break*/, 10];
                 case 9:
-                    if (e_13) throw e_13.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.');
@@ -6438,7 +7771,7 @@ function normalizeRouteMatchKey(value) {
     return normalizeRouteKey(value).toLowerCase();
 }
 function buildClientRouteIndex() {
-    var e_14, _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();
@@ -6457,12 +7790,12 @@ function buildClientRouteIndex() {
             }
         }
     }
-    catch (e_14_1) { e_14 = { error: e_14_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_14) throw e_14.error; }
+        finally { if (e_25) throw e_25.error; }
     }
     return { set: set, map: map, size: routes.length };
 }
@@ -6605,7 +7938,7 @@ function sanitizeAssistantResponse(value) {
     return normalizeAssistantRoutes(normalizedCurrency);
 }
 function evaluateAssistantGuardrails(message) {
-    var e_15, _a;
+    var e_26, _a;
     var normalized = String(message || '').toLowerCase();
     var patterns = [
         {
@@ -6651,12 +7984,12 @@ function evaluateAssistantGuardrails(message) {
             }
         }
     }
-    catch (e_15_1) { e_15 = { error: e_15_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_15) throw e_15.error; }
+        finally { if (e_26) throw e_26.error; }
     }
     return null;
 }
@@ -6771,7 +8104,7 @@ function tokenizeArithmeticExpression(expression) {
     return tokens;
 }
 function evaluateArithmeticExpression(expression) {
-    var e_16, _a, e_17, _b;
+    var e_27, _a, e_28, _b;
     var tokens = tokenizeArithmeticExpression(expression);
     if (!tokens || !tokens.length) {
         return null;
@@ -6828,12 +8161,12 @@ function evaluateArithmeticExpression(expression) {
             prevToken = token;
         }
     }
-    catch (e_16_1) { e_16 = { error: e_16_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_16) throw e_16.error; }
+        finally { if (e_27) throw e_27.error; }
     }
     while (ops.length) {
         var op = ops.pop();
@@ -6873,12 +8206,12 @@ function evaluateArithmeticExpression(expression) {
             stack.push(Number(token));
         }
     }
-    catch (e_17_1) { e_17 = { error: e_17_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_17) throw e_17.error; }
+        finally { if (e_28) throw e_28.error; }
     }
     if (stack.length !== 1 || Number.isNaN(stack[0])) {
         return null;
@@ -7062,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_18_1;
-        var e_18, _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:
@@ -7142,14 +8475,14 @@ function readAttachmentContents(attachments) {
                     return [3 /*break*/, 2];
                 case 10: return [3 /*break*/, 13];
                 case 11:
-                    e_18_1 = _c.sent();
-                    e_18 = { error: e_18_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_18) throw e_18.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')) : '',
@@ -7270,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') {
@@ -7326,7 +8670,7 @@ function estimateUsage(messages, responseText, model) {
     };
 }
 function evaluateGuardrails(message) {
-    var e_19, _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.' },
@@ -7348,12 +8692,12 @@ function evaluateGuardrails(message) {
             }
         }
     }
-    catch (e_19_1) { e_19 = { error: e_19_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_19) throw e_19.error; }
+        finally { if (e_30) throw e_30.error; }
     }
     return null;
 }