@resolveio/server-lib 22.1.13 → 22.1.14

package/methods/ai-terminal.js

@@ -1695,7 +1695,7 @@ function executeAiAssistantCodexRun(payload, context) {
                     insertResult = _e.sent();
                     assistantMessageId = (insertResult === null || insertResult === void 0 ? void 0 : insertResult._id) || (insertResult === null || insertResult === void 0 ? void 0 : insertResult.insertedId);
                     enqueueAssistantCodexRun(function () { return __awaiter(_this, void 0, void 0, function () {
-                        var runStart, steps, recordStep, progressTracker, streamProgress, assistantContent, toolResult, assistantDebug, directiveSource, requestClassification, dataQuestion, lastDirective, heuristicDirectivePrecomputed, usedDeterministicHeuristicFastPath, requestedTimeGrain, requestedBreakdownDimensions, enforceDatedDirective, enforceGroupedDirective, datedDirectiveRetryUsed, datedDirectiveResolved, toolResponseDebug, toolError, termHints, collectionHints, fieldHints, methodHints, publicationHints, collectionTokenization, collectionRanking, collectionSelection, collectionOverride, collectionNames, plannerEnabled, plannerUsed, plannerSkipReason, plannerOutput, plannerRaw, timingBreakdown, codexUsage, accumulateCodexUsage, contextRoute, contextMode, hintSeed, termExpansion, hintText, baseTokens, expandedTokens, baseWeights, expandedWeights, dbName, db, surfaceHints, _a, allowedRoutes, rankedAllowedRoutes, routeHints, rankedCollectionHints, rankedCollections, hintCollections, assistantContext, hasDeterministicHeuristicFastPath, prompt_1, workspaceRoot, codexConfig, runOptions, plannerRunOptions, shouldRunPlanner, plannerPrompt, plannerStart, _b, preferListDirective, directiveStyleHint, directivePromptMode, responseText, directiveText, directive, heuristicDirectiveFastPath, directivePrompt, directiveStart, forcedDirective, _c, initialStart, extractedDirective, error_2, directivePrompt, forcedStart, forcedDirective, _d, strictDirectivePrompt, strictStart, strictDirectiveText, strictDirective, strictDirectiveIsDated, shouldUseStrictDirective, _e, guardDirectivePrompt, guardStart, guardDirectiveText, guardDirective, _f, groupedDirectivePrompt, groupedStart, groupedDirectiveText, groupedDirective, _g, heuristicDirective, requestedCollection, cleanedResponseText, effectiveDirective, toolRequest, toolStart, toolResponse, _h, toolPayload, skipFollowupCodex, followupPrompt, followupStart, followupText, _j, error_3, error_4, finishedAt, finalNow, finishedAt, codexMs, draftingMs, finalMetadata, finalUsage, usageClientId, usageError_1, finalAssistantDoc, setPayload;
+                        var runStart, steps, recordStep, progressTracker, streamProgress, assistantContent, toolResult, assistantDebug, directiveSource, requestClassification, dataQuestion, lastDirective, heuristicDirectivePrecomputed, usedDeterministicHeuristicFastPath, requestedTimeGrain, requestedBreakdownDimensions, enforceDatedDirective, enforceGroupedDirective, datedDirectiveRetryUsed, datedDirectiveResolved, toolResponseDebug, toolError, termHints, collectionHints, fieldHints, methodHints, publicationHints, collectionTokenization, collectionRanking, collectionSelection, collectionOverride, collectionNames, plannerEnabled, plannerUsed, plannerSkipReason, plannerOutput, plannerRaw, timingBreakdown, codexUsage, accumulateCodexUsage, contextRoute, contextMode, hintSeed, termExpansion, hintText, baseTokens, expandedTokens, baseWeights, expandedWeights, dbName, db, surfaceHints, _a, allowedRoutes, rankedAllowedRoutes, routeHints, rankedCollectionHints, rankedCollections, hintCollections, assistantContext, hasDeterministicHeuristicFastPath, prompt_1, workspaceRoot, codexConfig, runOptions, plannerRunOptions, shouldRunPlanner, plannerPrompt, plannerStart, _b, preferListDirective, directiveStyleHint, directivePromptMode, responseText, directiveText, directive, heuristicDirectiveFastPath, directivePrompt, directiveStart, forcedDirective, _c, initialStart, extractedDirective, error_2, directivePrompt, forcedStart, forcedDirective, _d, strictDirectivePrompt, strictStart, strictDirectiveText, strictDirective, strictDirectiveIsDated, shouldUseStrictDirective, _e, guardDirectivePrompt, guardStart, guardDirectiveText, guardDirective, _f, groupedDirectivePrompt, groupedStart, groupedDirectiveText, groupedDirective, _g, heuristicDirective, requestedCollection, allowCollectionOverride, cleanedResponseText, effectiveDirective, toolRequest, toolStart, toolResponse, _h, toolPayload, skipFollowupCodex, followupPrompt, followupStart, followupText, _j, error_3, error_4, finishedAt, finalNow, finishedAt, codexMs, draftingMs, finalMetadata, finalUsage, usageClientId, usageError_1, finalAssistantDoc, setPayload;
                         var _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12;
                         return __generator(this, function (_13) {
                             switch (_13.label) {
@@ -1882,7 +1882,9 @@ function executeAiAssistantCodexRun(payload, context) {
                                         publicationHints: publicationHints,
                                         recentToolError: recentToolError
                                     });
-                                    heuristicDirectivePrecomputed = dataQuestion ? buildAssistantHeuristicDirective(message, collectionHints) : null;
+                                    heuristicDirectivePrecomputed = dataQuestion
+                                        ? buildAssistantHeuristicDirective(message, collectionHints, collectionNames)
+                                        : null;
                                     hasDeterministicHeuristicFastPath = dataQuestion
                                         && isAssistantExecutableDirective(heuristicDirectivePrecomputed)
                                         && isAssistantDeterministicHeuristicDirective(heuristicDirectivePrecomputed);
@@ -2004,7 +2006,7 @@ function executeAiAssistantCodexRun(payload, context) {
                                     directiveText = '';
                                     directive = null;
                                     heuristicDirectiveFastPath = dataQuestion
-                                        ? (heuristicDirectivePrecomputed || buildAssistantHeuristicDirective(message, collectionHints))
+                                        ? (heuristicDirectivePrecomputed || buildAssistantHeuristicDirective(message, collectionHints, collectionNames))
                                         : null;
                                     if (dataQuestion
                                         && isAssistantExecutableDirective(heuristicDirectiveFastPath)
@@ -2256,7 +2258,7 @@ function executeAiAssistantCodexRun(payload, context) {
                                     return [3 /*break*/, 37];
                                 case 37:
                                     if (!directive && dataQuestion) {
-                                        heuristicDirective = buildAssistantHeuristicDirective(message, collectionHints);
+                                        heuristicDirective = buildAssistantHeuristicDirective(message, collectionHints, collectionNames);
                                         if (isAssistantExecutableDirective(heuristicDirective)) {
                                             directive = heuristicDirective;
                                             directiveSource = 'forced';
@@ -2272,13 +2274,16 @@ function executeAiAssistantCodexRun(payload, context) {
                                     }
                                     if (directive) {
                                         requestedCollection = normalizeOptionalString((_11 = directive.payload) === null || _11 === void 0 ? void 0 : _11.collection);
-                                        collectionOverride = resolveCollectionOverrideWithContext({
-                                            message: message,
-                                            collectionRanking: collectionRanking,
-                                            requestedCollection: requestedCollection,
-                                            permissionView: normalizeOptionalString((_12 = directive.payload) === null || _12 === void 0 ? void 0 : _12.permissionView) || contextRoute,
-                                            collectionNames: collectionNames
-                                        });
+                                        allowCollectionOverride = !isAssistantDeterministicHeuristicDirective(directive);
+                                        collectionOverride = allowCollectionOverride
+                                            ? resolveCollectionOverrideWithContext({
+                                                message: message,
+                                                collectionRanking: collectionRanking,
+                                                requestedCollection: requestedCollection,
+                                                permissionView: normalizeOptionalString((_12 = directive.payload) === null || _12 === void 0 ? void 0 : _12.permissionView) || contextRoute,
+                                                collectionNames: collectionNames
+                                            })
+                                            : null;
                                         if (collectionOverride) {
                                             recordStep('Planning: collection override', {
                                                 from: collectionOverride.from || undefined,
@@ -2666,7 +2671,7 @@ function executeAiAssistantReportIssue(payload, context) {
 }
 function executeAiAssistantMongoRead(payload, context) {
     return __awaiter(this, void 0, void 0, function () {
-        var input, rawCollection, retryState, triedCollections, crossCollectionRetryEnabled, dbName, db, collectionResolution, collection, bridgeCollection, retryRootCollection, schemaFields, effectivePermissionView, _a, user, isSuperAdmin, customerId, fallbackMeta, baseQuery, stripped, userId, normalizedClient, shouldScopeByClient, _b, strippedClient, clientScopedQuery, scopedQuery, normalized, findOptions, runFindWithRepair, initialRead, documents, executedQuery, probeDocs, dateFallback, fallbackQuery, fallbackRead, fallbackDocs, expanded, fallbackRead, fallbackDocs, nameFallback, fallbackRead, fallbackDocs, _c, chemicalLookup, fallbackRead, fallbackDocs, queryFields, _d, aliases, rewrittenQuery, fallbackRead, fallbackDocs, _e, activeFallback, fallbackRead, fallbackDocs, _f, idLookup, fallbackRead, fallbackDocs, baseCollection, fallbackPayload, fallbackResult, existingFallbacks, hasActiveStatusFilters, crossCollectionCandidates, crossCollectionCandidates_1, crossCollectionCandidates_1_1, candidateCollection, fallbackPayload, fallbackResult, fallbackDocs, existingFallbacks, rejectedQuality, e_1_1, nameFields, dateFields, diagnostics, queryNoName, _g, queryNoDate, _h, _j, _k, _l, allCollections, base, alt, altCount, _m, total, sanitizedDocuments, requestedFields, missingFields, _o, projectionAliases, expandedProjection, refreshedDocs, includeIds, fieldAliases, displayDocs, idLookupDisplay, priorityFields, displayMaxRows, display;
+        var input, rawCollection, retryState, triedCollections, crossCollectionRetryEnabled, dbName, db, collectionResolution, collection, bridgeCollection, retryRootCollection, schemaFields, effectivePermissionView, _a, user, isSuperAdmin, customerId, fallbackMeta, baseQuery, stripped, userId, normalizedClient, shouldScopeByClient, _b, strippedClient, clientScopedQuery, scopedQuery, normalized, findOptions, runFindWithRepair, initialRead, documents, executedQuery, probeDocs, dateFallback, fallbackQuery, fallbackRead, fallbackDocs, expanded, fallbackRead, fallbackDocs, nameFallback, fallbackRead, fallbackDocs, _c, chemicalLookup, fallbackRead, fallbackDocs, queryFields, _d, aliases, rewrittenQuery, fallbackRead, fallbackDocs, _e, activeFallback, fallbackRead, fallbackDocs, _f, idLookup, fallbackRead, fallbackDocs, baseCollection, fallbackPayload, fallbackResult, existingFallbacks, hasActiveStatusFilters, crossCollectionCandidates, crossCollectionCandidates_1, crossCollectionCandidates_1_1, candidateCollection, fallbackPayload, fallbackResult, fallbackDocs, existingFallbacks, rejectedQuality, error_5, existingErrors, e_1_1, nameFields, dateFields, diagnostics, queryNoName, _g, queryNoDate, _h, _j, _k, _l, allCollections, base, alt, altCount, _m, total, sanitizedDocuments, requestedFields, missingFields, _o, projectionAliases, expandedProjection, refreshedDocs, includeIds, fieldAliases, displayDocs, idLookupDisplay, priorityFields, displayMaxRows, display;
         var e_1, _p;
         var _this = this;
         var _q, _r;
@@ -2768,7 +2773,7 @@ function executeAiAssistantMongoRead(payload, context) {
                     normalized = normalizeAssistantFindOptions(input.options);
                     findOptions = __assign(__assign({}, normalized.findOptions), { readPreference: AI_ASSISTANT_READ_PREFERENCE });
                     runFindWithRepair = function (query, stage) { return __awaiter(_this, void 0, void 0, function () {
-                        var docs, error_5, repaired, docs;
+                        var docs, error_6, repaired, docs;
                         return __generator(this, function (_a) {
                             switch (_a.label) {
                                 case 0:
@@ -2778,13 +2783,13 @@ function executeAiAssistantMongoRead(payload, context) {
                                     docs = _a.sent();
                                     return [2 /*return*/, { documents: docs, query: query }];
                                 case 2:
-                                    error_5 = _a.sent();
-                                    if (!isAssistantDateArithmeticArgumentError(error_5)) {
-                                        throw error_5;
+                                    error_6 = _a.sent();
+                                    if (!isAssistantDateArithmeticArgumentError(error_6)) {
+                                        throw error_6;
                                     }
                                     repaired = repairAssistantDateArithmeticInQuery(query);
                                     if (!repaired.changed || containsForbiddenMongoOperators(repaired.query)) {
-                                        throw error_5;
+                                        throw error_6;
                                     }
                                     return [4 /*yield*/, db.collection(collection).find(repaired.query, findOptions).toArray()];
                                 case 3:
@@ -3052,13 +3057,13 @@ function executeAiAssistantMongoRead(payload, context) {
                     _s.label = 34;
                 case 34:
                     hasActiveStatusFilters = collectAssistantActiveMatchFields(executedQuery).length > 0;
-                    if (!(!documents.length && crossCollectionRetryEnabled && !hasActiveStatusFilters)) return [3 /*break*/, 44];
+                    if (!(!documents.length && crossCollectionRetryEnabled && !hasActiveStatusFilters)) return [3 /*break*/, 46];
                     return [4 /*yield*/, resolveAssistantAvailableCrossCollectionFallbacks(db, dbName, collection, triedCollections, {
                             fieldHints: extractQueryFieldPaths(executedQuery || {})
                         })];
                 case 35:
                     crossCollectionCandidates = _s.sent();
-                    if (!crossCollectionCandidates.length) return [3 /*break*/, 43];
+                    if (!crossCollectionCandidates.length) return [3 /*break*/, 45];
                     fallbackMeta.collectionRetry = {
                         from: collection,
                         root: retryRootCollection,
@@ -3068,19 +3073,22 @@ function executeAiAssistantMongoRead(payload, context) {
                     };
                     _s.label = 36;
                 case 36:
-                    _s.trys.push([36, 41, 42, 43]);
+                    _s.trys.push([36, 43, 44, 45]);
                     crossCollectionCandidates_1 = __values(crossCollectionCandidates), crossCollectionCandidates_1_1 = crossCollectionCandidates_1.next();
                     _s.label = 37;
                 case 37:
-                    if (!!crossCollectionCandidates_1_1.done) return [3 /*break*/, 40];
+                    if (!!crossCollectionCandidates_1_1.done) return [3 /*break*/, 42];
                     candidateCollection = crossCollectionCandidates_1_1.value;
                     addAssistantCollectionToTriedSet(triedCollections, candidateCollection);
                     fallbackPayload = __assign(__assign({}, input), { collection: candidateCollection, __assistantRetryState: buildAssistantRetryState(retryState, triedCollections, {
                             rootCollection: retryRootCollection,
                             disableCrossCollectionRetry: true
                         }) });
-                    return [4 /*yield*/, executeAiAssistantMongoRead(fallbackPayload, context)];
+                    _s.label = 38;
                 case 38:
+                    _s.trys.push([38, 40, , 41]);
+                    return [4 /*yield*/, executeAiAssistantMongoRead(fallbackPayload, context)];
+                case 39:
                     fallbackResult = _s.sent();
                     fallbackDocs = Array.isArray(fallbackResult === null || fallbackResult === void 0 ? void 0 : fallbackResult.documents) ? fallbackResult.documents : [];
                     if (fallbackDocs.length && shouldAcceptAssistantFallbackDocuments(fallbackDocs)) {
@@ -3108,23 +3116,36 @@ function executeAiAssistantMongoRead(payload, context) {
                         });
                         fallbackMeta.collectionRetry.rejectedQuality = rejectedQuality;
                     }
-                    _s.label = 39;
-                case 39:
+                    return [3 /*break*/, 41];
+                case 40:
+                    error_5 = _s.sent();
+                    if (fallbackMeta.collectionRetry && typeof fallbackMeta.collectionRetry === 'object') {
+                        existingErrors = Array.isArray(fallbackMeta.collectionRetry.errors)
+                            ? fallbackMeta.collectionRetry.errors
+                            : [];
+                        existingErrors.push({
+                            collection: candidateCollection,
+                            error: normalizeOptionalString(error_5 === null || error_5 === void 0 ? void 0 : error_5.message) || 'Unknown error'
+                        });
+                        fallbackMeta.collectionRetry.errors = existingErrors;
+                    }
+                    return [3 /*break*/, 41];
+                case 41:
                     crossCollectionCandidates_1_1 = crossCollectionCandidates_1.next();
                     return [3 /*break*/, 37];
-                case 40: return [3 /*break*/, 43];
-                case 41:
+                case 42: return [3 /*break*/, 45];
+                case 43:
                     e_1_1 = _s.sent();
                     e_1 = { error: e_1_1 };
-                    return [3 /*break*/, 43];
-                case 42:
+                    return [3 /*break*/, 45];
+                case 44:
                     try {
                         if (crossCollectionCandidates_1_1 && !crossCollectionCandidates_1_1.done && (_p = crossCollectionCandidates_1.return)) _p.call(crossCollectionCandidates_1);
                     }
                     finally { if (e_1) throw e_1.error; }
                     return [7 /*endfinally*/];
-                case 43: return [3 /*break*/, 45];
-                case 44:
+                case 45: return [3 /*break*/, 47];
+                case 46:
                     if (!documents.length && crossCollectionRetryEnabled && hasActiveStatusFilters && isSuperAdmin) {
                         fallbackMeta.collectionRetry = {
                             from: collection,
@@ -3134,9 +3155,9 @@ function executeAiAssistantMongoRead(payload, context) {
                             reason: 'active_status_query_preserved'
                         };
                     }
-                    _s.label = 45;
-                case 45:
-                    if (!(!documents.length && isSuperAdmin)) return [3 /*break*/, 62];
+                    _s.label = 47;
+                case 47:
+                    if (!(!documents.length && isSuperAdmin)) return [3 /*break*/, 64];
                     nameFields = collectMatchFieldsByCondition(executedQuery, function (field, condition) { return isRegexMatchCondition(condition)
                         || (typeof condition === 'string' && shouldApplyAssistantNameRegex(field)); });
                     dateFields = collectMatchFieldsByCondition(executedQuery, function (_field, condition) { return isDateCondition(condition); });
@@ -3144,36 +3165,36 @@ function executeAiAssistantMongoRead(payload, context) {
                         nameFields: nameFields.length ? nameFields : undefined,
                         dateFields: dateFields.length ? dateFields : undefined
                     };
-                    _s.label = 46;
-                case 46:
-                    _s.trys.push([46, 51, , 52]);
-                    if (!nameFields.length) return [3 /*break*/, 48];
+                    _s.label = 48;
+                case 48:
+                    _s.trys.push([48, 53, , 54]);
+                    if (!nameFields.length) return [3 /*break*/, 50];
                     queryNoName = stripMatchFields(executedQuery, nameFields);
                     _g = diagnostics;
                     return [4 /*yield*/, db.collection(collection).countDocuments(queryNoName, {
                             readPreference: AI_ASSISTANT_READ_PREFERENCE
                         })];
-                case 47:
+                case 49:
                     _g.recentCount = _s.sent();
-                    _s.label = 48;
-                case 48:
-                    if (!dateFields.length) return [3 /*break*/, 50];
+                    _s.label = 50;
+                case 50:
+                    if (!dateFields.length) return [3 /*break*/, 52];
                     queryNoDate = stripMatchFields(executedQuery, dateFields);
                     _h = diagnostics;
                     return [4 /*yield*/, db.collection(collection).countDocuments(queryNoDate, {
                             readPreference: AI_ASSISTANT_READ_PREFERENCE
                         })];
-                case 49:
-                    _h.nameMatchCount = _s.sent();
-                    _s.label = 50;
-                case 50: return [3 /*break*/, 52];
                 case 51:
+                    _h.nameMatchCount = _s.sent();
+                    _s.label = 52;
+                case 52: return [3 /*break*/, 54];
+                case 53:
                     _j = _s.sent();
-                    return [3 /*break*/, 52];
-                case 52:
-                    _s.trys.push([52, 55, , 56]);
+                    return [3 /*break*/, 54];
+                case 54:
+                    _s.trys.push([54, 57, , 58]);
                     _k = probeDocs;
-                    if (_k) return [3 /*break*/, 54];
+                    if (_k) return [3 /*break*/, 56];
                     return [4 /*yield*/, fetchAssistantProbeDocs({
                             db: db,
                             collection: collection,
@@ -3182,56 +3203,56 @@ function executeAiAssistantMongoRead(payload, context) {
                             isSuperAdmin: isSuperAdmin,
                             includeClientScope: shouldScopeByClient
                         })];
-                case 53:
+                case 55:
                     _k = (_s.sent());
-                    _s.label = 54;
-                case 54:
+                    _s.label = 56;
+                case 56:
                     probeDocs = _k;
                     if (probeDocs.length && nameFields.length) {
                         diagnostics.chemicalIdDetected = detectChemicalIdFromProbe(probeDocs, nameFields);
                     }
-                    return [3 /*break*/, 56];
-                case 55:
+                    return [3 /*break*/, 58];
+                case 57:
                     _l = _s.sent();
-                    return [3 /*break*/, 56];
-                case 56:
-                    _s.trys.push([56, 60, , 61]);
+                    return [3 /*break*/, 58];
+                case 58:
+                    _s.trys.push([58, 62, , 63]);
                     return [4 /*yield*/, listAssistantCollections(db, dbName)];
-                case 57:
+                case 59:
                     allCollections = _s.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*/, 59];
+                    if (!(alt && alt !== collection && allCollections.includes(alt))) return [3 /*break*/, 61];
                     return [4 /*yield*/, db.collection(alt).countDocuments({}, { readPreference: AI_ASSISTANT_READ_PREFERENCE })];
-                case 58:
+                case 60:
                     altCount = _s.sent();
                     diagnostics.alternateCollection = alt;
                     diagnostics.alternateCollectionCount = altCount;
-                    _s.label = 59;
-                case 59: return [3 /*break*/, 61];
-                case 60:
+                    _s.label = 61;
+                case 61: return [3 /*break*/, 63];
+                case 62:
                     _m = _s.sent();
-                    return [3 /*break*/, 61];
-                case 61:
+                    return [3 /*break*/, 63];
+                case 63:
                     fallbackMeta.zeroDiagnostics = diagnostics;
-                    _s.label = 62;
-                case 62:
+                    _s.label = 64;
+                case 64:
                     total = null;
-                    if (!normalized.includeTotal) return [3 /*break*/, 64];
+                    if (!normalized.includeTotal) return [3 /*break*/, 66];
                     return [4 /*yield*/, db.collection(collection).countDocuments(executedQuery, { readPreference: AI_ASSISTANT_READ_PREFERENCE })];
-                case 63:
+                case 65:
                     total = _s.sent();
-                    _s.label = 64;
-                case 64:
+                    _s.label = 66;
+                case 66:
                     sanitizedDocuments = isSuperAdmin
                         ? documents
                         : documents.map(function (doc) { return redactSensitiveFields((0, common_1.deepCopy)(doc)); });
                     requestedFields = resolveProjectionRequestedFields(findOptions.projection);
-                    if (!(sanitizedDocuments.length && requestedFields.length)) return [3 /*break*/, 68];
+                    if (!(sanitizedDocuments.length && requestedFields.length)) return [3 /*break*/, 70];
                     missingFields = requestedFields.filter(function (field) { return !hasNonEmptyValue(sanitizedDocuments, field, { treatObjectLikeAsEmpty: true }); });
-                    if (!missingFields.length) return [3 /*break*/, 68];
+                    if (!missingFields.length) return [3 /*break*/, 70];
                     _o = probeDocs;
-                    if (_o) return [3 /*break*/, 66];
+                    if (_o) return [3 /*break*/, 68];
                     return [4 /*yield*/, fetchAssistantProbeDocs({
                             db: db,
                             collection: collection,
@@ -3240,25 +3261,25 @@ function executeAiAssistantMongoRead(payload, context) {
                             isSuperAdmin: isSuperAdmin,
                             includeClientScope: shouldScopeByClient
                         })];
-                case 65:
+                case 67:
                     _o = (_s.sent());
-                    _s.label = 66;
-                case 66:
+                    _s.label = 68;
+                case 68:
                     probeDocs = _o;
-                    if (!probeDocs.length) return [3 /*break*/, 68];
+                    if (!probeDocs.length) return [3 /*break*/, 70];
                     projectionAliases = resolveFieldAliases(probeDocs, missingFields, schemaFields);
-                    if (!Object.keys(projectionAliases).length) return [3 /*break*/, 68];
+                    if (!Object.keys(projectionAliases).length) return [3 /*break*/, 70];
                     fallbackMeta.projectionAliases = {
                         aliases: projectionAliases,
                         attempted: true,
                         used: false
                     };
                     expandedProjection = expandProjectionWithAliases(findOptions.projection, projectionAliases);
-                    if (!(expandedProjection && expandedProjection !== findOptions.projection)) return [3 /*break*/, 68];
+                    if (!(expandedProjection && expandedProjection !== findOptions.projection)) return [3 /*break*/, 70];
                     findOptions = __assign(__assign({}, findOptions), { projection: expandedProjection });
                     normalized.findOptions.projection = expandedProjection;
                     return [4 /*yield*/, db.collection(collection).find(executedQuery, findOptions).toArray()];
-                case 67:
+                case 69:
                     refreshedDocs = _s.sent();
                     if (refreshedDocs.length) {
                         documents = refreshedDocs;
@@ -3267,8 +3288,8 @@ function executeAiAssistantMongoRead(payload, context) {
                             : refreshedDocs.map(function (doc) { return redactSensitiveFields((0, common_1.deepCopy)(doc)); });
                         fallbackMeta.projectionAliases.used = true;
                     }
-                    _s.label = 68;
-                case 68:
+                    _s.label = 70;
+                case 70:
                     includeIds = ((_r = input.options) === null || _r === void 0 ? void 0 : _r.includeIds) === true;
                     fieldAliases = resolveFieldAliases(sanitizedDocuments, requestedFields, schemaFields);
                     displayDocs = Object.keys(fieldAliases).length
@@ -3283,7 +3304,7 @@ function executeAiAssistantMongoRead(payload, context) {
                             idCustomer: customerId,
                             isSuperAdmin: isSuperAdmin
                         })];
-                case 69:
+                case 71:
                     idLookupDisplay = _s.sent();
                     if (idLookupDisplay === null || idLookupDisplay === void 0 ? void 0 : idLookupDisplay.docs) {
                         displayDocs = idLookupDisplay.docs;
@@ -3329,7 +3350,7 @@ function executeAiAssistantMongoRead(payload, context) {
 }
 function executeAiAssistantMongoAggregate(payload, context) {
     return __awaiter(this, void 0, void 0, function () {
-        var input, rawCollection, retryState, triedCollections, crossCollectionRetryEnabled, dbName, db, collectionResolution, collection, bridgeCollection, retryRootCollection, schemaFields, effectivePermissionView, _a, user, isSuperAdmin, customerId, fallbackMeta, baseQuery, stripped, userId, normalizedClient, shouldScopeByClient, _b, clientScopedQuery, scopedQuery, normalizedPipeline, sanitizedPipeline, strippedPipeline, pipelineWithScope, normalizedOptions, limitedPipeline, executedPipeline, dateField, aggregateOptions, runAggregateWithRepair, initialAggregate, documents, probeDocs, fallback, fallbackPipeline, fallbackAggregate, fallbackDocs, createdFallback, createdPipeline, createdAggregate, createdDocs, expanded, expandedAggregate, expandedDocs, completionFallback, fallbackPipeline, fallbackAggregate, fallbackDocs, completionExprFallback, fallbackPipeline, fallbackAggregate, fallbackDocs, unwindFallback, shouldUnwind, _c, _d, fallbackPipeline, fallbackAggregate, fallbackDocs, nameFallback, fallbackPipeline, fallbackAggregate, fallbackDocs, _e, _loop_1, i, state_1, matchFields_1, _f, aliases, rewrittenPipeline, fallbackAggregate, fallbackDocs, _loop_2, i, state_2, nestedFallbacks, nestedFallbacks_1, nestedFallbacks_1_1, nestedFallback, fallbackPayload, fallbackResult, existingFallbacks, error_6, errorMessage, existingErrors, e_2_1, baseCollection, fallbackPayload, fallbackResult, existingFallbacks, fallbackAcceptanceOptions, crossCollectionCandidates, crossCollectionCandidates_2, crossCollectionCandidates_2_1, candidateCollection, fallbackPayload, fallbackResult, fallbackDocs, fallbackQuality, existingFallbacks, rejectedQuality, e_3_1, matchStages, diagnostics, combinedMatch, nameFields, dateFields, queryNoName, _g, queryNoDate, _h, _j, _k, _l, allCollections, base, alt, altCount, _m, verification, sanitizedDocuments, includeIds, displayDocs, idLookupDisplay, display;
+        var input, rawCollection, retryState, triedCollections, crossCollectionRetryEnabled, dbName, db, collectionResolution, collection, bridgeCollection, retryRootCollection, schemaFields, effectivePermissionView, _a, user, isSuperAdmin, customerId, fallbackMeta, baseQuery, stripped, userId, normalizedClient, shouldScopeByClient, _b, clientScopedQuery, scopedQuery, normalizedPipeline, sanitizedPipeline, strippedPipeline, pipelineWithScope, normalizedOptions, limitedPipeline, executedPipeline, dateField, aggregateOptions, runAggregateWithRepair, initialAggregate, documents, probeDocs, fallback, fallbackPipeline, fallbackAggregate, fallbackDocs, createdFallback, createdPipeline, createdAggregate, createdDocs, expanded, expandedAggregate, expandedDocs, completionFallback, fallbackPipeline, fallbackAggregate, fallbackDocs, completionExprFallback, fallbackPipeline, fallbackAggregate, fallbackDocs, unwindFallback, shouldUnwind, _c, _d, fallbackPipeline, fallbackAggregate, fallbackDocs, nameFallback, fallbackPipeline, fallbackAggregate, fallbackDocs, _e, _loop_1, i, state_1, matchFields_1, _f, aliases, rewrittenPipeline, fallbackAggregate, fallbackDocs, _loop_2, i, state_2, nestedFallbacks, nestedFallbacks_1, nestedFallbacks_1_1, nestedFallback, fallbackPayload, fallbackResult, existingFallbacks, error_7, errorMessage, existingErrors, e_2_1, baseCollection, fallbackPayload, fallbackResult, existingFallbacks, fallbackAcceptanceOptions, crossCollectionCandidates, crossCollectionCandidates_2, crossCollectionCandidates_2_1, candidateCollection, fallbackPayload, fallbackResult, fallbackDocs, fallbackQuality, existingFallbacks, rejectedQuality, error_8, existingErrors, e_3_1, matchStages, diagnostics, combinedMatch, nameFields, dateFields, queryNoName, _g, queryNoDate, _h, _j, _k, _l, allCollections, base, alt, altCount, _m, verification, sanitizedDocuments, includeIds, displayDocs, idLookupDisplay, display;
         var e_2, _o, e_3, _p;
         var _this = this;
         var _q, _r;
@@ -3440,7 +3461,7 @@ function executeAiAssistantMongoAggregate(payload, context) {
                     }
                     aggregateOptions = __assign(__assign({}, normalizedOptions.aggregateOptions), { readPreference: AI_ASSISTANT_READ_PREFERENCE });
                     runAggregateWithRepair = function (pipeline, stage) { return __awaiter(_this, void 0, void 0, function () {
-                        var docs, error_7, isDateRepair, isRankSortByRepair, isDottedOutputFieldRepair, repaired, dottedFieldPath, dottedFieldReferenceRepairUsed, pathReferenceRepair, docs;
+                        var docs, error_9, isDateRepair, isRankSortByRepair, isDottedOutputFieldRepair, repaired, dottedFieldPath, dottedFieldReferenceRepairUsed, pathReferenceRepair, docs;
                         return __generator(this, function (_a) {
                             switch (_a.label) {
                                 case 0:
@@ -3452,12 +3473,12 @@ function executeAiAssistantMongoAggregate(payload, context) {
                                     docs = _a.sent();
                                     return [2 /*return*/, { documents: docs, pipeline: pipeline }];
                                 case 2:
-                                    error_7 = _a.sent();
-                                    isDateRepair = isAssistantDateArithmeticArgumentError(error_7);
-                                    isRankSortByRepair = isAssistantRankSortByError(error_7);
-                                    isDottedOutputFieldRepair = isAssistantDottedOutputFieldError(error_7);
+                                    error_9 = _a.sent();
+                                    isDateRepair = isAssistantDateArithmeticArgumentError(error_9);
+                                    isRankSortByRepair = isAssistantRankSortByError(error_9);
+                                    isDottedOutputFieldRepair = isAssistantDottedOutputFieldError(error_9);
                                     if (!isDateRepair && !isRankSortByRepair && !isDottedOutputFieldRepair) {
-                                        throw error_7;
+                                        throw error_9;
                                     }
                                     repaired = isDateRepair
                                         ? repairAssistantDateArithmeticInPipeline(pipeline)
@@ -3467,7 +3488,7 @@ function executeAiAssistantMongoAggregate(payload, context) {
                                     dottedFieldPath = null;
                                     dottedFieldReferenceRepairUsed = false;
                                     if (isDottedOutputFieldRepair) {
-                                        dottedFieldPath = extractAssistantDottedFieldPathFromError(error_7);
+                                        dottedFieldPath = extractAssistantDottedFieldPathFromError(error_9);
                                         if (dottedFieldPath) {
                                             pathReferenceRepair = repairAssistantFieldPathReferenceInPipeline(repaired.pipeline, dottedFieldPath);
                                             if (pathReferenceRepair.changed) {
@@ -3480,7 +3501,7 @@ function executeAiAssistantMongoAggregate(payload, context) {
                                         }
                                     }
                                     if (!repaired.changed || containsForbiddenMongoOperators(repaired.pipeline)) {
-                                        throw error_7;
+                                        throw error_9;
                                     }
                                     return [4 /*yield*/, db.collection(collection)
                                             .aggregate(repaired.pipeline, aggregateOptions)
@@ -3948,8 +3969,8 @@ function executeAiAssistantMongoAggregate(payload, context) {
                     }
                     return [3 /*break*/, 49];
                 case 48:
-                    error_6 = _s.sent();
-                    errorMessage = normalizeOptionalString(error_6 === null || error_6 === void 0 ? void 0 : error_6.message) || 'Unknown error';
+                    error_7 = _s.sent();
+                    errorMessage = normalizeOptionalString(error_7 === null || error_7 === void 0 ? void 0 : error_7.message) || 'Unknown error';
                     existingErrors = Array.isArray(fallbackMeta.relationshipRetry.errors)
                         ? fallbackMeta.relationshipRetry.errors
                         : [];
@@ -4004,14 +4025,14 @@ function executeAiAssistantMongoAggregate(payload, context) {
                     }
                     _s.label = 56;
                 case 56:
-                    if (!(!documents.length && crossCollectionRetryEnabled)) return [3 /*break*/, 65];
+                    if (!(!documents.length && crossCollectionRetryEnabled)) return [3 /*break*/, 67];
                     fallbackAcceptanceOptions = buildAssistantAggregateFallbackAcceptanceOptions(executedPipeline || []);
                     return [4 /*yield*/, resolveAssistantAvailableCrossCollectionFallbacks(db, dbName, collection, triedCollections, {
                             fieldHints: collectAggregateReferencedFieldPaths(executedPipeline || [])
                         })];
                 case 57:
                     crossCollectionCandidates = _s.sent();
-                    if (!crossCollectionCandidates.length) return [3 /*break*/, 65];
+                    if (!crossCollectionCandidates.length) return [3 /*break*/, 67];
                     fallbackMeta.collectionRetry = {
                         from: collection,
                         root: retryRootCollection,
@@ -4021,19 +4042,22 @@ function executeAiAssistantMongoAggregate(payload, context) {
                     };
                     _s.label = 58;
                 case 58:
-                    _s.trys.push([58, 63, 64, 65]);
+                    _s.trys.push([58, 65, 66, 67]);
                     crossCollectionCandidates_2 = __values(crossCollectionCandidates), crossCollectionCandidates_2_1 = crossCollectionCandidates_2.next();
                     _s.label = 59;
                 case 59:
-                    if (!!crossCollectionCandidates_2_1.done) return [3 /*break*/, 62];
+                    if (!!crossCollectionCandidates_2_1.done) return [3 /*break*/, 64];
                     candidateCollection = crossCollectionCandidates_2_1.value;
                     addAssistantCollectionToTriedSet(triedCollections, candidateCollection);
                     fallbackPayload = __assign(__assign({}, input), { collection: candidateCollection, __assistantRetryState: buildAssistantRetryState(retryState, triedCollections, {
                             rootCollection: retryRootCollection,
                             disableCrossCollectionRetry: true
                         }) });
-                    return [4 /*yield*/, executeAiAssistantMongoAggregate(fallbackPayload, context)];
+                    _s.label = 60;
                 case 60:
+                    _s.trys.push([60, 62, , 63]);
+                    return [4 /*yield*/, executeAiAssistantMongoAggregate(fallbackPayload, context)];
+                case 61:
                     fallbackResult = _s.sent();
                     fallbackDocs = Array.isArray(fallbackResult === null || fallbackResult === void 0 ? void 0 : fallbackResult.documents) ? fallbackResult.documents : [];
                     fallbackQuality = evaluateAssistantFallbackDocumentsQuality(fallbackDocs, fallbackAcceptanceOptions);
@@ -4067,62 +4091,75 @@ function executeAiAssistantMongoAggregate(payload, context) {
                         });
                         fallbackMeta.collectionRetry.rejectedQuality = rejectedQuality;
                     }
-                    _s.label = 61;
-                case 61:
+                    return [3 /*break*/, 63];
+                case 62:
+                    error_8 = _s.sent();
+                    if (fallbackMeta.collectionRetry && typeof fallbackMeta.collectionRetry === 'object') {
+                        existingErrors = Array.isArray(fallbackMeta.collectionRetry.errors)
+                            ? fallbackMeta.collectionRetry.errors
+                            : [];
+                        existingErrors.push({
+                            collection: candidateCollection,
+                            error: normalizeOptionalString(error_8 === null || error_8 === void 0 ? void 0 : error_8.message) || 'Unknown error'
+                        });
+                        fallbackMeta.collectionRetry.errors = existingErrors;
+                    }
+                    return [3 /*break*/, 63];
+                case 63:
                     crossCollectionCandidates_2_1 = crossCollectionCandidates_2.next();
                     return [3 /*break*/, 59];
-                case 62: return [3 /*break*/, 65];
-                case 63:
+                case 64: return [3 /*break*/, 67];
+                case 65:
                     e_3_1 = _s.sent();
                     e_3 = { error: e_3_1 };
-                    return [3 /*break*/, 65];
-                case 64:
+                    return [3 /*break*/, 67];
+                case 66:
                     try {
                         if (crossCollectionCandidates_2_1 && !crossCollectionCandidates_2_1.done && (_p = crossCollectionCandidates_2.return)) _p.call(crossCollectionCandidates_2);
                     }
                     finally { if (e_3) throw e_3.error; }
                     return [7 /*endfinally*/];
-                case 65:
-                    if (!(!documents.length && isSuperAdmin)) return [3 /*break*/, 82];
+                case 67:
+                    if (!(!documents.length && isSuperAdmin)) return [3 /*break*/, 84];
                     matchStages = (executedPipeline || []).filter(function (stage) { return stage && typeof stage === 'object' && stage.$match && typeof stage.$match === 'object'; });
                     diagnostics = {};
-                    if (!matchStages.length) return [3 /*break*/, 82];
+                    if (!matchStages.length) return [3 /*break*/, 84];
                     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;
-                    _s.label = 66;
-                case 66:
-                    _s.trys.push([66, 71, , 72]);
-                    if (!nameFields.length) return [3 /*break*/, 68];
+                    _s.label = 68;
+                case 68:
+                    _s.trys.push([68, 73, , 74]);
+                    if (!nameFields.length) return [3 /*break*/, 70];
                     queryNoName = stripMatchFields(combinedMatch, nameFields);
                     _g = diagnostics;
                     return [4 /*yield*/, db.collection(collection).countDocuments(queryNoName, {
                             readPreference: AI_ASSISTANT_READ_PREFERENCE
                         })];
-                case 67:
+                case 69:
                     _g.recentCount = _s.sent();
-                    _s.label = 68;
-                case 68:
-                    if (!dateFields.length) return [3 /*break*/, 70];
+                    _s.label = 70;
+                case 70:
+                    if (!dateFields.length) return [3 /*break*/, 72];
                     queryNoDate = stripMatchFields(combinedMatch, dateFields);
                     _h = diagnostics;
                     return [4 /*yield*/, db.collection(collection).countDocuments(queryNoDate, {
                             readPreference: AI_ASSISTANT_READ_PREFERENCE
                         })];
-                case 69:
-                    _h.nameMatchCount = _s.sent();
-                    _s.label = 70;
-                case 70: return [3 /*break*/, 72];
                 case 71:
+                    _h.nameMatchCount = _s.sent();
+                    _s.label = 72;
+                case 72: return [3 /*break*/, 74];
+                case 73:
                     _j = _s.sent();
-                    return [3 /*break*/, 72];
-                case 72:
-                    _s.trys.push([72, 75, , 76]);
+                    return [3 /*break*/, 74];
+                case 74:
+                    _s.trys.push([74, 77, , 78]);
                     _k = probeDocs;
-                    if (_k) return [3 /*break*/, 74];
+                    if (_k) return [3 /*break*/, 76];
                     return [4 /*yield*/, fetchAssistantProbeDocs({
                             db: db,
                             collection: collection,
@@ -4131,47 +4168,47 @@ function executeAiAssistantMongoAggregate(payload, context) {
                             isSuperAdmin: isSuperAdmin,
                             includeClientScope: shouldScopeByClient
                         })];
-                case 73:
+                case 75:
                     _k = (_s.sent());
-                    _s.label = 74;
-                case 74:
+                    _s.label = 76;
+                case 76:
                     probeDocs = _k;
                     if (probeDocs.length && nameFields.length) {
                         diagnostics.chemicalIdDetected = detectChemicalIdFromProbe(probeDocs, nameFields);
                     }
-                    return [3 /*break*/, 76];
-                case 75:
+                    return [3 /*break*/, 78];
+                case 77:
                     _l = _s.sent();
-                    return [3 /*break*/, 76];
-                case 76:
-                    _s.trys.push([76, 80, , 81]);
+                    return [3 /*break*/, 78];
+                case 78:
+                    _s.trys.push([78, 82, , 83]);
                     return [4 /*yield*/, listAssistantCollections(db, dbName)];
-                case 77:
+                case 79:
                     allCollections = _s.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*/, 79];
+                    if (!(alt && alt !== collection && allCollections.includes(alt))) return [3 /*break*/, 81];
                     return [4 /*yield*/, db.collection(alt).countDocuments({}, { readPreference: AI_ASSISTANT_READ_PREFERENCE })];
-                case 78:
+                case 80:
                     altCount = _s.sent();
                     diagnostics.alternateCollection = alt;
                     diagnostics.alternateCollectionCount = altCount;
-                    _s.label = 79;
-                case 79: return [3 /*break*/, 81];
-                case 80:
+                    _s.label = 81;
+                case 81: return [3 /*break*/, 83];
+                case 82:
                     _m = _s.sent();
-                    return [3 /*break*/, 81];
-                case 81:
+                    return [3 /*break*/, 83];
+                case 83:
                     fallbackMeta.zeroDiagnostics = diagnostics;
-                    _s.label = 82;
-                case 82: return [4 /*yield*/, verifyAssistantAggregateReliability({
+                    _s.label = 84;
+                case 84: return [4 /*yield*/, verifyAssistantAggregateReliability({
                         db: db,
                         collection: collection,
                         pipeline: executedPipeline,
                         documents: documents,
                         aggregateOptions: aggregateOptions
                     })];
-                case 83:
+                case 85:
                     verification = _s.sent();
                     sanitizedDocuments = isSuperAdmin
                         ? documents
@@ -4190,7 +4227,7 @@ function executeAiAssistantMongoAggregate(payload, context) {
                             idCustomer: customerId,
                             isSuperAdmin: isSuperAdmin
                         })];
-                case 84:
+                case 86:
                     idLookupDisplay = _s.sent();
                     if (idLookupDisplay === null || idLookupDisplay === void 0 ? void 0 : idLookupDisplay.docs) {
                         displayDocs = idLookupDisplay.docs;
@@ -5624,6 +5661,557 @@ function buildAssistantGenericHoursDirective(message, collectionHints) {
         rawLine: 'HEURISTIC_AGG(schema-hours-user-time)'
     };
 }
+function parseAssistantNaturalNumber(value) {
+    var normalized = normalizeOptionalString(value).toLowerCase();
+    if (!normalized) {
+        return null;
+    }
+    var numeric = Number(normalized);
+    if (Number.isFinite(numeric) && numeric > 0) {
+        return (0, common_1.round)(numeric);
+    }
+    var wordMap = {
+        one: 1,
+        two: 2,
+        three: 3,
+        four: 4,
+        five: 5,
+        six: 6,
+        seven: 7,
+        eight: 8,
+        nine: 9,
+        ten: 10,
+        eleven: 11,
+        twelve: 12,
+        thirteen: 13,
+        fourteen: 14,
+        fifteen: 15,
+        sixteen: 16,
+        seventeen: 17,
+        eighteen: 18,
+        nineteen: 19,
+        twenty: 20
+    };
+    return wordMap[normalized] || null;
+}
+function resolveAssistantNaturalNumberFromPattern(message, pattern, fallback, min, max) {
+    var normalizedMessage = normalizeOptionalString(message).toLowerCase();
+    if (!normalizedMessage) {
+        return fallback;
+    }
+    var match = normalizedMessage.match(pattern);
+    var parsed = parseAssistantNaturalNumber(String((match === null || match === void 0 ? void 0 : match[1]) || ''));
+    if (!parsed) {
+        return fallback;
+    }
+    return Math.min(Math.max(parsed, min), max);
+}
+function resolveAssistantHeuristicCollectionFromCandidates(collectionHints, candidates, collectionNames) {
+    var e_5, _a, e_6, _b, e_7, _c;
+    if (collectionNames === void 0) { collectionNames = []; }
+    var hints = mergeAssistantHintValues(collectionHints || []);
+    var preferred = mergeAssistantHintValues(candidates || []);
+    var availableCollections = mergeAssistantHintValues(collectionNames || []);
+    var reportBuilderCollections = mergeAssistantHintValues(listAssistantReportBuilderCollectionsFromManager());
+    var effectiveAvailableCollections = reportBuilderCollections.length
+        ? reportBuilderCollections
+        : availableCollections;
+    var _loop_3 = function (candidate) {
+        var candidateFamily = normalizeAssistantCollectionFamilyName(candidate);
+        if (!candidateFamily) {
+            return "continue";
+        }
+        var matchedCollection = effectiveAvailableCollections.find(function (name) { return normalizeAssistantCollectionFamilyName(name) === candidateFamily; });
+        if (matchedCollection) {
+            return { value: matchedCollection };
+        }
+    };
+    try {
+        for (var preferred_1 = __values(preferred), preferred_1_1 = preferred_1.next(); !preferred_1_1.done; preferred_1_1 = preferred_1.next()) {
+            var candidate = preferred_1_1.value;
+            var state_3 = _loop_3(candidate);
+            if (typeof state_3 === "object")
+                return state_3.value;
+        }
+    }
+    catch (e_5_1) { e_5 = { error: e_5_1 }; }
+    finally {
+        try {
+            if (preferred_1_1 && !preferred_1_1.done && (_a = preferred_1.return)) _a.call(preferred_1);
+        }
+        finally { if (e_5) throw e_5.error; }
+    }
+    var _loop_4 = function (candidate) {
+        var candidateFamily = normalizeAssistantCollectionFamilyName(candidate);
+        if (!candidateFamily) {
+            return "continue";
+        }
+        var matchedCollection = availableCollections.find(function (name) { return normalizeAssistantCollectionFamilyName(name) === candidateFamily; });
+        if (matchedCollection) {
+            return { value: matchedCollection };
+        }
+    };
+    try {
+        for (var preferred_2 = __values(preferred), preferred_2_1 = preferred_2.next(); !preferred_2_1.done; preferred_2_1 = preferred_2.next()) {
+            var candidate = preferred_2_1.value;
+            var state_4 = _loop_4(candidate);
+            if (typeof state_4 === "object")
+                return state_4.value;
+        }
+    }
+    catch (e_6_1) { e_6 = { error: e_6_1 }; }
+    finally {
+        try {
+            if (preferred_2_1 && !preferred_2_1.done && (_b = preferred_2.return)) _b.call(preferred_2);
+        }
+        finally { if (e_6) throw e_6.error; }
+    }
+    var _loop_5 = function (candidate) {
+        var candidateFamily = normalizeAssistantCollectionFamilyName(candidate);
+        if (!candidateFamily) {
+            return "continue";
+        }
+        var matchedHint = hints.find(function (hint) { return normalizeAssistantCollectionFamilyName(hint) === candidateFamily; });
+        if (matchedHint) {
+            return { value: matchedHint };
+        }
+    };
+    try {
+        for (var preferred_3 = __values(preferred), preferred_3_1 = preferred_3.next(); !preferred_3_1.done; preferred_3_1 = preferred_3.next()) {
+            var candidate = preferred_3_1.value;
+            var state_5 = _loop_5(candidate);
+            if (typeof state_5 === "object")
+                return state_5.value;
+        }
+    }
+    catch (e_7_1) { e_7 = { error: e_7_1 }; }
+    finally {
+        try {
+            if (preferred_3_1 && !preferred_3_1.done && (_c = preferred_3.return)) _c.call(preferred_3);
+        }
+        finally { if (e_7) throw e_7.error; }
+    }
+    if (!effectiveAvailableCollections.length && !hints.length) {
+        return normalizeOptionalString(preferred[0]) || '';
+    }
+    return normalizeOptionalString(effectiveAvailableCollections[0])
+        || normalizeOptionalString(availableCollections[0])
+        || normalizeOptionalString(hints[0])
+        || normalizeOptionalString(preferred[0])
+        || '';
+}
+function buildAssistantActiveClientsCountDirective(message, collectionHints, collectionNames) {
+    var text = normalizeOptionalString(message).toLowerCase();
+    if (!text) {
+        return null;
+    }
+    if (!/\bactive\b/i.test(text)) {
+        return null;
+    }
+    if (!/\b(clients?|customers?)\b/i.test(text)) {
+        return null;
+    }
+    if (!/\b(how\s+many|count|number|total|show|list)\b/i.test(text)) {
+        return null;
+    }
+    if (/\binactive\b/i.test(text)) {
+        return null;
+    }
+    var reportBuilderCollections = mergeAssistantHintValues(listAssistantReportBuilderCollectionsFromManager());
+    var knownCollections = mergeAssistantHintValues(collectionNames || [], reportBuilderCollections);
+    var selectCollection = function (candidates) {
+        var candidateFamilies = new Set(mergeAssistantHintValues(candidates || [])
+            .map(function (candidate) { return normalizeAssistantCollectionFamilyName(candidate); })
+            .filter(Boolean));
+        if (!candidateFamilies.size) {
+            return '';
+        }
+        var resolved = resolveAssistantHeuristicCollectionFromCandidates(collectionHints, candidates, collectionNames);
+        var resolvedFamily = normalizeAssistantCollectionFamilyName(resolved);
+        if (!resolvedFamily || !candidateFamilies.has(resolvedFamily)) {
+            return '';
+        }
+        if (knownCollections.length) {
+            var knownMatch = knownCollections.some(function (name) { return normalizeAssistantCollectionFamilyName(name) === resolvedFamily; });
+            if (!knownMatch) {
+                return '';
+            }
+        }
+        return resolved;
+    };
+    var collection = selectCollection(['customers', 'clients']);
+    if (!collection) {
+        var rbSupportsUsers = reportBuilderCollections.some(function (name) { return normalizeAssistantCollectionFamilyName(name) === 'users'; });
+        if (rbSupportsUsers) {
+            collection = selectCollection(['users']);
+        }
+    }
+    if (!collection) {
+        return null;
+    }
+    var matchAnd = [
+        {
+            $or: [
+                { active: true },
+                { is_active: true },
+                { isactive: true },
+                { enabled: true },
+                { is_enabled: true },
+                { isenabled: true },
+                { status: { $regex: '^active$', $options: 'i' } },
+                { state: { $regex: '^active$', $options: 'i' } }
+            ]
+        }
+    ];
+    var collectionFamily = normalizeAssistantCollectionFamilyName(collection);
+    if (collectionFamily === 'users') {
+        matchAnd.push({
+            $or: [
+                { 'other.id_customer': { $exists: true, $ne: null } },
+                { id_customer: { $exists: true, $ne: null } },
+                { customer: { $exists: true, $ne: null } }
+            ]
+        });
+        matchAnd.push({
+            $or: [
+                { 'other.id_client': { $exists: true, $ne: null } },
+                { id_client: { $exists: true, $ne: null } }
+            ]
+        });
+        matchAnd.push({ 'roles.super_admin': { $ne: true } });
+    }
+    return {
+        type: 'aggregate',
+        payload: {
+            collection: collection,
+            permissionView: '/client/list',
+            pipeline: [
+                {
+                    $match: {
+                        $and: matchAnd
+                    }
+                },
+                {
+                    $group: {
+                        _id: null,
+                        active_clients: { $sum: 1 }
+                    }
+                },
+                {
+                    $project: {
+                        _id: 0,
+                        active_clients: 1
+                    }
+                }
+            ],
+            options: {
+                allowDiskUse: true,
+                limit: 1
+            }
+        },
+        cleaned: '',
+        rawLine: 'HEURISTIC_AGG(active-clients-count)'
+    };
+}
+function buildAssistantWorkOrderCreatedThisWeekStatusDirective(message, collectionHints, collectionNames) {
+    var text = normalizeOptionalString(message).toLowerCase();
+    if (!text) {
+        return null;
+    }
+    if (!hasAssistantWorkOrderAliasTerms(text)) {
+        return null;
+    }
+    if (!/\bthis\s+week\b/i.test(text)) {
+        return null;
+    }
+    if (!/\b(group(?:ed)?\s+by\s+status|by\s+status)\b/i.test(text)) {
+        return null;
+    }
+    var limit = resolveAssistantNaturalNumberFromPattern(text, /\blast\s+([a-z0-9]+)\b/i, 20, 1, AI_ASSISTANT_MONGO_MAX_LIMIT);
+    var collection = resolveAssistantHeuristicCollectionFromCandidates(collectionHints, AI_ASSISTANT_WORK_ORDER_HINT_CANDIDATES, collectionNames);
+    if (!collection) {
+        return null;
+    }
+    var startOfWeekExpr = {
+        $dateTrunc: {
+            date: '$$NOW',
+            unit: 'week',
+            startOfWeek: 'monday',
+            timezone: 'UTC'
+        }
+    };
+    return {
+        type: 'aggregate',
+        payload: {
+            collection: collection,
+            permissionView: resolveDefaultAssistantPermissionView(collection),
+            pipeline: [
+                {
+                    $match: {
+                        $expr: {
+                            $or: [
+                                {
+                                    $and: [
+                                        { $gte: ['$date_created', startOfWeekExpr] },
+                                        { $lt: ['$date_created', '$$NOW'] }
+                                    ]
+                                },
+                                {
+                                    $and: [
+                                        { $gte: ['$createdAt', startOfWeekExpr] },
+                                        { $lt: ['$createdAt', '$$NOW'] }
+                                    ]
+                                }
+                            ]
+                        }
+                    }
+                },
+                {
+                    $addFields: {
+                        effective_created_at: { $ifNull: ['$date_created', '$createdAt'] }
+                    }
+                },
+                {
+                    $sort: {
+                        effective_created_at: -1
+                    }
+                },
+                {
+                    $limit: limit
+                },
+                {
+                    $group: {
+                        _id: { $ifNull: ['$status', { $ifNull: ['$state', 'Unknown'] }] },
+                        work_order_count: { $sum: 1 }
+                    }
+                },
+                {
+                    $sort: {
+                        work_order_count: -1,
+                        _id: 1
+                    }
+                },
+                {
+                    $project: {
+                        _id: 0,
+                        status: '$_id',
+                        work_order_count: 1
+                    }
+                }
+            ],
+            options: {
+                allowDiskUse: true,
+                limit: limit
+            }
+        },
+        cleaned: '',
+        rawLine: 'HEURISTIC_AGG(work-order-created-this-week-status)'
+    };
+}
+function buildAssistantCompletedWorkOrdersPerDayDirective(message, collectionHints, collectionNames) {
+    var text = normalizeOptionalString(message).toLowerCase();
+    if (!text) {
+        return null;
+    }
+    if (!hasAssistantWorkOrderAliasTerms(text)) {
+        return null;
+    }
+    if (!/\b(completed|closed)\b/i.test(text)) {
+        return null;
+    }
+    if (!/\b(by|per)\s+day\b/i.test(text)) {
+        return null;
+    }
+    var days = resolveAssistantNaturalNumberFromPattern(text, /\b(?:last|past)\s+([a-z0-9]+)\s+days?\b/i, 30, 1, 365);
+    var collection = resolveAssistantHeuristicCollectionFromCandidates(collectionHints, AI_ASSISTANT_WORK_ORDER_HINT_CANDIDATES, collectionNames);
+    if (!collection) {
+        return null;
+    }
+    return {
+        type: 'aggregate',
+        payload: {
+            collection: collection,
+            permissionView: resolveDefaultAssistantPermissionView(collection),
+            pipeline: [
+                {
+                    $addFields: {
+                        effective_completed_at: {
+                            $ifNull: [
+                                '$date_completed',
+                                {
+                                    $ifNull: [
+                                        '$completedAt',
+                                        '$date_closed'
+                                    ]
+                                }
+                            ]
+                        }
+                    }
+                },
+                {
+                    $match: {
+                        $expr: {
+                            $and: [
+                                { $ne: ['$effective_completed_at', null] },
+                                {
+                                    $gte: [
+                                        '$effective_completed_at',
+                                        {
+                                            $dateSubtract: {
+                                                startDate: '$$NOW',
+                                                unit: 'day',
+                                                amount: days
+                                            }
+                                        }
+                                    ]
+                                },
+                                { $lt: ['$effective_completed_at', '$$NOW'] }
+                            ]
+                        }
+                    }
+                },
+                {
+                    $group: {
+                        _id: {
+                            $dateToString: {
+                                format: '%Y-%m-%d',
+                                date: '$effective_completed_at',
+                                timezone: 'UTC'
+                            }
+                        },
+                        completed_work_orders: { $sum: 1 }
+                    }
+                },
+                {
+                    $sort: {
+                        _id: 1
+                    }
+                },
+                {
+                    $project: {
+                        _id: 0,
+                        day_utc: '$_id',
+                        completed_work_orders: 1
+                    }
+                }
+            ],
+            options: {
+                allowDiskUse: true,
+                limit: Math.min(days + 10, AI_ASSISTANT_MONGO_MAX_LIMIT)
+            }
+        },
+        cleaned: '',
+        rawLine: 'HEURISTIC_AGG(work-order-completed-per-day)'
+    };
+}
+function buildAssistantWorkOrderTopCustomersDirective(message, collectionHints, collectionNames) {
+    var text = normalizeOptionalString(message).toLowerCase();
+    if (!text) {
+        return null;
+    }
+    if (!hasAssistantWorkOrderAliasTerms(text)) {
+        return null;
+    }
+    if (!/\b(customers?|clients?|accounts?)\b/i.test(text)) {
+        return null;
+    }
+    if (!/\btop\b/i.test(text)) {
+        return null;
+    }
+    var hasMonthWindow = /\b(?:last|past)\s+[a-z0-9]+\s+months?\b/i.test(text);
+    if (!hasMonthWindow) {
+        return null;
+    }
+    var topN = resolveAssistantNaturalNumberFromPattern(text, /\btop\s+([a-z0-9]+)\b/i, 10, 1, 100);
+    var months = resolveAssistantNaturalNumberFromPattern(text, /\b(?:last|past)\s+([a-z0-9]+)\s+months?\b/i, 6, 1, 24);
+    var collection = resolveAssistantHeuristicCollectionFromCandidates(collectionHints, AI_ASSISTANT_WORK_ORDER_HINT_CANDIDATES, collectionNames);
+    if (!collection) {
+        return null;
+    }
+    return {
+        type: 'aggregate',
+        payload: {
+            collection: collection,
+            permissionView: resolveDefaultAssistantPermissionView(collection),
+            pipeline: [
+                {
+                    $addFields: {
+                        effective_date: {
+                            $ifNull: [
+                                '$date_created',
+                                { $ifNull: ['$date_create', '$createdAt'] }
+                            ]
+                        },
+                        customer_label: {
+                            $ifNull: [
+                                '$customer',
+                                {
+                                    $ifNull: [
+                                        '$customer_name',
+                                        {
+                                            $ifNull: [
+                                                '$client_name',
+                                                {
+                                                    $ifNull: [
+                                                        { $toString: '$id_customer' },
+                                                        { $ifNull: ['$qb_ListID_class', 'Unknown'] }
+                                                    ]
+                                                }
+                                            ]
+                                        }
+                                    ]
+                                }
+                            ]
+                        }
+                    }
+                },
+                {
+                    $match: {
+                        effective_date: {
+                            $gte: {
+                                $dateSubtract: {
+                                    startDate: '$$NOW',
+                                    unit: 'month',
+                                    amount: months
+                                }
+                            },
+                            $lt: '$$NOW'
+                        },
+                        'deleted.date': { $exists: false }
+                    }
+                },
+                {
+                    $group: {
+                        _id: '$customer_label',
+                        work_order_count: { $sum: 1 }
+                    }
+                },
+                {
+                    $sort: {
+                        work_order_count: -1,
+                        _id: 1
+                    }
+                },
+                {
+                    $limit: topN
+                },
+                {
+                    $project: {
+                        _id: 0,
+                        customer: '$_id',
+                        work_order_count: 1
+                    }
+                }
+            ],
+            options: {
+                allowDiskUse: true,
+                limit: topN
+            }
+        },
+        cleaned: '',
+        rawLine: 'HEURISTIC_AGG(work-order-top-customers-window)'
+    };
+}
 function isAssistantSchemaHoursHeuristicDirective(directive) {
     var rawLine = normalizeOptionalString(directive === null || directive === void 0 ? void 0 : directive.rawLine).toLowerCase();
     return rawLine.includes('heuristic_agg(schema-hours-user-time)');
@@ -5632,11 +6220,24 @@ function isAssistantBlendThroughputHeuristicDirective(directive) {
     var rawLine = normalizeOptionalString(directive === null || directive === void 0 ? void 0 : directive.rawLine).toLowerCase();
     return rawLine.includes('heuristic_agg(blend-throughput-day-window)');
 }
+function isAssistantWorkOrderHeuristicDirective(directive) {
+    var rawLine = normalizeOptionalString(directive === null || directive === void 0 ? void 0 : directive.rawLine).toLowerCase();
+    return rawLine.includes('heuristic_agg(work-order-created-this-week-status)')
+        || rawLine.includes('heuristic_agg(work-order-completed-per-day)')
+        || rawLine.includes('heuristic_agg(work-order-top-customers-window)');
+}
+function isAssistantActiveClientsHeuristicDirective(directive) {
+    var rawLine = normalizeOptionalString(directive === null || directive === void 0 ? void 0 : directive.rawLine).toLowerCase();
+    return rawLine.includes('heuristic_agg(active-clients-count)');
+}
 function isAssistantDeterministicHeuristicDirective(directive) {
     return isAssistantSchemaHoursHeuristicDirective(directive)
-        || isAssistantBlendThroughputHeuristicDirective(directive);
+        || isAssistantBlendThroughputHeuristicDirective(directive)
+        || isAssistantWorkOrderHeuristicDirective(directive)
+        || isAssistantActiveClientsHeuristicDirective(directive);
 }
-function buildAssistantHeuristicDirective(message, collectionHints) {
+function buildAssistantHeuristicDirective(message, collectionHints, collectionNames) {
+    if (collectionNames === void 0) { collectionNames = []; }
     if (!normalizeOptionalString(message)) {
         return null;
     }
@@ -5644,6 +6245,22 @@ function buildAssistantHeuristicDirective(message, collectionHints) {
     if (blendThroughputDirective) {
         return blendThroughputDirective;
     }
+    var activeClientsDirective = buildAssistantActiveClientsCountDirective(message, collectionHints, collectionNames);
+    if (activeClientsDirective) {
+        return activeClientsDirective;
+    }
+    var workOrderCreatedWeekDirective = buildAssistantWorkOrderCreatedThisWeekStatusDirective(message, collectionHints, collectionNames);
+    if (workOrderCreatedWeekDirective) {
+        return workOrderCreatedWeekDirective;
+    }
+    var completedWorkOrdersPerDayDirective = buildAssistantCompletedWorkOrdersPerDayDirective(message, collectionHints, collectionNames);
+    if (completedWorkOrdersPerDayDirective) {
+        return completedWorkOrdersPerDayDirective;
+    }
+    var workOrderTopCustomersDirective = buildAssistantWorkOrderTopCustomersDirective(message, collectionHints, collectionNames);
+    if (workOrderTopCustomersDirective) {
+        return workOrderTopCustomersDirective;
+    }
     var schemaHoursDirective = buildAssistantGenericHoursDirective(message, collectionHints);
     if (schemaHoursDirective) {
         return schemaHoursDirective;
@@ -5679,9 +6296,18 @@ function resolveDefaultAssistantPermissionView(collection) {
     if (base.startsWith('client')) {
         return '/client/list';
     }
+    if (base.startsWith('customer')) {
+        return '/client/list';
+    }
     if (base.startsWith('employee')) {
         return '/employee/list';
     }
+    if (/work[-_/ ]?orders?|maintenance[-_/ ]?orders?|repair[-_/ ]?orders?/.test(base)) {
+        return '/order/list';
+    }
+    if (base === 'orders' || base.startsWith('order-') || base.startsWith('orders-')) {
+        return '/order/list';
+    }
     if (base.startsWith('support-ticket') || base.startsWith('supportticket')) {
         return '/support-ticket/list';
     }
@@ -5765,7 +6391,7 @@ function ensureAssistantDisplayColumns(display, requestedColumns) {
     return __assign(__assign({}, display), { columns: columns, rows: rows });
 }
 function resolveAssistantPipelineTimeGrain(pipeline) {
-    var e_5, _a;
+    var e_8, _a;
     if (!Array.isArray(pipeline) || !pipeline.length) {
         return null;
     }
@@ -5827,12 +6453,12 @@ function resolveAssistantPipelineTimeGrain(pipeline) {
             }
         }
     }
-    catch (e_5_1) { e_5 = { error: e_5_1 }; }
+    catch (e_8_1) { e_8 = { error: e_8_1 }; }
     finally {
         try {
             if (priority_1_1 && !priority_1_1.done && (_a = priority_1.return)) _a.call(priority_1);
         }
-        finally { if (e_5) throw e_5.error; }
+        finally { if (e_8) throw e_8.error; }
     }
     return null;
 }
@@ -6535,7 +7161,7 @@ function applyAssistantDatedReportWindow(value, toolResult) {
     return "".concat(line, "\n\n").concat(content).trim();
 }
 function resolveAssistantDatedReportWindow(toolResult) {
-    var e_6, _a;
+    var e_9, _a;
     var _b, _c, _d, _e, _f, _g, _h, _j;
     var verificationWindow = (_d = (_c = (_b = toolResult === null || toolResult === void 0 ? void 0 : toolResult.output) === null || _b === void 0 ? void 0 : _b.verification) === null || _c === void 0 ? void 0 : _c.metrics) === null || _d === void 0 ? void 0 : _d.window;
     var verificationStart = normalizeOptionalString(verificationWindow === null || verificationWindow === void 0 ? void 0 : verificationWindow.startDate);
@@ -6601,12 +7227,12 @@ function resolveAssistantDatedReportWindow(toolResult) {
             };
         }
     }
-    catch (e_6_1) { e_6 = { error: e_6_1 }; }
+    catch (e_9_1) { e_9 = { error: e_9_1 }; }
     finally {
         try {
             if (pipelineCandidates_1_1 && !pipelineCandidates_1_1.done && (_a = pipelineCandidates_1.return)) _a.call(pipelineCandidates_1);
         }
-        finally { if (e_6) throw e_6.error; }
+        finally { if (e_9) throw e_9.error; }
     }
     return null;
 }
@@ -7238,7 +7864,7 @@ function getValueAtPath(obj, path) {
     return walk(obj, 0);
 }
 function hasArrayValueAtPath(docs, path) {
-    var e_7, _a;
+    var e_10, _a;
     if (!Array.isArray(docs) || !docs.length || !path) {
         return false;
     }
@@ -7251,17 +7877,17 @@ function hasArrayValueAtPath(docs, path) {
             }
         }
     }
-    catch (e_7_1) { e_7 = { error: e_7_1 }; }
+    catch (e_10_1) { e_10 = { error: e_10_1 }; }
     finally {
         try {
             if (docs_1_1 && !docs_1_1.done && (_a = docs_1.return)) _a.call(docs_1);
         }
-        finally { if (e_7) throw e_7.error; }
+        finally { if (e_10) throw e_10.error; }
     }
     return false;
 }
 function inferIdFieldStorageTypeFromDocs(docs, fieldPath) {
-    var e_8, _a, e_9, _b;
+    var e_11, _a, e_12, _b;
     if (!Array.isArray(docs) || !fieldPath) {
         return 'unknown';
     }
@@ -7274,7 +7900,7 @@ function inferIdFieldStorageTypeFromDocs(docs, fieldPath) {
                 : doc === null || doc === void 0 ? void 0 : doc[fieldPath];
             var queue = Array.isArray(value) ? value : [value];
             try {
-                for (var queue_1 = (e_9 = void 0, __values(queue)), queue_1_1 = queue_1.next(); !queue_1_1.done; queue_1_1 = queue_1.next()) {
+                for (var queue_1 = (e_12 = 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;
@@ -7287,21 +7913,21 @@ function inferIdFieldStorageTypeFromDocs(docs, fieldPath) {
                     }
                 }
             }
-            catch (e_9_1) { e_9 = { error: e_9_1 }; }
+            catch (e_12_1) { e_12 = { error: e_12_1 }; }
             finally {
                 try {
                     if (queue_1_1 && !queue_1_1.done && (_b = queue_1.return)) _b.call(queue_1);
                 }
-                finally { if (e_9) throw e_9.error; }
+                finally { if (e_12) throw e_12.error; }
             }
         }
     }
-    catch (e_8_1) { e_8 = { error: e_8_1 }; }
+    catch (e_11_1) { e_11 = { error: e_11_1 }; }
     finally {
         try {
             if (docs_2_1 && !docs_2_1.done && (_a = docs_2.return)) _a.call(docs_2);
         }
-        finally { if (e_8) throw e_8.error; }
+        finally { if (e_11) throw e_11.error; }
     }
     return sawString ? 'string' : 'unknown';
 }
@@ -7396,7 +8022,7 @@ function normalizeLookupKeyValue(value) {
     return '';
 }
 function collectTopLevelIdFieldValues(docs, options) {
-    var e_10, _a, e_11, _b;
+    var e_13, _a, e_14, _b;
     if (!Array.isArray(docs) || !docs.length) {
         return [];
     }
@@ -7414,7 +8040,7 @@ function collectTopLevelIdFieldValues(docs, options) {
                 continue;
             }
             var keys = Object.keys(doc);
-            var _loop_3 = function (key) {
+            var _loop_6 = function (key) {
                 if (!key || key === '_id' || key === '__v') {
                     return "continue";
                 }
@@ -7444,26 +8070,26 @@ function collectTopLevelIdFieldValues(docs, options) {
                 });
             };
             try {
-                for (var keys_1 = (e_11 = void 0, __values(keys)), keys_1_1 = keys_1.next(); !keys_1_1.done; keys_1_1 = keys_1.next()) {
+                for (var keys_1 = (e_14 = 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);
+                    _loop_6(key);
                 }
             }
-            catch (e_11_1) { e_11 = { error: e_11_1 }; }
+            catch (e_14_1) { e_14 = { error: e_14_1 }; }
             finally {
                 try {
                     if (keys_1_1 && !keys_1_1.done && (_b = keys_1.return)) _b.call(keys_1);
                 }
-                finally { if (e_11) throw e_11.error; }
+                finally { if (e_14) throw e_14.error; }
             }
         }
     }
-    catch (e_10_1) { e_10 = { error: e_10_1 }; }
+    catch (e_13_1) { e_13 = { error: e_13_1 }; }
     finally {
         try {
             if (docs_3_1 && !docs_3_1.done && (_a = docs_3.return)) _a.call(docs_3);
         }
-        finally { if (e_10) throw e_10.error; }
+        finally { if (e_13) throw e_13.error; }
     }
     return Array.from(fieldMap.entries()).map(function (_a) {
         var _b = __read(_a, 2), field = _b[0], values = _b[1];
@@ -7582,8 +8208,8 @@ function resolveLookupMappingsForField(field, mappings) {
 }
 function applyIdLookupDisplayEnrichment(params) {
     return __awaiter(this, void 0, void 0, function () {
-        var docs, collection, db, dbName, idClient, idCustomer, isSuperAdmin, idFields, lookupMappings, allCollections, collectionProbeCache, collectionSchemaCache, lookupMeta, enrichedDocs, _loop_4, idFields_1, idFields_1_1, fieldEntry, e_12_1;
-        var e_12, _a;
+        var docs, collection, db, dbName, idClient, idCustomer, isSuperAdmin, idFields, lookupMappings, allCollections, collectionProbeCache, collectionSchemaCache, lookupMeta, enrichedDocs, _loop_7, idFields_1, idFields_1_1, fieldEntry, e_15_1;
+        var e_15, _a;
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
@@ -7606,9 +8232,9 @@ function applyIdLookupDisplayEnrichment(params) {
                     collectionSchemaCache = new Map();
                     lookupMeta = [];
                     enrichedDocs = docs.map(function (doc) { return (__assign({}, doc)); });
-                    _loop_4 = function (fieldEntry) {
-                        var values, baseToken, mappingMatches, candidateCollections, filteredCandidates, _loop_5, filteredCandidates_1, filteredCandidates_1_1, candidate, state_3, e_13_1;
-                        var e_13, _c;
+                    _loop_7 = function (fieldEntry) {
+                        var values, baseToken, mappingMatches, candidateCollections, filteredCandidates, _loop_8, filteredCandidates_1, filteredCandidates_1_1, candidate, state_6, e_16_1;
+                        var e_16, _c;
                         return __generator(this, function (_d) {
                             switch (_d.label) {
                                 case 0:
@@ -7633,7 +8259,7 @@ function applyIdLookupDisplayEnrichment(params) {
                                     if (!filteredCandidates.length) {
                                         return [2 /*return*/, "continue"];
                                     }
-                                    _loop_5 = function (candidate) {
+                                    _loop_8 = function (candidate) {
                                         var probeDocs, candidateHasClientScope, _e, schemaFields, nameFieldCandidates, mapping, lookupKey, idsForQuery, query, candidateHasClientScope, _f, projection, lookupDocs, bestLookupField, nameField, nameMap, displayField;
                                         var _g, _h;
                                         return __generator(this, function (_j) {
@@ -7770,15 +8396,15 @@ function applyIdLookupDisplayEnrichment(params) {
                                     _d.label = 1;
                                 case 1:
                                     _d.trys.push([1, 6, 7, 8]);
-                                    filteredCandidates_1 = (e_13 = void 0, __values(filteredCandidates)), filteredCandidates_1_1 = filteredCandidates_1.next();
+                                    filteredCandidates_1 = (e_16 = void 0, __values(filteredCandidates)), filteredCandidates_1_1 = filteredCandidates_1.next();
                                     _d.label = 2;
                                 case 2:
                                     if (!!filteredCandidates_1_1.done) return [3 /*break*/, 5];
                                     candidate = filteredCandidates_1_1.value;
-                                    return [5 /*yield**/, _loop_5(candidate)];
+                                    return [5 /*yield**/, _loop_8(candidate)];
                                 case 3:
-                                    state_3 = _d.sent();
-                                    if (state_3 === "break")
+                                    state_6 = _d.sent();
+                                    if (state_6 === "break")
                                         return [3 /*break*/, 5];
                                     _d.label = 4;
                                 case 4:
@@ -7786,14 +8412,14 @@ function applyIdLookupDisplayEnrichment(params) {
                                     return [3 /*break*/, 2];
                                 case 5: return [3 /*break*/, 8];
                                 case 6:
-                                    e_13_1 = _d.sent();
-                                    e_13 = { error: e_13_1 };
+                                    e_16_1 = _d.sent();
+                                    e_16 = { error: e_16_1 };
                                     return [3 /*break*/, 8];
                                 case 7:
                                     try {
                                         if (filteredCandidates_1_1 && !filteredCandidates_1_1.done && (_c = filteredCandidates_1.return)) _c.call(filteredCandidates_1);
                                     }
-                                    finally { if (e_13) throw e_13.error; }
+                                    finally { if (e_16) throw e_16.error; }
                                     return [7 /*endfinally*/];
                                 case 8: return [2 /*return*/];
                             }
@@ -7807,7 +8433,7 @@ function applyIdLookupDisplayEnrichment(params) {
                 case 3:
                     if (!!idFields_1_1.done) return [3 /*break*/, 6];
                     fieldEntry = idFields_1_1.value;
-                    return [5 /*yield**/, _loop_4(fieldEntry)];
+                    return [5 /*yield**/, _loop_7(fieldEntry)];
                 case 4:
                     _b.sent();
                     _b.label = 5;
@@ -7816,14 +8442,14 @@ function applyIdLookupDisplayEnrichment(params) {
                     return [3 /*break*/, 3];
                 case 6: return [3 /*break*/, 9];
                 case 7:
-                    e_12_1 = _b.sent();
-                    e_12 = { error: e_12_1 };
+                    e_15_1 = _b.sent();
+                    e_15 = { error: e_15_1 };
                     return [3 /*break*/, 9];
                 case 8:
                     try {
                         if (idFields_1_1 && !idFields_1_1.done && (_a = idFields_1.return)) _a.call(idFields_1);
                     }
-                    finally { if (e_12) throw e_12.error; }
+                    finally { if (e_15) throw e_15.error; }
                     return [7 /*endfinally*/];
                 case 9:
                     if (!lookupMeta.length) {
@@ -7842,7 +8468,7 @@ function applyIdLookupDisplayEnrichment(params) {
     });
 }
 function hasNonEmptyValue(docs, fieldPath, options) {
-    var e_14, _a;
+    var e_17, _a;
     if (!Array.isArray(docs) || !fieldPath) {
         return false;
     }
@@ -7859,12 +8485,12 @@ function hasNonEmptyValue(docs, fieldPath, options) {
             }
         }
     }
-    catch (e_14_1) { e_14 = { error: e_14_1 }; }
+    catch (e_17_1) { e_17 = { error: e_17_1 }; }
     finally {
         try {
             if (docs_4_1 && !docs_4_1.done && (_a = docs_4.return)) _a.call(docs_4);
         }
-        finally { if (e_14) throw e_14.error; }
+        finally { if (e_17) throw e_17.error; }
     }
     return false;
 }
@@ -8936,6 +9562,15 @@ function applyAssistantDisplayTableToResponse(value, display) {
         var rowCount = typeof normalizedDisplay.rowCount === 'number' && normalizedDisplay.rowCount > 0
             ? normalizedDisplay.rowCount
             : 0;
+        if (rowCount <= 0) {
+            if (!cleaned_1) {
+                return 'No rows matched your request.';
+            }
+            if (/\bno rows? matched\b/i.test(cleaned_1)) {
+                return cleaned_1;
+            }
+            return "".concat(cleaned_1.trim(), "\n\nNo rows matched your request.").trim();
+        }
         var fallbackColumns = Array.isArray(normalizedDisplay.columns) && normalizedDisplay.columns.length
             ? normalizedDisplay.columns
             : resolveAssistantEmptyDisplayColumns(cleaned_1 || value);
@@ -10281,7 +10916,7 @@ function flattenAssistantExprClauses(expr) {
     return [expr];
 }
 function detectAssistantMonthWindowInExpr(expr, allowedDateFields) {
-    var e_15, _a;
+    var e_18, _a;
     var clauses = flattenAssistantExprClauses(expr);
     if (!clauses.length) {
         return null;
@@ -10332,7 +10967,7 @@ function detectAssistantMonthWindowInExpr(expr, allowedDateFields) {
             upperClauses.push({ index: index, field: field, mode: 'full_month' });
         }
     });
-    var _loop_6 = function (lower) {
+    var _loop_9 = function (lower) {
         var upper = upperClauses.find(function (candidate) { return (candidate.field === lower.field
             && candidate.mode === lower.mode); });
         if (!upper) {
@@ -10350,17 +10985,17 @@ function detectAssistantMonthWindowInExpr(expr, allowedDateFields) {
     try {
         for (var lowerClauses_1 = __values(lowerClauses), lowerClauses_1_1 = lowerClauses_1.next(); !lowerClauses_1_1.done; lowerClauses_1_1 = lowerClauses_1.next()) {
             var lower = lowerClauses_1_1.value;
-            var state_4 = _loop_6(lower);
-            if (typeof state_4 === "object")
-                return state_4.value;
+            var state_7 = _loop_9(lower);
+            if (typeof state_7 === "object")
+                return state_7.value;
         }
     }
-    catch (e_15_1) { e_15 = { error: e_15_1 }; }
+    catch (e_18_1) { e_18 = { error: e_18_1 }; }
     finally {
         try {
             if (lowerClauses_1_1 && !lowerClauses_1_1.done && (_a = lowerClauses_1.return)) _a.call(lowerClauses_1);
         }
-        finally { if (e_15) throw e_15.error; }
+        finally { if (e_18) throw e_18.error; }
     }
     return null;
 }
@@ -10423,7 +11058,7 @@ function resolveAssistantMonthlyGroupDateFields(pipeline) {
     return fields;
 }
 function detectAssistantMonthWindowFromPipeline(pipeline) {
-    var e_16, _a;
+    var e_19, _a;
     var _b;
     var monthlyFields = resolveAssistantMonthlyGroupDateFields(pipeline);
     var scanMatch = function (match) {
@@ -10451,12 +11086,12 @@ function detectAssistantMonthWindowFromPipeline(pipeline) {
             }
         }
     }
-    catch (e_16_1) { e_16 = { error: e_16_1 }; }
+    catch (e_19_1) { e_19 = { error: e_19_1 }; }
     finally {
         try {
             if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
         }
-        finally { if (e_16) throw e_16.error; }
+        finally { if (e_19) throw e_19.error; }
     }
     return null;
 }
@@ -10736,7 +11371,7 @@ function normalizeAssistantCustomerLookupProjectionPipeline(pipeline) {
         var nextProject = __assign({}, project);
         var stageChanged = false;
         Object.keys(nextProject).forEach(function (field) {
-            var e_17, _a;
+            var e_20, _a;
             var expression = nextProject[field];
             if (typeof expression !== 'string') {
                 return;
@@ -10772,12 +11407,12 @@ function normalizeAssistantCustomerLookupProjectionPipeline(pipeline) {
                     break;
                 }
             }
-            catch (e_17_1) { e_17 = { error: e_17_1 }; }
+            catch (e_20_1) { e_20 = { error: e_20_1 }; }
             finally {
                 try {
                     if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
                 }
-                finally { if (e_17) throw e_17.error; }
+                finally { if (e_20) throw e_20.error; }
             }
         });
         if (stageChanged) {
@@ -10945,7 +11580,7 @@ function matchContainsField(value, field) {
     });
 }
 function resolveAggregateCompletionFallback(pipeline) {
-    var e_18, _a;
+    var e_21, _a;
     if (!Array.isArray(pipeline)) {
         return null;
     }
@@ -10958,7 +11593,7 @@ function resolveAggregateCompletionFallback(pipeline) {
         }
         var addFields = stage.$addFields;
         try {
-            for (var _b = (e_18 = void 0, __values(Object.keys(addFields))), _c = _b.next(); !_c.done; _c = _b.next()) {
+            for (var _b = (e_21 = void 0, __values(Object.keys(addFields))), _c = _b.next(); !_c.done; _c = _b.next()) {
                 var key = _c.value;
                 if (!isCompletionFieldName(key)) {
                     continue;
@@ -10972,12 +11607,12 @@ function resolveAggregateCompletionFallback(pipeline) {
                 }
             }
         }
-        catch (e_18_1) { e_18 = { error: e_18_1 }; }
+        catch (e_21_1) { e_21 = { error: e_21_1 }; }
         finally {
             try {
                 if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
             }
-            finally { if (e_18) throw e_18.error; }
+            finally { if (e_21) throw e_21.error; }
         }
         if (candidateField) {
             break;
@@ -11133,7 +11768,7 @@ function buildCompletionFallbackSources(field) {
     ]);
 }
 function resolveAggregateCompletionExprFallback(pipeline) {
-    var e_19, _a;
+    var e_22, _a;
     if (!Array.isArray(pipeline)) {
         return null;
     }
@@ -11153,7 +11788,7 @@ function resolveAggregateCompletionExprFallback(pipeline) {
         }
         if (!candidateField) {
             try {
-                for (var _b = (e_19 = void 0, __values(Object.keys(matchStage))), _c = _b.next(); !_c.done; _c = _b.next()) {
+                for (var _b = (e_22 = void 0, __values(Object.keys(matchStage))), _c = _b.next(); !_c.done; _c = _b.next()) {
                     var key = _c.value;
                     if (key.startsWith('$')) {
                         continue;
@@ -11168,12 +11803,12 @@ function resolveAggregateCompletionExprFallback(pipeline) {
                     }
                 }
             }
-            catch (e_19_1) { e_19 = { error: e_19_1 }; }
+            catch (e_22_1) { e_22 = { error: e_22_1 }; }
             finally {
                 try {
                     if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
                 }
-                finally { if (e_19) throw e_19.error; }
+                finally { if (e_22) throw e_22.error; }
             }
         }
         if (!candidateField) {
@@ -11281,7 +11916,7 @@ function resolveAssistantAggregateDimensionFieldHints(pipeline) {
         }
         hints.push(normalized);
     };
-    var _loop_7 = function (index) {
+    var _loop_10 = function (index) {
         var stage = pipeline[index];
         if (!stage || typeof stage !== 'object' || Array.isArray(stage) || !stage.$project || typeof stage.$project !== 'object') {
             return "continue";
@@ -11302,7 +11937,7 @@ function resolveAssistantAggregateDimensionFieldHints(pipeline) {
         });
     };
     for (var index = groupIndex + 1; index < pipeline.length; index += 1) {
-        _loop_7(index);
+        _loop_10(index);
     }
     return hints.slice(0, 6);
 }
@@ -11375,7 +12010,7 @@ function hasAssistantDateGroupingOperator(value) {
     return Object.keys(value).some(function (key) { return hasAssistantDateGroupingOperator(value[key]); });
 }
 function isGroupFieldDerivedFromDateExpression(pipeline, groupIndex, groupPaths) {
-    var e_20, _a, e_21, _b;
+    var e_23, _a, e_24, _b;
     if (!Array.isArray(pipeline) || groupIndex <= 0 || !groupPaths.length) {
         return false;
     }
@@ -11401,14 +12036,14 @@ function isGroupFieldDerivedFromDateExpression(pipeline, groupIndex, groupPaths)
             continue;
         }
         try {
-            for (var stageKeys_1 = (e_20 = void 0, __values(stageKeys)), stageKeys_1_1 = stageKeys_1.next(); !stageKeys_1_1.done; stageKeys_1_1 = stageKeys_1.next()) {
+            for (var stageKeys_1 = (e_23 = void 0, __values(stageKeys)), stageKeys_1_1 = stageKeys_1.next(); !stageKeys_1_1.done; stageKeys_1_1 = stageKeys_1.next()) {
                 var stageKey = stageKeys_1_1.value;
                 var payload = stage[stageKey];
                 if (!payload || typeof payload !== 'object' || Array.isArray(payload)) {
                     continue;
                 }
                 try {
-                    for (var groupFields_1 = (e_21 = void 0, __values(groupFields)), groupFields_1_1 = groupFields_1.next(); !groupFields_1_1.done; groupFields_1_1 = groupFields_1.next()) {
+                    for (var groupFields_1 = (e_24 = void 0, __values(groupFields)), groupFields_1_1 = groupFields_1.next(); !groupFields_1_1.done; groupFields_1_1 = groupFields_1.next()) {
                         var groupField = groupFields_1_1.value;
                         if (!Object.prototype.hasOwnProperty.call(payload, groupField)) {
                             continue;
@@ -11418,21 +12053,21 @@ function isGroupFieldDerivedFromDateExpression(pipeline, groupIndex, groupPaths)
                         }
                     }
                 }
-                catch (e_21_1) { e_21 = { error: e_21_1 }; }
+                catch (e_24_1) { e_24 = { error: e_24_1 }; }
                 finally {
                     try {
                         if (groupFields_1_1 && !groupFields_1_1.done && (_b = groupFields_1.return)) _b.call(groupFields_1);
                     }
-                    finally { if (e_21) throw e_21.error; }
+                    finally { if (e_24) throw e_24.error; }
                 }
             }
         }
-        catch (e_20_1) { e_20 = { error: e_20_1 }; }
+        catch (e_23_1) { e_23 = { error: e_23_1 }; }
         finally {
             try {
                 if (stageKeys_1_1 && !stageKeys_1_1.done && (_a = stageKeys_1.return)) _a.call(stageKeys_1);
             }
-            finally { if (e_20) throw e_20.error; }
+            finally { if (e_23) throw e_23.error; }
         }
     }
     return false;
@@ -11539,7 +12174,7 @@ function isRegexMatchCondition(value) {
     return false;
 }
 function findRegexMatchInMatchObject(match, prefix) {
-    var e_22, _a, e_23, _b;
+    var e_25, _a, e_26, _b;
     if (prefix === void 0) { prefix = ''; }
     if (Array.isArray(match)) {
         try {
@@ -11551,12 +12186,12 @@ function findRegexMatchInMatchObject(match, prefix) {
                 }
             }
         }
-        catch (e_22_1) { e_22 = { error: e_22_1 }; }
+        catch (e_25_1) { e_25 = { error: e_25_1 }; }
         finally {
             try {
                 if (match_1_1 && !match_1_1.done && (_a = match_1.return)) _a.call(match_1);
             }
-            finally { if (e_22) throw e_22.error; }
+            finally { if (e_25) throw e_25.error; }
         }
         return null;
     }
@@ -11587,12 +12222,12 @@ function findRegexMatchInMatchObject(match, prefix) {
             }
         }
     }
-    catch (e_23_1) { e_23 = { error: e_23_1 }; }
+    catch (e_26_1) { e_26 = { error: e_26_1 }; }
     finally {
         try {
             if (keys_2_1 && !keys_2_1.done && (_b = keys_2.return)) _b.call(keys_2);
         }
-        finally { if (e_23) throw e_23.error; }
+        finally { if (e_26) throw e_26.error; }
     }
     return null;
 }
@@ -11816,7 +12451,7 @@ function collectMatchFieldsByCondition(match, predicate, prefix) {
     return results;
 }
 function findMatchConditionForField(match, targetField, prefix) {
-    var e_24, _a, e_25, _b;
+    var e_27, _a, e_28, _b;
     if (prefix === void 0) { prefix = ''; }
     if (!match || typeof match !== 'object') {
         return undefined;
@@ -11831,12 +12466,12 @@ function findMatchConditionForField(match, targetField, prefix) {
                 }
             }
         }
-        catch (e_24_1) { e_24 = { error: e_24_1 }; }
+        catch (e_27_1) { e_27 = { error: e_27_1 }; }
         finally {
             try {
                 if (match_2_1 && !match_2_1.done && (_a = match_2.return)) _a.call(match_2);
             }
-            finally { if (e_24) throw e_24.error; }
+            finally { if (e_27) throw e_27.error; }
         }
         return undefined;
     }
@@ -11863,12 +12498,12 @@ function findMatchConditionForField(match, targetField, prefix) {
             }
         }
     }
-    catch (e_25_1) { e_25 = { error: e_25_1 }; }
+    catch (e_28_1) { e_28 = { error: e_28_1 }; }
     finally {
         try {
             if (_d && !_d.done && (_b = _c.return)) _b.call(_c);
         }
-        finally { if (e_25) throw e_25.error; }
+        finally { if (e_28) throw e_28.error; }
     }
     return undefined;
 }
@@ -12014,7 +12649,7 @@ function detectIdLikeValue(value) {
     return false;
 }
 function detectChemicalIdFromProbe(probeDocs, fields) {
-    var e_26, _a, e_27, _b;
+    var e_29, _a, e_30, _b;
     if (!Array.isArray(probeDocs) || !probeDocs.length) {
         return false;
     }
@@ -12026,7 +12661,7 @@ function detectChemicalIdFromProbe(probeDocs, fields) {
         for (var probeDocs_1 = __values(probeDocs), probeDocs_1_1 = probeDocs_1.next(); !probeDocs_1_1.done; probeDocs_1_1 = probeDocs_1.next()) {
             var doc = probeDocs_1_1.value;
             try {
-                for (var targets_1 = (e_27 = void 0, __values(targets)), targets_1_1 = targets_1.next(); !targets_1_1.done; targets_1_1 = targets_1.next()) {
+                for (var targets_1 = (e_30 = 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)) {
@@ -12039,21 +12674,21 @@ function detectChemicalIdFromProbe(probeDocs, fields) {
                     }
                 }
             }
-            catch (e_27_1) { e_27 = { error: e_27_1 }; }
+            catch (e_30_1) { e_30 = { error: e_30_1 }; }
             finally {
                 try {
                     if (targets_1_1 && !targets_1_1.done && (_b = targets_1.return)) _b.call(targets_1);
                 }
-                finally { if (e_27) throw e_27.error; }
+                finally { if (e_30) throw e_30.error; }
             }
         }
     }
-    catch (e_26_1) { e_26 = { error: e_26_1 }; }
+    catch (e_29_1) { e_29 = { error: e_29_1 }; }
     finally {
         try {
             if (probeDocs_1_1 && !probeDocs_1_1.done && (_a = probeDocs_1.return)) _a.call(probeDocs_1);
         }
-        finally { if (e_26) throw e_26.error; }
+        finally { if (e_29) throw e_29.error; }
     }
     return false;
 }
@@ -12274,8 +12909,8 @@ function buildChemicalIdFieldCandidates(field) {
 }
 function applyChemicalNameLookupFallbackToQuery(params) {
     return __awaiter(this, void 0, void 0, function () {
-        var query, db, dbName, idClient, idCustomer, isSuperAdmin, probeDocs, chemicalFields, targetField, condition, regex, sampleDocs, collectionNames, candidates, _loop_8, candidates_1, candidates_1_1, candidate, state_5, e_28_1;
-        var e_28, _a;
+        var query, db, dbName, idClient, idCustomer, isSuperAdmin, probeDocs, chemicalFields, targetField, condition, regex, sampleDocs, collectionNames, candidates, _loop_11, candidates_1, candidates_1_1, candidate, state_8, e_31_1;
+        var e_31, _a;
         var _b;
         return __generator(this, function (_c) {
             switch (_c.label) {
@@ -12299,7 +12934,7 @@ function applyChemicalNameLookupFallbackToQuery(params) {
                 case 1:
                     collectionNames = _c.sent();
                     candidates = resolveIdLookupCandidates('chemical', collectionNames);
-                    _loop_8 = function (candidate) {
+                    _loop_11 = function (candidate) {
                         var candidateHasClientScope, _d, candidateProbe, lookup, idFields, baseMatch, orConditions, nextMatch;
                         return __generator(this, function (_e) {
                             switch (_e.label) {
@@ -12377,25 +13012,25 @@ function applyChemicalNameLookupFallbackToQuery(params) {
                 case 3:
                     if (!!candidates_1_1.done) return [3 /*break*/, 6];
                     candidate = candidates_1_1.value;
-                    return [5 /*yield**/, _loop_8(candidate)];
+                    return [5 /*yield**/, _loop_11(candidate)];
                 case 4:
-                    state_5 = _c.sent();
-                    if (typeof state_5 === "object")
-                        return [2 /*return*/, state_5.value];
+                    state_8 = _c.sent();
+                    if (typeof state_8 === "object")
+                        return [2 /*return*/, state_8.value];
                     _c.label = 5;
                 case 5:
                     candidates_1_1 = candidates_1.next();
                     return [3 /*break*/, 3];
                 case 6: return [3 /*break*/, 9];
                 case 7:
-                    e_28_1 = _c.sent();
-                    e_28 = { error: e_28_1 };
+                    e_31_1 = _c.sent();
+                    e_31 = { error: e_31_1 };
                     return [3 /*break*/, 9];
                 case 8:
                     try {
                         if (candidates_1_1 && !candidates_1_1.done && (_a = candidates_1.return)) _a.call(candidates_1);
                     }
-                    finally { if (e_28) throw e_28.error; }
+                    finally { if (e_31) throw e_31.error; }
                     return [7 /*endfinally*/];
                 case 9: return [2 /*return*/, null];
             }
@@ -12489,8 +13124,8 @@ function lookupIdsForNameMatch(params) {
 }
 function applyIdLookupFallbackToQuery(params) {
     return __awaiter(this, void 0, void 0, function () {
-        var query, db, dbName, idClient, idCustomer, isSuperAdmin, probeDocs, conditions, collectionNames, _a, conditions_1, conditions_1_1, condition, regex, baseToken, targetFieldType, nextValue, localNameField, candidates, candidates_2, candidates_2_1, candidate, candidateHasClientScope, _b, candidateProbe, lookup, targetFieldType, normalizedIds, idsForQuery, e_29_1, e_30_1;
-        var e_30, _c, e_29, _d;
+        var query, db, dbName, idClient, idCustomer, isSuperAdmin, probeDocs, conditions, collectionNames, _a, conditions_1, conditions_1_1, condition, regex, baseToken, targetFieldType, nextValue, localNameField, candidates, candidates_2, candidates_2_1, candidate, candidateHasClientScope, _b, candidateProbe, lookup, targetFieldType, normalizedIds, idsForQuery, e_32_1, e_33_1;
+        var e_33, _c, e_32, _d;
         var _e;
         return __generator(this, function (_f) {
             switch (_f.label) {
@@ -12560,7 +13195,7 @@ function applyIdLookupFallbackToQuery(params) {
                     _f.label = 5;
                 case 5:
                     _f.trys.push([5, 14, 15, 16]);
-                    candidates_2 = (e_29 = void 0, __values(candidates)), candidates_2_1 = candidates_2.next();
+                    candidates_2 = (e_32 = void 0, __values(candidates)), candidates_2_1 = candidates_2.next();
                     _f.label = 6;
                 case 6:
                     if (!!candidates_2_1.done) return [3 /*break*/, 13];
@@ -12627,28 +13262,28 @@ function applyIdLookupFallbackToQuery(params) {
                     return [3 /*break*/, 6];
                 case 13: return [3 /*break*/, 16];
                 case 14:
-                    e_29_1 = _f.sent();
-                    e_29 = { error: e_29_1 };
+                    e_32_1 = _f.sent();
+                    e_32 = { error: e_32_1 };
                     return [3 /*break*/, 16];
                 case 15:
                     try {
                         if (candidates_2_1 && !candidates_2_1.done && (_d = candidates_2.return)) _d.call(candidates_2);
                     }
-                    finally { if (e_29) throw e_29.error; }
+                    finally { if (e_32) throw e_32.error; }
                     return [7 /*endfinally*/];
                 case 16:
                     conditions_1_1 = conditions_1.next();
                     return [3 /*break*/, 4];
                 case 17: return [3 /*break*/, 20];
                 case 18:
-                    e_30_1 = _f.sent();
-                    e_30 = { error: e_30_1 };
+                    e_33_1 = _f.sent();
+                    e_33 = { error: e_33_1 };
                     return [3 /*break*/, 20];
                 case 19:
                     try {
                         if (conditions_1_1 && !conditions_1_1.done && (_c = conditions_1.return)) _c.call(conditions_1);
                     }
-                    finally { if (e_30) throw e_30.error; }
+                    finally { if (e_33) throw e_33.error; }
                     return [7 /*endfinally*/];
                 case 20: return [2 /*return*/, null];
             }
@@ -13071,8 +13706,8 @@ function resolveAssistantSurfaceFileCandidates(baseName) {
 }
 function readFirstAssistantSurfaceFile(candidates) {
     return __awaiter(this, void 0, void 0, function () {
-        var candidates_3, candidates_3_1, candidate, normalized, _a, e_31_1;
-        var e_31, _b;
+        var candidates_3, candidates_3_1, candidate, normalized, _a, e_34_1;
+        var e_34, _b;
         return __generator(this, function (_c) {
             switch (_c.label) {
                 case 0:
@@ -13099,14 +13734,14 @@ function readFirstAssistantSurfaceFile(candidates) {
                     return [3 /*break*/, 1];
                 case 6: return [3 /*break*/, 9];
                 case 7:
-                    e_31_1 = _c.sent();
-                    e_31 = { error: e_31_1 };
+                    e_34_1 = _c.sent();
+                    e_34 = { error: e_34_1 };
                     return [3 /*break*/, 9];
                 case 8:
                     try {
                         if (candidates_3_1 && !candidates_3_1.done && (_b = candidates_3.return)) _b.call(candidates_3);
                     }
-                    finally { if (e_31) throw e_31.error; }
+                    finally { if (e_34) throw e_34.error; }
                     return [7 /*endfinally*/];
                 case 9: return [2 /*return*/, ''];
             }
@@ -14180,7 +14815,10 @@ var AI_ASSISTANT_BRIDGE_COLLECTION_ALIAS_OPTIONS = {
     purchaseorder: AI_ASSISTANT_PURCHASE_COLLECTION_ALIAS_CANDIDATES,
     purchaseorders: AI_ASSISTANT_PURCHASE_COLLECTION_ALIAS_CANDIDATES
 };
-var AI_ASSISTANT_DIRECT_COLLECTION_FALLBACK_ALLOWLIST = new Set([]);
+var AI_ASSISTANT_DIRECT_COLLECTION_FALLBACK_ALLOWLIST = new Set([
+    'customers',
+    'clients'
+]);
 var AI_ASSISTANT_SUPPORT_COLLECTION_FALLBACKS = [
     'support-tickets',
     'supporttickets',
@@ -14330,7 +14968,7 @@ function resolveAssistantRelationshipFallbackCandidates(collection, collectionNa
     var depthByFamily = new Map();
     var queue = [{ family: currentFamily, depth: 0 }];
     depthByFamily.set(currentFamily, 0);
-    var _loop_9 = function () {
+    var _loop_12 = function () {
         var current = queue.shift();
         if (!current) {
             return "continue";
@@ -14363,7 +15001,7 @@ function resolveAssistantRelationshipFallbackCandidates(collection, collectionNa
         });
     };
     while (queue.length) {
-        _loop_9();
+        _loop_12();
     }
     var preferredCollections = Array.from(familyScores.entries())
         .map(function (_a) {
@@ -14851,7 +15489,7 @@ function resolveAssistantNestedPrefixCollectionCandidates(params) {
 function resolveAssistantNestedAggregateFallbacks(params) {
     return __awaiter(this, void 0, void 0, function () {
         var prefixes, collectionNames, fallbacks, seen, prefixes_1, prefixes_1_1, prefix, rewrite, candidates, candidates_4, candidates_4_1, candidate, normalizedPipeline, key;
-        var e_32, _a, e_33, _b;
+        var e_35, _a, e_36, _b;
         return __generator(this, function (_c) {
             switch (_c.label) {
                 case 0:
@@ -14881,7 +15519,7 @@ function resolveAssistantNestedAggregateFallbacks(params) {
                                 triedCollections: params.triedCollections
                             });
                             try {
-                                for (candidates_4 = (e_33 = void 0, __values(candidates)), candidates_4_1 = candidates_4.next(); !candidates_4_1.done; candidates_4_1 = candidates_4.next()) {
+                                for (candidates_4 = (e_36 = void 0, __values(candidates)), candidates_4_1 = candidates_4.next(); !candidates_4_1.done; candidates_4_1 = candidates_4.next()) {
                                     candidate = candidates_4_1.value;
                                     normalizedPipeline = normalizeAssistantAggregatePipeline(rewrite.pipeline, candidate);
                                     if (!normalizedPipeline.length || containsForbiddenMongoOperators(normalizedPipeline)) {
@@ -14903,21 +15541,21 @@ function resolveAssistantNestedAggregateFallbacks(params) {
                                     }
                                 }
                             }
-                            catch (e_33_1) { e_33 = { error: e_33_1 }; }
+                            catch (e_36_1) { e_36 = { error: e_36_1 }; }
                             finally {
                                 try {
                                     if (candidates_4_1 && !candidates_4_1.done && (_b = candidates_4.return)) _b.call(candidates_4);
                                 }
-                                finally { if (e_33) throw e_33.error; }
+                                finally { if (e_36) throw e_36.error; }
                             }
                         }
                     }
-                    catch (e_32_1) { e_32 = { error: e_32_1 }; }
+                    catch (e_35_1) { e_35 = { error: e_35_1 }; }
                     finally {
                         try {
                             if (prefixes_1_1 && !prefixes_1_1.done && (_a = prefixes_1.return)) _a.call(prefixes_1);
                         }
-                        finally { if (e_32) throw e_32.error; }
+                        finally { if (e_35) throw e_35.error; }
                     }
                     return [2 /*return*/, fallbacks];
             }
@@ -14979,8 +15617,8 @@ function doesAssistantCollectionExistInDb(db, collection) {
 }
 function resolveAssistantReportBuilderBridgeCollection(collection_1, db_1) {
     return __awaiter(this, arguments, void 0, function (collection, db, dbName) {
-        var normalized, aliasCandidates, alias, manager, hasManager, candidates, pushCandidate, base, reportCandidate, candidates_5, candidates_5_1, candidate, model, resolved, resolvedName, resolvedModel, _a, candidates_6, candidates_6_1, candidate, e_34_1, candidates_7, candidates_7_1, candidate;
-        var e_35, _b, e_34, _c, e_36, _d;
+        var normalized, aliasCandidates, alias, manager, hasManager, candidates, pushCandidate, base, reportCandidate, candidates_5, candidates_5_1, candidate, model, resolved, resolvedName, resolvedModel, _a, candidates_6, candidates_6_1, candidate, e_37_1, candidates_7, candidates_7_1, candidate;
+        var e_38, _b, e_37, _c, e_39, _d;
         var _e;
         if (dbName === void 0) { dbName = ''; }
         return __generator(this, function (_f) {
@@ -15022,12 +15660,12 @@ function resolveAssistantReportBuilderBridgeCollection(collection_1, db_1) {
                                 }
                             }
                         }
-                        catch (e_35_1) { e_35 = { error: e_35_1 }; }
+                        catch (e_38_1) { e_38 = { error: e_38_1 }; }
                         finally {
                             try {
                                 if (candidates_5_1 && !candidates_5_1.done && (_b = candidates_5.return)) _b.call(candidates_5);
                             }
-                            finally { if (e_35) throw e_35.error; }
+                            finally { if (e_38) throw e_38.error; }
                         }
                     }
                     if (!(db && dbName)) return [3 /*break*/, 4];
@@ -15073,14 +15711,14 @@ function resolveAssistantReportBuilderBridgeCollection(collection_1, db_1) {
                     return [3 /*break*/, 6];
                 case 9: return [3 /*break*/, 12];
                 case 10:
-                    e_34_1 = _f.sent();
-                    e_34 = { error: e_34_1 };
+                    e_37_1 = _f.sent();
+                    e_37 = { error: e_37_1 };
                     return [3 /*break*/, 12];
                 case 11:
                     try {
                         if (candidates_6_1 && !candidates_6_1.done && (_c = candidates_6.return)) _c.call(candidates_6);
                     }
-                    finally { if (e_34) throw e_34.error; }
+                    finally { if (e_37) throw e_37.error; }
                     return [7 /*endfinally*/];
                 case 12:
                     try {
@@ -15091,12 +15729,12 @@ function resolveAssistantReportBuilderBridgeCollection(collection_1, db_1) {
                             }
                         }
                     }
-                    catch (e_36_1) { e_36 = { error: e_36_1 }; }
+                    catch (e_39_1) { e_39 = { error: e_39_1 }; }
                     finally {
                         try {
                             if (candidates_7_1 && !candidates_7_1.done && (_d = candidates_7.return)) _d.call(candidates_7);
                         }
-                        finally { if (e_36) throw e_36.error; }
+                        finally { if (e_39) throw e_39.error; }
                     }
                     throw new Error('AI assistant report builder bridge: No queryable collection could be resolved.');
             }
@@ -15104,7 +15742,7 @@ function resolveAssistantReportBuilderBridgeCollection(collection_1, db_1) {
     });
 }
 function findQueryDateField(query) {
-    var e_37, _a, e_38, _b;
+    var e_40, _a, e_41, _b;
     if (!query || typeof query !== 'object') {
         return null;
     }
@@ -15118,12 +15756,12 @@ function findQueryDateField(query) {
                 }
             }
         }
-        catch (e_37_1) { e_37 = { error: e_37_1 }; }
+        catch (e_40_1) { e_40 = { error: e_40_1 }; }
         finally {
             try {
                 if (query_1_1 && !query_1_1.done && (_a = query_1.return)) _a.call(query_1);
             }
-            finally { if (e_37) throw e_37.error; }
+            finally { if (e_40) throw e_40.error; }
         }
         return null;
     }
@@ -15142,12 +15780,12 @@ function findQueryDateField(query) {
             }
         }
     }
-    catch (e_38_1) { e_38 = { error: e_38_1 }; }
+    catch (e_41_1) { e_41 = { error: e_41_1 }; }
     finally {
         try {
             if (_d && !_d.done && (_b = _c.return)) _b.call(_c);
         }
-        finally { if (e_38) throw e_38.error; }
+        finally { if (e_41) throw e_41.error; }
     }
     return null;
 }
@@ -15330,7 +15968,7 @@ function expandAggregateDateMatchFallback(pipeline, schemaFields) {
     if (!Array.isArray(pipeline)) {
         return null;
     }
-    var _loop_10 = function (i) {
+    var _loop_13 = function (i) {
         var stage = pipeline[i];
         if (!stage || typeof stage !== 'object' || !stage.$match || typeof stage.$match !== 'object') {
             return "continue";
@@ -15378,9 +16016,9 @@ function expandAggregateDateMatchFallback(pipeline, schemaFields) {
         return { value: { pipeline: updated, fields: Array.from(addedFields) } };
     };
     for (var i = 0; i < pipeline.length; i += 1) {
-        var state_6 = _loop_10(i);
-        if (typeof state_6 === "object")
-            return state_6.value;
+        var state_9 = _loop_13(i);
+        if (typeof state_9 === "object")
+            return state_9.value;
     }
     return null;
 }
@@ -15396,7 +16034,7 @@ function resolveQueryDateFieldFallback(query) {
     return { from: dateField, to: fallback };
 }
 function containsForbiddenMongoOperators(value) {
-    var e_39, _a;
+    var e_42, _a;
     if (!value || typeof value !== 'object') {
         return false;
     }
@@ -15415,12 +16053,12 @@ function containsForbiddenMongoOperators(value) {
             }
         }
     }
-    catch (e_39_1) { e_39 = { error: e_39_1 }; }
+    catch (e_42_1) { e_42 = { error: e_42_1 }; }
     finally {
         try {
             if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
         }
-        finally { if (e_39) throw e_39.error; }
+        finally { if (e_42) throw e_42.error; }
     }
     return false;
 }
@@ -15835,8 +16473,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_40_1;
-        var _e, e_40, _f, _g;
+        var _a, _b, _c, _d, message, payload, status_1, e_43_1;
+        var _e, e_43, _f, _g;
         return __generator(this, function (_h) {
             switch (_h.label) {
                 case 0:
@@ -15863,8 +16501,8 @@ function waitForCodexWorkerMessage(worker, streamStatusHandler) {
                     return [3 /*break*/, 1];
                 case 4: return [3 /*break*/, 11];
                 case 5:
-                    e_40_1 = _h.sent();
-                    e_40 = { error: e_40_1 };
+                    e_43_1 = _h.sent();
+                    e_43 = { error: e_43_1 };
                     return [3 /*break*/, 11];
                 case 6:
                     _h.trys.push([6, , 9, 10]);
@@ -15875,7 +16513,7 @@ function waitForCodexWorkerMessage(worker, streamStatusHandler) {
                     _h.label = 8;
                 case 8: return [3 /*break*/, 10];
                 case 9:
-                    if (e_40) throw e_40.error;
+                    if (e_43) throw e_43.error;
                     return [7 /*endfinally*/];
                 case 10: return [7 /*endfinally*/];
                 case 11: throw new CodexWorkerBootstrapError('Codex worker exited before completing.');
@@ -15885,7 +16523,7 @@ function waitForCodexWorkerMessage(worker, streamStatusHandler) {
 }
 function runCodexInWorkerThread(prompt, runOptions, config, streamStatusHandler) {
     return __awaiter(this, void 0, void 0, function () {
-        var streamedOptions, codexClient, workerPath, codexClient, error_8, codexClient;
+        var streamedOptions, codexClient, workerPath, codexClient, error_10, codexClient;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -15906,11 +16544,11 @@ function runCodexInWorkerThread(prompt, runOptions, config, streamStatusHandler)
                     return [4 /*yield*/, runCodexInWorkerThreadInternal(workerPath, prompt, runOptions, config, streamStatusHandler)];
                 case 6: return [2 /*return*/, _a.sent()];
                 case 7:
-                    error_8 = _a.sent();
-                    if (!(error_8 instanceof CodexWorkerBootstrapError)) {
-                        throw error_8;
+                    error_10 = _a.sent();
+                    if (!(error_10 instanceof CodexWorkerBootstrapError)) {
+                        throw error_10;
                     }
-                    console.error('Codex worker bootstrap failed, falling back to in-process run.', error_8);
+                    console.error('Codex worker bootstrap failed, falling back to in-process run.', error_10);
                     codexClient = getAssistantCodexClient(config);
                     return [4 /*yield*/, codexClient.run(prompt, streamedOptions)];
                 case 8: return [2 /*return*/, _a.sent()];
@@ -15948,7 +16586,7 @@ function runCodexInWorkerThreadInternal(workerPath, prompt, runOptions, config,
                     timeoutMs = ((sanitizedOptions === null || sanitizedOptions === void 0 ? void 0 : sanitizedOptions.timeoutMs) || resolveCodexTimeoutMs()) + 15000;
                     timeoutController = new AbortController();
                     timeoutPromise = (function () { return __awaiter(_this, void 0, void 0, function () {
-                        var error_9;
+                        var error_11;
                         return __generator(this, function (_a) {
                             switch (_a.label) {
                                 case 0:
@@ -15958,11 +16596,11 @@ function runCodexInWorkerThreadInternal(workerPath, prompt, runOptions, config,
                                     _a.sent();
                                     return [2 /*return*/, { type: 'timeout' }];
                                 case 2:
-                                    error_9 = _a.sent();
-                                    if ((error_9 === null || error_9 === void 0 ? void 0 : error_9.name) === 'AbortError') {
+                                    error_11 = _a.sent();
+                                    if ((error_11 === null || error_11 === void 0 ? void 0 : error_11.name) === 'AbortError') {
                                         return [2 /*return*/, { type: 'aborted' }];
                                     }
-                                    throw error_9;
+                                    throw error_11;
                                 case 3: return [2 /*return*/];
                             }
                         });
@@ -16207,8 +16845,8 @@ function buildAssistantWorkspaceRootCandidates(params) {
 }
 function resolveAssistantWorkspaceRoot() {
     return __awaiter(this, void 0, void 0, function () {
-        var candidates, firstExisting, candidates_8, candidates_8_1, candidate, _a, gitRoot, e_41_1;
-        var e_41, _b;
+        var candidates, firstExisting, candidates_8, candidates_8_1, candidate, _a, gitRoot, e_44_1;
+        var e_44, _b;
         return __generator(this, function (_c) {
             switch (_c.label) {
                 case 0:
@@ -16247,14 +16885,14 @@ function resolveAssistantWorkspaceRoot() {
                     return [3 /*break*/, 2];
                 case 7: return [3 /*break*/, 10];
                 case 8:
-                    e_41_1 = _c.sent();
-                    e_41 = { error: e_41_1 };
+                    e_44_1 = _c.sent();
+                    e_44 = { error: e_44_1 };
                     return [3 /*break*/, 10];
                 case 9:
                     try {
                         if (candidates_8_1 && !candidates_8_1.done && (_b = candidates_8.return)) _b.call(candidates_8);
                     }
-                    finally { if (e_41) throw e_41.error; }
+                    finally { if (e_44) throw e_44.error; }
                     return [7 /*endfinally*/];
                 case 10:
                     if (firstExisting) {
@@ -16654,7 +17292,7 @@ var AI_ASSISTANT_BREAKDOWN_DIMENSION_STOPWORDS = new Set([
     'by'
 ]);
 function normalizeAssistantBreakdownDimension(value) {
-    var e_42, _a;
+    var e_45, _a;
     var normalized = normalizeOptionalString(value)
         .toLowerCase()
         .replace(/[^a-z0-9_\s-]+/g, ' ')
@@ -16686,12 +17324,12 @@ function normalizeAssistantBreakdownDimension(value) {
             }
         }
     }
-    catch (e_42_1) { e_42 = { error: e_42_1 }; }
+    catch (e_45_1) { e_45 = { error: e_45_1 }; }
     finally {
         try {
             if (tokens_1_1 && !tokens_1_1.done && (_a = tokens_1.return)) _a.call(tokens_1);
         }
-        finally { if (e_42) throw e_42.error; }
+        finally { if (e_45) throw e_45.error; }
     }
     if (!kept.length) {
         return '';
@@ -16889,7 +17527,7 @@ function resolveAssistantPlannerEnabled() {
     return raw === undefined ? true : raw === true;
 }
 function resolveAssistantPlannerKnownRoutes(user, isSuperAdmin) {
-    var e_43, _a;
+    var e_46, _a;
     var _b;
     if (isSuperAdmin === void 0) { isSuperAdmin = false; }
     var routes = ((_b = resolveio_server_app_1.ResolveIOServer.getClientRoutes) === null || _b === void 0 ? void 0 : _b.call(resolveio_server_app_1.ResolveIOServer)) || [];
@@ -16903,12 +17541,12 @@ function resolveAssistantPlannerKnownRoutes(user, isSuperAdmin) {
             }
         }
     }
-    catch (e_43_1) { e_43 = { error: e_43_1 }; }
+    catch (e_46_1) { e_46 = { error: e_46_1 }; }
     finally {
         try {
             if (routes_1_1 && !routes_1_1.done && (_a = routes_1.return)) _a.call(routes_1);
         }
-        finally { if (e_43) throw e_43.error; }
+        finally { if (e_46) throw e_46.error; }
     }
     var normalizedRoutes = Array.from(unique);
     var allowedRoutes = collectAssistantAllowedRoutesForUser(user, normalizedRoutes, isSuperAdmin);
@@ -17170,7 +17808,7 @@ function normalizeRouteMatchKey(value) {
     return normalizeRouteKey(value).toLowerCase();
 }
 function buildClientRouteIndex() {
-    var e_44, _a;
+    var e_47, _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();
@@ -17189,12 +17827,12 @@ function buildClientRouteIndex() {
             }
         }
     }
-    catch (e_44_1) { e_44 = { error: e_44_1 }; }
+    catch (e_47_1) { e_47 = { error: e_47_1 }; }
     finally {
         try {
             if (routes_2_1 && !routes_2_1.done && (_a = routes_2.return)) _a.call(routes_2);
         }
-        finally { if (e_44) throw e_44.error; }
+        finally { if (e_47) throw e_47.error; }
     }
     return { set: set, map: map, size: routes.length };
 }
@@ -17564,6 +18202,8 @@ var AI_ASSISTANT_CHANGE_HISTORY_PATTERNS = [
     /\bwhat\s+did\s+(?:the\s+)?last\s+(?:system\s+)?update\s+(?:just\s+)?do\b/i,
     /\blast\s+system\s+update\b[\s\S]{0,40}\bdo\b/i,
     /\bhow\s+long\b.*\bbeen\s+(this|that)\s+way\b/i,
+    /\bhow\s+long\b[\s\S]{0,120}\bbeen\s+on\s+(?:this|that|the)\s+(?:page|screen|dashboard|menu|route)\b/i,
+    /\bhow\s+long\b[\s\S]{0,120}\bbeen\s+on\s+here\b/i,
     /\bhow\s+long\b[\s\S]{0,80}\bbeen\s+around\b/i,
     /\bsince\s+when\b/i,
     /\bwhen\s+was\b[\s\S]{0,80}\bintroduced\b/i,
@@ -17972,8 +18612,8 @@ function shouldSkipAssistantGitDiscoveryDirectory(name) {
 }
 function resolveAssistantWorkspaceGitRoots(workspaceRoot) {
     return __awaiter(this, void 0, void 0, function () {
-        var roots, seen, push, _a, configuredRoots, configuredRoots_1, configuredRoots_1_1, configuredRoot, _b, e_45_1, queue, queued, enqueue, next, entries, _c, entries_1, entries_1_1, entry, childName, candidate, gitPath, _d, e_46_1;
-        var e_45, _e, e_46, _f;
+        var roots, seen, push, _a, configuredRoots, configuredRoots_1, configuredRoots_1_1, configuredRoot, _b, e_48_1, queue, queued, enqueue, next, entries, _c, entries_1, entries_1_1, entry, childName, candidate, gitPath, _d, e_49_1;
+        var e_48, _e, e_49, _f;
         var _g;
         return __generator(this, function (_h) {
             switch (_h.label) {
@@ -18018,14 +18658,14 @@ function resolveAssistantWorkspaceGitRoots(workspaceRoot) {
                     return [3 /*break*/, 3];
                 case 6: return [3 /*break*/, 9];
                 case 7:
-                    e_45_1 = _h.sent();
-                    e_45 = { error: e_45_1 };
+                    e_48_1 = _h.sent();
+                    e_48 = { error: e_48_1 };
                     return [3 /*break*/, 9];
                 case 8:
                     try {
                         if (configuredRoots_1_1 && !configuredRoots_1_1.done && (_e = configuredRoots_1.return)) _e.call(configuredRoots_1);
                     }
-                    finally { if (e_45) throw e_45.error; }
+                    finally { if (e_48) throw e_48.error; }
                     return [7 /*endfinally*/];
                 case 9:
                     queue = [];
@@ -18065,7 +18705,7 @@ function resolveAssistantWorkspaceGitRoots(workspaceRoot) {
                     return [3 /*break*/, 14];
                 case 14:
                     _h.trys.push([14, 21, 22, 23]);
-                    entries_1 = (e_46 = void 0, __values(entries)), entries_1_1 = entries_1.next();
+                    entries_1 = (e_49 = void 0, __values(entries)), entries_1_1 = entries_1.next();
                     _h.label = 15;
                 case 15:
                     if (!!entries_1_1.done) return [3 /*break*/, 20];
@@ -18104,14 +18744,14 @@ function resolveAssistantWorkspaceGitRoots(workspaceRoot) {
                     return [3 /*break*/, 15];
                 case 20: return [3 /*break*/, 23];
                 case 21:
-                    e_46_1 = _h.sent();
-                    e_46 = { error: e_46_1 };
+                    e_49_1 = _h.sent();
+                    e_49 = { error: e_49_1 };
                     return [3 /*break*/, 23];
                 case 22:
                     try {
                         if (entries_1_1 && !entries_1_1.done && (_f = entries_1.return)) _f.call(entries_1);
                     }
-                    finally { if (e_46) throw e_46.error; }
+                    finally { if (e_49) throw e_49.error; }
                     return [7 /*endfinally*/];
                 case 23: return [3 /*break*/, 10];
                 case 24: return [2 /*return*/, roots];
@@ -18408,8 +19048,8 @@ function syncAssistantGitMirror(repoUrl) {
 }
 function resolveAssistantChangeHistoryGitRoots(workspaceRoot) {
     return __awaiter(this, void 0, void 0, function () {
-        var roots, repoUrls, mirroredRoots, repoUrls_1, repoUrls_1_1, repoUrl, mirrorRoot, e_47_1;
-        var e_47, _a;
+        var roots, repoUrls, mirroredRoots, repoUrls_1, repoUrls_1_1, repoUrl, mirrorRoot, e_50_1;
+        var e_50, _a;
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0: return [4 /*yield*/, resolveAssistantWorkspaceGitRoots(workspaceRoot)];
@@ -18443,14 +19083,14 @@ function resolveAssistantChangeHistoryGitRoots(workspaceRoot) {
                     return [3 /*break*/, 3];
                 case 6: return [3 /*break*/, 9];
                 case 7:
-                    e_47_1 = _b.sent();
-                    e_47 = { error: e_47_1 };
+                    e_50_1 = _b.sent();
+                    e_50 = { error: e_50_1 };
                     return [3 /*break*/, 9];
                 case 8:
                     try {
                         if (repoUrls_1_1 && !repoUrls_1_1.done && (_a = repoUrls_1.return)) _a.call(repoUrls_1);
                     }
-                    finally { if (e_47) throw e_47.error; }
+                    finally { if (e_50) throw e_50.error; }
                     return [7 /*endfinally*/];
                 case 9: return [2 /*return*/, mirroredRoots];
             }
@@ -18459,8 +19099,8 @@ function resolveAssistantChangeHistoryGitRoots(workspaceRoot) {
 }
 function resolveAssistantChangeHistoryFastPathResponse(params) {
     return __awaiter(this, void 0, void 0, function () {
-        var workspaceRoot, _a, gitRoots, featureKeywords, sawExecutionError, bestFallback, gitRoots_1, gitRoots_1_1, gitRoot, _b, branch, _c, _d, limit, historyDepth, rawHistory, commits, summary, hasKeywordMatches, _e, e_48_1;
-        var e_48, _f;
+        var workspaceRoot, _a, gitRoots, featureKeywords, sawExecutionError, bestFallback, gitRoots_1, gitRoots_1_1, gitRoot, _b, branch, _c, _d, limit, historyDepth, rawHistory, commits, summary, hasKeywordMatches, _e, e_51_1;
+        var e_51, _f;
         return __generator(this, function (_g) {
             switch (_g.label) {
                 case 0:
@@ -18582,14 +19222,14 @@ function resolveAssistantChangeHistoryFastPathResponse(params) {
                     return [3 /*break*/, 7];
                 case 20: return [3 /*break*/, 23];
                 case 21:
-                    e_48_1 = _g.sent();
-                    e_48 = { error: e_48_1 };
+                    e_51_1 = _g.sent();
+                    e_51 = { error: e_51_1 };
                     return [3 /*break*/, 23];
                 case 22:
                     try {
                         if (gitRoots_1_1 && !gitRoots_1_1.done && (_f = gitRoots_1.return)) _f.call(gitRoots_1);
                     }
-                    finally { if (e_48) throw e_48.error; }
+                    finally { if (e_51) throw e_51.error; }
                     return [7 /*endfinally*/];
                 case 23:
                     if (bestFallback) {
@@ -18770,7 +19410,7 @@ function sanitizeAssistantResponse(value) {
     return normalizeAssistantRoutes(normalizedCurrency);
 }
 function evaluateAssistantGuardrails(message) {
-    var e_49, _a;
+    var e_52, _a;
     var normalized = String(message || '').toLowerCase();
     var patterns = [
         {
@@ -18816,12 +19456,12 @@ function evaluateAssistantGuardrails(message) {
             }
         }
     }
-    catch (e_49_1) { e_49 = { error: e_49_1 }; }
+    catch (e_52_1) { e_52 = { error: e_52_1 }; }
     finally {
         try {
             if (patterns_2_1 && !patterns_2_1.done && (_a = patterns_2.return)) _a.call(patterns_2);
         }
-        finally { if (e_49) throw e_49.error; }
+        finally { if (e_52) throw e_52.error; }
     }
     return null;
 }
@@ -18936,7 +19576,7 @@ function tokenizeArithmeticExpression(expression) {
     return tokens;
 }
 function evaluateArithmeticExpression(expression) {
-    var e_50, _a, e_51, _b;
+    var e_53, _a, e_54, _b;
     var tokens = tokenizeArithmeticExpression(expression);
     if (!tokens || !tokens.length) {
         return null;
@@ -18993,12 +19633,12 @@ function evaluateArithmeticExpression(expression) {
             prevToken = token;
         }
     }
-    catch (e_50_1) { e_50 = { error: e_50_1 }; }
+    catch (e_53_1) { e_53 = { error: e_53_1 }; }
     finally {
         try {
             if (tokens_2_1 && !tokens_2_1.done && (_a = tokens_2.return)) _a.call(tokens_2);
         }
-        finally { if (e_50) throw e_50.error; }
+        finally { if (e_53) throw e_53.error; }
     }
     while (ops.length) {
         var op = ops.pop();
@@ -19038,12 +19678,12 @@ function evaluateArithmeticExpression(expression) {
             stack.push(Number(token));
         }
     }
-    catch (e_51_1) { e_51 = { error: e_51_1 }; }
+    catch (e_54_1) { e_54 = { error: e_54_1 }; }
     finally {
         try {
             if (output_1_1 && !output_1_1.done && (_b = output_1.return)) _b.call(output_1);
         }
-        finally { if (e_51) throw e_51.error; }
+        finally { if (e_54) throw e_54.error; }
     }
     if (stack.length !== 1 || Number.isNaN(stack[0])) {
         return null;
@@ -19227,8 +19867,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_52_1;
-        var e_52, _b;
+        var limits, totalBytes, totalChars, chunks, cleaned, attachments_1, attachments_1_1, attachment, localPath, safe, stat, ext, name_1, type, readable, content, _a, e_55_1;
+        var e_55, _b;
         return __generator(this, function (_c) {
             switch (_c.label) {
                 case 0:
@@ -19307,14 +19947,14 @@ function readAttachmentContents(attachments) {
                     return [3 /*break*/, 2];
                 case 10: return [3 /*break*/, 13];
                 case 11:
-                    e_52_1 = _c.sent();
-                    e_52 = { error: e_52_1 };
+                    e_55_1 = _c.sent();
+                    e_55 = { error: e_55_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_52) throw e_52.error; }
+                    finally { if (e_55) throw e_55.error; }
                     return [7 /*endfinally*/];
                 case 13: return [2 /*return*/, {
                         promptText: chunks.length ? "\n\nAttachments:\n".concat(chunks.join('\n\n')) : '',
@@ -19469,7 +20109,7 @@ function resolveAssistantDatabaseNameForSystemCollections() {
 }
 function updateAssistantMessageWithFallback(messageId, setPayload) {
     return __awaiter(this, void 0, void 0, function () {
-        var error_10, dbName, _a;
+        var error_12, dbName, _a;
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
@@ -19484,9 +20124,9 @@ function updateAssistantMessageWithFallback(messageId, setPayload) {
                     _b.sent();
                     return [2 /*return*/];
                 case 3:
-                    error_10 = _b.sent();
-                    if (!isAssistantTransactionCommittedError(error_10)) {
-                        throw error_10;
+                    error_12 = _b.sent();
+                    if (!isAssistantTransactionCommittedError(error_12)) {
+                        throw error_12;
                     }
                     dbName = resolveAssistantDatabaseNameForSystemCollections();
                     _b.label = 4;
@@ -19516,7 +20156,7 @@ function updateAssistantMessageWithFallback(messageId, setPayload) {
 }
 function touchConversation(idConversation, timestamp, lastMessageId) {
     return __awaiter(this, void 0, void 0, function () {
-        var update, error_11, dbName;
+        var update, error_13, dbName;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -19535,9 +20175,9 @@ function touchConversation(idConversation, timestamp, lastMessageId) {
                     _a.sent();
                     return [2 /*return*/];
                 case 3:
-                    error_11 = _a.sent();
-                    if (!isAssistantTransactionCommittedError(error_11)) {
-                        throw error_11;
+                    error_13 = _a.sent();
+                    if (!isAssistantTransactionCommittedError(error_13)) {
+                        throw error_13;
                     }
                     dbName = resolveAssistantDatabaseNameForSystemCollections();
                     return [4 /*yield*/, resolveio_server_app_1.ResolveIOServer.getMongoConnection()
@@ -19638,7 +20278,7 @@ function estimateUsage(messages, responseText, model) {
     };
 }
 function evaluateGuardrails(message) {
-    var e_53, _a;
+    var e_56, _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.' },
@@ -19660,12 +20300,12 @@ function evaluateGuardrails(message) {
             }
         }
     }
-    catch (e_53_1) { e_53 = { error: e_53_1 }; }
+    catch (e_56_1) { e_56 = { error: e_56_1 }; }
     finally {
         try {
             if (patterns_3_1 && !patterns_3_1.done && (_a = patterns_3.return)) _a.call(patterns_3);
         }
-        finally { if (e_53) throw e_53.error; }
+        finally { if (e_56) throw e_56.error; }
     }
     return null;
 }