@resolveio/server-lib 22.0.10 → 22.0.11

package/methods/ai-terminal.js

@@ -139,7 +139,8 @@ var DEFAULT_MAX_FILE_MB = 50;
 var DEFAULT_MAX_TOTAL_MB = 100;
 var DEFAULT_MAX_ATTACHMENT_CHARS = 12000;
 var DEFAULT_MAX_TOTAL_ATTACHMENT_CHARS = 40000;
-var DEFAULT_CODEX_MODEL = 'gpt-5.1-codex-mini';
+var DEFAULT_CODEX_MODEL = 'gpt-5.3-codex';
+var DEFAULT_CODEX_FALLBACK_MODEL = 'gpt-5.2-codex';
 var DEFAULT_CODEX_TIMEOUT_MS = 180000;
 var AI_ASSISTANT_MONGO_DEFAULT_LIMIT = 20;
 var AI_ASSISTANT_MONGO_MAX_LIMIT = 200;
@@ -381,12 +382,13 @@ var AI_ASSISTANT_REPORT_BUILDER_EXPERT_PLAYBOOK = [
     '',
     '2) Resolve the target dataset safely.',
     '- Map user wording to internal collection names using routes, collection hints, field hints, and synonym expansion.',
-    '- Prefer report-* collections when permissionView is under /report.',
+    '- Prefer report-* collections when permissionView is under /report-builder.',
     '- Never use *.versions unless user explicitly requests bug-history/version investigation.',
     '- Never invent collection names or fields.',
     '',
     '3) Enforce permissions and scope in the directive.',
     '- Always include permissionView.',
+    '- Use /report-builder as the default permissionView for data directives; avoid /report/* routes.',
     '- Assume non-super-admin unless explicitly told otherwise.',
     '- Invoice-like collections require invoice view access.',
     '- Customer portal users must stay in their own customer scope.',
@@ -435,7 +437,7 @@ var AI_ASSISTANT_SYSTEM_PROMPT = [
     '- 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.',
     '- Never use *.versions collections for normal requests. Only use a .versions collection when explicitly investigating a bug by checking the last ~5 updates.',
     '- Planning stage: regex/keyword scan the codebase for collectionName/model definitions, methods, publications, and Angular routes/modules to map user wording to internal names.',
-    '- If permissionView starts with /report/, prefer the report-* collection when both report and base collections exist.',
+    '- If permissionView starts with /report-builder, prefer the report-* collection when both report and base collections exist.',
     '- 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 REPORT_BUILDER_READ probe (limit 1-5) to learn the shape.',
@@ -490,7 +492,8 @@ var AI_ASSISTANT_SYSTEM_PROMPT = [
     '- REPORT_BUILDER_READ: {"collection":"<name>","query":{...},"options":{"projection":{...},"sort":{...},"limit":20},"permissionView":"</route>"}',
     '- If you need grouped/aggregated data (totals by user, rankings, trends), end your response with a single line exactly in this format:',
     '- REPORT_BUILDER_AGG: {"collection":"<name>","pipeline":[...],"options":{"allowDiskUse":true,"limit":20},"permissionView":"</route>"}',
-    '- For invoice data, set permissionView to an invoice route (ex: /invoice/list or /report/invoice).',
+    '- For invoice data, set permissionView to an invoice-capable route (ex: /invoice/list or /report-builder/list).',
+    '- Do not use /report/* routes as permissionView for data directives; use /report-builder or a module route.',
     '- For revenue/sales/billing questions, use invoices and sum paid_total (fallback to grand_total) with date_paid and Paid/Closed status when available.',
     '- For revenue answers, always state the metric/date basis used (paid_total/date_paid vs grand_total/date_invoice). If tool verification warns about ambiguity or partial months, call that out before totals.',
     '- For relative date ranges (last/past/recent), include an upper bound <= $$NOW unless the user specifies a future end date.',
@@ -532,7 +535,7 @@ var AI_ASSISTANT_PLANNER_SYSTEM_PROMPT = [
     '   - Never propose querying blocked/sensitive collections if the user lacks permission.',
     '',
     '4) PERMISSION MATCHING:',
-    '   - Do NOT hardcode invoice access to "/report/invoice".',
+    '   - Do NOT hardcode invoice access to "/report-builder/*".',
     '   - For invoice-related data or navigation, permission is satisfied if ANY user view contains "invoice" case-insensitive.',
     '     (General rule: for an entity token X, permission is satisfied if any view contains X case-insensitive.)',
     '   - If permission checks are ambiguous, choose the safest restriction and explain.',
@@ -667,7 +670,7 @@ var AI_FORM_PATCH_SYSTEM_PROMPT = [
     '- Use ISO 8601 for dates and true/false for booleans.',
     '- Use medium reasoning effort.'
 ].join('\n');
-var assistantCodexClient = null;
+var assistantCodexClientByConfig = new Map();
 var assistantCodexRunQueue = [];
 var assistantCodexRunDraining = false;
 /* eslint-enable no-unused-vars */
@@ -1320,7 +1323,7 @@ function executeAiFormPatch(payload, context) {
 }
 function executeAiAssistantCodexRun(payload, context) {
     return __awaiter(this, void 0, void 0, function () {
-        var input, message, aiWorkerDebug, 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 input, message, aiWorkerDebug, requestId, codexModel, codexFallbackModels, guardrail, conversation_2, now_2, userMsg, assistantMsg, user, isSuperAdmin, hasInvoiceAccess, customerId, conversation, now, attachments, attachmentData, historyLimit, history, _a, historyLines, recentToolError, userDoc, initialProgress, assistantDoc, insertResult, assistantMessageId;
         var _this = this;
         var _b, _c;
         return __generator(this, function (_d) {
@@ -1336,6 +1339,8 @@ function executeAiAssistantCodexRun(payload, context) {
                     }
                     aiWorkerDebug = isAiWorkerDebugEnabled();
                     requestId = normalizeOptionalString(input.request_id);
+                    codexModel = resolveCodexModel(input.config);
+                    codexFallbackModels = resolveCodexFallbackModels(input.config, codexModel);
                     guardrail = evaluateAssistantGuardrails(message);
                     if (!(guardrail === null || guardrail === void 0 ? void 0 : guardrail.blocked)) return [3 /*break*/, 5];
                     return [4 /*yield*/, ensureConversation(input, 'codex')];
@@ -1415,6 +1420,9 @@ function executeAiAssistantCodexRun(payload, context) {
                             historyLines.push("".concat(role, ": ").concat(content));
                         }
                     });
+                    recentToolError = isAssistantWhyFollowupMessage(message)
+                        ? resolveRecentAssistantToolError(history)
+                        : '';
                     userDoc = {
                         id_conversation: conversation._id,
                         role: 'user',
@@ -1429,7 +1437,7 @@ function executeAiAssistantCodexRun(payload, context) {
                         id_conversation: conversation._id,
                         role: 'assistant',
                         content: AI_ASSISTANT_PROGRESS_PLACEHOLDER,
-                        metadata: __assign(__assign({ model: resolveCodexModel() }, (requestId ? { request_id: requestId } : {})), { pending: true, progress: initialProgress }),
+                        metadata: __assign(__assign(__assign({ model: codexModel }, (codexFallbackModels.length ? { model_fallbacks: codexFallbackModels } : {})), (requestId ? { request_id: requestId } : {})), { pending: true, progress: initialProgress }),
                         createdAt: now,
                         updatedAt: now
                     };
@@ -1564,16 +1572,22 @@ function executeAiAssistantCodexRun(payload, context) {
                                         customerId: customerId,
                                         collectionHints: collectionHints,
                                         termHints: termHints,
-                                        fieldHints: fieldHints
+                                        fieldHints: fieldHints,
+                                        recentToolError: recentToolError
                                     });
                                     prompt_1 = buildAssistantCodexPrompt(message, attachmentData.promptText, historyLines.join('\n'), assistantContext);
                                     return [4 /*yield*/, resolveAssistantWorkspaceRoot()];
                                 case 6:
                                     workspaceRoot = _x.sent();
-                                    codexConfig = resolveCodexSettings();
+                                    codexConfig = resolveCodexSettings({
+                                        model: codexModel,
+                                        fallbackModels: codexFallbackModels
+                                    });
                                     runOptions = {
                                         timeoutMs: resolveCodexTimeoutMs(),
+                                        fallbackModels: codexFallbackModels,
                                         threadOptions: {
+                                            model: codexModel,
                                             workingDirectory: workspaceRoot,
                                             sandboxMode: 'read-only',
                                             skipGitRepoCheck: true,
@@ -1874,7 +1888,7 @@ function executeAiAssistantCodexRun(payload, context) {
                                             }
                                         });
                                     }
-                                    finalMetadata = __assign(__assign(__assign({ model: resolveCodexModel() }, (requestId ? { request_id: requestId } : {})), (toolResult ? { tool_result: toolResult } : {})), (assistantDebug ? { debug: assistantDebug } : {}));
+                                    finalMetadata = __assign(__assign(__assign(__assign({ model: codexModel }, (codexFallbackModels.length ? { model_fallbacks: codexFallbackModels } : {})), (requestId ? { request_id: requestId } : {})), (toolResult ? { tool_result: toolResult } : {})), (assistantDebug ? { debug: assistantDebug } : {}));
                                     finalAssistantDoc = __assign(__assign({}, assistantDoc), { _id: assistantMessageId, content: assistantContent, metadata: finalMetadata, updatedAt: finalNow });
                                     if (!assistantMessageId) return [3 /*break*/, 39];
                                     return [4 /*yield*/, ai_terminal_message_collection_1.AiTerminalMessages.updateOne({ _id: assistantMessageId }, {
@@ -3548,13 +3562,12 @@ function extractAssistantMongoDirective(content) {
     };
 }
 function buildAssistantToolRequest(directive, payload) {
-    var _a;
     var base = directive.payload && typeof directive.payload === 'object' ? directive.payload : {};
     var request = __assign({}, base);
-    var route = normalizeOptionalString((_a = payload === null || payload === void 0 ? void 0 : payload.context) === null || _a === void 0 ? void 0 : _a.route);
-    if (!request.permissionView && route) {
-        request.permissionView = route;
+    if (!request.permissionView) {
+        request.permissionView = '/report-builder';
     }
+    request.permissionView = normalizeAssistantPermissionView(request.permissionView, request.collection);
     if (!request.id_client) {
         var idClient = normalizeOptionalString(payload === null || payload === void 0 ? void 0 : payload.id_client);
         if (idClient) {
@@ -3566,6 +3579,24 @@ function buildAssistantToolRequest(directive, payload) {
     }
     return request;
 }
+function normalizeAssistantPermissionView(permissionView, collection) {
+    var normalizedPermission = normalizeOptionalString(permissionView);
+    var normalizedCollection = normalizeOptionalString(collection);
+    var loweredPermission = normalizedPermission.toLowerCase();
+    if (!normalizedPermission) {
+        return '/report-builder';
+    }
+    if (loweredPermission === '/report-builder' || loweredPermission.startsWith('/report-builder/')) {
+        return '/report-builder';
+    }
+    if (loweredPermission === '/report' || loweredPermission.startsWith('/report/')) {
+        if (requiresInvoicePermission(normalizedCollection)) {
+            return '/invoice/list';
+        }
+        return '/report-builder';
+    }
+    return normalizedPermission;
+}
 function buildAssistantToolResultPayload(directive, toolResponse) {
     var _a, _b, _c;
     var directivePayload = directive.payload || {};
@@ -3877,7 +3908,7 @@ function buildAssistantToolErrorMessage(error, directive, request) {
         ? "Open ".concat(routeHint, " in the app to view this data or request access.")
         : 'Open the related screen in the app to view this data or request access.';
     if (!routeHint && collection && requiresInvoicePermission(collection)) {
-        routeLine = 'Open /invoice/list or /report/invoice to view this data or request access.';
+        routeLine = 'Open /invoice/list or /report-builder/list to view this data or request access.';
     }
     if (normalized.includes('permission scope required')) {
         return "I need a permission scope to access that data. ".concat(routeLine);
@@ -3891,6 +3922,9 @@ function buildAssistantToolErrorMessage(error, directive, request) {
     if (normalized.includes('database access denied')) {
         return "Database access is restricted for that request. ".concat(routeLine);
     }
+    if (normalized.includes('undefined variable') && normalized.includes('now_minus')) {
+        return "The query used an unsupported relative date token. Please retry; the assistant now normalizes relative dates automatically. ".concat(routeLine);
+    }
     if (normalized.includes('report builder bridge') && normalized.includes('not configured')) {
         return "That dataset is not configured for report builder access yet. ".concat(routeLine);
     }
@@ -5595,7 +5629,7 @@ function isDisplayObjectLike(value) {
 }
 function ensureAssistantReadAccess(context, permissionView, collection) {
     return __awaiter(this, void 0, void 0, function () {
-        var idUser, user, isSuperAdmin, normalizedPermission, normalizedCollection;
+        var idUser, user, isSuperAdmin, normalizedCollection, normalizedPermission, requiresInvoiceAccess, hasInvoiceAccess, hasViewAccess;
         var _a;
         return __generator(this, function (_b) {
             switch (_b.label) {
@@ -5611,20 +5645,21 @@ function ensureAssistantReadAccess(context, permissionView, collection) {
                         throw new Error('AI assistant report builder bridge: Unauthorized.');
                     }
                     isSuperAdmin = !!((_a = user === null || user === void 0 ? void 0 : user.roles) === null || _a === void 0 ? void 0 : _a.super_admin);
-                    normalizedPermission = normalizeOptionalString(permissionView);
-                    if (!isSuperAdmin) {
-                        if (!normalizedPermission) {
-                            throw new Error('AI assistant report builder bridge: Permission scope required.');
-                        }
-                        if (!userHasViewPermission(user, normalizedPermission)) {
-                            throw new Error('AI assistant report builder bridge: Access denied.');
-                        }
-                        normalizedCollection = normalizeOptionalString(collection);
-                        if (normalizedCollection && requiresInvoicePermission(normalizedCollection) && !userHasInvoiceAccess(user)) {
-                            throw new Error('AI assistant report builder bridge: Access denied.');
-                        }
+                    if (isSuperAdmin) {
+                        return [2 /*return*/, { user: user, isSuperAdmin: isSuperAdmin }];
                     }
-                    else if (normalizedPermission && !userHasViewPermission(user, normalizedPermission)) {
+                    normalizedCollection = normalizeOptionalString(collection);
+                    normalizedPermission = normalizeAssistantPermissionView(permissionView, normalizedCollection);
+                    if (!normalizedPermission) {
+                        throw new Error('AI assistant report builder bridge: Permission scope required.');
+                    }
+                    requiresInvoiceAccess = normalizedCollection ? requiresInvoicePermission(normalizedCollection) : false;
+                    hasInvoiceAccess = requiresInvoiceAccess && userHasInvoiceAccess(user);
+                    hasViewAccess = userHasViewPermission(user, normalizedPermission);
+                    if (!hasViewAccess && !hasInvoiceAccess) {
+                        throw new Error('AI assistant report builder bridge: Access denied.');
+                    }
+                    if (requiresInvoiceAccess && !hasInvoiceAccess) {
                         throw new Error('AI assistant report builder bridge: Access denied.');
                     }
                     return [2 /*return*/, { user: user, isSuperAdmin: isSuperAdmin }];
@@ -5700,6 +5735,90 @@ function sanitizeAssistantProjection(projection) {
     return projection;
 }
 var AGG_MATCH_EXPR_OPERATORS = new Set(['$eq', '$ne', '$gt', '$gte', '$lt', '$lte']);
+var ASSISTANT_NOW_RELATIVE_PATTERN = /^\$\$NOW_(MINUS|PLUS)_([0-9]+)_(MINUTES?|HOURS?|DAYS?|WEEKS?|MONTHS?|YEARS?)$/i;
+function normalizeAssistantTimeUnit(raw) {
+    var normalized = String(raw || '').toLowerCase();
+    if (normalized.startsWith('minute')) {
+        return 'minute';
+    }
+    if (normalized.startsWith('hour')) {
+        return 'hour';
+    }
+    if (normalized.startsWith('day')) {
+        return 'day';
+    }
+    if (normalized.startsWith('week')) {
+        return 'week';
+    }
+    if (normalized.startsWith('month')) {
+        return 'month';
+    }
+    return 'year';
+}
+function parseAssistantNowRelativeToken(value) {
+    var trimmed = normalizeOptionalString(value);
+    if (!trimmed) {
+        return null;
+    }
+    var match = trimmed.match(ASSISTANT_NOW_RELATIVE_PATTERN);
+    if (!match) {
+        return null;
+    }
+    var direction = String(match[1] || '').toUpperCase() === 'PLUS' ? 'PLUS' : 'MINUS';
+    var amount = Number(match[2]);
+    if (!Number.isFinite(amount) || amount < 0) {
+        return null;
+    }
+    var unit = normalizeAssistantTimeUnit(match[3] || '');
+    return {
+        operator: direction === 'PLUS' ? '$dateAdd' : '$dateSubtract',
+        amount: amount,
+        unit: unit
+    };
+}
+function normalizeAssistantNowExprOperand(value) {
+    var _a;
+    if (typeof value !== 'string') {
+        return value;
+    }
+    var trimmed = normalizeOptionalString(value);
+    if (!trimmed) {
+        return value;
+    }
+    if (trimmed === '$$NOW') {
+        return '$$NOW';
+    }
+    var parsed = parseAssistantNowRelativeToken(trimmed);
+    if (!parsed) {
+        return value;
+    }
+    return _a = {},
+        _a[parsed.operator] = {
+            startDate: '$$NOW',
+            unit: parsed.unit,
+            amount: parsed.amount
+        },
+        _a;
+}
+function normalizeAssistantNowExprPlaceholdersDeep(value) {
+    if (Array.isArray(value)) {
+        return value.map(function (entry) { return normalizeAssistantNowExprPlaceholdersDeep(entry); });
+    }
+    if (value instanceof Date || value instanceof RegExp || isMongoObjectId(value)) {
+        return value;
+    }
+    if (typeof value === 'string') {
+        return normalizeAssistantNowExprOperand(value);
+    }
+    if (!value || typeof value !== 'object') {
+        return value;
+    }
+    var result = {};
+    Object.keys(value).forEach(function (key) {
+        result[key] = normalizeAssistantNowExprPlaceholdersDeep(value[key]);
+    });
+    return result;
+}
 function isMatchExpressionOperand(value) {
     if (typeof value === 'string') {
         return value.startsWith('$$');
@@ -5757,7 +5876,7 @@ function rewriteMatchExpressionsToExpr(match) {
                     }
                     var operand = nextEntry_1[op];
                     if (isMatchExpressionOperand(operand)) {
-                        exprClauses.push((_a = {}, _a[op] = ["$".concat(key), operand], _a));
+                        exprClauses.push((_a = {}, _a[op] = ["$".concat(key), normalizeAssistantNowExprOperand(operand)], _a));
                         delete nextEntry_1[op];
                         moved_1 = true;
                     }
@@ -5771,7 +5890,7 @@ function rewriteMatchExpressionsToExpr(match) {
                 return;
             }
             if (typeof entry === 'string' && entry.startsWith('$$')) {
-                exprClauses.push({ $eq: ["$".concat(key), entry] });
+                exprClauses.push({ $eq: ["$".concat(key), normalizeAssistantNowExprOperand(entry)] });
                 return;
             }
             result[key] = entry;
@@ -5848,7 +5967,7 @@ function normalizeAssistantAggregatePipeline(pipeline, collection) {
             var statusNormalized = isInvoiceCollection ? normalizeInvoiceStatusMatch(exprRewritten) : exprRewritten;
             next.$geoNear = __assign(__assign({}, next.$geoNear), { query: applyAssistantNameRegexToQuery(statusNormalized) });
         }
-        return next;
+        return normalizeAssistantNowExprPlaceholdersDeep(next);
     });
 }
 function buildAssistantAggregatePipeline(query, pipeline) {
@@ -7495,7 +7614,9 @@ function normalizeMongoQuery(query) {
         throw new Error('AI assistant report builder bridge: Query contains restricted operators.');
     }
     var rewritten = rewriteEmbeddedMatchObjects(normalized);
-    return applyAssistantNameRegexToQuery(rewritten);
+    var exprRewritten = rewriteMatchExpressionsToExpr(rewritten);
+    var nowNormalized = normalizeAssistantNowExprPlaceholdersDeep(exprRewritten);
+    return applyAssistantNameRegexToQuery(nowNormalized);
 }
 function shouldApplyAssistantNameRegex(field) {
     var normalized = String(field || '').toLowerCase().trim();
@@ -8019,7 +8140,7 @@ function shouldAllowVersionCollections(message) {
 }
 function resolveReportCollectionName(permissionView, collectionNames, currentCollection) {
     var normalizedView = normalizeOptionalString(permissionView).toLowerCase();
-    if (!normalizedView.startsWith('/report/')) {
+    if (!normalizedView.startsWith('/report-builder')) {
         return null;
     }
     var current = stripVersionSuffix(normalizeOptionalString(currentCollection));
@@ -8027,11 +8148,6 @@ function resolveReportCollectionName(permissionView, collectionNames, currentCol
     if (collectionNames.includes(reportCollection)) {
         return reportCollection;
     }
-    var routeTail = normalizedView.replace('/report/', '').replace(/\//g, '-');
-    var routeCandidate = routeTail ? "report-".concat(routeTail) : '';
-    if (routeCandidate && collectionNames.includes(routeCandidate)) {
-        return routeCandidate;
-    }
     return null;
 }
 function resolveBaseCollectionFromReport(db, dbName, collection) {
@@ -8069,7 +8185,7 @@ function resolveCollectionOverrideWithContext(params) {
                 to: reportPreferred,
                 fromScore: 0,
                 toScore: 0,
-                reason: 'report route preference'
+                reason: 'report builder route preference'
             };
         }
     }
@@ -8677,14 +8793,43 @@ function userHasViewPermission(user, view) {
     }
     return false;
 }
-function userHasAnyViewPermission(user, views) {
-    if (!user || !Array.isArray(views)) {
+function collectUserViewPermissions(user) {
+    var _a, _b;
+    if (!user) {
+        return [];
+    }
+    var groups = Array.isArray((_a = user.roles) === null || _a === void 0 ? void 0 : _a.groups) ? user.roles.groups : [];
+    var miscs = Array.isArray((_b = user.roles) === null || _b === void 0 ? void 0 : _b.miscs) ? user.roles.miscs : [];
+    var collected = [];
+    var seen = new Set();
+    var push = function (value) {
+        var normalized = normalizeOptionalString(value);
+        if (!normalized || seen.has(normalized)) {
+            return;
+        }
+        seen.add(normalized);
+        collected.push(normalized);
+    };
+    groups.forEach(function (group) {
+        var views = Array.isArray(group === null || group === void 0 ? void 0 : group.views) ? group.views : [];
+        views.forEach(push);
+    });
+    miscs.forEach(push);
+    return collected;
+}
+function userHasViewTokenPermission(user, tokenRegex) {
+    var _a;
+    if (!user || !tokenRegex) {
         return false;
     }
-    return views.some(function (view) { return view && userHasViewPermission(user, view); });
+    if ((_a = user.roles) === null || _a === void 0 ? void 0 : _a.super_admin) {
+        return true;
+    }
+    var permissions = collectUserViewPermissions(user);
+    return permissions.some(function (view) { return tokenRegex.test(view); });
 }
 function userHasInvoiceAccess(user) {
-    return userHasAnyViewPermission(user, ['/invoice', '/report/invoice']);
+    return userHasViewTokenPermission(user, /invoice/i);
 }
 function requiresInvoicePermission(collection) {
     var normalized = normalizeOptionalString(collection).toLowerCase();
@@ -8736,16 +8881,59 @@ function resolveCodexWorkerThreadEnabled() {
     }
     return process.env.IS_WORKER_INSTANCE !== 'true';
 }
-function resolveCodexModel() {
-    var config = resolveio_server_app_1.ResolveIOServer.getServerConfig() || {};
-    var raw = normalizeOptionalString(config['AI_ASSISTANT_CODEX_MODEL']
+function normalizeCodexModelList(value) {
+    if (Array.isArray(value)) {
+        return value
+            .map(function (entry) { return normalizeOptionalString(entry); })
+            .filter(Boolean);
+    }
+    var raw = normalizeOptionalString(value);
+    if (!raw) {
+        return [];
+    }
+    return raw
+        .split(',')
+        .map(function (entry) { return normalizeOptionalString(entry); })
+        .filter(Boolean);
+}
+function resolveCodexModel(config) {
+    var serverConfig = resolveio_server_app_1.ResolveIOServer.getServerConfig() || {};
+    var raw = normalizeOptionalString((config === null || config === void 0 ? void 0 : config.model)
+        || (config === null || config === void 0 ? void 0 : config.codex_model)
+        || serverConfig['AI_ASSISTANT_CODEX_MODEL']
         || process.env.AI_ASSISTANT_CODEX_MODEL
-        || config['AI_TERMINAL_CODEX_MODEL']
+        || serverConfig['AI_TERMINAL_CODEX_MODEL']
         || process.env.AI_TERMINAL_CODEX_MODEL
-        || config['AI_DASHBOARD_CODEX_MODEL']
+        || serverConfig['AI_DASHBOARD_CODEX_MODEL']
         || process.env.AI_DASHBOARD_CODEX_MODEL);
     return raw || DEFAULT_CODEX_MODEL;
 }
+function resolveCodexFallbackModels(config, primaryModel) {
+    var serverConfig = resolveio_server_app_1.ResolveIOServer.getServerConfig() || {};
+    var primary = normalizeOptionalString(primaryModel || resolveCodexModel(config));
+    var models = [];
+    var push = function (value) {
+        var normalized = normalizeOptionalString(value);
+        if (!normalized || normalized === primary || models.includes(normalized)) {
+            return;
+        }
+        models.push(normalized);
+    };
+    normalizeCodexModelList(config === null || config === void 0 ? void 0 : config.fallback_models).forEach(push);
+    normalizeCodexModelList(config === null || config === void 0 ? void 0 : config.fallbackModels).forEach(push);
+    push(config === null || config === void 0 ? void 0 : config.fallback_model);
+    push(config === null || config === void 0 ? void 0 : config.fallbackModel);
+    normalizeCodexModelList(serverConfig['AI_ASSISTANT_CODEX_FALLBACK_MODELS'] || process.env.AI_ASSISTANT_CODEX_FALLBACK_MODELS).forEach(push);
+    push(serverConfig['AI_ASSISTANT_CODEX_FALLBACK_MODEL'] || process.env.AI_ASSISTANT_CODEX_FALLBACK_MODEL);
+    normalizeCodexModelList(serverConfig['AI_TERMINAL_CODEX_FALLBACK_MODELS'] || process.env.AI_TERMINAL_CODEX_FALLBACK_MODELS).forEach(push);
+    push(serverConfig['AI_TERMINAL_CODEX_FALLBACK_MODEL'] || process.env.AI_TERMINAL_CODEX_FALLBACK_MODEL);
+    normalizeCodexModelList(serverConfig['AI_DASHBOARD_CODEX_FALLBACK_MODELS'] || process.env.AI_DASHBOARD_CODEX_FALLBACK_MODELS).forEach(push);
+    push(serverConfig['AI_DASHBOARD_CODEX_FALLBACK_MODEL'] || process.env.AI_DASHBOARD_CODEX_FALLBACK_MODEL);
+    if (!models.length) {
+        push(DEFAULT_CODEX_FALLBACK_MODEL);
+    }
+    return models;
+}
 function resolveCodexThoughtLevel() {
     var config = resolveio_server_app_1.ResolveIOServer.getServerConfig() || {};
     var raw = normalizeOptionalString(config['AI_ASSISTANT_CODEX_THOUGHT_LEVEL']
@@ -8760,25 +8948,38 @@ function resolveCodexThoughtLevel() {
     }
     return 'low';
 }
-function resolveCodexSettings() {
+function resolveCodexSettings(options) {
     var serverConfig = resolveio_server_app_1.ResolveIOServer.getServerConfig() || {};
     var apiKey = (serverConfig['OPENAI_API_KEY'] || process.env.OPENAI_API_KEY || '').trim();
     if (!apiKey) {
         throw new Error('OpenAI API key missing. Add OPENAI_API_KEY to server config.');
     }
-    return {
-        apiKey: apiKey,
-        baseUrl: (serverConfig['OPENAI_BASE_URL'] || process.env.OPENAI_BASE_URL || '').trim() || undefined,
-        model: resolveCodexModel(),
-        maxRetries: normalizeOptionalNumber(serverConfig['OPENAI_MAX_RETRIES'] || process.env.OPENAI_MAX_RETRIES),
-        retryDelayMs: normalizeOptionalNumber(serverConfig['OPENAI_RETRY_DELAY_MS'] || process.env.OPENAI_RETRY_DELAY_MS)
-    };
+    var model = normalizeOptionalString(options === null || options === void 0 ? void 0 : options.model) || resolveCodexModel();
+    var fallbackModels = resolveCodexFallbackModels({ fallbackModels: options === null || options === void 0 ? void 0 : options.fallbackModels }, model);
+    return __assign(__assign({ apiKey: apiKey, baseUrl: (serverConfig['OPENAI_BASE_URL'] || process.env.OPENAI_BASE_URL || '').trim() || undefined, model: model }, (fallbackModels.length ? { fallbackModel: fallbackModels[0], fallbackModels: fallbackModels } : {})), { maxRetries: normalizeOptionalNumber(serverConfig['OPENAI_MAX_RETRIES'] || process.env.OPENAI_MAX_RETRIES), retryDelayMs: normalizeOptionalNumber(serverConfig['OPENAI_RETRY_DELAY_MS'] || process.env.OPENAI_RETRY_DELAY_MS) });
+}
+function buildAssistantCodexClientCacheKey(config) {
+    var _a, _b;
+    return JSON.stringify({
+        apiKey: normalizeOptionalString(config === null || config === void 0 ? void 0 : config.apiKey),
+        baseUrl: normalizeOptionalString(config === null || config === void 0 ? void 0 : config.baseUrl),
+        model: normalizeOptionalString(config === null || config === void 0 ? void 0 : config.model),
+        fallbackModel: normalizeOptionalString(config === null || config === void 0 ? void 0 : config.fallbackModel),
+        fallbackModels: normalizeCodexModelList(config === null || config === void 0 ? void 0 : config.fallbackModels),
+        maxRetries: (_a = config === null || config === void 0 ? void 0 : config.maxRetries) !== null && _a !== void 0 ? _a : null,
+        retryDelayMs: (_b = config === null || config === void 0 ? void 0 : config.retryDelayMs) !== null && _b !== void 0 ? _b : null
+    });
 }
-function getAssistantCodexClient() {
-    if (!assistantCodexClient) {
-        assistantCodexClient = new codex_client_1.CodexClient(resolveCodexSettings());
+function getAssistantCodexClient(config) {
+    var resolved = config || resolveCodexSettings();
+    var key = buildAssistantCodexClientCacheKey(resolved);
+    var existing = assistantCodexClientByConfig.get(key);
+    if (existing) {
+        return existing;
     }
-    return assistantCodexClient;
+    var client = new codex_client_1.CodexClient(resolved);
+    assistantCodexClientByConfig.set(key, client);
+    return client;
 }
 var CodexWorkerBootstrapError = /** @class */ (function (_super) {
     __extends(CodexWorkerBootstrapError, _super);
@@ -8873,14 +9074,14 @@ function runCodexInWorkerThread(prompt, runOptions, config, streamStatusHandler)
                 case 0:
                     streamedOptions = applyCodexStreamStatusHandler(runOptions, streamStatusHandler);
                     if (!!resolveCodexWorkerThreadEnabled()) return [3 /*break*/, 2];
-                    codexClient = getAssistantCodexClient();
+                    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];
-                    codexClient = getAssistantCodexClient();
+                    codexClient = getAssistantCodexClient(config);
                     return [4 /*yield*/, codexClient.run(prompt, streamedOptions)];
                 case 4: return [2 /*return*/, _a.sent()];
                 case 5:
@@ -8893,7 +9094,7 @@ function runCodexInWorkerThread(prompt, runOptions, config, streamStatusHandler)
                         throw error_4;
                     }
                     console.error('Codex worker bootstrap failed, falling back to in-process run.', error_4);
-                    codexClient = getAssistantCodexClient();
+                    codexClient = getAssistantCodexClient(config);
                     return [4 /*yield*/, codexClient.run(prompt, streamedOptions)];
                 case 8: return [2 /*return*/, _a.sent()];
                 case 9: return [2 /*return*/];
@@ -9055,7 +9256,8 @@ function sanitizeCodexRunOptions(options) {
         timeoutMs: options.timeoutMs,
         threadOptions: options.threadOptions,
         threadKey: options.threadKey,
-        reuseThread: options.reuseThread
+        reuseThread: options.reuseThread,
+        fallbackModels: options.fallbackModels
     };
 }
 function resolveCodexWorkerPath() {
@@ -9438,6 +9640,10 @@ function buildAssistantContext(input, userContext) {
             lines.push(hint);
         });
     }
+    var recentToolError = normalizeOptionalString(userContext === null || userContext === void 0 ? void 0 : userContext.recentToolError);
+    if (recentToolError) {
+        lines.push("Most recent data-query error: ".concat(recentToolError));
+    }
     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)
@@ -9534,6 +9740,34 @@ 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);