@resolveio/server-lib 22.2.56 → 22.2.57

package/methods/ai-terminal.d.ts

@@ -188,6 +188,7 @@ export declare function buildDisplayTable(docs: any[], options?: {
     includeGroupFromId?: boolean;
 }): AiAssistantDisplayTable;
 export declare function formatDisplayTableMarkdown(display: AiAssistantDisplayTable): string;
+export declare function applyAssistantDisplayTableToResponseForTesting(value: string, display: AiAssistantDisplayTable | null | undefined): 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>>): {

package/methods/ai-terminal.js

@@ -121,6 +121,7 @@ exports.serializeMongoValue = serializeMongoValue;
 exports.flattenForTable = flattenForTable;
 exports.buildDisplayTable = buildDisplayTable;
 exports.formatDisplayTableMarkdown = formatDisplayTableMarkdown;
+exports.applyAssistantDisplayTableToResponseForTesting = applyAssistantDisplayTableToResponseForTesting;
 exports.resolveAssistantReadDisplayMaxRows = resolveAssistantReadDisplayMaxRows;
 exports.normalizeAssistantNowExprPlaceholders = normalizeAssistantNowExprPlaceholders;
 exports.repairAssistantPositionalPathSegmentsInPipeline = repairAssistantPositionalPathSegmentsInPipeline;
@@ -615,6 +616,7 @@ function buildAssistantSystemPromptText(platformPrompt) {
         '- If a report-* collection is unavailable, keep using REPORT_BUILDER_READ/REPORT_BUILDER_AGG with the best-matched collection family; the bridge can safely fall back to direct collection access.',
         '- Map user wording to internal collections/fields yourself. Do not ask for property names unless required to run a query.',
         '- Use app heuristics and context hints as weak signals only. Verify collection and field guesses before relying on them.',
+        '- Distinguish the root business object from related measured details. Example: if the user asks for jobs and chemicals sent, jobs/work orders are the root and chemicals are joined detail, not necessarily the root collection.',
         '- 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.',
         '- Prefer running a small REPORT_BUILDER_READ probe over asking multiple questions.',
         '- Form a concrete hypothesis about collection/field/date mapping, then verify it with codebase context or a tiny probe before answering.',
@@ -684,6 +686,7 @@ function buildAssistantSystemPromptText(platformPrompt) {
         '- For performance, keep pipelines minimal: avoid $push arrays or large fields unless the user explicitly asks for them.',
         '- For completion metrics (ex: "completed per day"), filter by completed status when applicable and use completion date fields; if completion dates are missing, fall back to createdAt/date_created and note the fallback.',
         '- Before issuing REPORT_BUILDER_READ or REPORT_BUILDER_AGG, verify the collection name and key fields by checking collection/model definitions in the current app (look for "collectionName:" and date fields like date_created/date_completed/createdAt). Do not invent collection names.',
+        '- When a request names multiple business concepts, root the query in the concept being counted/listed/summarized, then use $lookup/$unwind for related detail concepts.',
         '- For creation-date questions when both date_created and createdAt exist, match both with $or so results are not missed.',
         '- When grouping by fields that can be arrays (drivers, deliveries, routes, chemicals), $unwind first and group by both id and name when available.',
         '- Use REPORT_BUILDER_READ/REPORT_BUILDER_AGG only to produce summaries/snapshots/health checks (not raw dumps) when permitted.',
@@ -1897,7 +1900,7 @@ function executeAiAssistantCodexRun(payload, context) {
                     insertResult = _d.sent();
                     assistantMessageId = (insertResult === null || insertResult === void 0 ? void 0 : insertResult._id) || (insertResult === null || insertResult === void 0 ? void 0 : insertResult.insertedId);
                     enqueueAssistantCodexRun(function () { return __awaiter(_this, void 0, void 0, function () {
-                        var runStart, fastModeEnabled, alwaysAllowProbeEnabled, plannerEnabled, runBudgetMs, assistantMongoMaxTimeMs, assistantSystemPrompt, runDeadlineMs, steps, recordStep, progressTracker, streamProgress, remainingRunBudgetMs, hasRunBudget, applyCodexStageBudget, assistantContent, toolResult, assistantDebug, directiveSource, requestClassification, dataQuestion, lastDirective, heuristicDirectivePrecomputed, usedDeterministicHeuristicFastPath, requestedTimeGrain, requestedBreakdownDimensions, enforceDatedDirective, enforceGroupedDirective, datedDirectiveRetryUsed, datedDirectiveResolved, toolResponseDebug, toolError, toolTelemetry, termHints, collectionHints, fieldHints, schemaHints, methodHints, publicationHints, collectionTokenization, collectionRanking, collectionSelection, collectionOverride, collectionNames, plannerUsed, plannerSkipReason, plannerOutput, plannerRaw, timingBreakdown, codexUsage, accumulateCodexUsage, contextRoute, contextMode, hintSeed, termExpansion, hintText, baseTokens, expandedTokens, baseWeights, expandedWeights, dbName, db, surfaceHints, _a, allowedRoutes, rankedAllowedRoutes, routeHints, appCollectionHints, rankedCollectionHints, rankedCollections, hintCollections, schemaHintCollections, assistantContext, hasDeterministicHeuristicFastPath, prompt_1, workspaceRoot, codexConfig, runOptions, plannerRunOptions, shouldRunPlanner, plannerBudgetAvailable, plannerPrompt, plannerStart, _b, preferListDirective, directiveStyleHint, directivePromptMode, responseText, directiveText, directive, heuristicDirectiveFastPath, directivePrompt, directiveStart, forcedDirective, _c, initialStart, extractedDirective, error_2, directivePrompt, forcedStart, forcedDirective, _d, strictDirectivePrompt, strictStart, strictDirectiveText, strictDirective, strictDirectiveIsDated, shouldUseStrictDirective, _e, guardDirectivePrompt, guardStart, guardDirectiveText, guardDirective, _f, groupedDirectivePrompt, groupedStart, groupedDirectiveText, groupedDirective, _g, heuristicDirective, requestedCollection, allowCollectionOverride, cleanedResponseText, deniedModuleByIntent, permissionLabel, effectiveDirective, rankedCollections_1, directiveHintsBase_1, buildToolRequestForDirective, executionDirective, probeFieldHints, probeEnabled, probeBudgetAllowed, probeDirective, probeRequest, probeStart, probeResponse, _h, probeDurationMs, probeRowCount, probeRewrite, probeError_1, probeDurationMs, probeErrorMessage, toolRequest, requestedToolCollection, toolStart, toolResponse, _j, toolDurationMs, toolPayload, resolvedToolCollection, zeroRowResult, followupCodexEnabled, skipFollowupCodex, followupPrompt, followupStart, followupText, _k, error_3, errorMessage, existingFinal, error_4, runBudgetExceeded, includeToolExecutionTelemetry, toolExecutionTelemetry, finishedAt, finalNow, finishedAt, codexMs, draftingMs, finalMetadata, finalUsage, usageClientId, usageError_1, finalAssistantDoc, setPayload, finalizeError_1, failedAt, fallbackContent, failureMetadata, persistError_1, _l;
+                        var runStart, fastModeEnabled, alwaysAllowProbeEnabled, plannerEnabled, runBudgetMs, assistantMongoMaxTimeMs, assistantSystemPrompt, runDeadlineMs, steps, recordStep, progressTracker, streamProgress, remainingRunBudgetMs, hasRunBudget, applyCodexStageBudget, assistantContent, toolResult, assistantDebug, directiveSource, requestClassification, dataQuestion, lastDirective, heuristicDirectivePrecomputed, usedDeterministicHeuristicFastPath, requestedTimeGrain, requestedBreakdownDimensions, enforceDatedDirective, enforceGroupedDirective, datedDirectiveRetryUsed, datedDirectiveResolved, toolResponseDebug, toolError, toolTelemetry, termHints, collectionHints, fieldHints, schemaHints, methodHints, publicationHints, collectionTokenization, collectionRanking, collectionSelection, collectionOverride, collectionNames, plannerUsed, plannerSkipReason, plannerOutput, plannerRaw, timingBreakdown, codexUsage, accumulateCodexUsage, contextRoute, contextMode, hintSeed, termExpansion, hintText, baseTokens, expandedTokens, baseWeights, expandedWeights, dbName, db, surfaceHints, _a, allowedRoutes, rankedAllowedRoutes, routeHints, appCollectionHints, rankedCollectionHints, rankedCollections, hintCollections, schemaHintCollections, assistantContext, hasDeterministicHeuristicFastPath, prompt_1, workspaceRoot, codexConfig, runOptions, plannerRunOptions, shouldRunPlanner, plannerBudgetAvailable, plannerPrompt, plannerStart, _b, preferListDirective, directiveStyleHint, directivePromptMode, responseText, directiveText, directive, heuristicDirectiveFastPath, directivePrompt, directiveStart, forcedDirective, _c, initialStart, extractedDirective, error_2, directivePrompt, forcedStart, forcedDirective, _d, strictDirectivePrompt, strictStart, strictDirectiveText, strictDirective, strictDirectiveIsDated, shouldUseStrictDirective, _e, guardDirectivePrompt, guardStart, guardDirectiveText, guardDirective, _f, groupedDirectivePrompt, groupedStart, groupedDirectiveText, groupedDirective, _g, heuristicDirective, requestedCollection, allowCollectionOverride, cleanedResponseText, deniedModuleByIntent, permissionLabel, effectiveDirective, rankedCollections_1, directiveHintsBase_1, buildToolRequestForDirective, executionDirective, probeFieldHints, aggregateProbeDisabled, probeEnabled, probeBudgetAllowed, probeDirective, probeRequest, probeStart, probeResponse, _h, probeDurationMs, probeRowCount, probeRewrite, probeError_1, probeDurationMs, probeErrorMessage, toolRequest, requestedToolCollection, toolStart, toolResponse, _j, toolDurationMs, toolPayload, resolvedToolCollection, zeroRowResult, followupCodexEnabled, skipFollowupCodex, followupPrompt, followupStart, followupText, _k, error_3, errorMessage, existingFinal, error_4, runBudgetExceeded, includeToolExecutionTelemetry, toolExecutionTelemetry, finishedAt, finalNow, finishedAt, codexMs, draftingMs, finalMetadata, finalUsage, usageClientId, usageError_1, finalAssistantDoc, setPayload, finalizeError_1, failedAt, fallbackContent, failureMetadata, persistError_1, _l;
                         var _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21;
                         return __generator(this, function (_22) {
                             switch (_22.label) {
@@ -2644,7 +2647,8 @@ function executeAiAssistantCodexRun(payload, context) {
                                     };
                                     return [3 /*break*/, 63];
                                 case 40:
-                                    probeEnabled = AI_ASSISTANT_TOOL_MAX_STEPS > 1;
+                                    aggregateProbeDisabled = executionDirective.type === 'aggregate' && !alwaysAllowProbeEnabled;
+                                    probeEnabled = AI_ASSISTANT_TOOL_MAX_STEPS > 1 && !aggregateProbeDisabled;
                                     probeBudgetAllowed = alwaysAllowProbeEnabled
                                         || hasRunBudget('Grabbing Data: probe', AI_ASSISTANT_MONGO_MIN_STAGE_BUDGET_MS);
                                     if (!(probeEnabled && probeBudgetAllowed)) return [3 /*break*/, 50];
@@ -2731,6 +2735,12 @@ function executeAiAssistantCodexRun(payload, context) {
                                             skippedReason: 'run_budget_exhausted'
                                         };
                                     }
+                                    else if (aggregateProbeDisabled) {
+                                        toolTelemetry.probe = {
+                                            attempted: false,
+                                            skippedReason: 'aggregate_probe_disabled'
+                                        };
+                                    }
                                     _22.label = 51;
                                 case 51:
                                     if (!(!alwaysAllowProbeEnabled && !hasRunBudget('Grabbing Data: final', AI_ASSISTANT_MONGO_MIN_STAGE_BUDGET_MS))) return [3 /*break*/, 52];
@@ -6644,10 +6654,10 @@ function isAssistantDeterministicHeuristicDirective(directive) {
 }
 function buildAssistantHeuristicDirective(message, collectionHints, collectionNames, appId) {
     if (collectionNames === void 0) { collectionNames = []; }
-    void collectionNames;
     if (!normalizeOptionalString(message)) {
         return null;
     }
+    void collectionNames;
     var schemaHoursDirective = resolveAssistantDeterministicHeuristicEnabled(AI_ASSISTANT_HEURISTIC_ID_SCHEMA_HOURS_USER_TIME, appId)
         ? buildAssistantGenericHoursDirective(message, collectionHints, appId)
         : null;
@@ -6695,6 +6705,9 @@ function resolveDefaultAssistantPermissionView(collection) {
     if (base.startsWith('employee')) {
         return '/employee/list';
     }
+    if (base === 'jobs' || base === 'job' || base.startsWith('job-') || base.startsWith('jobs-')) {
+        return '/job/list';
+    }
     if (/work[-_/ ]?orders?|maintenance[-_/ ]?orders?|repair[-_/ ]?orders?/.test(base)) {
         return '/order/list';
     }
@@ -10082,30 +10095,7 @@ function applyAssistantDisplayColumnHints(value, display) {
     }
     return renameAssistantDisplayColumn(display, display.columns[0], labelHint);
 }
-function resolveAssistantEmptyDisplayColumns(value) {
-    var labelHint = resolveAssistantDisplayTemporalLabelHint(value);
-    if (labelHint) {
-        if (labelHint === 'Customer') {
-            var requestedMonths = resolveAssistantRequestedMonthBucketsFromMessage(value);
-            if (requestedMonths.length >= 3) {
-                return __spreadArray([labelHint], __read(requestedMonths), false);
-            }
-            var looseMonthMatch = value.match(/\b(?:last|past|previous|over\s+the\s+last)\s+(\d+)\s+(?:full\s+calendar\s+|calendar\s+|full\s+)?months?\b/i);
-            var looseMonthCount = (looseMonthMatch === null || looseMonthMatch === void 0 ? void 0 : looseMonthMatch[1]) ? Number(looseMonthMatch[1]) : Number.NaN;
-            if (Number.isFinite(looseMonthCount) && looseMonthCount > 0) {
-                var inferred = buildAssistantExpectedMonthBuckets((0, common_1.round)(looseMonthCount), 'full_month');
-                if (inferred.length >= 3) {
-                    return __spreadArray([labelHint], __read(inferred), false);
-                }
-            }
-            return [labelHint, 'Details'];
-        }
-        return [labelHint, 'Total Revenue'];
-    }
-    return ['Result', 'Details'];
-}
 function applyAssistantDisplayTableToResponse(value, display) {
-    var _a;
     if (!display || !Array.isArray(display.rows)) {
         return value;
     }
@@ -10115,26 +10105,6 @@ function applyAssistantDisplayTableToResponse(value, display) {
         var rowCount = typeof normalizedDisplay.rowCount === 'number' && normalizedDisplay.rowCount > 0
             ? normalizedDisplay.rowCount
             : 0;
-        var fallbackColumns = Array.isArray(normalizedDisplay.columns) && normalizedDisplay.columns.length
-            ? normalizedDisplay.columns
-            : resolveAssistantEmptyDisplayColumns(cleaned_1 || value);
-        var normalizedColumns = fallbackColumns.length === 1
-            ? __spreadArray(__spreadArray([], __read(fallbackColumns), false), ['Value'], false) : fallbackColumns;
-        var rowSummary = [(_a = {},
-                _a[normalizedColumns[0]] = rowCount > 0 ? 'Rows matched' : 'No rows matched',
-                _a[normalizedColumns[1]] = rowCount,
-                _a)];
-        var tableDisplay = {
-            columns: normalizedColumns,
-            rows: rowSummary,
-            rowCount: rowCount,
-            truncated: false,
-            includeIds: false
-        };
-        var emptyTable = formatDisplayTableMarkdown(tableDisplay);
-        if (!emptyTable) {
-            return cleaned_1 || value;
-        }
         var noRowsNote = rowCount > 0 ? '' : 'No rows matched your request.';
         var alreadyExplainsNoRows = /\bno (?:matching )?rows?(?: matched| were returned)?\b/i.test(cleaned_1);
         var base = cleaned_1
@@ -10142,13 +10112,7 @@ function applyAssistantDisplayTableToResponse(value, display) {
                 ? "".concat(cleaned_1.trim(), "\n\n").concat(noRowsNote).trim()
                 : cleaned_1.trim())
             : noRowsNote;
-        if (!cleaned_1) {
-            if (!base) {
-                return emptyTable;
-            }
-            return "".concat(base, "\n\n").concat(emptyTable).trim();
-        }
-        return "".concat(base, "\n\n").concat(emptyTable).trim();
+        return base || value;
     }
     var table = formatDisplayTableMarkdown(normalizedDisplay);
     if (!table) {
@@ -10160,6 +10124,9 @@ function applyAssistantDisplayTableToResponse(value, display) {
     }
     return "".concat(cleaned.trim(), "\n\n").concat(table).trim();
 }
+function applyAssistantDisplayTableToResponseForTesting(value, display) {
+    return applyAssistantDisplayTableToResponse(value, display);
+}
 function escapeMarkdownCell(value) {
     var raw = value === null || value === undefined ? '' : String(value);
     return raw.replace(/\|/g, '\\|').replace(/\r?\n/g, ' ').trim();
@@ -15949,6 +15916,32 @@ function resolveCollectionOverrideWithContext(params) {
         }
     }
     var primaryCollectionHint = collectionHints[0] || '';
+    var requestedMatchesPermissionRoute = !!(requested
+        && permissionView
+        && (isAssistantCollectionInHintFamilies(requested, routeHintCollections)
+            || doesAssistantPermissionRouteMatchCollection(permissionView, requested)));
+    var primaryHintMatchesPermissionRoute = !!(primaryCollectionHint
+        && permissionView
+        && (isAssistantCollectionInHintFamilies(primaryCollectionHint, routeHintCollections)
+            || doesAssistantPermissionRouteMatchCollection(permissionView, primaryCollectionHint)));
+    if (requestedMatchesPermissionRoute && !primaryHintMatchesPermissionRoute) {
+        return null;
+    }
+    var requestedHintIndex = requested
+        ? collectionHints.findIndex(function (collection) { return isAssistantCollectionInHintFamilies(requested, [collection]); })
+        : -1;
+    if (requestedHintIndex > 0
+        && primaryCollectionHint
+        && !primaryHintMatchesPermissionRoute) {
+        var requestedScore = resolveAssistantCollectionScore(params.collectionRanking, requested);
+        var primaryScore = resolveAssistantCollectionScore(params.collectionRanking, primaryCollectionHint);
+        var scoreGap = primaryScore - requestedScore;
+        if (requestedScore >= AI_ASSISTANT_COLLECTION_OVERRIDE_MIN_SCORE
+            && primaryScore >= AI_ASSISTANT_COLLECTION_OVERRIDE_MIN_SCORE
+            && scoreGap <= AI_ASSISTANT_COLLECTION_OVERRIDE_SCORE_GAP) {
+            return null;
+        }
+    }
     if (primaryCollectionHint
         && requested
         && !isAssistantCollectionInHintFamilies(requested, [primaryCollectionHint])
@@ -19566,7 +19559,7 @@ function buildAssistantContext(input, userContext) {
         : [];
     if (collectionHints.length) {
         lines.push("Collection hints: ".concat(collectionHints.join(', ')));
-        lines.push('Collection hints are ordered by relevance; prefer the first hint when it directly matches the user wording and verified schema.');
+        lines.push('Collection hints are candidate roots and related collections; the first hint can be a measured/detail collection. Choose the root collection that owns the primary business object in the request, then join related collections for details/metrics.');
     }
     var termHints = Array.isArray(userContext === null || userContext === void 0 ? void 0 : userContext.termHints)
         ? userContext === null || userContext === void 0 ? void 0 : userContext.termHints.filter(Boolean)