@resolveio/server-lib 22.1.5 → 22.1.7

package/methods/ai-terminal.js

@@ -111,6 +111,7 @@ exports.executeAiAssistantMongoAggregate = executeAiAssistantMongoAggregate;
 exports.extractAssistantMongoDirective = extractAssistantMongoDirective;
 exports.buildAssistantInvoiceCustomerLabelExpr = buildAssistantInvoiceCustomerLabelExpr;
 exports.buildAssistantDatedPivotDisplay = buildAssistantDatedPivotDisplay;
+exports.deriveAssistantCommandExecutionStatus = deriveAssistantCommandExecutionStatus;
 exports.normalizeIdsForTargetField = normalizeIdsForTargetField;
 exports.serializeMongoValue = serializeMongoValue;
 exports.flattenForTable = flattenForTable;
@@ -130,7 +131,9 @@ exports.resolveAssistantAvailableCrossCollectionFallbacksFromNames = resolveAssi
 exports.collectUserViewPermissions = collectUserViewPermissions;
 exports.userHasInvoiceAccess = userHasInvoiceAccess;
 exports.resolveAssistantUserAccessTier = resolveAssistantUserAccessTier;
+exports.resolveCodexThoughtLevel = resolveCodexThoughtLevel;
 exports.classifyAssistantRequestType = classifyAssistantRequestType;
+exports.shouldRunAssistantPlanner = shouldRunAssistantPlanner;
 exports.collectAssistantAllowedRoutesForUser = collectAssistantAllowedRoutesForUser;
 exports.rankAssistantNavigationRoutes = rankAssistantNavigationRoutes;
 exports.shouldUseAssistantNavigationFastPath = shouldUseAssistantNavigationFastPath;
@@ -245,6 +248,9 @@ var AI_ASSISTANT_DATE_EXPANSION_SCHEMA_MAX_FIELDS = 12;
 var execFileAsync = (0, util_1.promisify)(child_process_1.execFile);
 var AI_ASSISTANT_CHANGE_HISTORY_DEFAULT_LIMIT = 10;
 var AI_ASSISTANT_CHANGE_HISTORY_MAX_LIMIT = 40;
+var AI_ASSISTANT_CHANGE_HISTORY_MIN_DEPTH = 80;
+var AI_ASSISTANT_CHANGE_HISTORY_MAX_DEPTH = 240;
+var AI_ASSISTANT_CHANGE_HISTORY_DURATION_MAX_DEPTH = 1200;
 var AI_ASSISTANT_GIT_COMMAND_TIMEOUT_MS = 15000;
 var AI_ASSISTANT_BLOCKED_COLLECTIONS = new Set([
     'user-groups',
@@ -463,6 +469,9 @@ var AI_ASSISTANT_REPORT_BUILDER_EXPERT_PLAYBOOK = [
     '- Re-check collection and date fields (date_created/createdAt/date_completed/date_paid variants).',
     '- Run tiny probe (limit 1-3) to validate shape before concluding "no data".',
     '- For name filters, verify date-only first; then apply tokenized regex and id/name lookup fallback.',
+    '- If the user is super admin OR has permission for the requested module/view, continue best-effort retries across related collections, aliases, and field/date fallbacks before failing.',
+    '- Treat "collection not configured" as a retry signal, not a terminal result. Keep searching relatable collections until retry candidates are exhausted.',
+    '- Only stop retrying when candidate collections, scoped probes, and schema/date/name fallback paths are exhausted.',
     '',
     '7) Output behavior after bridge response.',
     '- Summarize the answer first in plain language.',
@@ -493,6 +502,7 @@ var AI_ASSISTANT_SYSTEM_PROMPT = [
     '- 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.',
     '- For any data request (counts, lists, breakdowns, recent/last items), you MUST run a REPORT_BUILDER_READ or REPORT_BUILDER_AGG before answering.',
+    '- If the user is super admin or has permission for the requested data scope, keep attempting related collection/field fallbacks and probe reads until retry paths are exhausted; do not stop on first collection mismatch.',
     '- Ask at most one clarifying question only when required to run a query or resolve missing details.',
     '- If a field starts with id_ and refers to another collection, treat it as a foreign key and look up the related record when needed.',
     '- When resolving id_* fields, prefer lookup definitions from collection schemas/report-builder lookup tables to choose the target collection and name fields.',
@@ -563,6 +573,7 @@ var AI_ASSISTANT_SYSTEM_PROMPT = [
     '- Use REPORT_BUILDER_READ/REPORT_BUILDER_AGG only to produce summaries/snapshots/health checks (not raw dumps) when permitted.',
     '- If the user explicitly asks for IDs, set options.includeIds: true.',
     '- If a data question returns zero results, verify the collection/date field with a tiny read (limit 1-5) or a date field fallback before concluding there is no data.',
+    '- Never return "dataset not configured" as the final answer when data access is allowed; continue retries and only report failure after accessible retry paths are exhausted.',
     '- Keep responses concise and use the configured reasoning effort level (default low).',
     '- Never show internal placeholders like $$NOW in user-facing text; always use concrete dates.',
     '',
@@ -587,6 +598,7 @@ var AI_ASSISTANT_PLANNER_SYSTEM_PROMPT = [
     '   - customer_portal: apply customer scope (id_customer or other.id_customer) to all data plans.',
     '   - client_user: apply client scope (id_client) to all data plans.',
     '   - Never propose querying blocked/sensitive collections if the user lacks permission.',
+    '   - If permission allows a data request, plan best-effort retrieval with preferred + fallback collections and schema/date/name validation steps before concluding failure.',
     '',
     '4) PERMISSION MATCHING:',
     '   - Do NOT hardcode invoice access to "/report-builder/*".',
@@ -1616,7 +1628,7 @@ function executeAiAssistantCodexRun(payload, context) {
                     insertResult = _e.sent();
                     assistantMessageId = (insertResult === null || insertResult === void 0 ? void 0 : insertResult._id) || (insertResult === null || insertResult === void 0 ? void 0 : insertResult.insertedId);
                     enqueueAssistantCodexRun(function () { return __awaiter(_this, void 0, void 0, function () {
-                        var runStart, steps, recordStep, progressTracker, streamProgress, assistantContent, toolResult, assistantDebug, directiveSource, requestClassification, dataQuestion, lastDirective, heuristicDirectivePrecomputed, usedDeterministicHeuristicFastPath, requestedTimeGrain, requestedBreakdownDimensions, enforceDatedDirective, enforceGroupedDirective, datedDirectiveRetryUsed, datedDirectiveResolved, toolResponseDebug, toolError, termHints, collectionHints, fieldHints, collectionTokenization, collectionRanking, collectionSelection, collectionOverride, collectionNames, plannerEnabled, plannerUsed, plannerOutput, plannerRaw, timingBreakdown, codexUsage, accumulateCodexUsage, contextRoute, contextMode, hintSeed, termExpansion, hintText, baseTokens, expandedTokens, baseWeights, expandedWeights, dbName, db, _a, routeHints, rankedCollections, hintCollections, assistantContext, hasDeterministicHeuristicFastPath, prompt_1, workspaceRoot, codexConfig, runOptions, shouldRunPlanner, plannerPrompt, plannerStart, _b, preferListDirective, directiveStyleHint, directivePromptMode, responseText, directiveText, directive, heuristicDirectiveFastPath, directivePrompt, directiveStart, forcedDirective, _c, initialStart, extractedDirective, error_2, directivePrompt, forcedStart, forcedDirective, _d, strictDirectivePrompt, strictStart, strictDirectiveText, strictDirective, strictDirectiveIsDated, shouldUseStrictDirective, _e, guardDirectivePrompt, guardStart, guardDirectiveText, guardDirective, _f, groupedDirectivePrompt, groupedStart, groupedDirectiveText, groupedDirective, _g, heuristicDirective, requestedCollection, cleanedResponseText, effectiveDirective, toolRequest, toolStart, toolResponse, _h, toolPayload, skipFollowupCodex, followupPrompt, followupStart, followupText, _j, error_3, error_4, finishedAt, finalNow, finishedAt, codexMs, draftingMs, finalMetadata, finalUsage, usageClientId, usageError_1, finalAssistantDoc, setPayload;
+                        var runStart, steps, recordStep, progressTracker, streamProgress, assistantContent, toolResult, assistantDebug, directiveSource, requestClassification, dataQuestion, lastDirective, heuristicDirectivePrecomputed, usedDeterministicHeuristicFastPath, requestedTimeGrain, requestedBreakdownDimensions, enforceDatedDirective, enforceGroupedDirective, datedDirectiveRetryUsed, datedDirectiveResolved, toolResponseDebug, toolError, termHints, collectionHints, fieldHints, collectionTokenization, collectionRanking, collectionSelection, collectionOverride, collectionNames, plannerEnabled, plannerUsed, plannerSkipReason, plannerOutput, plannerRaw, timingBreakdown, codexUsage, accumulateCodexUsage, contextRoute, contextMode, hintSeed, termExpansion, hintText, baseTokens, expandedTokens, baseWeights, expandedWeights, dbName, db, _a, routeHints, rankedCollections, hintCollections, assistantContext, hasDeterministicHeuristicFastPath, prompt_1, workspaceRoot, codexConfig, runOptions, plannerRunOptions, shouldRunPlanner, plannerPrompt, plannerStart, _b, preferListDirective, directiveStyleHint, directivePromptMode, responseText, directiveText, directive, heuristicDirectiveFastPath, directivePrompt, directiveStart, forcedDirective, _c, initialStart, extractedDirective, error_2, directivePrompt, forcedStart, forcedDirective, _d, strictDirectivePrompt, strictStart, strictDirectiveText, strictDirective, strictDirectiveIsDated, shouldUseStrictDirective, _e, guardDirectivePrompt, guardStart, guardDirectiveText, guardDirective, _f, groupedDirectivePrompt, groupedStart, groupedDirectiveText, groupedDirective, _g, heuristicDirective, requestedCollection, cleanedResponseText, effectiveDirective, toolRequest, toolStart, toolResponse, _h, toolPayload, skipFollowupCodex, followupPrompt, followupStart, followupText, _j, error_3, error_4, finishedAt, finalNow, finishedAt, codexMs, draftingMs, finalMetadata, finalUsage, usageClientId, usageError_1, finalAssistantDoc, setPayload;
                         var _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12;
                         return __generator(this, function (_13) {
                             switch (_13.label) {
@@ -1671,6 +1683,7 @@ function executeAiAssistantCodexRun(payload, context) {
                                     collectionNames = [];
                                     plannerEnabled = resolveAssistantPlannerEnabled();
                                     plannerUsed = false;
+                                    plannerSkipReason = '';
                                     plannerOutput = null;
                                     plannerRaw = '';
                                     timingBreakdown = {
@@ -1706,7 +1719,7 @@ function executeAiAssistantCodexRun(payload, context) {
                                     });
                                     _13.label = 1;
                                 case 1:
-                                    _13.trys.push([1, 49, 50, 51]);
+                                    _13.trys.push([1, 51, 52, 53]);
                                     hintSeed = [message, contextRoute].filter(Boolean).join(' ');
                                     termExpansion = expandAssistantTermSynonyms(hintSeed);
                                     hintText = termExpansion.expanded || hintSeed;
@@ -1804,7 +1817,8 @@ function executeAiAssistantCodexRun(payload, context) {
                                             skipGitRepoCheck: true,
                                             modelReasoningEffort: resolveCodexThoughtLevel({
                                                 message: message,
-                                                attachmentText: attachmentData.promptText
+                                                attachmentText: attachmentData.promptText,
+                                                requestType: requestClassification.type
                                             }),
                                             networkAccessEnabled: false,
                                             webSearchMode: 'disabled',
@@ -1812,10 +1826,13 @@ function executeAiAssistantCodexRun(payload, context) {
                                             approvalPolicy: 'never'
                                         }
                                     };
-                                    shouldRunPlanner = plannerEnabled
-                                        && !(requestClassification.type === 'navigation' && !dataQuestion)
-                                        && !hasDeterministicHeuristicFastPath;
-                                    if (!shouldRunPlanner) return [3 /*break*/, 10];
+                                    plannerRunOptions = __assign(__assign({}, runOptions), { threadOptions: __assign(__assign({}, (runOptions.threadOptions || {})), { modelReasoningEffort: 'minimal' }) });
+                                    shouldRunPlanner = shouldRunAssistantPlanner({
+                                        plannerEnabled: plannerEnabled,
+                                        requestClassification: requestClassification,
+                                        hasDeterministicHeuristicFastPath: hasDeterministicHeuristicFastPath
+                                    });
+                                    if (!shouldRunPlanner) return [3 /*break*/, 11];
                                     plannerUsed = true;
                                     recordStep('Planning: planner prompt');
                                     plannerPrompt = buildAssistantPlannerPrompt({
@@ -1832,7 +1849,7 @@ function executeAiAssistantCodexRun(payload, context) {
                                 case 7:
                                     _13.trys.push([7, 9, , 10]);
                                     plannerStart = Date.now();
-                                    return [4 /*yield*/, runCodexInWorkerThread(plannerPrompt, runOptions, codexConfig, streamProgress)];
+                                    return [4 /*yield*/, runCodexInWorkerThread(plannerPrompt, plannerRunOptions, codexConfig, streamProgress)];
                                 case 8:
                                     plannerRaw = _13.sent();
                                     accumulateCodexUsage(plannerPrompt, plannerRaw);
@@ -1844,7 +1861,22 @@ function executeAiAssistantCodexRun(payload, context) {
                                     _b = _13.sent();
                                     recordStep('Planning: planner result', { parsed: false });
                                     return [3 /*break*/, 10];
-                                case 10:
+                                case 10: return [3 /*break*/, 12];
+                                case 11:
+                                    if (plannerEnabled) {
+                                        if (hasDeterministicHeuristicFastPath) {
+                                            plannerSkipReason = 'heuristic_directive_fast_path';
+                                        }
+                                        else if (!requestClassification.dataQuestion) {
+                                            plannerSkipReason = "non_data_".concat(requestClassification.type || 'unknown');
+                                        }
+                                        else {
+                                            plannerSkipReason = 'policy';
+                                        }
+                                        recordStep('Planning: planner skipped', { reason: plannerSkipReason });
+                                    }
+                                    _13.label = 12;
+                                case 12:
                                     requestClassification = classifyAssistantRequestType(message, plannerOutput || undefined);
                                     dataQuestion = requestClassification.dataQuestion;
                                     requestedTimeGrain = resolveAssistantRequestedTimeGrain(message, plannerOutput || undefined);
@@ -1895,15 +1927,15 @@ function executeAiAssistantCodexRun(payload, context) {
                                             timeGrain: requestedTimeGrain || undefined
                                         });
                                     }
-                                    if (!(dataQuestion && !directive)) return [3 /*break*/, 14];
+                                    if (!(dataQuestion && !directive)) return [3 /*break*/, 16];
                                     recordStep('Directive: determine tool', { type: 'data-question' });
                                     directivePrompt = buildAssistantCodexDirectivePrompt(message, attachmentData.promptText, historyLines.join('\n'), assistantContext, directiveStyleHint, directivePromptMode);
-                                    _13.label = 11;
-                                case 11:
-                                    _13.trys.push([11, 13, , 14]);
+                                    _13.label = 13;
+                                case 13:
+                                    _13.trys.push([13, 15, , 16]);
                                     directiveStart = Date.now();
                                     return [4 /*yield*/, runCodexInWorkerThread(directivePrompt, runOptions, codexConfig, streamProgress)];
-                                case 12:
+                                case 14:
                                     directiveText = _13.sent();
                                     accumulateCodexUsage(directivePrompt, directiveText);
                                     timingBreakdown.directiveMs = Date.now() - directiveStart;
@@ -1920,19 +1952,19 @@ function executeAiAssistantCodexRun(payload, context) {
                                             permissionView: normalizeOptionalString((_t = directive.payload) === null || _t === void 0 ? void 0 : _t.permissionView) || undefined
                                         });
                                     }
-                                    return [3 /*break*/, 14];
-                                case 13:
+                                    return [3 /*break*/, 16];
+                                case 15:
                                     _c = _13.sent();
-                                    return [3 /*break*/, 14];
-                                case 14:
-                                    if (!(!directive && !dataQuestion)) return [3 /*break*/, 18];
+                                    return [3 /*break*/, 16];
+                                case 16:
+                                    if (!(!directive && !dataQuestion)) return [3 /*break*/, 20];
                                     recordStep('Response: draft initial answer', { mode: 'full' });
-                                    _13.label = 15;
-                                case 15:
-                                    _13.trys.push([15, 17, , 18]);
+                                    _13.label = 17;
+                                case 17:
+                                    _13.trys.push([17, 19, , 20]);
                                     initialStart = Date.now();
                                     return [4 /*yield*/, runCodexInWorkerThread(prompt_1, runOptions, codexConfig, streamProgress)];
-                                case 16:
+                                case 18:
                                     responseText = _13.sent();
                                     accumulateCodexUsage(prompt_1, responseText);
                                     timingBreakdown.initialResponseMs = Date.now() - initialStart;
@@ -1949,23 +1981,23 @@ function executeAiAssistantCodexRun(payload, context) {
                                             permissionView: normalizeOptionalString((_w = directive.payload) === null || _w === void 0 ? void 0 : _w.permissionView) || undefined
                                         });
                                     }
-                                    return [3 /*break*/, 18];
-                                case 17:
+                                    return [3 /*break*/, 20];
+                                case 19:
                                     error_2 = _13.sent();
                                     recordStep('Response: initial draft failed', {
                                         message: normalizeOptionalString(error_2 === null || error_2 === void 0 ? void 0 : error_2.message) || 'Unknown error'
                                     });
-                                    return [3 /*break*/, 18];
-                                case 18:
-                                    if (!(!directive && dataQuestion)) return [3 /*break*/, 22];
+                                    return [3 /*break*/, 20];
+                                case 20:
+                                    if (!(!directive && dataQuestion)) return [3 /*break*/, 24];
                                     recordStep('Directive: forced retry', { mode: 'directive-only' });
                                     directivePrompt = buildAssistantCodexDirectivePrompt(message, attachmentData.promptText, historyLines.join('\n'), assistantContext, directiveStyleHint, directivePromptMode);
-                                    _13.label = 19;
-                                case 19:
-                                    _13.trys.push([19, 21, , 22]);
+                                    _13.label = 21;
+                                case 21:
+                                    _13.trys.push([21, 23, , 24]);
                                     forcedStart = Date.now();
                                     return [4 /*yield*/, runCodexInWorkerThread(directivePrompt, runOptions, codexConfig, streamProgress)];
-                                case 20:
+                                case 22:
                                     directiveText = _13.sent();
                                     accumulateCodexUsage(directivePrompt, directiveText);
                                     timingBreakdown.forcedDirectiveMs = Date.now() - forcedStart;
@@ -1982,15 +2014,15 @@ function executeAiAssistantCodexRun(payload, context) {
                                             permissionView: normalizeOptionalString((_z = directive.payload) === null || _z === void 0 ? void 0 : _z.permissionView) || undefined
                                         });
                                     }
-                                    return [3 /*break*/, 22];
-                                case 21:
+                                    return [3 /*break*/, 24];
+                                case 23:
                                     _d = _13.sent();
-                                    return [3 /*break*/, 22];
-                                case 22:
+                                    return [3 /*break*/, 24];
+                                case 24:
                                     if (!(directive
                                         && enforceDatedDirective
                                         && !isAssistantDeterministicHeuristicDirective(directive)
-                                        && !isAssistantDirectiveDated(directive))) return [3 /*break*/, 26];
+                                        && !isAssistantDirectiveDated(directive))) return [3 /*break*/, 28];
                                     recordStep('Directive: dated retry', {
                                         currentType: directive.type,
                                         timeGrain: requestedTimeGrain || undefined
@@ -2002,12 +2034,12 @@ function executeAiAssistantCodexRun(payload, context) {
                                         requestedBreakdowns: requestedBreakdownDimensions,
                                         strict: true
                                     }), 'aggregate_only');
-                                    _13.label = 23;
-                                case 23:
-                                    _13.trys.push([23, 25, , 26]);
+                                    _13.label = 25;
+                                case 25:
+                                    _13.trys.push([25, 27, , 28]);
                                     strictStart = Date.now();
                                     return [4 /*yield*/, runCodexInWorkerThread(strictDirectivePrompt, runOptions, codexConfig, streamProgress)];
-                                case 24:
+                                case 26:
                                     strictDirectiveText = _13.sent();
                                     accumulateCodexUsage(strictDirectivePrompt, strictDirectiveText);
                                     timingBreakdown.forcedDirectiveMs += Date.now() - strictStart;
@@ -2029,15 +2061,15 @@ function executeAiAssistantCodexRun(payload, context) {
                                             timeGrain: requestedTimeGrain || undefined
                                         });
                                     }
-                                    return [3 /*break*/, 26];
-                                case 25:
+                                    return [3 /*break*/, 28];
+                                case 27:
                                     _e = _13.sent();
-                                    return [3 /*break*/, 26];
-                                case 26:
+                                    return [3 /*break*/, 28];
+                                case 28:
                                     if (!(directive
                                         && enforceDatedDirective
                                         && !isAssistantDeterministicHeuristicDirective(directive)
-                                        && directive.type === 'read')) return [3 /*break*/, 30];
+                                        && directive.type === 'read')) return [3 /*break*/, 32];
                                     recordStep('Directive: dated guard retry', {
                                         currentType: directive.type,
                                         timeGrain: requestedTimeGrain || undefined
@@ -2049,12 +2081,12 @@ function executeAiAssistantCodexRun(payload, context) {
                                         requestedBreakdowns: requestedBreakdownDimensions,
                                         strict: true
                                     }), 'aggregate_only');
-                                    _13.label = 27;
-                                case 27:
-                                    _13.trys.push([27, 29, , 30]);
+                                    _13.label = 29;
+                                case 29:
+                                    _13.trys.push([29, 31, , 32]);
                                     guardStart = Date.now();
                                     return [4 /*yield*/, runCodexInWorkerThread(guardDirectivePrompt, runOptions, codexConfig, streamProgress)];
-                                case 28:
+                                case 30:
                                     guardDirectiveText = _13.sent();
                                     accumulateCodexUsage(guardDirectivePrompt, guardDirectiveText);
                                     timingBreakdown.forcedDirectiveMs += Date.now() - guardStart;
@@ -2074,15 +2106,15 @@ function executeAiAssistantCodexRun(payload, context) {
                                             timeGrain: requestedTimeGrain || undefined
                                         });
                                     }
-                                    return [3 /*break*/, 30];
-                                case 29:
+                                    return [3 /*break*/, 32];
+                                case 31:
                                     _f = _13.sent();
-                                    return [3 /*break*/, 30];
-                                case 30:
+                                    return [3 /*break*/, 32];
+                                case 32:
                                     if (!(directive
                                         && enforceGroupedDirective
                                         && !isAssistantDeterministicHeuristicDirective(directive)
-                                        && !isAssistantDirectiveGrouped(directive))) return [3 /*break*/, 34];
+                                        && !isAssistantDirectiveGrouped(directive))) return [3 /*break*/, 36];
                                     recordStep('Directive: grouped guard retry', {
                                         currentType: directive.type,
                                         breakdownDimensions: requestedBreakdownDimensions.length ? requestedBreakdownDimensions : undefined
@@ -2094,12 +2126,12 @@ function executeAiAssistantCodexRun(payload, context) {
                                         requestedBreakdowns: requestedBreakdownDimensions,
                                         strict: true
                                     }), 'aggregate_only');
-                                    _13.label = 31;
-                                case 31:
-                                    _13.trys.push([31, 33, , 34]);
+                                    _13.label = 33;
+                                case 33:
+                                    _13.trys.push([33, 35, , 36]);
                                     groupedStart = Date.now();
                                     return [4 /*yield*/, runCodexInWorkerThread(groupedDirectivePrompt, runOptions, codexConfig, streamProgress)];
-                                case 32:
+                                case 34:
                                     groupedDirectiveText = _13.sent();
                                     accumulateCodexUsage(groupedDirectivePrompt, groupedDirectiveText);
                                     timingBreakdown.forcedDirectiveMs += Date.now() - groupedStart;
@@ -2122,11 +2154,11 @@ function executeAiAssistantCodexRun(payload, context) {
                                             timeGrain: requestedTimeGrain || undefined
                                         });
                                     }
-                                    return [3 /*break*/, 34];
-                                case 33:
+                                    return [3 /*break*/, 36];
+                                case 35:
                                     _g = _13.sent();
-                                    return [3 /*break*/, 34];
-                                case 34:
+                                    return [3 /*break*/, 36];
+                                case 36:
                                     if (!directive && dataQuestion) {
                                         heuristicDirective = buildAssistantHeuristicDirective(message, collectionHints);
                                         if (isAssistantExecutableDirective(heuristicDirective)) {
@@ -2165,7 +2197,7 @@ function executeAiAssistantCodexRun(payload, context) {
                                     if (cleanedResponseText) {
                                         assistantContent = sanitizeAssistantResponse(cleanedResponseText);
                                     }
-                                    if (!((directive === null || directive === void 0 ? void 0 : directive.payload) && AI_ASSISTANT_TOOL_MAX_STEPS > 0)) return [3 /*break*/, 47];
+                                    if (!((directive === null || directive === void 0 ? void 0 : directive.payload) && AI_ASSISTANT_TOOL_MAX_STEPS > 0)) return [3 /*break*/, 49];
                                     effectiveDirective = collectionOverride
                                         ? __assign(__assign({}, directive), { payload: __assign(__assign({}, (directive.payload || {})), { collection: collectionOverride.to }) }) : directive;
                                     toolRequest = buildAssistantToolRequest(effectiveDirective, input);
@@ -2175,20 +2207,20 @@ function executeAiAssistantCodexRun(payload, context) {
                                         collection: normalizeOptionalString(toolRequest === null || toolRequest === void 0 ? void 0 : toolRequest.collection) || undefined,
                                         permissionView: normalizeOptionalString(toolRequest === null || toolRequest === void 0 ? void 0 : toolRequest.permissionView) || undefined
                                     });
-                                    _13.label = 35;
-                                case 35:
-                                    _13.trys.push([35, 45, , 46]);
+                                    _13.label = 37;
+                                case 37:
+                                    _13.trys.push([37, 47, , 48]);
                                     toolStart = Date.now();
-                                    if (!(effectiveDirective.type === 'aggregate')) return [3 /*break*/, 37];
+                                    if (!(effectiveDirective.type === 'aggregate')) return [3 /*break*/, 39];
                                     return [4 /*yield*/, executeAiAssistantReportBuilderAggregate(toolRequest, context)];
-                                case 36:
-                                    _h = _13.sent();
-                                    return [3 /*break*/, 39];
-                                case 37: return [4 /*yield*/, executeAiAssistantReportBuilderRead(toolRequest, context)];
                                 case 38:
                                     _h = _13.sent();
-                                    _13.label = 39;
-                                case 39:
+                                    return [3 /*break*/, 41];
+                                case 39: return [4 /*yield*/, executeAiAssistantReportBuilderRead(toolRequest, context)];
+                                case 40:
+                                    _h = _13.sent();
+                                    _13.label = 41;
+                                case 41:
                                     toolResponse = _h;
                                     timingBreakdown.toolMs = Date.now() - toolStart;
                                     toolResponseDebug = (toolResponse === null || toolResponse === void 0 ? void 0 : toolResponse.debug) && typeof toolResponse.debug === 'object'
@@ -2204,53 +2236,53 @@ function executeAiAssistantCodexRun(payload, context) {
                                     progressTracker.push('Drafting response');
                                     skipFollowupCodex = usedDeterministicHeuristicFastPath
                                         || isAssistantDeterministicHeuristicDirective(effectiveDirective);
-                                    if (!skipFollowupCodex) return [3 /*break*/, 40];
+                                    if (!skipFollowupCodex) return [3 /*break*/, 42];
                                     recordStep('Drafting response: deterministic summary', {
                                         reason: normalizeOptionalString(effectiveDirective.rawLine) || 'deterministic_heuristic'
                                     });
                                     assistantContent = buildAssistantToolFallbackResponse(toolPayload.result);
                                     assistantContent = applyAssistantDisplayTableToResponse(assistantContent, toolPayload.result.output.display);
-                                    return [3 /*break*/, 44];
-                                case 40:
+                                    return [3 /*break*/, 46];
+                                case 42:
                                     recordStep('Drafting response');
                                     followupPrompt = buildAssistantCodexToolFollowupPrompt(message, attachmentData.promptText, historyLines.join('\n'), assistantContext, toolPayload.prompt);
-                                    _13.label = 41;
-                                case 41:
-                                    _13.trys.push([41, 43, , 44]);
+                                    _13.label = 43;
+                                case 43:
+                                    _13.trys.push([43, 45, , 46]);
                                     followupStart = Date.now();
                                     return [4 /*yield*/, runCodexInWorkerThread(followupPrompt, runOptions, codexConfig, streamProgress)];
-                                case 42:
+                                case 44:
                                     followupText = _13.sent();
                                     accumulateCodexUsage(followupPrompt, followupText);
                                     timingBreakdown.followupMs = Date.now() - followupStart;
                                     assistantContent = sanitizeAssistantResponse(followupText);
                                     assistantContent = applyAssistantDisplayTableToResponse(assistantContent, toolPayload.result.output.display);
-                                    return [3 /*break*/, 44];
-                                case 43:
+                                    return [3 /*break*/, 46];
+                                case 45:
                                     _j = _13.sent();
                                     assistantContent = buildAssistantToolFallbackResponse(toolPayload.result);
-                                    return [3 /*break*/, 44];
-                                case 44: return [3 /*break*/, 46];
-                                case 45:
-                                    error_3 = _13.sent();
-                                    assistantContent = buildAssistantToolErrorMessage(error_3);
-                                    toolError = error_3;
                                     return [3 /*break*/, 46];
                                 case 46: return [3 /*break*/, 48];
                                 case 47:
+                                    error_3 = _13.sent();
+                                    assistantContent = buildAssistantToolErrorMessage(error_3);
+                                    toolError = error_3;
+                                    return [3 /*break*/, 48];
+                                case 48: return [3 /*break*/, 50];
+                                case 49:
                                     progressTracker.push('Drafting response');
                                     recordStep('Drafting response');
-                                    _13.label = 48;
-                                case 48: return [3 /*break*/, 51];
-                                case 49:
+                                    _13.label = 50;
+                                case 50: return [3 /*break*/, 53];
+                                case 51:
                                     error_4 = _13.sent();
                                     assistantContent = buildAssistantCodexErrorMessage(error_4);
                                     recordStep('Error', { message: normalizeOptionalString(error_4 === null || error_4 === void 0 ? void 0 : error_4.message) || 'Unknown error' });
-                                    return [3 /*break*/, 51];
-                                case 50:
+                                    return [3 /*break*/, 53];
+                                case 52:
                                     progressTracker.stop();
                                     return [7 /*endfinally*/];
-                                case 51:
+                                case 53:
                                     if (!assistantContent) {
                                         assistantContent = buildAssistantCodexErrorMessage(null);
                                     }
@@ -2320,7 +2352,7 @@ function executeAiAssistantCodexRun(payload, context) {
                                                             : undefined
                                                     } : (plannerEnabled ? {
                                                         enabled: false,
-                                                        reason: 'skipped_for_navigation'
+                                                        reason: plannerSkipReason || 'skipped_by_policy'
                                                     } : undefined)
                                                 },
                                                 timings: {
@@ -2346,14 +2378,14 @@ function executeAiAssistantCodexRun(payload, context) {
                                         output_tokens: codexUsage.output_tokens,
                                         total_tokens: codexUsage.total_tokens
                                     } : null;
-                                    if (!finalUsage) return [3 /*break*/, 56];
+                                    if (!finalUsage) return [3 /*break*/, 58];
                                     return [4 /*yield*/, resolveClientId(conversation, input.id_client, context === null || context === void 0 ? void 0 : context.id_user)];
-                                case 52:
+                                case 54:
                                     usageClientId = _13.sent();
-                                    if (!usageClientId) return [3 /*break*/, 56];
-                                    _13.label = 53;
-                                case 53:
-                                    _13.trys.push([53, 55, , 56]);
+                                    if (!usageClientId) return [3 /*break*/, 58];
+                                    _13.label = 55;
+                                case 55:
+                                    _13.trys.push([55, 57, , 58]);
                                     return [4 /*yield*/, (0, openai_usage_ledger_manager_1.recordOpenAIUsage)({
                                             id_client: usageClientId,
                                             model: finalUsage.model,
@@ -2364,16 +2396,16 @@ function executeAiAssistantCodexRun(payload, context) {
                                             id_request: requestId || undefined,
                                             id_conversation: conversation._id
                                         })];
-                                case 54:
+                                case 56:
                                     _13.sent();
-                                    return [3 /*break*/, 56];
-                                case 55:
+                                    return [3 /*break*/, 58];
+                                case 57:
                                     usageError_1 = _13.sent();
                                     console.error(new Date(), 'Failed to record codex usage', usageError_1);
-                                    return [3 /*break*/, 56];
-                                case 56:
+                                    return [3 /*break*/, 58];
+                                case 58:
                                     finalAssistantDoc = __assign(__assign(__assign(__assign({}, assistantDoc), { _id: assistantMessageId, content: assistantContent, metadata: finalMetadata }), (finalUsage ? { usage: finalUsage } : {})), { updatedAt: finalNow });
-                                    if (!assistantMessageId) return [3 /*break*/, 58];
+                                    if (!assistantMessageId) return [3 /*break*/, 60];
                                     setPayload = {
                                         content: assistantContent,
                                         metadata: finalMetadata,
@@ -2383,18 +2415,18 @@ function executeAiAssistantCodexRun(payload, context) {
                                         setPayload.usage = finalUsage;
                                     }
                                     return [4 /*yield*/, updateAssistantMessageWithFallback(assistantMessageId, setPayload)];
-                                case 57:
-                                    _13.sent();
-                                    _13.label = 58;
-                                case 58: return [4 /*yield*/, touchConversation(conversation._id, finalNow, assistantMessageId ? String(assistantMessageId) : undefined)];
                                 case 59:
                                     _13.sent();
-                                    if (!(input.delete_files_after_run !== false)) return [3 /*break*/, 61];
+                                    _13.label = 60;
+                                case 60: return [4 /*yield*/, touchConversation(conversation._id, finalNow, assistantMessageId ? String(assistantMessageId) : undefined)];
+                                case 61:
+                                    _13.sent();
+                                    if (!(input.delete_files_after_run !== false)) return [3 /*break*/, 63];
                                     return [4 /*yield*/, cleanupAttachments(attachmentData.attachments)];
-                                case 60:
+                                case 62:
                                     _13.sent();
-                                    _13.label = 61;
-                                case 61: return [2 /*return*/, finalAssistantDoc];
+                                    _13.label = 63;
+                                case 63: return [2 /*return*/, finalAssistantDoc];
                             }
                         });
                     }); });
@@ -6951,8 +6983,11 @@ function buildAssistantToolErrorMessage(error) {
     if (normalized.includes('unrecognized argument to $datesubtract:') || normalized.includes('unrecognized argument to $dateadd:')) {
         return 'The data query failed because of an invalid date expression argument. Please retry; date arithmetic arguments are now normalized automatically.';
     }
+    if (normalized.includes('no queryable collection could be resolved')) {
+        return 'I tried all accessible related datasets but could not resolve a queryable source for this request.';
+    }
     if (normalized.includes('report builder bridge') && normalized.includes('not configured')) {
-        return 'That dataset is not configured for assistant data access yet.';
+        return 'I tried all accessible related datasets but could not resolve a queryable source for this request.';
     }
     if (normalized.includes('collection is required')) {
         return 'I need a valid collection to read from. Please specify which screen or dataset you want.';
@@ -6962,8 +6997,27 @@ function buildAssistantToolErrorMessage(error) {
     }
     return 'I couldn\'t run the requested data query.';
 }
+function deriveAssistantCommandExecutionStatus(commandValue) {
+    var command = normalizeOptionalString(commandValue).toLowerCase();
+    if (!command) {
+        return 'Running command';
+    }
+    if (/\b(rg|grep|ripgrep|ag|ack)\b/.test(command)) {
+        return 'Searching files';
+    }
+    if (/\bfind\b/.test(command)) {
+        return 'Finding files';
+    }
+    if (/\b(cat|sed|awk|head|tail|less|more)\b/.test(command)) {
+        return 'Opening files';
+    }
+    if (/\b(ls|tree)\b/.test(command)) {
+        return 'Scanning files';
+    }
+    return 'Running command';
+}
 function deriveAssistantStreamStatus(event) {
-    var _a;
+    var _a, _b;
     if (!event || !event.type) {
         return null;
     }
@@ -6982,10 +7036,10 @@ function deriveAssistantStreamStatus(event) {
             return 'Planning';
         }
         if (itemType === 'command_execution') {
-            return 'Planning';
+            return deriveAssistantCommandExecutionStatus((_b = event === null || event === void 0 ? void 0 : event.item) === null || _b === void 0 ? void 0 : _b.command);
         }
         if (itemType === 'web_search') {
-            return 'Planning';
+            return 'Searching references';
         }
         if (itemType === 'file_change') {
             return 'Drafting response';
@@ -7052,7 +7106,7 @@ function updateAssistantProgress(messageId, progress) {
                                 'metadata.progress': normalized,
                                 updatedAt: new Date()
                             }
-                        })];
+                        }, undefined, false, false, true)];
                 case 2:
                     _b.sent();
                     return [3 /*break*/, 4];
@@ -12430,7 +12484,7 @@ function listAssistantReportBuilderCollectionsFromManager() {
 }
 function listAssistantCollections(db, dbName) {
     return __awaiter(this, void 0, void 0, function () {
-        var cacheKey, cached, now, reportBuilderCollections, collections, names, _a;
+        var cacheKey, cached, now, seen, merged, pushName, collections, _a, names;
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
@@ -12440,26 +12494,39 @@ function listAssistantCollections(db, dbName) {
                     if (cached && now - cached.updatedAt < AI_ASSISTANT_COLLECTION_CACHE_TTL_MS) {
                         return [2 /*return*/, cached.names];
                     }
-                    reportBuilderCollections = listAssistantReportBuilderCollectionsFromManager().sort(function (a, b) { return a.localeCompare(b); });
-                    if (reportBuilderCollections.length) {
-                        AI_ASSISTANT_COLLECTION_CACHE.set(cacheKey, { names: reportBuilderCollections, updatedAt: now });
-                        return [2 /*return*/, reportBuilderCollections];
-                    }
+                    seen = new Set();
+                    merged = [];
+                    pushName = function (name) {
+                        var normalized = normalizeOptionalString(name);
+                        if (!normalized || seen.has(normalized)) {
+                            return;
+                        }
+                        seen.add(normalized);
+                        merged.push(normalized);
+                    };
+                    listAssistantReportBuilderCollectionsFromManager().forEach(pushName);
                     _b.label = 1;
                 case 1:
                     _b.trys.push([1, 3, , 4]);
                     return [4 /*yield*/, db.listCollections({}, { nameOnly: true }).toArray()];
                 case 2:
                     collections = _b.sent();
-                    names = Array.isArray(collections)
-                        ? collections.map(function (entry) { return normalizeOptionalString(entry === null || entry === void 0 ? void 0 : entry.name); }).filter(Boolean)
-                        : [];
-                    AI_ASSISTANT_COLLECTION_CACHE.set(cacheKey, { names: names, updatedAt: now });
-                    return [2 /*return*/, names];
+                    if (Array.isArray(collections)) {
+                        collections.forEach(function (entry) {
+                            pushName(normalizeOptionalString(entry === null || entry === void 0 ? void 0 : entry.name));
+                        });
+                    }
+                    return [3 /*break*/, 4];
                 case 3:
                     _a = _b.sent();
+                    return [3 /*break*/, 4];
+                case 4:
+                    names = merged.sort(function (a, b) { return a.localeCompare(b); });
+                    if (names.length) {
+                        AI_ASSISTANT_COLLECTION_CACHE.set(cacheKey, { names: names, updatedAt: now });
+                        return [2 /*return*/, names];
+                    }
                     return [2 /*return*/, (cached === null || cached === void 0 ? void 0 : cached.names) || []];
-                case 4: return [2 /*return*/];
             }
         });
     });
@@ -12943,6 +13010,16 @@ var AI_ASSISTANT_BRIDGE_COLLECTION_ALIASES = {
     supporttickets: 'support-tickets',
     ticket: 'support-tickets',
     tickets: 'support-tickets',
+    timeentry: 'time_entries',
+    timeentries: 'time_entries',
+    timeentrylog: 'time_entries',
+    timeentrylogs: 'time_entries',
+    timeentryrecord: 'time_entries',
+    timeentryrecords: 'time_entries',
+    timesheet: 'timesheets',
+    timesheets: 'timesheets',
+    payrollentry: 'payroll_entries',
+    payrollentries: 'payroll_entries',
     invoice: 'invoices',
     client: 'customers',
     clients: 'customers',
@@ -12959,7 +13036,20 @@ var AI_ASSISTANT_DIRECT_COLLECTION_FALLBACK_ALLOWLIST = new Set([
     'duplicate-deliveries',
     'third-party-drivers',
     'customers',
-    'support-tickets'
+    'support-tickets',
+    'time_entries',
+    'time-entries',
+    'timeentries',
+    'timesheets',
+    'timesheet-entries',
+    'employee-time',
+    'employee_time',
+    'employee-time-entries',
+    'employee_time_entries',
+    'payroll_entries',
+    'payroll-entries',
+    'billing_entries',
+    'billing-entries'
 ]);
 var AI_ASSISTANT_ORDER_COLLECTION_FALLBACKS = [
     'work-order-dynamics',
@@ -12985,6 +13075,21 @@ var AI_ASSISTANT_INVOICE_COLLECTION_FALLBACKS = [
     'billings',
     'sales-taxes'
 ];
+var AI_ASSISTANT_TIME_COLLECTION_FALLBACKS = [
+    'time_entries',
+    'time-entries',
+    'timeentries',
+    'timesheets',
+    'timesheet-entries',
+    'employee-time',
+    'employee_time',
+    'employee-time-entries',
+    'employee_time_entries',
+    'payroll_entries',
+    'payroll-entries',
+    'billing_entries',
+    'billing-entries'
+];
 function normalizeAssistantCollectionFamilyName(value) {
     var normalized = normalizeOptionalString(value).toLowerCase();
     if (!normalized) {
@@ -13050,6 +13155,13 @@ function resolveAssistantCrossCollectionFallbackCandidates(collection) {
     else if (AI_ASSISTANT_INVOICE_COLLECTION_FALLBACKS.includes(normalized) || normalized.includes('invoice') || normalized.includes('billing')) {
         candidates = AI_ASSISTANT_INVOICE_COLLECTION_FALLBACKS;
     }
+    else if (AI_ASSISTANT_TIME_COLLECTION_FALLBACKS.includes(normalized)
+        || normalized.includes('time')
+        || normalized.includes('sheet')
+        || normalized.includes('hour')
+        || normalized.includes('payroll')) {
+        candidates = AI_ASSISTANT_TIME_COLLECTION_FALLBACKS;
+    }
     var deduped = [];
     candidates.forEach(function (candidate) {
         if (!candidate || deduped.includes(candidate)) {
@@ -13120,28 +13232,48 @@ function isAssistantDirectCollectionFallbackAllowed(collection) {
     }
     return AI_ASSISTANT_DIRECT_COLLECTION_FALLBACK_ALLOWLIST.has(normalized);
 }
+function doesAssistantCollectionExistInDb(db, collection) {
+    return __awaiter(this, void 0, void 0, function () {
+        var normalized, collections, _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    normalized = normalizeOptionalString(collection);
+                    if (!normalized || !db || typeof db.listCollections !== 'function') {
+                        return [2 /*return*/, false];
+                    }
+                    _b.label = 1;
+                case 1:
+                    _b.trys.push([1, 3, , 4]);
+                    return [4 /*yield*/, db.listCollections({ name: normalized }, { nameOnly: true }).toArray()];
+                case 2:
+                    collections = _b.sent();
+                    return [2 /*return*/, Array.isArray(collections)
+                            && collections.some(function (entry) { return normalizeOptionalString(entry === null || entry === void 0 ? void 0 : entry.name) === normalized; })];
+                case 3:
+                    _a = _b.sent();
+                    return [2 /*return*/, false];
+                case 4: return [2 /*return*/];
+            }
+        });
+    });
+}
 function resolveAssistantReportBuilderBridgeCollection(collection_1, db_1) {
     return __awaiter(this, arguments, void 0, function (collection, db, dbName) {
-        var normalized, alias, manager, fallback, candidates, pushCandidate, base, reportCandidate, candidates_4, candidates_4_1, candidate, model, resolved, resolvedName, model, _a, candidates_5, candidates_5_1, candidate;
-        var e_30, _b, e_31, _c;
-        var _d;
+        var normalized, alias, manager, hasManager, candidates, pushCandidate, base, reportCandidate, candidates_4, candidates_4_1, candidate, model, resolved, resolvedName, resolvedModel, _a, candidates_5, candidates_5_1, candidate, e_30_1, candidates_6, candidates_6_1, candidate;
+        var e_31, _b, e_30, _c, e_32, _d;
+        var _e;
         if (dbName === void 0) { dbName = ''; }
-        return __generator(this, function (_e) {
-            switch (_e.label) {
+        return __generator(this, function (_f) {
+            switch (_f.label) {
                 case 0:
                     normalized = normalizeOptionalString(collection);
                     if (!normalized) {
                         throw new Error('AI assistant report builder bridge: Collection is required.');
                     }
                     alias = resolveAssistantBridgeCollectionAlias(normalized);
-                    manager = (_d = resolveio_server_app_1.ResolveIOServer.getMongoManager) === null || _d === void 0 ? void 0 : _d.call(resolveio_server_app_1.ResolveIOServer);
-                    if (!manager || typeof manager.collection !== 'function') {
-                        fallback = alias || normalized;
-                        if (isAssistantDirectCollectionFallbackAllowed(fallback)) {
-                            return [2 /*return*/, __assign({ collection: fallback }, (fallback !== normalized ? { fallbackFrom: normalized } : {}))];
-                        }
-                        throw new Error('AI assistant report builder bridge: Mongo manager unavailable.');
-                    }
+                    manager = (_e = resolveio_server_app_1.ResolveIOServer.getMongoManager) === null || _e === void 0 ? void 0 : _e.call(resolveio_server_app_1.ResolveIOServer);
+                    hasManager = !!(manager && typeof manager.collection === 'function');
                     candidates = [];
                     pushCandidate = function (name) {
                         var value = normalizeOptionalString(name);
@@ -13162,64 +13294,99 @@ function resolveAssistantReportBuilderBridgeCollection(collection_1, db_1) {
                     if (reportCandidate && reportCandidate !== normalized) {
                         pushCandidate(reportCandidate);
                     }
-                    try {
-                        for (candidates_4 = __values(candidates), candidates_4_1 = candidates_4.next(); !candidates_4_1.done; candidates_4_1 = candidates_4.next()) {
-                            candidate = candidates_4_1.value;
-                            model = manager.collection(candidate);
-                            if (model === null || model === void 0 ? void 0 : model.useRB) {
-                                return [2 /*return*/, __assign({ collection: candidate }, (candidate !== normalized ? { fallbackFrom: normalized } : {}))];
+                    if (hasManager) {
+                        try {
+                            for (candidates_4 = __values(candidates), candidates_4_1 = candidates_4.next(); !candidates_4_1.done; candidates_4_1 = candidates_4.next()) {
+                                candidate = candidates_4_1.value;
+                                model = manager.collection(candidate);
+                                if (model === null || model === void 0 ? void 0 : model.useRB) {
+                                    return [2 /*return*/, __assign({ collection: candidate }, (candidate !== normalized ? { fallbackFrom: normalized } : {}))];
+                                }
                             }
                         }
-                    }
-                    catch (e_30_1) { e_30 = { error: e_30_1 }; }
-                    finally {
-                        try {
-                            if (candidates_4_1 && !candidates_4_1.done && (_b = candidates_4.return)) _b.call(candidates_4);
+                        catch (e_31_1) { e_31 = { error: e_31_1 }; }
+                        finally {
+                            try {
+                                if (candidates_4_1 && !candidates_4_1.done && (_b = candidates_4.return)) _b.call(candidates_4);
+                            }
+                            finally { if (e_31) throw e_31.error; }
                         }
-                        finally { if (e_30) throw e_30.error; }
                     }
                     if (!(db && dbName)) return [3 /*break*/, 4];
-                    _e.label = 1;
+                    _f.label = 1;
                 case 1:
-                    _e.trys.push([1, 3, , 4]);
+                    _f.trys.push([1, 3, , 4]);
                     return [4 /*yield*/, resolveAssistantCollectionName(db, dbName, alias || normalized)];
                 case 2:
-                    resolved = _e.sent();
+                    resolved = _f.sent();
                     resolvedName = normalizeOptionalString(resolved === null || resolved === void 0 ? void 0 : resolved.name);
                     if (resolvedName) {
                         pushCandidate(resolvedName);
-                        model = manager.collection(resolvedName);
-                        if ((model === null || model === void 0 ? void 0 : model.useRB) || isAssistantDirectCollectionFallbackAllowed(resolvedName)) {
+                        resolvedModel = hasManager ? manager.collection(resolvedName) : null;
+                        if ((resolvedModel === null || resolvedModel === void 0 ? void 0 : resolvedModel.useRB) || isAssistantDirectCollectionFallbackAllowed(resolvedName)) {
                             return [2 /*return*/, __assign({ collection: resolvedName }, (resolvedName !== normalized ? { fallbackFrom: normalized } : {}))];
                         }
                     }
                     return [3 /*break*/, 4];
                 case 3:
-                    _a = _e.sent();
+                    _a = _f.sent();
                     return [3 /*break*/, 4];
                 case 4:
+                    if (!db) return [3 /*break*/, 12];
+                    _f.label = 5;
+                case 5:
+                    _f.trys.push([5, 10, 11, 12]);
+                    candidates_5 = __values(candidates), candidates_5_1 = candidates_5.next();
+                    _f.label = 6;
+                case 6:
+                    if (!!candidates_5_1.done) return [3 /*break*/, 9];
+                    candidate = candidates_5_1.value;
+                    if (AI_ASSISTANT_BLOCKED_COLLECTIONS.has(candidate)) {
+                        return [3 /*break*/, 8];
+                    }
+                    return [4 /*yield*/, doesAssistantCollectionExistInDb(db, candidate)];
+                case 7:
+                    if (_f.sent()) {
+                        return [2 /*return*/, __assign({ collection: candidate }, (candidate !== normalized ? { fallbackFrom: normalized } : {}))];
+                    }
+                    _f.label = 8;
+                case 8:
+                    candidates_5_1 = candidates_5.next();
+                    return [3 /*break*/, 6];
+                case 9: return [3 /*break*/, 12];
+                case 10:
+                    e_30_1 = _f.sent();
+                    e_30 = { error: e_30_1 };
+                    return [3 /*break*/, 12];
+                case 11:
                     try {
-                        for (candidates_5 = __values(candidates), candidates_5_1 = candidates_5.next(); !candidates_5_1.done; candidates_5_1 = candidates_5.next()) {
-                            candidate = candidates_5_1.value;
+                        if (candidates_5_1 && !candidates_5_1.done && (_c = candidates_5.return)) _c.call(candidates_5);
+                    }
+                    finally { if (e_30) throw e_30.error; }
+                    return [7 /*endfinally*/];
+                case 12:
+                    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 (isAssistantDirectCollectionFallbackAllowed(candidate)) {
                                 return [2 /*return*/, __assign({ collection: candidate }, (candidate !== normalized ? { fallbackFrom: normalized } : {}))];
                             }
                         }
                     }
-                    catch (e_31_1) { e_31 = { error: e_31_1 }; }
+                    catch (e_32_1) { e_32 = { error: e_32_1 }; }
                     finally {
                         try {
-                            if (candidates_5_1 && !candidates_5_1.done && (_c = candidates_5.return)) _c.call(candidates_5);
+                            if (candidates_6_1 && !candidates_6_1.done && (_d = candidates_6.return)) _d.call(candidates_6);
                         }
-                        finally { if (e_31) throw e_31.error; }
+                        finally { if (e_32) throw e_32.error; }
                     }
-                    throw new Error('AI assistant report builder bridge: Collection is not configured for report builder.');
+                    throw new Error('AI assistant report builder bridge: No queryable collection could be resolved.');
             }
         });
     });
 }
 function findQueryDateField(query) {
-    var e_32, _a, e_33, _b;
+    var e_33, _a, e_34, _b;
     if (!query || typeof query !== 'object') {
         return null;
     }
@@ -13233,12 +13400,12 @@ function findQueryDateField(query) {
                 }
             }
         }
-        catch (e_32_1) { e_32 = { error: e_32_1 }; }
+        catch (e_33_1) { e_33 = { error: e_33_1 }; }
         finally {
             try {
                 if (query_1_1 && !query_1_1.done && (_a = query_1.return)) _a.call(query_1);
             }
-            finally { if (e_32) throw e_32.error; }
+            finally { if (e_33) throw e_33.error; }
         }
         return null;
     }
@@ -13257,12 +13424,12 @@ function findQueryDateField(query) {
             }
         }
     }
-    catch (e_33_1) { e_33 = { error: e_33_1 }; }
+    catch (e_34_1) { e_34 = { error: e_34_1 }; }
     finally {
         try {
             if (_d && !_d.done && (_b = _c.return)) _b.call(_c);
         }
-        finally { if (e_33) throw e_33.error; }
+        finally { if (e_34) throw e_34.error; }
     }
     return null;
 }
@@ -13511,7 +13678,7 @@ function resolveQueryDateFieldFallback(query) {
     return { from: dateField, to: fallback };
 }
 function containsForbiddenMongoOperators(value) {
-    var e_34, _a;
+    var e_35, _a;
     if (!value || typeof value !== 'object') {
         return false;
     }
@@ -13530,12 +13697,12 @@ function containsForbiddenMongoOperators(value) {
             }
         }
     }
-    catch (e_34_1) { e_34 = { error: e_34_1 }; }
+    catch (e_35_1) { e_35 = { error: e_35_1 }; }
     finally {
         try {
             if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
         }
-        finally { if (e_34) throw e_34.error; }
+        finally { if (e_35) throw e_35.error; }
     }
     return false;
 }
@@ -13858,38 +14025,6 @@ function resolveConfiguredCodexAutoThoughtLevel(kind) {
         || process.env["AI_DASHBOARD_CODEX_".concat(levelKey, "_THOUGHT_LEVEL")]);
     return configured || fallbackLevel;
 }
-function resolveAutoCodexThoughtLevel(params) {
-    var combinedText = [
-        normalizeOptionalString(params === null || params === void 0 ? void 0 : params.message),
-        normalizeOptionalString(params === null || params === void 0 ? void 0 : params.attachmentText)
-    ].filter(Boolean).join('\n').toLowerCase();
-    var simpleLevel = resolveConfiguredCodexAutoThoughtLevel('simple');
-    var complexLevel = resolveConfiguredCodexAutoThoughtLevel('complex');
-    if (!combinedText) {
-        return simpleLevel;
-    }
-    var bugOrIssuePatterns = [
-        /\bbug\b/i,
-        /\bissue\b/i,
-        /\berror\b/i,
-        /\bexception\b/i,
-        /\bfail(?:ed|ing|ure)?\b/i,
-        /\bbroken\b/i,
-        /\bnot\s+working\b/i,
-        /\bdoesn['’]t\s+work\b/i,
-        /\bwhy\s+is\s+this\s+happening\b/i,
-        /\broot\s+cause\b/i,
-        /\bregression\b/i,
-        /\bdebug\b/i,
-        /\binvestigat(?:e|ion)\b/i,
-        /\bfix\b/i,
-        /\bcrash(?:ed|ing)?\b/i,
-        /\btimeout\b/i,
-        /\bwrong\b/i,
-        /\bincorrect\b/i
-    ];
-    return bugOrIssuePatterns.some(function (pattern) { return pattern.test(combinedText); }) ? complexLevel : simpleLevel;
-}
 function resolveCodexThoughtLevel(params) {
     var config = resolveio_server_app_1.ResolveIOServer.getServerConfig() || {};
     var raw = normalizeOptionalString(config['AI_ASSISTANT_CODEX_THOUGHT_LEVEL']
@@ -13900,13 +14035,17 @@ function resolveCodexThoughtLevel(params) {
         || process.env.AI_DASHBOARD_CODEX_THOUGHT_LEVEL);
     var normalized = (raw || '').trim().toLowerCase();
     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;
     }
     if (normalized === 'auto' || !normalized) {
-        return resolveAutoCodexThoughtLevel(params);
+        return resolveConfiguredCodexAutoThoughtLevel('complex');
     }
-    return 'medium';
+    return 'high';
 }
 function resolveCodexSettings(options) {
     var serverConfig = resolveio_server_app_1.ResolveIOServer.getServerConfig() || {};
@@ -13978,8 +14117,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_35_1;
-        var _e, e_35, _f, _g;
+        var _a, _b, _c, _d, message, payload, status_1, e_36_1;
+        var _e, e_36, _f, _g;
         return __generator(this, function (_h) {
             switch (_h.label) {
                 case 0:
@@ -14006,8 +14145,8 @@ function waitForCodexWorkerMessage(worker, streamStatusHandler) {
                     return [3 /*break*/, 1];
                 case 4: return [3 /*break*/, 11];
                 case 5:
-                    e_35_1 = _h.sent();
-                    e_35 = { error: e_35_1 };
+                    e_36_1 = _h.sent();
+                    e_36 = { error: e_36_1 };
                     return [3 /*break*/, 11];
                 case 6:
                     _h.trys.push([6, , 9, 10]);
@@ -14018,7 +14157,7 @@ function waitForCodexWorkerMessage(worker, streamStatusHandler) {
                     _h.label = 8;
                 case 8: return [3 /*break*/, 10];
                 case 9:
-                    if (e_35) throw e_35.error;
+                    if (e_36) throw e_36.error;
                     return [7 /*endfinally*/];
                 case 10: return [7 /*endfinally*/];
                 case 11: throw new CodexWorkerBootstrapError('Codex worker exited before completing.');
@@ -14587,6 +14726,20 @@ function classifyAssistantRequestType(message, plannerOutput) {
         plannerIntentType: plannerIntentRaw || undefined
     };
 }
+function shouldRunAssistantPlanner(params) {
+    if (!(params === null || params === void 0 ? void 0 : params.plannerEnabled)) {
+        return false;
+    }
+    if (params === null || params === void 0 ? void 0 : params.hasDeterministicHeuristicFastPath) {
+        return false;
+    }
+    var requestClassification = params === null || params === void 0 ? void 0 : params.requestClassification;
+    if (requestClassification === null || requestClassification === void 0 ? void 0 : requestClassification.dataQuestion) {
+        return true;
+    }
+    var type = (requestClassification === null || requestClassification === void 0 ? void 0 : requestClassification.type) || 'unknown';
+    return type === 'unknown' || type === 'mixed';
+}
 function resolveAssistantRequestedTimeGrain(message, plannerOutput) {
     var _a, _b;
     var plannerGrain = normalizeOptionalString((_b = (_a = plannerOutput === null || plannerOutput === void 0 ? void 0 : plannerOutput.dataPlan) === null || _a === void 0 ? void 0 : _a.timeRange) === null || _b === void 0 ? void 0 : _b.grain).toLowerCase();
@@ -14680,7 +14833,7 @@ var AI_ASSISTANT_BREAKDOWN_DIMENSION_STOPWORDS = new Set([
     'by'
 ]);
 function normalizeAssistantBreakdownDimension(value) {
-    var e_36, _a;
+    var e_37, _a;
     var normalized = normalizeOptionalString(value)
         .toLowerCase()
         .replace(/[^a-z0-9_\s-]+/g, ' ')
@@ -14712,12 +14865,12 @@ function normalizeAssistantBreakdownDimension(value) {
             }
         }
     }
-    catch (e_36_1) { e_36 = { error: e_36_1 }; }
+    catch (e_37_1) { e_37 = { error: e_37_1 }; }
     finally {
         try {
             if (tokens_1_1 && !tokens_1_1.done && (_a = tokens_1.return)) _a.call(tokens_1);
         }
-        finally { if (e_36) throw e_36.error; }
+        finally { if (e_37) throw e_37.error; }
     }
     if (!kept.length) {
         return '';
@@ -14904,7 +15057,7 @@ function resolveAssistantPlannerEnabled() {
     return raw === undefined ? true : raw === true;
 }
 function resolveAssistantPlannerKnownRoutes() {
-    var e_37, _a;
+    var e_38, _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 unique = new Set();
@@ -14917,12 +15070,12 @@ function resolveAssistantPlannerKnownRoutes() {
             }
         }
     }
-    catch (e_37_1) { e_37 = { error: e_37_1 }; }
+    catch (e_38_1) { e_38 = { error: e_38_1 }; }
     finally {
         try {
             if (routes_1_1 && !routes_1_1.done && (_a = routes_1.return)) _a.call(routes_1);
         }
-        finally { if (e_37) throw e_37.error; }
+        finally { if (e_38) throw e_38.error; }
     }
     return Array.from(unique).slice(0, AI_ASSISTANT_PLANNER_MAX_ROUTES);
 }
@@ -15165,7 +15318,7 @@ function normalizeRouteMatchKey(value) {
     return normalizeRouteKey(value).toLowerCase();
 }
 function buildClientRouteIndex() {
-    var e_38, _a;
+    var e_39, _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();
@@ -15184,12 +15337,12 @@ function buildClientRouteIndex() {
             }
         }
     }
-    catch (e_38_1) { e_38 = { error: e_38_1 }; }
+    catch (e_39_1) { e_39 = { error: e_39_1 }; }
     finally {
         try {
             if (routes_2_1 && !routes_2_1.done && (_a = routes_2.return)) _a.call(routes_2);
         }
-        finally { if (e_38) throw e_38.error; }
+        finally { if (e_39) throw e_39.error; }
     }
     return { set: set, map: map, size: routes.length };
 }
@@ -15559,13 +15712,88 @@ var AI_ASSISTANT_CHANGE_HISTORY_PATTERNS = [
     /\bwhat\s+did\s+(?:the\s+)?last\s+(?:system\s+)?update\s+(?:just\s+)?do\b/i,
     /\blast\s+system\s+update\b[\s\S]{0,40}\bdo\b/i,
     /\bhow\s+long\b.*\bbeen\s+(this|that)\s+way\b/i,
+    /\bhow\s+long\b[\s\S]{0,80}\bbeen\s+around\b/i,
     /\bsince\s+when\b/i,
+    /\bwhen\s+was\b[\s\S]{0,80}\bintroduced\b/i,
     /\bchangelog\b/i,
     /\brelease\s+notes?\b/i,
     /\bgithub\b/i,
     /\bcommits?\b/i,
     /\bupdate\s+history\b/i
 ];
+var AI_ASSISTANT_CHANGE_HISTORY_TOKEN_STOPWORDS = new Set([
+    'the',
+    'a',
+    'an',
+    'to',
+    'for',
+    'of',
+    'in',
+    'on',
+    'at',
+    'and',
+    'or',
+    'i',
+    'me',
+    'my',
+    'we',
+    'us',
+    'you',
+    'our',
+    'is',
+    'are',
+    'do',
+    'did',
+    'does',
+    'can',
+    'could',
+    'would',
+    'should',
+    'what',
+    'when',
+    'where',
+    'which',
+    'why',
+    'how',
+    'long',
+    'has',
+    'have',
+    'had',
+    'been',
+    'this',
+    'that',
+    'these',
+    'those',
+    'it',
+    'new',
+    'changed',
+    'change',
+    'recent',
+    'recently',
+    'latest',
+    'last',
+    'time',
+    'updated',
+    'update',
+    'updates',
+    'added',
+    'around',
+    'page',
+    'screen',
+    'feature',
+    'features',
+    'history',
+    'list',
+    'dashboard',
+    'server',
+    'management',
+    'system',
+    'release',
+    'notes',
+    'github',
+    'commits',
+    'commit'
+]);
 function isAssistantChangeHistoryQuestion(message) {
     var text = normalizeOptionalString(message).toLowerCase();
     if (!text) {
@@ -15597,6 +15825,13 @@ function resolveAssistantChangeHistoryLimit(message) {
     }
     return AI_ASSISTANT_CHANGE_HISTORY_DEFAULT_LIMIT;
 }
+function resolveAssistantChangeHistoryDepth(message, limit) {
+    var normalizedLimit = Math.min(Math.max((0, common_1.round)(limit || 0), 1), AI_ASSISTANT_CHANGE_HISTORY_MAX_LIMIT);
+    if (isAssistantChangeDurationQuestion(message)) {
+        return Math.min(Math.max(normalizedLimit * 40, AI_ASSISTANT_CHANGE_HISTORY_MAX_DEPTH), AI_ASSISTANT_CHANGE_HISTORY_DURATION_MAX_DEPTH);
+    }
+    return Math.min(Math.max(normalizedLimit * 8, AI_ASSISTANT_CHANGE_HISTORY_MIN_DEPTH), AI_ASSISTANT_CHANGE_HISTORY_MAX_DEPTH);
+}
 function resolveAssistantChangeHistoryFetchEnabled() {
     var config = resolveio_server_app_1.ResolveIOServer.getServerConfig() || {};
     var normalized = normalizeOptionalBoolean(config['AI_ASSISTANT_GIT_FETCH_ENABLED']
@@ -15612,6 +15847,43 @@ function shouldAssistantFetchGitRemote(message) {
     }
     return /\b(github|latest|newest|up to date|up-to-date|pull|remote)\b/i.test(text);
 }
+function resolveAssistantChangeHistoryKeywords(message) {
+    var rawTokens = normalizeOptionalString(message)
+        .toLowerCase()
+        .split(/[^a-z0-9]+/g)
+        .map(function (token) { return token.trim(); })
+        .filter(Boolean);
+    var keywords = [];
+    rawTokens.forEach(function (token) {
+        normalizeCollectionToken(token).forEach(function (normalized) {
+            if (!normalized || normalized.length < 4 || AI_ASSISTANT_CHANGE_HISTORY_TOKEN_STOPWORDS.has(normalized)) {
+                return;
+            }
+            keywords.push(normalized);
+        });
+    });
+    return Array.from(new Set(keywords));
+}
+function scoreAssistantChangeHistoryCommitByKeywords(commit, keywords) {
+    if (!Array.isArray(keywords) || !keywords.length) {
+        return 0;
+    }
+    var subject = normalizeOptionalString(commit === null || commit === void 0 ? void 0 : commit.subject).toLowerCase();
+    var files = Array.isArray(commit === null || commit === void 0 ? void 0 : commit.files)
+        ? commit.files.map(function (file) { return normalizeOptionalString(file).toLowerCase(); }).filter(Boolean).join(' ')
+        : '';
+    var haystack = "".concat(subject, " ").concat(files).trim();
+    if (!haystack) {
+        return 0;
+    }
+    var score = 0;
+    keywords.forEach(function (keyword) {
+        if (keyword && haystack.includes(keyword)) {
+            score += keyword.length >= 8 ? 2 : 1;
+        }
+    });
+    return score;
+}
 function resolveAssistantChangeModulesFromText(message) {
     var text = normalizeOptionalString(message).toLowerCase();
     if (!text) {
@@ -15916,9 +16188,22 @@ function buildAssistantChangeHistorySummaryFromCommits(params) {
         }
         return __assign({ response: lines_3.join('\n'), reason: 'generic', commitCount: 0, generic: true }, (branch ? { branch: branch } : {}));
     }
-    var themes = summarizeAssistantChangeThemes(permittedCommits);
+    var featureKeywords = resolveAssistantChangeHistoryKeywords(message);
+    var keywordScopedCommits = featureKeywords.length
+        ? permittedCommits
+            .map(function (commit, index) { return ({
+            commit: commit,
+            index: index,
+            score: scoreAssistantChangeHistoryCommitByKeywords(commit, featureKeywords)
+        }); })
+            .filter(function (entry) { return entry.score > 0; })
+            .sort(function (a, b) { return (b.score - a.score) || (a.index - b.index); })
+            .map(function (entry) { return entry.commit; })
+        : [];
+    var relevantCommits = keywordScopedCommits.length ? keywordScopedCommits : permittedCommits;
+    var themes = summarizeAssistantChangeThemes(relevantCommits);
     var limit = resolveAssistantChangeHistoryLimit(message);
-    var topCommits = permittedCommits.slice(0, Math.max(limit, 1));
+    var topCommits = relevantCommits.slice(0, Math.max(limit, 1));
     var lines = [title];
     if (themes.length) {
         lines.push("- Themes: ".concat(themes.join(', '), "."));
@@ -15928,7 +16213,10 @@ function buildAssistantChangeHistorySummaryFromCommits(params) {
         lines.push("- ".concat(dateText, ": ").concat(sanitizeAssistantChangeSubject(commit.subject), "."));
     });
     if (asksDuration) {
-        var datedCommits = permittedCommits
+        if (featureKeywords.length && !keywordScopedCommits.length) {
+            lines.push('- I could not find exact feature-term matches in recent commits, so this estimate uses the closest available history.');
+        }
+        var datedCommits = relevantCommits
             .map(function (commit) { return ({ commit: commit, date: new Date(commit.date) }); })
             .filter(function (entry) { return !Number.isNaN(entry.date.getTime()); });
         if (datedCommits.length) {
@@ -16017,7 +16305,7 @@ function resolveAssistantChangeHistoryFastPathResponse(params) {
                     return [3 /*break*/, 14];
                 case 14:
                     limit = resolveAssistantChangeHistoryLimit(params.message);
-                    historyDepth = Math.min(Math.max(limit * 8, 80), 240);
+                    historyDepth = resolveAssistantChangeHistoryDepth(params.message, limit);
                     return [4 /*yield*/, runAssistantGitCommand(gitRoot, [
                             'log',
                             '-n',
@@ -16220,7 +16508,7 @@ function sanitizeAssistantResponse(value) {
     return normalizeAssistantRoutes(normalizedCurrency);
 }
 function evaluateAssistantGuardrails(message) {
-    var e_39, _a;
+    var e_40, _a;
     var normalized = String(message || '').toLowerCase();
     var patterns = [
         {
@@ -16266,12 +16554,12 @@ function evaluateAssistantGuardrails(message) {
             }
         }
     }
-    catch (e_39_1) { e_39 = { error: e_39_1 }; }
+    catch (e_40_1) { e_40 = { error: e_40_1 }; }
     finally {
         try {
             if (patterns_1_1 && !patterns_1_1.done && (_a = patterns_1.return)) _a.call(patterns_1);
         }
-        finally { if (e_39) throw e_39.error; }
+        finally { if (e_40) throw e_40.error; }
     }
     return null;
 }
@@ -16386,7 +16674,7 @@ function tokenizeArithmeticExpression(expression) {
     return tokens;
 }
 function evaluateArithmeticExpression(expression) {
-    var e_40, _a, e_41, _b;
+    var e_41, _a, e_42, _b;
     var tokens = tokenizeArithmeticExpression(expression);
     if (!tokens || !tokens.length) {
         return null;
@@ -16443,12 +16731,12 @@ function evaluateArithmeticExpression(expression) {
             prevToken = token;
         }
     }
-    catch (e_40_1) { e_40 = { error: e_40_1 }; }
+    catch (e_41_1) { e_41 = { error: e_41_1 }; }
     finally {
         try {
             if (tokens_2_1 && !tokens_2_1.done && (_a = tokens_2.return)) _a.call(tokens_2);
         }
-        finally { if (e_40) throw e_40.error; }
+        finally { if (e_41) throw e_41.error; }
     }
     while (ops.length) {
         var op = ops.pop();
@@ -16488,12 +16776,12 @@ function evaluateArithmeticExpression(expression) {
             stack.push(Number(token));
         }
     }
-    catch (e_41_1) { e_41 = { error: e_41_1 }; }
+    catch (e_42_1) { e_42 = { error: e_42_1 }; }
     finally {
         try {
             if (output_1_1 && !output_1_1.done && (_b = output_1.return)) _b.call(output_1);
         }
-        finally { if (e_41) throw e_41.error; }
+        finally { if (e_42) throw e_42.error; }
     }
     if (stack.length !== 1 || Number.isNaN(stack[0])) {
         return null;
@@ -16677,8 +16965,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_42_1;
-        var e_42, _b;
+        var limits, totalBytes, totalChars, chunks, cleaned, attachments_1, attachments_1_1, attachment, localPath, safe, stat, ext, name_1, type, readable, content, _a, e_43_1;
+        var e_43, _b;
         return __generator(this, function (_c) {
             switch (_c.label) {
                 case 0:
@@ -16757,14 +17045,14 @@ function readAttachmentContents(attachments) {
                     return [3 /*break*/, 2];
                 case 10: return [3 /*break*/, 13];
                 case 11:
-                    e_42_1 = _c.sent();
-                    e_42 = { error: e_42_1 };
+                    e_43_1 = _c.sent();
+                    e_43 = { error: e_43_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_42) throw e_42.error; }
+                    finally { if (e_43) throw e_43.error; }
                     return [7 /*endfinally*/];
                 case 13: return [2 /*return*/, {
                         promptText: chunks.length ? "\n\nAttachments:\n".concat(chunks.join('\n\n')) : '',
@@ -16929,7 +17217,7 @@ function updateAssistantMessageWithFallback(messageId, setPayload) {
                     _b.label = 1;
                 case 1:
                     _b.trys.push([1, 3, , 10]);
-                    return [4 /*yield*/, ai_terminal_message_collection_1.AiTerminalMessages.updateOne({ _id: messageId }, { $set: setPayload })];
+                    return [4 /*yield*/, ai_terminal_message_collection_1.AiTerminalMessages.updateOne({ _id: messageId }, { $set: setPayload }, undefined, false, false, true)];
                 case 2:
                     _b.sent();
                     return [2 /*return*/];
@@ -16955,7 +17243,7 @@ function updateAssistantMessageWithFallback(messageId, setPayload) {
                 case 7: return [4 /*yield*/, (0, promises_1.setTimeout)(15)];
                 case 8:
                     _b.sent();
-                    return [4 /*yield*/, ai_terminal_message_collection_1.AiTerminalMessages.updateOne({ _id: messageId }, { $set: setPayload })];
+                    return [4 /*yield*/, ai_terminal_message_collection_1.AiTerminalMessages.updateOne({ _id: messageId }, { $set: setPayload }, undefined, false, false, true)];
                 case 9:
                     _b.sent();
                     return [3 /*break*/, 10];
@@ -16980,7 +17268,7 @@ function touchConversation(idConversation, timestamp, lastMessageId) {
                     _a.label = 1;
                 case 1:
                     _a.trys.push([1, 3, , 5]);
-                    return [4 /*yield*/, ai_terminal_conversation_collection_1.AiTerminalConversations.updateOne({ _id: idConversation }, { $set: update })];
+                    return [4 /*yield*/, ai_terminal_conversation_collection_1.AiTerminalConversations.updateOne({ _id: idConversation }, { $set: update }, undefined, false, false, true)];
                 case 2:
                     _a.sent();
                     return [2 /*return*/];
@@ -17088,7 +17376,7 @@ function estimateUsage(messages, responseText, model) {
     };
 }
 function evaluateGuardrails(message) {
-    var e_43, _a;
+    var e_44, _a;
     var normalized = String(message || '').toLowerCase();
     var patterns = [
         { pattern: /\b(source\s*code|full\s*code|entire\s*code|repo\s*dump|repository|git\s*clone)\b/i, reason: 'Code access is restricted.' },
@@ -17110,12 +17398,12 @@ function evaluateGuardrails(message) {
             }
         }
     }
-    catch (e_43_1) { e_43 = { error: e_43_1 }; }
+    catch (e_44_1) { e_44 = { error: e_44_1 }; }
     finally {
         try {
             if (patterns_2_1 && !patterns_2_1.done && (_a = patterns_2.return)) _a.call(patterns_2);
         }
-        finally { if (e_43) throw e_43.error; }
+        finally { if (e_44) throw e_44.error; }
     }
     return null;
 }