@resolveio/server-lib 22.1.10 → 22.1.12

package/methods/ai-terminal.d.ts

@@ -46,6 +46,7 @@ export type AiAssistantMongoAggregateInput = {
         access?: string;
         readonly?: boolean;
     };
+    __assistantMessage?: string;
     __assistantRetryState?: AiAssistantCollectionRetryState;
 };
 type AiAssistantDisplayTable = {
@@ -112,9 +113,13 @@ export declare function buildDisplayTable(docs: any[], options?: {
 export declare function formatDisplayTableMarkdown(display: AiAssistantDisplayTable): string;
 export declare function resolveAssistantReadDisplayMaxRows(limit: number | undefined, rowCount: number): number;
 export declare function normalizeAssistantNowExprPlaceholders(value: any): any;
+export declare function repairAssistantFieldPathReferenceInPipeline(pipeline: Array<Record<string, any>>, fieldPath: string): {
+    pipeline: Array<Record<string, any>>;
+    changed: boolean;
+};
 export declare function rewriteMatchExpressionsToExpr(match: any): any;
 export declare function normalizeAssistantMonthlyCalendarWindowPipeline(pipeline: Array<Record<string, any>>): Array<Record<string, any>>;
-export declare function normalizeAssistantAggregatePipeline(pipeline?: Array<Record<string, any>>, collection?: string): Array<Record<string, any>>;
+export declare function normalizeAssistantAggregatePipeline(pipeline?: Array<Record<string, any>>, collection?: string, originalMessage?: string): Array<Record<string, any>>;
 export declare function stripQueryFieldPathsDeep(query: any, fieldsToStrip: string[]): any;
 export declare function stripScopedFieldsFromPipeline(pipeline: any[], fieldsToStrip: string[]): any[];
 export declare function rewriteEmbeddedMatchObjects(query: any): any;

package/methods/ai-terminal.js

@@ -119,6 +119,7 @@ exports.buildDisplayTable = buildDisplayTable;
 exports.formatDisplayTableMarkdown = formatDisplayTableMarkdown;
 exports.resolveAssistantReadDisplayMaxRows = resolveAssistantReadDisplayMaxRows;
 exports.normalizeAssistantNowExprPlaceholders = normalizeAssistantNowExprPlaceholders;
+exports.repairAssistantFieldPathReferenceInPipeline = repairAssistantFieldPathReferenceInPipeline;
 exports.rewriteMatchExpressionsToExpr = rewriteMatchExpressionsToExpr;
 exports.normalizeAssistantMonthlyCalendarWindowPipeline = normalizeAssistantMonthlyCalendarWindowPipeline;
 exports.normalizeAssistantAggregatePipeline = normalizeAssistantAggregatePipeline;
@@ -3367,7 +3368,7 @@ function executeAiAssistantMongoAggregate(payload, context) {
                         ? applyClientScopeFilter(baseQuery, normalizedClient, isSuperAdmin)
                         : baseQuery;
                     scopedQuery = applyCustomerScopeFilter(clientScopedQuery, collection, customerId, isSuperAdmin);
-                    normalizedPipeline = normalizeAssistantAggregatePipeline(input.pipeline, collection);
+                    normalizedPipeline = normalizeAssistantAggregatePipeline(input.pipeline, collection, input.__assistantMessage);
                     sanitizedPipeline = normalizedPipeline;
                     if (!isSuperAdmin && customerId) {
                         strippedPipeline = stripScopedFieldsFromPipelineWithMeta(normalizedPipeline, ['id_customer', 'other.id_customer']);
@@ -3388,7 +3389,7 @@ function executeAiAssistantMongoAggregate(payload, context) {
                     }
                     aggregateOptions = __assign(__assign({}, normalizedOptions.aggregateOptions), { readPreference: AI_ASSISTANT_READ_PREFERENCE });
                     runAggregateWithRepair = function (pipeline, stage) { return __awaiter(_this, void 0, void 0, function () {
-                        var docs, error_7, isDateRepair, isRankSortByRepair, isDottedOutputFieldRepair, repaired, docs;
+                        var docs, error_7, isDateRepair, isRankSortByRepair, isDottedOutputFieldRepair, repaired, dottedFieldPath, dottedFieldReferenceRepairUsed, pathReferenceRepair, docs;
                         return __generator(this, function (_a) {
                             switch (_a.label) {
                                 case 0:
@@ -3412,6 +3413,21 @@ function executeAiAssistantMongoAggregate(payload, context) {
                                         : isRankSortByRepair
                                             ? repairAssistantRankSortByInPipeline(pipeline)
                                             : repairAssistantDottedOutputFieldNamesInPipeline(pipeline);
+                                    dottedFieldPath = null;
+                                    dottedFieldReferenceRepairUsed = false;
+                                    if (isDottedOutputFieldRepair) {
+                                        dottedFieldPath = extractAssistantDottedFieldPathFromError(error_7);
+                                        if (dottedFieldPath) {
+                                            pathReferenceRepair = repairAssistantFieldPathReferenceInPipeline(repaired.pipeline, dottedFieldPath);
+                                            if (pathReferenceRepair.changed) {
+                                                dottedFieldReferenceRepairUsed = true;
+                                                repaired = {
+                                                    pipeline: pathReferenceRepair.pipeline,
+                                                    changed: repaired.changed || pathReferenceRepair.changed
+                                                };
+                                            }
+                                        }
+                                    }
                                     if (!repaired.changed || containsForbiddenMongoOperators(repaired.pipeline)) {
                                         throw error_7;
                                     }
@@ -3441,7 +3457,10 @@ function executeAiAssistantMongoAggregate(payload, context) {
                                             attempted: true,
                                             used: true,
                                             stage: stage,
-                                            reason: 'normalized_dotted_output_field_names'
+                                            reason: dottedFieldReferenceRepairUsed
+                                                ? 'normalized_dotted_output_field_names_and_field_path_references'
+                                                : 'normalized_dotted_output_field_names',
+                                            fieldPath: dottedFieldPath || undefined
                                         };
                                     }
                                     return [2 /*return*/, { documents: docs, pipeline: repaired.pipeline }];
@@ -4798,6 +4817,12 @@ function buildAssistantToolRequest(directive, payload) {
     if (!request.mongo && (payload === null || payload === void 0 ? void 0 : payload.mongo)) {
         request.mongo = payload.mongo;
     }
+    if (directive.type === 'aggregate' && !request.__assistantMessage) {
+        var message = normalizeOptionalString(payload === null || payload === void 0 ? void 0 : payload.message);
+        if (message) {
+            request.__assistantMessage = message;
+        }
+    }
     return request;
 }
 function buildAssistantTrimmedStringExpr(value) {
@@ -9549,6 +9574,23 @@ function isAssistantDottedOutputFieldError(error) {
     }
     return message.includes("fieldpath field names may not contain '.'");
 }
+function extractAssistantDottedFieldPathFromError(error) {
+    var message = normalizeOptionalString(error === null || error === void 0 ? void 0 : error.message);
+    if (!message) {
+        return null;
+    }
+    var quotedMatch = message.match(/given\s+'([^']+)'/i);
+    if (quotedMatch && quotedMatch[1]) {
+        var normalized = normalizeOptionalString(quotedMatch[1]);
+        return normalized.includes('.') ? normalized : null;
+    }
+    var plainMatch = message.match(/given\s+([a-z0-9_.-]+)/i);
+    if (plainMatch && plainMatch[1]) {
+        var normalized = normalizeOptionalString(plainMatch[1]);
+        return normalized.includes('.') ? normalized : null;
+    }
+    return null;
+}
 function didAssistantValueChange(before, after) {
     try {
         return JSON.stringify(before) !== JSON.stringify(after);
@@ -9637,6 +9679,59 @@ function repairAssistantDottedOutputFieldNamesInPipeline(pipeline) {
         changed: didAssistantValueChange(pipeline, repaired)
     };
 }
+function buildAssistantGetFieldExpressionFromPath(path) {
+    var normalizedPath = normalizeOptionalString(path);
+    var segments = normalizedPath.split('.').filter(Boolean);
+    if (!segments.length) {
+        return "$".concat(normalizedPath);
+    }
+    var expression = "$".concat(segments[0]);
+    for (var i = 1; i < segments.length; i += 1) {
+        expression = {
+            $getField: {
+                field: segments[i],
+                input: expression
+            }
+        };
+    }
+    return expression;
+}
+function repairAssistantFieldPathReferenceInPipeline(pipeline, fieldPath) {
+    var normalizedFieldPath = normalizeOptionalString(fieldPath).replace(/^\$+/, '');
+    if (!normalizedFieldPath || !normalizedFieldPath.includes('.')) {
+        return { pipeline: pipeline, changed: false };
+    }
+    var targetRef = "$".concat(normalizedFieldPath);
+    var rewriteValue = function (value) {
+        if (Array.isArray(value)) {
+            return value.map(function (entry) { return rewriteValue(entry); });
+        }
+        if (typeof value === 'string') {
+            if (value === targetRef) {
+                return buildAssistantGetFieldExpressionFromPath(normalizedFieldPath);
+            }
+            if (value.startsWith("".concat(targetRef, "."))) {
+                return buildAssistantGetFieldExpressionFromPath(value.slice(1));
+            }
+            return value;
+        }
+        if (!value || typeof value !== 'object' || value instanceof Date || value instanceof RegExp || isMongoObjectId(value)) {
+            return value;
+        }
+        var next = {};
+        Object.keys(value).forEach(function (key) {
+            next[key] = rewriteValue(value[key]);
+        });
+        return next;
+    };
+    var repaired = Array.isArray(pipeline)
+        ? pipeline.map(function (stage) { return rewriteValue(stage); })
+        : pipeline;
+    return {
+        pipeline: repaired,
+        changed: didAssistantValueChange(pipeline, repaired)
+    };
+}
 function isMatchExpressionOperand(value) {
     if (typeof value === 'string') {
         return value.startsWith('$$');
@@ -10178,7 +10273,75 @@ function normalizeAssistantSortTieBreakersForLimit(pipeline) {
         return __assign(__assign({}, stage), { $sort: __assign(__assign({}, sort), { _id: 1 }) });
     });
 }
-function normalizeAssistantAggregatePipeline(pipeline, collection) {
+function resolveAssistantRecentGroupedRecordLimit(message) {
+    var normalized = normalizeOptionalString(message);
+    if (!normalized) {
+        return null;
+    }
+    if (!/\b(last|latest|recent)\b/i.test(normalized)) {
+        return null;
+    }
+    var groupedHint = /\bgroup(?:ed|ing)?\s+by\b/i.test(normalized)
+        || /\bby\s+(status|state|type)\b/i.test(normalized);
+    if (!groupedHint) {
+        return null;
+    }
+    if (/\b(by|per)\s+(day|week|month|quarter|year)\b/i.test(normalized) || /\btrend|over\s+time|timeline\b/i.test(normalized)) {
+        return null;
+    }
+    var tokenMatch = normalized.match(/\b(?:last|latest|recent)\s+(\d{1,4})\s+([a-z][a-z_-]*)\b/i);
+    if (!tokenMatch) {
+        return null;
+    }
+    var entityToken = normalizeOptionalString(tokenMatch[2]).toLowerCase();
+    if (['minute', 'minutes', 'hour', 'hours', 'day', 'days', 'week', 'weeks', 'month', 'months', 'quarter', 'quarters', 'year', 'years'].includes(entityToken)) {
+        return null;
+    }
+    var value = Number(tokenMatch[1]);
+    if (!Number.isFinite(value) || value <= 0) {
+        return null;
+    }
+    return Math.max(1, Math.min((0, common_1.round)(value), AI_ASSISTANT_MONGO_MAX_LIMIT));
+}
+function normalizeAssistantRecentGroupedLimitBeforeGroup(pipeline, message) {
+    var _a;
+    var requestedLimit = resolveAssistantRecentGroupedRecordLimit(message || '');
+    if (!requestedLimit || !Array.isArray(pipeline) || !pipeline.length) {
+        return pipeline;
+    }
+    var groupIndex = findAggregateGroupIndex(pipeline);
+    if (groupIndex <= 0) {
+        return pipeline;
+    }
+    var hasPreGroupLimit = pipeline
+        .slice(0, groupIndex)
+        .some(function (stage) { return stage && typeof stage === 'object' && typeof stage.$limit === 'number' && stage.$limit > 0; });
+    if (hasPreGroupLimit) {
+        return pipeline;
+    }
+    var postGroupLimitIndex = pipeline.findIndex(function (stage, index) {
+        return index > groupIndex
+            && stage
+            && typeof stage === 'object'
+            && typeof stage.$limit === 'number'
+            && stage.$limit > 0;
+    });
+    var nextPipeline = pipeline
+        .map(function (stage) { return (stage && typeof stage === 'object' && !Array.isArray(stage) ? __assign({}, stage) : stage); })
+        .filter(function (_stage, index) { return index !== postGroupLimitIndex; });
+    var insertionIndex = groupIndex;
+    var hasPreGroupSort = nextPipeline
+        .slice(0, groupIndex)
+        .some(function (stage) { return stage && typeof stage === 'object' && stage.$sort && typeof stage.$sort === 'object'; });
+    if (!hasPreGroupSort) {
+        var dateField = findAggregateDateField(nextPipeline) || 'createdAt';
+        nextPipeline.splice(insertionIndex, 0, { $sort: (_a = {}, _a[dateField] = -1, _a._id = -1, _a) });
+        insertionIndex += 1;
+    }
+    nextPipeline.splice(insertionIndex, 0, { $limit: requestedLimit });
+    return nextPipeline;
+}
+function normalizeAssistantAggregatePipeline(pipeline, collection, originalMessage) {
     if (!Array.isArray(pipeline)) {
         return [];
     }
@@ -10205,7 +10368,8 @@ function normalizeAssistantAggregatePipeline(pipeline, collection) {
         return normalizeAssistantNowExprPlaceholdersDeep(next);
     });
     var stableSortPipeline = normalizeAssistantSortTieBreakersForLimit(normalizedPipeline);
-    return normalizeAssistantMonthlyCalendarWindowPipeline(stableSortPipeline);
+    var recordLimitedPipeline = normalizeAssistantRecentGroupedLimitBeforeGroup(stableSortPipeline, originalMessage);
+    return normalizeAssistantMonthlyCalendarWindowPipeline(recordLimitedPipeline);
 }
 function buildAssistantAggregatePipeline(query, pipeline) {
     var _a;
@@ -12837,8 +13001,27 @@ function isAssistantCollectionRefinementOf(currentCollection, genericCollection)
         || current.endsWith("_".concat(generic))
         || current.includes("_".concat(generic, "_"));
 }
+function resolveAssistantCollectionScore(collectionRanking, collectionName) {
+    var _a;
+    var ranked = Array.isArray(collectionRanking === null || collectionRanking === void 0 ? void 0 : collectionRanking.ranked) ? collectionRanking === null || collectionRanking === void 0 ? void 0 : collectionRanking.ranked : [];
+    var rankedScore = (_a = ranked.find(function (entry) { return (entry === null || entry === void 0 ? void 0 : entry.name) === collectionName; })) === null || _a === void 0 ? void 0 : _a.score;
+    if (typeof rankedScore === 'number') {
+        return rankedScore;
+    }
+    var tokens = Array.isArray(collectionRanking === null || collectionRanking === void 0 ? void 0 : collectionRanking.tokens)
+        ? collectionRanking.tokens.filter(function (token) { return typeof token === 'string' && !!token; })
+        : [];
+    if (!tokens.length) {
+        return 0;
+    }
+    var rankingWeights = collectionRanking === null || collectionRanking === void 0 ? void 0 : collectionRanking.tokenWeights;
+    var hasRankingWeights = rankingWeights && typeof rankingWeights === 'object';
+    var weights = hasRankingWeights
+        ? rankingWeights
+        : computeCollectionTokenWeights(tokens).weights;
+    return scoreCollectionMatch(tokens, collectionName, weights);
+}
 function resolveAssistantCollectionOverride(collectionRanking, currentCollection) {
-    var _a, _b;
     var ranked = Array.isArray(collectionRanking === null || collectionRanking === void 0 ? void 0 : collectionRanking.ranked) ? collectionRanking === null || collectionRanking === void 0 ? void 0 : collectionRanking.ranked : [];
     if (!ranked.length) {
         return null;
@@ -12860,7 +13043,7 @@ function resolveAssistantCollectionOverride(collectionRanking, currentCollection
     if (current === top.name) {
         return null;
     }
-    var currentScore = (_b = (_a = ranked.find(function (entry) { return entry.name === current; })) === null || _a === void 0 ? void 0 : _a.score) !== null && _b !== void 0 ? _b : 0;
+    var currentScore = resolveAssistantCollectionScore(collectionRanking, current);
     if (currentScore >= AI_ASSISTANT_COLLECTION_OVERRIDE_MIN_SCORE
         && isAssistantGenericCollectionName(top.name)
         && isAssistantCollectionRefinementOf(current, top.name)) {
@@ -12869,7 +13052,7 @@ function resolveAssistantCollectionOverride(collectionRanking, currentCollection
     var scoreGap = top.score - currentScore;
     var currentIsVersion = isVersionCollectionName(current);
     var topIsVersion = isVersionCollectionName(top.name);
-    if (scoreGap < AI_ASSISTANT_COLLECTION_OVERRIDE_SCORE_GAP && !(currentIsVersion && !topIsVersion)) {
+    if (scoreGap <= AI_ASSISTANT_COLLECTION_OVERRIDE_SCORE_GAP && !(currentIsVersion && !topIsVersion)) {
         return null;
     }
     var reason = currentIsVersion && !topIsVersion