@resolveio/server-lib 22.1.21 → 22.1.23

package/methods/ai-terminal.js

@@ -1519,11 +1519,11 @@ function executeAiFormPatch(payload, context) {
 }
 function executeAiAssistantCodexRun(payload, context) {
     return __awaiter(this, void 0, void 0, function () {
-        var input, message, aiWorkerDebug, requestId, codexModel, codexFallbackModels, guardrail, conversation_3, now_3, userMsg, assistantMsg, user, isSuperAdmin, canViewDebug, hasInvoiceAccess, customerId, conversation, now, attachments, navigationFastPath, userMsg, assistantMsg, assistantInsert, assistantMessageId_1, changeHistoryFastPath, changeHistoryFastPathBypassedReason, userMsg, assistantMsg, assistantInsert, assistantMessageId_2, attachmentData, historyLimit, history, _a, historyLines, recentToolError, userDoc, initialProgress, assistantDoc, insertResult, assistantMessageId;
+        var input, message, aiWorkerDebug, requestId, codexModel, codexFallbackModels, guardrail, conversation_3, now_3, userMsg, assistantMsg, user, isSuperAdmin, canViewDebug, hasInvoiceAccess, customerId, conversation, now, attachments, navigationFastPath, userMsg, assistantMsg, assistantInsert, assistantMessageId_1, changeHistoryFastPath, changeHistoryFastPathBypassedReason, userMsg, assistantMsg, assistantInsert, assistantMessageId_2, attachmentData, historyLines, recentToolError, userDoc, initialProgress, assistantDoc, insertResult, assistantMessageId;
         var _this = this;
-        var _b, _c, _d;
-        return __generator(this, function (_e) {
-            switch (_e.label) {
+        var _a, _b, _c;
+        return __generator(this, function (_d) {
+            switch (_d.label) {
                 case 0:
                     input = payload || {};
                     message = normalizeOptionalString(input.message);
@@ -1541,7 +1541,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', context === null || context === void 0 ? void 0 : context.id_user)];
                 case 1:
-                    conversation_3 = _e.sent();
+                    conversation_3 = _d.sent();
                     now_3 = new Date();
                     userMsg = {
                         id_conversation: conversation_3._id,
@@ -1561,13 +1561,13 @@ function executeAiAssistantCodexRun(payload, context) {
                     };
                     return [4 /*yield*/, ai_terminal_message_collection_1.AiTerminalMessages.insertOne(userMsg)];
                 case 2:
-                    _e.sent();
+                    _d.sent();
                     return [4 /*yield*/, ai_terminal_message_collection_1.AiTerminalMessages.insertOne(assistantMsg)];
                 case 3:
-                    _e.sent();
+                    _d.sent();
                     return [4 /*yield*/, touchConversation(conversation_3._id, now_3)];
                 case 4:
-                    _e.sent();
+                    _d.sent();
                     return [2 /*return*/, {
                             conversation: conversation_3,
                             message: assistantMsg,
@@ -1575,14 +1575,14 @@ 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 = _e.sent();
-                    isSuperAdmin = !!((_b = user === null || user === void 0 ? void 0 : user.roles) === null || _b === void 0 ? void 0 : _b.super_admin);
+                    user = _d.sent();
+                    isSuperAdmin = !!((_a = user === null || user === void 0 ? void 0 : user.roles) === null || _a === void 0 ? void 0 : _a.super_admin);
                     canViewDebug = isAssistantDebugUser(user);
                     hasInvoiceAccess = userHasInvoiceAccess(user);
-                    customerId = normalizeOptionalString((_c = user === null || user === void 0 ? void 0 : user.other) === null || _c === void 0 ? void 0 : _c.id_customer);
+                    customerId = normalizeOptionalString((_b = user === null || user === void 0 ? void 0 : user.other) === null || _b === void 0 ? void 0 : _b.id_customer);
                     return [4 /*yield*/, ensureConversation(input, 'codex', context === null || context === void 0 ? void 0 : context.id_user)];
                 case 7:
-                    conversation = _e.sent();
+                    conversation = _d.sent();
                     if (aiWorkerDebug) {
                         console.log(new Date(), '[AI Worker Debug] codex run queued', {
                             requestId: requestId || null,
@@ -1600,7 +1600,7 @@ function executeAiAssistantCodexRun(payload, context) {
                         hasAttachments: attachments.length > 0,
                         user: user,
                         isSuperAdmin: isSuperAdmin,
-                        contextRoute: normalizeOptionalString((_d = input === null || input === void 0 ? void 0 : input.context) === null || _d === void 0 ? void 0 : _d.route)
+                        contextRoute: normalizeOptionalString((_c = input === null || input === void 0 ? void 0 : input.context) === null || _c === void 0 ? void 0 : _c.route)
                     });
                     if (!navigationFastPath) return [3 /*break*/, 11];
                     userMsg = {
@@ -1622,14 +1622,14 @@ function executeAiAssistantCodexRun(payload, context) {
                     };
                     return [4 /*yield*/, ai_terminal_message_collection_1.AiTerminalMessages.insertOne(userMsg)];
                 case 8:
-                    _e.sent();
+                    _d.sent();
                     return [4 /*yield*/, ai_terminal_message_collection_1.AiTerminalMessages.insertOne(assistantMsg)];
                 case 9:
-                    assistantInsert = _e.sent();
+                    assistantInsert = _d.sent();
                     assistantMessageId_1 = (assistantInsert === null || assistantInsert === void 0 ? void 0 : assistantInsert._id) || (assistantInsert === null || assistantInsert === void 0 ? void 0 : assistantInsert.insertedId);
                     return [4 /*yield*/, touchConversation(conversation._id, now, assistantMessageId_1 ? String(assistantMessageId_1) : undefined)];
                 case 10:
-                    _e.sent();
+                    _d.sent();
                     return [2 /*return*/, {
                             conversation: conversation,
                             message: assistantMsg,
@@ -1645,7 +1645,7 @@ function executeAiAssistantCodexRun(payload, context) {
                         isSuperAdmin: isSuperAdmin
                     })];
                 case 12:
-                    changeHistoryFastPath = _e.sent();
+                    changeHistoryFastPath = _d.sent();
                     changeHistoryFastPathBypassedReason = (changeHistoryFastPath
                         && (changeHistoryFastPath.reason === 'no_repo' || changeHistoryFastPath.reason === 'error')
                         && !shouldReturnAssistantChangeHistoryUnavailableFastPath())
@@ -1671,14 +1671,14 @@ function executeAiAssistantCodexRun(payload, context) {
                     };
                     return [4 /*yield*/, ai_terminal_message_collection_1.AiTerminalMessages.insertOne(userMsg)];
                 case 13:
-                    _e.sent();
+                    _d.sent();
                     return [4 /*yield*/, ai_terminal_message_collection_1.AiTerminalMessages.insertOne(assistantMsg)];
                 case 14:
-                    assistantInsert = _e.sent();
+                    assistantInsert = _d.sent();
                     assistantMessageId_2 = (assistantInsert === null || assistantInsert === void 0 ? void 0 : assistantInsert._id) || (assistantInsert === null || assistantInsert === void 0 ? void 0 : assistantInsert.insertedId);
                     return [4 /*yield*/, touchConversation(conversation._id, now, assistantMessageId_2 ? String(assistantMessageId_2) : undefined)];
                 case 15:
-                    _e.sent();
+                    _d.sent();
                     return [2 /*return*/, {
                             conversation: conversation,
                             message: assistantMsg,
@@ -1689,29 +1689,9 @@ function executeAiAssistantCodexRun(payload, context) {
                         }];
                 case 16: return [4 /*yield*/, readAttachmentContents(attachments)];
                 case 17:
-                    attachmentData = _e.sent();
-                    historyLimit = normalizeHistoryLimit(input.max_history);
-                    if (!(historyLimit > 0)) return [3 /*break*/, 19];
-                    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 18:
-                    _a = _e.sent();
-                    return [3 /*break*/, 20];
-                case 19:
-                    _a = [];
-                    _e.label = 20;
-                case 20:
-                    history = _a;
+                    attachmentData = _d.sent();
                     historyLines = [];
-                    history.forEach(function (entry) {
-                        var role = entry.role === 'assistant' ? 'Assistant' : 'User';
-                        var content = normalizeOptionalString(entry.content);
-                        if (content) {
-                            historyLines.push("".concat(role, ": ").concat(content));
-                        }
-                    });
-                    recentToolError = isAssistantWhyFollowupMessage(message)
-                        ? resolveRecentAssistantToolError(history)
-                        : '';
+                    recentToolError = '';
                     userDoc = {
                         id_conversation: conversation._id,
                         role: 'user',
@@ -1731,11 +1711,11 @@ function executeAiAssistantCodexRun(payload, context) {
                         updatedAt: now
                     };
                     return [4 /*yield*/, ai_terminal_message_collection_1.AiTerminalMessages.insertOne(userDoc)];
-                case 21:
-                    _e.sent();
+                case 18:
+                    _d.sent();
                     return [4 /*yield*/, ai_terminal_message_collection_1.AiTerminalMessages.insertOne(assistantDoc)];
-                case 22:
-                    insertResult = _e.sent();
+                case 19:
+                    insertResult = _d.sent();
                     assistantMessageId = (insertResult === null || insertResult === void 0 ? void 0 : insertResult._id) || (insertResult === null || insertResult === void 0 ? void 0 : insertResult.insertedId);
                     enqueueAssistantCodexRun(function () { return __awaiter(_this, void 0, void 0, function () {
                         var runStart, steps, recordStep, progressTracker, streamProgress, assistantContent, toolResult, assistantDebug, directiveSource, requestClassification, dataQuestion, lastDirective, heuristicDirectivePrecomputed, usedDeterministicHeuristicFastPath, requestedTimeGrain, requestedBreakdownDimensions, enforceDatedDirective, enforceGroupedDirective, datedDirectiveRetryUsed, datedDirectiveResolved, toolResponseDebug, toolError, termHints, collectionHints, fieldHints, methodHints, publicationHints, collectionTokenization, collectionRanking, collectionSelection, collectionOverride, collectionNames, plannerEnabled, plannerUsed, plannerSkipReason, plannerOutput, plannerRaw, timingBreakdown, codexUsage, accumulateCodexUsage, contextRoute, contextMode, hintSeed, termExpansion, hintText, baseTokens, expandedTokens, baseWeights, expandedWeights, dbName, db, surfaceHints, _a, allowedRoutes, rankedAllowedRoutes, routeHints, rankedCollectionHints, rankedCollections, hintCollections, assistantContext, hasDeterministicHeuristicFastPath, prompt_1, workspaceRoot, codexConfig, runOptions, plannerRunOptions, shouldRunPlanner, plannerPrompt, plannerStart, _b, preferListDirective, directiveStyleHint, directivePromptMode, responseText, directiveText, directive, heuristicDirectiveFastPath, directivePrompt, directiveStart, forcedDirective, _c, initialStart, extractedDirective, error_2, directivePrompt, forcedStart, forcedDirective, _d, strictDirectivePrompt, strictStart, strictDirectiveText, strictDirective, strictDirectiveIsDated, shouldUseStrictDirective, _e, guardDirectivePrompt, guardStart, guardDirectiveText, guardDirective, _f, groupedDirectivePrompt, groupedStart, groupedDirectiveText, groupedDirective, _g, heuristicDirective, requestedCollection, allowCollectionOverride, cleanedResponseText, effectiveDirective, toolRequest, toolStart, toolResponse, _h, toolPayload, skipFollowupCodex, followupPrompt, followupStart, followupText, _j, error_3, error_4, finishedAt, finalNow, finishedAt, codexMs, draftingMs, finalMetadata, finalUsage, usageClientId, usageError_1, finalAssistantDoc, setPayload;
@@ -1955,6 +1935,8 @@ function executeAiAssistantCodexRun(payload, context) {
                                     runOptions = {
                                         timeoutMs: resolveCodexTimeoutMs(),
                                         fallbackModels: codexFallbackModels,
+                                        threadKey: conversation._id,
+                                        reuseThread: true,
                                         threadOptions: {
                                             model: codexModel,
                                             workingDirectory: workspaceRoot,
@@ -1971,7 +1953,7 @@ function executeAiAssistantCodexRun(payload, context) {
                                             approvalPolicy: 'never'
                                         }
                                     };
-                                    plannerRunOptions = __assign(__assign({}, runOptions), { threadOptions: __assign(__assign({}, (runOptions.threadOptions || {})), { modelReasoningEffort: 'minimal' }) });
+                                    plannerRunOptions = __assign(__assign({}, runOptions), { threadKey: "".concat(conversation._id, ":planner"), threadOptions: __assign(__assign({}, (runOptions.threadOptions || {})), { modelReasoningEffort: 'minimal' }) });
                                     shouldRunPlanner = shouldRunAssistantPlanner({
                                         plannerEnabled: plannerEnabled,
                                         requestClassification: requestClassification,
@@ -16634,27 +16616,34 @@ function waitForCodexWorkerMessage(worker, streamStatusHandler) {
 }
 function runCodexInWorkerThread(prompt, runOptions, config, streamStatusHandler) {
     return __awaiter(this, void 0, void 0, function () {
-        var streamedOptions, codexClient, workerPath, codexClient, error_10, codexClient;
+        var streamedOptions, normalizedThreadKey, shouldForceInProcessThreadReuse, codexClient, codexClient, workerPath, codexClient, error_10, codexClient;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     streamedOptions = applyCodexStreamStatusHandler(runOptions, streamStatusHandler);
-                    if (!!resolveCodexWorkerThreadEnabled()) return [3 /*break*/, 2];
+                    normalizedThreadKey = normalizeOptionalString(runOptions === null || runOptions === void 0 ? void 0 : runOptions.threadKey);
+                    shouldForceInProcessThreadReuse = !!(normalizedThreadKey && (runOptions === null || runOptions === void 0 ? void 0 : runOptions.reuseThread) !== false);
+                    if (!shouldForceInProcessThreadReuse) return [3 /*break*/, 2];
                     codexClient = getAssistantCodexClient(config);
                     return [4 /*yield*/, codexClient.run(prompt, streamedOptions)];
                 case 1: return [2 /*return*/, _a.sent()];
-                case 2: return [4 /*yield*/, resolveCodexWorkerPath()];
-                case 3:
-                    workerPath = _a.sent();
-                    if (!!workerPath) return [3 /*break*/, 5];
+                case 2:
+                    if (!!resolveCodexWorkerThreadEnabled()) return [3 /*break*/, 4];
                     codexClient = getAssistantCodexClient(config);
                     return [4 /*yield*/, codexClient.run(prompt, streamedOptions)];
-                case 4: return [2 /*return*/, _a.sent()];
+                case 3: return [2 /*return*/, _a.sent()];
+                case 4: return [4 /*yield*/, resolveCodexWorkerPath()];
                 case 5:
-                    _a.trys.push([5, 7, , 9]);
-                    return [4 /*yield*/, runCodexInWorkerThreadInternal(workerPath, prompt, runOptions, config, streamStatusHandler)];
+                    workerPath = _a.sent();
+                    if (!!workerPath) return [3 /*break*/, 7];
+                    codexClient = getAssistantCodexClient(config);
+                    return [4 /*yield*/, codexClient.run(prompt, streamedOptions)];
                 case 6: return [2 /*return*/, _a.sent()];
                 case 7:
+                    _a.trys.push([7, 9, , 11]);
+                    return [4 /*yield*/, runCodexInWorkerThreadInternal(workerPath, prompt, runOptions, config, streamStatusHandler)];
+                case 8: return [2 /*return*/, _a.sent()];
+                case 9:
                     error_10 = _a.sent();
                     if (!(error_10 instanceof CodexWorkerBootstrapError)) {
                         throw error_10;
@@ -16662,8 +16651,8 @@ function runCodexInWorkerThread(prompt, runOptions, config, streamStatusHandler)
                     console.error('Codex worker bootstrap failed, falling back to in-process run.', error_10);
                     codexClient = getAssistantCodexClient(config);
                     return [4 /*yield*/, codexClient.run(prompt, streamedOptions)];
-                case 8: return [2 /*return*/, _a.sent()];
-                case 9: return [2 /*return*/];
+                case 10: return [2 /*return*/, _a.sent()];
+                case 11: return [2 /*return*/];
             }
         });
     });
@@ -17899,34 +17888,6 @@ function buildAssistantFieldHints(message, collectionNames, options) {
     });
     return hints;
 }
-function isAssistantWhyFollowupMessage(message) {
-    var normalized = normalizeOptionalString(message).toLowerCase();
-    if (!normalized) {
-        return false;
-    }
-    return /^(so\s+)?why(?:\s+not)?[.!?]*$/.test(normalized)
-        || /^(so\s+)?why\b/.test(normalized);
-}
-function resolveRecentAssistantToolError(history) {
-    var _a, _b;
-    var entries = Array.isArray(history) ? history : [];
-    for (var i = entries.length - 1; i >= 0; i -= 1) {
-        var entry = entries[i];
-        if ((entry === null || entry === void 0 ? void 0 : entry.role) !== 'assistant') {
-            continue;
-        }
-        var notes = Array.isArray((_b = (_a = entry === null || entry === void 0 ? void 0 : entry.metadata) === null || _a === void 0 ? void 0 : _a.debug) === null || _b === void 0 ? void 0 : _b.notes)
-            ? entry.metadata.debug.notes
-            : [];
-        var matched = notes
-            .map(function (note) { return normalizeOptionalString(note); })
-            .find(function (note) { return note.toLowerCase().startsWith('tool error:'); });
-        if (matched) {
-            return matched.replace(/^tool error:\s*/i, '').trim();
-        }
-    }
-    return '';
-}
 var cachedClientRouteIndex = null;
 function normalizeRouteKey(value) {
     var trimmed = normalizeOptionalString(value);