@resolveio/server-lib 22.2.55 → 22.2.57

package/methods/ai-terminal.js

@@ -110,15 +110,18 @@ exports.executeAiAssistantMongoRead = executeAiAssistantMongoRead;
 exports.executeAiAssistantMongoAggregate = executeAiAssistantMongoAggregate;
 exports.extractAssistantMongoDirective = extractAssistantMongoDirective;
 exports.buildAssistantToolRequest = buildAssistantToolRequest;
+exports.shouldPreserveAssistantProbeCollectionForTesting = shouldPreserveAssistantProbeCollectionForTesting;
 exports.buildAssistantInvoiceCustomerLabelExpr = buildAssistantInvoiceCustomerLabelExpr;
 exports.resolveAssistantHeuristicDirectiveForTesting = resolveAssistantHeuristicDirectiveForTesting;
 exports.buildAssistantDatedPivotDisplay = buildAssistantDatedPivotDisplay;
+exports.buildAssistantToolFallbackResponseForTesting = buildAssistantToolFallbackResponseForTesting;
 exports.deriveAssistantCommandExecutionStatus = deriveAssistantCommandExecutionStatus;
 exports.normalizeIdsForTargetField = normalizeIdsForTargetField;
 exports.serializeMongoValue = serializeMongoValue;
 exports.flattenForTable = flattenForTable;
 exports.buildDisplayTable = buildDisplayTable;
 exports.formatDisplayTableMarkdown = formatDisplayTableMarkdown;
+exports.applyAssistantDisplayTableToResponseForTesting = applyAssistantDisplayTableToResponseForTesting;
 exports.resolveAssistantReadDisplayMaxRows = resolveAssistantReadDisplayMaxRows;
 exports.normalizeAssistantNowExprPlaceholders = normalizeAssistantNowExprPlaceholders;
 exports.repairAssistantPositionalPathSegmentsInPipeline = repairAssistantPositionalPathSegmentsInPipeline;
@@ -134,6 +137,8 @@ exports.resolveAssistantAppCollectionHintCandidates = resolveAssistantAppCollect
 exports.isAssistantDeterministicHeuristicEnabledForApp = isAssistantDeterministicHeuristicEnabledForApp;
 exports.resolveCollectionOverrideWithContextForTesting = resolveCollectionOverrideWithContextForTesting;
 exports.resolveAssistantCollectionOverride = resolveAssistantCollectionOverride;
+exports.resolveAssistantCollectionNameForTesting = resolveAssistantCollectionNameForTesting;
+exports.shouldLockAssistantRequestedCollectionForExecutionForTesting = shouldLockAssistantRequestedCollectionForExecutionForTesting;
 exports.resolveAssistantCrossCollectionFallbackCandidates = resolveAssistantCrossCollectionFallbackCandidates;
 exports.resolveAssistantAvailableCrossCollectionFallbacksFromNames = resolveAssistantAvailableCrossCollectionFallbacksFromNames;
 exports.evaluateAssistantFallbackDocumentsQuality = evaluateAssistantFallbackDocumentsQuality;
@@ -563,6 +568,8 @@ var AI_ASSISTANT_REPORT_BUILDER_EXPERT_PLAYBOOK = [
     '- Do not include extra directive lines or mixed directive types in one response.'
 ].join('\n');
 var AI_ASSISTANT_PLATFORM_EXTRA_RULES = [
+    'Use the shared ResolveIO intelligence loop everywhere: inspect relevant workspace evidence, form a hypothesis, verify with code/data/logs/tests, then answer or implement.',
+    'ResolveIO platform knowledge and repository evidence override generic model defaults.',
     'Never share proprietary code or file contents verbatim unless product policy explicitly allows it.',
     'You may read files, inspect the workspace, run non-destructive commands, and make targeted code changes when the user is asking for debugging, implementation, or fixes.',
     'Use the provided read-only data bridge for database validation (REPORT_BUILDER_READ/REPORT_BUILDER_AGG). Do not improvise unsafe credential or secret access.',
@@ -609,6 +616,7 @@ function buildAssistantSystemPromptText(platformPrompt) {
         '- If a report-* collection is unavailable, keep using REPORT_BUILDER_READ/REPORT_BUILDER_AGG with the best-matched collection family; the bridge can safely fall back to direct collection access.',
         '- Map user wording to internal collections/fields yourself. Do not ask for property names unless required to run a query.',
         '- Use app heuristics and context hints as weak signals only. Verify collection and field guesses before relying on them.',
+        '- Distinguish the root business object from related measured details. Example: if the user asks for jobs and chemicals sent, jobs/work orders are the root and chemicals are joined detail, not necessarily the root collection.',
         '- Do not guess or invent collections/fields. If unsure, verify in the codebase or run a small REPORT_BUILDER_READ probe (limit 1-5) to learn the shape.',
         '- Prefer running a small REPORT_BUILDER_READ probe over asking multiple questions.',
         '- Form a concrete hypothesis about collection/field/date mapping, then verify it with codebase context or a tiny probe before answering.',
@@ -678,6 +686,7 @@ function buildAssistantSystemPromptText(platformPrompt) {
         '- For performance, keep pipelines minimal: avoid $push arrays or large fields unless the user explicitly asks for them.',
         '- For completion metrics (ex: "completed per day"), filter by completed status when applicable and use completion date fields; if completion dates are missing, fall back to createdAt/date_created and note the fallback.',
         '- Before issuing REPORT_BUILDER_READ or REPORT_BUILDER_AGG, verify the collection name and key fields by checking collection/model definitions in the current app (look for "collectionName:" and date fields like date_created/date_completed/createdAt). Do not invent collection names.',
+        '- When a request names multiple business concepts, root the query in the concept being counted/listed/summarized, then use $lookup/$unwind for related detail concepts.',
         '- For creation-date questions when both date_created and createdAt exist, match both with $or so results are not missed.',
         '- When grouping by fields that can be arrays (drivers, deliveries, routes, chemicals), $unwind first and group by both id and name when available.',
         '- Use REPORT_BUILDER_READ/REPORT_BUILDER_AGG only to produce summaries/snapshots/health checks (not raw dumps) when permitted.',
@@ -1891,7 +1900,7 @@ function executeAiAssistantCodexRun(payload, context) {
                     insertResult = _d.sent();
                     assistantMessageId = (insertResult === null || insertResult === void 0 ? void 0 : insertResult._id) || (insertResult === null || insertResult === void 0 ? void 0 : insertResult.insertedId);
                     enqueueAssistantCodexRun(function () { return __awaiter(_this, void 0, void 0, function () {
-                        var runStart, fastModeEnabled, alwaysAllowProbeEnabled, plannerEnabled, runBudgetMs, assistantMongoMaxTimeMs, assistantSystemPrompt, runDeadlineMs, steps, recordStep, progressTracker, streamProgress, remainingRunBudgetMs, hasRunBudget, applyCodexStageBudget, assistantContent, toolResult, assistantDebug, directiveSource, requestClassification, dataQuestion, lastDirective, heuristicDirectivePrecomputed, usedDeterministicHeuristicFastPath, requestedTimeGrain, requestedBreakdownDimensions, enforceDatedDirective, enforceGroupedDirective, datedDirectiveRetryUsed, datedDirectiveResolved, toolResponseDebug, toolError, toolTelemetry, termHints, collectionHints, fieldHints, schemaHints, methodHints, publicationHints, collectionTokenization, collectionRanking, collectionSelection, collectionOverride, collectionNames, plannerUsed, plannerSkipReason, plannerOutput, plannerRaw, timingBreakdown, codexUsage, accumulateCodexUsage, contextRoute, contextMode, hintSeed, termExpansion, hintText, baseTokens, expandedTokens, baseWeights, expandedWeights, dbName, db, surfaceHints, _a, allowedRoutes, rankedAllowedRoutes, routeHints, appCollectionHints, rankedCollectionHints, rankedCollections, hintCollections, schemaHintCollections, assistantContext, hasDeterministicHeuristicFastPath, prompt_1, workspaceRoot, codexConfig, runOptions, plannerRunOptions, shouldRunPlanner, plannerBudgetAvailable, 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, deniedModuleByIntent, permissionLabel, effectiveDirective, rankedCollections_1, directiveHintsBase_1, buildToolRequestForDirective, executionDirective, probeFieldHints, probeEnabled, probeBudgetAllowed, probeDirective, probeRequest, probeStart, probeResponse, _h, probeDurationMs, probeRowCount, probeRewrite, probeError_1, probeDurationMs, probeErrorMessage, toolRequest, requestedToolCollection, toolStart, toolResponse, _j, toolDurationMs, toolPayload, resolvedToolCollection, zeroRowResult, skipFollowupCodex, followupPrompt, followupStart, followupText, _k, error_3, errorMessage, existingFinal, error_4, runBudgetExceeded, includeToolExecutionTelemetry, toolExecutionTelemetry, finishedAt, finalNow, finishedAt, codexMs, draftingMs, finalMetadata, finalUsage, usageClientId, usageError_1, finalAssistantDoc, setPayload, finalizeError_1, failedAt, fallbackContent, failureMetadata, persistError_1, _l;
+                        var runStart, fastModeEnabled, alwaysAllowProbeEnabled, plannerEnabled, runBudgetMs, assistantMongoMaxTimeMs, assistantSystemPrompt, runDeadlineMs, steps, recordStep, progressTracker, streamProgress, remainingRunBudgetMs, hasRunBudget, applyCodexStageBudget, assistantContent, toolResult, assistantDebug, directiveSource, requestClassification, dataQuestion, lastDirective, heuristicDirectivePrecomputed, usedDeterministicHeuristicFastPath, requestedTimeGrain, requestedBreakdownDimensions, enforceDatedDirective, enforceGroupedDirective, datedDirectiveRetryUsed, datedDirectiveResolved, toolResponseDebug, toolError, toolTelemetry, termHints, collectionHints, fieldHints, schemaHints, methodHints, publicationHints, collectionTokenization, collectionRanking, collectionSelection, collectionOverride, collectionNames, plannerUsed, plannerSkipReason, plannerOutput, plannerRaw, timingBreakdown, codexUsage, accumulateCodexUsage, contextRoute, contextMode, hintSeed, termExpansion, hintText, baseTokens, expandedTokens, baseWeights, expandedWeights, dbName, db, surfaceHints, _a, allowedRoutes, rankedAllowedRoutes, routeHints, appCollectionHints, rankedCollectionHints, rankedCollections, hintCollections, schemaHintCollections, assistantContext, hasDeterministicHeuristicFastPath, prompt_1, workspaceRoot, codexConfig, runOptions, plannerRunOptions, shouldRunPlanner, plannerBudgetAvailable, 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, deniedModuleByIntent, permissionLabel, effectiveDirective, rankedCollections_1, directiveHintsBase_1, buildToolRequestForDirective, executionDirective, probeFieldHints, aggregateProbeDisabled, probeEnabled, probeBudgetAllowed, probeDirective, probeRequest, probeStart, probeResponse, _h, probeDurationMs, probeRowCount, probeRewrite, probeError_1, probeDurationMs, probeErrorMessage, toolRequest, requestedToolCollection, toolStart, toolResponse, _j, toolDurationMs, toolPayload, resolvedToolCollection, zeroRowResult, followupCodexEnabled, skipFollowupCodex, followupPrompt, followupStart, followupText, _k, error_3, errorMessage, existingFinal, error_4, runBudgetExceeded, includeToolExecutionTelemetry, toolExecutionTelemetry, finishedAt, finalNow, finishedAt, codexMs, draftingMs, finalMetadata, finalUsage, usageClientId, usageError_1, finalAssistantDoc, setPayload, finalizeError_1, failedAt, fallbackContent, failureMetadata, persistError_1, _l;
                         var _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, _13, _14, _15, _16, _17, _18, _19, _20, _21;
                         return __generator(this, function (_22) {
                             switch (_22.label) {
@@ -2107,7 +2116,7 @@ function executeAiAssistantCodexRun(payload, context) {
                                     }, 8);
                                     rankedCollectionHints = resolveCollectionHintsFromRanking(collectionRanking, 5);
                                     if (rankedCollectionHints.length) {
-                                        collectionHints = mergeAssistantHintValues(rankedCollectionHints, collectionHints);
+                                        collectionHints = mergeAssistantHintValues(collectionHints, rankedCollectionHints);
                                     }
                                     rankedCollections = Array.isArray(collectionRanking === null || collectionRanking === void 0 ? void 0 : collectionRanking.ranked)
                                         ? collectionRanking === null || collectionRanking === void 0 ? void 0 : collectionRanking.ranked.map(function (entry) { return entry.name; })
@@ -2554,7 +2563,8 @@ function executeAiAssistantCodexRun(payload, context) {
                                                 collectionRanking: collectionRanking,
                                                 requestedCollection: requestedCollection,
                                                 permissionView: normalizeOptionalString((_14 = directive.payload) === null || _14 === void 0 ? void 0 : _14.permissionView) || contextRoute,
-                                                collectionNames: collectionNames
+                                                collectionNames: collectionNames,
+                                                collectionHints: collectionHints
                                             })
                                             : null;
                                         if (collectionOverride) {
@@ -2637,7 +2647,8 @@ function executeAiAssistantCodexRun(payload, context) {
                                     };
                                     return [3 /*break*/, 63];
                                 case 40:
-                                    probeEnabled = AI_ASSISTANT_TOOL_MAX_STEPS > 1;
+                                    aggregateProbeDisabled = executionDirective.type === 'aggregate' && !alwaysAllowProbeEnabled;
+                                    probeEnabled = AI_ASSISTANT_TOOL_MAX_STEPS > 1 && !aggregateProbeDisabled;
                                     probeBudgetAllowed = alwaysAllowProbeEnabled
                                         || hasRunBudget('Grabbing Data: probe', AI_ASSISTANT_MONGO_MIN_STAGE_BUDGET_MS);
                                     if (!(probeEnabled && probeBudgetAllowed)) return [3 /*break*/, 50];
@@ -2724,6 +2735,12 @@ function executeAiAssistantCodexRun(payload, context) {
                                             skippedReason: 'run_budget_exhausted'
                                         };
                                     }
+                                    else if (aggregateProbeDisabled) {
+                                        toolTelemetry.probe = {
+                                            attempted: false,
+                                            skippedReason: 'aggregate_probe_disabled'
+                                        };
+                                    }
                                     _22.label = 51;
                                 case 51:
                                     if (!(!alwaysAllowProbeEnabled && !hasRunBudget('Grabbing Data: final', AI_ASSISTANT_MONGO_MIN_STAGE_BUDGET_MS))) return [3 /*break*/, 52];
@@ -2790,14 +2807,18 @@ function executeAiAssistantCodexRun(payload, context) {
                                     progressTracker.push('Drafting response');
                                     zeroRowResult = toolPayload.result.output.rowCount <= 0;
                                     toolTelemetry.outcome = zeroRowResult ? { zeroRows: true } : undefined;
-                                    skipFollowupCodex = usedDeterministicHeuristicFastPath
+                                    followupCodexEnabled = resolveAssistantFollowupCodexEnabled(input.config);
+                                    skipFollowupCodex = !followupCodexEnabled
+                                        || usedDeterministicHeuristicFastPath
                                         || isAssistantDeterministicHeuristicDirective(executionDirective)
                                         || zeroRowResult;
                                     if (!skipFollowupCodex) return [3 /*break*/, 57];
                                     recordStep('Drafting response: deterministic summary', {
                                         reason: zeroRowResult
                                             ? 'zero_rows'
-                                            : (normalizeOptionalString(executionDirective.rawLine) || 'deterministic_heuristic')
+                                            : (!followupCodexEnabled
+                                                ? 'followup_disabled'
+                                                : (normalizeOptionalString(executionDirective.rawLine) || 'deterministic_heuristic'))
                                     });
                                     assistantContent = buildAssistantToolFallbackResponse(toolPayload.result);
                                     assistantContent = applyAssistantDisplayTableToResponse(assistantContent, toolPayload.result.output.display);
@@ -3314,7 +3335,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, idApp, requestHints, collectionResolution, collection, bridgeCollection, retryRootCollection, schemaFields, effectivePermissionView, _a, user, isSuperAdmin, canViewDebug, customerId, fallbackMeta, runtimeControl, runtimeFastMode, activeRuntimeControl, hasReadRuntimeBudget, resolveReadMaxTimeMS, baseQuery, stripped, userId, normalizedClient, shouldScopeByClient, _b, strippedClient, clientScopedQuery, scopedQuery, normalized, findOptions, buildFindOptions, buildCountOptions, runFindWithRepair, initialRead, documents, executedQuery, probeDocs, dateFallback, fallbackQuery, fallbackRead, fallbackDocs, expanded, fallbackRead, fallbackDocs, nameFallback, fallbackRead, fallbackDocs, _c, multiTermFallback, fallbackRead, fallbackDocs, _d, chemicalLookup, fallbackRead, fallbackDocs, queryFields, _e, aliases, rewrittenQuery, fallbackRead, fallbackDocs, _f, activeFallback, fallbackRead, fallbackDocs, _g, 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, countOptions, queryNoName, _h, queryNoDate, _j, _k, _l, _m, allCollections, base, alt, altCount, _o, total, sanitizedDocuments, requestedFields, missingFields, _p, projectionAliases, expandedProjection, refreshedDocs, includeIds, fieldAliases, displayDocs, idLookupDisplay, priorityFields, displayMaxRows, display;
+        var input, rawCollection, retryState, triedCollections, dbName, db, idApp, requestHints, lockRequestedCollection, crossCollectionRetryEnabled, collectionResolution, collection, preservePrimaryHintCollection, bridgeCollection, retryRootCollection, schemaFields, effectivePermissionView, _a, user, isSuperAdmin, canViewDebug, customerId, fallbackMeta, runtimeControl, runtimeFastMode, activeRuntimeControl, hasReadRuntimeBudget, resolveReadMaxTimeMS, baseQuery, stripped, userId, normalizedClient, shouldScopeByClient, _b, strippedClient, clientScopedQuery, scopedQuery, normalized, findOptions, buildFindOptions, buildCountOptions, runFindWithRepair, initialRead, documents, executedQuery, probeDocs, dateFallback, fallbackQuery, fallbackRead, fallbackDocs, expanded, fallbackRead, fallbackDocs, nameFallback, fallbackRead, fallbackDocs, _c, multiTermFallback, fallbackRead, fallbackDocs, _d, chemicalLookup, fallbackRead, fallbackDocs, queryFields, _e, aliases, rewrittenQuery, fallbackRead, fallbackDocs, _f, activeFallback, fallbackRead, fallbackDocs, _g, 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, countOptions, queryNoName, _h, queryNoDate, _j, _k, _l, _m, allCollections, base, alt, altCount, _o, total, sanitizedDocuments, requestedFields, missingFields, _p, projectionAliases, expandedProjection, refreshedDocs, includeIds, fieldAliases, displayDocs, idLookupDisplay, priorityFields, displayMaxRows, display;
         var e_1, _q;
         var _this = this;
         var _r, _s;
@@ -3331,15 +3352,20 @@ function executeAiAssistantMongoRead(payload, context) {
                         : {};
                     triedCollections = buildAssistantTriedCollectionSet(retryState.triedCollections);
                     addAssistantCollectionToTriedSet(triedCollections, rawCollection);
-                    crossCollectionRetryEnabled = retryState.disableCrossCollectionRetry !== true;
                     dbName = resolveAssistantDatabaseName(input.database, input.mongo);
                     db = resolveio_server_app_1.ResolveIOServer.getMongoConnection().db(dbName);
                     idApp = normalizeOptionalString(input.id_app);
                     requestHints = normalizeAssistantDirectiveHints(input.__assistantHints);
+                    lockRequestedCollection = shouldLockAssistantRequestedCollectionForExecution(rawCollection, input.permissionView, requestHints);
+                    crossCollectionRetryEnabled = retryState.disableCrossCollectionRetry !== true && !lockRequestedCollection;
                     return [4 /*yield*/, resolveAssistantCollectionName(db, dbName, rawCollection, idApp)];
                 case 1:
                     collectionResolution = _t.sent();
                     collection = collectionResolution.name || rawCollection;
+                    preservePrimaryHintCollection = shouldPreserveAssistantPrimaryHintCollection(rawCollection, collection, requestHints);
+                    if (preservePrimaryHintCollection) {
+                        collection = rawCollection;
+                    }
                     return [4 /*yield*/, resolveAssistantReportBuilderBridgeCollection(collection, db, dbName, {
                             requestHints: requestHints,
                             appId: idApp
@@ -4055,7 +4081,7 @@ function executeAiAssistantMongoRead(payload, context) {
                         fallbackMeta.fieldAliases = fieldAliases;
                     }
                     return [2 /*return*/, __assign({ documents: sanitizedDocuments, total: total, display: display }, (canViewDebug ? {
-                            debug: __assign(__assign({ collection: collection, collectionRequested: rawCollection, collectionResolved: collection, collectionMatched: collectionResolution.matched, collectionCandidates: collectionResolution.candidates, collectionScore: collectionResolution.score, bridge: bridgeCollection.mode === 'report-builder' ? 'report-builder' : 'direct-mongo', bridgeResolution: {
+                            debug: __assign(__assign({ collection: collection, collectionRequested: rawCollection, collectionResolved: collection, collectionMatched: preservePrimaryHintCollection ? true : collectionResolution.matched, collectionCandidates: preservePrimaryHintCollection ? [] : collectionResolution.candidates, collectionScore: preservePrimaryHintCollection ? 100 : collectionResolution.score, bridge: bridgeCollection.mode === 'report-builder' ? 'report-builder' : 'direct-mongo', bridgeResolution: {
                                     mode: bridgeCollection.mode,
                                     fallbackFrom: bridgeCollection.fallbackFrom || undefined,
                                     path: bridgeCollection.resolutionPath
@@ -4067,7 +4093,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, idApp, requestHints, collectionResolution, collection, bridgeCollection, retryRootCollection, schemaFields, effectivePermissionView, _a, user, isSuperAdmin, canViewDebug, customerId, fallbackMeta, runtimeControl, runtimeFastMode, activeRuntimeControl, hasAggregateRuntimeBudget, resolveAggregateMaxTimeMS, baseQuery, stripped, userId, normalizedClient, shouldScopeByClient, _b, clientScopedQuery, scopedQuery, normalizedPipeline, sanitizedPipeline, strippedPipeline, pipelineWithScope, normalizedOptions, limitedPipeline, executedPipeline, dateField, buildAggregateOptions, buildAggregateCountOptions, 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, _g, activeFallback, 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, hasActiveStatusFilters, 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, countOptions, queryNoName, _h, queryNoDate, _j, _k, _l, _m, allCollections, base, alt, altCount, _o, verification, _p, sanitizedDocuments, includeIds, displayDocs, idLookupDisplay, display;
+        var input, rawCollection, retryState, triedCollections, dbName, db, idApp, requestHints, lockRequestedCollection, crossCollectionRetryEnabled, collectionResolution, collection, preservePrimaryHintCollection, bridgeCollection, retryRootCollection, schemaFields, effectivePermissionView, _a, user, isSuperAdmin, canViewDebug, customerId, fallbackMeta, runtimeControl, runtimeFastMode, activeRuntimeControl, hasAggregateRuntimeBudget, resolveAggregateMaxTimeMS, baseQuery, stripped, userId, normalizedClient, shouldScopeByClient, _b, clientScopedQuery, scopedQuery, normalizedPipeline, sanitizedPipeline, strippedPipeline, pipelineWithScope, normalizedOptions, limitedPipeline, executedPipeline, dateField, buildAggregateOptions, buildAggregateCountOptions, 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, _g, activeFallback, 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, hasActiveStatusFilters, 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, countOptions, queryNoName, _h, queryNoDate, _j, _k, _l, _m, allCollections, base, alt, altCount, _o, verification, _p, sanitizedDocuments, includeIds, displayDocs, idLookupDisplay, display;
         var e_2, _q, e_3, _r;
         var _this = this;
         var _s, _t;
@@ -4084,15 +4110,20 @@ function executeAiAssistantMongoAggregate(payload, context) {
                         : {};
                     triedCollections = buildAssistantTriedCollectionSet(retryState.triedCollections);
                     addAssistantCollectionToTriedSet(triedCollections, rawCollection);
-                    crossCollectionRetryEnabled = retryState.disableCrossCollectionRetry !== true;
                     dbName = resolveAssistantDatabaseName(input.database, input.mongo);
                     db = resolveio_server_app_1.ResolveIOServer.getMongoConnection().db(dbName);
                     idApp = normalizeOptionalString(input.id_app);
                     requestHints = normalizeAssistantDirectiveHints(input.__assistantHints);
+                    lockRequestedCollection = shouldLockAssistantRequestedCollectionForExecution(rawCollection, input.permissionView, requestHints);
+                    crossCollectionRetryEnabled = retryState.disableCrossCollectionRetry !== true && !lockRequestedCollection;
                     return [4 /*yield*/, resolveAssistantCollectionName(db, dbName, rawCollection, idApp)];
                 case 1:
                     collectionResolution = _u.sent();
                     collection = collectionResolution.name || rawCollection;
+                    preservePrimaryHintCollection = shouldPreserveAssistantPrimaryHintCollection(rawCollection, collection, requestHints);
+                    if (preservePrimaryHintCollection) {
+                        collection = rawCollection;
+                    }
                     return [4 /*yield*/, resolveAssistantReportBuilderBridgeCollection(collection, db, dbName, {
                             requestHints: requestHints,
                             appId: idApp
@@ -5073,7 +5104,7 @@ function executeAiAssistantMongoAggregate(payload, context) {
                         includeGroupFromId: false
                     });
                     return [2 /*return*/, __assign(__assign({ documents: sanitizedDocuments, display: display }, (verification ? { verification: verification } : {})), (canViewDebug ? {
-                            debug: __assign(__assign(__assign({ collection: collection, collectionRequested: rawCollection, collectionResolved: collection, collectionMatched: collectionResolution.matched, collectionCandidates: collectionResolution.candidates, collectionScore: collectionResolution.score, bridge: bridgeCollection.mode === 'report-builder' ? 'report-builder' : 'direct-mongo', bridgeResolution: {
+                            debug: __assign(__assign(__assign({ collection: collection, collectionRequested: rawCollection, collectionResolved: collection, collectionMatched: preservePrimaryHintCollection ? true : collectionResolution.matched, collectionCandidates: preservePrimaryHintCollection ? [] : collectionResolution.candidates, collectionScore: preservePrimaryHintCollection ? 100 : collectionResolution.score, bridge: bridgeCollection.mode === 'report-builder' ? 'report-builder' : 'direct-mongo', bridgeResolution: {
                                     mode: bridgeCollection.mode,
                                     fallbackFrom: bridgeCollection.fallbackFrom || undefined,
                                     path: bridgeCollection.resolutionPath
@@ -5874,6 +5905,38 @@ function applyAssistantSortFieldAliases(sort, aliases) {
     });
     return next;
 }
+function doesAssistantPermissionRouteMatchCollection(permissionView, collection) {
+    var routeKey = normalizeCollectionKey(permissionView);
+    var collectionFamily = normalizeAssistantCollectionFamilyName(collection);
+    var collectionKey = normalizeCollectionKey(collectionFamily || collection);
+    if (!routeKey || !collectionKey || collectionKey.length < 5) {
+        return false;
+    }
+    var collectionKeys = [collectionKey];
+    if (collectionKey.endsWith('s') && collectionKey.length > 5) {
+        collectionKeys.push(collectionKey.slice(0, -1));
+    }
+    return collectionKeys.some(function (key) { return key.length >= 5 && (routeKey.includes(key) || key.includes(routeKey)); });
+}
+function shouldPreserveAssistantProbeCollection(directive, resolvedCollection, probeResponse) {
+    var _a, _b, _c;
+    var requestedCollection = normalizeOptionalString((_a = directive === null || directive === void 0 ? void 0 : directive.payload) === null || _a === void 0 ? void 0 : _a.collection);
+    var resolved = normalizeOptionalString(resolvedCollection);
+    if (!requestedCollection || !resolved || requestedCollection === resolved) {
+        return false;
+    }
+    var probeHints = normalizeAssistantDirectiveHints((_b = probeResponse === null || probeResponse === void 0 ? void 0 : probeResponse.debug) === null || _b === void 0 ? void 0 : _b.requestHints);
+    if (shouldPreserveAssistantPrimaryHintCollection(requestedCollection, resolved, probeHints)) {
+        return true;
+    }
+    var permissionView = normalizeOptionalString((_c = directive === null || directive === void 0 ? void 0 : directive.payload) === null || _c === void 0 ? void 0 : _c.permissionView);
+    return !!(permissionView
+        && doesAssistantPermissionRouteMatchCollection(permissionView, requestedCollection)
+        && !doesAssistantPermissionRouteMatchCollection(permissionView, resolved));
+}
+function shouldPreserveAssistantProbeCollectionForTesting(directive, resolvedCollection, probeResponse) {
+    return shouldPreserveAssistantProbeCollection(directive, resolvedCollection, probeResponse);
+}
 function rewriteAssistantDirectiveWithProbe(directive, probeResponse) {
     var _a, _b;
     if (!(directive === null || directive === void 0 ? void 0 : directive.payload) || typeof directive.payload !== 'object') {
@@ -5887,7 +5950,9 @@ function rewriteAssistantDirectiveWithProbe(directive, probeResponse) {
     var notes = [];
     var resolvedCollection = normalizeOptionalString(((_a = probeResponse === null || probeResponse === void 0 ? void 0 : probeResponse.debug) === null || _a === void 0 ? void 0 : _a.collectionResolved)
         || ((_b = probeResponse === null || probeResponse === void 0 ? void 0 : probeResponse.debug) === null || _b === void 0 ? void 0 : _b.collection));
-    if (resolvedCollection && resolvedCollection !== normalizeOptionalString(payload.collection)) {
+    if (resolvedCollection
+        && resolvedCollection !== normalizeOptionalString(payload.collection)
+        && !shouldPreserveAssistantProbeCollection(directive, resolvedCollection, probeResponse)) {
         payload.collection = resolvedCollection;
         notes.push("collection:".concat(resolvedCollection));
     }
@@ -6589,10 +6654,10 @@ function isAssistantDeterministicHeuristicDirective(directive) {
 }
 function buildAssistantHeuristicDirective(message, collectionHints, collectionNames, appId) {
     if (collectionNames === void 0) { collectionNames = []; }
-    void collectionNames;
     if (!normalizeOptionalString(message)) {
         return null;
     }
+    void collectionNames;
     var schemaHoursDirective = resolveAssistantDeterministicHeuristicEnabled(AI_ASSISTANT_HEURISTIC_ID_SCHEMA_HOURS_USER_TIME, appId)
         ? buildAssistantGenericHoursDirective(message, collectionHints, appId)
         : null;
@@ -6640,6 +6705,9 @@ function resolveDefaultAssistantPermissionView(collection) {
     if (base.startsWith('employee')) {
         return '/employee/list';
     }
+    if (base === 'jobs' || base === 'job' || base.startsWith('job-') || base.startsWith('jobs-')) {
+        return '/job/list';
+    }
     if (/work[-_/ ]?orders?|maintenance[-_/ ]?orders?|repair[-_/ ]?orders?/.test(base)) {
         return '/order/list';
     }
@@ -7367,22 +7435,135 @@ function buildAssistantCodexToolFollowupPrompt(message, attachmentText, historyT
     var instruction = '\n\nInstruction:\nNow answer the user. Do NOT output another REPORT_BUILDER_* directive. Output plain Markdown. Summarize first, then include a Markdown table. If the Tool Result includes verification warnings that materially affect interpretation (partial periods, mixed metric/date basis, failed cross-check), mention them briefly and call out the metric/date basis used. Include explicit UTC date boundaries and never show placeholders like $$NOW.';
     return "System:\n".concat(systemPromptText).concat(contextBlock).concat(historyBlock, "\n\nUser:\n").concat(message).concat(attachmentText || '').concat(toolBlock).concat(instruction).trim();
 }
+function formatAssistantDisplayValueForSentence(value) {
+    if (value === null || value === undefined) {
+        return '';
+    }
+    if (typeof value === 'number' && Number.isFinite(value)) {
+        return new Intl.NumberFormat('en-US', {
+            maximumFractionDigits: Math.abs(value) >= 100 ? 0 : 2
+        }).format(value);
+    }
+    if (value instanceof Date) {
+        return value.toISOString();
+    }
+    var normalized = normalizeOptionalString(value);
+    return normalized.length > 80 ? "".concat(normalized.slice(0, 77), "...") : normalized;
+}
+function isAssistantMetricDisplayColumn(column, value) {
+    if (typeof value !== 'number' || !Number.isFinite(value)) {
+        return false;
+    }
+    var normalized = normalizeOptionalString(column).toLowerCase();
+    if (!normalized || /\b(id|number|zip|phone)\b/.test(normalized)) {
+        return false;
+    }
+    return true;
+}
+function getAssistantMetricDisplayColumnPriority(column) {
+    var normalized = normalizeOptionalString(column)
+        .toLowerCase()
+        .replace(/[_-]+/g, ' ')
+        .replace(/\s+/g, ' ')
+        .trim();
+    if (!normalized) {
+        return 0;
+    }
+    if (/\bwork\s*orders?\b/.test(normalized)) {
+        return 100;
+    }
+    if (/\borders?\b/.test(normalized)) {
+        return 95;
+    }
+    if (/\b(total|count|rows?)\b/.test(normalized)) {
+        return 90;
+    }
+    if (/\b(revenue|amount|price|cost|margin|balance)\b/.test(normalized)) {
+        return 85;
+    }
+    if (/\b(hours?|volume|quantity|qty|deliveries|invoices)\b/.test(normalized)) {
+        return 80;
+    }
+    if (/\b(active|completed|reviewed|closed|canceled|cancelled|inactive|open|pending)\b/.test(normalized)) {
+        return 20;
+    }
+    return 50;
+}
+function buildAssistantDisplayLeadSummary(display) {
+    var rows = Array.isArray(display === null || display === void 0 ? void 0 : display.rows) ? (display === null || display === void 0 ? void 0 : display.rows) || [] : [];
+    var columns = Array.isArray(display === null || display === void 0 ? void 0 : display.columns) ? (display === null || display === void 0 ? void 0 : display.columns) || [] : [];
+    var firstRow = rows[0];
+    if (!firstRow || typeof firstRow !== 'object' || !columns.length) {
+        return '';
+    }
+    var visibleColumns = columns
+        .map(function (column) { return normalizeOptionalString(column); })
+        .filter(Boolean)
+        .filter(function (column) { return !shouldRedactField(column); });
+    if (!visibleColumns.length) {
+        return '';
+    }
+    var labelColumn = visibleColumns.find(function (column) {
+        var value = firstRow[column];
+        return typeof value === 'string' && !!normalizeOptionalString(value);
+    }) || visibleColumns[0];
+    var metricColumn = visibleColumns
+        .filter(function (column) { return column !== labelColumn && isAssistantMetricDisplayColumn(column, firstRow[column]); })
+        .sort(function (a, b) {
+        var priorityDelta = getAssistantMetricDisplayColumnPriority(b) - getAssistantMetricDisplayColumnPriority(a);
+        return priorityDelta || visibleColumns.indexOf(a) - visibleColumns.indexOf(b);
+    })[0];
+    var labelValue = formatAssistantDisplayValueForSentence(firstRow[labelColumn]);
+    if (labelValue && metricColumn) {
+        var metricValue = formatAssistantDisplayValueForSentence(firstRow[metricColumn]);
+        if (metricValue) {
+            return rows.length > 1
+                ? "Top row: ".concat(labelColumn, " ").concat(labelValue, ", ").concat(metricColumn, " ").concat(metricValue, ".")
+                : "Result: ".concat(labelColumn, " ").concat(labelValue, ", ").concat(metricColumn, " ").concat(metricValue, ".");
+        }
+    }
+    var details = visibleColumns
+        .slice(0, 4)
+        .map(function (column) {
+        var value = formatAssistantDisplayValueForSentence(firstRow[column]);
+        return value ? "".concat(column, " ").concat(value) : '';
+    })
+        .filter(Boolean);
+    if (!details.length) {
+        return '';
+    }
+    return rows.length > 1
+        ? "First row: ".concat(details.join(', '), ".")
+        : "Result: ".concat(details.join(', '), ".");
+}
 function buildAssistantToolFallbackResponse(result) {
     var _a, _b;
-    var lines = ['Here is a data snapshot based on the tool result:'];
-    if (result.output.collection) {
-        lines.push("- Collection: ".concat(result.output.collection));
-    }
-    lines.push("- Rows returned: ".concat(result.output.rowCount));
+    var rowCount = Math.max(0, Number(result.output.rowCount || 0));
+    var source = normalizeOptionalString(result.output.collection);
+    var lines = rowCount > 0
+        ? ["I found ".concat(rowCount === 1 ? '1 matching row' : "".concat(rowCount, " matching rows")).concat(source ? " from ".concat(source) : '', ".")]
+        : ["The query ran successfully".concat(source ? " against ".concat(source) : '', ", but no matching rows were returned.")];
+    if (source) {
+        lines.push("- Source: ".concat(source));
+    }
+    lines.push("- Rows returned: ".concat(rowCount));
     if (typeof result.output.total === 'number') {
         lines.push("- Total: ".concat(result.output.total));
     }
+    var leadSummary = buildAssistantDisplayLeadSummary(result.output.display);
+    if (leadSummary) {
+        lines.push('');
+        lines.push(leadSummary);
+    }
     if ((_b = (_a = result.output.display) === null || _a === void 0 ? void 0 : _a.rows) === null || _b === void 0 ? void 0 : _b.length) {
         lines.push('');
         lines.push(formatDisplayTableMarkdown(result.output.display));
     }
     return lines.join('\n').trim();
 }
+function buildAssistantToolFallbackResponseForTesting(result) {
+    return buildAssistantToolFallbackResponse(result);
+}
 function didAssistantRequestLotOrBatch(message) {
     var normalized = normalizeOptionalString(message).toLowerCase();
     if (!normalized) {
@@ -9914,30 +10095,7 @@ function applyAssistantDisplayColumnHints(value, display) {
     }
     return renameAssistantDisplayColumn(display, display.columns[0], labelHint);
 }
-function resolveAssistantEmptyDisplayColumns(value) {
-    var labelHint = resolveAssistantDisplayTemporalLabelHint(value);
-    if (labelHint) {
-        if (labelHint === 'Customer') {
-            var requestedMonths = resolveAssistantRequestedMonthBucketsFromMessage(value);
-            if (requestedMonths.length >= 3) {
-                return __spreadArray([labelHint], __read(requestedMonths), false);
-            }
-            var looseMonthMatch = value.match(/\b(?:last|past|previous|over\s+the\s+last)\s+(\d+)\s+(?:full\s+calendar\s+|calendar\s+|full\s+)?months?\b/i);
-            var looseMonthCount = (looseMonthMatch === null || looseMonthMatch === void 0 ? void 0 : looseMonthMatch[1]) ? Number(looseMonthMatch[1]) : Number.NaN;
-            if (Number.isFinite(looseMonthCount) && looseMonthCount > 0) {
-                var inferred = buildAssistantExpectedMonthBuckets((0, common_1.round)(looseMonthCount), 'full_month');
-                if (inferred.length >= 3) {
-                    return __spreadArray([labelHint], __read(inferred), false);
-                }
-            }
-            return [labelHint, 'Details'];
-        }
-        return [labelHint, 'Total Revenue'];
-    }
-    return ['Result', 'Details'];
-}
 function applyAssistantDisplayTableToResponse(value, display) {
-    var _a;
     if (!display || !Array.isArray(display.rows)) {
         return value;
     }
@@ -9947,39 +10105,14 @@ function applyAssistantDisplayTableToResponse(value, display) {
         var rowCount = typeof normalizedDisplay.rowCount === 'number' && normalizedDisplay.rowCount > 0
             ? normalizedDisplay.rowCount
             : 0;
-        var fallbackColumns = Array.isArray(normalizedDisplay.columns) && normalizedDisplay.columns.length
-            ? normalizedDisplay.columns
-            : resolveAssistantEmptyDisplayColumns(cleaned_1 || value);
-        var normalizedColumns = fallbackColumns.length === 1
-            ? __spreadArray(__spreadArray([], __read(fallbackColumns), false), ['Value'], false) : fallbackColumns;
-        var rowSummary = [(_a = {},
-                _a[normalizedColumns[0]] = rowCount > 0 ? 'Rows matched' : 'No rows matched',
-                _a[normalizedColumns[1]] = rowCount,
-                _a)];
-        var tableDisplay = {
-            columns: normalizedColumns,
-            rows: rowSummary,
-            rowCount: rowCount,
-            truncated: false,
-            includeIds: false
-        };
-        var emptyTable = formatDisplayTableMarkdown(tableDisplay);
-        if (!emptyTable) {
-            return cleaned_1 || value;
-        }
         var noRowsNote = rowCount > 0 ? '' : 'No rows matched your request.';
+        var alreadyExplainsNoRows = /\bno (?:matching )?rows?(?: matched| were returned)?\b/i.test(cleaned_1);
         var base = cleaned_1
-            ? (noRowsNote && !/\bno rows? matched\b/i.test(cleaned_1)
+            ? (noRowsNote && !alreadyExplainsNoRows
                 ? "".concat(cleaned_1.trim(), "\n\n").concat(noRowsNote).trim()
                 : cleaned_1.trim())
             : noRowsNote;
-        if (!cleaned_1) {
-            if (!base) {
-                return emptyTable;
-            }
-            return "".concat(base, "\n\n").concat(emptyTable).trim();
-        }
-        return "".concat(base, "\n\n").concat(emptyTable).trim();
+        return base || value;
     }
     var table = formatDisplayTableMarkdown(normalizedDisplay);
     if (!table) {
@@ -9991,6 +10124,9 @@ function applyAssistantDisplayTableToResponse(value, display) {
     }
     return "".concat(cleaned.trim(), "\n\n").concat(table).trim();
 }
+function applyAssistantDisplayTableToResponseForTesting(value, display) {
+    return applyAssistantDisplayTableToResponse(value, display);
+}
 function escapeMarkdownCell(value) {
     var raw = value === null || value === undefined ? '' : String(value);
     return raw.replace(/\|/g, '\\|').replace(/\r?\n/g, ' ').trim();
@@ -14558,6 +14694,27 @@ function listAssistantReportBuilderCollectionsFromManager() {
     });
     return names;
 }
+function listAssistantConfiguredCollectionsFromManager() {
+    var _a;
+    var manager = (_a = resolveio_server_app_1.ResolveIOServer.getMongoManager) === null || _a === void 0 ? void 0 : _a.call(resolveio_server_app_1.ResolveIOServer);
+    var collectionModels = manager && typeof manager.collections === 'function'
+        ? manager.collections()
+        : [];
+    if (!Array.isArray(collectionModels) || !collectionModels.length) {
+        return [];
+    }
+    var seen = new Set();
+    var names = [];
+    collectionModels.forEach(function (model) {
+        var name = normalizeOptionalString(model === null || model === void 0 ? void 0 : model.collectionName);
+        if (!name || seen.has(name)) {
+            return;
+        }
+        seen.add(name);
+        names.push(name);
+    });
+    return names;
+}
 function resolveAssistantSurfaceFileCandidates(baseName) {
     var fileNames = ["".concat(baseName, ".ts"), "".concat(baseName, ".js")];
     var roots = [
@@ -14788,15 +14945,21 @@ function resolveAssistantSurfaceHints(message, contextRoute, collectionNames) {
 }
 function listAssistantCollections(db, dbName) {
     return __awaiter(this, void 0, void 0, function () {
-        var cacheKey, cached, now, seen, merged, pushName, collections, _a, names;
+        var cacheKey, cached, now, managerCollectionNames, mergedCachedNames, seen, merged, pushName, collections, _a, names;
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
                     cacheKey = normalizeOptionalString(dbName) || 'default';
                     cached = AI_ASSISTANT_COLLECTION_CACHE.get(cacheKey);
                     now = Date.now();
+                    managerCollectionNames = mergeAssistantHintValues(listAssistantConfiguredCollectionsFromManager(), listAssistantReportBuilderCollectionsFromManager());
                     if (cached && now - cached.updatedAt < AI_ASSISTANT_COLLECTION_CACHE_TTL_MS) {
-                        return [2 /*return*/, cached.names];
+                        mergedCachedNames = mergeAssistantHintValues(managerCollectionNames, cached.names)
+                            .sort(function (a, b) { return a.localeCompare(b); });
+                        if (mergedCachedNames.length !== cached.names.length) {
+                            AI_ASSISTANT_COLLECTION_CACHE.set(cacheKey, { names: mergedCachedNames, updatedAt: now });
+                        }
+                        return [2 /*return*/, mergedCachedNames];
                     }
                     seen = new Set();
                     merged = [];
@@ -14808,7 +14971,7 @@ function listAssistantCollections(db, dbName) {
                         seen.add(normalized);
                         merged.push(normalized);
                     };
-                    listAssistantReportBuilderCollectionsFromManager().forEach(pushName);
+                    managerCollectionNames.forEach(pushName);
                     _b.label = 1;
                 case 1:
                     _b.trys.push([1, 3, , 4]);
@@ -15703,20 +15866,13 @@ function resolveCollectionOverrideWithContext(params) {
     var requested = normalizeOptionalString(params.requestedCollection);
     var allowVersions = shouldAllowVersionCollections(params.message);
     var collectionNames = Array.isArray(params.collectionNames) ? params.collectionNames : [];
+    var collectionHints = Array.isArray(params.collectionHints)
+        ? params.collectionHints.map(function (value) { return normalizeOptionalString(value); }).filter(Boolean)
+        : [];
     var permissionView = normalizeOptionalString(params.permissionView);
     var routeHintCollections = permissionView
         ? resolveCollectionHintsFromRoute(permissionView, collectionNames)
         : [];
-    var isCollectionInHintFamilies = function (collection, hintCollections) {
-        var candidateFamily = normalizeAssistantCollectionFamilyName(collection);
-        if (!candidateFamily) {
-            return false;
-        }
-        return (hintCollections || []).some(function (hintCollection) {
-            var hintFamily = normalizeAssistantCollectionFamilyName(hintCollection);
-            return !!(hintFamily && hintFamily === candidateFamily);
-        });
-    };
     if (permissionView) {
         var reportPreferred = resolveReportCollectionName(permissionView, collectionNames, requested);
         if (reportPreferred && reportPreferred !== requested) {
@@ -15728,6 +15884,24 @@ function resolveCollectionOverrideWithContext(params) {
                 reason: 'report builder route preference'
             };
         }
+        var routePreferred = routeHintCollections.find(function (collection) {
+            return collectionNames.includes(collection) && !isVersionCollectionName(collection);
+        });
+        if (routePreferred
+            && requested
+            && !isAssistantCollectionInHintFamilies(requested, [routePreferred])) {
+            var routePreferredName = normalizeAssistantCollectionOverrideName(routePreferred);
+            var requestedIsWorkOrder = isAssistantWorkOrderCollectionOverrideCandidate(requested);
+            if (!(routePreferredName === 'orders' && requestedIsWorkOrder && hasAssistantWorkOrderAliasTerms(params.message))) {
+                return {
+                    from: requested,
+                    to: routePreferred,
+                    fromScore: 0,
+                    toScore: 0,
+                    reason: 'permission route collection match'
+                };
+            }
+        }
     }
     if (!allowVersions && isVersionCollectionName(requested)) {
         var base = stripVersionSuffix(requested);
@@ -15741,10 +15915,55 @@ function resolveCollectionOverrideWithContext(params) {
             };
         }
     }
+    var primaryCollectionHint = collectionHints[0] || '';
+    var requestedMatchesPermissionRoute = !!(requested
+        && permissionView
+        && (isAssistantCollectionInHintFamilies(requested, routeHintCollections)
+            || doesAssistantPermissionRouteMatchCollection(permissionView, requested)));
+    var primaryHintMatchesPermissionRoute = !!(primaryCollectionHint
+        && permissionView
+        && (isAssistantCollectionInHintFamilies(primaryCollectionHint, routeHintCollections)
+            || doesAssistantPermissionRouteMatchCollection(permissionView, primaryCollectionHint)));
+    if (requestedMatchesPermissionRoute && !primaryHintMatchesPermissionRoute) {
+        return null;
+    }
+    var requestedHintIndex = requested
+        ? collectionHints.findIndex(function (collection) { return isAssistantCollectionInHintFamilies(requested, [collection]); })
+        : -1;
+    if (requestedHintIndex > 0
+        && primaryCollectionHint
+        && !primaryHintMatchesPermissionRoute) {
+        var requestedScore = resolveAssistantCollectionScore(params.collectionRanking, requested);
+        var primaryScore = resolveAssistantCollectionScore(params.collectionRanking, primaryCollectionHint);
+        var scoreGap = primaryScore - requestedScore;
+        if (requestedScore >= AI_ASSISTANT_COLLECTION_OVERRIDE_MIN_SCORE
+            && primaryScore >= AI_ASSISTANT_COLLECTION_OVERRIDE_MIN_SCORE
+            && scoreGap <= AI_ASSISTANT_COLLECTION_OVERRIDE_SCORE_GAP) {
+            return null;
+        }
+    }
+    if (primaryCollectionHint
+        && requested
+        && !isAssistantCollectionInHintFamilies(requested, [primaryCollectionHint])
+        && (isAssistantCollectionInHintFamilies(requested, collectionHints.slice(1))
+            || routeHintCollections.length > 0)) {
+        return {
+            from: requested,
+            to: primaryCollectionHint,
+            fromScore: 0,
+            toScore: 0,
+            reason: 'ordered collection hint preference'
+        };
+    }
+    if (primaryCollectionHint
+        && requested
+        && isAssistantCollectionInHintFamilies(requested, [primaryCollectionHint])) {
+        return null;
+    }
     var rankingOverride = resolveAssistantCollectionOverride(params.collectionRanking, requested);
     if (rankingOverride) {
-        var requestedMatchesRouteHints = isCollectionInHintFamilies(requested, routeHintCollections);
-        var overrideMatchesRouteHints = isCollectionInHintFamilies(rankingOverride.to, routeHintCollections);
+        var requestedMatchesRouteHints = isAssistantCollectionInHintFamilies(requested, routeHintCollections);
+        var overrideMatchesRouteHints = isAssistantCollectionInHintFamilies(rankingOverride.to, routeHintCollections);
         if (requestedMatchesRouteHints && !overrideMatchesRouteHints) {
             return null;
         }
@@ -15946,6 +16165,13 @@ function resolveAssistantCollectionName(db, dbName, requested, appId) {
         });
     });
 }
+function resolveAssistantCollectionNameForTesting(db, dbName, requested, appId) {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            return [2 /*return*/, resolveAssistantCollectionName(db, dbName, requested, appId)];
+        });
+    });
+}
 var AI_ASSISTANT_BRIDGE_COLLECTION_ALIASES = {};
 var AI_ASSISTANT_BRIDGE_COLLECTION_ALIAS_OPTIONS = {};
 var AI_ASSISTANT_DIRECT_COLLECTION_FALLBACK_ALLOWLIST = new Set([
@@ -15960,6 +16186,44 @@ function normalizeAssistantCollectionFamilyName(value) {
     var withoutReport = normalized.startsWith('report-') ? normalized.slice('report-'.length) : normalized;
     return stripVersionSuffix(withoutReport);
 }
+function isAssistantCollectionInHintFamilies(collection, hintCollections) {
+    var candidateFamily = normalizeAssistantCollectionFamilyName(collection);
+    if (!candidateFamily) {
+        return false;
+    }
+    return (hintCollections || []).some(function (hintCollection) {
+        var hintFamily = normalizeAssistantCollectionFamilyName(hintCollection);
+        return !!(hintFamily && hintFamily === candidateFamily);
+    });
+}
+function shouldPreserveAssistantPrimaryHintCollection(requestedCollection, resolvedCollection, requestHints) {
+    var _a;
+    var requested = normalizeOptionalString(requestedCollection);
+    var resolved = normalizeOptionalString(resolvedCollection);
+    if (!requested || !resolved || requested === resolved || AI_ASSISTANT_BLOCKED_COLLECTIONS.has(requested)) {
+        return false;
+    }
+    var primaryCollectionHint = normalizeOptionalString((_a = requestHints === null || requestHints === void 0 ? void 0 : requestHints.collectionHints) === null || _a === void 0 ? void 0 : _a[0]);
+    return !!(primaryCollectionHint
+        && isAssistantCollectionInHintFamilies(requested, [primaryCollectionHint]));
+}
+function shouldLockAssistantRequestedCollectionForExecution(requestedCollection, permissionView, requestHints) {
+    var _a;
+    var requested = normalizeOptionalString(requestedCollection);
+    if (!requested || AI_ASSISTANT_BLOCKED_COLLECTIONS.has(requested)) {
+        return false;
+    }
+    var primaryCollectionHint = normalizeOptionalString((_a = requestHints === null || requestHints === void 0 ? void 0 : requestHints.collectionHints) === null || _a === void 0 ? void 0 : _a[0]);
+    if (primaryCollectionHint && isAssistantCollectionInHintFamilies(requested, [primaryCollectionHint])) {
+        return true;
+    }
+    var normalizedPermissionView = normalizeOptionalString(permissionView);
+    return !!(normalizedPermissionView
+        && doesAssistantPermissionRouteMatchCollection(normalizedPermissionView, requested));
+}
+function shouldLockAssistantRequestedCollectionForExecutionForTesting(requestedCollection, permissionView, requestHints) {
+    return shouldLockAssistantRequestedCollectionForExecution(requestedCollection, permissionView, normalizeAssistantDirectiveHints(requestHints));
+}
 function addAssistantCollectionToTriedSet(tried, collection) {
     var normalized = normalizeOptionalString(collection);
     if (normalized) {
@@ -16810,12 +17074,12 @@ function resolveAssistantBridgeCollectionHintCandidates(requestedCollection, req
 }
 function resolveAssistantReportBuilderBridgeCollection(collection_1, db_1) {
     return __awaiter(this, arguments, void 0, function (collection, db, dbName, options) {
-        var normalized, resolutionPath, pushResolutionStep, finalizeResolution, requestHints, appId, requestedTokens, requestedTokenWeights, aliasCandidates, hintCandidates, alias, manager, hasManager, candidates, pushCandidate, base, reportCandidate, candidates_5, candidates_5_1, candidate, model, resolverTargets, resolverErrorLogged, resolverTargets_1, resolverTargets_1_1, resolverTarget, resolved, resolvedName, resolvedScore, resolvedModel, _a, e_34_1, candidates_6, candidates_6_1, candidate, e_35_1, candidates_7, candidates_7_1, candidate;
-        var e_36, _b, e_34, _c, e_35, _d, e_37, _e;
-        var _f;
+        var normalized, resolutionPath, pushResolutionStep, finalizeResolution, requestHints, appId, requestedTokens, requestedTokenWeights, aliasCandidates, hintCandidates, alias, manager, hasManager, configuredCollectionNames, isConfiguredCollection, candidates, pushCandidate, base, reportCandidate, candidates_5, candidates_5_1, candidate, model, candidates_6, candidates_6_1, candidate, primaryCollectionHint, resolverTargets, resolverErrorLogged, resolverTargets_1, resolverTargets_1_1, resolverTarget, resolved, resolvedName, resolvedScore, resolvedModel, _a, e_34_1, candidates_7, candidates_7_1, candidate, e_35_1, candidates_8, candidates_8_1, candidate;
+        var e_36, _b, e_37, _c, e_34, _d, e_35, _e, e_38, _f;
+        var _g, _h;
         if (dbName === void 0) { dbName = ''; }
-        return __generator(this, function (_g) {
-            switch (_g.label) {
+        return __generator(this, function (_j) {
+            switch (_j.label) {
                 case 0:
                     normalized = normalizeOptionalString(collection);
                     if (!normalized) {
@@ -16849,8 +17113,13 @@ function resolveAssistantReportBuilderBridgeCollection(collection_1, db_1) {
                         pushResolutionStep("hints:".concat(hintCandidates.slice(0, 6).join(',')));
                     }
                     alias = aliasCandidates[0] || '';
-                    manager = (_f = resolveio_server_app_1.ResolveIOServer.getMongoManager) === null || _f === void 0 ? void 0 : _f.call(resolveio_server_app_1.ResolveIOServer);
+                    manager = (_g = resolveio_server_app_1.ResolveIOServer.getMongoManager) === null || _g === void 0 ? void 0 : _g.call(resolveio_server_app_1.ResolveIOServer);
                     hasManager = !!(manager && typeof manager.collection === 'function');
+                    configuredCollectionNames = listAssistantConfiguredCollectionsFromManager();
+                    isConfiguredCollection = function (name) {
+                        var value = normalizeOptionalString(name);
+                        return !!value && configuredCollectionNames.includes(value);
+                    };
                     candidates = [];
                     pushCandidate = function (name) {
                         var value = normalizeOptionalString(name);
@@ -16888,23 +17157,49 @@ function resolveAssistantReportBuilderBridgeCollection(collection_1, db_1) {
                             finally { if (e_36) throw e_36.error; }
                         }
                     }
+                    if (configuredCollectionNames.length) {
+                        try {
+                            for (candidates_6 = __values(candidates), candidates_6_1 = candidates_6.next(); !candidates_6_1.done; candidates_6_1 = candidates_6.next()) {
+                                candidate = candidates_6_1.value;
+                                if (AI_ASSISTANT_BLOCKED_COLLECTIONS.has(candidate)) {
+                                    continue;
+                                }
+                                if (isConfiguredCollection(candidate)) {
+                                    return [2 /*return*/, finalizeResolution(candidate, 'direct-mongo', "manager.configured:".concat(candidate))];
+                                }
+                            }
+                        }
+                        catch (e_37_1) { e_37 = { error: e_37_1 }; }
+                        finally {
+                            try {
+                                if (candidates_6_1 && !candidates_6_1.done && (_c = candidates_6.return)) _c.call(candidates_6);
+                            }
+                            finally { if (e_37) throw e_37.error; }
+                        }
+                    }
+                    primaryCollectionHint = normalizeOptionalString((_h = requestHints === null || requestHints === void 0 ? void 0 : requestHints.collectionHints) === null || _h === void 0 ? void 0 : _h[0]);
+                    if (primaryCollectionHint
+                        && !AI_ASSISTANT_BLOCKED_COLLECTIONS.has(normalized)
+                        && isAssistantCollectionInHintFamilies(normalized, [primaryCollectionHint])) {
+                        return [2 /*return*/, finalizeResolution(normalized, 'direct-mongo', "hints.primary:".concat(primaryCollectionHint))];
+                    }
                     if (!(db && dbName)) return [3 /*break*/, 10];
                     resolverTargets = mergeAssistantHintValues(alias ? [alias] : [], [normalized], hintCandidates).slice(0, 10);
                     resolverErrorLogged = false;
-                    _g.label = 1;
+                    _j.label = 1;
                 case 1:
-                    _g.trys.push([1, 8, 9, 10]);
+                    _j.trys.push([1, 8, 9, 10]);
                     resolverTargets_1 = __values(resolverTargets), resolverTargets_1_1 = resolverTargets_1.next();
-                    _g.label = 2;
+                    _j.label = 2;
                 case 2:
                     if (!!resolverTargets_1_1.done) return [3 /*break*/, 7];
                     resolverTarget = resolverTargets_1_1.value;
-                    _g.label = 3;
+                    _j.label = 3;
                 case 3:
-                    _g.trys.push([3, 5, , 6]);
+                    _j.trys.push([3, 5, , 6]);
                     return [4 /*yield*/, resolveAssistantCollectionName(db, dbName, resolverTarget, appId)];
                 case 4:
-                    resolved = _g.sent();
+                    resolved = _j.sent();
                     resolvedName = normalizeOptionalString(resolved === null || resolved === void 0 ? void 0 : resolved.name);
                     if (!resolvedName) {
                         return [3 /*break*/, 6];
@@ -16929,7 +17224,7 @@ function resolveAssistantReportBuilderBridgeCollection(collection_1, db_1) {
                     }
                     return [3 /*break*/, 6];
                 case 5:
-                    _a = _g.sent();
+                    _a = _j.sent();
                     if (!resolverErrorLogged) {
                         pushResolutionStep('resolver:error');
                         resolverErrorLogged = true;
@@ -16940,63 +17235,63 @@ function resolveAssistantReportBuilderBridgeCollection(collection_1, db_1) {
                     return [3 /*break*/, 2];
                 case 7: return [3 /*break*/, 10];
                 case 8:
-                    e_34_1 = _g.sent();
+                    e_34_1 = _j.sent();
                     e_34 = { error: e_34_1 };
                     return [3 /*break*/, 10];
                 case 9:
                     try {
-                        if (resolverTargets_1_1 && !resolverTargets_1_1.done && (_c = resolverTargets_1.return)) _c.call(resolverTargets_1);
+                        if (resolverTargets_1_1 && !resolverTargets_1_1.done && (_d = resolverTargets_1.return)) _d.call(resolverTargets_1);
                     }
                     finally { if (e_34) throw e_34.error; }
                     return [7 /*endfinally*/];
                 case 10:
                     if (!db) return [3 /*break*/, 18];
-                    _g.label = 11;
+                    _j.label = 11;
                 case 11:
-                    _g.trys.push([11, 16, 17, 18]);
-                    candidates_6 = __values(candidates), candidates_6_1 = candidates_6.next();
-                    _g.label = 12;
+                    _j.trys.push([11, 16, 17, 18]);
+                    candidates_7 = __values(candidates), candidates_7_1 = candidates_7.next();
+                    _j.label = 12;
                 case 12:
-                    if (!!candidates_6_1.done) return [3 /*break*/, 15];
-                    candidate = candidates_6_1.value;
+                    if (!!candidates_7_1.done) return [3 /*break*/, 15];
+                    candidate = candidates_7_1.value;
                     if (AI_ASSISTANT_BLOCKED_COLLECTIONS.has(candidate)) {
                         return [3 /*break*/, 14];
                     }
                     return [4 /*yield*/, doesAssistantCollectionExistInDb(db, candidate)];
                 case 13:
-                    if (_g.sent()) {
+                    if (_j.sent()) {
                         return [2 /*return*/, finalizeResolution(candidate, 'direct-mongo', "db.exists:".concat(candidate))];
                     }
-                    _g.label = 14;
+                    _j.label = 14;
                 case 14:
-                    candidates_6_1 = candidates_6.next();
+                    candidates_7_1 = candidates_7.next();
                     return [3 /*break*/, 12];
                 case 15: return [3 /*break*/, 18];
                 case 16:
-                    e_35_1 = _g.sent();
+                    e_35_1 = _j.sent();
                     e_35 = { error: e_35_1 };
                     return [3 /*break*/, 18];
                 case 17:
                     try {
-                        if (candidates_6_1 && !candidates_6_1.done && (_d = candidates_6.return)) _d.call(candidates_6);
+                        if (candidates_7_1 && !candidates_7_1.done && (_e = candidates_7.return)) _e.call(candidates_7);
                     }
                     finally { if (e_35) throw e_35.error; }
                     return [7 /*endfinally*/];
                 case 18:
                     try {
-                        for (candidates_7 = __values(candidates), candidates_7_1 = candidates_7.next(); !candidates_7_1.done; candidates_7_1 = candidates_7.next()) {
-                            candidate = candidates_7_1.value;
+                        for (candidates_8 = __values(candidates), candidates_8_1 = candidates_8.next(); !candidates_8_1.done; candidates_8_1 = candidates_8.next()) {
+                            candidate = candidates_8_1.value;
                             if (isAssistantDirectCollectionFallbackAllowed(candidate)) {
                                 return [2 /*return*/, finalizeResolution(candidate, 'direct-mongo', "allowlist:".concat(candidate))];
                             }
                         }
                     }
-                    catch (e_37_1) { e_37 = { error: e_37_1 }; }
+                    catch (e_38_1) { e_38 = { error: e_38_1 }; }
                     finally {
                         try {
-                            if (candidates_7_1 && !candidates_7_1.done && (_e = candidates_7.return)) _e.call(candidates_7);
+                            if (candidates_8_1 && !candidates_8_1.done && (_f = candidates_8.return)) _f.call(candidates_8);
                         }
-                        finally { if (e_37) throw e_37.error; }
+                        finally { if (e_38) throw e_38.error; }
                     }
                     throw new Error('AI assistant report builder bridge: No queryable collection could be resolved.');
             }
@@ -17004,7 +17299,7 @@ function resolveAssistantReportBuilderBridgeCollection(collection_1, db_1) {
     });
 }
 function findQueryDateField(query) {
-    var e_38, _a, e_39, _b;
+    var e_39, _a, e_40, _b;
     if (!query || typeof query !== 'object') {
         return null;
     }
@@ -17018,12 +17313,12 @@ function findQueryDateField(query) {
                 }
             }
         }
-        catch (e_38_1) { e_38 = { error: e_38_1 }; }
+        catch (e_39_1) { e_39 = { error: e_39_1 }; }
         finally {
             try {
                 if (query_1_1 && !query_1_1.done && (_a = query_1.return)) _a.call(query_1);
             }
-            finally { if (e_38) throw e_38.error; }
+            finally { if (e_39) throw e_39.error; }
         }
         return null;
     }
@@ -17042,12 +17337,12 @@ function findQueryDateField(query) {
             }
         }
     }
-    catch (e_39_1) { e_39 = { error: e_39_1 }; }
+    catch (e_40_1) { e_40 = { error: e_40_1 }; }
     finally {
         try {
             if (_d && !_d.done && (_b = _c.return)) _b.call(_c);
         }
-        finally { if (e_39) throw e_39.error; }
+        finally { if (e_40) throw e_40.error; }
     }
     return null;
 }
@@ -17335,7 +17630,7 @@ function resolveQueryDateFieldFallback(query) {
     return { from: dateField, to: fallback };
 }
 function containsForbiddenMongoOperators(value) {
-    var e_40, _a;
+    var e_41, _a;
     if (!value || typeof value !== 'object') {
         return false;
     }
@@ -17354,12 +17649,12 @@ function containsForbiddenMongoOperators(value) {
             }
         }
     }
-    catch (e_40_1) { e_40 = { error: e_40_1 }; }
+    catch (e_41_1) { e_41 = { error: e_41_1 }; }
     finally {
         try {
             if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
         }
-        finally { if (e_40) throw e_40.error; }
+        finally { if (e_41) throw e_41.error; }
     }
     return false;
 }
@@ -17544,7 +17839,7 @@ function splitAssistantPermissionTokenSets(value) {
     };
 }
 function isAssistantTokenSetSubset(subset, superset) {
-    var e_41, _a;
+    var e_42, _a;
     if (!subset.size) {
         return false;
     }
@@ -17556,12 +17851,12 @@ function isAssistantTokenSetSubset(subset, superset) {
             }
         }
     }
-    catch (e_41_1) { e_41 = { error: e_41_1 }; }
+    catch (e_42_1) { e_42 = { error: e_42_1 }; }
     finally {
         try {
             if (subset_1_1 && !subset_1_1.done && (_a = subset_1.return)) _a.call(subset_1);
         }
-        finally { if (e_41) throw e_41.error; }
+        finally { if (e_42) throw e_42.error; }
     }
     return true;
 }
@@ -17945,7 +18240,7 @@ function normalizeCodexThoughtLevel(value) {
 function resolveConfiguredCodexAutoThoughtLevel(kind) {
     var config = resolveio_server_app_1.ResolveIOServer.getServerConfig() || {};
     var levelKey = kind === 'simple' ? 'SIMPLE' : 'COMPLEX';
-    var fallbackLevel = kind === 'simple' ? 'medium' : 'high';
+    var fallbackLevel = kind === 'simple' ? 'low' : 'high';
     var configured = normalizeCodexThoughtLevel(config["AI_ASSISTANT_CODEX_".concat(levelKey, "_THOUGHT_LEVEL")]
         || process.env["AI_ASSISTANT_CODEX_".concat(levelKey, "_THOUGHT_LEVEL")]
         || config["AI_TERMINAL_CODEX_".concat(levelKey, "_THOUGHT_LEVEL")]
@@ -17966,7 +18261,12 @@ function resolveCodexThoughtLevel(params) {
     var explicitLevel = normalizeCodexThoughtLevel(normalized);
     var isBugIssueRequest = (params === null || params === void 0 ? void 0 : params.requestType) === 'bug_issue';
     if (!isBugIssueRequest) {
-        return 'medium';
+        if (explicitLevel) {
+            return explicitLevel === 'high' || explicitLevel === 'xhigh'
+                ? 'medium'
+                : explicitLevel;
+        }
+        return resolveConfiguredCodexAutoThoughtLevel('simple');
     }
     if (explicitLevel) {
         return explicitLevel;
@@ -17986,6 +18286,18 @@ function resolveCodexSettings(options) {
     var fallbackModels = resolveCodexFallbackModels({ fallbackModels: options === null || options === void 0 ? void 0 : options.fallbackModels }, model);
     return __assign(__assign(__assign({ apiKey: apiKey, baseUrl: (serverConfig['OPENAI_BASE_URL'] || process.env.OPENAI_BASE_URL || '').trim() || undefined }, (model ? { model: model } : {})), (fallbackModels.length ? { fallbackModel: fallbackModels[0], fallbackModels: fallbackModels } : {})), { maxRetries: normalizeOptionalNumber(serverConfig['OPENAI_MAX_RETRIES'] || process.env.OPENAI_MAX_RETRIES), retryDelayMs: normalizeOptionalNumber(serverConfig['OPENAI_RETRY_DELAY_MS'] || process.env.OPENAI_RETRY_DELAY_MS) });
 }
+function resolveAssistantFollowupCodexEnabled(config) {
+    var serverConfig = resolveio_server_app_1.ResolveIOServer.getServerConfig() || {};
+    var raw = normalizeOptionalBoolean((config === null || config === void 0 ? void 0 : config.followup_enabled)
+        || (config === null || config === void 0 ? void 0 : config.followupEnabled)
+        || serverConfig['AI_ASSISTANT_CODEX_FOLLOWUP_ENABLED']
+        || process.env.AI_ASSISTANT_CODEX_FOLLOWUP_ENABLED
+        || serverConfig['AI_TERMINAL_CODEX_FOLLOWUP_ENABLED']
+        || process.env.AI_TERMINAL_CODEX_FOLLOWUP_ENABLED
+        || serverConfig['AI_DASHBOARD_CODEX_FOLLOWUP_ENABLED']
+        || process.env.AI_DASHBOARD_CODEX_FOLLOWUP_ENABLED);
+    return raw === true;
+}
 function buildAssistantCodexClientCacheKey(config) {
     var _a, _b;
     return JSON.stringify({
@@ -18046,8 +18358,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_42_1;
-        var _e, e_42, _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:
@@ -18074,8 +18386,8 @@ function waitForCodexWorkerMessage(worker, streamStatusHandler) {
                     return [3 /*break*/, 1];
                 case 4: return [3 /*break*/, 11];
                 case 5:
-                    e_42_1 = _h.sent();
-                    e_42 = { error: e_42_1 };
+                    e_43_1 = _h.sent();
+                    e_43 = { error: e_43_1 };
                     return [3 /*break*/, 11];
                 case 6:
                     _h.trys.push([6, , 9, 10]);
@@ -18086,7 +18398,7 @@ function waitForCodexWorkerMessage(worker, streamStatusHandler) {
                     _h.label = 8;
                 case 8: return [3 /*break*/, 10];
                 case 9:
-                    if (e_42) throw e_42.error;
+                    if (e_43) throw e_43.error;
                     return [7 /*endfinally*/];
                 case 10: return [7 /*endfinally*/];
                 case 11: throw new CodexWorkerBootstrapError('AI worker exited before completing.');
@@ -18430,8 +18742,8 @@ function buildAssistantWorkspaceRootCandidates(params) {
 }
 function resolveAssistantWorkspaceRoot() {
     return __awaiter(this, void 0, void 0, function () {
-        var candidates, firstExisting, firstNestedGitRoot, candidates_8, candidates_8_1, candidate, _a, gitRoot, nestedGitRoots, e_43_1;
-        var e_43, _b;
+        var candidates, firstExisting, firstNestedGitRoot, candidates_9, candidates_9_1, candidate, _a, gitRoot, nestedGitRoots, e_44_1;
+        var e_44, _b;
         return __generator(this, function (_c) {
             switch (_c.label) {
                 case 0:
@@ -18441,11 +18753,11 @@ function resolveAssistantWorkspaceRoot() {
                     _c.label = 1;
                 case 1:
                     _c.trys.push([1, 9, 10, 11]);
-                    candidates_8 = __values(candidates), candidates_8_1 = candidates_8.next();
+                    candidates_9 = __values(candidates), candidates_9_1 = candidates_9.next();
                     _c.label = 2;
                 case 2:
-                    if (!!candidates_8_1.done) return [3 /*break*/, 8];
-                    candidate = candidates_8_1.value;
+                    if (!!candidates_9_1.done) return [3 /*break*/, 8];
+                    candidate = candidates_9_1.value;
                     _a = !candidate;
                     if (_a) return [3 /*break*/, 4];
                     return [4 /*yield*/, directoryExists(candidate)];
@@ -18474,18 +18786,18 @@ function resolveAssistantWorkspaceRoot() {
                     }
                     _c.label = 7;
                 case 7:
-                    candidates_8_1 = candidates_8.next();
+                    candidates_9_1 = candidates_9.next();
                     return [3 /*break*/, 2];
                 case 8: return [3 /*break*/, 11];
                 case 9:
-                    e_43_1 = _c.sent();
-                    e_43 = { error: e_43_1 };
+                    e_44_1 = _c.sent();
+                    e_44 = { error: e_44_1 };
                     return [3 /*break*/, 11];
                 case 10:
                     try {
-                        if (candidates_8_1 && !candidates_8_1.done && (_b = candidates_8.return)) _b.call(candidates_8);
+                        if (candidates_9_1 && !candidates_9_1.done && (_b = candidates_9.return)) _b.call(candidates_9);
                     }
-                    finally { if (e_43) throw e_43.error; }
+                    finally { if (e_44) throw e_44.error; }
                     return [7 /*endfinally*/];
                 case 11:
                     if (firstNestedGitRoot) {
@@ -18891,7 +19203,7 @@ var AI_ASSISTANT_BREAKDOWN_DIMENSION_STOPWORDS = new Set([
     'by'
 ]);
 function normalizeAssistantBreakdownDimension(value) {
-    var e_44, _a;
+    var e_45, _a;
     var normalized = normalizeOptionalString(value)
         .toLowerCase()
         .replace(/[^a-z0-9_\s-]+/g, ' ')
@@ -18923,12 +19235,12 @@ function normalizeAssistantBreakdownDimension(value) {
             }
         }
     }
-    catch (e_44_1) { e_44 = { error: e_44_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_44) throw e_44.error; }
+        finally { if (e_45) throw e_45.error; }
     }
     if (!kept.length) {
         return '';
@@ -19133,7 +19445,7 @@ function resolveAssistantPlannerEnabled(config) {
     return raw === undefined ? false : raw === true;
 }
 function resolveAssistantPlannerKnownRoutes(user, isSuperAdmin) {
-    var e_45, _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)) || [];
@@ -19147,12 +19459,12 @@ function resolveAssistantPlannerKnownRoutes(user, isSuperAdmin) {
             }
         }
     }
-    catch (e_45_1) { e_45 = { error: e_45_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_45) throw e_45.error; }
+        finally { if (e_46) throw e_46.error; }
     }
     var normalizedRoutes = Array.from(unique);
     var allowedRoutes = collectAssistantAllowedRoutesForUser(user, normalizedRoutes, isSuperAdmin);
@@ -19247,6 +19559,7 @@ function buildAssistantContext(input, userContext) {
         : [];
     if (collectionHints.length) {
         lines.push("Collection hints: ".concat(collectionHints.join(', ')));
+        lines.push('Collection hints are candidate roots and related collections; the first hint can be a measured/detail collection. Choose the root collection that owns the primary business object in the request, then join related collections for details/metrics.');
     }
     var termHints = Array.isArray(userContext === null || userContext === void 0 ? void 0 : userContext.termHints)
         ? userContext === null || userContext === void 0 ? void 0 : userContext.termHints.filter(Boolean)
@@ -19462,7 +19775,7 @@ function normalizeRouteMatchKey(value) {
     return normalizeRouteKey(value).toLowerCase();
 }
 function buildClientRouteIndex() {
-    var e_46, _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();
@@ -19481,12 +19794,12 @@ function buildClientRouteIndex() {
             }
         }
     }
-    catch (e_46_1) { e_46 = { error: e_46_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_46) throw e_46.error; }
+        finally { if (e_47) throw e_47.error; }
     }
     return { set: set, map: map, size: routes.length };
 }
@@ -20265,8 +20578,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_47_1, queue, queued, enqueue, next, entries, _c, entries_1, entries_1_1, entry, childName, candidate, gitPath, _d, e_48_1;
-        var e_47, _e, e_48, _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) {
@@ -20311,14 +20624,14 @@ function resolveAssistantWorkspaceGitRoots(workspaceRoot) {
                     return [3 /*break*/, 3];
                 case 6: return [3 /*break*/, 9];
                 case 7:
-                    e_47_1 = _h.sent();
-                    e_47 = { error: e_47_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_47) throw e_47.error; }
+                    finally { if (e_48) throw e_48.error; }
                     return [7 /*endfinally*/];
                 case 9:
                     queue = [];
@@ -20358,7 +20671,7 @@ function resolveAssistantWorkspaceGitRoots(workspaceRoot) {
                     return [3 /*break*/, 14];
                 case 14:
                     _h.trys.push([14, 21, 22, 23]);
-                    entries_1 = (e_48 = 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];
@@ -20397,14 +20710,14 @@ function resolveAssistantWorkspaceGitRoots(workspaceRoot) {
                     return [3 /*break*/, 15];
                 case 20: return [3 /*break*/, 23];
                 case 21:
-                    e_48_1 = _h.sent();
-                    e_48 = { error: e_48_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_48) throw e_48.error; }
+                    finally { if (e_49) throw e_49.error; }
                     return [7 /*endfinally*/];
                 case 23: return [3 /*break*/, 10];
                 case 24: return [2 /*return*/, roots];
@@ -20744,8 +21057,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_49_1;
-        var e_49, _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)];
@@ -20779,14 +21092,14 @@ function resolveAssistantChangeHistoryGitRoots(workspaceRoot) {
                     return [3 /*break*/, 3];
                 case 6: return [3 /*break*/, 9];
                 case 7:
-                    e_49_1 = _b.sent();
-                    e_49 = { error: e_49_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_49) throw e_49.error; }
+                    finally { if (e_50) throw e_50.error; }
                     return [7 /*endfinally*/];
                 case 9: return [2 /*return*/, mirroredRoots];
             }
@@ -20795,8 +21108,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_50_1;
-        var e_50, _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:
@@ -20918,14 +21231,14 @@ function resolveAssistantChangeHistoryFastPathResponse(params) {
                     return [3 /*break*/, 7];
                 case 20: return [3 /*break*/, 23];
                 case 21:
-                    e_50_1 = _g.sent();
-                    e_50 = { error: e_50_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_50) throw e_50.error; }
+                    finally { if (e_51) throw e_51.error; }
                     return [7 /*endfinally*/];
                 case 23:
                     if (bestFallback) {
@@ -21106,7 +21419,7 @@ function sanitizeAssistantResponse(value) {
     return normalizeAssistantRoutes(normalizedCurrency);
 }
 function evaluateAssistantGuardrails(message) {
-    var e_51, _a;
+    var e_52, _a;
     var normalized = String(message || '').toLowerCase();
     var identityGuardrail = evaluateAssistantIdentityDisclosureGuardrail(normalized);
     if (identityGuardrail === null || identityGuardrail === void 0 ? void 0 : identityGuardrail.blocked) {
@@ -21151,12 +21464,12 @@ function evaluateAssistantGuardrails(message) {
             }
         }
     }
-    catch (e_51_1) { e_51 = { error: e_51_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_51) throw e_51.error; }
+        finally { if (e_52) throw e_52.error; }
     }
     return null;
 }
@@ -21261,7 +21574,7 @@ function tokenizeArithmeticExpression(expression) {
     return tokens;
 }
 function evaluateArithmeticExpression(expression) {
-    var e_52, _a, e_53, _b;
+    var e_53, _a, e_54, _b;
     var tokens = tokenizeArithmeticExpression(expression);
     if (!tokens || !tokens.length) {
         return null;
@@ -21318,12 +21631,12 @@ function evaluateArithmeticExpression(expression) {
             prevToken = token;
         }
     }
-    catch (e_52_1) { e_52 = { error: e_52_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_52) throw e_52.error; }
+        finally { if (e_53) throw e_53.error; }
     }
     while (ops.length) {
         var op = ops.pop();
@@ -21363,12 +21676,12 @@ function evaluateArithmeticExpression(expression) {
             stack.push(Number(token));
         }
     }
-    catch (e_53_1) { e_53 = { error: e_53_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_53) throw e_53.error; }
+        finally { if (e_54) throw e_54.error; }
     }
     if (stack.length !== 1 || Number.isNaN(stack[0])) {
         return null;
@@ -21552,8 +21865,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_54_1;
-        var e_54, _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:
@@ -21632,14 +21945,14 @@ function readAttachmentContents(attachments) {
                     return [3 /*break*/, 2];
                 case 10: return [3 /*break*/, 13];
                 case 11:
-                    e_54_1 = _c.sent();
-                    e_54 = { error: e_54_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_54) throw e_54.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')) : '',
@@ -22050,7 +22363,7 @@ function sanitizeAssistantMessageSetPayload(setPayload) {
     return next;
 }
 function sanitizeMongoSafeObject(value) {
-    var e_55, _a;
+    var e_56, _a;
     if (value === null || value === undefined) {
         return value;
     }
@@ -22074,17 +22387,17 @@ function sanitizeMongoSafeObject(value) {
             out[key] = sanitizeMongoSafeObject(rawValue);
         }
     }
-    catch (e_55_1) { e_55 = { error: e_55_1 }; }
+    catch (e_56_1) { e_56 = { error: e_56_1 }; }
     finally {
         try {
             if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
         }
-        finally { if (e_55) throw e_55.error; }
+        finally { if (e_56) throw e_56.error; }
     }
     return out;
 }
 function restoreMongoSafeObject(value) {
-    var e_56, _a;
+    var e_57, _a;
     if (value === null || value === undefined) {
         return value;
     }
@@ -22108,12 +22421,12 @@ function restoreMongoSafeObject(value) {
             out[key] = restoreMongoSafeObject(rawValue);
         }
     }
-    catch (e_56_1) { e_56 = { error: e_56_1 }; }
+    catch (e_57_1) { e_57 = { error: e_57_1 }; }
     finally {
         try {
             if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
         }
-        finally { if (e_56) throw e_56.error; }
+        finally { if (e_57) throw e_57.error; }
     }
     return out;
 }
@@ -22228,7 +22541,7 @@ function estimateUsage(messages, responseText, model) {
     };
 }
 function evaluateGuardrails(message) {
-    var e_57, _a;
+    var e_58, _a;
     var normalized = String(message || '').toLowerCase();
     var identityGuardrail = evaluateAssistantIdentityDisclosureGuardrail(normalized);
     if (identityGuardrail === null || identityGuardrail === void 0 ? void 0 : identityGuardrail.blocked) {
@@ -22254,12 +22567,12 @@ function evaluateGuardrails(message) {
             }
         }
     }
-    catch (e_57_1) { e_57 = { error: e_57_1 }; }
+    catch (e_58_1) { e_58 = { error: e_58_1 }; }
     finally {
         try {
             if (patterns_3_1 && !patterns_3_1.done && (_a = patterns_3.return)) _a.call(patterns_3);
         }
-        finally { if (e_57) throw e_57.error; }
+        finally { if (e_58) throw e_58.error; }
     }
     return null;
 }