@resolveio/server-lib 20.15.5 → 20.15.7

package/methods/ai-terminal.js

@@ -142,10 +142,11 @@ var AI_ASSISTANT_TOOL_MAX_STEPS = 1;
 var AI_ASSISTANT_DISPLAY_MAX_COLUMNS = 12;
 var AI_ASSISTANT_DISPLAY_PREVIEW_MAX_ROWS = 20;
 var AI_ASSISTANT_DISPLAY_STRING_LIMIT = 160;
-var AI_ASSISTANT_PROGRESS_PLACEHOLDER = 'Thinking...';
+var AI_ASSISTANT_PROGRESS_PLACEHOLDER = 'Planning...';
 var AI_ASSISTANT_PROGRESS_TICK_MS = 5000;
 var AI_ASSISTANT_READ_PREFERENCE = 'secondary';
 var AI_ASSISTANT_PROGRESS_TICKS = [
+    'Grabbing Data',
     'Drafting response'
 ];
 var AI_ASSISTANT_DISPLAY_PRIORITY_FIELDS = [
@@ -245,6 +246,13 @@ var AI_ASSISTANT_COLLECTION_STOPWORDS = new Set([
     'missing',
     'overdue'
 ]);
+var AI_ASSISTANT_TERM_SYNONYMS = [
+    {
+        label: 'truck treating jobs',
+        pattern: /\btruck\s+treating\s+jobs?\b/i,
+        expansions: ['truck treating deliveries', 'truck-treating-deliveries', 'truck treating route events']
+    }
+];
 var AI_ASSISTANT_SYSTEM_PROMPT = [
     'You are the ResolveIO in-app AI assistant running with read-only access to the codebase.',
     'Core rules:',
@@ -256,7 +264,9 @@ var AI_ASSISTANT_SYSTEM_PROMPT = [
     '- Do not assist with hacking, bypassing security, or abuse.',
     'Accuracy & tools:',
     '- Step 1 (always): determine the target collections/models/modules/workflows using context, routes, and collection hints. Assume the user is non-technical and will not provide internal names.',
+    '- Planning stage: regex/keyword scan the codebase for collectionName/model definitions, methods, publications, and Angular routes/modules to map user wording to internal names.',
     '- Map user wording to internal collections/fields yourself. Do not ask for property names unless required to run a query.',
+    '- Use term hints from context (synonym expansions) when mapping user language to collections.',
     '- Do not guess or invent collections/fields. If unsure, verify in the codebase or run a small Mongo read (limit 1-5) to learn the shape.',
     '- Prefer running a small Mongo read over asking multiple questions.',
     '- For any data request (counts, lists, breakdowns, recent/last items), you MUST run a MONGO_READ or MONGO_AGG before answering.',
@@ -264,13 +274,16 @@ var AI_ASSISTANT_SYSTEM_PROMPT = [
     '- If a field starts with id_ and refers to another collection, treat it as a foreign key and look up the related record when needed.',
     '- When the user provides a customer, well, or chemical name, use case-insensitive regex matching to find it. Assume the name exists and try to match it before asking questions.',
     '- Use the codebase context to choose correct collections/fields/workflows and use MONGO_READ/MONGO_AGG to answer with real data when needed.',
+    '- Process (fast path): Queue -> Planning -> Grabbing Data -> Drafting response. Use regex/keyword matching to identify collections/models, draft a minimal query, run the tool, then format a table. This should be fast; avoid extra narration.',
     '- Assume a relevant collection exists; if verification reads return zero data, report no data found instead of interrogating the user.',
+    '- Never claim "no data exists" unless you resolved a collection and executed a legitimate query (with fallback date fields when needed) that returned zero rows.',
     '- For direct questions, answer first. Ask a single follow-up only if required to proceed.',
     'Data Presentation:',
     '- Output plain Markdown (NO triple backticks).',
     '- When you reference database results, summarize first, then include a Markdown table.',
     '- When presenting record lists or aggregates, produce a Markdown table (pipes).',
     '- Never show raw JSON dumps.',
+    '- Do not invent placeholders like "Not available" or "N/A". If a value is missing in tool results, leave the cell blank or omit the column and note it briefly.',
     '- Do not include `_id` & `__v` & `id_<other collection _id property>` in tables by default.',
     '- If `_id` & `__v` & `id_<other collection _id property>` is needed, show it as `id` and shorten (e.g., first 6-8 chars) unless asked otherwise.',
     '- Rename `createdAt` to `Created At` and `updatedAt` to `Updated At` in tables.',
@@ -308,6 +321,7 @@ var AI_ASSISTANT_SYSTEM_PROMPT = [
     '- Only request data when the user has permission for that module; invoice data requires invoice view access.',
     '- If the user lacks permission, answer without data and explain how to view it in the app or request access.',
     '- For simple counts or time-range totals, use MONGO_READ (includeTotal). For breakdowns, rankings, or sums grouped by a field, use MONGO_AGG.',
+    '- For performance, keep pipelines minimal: avoid $push arrays or large fields unless the user explicitly asks for them.',
     '- For completion metrics (ex: "completed per day"), filter by completed status when applicable and use completion date fields; if completion dates are missing, fall back to createdAt/date_created and note the fallback.',
     '- Before issuing MONGO_READ or MONGO_AGG, verify the collection name and key fields by checking collection/model definitions in the current app (look for "collectionName:" and date fields like date_created/date_completed/createdAt). Do not invent collection names.',
     '- For creation-date questions when both date_created and createdAt exist, match both with $or so results are not missed.',
@@ -327,6 +341,76 @@ var AI_FORM_PATCH_SYSTEM_PROMPT = [
     '- Use medium reasoning effort.'
 ].join('\n');
 var assistantCodexClient = null;
+var assistantCodexRunQueue = [];
+var assistantCodexRunDraining = false;
+/* eslint-enable no-unused-vars */
+function enqueueAssistantCodexRun(task) {
+    var _this = this;
+    assistantCodexRunQueue.push(task);
+    if (assistantCodexRunDraining) {
+        return;
+    }
+    assistantCodexRunDraining = true;
+    queueMicrotask(function () { return __awaiter(_this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, drainAssistantCodexRunQueue()];
+                case 1:
+                    _a.sent();
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+}
+function drainAssistantCodexRunQueue() {
+    return __awaiter(this, void 0, void 0, function () {
+        var next, error_1;
+        var _this = this;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    _a.trys.push([0, , 7, 8]);
+                    _a.label = 1;
+                case 1:
+                    if (!assistantCodexRunQueue.length) return [3 /*break*/, 6];
+                    next = assistantCodexRunQueue.shift();
+                    if (!next) {
+                        return [3 /*break*/, 1];
+                    }
+                    _a.label = 2;
+                case 2:
+                    _a.trys.push([2, 4, , 5]);
+                    return [4 /*yield*/, next()];
+                case 3:
+                    _a.sent();
+                    return [3 /*break*/, 5];
+                case 4:
+                    error_1 = _a.sent();
+                    console.error(new Date(), 'AI assistant run failed:', error_1);
+                    return [3 /*break*/, 5];
+                case 5: return [3 /*break*/, 1];
+                case 6: return [3 /*break*/, 8];
+                case 7:
+                    assistantCodexRunDraining = false;
+                    if (assistantCodexRunQueue.length) {
+                        assistantCodexRunDraining = true;
+                        queueMicrotask(function () { return __awaiter(_this, void 0, void 0, function () {
+                            return __generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0: return [4 /*yield*/, drainAssistantCodexRunQueue()];
+                                    case 1:
+                                        _a.sent();
+                                        return [2 /*return*/];
+                                }
+                            });
+                        }); });
+                    }
+                    return [7 /*endfinally*/];
+                case 8: return [2 /*return*/];
+            }
+        });
+    });
+}
 function loadAiTerminalMethods(methodManager) {
     methodManager.methods({
         aiTerminalConversationCreate: {
@@ -854,10 +938,11 @@ function executeAiFormPatch(payload, context) {
 }
 function executeAiAssistantCodexRun(payload, context) {
     return __awaiter(this, void 0, void 0, function () {
-        var input, message, requestId, guardrail, conversation_2, now_2, userMsg, assistantMsg, user, isSuperAdmin, hasInvoiceAccess, customerId, conversation, now, attachments, attachmentData, historyLimit, history, _a, historyLines, collectionHints, dbName, db, hintText, _b, assistantContext, prompt, workspaceRoot, codexConfig, runOptions, userDoc, initialProgress, assistantDoc, insertResult, assistantMessageId, progressTracker, streamProgress, assistantContent, toolResult, assistantDebug, directiveSource, dataQuestion, lastDirective, toolResponseDebug, toolError, responseText, directive, directiveSourceText, directivePrompt, directiveText, forcedDirective, _c, cleanedResponseText, toolRequest, toolResponse, _d, toolPayload, followupPrompt, followupText, _e, error_1, error_2, finalNow, finalMetadata, finalAssistantDoc;
-        var _f, _g, _h;
-        return __generator(this, function (_j) {
-            switch (_j.label) {
+        var input, message, requestId, guardrail, conversation_2, now_2, userMsg, assistantMsg, user, isSuperAdmin, hasInvoiceAccess, customerId, conversation, now, attachments, attachmentData, historyLimit, history, _a, historyLines, userDoc, initialProgress, assistantDoc, insertResult, assistantMessageId;
+        var _this = this;
+        var _b, _c;
+        return __generator(this, function (_d) {
+            switch (_d.label) {
                 case 0:
                     input = payload || {};
                     message = normalizeOptionalString(input.message);
@@ -872,7 +957,7 @@ function executeAiAssistantCodexRun(payload, context) {
                     if (!(guardrail === null || guardrail === void 0 ? void 0 : guardrail.blocked)) return [3 /*break*/, 5];
                     return [4 /*yield*/, ensureConversation(input, 'codex')];
                 case 1:
-                    conversation_2 = _j.sent();
+                    conversation_2 = _d.sent();
                     now_2 = new Date();
                     userMsg = {
                         id_conversation: conversation_2._id,
@@ -892,13 +977,13 @@ function executeAiAssistantCodexRun(payload, context) {
                     };
                     return [4 /*yield*/, ai_terminal_message_collection_1.AiTerminalMessages.insertOne(userMsg)];
                 case 2:
-                    _j.sent();
+                    _d.sent();
                     return [4 /*yield*/, ai_terminal_message_collection_1.AiTerminalMessages.insertOne(assistantMsg)];
                 case 3:
-                    _j.sent();
+                    _d.sent();
                     return [4 /*yield*/, touchConversation(conversation_2._id, now_2)];
                 case 4:
-                    _j.sent();
+                    _d.sent();
                     return [2 /*return*/, {
                             conversation: conversation_2,
                             message: assistantMsg,
@@ -906,27 +991,27 @@ function executeAiAssistantCodexRun(payload, context) {
                         }];
                 case 5: return [4 /*yield*/, user_collection_1.Users.findById(context === null || context === void 0 ? void 0 : context.id_user)];
                 case 6:
-                    user = _j.sent();
-                    isSuperAdmin = !!((_f = user === null || user === void 0 ? void 0 : user.roles) === null || _f === void 0 ? void 0 : _f.super_admin);
+                    user = _d.sent();
+                    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((_g = user === null || user === void 0 ? void 0 : user.other) === null || _g === void 0 ? void 0 : _g.id_customer);
+                    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')];
                 case 7:
-                    conversation = _j.sent();
+                    conversation = _d.sent();
                     now = new Date();
                     attachments = Array.isArray(input.attachments) ? input.attachments : [];
                     return [4 /*yield*/, readAttachmentContents(attachments)];
                 case 8:
-                    attachmentData = _j.sent();
+                    attachmentData = _d.sent();
                     historyLimit = normalizeHistoryLimit(input.max_history);
                     if (!(historyLimit > 0)) return [3 /*break*/, 10];
                     return [4 /*yield*/, ai_terminal_message_collection_1.AiTerminalMessages.find({ id_conversation: conversation._id, role: { $in: ['user', 'assistant'] } }, { sort: { createdAt: 1 }, limit: historyLimit * 2 })];
                 case 9:
-                    _a = _j.sent();
+                    _a = _d.sent();
                     return [3 /*break*/, 11];
                 case 10:
                     _a = [];
-                    _j.label = 11;
+                    _d.label = 11;
                 case 11:
                     history = _a;
                     historyLines = [];
@@ -937,49 +1022,6 @@ function executeAiAssistantCodexRun(payload, context) {
                             historyLines.push("".concat(role, ": ").concat(content));
                         }
                     });
-                    collectionHints = [];
-                    _j.label = 12;
-                case 12:
-                    _j.trys.push([12, 14, , 15]);
-                    dbName = resolveAssistantDatabaseName(undefined, input.mongo);
-                    db = resolveio_server_app_1.ResolveIOServer.getMongoConnection().db(dbName);
-                    hintText = [
-                        message,
-                        normalizeOptionalString((_h = input === null || input === void 0 ? void 0 : input.context) === null || _h === void 0 ? void 0 : _h.route)
-                    ].filter(Boolean).join(' ');
-                    return [4 /*yield*/, resolveAssistantCollectionHints(hintText, dbName, db)];
-                case 13:
-                    collectionHints = _j.sent();
-                    return [3 /*break*/, 15];
-                case 14:
-                    _b = _j.sent();
-                    collectionHints = [];
-                    return [3 /*break*/, 15];
-                case 15:
-                    assistantContext = buildAssistantContext(input, {
-                        isSuperAdmin: isSuperAdmin,
-                        hasInvoiceAccess: hasInvoiceAccess,
-                        customerId: customerId,
-                        collectionHints: collectionHints
-                    });
-                    prompt = buildAssistantCodexPrompt(message, attachmentData.promptText, historyLines.join('\n'), assistantContext);
-                    return [4 /*yield*/, resolveAssistantWorkspaceRoot()];
-                case 16:
-                    workspaceRoot = _j.sent();
-                    codexConfig = resolveCodexSettings();
-                    runOptions = {
-                        timeoutMs: resolveCodexTimeoutMs(),
-                        threadOptions: {
-                            workingDirectory: workspaceRoot,
-                            sandboxMode: 'read-only',
-                            skipGitRepoCheck: true,
-                            modelReasoningEffort: resolveCodexThoughtLevel(),
-                            networkAccessEnabled: false,
-                            webSearchMode: 'disabled',
-                            webSearchEnabled: false,
-                            approvalPolicy: 'never'
-                        }
-                    };
                     userDoc = {
                         id_conversation: conversation._id,
                         role: 'user',
@@ -989,7 +1031,7 @@ function executeAiAssistantCodexRun(payload, context) {
                         createdAt: now,
                         updatedAt: now
                     };
-                    initialProgress = ['Thinking'];
+                    initialProgress = ['Planning'];
                     assistantDoc = {
                         id_conversation: conversation._id,
                         role: 'assistant',
@@ -999,154 +1041,307 @@ function executeAiAssistantCodexRun(payload, context) {
                         updatedAt: now
                     };
                     return [4 /*yield*/, ai_terminal_message_collection_1.AiTerminalMessages.insertOne(userDoc)];
-                case 17:
-                    _j.sent();
+                case 12:
+                    _d.sent();
                     return [4 /*yield*/, ai_terminal_message_collection_1.AiTerminalMessages.insertOne(assistantDoc)];
-                case 18:
-                    insertResult = _j.sent();
+                case 13:
+                    insertResult = _d.sent();
                     assistantMessageId = (insertResult === null || insertResult === void 0 ? void 0 : insertResult._id) || (insertResult === null || insertResult === void 0 ? void 0 : insertResult.insertedId);
-                    progressTracker = createAssistantProgressTracker(assistantMessageId, initialProgress);
-                    streamProgress = createAssistantStreamProgressHandler(progressTracker);
-                    assistantContent = '';
-                    toolResult = null;
-                    assistantDebug = null;
-                    directiveSource = 'none';
-                    dataQuestion = isAssistantDataQuestion(message);
-                    lastDirective = null;
-                    toolResponseDebug = null;
-                    toolError = null;
-                    _j.label = 19;
-                case 19:
-                    _j.trys.push([19, 38, 39, 40]);
-                    return [4 /*yield*/, runCodexInWorkerThread(prompt, runOptions, codexConfig, streamProgress)];
-                case 20:
-                    responseText = _j.sent();
-                    directive = extractAssistantMongoDirective(responseText);
-                    directiveSourceText = responseText;
-                    if (directive) {
-                        directiveSource = 'model';
-                        lastDirective = directive;
-                    }
-                    if (!(!directive && dataQuestion)) return [3 /*break*/, 24];
-                    directivePrompt = buildAssistantCodexDirectivePrompt(message, attachmentData.promptText, historyLines.join('\n'), assistantContext);
-                    _j.label = 21;
-                case 21:
-                    _j.trys.push([21, 23, , 24]);
-                    return [4 /*yield*/, runCodexInWorkerThread(directivePrompt, runOptions, codexConfig, streamProgress)];
-                case 22:
-                    directiveText = _j.sent();
-                    forcedDirective = extractAssistantMongoDirective(directiveText);
-                    if (forcedDirective) {
-                        directive = forcedDirective;
-                        directiveSourceText = directiveText;
-                        directiveSource = 'forced';
-                        lastDirective = forcedDirective;
-                    }
-                    return [3 /*break*/, 24];
-                case 23:
-                    _c = _j.sent();
-                    return [3 /*break*/, 24];
-                case 24:
-                    cleanedResponseText = (directive === null || directive === void 0 ? void 0 : directive.cleaned) || directiveSourceText;
-                    assistantContent = sanitizeAssistantResponse(cleanedResponseText);
-                    if (!((directive === null || directive === void 0 ? void 0 : directive.payload) && AI_ASSISTANT_TOOL_MAX_STEPS > 0)) return [3 /*break*/, 36];
-                    toolRequest = buildAssistantToolRequest(directive, input);
-                    progressTracker.push('Looking up Data');
-                    _j.label = 25;
-                case 25:
-                    _j.trys.push([25, 34, , 35]);
-                    if (!(directive.type === 'aggregate')) return [3 /*break*/, 27];
-                    return [4 /*yield*/, executeAiAssistantMongoAggregate(toolRequest, context)];
-                case 26:
-                    _d = _j.sent();
-                    return [3 /*break*/, 29];
-                case 27: return [4 /*yield*/, executeAiAssistantMongoRead(toolRequest, context)];
-                case 28:
-                    _d = _j.sent();
-                    _j.label = 29;
-                case 29:
-                    toolResponse = _d;
-                    toolResponseDebug = (toolResponse === null || toolResponse === void 0 ? void 0 : toolResponse.debug) && typeof toolResponse.debug === 'object'
-                        ? toolResponse.debug
-                        : null;
-                    toolPayload = buildAssistantToolResultPayload(directive, toolResponse);
-                    toolResult = toolPayload.result;
-                    progressTracker.push('Drafting response');
-                    followupPrompt = buildAssistantCodexToolFollowupPrompt(message, attachmentData.promptText, historyLines.join('\n'), assistantContext, toolPayload.prompt);
-                    _j.label = 30;
-                case 30:
-                    _j.trys.push([30, 32, , 33]);
-                    return [4 /*yield*/, runCodexInWorkerThread(followupPrompt, runOptions, codexConfig, streamProgress)];
-                case 31:
-                    followupText = _j.sent();
-                    assistantContent = sanitizeAssistantResponse(followupText);
-                    return [3 /*break*/, 33];
-                case 32:
-                    _e = _j.sent();
-                    assistantContent = buildAssistantToolFallbackResponse(toolPayload.result);
-                    return [3 /*break*/, 33];
-                case 33: return [3 /*break*/, 35];
-                case 34:
-                    error_1 = _j.sent();
-                    assistantContent = buildAssistantToolErrorMessage(error_1, directive, toolRequest);
-                    toolError = error_1;
-                    return [3 /*break*/, 35];
-                case 35: return [3 /*break*/, 37];
-                case 36:
-                    progressTracker.push('Drafting response');
-                    _j.label = 37;
-                case 37: return [3 /*break*/, 40];
-                case 38:
-                    error_2 = _j.sent();
-                    assistantContent = buildAssistantCodexErrorMessage(error_2);
-                    return [3 /*break*/, 40];
-                case 39:
-                    progressTracker.stop();
-                    return [7 /*endfinally*/];
-                case 40:
-                    if (!assistantContent) {
-                        assistantContent = buildAssistantCodexErrorMessage(null);
-                    }
-                    finalNow = new Date();
-                    if (isSuperAdmin) {
-                        assistantDebug = buildAssistantDebugPayload({
-                            dataQuestion: dataQuestion,
-                            directive: lastDirective,
-                            directiveSource: directiveSource,
-                            toolResult: toolResult,
-                            toolResponseDebug: toolResponseDebug,
-                            toolError: toolError
-                        });
-                    }
-                    finalMetadata = __assign(__assign(__assign({ model: resolveCodexModel() }, (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*/, 42];
-                    return [4 /*yield*/, ai_terminal_message_collection_1.AiTerminalMessages.updateOne({ _id: assistantMessageId }, {
-                            $set: {
-                                content: assistantContent,
-                                metadata: finalMetadata,
-                                updatedAt: finalNow
+                    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, contextRoute, contextMode, hintSeed, termExpansion, hintText, dbName, db, _a, assistantContext, prompt_1, workspaceRoot, codexConfig, runOptions, responseText, directiveText, directive, directivePrompt, forcedDirective, _b, directivePrompt, forcedDirective, _c, cleanedResponseText, toolRequest, toolResponse, _d, toolPayload, followupPrompt, followupText, _e, error_2, error_3, finalNow, finishedAt, finalMetadata, finalAssistantDoc;
+                        var _f, _g, _h, _j, _k, _l, _m, _o;
+                        return __generator(this, function (_p) {
+                            switch (_p.label) {
+                                case 0:
+                                    runStart = Date.now();
+                                    steps = [];
+                                    recordStep = function (step, details) {
+                                        steps.push({
+                                            step: step,
+                                            at: new Date().toISOString(),
+                                            ms: Date.now() - runStart,
+                                            details: details
+                                        });
+                                    };
+                                    progressTracker = createAssistantProgressTracker(assistantMessageId, initialProgress);
+                                    streamProgress = createAssistantStreamProgressHandler(progressTracker);
+                                    assistantContent = '';
+                                    toolResult = null;
+                                    assistantDebug = null;
+                                    directiveSource = 'none';
+                                    dataQuestion = isAssistantDataQuestion(message);
+                                    lastDirective = null;
+                                    toolResponseDebug = null;
+                                    toolError = null;
+                                    termHints = [];
+                                    collectionHints = [];
+                                    contextRoute = normalizeOptionalString((_f = input === null || input === void 0 ? void 0 : input.context) === null || _f === void 0 ? void 0 : _f.route);
+                                    contextMode = normalizeOptionalString((_g = input === null || input === void 0 ? void 0 : input.context) === null || _g === void 0 ? void 0 : _g.mode);
+                                    recordStep('Queued', { requestId: requestId || undefined });
+                                    _p.label = 1;
+                                case 1:
+                                    _p.trys.push([1, 30, 31, 32]);
+                                    hintSeed = [message, contextRoute].filter(Boolean).join(' ');
+                                    termExpansion = expandAssistantTermSynonyms(hintSeed);
+                                    hintText = termExpansion.expanded || hintSeed;
+                                    termHints = termExpansion.matches.map(function (match) { return "".concat(match.term, " -> ").concat(match.expansions.join(', ')); });
+                                    recordStep('Planning: term expansion', {
+                                        termMatches: termExpansion.matches.length ? termExpansion.matches : undefined
+                                    });
+                                    _p.label = 2;
+                                case 2:
+                                    _p.trys.push([2, 4, , 5]);
+                                    dbName = resolveAssistantDatabaseName(undefined, input.mongo);
+                                    db = resolveio_server_app_1.ResolveIOServer.getMongoConnection().db(dbName);
+                                    return [4 /*yield*/, resolveAssistantCollectionHints(hintText, dbName, db)];
+                                case 3:
+                                    collectionHints = _p.sent();
+                                    return [3 /*break*/, 5];
+                                case 4:
+                                    _a = _p.sent();
+                                    collectionHints = [];
+                                    return [3 /*break*/, 5];
+                                case 5:
+                                    recordStep('Planning: collection hints', {
+                                        contextRoute: contextRoute || undefined,
+                                        contextMode: contextMode || undefined,
+                                        collectionHints: collectionHints.length ? collectionHints : undefined,
+                                        termHints: termHints.length ? termHints : undefined
+                                    });
+                                    assistantContext = buildAssistantContext(input, {
+                                        isSuperAdmin: isSuperAdmin,
+                                        hasInvoiceAccess: hasInvoiceAccess,
+                                        customerId: customerId,
+                                        collectionHints: collectionHints,
+                                        termHints: termHints
+                                    });
+                                    prompt_1 = buildAssistantCodexPrompt(message, attachmentData.promptText, historyLines.join('\n'), assistantContext);
+                                    return [4 /*yield*/, resolveAssistantWorkspaceRoot()];
+                                case 6:
+                                    workspaceRoot = _p.sent();
+                                    codexConfig = resolveCodexSettings();
+                                    runOptions = {
+                                        timeoutMs: resolveCodexTimeoutMs(),
+                                        threadOptions: {
+                                            workingDirectory: workspaceRoot,
+                                            sandboxMode: 'read-only',
+                                            skipGitRepoCheck: true,
+                                            modelReasoningEffort: resolveCodexThoughtLevel(),
+                                            networkAccessEnabled: false,
+                                            webSearchMode: 'disabled',
+                                            webSearchEnabled: false,
+                                            approvalPolicy: 'never'
+                                        }
+                                    };
+                                    responseText = '';
+                                    directiveText = '';
+                                    directive = null;
+                                    if (!dataQuestion) return [3 /*break*/, 10];
+                                    recordStep('Directive: determine tool', { type: 'data-question' });
+                                    directivePrompt = buildAssistantCodexDirectivePrompt(message, attachmentData.promptText, historyLines.join('\n'), assistantContext);
+                                    _p.label = 7;
+                                case 7:
+                                    _p.trys.push([7, 9, , 10]);
+                                    return [4 /*yield*/, runCodexInWorkerThread(directivePrompt, runOptions, codexConfig, streamProgress)];
+                                case 8:
+                                    directiveText = _p.sent();
+                                    forcedDirective = extractAssistantMongoDirective(directiveText);
+                                    if (forcedDirective) {
+                                        directive = forcedDirective;
+                                        directiveSource = 'model';
+                                        lastDirective = forcedDirective;
+                                        recordStep('Directive resolved', {
+                                            source: directiveSource,
+                                            type: directive.type,
+                                            collection: normalizeOptionalString((_h = directive.payload) === null || _h === void 0 ? void 0 : _h.collection) || undefined,
+                                            permissionView: normalizeOptionalString((_j = directive.payload) === null || _j === void 0 ? void 0 : _j.permissionView) || undefined
+                                        });
+                                    }
+                                    return [3 /*break*/, 10];
+                                case 9:
+                                    _b = _p.sent();
+                                    return [3 /*break*/, 10];
+                                case 10:
+                                    if (!!directive) return [3 /*break*/, 12];
+                                    recordStep('Response: draft initial answer', { mode: 'full' });
+                                    return [4 /*yield*/, runCodexInWorkerThread(prompt_1, runOptions, codexConfig, streamProgress)];
+                                case 11:
+                                    responseText = _p.sent();
+                                    directive = extractAssistantMongoDirective(responseText);
+                                    if (directive) {
+                                        directiveSource = 'model';
+                                        lastDirective = directive;
+                                        recordStep('Directive resolved', {
+                                            source: directiveSource,
+                                            type: directive.type,
+                                            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
+                                        });
+                                    }
+                                    _p.label = 12;
+                                case 12:
+                                    if (!(!directive && dataQuestion)) return [3 /*break*/, 16];
+                                    recordStep('Directive: forced retry', { mode: 'directive-only' });
+                                    directivePrompt = buildAssistantCodexDirectivePrompt(message, attachmentData.promptText, historyLines.join('\n'), assistantContext);
+                                    _p.label = 13;
+                                case 13:
+                                    _p.trys.push([13, 15, , 16]);
+                                    return [4 /*yield*/, runCodexInWorkerThread(directivePrompt, runOptions, codexConfig, streamProgress)];
+                                case 14:
+                                    directiveText = _p.sent();
+                                    forcedDirective = extractAssistantMongoDirective(directiveText);
+                                    if (forcedDirective) {
+                                        directive = forcedDirective;
+                                        directiveSource = 'forced';
+                                        lastDirective = forcedDirective;
+                                        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
+                                        });
+                                    }
+                                    return [3 /*break*/, 16];
+                                case 15:
+                                    _c = _p.sent();
+                                    return [3 /*break*/, 16];
+                                case 16:
+                                    cleanedResponseText = (directive === null || directive === void 0 ? void 0 : directive.cleaned) || responseText;
+                                    if (cleanedResponseText) {
+                                        assistantContent = sanitizeAssistantResponse(cleanedResponseText);
+                                    }
+                                    if (!((directive === null || directive === void 0 ? void 0 : directive.payload) && AI_ASSISTANT_TOOL_MAX_STEPS > 0)) return [3 /*break*/, 28];
+                                    toolRequest = buildAssistantToolRequest(directive, input);
+                                    progressTracker.push('Grabbing Data');
+                                    recordStep('Grabbing Data: start', {
+                                        type: directive.type,
+                                        collection: normalizeOptionalString(toolRequest === null || toolRequest === void 0 ? void 0 : toolRequest.collection) || undefined,
+                                        permissionView: normalizeOptionalString(toolRequest === null || toolRequest === void 0 ? void 0 : toolRequest.permissionView) || undefined
+                                    });
+                                    _p.label = 17;
+                                case 17:
+                                    _p.trys.push([17, 26, , 27]);
+                                    if (!(directive.type === 'aggregate')) return [3 /*break*/, 19];
+                                    return [4 /*yield*/, executeAiAssistantMongoAggregate(toolRequest, context)];
+                                case 18:
+                                    _d = _p.sent();
+                                    return [3 /*break*/, 21];
+                                case 19: return [4 /*yield*/, executeAiAssistantMongoRead(toolRequest, context)];
+                                case 20:
+                                    _d = _p.sent();
+                                    _p.label = 21;
+                                case 21:
+                                    toolResponse = _d;
+                                    toolResponseDebug = (toolResponse === null || toolResponse === void 0 ? void 0 : toolResponse.debug) && typeof toolResponse.debug === 'object'
+                                        ? toolResponse.debug
+                                        : null;
+                                    toolPayload = buildAssistantToolResultPayload(directive, toolResponse);
+                                    toolResult = toolPayload.result;
+                                    recordStep('Grabbing Data: complete', {
+                                        rowCount: toolPayload.result.output.rowCount,
+                                        total: toolPayload.result.output.total,
+                                        columns: toolPayload.result.output.columns
+                                    });
+                                    progressTracker.push('Drafting response');
+                                    recordStep('Drafting response');
+                                    followupPrompt = buildAssistantCodexToolFollowupPrompt(message, attachmentData.promptText, historyLines.join('\n'), assistantContext, toolPayload.prompt);
+                                    _p.label = 22;
+                                case 22:
+                                    _p.trys.push([22, 24, , 25]);
+                                    return [4 /*yield*/, runCodexInWorkerThread(followupPrompt, runOptions, codexConfig, streamProgress)];
+                                case 23:
+                                    followupText = _p.sent();
+                                    assistantContent = sanitizeAssistantResponse(followupText);
+                                    return [3 /*break*/, 25];
+                                case 24:
+                                    _e = _p.sent();
+                                    assistantContent = buildAssistantToolFallbackResponse(toolPayload.result);
+                                    return [3 /*break*/, 25];
+                                case 25: return [3 /*break*/, 27];
+                                case 26:
+                                    error_2 = _p.sent();
+                                    assistantContent = buildAssistantToolErrorMessage(error_2, directive, toolRequest);
+                                    toolError = error_2;
+                                    return [3 /*break*/, 27];
+                                case 27: return [3 /*break*/, 29];
+                                case 28:
+                                    progressTracker.push('Drafting response');
+                                    recordStep('Drafting response');
+                                    _p.label = 29;
+                                case 29: return [3 /*break*/, 32];
+                                case 30:
+                                    error_3 = _p.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*/, 32];
+                                case 31:
+                                    progressTracker.stop();
+                                    return [7 /*endfinally*/];
+                                case 32:
+                                    if (!assistantContent) {
+                                        assistantContent = buildAssistantCodexErrorMessage(null);
+                                    }
+                                    finalNow = new Date();
+                                    if (isSuperAdmin) {
+                                        finishedAt = Date.now();
+                                        assistantDebug = buildAssistantDebugPayload({
+                                            dataQuestion: dataQuestion,
+                                            directive: lastDirective,
+                                            directiveSource: directiveSource,
+                                            toolResult: toolResult,
+                                            toolResponseDebug: toolResponseDebug,
+                                            toolError: toolError,
+                                            trace: {
+                                                steps: steps,
+                                                planning: {
+                                                    contextMode: contextMode || undefined,
+                                                    contextRoute: contextRoute || undefined,
+                                                    termHints: termHints.length ? termHints : undefined,
+                                                    collectionHints: collectionHints.length ? collectionHints : undefined
+                                                },
+                                                timings: {
+                                                    startedAt: new Date(runStart).toISOString(),
+                                                    finishedAt: new Date(finishedAt).toISOString(),
+                                                    totalMs: finishedAt - runStart
+                                                }
+                                            }
+                                        });
+                                    }
+                                    finalMetadata = __assign(__assign(__assign({ model: resolveCodexModel() }, (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*/, 34];
+                                    return [4 /*yield*/, ai_terminal_message_collection_1.AiTerminalMessages.updateOne({ _id: assistantMessageId }, {
+                                            $set: {
+                                                content: assistantContent,
+                                                metadata: finalMetadata,
+                                                updatedAt: finalNow
+                                            }
+                                        })];
+                                case 33:
+                                    _p.sent();
+                                    _p.label = 34;
+                                case 34: return [4 /*yield*/, touchConversation(conversation._id, finalNow, assistantMessageId ? String(assistantMessageId) : undefined)];
+                                case 35:
+                                    _p.sent();
+                                    if (!(input.delete_files_after_run !== false)) return [3 /*break*/, 37];
+                                    return [4 /*yield*/, cleanupAttachments(attachmentData.attachments)];
+                                case 36:
+                                    _p.sent();
+                                    _p.label = 37;
+                                case 37: return [2 /*return*/, finalAssistantDoc];
                             }
-                        })];
-                case 41:
-                    _j.sent();
-                    _j.label = 42;
-                case 42: return [4 /*yield*/, touchConversation(conversation._id, finalNow, assistantMessageId ? String(assistantMessageId) : undefined)];
-                case 43:
-                    _j.sent();
-                    if (!(input.delete_files_after_run !== false)) return [3 /*break*/, 45];
-                    return [4 /*yield*/, cleanupAttachments(attachmentData.attachments)];
-                case 44:
-                    _j.sent();
-                    _j.label = 45;
-                case 45: return [2 /*return*/, __assign({ conversation: conversation, message: finalAssistantDoc }, (toolResult ? { tool_result: toolResult } : {}))];
+                        });
+                    }); });
+                    return [2 /*return*/, {
+                            conversation: conversation
+                        }];
             }
         });
     });
 }
 function executeAiAssistantMongoRead(payload, context) {
     return __awaiter(this, void 0, void 0, function () {
-        var input, rawCollection, dbName, db, collectionResolution, collection, _a, user, isSuperAdmin, customerId, baseQuery, userId, normalizedClient, shouldScopeByClient, _b, clientScopedQuery, scopedQuery, normalized, findOptions, documents, executedQuery, fallbackMeta, dateFallback, fallbackQuery, fallbackDocs, total, sanitizedDocuments, includeIds, display;
+        var input, rawCollection, dbName, db, collectionResolution, collection, _a, user, isSuperAdmin, customerId, baseQuery, userId, normalizedClient, shouldScopeByClient, _b, clientScopedQuery, scopedQuery, normalized, findOptions, documents, executedQuery, fallbackMeta, dateFallback, fallbackQuery, fallbackDocs, total, sanitizedDocuments, includeIds, requestedFields, fieldAliases, displayDocs, priorityFields, display;
         var _c, _d;
         return __generator(this, function (_e) {
             switch (_e.label) {
@@ -1227,14 +1422,25 @@ function executeAiAssistantMongoRead(payload, context) {
                         ? documents
                         : documents.map(function (doc) { return redactSensitiveFields((0, common_1.deepCopy)(doc)); });
                     includeIds = ((_d = input.options) === null || _d === void 0 ? void 0 : _d.includeIds) === true;
-                    display = buildDisplayTable(sanitizedDocuments, {
+                    requestedFields = resolveProjectionRequestedFields(normalized.findOptions.projection);
+                    fieldAliases = resolveFieldAliases(sanitizedDocuments, requestedFields);
+                    displayDocs = Object.keys(fieldAliases).length
+                        ? applyFieldAliasesForDisplay(sanitizedDocuments, fieldAliases)
+                        : sanitizedDocuments;
+                    priorityFields = requestedFields.length
+                        ? __spreadArray(__spreadArray([], __read(requestedFields), false), __read(AI_ASSISTANT_DISPLAY_PRIORITY_FIELDS), false) : AI_ASSISTANT_DISPLAY_PRIORITY_FIELDS;
+                    display = buildDisplayTable(displayDocs, {
                         includeIds: includeIds,
                         maxColumns: AI_ASSISTANT_DISPLAY_MAX_COLUMNS,
-                        maxRows: normalized.findOptions.limit
+                        maxRows: normalized.findOptions.limit,
+                        priorityFields: priorityFields
                     });
                     if (total !== null) {
                         display.total = total;
                     }
+                    if (Object.keys(fieldAliases).length) {
+                        fallbackMeta.fieldAliases = fieldAliases;
+                    }
                     return [2 /*return*/, __assign({ documents: sanitizedDocuments, total: total, display: display }, (isSuperAdmin ? {
                             debug: {
                                 collection: collection,
@@ -1623,7 +1829,7 @@ function buildAssistantDebugPayload(params) {
             notes.push("Tool error: ".concat(errorMessage));
         }
     }
-    return {
+    var payload = {
         decision: {
             dataQuestion: params.dataQuestion,
             directiveSource: params.directiveSource
@@ -1647,6 +1853,10 @@ function buildAssistantDebugPayload(params) {
         fallbacks: ((_t = params.toolResponseDebug) === null || _t === void 0 ? void 0 : _t.fallbacks) || undefined,
         notes: notes
     };
+    if (params.trace && typeof params.trace === 'object') {
+        payload.trace = params.trace;
+    }
+    return payload;
 }
 function buildAssistantToolErrorMessage(error, directive, request) {
     var _a, _b;
@@ -1684,7 +1894,7 @@ function deriveAssistantStreamStatus(event) {
         return null;
     }
     if (event.type === 'thread.started' || event.type === 'turn.started') {
-        return 'Reviewing request';
+        return 'Planning';
     }
     if (event.type === 'turn.completed') {
         return 'Drafting response';
@@ -1695,13 +1905,13 @@ function deriveAssistantStreamStatus(event) {
             return null;
         }
         if (itemType === 'mcp_tool_call') {
-            return 'Calling tool';
+            return 'Grabbing Data';
         }
         if (itemType === 'command_execution') {
-            return 'Running command';
+            return 'Grabbing Data';
         }
         if (itemType === 'web_search') {
-            return 'Searching references';
+            return 'Planning';
         }
         if (itemType === 'file_change') {
             return 'Drafting response';
@@ -1710,7 +1920,7 @@ function deriveAssistantStreamStatus(event) {
             return 'Drafting response';
         }
         if (itemType === 'reasoning') {
-            return 'Analyzing';
+            return 'Planning';
         }
     }
     return null;
@@ -1896,6 +2106,219 @@ function normalizeColumnPriorityKey(column) {
     var base = trimmed.includes('.') ? trimmed.split('.').pop() || trimmed : trimmed;
     return base.toLowerCase();
 }
+function tokenizeFieldKey(value) {
+    var normalized = String(value || '')
+        .replace(/([a-z0-9])([A-Z])/g, '$1 $2')
+        .replace(/[^a-zA-Z0-9]+/g, ' ')
+        .trim()
+        .toLowerCase();
+    return normalized ? normalized.split(/\s+/).filter(Boolean) : [];
+}
+function normalizeFieldMatchKey(value) {
+    return tokenizeFieldKey(value).join('');
+}
+function getValueAtPath(obj, path) {
+    var e_1, _a;
+    if (!obj || typeof obj !== 'object') {
+        return undefined;
+    }
+    var parts = String(path || '').split('.').filter(Boolean);
+    var current = obj;
+    try {
+        for (var parts_1 = __values(parts), parts_1_1 = parts_1.next(); !parts_1_1.done; parts_1_1 = parts_1.next()) {
+            var part = parts_1_1.value;
+            if (!current || typeof current !== 'object') {
+                return undefined;
+            }
+            current = current[part];
+        }
+    }
+    catch (e_1_1) { e_1 = { error: e_1_1 }; }
+    finally {
+        try {
+            if (parts_1_1 && !parts_1_1.done && (_a = parts_1.return)) _a.call(parts_1);
+        }
+        finally { if (e_1) throw e_1.error; }
+    }
+    return current;
+}
+function hasNonEmptyValue(docs, fieldPath, options) {
+    var e_2, _a;
+    if (!Array.isArray(docs) || !fieldPath) {
+        return false;
+    }
+    var usePath = fieldPath.includes('.');
+    try {
+        for (var docs_1 = __values(docs), docs_1_1 = docs_1.next(); !docs_1_1.done; docs_1_1 = docs_1.next()) {
+            var doc = docs_1_1.value;
+            var value = usePath ? getValueAtPath(doc, fieldPath) : doc === null || doc === void 0 ? void 0 : doc[fieldPath];
+            if ((options === null || options === void 0 ? void 0 : options.treatObjectLikeAsEmpty) && isDisplayObjectLike(value)) {
+                continue;
+            }
+            if (!isEmptyDisplayValue(value)) {
+                return true;
+            }
+        }
+    }
+    catch (e_2_1) { e_2 = { error: e_2_1 }; }
+    finally {
+        try {
+            if (docs_1_1 && !docs_1_1.done && (_a = docs_1.return)) _a.call(docs_1);
+        }
+        finally { if (e_2) throw e_2.error; }
+    }
+    return false;
+}
+function collectFieldCandidates(docs) {
+    var candidates = new Map();
+    if (!Array.isArray(docs)) {
+        return candidates;
+    }
+    var addCandidate = function (path, value) {
+        if (!path) {
+            return;
+        }
+        var entry = candidates.get(path) || {
+            nonEmpty: 0,
+            objectLike: 0,
+            normalized: normalizeFieldMatchKey(path)
+        };
+        if (!isEmptyDisplayValue(value)) {
+            entry.nonEmpty += 1;
+        }
+        if (isDisplayObjectLike(value)) {
+            entry.objectLike += 1;
+        }
+        candidates.set(path, entry);
+    };
+    docs.forEach(function (doc) {
+        if (!doc || typeof doc !== 'object') {
+            return;
+        }
+        Object.keys(doc).forEach(function (key) {
+            if (!key) {
+                return;
+            }
+            var value = doc[key];
+            addCandidate(key, value);
+            if (isPlainObject(value) && !isMongoObjectId(value) && !(value instanceof Date)) {
+                var nestedKeys = Object.keys(value).slice(0, 50);
+                nestedKeys.forEach(function (nestedKey) {
+                    if (!nestedKey) {
+                        return;
+                    }
+                    addCandidate("".concat(key, ".").concat(nestedKey), value[nestedKey]);
+                });
+            }
+        });
+    });
+    return candidates;
+}
+function resolveFieldAliases(docs, requestedFields) {
+    var aliases = {};
+    if (!Array.isArray(docs) || !requestedFields.length) {
+        return aliases;
+    }
+    var missing = requestedFields.filter(function (field) { return field && !hasNonEmptyValue(docs, field, { treatObjectLikeAsEmpty: true }); });
+    if (!missing.length) {
+        return aliases;
+    }
+    var candidates = collectFieldCandidates(docs);
+    missing.forEach(function (field) {
+        var normalizedRequested = normalizeFieldMatchKey(field);
+        if (!normalizedRequested) {
+            return;
+        }
+        var bestPath = '';
+        var bestScore = 0;
+        candidates.forEach(function (stats, path) {
+            if (!path || stats.nonEmpty === 0) {
+                return;
+            }
+            if (isAssistantIdField(path)) {
+                return;
+            }
+            var normalizedCandidate = stats.normalized || normalizeFieldMatchKey(path);
+            if (!normalizedCandidate) {
+                return;
+            }
+            var score = 0;
+            if (normalizedCandidate === normalizedRequested) {
+                score = 100;
+            }
+            else if (normalizedCandidate.includes(normalizedRequested) || normalizedRequested.includes(normalizedCandidate)) {
+                score = 70;
+            }
+            else {
+                var candidateTokens_1 = tokenizeFieldKey(path);
+                var requestedTokens = tokenizeFieldKey(field);
+                var overlap = requestedTokens.filter(function (token) { return candidateTokens_1.includes(token); }).length;
+                if (overlap > 0) {
+                    score = 40 + overlap * 5;
+                }
+            }
+            var objectRatio = stats.objectLike / Math.max(stats.nonEmpty, 1);
+            if (objectRatio > 0.5) {
+                score -= 50;
+            }
+            if (score > bestScore) {
+                bestScore = score;
+                bestPath = path;
+            }
+        });
+        if (bestPath && bestScore >= 60) {
+            aliases[field] = bestPath;
+        }
+    });
+    return aliases;
+}
+function applyFieldAliasesForDisplay(docs, aliases) {
+    if (!Array.isArray(docs) || !aliases || !Object.keys(aliases).length) {
+        return docs;
+    }
+    return docs.map(function (doc) {
+        var next = __assign({}, doc);
+        Object.keys(aliases).forEach(function (targetField) {
+            var sourcePath = aliases[targetField];
+            if (!sourcePath) {
+                return;
+            }
+            var existing = targetField.includes('.') ? getValueAtPath(doc, targetField) : doc === null || doc === void 0 ? void 0 : doc[targetField];
+            if (!isEmptyDisplayValue(existing)) {
+                return;
+            }
+            var value = getValueAtPath(doc, sourcePath);
+            if (value !== undefined) {
+                next[targetField] = value;
+            }
+        });
+        return next;
+    });
+}
+function resolveProjectionRequestedFields(projection) {
+    if (!projection || typeof projection !== 'object') {
+        return [];
+    }
+    var keys = Object.keys(projection);
+    if (!keys.length) {
+        return [];
+    }
+    var hasInclude = false;
+    var hasExclude = false;
+    keys.forEach(function (key) {
+        var value = projection[key];
+        if (value === 0 || value === false) {
+            hasExclude = true;
+        }
+        else if (value === 1 || value === true) {
+            hasInclude = true;
+        }
+    });
+    if (!hasInclude || hasExclude) {
+        return [];
+    }
+    return keys.filter(function (key) { return !isAssistantIdField(key); });
+}
 function formatDisplayColumnName(column) {
     var trimmed = String(column || '').trim();
     if (!trimmed) {
@@ -1914,7 +2337,22 @@ function formatDisplayColumnName(column) {
     if (normalized === 'updatedat') {
         return 'Updated At';
     }
-    return trimmed;
+    var parts = trimmed.split('.');
+    var base = parts[parts.length - 1] || trimmed;
+    if ((base === 'name' || base === 'title' || base === 'label') && parts.length > 1) {
+        return parts[parts.length - 2]
+            .replace(/[_-]+/g, ' ')
+            .replace(/([a-z0-9])([A-Z])/g, '$1 $2')
+            .replace(/\s+/g, ' ')
+            .trim()
+            .replace(/\b\w/g, function (char) { return char.toUpperCase(); });
+    }
+    return base
+        .replace(/[_-]+/g, ' ')
+        .replace(/([a-z0-9])([A-Z])/g, '$1 $2')
+        .replace(/\s+/g, ' ')
+        .trim()
+        .replace(/\b\w/g, function (char) { return char.toUpperCase(); });
 }
 function truncateDisplayText(value, maxLength) {
     if (maxLength === void 0) { maxLength = AI_ASSISTANT_DISPLAY_STRING_LIMIT; }
@@ -2410,7 +2848,7 @@ function matchContainsField(value, field) {
     });
 }
 function resolveAggregateCompletionFallback(pipeline) {
-    var e_1, _a;
+    var e_3, _a;
     if (!Array.isArray(pipeline)) {
         return null;
     }
@@ -2423,7 +2861,7 @@ function resolveAggregateCompletionFallback(pipeline) {
         }
         var addFields = stage.$addFields;
         try {
-            for (var _b = (e_1 = void 0, __values(Object.keys(addFields))), _c = _b.next(); !_c.done; _c = _b.next()) {
+            for (var _b = (e_3 = void 0, __values(Object.keys(addFields))), _c = _b.next(); !_c.done; _c = _b.next()) {
                 var key = _c.value;
                 if (!isCompletionFieldName(key)) {
                     continue;
@@ -2437,12 +2875,12 @@ function resolveAggregateCompletionFallback(pipeline) {
                 }
             }
         }
-        catch (e_1_1) { e_1 = { error: e_1_1 }; }
+        catch (e_3_1) { e_3 = { error: e_3_1 }; }
         finally {
             try {
                 if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
             }
-            finally { if (e_1) throw e_1.error; }
+            finally { if (e_3) throw e_3.error; }
         }
         if (candidateField) {
             break;
@@ -2809,6 +3247,27 @@ function tokenizeCollectionText(value) {
     });
     return Array.from(new Set(tokens));
 }
+function expandAssistantTermSynonyms(text) {
+    var base = normalizeOptionalString(text);
+    if (!base) {
+        return { expanded: '', matches: [] };
+    }
+    var expanded = base;
+    var matches = [];
+    AI_ASSISTANT_TERM_SYNONYMS.forEach(function (entry) {
+        if (!entry.pattern.test(base)) {
+            return;
+        }
+        var existing = expanded.toLowerCase();
+        entry.expansions.forEach(function (expansion) {
+            if (expansion && !existing.includes(expansion.toLowerCase())) {
+                expanded = "".concat(expanded, " ").concat(expansion);
+            }
+        });
+        matches.push({ term: entry.label, expansions: entry.expansions });
+    });
+    return { expanded: expanded, matches: matches };
+}
 function listAssistantCollections(db, dbName) {
     return __awaiter(this, void 0, void 0, function () {
         var cacheKey, cached, now, collections, names, _a;
@@ -2940,7 +3399,7 @@ function resolveAssistantCollectionHints(message, dbName, db) {
     });
 }
 function findQueryDateField(query) {
-    var e_2, _a, e_3, _b;
+    var e_4, _a, e_5, _b;
     if (!query || typeof query !== 'object') {
         return null;
     }
@@ -2954,12 +3413,12 @@ function findQueryDateField(query) {
                 }
             }
         }
-        catch (e_2_1) { e_2 = { error: e_2_1 }; }
+        catch (e_4_1) { e_4 = { error: e_4_1 }; }
         finally {
             try {
                 if (query_1_1 && !query_1_1.done && (_a = query_1.return)) _a.call(query_1);
             }
-            finally { if (e_2) throw e_2.error; }
+            finally { if (e_4) throw e_4.error; }
         }
         return null;
     }
@@ -2978,12 +3437,12 @@ function findQueryDateField(query) {
             }
         }
     }
-    catch (e_3_1) { e_3 = { error: e_3_1 }; }
+    catch (e_5_1) { e_5 = { error: e_5_1 }; }
     finally {
         try {
             if (_d && !_d.done && (_b = _c.return)) _b.call(_c);
         }
-        finally { if (e_3) throw e_3.error; }
+        finally { if (e_5) throw e_5.error; }
     }
     return null;
 }
@@ -3013,7 +3472,7 @@ function resolveQueryDateFieldFallback(query) {
     return { from: dateField, to: fallback };
 }
 function containsForbiddenMongoOperators(value) {
-    var e_4, _a;
+    var e_6, _a;
     if (!value || typeof value !== 'object') {
         return false;
     }
@@ -3032,12 +3491,12 @@ function containsForbiddenMongoOperators(value) {
             }
         }
     }
-    catch (e_4_1) { e_4 = { error: e_4_1 }; }
+    catch (e_6_1) { e_6 = { error: e_6_1 }; }
     finally {
         try {
             if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
         }
-        finally { if (e_4) throw e_4.error; }
+        finally { if (e_6) throw e_6.error; }
     }
     return false;
 }
@@ -3271,8 +3730,8 @@ function applyCodexStreamStatusHandler(runOptions, streamStatusHandler) {
 }
 function waitForCodexWorkerMessage(worker, streamStatusHandler) {
     return __awaiter(this, void 0, void 0, function () {
-        var _a, _b, _c, _d, message, payload, status_1, e_5_1;
-        var _e, e_5, _f, _g;
+        var _a, _b, _c, _d, message, payload, status_1, e_7_1;
+        var _e, e_7, _f, _g;
         return __generator(this, function (_h) {
             switch (_h.label) {
                 case 0:
@@ -3299,8 +3758,8 @@ function waitForCodexWorkerMessage(worker, streamStatusHandler) {
                     return [3 /*break*/, 1];
                 case 4: return [3 /*break*/, 11];
                 case 5:
-                    e_5_1 = _h.sent();
-                    e_5 = { error: e_5_1 };
+                    e_7_1 = _h.sent();
+                    e_7 = { error: e_7_1 };
                     return [3 /*break*/, 11];
                 case 6:
                     _h.trys.push([6, , 9, 10]);
@@ -3311,7 +3770,7 @@ function waitForCodexWorkerMessage(worker, streamStatusHandler) {
                     _h.label = 8;
                 case 8: return [3 /*break*/, 10];
                 case 9:
-                    if (e_5) throw e_5.error;
+                    if (e_7) throw e_7.error;
                     return [7 /*endfinally*/];
                 case 10: return [7 /*endfinally*/];
                 case 11: throw new CodexWorkerBootstrapError('Codex worker exited before completing.');
@@ -3321,7 +3780,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_3, codexClient;
+        var streamedOptions, codexClient, workerPath, codexClient, error_4, codexClient;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -3342,11 +3801,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_3 = _a.sent();
-                    if (!(error_3 instanceof CodexWorkerBootstrapError)) {
-                        throw error_3;
+                    error_4 = _a.sent();
+                    if (!(error_4 instanceof CodexWorkerBootstrapError)) {
+                        throw error_4;
                     }
-                    console.error('Codex worker bootstrap failed, falling back to in-process run.', error_3);
+                    console.error('Codex worker bootstrap failed, falling back to in-process run.', error_4);
                     codexClient = getAssistantCodexClient();
                     return [4 /*yield*/, codexClient.run(prompt, streamedOptions)];
                 case 8: return [2 /*return*/, _a.sent()];
@@ -3384,7 +3843,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_4;
+                        var error_5;
                         return __generator(this, function (_a) {
                             switch (_a.label) {
                                 case 0:
@@ -3394,11 +3853,11 @@ function runCodexInWorkerThreadInternal(workerPath, prompt, runOptions, config,
                                     _a.sent();
                                     return [2 /*return*/, { type: 'timeout' }];
                                 case 2:
-                                    error_4 = _a.sent();
-                                    if ((error_4 === null || error_4 === void 0 ? void 0 : error_4.name) === 'AbortError') {
+                                    error_5 = _a.sent();
+                                    if ((error_5 === null || error_5 === void 0 ? void 0 : error_5.name) === 'AbortError') {
                                         return [2 /*return*/, { type: 'aborted' }];
                                     }
-                                    throw error_4;
+                                    throw error_5;
                                 case 3: return [2 /*return*/];
                             }
                         });
@@ -3663,6 +4122,12 @@ function buildAssistantContext(input, userContext) {
     if (collectionHints.length) {
         lines.push("Collection hints: ".concat(collectionHints.join(', ')));
     }
+    var termHints = Array.isArray(userContext === null || userContext === void 0 ? void 0 : userContext.termHints)
+        ? userContext === null || userContext === void 0 ? void 0 : userContext.termHints.filter(Boolean)
+        : [];
+    if (termHints.length) {
+        lines.push("Term hints: ".concat(termHints.join('; ')));
+    }
     var mongoDb = normalizeOptionalString((_c = input === null || input === void 0 ? void 0 : input.mongo) === null || _c === void 0 ? void 0 : _c.database);
     var mongoDbs = Array.isArray((_d = input === null || input === void 0 ? void 0 : input.mongo) === null || _d === void 0 ? void 0 : _d.databases)
         ? input.mongo.databases.map(function (value) { return normalizeOptionalString(value); }).filter(Boolean)
@@ -3693,7 +4158,7 @@ function normalizeRouteMatchKey(value) {
     return normalizeRouteKey(value).toLowerCase();
 }
 function buildClientRouteIndex() {
-    var e_6, _a;
+    var e_8, _a;
     var _b;
     var routes = ((_b = resolveio_server_app_1.ResolveIOServer.getClientRoutes) === null || _b === void 0 ? void 0 : _b.call(resolveio_server_app_1.ResolveIOServer)) || [];
     var set = new Set();
@@ -3712,12 +4177,12 @@ function buildClientRouteIndex() {
             }
         }
     }
-    catch (e_6_1) { e_6 = { error: e_6_1 }; }
+    catch (e_8_1) { e_8 = { error: e_8_1 }; }
     finally {
         try {
             if (routes_1_1 && !routes_1_1.done && (_a = routes_1.return)) _a.call(routes_1);
         }
-        finally { if (e_6) throw e_6.error; }
+        finally { if (e_8) throw e_8.error; }
     }
     return { set: set, map: map, size: routes.length };
 }
@@ -3843,7 +4308,7 @@ function sanitizeAssistantResponse(value) {
     return normalizeAssistantRoutes(normalizedCurrency);
 }
 function evaluateAssistantGuardrails(message) {
-    var e_7, _a;
+    var e_9, _a;
     var normalized = String(message || '').toLowerCase();
     var patterns = [
         {
@@ -3889,12 +4354,12 @@ function evaluateAssistantGuardrails(message) {
             }
         }
     }
-    catch (e_7_1) { e_7 = { error: e_7_1 }; }
+    catch (e_9_1) { e_9 = { error: e_9_1 }; }
     finally {
         try {
             if (patterns_1_1 && !patterns_1_1.done && (_a = patterns_1.return)) _a.call(patterns_1);
         }
-        finally { if (e_7) throw e_7.error; }
+        finally { if (e_9) throw e_9.error; }
     }
     return null;
 }
@@ -4058,8 +4523,8 @@ function handleCodexUpload(id_conversation, file_name, content_base64, size, con
 }
 function readAttachmentContents(attachments) {
     return __awaiter(this, void 0, void 0, function () {
-        var limits, totalBytes, totalChars, chunks, cleaned, attachments_1, attachments_1_1, attachment, localPath, safe, stat, ext, name_1, type, readable, content, _a, e_8_1;
-        var e_8, _b;
+        var limits, totalBytes, totalChars, chunks, cleaned, attachments_1, attachments_1_1, attachment, localPath, safe, stat, ext, name_1, type, readable, content, _a, e_10_1;
+        var e_10, _b;
         return __generator(this, function (_c) {
             switch (_c.label) {
                 case 0:
@@ -4138,14 +4603,14 @@ function readAttachmentContents(attachments) {
                     return [3 /*break*/, 2];
                 case 10: return [3 /*break*/, 13];
                 case 11:
-                    e_8_1 = _c.sent();
-                    e_8 = { error: e_8_1 };
+                    e_10_1 = _c.sent();
+                    e_10 = { error: e_10_1 };
                     return [3 /*break*/, 13];
                 case 12:
                     try {
                         if (attachments_1_1 && !attachments_1_1.done && (_b = attachments_1.return)) _b.call(attachments_1);
                     }
-                    finally { if (e_8) throw e_8.error; }
+                    finally { if (e_10) throw e_10.error; }
                     return [7 /*endfinally*/];
                 case 13: return [2 /*return*/, {
                         promptText: chunks.length ? "\n\nAttachments:\n".concat(chunks.join('\n\n')) : '',
@@ -4322,7 +4787,7 @@ function estimateUsage(messages, responseText, model) {
     };
 }
 function evaluateGuardrails(message) {
-    var e_9, _a;
+    var e_11, _a;
     var normalized = String(message || '').toLowerCase();
     var patterns = [
         { pattern: /\b(source\s*code|full\s*code|entire\s*code|repo\s*dump|repository|git\s*clone)\b/i, reason: 'Code access is restricted.' },
@@ -4344,12 +4809,12 @@ function evaluateGuardrails(message) {
             }
         }
     }
-    catch (e_9_1) { e_9 = { error: e_9_1 }; }
+    catch (e_11_1) { e_11 = { error: e_11_1 }; }
     finally {
         try {
             if (patterns_2_1 && !patterns_2_1.done && (_a = patterns_2.return)) _a.call(patterns_2);
         }
-        finally { if (e_9) throw e_9.error; }
+        finally { if (e_11) throw e_11.error; }
     }
     return null;
 }