@resolveio/server-lib 20.15.5 → 20.15.6

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 = [
@@ -256,6 +257,7 @@ 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.',
     '- 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.',
@@ -264,7 +266,9 @@ 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).',
@@ -308,6 +312,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 +332,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 +929,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 +948,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 +968,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 +982,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 +1013,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 +1022,7 @@ function executeAiAssistantCodexRun(payload, context) {
                         createdAt: now,
                         updatedAt: now
                     };
-                    initialProgress = ['Thinking'];
+                    initialProgress = ['Planning'];
                     assistantDoc = {
                         id_conversation: conversation._id,
                         role: 'assistant',
@@ -999,147 +1032,227 @@ 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 progressTracker, streamProgress, assistantContent, toolResult, assistantDebug, directiveSource, dataQuestion, lastDirective, toolResponseDebug, toolError, collectionHints, dbName, db, hintText, _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, finalMetadata, finalAssistantDoc;
+                        var _f;
+                        return __generator(this, function (_g) {
+                            switch (_g.label) {
+                                case 0:
+                                    progressTracker = createAssistantProgressTracker(assistantMessageId, initialProgress);
+                                    streamProgress = createAssistantStreamProgressHandler(progressTracker);
+                                    assistantContent = '';
+                                    toolResult = null;
+                                    assistantDebug = null;
+                                    directiveSource = 'none';
+                                    dataQuestion = isAssistantDataQuestion(message);
+                                    lastDirective = null;
+                                    toolResponseDebug = null;
+                                    toolError = null;
+                                    _g.label = 1;
+                                case 1:
+                                    _g.trys.push([1, 30, 31, 32]);
+                                    collectionHints = [];
+                                    _g.label = 2;
+                                case 2:
+                                    _g.trys.push([2, 4, , 5]);
+                                    dbName = resolveAssistantDatabaseName(undefined, input.mongo);
+                                    db = resolveio_server_app_1.ResolveIOServer.getMongoConnection().db(dbName);
+                                    hintText = [
+                                        message,
+                                        normalizeOptionalString((_f = input === null || input === void 0 ? void 0 : input.context) === null || _f === void 0 ? void 0 : _f.route)
+                                    ].filter(Boolean).join(' ');
+                                    return [4 /*yield*/, resolveAssistantCollectionHints(hintText, dbName, db)];
+                                case 3:
+                                    collectionHints = _g.sent();
+                                    return [3 /*break*/, 5];
+                                case 4:
+                                    _a = _g.sent();
+                                    collectionHints = [];
+                                    return [3 /*break*/, 5];
+                                case 5:
+                                    assistantContext = buildAssistantContext(input, {
+                                        isSuperAdmin: isSuperAdmin,
+                                        hasInvoiceAccess: hasInvoiceAccess,
+                                        customerId: customerId,
+                                        collectionHints: collectionHints
+                                    });
+                                    prompt_1 = buildAssistantCodexPrompt(message, attachmentData.promptText, historyLines.join('\n'), assistantContext);
+                                    return [4 /*yield*/, resolveAssistantWorkspaceRoot()];
+                                case 6:
+                                    workspaceRoot = _g.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];
+                                    directivePrompt = buildAssistantCodexDirectivePrompt(message, attachmentData.promptText, historyLines.join('\n'), assistantContext);
+                                    _g.label = 7;
+                                case 7:
+                                    _g.trys.push([7, 9, , 10]);
+                                    return [4 /*yield*/, runCodexInWorkerThread(directivePrompt, runOptions, codexConfig, streamProgress)];
+                                case 8:
+                                    directiveText = _g.sent();
+                                    forcedDirective = extractAssistantMongoDirective(directiveText);
+                                    if (forcedDirective) {
+                                        directive = forcedDirective;
+                                        directiveSource = 'model';
+                                        lastDirective = forcedDirective;
+                                    }
+                                    return [3 /*break*/, 10];
+                                case 9:
+                                    _b = _g.sent();
+                                    return [3 /*break*/, 10];
+                                case 10:
+                                    if (!!directive) return [3 /*break*/, 12];
+                                    return [4 /*yield*/, runCodexInWorkerThread(prompt_1, runOptions, codexConfig, streamProgress)];
+                                case 11:
+                                    responseText = _g.sent();
+                                    directive = extractAssistantMongoDirective(responseText);
+                                    if (directive) {
+                                        directiveSource = 'model';
+                                        lastDirective = directive;
+                                    }
+                                    _g.label = 12;
+                                case 12:
+                                    if (!(!directive && dataQuestion)) return [3 /*break*/, 16];
+                                    directivePrompt = buildAssistantCodexDirectivePrompt(message, attachmentData.promptText, historyLines.join('\n'), assistantContext);
+                                    _g.label = 13;
+                                case 13:
+                                    _g.trys.push([13, 15, , 16]);
+                                    return [4 /*yield*/, runCodexInWorkerThread(directivePrompt, runOptions, codexConfig, streamProgress)];
+                                case 14:
+                                    directiveText = _g.sent();
+                                    forcedDirective = extractAssistantMongoDirective(directiveText);
+                                    if (forcedDirective) {
+                                        directive = forcedDirective;
+                                        directiveSource = 'forced';
+                                        lastDirective = forcedDirective;
+                                    }
+                                    return [3 /*break*/, 16];
+                                case 15:
+                                    _c = _g.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');
+                                    _g.label = 17;
+                                case 17:
+                                    _g.trys.push([17, 26, , 27]);
+                                    if (!(directive.type === 'aggregate')) return [3 /*break*/, 19];
+                                    return [4 /*yield*/, executeAiAssistantMongoAggregate(toolRequest, context)];
+                                case 18:
+                                    _d = _g.sent();
+                                    return [3 /*break*/, 21];
+                                case 19: return [4 /*yield*/, executeAiAssistantMongoRead(toolRequest, context)];
+                                case 20:
+                                    _d = _g.sent();
+                                    _g.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;
+                                    progressTracker.push('Drafting response');
+                                    followupPrompt = buildAssistantCodexToolFollowupPrompt(message, attachmentData.promptText, historyLines.join('\n'), assistantContext, toolPayload.prompt);
+                                    _g.label = 22;
+                                case 22:
+                                    _g.trys.push([22, 24, , 25]);
+                                    return [4 /*yield*/, runCodexInWorkerThread(followupPrompt, runOptions, codexConfig, streamProgress)];
+                                case 23:
+                                    followupText = _g.sent();
+                                    assistantContent = sanitizeAssistantResponse(followupText);
+                                    return [3 /*break*/, 25];
+                                case 24:
+                                    _e = _g.sent();
+                                    assistantContent = buildAssistantToolFallbackResponse(toolPayload.result);
+                                    return [3 /*break*/, 25];
+                                case 25: return [3 /*break*/, 27];
+                                case 26:
+                                    error_2 = _g.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');
+                                    _g.label = 29;
+                                case 29: return [3 /*break*/, 32];
+                                case 30:
+                                    error_3 = _g.sent();
+                                    assistantContent = buildAssistantCodexErrorMessage(error_3);
+                                    return [3 /*break*/, 32];
+                                case 31:
+                                    progressTracker.stop();
+                                    return [7 /*endfinally*/];
+                                case 32:
+                                    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*/, 34];
+                                    return [4 /*yield*/, ai_terminal_message_collection_1.AiTerminalMessages.updateOne({ _id: assistantMessageId }, {
+                                            $set: {
+                                                content: assistantContent,
+                                                metadata: finalMetadata,
+                                                updatedAt: finalNow
+                                            }
+                                        })];
+                                case 33:
+                                    _g.sent();
+                                    _g.label = 34;
+                                case 34: return [4 /*yield*/, touchConversation(conversation._id, finalNow, assistantMessageId ? String(assistantMessageId) : undefined)];
+                                case 35:
+                                    _g.sent();
+                                    if (!(input.delete_files_after_run !== false)) return [3 /*break*/, 37];
+                                    return [4 /*yield*/, cleanupAttachments(attachmentData.attachments)];
+                                case 36:
+                                    _g.sent();
+                                    _g.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
+                        }];
             }
         });
     });
@@ -1684,7 +1797,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 +1808,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 +1823,7 @@ function deriveAssistantStreamStatus(event) {
             return 'Drafting response';
         }
         if (itemType === 'reasoning') {
-            return 'Analyzing';
+            return 'Planning';
         }
     }
     return null;
@@ -3321,7 +3434,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 +3455,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 +3497,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 +3507,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*/];
                             }
                         });