@resolveio/server-lib 22.0.15 → 22.0.17

package/methods/ai-terminal.js

@@ -114,6 +114,7 @@ exports.serializeMongoValue = serializeMongoValue;
 exports.flattenForTable = flattenForTable;
 exports.buildDisplayTable = buildDisplayTable;
 exports.formatDisplayTableMarkdown = formatDisplayTableMarkdown;
+exports.normalizeAssistantNowExprPlaceholders = normalizeAssistantNowExprPlaceholders;
 exports.rewriteMatchExpressionsToExpr = rewriteMatchExpressionsToExpr;
 exports.stripQueryFieldPathsDeep = stripQueryFieldPathsDeep;
 exports.stripScopedFieldsFromPipeline = stripScopedFieldsFromPipeline;
@@ -543,7 +544,8 @@ var AI_ASSISTANT_PLANNER_SYSTEM_PROMPT = [
     '5) CLASSIFY THE REQUEST:',
     '   - type = "navigation" if user asks how/where to do something in the app.',
     '   - type = "data" if user asks for totals, lists, breakdowns, counts, reports, "last N", "by month", etc.',
-    '   - type = "program_explain" if user asks how the system works (features/process).',
+    '   - type = "feature_info" if user asks how the system works (features/process) without requesting data.',
+    '   - type = "bug_issue" if user reports wrong behavior/errors or asks for root-cause/debugging.',
     '   - type = "mixed" if both navigation + data are clearly requested.',
     '',
     '6) OUTPUT FORMAT:',
@@ -578,7 +580,7 @@ var AI_ASSISTANT_PLANNER_USER_PROMPT_TEMPLATE = [
     '    }',
     '  },',
     '  "intent": {',
-    '    "type": "navigation" | "data" | "program_explain" | "mixed",',
+    '    "type": "navigation" | "data" | "feature_info" | "bug_issue" | "mixed",',
     '    "summary": string,',
     '    "confidence": number',
     '  },',
@@ -778,28 +780,31 @@ function loadAiTerminalMethods(methodManager) {
             function: function (payload) {
                 return __awaiter(this, void 0, void 0, function () {
                     var now, doc, result;
-                    return __generator(this, function (_a) {
-                        switch (_a.label) {
+                    var _a;
+                    return __generator(this, function (_b) {
+                        switch (_b.label) {
                             case 0:
                                 now = new Date();
-                                doc = {
-                                    id_client: resolveClientIdFromConfig(payload.id_client),
-                                    id_app: normalizeOptionalString(payload.id_app),
-                                    title: normalizeOptionalString(payload.title) || 'New Conversation',
-                                    mode: normalizeConversationMode(payload.mode),
-                                    branch_enabled: payload.branch_enabled === true,
-                                    branch_name: normalizeOptionalString(payload.branch_name),
-                                    status: normalizeConversationStatus(payload.status),
-                                    profile_id: normalizeOptionalString(payload.profile_id),
-                                    metadata: payload.metadata || {},
-                                    last_message_at: undefined,
-                                    last_message_id: undefined,
-                                    createdAt: now,
-                                    updatedAt: now
-                                };
-                                return [4 /*yield*/, ai_terminal_conversation_collection_1.AiTerminalConversations.insertOne(doc)];
+                                _a = {};
+                                return [4 /*yield*/, resolveClientIdFromConfig(payload.id_client, this === null || this === void 0 ? void 0 : this.id_user)];
                             case 1:
-                                result = _a.sent();
+                                doc = (_a.id_client = _b.sent(),
+                                    _a.id_app = normalizeOptionalString(payload.id_app),
+                                    _a.title = normalizeOptionalString(payload.title) || 'New Conversation',
+                                    _a.mode = normalizeConversationMode(payload.mode),
+                                    _a.branch_enabled = payload.branch_enabled === true,
+                                    _a.branch_name = normalizeOptionalString(payload.branch_name),
+                                    _a.status = normalizeConversationStatus(payload.status),
+                                    _a.profile_id = normalizeOptionalString(payload.profile_id),
+                                    _a.metadata = payload.metadata || {},
+                                    _a.last_message_at = undefined,
+                                    _a.last_message_id = undefined,
+                                    _a.createdAt = now,
+                                    _a.updatedAt = now,
+                                    _a);
+                                return [4 /*yield*/, ai_terminal_conversation_collection_1.AiTerminalConversations.insertOne(doc)];
+                            case 2:
+                                result = _b.sent();
                                 return [2 /*return*/, { id_conversation: result._id }];
                         }
                     });
@@ -1116,7 +1121,7 @@ function executeAiTerminalRun(payload, context) {
                     if (!guardrailsEnabled) return [3 /*break*/, 6];
                     guardrail = evaluateGuardrails(message);
                     if (!(guardrail === null || guardrail === void 0 ? void 0 : guardrail.blocked)) return [3 /*break*/, 6];
-                    return [4 /*yield*/, ensureConversation(input, 'openai')];
+                    return [4 /*yield*/, ensureConversation(input, 'openai', context === null || context === void 0 ? void 0 : context.id_user)];
                 case 2:
                     conversation_1 = _b.sent();
                     now_1 = new Date();
@@ -1150,7 +1155,7 @@ function executeAiTerminalRun(payload, context) {
                             message: assistantMsg,
                             guardrails: { blocked: true, reason: guardrail.reason }
                         }];
-                case 6: return [4 /*yield*/, ensureConversation(input, 'openai')];
+                case 6: return [4 /*yield*/, ensureConversation(input, 'openai', context === null || context === void 0 ? void 0 : context.id_user)];
                 case 7:
                     conversation = _b.sent();
                     now = new Date();
@@ -1193,8 +1198,10 @@ function executeAiTerminalRun(payload, context) {
                 case 12:
                     response = _b.sent();
                     usage = response.usage || estimateUsage(messages, response.content, openaiSettings.model);
-                    idClient = resolveClientId(conversation, input.id_client);
-                    if (!idClient) return [3 /*break*/, 14];
+                    return [4 /*yield*/, resolveClientId(conversation, input.id_client, context === null || context === void 0 ? void 0 : context.id_user)];
+                case 13:
+                    idClient = _b.sent();
+                    if (!idClient) return [3 /*break*/, 15];
                     return [4 /*yield*/, (0, openai_usage_ledger_manager_1.recordOpenAIUsage)({
                             id_client: idClient,
                             model: response.model || openaiSettings.model || 'unknown',
@@ -1204,10 +1211,10 @@ function executeAiTerminalRun(payload, context) {
                             category: 'ai-terminal',
                             id_conversation: conversation._id
                         })];
-                case 13:
-                    _b.sent();
-                    _b.label = 14;
                 case 14:
+                    _b.sent();
+                    _b.label = 15;
+                case 15:
                     userDoc = {
                         id_conversation: conversation._id,
                         role: 'user',
@@ -1232,20 +1239,20 @@ function executeAiTerminalRun(payload, context) {
                         updatedAt: now
                     };
                     return [4 /*yield*/, ai_terminal_message_collection_1.AiTerminalMessages.insertOne(userDoc)];
-                case 15:
+                case 16:
                     _b.sent();
                     return [4 /*yield*/, ai_terminal_message_collection_1.AiTerminalMessages.insertOne(assistantDoc)];
-                case 16:
+                case 17:
                     insertResult = _b.sent();
                     return [4 /*yield*/, touchConversation(conversation._id, now, insertResult._id)];
-                case 17:
+                case 18:
                     _b.sent();
-                    if (!(input.delete_files_after_run !== false)) return [3 /*break*/, 19];
+                    if (!(input.delete_files_after_run !== false)) return [3 /*break*/, 20];
                     return [4 /*yield*/, cleanupAttachments(attachmentData.attachments)];
-                case 18:
+                case 19:
                     _b.sent();
-                    _b.label = 19;
-                case 19: return [2 /*return*/, {
+                    _b.label = 20;
+                case 20: return [2 /*return*/, {
                         conversation: conversation,
                         message: assistantDoc,
                         usage: assistantDoc.usage
@@ -1289,8 +1296,10 @@ function executeAiFormPatch(payload, context) {
                 case 1:
                     response = _b.sent();
                     usage = response.usage || estimateUsage(messages, response.content, response.model || openaiSettings.model);
-                    idClient = resolveClientIdFromConfig(input.id_client);
-                    if (!idClient) return [3 /*break*/, 3];
+                    return [4 /*yield*/, resolveClientIdFromConfig(input.id_client, context === null || context === void 0 ? void 0 : context.id_user)];
+                case 2:
+                    idClient = _b.sent();
+                    if (!idClient) return [3 /*break*/, 4];
                     return [4 /*yield*/, (0, openai_usage_ledger_manager_1.recordOpenAIUsage)({
                             id_client: idClient,
                             model: response.model || openaiSettings.model || 'unknown',
@@ -1299,10 +1308,10 @@ function executeAiFormPatch(payload, context) {
                             total_tokens: usage.totalTokens,
                             category: 'ai-form'
                         })];
-                case 2:
-                    _b.sent();
-                    _b.label = 3;
                 case 3:
+                    _b.sent();
+                    _b.label = 4;
+                case 4:
                     parsed = parseJsonObject(response.content);
                     if (!parsed || typeof parsed !== 'object') {
                         throw new Error('AI form patch response was not valid JSON.');
@@ -1343,7 +1352,7 @@ function executeAiAssistantCodexRun(payload, context) {
                     codexFallbackModels = resolveCodexFallbackModels(input.config, codexModel);
                     guardrail = evaluateAssistantGuardrails(message);
                     if (!(guardrail === null || guardrail === void 0 ? void 0 : guardrail.blocked)) return [3 /*break*/, 5];
-                    return [4 /*yield*/, ensureConversation(input, 'codex')];
+                    return [4 /*yield*/, ensureConversation(input, 'codex', context === null || context === void 0 ? void 0 : context.id_user)];
                 case 1:
                     conversation_2 = _d.sent();
                     now_2 = new Date();
@@ -1383,7 +1392,7 @@ function executeAiAssistantCodexRun(payload, context) {
                     isSuperAdmin = !!((_b = user === null || user === void 0 ? void 0 : user.roles) === null || _b === void 0 ? void 0 : _b.super_admin);
                     hasInvoiceAccess = userHasInvoiceAccess(user);
                     customerId = normalizeOptionalString((_c = user === null || user === void 0 ? void 0 : user.other) === null || _c === void 0 ? void 0 : _c.id_customer);
-                    return [4 /*yield*/, ensureConversation(input, 'codex')];
+                    return [4 /*yield*/, ensureConversation(input, 'codex', context === null || context === void 0 ? void 0 : context.id_user)];
                 case 7:
                     conversation = _d.sent();
                     if (aiWorkerDebug) {
@@ -1449,10 +1458,10 @@ function executeAiAssistantCodexRun(payload, context) {
                     insertResult = _d.sent();
                     assistantMessageId = (insertResult === null || insertResult === void 0 ? void 0 : insertResult._id) || (insertResult === null || insertResult === void 0 ? void 0 : insertResult.insertedId);
                     enqueueAssistantCodexRun(function () { return __awaiter(_this, void 0, void 0, function () {
-                        var runStart, steps, recordStep, progressTracker, streamProgress, assistantContent, toolResult, assistantDebug, directiveSource, dataQuestion, lastDirective, toolResponseDebug, toolError, termHints, collectionHints, fieldHints, collectionTokenization, collectionRanking, collectionSelection, collectionOverride, collectionNames, plannerEnabled, plannerOutput, plannerRaw, timingBreakdown, contextRoute, contextMode, hintSeed, termExpansion, hintText, baseTokens, expandedTokens, baseWeights, expandedWeights, dbName, db, _a, routeHints, rankedCollections, hintCollections, assistantContext, prompt_1, workspaceRoot, codexConfig, runOptions, plannerPrompt, plannerStart, _b, intentType, shouldFetch, responseText, directiveText, directive, directivePrompt, directiveStart, forcedDirective, _c, initialStart, directivePrompt, forcedStart, forcedDirective, _d, requestedCollection, cleanedResponseText, effectiveDirective, toolRequest, toolStart, toolResponse, _e, toolPayload, followupPrompt, followupStart, followupText, _f, error_2, error_3, finishedAt, finalNow, finishedAt, codexMs, draftingMs, finalMetadata, finalAssistantDoc;
-                        var _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w;
-                        return __generator(this, function (_x) {
-                            switch (_x.label) {
+                        var runStart, steps, recordStep, progressTracker, streamProgress, assistantContent, toolResult, assistantDebug, directiveSource, requestClassification, dataQuestion, lastDirective, toolResponseDebug, toolError, termHints, collectionHints, fieldHints, collectionTokenization, collectionRanking, collectionSelection, collectionOverride, collectionNames, plannerEnabled, plannerOutput, plannerRaw, timingBreakdown, codexUsage, accumulateCodexUsage, contextRoute, contextMode, hintSeed, termExpansion, hintText, baseTokens, expandedTokens, baseWeights, expandedWeights, dbName, db, _a, routeHints, rankedCollections, hintCollections, assistantContext, prompt_1, workspaceRoot, codexConfig, runOptions, plannerPrompt, plannerStart, _b, responseText, directiveText, directive, directivePrompt, directiveStart, forcedDirective, _c, initialStart, directivePrompt, forcedStart, forcedDirective, _d, requestedCollection, cleanedResponseText, effectiveDirective, toolRequest, toolStart, toolResponse, _e, toolPayload, followupPrompt, followupStart, followupText, _f, error_2, error_3, finishedAt, finalNow, finishedAt, codexMs, draftingMs, finalMetadata, finalUsage, usageClientId, usageError_1, finalAssistantDoc, setPayload;
+                        var _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
+                        return __generator(this, function (_v) {
+                            switch (_v.label) {
                                 case 0:
                                     runStart = Date.now();
                                     if (aiWorkerDebug) {
@@ -1481,7 +1490,8 @@ function executeAiAssistantCodexRun(payload, context) {
                                     toolResult = null;
                                     assistantDebug = null;
                                     directiveSource = 'none';
-                                    dataQuestion = isAssistantDataQuestion(message);
+                                    requestClassification = classifyAssistantRequestType(message);
+                                    dataQuestion = requestClassification.dataQuestion;
                                     lastDirective = null;
                                     toolResponseDebug = null;
                                     toolError = null;
@@ -1504,12 +1514,32 @@ function executeAiAssistantCodexRun(payload, context) {
                                         toolMs: 0,
                                         followupMs: 0
                                     };
+                                    codexUsage = {
+                                        input_tokens: 0,
+                                        output_tokens: 0,
+                                        total_tokens: 0
+                                    };
+                                    accumulateCodexUsage = function (promptText, completionText) {
+                                        var inputTokens = (0, tokenizer_1.countTokens)(promptText || '', codexModel);
+                                        var outputTokens = (0, tokenizer_1.countTokens)(completionText || '', codexModel);
+                                        if (!inputTokens && !outputTokens) {
+                                            return;
+                                        }
+                                        codexUsage.input_tokens += inputTokens;
+                                        codexUsage.output_tokens += outputTokens;
+                                        codexUsage.total_tokens += inputTokens + outputTokens;
+                                    };
                                     contextRoute = normalizeOptionalString((_g = input === null || input === void 0 ? void 0 : input.context) === null || _g === void 0 ? void 0 : _g.route);
                                     contextMode = normalizeOptionalString((_h = input === null || input === void 0 ? void 0 : input.context) === null || _h === void 0 ? void 0 : _h.mode);
                                     recordStep('Queued', { requestId: requestId || undefined });
-                                    _x.label = 1;
+                                    recordStep('Planning: request classification', {
+                                        type: requestClassification.type,
+                                        source: requestClassification.source,
+                                        dataQuestion: dataQuestion
+                                    });
+                                    _v.label = 1;
                                 case 1:
-                                    _x.trys.push([1, 35, 36, 37]);
+                                    _v.trys.push([1, 34, 35, 36]);
                                     hintSeed = [message, contextRoute].filter(Boolean).join(' ');
                                     termExpansion = expandAssistantTermSynonyms(hintSeed);
                                     hintText = termExpansion.expanded || hintSeed;
@@ -1530,19 +1560,19 @@ function executeAiAssistantCodexRun(payload, context) {
                                     recordStep('Planning: term expansion', {
                                         termMatches: termExpansion.matches.length ? termExpansion.matches : undefined
                                     });
-                                    _x.label = 2;
+                                    _v.label = 2;
                                 case 2:
-                                    _x.trys.push([2, 4, , 5]);
+                                    _v.trys.push([2, 4, , 5]);
                                     dbName = resolveAssistantDatabaseName(undefined, input.mongo);
                                     db = resolveio_server_app_1.ResolveIOServer.getMongoConnection().db(dbName);
                                     return [4 /*yield*/, listAssistantCollections(db, dbName)];
                                 case 3:
-                                    collectionNames = _x.sent();
+                                    collectionNames = _v.sent();
                                     collectionHints = resolveCollectionHintsFromTokens(expandedTokens, collectionNames, 5);
                                     collectionRanking = buildCollectionRankingDebugFromTokens(expandedTokens, collectionNames, 8);
                                     return [3 /*break*/, 5];
                                 case 4:
-                                    _a = _x.sent();
+                                    _a = _v.sent();
                                     collectionHints = [];
                                     collectionRanking = collectionRanking || ((collectionTokenization === null || collectionTokenization === void 0 ? void 0 : collectionTokenization.expandedTokens)
                                         ? buildCollectionRankingDebugFromTokens(collectionTokenization.expandedTokens || [], [], 0)
@@ -1578,7 +1608,7 @@ function executeAiAssistantCodexRun(payload, context) {
                                     prompt_1 = buildAssistantCodexPrompt(message, attachmentData.promptText, historyLines.join('\n'), assistantContext);
                                     return [4 /*yield*/, resolveAssistantWorkspaceRoot()];
                                 case 6:
-                                    workspaceRoot = _x.sent();
+                                    workspaceRoot = _v.sent();
                                     codexConfig = resolveCodexSettings({
                                         model: codexModel,
                                         fallbackModels: codexFallbackModels
@@ -1601,7 +1631,7 @@ function executeAiAssistantCodexRun(payload, context) {
                                             approvalPolicy: 'never'
                                         }
                                     };
-                                    if (!plannerEnabled) return [3 /*break*/, 11];
+                                    if (!plannerEnabled) return [3 /*break*/, 10];
                                     recordStep('Planning: planner prompt');
                                     plannerPrompt = buildAssistantPlannerPrompt({
                                         message: message,
@@ -1613,120 +1643,123 @@ function executeAiAssistantCodexRun(payload, context) {
                                         fieldHints: fieldHints,
                                         inputClientId: input.id_client
                                     });
-                                    _x.label = 7;
+                                    _v.label = 7;
                                 case 7:
-                                    _x.trys.push([7, 9, , 10]);
+                                    _v.trys.push([7, 9, , 10]);
                                     plannerStart = Date.now();
                                     return [4 /*yield*/, runCodexInWorkerThread(plannerPrompt, runOptions, codexConfig, streamProgress)];
                                 case 8:
-                                    plannerRaw = _x.sent();
+                                    plannerRaw = _v.sent();
+                                    accumulateCodexUsage(plannerPrompt, plannerRaw);
                                     timingBreakdown.plannerMs = Date.now() - plannerStart;
                                     plannerOutput = parseJsonObject(plannerRaw);
                                     recordStep('Planning: planner result', { parsed: !!plannerOutput });
                                     return [3 /*break*/, 10];
                                 case 9:
-                                    _b = _x.sent();
+                                    _b = _v.sent();
                                     recordStep('Planning: planner result', { parsed: false });
                                     return [3 /*break*/, 10];
                                 case 10:
-                                    if (plannerOutput) {
-                                        intentType = normalizeOptionalString((_j = plannerOutput === null || plannerOutput === void 0 ? void 0 : plannerOutput.intent) === null || _j === void 0 ? void 0 : _j.type).toLowerCase();
-                                        shouldFetch = ((_k = plannerOutput === null || plannerOutput === void 0 ? void 0 : plannerOutput.dataPlan) === null || _k === void 0 ? void 0 : _k.shouldFetchData) === true;
-                                        if (shouldFetch || intentType === 'data' || intentType === 'mixed') {
-                                            dataQuestion = true;
-                                        }
-                                    }
-                                    _x.label = 11;
-                                case 11:
+                                    requestClassification = classifyAssistantRequestType(message, plannerOutput || undefined);
+                                    dataQuestion = requestClassification.dataQuestion;
+                                    recordStep('Planning: request classification', {
+                                        type: requestClassification.type,
+                                        source: requestClassification.source,
+                                        plannerIntentType: requestClassification.plannerIntentType || undefined,
+                                        dataQuestion: dataQuestion
+                                    });
                                     responseText = '';
                                     directiveText = '';
                                     directive = null;
-                                    if (!dataQuestion) return [3 /*break*/, 15];
+                                    if (!dataQuestion) return [3 /*break*/, 14];
                                     recordStep('Directive: determine tool', { type: 'data-question' });
                                     directivePrompt = buildAssistantCodexDirectivePrompt(message, attachmentData.promptText, historyLines.join('\n'), assistantContext);
-                                    _x.label = 12;
-                                case 12:
-                                    _x.trys.push([12, 14, , 15]);
+                                    _v.label = 11;
+                                case 11:
+                                    _v.trys.push([11, 13, , 14]);
                                     directiveStart = Date.now();
                                     return [4 /*yield*/, runCodexInWorkerThread(directivePrompt, runOptions, codexConfig, streamProgress)];
-                                case 13:
-                                    directiveText = _x.sent();
+                                case 12:
+                                    directiveText = _v.sent();
+                                    accumulateCodexUsage(directivePrompt, directiveText);
                                     timingBreakdown.directiveMs = Date.now() - directiveStart;
                                     forcedDirective = extractAssistantMongoDirective(directiveText);
                                     if (forcedDirective) {
                                         directive = forcedDirective;
                                         directiveSource = 'model';
                                         lastDirective = forcedDirective;
-                                        collectionSelection = buildCollectionSelectionDetail((collectionTokenization === null || collectionTokenization === void 0 ? void 0 : collectionTokenization.expandedTokens) || [], normalizeOptionalString((_l = directive.payload) === null || _l === void 0 ? void 0 : _l.collection) || '');
+                                        collectionSelection = buildCollectionSelectionDetail((collectionTokenization === null || collectionTokenization === void 0 ? void 0 : collectionTokenization.expandedTokens) || [], normalizeOptionalString((_j = directive.payload) === null || _j === void 0 ? void 0 : _j.collection) || '');
                                         recordStep('Directive resolved', {
                                             source: directiveSource,
                                             type: directive.type,
-                                            collection: normalizeOptionalString((_m = directive.payload) === null || _m === void 0 ? void 0 : _m.collection) || undefined,
-                                            permissionView: normalizeOptionalString((_o = directive.payload) === null || _o === void 0 ? void 0 : _o.permissionView) || undefined
+                                            collection: normalizeOptionalString((_k = directive.payload) === null || _k === void 0 ? void 0 : _k.collection) || undefined,
+                                            permissionView: normalizeOptionalString((_l = directive.payload) === null || _l === void 0 ? void 0 : _l.permissionView) || undefined
                                         });
                                     }
-                                    return [3 /*break*/, 15];
+                                    return [3 /*break*/, 14];
+                                case 13:
+                                    _c = _v.sent();
+                                    return [3 /*break*/, 14];
                                 case 14:
-                                    _c = _x.sent();
-                                    return [3 /*break*/, 15];
-                                case 15:
-                                    if (!!directive) return [3 /*break*/, 17];
+                                    if (!!directive) return [3 /*break*/, 16];
                                     recordStep('Response: draft initial answer', { mode: 'full' });
                                     initialStart = Date.now();
                                     return [4 /*yield*/, runCodexInWorkerThread(prompt_1, runOptions, codexConfig, streamProgress)];
-                                case 16:
-                                    responseText = _x.sent();
+                                case 15:
+                                    responseText = _v.sent();
+                                    accumulateCodexUsage(prompt_1, responseText);
                                     timingBreakdown.initialResponseMs = Date.now() - initialStart;
                                     directive = extractAssistantMongoDirective(responseText);
                                     if (directive) {
                                         directiveSource = 'model';
                                         lastDirective = directive;
-                                        collectionSelection = buildCollectionSelectionDetail((collectionTokenization === null || collectionTokenization === void 0 ? void 0 : collectionTokenization.expandedTokens) || [], normalizeOptionalString((_p = directive.payload) === null || _p === void 0 ? void 0 : _p.collection) || '');
+                                        collectionSelection = buildCollectionSelectionDetail((collectionTokenization === null || collectionTokenization === void 0 ? void 0 : collectionTokenization.expandedTokens) || [], normalizeOptionalString((_m = directive.payload) === null || _m === void 0 ? void 0 : _m.collection) || '');
                                         recordStep('Directive resolved', {
                                             source: directiveSource,
                                             type: directive.type,
-                                            collection: normalizeOptionalString((_q = directive.payload) === null || _q === void 0 ? void 0 : _q.collection) || undefined,
-                                            permissionView: normalizeOptionalString((_r = directive.payload) === null || _r === void 0 ? void 0 : _r.permissionView) || undefined
+                                            collection: normalizeOptionalString((_o = directive.payload) === null || _o === void 0 ? void 0 : _o.collection) || undefined,
+                                            permissionView: normalizeOptionalString((_p = directive.payload) === null || _p === void 0 ? void 0 : _p.permissionView) || undefined
                                         });
                                     }
-                                    _x.label = 17;
-                                case 17:
-                                    if (!(!directive && dataQuestion)) return [3 /*break*/, 21];
+                                    _v.label = 16;
+                                case 16:
+                                    if (!(!directive && dataQuestion)) return [3 /*break*/, 20];
                                     recordStep('Directive: forced retry', { mode: 'directive-only' });
                                     directivePrompt = buildAssistantCodexDirectivePrompt(message, attachmentData.promptText, historyLines.join('\n'), assistantContext);
-                                    _x.label = 18;
-                                case 18:
-                                    _x.trys.push([18, 20, , 21]);
+                                    _v.label = 17;
+                                case 17:
+                                    _v.trys.push([17, 19, , 20]);
                                     forcedStart = Date.now();
                                     return [4 /*yield*/, runCodexInWorkerThread(directivePrompt, runOptions, codexConfig, streamProgress)];
-                                case 19:
-                                    directiveText = _x.sent();
+                                case 18:
+                                    directiveText = _v.sent();
+                                    accumulateCodexUsage(directivePrompt, directiveText);
                                     timingBreakdown.forcedDirectiveMs = Date.now() - forcedStart;
                                     forcedDirective = extractAssistantMongoDirective(directiveText);
                                     if (forcedDirective) {
                                         directive = forcedDirective;
                                         directiveSource = 'forced';
                                         lastDirective = forcedDirective;
-                                        collectionSelection = buildCollectionSelectionDetail((collectionTokenization === null || collectionTokenization === void 0 ? void 0 : collectionTokenization.expandedTokens) || [], normalizeOptionalString((_s = directive.payload) === null || _s === void 0 ? void 0 : _s.collection) || '');
+                                        collectionSelection = buildCollectionSelectionDetail((collectionTokenization === null || collectionTokenization === void 0 ? void 0 : collectionTokenization.expandedTokens) || [], normalizeOptionalString((_q = directive.payload) === null || _q === void 0 ? void 0 : _q.collection) || '');
                                         recordStep('Directive resolved', {
                                             source: directiveSource,
                                             type: directive.type,
-                                            collection: normalizeOptionalString((_t = directive.payload) === null || _t === void 0 ? void 0 : _t.collection) || undefined,
-                                            permissionView: normalizeOptionalString((_u = directive.payload) === null || _u === void 0 ? void 0 : _u.permissionView) || undefined
+                                            collection: normalizeOptionalString((_r = directive.payload) === null || _r === void 0 ? void 0 : _r.collection) || undefined,
+                                            permissionView: normalizeOptionalString((_s = directive.payload) === null || _s === void 0 ? void 0 : _s.permissionView) || undefined
                                         });
                                     }
-                                    return [3 /*break*/, 21];
+                                    return [3 /*break*/, 20];
+                                case 19:
+                                    _d = _v.sent();
+                                    return [3 /*break*/, 20];
                                 case 20:
-                                    _d = _x.sent();
-                                    return [3 /*break*/, 21];
-                                case 21:
                                     if (directive) {
-                                        requestedCollection = normalizeOptionalString((_v = directive.payload) === null || _v === void 0 ? void 0 : _v.collection);
+                                        requestedCollection = normalizeOptionalString((_t = directive.payload) === null || _t === void 0 ? void 0 : _t.collection);
                                         collectionOverride = resolveCollectionOverrideWithContext({
                                             message: message,
                                             collectionRanking: collectionRanking,
                                             requestedCollection: requestedCollection,
-                                            permissionView: normalizeOptionalString((_w = directive.payload) === null || _w === void 0 ? void 0 : _w.permissionView) || contextRoute,
+                                            permissionView: normalizeOptionalString((_u = directive.payload) === null || _u === void 0 ? void 0 : _u.permissionView) || contextRoute,
                                             collectionNames: collectionNames
                                         });
                                         if (collectionOverride) {
@@ -1742,7 +1775,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*/, 33];
+                                    if (!((directive === null || directive === void 0 ? void 0 : directive.payload) && AI_ASSISTANT_TOOL_MAX_STEPS > 0)) return [3 /*break*/, 32];
                                     effectiveDirective = collectionOverride
                                         ? __assign(__assign({}, directive), { payload: __assign(__assign({}, (directive.payload || {})), { collection: collectionOverride.to }) }) : directive;
                                     toolRequest = buildAssistantToolRequest(effectiveDirective, input);
@@ -1752,20 +1785,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
                                     });
-                                    _x.label = 22;
-                                case 22:
-                                    _x.trys.push([22, 31, , 32]);
+                                    _v.label = 21;
+                                case 21:
+                                    _v.trys.push([21, 30, , 31]);
                                     toolStart = Date.now();
-                                    if (!(effectiveDirective.type === 'aggregate')) return [3 /*break*/, 24];
+                                    if (!(effectiveDirective.type === 'aggregate')) return [3 /*break*/, 23];
                                     return [4 /*yield*/, executeAiAssistantReportBuilderAggregate(toolRequest, context)];
-                                case 23:
-                                    _e = _x.sent();
-                                    return [3 /*break*/, 26];
-                                case 24: return [4 /*yield*/, executeAiAssistantReportBuilderRead(toolRequest, context)];
+                                case 22:
+                                    _e = _v.sent();
+                                    return [3 /*break*/, 25];
+                                case 23: return [4 /*yield*/, executeAiAssistantReportBuilderRead(toolRequest, context)];
+                                case 24:
+                                    _e = _v.sent();
+                                    _v.label = 25;
                                 case 25:
-                                    _e = _x.sent();
-                                    _x.label = 26;
-                                case 26:
                                     toolResponse = _e;
                                     timingBreakdown.toolMs = Date.now() - toolStart;
                                     toolResponseDebug = (toolResponse === null || toolResponse === void 0 ? void 0 : toolResponse.debug) && typeof toolResponse.debug === 'object'
@@ -1781,42 +1814,43 @@ function executeAiAssistantCodexRun(payload, context) {
                                     progressTracker.push('Drafting response');
                                     recordStep('Drafting response');
                                     followupPrompt = buildAssistantCodexToolFollowupPrompt(message, attachmentData.promptText, historyLines.join('\n'), assistantContext, toolPayload.prompt);
-                                    _x.label = 27;
-                                case 27:
-                                    _x.trys.push([27, 29, , 30]);
+                                    _v.label = 26;
+                                case 26:
+                                    _v.trys.push([26, 28, , 29]);
                                     followupStart = Date.now();
                                     return [4 /*yield*/, runCodexInWorkerThread(followupPrompt, runOptions, codexConfig, streamProgress)];
-                                case 28:
-                                    followupText = _x.sent();
+                                case 27:
+                                    followupText = _v.sent();
+                                    accumulateCodexUsage(followupPrompt, followupText);
                                     timingBreakdown.followupMs = Date.now() - followupStart;
                                     assistantContent = sanitizeAssistantResponse(followupText);
                                     assistantContent = applyAssistantDisplayTableToResponse(assistantContent, toolPayload.result.output.display);
-                                    return [3 /*break*/, 30];
-                                case 29:
-                                    _f = _x.sent();
+                                    return [3 /*break*/, 29];
+                                case 28:
+                                    _f = _v.sent();
                                     assistantContent = buildAssistantToolFallbackResponse(toolPayload.result);
-                                    return [3 /*break*/, 30];
-                                case 30: return [3 /*break*/, 32];
-                                case 31:
-                                    error_2 = _x.sent();
-                                    assistantContent = buildAssistantToolErrorMessage(error_2, directive, toolRequest);
+                                    return [3 /*break*/, 29];
+                                case 29: return [3 /*break*/, 31];
+                                case 30:
+                                    error_2 = _v.sent();
+                                    assistantContent = buildAssistantToolErrorMessage(error_2);
                                     toolError = error_2;
-                                    return [3 /*break*/, 32];
-                                case 32: return [3 /*break*/, 34];
-                                case 33:
+                                    return [3 /*break*/, 31];
+                                case 31: return [3 /*break*/, 33];
+                                case 32:
                                     progressTracker.push('Drafting response');
                                     recordStep('Drafting response');
-                                    _x.label = 34;
-                                case 34: return [3 /*break*/, 37];
-                                case 35:
-                                    error_3 = _x.sent();
+                                    _v.label = 33;
+                                case 33: return [3 /*break*/, 36];
+                                case 34:
+                                    error_3 = _v.sent();
                                     assistantContent = buildAssistantCodexErrorMessage(error_3);
                                     recordStep('Error', { message: normalizeOptionalString(error_3 === null || error_3 === void 0 ? void 0 : error_3.message) || 'Unknown error' });
-                                    return [3 /*break*/, 37];
-                                case 36:
+                                    return [3 /*break*/, 36];
+                                case 35:
                                     progressTracker.stop();
                                     return [7 /*endfinally*/];
-                                case 37:
+                                case 36:
                                     if (!assistantContent) {
                                         assistantContent = buildAssistantCodexErrorMessage(null);
                                     }
@@ -1848,6 +1882,9 @@ function executeAiAssistantCodexRun(payload, context) {
                                             + timingBreakdown.followupMs;
                                         draftingMs = timingBreakdown.followupMs || timingBreakdown.initialResponseMs;
                                         assistantDebug = buildAssistantDebugPayload({
+                                            requestType: requestClassification.type,
+                                            requestTypeSource: requestClassification.source,
+                                            plannerIntentType: requestClassification.plannerIntentType,
                                             dataQuestion: dataQuestion,
                                             directive: lastDirective,
                                             directiveSource: directiveSource,
@@ -1893,27 +1930,63 @@ function executeAiAssistantCodexRun(payload, context) {
                                         });
                                     }
                                     finalMetadata = __assign(__assign(__assign(__assign({ model: codexModel }, (codexFallbackModels.length ? { model_fallbacks: codexFallbackModels } : {})), (requestId ? { request_id: requestId } : {})), (toolResult ? { tool_result: toolResult } : {})), (assistantDebug ? { debug: assistantDebug } : {}));
-                                    finalAssistantDoc = __assign(__assign({}, assistantDoc), { _id: assistantMessageId, content: assistantContent, metadata: finalMetadata, updatedAt: finalNow });
-                                    if (!assistantMessageId) return [3 /*break*/, 39];
-                                    return [4 /*yield*/, ai_terminal_message_collection_1.AiTerminalMessages.updateOne({ _id: assistantMessageId }, {
-                                            $set: {
-                                                content: assistantContent,
-                                                metadata: finalMetadata,
-                                                updatedAt: finalNow
-                                            }
-                                        })];
+                                    finalUsage = codexUsage.total_tokens > 0 ? {
+                                        model: codexModel || 'unknown',
+                                        input_tokens: codexUsage.input_tokens,
+                                        output_tokens: codexUsage.output_tokens,
+                                        total_tokens: codexUsage.total_tokens
+                                    } : null;
+                                    if (!finalUsage) return [3 /*break*/, 41];
+                                    return [4 /*yield*/, resolveClientId(conversation, input.id_client, context === null || context === void 0 ? void 0 : context.id_user)];
+                                case 37:
+                                    usageClientId = _v.sent();
+                                    if (!usageClientId) return [3 /*break*/, 41];
+                                    _v.label = 38;
                                 case 38:
-                                    _x.sent();
-                                    _x.label = 39;
-                                case 39: return [4 /*yield*/, touchConversation(conversation._id, finalNow, assistantMessageId ? String(assistantMessageId) : undefined)];
+                                    _v.trys.push([38, 40, , 41]);
+                                    return [4 /*yield*/, (0, openai_usage_ledger_manager_1.recordOpenAIUsage)({
+                                            id_client: usageClientId,
+                                            model: finalUsage.model,
+                                            input_tokens: finalUsage.input_tokens,
+                                            output_tokens: finalUsage.output_tokens,
+                                            total_tokens: finalUsage.total_tokens,
+                                            category: 'ai-terminal-codex',
+                                            id_request: requestId || undefined,
+                                            id_conversation: conversation._id
+                                        })];
+                                case 39:
+                                    _v.sent();
+                                    return [3 /*break*/, 41];
                                 case 40:
-                                    _x.sent();
-                                    if (!(input.delete_files_after_run !== false)) return [3 /*break*/, 42];
-                                    return [4 /*yield*/, cleanupAttachments(attachmentData.attachments)];
+                                    usageError_1 = _v.sent();
+                                    console.error(new Date(), 'Failed to record codex usage', usageError_1);
+                                    return [3 /*break*/, 41];
                                 case 41:
-                                    _x.sent();
-                                    _x.label = 42;
-                                case 42: return [2 /*return*/, finalAssistantDoc];
+                                    finalAssistantDoc = __assign(__assign(__assign(__assign({}, assistantDoc), { _id: assistantMessageId, content: assistantContent, metadata: finalMetadata }), (finalUsage ? { usage: finalUsage } : {})), { updatedAt: finalNow });
+                                    if (!assistantMessageId) return [3 /*break*/, 43];
+                                    setPayload = {
+                                        content: assistantContent,
+                                        metadata: finalMetadata,
+                                        updatedAt: finalNow
+                                    };
+                                    if (finalUsage) {
+                                        setPayload.usage = finalUsage;
+                                    }
+                                    return [4 /*yield*/, ai_terminal_message_collection_1.AiTerminalMessages.updateOne({ _id: assistantMessageId }, {
+                                            $set: setPayload
+                                        })];
+                                case 42:
+                                    _v.sent();
+                                    _v.label = 43;
+                                case 43: return [4 /*yield*/, touchConversation(conversation._id, finalNow, assistantMessageId ? String(assistantMessageId) : undefined)];
+                                case 44:
+                                    _v.sent();
+                                    if (!(input.delete_files_after_run !== false)) return [3 /*break*/, 46];
+                                    return [4 /*yield*/, cleanupAttachments(attachmentData.attachments)];
+                                case 45:
+                                    _v.sent();
+                                    _v.label = 46;
+                                case 46: return [2 /*return*/, finalAssistantDoc];
                             }
                         });
                     }); });
@@ -2422,7 +2495,8 @@ function executeAiAssistantMongoRead(payload, context) {
 }
 function executeAiAssistantMongoAggregate(payload, context) {
     return __awaiter(this, void 0, void 0, function () {
-        var input, rawCollection, dbName, db, collectionResolution, collection, bridgeCollection, schemaFields, _a, user, isSuperAdmin, customerId, fallbackMeta, baseQuery, stripped, userId, normalizedClient, shouldScopeByClient, _b, clientScopedQuery, scopedQuery, normalizedPipeline, sanitizedPipeline, strippedPipeline, pipelineWithScope, normalizedOptions, limitedPipeline, dateField, aggregateOptions, documents, executedPipeline, probeDocs, fallback, fallbackPipeline, fallbackDocs, createdFallback, createdPipeline, createdDocs, expanded, expandedDocs, completionFallback, fallbackPipeline, fallbackDocs, completionExprFallback, fallbackPipeline, fallbackDocs, unwindFallback, shouldUnwind, _c, _d, fallbackPipeline, fallbackDocs, nameFallback, fallbackPipeline, fallbackDocs, _e, _loop_1, i, state_1, matchFields_1, _f, aliases, rewrittenPipeline, fallbackDocs, _loop_2, i, state_2, baseCollection, fallbackPayload, fallbackResult, existingFallbacks, matchStages, diagnostics, combinedMatch, nameFields, dateFields, queryNoName, _g, queryNoDate, _h, _j, _k, _l, allCollections, base, alt, altCount, _m, verification, sanitizedDocuments, includeIds, displayDocs, idLookupDisplay, display;
+        var input, rawCollection, dbName, db, collectionResolution, collection, bridgeCollection, schemaFields, _a, user, isSuperAdmin, customerId, fallbackMeta, baseQuery, stripped, userId, normalizedClient, shouldScopeByClient, _b, clientScopedQuery, scopedQuery, normalizedPipeline, sanitizedPipeline, strippedPipeline, pipelineWithScope, normalizedOptions, limitedPipeline, executedPipeline, dateField, aggregateOptions, runAggregateWithRepair, initialAggregate, documents, probeDocs, fallback, fallbackPipeline, fallbackAggregate, fallbackDocs, createdFallback, createdPipeline, createdAggregate, createdDocs, expanded, expandedAggregate, expandedDocs, completionFallback, fallbackPipeline, fallbackAggregate, fallbackDocs, completionExprFallback, fallbackPipeline, fallbackAggregate, fallbackDocs, unwindFallback, shouldUnwind, _c, _d, fallbackPipeline, fallbackAggregate, fallbackDocs, nameFallback, fallbackPipeline, fallbackAggregate, fallbackDocs, _e, _loop_1, i, state_1, matchFields_1, _f, aliases, rewrittenPipeline, fallbackAggregate, fallbackDocs, _loop_2, i, state_2, baseCollection, fallbackPayload, fallbackResult, existingFallbacks, matchStages, diagnostics, combinedMatch, nameFields, dateFields, queryNoName, _g, queryNoDate, _h, _j, _k, _l, allCollections, base, alt, altCount, _m, verification, sanitizedDocuments, includeIds, displayDocs, idLookupDisplay, display;
+        var _this = this;
         var _o, _p;
         return __generator(this, function (_q) {
             switch (_q.label) {
@@ -2506,49 +2580,85 @@ function executeAiAssistantMongoAggregate(payload, context) {
                     pipelineWithScope = buildAssistantAggregatePipeline(scopedQuery, sanitizedPipeline);
                     normalizedOptions = normalizeAssistantAggregateOptions(input.options);
                     limitedPipeline = applyAssistantAggregateLimit(pipelineWithScope, normalizedOptions.limit, normalizedOptions.maxLimit, normalizedOptions.defaultLimit);
-                    dateField = findAggregateDateField(limitedPipeline);
-                    if (containsForbiddenMongoOperators(limitedPipeline)) {
+                    executedPipeline = limitedPipeline;
+                    dateField = findAggregateDateField(executedPipeline);
+                    if (containsForbiddenMongoOperators(executedPipeline)) {
                         throw new Error('AI assistant report builder bridge: Pipeline contains restricted operators.');
                     }
                     aggregateOptions = __assign(__assign({}, normalizedOptions.aggregateOptions), { readPreference: AI_ASSISTANT_READ_PREFERENCE });
-                    return [4 /*yield*/, db.collection(collection)
-                            .aggregate(limitedPipeline, aggregateOptions)
-                            .toArray()];
+                    runAggregateWithRepair = function (pipeline, stage) { return __awaiter(_this, void 0, void 0, function () {
+                        var docs, error_4, repaired, docs;
+                        return __generator(this, function (_a) {
+                            switch (_a.label) {
+                                case 0:
+                                    _a.trys.push([0, 2, , 4]);
+                                    return [4 /*yield*/, db.collection(collection)
+                                            .aggregate(pipeline, aggregateOptions)
+                                            .toArray()];
+                                case 1:
+                                    docs = _a.sent();
+                                    return [2 /*return*/, { documents: docs, pipeline: pipeline }];
+                                case 2:
+                                    error_4 = _a.sent();
+                                    if (!isAssistantDateArithmeticArgumentError(error_4)) {
+                                        throw error_4;
+                                    }
+                                    repaired = repairAssistantDateArithmeticInPipeline(pipeline);
+                                    if (!repaired.changed || containsForbiddenMongoOperators(repaired.pipeline)) {
+                                        throw error_4;
+                                    }
+                                    return [4 /*yield*/, db.collection(collection)
+                                            .aggregate(repaired.pipeline, aggregateOptions)
+                                            .toArray()];
+                                case 3:
+                                    docs = _a.sent();
+                                    fallbackMeta.dateArithmetic = {
+                                        attempted: true,
+                                        used: true,
+                                        stage: stage,
+                                        reason: 'normalized_date_operator_args'
+                                    };
+                                    return [2 /*return*/, { documents: docs, pipeline: repaired.pipeline }];
+                                case 4: return [2 /*return*/];
+                            }
+                        });
+                    }); };
+                    return [4 /*yield*/, runAggregateWithRepair(executedPipeline, 'initial')];
                 case 6:
-                    documents = _q.sent();
-                    executedPipeline = limitedPipeline;
+                    initialAggregate = _q.sent();
+                    documents = initialAggregate.documents;
+                    executedPipeline = initialAggregate.pipeline;
+                    dateField = findAggregateDateField(executedPipeline);
                     probeDocs = null;
                     if (!(!documents.length && dateField)) return [3 /*break*/, 10];
-                    fallback = resolveAggregateDateFieldFallback(limitedPipeline);
+                    fallback = resolveAggregateDateFieldFallback(executedPipeline);
                     if (!fallback) return [3 /*break*/, 8];
                     fallbackMeta.dateField = __assign(__assign({}, fallback), { attempted: true, used: false });
-                    fallbackPipeline = replaceAggregateDateField(limitedPipeline, fallback.from, fallback.to);
+                    fallbackPipeline = replaceAggregateDateField(executedPipeline, fallback.from, fallback.to);
                     if (!!containsForbiddenMongoOperators(fallbackPipeline)) return [3 /*break*/, 8];
-                    return [4 /*yield*/, db.collection(collection)
-                            .aggregate(fallbackPipeline, aggregateOptions)
-                            .toArray()];
+                    return [4 /*yield*/, runAggregateWithRepair(fallbackPipeline, 'date_field_fallback')];
                 case 7:
-                    fallbackDocs = _q.sent();
+                    fallbackAggregate = _q.sent();
+                    fallbackDocs = fallbackAggregate.documents;
                     if (fallbackDocs.length) {
                         documents = fallbackDocs;
-                        executedPipeline = fallbackPipeline;
+                        executedPipeline = fallbackAggregate.pipeline;
                         fallbackMeta.dateField.used = true;
                     }
                     _q.label = 8;
                 case 8:
                     if (!(!documents.length && dateField !== 'createdAt')) return [3 /*break*/, 10];
                     createdFallback = { from: dateField, to: 'createdAt', attempted: true, used: false };
-                    createdPipeline = replaceAggregateDateField(limitedPipeline, dateField, 'createdAt');
+                    createdPipeline = replaceAggregateDateField(executedPipeline, dateField, 'createdAt');
                     fallbackMeta.dateFieldCreatedAt = createdFallback;
                     if (!!containsForbiddenMongoOperators(createdPipeline)) return [3 /*break*/, 10];
-                    return [4 /*yield*/, db.collection(collection)
-                            .aggregate(createdPipeline, aggregateOptions)
-                            .toArray()];
+                    return [4 /*yield*/, runAggregateWithRepair(createdPipeline, 'date_field_created_at')];
                 case 9:
-                    createdDocs = _q.sent();
+                    createdAggregate = _q.sent();
+                    createdDocs = createdAggregate.documents;
                     if (createdDocs.length) {
                         documents = createdDocs;
-                        executedPipeline = createdPipeline;
+                        executedPipeline = createdAggregate.pipeline;
                         fallbackMeta.dateFieldCreatedAt.used = true;
                     }
                     _q.label = 10;
@@ -2562,14 +2672,13 @@ function executeAiAssistantMongoAggregate(payload, context) {
                         used: false
                     };
                     if (!!containsForbiddenMongoOperators(expanded.pipeline)) return [3 /*break*/, 12];
-                    return [4 /*yield*/, db.collection(collection)
-                            .aggregate(expanded.pipeline, aggregateOptions)
-                            .toArray()];
+                    return [4 /*yield*/, runAggregateWithRepair(expanded.pipeline, 'date_fields_expanded')];
                 case 11:
-                    expandedDocs = _q.sent();
+                    expandedAggregate = _q.sent();
+                    expandedDocs = expandedAggregate.documents;
                     if (expandedDocs.length) {
                         documents = expandedDocs;
-                        executedPipeline = expanded.pipeline;
+                        executedPipeline = expandedAggregate.pipeline;
                         fallbackMeta.dateFieldsExpanded.used = true;
                     }
                     _q.label = 12;
@@ -2587,14 +2696,13 @@ function executeAiAssistantMongoAggregate(payload, context) {
                     };
                     fallbackPipeline = buildAggregateCompletionFallbackPipeline(executedPipeline, completionFallback);
                     if (!(fallbackPipeline.length && !containsForbiddenMongoOperators(fallbackPipeline))) return [3 /*break*/, 14];
-                    return [4 /*yield*/, db.collection(collection)
-                            .aggregate(fallbackPipeline, aggregateOptions)
-                            .toArray()];
+                    return [4 /*yield*/, runAggregateWithRepair(fallbackPipeline, 'completion_add_fields')];
                 case 13:
-                    fallbackDocs = _q.sent();
+                    fallbackAggregate = _q.sent();
+                    fallbackDocs = fallbackAggregate.documents;
                     if (fallbackDocs.length) {
                         documents = fallbackDocs;
-                        executedPipeline = fallbackPipeline;
+                        executedPipeline = fallbackAggregate.pipeline;
                         fallbackMeta.completion.used = true;
                     }
                     _q.label = 14;
@@ -2612,14 +2720,13 @@ function executeAiAssistantMongoAggregate(payload, context) {
                     };
                     fallbackPipeline = buildAggregateCompletionExprFallbackPipeline(executedPipeline, completionExprFallback);
                     if (!(fallbackPipeline.length && !containsForbiddenMongoOperators(fallbackPipeline))) return [3 /*break*/, 16];
-                    return [4 /*yield*/, db.collection(collection)
-                            .aggregate(fallbackPipeline, aggregateOptions)
-                            .toArray()];
+                    return [4 /*yield*/, runAggregateWithRepair(fallbackPipeline, 'completion_expr')];
                 case 15:
-                    fallbackDocs = _q.sent();
+                    fallbackAggregate = _q.sent();
+                    fallbackDocs = fallbackAggregate.documents;
                     if (fallbackDocs.length) {
                         documents = fallbackDocs;
-                        executedPipeline = fallbackPipeline;
+                        executedPipeline = fallbackAggregate.pipeline;
                         fallbackMeta.completion.used = true;
                     }
                     _q.label = 16;
@@ -2657,14 +2764,13 @@ function executeAiAssistantMongoAggregate(payload, context) {
                     if (!shouldUnwind) return [3 /*break*/, 24];
                     fallbackPipeline = buildAggregateUnwindFallbackPipeline(executedPipeline, unwindFallback);
                     if (!!containsForbiddenMongoOperators(fallbackPipeline)) return [3 /*break*/, 23];
-                    return [4 /*yield*/, db.collection(collection)
-                            .aggregate(fallbackPipeline, aggregateOptions)
-                            .toArray()];
+                    return [4 /*yield*/, runAggregateWithRepair(fallbackPipeline, 'unwind')];
                 case 22:
-                    fallbackDocs = _q.sent();
+                    fallbackAggregate = _q.sent();
+                    fallbackDocs = fallbackAggregate.documents;
                     if (fallbackDocs.length > documents.length) {
                         documents = fallbackDocs;
-                        executedPipeline = fallbackPipeline;
+                        executedPipeline = fallbackAggregate.pipeline;
                         fallbackMeta.unwind.used = true;
                     }
                     _q.label = 23;
@@ -2684,14 +2790,13 @@ function executeAiAssistantMongoAggregate(payload, context) {
                     };
                     fallbackPipeline = buildAggregateNameMatchFallbackPipeline(executedPipeline, nameFallback);
                     if (!(fallbackPipeline.length && !containsForbiddenMongoOperators(fallbackPipeline))) return [3 /*break*/, 27];
-                    return [4 /*yield*/, db.collection(collection)
-                            .aggregate(fallbackPipeline, aggregateOptions)
-                            .toArray()];
+                    return [4 /*yield*/, runAggregateWithRepair(fallbackPipeline, 'name_match')];
                 case 26:
-                    fallbackDocs = _q.sent();
+                    fallbackAggregate = _q.sent();
+                    fallbackDocs = fallbackAggregate.documents;
                     if (fallbackDocs.length) {
                         documents = fallbackDocs;
-                        executedPipeline = fallbackPipeline;
+                        executedPipeline = fallbackAggregate.pipeline;
                         fallbackMeta.nameMatch.used = true;
                     }
                     _q.label = 27;
@@ -2713,7 +2818,7 @@ function executeAiAssistantMongoAggregate(payload, context) {
                 case 29:
                     probeDocs = _e;
                     _loop_1 = function (i) {
-                        var stage, chemicalLookup, rewrittenPipeline, fallbackDocs;
+                        var stage, chemicalLookup, rewrittenPipeline, fallbackAggregate, fallbackDocs;
                         return __generator(this, function (_r) {
                             switch (_r.label) {
                                 case 0:
@@ -2738,14 +2843,13 @@ function executeAiAssistantMongoAggregate(payload, context) {
                                     fallbackMeta.chemicalLookup = __assign(__assign({}, chemicalLookup.meta), { attempted: true, used: false, stage: i });
                                     rewrittenPipeline = executedPipeline.map(function (current, index) { return (index === i ? { $match: chemicalLookup.query } : current); });
                                     if (!!containsForbiddenMongoOperators(rewrittenPipeline)) return [3 /*break*/, 3];
-                                    return [4 /*yield*/, db.collection(collection)
-                                            .aggregate(rewrittenPipeline, aggregateOptions)
-                                            .toArray()];
+                                    return [4 /*yield*/, runAggregateWithRepair(rewrittenPipeline, 'chemical_lookup')];
                                 case 2:
-                                    fallbackDocs = _r.sent();
+                                    fallbackAggregate = _r.sent();
+                                    fallbackDocs = fallbackAggregate.documents;
                                     if (fallbackDocs.length) {
                                         documents = fallbackDocs;
-                                        executedPipeline = rewrittenPipeline;
+                                        executedPipeline = fallbackAggregate.pipeline;
                                         fallbackMeta.chemicalLookup.used = true;
                                         return [2 /*return*/, "break"];
                                     }
@@ -2807,21 +2911,20 @@ function executeAiAssistantMongoAggregate(payload, context) {
                         return replaceFieldPathDeep(acc, from, to);
                     }, executedPipeline);
                     if (!!containsForbiddenMongoOperators(rewrittenPipeline)) return [3 /*break*/, 37];
-                    return [4 /*yield*/, db.collection(collection)
-                            .aggregate(rewrittenPipeline, aggregateOptions)
-                            .toArray()];
+                    return [4 /*yield*/, runAggregateWithRepair(rewrittenPipeline, 'query_field_aliases')];
                 case 36:
-                    fallbackDocs = _q.sent();
+                    fallbackAggregate = _q.sent();
+                    fallbackDocs = fallbackAggregate.documents;
                     if (fallbackDocs.length) {
                         documents = fallbackDocs;
-                        executedPipeline = rewrittenPipeline;
+                        executedPipeline = fallbackAggregate.pipeline;
                         fallbackMeta.queryFieldAliases.used = true;
                     }
                     _q.label = 37;
                 case 37:
                     if (!!documents.length) return [3 /*break*/, 41];
                     _loop_2 = function (i) {
-                        var stage, _s, idLookup, rewrittenPipeline, fallbackDocs;
+                        var stage, _s, idLookup, rewrittenPipeline, fallbackAggregate, fallbackDocs;
                         return __generator(this, function (_t) {
                             switch (_t.label) {
                                 case 0:
@@ -2861,14 +2964,13 @@ function executeAiAssistantMongoAggregate(payload, context) {
                                     fallbackMeta.idLookup = __assign(__assign({}, idLookup.meta), { attempted: true, used: false, stage: i });
                                     rewrittenPipeline = executedPipeline.map(function (current, index) { return (index === i ? { $match: idLookup.query } : current); });
                                     if (!!containsForbiddenMongoOperators(rewrittenPipeline)) return [3 /*break*/, 5];
-                                    return [4 /*yield*/, db.collection(collection)
-                                            .aggregate(rewrittenPipeline, aggregateOptions)
-                                            .toArray()];
+                                    return [4 /*yield*/, runAggregateWithRepair(rewrittenPipeline, 'id_lookup')];
                                 case 4:
-                                    fallbackDocs = _t.sent();
+                                    fallbackAggregate = _t.sent();
+                                    fallbackDocs = fallbackAggregate.documents;
                                     if (fallbackDocs.length) {
                                         documents = fallbackDocs;
-                                        executedPipeline = rewrittenPipeline;
+                                        executedPipeline = fallbackAggregate.pipeline;
                                         fallbackMeta.idLookup.used = true;
                                         return [2 /*return*/, "break"];
                                     }
@@ -3902,6 +4004,7 @@ function resolveAssistantDatedReportWindow(toolResult) {
 function buildAssistantDebugPayload(params) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4;
     var notes = [];
+    notes.push("Request classification: ".concat(params.requestType, " (").concat(params.requestTypeSource, ")."));
     if (params.dataQuestion) {
         notes.push('Detected a data request; tool call required.');
     }
@@ -4036,6 +4139,9 @@ function buildAssistantDebugPayload(params) {
     }
     var payload = {
         decision: {
+            requestType: params.requestType,
+            requestTypeSource: params.requestTypeSource,
+            plannerIntentType: params.plannerIntentType || undefined,
             dataQuestion: params.dataQuestion,
             directiveSource: params.directiveSource
         },
@@ -4064,56 +4170,42 @@ function buildAssistantDebugPayload(params) {
     }
     return payload;
 }
-function buildAssistantToolErrorMessage(error, directive, request) {
-    var _a, _b;
+function buildAssistantToolErrorMessage(error) {
     var rawMessage = normalizeOptionalString(error === null || error === void 0 ? void 0 : error.message) || 'Unable to access data.';
     var normalized = rawMessage.toLowerCase();
-    var collection = normalizeOptionalString(request === null || request === void 0 ? void 0 : request.collection) || normalizeOptionalString((_a = directive.payload) === null || _a === void 0 ? void 0 : _a.collection);
-    var routeHint = resolveAssistantErrorRouteHint(normalizeOptionalString(request === null || request === void 0 ? void 0 : request.permissionView) || normalizeOptionalString((_b = directive.payload) === null || _b === void 0 ? void 0 : _b.permissionView), collection);
-    var routeLine = routeHint
-        ? "Open ".concat(routeHint, " in the app to view this data or request access.")
-        : 'Request access to the related module in the app.';
-    if (!routeHint && collection && requiresInvoicePermission(collection)) {
-        routeLine = 'Open /invoice/list in the app to view this data or request access.';
-    }
+    var cleaned = rawMessage
+        .replace(/^AI assistant report builder bridge:\s*/i, '')
+        .replace(/\s+/g, ' ')
+        .trim()
+        .replace(/\.*$/, '');
     if (normalized.includes('permission scope required')) {
-        return "I need a permission scope to access that data. ".concat(routeLine);
+        return 'I couldn\'t run the data query because no permission scope was provided.';
     }
     if (normalized.includes('access denied')) {
-        if (collection && requiresInvoicePermission(collection)) {
-            return "Invoice access is required to view that data. ".concat(routeLine);
-        }
-        return "You don't have permission to view that data. ".concat(routeLine);
+        return 'I couldn\'t run the data query because this account does not have permission for that dataset.';
     }
     if (normalized.includes('database access denied')) {
-        return "Database access is restricted for that request. ".concat(routeLine);
+        return 'I couldn\'t run the data query because database access is restricted for this request.';
     }
     if (normalized.includes('undefined variable') && normalized.includes('now_minus')) {
-        return "The query used an unsupported relative date token. Please retry; the assistant now normalizes relative dates automatically. ".concat(routeLine);
+        return 'The query used an unsupported relative date token. Please retry and I will normalize the date expression.';
     }
     if (normalized.includes('invalid character for a variable name') && (normalized.includes('now-') || normalized.includes('now+'))) {
-        return "The query used an unsupported relative date token. Please retry; the assistant now normalizes relative dates automatically. ".concat(routeLine);
+        return 'The query used an unsupported relative date token. Please retry and I will normalize the date expression.';
+    }
+    if (normalized.includes('unrecognized argument to $datesubtract: date') || normalized.includes('unrecognized argument to $dateadd: date')) {
+        return 'The data query failed because of an invalid date expression argument. Please retry; date arithmetic arguments are now normalized automatically.';
     }
     if (normalized.includes('report builder bridge') && normalized.includes('not configured')) {
-        return "That dataset is not configured for assistant data access yet. ".concat(routeLine);
+        return 'That dataset is not configured for assistant data access yet.';
     }
     if (normalized.includes('collection is required')) {
         return 'I need a valid collection to read from. Please specify which screen or dataset you want.';
     }
-    return "I couldn't access the requested data. ".concat(routeLine);
-}
-function resolveAssistantErrorRouteHint(routeHint, collection) {
-    var normalizedHint = normalizeOptionalString(routeHint);
-    if (!normalizedHint) {
-        var fallback = resolveDefaultAssistantPermissionView(collection);
-        return fallback.startsWith('/report-builder') ? '' : fallback;
-    }
-    var loweredHint = normalizedHint.toLowerCase();
-    if (loweredHint.startsWith('/report-builder') || loweredHint === '/report' || loweredHint.startsWith('/report/')) {
-        var fallback = resolveDefaultAssistantPermissionView(collection);
-        return fallback.startsWith('/report-builder') ? '' : fallback;
+    if (cleaned) {
+        return "I couldn't run the data query: ".concat(cleaned, ".");
     }
-    return normalizedHint;
+    return 'I couldn\'t run the requested data query.';
 }
 function deriveAssistantStreamStatus(event) {
     var _a;
@@ -6079,6 +6171,45 @@ function normalizeAssistantNowExprOperand(value) {
         },
         _a;
 }
+function normalizeAssistantDateArithmeticArgs(expression) {
+    if (!expression || typeof expression !== 'object' || Array.isArray(expression)) {
+        return expression;
+    }
+    if (expression instanceof Date || expression instanceof RegExp || isMongoObjectId(expression)) {
+        return expression;
+    }
+    var normalizeOperatorArgs = function (operator) {
+        if (!Object.prototype.hasOwnProperty.call(expression, operator)) {
+            return;
+        }
+        var rawArgs = expression[operator];
+        if (!rawArgs || typeof rawArgs !== 'object' || Array.isArray(rawArgs)) {
+            return;
+        }
+        if (rawArgs instanceof Date || rawArgs instanceof RegExp || isMongoObjectId(rawArgs)) {
+            return;
+        }
+        var nextArgs = __assign({}, rawArgs);
+        if (!Object.prototype.hasOwnProperty.call(nextArgs, 'startDate')) {
+            if (Object.prototype.hasOwnProperty.call(nextArgs, 'date')) {
+                nextArgs.startDate = nextArgs.date;
+            }
+            else if (Object.prototype.hasOwnProperty.call(nextArgs, 'start')) {
+                nextArgs.startDate = nextArgs.start;
+            }
+        }
+        if (Object.prototype.hasOwnProperty.call(nextArgs, 'date')) {
+            delete nextArgs.date;
+        }
+        if (Object.prototype.hasOwnProperty.call(nextArgs, 'start')) {
+            delete nextArgs.start;
+        }
+        expression[operator] = nextArgs;
+    };
+    normalizeOperatorArgs('$dateAdd');
+    normalizeOperatorArgs('$dateSubtract');
+    return expression;
+}
 function normalizeAssistantNowExprPlaceholdersDeep(value) {
     if (Array.isArray(value)) {
         return value.map(function (entry) { return normalizeAssistantNowExprPlaceholdersDeep(entry); });
@@ -6096,7 +6227,38 @@ function normalizeAssistantNowExprPlaceholdersDeep(value) {
     Object.keys(value).forEach(function (key) {
         result[key] = normalizeAssistantNowExprPlaceholdersDeep(value[key]);
     });
-    return result;
+    return normalizeAssistantDateArithmeticArgs(result);
+}
+function normalizeAssistantNowExprPlaceholders(value) {
+    return normalizeAssistantNowExprPlaceholdersDeep(value);
+}
+function isAssistantDateArithmeticArgumentError(error) {
+    var message = normalizeOptionalString(error === null || error === void 0 ? void 0 : error.message).toLowerCase();
+    if (!message) {
+        return false;
+    }
+    return message.includes('unrecognized argument to $datesubtract: date')
+        || message.includes('unrecognized argument to $dateadd: date')
+        || message.includes('unrecognized argument to $datesubtract: start')
+        || message.includes('unrecognized argument to $dateadd: start');
+}
+function didAssistantValueChange(before, after) {
+    try {
+        return JSON.stringify(before) !== JSON.stringify(after);
+    }
+    catch (_a) {
+        return true;
+    }
+}
+function repairAssistantDateArithmeticInPipeline(pipeline) {
+    var repairedRaw = normalizeAssistantNowExprPlaceholdersDeep(pipeline);
+    var repaired = Array.isArray(repairedRaw)
+        ? repairedRaw
+        : pipeline;
+    return {
+        pipeline: repaired,
+        changed: didAssistantValueChange(pipeline, repaired)
+    };
 }
 function isMatchExpressionOperand(value) {
     if (typeof value === 'string') {
@@ -9406,7 +9568,7 @@ function waitForCodexWorkerMessage(worker, streamStatusHandler) {
 }
 function runCodexInWorkerThread(prompt, runOptions, config, streamStatusHandler) {
     return __awaiter(this, void 0, void 0, function () {
-        var streamedOptions, codexClient, workerPath, codexClient, error_4, codexClient;
+        var streamedOptions, codexClient, workerPath, codexClient, error_5, codexClient;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -9427,11 +9589,11 @@ function runCodexInWorkerThread(prompt, runOptions, config, streamStatusHandler)
                     return [4 /*yield*/, runCodexInWorkerThreadInternal(workerPath, prompt, runOptions, config, streamStatusHandler)];
                 case 6: return [2 /*return*/, _a.sent()];
                 case 7:
-                    error_4 = _a.sent();
-                    if (!(error_4 instanceof CodexWorkerBootstrapError)) {
-                        throw error_4;
+                    error_5 = _a.sent();
+                    if (!(error_5 instanceof CodexWorkerBootstrapError)) {
+                        throw error_5;
                     }
-                    console.error('Codex worker bootstrap failed, falling back to in-process run.', error_4);
+                    console.error('Codex worker bootstrap failed, falling back to in-process run.', error_5);
                     codexClient = getAssistantCodexClient(config);
                     return [4 /*yield*/, codexClient.run(prompt, streamedOptions)];
                 case 8: return [2 /*return*/, _a.sent()];
@@ -9469,7 +9631,7 @@ function runCodexInWorkerThreadInternal(workerPath, prompt, runOptions, config,
                     timeoutMs = ((sanitizedOptions === null || sanitizedOptions === void 0 ? void 0 : sanitizedOptions.timeoutMs) || resolveCodexTimeoutMs()) + 15000;
                     timeoutController = new AbortController();
                     timeoutPromise = (function () { return __awaiter(_this, void 0, void 0, function () {
-                        var error_5;
+                        var error_6;
                         return __generator(this, function (_a) {
                             switch (_a.label) {
                                 case 0:
@@ -9479,11 +9641,11 @@ function runCodexInWorkerThreadInternal(workerPath, prompt, runOptions, config,
                                     _a.sent();
                                     return [2 /*return*/, { type: 'timeout' }];
                                 case 2:
-                                    error_5 = _a.sent();
-                                    if ((error_5 === null || error_5 === void 0 ? void 0 : error_5.name) === 'AbortError') {
+                                    error_6 = _a.sent();
+                                    if ((error_6 === null || error_6 === void 0 ? void 0 : error_6.name) === 'AbortError') {
                                         return [2 /*return*/, { type: 'aborted' }];
                                     }
-                                    throw error_5;
+                                    throw error_6;
                                 case 3: return [2 /*return*/];
                             }
                         });
@@ -9806,34 +9968,178 @@ function resolveAssistantWorkspaceRoot() {
         });
     });
 }
+var AI_ASSISTANT_DATA_REQUEST_PATTERNS = [
+    /\bshow\b/,
+    /\blist\b/,
+    /\bhow many\b/,
+    /\bcount\b/,
+    /\btotal\b/,
+    /\bnumber of\b/,
+    /\blast\b/,
+    /\brecent\b/,
+    /\bthis week\b/,
+    /\blast month\b/,
+    /\boverdue\b/,
+    /\bopen\b/,
+    /\bclosed\b/,
+    /\bcompleted\b/,
+    /\bmissing\b/,
+    /\bgroup(ed)? by\b/,
+    /\bbreakdown\b/,
+    /\bper day\b/,
+    /\bper week\b/,
+    /\bper month\b/
+];
+var AI_ASSISTANT_NAVIGATION_REQUEST_PATTERNS = [
+    /\bwhere\b/,
+    /\bhow do i\b/,
+    /\bhow to\b/,
+    /\bnavigate\b/,
+    /\bgo to\b/,
+    /\bwhich screen\b/,
+    /\bwhich page\b/,
+    /\bwhat menu\b/,
+    /\broute\b/,
+    /\bpath\b/,
+    /\bfind\b/
+];
+var AI_ASSISTANT_FEATURE_INFO_PATTERNS = [
+    /\bwhat is\b/,
+    /\bhow does\b/,
+    /\bhow .* work\b/,
+    /\bfeature\b/,
+    /\bworkflow\b/,
+    /\bprocess\b/,
+    /\bexplain\b/,
+    /\bdifference between\b/
+];
+var AI_ASSISTANT_BUG_ISSUE_PATTERNS = [
+    /\bbug\b/,
+    /\bissue\b/,
+    /\berror\b/,
+    /\bexception\b/,
+    /\bfail(?:ed|ing|ure)?\b/,
+    /\bbroken\b/,
+    /\bnot working\b/,
+    /\bdoesn['’]t work\b/,
+    /\bwhy is this happening\b/,
+    /\broot cause\b/,
+    /\bdebug\b/,
+    /\binvestigat(?:e|ion)\b/,
+    /\bfix\b/,
+    /\bcrash(?:ed|ing)?\b/
+];
 function isAssistantDataQuestion(message) {
     var text = normalizeOptionalString(message).toLowerCase();
     if (!text) {
         return false;
     }
-    var patterns = [
-        /\bshow\b/,
-        /\blist\b/,
-        /\bhow many\b/,
-        /\bcount\b/,
-        /\btotal\b/,
-        /\bnumber of\b/,
-        /\blast\b/,
-        /\brecent\b/,
-        /\bthis week\b/,
-        /\blast month\b/,
-        /\boverdue\b/,
-        /\bopen\b/,
-        /\bclosed\b/,
-        /\bcompleted\b/,
-        /\bmissing\b/,
-        /\bgroup(ed)? by\b/,
-        /\bbreakdown\b/,
-        /\bper day\b/,
-        /\bper week\b/,
-        /\bper month\b/
-    ];
-    return patterns.some(function (pattern) { return pattern.test(text); });
+    return AI_ASSISTANT_DATA_REQUEST_PATTERNS.some(function (pattern) { return pattern.test(text); });
+}
+function isAssistantNavigationQuestion(message) {
+    var text = normalizeOptionalString(message).toLowerCase();
+    if (!text) {
+        return false;
+    }
+    return AI_ASSISTANT_NAVIGATION_REQUEST_PATTERNS.some(function (pattern) { return pattern.test(text); });
+}
+function isAssistantFeatureInfoQuestion(message) {
+    var text = normalizeOptionalString(message).toLowerCase();
+    if (!text) {
+        return false;
+    }
+    return AI_ASSISTANT_FEATURE_INFO_PATTERNS.some(function (pattern) { return pattern.test(text); });
+}
+function isAssistantBugIssueQuestion(message) {
+    var text = normalizeOptionalString(message).toLowerCase();
+    if (!text) {
+        return false;
+    }
+    return AI_ASSISTANT_BUG_ISSUE_PATTERNS.some(function (pattern) { return pattern.test(text); });
+}
+function normalizeAssistantPlannerIntentType(value) {
+    var normalized = normalizeOptionalString(value).toLowerCase();
+    if (!normalized) {
+        return null;
+    }
+    if (normalized === 'data') {
+        return 'data';
+    }
+    if (normalized === 'navigation') {
+        return 'navigation';
+    }
+    if (normalized === 'mixed') {
+        return 'mixed';
+    }
+    if (normalized === 'feature_info' || normalized === 'program_explain') {
+        return 'feature_info';
+    }
+    if (normalized === 'bug_issue') {
+        return 'bug_issue';
+    }
+    return null;
+}
+function classifyAssistantRequestByHeuristics(message) {
+    var isData = isAssistantDataQuestion(message);
+    var isNavigation = isAssistantNavigationQuestion(message);
+    var isBug = isAssistantBugIssueQuestion(message);
+    var isFeatureInfo = isAssistantFeatureInfoQuestion(message);
+    var type = 'unknown';
+    if (isData && isNavigation) {
+        type = 'mixed';
+    }
+    else if (isData) {
+        type = 'data';
+    }
+    else if (isNavigation) {
+        type = 'navigation';
+    }
+    else if (isBug) {
+        type = 'bug_issue';
+    }
+    else if (isFeatureInfo) {
+        type = 'feature_info';
+    }
+    return {
+        type: type,
+        dataQuestion: type === 'data' || type === 'mixed',
+        source: 'heuristic'
+    };
+}
+function classifyAssistantRequestType(message, plannerOutput) {
+    var _a, _b;
+    var heuristic = classifyAssistantRequestByHeuristics(message);
+    var plannerIntentRaw = normalizeOptionalString((_a = plannerOutput === null || plannerOutput === void 0 ? void 0 : plannerOutput.intent) === null || _a === void 0 ? void 0 : _a.type).toLowerCase();
+    var plannerIntent = normalizeAssistantPlannerIntentType(plannerIntentRaw);
+    var plannerShouldFetch = ((_b = plannerOutput === null || plannerOutput === void 0 ? void 0 : plannerOutput.dataPlan) === null || _b === void 0 ? void 0 : _b.shouldFetchData) === true;
+    if (!plannerIntent) {
+        if (plannerShouldFetch) {
+            return {
+                type: heuristic.type === 'navigation' ? 'mixed' : 'data',
+                dataQuestion: true,
+                source: heuristic.type === 'navigation' ? 'merged' : 'planner',
+                plannerIntentType: plannerIntentRaw || undefined
+            };
+        }
+        return __assign(__assign({}, heuristic), { plannerIntentType: plannerIntentRaw || undefined });
+    }
+    var resolvedType = plannerIntent;
+    var source = 'planner';
+    if (plannerShouldFetch && resolvedType !== 'data' && resolvedType !== 'mixed') {
+        resolvedType = resolvedType === 'navigation' ? 'mixed' : 'data';
+        source = 'merged';
+    }
+    if (heuristic.dataQuestion && (resolvedType === 'navigation' || resolvedType === 'feature_info' || resolvedType === 'bug_issue')) {
+        resolvedType = 'mixed';
+        source = 'merged';
+    }
+    var dataQuestion = plannerShouldFetch || resolvedType === 'data' || resolvedType === 'mixed';
+    return {
+        type: resolvedType,
+        dataQuestion: dataQuestion,
+        source: source,
+        plannerIntentType: plannerIntentRaw || undefined
+    };
 }
 function buildAssistantCodexDirectivePrompt(message, attachmentText, historyText, contextText) {
     var trimmedContext = normalizeOptionalString(contextText);
@@ -10881,15 +11187,50 @@ function sanitizeConfig(source) {
         max_tokens: normalizeOptionalNumber(source === null || source === void 0 ? void 0 : source.max_tokens)
     };
 }
-function resolveClientIdFromConfig(explicit) {
-    var _a;
-    var config = ((_a = resolveio_server_app_1.ResolveIOServer.getServerConfig) === null || _a === void 0 ? void 0 : _a.call(resolveio_server_app_1.ResolveIOServer)) || {};
-    return normalizeOptionalString(explicit)
-        || normalizeOptionalString(config['CLIENT_ID'] || config['client_id'] || process.env.CLIENT_ID || '');
+function isLikelyObjectId(value) {
+    var normalized = normalizeOptionalString(value);
+    return /^[a-f0-9]{24}$/i.test(normalized);
 }
-function ensureConversation(input, mode) {
+function resolveClientIdFromConfig(explicit, contextUserId) {
     return __awaiter(this, void 0, void 0, function () {
-        var idConversation, existing, now, doc, result;
+        var explicitValue, user, userClientId, _a, config, configClientId;
+        var _b, _c;
+        return __generator(this, function (_d) {
+            switch (_d.label) {
+                case 0:
+                    explicitValue = normalizeOptionalString(explicit);
+                    if (isLikelyObjectId(explicitValue)) {
+                        return [2 /*return*/, explicitValue];
+                    }
+                    if (!contextUserId) return [3 /*break*/, 4];
+                    _d.label = 1;
+                case 1:
+                    _d.trys.push([1, 3, , 4]);
+                    return [4 /*yield*/, user_collection_1.Users.findById(contextUserId)];
+                case 2:
+                    user = _d.sent();
+                    userClientId = normalizeOptionalString((_b = user === null || user === void 0 ? void 0 : user.other) === null || _b === void 0 ? void 0 : _b.id_client);
+                    if (userClientId) {
+                        return [2 /*return*/, userClientId];
+                    }
+                    return [3 /*break*/, 4];
+                case 3:
+                    _a = _d.sent();
+                    return [3 /*break*/, 4];
+                case 4:
+                    config = ((_c = resolveio_server_app_1.ResolveIOServer.getServerConfig) === null || _c === void 0 ? void 0 : _c.call(resolveio_server_app_1.ResolveIOServer)) || {};
+                    configClientId = normalizeOptionalString(config['CLIENT_ID'] || config['client_id'] || process.env.CLIENT_ID || '');
+                    if (configClientId) {
+                        return [2 /*return*/, configClientId];
+                    }
+                    return [2 /*return*/, explicitValue];
+            }
+        });
+    });
+}
+function ensureConversation(input, mode, contextUserId) {
+    return __awaiter(this, void 0, void 0, function () {
+        var idConversation, existing, now, resolvedClientId, doc, result;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -10904,8 +11245,11 @@ function ensureConversation(input, mode) {
                     _a.label = 2;
                 case 2:
                     now = new Date();
+                    return [4 /*yield*/, resolveClientIdFromConfig(input.id_client, contextUserId)];
+                case 3:
+                    resolvedClientId = _a.sent();
                     doc = {
-                        id_client: resolveClientIdFromConfig(input.id_client),
+                        id_client: resolvedClientId,
                         id_app: normalizeOptionalString(input.id_app),
                         title: 'New Conversation',
                         mode: mode,
@@ -10917,7 +11261,7 @@ function ensureConversation(input, mode) {
                         updatedAt: now
                     };
                     return [4 /*yield*/, ai_terminal_conversation_collection_1.AiTerminalConversations.insertOne(doc)];
-                case 3:
+                case 4:
                     result = _a.sent();
                     return [2 /*return*/, result];
             }
@@ -11001,10 +11345,25 @@ function normalizeHistoryLimit(value) {
     }
     return Math.min(Math.max((0, common_1.round)(parsed), 0), 30);
 }
-function resolveClientId(conversation, inputClientId) {
-    return normalizeOptionalString(inputClientId)
-        || normalizeOptionalString(conversation === null || conversation === void 0 ? void 0 : conversation.id_client)
-        || resolveClientIdFromConfig();
+function resolveClientId(conversation, inputClientId, contextUserId) {
+    return __awaiter(this, void 0, void 0, function () {
+        var inputValue, conversationValue;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    inputValue = normalizeOptionalString(inputClientId);
+                    if (isLikelyObjectId(inputValue)) {
+                        return [2 /*return*/, inputValue];
+                    }
+                    conversationValue = normalizeOptionalString(conversation === null || conversation === void 0 ? void 0 : conversation.id_client);
+                    if (isLikelyObjectId(conversationValue)) {
+                        return [2 /*return*/, conversationValue];
+                    }
+                    return [4 /*yield*/, resolveClientIdFromConfig(inputValue || conversationValue, contextUserId)];
+                case 1: return [2 /*return*/, _a.sent()];
+            }
+        });
+    });
 }
 function estimateUsage(messages, responseText, model) {
     var inputTokens = (0, tokenizer_1.countChatTokens)(messages, model);