@resolveio/server-lib 20.14.46 → 20.14.47

package/methods/ai-terminal.js

@@ -134,6 +134,13 @@ 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_TICK_MS = 8000;
+var AI_ASSISTANT_PROGRESS_TICKS = [
+    'Reviewing context',
+    'Checking data',
+    'Drafting response'
+];
 var AI_ASSISTANT_DISPLAY_PRIORITY_FIELDS = [
     'name',
     'title',
@@ -781,7 +788,7 @@ function executeAiFormPatch(payload, context) {
 }
 function executeAiAssistantCodexRun(payload, context) {
     return __awaiter(this, void 0, void 0, function () {
-        var input, message, guardrail, conversation_2, now_2, userMsg, assistantMsg, user, isSuperAdmin, hasInvoiceAccess, customerId, conversation, now, attachments, attachmentData, historyLimit, history, _a, historyLines, assistantContext, prompt, workspaceRoot, codexConfig, runOptions, responseText, directive, cleanedResponseText, assistantContent, toolResult, toolRequest, toolResponse, _b, toolPayload, followupPrompt, followupText, _c, error_1, userDoc, assistantDoc, insertResult;
+        var input, message, guardrail, conversation_2, now_2, userMsg, assistantMsg, user, isSuperAdmin, hasInvoiceAccess, customerId, conversation, now, attachments, attachmentData, historyLimit, history, _a, historyLines, assistantContext, prompt, workspaceRoot, codexConfig, runOptions, userDoc, initialProgress, assistantDoc, insertResult, assistantMessageId, progressTracker, assistantContent, toolResult, responseText, directive, cleanedResponseText, toolRequest, toolResponse, _b, toolPayload, followupPrompt, followupText, _c, error_1, error_2, finalNow, finalMetadata, finalAssistantDoc;
         var _d, _e;
         return __generator(this, function (_f) {
             switch (_f.label) {
@@ -884,86 +891,123 @@ function executeAiAssistantCodexRun(payload, context) {
                             approvalPolicy: 'never'
                         }
                     };
-                    return [4 /*yield*/, runCodexInWorkerThread(prompt, runOptions, codexConfig)];
+                    userDoc = {
+                        id_conversation: conversation._id,
+                        role: 'user',
+                        content: message,
+                        attachments: attachmentData.attachments,
+                        createdAt: now,
+                        updatedAt: now
+                    };
+                    initialProgress = ['Thinking'];
+                    assistantDoc = {
+                        id_conversation: conversation._id,
+                        role: 'assistant',
+                        content: AI_ASSISTANT_PROGRESS_PLACEHOLDER,
+                        metadata: {
+                            model: resolveCodexModel(),
+                            pending: true,
+                            progress: initialProgress
+                        },
+                        createdAt: now,
+                        updatedAt: now
+                    };
+                    return [4 /*yield*/, ai_terminal_message_collection_1.AiTerminalMessages.insertOne(userDoc)];
                 case 13:
+                    _f.sent();
+                    return [4 /*yield*/, ai_terminal_message_collection_1.AiTerminalMessages.insertOne(assistantDoc)];
+                case 14:
+                    insertResult = _f.sent();
+                    assistantMessageId = (insertResult === null || insertResult === void 0 ? void 0 : insertResult._id) || (insertResult === null || insertResult === void 0 ? void 0 : insertResult.insertedId);
+                    progressTracker = createAssistantProgressTracker(assistantMessageId, initialProgress);
+                    assistantContent = '';
+                    toolResult = null;
+                    _f.label = 15;
+                case 15:
+                    _f.trys.push([15, 30, 31, 32]);
+                    return [4 /*yield*/, runCodexInWorkerThread(prompt, runOptions, codexConfig)];
+                case 16:
                     responseText = _f.sent();
                     directive = extractAssistantMongoDirective(responseText);
                     cleanedResponseText = (directive === null || directive === void 0 ? void 0 : directive.cleaned) || responseText;
                     assistantContent = sanitizeAssistantResponse(cleanedResponseText);
-                    toolResult = null;
-                    if (!((directive === null || directive === void 0 ? void 0 : directive.payload) && AI_ASSISTANT_TOOL_MAX_STEPS > 0)) return [3 /*break*/, 24];
+                    if (!((directive === null || directive === void 0 ? void 0 : directive.payload) && AI_ASSISTANT_TOOL_MAX_STEPS > 0)) return [3 /*break*/, 28];
                     toolRequest = buildAssistantToolRequest(directive, input);
-                    _f.label = 14;
-                case 14:
-                    _f.trys.push([14, 23, , 24]);
-                    if (!(directive.type === 'aggregate')) return [3 /*break*/, 16];
+                    progressTracker.push(directive.type === 'aggregate' ? 'Running Mongo aggregation' : 'Running Mongo read');
+                    _f.label = 17;
+                case 17:
+                    _f.trys.push([17, 26, , 27]);
+                    if (!(directive.type === 'aggregate')) return [3 /*break*/, 19];
                     return [4 /*yield*/, executeAiAssistantMongoAggregate(toolRequest, context)];
-                case 15:
+                case 18:
                     _b = _f.sent();
-                    return [3 /*break*/, 18];
-                case 16: return [4 /*yield*/, executeAiAssistantMongoRead(toolRequest, context)];
-                case 17:
+                    return [3 /*break*/, 21];
+                case 19: return [4 /*yield*/, executeAiAssistantMongoRead(toolRequest, context)];
+                case 20:
                     _b = _f.sent();
-                    _f.label = 18;
-                case 18:
+                    _f.label = 21;
+                case 21:
                     toolResponse = _b;
                     toolPayload = buildAssistantToolResultPayload(directive, toolResponse);
                     toolResult = toolPayload.result;
+                    progressTracker.push('Summarizing results');
                     followupPrompt = buildAssistantCodexToolFollowupPrompt(message, attachmentData.promptText, historyLines.join('\n'), assistantContext, toolPayload.prompt);
-                    _f.label = 19;
-                case 19:
-                    _f.trys.push([19, 21, , 22]);
+                    _f.label = 22;
+                case 22:
+                    _f.trys.push([22, 24, , 25]);
                     return [4 /*yield*/, runCodexInWorkerThread(followupPrompt, runOptions, codexConfig)];
-                case 20:
+                case 23:
                     followupText = _f.sent();
                     assistantContent = sanitizeAssistantResponse(followupText);
-                    return [3 /*break*/, 22];
-                case 21:
+                    return [3 /*break*/, 25];
+                case 24:
                     _c = _f.sent();
                     assistantContent = buildAssistantToolFallbackResponse(toolPayload.result);
-                    return [3 /*break*/, 22];
-                case 22: return [3 /*break*/, 24];
-                case 23:
+                    return [3 /*break*/, 25];
+                case 25: return [3 /*break*/, 27];
+                case 26:
                     error_1 = _f.sent();
                     assistantContent = buildAssistantToolErrorMessage(error_1, directive, toolRequest);
-                    return [3 /*break*/, 24];
-                case 24:
-                    userDoc = {
-                        id_conversation: conversation._id,
-                        role: 'user',
-                        content: message,
-                        attachments: attachmentData.attachments,
-                        createdAt: now,
-                        updatedAt: now
-                    };
-                    assistantDoc = {
-                        id_conversation: conversation._id,
-                        role: 'assistant',
-                        content: assistantContent,
-                        metadata: {
-                            model: resolveCodexModel()
-                        },
-                        createdAt: now,
-                        updatedAt: now
-                    };
-                    if (toolResult) {
-                        assistantDoc.metadata = __assign(__assign({}, (assistantDoc.metadata || {})), { tool_result: toolResult });
+                    return [3 /*break*/, 27];
+                case 27: return [3 /*break*/, 29];
+                case 28:
+                    progressTracker.push('Drafting response');
+                    _f.label = 29;
+                case 29: return [3 /*break*/, 32];
+                case 30:
+                    error_2 = _f.sent();
+                    assistantContent = buildAssistantCodexErrorMessage(error_2);
+                    return [3 /*break*/, 32];
+                case 31:
+                    progressTracker.stop();
+                    return [7 /*endfinally*/];
+                case 32:
+                    if (!assistantContent) {
+                        assistantContent = buildAssistantCodexErrorMessage(null);
                     }
-                    return [4 /*yield*/, ai_terminal_message_collection_1.AiTerminalMessages.insertOne(userDoc)];
-                case 25:
+                    finalNow = new Date();
+                    finalMetadata = __assign({ model: resolveCodexModel() }, (toolResult ? { tool_result: toolResult } : {}));
+                    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:
                     _f.sent();
-                    return [4 /*yield*/, ai_terminal_message_collection_1.AiTerminalMessages.insertOne(assistantDoc)];
-                case 26:
-                    insertResult = _f.sent();
-                    return [4 /*yield*/, touchConversation(conversation._id, now, insertResult._id)];
-                case 27:
+                    _f.label = 34;
+                case 34: return [4 /*yield*/, touchConversation(conversation._id, finalNow, assistantMessageId ? String(assistantMessageId) : undefined)];
+                case 35:
                     _f.sent();
-                    if (!(input.delete_files_after_run !== false)) return [3 /*break*/, 29];
+                    if (!(input.delete_files_after_run !== false)) return [3 /*break*/, 37];
                     return [4 /*yield*/, cleanupAttachments(attachmentData.attachments)];
-                case 28:
+                case 36:
                     _f.sent();
-                    _f.label = 29;
-                case 29: return [2 /*return*/, __assign({ conversation: conversation, message: assistantDoc }, (toolResult ? { tool_result: toolResult } : {}))];
+                    _f.label = 37;
+                case 37: return [2 /*return*/, __assign({ conversation: conversation, message: finalAssistantDoc }, (toolResult ? { tool_result: toolResult } : {}))];
             }
         });
     });
@@ -1341,6 +1385,135 @@ function buildAssistantToolErrorMessage(error, directive, request) {
     }
     return "I couldn't access the requested data. ".concat(routeLine);
 }
+function normalizeAssistantProgress(items) {
+    var seen = new Set();
+    var cleaned = [];
+    items.forEach(function (item) {
+        var trimmed = String(item || '').trim();
+        if (!trimmed) {
+            return;
+        }
+        var key = trimmed.toLowerCase();
+        if (seen.has(key)) {
+            return;
+        }
+        seen.add(key);
+        cleaned.push(trimmed);
+    });
+    return cleaned;
+}
+function updateAssistantProgress(messageId, progress) {
+    return __awaiter(this, void 0, void 0, function () {
+        var normalized, _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    normalized = normalizeAssistantProgress(progress);
+                    if (!messageId || !normalized.length) {
+                        return [2 /*return*/];
+                    }
+                    _b.label = 1;
+                case 1:
+                    _b.trys.push([1, 3, , 4]);
+                    return [4 /*yield*/, ai_terminal_message_collection_1.AiTerminalMessages.updateOne({ _id: messageId, 'metadata.pending': true }, {
+                            $set: {
+                                'metadata.pending': true,
+                                'metadata.progress': normalized,
+                                updatedAt: new Date()
+                            }
+                        })];
+                case 2:
+                    _b.sent();
+                    return [3 /*break*/, 4];
+                case 3:
+                    _a = _b.sent();
+                    return [3 /*break*/, 4];
+                case 4: return [2 /*return*/];
+            }
+        });
+    });
+}
+function createAssistantProgressTracker(messageId, initialProgress) {
+    var _this = this;
+    var progress = normalizeAssistantProgress(initialProgress);
+    var stopped = false;
+    var tickIndex = 0;
+    var updateScheduled = false;
+    var timer = null;
+    var queueProgressUpdate = function () {
+        if (stopped || !messageId || updateScheduled) {
+            return;
+        }
+        updateScheduled = true;
+        setTimeout(function () { return __awaiter(_this, void 0, void 0, function () {
+            var _a;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        updateScheduled = false;
+                        if (stopped) {
+                            return [2 /*return*/];
+                        }
+                        _b.label = 1;
+                    case 1:
+                        _b.trys.push([1, 3, , 4]);
+                        return [4 /*yield*/, updateAssistantProgress(messageId, progress)];
+                    case 2:
+                        _b.sent();
+                        return [3 /*break*/, 4];
+                    case 3:
+                        _a = _b.sent();
+                        return [3 /*break*/, 4];
+                    case 4: return [2 /*return*/];
+                }
+            });
+        }); }, 0);
+    };
+    if (messageId) {
+        timer = setInterval(function () {
+            if (stopped) {
+                if (timer) {
+                    clearInterval(timer);
+                    timer = null;
+                }
+                return;
+            }
+            if (tickIndex >= AI_ASSISTANT_PROGRESS_TICKS.length) {
+                if (timer) {
+                    clearInterval(timer);
+                    timer = null;
+                }
+                return;
+            }
+            var next = AI_ASSISTANT_PROGRESS_TICKS[tickIndex++];
+            progress = normalizeAssistantProgress(__spreadArray(__spreadArray([], __read(progress), false), [next], false));
+            queueProgressUpdate();
+        }, AI_ASSISTANT_PROGRESS_TICK_MS);
+    }
+    return {
+        push: function (item) {
+            if (stopped || !messageId) {
+                return;
+            }
+            progress = normalizeAssistantProgress(__spreadArray(__spreadArray([], __read(progress), false), [item], false));
+            queueProgressUpdate();
+        },
+        stop: function () {
+            stopped = true;
+            if (timer) {
+                clearInterval(timer);
+                timer = null;
+            }
+        }
+    };
+}
+function buildAssistantCodexErrorMessage(error) {
+    var raw = normalizeOptionalString(error === null || error === void 0 ? void 0 : error.message);
+    if (raw && /timed out/i.test(raw)) {
+        return 'That took longer than expected. Please try again or narrow the request.';
+    }
+    return 'I ran into an internal error while preparing that response. Please try again.';
+}
 function isAssistantIdField(key) {
     var normalized = String(key || '').trim().toLowerCase();
     if (!normalized) {
@@ -2233,7 +2406,7 @@ var CodexWorkerBootstrapError = /** @class */ (function (_super) {
 }(Error));
 function runCodexInWorkerThread(prompt, runOptions, config) {
     return __awaiter(this, void 0, void 0, function () {
-        var codexClient, workerPath, codexClient, error_2, codexClient;
+        var codexClient, workerPath, codexClient, error_3, codexClient;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -2253,11 +2426,11 @@ function runCodexInWorkerThread(prompt, runOptions, config) {
                     return [4 /*yield*/, runCodexInWorkerThreadInternal(workerPath, prompt, runOptions, config)];
                 case 6: return [2 /*return*/, _a.sent()];
                 case 7:
-                    error_2 = _a.sent();
-                    if (!(error_2 instanceof CodexWorkerBootstrapError)) {
-                        throw error_2;
+                    error_3 = _a.sent();
+                    if (!(error_3 instanceof CodexWorkerBootstrapError)) {
+                        throw error_3;
                     }
-                    console.error('Codex worker bootstrap failed, falling back to in-process run.', error_2);
+                    console.error('Codex worker bootstrap failed, falling back to in-process run.', error_3);
                     codexClient = getAssistantCodexClient();
                     return [4 /*yield*/, codexClient.run(prompt, runOptions)];
                 case 8: return [2 /*return*/, _a.sent()];
@@ -2294,7 +2467,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_3;
+                        var error_4;
                         return __generator(this, function (_a) {
                             switch (_a.label) {
                                 case 0:
@@ -2304,11 +2477,11 @@ function runCodexInWorkerThreadInternal(workerPath, prompt, runOptions, config)
                                     _a.sent();
                                     return [2 /*return*/, { type: 'timeout' }];
                                 case 2:
-                                    error_3 = _a.sent();
-                                    if ((error_3 === null || error_3 === void 0 ? void 0 : error_3.name) === 'AbortError') {
+                                    error_4 = _a.sent();
+                                    if ((error_4 === null || error_4 === void 0 ? void 0 : error_4.name) === 'AbortError') {
                                         return [2 /*return*/, { type: 'aborted' }];
                                     }
-                                    throw error_3;
+                                    throw error_4;
                                 case 3: return [2 /*return*/];
                             }
                         });