@resolveio/server-lib 22.3.207 → 22.3.209

package/methods/ai-terminal.js

@@ -3432,7 +3432,8 @@ function executeAiAssistantCodexRun(payload, context) {
                         });
                     }); });
                     return [2 /*return*/, {
-                            conversation: conversation
+                            conversation: conversation,
+                            message: __assign(__assign({}, assistantDoc), { _id: assistantMessageId })
                         }];
             }
         });
@@ -7407,6 +7408,7 @@ function extractAssistantDataIntentCustomerText(message) {
         return '';
     }
     value = value.replace(/\b(january|jan|february|feb|march|mar|april|apr|may|june|jun|july|jul|august|aug|september|sep|october|oct|november|nov|december|dec)\s+[0-9]{4}\b/gi, ' ');
+    value = value.replace(/\b(?:last|past|previous|over\s+the\s+last)\s+(?:few|couple|couple\s+of|several)\s+(?:days?|weeks?|months?|years?)\b/gi, ' ');
     value = value.replace(/\b(?:last|past)\s+[0-9]+\s+(?:days?|weeks?|months?)\b/gi, ' ');
     value = value.replace(/\b(?:this|current)\s+(?:week|month|quarter|year)\b/gi, ' ');
     value = value.replace(/\b(?:last|past)\s+(?:week|month|quarter|year)\b/gi, ' ');
@@ -7443,6 +7445,7 @@ function extractAssistantDataIntentLikelyFilterText(message, intent) {
     }
     value = value.replace(/\b(january|jan|february|feb|march|mar|april|apr|may|june|jun|july|jul|august|aug|september|sep|october|oct|november|nov|december)\s+[0-9]{4}\b/gi, ' ');
     value = value.replace(/\b(january|jan|february|feb|march|mar|april|apr|may|june|jun|july|jul|august|aug|september|sep|october|oct|november|nov|december)\b/gi, ' ');
+    value = value.replace(/\b(?:last|past|previous|over\s+the\s+last)\s+(?:few|couple|couple\s+of|several)\s+(?:days?|weeks?|months?|years?)\b/gi, ' ');
     value = value.replace(/\b(?:last|past)\s+[0-9]+\s+(?:days?|weeks?|months?)\b/gi, ' ');
     value = value.replace(/\b(?:this|current)\s+(?:week|month|quarter|year)\b/gi, ' ');
     value = value.replace(/\b(?:last|past)\s+(?:week|month|quarter|year)\b/gi, ' ');
@@ -8004,6 +8007,35 @@ function resolveAssistantDataIntentDateWindow(message) {
             year: now.getUTCFullYear()
         };
     }
+    var approximateLastWindowMatch = text.match(/\b(?:last|past|previous|over\s+the\s+last)\s+(few|couple|couple\s+of|several)\s+(days?|weeks?|months?|years?)\b/);
+    if (approximateLastWindowMatch) {
+        var amountText = approximateLastWindowMatch[1];
+        var amount = amountText.includes('couple')
+            ? 2
+            : amountText === 'several'
+                ? 6
+                : 3;
+        var unit = approximateLastWindowMatch[2];
+        var start = new Date(now.getTime());
+        if (/year/.test(unit)) {
+            start.setUTCFullYear(start.getUTCFullYear() - amount);
+        }
+        else if (/month/.test(unit)) {
+            start.setUTCMonth(start.getUTCMonth() - amount);
+        }
+        else if (/week/.test(unit)) {
+            start.setUTCDate(start.getUTCDate() - (amount * 7));
+        }
+        else {
+            start.setUTCDate(start.getUTCDate() - amount);
+        }
+        start.setUTCHours(0, 0, 0, 0);
+        return {
+            start: start.toISOString(),
+            end: new Date(Date.UTC(now.getUTCFullYear(), now.getUTCMonth(), now.getUTCDate(), 23, 59, 59, 999)).toISOString(),
+            year: now.getUTCFullYear()
+        };
+    }
     var lastWindowMatch = text.match(/\b(?:last|past)\s+([0-9]+)\s+(days?|weeks?|months?)\b/);
     if (lastWindowMatch) {
         var amount = Math.max(1, Math.min(Number(lastWindowMatch[1]) || 1, 36));
@@ -8338,7 +8370,7 @@ function buildAssistantDataIntentTimeDimension(requestedDimensionText, intent) {
             _b[id] = "$_id.".concat(id),
             _b),
         sort: (_c = {},
-            _c[id] = 1,
+            _c[id] = -1,
             _c)
     };
 }
@@ -10280,6 +10312,56 @@ function mergeAssistantMatchClauses(existingMatch, clauses) {
         ], __read(cleanClauses), false)
     };
 }
+function hasAssistantMeaningfulSortStage(pipeline) {
+    return (Array.isArray(pipeline) ? pipeline : []).some(function (stage) { return ((stage === null || stage === void 0 ? void 0 : stage.$sort)
+        && typeof stage.$sort === 'object'
+        && !Array.isArray(stage.$sort)
+        && Object.keys(stage.$sort).length > 0); });
+}
+function applyAssistantDefaultRecencySortToPipeline(pipeline) {
+    var _a;
+    var _b;
+    if (!Array.isArray(pipeline) || !pipeline.length || hasAssistantMeaningfulSortStage(pipeline)) {
+        return pipeline;
+    }
+    var next = (0, common_1.deepCopy)(pipeline);
+    var groupIndex = findAggregateGroupIndex(next);
+    if (groupIndex > -1) {
+        var groupStage = (_b = next[groupIndex]) === null || _b === void 0 ? void 0 : _b.$group;
+        if (!groupStage || typeof groupStage !== 'object' || Array.isArray(groupStage)) {
+            return next;
+        }
+        var updatedSortField = '__assistant_sort_updatedAt';
+        var createdSortField = '__assistant_sort_createdAt';
+        if (!Object.prototype.hasOwnProperty.call(groupStage, updatedSortField)) {
+            groupStage[updatedSortField] = { $max: '$updatedAt' };
+        }
+        if (!Object.prototype.hasOwnProperty.call(groupStage, createdSortField)) {
+            groupStage[createdSortField] = { $max: '$createdAt' };
+        }
+        var projectIndex = next.findIndex(function (stage, index) { return index > groupIndex && !!(stage === null || stage === void 0 ? void 0 : stage.$project); });
+        var insertIndex_1 = projectIndex > -1 ? projectIndex : groupIndex + 1;
+        next.splice(insertIndex_1, 0, {
+            $sort: (_a = {},
+                _a[updatedSortField] = -1,
+                _a[createdSortField] = -1,
+                _a)
+        });
+        if (projectIndex === -1) {
+            next.splice(insertIndex_1 + 1, 0, { $unset: [updatedSortField, createdSortField] });
+        }
+        return next;
+    }
+    var insertIndex = next.findIndex(function (stage) { return !!((stage === null || stage === void 0 ? void 0 : stage.$project) || (stage === null || stage === void 0 ? void 0 : stage.$limit) || (stage === null || stage === void 0 ? void 0 : stage.$skip) || (stage === null || stage === void 0 ? void 0 : stage.$count) || (stage === null || stage === void 0 ? void 0 : stage.$facet)); });
+    next.splice(insertIndex > -1 ? insertIndex : next.length, 0, {
+        $sort: {
+            updatedAt: -1,
+            createdAt: -1,
+            _id: -1
+        }
+    });
+    return next;
+}
 function applyAssistantDataIntentContractFiltersToPipeline(pipeline, intent, requestContract) {
     var _a;
     var filters = Array.isArray(requestContract === null || requestContract === void 0 ? void 0 : requestContract.filters) ? requestContract.filters : [];
@@ -10468,21 +10550,25 @@ function applyAssistantDataIntentDimensionsToPipeline(pipeline, dimensions) {
             }
         });
     }
-    var sortIndex = next.findIndex(function (stage, index) { return index > groupIndex && !!(stage === null || stage === void 0 ? void 0 : stage.$sort); });
-    if (sortIndex > -1) {
-        var combinedSort_1 = {};
-        selectedDimensions.forEach(function (dimension) {
-            if (dimension.sort && typeof dimension.sort === 'object' && !Array.isArray(dimension.sort)) {
-                Object.keys(dimension.sort).forEach(function (key) {
-                    var _a;
-                    if (!Object.prototype.hasOwnProperty.call(combinedSort_1, key)) {
-                        combinedSort_1[key] = (0, common_1.deepCopy)((_a = dimension.sort) === null || _a === void 0 ? void 0 : _a[key]);
-                    }
-                });
-            }
-        });
-        if (Object.keys(combinedSort_1).length) {
-            next[sortIndex].$sort = combinedSort_1;
+    var combinedSort = {};
+    selectedDimensions.forEach(function (dimension) {
+        if (dimension.sort && typeof dimension.sort === 'object' && !Array.isArray(dimension.sort)) {
+            Object.keys(dimension.sort).forEach(function (key) {
+                var _a;
+                if (!Object.prototype.hasOwnProperty.call(combinedSort, key)) {
+                    combinedSort[key] = (0, common_1.deepCopy)((_a = dimension.sort) === null || _a === void 0 ? void 0 : _a[key]);
+                }
+            });
+        }
+    });
+    if (Object.keys(combinedSort).length) {
+        var sortIndex = next.findIndex(function (stage, index) { return index > groupIndex && !!(stage === null || stage === void 0 ? void 0 : stage.$sort); });
+        if (sortIndex > -1) {
+            next[sortIndex].$sort = combinedSort;
+        }
+        else {
+            var insertIndex = projectIndex > -1 ? projectIndex + 1 : groupIndex + 1;
+            next.splice(insertIndex, 0, { $sort: combinedSort });
         }
     }
     return next;
@@ -10536,7 +10622,7 @@ function buildAssistantAppDataIntentDirective(message, collectionNames, appId, o
         : buildAssistantGenericDataIntentPipeline(intent, customerText, dateWindow);
     var dimensionPipeline = applyAssistantDataIntentDimensionsToPipeline(pipeline, templatedDimensions);
     var filterApplication = applyAssistantDataIntentContractFiltersToPipeline(dimensionPipeline, intent, requestUnderstanding.contract);
-    var finalPipeline = filterApplication.pipeline;
+    var finalPipeline = applyAssistantDefaultRecencySortToPipeline(filterApplication.pipeline);
     var planValidationStart = Date.now();
     var droppedBreakdownAmbiguities = resolveAssistantDroppedBreakdownAmbiguities(requestUnderstanding.contract, finalPipeline);
     var droppedFilterAmbiguities = resolveAssistantDroppedFilterAmbiguities(requestUnderstanding.contract, finalPipeline, filterApplication.appliedFilterKeys);
@@ -10860,7 +10946,7 @@ function buildAssistantDatedPivotDisplay(display, expectedMonths) {
             .filter(Boolean)
         : [];
     expectedMonthBuckets.forEach(function (month) { return monthSet.add(month); });
-    var months = Array.from(monthSet).sort(function (a, b) { return a.localeCompare(b); });
+    var months = Array.from(monthSet).sort(function (a, b) { return b.localeCompare(a); });
     if (!months.length) {
         return null;
     }
@@ -12318,7 +12404,7 @@ function createAssistantProgressTracker(messageId, initialProgress) {
             if (!next.length) {
                 return;
             }
-            progress = next;
+            progress = normalizeAssistantProgress(__spreadArray(__spreadArray([], __read(progress), false), __read(next), false));
             progressSource = normalizeOptionalString(source) || progressSource;
             queueProgressUpdate();
         },