@resolveio/server-lib 22.0.9 → 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;
@@ -166,6 +167,9 @@ var AI_ASSISTANT_PLANNER_MAX_ROUTES = 200;
 var AI_ASSISTANT_PLANNER_DEBUG_MAX_CHARS = 2000;
 var AI_ASSISTANT_LOCALE = 'en-US';
 var AI_ASSISTANT_CURRENCY_CODE = 'USD';
+var AI_ASSISTANT_USD_CURRENCY_TEXT_PATTERN = /\b(?:USD|US\$)(?:\s| | |[\u00A0\u202F\u2007])*\$?\s*([-+]?[0-9][0-9,]*(?:\.[0-9]+)?)/gi;
+var AI_ASSISTANT_REVENUE_VERIFY_DIFF_WARN_THRESHOLD = 0.15;
+var AI_ASSISTANT_REVENUE_VERIFY_PAID_GRAND_GAP_WARN_THRESHOLD = 0.10;
 var AI_ASSISTANT_PROGRESS_TICKS = [
     'Grabbing Data',
     'Drafting response'
@@ -378,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.',
@@ -432,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.',
@@ -487,8 +492,10 @@ 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.',
     '- Keep queries minimal, read-only, and avoid user/credential data unless the user is a super admin.',
     '- Assume you are not a super admin unless explicitly told otherwise.',
@@ -528,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.',
@@ -663,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 */
@@ -1316,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) {
@@ -1332,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')];
@@ -1411,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',
@@ -1425,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
                     };
@@ -1560,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,
@@ -1799,6 +1817,8 @@ function executeAiAssistantCodexRun(payload, context) {
                                     if (!assistantContent) {
                                         assistantContent = buildAssistantCodexErrorMessage(null);
                                     }
+                                    assistantContent = applyAssistantVerificationNotes(assistantContent, toolResult);
+                                    assistantContent = normalizeAssistantCurrencyText(assistantContent);
                                     if (aiWorkerDebug) {
                                         finishedAt = Date.now();
                                         console.log(new Date(), '[AI Worker Debug] codex run complete', {
@@ -1868,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 }, {
@@ -2398,7 +2418,7 @@ function executeAiAssistantMongoRead(payload, context) {
 }
 function executeAiAssistantMongoAggregate(payload, context) {
     return __awaiter(this, void 0, void 0, function () {
-        var input, rawCollection, dbName, db, collectionResolution, collection, bridgeCollection, schemaFields, _a, user, isSuperAdmin, customerId, fallbackMeta, baseQuery, stripped, userId, normalizedClient, shouldScopeByClient, _b, clientScopedQuery, scopedQuery, normalizedPipeline, sanitizedPipeline, strippedPipeline, pipelineWithScope, normalizedOptions, limitedPipeline, dateField, aggregateOptions, documents, executedPipeline, probeDocs, fallback, fallbackPipeline, fallbackDocs, createdFallback, createdPipeline, createdDocs, expanded, expandedDocs, completionFallback, fallbackPipeline, fallbackDocs, completionExprFallback, fallbackPipeline, fallbackDocs, unwindFallback, shouldUnwind, _c, _d, fallbackPipeline, fallbackDocs, nameFallback, fallbackPipeline, fallbackDocs, _e, _loop_1, i, state_1, matchFields_1, _f, aliases, rewrittenPipeline, fallbackDocs, _loop_2, i, state_2, baseCollection, fallbackPayload, fallbackResult, existingFallbacks, matchStages, diagnostics, combinedMatch, nameFields, dateFields, queryNoName, _g, queryNoDate, _h, _j, _k, _l, allCollections, base, alt, altCount, _m, sanitizedDocuments, includeIds, displayDocs, idLookupDisplay, display;
+        var input, rawCollection, dbName, db, collectionResolution, collection, bridgeCollection, schemaFields, _a, user, isSuperAdmin, customerId, fallbackMeta, baseQuery, stripped, userId, normalizedClient, shouldScopeByClient, _b, clientScopedQuery, scopedQuery, normalizedPipeline, sanitizedPipeline, strippedPipeline, pipelineWithScope, normalizedOptions, limitedPipeline, dateField, aggregateOptions, documents, executedPipeline, probeDocs, fallback, fallbackPipeline, fallbackDocs, createdFallback, createdPipeline, createdDocs, expanded, expandedDocs, completionFallback, fallbackPipeline, fallbackDocs, completionExprFallback, fallbackPipeline, fallbackDocs, unwindFallback, shouldUnwind, _c, _d, fallbackPipeline, fallbackDocs, nameFallback, fallbackPipeline, fallbackDocs, _e, _loop_1, i, state_1, matchFields_1, _f, aliases, rewrittenPipeline, fallbackDocs, _loop_2, i, state_2, baseCollection, fallbackPayload, fallbackResult, existingFallbacks, matchStages, diagnostics, combinedMatch, nameFields, dateFields, queryNoName, _g, queryNoDate, _h, _j, _k, _l, allCollections, base, alt, altCount, _m, verification, sanitizedDocuments, includeIds, displayDocs, idLookupDisplay, display;
         var _o, _p;
         return __generator(this, function (_q) {
             switch (_q.label) {
@@ -2975,7 +2995,15 @@ function executeAiAssistantMongoAggregate(payload, context) {
                 case 60:
                     fallbackMeta.zeroDiagnostics = diagnostics;
                     _q.label = 61;
-                case 61:
+                case 61: return [4 /*yield*/, verifyAssistantAggregateReliability({
+                        db: db,
+                        collection: collection,
+                        pipeline: executedPipeline,
+                        documents: documents,
+                        aggregateOptions: aggregateOptions
+                    })];
+                case 62:
+                    verification = _q.sent();
                     sanitizedDocuments = isSuperAdmin
                         ? documents
                         : documents.map(function (doc) { return redactSensitiveFields((0, common_1.deepCopy)(doc)); });
@@ -2990,7 +3018,7 @@ function executeAiAssistantMongoAggregate(payload, context) {
                             idCustomer: customerId,
                             isSuperAdmin: isSuperAdmin
                         })];
-                case 62:
+                case 63:
                     idLookupDisplay = _q.sent();
                     if (idLookupDisplay === null || idLookupDisplay === void 0 ? void 0 : idLookupDisplay.docs) {
                         displayDocs = idLookupDisplay.docs;
@@ -3004,27 +3032,482 @@ function executeAiAssistantMongoAggregate(payload, context) {
                         maxRows: normalizedOptions.limit || sanitizedDocuments.length,
                         includeGroupFromId: true
                     });
-                    return [2 /*return*/, __assign({ documents: sanitizedDocuments, display: display }, (isSuperAdmin ? {
-                            debug: {
-                                collection: collection,
-                                collectionRequested: rawCollection,
-                                collectionResolved: collection,
-                                collectionMatched: collectionResolution.matched,
-                                collectionCandidates: collectionResolution.candidates,
-                                collectionScore: collectionResolution.score,
-                                bridge: 'report-builder',
-                                database: dbName,
-                                query: scopedQuery,
-                                options: normalizedOptions.aggregateOptions,
-                                originalPipeline: limitedPipeline,
-                                executedPipeline: executedPipeline,
-                                fallbacks: fallbackMeta
-                            }
+                    return [2 /*return*/, __assign(__assign({ documents: sanitizedDocuments, display: display }, (verification ? { verification: verification } : {})), (isSuperAdmin ? {
+                            debug: __assign(__assign({ collection: collection, collectionRequested: rawCollection, collectionResolved: collection, collectionMatched: collectionResolution.matched, collectionCandidates: collectionResolution.candidates, collectionScore: collectionResolution.score, bridge: 'report-builder', database: dbName, query: scopedQuery, options: normalizedOptions.aggregateOptions, originalPipeline: limitedPipeline, executedPipeline: executedPipeline }, (verification ? { verification: verification } : {})), { fallbacks: fallbackMeta })
                         } : {}))];
             }
         });
     });
 }
+function verifyAssistantAggregateReliability(params) {
+    return __awaiter(this, void 0, void 0, function () {
+        var collection, collectionBase, monthKey, amountKey, baseMap, groupIndex, groupPaths, dateField, mergedMatch, dateFieldsInMatch, baseMatchNoDate, primaryDateCondition, verifyPipeline, verifyDocs, _a, verifyMap, comparedMonths, paidCloserCount, grandCloserCount, sumPaidDiffPct, sumGrandDiffPct, maxPaidDiffPct, maxGrandDiffPct, sumPaidGrandGapPct, highVarianceMonths, checks, warnings, avgPaidDiffPct, avgGrandDiffPct, avgPaidGrandGapPct, baselineMetric, rollingWindow, normalizedMetric, bounds, fullMonthMatch, fullMonthDocs, fullMonthMap, fullMonthDiff, _b, alternateDateField, alternateDateCondition, bounds, alternateMatch, alternateDocs, alternateMap, alternateDiff, _c;
+        var _d, _e;
+        var _f;
+        return __generator(this, function (_g) {
+            switch (_g.label) {
+                case 0:
+                    collection = normalizeOptionalString(params.collection).toLowerCase();
+                    collectionBase = collection.startsWith('report-') ? collection.slice('report-'.length) : collection;
+                    if (collectionBase !== 'invoices') {
+                        return [2 /*return*/, null];
+                    }
+                    monthKey = resolveAssistantMonthlyKey(params.documents);
+                    if (!monthKey) {
+                        return [2 /*return*/, null];
+                    }
+                    amountKey = resolveAssistantNumericAmountKey(params.documents, monthKey);
+                    if (!amountKey) {
+                        return [2 /*return*/, null];
+                    }
+                    baseMap = mapAssistantRevenueByMonth(params.documents, monthKey, amountKey);
+                    if (!baseMap.size) {
+                        return [2 /*return*/, null];
+                    }
+                    groupIndex = findAggregateGroupIndex(params.pipeline || []);
+                    if (groupIndex === -1) {
+                        return [2 /*return*/, null];
+                    }
+                    groupPaths = extractGroupFieldPaths(((_f = params.pipeline[groupIndex]) === null || _f === void 0 ? void 0 : _f.$group) || {});
+                    dateField = groupPaths.find(function (field) { return /(date|paid|invoice|created|updated|_at)$/i.test(field); })
+                        || groupPaths.find(function (field) { return /(date|paid|invoice|created|updated)/i.test(field); })
+                        || 'date_paid';
+                    mergedMatch = mergeAssistantPreGroupMatchStages(params.pipeline || [], groupIndex);
+                    dateFieldsInMatch = collectMatchFieldsByCondition(mergedMatch, function (_field, condition) { return isDateCondition(condition); });
+                    baseMatchNoDate = dateFieldsInMatch.length ? stripMatchFields(mergedMatch, dateFieldsInMatch) : mergedMatch;
+                    primaryDateCondition = findMatchConditionForField(mergedMatch, dateField);
+                    verifyPipeline = buildAssistantMonthlyRevenueVerificationPipeline(mergedMatch, dateField);
+                    verifyDocs = [];
+                    _g.label = 1;
+                case 1:
+                    _g.trys.push([1, 3, , 4]);
+                    return [4 /*yield*/, params.db.collection(params.collection)
+                            .aggregate(verifyPipeline, params.aggregateOptions || {})
+                            .toArray()];
+                case 2:
+                    verifyDocs = _g.sent();
+                    return [3 /*break*/, 4];
+                case 3:
+                    _a = _g.sent();
+                    return [2 /*return*/, {
+                            type: 'invoice_revenue_monthly',
+                            checks: [
+                                { name: 'Cross-check query', status: 'warn', details: 'Verification query failed; result not cross-checked.' }
+                            ],
+                            warnings: ['Verification query failed, so this total was not independently cross-checked.'],
+                            metrics: {
+                                baselineField: amountKey,
+                                dateField: dateField
+                            }
+                        }];
+                case 4:
+                    verifyMap = mapAssistantVerificationDocsByMonth(verifyDocs);
+                    comparedMonths = 0;
+                    paidCloserCount = 0;
+                    grandCloserCount = 0;
+                    sumPaidDiffPct = 0;
+                    sumGrandDiffPct = 0;
+                    maxPaidDiffPct = 0;
+                    maxGrandDiffPct = 0;
+                    sumPaidGrandGapPct = 0;
+                    highVarianceMonths = [];
+                    baseMap.forEach(function (value, month) {
+                        var match = verifyMap.get(month);
+                        if (!match) {
+                            return;
+                        }
+                        comparedMonths += 1;
+                        var paidDiff = Math.abs(value - match.paid);
+                        var grandDiff = Math.abs(value - match.grand);
+                        var denom = Math.max(Math.abs(value), 1);
+                        var paidPct = paidDiff / denom;
+                        var grandPct = grandDiff / denom;
+                        sumPaidDiffPct += paidPct;
+                        sumGrandDiffPct += grandPct;
+                        maxPaidDiffPct = Math.max(maxPaidDiffPct, paidPct);
+                        maxGrandDiffPct = Math.max(maxGrandDiffPct, grandPct);
+                        if (paidDiff < grandDiff) {
+                            paidCloserCount += 1;
+                        }
+                        else if (grandDiff < paidDiff) {
+                            grandCloserCount += 1;
+                        }
+                        var gapPct = Math.abs(match.paid - match.grand) / Math.max(Math.abs(match.grand), 1);
+                        sumPaidGrandGapPct += gapPct;
+                        if (Math.min(paidPct, grandPct) >= AI_ASSISTANT_REVENUE_VERIFY_DIFF_WARN_THRESHOLD) {
+                            highVarianceMonths.push(month);
+                        }
+                    });
+                    checks = [];
+                    warnings = [];
+                    avgPaidDiffPct = comparedMonths ? (sumPaidDiffPct / comparedMonths) : 0;
+                    avgGrandDiffPct = comparedMonths ? (sumGrandDiffPct / comparedMonths) : 0;
+                    avgPaidGrandGapPct = comparedMonths ? (sumPaidGrandGapPct / comparedMonths) : 0;
+                    baselineMetric = 'unknown';
+                    if (comparedMonths) {
+                        if (paidCloserCount > grandCloserCount) {
+                            baselineMetric = 'paid_total (date_paid)';
+                        }
+                        else if (grandCloserCount > paidCloserCount) {
+                            baselineMetric = 'grand_total (date_paid)';
+                        }
+                        else {
+                            baselineMetric = 'mixed';
+                        }
+                    }
+                    if (!comparedMonths) {
+                        checks.push({
+                            name: 'Cross-check coverage',
+                            status: 'warn',
+                            details: 'No overlapping month rows were available for verification.'
+                        });
+                        warnings.push('Could not cross-check this result against alternate invoice total fields for the same months.');
+                    }
+                    else {
+                        checks.push({
+                            name: 'Metric alignment',
+                            status: baselineMetric === 'mixed' ? 'warn' : 'pass',
+                            details: "Result aligns most with ".concat(baselineMetric, ".")
+                        });
+                        if (baselineMetric === 'mixed') {
+                            warnings.push('Revenue appears to mix definitions across months (paid_total vs grand_total).');
+                        }
+                        checks.push({
+                            name: 'Field variance',
+                            status: avgPaidGrandGapPct >= AI_ASSISTANT_REVENUE_VERIFY_PAID_GRAND_GAP_WARN_THRESHOLD ? 'warn' : 'pass',
+                            details: "Average paid-vs-grand gap: ".concat((0, common_1.round)(avgPaidGrandGapPct * 100, 2), "%.")
+                        });
+                        if (avgPaidGrandGapPct >= AI_ASSISTANT_REVENUE_VERIFY_PAID_GRAND_GAP_WARN_THRESHOLD) {
+                            warnings.push("paid_total and grand_total differ materially for this period (".concat((0, common_1.round)(avgPaidGrandGapPct * 100, 2), "% average gap)."));
+                        }
+                    }
+                    rollingWindow = detectAssistantRollingMonthWindow(params.pipeline || []);
+                    if ((rollingWindow === null || rollingWindow === void 0 ? void 0 : rollingWindow.months) && (rollingWindow === null || rollingWindow === void 0 ? void 0 : rollingWindow.upperNow)) {
+                        checks.push({
+                            name: 'Date window shape',
+                            status: 'warn',
+                            details: "Query uses rolling $$NOW bounds (last ".concat(rollingWindow.months, " months), which can include partial months.")
+                        });
+                        warnings.push("Date window is rolling (last ".concat(rollingWindow.months, " months to now), so first/current months may be partial."));
+                    }
+                    else {
+                        checks.push({
+                            name: 'Date window shape',
+                            status: 'pass',
+                            details: 'No rolling $$NOW month window pattern detected.'
+                        });
+                    }
+                    normalizedMetric = normalizeAssistantVerificationMetric(baselineMetric);
+                    if (!((rollingWindow === null || rollingWindow === void 0 ? void 0 : rollingWindow.months) && (rollingWindow === null || rollingWindow === void 0 ? void 0 : rollingWindow.upperNow))) return [3 /*break*/, 8];
+                    bounds = resolveAssistantRollingWindowBounds(rollingWindow.months);
+                    fullMonthMatch = mergeAssistantMatch(baseMatchNoDate, (_d = {},
+                        _d[dateField] = {
+                            $gte: bounds.startOfWindow,
+                            $lt: bounds.startOfCurrentMonth
+                        },
+                        _d));
+                    _g.label = 5;
+                case 5:
+                    _g.trys.push([5, 7, , 8]);
+                    return [4 /*yield*/, params.db.collection(params.collection)
+                            .aggregate(buildAssistantMonthlyRevenueVerificationPipeline(fullMonthMatch, dateField), params.aggregateOptions || {})
+                            .toArray()];
+                case 6:
+                    fullMonthDocs = _g.sent();
+                    fullMonthMap = mapAssistantMetricByMonth(mapAssistantVerificationDocsByMonth(fullMonthDocs), normalizedMetric);
+                    fullMonthDiff = compareAssistantMonthlyValueMaps(baseMap, fullMonthMap);
+                    checks.push({
+                        name: 'Full-month cross-check',
+                        status: fullMonthDiff.comparedMonths && fullMonthDiff.avgDiffPct < AI_ASSISTANT_REVENUE_VERIFY_DIFF_WARN_THRESHOLD ? 'pass' : 'warn',
+                        details: fullMonthDiff.comparedMonths
+                            ? "Compared ".concat(fullMonthDiff.comparedMonths, " month(s); avg diff ").concat((0, common_1.round)(fullMonthDiff.avgDiffPct * 100, 2), "%.")
+                            : 'No overlapping months for full-month cross-check.'
+                    });
+                    if (fullMonthDiff.comparedMonths && fullMonthDiff.avgDiffPct >= AI_ASSISTANT_REVENUE_VERIFY_DIFF_WARN_THRESHOLD) {
+                        warnings.push("Rolling-window totals differ from full-month totals by ".concat((0, common_1.round)(fullMonthDiff.avgDiffPct * 100, 2), "% on average."));
+                    }
+                    if (!fullMonthDiff.comparedMonths) {
+                        warnings.push('Could not compare rolling-window results against full-month buckets.');
+                    }
+                    return [3 /*break*/, 8];
+                case 7:
+                    _b = _g.sent();
+                    checks.push({
+                        name: 'Full-month cross-check',
+                        status: 'warn',
+                        details: 'Full-month verification query failed.'
+                    });
+                    warnings.push('Full-month verification query failed.');
+                    return [3 /*break*/, 8];
+                case 8:
+                    alternateDateField = dateField === 'date_paid'
+                        ? 'date_invoice'
+                        : dateField === 'date_invoice'
+                            ? 'date_paid'
+                            : '';
+                    if (!alternateDateField) return [3 /*break*/, 12];
+                    alternateDateCondition = null;
+                    if ((rollingWindow === null || rollingWindow === void 0 ? void 0 : rollingWindow.months) && (rollingWindow === null || rollingWindow === void 0 ? void 0 : rollingWindow.upperNow)) {
+                        bounds = resolveAssistantRollingWindowBounds(rollingWindow.months);
+                        alternateDateCondition = {
+                            $gte: bounds.rollingStart,
+                            $lte: bounds.now
+                        };
+                    }
+                    else if (primaryDateCondition && typeof primaryDateCondition === 'object') {
+                        alternateDateCondition = primaryDateCondition;
+                    }
+                    if (!alternateDateCondition) return [3 /*break*/, 12];
+                    alternateMatch = mergeAssistantMatch(baseMatchNoDate, (_e = {}, _e[alternateDateField] = alternateDateCondition, _e));
+                    _g.label = 9;
+                case 9:
+                    _g.trys.push([9, 11, , 12]);
+                    return [4 /*yield*/, params.db.collection(params.collection)
+                            .aggregate(buildAssistantMonthlyRevenueVerificationPipeline(alternateMatch, alternateDateField), params.aggregateOptions || {})
+                            .toArray()];
+                case 10:
+                    alternateDocs = _g.sent();
+                    alternateMap = mapAssistantMetricByMonth(mapAssistantVerificationDocsByMonth(alternateDocs), normalizedMetric);
+                    alternateDiff = compareAssistantMonthlyValueMaps(baseMap, alternateMap);
+                    checks.push({
+                        name: "Alternate date field (".concat(alternateDateField, ")"),
+                        status: alternateDiff.comparedMonths && alternateDiff.avgDiffPct < AI_ASSISTANT_REVENUE_VERIFY_DIFF_WARN_THRESHOLD ? 'pass' : 'warn',
+                        details: alternateDiff.comparedMonths
+                            ? "Compared ".concat(alternateDiff.comparedMonths, " month(s); avg diff ").concat((0, common_1.round)(alternateDiff.avgDiffPct * 100, 2), "%.")
+                            : 'No overlapping months for alternate date-field cross-check.'
+                    });
+                    if (alternateDiff.comparedMonths && alternateDiff.avgDiffPct >= AI_ASSISTANT_REVENUE_VERIFY_DIFF_WARN_THRESHOLD) {
+                        warnings.push("Switching from ".concat(dateField, " to ").concat(alternateDateField, " changes monthly totals by ").concat((0, common_1.round)(alternateDiff.avgDiffPct * 100, 2), "% on average."));
+                    }
+                    return [3 /*break*/, 12];
+                case 11:
+                    _c = _g.sent();
+                    checks.push({
+                        name: "Alternate date field (".concat(alternateDateField, ")"),
+                        status: 'warn',
+                        details: 'Alternate date-field verification query failed.'
+                    });
+                    return [3 /*break*/, 12];
+                case 12:
+                    if (highVarianceMonths.length) {
+                        warnings.push("High variance months vs both paid/grand checks: ".concat(highVarianceMonths.join(', '), "."));
+                    }
+                    return [2 /*return*/, {
+                            type: 'invoice_revenue_monthly',
+                            checks: checks,
+                            warnings: warnings,
+                            metrics: {
+                                baselineField: amountKey,
+                                dateField: dateField,
+                                comparedMonths: comparedMonths,
+                                avgDiffToPaidPct: (0, common_1.round)(avgPaidDiffPct * 100, 2),
+                                avgDiffToGrandPct: (0, common_1.round)(avgGrandDiffPct * 100, 2),
+                                maxDiffToPaidPct: (0, common_1.round)(maxPaidDiffPct * 100, 2),
+                                maxDiffToGrandPct: (0, common_1.round)(maxGrandDiffPct * 100, 2),
+                                avgPaidGrandGapPct: (0, common_1.round)(avgPaidGrandGapPct * 100, 2)
+                            }
+                        }];
+            }
+        });
+    });
+}
+function resolveAssistantMonthlyKey(documents) {
+    var first = Array.isArray(documents) ? documents.find(function (doc) { return doc && typeof doc === 'object'; }) : null;
+    if (!first) {
+        return '';
+    }
+    return Object.keys(first).find(function (key) {
+        var value = first[key];
+        return typeof value === 'string' && /^\d{4}-\d{2}$/.test(value);
+    }) || '';
+}
+function resolveAssistantNumericAmountKey(documents, monthKey) {
+    var first = Array.isArray(documents) ? documents.find(function (doc) { return doc && typeof doc === 'object'; }) : null;
+    if (!first) {
+        return '';
+    }
+    var currencyLike = Object.keys(first).filter(function (key) {
+        if (key === monthKey) {
+            return false;
+        }
+        var value = Number(first[key]);
+        if (!Number.isFinite(value)) {
+            return false;
+        }
+        return /(revenue|amount|total|sales|billing|paid|grand)/i.test(key);
+    });
+    if (currencyLike.length) {
+        return currencyLike[0];
+    }
+    return Object.keys(first).find(function (key) {
+        if (key === monthKey) {
+            return false;
+        }
+        return Number.isFinite(Number(first[key]));
+    }) || '';
+}
+function mapAssistantRevenueByMonth(documents, monthKey, valueKey) {
+    var mapped = new Map();
+    (Array.isArray(documents) ? documents : []).forEach(function (doc) {
+        var month = normalizeOptionalString(doc === null || doc === void 0 ? void 0 : doc[monthKey]);
+        if (!month || !/^\d{4}-\d{2}$/.test(month)) {
+            return;
+        }
+        var value = Number(doc === null || doc === void 0 ? void 0 : doc[valueKey]);
+        if (!Number.isFinite(value)) {
+            return;
+        }
+        mapped.set(month, value);
+    });
+    return mapped;
+}
+function mergeAssistantPreGroupMatchStages(pipeline, groupIndex) {
+    var matches = [];
+    for (var i = 0; i < groupIndex; i += 1) {
+        var stage = pipeline[i];
+        if (stage && typeof stage === 'object' && stage.$match && typeof stage.$match === 'object') {
+            matches.push(stage.$match);
+        }
+    }
+    if (!matches.length) {
+        return {};
+    }
+    if (matches.length === 1) {
+        return matches[0];
+    }
+    return { $and: matches };
+}
+function detectAssistantRollingMonthWindow(pipeline) {
+    var raw = JSON.stringify(Array.isArray(pipeline) ? pipeline : []);
+    if (!raw) {
+        return null;
+    }
+    var amountMatch = raw.match(/"\$dateSubtract":\{"startDate":"\$\$NOW","unit":"month","amount":([0-9]+)\}/);
+    if (!amountMatch) {
+        return null;
+    }
+    var months = Number(amountMatch[1]);
+    if (!Number.isFinite(months) || months < 1) {
+        return null;
+    }
+    var nowCount = (raw.match(/\$\$NOW/g) || []).length;
+    return {
+        months: months,
+        upperNow: nowCount >= 2
+    };
+}
+function buildAssistantMonthlyRevenueVerificationPipeline(match, dateField) {
+    var pipeline = [];
+    if (match && typeof match === 'object' && Object.keys(match).length) {
+        pipeline.push({ $match: match });
+    }
+    pipeline.push({
+        $group: {
+            _id: {
+                $dateToString: {
+                    format: '%Y-%m',
+                    date: "$".concat(dateField)
+                }
+            },
+            paid_total_sum: { $sum: { $ifNull: ['$paid_total', 0] } },
+            grand_total_sum: { $sum: { $ifNull: ['$grand_total', 0] } },
+            invoice_count: { $sum: 1 }
+        }
+    }, {
+        $project: {
+            _id: 0,
+            month: '$_id',
+            paid_total_sum: 1,
+            grand_total_sum: 1,
+            invoice_count: 1
+        }
+    }, { $sort: { month: 1 } }, { $limit: 36 });
+    return pipeline;
+}
+function mapAssistantVerificationDocsByMonth(docs) {
+    var mapped = new Map();
+    (Array.isArray(docs) ? docs : []).forEach(function (row) {
+        var month = normalizeOptionalString(row === null || row === void 0 ? void 0 : row.month);
+        if (!month || !/^\d{4}-\d{2}$/.test(month)) {
+            return;
+        }
+        var paid = Number(row === null || row === void 0 ? void 0 : row.paid_total_sum);
+        var grand = Number(row === null || row === void 0 ? void 0 : row.grand_total_sum);
+        var count = Number(row === null || row === void 0 ? void 0 : row.invoice_count);
+        mapped.set(month, {
+            paid: Number.isFinite(paid) ? paid : 0,
+            grand: Number.isFinite(grand) ? grand : 0,
+            count: Number.isFinite(count) ? count : 0
+        });
+    });
+    return mapped;
+}
+function normalizeAssistantVerificationMetric(value) {
+    var normalized = normalizeOptionalString(value).toLowerCase();
+    if (normalized.startsWith('paid_total')) {
+        return 'paid';
+    }
+    if (normalized.startsWith('grand_total')) {
+        return 'grand';
+    }
+    return 'mixed';
+}
+function mapAssistantMetricByMonth(source, metric) {
+    var mapped = new Map();
+    source.forEach(function (value, month) {
+        var next = metric === 'paid'
+            ? value.paid
+            : metric === 'grand'
+                ? value.grand
+                : value.paid || value.grand;
+        mapped.set(month, Number.isFinite(next) ? next : 0);
+    });
+    return mapped;
+}
+function compareAssistantMonthlyValueMaps(base, compare) {
+    var comparedMonths = 0;
+    var sumDiffPct = 0;
+    var maxDiffPct = 0;
+    base.forEach(function (baseValue, month) {
+        var compareValue = compare.get(month);
+        if (typeof compareValue !== 'number') {
+            return;
+        }
+        var diffPct = Math.abs(baseValue - compareValue) / Math.max(Math.abs(baseValue), 1);
+        comparedMonths += 1;
+        sumDiffPct += diffPct;
+        maxDiffPct = Math.max(maxDiffPct, diffPct);
+    });
+    return {
+        comparedMonths: comparedMonths,
+        avgDiffPct: comparedMonths ? (sumDiffPct / comparedMonths) : 0,
+        maxDiffPct: maxDiffPct
+    };
+}
+function mergeAssistantMatch(base, extra) {
+    var baseObj = base && typeof base === 'object' ? base : {};
+    var extraObj = extra && typeof extra === 'object' ? extra : {};
+    if (!Object.keys(baseObj).length) {
+        return extraObj;
+    }
+    if (!Object.keys(extraObj).length) {
+        return baseObj;
+    }
+    return { $and: [baseObj, extraObj] };
+}
+function resolveAssistantRollingWindowBounds(months) {
+    var now = new Date();
+    var rollingStart = new Date(now);
+    rollingStart.setUTCMonth(rollingStart.getUTCMonth() - months);
+    var startOfCurrentMonth = new Date(Date.UTC(now.getUTCFullYear(), now.getUTCMonth(), 1));
+    var startOfWindow = new Date(Date.UTC(startOfCurrentMonth.getUTCFullYear(), startOfCurrentMonth.getUTCMonth() - months, 1));
+    return {
+        now: now,
+        rollingStart: rollingStart,
+        startOfCurrentMonth: startOfCurrentMonth,
+        startOfWindow: startOfWindow
+    };
+}
 function extractAssistantMongoDirective(content) {
     var lines = String(content || '').split('\n');
     var directiveIndex = -1;
@@ -3079,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) {
@@ -3097,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 || {};
@@ -3121,6 +3621,9 @@ function buildAssistantToolResultPayload(directive, toolResponse) {
         || normalizeOptionalString((_c = toolResponse === null || toolResponse === void 0 ? void 0 : toolResponse.debug) === null || _c === void 0 ? void 0 : _c.collection)
         || requestedCollection
         || '';
+    var verification = (toolResponse === null || toolResponse === void 0 ? void 0 : toolResponse.verification) && typeof toolResponse.verification === 'object'
+        ? toolResponse.verification
+        : undefined;
     var result = {
         type: directive.type === 'aggregate' ? 'mongo_agg' : 'mongo_read',
         input: directivePayload,
@@ -3131,6 +3634,7 @@ function buildAssistantToolResultPayload(directive, toolResponse) {
             rowCount: rowCount,
             columns: trimmedDisplay.columns,
             truncated: trimmedDisplay.truncated,
+            verification: verification,
             debug: (toolResponse === null || toolResponse === void 0 ? void 0 : toolResponse.debug) && typeof toolResponse.debug === 'object' ? toolResponse.debug : undefined
         }
     };
@@ -3160,6 +3664,26 @@ function buildAssistantToolResultPrompt(result) {
     else {
         lines.push('Preview: (no rows)');
     }
+    var verification = result.output.verification;
+    if (verification && typeof verification === 'object') {
+        var checks = Array.isArray(verification.checks) ? verification.checks : [];
+        var warnings = Array.isArray(verification.warnings) ? verification.warnings : [];
+        if (checks.length || warnings.length) {
+            lines.push('Verification:');
+        }
+        checks.slice(0, 4).forEach(function (entry) {
+            var name = normalizeOptionalString(entry === null || entry === void 0 ? void 0 : entry.name) || 'check';
+            var status = normalizeOptionalString(entry === null || entry === void 0 ? void 0 : entry.status).toLowerCase() === 'warn' ? 'warn' : 'pass';
+            var details = normalizeOptionalString(entry === null || entry === void 0 ? void 0 : entry.details);
+            lines.push("- ".concat(name, ": ").concat(status).concat(details ? " (".concat(details, ")") : ''));
+        });
+        warnings.slice(0, 4).forEach(function (warning) {
+            var text = normalizeOptionalString(warning);
+            if (text) {
+                lines.push("- warning: ".concat(text));
+            }
+        });
+    }
     return lines.join('\n');
 }
 function buildAssistantCodexToolFollowupPrompt(message, attachmentText, historyText, contextText, toolResultText) {
@@ -3168,7 +3692,7 @@ function buildAssistantCodexToolFollowupPrompt(message, attachmentText, historyT
     var trimmedHistory = normalizeOptionalString(historyText);
     var historyBlock = trimmedHistory ? "\n\nConversation so far:\n".concat(trimmedHistory) : '';
     var toolBlock = toolResultText ? "\n\nTool Result:\n".concat(toolResultText) : '';
-    var instruction = '\n\nInstruction:\nNow answer the user. Do NOT output another REPORT_BUILDER_* directive. Output plain Markdown. Summarize first, then include a Markdown table.';
+    var instruction = '\n\nInstruction:\nNow answer the user. Do NOT output another REPORT_BUILDER_* directive. Output plain Markdown. Summarize first, then include a Markdown table. If the Tool Result includes Verification warnings, explicitly include them and call out the metric/date basis used.';
     return "System:\n".concat(AI_ASSISTANT_SYSTEM_PROMPT).concat(contextBlock).concat(historyBlock, "\n\nUser:\n").concat(message).concat(attachmentText || '').concat(toolBlock).concat(instruction).trim();
 }
 function buildAssistantToolFallbackResponse(result) {
@@ -3187,6 +3711,27 @@ function buildAssistantToolFallbackResponse(result) {
     }
     return lines.join('\n').trim();
 }
+function applyAssistantVerificationNotes(value, toolResult) {
+    var _a, _b, _c, _d;
+    var content = normalizeOptionalString(value);
+    var warnings = Array.isArray((_b = (_a = toolResult === null || toolResult === void 0 ? void 0 : toolResult.output) === null || _a === void 0 ? void 0 : _a.verification) === null || _b === void 0 ? void 0 : _b.warnings)
+        ? (_d = (_c = toolResult === null || toolResult === void 0 ? void 0 : toolResult.output) === null || _c === void 0 ? void 0 : _c.verification) === null || _d === void 0 ? void 0 : _d.warnings.map(function (entry) { return normalizeOptionalString(entry); }).filter(Boolean)
+        : [];
+    if (!warnings.length) {
+        return content || value || '';
+    }
+    var normalizedLower = String(content || '').toLowerCase();
+    var missing = warnings.filter(function (warning) { return !normalizedLower.includes(String(warning).toLowerCase()); });
+    if (!missing.length) {
+        return content || value || '';
+    }
+    var noteLines = ['Verification notes:'];
+    missing.slice(0, 4).forEach(function (warning) { return noteLines.push("- ".concat(warning)); });
+    if (!content) {
+        return noteLines.join('\n');
+    }
+    return "".concat(content, "\n\n").concat(noteLines.join('\n')).trim();
+}
 function buildAssistantDebugPayload(params) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4;
     var notes = [];
@@ -3363,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);
@@ -3377,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);
     }
@@ -4876,6 +5424,7 @@ function getAssistantCurrencyFormatter() {
         assistantCurrencyFormatter = new Intl.NumberFormat(AI_ASSISTANT_LOCALE, {
             style: 'currency',
             currency: AI_ASSISTANT_CURRENCY_CODE,
+            currencyDisplay: 'narrowSymbol',
             minimumFractionDigits: 2,
             maximumFractionDigits: 2
         });
@@ -4963,6 +5512,12 @@ function formatAssistantDisplayCell(value, column) {
     if (Array.isArray(value)) {
         return value.map(function (item) { return formatAssistantDisplayCell(item, column); }).filter(Boolean).join(', ');
     }
+    if (typeof value === 'string') {
+        var normalizedCurrency = normalizeAssistantCurrencyText(value);
+        if (normalizedCurrency !== value) {
+            return normalizedCurrency;
+        }
+    }
     var columnKey = String(column || '').toLowerCase();
     if (isAssistantDateColumn(columnKey) && isAssistantLikelyDateValue(value)) {
         return formatAssistantDateValue(value);
@@ -4998,6 +5553,13 @@ function formatAssistantDisplayCell(value, column) {
     }
     return String(value);
 }
+function normalizeAssistantCurrencyText(value) {
+    var raw = String(value || '');
+    if (!raw) {
+        return '';
+    }
+    return raw.replace(AI_ASSISTANT_USD_CURRENCY_TEXT_PATTERN, function (_match, amount) { return "$".concat(amount); });
+}
 function formatDisplayTableMarkdown(display) {
     if (!display || !Array.isArray(display.columns) || !display.columns.length) {
         return '';
@@ -5019,7 +5581,7 @@ function stripAssistantMarkdownTables(value) {
     if (!raw) {
         return '';
     }
-    var tablePattern = /(^|\n)\|[^\n]*\|\n\|[ \t:-|]+\|\n(?:\|[^\n]*\|\n?)*/g;
+    var tablePattern = /(^|\n)\s*\|[^\n]*\|\s*\n\s*\|[ \t:-|]+\|\s*\n(?:\s*\|[^\n]*\|\s*\n?)*/g;
     var cleaned = raw.replace(tablePattern, '\n').trim();
     return cleaned;
 }
@@ -5067,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) {
@@ -5083,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 }];
+                    }
+                    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.');
                     }
-                    else if (normalizedPermission && !userHasViewPermission(user, normalizedPermission)) {
+                    if (requiresInvoiceAccess && !hasInvoiceAccess) {
                         throw new Error('AI assistant report builder bridge: Access denied.');
                     }
                     return [2 /*return*/, { user: user, isSuperAdmin: isSuperAdmin }];
@@ -5172,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('$$');
@@ -5229,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;
                     }
@@ -5243,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;
@@ -5320,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) {
@@ -6967,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();
@@ -7491,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));
@@ -7499,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) {
@@ -7541,7 +8185,7 @@ function resolveCollectionOverrideWithContext(params) {
                 to: reportPreferred,
                 fromScore: 0,
                 toScore: 0,
-                reason: 'report route preference'
+                reason: 'report builder route preference'
             };
         }
     }
@@ -8149,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();
@@ -8208,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']
@@ -8232,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);
@@ -8345,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:
@@ -8365,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*/];
@@ -8527,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() {
@@ -8910,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)
@@ -9006,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);
@@ -9180,13 +9942,7 @@ function sanitizeAssistantResponse(value) {
     if (!cleaned) {
         return 'I can’t share code, but I can point you to files or explain behavior at a high level.';
     }
-    var normalizedCurrency = cleaned
-        .replace(/\bUSD(?:\s|&nbsp;|&#160;|[\u00A0\u202F\u2007])*\$?\s*([-+]?[0-9][0-9,]*(?:\.[0-9]+)?)/g, function (_match, amount) {
-        return "$".concat(amount);
-    })
-        .replace(/\bUS\$\s*([-+]?[0-9][0-9,]*(?:\.[0-9]+)?)/g, function (_match, amount) {
-        return "$".concat(amount);
-    });
+    var normalizedCurrency = normalizeAssistantCurrencyText(cleaned);
     return normalizeAssistantRoutes(normalizedCurrency);
 }
 function evaluateAssistantGuardrails(message) {