@resolveio/server-lib 22.0.17 → 22.0.18

package/methods/ai-terminal.js

@@ -4193,7 +4193,7 @@ function buildAssistantToolErrorMessage(error) {
     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 and I will normalize the date expression.';
     }
-    if (normalized.includes('unrecognized argument to $datesubtract: date') || normalized.includes('unrecognized argument to $dateadd: date')) {
+    if (normalized.includes('unrecognized argument to $datesubtract:') || normalized.includes('unrecognized argument to $dateadd:')) {
         return 'The data query failed because of an invalid date expression argument. Please retry; date arithmetic arguments are now normalized automatically.';
     }
     if (normalized.includes('report builder bridge') && normalized.includes('not configured')) {
@@ -6204,6 +6204,45 @@ function normalizeAssistantDateArithmeticArgs(expression) {
         if (Object.prototype.hasOwnProperty.call(nextArgs, 'start')) {
             delete nextArgs.start;
         }
+        var allowedKeys = new Set(['startDate', 'unit', 'amount', 'timezone']);
+        var unknownKeys = Object.keys(nextArgs).filter(function (key) { return !allowedKeys.has(key); });
+        if (!Object.prototype.hasOwnProperty.call(nextArgs, 'startDate')) {
+            var startCandidateKey = unknownKeys.find(function (key) {
+                var candidate = nextArgs[key];
+                if (candidate instanceof Date) {
+                    return true;
+                }
+                if (typeof candidate === 'string') {
+                    return candidate.startsWith('$$') || candidate.startsWith('$');
+                }
+                if (candidate && typeof candidate === 'object' && !Array.isArray(candidate)) {
+                    return Object.keys(candidate).some(function (op) { return op.startsWith('$'); });
+                }
+                return false;
+            });
+            if (startCandidateKey) {
+                nextArgs.startDate = nextArgs[startCandidateKey];
+                delete nextArgs[startCandidateKey];
+            }
+        }
+        if (!Object.prototype.hasOwnProperty.call(nextArgs, 'amount')) {
+            var amountCandidateKey = Object.keys(nextArgs).find(function (key) {
+                if (allowedKeys.has(key)) {
+                    return false;
+                }
+                var candidate = nextArgs[key];
+                return typeof candidate === 'number' && Number.isFinite(candidate);
+            });
+            if (amountCandidateKey) {
+                nextArgs.amount = nextArgs[amountCandidateKey];
+                delete nextArgs[amountCandidateKey];
+            }
+        }
+        Object.keys(nextArgs).forEach(function (key) {
+            if (!allowedKeys.has(key)) {
+                delete nextArgs[key];
+            }
+        });
         expression[operator] = nextArgs;
     };
     normalizeOperatorArgs('$dateAdd');
@@ -6237,10 +6276,8 @@ function isAssistantDateArithmeticArgumentError(error) {
     if (!message) {
         return false;
     }
-    return message.includes('unrecognized argument to $datesubtract: date')
-        || message.includes('unrecognized argument to $dateadd: date')
-        || message.includes('unrecognized argument to $datesubtract: start')
-        || message.includes('unrecognized argument to $dateadd: start');
+    return message.includes('unrecognized argument to $datesubtract:')
+        || message.includes('unrecognized argument to $dateadd:');
 }
 function didAssistantValueChange(before, after) {
     try {