@resolveio/server-lib 22.0.13 → 22.0.14

package/methods/ai-terminal.js

@@ -373,7 +373,7 @@ var AI_ASSISTANT_TERM_SYNONYMS = [
 var AI_ASSISTANT_REPORT_BUILDER_EXPERT_PLAYBOOK = [
     'Report Builder Bridge Expert Playbook (execute in order for every data request):',
     '1) Determine if data is required.',
-    '- If user asks for counts, lists, totals, trends, rankings, or "recent/last", run a report builder directive before answering.',
+    '- If user asks for counts, lists, totals, trends, rankings, or "recent/last", run a data directive before answering.',
     '',
     'Report style mapping (always apply):',
     '- Dated report: any breakdown over time (per day/week/month/quarter/year, trends, time-series comparisons).',
@@ -388,7 +388,7 @@ var AI_ASSISTANT_REPORT_BUILDER_EXPERT_PLAYBOOK = [
     '',
     '3) Enforce permissions and scope in the directive.',
     '- Always include permissionView.',
-    '- Use /report-builder as the default permissionView for data directives; avoid /report/* routes.',
+    '- Prefer module-specific permissionView routes (for example /invoice/list for invoices). Avoid /report/* routes and only use /report-builder when the user is explicitly asking about report building.',
     '- 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.',
@@ -492,8 +492,8 @@ 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-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 invoice data, set permissionView to an invoice-capable route (ex: /invoice/list).',
+    '- Do not use /report/* routes as permissionView for data directives; use a module route that matches the collection.',
     '- 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.',
@@ -3624,7 +3624,7 @@ function buildAssistantToolRequest(directive, payload) {
     var base = directive.payload && typeof directive.payload === 'object' ? directive.payload : {};
     var request = __assign({}, base);
     if (!request.permissionView) {
-        request.permissionView = '/report-builder';
+        request.permissionView = resolveDefaultAssistantPermissionView(request.collection);
     }
     request.permissionView = normalizeAssistantPermissionView(request.permissionView, request.collection);
     if (!request.id_client) {
@@ -3638,21 +3638,53 @@ function buildAssistantToolRequest(directive, payload) {
     }
     return request;
 }
+function resolveDefaultAssistantPermissionView(collection) {
+    var normalizedCollection = normalizeOptionalString(collection).toLowerCase();
+    if (!normalizedCollection) {
+        return '/report-builder';
+    }
+    var base = stripVersionSuffix(normalizedCollection.startsWith('report-')
+        ? normalizedCollection.slice('report-'.length)
+        : normalizedCollection);
+    if (!base) {
+        return '/report-builder';
+    }
+    if (requiresInvoicePermission(base)) {
+        return '/invoice/list';
+    }
+    if (base.startsWith('sales-tax')) {
+        return '/sales-tax/list';
+    }
+    if (base.startsWith('expense')) {
+        return '/expense/list';
+    }
+    if (base.startsWith('distribution')) {
+        return '/distribution/list';
+    }
+    if (base.startsWith('prospective-client')) {
+        return '/prospective-client/list';
+    }
+    if (base.startsWith('client')) {
+        return '/client/list';
+    }
+    if (base.startsWith('employee')) {
+        return '/employee/list';
+    }
+    return '/report-builder';
+}
 function normalizeAssistantPermissionView(permissionView, collection) {
     var normalizedPermission = normalizeOptionalString(permissionView);
     var normalizedCollection = normalizeOptionalString(collection);
     var loweredPermission = normalizedPermission.toLowerCase();
+    var fallbackPermission = resolveDefaultAssistantPermissionView(normalizedCollection);
     if (!normalizedPermission) {
-        return '/report-builder';
+        return fallbackPermission;
     }
     if (loweredPermission === '/report-builder' || loweredPermission.startsWith('/report-builder/')) {
-        return '/report-builder';
+        return fallbackPermission;
     }
     if (loweredPermission === '/report' || loweredPermission.startsWith('/report/')) {
-        if (requiresInvoicePermission(normalizedCollection)) {
-            return '/invoice/list';
-        }
-        return '/report-builder';
+        return fallbackPermission;
     }
     return normalizedPermission;
 }
@@ -4033,14 +4065,13 @@ function buildAssistantToolErrorMessage(error, directive, request) {
     var _a, _b;
     var rawMessage = normalizeOptionalString(error === null || error === void 0 ? void 0 : error.message) || 'Unable to access data.';
     var normalized = rawMessage.toLowerCase();
-    var routeHint = normalizeOptionalString(request === null || request === void 0 ? void 0 : request.permissionView)
-        || normalizeOptionalString((_a = directive.payload) === null || _a === void 0 ? void 0 : _a.permissionView);
-    var collection = normalizeOptionalString(request === null || request === void 0 ? void 0 : request.collection) || normalizeOptionalString((_b = directive.payload) === null || _b === void 0 ? void 0 : _b.collection);
+    var collection = normalizeOptionalString(request === null || request === void 0 ? void 0 : request.collection) || normalizeOptionalString((_a = directive.payload) === null || _a === void 0 ? void 0 : _a.collection);
+    var routeHint = resolveAssistantErrorRouteHint(normalizeOptionalString(request === null || request === void 0 ? void 0 : request.permissionView) || normalizeOptionalString((_b = directive.payload) === null || _b === void 0 ? void 0 : _b.permissionView), collection);
     var routeLine = routeHint
         ? "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.';
+        : 'Request access to the related module in the app.';
     if (!routeHint && collection && requiresInvoicePermission(collection)) {
-        routeLine = 'Open /invoice/list or /report-builder/list to view this data or request access.';
+        routeLine = 'Open /invoice/list in the app 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);
@@ -4057,14 +4088,30 @@ function buildAssistantToolErrorMessage(error, directive, request) {
     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('invalid character for a variable name') && (normalized.includes('now-') || normalized.includes('now+'))) {
+        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);
+        return "That dataset is not configured for assistant data access yet. ".concat(routeLine);
     }
     if (normalized.includes('collection is required')) {
         return 'I need a valid collection to read from. Please specify which screen or dataset you want.';
     }
     return "I couldn't access the requested data. ".concat(routeLine);
 }
+function resolveAssistantErrorRouteHint(routeHint, collection) {
+    var normalizedHint = normalizeOptionalString(routeHint);
+    if (!normalizedHint) {
+        var fallback = resolveDefaultAssistantPermissionView(collection);
+        return fallback.startsWith('/report-builder') ? '' : fallback;
+    }
+    var loweredHint = normalizedHint.toLowerCase();
+    if (loweredHint.startsWith('/report-builder') || loweredHint === '/report' || loweredHint.startsWith('/report/')) {
+        var fallback = resolveDefaultAssistantPermissionView(collection);
+        return fallback.startsWith('/report-builder') ? '' : fallback;
+    }
+    return normalizedHint;
+}
 function deriveAssistantStreamStatus(event) {
     var _a;
     if (!event || !event.type) {
@@ -5599,8 +5646,25 @@ function resolveAssistantNumericValue(value) {
 function isAssistantPercentColumn(column) {
     return /(percent|pct|percentage|ratio|rate)\b/.test(column);
 }
+var ASSISTANT_NON_CURRENCY_COLUMN_PATTERN = /\b(invoice\s*number|count|qty|quantity|index|rank|sequence|seq|id|code|ticket|number)\b/;
+var ASSISTANT_CURRENCY_HINT_PATTERN = /\b(amount|price|cost|balance|fee|revenue|tax|billing|charge|payment|profit|margin|due)\b/;
+var ASSISTANT_MONEY_TOTAL_PATTERN = /\b(sub\s*total|subtotal|grand\s*total|paid\s*total)\b/;
+var ASSISTANT_TOTAL_WITH_MONEY_HINT_PATTERN = /\btotal\b.*\b(amount|revenue|sales|tax|price|cost|balance|paid|due|charge|billing|profit|margin)\b/;
 function isAssistantCurrencyColumn(column) {
-    return /(amount|total|price|cost|balance|fee|revenue|invoice|usd|tax|subtotal|paid|billing|sales)\b/.test(column);
+    var normalized = String(column || '').toLowerCase().replace(/[_-]+/g, ' ').trim();
+    if (!normalized) {
+        return false;
+    }
+    var hasMoneyHint = ASSISTANT_CURRENCY_HINT_PATTERN.test(normalized)
+        || ASSISTANT_MONEY_TOTAL_PATTERN.test(normalized)
+        || ASSISTANT_TOTAL_WITH_MONEY_HINT_PATTERN.test(normalized);
+    if (ASSISTANT_NON_CURRENCY_COLUMN_PATTERN.test(normalized) && !hasMoneyHint) {
+        return false;
+    }
+    if (/\btotal\b/.test(normalized) && !hasMoneyHint) {
+        return false;
+    }
+    return hasMoneyHint;
 }
 function isAssistantDateColumn(column) {
     return /(date|time|created|updated|timestamp|at)\b/.test(column);
@@ -5914,6 +5978,7 @@ function sanitizeAssistantProjection(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;
+var ASSISTANT_NOW_RELATIVE_COMPACT_PATTERN = /^\$\$NOW([+-])([0-9]+)\s*(MINUTES?|MINS?|MIN|HOURS?|HRS?|HR|DAYS?|WEEKS?|WKS?|WK|MONTHS?|MOS?|MO|M|YEARS?|YRS?|YR|Y)$/i;
 function normalizeAssistantTimeUnit(raw) {
     var normalized = String(raw || '').toLowerCase();
     if (normalized.startsWith('minute')) {
@@ -5933,21 +5998,54 @@ function normalizeAssistantTimeUnit(raw) {
     }
     return 'year';
 }
+function normalizeAssistantCompactTimeUnit(raw) {
+    var normalized = String(raw || '').toLowerCase();
+    if (normalized === 'm' || normalized === 'mo' || normalized === 'mos' || normalized.startsWith('month')) {
+        return 'month';
+    }
+    if (normalized === 'min' || normalized === 'mins' || normalized.startsWith('minute')) {
+        return 'minute';
+    }
+    if (normalized === 'h' || normalized === 'hr' || normalized === 'hrs' || normalized.startsWith('hour')) {
+        return 'hour';
+    }
+    if (normalized === 'd' || normalized.startsWith('day')) {
+        return 'day';
+    }
+    if (normalized === 'w' || normalized === 'wk' || normalized === 'wks' || normalized.startsWith('week')) {
+        return 'week';
+    }
+    return 'year';
+}
 function parseAssistantNowRelativeToken(value) {
     var trimmed = normalizeOptionalString(value);
     if (!trimmed) {
         return null;
     }
-    var match = trimmed.match(ASSISTANT_NOW_RELATIVE_PATTERN);
-    if (!match) {
+    var expandedMatch = trimmed.match(ASSISTANT_NOW_RELATIVE_PATTERN);
+    if (expandedMatch) {
+        var direction_1 = String(expandedMatch[1] || '').toUpperCase() === 'PLUS' ? 'PLUS' : 'MINUS';
+        var amount_1 = Number(expandedMatch[2]);
+        if (!Number.isFinite(amount_1) || amount_1 < 0) {
+            return null;
+        }
+        var unit_1 = normalizeAssistantTimeUnit(expandedMatch[3] || '');
+        return {
+            operator: direction_1 === 'PLUS' ? '$dateAdd' : '$dateSubtract',
+            amount: amount_1,
+            unit: unit_1
+        };
+    }
+    var compactMatch = trimmed.match(ASSISTANT_NOW_RELATIVE_COMPACT_PATTERN);
+    if (!compactMatch) {
         return null;
     }
-    var direction = String(match[1] || '').toUpperCase() === 'PLUS' ? 'PLUS' : 'MINUS';
-    var amount = Number(match[2]);
+    var direction = compactMatch[1] === '+' ? 'PLUS' : 'MINUS';
+    var amount = Number(compactMatch[2]);
     if (!Number.isFinite(amount) || amount < 0) {
         return null;
     }
-    var unit = normalizeAssistantTimeUnit(match[3] || '');
+    var unit = normalizeAssistantCompactTimeUnit(compactMatch[3] || '');
     return {
         operator: direction === 'PLUS' ? '$dateAdd' : '$dateSubtract',
         amount: amount,