@resolveio/server-lib 22.2.17 → 22.2.19

package/methods/ai-terminal.d.ts

@@ -183,6 +183,10 @@ 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 repairAssistantPositionalPathSegmentsInPipeline(pipeline: Array<Record<string, any>>): {
+    pipeline: Array<Record<string, any>>;
+    changed: boolean;
+};
 export declare function repairAssistantFieldPathReferenceInPipeline(pipeline: Array<Record<string, any>>, fieldPath: string): {
     pipeline: Array<Record<string, any>>;
     changed: boolean;
@@ -195,6 +199,19 @@ export declare function stripScopedFieldsFromPipeline(pipeline: any[], fieldsToS
 export declare function rewriteEmbeddedMatchObjects(query: any): any;
 export declare function resolveAssistantAppCollectionHintCandidates(message: string, appId?: string): string[];
 export declare function isAssistantDeterministicHeuristicEnabledForApp(heuristicId: string, appId?: string): boolean;
+export declare function resolveCollectionOverrideWithContextForTesting(params: {
+    message: string;
+    collectionRanking: Record<string, any> | null;
+    requestedCollection: string;
+    permissionView?: string;
+    collectionNames: string[];
+}): {
+    from: string;
+    to: string;
+    fromScore: number;
+    toScore: number;
+    reason: string;
+} | null;
 export declare function resolveAssistantCollectionOverride(collectionRanking: Record<string, any> | null, currentCollection: string): {
     from: string;
     to: string;
@@ -229,6 +246,10 @@ export declare function resolveAssistantReportBuilderBridgeCollection(collection
     mode: 'report-builder' | 'direct-mongo';
     resolutionPath: string[];
 }>;
+export declare function expandAggregateDateMatchFallbackForTesting(pipeline: Array<Record<string, any>>, schemaFields?: string[]): {
+    pipeline: Array<Record<string, any>>;
+    fields: string[];
+} | null;
 export declare function collectUserViewPermissions(user: any): string[];
 export declare function userHasInvoiceAccess(user: any): boolean;
 export declare function resolveAssistantUserAccessTier(user: any): 'super_admin' | 'customer_portal' | 'client_user';

package/methods/ai-terminal.js

@@ -121,6 +121,7 @@ exports.buildDisplayTable = buildDisplayTable;
 exports.formatDisplayTableMarkdown = formatDisplayTableMarkdown;
 exports.resolveAssistantReadDisplayMaxRows = resolveAssistantReadDisplayMaxRows;
 exports.normalizeAssistantNowExprPlaceholders = normalizeAssistantNowExprPlaceholders;
+exports.repairAssistantPositionalPathSegmentsInPipeline = repairAssistantPositionalPathSegmentsInPipeline;
 exports.repairAssistantFieldPathReferenceInPipeline = repairAssistantFieldPathReferenceInPipeline;
 exports.rewriteMatchExpressionsToExpr = rewriteMatchExpressionsToExpr;
 exports.normalizeAssistantMonthlyCalendarWindowPipeline = normalizeAssistantMonthlyCalendarWindowPipeline;
@@ -130,12 +131,14 @@ exports.stripScopedFieldsFromPipeline = stripScopedFieldsFromPipeline;
 exports.rewriteEmbeddedMatchObjects = rewriteEmbeddedMatchObjects;
 exports.resolveAssistantAppCollectionHintCandidates = resolveAssistantAppCollectionHintCandidates;
 exports.isAssistantDeterministicHeuristicEnabledForApp = isAssistantDeterministicHeuristicEnabledForApp;
+exports.resolveCollectionOverrideWithContextForTesting = resolveCollectionOverrideWithContextForTesting;
 exports.resolveAssistantCollectionOverride = resolveAssistantCollectionOverride;
 exports.resolveAssistantCrossCollectionFallbackCandidates = resolveAssistantCrossCollectionFallbackCandidates;
 exports.resolveAssistantAvailableCrossCollectionFallbacksFromNames = resolveAssistantAvailableCrossCollectionFallbacksFromNames;
 exports.evaluateAssistantFallbackDocumentsQuality = evaluateAssistantFallbackDocumentsQuality;
 exports.shouldAcceptAssistantFallbackDocuments = shouldAcceptAssistantFallbackDocuments;
 exports.resolveAssistantReportBuilderBridgeCollection = resolveAssistantReportBuilderBridgeCollection;
+exports.expandAggregateDateMatchFallbackForTesting = expandAggregateDateMatchFallbackForTesting;
 exports.collectUserViewPermissions = collectUserViewPermissions;
 exports.userHasInvoiceAccess = userHasInvoiceAccess;
 exports.resolveAssistantUserAccessTier = resolveAssistantUserAccessTier;
@@ -4157,7 +4160,7 @@ function executeAiAssistantMongoAggregate(payload, context) {
                             : { readPreference: AI_ASSISTANT_READ_PREFERENCE };
                     };
                     runAggregateWithRepair = function (pipeline, stage) { return __awaiter(_this, void 0, void 0, function () {
-                        var aggregateOptions, docs, error_9, isDateRepair, isRankSortByRepair, isDottedOutputFieldRepair, repaired, dottedFieldPath, dottedFieldReferenceRepairUsed, pathReferenceRepair, docs;
+                        var aggregateOptions, docs, error_9, isDateRepair, isRankSortByRepair, isDottedOutputFieldRepair, isPositionalPathRepair, repaired, dottedFieldPath, dottedFieldReferenceRepairUsed, pathReferenceRepair, docs;
                         return __generator(this, function (_a) {
                             switch (_a.label) {
                                 case 0:
@@ -4179,14 +4182,17 @@ function executeAiAssistantMongoAggregate(payload, context) {
                                     isDateRepair = isAssistantDateArithmeticArgumentError(error_9);
                                     isRankSortByRepair = isAssistantRankSortByError(error_9);
                                     isDottedOutputFieldRepair = isAssistantDottedOutputFieldError(error_9);
-                                    if (!isDateRepair && !isRankSortByRepair && !isDottedOutputFieldRepair) {
+                                    isPositionalPathRepair = isAssistantPositionalPathError(error_9);
+                                    if (!isDateRepair && !isRankSortByRepair && !isDottedOutputFieldRepair && !isPositionalPathRepair) {
                                         throw error_9;
                                     }
                                     repaired = isDateRepair
                                         ? repairAssistantDateArithmeticInPipeline(pipeline)
                                         : isRankSortByRepair
                                             ? repairAssistantRankSortByInPipeline(pipeline)
-                                            : repairAssistantDottedOutputFieldNamesInPipeline(pipeline);
+                                            : isDottedOutputFieldRepair
+                                                ? repairAssistantDottedOutputFieldNamesInPipeline(pipeline)
+                                                : repairAssistantPositionalPathSegmentsInPipeline(pipeline);
                                     dottedFieldPath = null;
                                     dottedFieldReferenceRepairUsed = false;
                                     if (isDottedOutputFieldRepair) {
@@ -4237,6 +4243,14 @@ function executeAiAssistantMongoAggregate(payload, context) {
                                             fieldPath: dottedFieldPath || undefined
                                         };
                                     }
+                                    if (isPositionalPathRepair) {
+                                        fallbackMeta.positionalPath = {
+                                            attempted: true,
+                                            used: true,
+                                            stage: stage,
+                                            reason: 'removed_positional_path_segments'
+                                        };
+                                    }
                                     return [2 /*return*/, { documents: docs, pipeline: repaired.pipeline }];
                                 case 5: return [2 /*return*/];
                             }
@@ -13465,6 +13479,76 @@ function normalizeAssistantNowExprPlaceholdersDeep(value) {
 function normalizeAssistantNowExprPlaceholders(value) {
     return normalizeAssistantNowExprPlaceholdersDeep(value);
 }
+function stripAssistantPositionalPathSegments(path) {
+    var normalized = normalizeOptionalString(path);
+    if (!normalized || !normalized.includes('.$')) {
+        return normalized;
+    }
+    return normalized.replace(/\.\$(?=\.|$)/g, '');
+}
+function repairAssistantPositionalPathSegmentsDeep(value) {
+    var changed = false;
+    var rewriteValue = function (current) {
+        if (Array.isArray(current)) {
+            return current.map(function (entry) { return rewriteValue(entry); });
+        }
+        if (!current || typeof current !== 'object' || current instanceof Date || current instanceof RegExp || isMongoObjectId(current)) {
+            if (typeof current === 'string' && current.startsWith('$') && !current.startsWith('$$')) {
+                var strippedPath = stripAssistantPositionalPathSegments(current.slice(1));
+                if (strippedPath && strippedPath !== current.slice(1)) {
+                    changed = true;
+                    return "$".concat(strippedPath);
+                }
+            }
+            return current;
+        }
+        var next = {};
+        Object.keys(current).forEach(function (key) {
+            var nextKey = key;
+            if (!key.startsWith('$')) {
+                var strippedKey = stripAssistantPositionalPathSegments(key);
+                if (strippedKey && strippedKey !== key) {
+                    nextKey = strippedKey;
+                    changed = true;
+                }
+            }
+            next[nextKey] = rewriteValue(current[key]);
+        });
+        return next;
+    };
+    return {
+        value: rewriteValue(value),
+        changed: changed
+    };
+}
+function repairAssistantPositionalPathSegmentsInQuery(query) {
+    var repaired = repairAssistantPositionalPathSegmentsDeep(query);
+    var normalizedQuery = (repaired.value && typeof repaired.value === 'object' && !Array.isArray(repaired.value))
+        ? repaired.value
+        : query;
+    return {
+        query: normalizedQuery,
+        changed: repaired.changed
+    };
+}
+function repairAssistantPositionalPathSegmentsInPipeline(pipeline) {
+    var repaired = repairAssistantPositionalPathSegmentsDeep(pipeline);
+    var normalizedPipeline = Array.isArray(repaired.value)
+        ? repaired.value
+        : pipeline;
+    return {
+        pipeline: normalizedPipeline,
+        changed: repaired.changed
+    };
+}
+function isAssistantPositionalPathError(error) {
+    var message = normalizeOptionalString(error === null || error === void 0 ? void 0 : error.message).toLowerCase();
+    if (!message) {
+        return false;
+    }
+    return message.includes('positional operator')
+        && message.includes('middle of a path');
+}
 function isAssistantDateArithmeticArgumentError(error) {
     var message = normalizeOptionalString(error === null || error === void 0 ? void 0 : error.message).toLowerCase();
     if (!message) {
@@ -14490,7 +14574,8 @@ function normalizeAssistantAggregatePipeline(pipeline, collection, originalMessa
         if (next.$setWindowFields && typeof next.$setWindowFields === 'object' && !Array.isArray(next.$setWindowFields)) {
             next.$setWindowFields = normalizeAssistantSetWindowFieldsRankSortBy(next.$setWindowFields);
         }
-        return normalizeAssistantNowExprPlaceholdersDeep(next);
+        var nowNormalized = normalizeAssistantNowExprPlaceholdersDeep(next);
+        return repairAssistantPositionalPathSegmentsInQuery(nowNormalized).query;
     });
     var stableSortPipeline = normalizeAssistantSortTieBreakersForLimit(normalizedPipeline);
     var recordLimitedPipeline = normalizeAssistantRecentGroupedLimitBeforeGroup(stableSortPipeline, originalMessage);
@@ -16441,7 +16526,8 @@ function normalizeMongoQuery(query) {
     }
     var rewritten = rewriteEmbeddedMatchObjects(normalized);
     var exprRewritten = rewriteMatchExpressionsToExpr(rewritten);
-    var nowNormalized = normalizeAssistantNowExprPlaceholdersDeep(exprRewritten);
+    var positionalRepaired = repairAssistantPositionalPathSegmentsInQuery(exprRewritten).query;
+    var nowNormalized = normalizeAssistantNowExprPlaceholdersDeep(positionalRepaired);
     return applyAssistantNameRegexToQuery(nowNormalized);
 }
 function shouldApplyAssistantNameRegex(field) {
@@ -17523,8 +17609,6 @@ function resolveAssistantConfiguredAppId() {
     var serverConfig = ((_a = resolveio_server_app_1.ResolveIOServer.getServerConfig) === null || _a === void 0 ? void 0 : _a.call(resolveio_server_app_1.ResolveIOServer)) || {};
     var configured = normalizeOptionalString(serverConfig['AI_ASSISTANT_APP_ID']
         || process.env.AI_ASSISTANT_APP_ID
-        || serverConfig['AI_CODER_APP_ID']
-        || process.env.AI_CODER_APP_ID
         || serverConfig['DATABASE']
         || process.env.DATABASE
         || serverConfig['CLIENT_NAME']
@@ -17927,6 +18011,19 @@ function resolveCollectionOverrideWithContext(params) {
     var allowVersions = shouldAllowVersionCollections(params.message);
     var collectionNames = Array.isArray(params.collectionNames) ? params.collectionNames : [];
     var permissionView = normalizeOptionalString(params.permissionView);
+    var routeHintCollections = permissionView
+        ? resolveCollectionHintsFromRoute(permissionView, collectionNames)
+        : [];
+    var isCollectionInHintFamilies = function (collection, hintCollections) {
+        var candidateFamily = normalizeAssistantCollectionFamilyName(collection);
+        if (!candidateFamily) {
+            return false;
+        }
+        return (hintCollections || []).some(function (hintCollection) {
+            var hintFamily = normalizeAssistantCollectionFamilyName(hintCollection);
+            return !!(hintFamily && hintFamily === candidateFamily);
+        });
+    };
     if (permissionView) {
         var reportPreferred = resolveReportCollectionName(permissionView, collectionNames, requested);
         if (reportPreferred && reportPreferred !== requested) {
@@ -17953,6 +18050,11 @@ function resolveCollectionOverrideWithContext(params) {
     }
     var rankingOverride = resolveAssistantCollectionOverride(params.collectionRanking, requested);
     if (rankingOverride) {
+        var requestedMatchesRouteHints = isCollectionInHintFamilies(requested, routeHintCollections);
+        var overrideMatchesRouteHints = isCollectionInHintFamilies(rankingOverride.to, routeHintCollections);
+        if (requestedMatchesRouteHints && !overrideMatchesRouteHints) {
+            return null;
+        }
         var rankingOverrideTarget = normalizeAssistantCollectionOverrideName(rankingOverride.to);
         var requestedIsWorkOrder = isAssistantWorkOrderCollectionOverrideCandidate(requested);
         if (rankingOverrideTarget === 'orders' && requestedIsWorkOrder && hasAssistantWorkOrderAliasTerms(params.message)) {
@@ -17974,6 +18076,9 @@ function resolveCollectionOverrideWithContext(params) {
     }
     return null;
 }
+function resolveCollectionOverrideWithContextForTesting(params) {
+    return resolveCollectionOverrideWithContext(params);
+}
 function isAssistantWorkOrderCollectionOverrideCandidate(value) {
     var normalized = normalizeAssistantCollectionOverrideName(value);
     return normalized === 'work-order-dynamics'
@@ -19607,16 +19712,8 @@ function expandAggregateDateMatchFallback(pipeline, schemaFields) {
     if (!Array.isArray(pipeline)) {
         return null;
     }
-    var _loop_13 = function (i) {
-        var stage = pipeline[i];
-        if (!stage || typeof stage !== 'object' || !stage.$match || typeof stage.$match !== 'object') {
-            return "continue";
-        }
-        var matchStage = stage.$match;
-        var orArray = Array.isArray(matchStage.$or) ? matchStage.$or : null;
-        if (!orArray || !orArray.length) {
-            return "continue";
-        }
+    var addedFields = new Set();
+    var expandOrArray = function (orArray) {
         var existingFields = new Set();
         orArray.forEach(function (entry) {
             if (!entry || typeof entry !== 'object' || Array.isArray(entry)) {
@@ -19628,8 +19725,8 @@ function expandAggregateDateMatchFallback(pipeline, schemaFields) {
                 }
             });
         });
-        var expandedOr = __spreadArray([], __read(orArray), false);
-        var addedFields = new Set();
+        var changed = false;
+        var expanded = __spreadArray([], __read(orArray), false);
         orArray.forEach(function (entry) {
             if (!entry || typeof entry !== 'object' || Array.isArray(entry)) {
                 return;
@@ -19641,25 +19738,72 @@ function expandAggregateDateMatchFallback(pipeline, schemaFields) {
                     if (existingFields.has(field)) {
                         return;
                     }
-                    expandedOr = __spreadArray(__spreadArray([], __read(expandedOr), false), [replaceQueryField(entry, condition.field, field)], false);
+                    expanded = __spreadArray(__spreadArray([], __read(expanded), false), [replaceQueryField(entry, condition.field, field)], false);
                     existingFields.add(field);
                     addedFields.add(field);
+                    changed = true;
                 });
             });
         });
-        if (!addedFields.size) {
-            return { value: null };
+        return { value: changed ? expanded : orArray, changed: changed };
+    };
+    var visit = function (value) {
+        if (Array.isArray(value)) {
+            var changed_3 = false;
+            var nextArray = value.map(function (entry) {
+                var visited = visit(entry);
+                if (visited.changed) {
+                    changed_3 = true;
+                }
+                return visited.value;
+            });
+            return { value: changed_3 ? nextArray : value, changed: changed_3 };
         }
-        var nextMatch = __assign(__assign({}, matchStage), { $or: expandedOr });
-        var updated = pipeline.map(function (current, index) { return (index === i ? { $match: nextMatch } : current); });
-        return { value: { pipeline: updated, fields: Array.from(addedFields) } };
+        if (!value || typeof value !== 'object') {
+            return { value: value, changed: false };
+        }
+        var changed = false;
+        var next = __assign({}, value);
+        Object.keys(value).forEach(function (key) {
+            if (key === '$or' && Array.isArray(value.$or)) {
+                var nested = visit(value.$or);
+                var expanded = expandOrArray(nested.value);
+                if (nested.changed || expanded.changed) {
+                    next.$or = expanded.value;
+                    changed = true;
+                }
+                return;
+            }
+            var visited = visit(value[key]);
+            if (visited.changed) {
+                next[key] = visited.value;
+                changed = true;
+            }
+        });
+        return { value: changed ? next : value, changed: changed };
     };
-    for (var i = 0; i < pipeline.length; i += 1) {
-        var state_9 = _loop_13(i);
-        if (typeof state_9 === "object")
-            return state_9.value;
+    var pipelineChanged = false;
+    var updated = pipeline.map(function (stage) {
+        if (!stage || typeof stage !== 'object' || !stage.$match || typeof stage.$match !== 'object') {
+            return stage;
+        }
+        var visited = visit(stage.$match);
+        if (!visited.changed) {
+            return stage;
+        }
+        pipelineChanged = true;
+        return __assign(__assign({}, stage), { $match: visited.value });
+    });
+    if (!pipelineChanged || !addedFields.size) {
+        return null;
     }
-    return null;
+    return {
+        pipeline: updated,
+        fields: Array.from(addedFields)
+    };
+}
+function expandAggregateDateMatchFallbackForTesting(pipeline, schemaFields) {
+    return expandAggregateDateMatchFallback(pipeline, schemaFields);
 }
 function resolveQueryDateFieldFallback(query) {
     var dateField = findQueryDateField(query);
@@ -24442,7 +24586,7 @@ function resolveSingleWorkerTarget(value) {
 }
 function normalizeConversationMode(value) {
     var normalized = normalizeOptionalString(value).toLowerCase();
-    if (normalized === 'codex' || normalized === 'aicoder') {
+    if (normalized === 'codex') {
         return 'codex';
     }
     if (normalized === 'openai') {