@resolveio/server-lib 22.0.5 → 22.0.6

package/methods/ai-terminal.js

@@ -114,6 +114,7 @@ exports.serializeMongoValue = serializeMongoValue;
 exports.flattenForTable = flattenForTable;
 exports.buildDisplayTable = buildDisplayTable;
 exports.formatDisplayTableMarkdown = formatDisplayTableMarkdown;
+exports.rewriteMatchExpressionsToExpr = rewriteMatchExpressionsToExpr;
 exports.stripQueryFieldPathsDeep = stripQueryFieldPathsDeep;
 exports.stripScopedFieldsFromPipeline = stripScopedFieldsFromPipeline;
 exports.rewriteEmbeddedMatchObjects = rewriteEmbeddedMatchObjects;
@@ -2074,10 +2075,10 @@ function executeAiAssistantMongoRead(payload, context) {
 }
 function executeAiAssistantMongoAggregate(payload, context) {
     return __awaiter(this, void 0, void 0, function () {
-        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) {
+        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, shouldUnwind, _c, _d, fallbackPipeline, fallbackDocs, nameFallback, fallbackPipeline, fallbackDocs, _e, _loop_1, i, state_1, matchFields_1, _f, aliases, rewrittenPipeline, fallbackDocs, _loop_2, i, state_2, baseCollection, fallbackPayload, fallbackResult, existingFallbacks, matchStages, diagnostics, combinedMatch, nameFields, dateFields, queryNoName, _g, queryNoDate, _h, _j, _k, _l, allCollections, base, alt, altCount, _m, sanitizedDocuments, includeIds, displayDocs, idLookupDisplay, display;
+        var _o, _p;
+        return __generator(this, function (_q) {
+            switch (_q.label) {
                 case 0:
                     input = payload || {};
                     rawCollection = normalizeOptionalString(input.collection);
@@ -2088,16 +2089,16 @@ function executeAiAssistantMongoAggregate(payload, context) {
                     db = resolveio_server_app_1.ResolveIOServer.getMongoConnection().db(dbName);
                     return [4 /*yield*/, resolveAssistantCollectionName(db, dbName, rawCollection)];
                 case 1:
-                    collectionResolution = _o.sent();
+                    collectionResolution = _q.sent();
                     collection = collectionResolution.name || rawCollection;
                     schemaFields = getCollectionSchemaFieldNames(collection);
                     return [4 /*yield*/, ensureAssistantReadAccess(context, input.permissionView, collection)];
                 case 2:
-                    _a = _o.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 aggregate: Access denied.');
                     }
-                    customerId = normalizeOptionalString((_l = user === null || user === void 0 ? void 0 : user.other) === null || _l === void 0 ? void 0 : _l.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) {
@@ -2122,18 +2123,18 @@ function executeAiAssistantMongoAggregate(payload, context) {
                     if (!(!isSuperAdmin && normalizedClient)) return [3 /*break*/, 4];
                     return [4 /*yield*/, collectionHasClientIndex(db, dbName, collection)];
                 case 3:
-                    _b = _o.sent();
+                    _b = _q.sent();
                     return [3 /*break*/, 5];
                 case 4:
                     _b = false;
-                    _o.label = 5;
+                    _q.label = 5;
                 case 5:
                     shouldScopeByClient = _b;
                     clientScopedQuery = shouldScopeByClient
                         ? applyClientScopeFilter(baseQuery, normalizedClient, isSuperAdmin)
                         : baseQuery;
                     scopedQuery = applyCustomerScopeFilter(clientScopedQuery, collection, customerId, isSuperAdmin);
-                    normalizedPipeline = normalizeAssistantAggregatePipeline(input.pipeline);
+                    normalizedPipeline = normalizeAssistantAggregatePipeline(input.pipeline, collection);
                     sanitizedPipeline = normalizedPipeline;
                     if (!isSuperAdmin && customerId) {
                         strippedPipeline = stripScopedFieldsFromPipelineWithMeta(normalizedPipeline, ['id_customer', 'other.id_customer']);
@@ -2156,7 +2157,7 @@ function executeAiAssistantMongoAggregate(payload, context) {
                             .aggregate(limitedPipeline, aggregateOptions)
                             .toArray()];
                 case 6:
-                    documents = _o.sent();
+                    documents = _q.sent();
                     executedPipeline = limitedPipeline;
                     probeDocs = null;
                     if (!(!documents.length && dateField)) return [3 /*break*/, 10];
@@ -2169,13 +2170,13 @@ function executeAiAssistantMongoAggregate(payload, context) {
                             .aggregate(fallbackPipeline, aggregateOptions)
                             .toArray()];
                 case 7:
-                    fallbackDocs = _o.sent();
+                    fallbackDocs = _q.sent();
                     if (fallbackDocs.length) {
                         documents = fallbackDocs;
                         executedPipeline = fallbackPipeline;
                         fallbackMeta.dateField.used = true;
                     }
-                    _o.label = 8;
+                    _q.label = 8;
                 case 8:
                     if (!(!documents.length && dateField !== 'createdAt')) return [3 /*break*/, 10];
                     createdFallback = { from: dateField, to: 'createdAt', attempted: true, used: false };
@@ -2186,13 +2187,13 @@ function executeAiAssistantMongoAggregate(payload, context) {
                             .aggregate(createdPipeline, aggregateOptions)
                             .toArray()];
                 case 9:
-                    createdDocs = _o.sent();
+                    createdDocs = _q.sent();
                     if (createdDocs.length) {
                         documents = createdDocs;
                         executedPipeline = createdPipeline;
                         fallbackMeta.dateFieldCreatedAt.used = true;
                     }
-                    _o.label = 10;
+                    _q.label = 10;
                 case 10:
                     if (!!documents.length) return [3 /*break*/, 12];
                     expanded = expandAggregateDateMatchFallback(executedPipeline);
@@ -2207,13 +2208,13 @@ function executeAiAssistantMongoAggregate(payload, context) {
                             .aggregate(expanded.pipeline, aggregateOptions)
                             .toArray()];
                 case 11:
-                    expandedDocs = _o.sent();
+                    expandedDocs = _q.sent();
                     if (expandedDocs.length) {
                         documents = expandedDocs;
                         executedPipeline = expanded.pipeline;
                         fallbackMeta.dateFieldsExpanded.used = true;
                     }
-                    _o.label = 12;
+                    _q.label = 12;
                 case 12:
                     if (!!documents.length) return [3 /*break*/, 16];
                     completionFallback = resolveAggregateCompletionFallback(executedPipeline);
@@ -2232,13 +2233,13 @@ function executeAiAssistantMongoAggregate(payload, context) {
                             .aggregate(fallbackPipeline, aggregateOptions)
                             .toArray()];
                 case 13:
-                    fallbackDocs = _o.sent();
+                    fallbackDocs = _q.sent();
                     if (fallbackDocs.length) {
                         documents = fallbackDocs;
                         executedPipeline = fallbackPipeline;
                         fallbackMeta.completion.used = true;
                     }
-                    _o.label = 14;
+                    _q.label = 14;
                 case 14:
                     if (!!documents.length) return [3 /*break*/, 16];
                     completionExprFallback = resolveAggregateCompletionExprFallback(executedPipeline);
@@ -2257,35 +2258,66 @@ function executeAiAssistantMongoAggregate(payload, context) {
                             .aggregate(fallbackPipeline, aggregateOptions)
                             .toArray()];
                 case 15:
-                    fallbackDocs = _o.sent();
+                    fallbackDocs = _q.sent();
                     if (fallbackDocs.length) {
                         documents = fallbackDocs;
                         executedPipeline = fallbackPipeline;
                         fallbackMeta.completion.used = true;
                     }
-                    _o.label = 16;
+                    _q.label = 16;
                 case 16:
-                    if (!(documents.length <= 1)) return [3 /*break*/, 18];
+                    if (!(documents.length <= 1)) return [3 /*break*/, 25];
                     unwindFallback = resolveAggregateUnwindFallback(executedPipeline);
-                    if (!unwindFallback) return [3 /*break*/, 18];
+                    if (!unwindFallback) return [3 /*break*/, 25];
                     fallbackMeta.unwind = { path: unwindFallback.path, attempted: true, used: false };
+                    shouldUnwind = false;
+                    _q.label = 17;
+                case 17:
+                    _q.trys.push([17, 20, , 21]);
+                    _c = probeDocs;
+                    if (_c) return [3 /*break*/, 19];
+                    return [4 /*yield*/, fetchAssistantProbeDocs({
+                            db: db,
+                            collection: collection,
+                            idClient: normalizedClient,
+                            idCustomer: customerId,
+                            isSuperAdmin: isSuperAdmin,
+                            includeClientScope: shouldScopeByClient
+                        })];
+                case 18:
+                    _c = (_q.sent());
+                    _q.label = 19;
+                case 19:
+                    probeDocs = _c;
+                    shouldUnwind = probeDocs.length ? hasArrayValueAtPath(probeDocs, unwindFallback.path) : false;
+                    return [3 /*break*/, 21];
+                case 20:
+                    _d = _q.sent();
+                    shouldUnwind = false;
+                    return [3 /*break*/, 21];
+                case 21:
+                    if (!shouldUnwind) return [3 /*break*/, 24];
                     fallbackPipeline = buildAggregateUnwindFallbackPipeline(executedPipeline, unwindFallback);
-                    if (!!containsForbiddenMongoOperators(fallbackPipeline)) return [3 /*break*/, 18];
+                    if (!!containsForbiddenMongoOperators(fallbackPipeline)) return [3 /*break*/, 23];
                     return [4 /*yield*/, db.collection(collection)
                             .aggregate(fallbackPipeline, aggregateOptions)
                             .toArray()];
-                case 17:
-                    fallbackDocs = _o.sent();
+                case 22:
+                    fallbackDocs = _q.sent();
                     if (fallbackDocs.length > documents.length) {
                         documents = fallbackDocs;
                         executedPipeline = fallbackPipeline;
                         fallbackMeta.unwind.used = true;
                     }
-                    _o.label = 18;
-                case 18:
-                    if (!!documents.length) return [3 /*break*/, 20];
+                    _q.label = 23;
+                case 23: return [3 /*break*/, 25];
+                case 24:
+                    fallbackMeta.unwind.skipped = 'not_array';
+                    _q.label = 25;
+                case 25:
+                    if (!!documents.length) return [3 /*break*/, 27];
                     nameFallback = resolveAggregateNameMatchFallback(executedPipeline);
-                    if (!nameFallback) return [3 /*break*/, 20];
+                    if (!nameFallback) return [3 /*break*/, 27];
                     fallbackMeta.nameMatch = {
                         field: nameFallback.field,
                         fields: nameFallback.fields,
@@ -2293,22 +2325,22 @@ function executeAiAssistantMongoAggregate(payload, context) {
                         used: false
                     };
                     fallbackPipeline = buildAggregateNameMatchFallbackPipeline(executedPipeline, nameFallback);
-                    if (!(fallbackPipeline.length && !containsForbiddenMongoOperators(fallbackPipeline))) return [3 /*break*/, 20];
+                    if (!(fallbackPipeline.length && !containsForbiddenMongoOperators(fallbackPipeline))) return [3 /*break*/, 27];
                     return [4 /*yield*/, db.collection(collection)
                             .aggregate(fallbackPipeline, aggregateOptions)
                             .toArray()];
-                case 19:
-                    fallbackDocs = _o.sent();
+                case 26:
+                    fallbackDocs = _q.sent();
                     if (fallbackDocs.length) {
                         documents = fallbackDocs;
                         executedPipeline = fallbackPipeline;
                         fallbackMeta.nameMatch.used = true;
                     }
-                    _o.label = 20;
-                case 20:
-                    if (!!documents.length) return [3 /*break*/, 26];
-                    _c = probeDocs;
-                    if (_c) return [3 /*break*/, 22];
+                    _q.label = 27;
+                case 27:
+                    if (!!documents.length) return [3 /*break*/, 33];
+                    _e = probeDocs;
+                    if (_e) return [3 /*break*/, 29];
                     return [4 /*yield*/, fetchAssistantProbeDocs({
                             db: db,
                             collection: collection,
@@ -2317,15 +2349,15 @@ function executeAiAssistantMongoAggregate(payload, context) {
                             isSuperAdmin: isSuperAdmin,
                             includeClientScope: shouldScopeByClient
                         })];
-                case 21:
-                    _c = (_o.sent());
-                    _o.label = 22;
-                case 22:
-                    probeDocs = _c;
+                case 28:
+                    _e = (_q.sent());
+                    _q.label = 29;
+                case 29:
+                    probeDocs = _e;
                     _loop_1 = function (i) {
                         var stage, chemicalLookup, rewrittenPipeline, fallbackDocs;
-                        return __generator(this, function (_p) {
-                            switch (_p.label) {
+                        return __generator(this, function (_r) {
+                            switch (_r.label) {
                                 case 0:
                                     stage = executedPipeline[i];
                                     if (!stage || typeof stage !== 'object' || !stage.$match || typeof stage.$match !== 'object') {
@@ -2341,7 +2373,7 @@ function executeAiAssistantMongoAggregate(payload, context) {
                                             probeDocs: probeDocs || undefined
                                         })];
                                 case 1:
-                                    chemicalLookup = _p.sent();
+                                    chemicalLookup = _r.sent();
                                     if (!chemicalLookup) {
                                         return [2 /*return*/, "continue"];
                                     }
@@ -2352,33 +2384,33 @@ function executeAiAssistantMongoAggregate(payload, context) {
                                             .aggregate(rewrittenPipeline, aggregateOptions)
                                             .toArray()];
                                 case 2:
-                                    fallbackDocs = _p.sent();
+                                    fallbackDocs = _r.sent();
                                     if (fallbackDocs.length) {
                                         documents = fallbackDocs;
                                         executedPipeline = rewrittenPipeline;
                                         fallbackMeta.chemicalLookup.used = true;
                                         return [2 /*return*/, "break"];
                                     }
-                                    _p.label = 3;
+                                    _r.label = 3;
                                 case 3: return [2 /*return*/];
                             }
                         });
                     };
                     i = 0;
-                    _o.label = 23;
-                case 23:
-                    if (!(i < (executedPipeline || []).length)) return [3 /*break*/, 26];
+                    _q.label = 30;
+                case 30:
+                    if (!(i < (executedPipeline || []).length)) return [3 /*break*/, 33];
                     return [5 /*yield**/, _loop_1(i)];
-                case 24:
-                    state_1 = _o.sent();
+                case 31:
+                    state_1 = _q.sent();
                     if (state_1 === "break")
-                        return [3 /*break*/, 26];
-                    _o.label = 25;
-                case 25:
+                        return [3 /*break*/, 33];
+                    _q.label = 32;
+                case 32:
                     i += 1;
-                    return [3 /*break*/, 23];
-                case 26:
-                    if (!!documents.length) return [3 /*break*/, 30];
+                    return [3 /*break*/, 30];
+                case 33:
+                    if (!!documents.length) return [3 /*break*/, 37];
                     matchFields_1 = new Set();
                     (executedPipeline || []).forEach(function (stage) {
                         if (stage && typeof stage === 'object' && stage.$match && typeof stage.$match === 'object') {
@@ -2387,9 +2419,9 @@ function executeAiAssistantMongoAggregate(payload, context) {
                                 .forEach(function (field) { return matchFields_1.add(field); });
                         }
                     });
-                    if (!matchFields_1.size) return [3 /*break*/, 30];
-                    _d = probeDocs;
-                    if (_d) return [3 /*break*/, 28];
+                    if (!matchFields_1.size) return [3 /*break*/, 37];
+                    _f = probeDocs;
+                    if (_f) return [3 /*break*/, 35];
                     return [4 /*yield*/, fetchAssistantProbeDocs({
                             db: db,
                             collection: collection,
@@ -2398,14 +2430,14 @@ function executeAiAssistantMongoAggregate(payload, context) {
                             isSuperAdmin: isSuperAdmin,
                             includeClientScope: shouldScopeByClient
                         })];
-                case 27:
-                    _d = (_o.sent());
-                    _o.label = 28;
-                case 28:
-                    probeDocs = _d;
-                    if (!probeDocs.length) return [3 /*break*/, 30];
+                case 34:
+                    _f = (_q.sent());
+                    _q.label = 35;
+                case 35:
+                    probeDocs = _f;
+                    if (!probeDocs.length) return [3 /*break*/, 37];
                     aliases = resolveFieldAliases(probeDocs, Array.from(matchFields_1), schemaFields);
-                    if (!Object.keys(aliases).length) return [3 /*break*/, 30];
+                    if (!Object.keys(aliases).length) return [3 /*break*/, 37];
                     fallbackMeta.queryFieldAliases = {
                         aliases: aliases,
                         attempted: true,
@@ -2416,31 +2448,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*/, 30];
+                    if (!!containsForbiddenMongoOperators(rewrittenPipeline)) return [3 /*break*/, 37];
                     return [4 /*yield*/, db.collection(collection)
                             .aggregate(rewrittenPipeline, aggregateOptions)
                             .toArray()];
-                case 29:
-                    fallbackDocs = _o.sent();
+                case 36:
+                    fallbackDocs = _q.sent();
                     if (fallbackDocs.length) {
                         documents = fallbackDocs;
                         executedPipeline = rewrittenPipeline;
                         fallbackMeta.queryFieldAliases.used = true;
                     }
-                    _o.label = 30;
-                case 30:
-                    if (!!documents.length) return [3 /*break*/, 34];
+                    _q.label = 37;
+                case 37:
+                    if (!!documents.length) return [3 /*break*/, 41];
                     _loop_2 = function (i) {
-                        var stage, _q, idLookup, rewrittenPipeline, fallbackDocs;
-                        return __generator(this, function (_r) {
-                            switch (_r.label) {
+                        var stage, _s, idLookup, rewrittenPipeline, fallbackDocs;
+                        return __generator(this, function (_t) {
+                            switch (_t.label) {
                                 case 0:
                                     stage = executedPipeline[i];
                                     if (!stage || typeof stage !== 'object' || !stage.$match || typeof stage.$match !== 'object') {
                                         return [2 /*return*/, "continue"];
                                     }
-                                    _q = probeDocs;
-                                    if (_q) return [3 /*break*/, 2];
+                                    _s = probeDocs;
+                                    if (_s) return [3 /*break*/, 2];
                                     return [4 /*yield*/, fetchAssistantProbeDocs({
                                             db: db,
                                             collection: collection,
@@ -2450,10 +2482,10 @@ function executeAiAssistantMongoAggregate(payload, context) {
                                             includeClientScope: shouldScopeByClient
                                         })];
                                 case 1:
-                                    _q = (_r.sent());
-                                    _r.label = 2;
+                                    _s = (_t.sent());
+                                    _t.label = 2;
                                 case 2:
-                                    probeDocs = _q;
+                                    probeDocs = _s;
                                     return [4 /*yield*/, applyIdLookupFallbackToQuery({
                                             query: stage.$match,
                                             db: db,
@@ -2464,7 +2496,7 @@ function executeAiAssistantMongoAggregate(payload, context) {
                                             probeDocs: probeDocs || undefined
                                         })];
                                 case 3:
-                                    idLookup = _r.sent();
+                                    idLookup = _t.sent();
                                     if (!idLookup) {
                                         return [2 /*return*/, "continue"];
                                     }
@@ -2475,41 +2507,41 @@ function executeAiAssistantMongoAggregate(payload, context) {
                                             .aggregate(rewrittenPipeline, aggregateOptions)
                                             .toArray()];
                                 case 4:
-                                    fallbackDocs = _r.sent();
+                                    fallbackDocs = _t.sent();
                                     if (fallbackDocs.length) {
                                         documents = fallbackDocs;
                                         executedPipeline = rewrittenPipeline;
                                         fallbackMeta.idLookup.used = true;
                                         return [2 /*return*/, "break"];
                                     }
-                                    _r.label = 5;
+                                    _t.label = 5;
                                 case 5: return [2 /*return*/];
                             }
                         });
                     };
                     i = 0;
-                    _o.label = 31;
-                case 31:
-                    if (!(i < (executedPipeline || []).length)) return [3 /*break*/, 34];
+                    _q.label = 38;
+                case 38:
+                    if (!(i < (executedPipeline || []).length)) return [3 /*break*/, 41];
                     return [5 /*yield**/, _loop_2(i)];
-                case 32:
-                    state_2 = _o.sent();
+                case 39:
+                    state_2 = _q.sent();
                     if (state_2 === "break")
-                        return [3 /*break*/, 34];
-                    _o.label = 33;
-                case 33:
+                        return [3 /*break*/, 41];
+                    _q.label = 40;
+                case 40:
                     i += 1;
-                    return [3 /*break*/, 31];
-                case 34:
-                    if (!!documents.length) return [3 /*break*/, 37];
+                    return [3 /*break*/, 38];
+                case 41:
+                    if (!!documents.length) return [3 /*break*/, 44];
                     return [4 /*yield*/, resolveBaseCollectionFromReport(db, dbName, collection)];
-                case 35:
-                    baseCollection = _o.sent();
-                    if (!(baseCollection && baseCollection !== collection)) return [3 /*break*/, 37];
+                case 42:
+                    baseCollection = _q.sent();
+                    if (!(baseCollection && baseCollection !== collection)) return [3 /*break*/, 44];
                     fallbackPayload = __assign(__assign({}, input), { collection: baseCollection });
                     return [4 /*yield*/, executeAiAssistantMongoAggregate(fallbackPayload, context)];
-                case 36:
-                    fallbackResult = _o.sent();
+                case 43:
+                    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'
@@ -2526,48 +2558,48 @@ function executeAiAssistantMongoAggregate(payload, context) {
                     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];
+                    _q.label = 44;
+                case 44:
+                    if (!(!documents.length && isSuperAdmin)) return [3 /*break*/, 61];
                     matchStages = (executedPipeline || []).filter(function (stage) { return stage && typeof stage === 'object' && stage.$match && typeof stage.$match === 'object'; });
                     diagnostics = {};
-                    if (!matchStages.length) return [3 /*break*/, 54];
+                    if (!matchStages.length) return [3 /*break*/, 61];
                     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];
+                    _q.label = 45;
+                case 45:
+                    _q.trys.push([45, 50, , 51]);
+                    if (!nameFields.length) return [3 /*break*/, 47];
                     queryNoName = stripMatchFields(combinedMatch, nameFields);
-                    _e = diagnostics;
+                    _g = 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];
+                case 46:
+                    _g.recentCount = _q.sent();
+                    _q.label = 47;
+                case 47:
+                    if (!dateFields.length) return [3 /*break*/, 49];
                     queryNoDate = stripMatchFields(combinedMatch, dateFields);
-                    _f = diagnostics;
+                    _h = 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];
+                case 48:
+                    _h.nameMatchCount = _q.sent();
+                    _q.label = 49;
+                case 49: return [3 /*break*/, 51];
+                case 50:
+                    _j = _q.sent();
+                    return [3 /*break*/, 51];
+                case 51:
+                    _q.trys.push([51, 54, , 55]);
+                    _k = probeDocs;
+                    if (_k) return [3 /*break*/, 53];
                     return [4 /*yield*/, fetchAssistantProbeDocs({
                             db: db,
                             collection: collection,
@@ -2576,44 +2608,44 @@ function executeAiAssistantMongoAggregate(payload, context) {
                             isSuperAdmin: isSuperAdmin,
                             includeClientScope: shouldScopeByClient
                         })];
-                case 45:
-                    _h = (_o.sent());
-                    _o.label = 46;
-                case 46:
-                    probeDocs = _h;
+                case 52:
+                    _k = (_q.sent());
+                    _q.label = 53;
+                case 53:
+                    probeDocs = _k;
                     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 [3 /*break*/, 55];
+                case 54:
+                    _l = _q.sent();
+                    return [3 /*break*/, 55];
+                case 55:
+                    _q.trys.push([55, 59, , 60]);
                     return [4 /*yield*/, listAssistantCollections(db, dbName)];
-                case 49:
-                    allCollections = _o.sent();
+                case 56:
+                    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*/, 51];
+                    if (!(alt && alt !== collection && allCollections.includes(alt))) return [3 /*break*/, 58];
                     return [4 /*yield*/, db.collection(alt).countDocuments({}, { readPreference: AI_ASSISTANT_READ_PREFERENCE })];
-                case 50:
-                    altCount = _o.sent();
+                case 57:
+                    altCount = _q.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:
+                    _q.label = 58;
+                case 58: return [3 /*break*/, 60];
+                case 59:
+                    _m = _q.sent();
+                    return [3 /*break*/, 60];
+                case 60:
                     fallbackMeta.zeroDiagnostics = diagnostics;
-                    _o.label = 54;
-                case 54:
+                    _q.label = 61;
+                case 61:
                     sanitizedDocuments = isSuperAdmin
                         ? documents
                         : documents.map(function (doc) { return redactSensitiveFields((0, common_1.deepCopy)(doc)); });
-                    includeIds = ((_m = input.options) === null || _m === void 0 ? void 0 : _m.includeIds) === true;
+                    includeIds = ((_p = input.options) === null || _p === void 0 ? void 0 : _p.includeIds) === true;
                     displayDocs = sanitizedDocuments;
                     return [4 /*yield*/, applyIdLookupDisplayEnrichment({
                             docs: displayDocs,
@@ -2624,8 +2656,8 @@ function executeAiAssistantMongoAggregate(payload, context) {
                             idCustomer: customerId,
                             isSuperAdmin: isSuperAdmin
                         })];
-                case 55:
-                    idLookupDisplay = _o.sent();
+                case 62:
+                    idLookupDisplay = _q.sent();
                     if (idLookupDisplay === null || idLookupDisplay === void 0 ? void 0 : idLookupDisplay.docs) {
                         displayDocs = idLookupDisplay.docs;
                     }
@@ -3357,21 +3389,44 @@ function getValueAtPath(obj, path) {
     };
     return walk(obj, 0);
 }
+function hasArrayValueAtPath(docs, path) {
+    var e_1, _a;
+    if (!Array.isArray(docs) || !docs.length || !path) {
+        return false;
+    }
+    try {
+        for (var docs_1 = __values(docs), docs_1_1 = docs_1.next(); !docs_1_1.done; docs_1_1 = docs_1.next()) {
+            var doc = docs_1_1.value;
+            var value = getValueAtPath(doc, path);
+            if (Array.isArray(value)) {
+                return true;
+            }
+        }
+    }
+    catch (e_1_1) { e_1 = { error: e_1_1 }; }
+    finally {
+        try {
+            if (docs_1_1 && !docs_1_1.done && (_a = docs_1.return)) _a.call(docs_1);
+        }
+        finally { if (e_1) throw e_1.error; }
+    }
+    return false;
+}
 function inferIdFieldStorageTypeFromDocs(docs, fieldPath) {
-    var e_1, _a, e_2, _b;
+    var e_2, _a, e_3, _b;
     if (!Array.isArray(docs) || !fieldPath) {
         return 'unknown';
     }
     var sawString = false;
     try {
-        for (var docs_1 = __values(docs), docs_1_1 = docs_1.next(); !docs_1_1.done; docs_1_1 = docs_1.next()) {
-            var doc = docs_1_1.value;
+        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;
             var value = fieldPath.includes('.')
                 ? getValueAtPath(doc, fieldPath)
                 : doc === null || doc === void 0 ? void 0 : doc[fieldPath];
             var queue = Array.isArray(value) ? value : [value];
             try {
-                for (var queue_1 = (e_2 = void 0, __values(queue)), queue_1_1 = queue_1.next(); !queue_1_1.done; queue_1_1 = queue_1.next()) {
+                for (var queue_1 = (e_3 = void 0, __values(queue)), queue_1_1 = queue_1.next(); !queue_1_1.done; queue_1_1 = queue_1.next()) {
                     var entry = queue_1_1.value;
                     if (entry === null || entry === undefined) {
                         continue;
@@ -3384,21 +3439,21 @@ function inferIdFieldStorageTypeFromDocs(docs, fieldPath) {
                     }
                 }
             }
-            catch (e_2_1) { e_2 = { error: e_2_1 }; }
+            catch (e_3_1) { e_3 = { error: e_3_1 }; }
             finally {
                 try {
                     if (queue_1_1 && !queue_1_1.done && (_b = queue_1.return)) _b.call(queue_1);
                 }
-                finally { if (e_2) throw e_2.error; }
+                finally { if (e_3) throw e_3.error; }
             }
         }
     }
-    catch (e_1_1) { e_1 = { error: e_1_1 }; }
+    catch (e_2_1) { e_2 = { error: e_2_1 }; }
     finally {
         try {
-            if (docs_1_1 && !docs_1_1.done && (_a = docs_1.return)) _a.call(docs_1);
+            if (docs_2_1 && !docs_2_1.done && (_a = docs_2.return)) _a.call(docs_2);
         }
-        finally { if (e_1) throw e_1.error; }
+        finally { if (e_2) throw e_2.error; }
     }
     return sawString ? 'string' : 'unknown';
 }
@@ -3493,7 +3548,7 @@ function normalizeLookupKeyValue(value) {
     return '';
 }
 function collectTopLevelIdFieldValues(docs, options) {
-    var e_3, _a, e_4, _b;
+    var e_4, _a, e_5, _b;
     if (!Array.isArray(docs) || !docs.length) {
         return [];
     }
@@ -3505,8 +3560,8 @@ function collectTopLevelIdFieldValues(docs, options) {
         : 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;
+        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;
             if (!doc || typeof doc !== 'object') {
                 continue;
             }
@@ -3541,26 +3596,26 @@ function collectTopLevelIdFieldValues(docs, options) {
                 });
             };
             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()) {
+                for (var keys_1 = (e_5 = 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 }; }
+            catch (e_5_1) { e_5 = { error: e_5_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; }
+                finally { if (e_5) throw e_5.error; }
             }
         }
     }
-    catch (e_3_1) { e_3 = { error: e_3_1 }; }
+    catch (e_4_1) { e_4 = { error: e_4_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_4) throw e_4.error; }
     }
     return Array.from(fieldMap.entries()).map(function (_a) {
         var _b = __read(_a, 2), field = _b[0], values = _b[1];
@@ -3571,7 +3626,7 @@ function collectTopLevelIdFieldValues(docs, options) {
     });
 }
 function resolveLookupDisplayField(baseToken, probeDocs, schemaFields) {
-    var e_5, _a, e_6, _b;
+    var e_6, _a, e_7, _b;
     var normalizedBase = normalizeOptionalString(baseToken);
     if (!normalizedBase) {
         return null;
@@ -3589,12 +3644,12 @@ function resolveLookupDisplayField(baseToken, probeDocs, schemaFields) {
                     }
                 }
             }
-            catch (e_5_1) { e_5 = { error: e_5_1 }; }
+            catch (e_6_1) { e_6 = { error: e_6_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; }
+                finally { if (e_6) throw e_6.error; }
             }
             return schemaCandidates[0];
         }
@@ -3607,12 +3662,12 @@ function resolveLookupDisplayField(baseToken, probeDocs, schemaFields) {
             }
         }
     }
-    catch (e_6_1) { e_6 = { error: e_6_1 }; }
+    catch (e_7_1) { e_7 = { error: e_7_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; }
+        finally { if (e_7) throw e_7.error; }
     }
     return candidates.length ? candidates[0] : null;
 }
@@ -3625,8 +3680,8 @@ function resolveLookupMappingsForField(field, mappings) {
 }
 function applyIdLookupDisplayEnrichment(params) {
     return __awaiter(this, void 0, void 0, function () {
-        var docs, collection, db, dbName, idClient, idCustomer, isSuperAdmin, idFields, lookupMappings, allCollections, collectionProbeCache, collectionSchemaCache, lookupMeta, enrichedDocs, _loop_4, idFields_1, idFields_1_1, fieldEntry, e_7_1;
-        var e_7, _a;
+        var docs, collection, db, dbName, idClient, idCustomer, isSuperAdmin, idFields, lookupMappings, allCollections, collectionProbeCache, collectionSchemaCache, lookupMeta, enrichedDocs, _loop_4, idFields_1, idFields_1_1, fieldEntry, e_8_1;
+        var e_8, _a;
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
@@ -3650,8 +3705,8 @@ function applyIdLookupDisplayEnrichment(params) {
                     lookupMeta = [];
                     enrichedDocs = docs.map(function (doc) { return (__assign({}, doc)); });
                     _loop_4 = function (fieldEntry) {
-                        var values, baseToken, mappingMatches, candidateCollections, filteredCandidates, _loop_5, filteredCandidates_1, filteredCandidates_1_1, candidate, state_3, e_8_1;
-                        var e_8, _c;
+                        var values, baseToken, mappingMatches, candidateCollections, filteredCandidates, _loop_5, filteredCandidates_1, filteredCandidates_1_1, candidate, state_3, e_9_1;
+                        var e_9, _c;
                         return __generator(this, function (_d) {
                             switch (_d.label) {
                                 case 0:
@@ -3800,7 +3855,7 @@ function applyIdLookupDisplayEnrichment(params) {
                                     _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();
+                                    filteredCandidates_1 = (e_9 = void 0, __values(filteredCandidates)), filteredCandidates_1_1 = filteredCandidates_1.next();
                                     _d.label = 2;
                                 case 2:
                                     if (!!filteredCandidates_1_1.done) return [3 /*break*/, 5];
@@ -3816,14 +3871,14 @@ function applyIdLookupDisplayEnrichment(params) {
                                     return [3 /*break*/, 2];
                                 case 5: return [3 /*break*/, 8];
                                 case 6:
-                                    e_8_1 = _d.sent();
-                                    e_8 = { error: e_8_1 };
+                                    e_9_1 = _d.sent();
+                                    e_9 = { error: e_9_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; }
+                                    finally { if (e_9) throw e_9.error; }
                                     return [7 /*endfinally*/];
                                 case 8: return [2 /*return*/];
                             }
@@ -3846,14 +3901,14 @@ function applyIdLookupDisplayEnrichment(params) {
                     return [3 /*break*/, 3];
                 case 6: return [3 /*break*/, 9];
                 case 7:
-                    e_7_1 = _b.sent();
-                    e_7 = { error: e_7_1 };
+                    e_8_1 = _b.sent();
+                    e_8 = { error: e_8_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; }
+                    finally { if (e_8) throw e_8.error; }
                     return [7 /*endfinally*/];
                 case 9:
                     if (!lookupMeta.length) {
@@ -3872,14 +3927,14 @@ function applyIdLookupDisplayEnrichment(params) {
     });
 }
 function hasNonEmptyValue(docs, fieldPath, options) {
-    var e_9, _a;
+    var e_10, _a;
     if (!Array.isArray(docs) || !fieldPath) {
         return false;
     }
     var usePath = fieldPath.includes('.');
     try {
-        for (var docs_3 = __values(docs), docs_3_1 = docs_3.next(); !docs_3_1.done; docs_3_1 = docs_3.next()) {
-            var doc = docs_3_1.value;
+        for (var docs_4 = __values(docs), docs_4_1 = docs_4.next(); !docs_4_1.done; docs_4_1 = docs_4.next()) {
+            var doc = docs_4_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;
@@ -3889,12 +3944,12 @@ function hasNonEmptyValue(docs, fieldPath, options) {
             }
         }
     }
-    catch (e_9_1) { e_9 = { error: e_9_1 }; }
+    catch (e_10_1) { e_10 = { error: e_10_1 }; }
     finally {
         try {
-            if (docs_3_1 && !docs_3_1.done && (_a = docs_3.return)) _a.call(docs_3);
+            if (docs_4_1 && !docs_4_1.done && (_a = docs_4.return)) _a.call(docs_4);
         }
-        finally { if (e_9) throw e_9.error; }
+        finally { if (e_10) throw e_10.error; }
     }
     return false;
 }
@@ -4166,35 +4221,45 @@ function replaceFieldPathDeep(value, fromField, toField) {
         return next_1;
     }
     if (typeof value === 'string') {
-        if (value.startsWith("$".concat(fromField))) {
-            return "$".concat(toField).concat(value.slice(fromField.length + 1));
+        var fromRef = "$".concat(fromField);
+        if (value === fromRef) {
+            return "$".concat(toField);
+        }
+        if (value.startsWith("".concat(fromRef, "."))) {
+            return "$".concat(toField).concat(value.slice(fromRef.length));
         }
         return value;
     }
     return value;
 }
 function replaceQueryFieldCondition(query, field, condition) {
-    if (Array.isArray(query)) {
-        return query.map(function (entry) { return replaceQueryFieldCondition(entry, field, condition); });
-    }
-    if (!query || typeof query !== 'object') {
-        return query;
-    }
-    var next = __assign({}, query);
-    Object.keys(next).forEach(function (key) {
-        if (key === field) {
-            next[key] = condition;
-            return;
-        }
-        if (key.startsWith('$')) {
-            next[key] = replaceQueryFieldCondition(next[key], field, condition);
-            return;
+    var hasPath = field.includes('.');
+    var replaceValue = function (value, prefix) {
+        if (Array.isArray(value)) {
+            return value.map(function (entry) { return replaceValue(entry, prefix); });
         }
-        if (next[key] && typeof next[key] === 'object') {
-            next[key] = replaceQueryFieldCondition(next[key], field, condition);
+        if (!value || typeof value !== 'object') {
+            return value;
         }
-    });
-    return next;
+        var next = __assign({}, value);
+        Object.keys(next).forEach(function (key) {
+            var currentPath = prefix ? "".concat(prefix, ".").concat(key) : key;
+            var matches = hasPath ? currentPath === field : key === field;
+            if (matches) {
+                next[key] = condition;
+                return;
+            }
+            if (key.startsWith('$')) {
+                next[key] = replaceValue(next[key], prefix);
+                return;
+            }
+            if (next[key] && typeof next[key] === 'object') {
+                next[key] = replaceValue(next[key], currentPath);
+            }
+        });
+        return next;
+    };
+    return replaceValue(query, '');
 }
 function formatDisplayColumnName(column) {
     var trimmed = String(column || '').trim();
@@ -4748,21 +4813,154 @@ function sanitizeAssistantProjection(projection) {
     }
     return projection;
 }
-function normalizeAssistantAggregatePipeline(pipeline) {
+var AGG_MATCH_EXPR_OPERATORS = new Set(['$eq', '$ne', '$gt', '$gte', '$lt', '$lte']);
+function isMatchExpressionOperand(value) {
+    if (typeof value === 'string') {
+        return value.startsWith('$$');
+    }
+    if (!value || typeof value !== 'object' || Array.isArray(value)) {
+        return false;
+    }
+    if (value instanceof Date || value instanceof RegExp || isMongoObjectId(value)) {
+        return false;
+    }
+    return Object.keys(value).some(function (key) { return key.startsWith('$'); });
+}
+function mergeMatchExpr(existing, clauses) {
+    if (!clauses.length) {
+        return existing;
+    }
+    if (!existing) {
+        return clauses.length === 1 ? clauses[0] : { $and: clauses };
+    }
+    if (existing && typeof existing === 'object' && !Array.isArray(existing)) {
+        var existingAnd = existing.$and;
+        if (Array.isArray(existingAnd)) {
+            return __assign(__assign({}, existing), { $and: __spreadArray(__spreadArray([], __read(existingAnd), false), __read(clauses), false) });
+        }
+    }
+    return { $and: __spreadArray([existing], __read(clauses), false) };
+}
+function rewriteMatchExpressionsToExpr(match) {
+    var rewriteValue = function (value) {
+        if (Array.isArray(value)) {
+            return value.map(function (entry) { return rewriteValue(entry); });
+        }
+        if (!value || typeof value !== 'object' || value instanceof Date || value instanceof RegExp || isMongoObjectId(value)) {
+            return value;
+        }
+        var result = {};
+        var exprClauses = [];
+        Object.keys(value).forEach(function (key) {
+            var entry = value[key];
+            if (key === '$expr') {
+                result[key] = entry;
+                return;
+            }
+            if (key.startsWith('$')) {
+                result[key] = rewriteValue(entry);
+                return;
+            }
+            if (entry && typeof entry === 'object' && !Array.isArray(entry) && !(entry instanceof Date) && !(entry instanceof RegExp) && !isMongoObjectId(entry)) {
+                var nextEntry_1 = __assign({}, entry);
+                var moved_1 = false;
+                Object.keys(nextEntry_1).forEach(function (op) {
+                    var _a;
+                    if (!AGG_MATCH_EXPR_OPERATORS.has(op)) {
+                        return;
+                    }
+                    var operand = nextEntry_1[op];
+                    if (isMatchExpressionOperand(operand)) {
+                        exprClauses.push((_a = {}, _a[op] = ["$".concat(key), operand], _a));
+                        delete nextEntry_1[op];
+                        moved_1 = true;
+                    }
+                });
+                if (Object.keys(nextEntry_1).length) {
+                    result[key] = rewriteValue(nextEntry_1);
+                }
+                else if (!moved_1) {
+                    result[key] = entry;
+                }
+                return;
+            }
+            if (typeof entry === 'string' && entry.startsWith('$$')) {
+                exprClauses.push({ $eq: ["$".concat(key), entry] });
+                return;
+            }
+            result[key] = entry;
+        });
+        if (exprClauses.length) {
+            result.$expr = mergeMatchExpr(result.$expr, exprClauses);
+        }
+        return result;
+    };
+    return rewriteValue(match);
+}
+function buildInvoiceStatusRegex(value) {
+    var normalized = String(value || '').toLowerCase();
+    if (!normalized) {
+        return null;
+    }
+    var tokens = normalized.split(/[^a-z0-9]+/g).filter(Boolean);
+    if (!tokens.includes('paid') || !tokens.includes('closed')) {
+        return null;
+    }
+    return /paid|closed/i;
+}
+function normalizeInvoiceStatusMatch(match) {
+    var rewriteValue = function (value) {
+        if (Array.isArray(value)) {
+            return value.map(function (entry) { return rewriteValue(entry); });
+        }
+        if (!value || typeof value !== 'object' || value instanceof Date || value instanceof RegExp || isMongoObjectId(value)) {
+            return value;
+        }
+        var result = {};
+        Object.keys(value).forEach(function (key) {
+            var entry = value[key];
+            if (key.startsWith('$')) {
+                result[key] = rewriteValue(entry);
+                return;
+            }
+            var field = key.split('.').pop() || key;
+            if (field === 'status' && typeof entry === 'string') {
+                var regex = buildInvoiceStatusRegex(entry);
+                if (regex) {
+                    result[key] = regex;
+                    return;
+                }
+            }
+            if (entry && typeof entry === 'object') {
+                result[key] = rewriteValue(entry);
+                return;
+            }
+            result[key] = entry;
+        });
+        return result;
+    };
+    return rewriteValue(match);
+}
+function normalizeAssistantAggregatePipeline(pipeline, collection) {
     if (!Array.isArray(pipeline)) {
         return [];
     }
+    var isInvoiceCollection = ['invoice', 'invoices', 'invoice-versions'].includes(String(collection || '').toLowerCase());
     return pipeline
         .filter(function (stage) { return stage && typeof stage === 'object' && !Array.isArray(stage); })
         .map(function (stage) {
         var next = __assign({}, stage);
         if (next.$match && typeof next.$match === 'object') {
             var rewritten = rewriteEmbeddedMatchObjects(next.$match);
-            next.$match = applyAssistantNameRegexToQuery(rewritten);
+            var exprRewritten = rewriteMatchExpressionsToExpr(rewritten);
+            var statusNormalized = isInvoiceCollection ? normalizeInvoiceStatusMatch(exprRewritten) : exprRewritten;
+            next.$match = applyAssistantNameRegexToQuery(statusNormalized);
         }
         if (next.$geoNear && typeof next.$geoNear === 'object' && next.$geoNear.query) {
             var rewritten = rewriteEmbeddedMatchObjects(next.$geoNear.query);
-            next.$geoNear = __assign(__assign({}, next.$geoNear), { query: applyAssistantNameRegexToQuery(rewritten) });
+            var exprRewritten = rewriteMatchExpressionsToExpr(rewritten);
+            var statusNormalized = isInvoiceCollection ? normalizeInvoiceStatusMatch(exprRewritten) : exprRewritten;
+            next.$geoNear = __assign(__assign({}, next.$geoNear), { query: applyAssistantNameRegexToQuery(statusNormalized) });
         }
         return next;
     });
@@ -4815,7 +5013,7 @@ function findAggregateLimit(pipeline) {
         }
         var limit = stage.$limit;
         if (typeof limit === 'number' && Number.isFinite(limit)) {
-            return limit;
+            return { index: i, limit: limit };
         }
     }
     return null;
@@ -4828,12 +5026,13 @@ function applyAssistantAggregateLimit(pipeline, limit, maxLimit, defaultLimit) {
         ? Math.min(limit, maxLimit)
         : defaultLimit;
     var existingLimit = findAggregateLimit(normalizedPipeline);
-    if (existingLimit === null) {
+    if (!existingLimit) {
         normalizedPipeline.push({ $limit: requestedLimit });
         return normalizedPipeline;
     }
-    if (existingLimit > maxLimit) {
-        normalizedPipeline.push({ $limit: maxLimit });
+    if (existingLimit.limit > maxLimit) {
+        var stage = normalizedPipeline[existingLimit.index];
+        normalizedPipeline[existingLimit.index] = __assign(__assign({}, stage), { $limit: maxLimit });
     }
     return normalizedPipeline;
 }
@@ -4893,7 +5092,7 @@ function matchContainsField(value, field) {
     });
 }
 function resolveAggregateCompletionFallback(pipeline) {
-    var e_10, _a;
+    var e_11, _a;
     if (!Array.isArray(pipeline)) {
         return null;
     }
@@ -4906,7 +5105,7 @@ function resolveAggregateCompletionFallback(pipeline) {
         }
         var addFields = stage.$addFields;
         try {
-            for (var _b = (e_10 = void 0, __values(Object.keys(addFields))), _c = _b.next(); !_c.done; _c = _b.next()) {
+            for (var _b = (e_11 = void 0, __values(Object.keys(addFields))), _c = _b.next(); !_c.done; _c = _b.next()) {
                 var key = _c.value;
                 if (!isCompletionFieldName(key)) {
                     continue;
@@ -4920,12 +5119,12 @@ function resolveAggregateCompletionFallback(pipeline) {
                 }
             }
         }
-        catch (e_10_1) { e_10 = { error: e_10_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_10) throw e_10.error; }
+            finally { if (e_11) throw e_11.error; }
         }
         if (candidateField) {
             break;
@@ -5081,7 +5280,7 @@ function buildCompletionFallbackSources(field) {
     ]);
 }
 function resolveAggregateCompletionExprFallback(pipeline) {
-    var e_11, _a;
+    var e_12, _a;
     if (!Array.isArray(pipeline)) {
         return null;
     }
@@ -5101,7 +5300,7 @@ function resolveAggregateCompletionExprFallback(pipeline) {
         }
         if (!candidateField) {
             try {
-                for (var _b = (e_11 = void 0, __values(Object.keys(matchStage))), _c = _b.next(); !_c.done; _c = _b.next()) {
+                for (var _b = (e_12 = void 0, __values(Object.keys(matchStage))), _c = _b.next(); !_c.done; _c = _b.next()) {
                     var key = _c.value;
                     if (key.startsWith('$')) {
                         continue;
@@ -5116,12 +5315,12 @@ function resolveAggregateCompletionExprFallback(pipeline) {
                     }
                 }
             }
-            catch (e_11_1) { e_11 = { error: e_11_1 }; }
+            catch (e_12_1) { e_12 = { error: e_12_1 }; }
             finally {
                 try {
                     if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
                 }
-                finally { if (e_11) throw e_11.error; }
+                finally { if (e_12) throw e_12.error; }
             }
         }
         if (!candidateField) {
@@ -5291,7 +5490,7 @@ function isRegexMatchCondition(value) {
     return false;
 }
 function findRegexMatchInMatchObject(match, prefix) {
-    var e_12, _a, e_13, _b;
+    var e_13, _a, e_14, _b;
     if (prefix === void 0) { prefix = ''; }
     if (Array.isArray(match)) {
         try {
@@ -5303,12 +5502,12 @@ function findRegexMatchInMatchObject(match, prefix) {
                 }
             }
         }
-        catch (e_12_1) { e_12 = { error: e_12_1 }; }
+        catch (e_13_1) { e_13 = { error: e_13_1 }; }
         finally {
             try {
                 if (match_1_1 && !match_1_1.done && (_a = match_1.return)) _a.call(match_1);
             }
-            finally { if (e_12) throw e_12.error; }
+            finally { if (e_13) throw e_13.error; }
         }
         return null;
     }
@@ -5339,12 +5538,12 @@ function findRegexMatchInMatchObject(match, prefix) {
             }
         }
     }
-    catch (e_13_1) { e_13 = { error: e_13_1 }; }
+    catch (e_14_1) { e_14 = { error: e_14_1 }; }
     finally {
         try {
             if (keys_2_1 && !keys_2_1.done && (_b = keys_2.return)) _b.call(keys_2);
         }
-        finally { if (e_13) throw e_13.error; }
+        finally { if (e_14) throw e_14.error; }
     }
     return null;
 }
@@ -5499,39 +5698,45 @@ function isEmptyMatchValue(value) {
     return false;
 }
 function stripMatchField(match, field) {
-    if (Array.isArray(match)) {
-        var strippedArray = match
-            .map(function (entry) { return stripMatchField(entry, field); })
-            .filter(function (entry) { return !isEmptyMatchValue(entry); });
-        return strippedArray;
-    }
-    if (!match || typeof match !== 'object') {
-        return match;
-    }
-    var result = {};
-    Object.keys(match).forEach(function (key) {
-        if (key === field) {
-            return;
+    var hasPath = field.includes('.');
+    var stripValue = function (value, prefix) {
+        if (Array.isArray(value)) {
+            var strippedArray = value
+                .map(function (entry) { return stripValue(entry, prefix); })
+                .filter(function (entry) { return !isEmptyMatchValue(entry); });
+            return strippedArray;
         }
-        var value = match[key];
-        if (key.startsWith('$')) {
-            var stripped = stripMatchField(value, field);
-            if (isEmptyMatchValue(stripped) && (key === '$and' || key === '$or')) {
+        if (!value || typeof value !== 'object') {
+            return value;
+        }
+        var result = {};
+        Object.keys(value).forEach(function (key) {
+            var entry = value[key];
+            var currentPath = prefix ? "".concat(prefix, ".").concat(key) : key;
+            var matches = hasPath ? currentPath === field : key === field;
+            if (matches) {
                 return;
             }
-            result[key] = stripped;
-            return;
-        }
-        if (value && typeof value === 'object') {
-            var stripped = stripMatchField(value, field);
-            if (!isEmptyMatchValue(stripped)) {
+            if (key.startsWith('$')) {
+                var stripped = stripValue(entry, prefix);
+                if (isEmptyMatchValue(stripped) && (key === '$and' || key === '$or')) {
+                    return;
+                }
                 result[key] = stripped;
+                return;
             }
-            return;
-        }
-        result[key] = value;
-    });
-    return result;
+            if (entry && typeof entry === 'object') {
+                var stripped = stripValue(entry, currentPath);
+                if (!isEmptyMatchValue(stripped)) {
+                    result[key] = stripped;
+                }
+                return;
+            }
+            result[key] = entry;
+        });
+        return result;
+    };
+    return stripValue(match, '');
 }
 function collectMatchFieldsByCondition(match, predicate, prefix) {
     if (prefix === void 0) { prefix = ''; }
@@ -5562,7 +5767,7 @@ function collectMatchFieldsByCondition(match, predicate, prefix) {
     return results;
 }
 function findMatchConditionForField(match, targetField, prefix) {
-    var e_14, _a, e_15, _b;
+    var e_15, _a, e_16, _b;
     if (prefix === void 0) { prefix = ''; }
     if (!match || typeof match !== 'object') {
         return undefined;
@@ -5577,12 +5782,12 @@ function findMatchConditionForField(match, targetField, prefix) {
                 }
             }
         }
-        catch (e_14_1) { e_14 = { error: e_14_1 }; }
+        catch (e_15_1) { e_15 = { error: e_15_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; }
+            finally { if (e_15) throw e_15.error; }
         }
         return undefined;
     }
@@ -5609,12 +5814,12 @@ function findMatchConditionForField(match, targetField, prefix) {
             }
         }
     }
-    catch (e_15_1) { e_15 = { error: e_15_1 }; }
+    catch (e_16_1) { e_16 = { error: e_16_1 }; }
     finally {
         try {
             if (_d && !_d.done && (_b = _c.return)) _b.call(_c);
         }
-        finally { if (e_15) throw e_15.error; }
+        finally { if (e_16) throw e_16.error; }
     }
     return undefined;
 }
@@ -5657,7 +5862,7 @@ function detectIdLikeValue(value) {
     return false;
 }
 function detectChemicalIdFromProbe(probeDocs, fields) {
-    var e_16, _a, e_17, _b;
+    var e_17, _a, e_18, _b;
     if (!Array.isArray(probeDocs) || !probeDocs.length) {
         return false;
     }
@@ -5669,7 +5874,7 @@ function detectChemicalIdFromProbe(probeDocs, fields) {
         for (var probeDocs_1 = __values(probeDocs), probeDocs_1_1 = probeDocs_1.next(); !probeDocs_1_1.done; probeDocs_1_1 = probeDocs_1.next()) {
             var doc = probeDocs_1_1.value;
             try {
-                for (var targets_1 = (e_17 = void 0, __values(targets)), targets_1_1 = targets_1.next(); !targets_1_1.done; targets_1_1 = targets_1.next()) {
+                for (var targets_1 = (e_18 = 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)) {
@@ -5682,21 +5887,21 @@ function detectChemicalIdFromProbe(probeDocs, fields) {
                     }
                 }
             }
-            catch (e_17_1) { e_17 = { error: e_17_1 }; }
+            catch (e_18_1) { e_18 = { error: e_18_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; }
+                finally { if (e_18) throw e_18.error; }
             }
         }
     }
-    catch (e_16_1) { e_16 = { error: e_16_1 }; }
+    catch (e_17_1) { e_17 = { error: e_17_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; }
+        finally { if (e_17) throw e_17.error; }
     }
     return false;
 }
@@ -5846,9 +6051,9 @@ function isIdLookupCondition(value) {
 }
 function collectIdFieldConditions(match) {
     var results = [];
-    var visit = function (value) {
+    var visit = function (value, prefix) {
         if (Array.isArray(value)) {
-            value.forEach(function (entry) { return visit(entry); });
+            value.forEach(function (entry) { return visit(entry, prefix); });
             return;
         }
         if (!value || typeof value !== 'object') {
@@ -5857,19 +6062,20 @@ function collectIdFieldConditions(match) {
         Object.keys(value).forEach(function (key) {
             var entry = value[key];
             if (key.startsWith('$')) {
-                visit(entry);
+                visit(entry, prefix);
                 return;
             }
+            var currentPath = prefix ? "".concat(prefix, ".").concat(key) : key;
             if (isAssistantIdField(key) && isIdLookupCondition(entry)) {
-                results.push({ field: key, condition: entry });
+                results.push({ field: currentPath, condition: entry });
                 return;
             }
             if (entry && typeof entry === 'object') {
-                visit(entry);
+                visit(entry, currentPath);
             }
         });
     };
-    visit(match);
+    visit(match, '');
     return results;
 }
 function resolveLocalNameFieldFromDocs(docs, baseToken) {
@@ -5916,8 +6122,8 @@ function buildChemicalIdFieldCandidates(field) {
 }
 function applyChemicalNameLookupFallbackToQuery(params) {
     return __awaiter(this, void 0, void 0, function () {
-        var query, db, dbName, idClient, idCustomer, isSuperAdmin, probeDocs, chemicalFields, targetField, condition, regex, sampleDocs, collectionNames, candidates, _loop_6, candidates_2, candidates_2_1, candidate, state_4, e_18_1;
-        var e_18, _a;
+        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_19_1;
+        var e_19, _a;
         var _b;
         return __generator(this, function (_c) {
             switch (_c.label) {
@@ -6030,14 +6236,14 @@ function applyChemicalNameLookupFallbackToQuery(params) {
                     return [3 /*break*/, 3];
                 case 6: return [3 /*break*/, 9];
                 case 7:
-                    e_18_1 = _c.sent();
-                    e_18 = { error: e_18_1 };
+                    e_19_1 = _c.sent();
+                    e_19 = { error: e_19_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; }
+                    finally { if (e_19) throw e_19.error; }
                     return [7 /*endfinally*/];
                 case 9: return [2 /*return*/, null];
             }
@@ -6131,8 +6337,8 @@ function lookupIdsForNameMatch(params) {
 }
 function applyIdLookupFallbackToQuery(params) {
     return __awaiter(this, void 0, void 0, function () {
-        var query, db, dbName, idClient, idCustomer, isSuperAdmin, probeDocs, conditions, collectionNames, _a, conditions_1, conditions_1_1, condition, regex, baseToken, targetFieldType, nextValue, localNameField, candidates, candidates_3, candidates_3_1, candidate, candidateHasClientScope, _b, candidateProbe, lookup, targetFieldType, normalizedIds, idsForQuery, e_19_1, e_20_1;
-        var e_20, _c, e_19, _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_20_1, e_21_1;
+        var e_21, _c, e_20, _d;
         var _e;
         return __generator(this, function (_f) {
             switch (_f.label) {
@@ -6202,7 +6408,7 @@ function applyIdLookupFallbackToQuery(params) {
                     _f.label = 5;
                 case 5:
                     _f.trys.push([5, 14, 15, 16]);
-                    candidates_3 = (e_19 = void 0, __values(candidates)), candidates_3_1 = candidates_3.next();
+                    candidates_3 = (e_20 = void 0, __values(candidates)), candidates_3_1 = candidates_3.next();
                     _f.label = 6;
                 case 6:
                     if (!!candidates_3_1.done) return [3 /*break*/, 13];
@@ -6269,28 +6475,28 @@ function applyIdLookupFallbackToQuery(params) {
                     return [3 /*break*/, 6];
                 case 13: return [3 /*break*/, 16];
                 case 14:
-                    e_19_1 = _f.sent();
-                    e_19 = { error: e_19_1 };
+                    e_20_1 = _f.sent();
+                    e_20 = { error: e_20_1 };
                     return [3 /*break*/, 16];
                 case 15:
                     try {
                         if (candidates_3_1 && !candidates_3_1.done && (_d = candidates_3.return)) _d.call(candidates_3);
                     }
-                    finally { if (e_19) throw e_19.error; }
+                    finally { if (e_20) throw e_20.error; }
                     return [7 /*endfinally*/];
                 case 16:
                     conditions_1_1 = conditions_1.next();
                     return [3 /*break*/, 4];
                 case 17: return [3 /*break*/, 20];
                 case 18:
-                    e_20_1 = _f.sent();
-                    e_20 = { error: e_20_1 };
+                    e_21_1 = _f.sent();
+                    e_21 = { error: e_21_1 };
                     return [3 /*break*/, 20];
                 case 19:
                     try {
                         if (conditions_1_1 && !conditions_1_1.done && (_c = conditions_1.return)) _c.call(conditions_1);
                     }
-                    finally { if (e_20) throw e_20.error; }
+                    finally { if (e_21) throw e_21.error; }
                     return [7 /*endfinally*/];
                 case 20: return [2 /*return*/, null];
             }
@@ -6384,8 +6590,12 @@ function replaceAggregateDateField(pipeline, fromField, toField) {
             return next_2;
         }
         if (typeof value === 'string') {
-            if (value.startsWith("$".concat(fromField))) {
-                return "$".concat(toField).concat(value.slice(fromField.length + 1));
+            var fromRef = "$".concat(fromField);
+            if (value === fromRef) {
+                return "$".concat(toField);
+            }
+            if (value.startsWith("".concat(fromRef, "."))) {
+                return "$".concat(toField).concat(value.slice(fromRef.length));
             }
             return value;
         }
@@ -6437,8 +6647,17 @@ function buildTokenizedRegex(value) {
     var tokenPattern = tokens.map(function (token) { return escapeRegexValue(token); }).join('[\\s\\-_]*.*');
     return new RegExp(tokenPattern, 'i');
 }
-function applyAssistantNameRegexToQuery(query) {
+function applyAssistantNameRegexToQuery(query, fieldContext) {
     if (Array.isArray(query)) {
+        if (fieldContext && shouldApplyAssistantNameRegex(fieldContext)) {
+            return query.map(function (entry) {
+                if (typeof entry === 'string') {
+                    var trimmed = entry.trim();
+                    return trimmed ? buildTokenizedRegex(trimmed) : entry;
+                }
+                return applyAssistantNameRegexToQuery(entry, fieldContext);
+            });
+        }
         return query.map(function (entry) { return applyAssistantNameRegexToQuery(entry); });
     }
     if (!query || typeof query !== 'object' || query instanceof Date || query instanceof RegExp || isMongoObjectId(query)) {
@@ -6448,7 +6667,7 @@ function applyAssistantNameRegexToQuery(query) {
     Object.keys(query).forEach(function (key) {
         var value = query[key];
         if (key.startsWith('$')) {
-            result[key] = applyAssistantNameRegexToQuery(value);
+            result[key] = applyAssistantNameRegexToQuery(value, fieldContext);
             return;
         }
         if (typeof value === 'string' && shouldApplyAssistantNameRegex(key)) {
@@ -6457,7 +6676,7 @@ function applyAssistantNameRegexToQuery(query) {
             return;
         }
         if (value && typeof value === 'object') {
-            result[key] = applyAssistantNameRegexToQuery(value);
+            result[key] = applyAssistantNameRegexToQuery(value, key);
             return;
         }
         result[key] = value;
@@ -6480,13 +6699,13 @@ function hasOperatorKeys(value) {
     return Object.keys(value).some(function (key) { return key.startsWith('$'); });
 }
 function rewriteEmbeddedMatchObjects(query) {
-    var rewriteValue = function (value, allowArrayRewrite, inOperator) {
-        if (inOperator === void 0) { inOperator = false; }
+    var isLogicalOperatorKey = function (key) { return key === '$or' || key === '$and' || key === '$nor'; };
+    var rewriteValue = function (value, allowArrayRewrite, context) {
         if (Array.isArray(value)) {
             if (!allowArrayRewrite) {
                 return value;
             }
-            return value.map(function (entry) { return rewriteValue(entry, true, inOperator); });
+            return value.map(function (entry) { return rewriteValue(entry, true, context); });
         }
         if (!value || typeof value !== 'object' || value instanceof Date || value instanceof RegExp || isMongoObjectId(value)) {
             return value;
@@ -6495,38 +6714,39 @@ function rewriteEmbeddedMatchObjects(query) {
         Object.keys(value).forEach(function (key) {
             var entry = value[key];
             if (key.startsWith('$')) {
-                result[key] = rewriteValue(entry, true, true);
+                var nextContext = isLogicalOperatorKey(key) ? 'logical' : 'fieldOperator';
+                result[key] = rewriteValue(entry, true, nextContext);
                 return;
             }
-            if (!inOperator && isPlainMatchObject(entry) && !Array.isArray(entry) && !hasOperatorKeys(entry)) {
-                var flattened = flattenMatchObject(entry, key, inOperator);
+            if (context !== 'fieldOperator' && isPlainMatchObject(entry) && !Array.isArray(entry) && !hasOperatorKeys(entry)) {
+                var flattened = flattenMatchObject(entry, key, context);
                 Object.assign(result, flattened);
                 return;
             }
             if (isPlainMatchObject(entry) && !Array.isArray(entry)) {
-                result[key] = rewriteValue(entry, true, inOperator);
+                result[key] = rewriteValue(entry, true, context);
                 return;
             }
             if (Array.isArray(entry)) {
-                result[key] = allowArrayRewrite ? entry.map(function (item) { return rewriteValue(item, true, inOperator); }) : entry;
+                result[key] = allowArrayRewrite ? entry.map(function (item) { return rewriteValue(item, true, context); }) : entry;
                 return;
             }
             result[key] = entry;
         });
         return result;
     };
-    var flattenMatchObject = function (value, prefix, inOperator) {
+    var flattenMatchObject = function (value, prefix, context) {
         var result = {};
         Object.keys(value || {}).forEach(function (key) {
             var entry = value[key];
             var currentPath = "".concat(prefix, ".").concat(key);
             if (isPlainMatchObject(entry) && !Array.isArray(entry) && !hasOperatorKeys(entry)) {
-                var flattened = flattenMatchObject(entry, currentPath, inOperator);
+                var flattened = flattenMatchObject(entry, currentPath, context);
                 Object.assign(result, flattened);
                 return;
             }
             if (isPlainMatchObject(entry) && !Array.isArray(entry)) {
-                result[currentPath] = rewriteValue(entry, true, inOperator);
+                result[currentPath] = rewriteValue(entry, true, context);
                 return;
             }
             if (Array.isArray(entry)) {
@@ -6537,7 +6757,7 @@ function rewriteEmbeddedMatchObjects(query) {
         });
         return result;
     };
-    return rewriteValue(query, true);
+    return rewriteValue(query, true, 'root');
 }
 function buildRegexFromCondition(condition) {
     if (!condition) {
@@ -7072,7 +7292,7 @@ function resolveAssistantCollectionName(db, dbName, requested) {
     });
 }
 function findQueryDateField(query) {
-    var e_21, _a, e_22, _b;
+    var e_22, _a, e_23, _b;
     if (!query || typeof query !== 'object') {
         return null;
     }
@@ -7086,12 +7306,12 @@ function findQueryDateField(query) {
                 }
             }
         }
-        catch (e_21_1) { e_21 = { error: e_21_1 }; }
+        catch (e_22_1) { e_22 = { error: e_22_1 }; }
         finally {
             try {
                 if (query_1_1 && !query_1_1.done && (_a = query_1.return)) _a.call(query_1);
             }
-            finally { if (e_21) throw e_21.error; }
+            finally { if (e_22) throw e_22.error; }
         }
         return null;
     }
@@ -7110,12 +7330,12 @@ function findQueryDateField(query) {
             }
         }
     }
-    catch (e_22_1) { e_22 = { error: e_22_1 }; }
+    catch (e_23_1) { e_23 = { error: e_23_1 }; }
     finally {
         try {
             if (_d && !_d.done && (_b = _c.return)) _b.call(_c);
         }
-        finally { if (e_22) throw e_22.error; }
+        finally { if (e_23) throw e_23.error; }
     }
     return null;
 }
@@ -7337,7 +7557,7 @@ function resolveQueryDateFieldFallback(query) {
     return { from: dateField, to: fallback };
 }
 function containsForbiddenMongoOperators(value) {
-    var e_23, _a;
+    var e_24, _a;
     if (!value || typeof value !== 'object') {
         return false;
     }
@@ -7356,12 +7576,12 @@ function containsForbiddenMongoOperators(value) {
             }
         }
     }
-    catch (e_23_1) { e_23 = { error: e_23_1 }; }
+    catch (e_24_1) { e_24 = { error: e_24_1 }; }
     finally {
         try {
             if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
         }
-        finally { if (e_23) throw e_23.error; }
+        finally { if (e_24) throw e_24.error; }
     }
     return false;
 }
@@ -7652,8 +7872,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_24_1;
-        var _e, e_24, _f, _g;
+        var _a, _b, _c, _d, message, payload, status_1, e_25_1;
+        var _e, e_25, _f, _g;
         return __generator(this, function (_h) {
             switch (_h.label) {
                 case 0:
@@ -7680,8 +7900,8 @@ function waitForCodexWorkerMessage(worker, streamStatusHandler) {
                     return [3 /*break*/, 1];
                 case 4: return [3 /*break*/, 11];
                 case 5:
-                    e_24_1 = _h.sent();
-                    e_24 = { error: e_24_1 };
+                    e_25_1 = _h.sent();
+                    e_25 = { error: e_25_1 };
                     return [3 /*break*/, 11];
                 case 6:
                     _h.trys.push([6, , 9, 10]);
@@ -7692,7 +7912,7 @@ function waitForCodexWorkerMessage(worker, streamStatusHandler) {
                     _h.label = 8;
                 case 8: return [3 /*break*/, 10];
                 case 9:
-                    if (e_24) throw e_24.error;
+                    if (e_25) throw e_25.error;
                     return [7 /*endfinally*/];
                 case 10: return [7 /*endfinally*/];
                 case 11: throw new CodexWorkerBootstrapError('Codex worker exited before completing.');
@@ -8300,7 +8520,7 @@ function normalizeRouteMatchKey(value) {
     return normalizeRouteKey(value).toLowerCase();
 }
 function buildClientRouteIndex() {
-    var e_25, _a;
+    var e_26, _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();
@@ -8319,12 +8539,12 @@ function buildClientRouteIndex() {
             }
         }
     }
-    catch (e_25_1) { e_25 = { error: e_25_1 }; }
+    catch (e_26_1) { e_26 = { error: e_26_1 }; }
     finally {
         try {
             if (routes_1_1 && !routes_1_1.done && (_a = routes_1.return)) _a.call(routes_1);
         }
-        finally { if (e_25) throw e_25.error; }
+        finally { if (e_26) throw e_26.error; }
     }
     return { set: set, map: map, size: routes.length };
 }
@@ -8471,7 +8691,7 @@ function sanitizeAssistantResponse(value) {
     return normalizeAssistantRoutes(normalizedCurrency);
 }
 function evaluateAssistantGuardrails(message) {
-    var e_26, _a;
+    var e_27, _a;
     var normalized = String(message || '').toLowerCase();
     var patterns = [
         {
@@ -8517,12 +8737,12 @@ function evaluateAssistantGuardrails(message) {
             }
         }
     }
-    catch (e_26_1) { e_26 = { error: e_26_1 }; }
+    catch (e_27_1) { e_27 = { error: e_27_1 }; }
     finally {
         try {
             if (patterns_1_1 && !patterns_1_1.done && (_a = patterns_1.return)) _a.call(patterns_1);
         }
-        finally { if (e_26) throw e_26.error; }
+        finally { if (e_27) throw e_27.error; }
     }
     return null;
 }
@@ -8637,7 +8857,7 @@ function tokenizeArithmeticExpression(expression) {
     return tokens;
 }
 function evaluateArithmeticExpression(expression) {
-    var e_27, _a, e_28, _b;
+    var e_28, _a, e_29, _b;
     var tokens = tokenizeArithmeticExpression(expression);
     if (!tokens || !tokens.length) {
         return null;
@@ -8694,12 +8914,12 @@ function evaluateArithmeticExpression(expression) {
             prevToken = token;
         }
     }
-    catch (e_27_1) { e_27 = { error: e_27_1 }; }
+    catch (e_28_1) { e_28 = { error: e_28_1 }; }
     finally {
         try {
             if (tokens_1_1 && !tokens_1_1.done && (_a = tokens_1.return)) _a.call(tokens_1);
         }
-        finally { if (e_27) throw e_27.error; }
+        finally { if (e_28) throw e_28.error; }
     }
     while (ops.length) {
         var op = ops.pop();
@@ -8739,12 +8959,12 @@ function evaluateArithmeticExpression(expression) {
             stack.push(Number(token));
         }
     }
-    catch (e_28_1) { e_28 = { error: e_28_1 }; }
+    catch (e_29_1) { e_29 = { error: e_29_1 }; }
     finally {
         try {
             if (output_1_1 && !output_1_1.done && (_b = output_1.return)) _b.call(output_1);
         }
-        finally { if (e_28) throw e_28.error; }
+        finally { if (e_29) throw e_29.error; }
     }
     if (stack.length !== 1 || Number.isNaN(stack[0])) {
         return null;
@@ -8928,8 +9148,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_29_1;
-        var e_29, _b;
+        var limits, totalBytes, totalChars, chunks, cleaned, attachments_1, attachments_1_1, attachment, localPath, safe, stat, ext, name_1, type, readable, content, _a, e_30_1;
+        var e_30, _b;
         return __generator(this, function (_c) {
             switch (_c.label) {
                 case 0:
@@ -9008,14 +9228,14 @@ function readAttachmentContents(attachments) {
                     return [3 /*break*/, 2];
                 case 10: return [3 /*break*/, 13];
                 case 11:
-                    e_29_1 = _c.sent();
-                    e_29 = { error: e_29_1 };
+                    e_30_1 = _c.sent();
+                    e_30 = { error: e_30_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_29) throw e_29.error; }
+                    finally { if (e_30) throw e_30.error; }
                     return [7 /*endfinally*/];
                 case 13: return [2 /*return*/, {
                         promptText: chunks.length ? "\n\nAttachments:\n".concat(chunks.join('\n\n')) : '',
@@ -9203,7 +9423,7 @@ function estimateUsage(messages, responseText, model) {
     };
 }
 function evaluateGuardrails(message) {
-    var e_30, _a;
+    var e_31, _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.' },
@@ -9225,12 +9445,12 @@ function evaluateGuardrails(message) {
             }
         }
     }
-    catch (e_30_1) { e_30 = { error: e_30_1 }; }
+    catch (e_31_1) { e_31 = { error: e_31_1 }; }
     finally {
         try {
             if (patterns_2_1 && !patterns_2_1.done && (_a = patterns_2.return)) _a.call(patterns_2);
         }
-        finally { if (e_30) throw e_30.error; }
+        finally { if (e_31) throw e_31.error; }
     }
     return null;
 }