@agentica/core 0.41.2 → 0.41.4

package/lib/index.mjs

@@ -966,7 +966,7 @@ const ChatGptTokenUsageAggregator = {
 
 const JsonUtil = {
     parse,
-    stringifyValidateFailure
+    stringifyValidationFailure
 };
 
 const pipe = (...fns) => str => fns.reduce(((acc, fn) => fn(acc)), str);
@@ -976,7 +976,7 @@ function parse(str) {
     return JSON.parse(str);
 }
 
-function stringifyValidateFailure(failure) {
+function stringifyValidationFailure(failure) {
     const usedErrors = new Set;
     const jsonOutput = stringify({
         value: failure.data,
@@ -1002,13 +1002,33 @@ function stringify(props) {
         return `${indent}undefined${errorComment}`;
     }
     if (Array.isArray(value)) {
+        const missingElementErrors = getMissingArrayElementErrors(path, errors, usedErrors);
+        const hasMissingElements = missingElementErrors.length > 0;
         if (value.length === 0) {
+            if (hasMissingElements) {
+                const innerIndent = "  ".repeat(tab + 1);
+                const lines = [];
+                lines.push(`${indent}[${errorComment}`);
+                missingElementErrors.forEach(((e, idx) => {
+                    const errComment = ` // ❌ ${JSON.stringify([ {
+                        path: e.path,
+                        expected: e.expected,
+                        description: e.description
+                    } ])}`;
+                    const comma = idx < missingElementErrors.length - 1 ? "," : "";
+                    lines.push(`${innerIndent}undefined${comma}${errComment}`);
+                }));
+                lines.push(`${indent}]`);
+                return lines.join("\n");
+            }
             return `${indent}[]${errorComment}`;
         }
         const lines = [];
         lines.push(`${indent}[${errorComment}`);
         value.forEach(((item, index) => {
             const itemPath = `${path}[${index}]`;
+            const isLastElement = index === value.length - 1;
+            const needsComma = !isLastElement || hasMissingElements;
             let itemStr = stringify({
                 value: item,
                 errors,
@@ -1018,7 +1038,7 @@ function stringify(props) {
                 inToJson: false,
                 usedErrors
             });
-            if (index < value.length - 1) {
+            if (needsComma) {
                 const itemLines = itemStr.split("\n");
                 const lastLine = itemLines[itemLines.length - 1];
                 const commentIndex = lastLine.indexOf(" //");
@@ -1031,6 +1051,18 @@ function stringify(props) {
             }
             lines.push(itemStr);
         }));
+        if (hasMissingElements) {
+            const innerIndent = "  ".repeat(tab + 1);
+            missingElementErrors.forEach(((e, idx) => {
+                const errComment = ` // ❌ ${JSON.stringify([ {
+                    path: e.path,
+                    expected: e.expected,
+                    description: e.description
+                } ])}`;
+                const comma = idx < missingElementErrors.length - 1 ? "," : "";
+                lines.push(`${innerIndent}undefined${comma}${errComment}`);
+            }));
+        }
         lines.push(`${indent}]`);
         return lines.join("\n");
     }
@@ -1047,9 +1079,15 @@ function stringify(props) {
                 usedErrors
             });
         }
-        const existingEntries = Object.entries(value).filter((([_, val]) => val !== undefined));
+        const allEntries = Object.entries(value);
+        const definedEntries = allEntries.filter((([_, val]) => val !== undefined));
+        const undefinedEntryKeys = new Set(allEntries.filter((([_, val]) => val === undefined)).map((([key]) => key)));
         const missingKeys = getMissingProperties(path, value, errors);
-        const allKeys = [ ...existingEntries.map((([key]) => key)), ...missingKeys ];
+        const undefinedKeysWithErrors = Array.from(undefinedEntryKeys).filter((key => {
+            const propPath = Escaper.variable(key) ? `${path}.${key}` : `${path}[${JSON.stringify(key)}]`;
+            return errors.some((e => e.path.startsWith(propPath)));
+        }));
+        const allKeys = [ ...definedEntries.map((([key]) => key)), ...undefinedKeysWithErrors, ...missingKeys ];
         if (allKeys.length === 0) {
             return `${indent}{}${errorComment}`;
         }
@@ -1058,15 +1096,16 @@ function stringify(props) {
         allKeys.forEach(((key, index, array) => {
             const propPath = Escaper.variable(key) ? `${path}.${key}` : `${path}[${JSON.stringify(key)}]`;
             const propIndent = "  ".repeat(tab + 1);
-            const val = missingKeys.includes(key) ? undefined : value[key];
+            const val = missingKeys.includes(key) || undefinedKeysWithErrors.includes(key) ? undefined : value[key];
             if (val === undefined || val === null || typeof val === "boolean" || typeof val === "number" || typeof val === "string") {
                 const propErrorComment = getErrorComment(propPath, errors, usedErrors);
-                const valueStr = val === undefined ? `${propIndent}"${key}": undefined` : `${propIndent}"${key}": ${JSON.stringify(val)}`;
+                const keyStr = JSON.stringify(key);
+                const valueStr = val === undefined ? `${propIndent}${keyStr}: undefined` : `${propIndent}${keyStr}: ${JSON.stringify(val)}`;
                 const withComma = index < array.length - 1 ? `${valueStr},` : valueStr;
                 const line = withComma + propErrorComment;
                 lines.push(line);
             } else {
-                const keyLine = `${propIndent}"${key}": `;
+                const keyLine = `${propIndent}${JSON.stringify(key)}: `;
                 let valStr = stringify({
                     value: val,
                     errors,
@@ -1114,6 +1153,13 @@ function getErrorComment(path, errors, usedErrors) {
     }))))}`;
 }
 
+function getMissingArrayElementErrors(path, errors, usedErrors) {
+    const wildcardPath = `${path}[]`;
+    const missingErrors = errors.filter((e => e.path === wildcardPath));
+    missingErrors.forEach((e => usedErrors.add(e)));
+    return missingErrors;
+}
+
 function getMissingProperties(path, value, errors) {
     const missingKeys = new Set;
     for (const e of errors) {
@@ -1132,8 +1178,20 @@ function extractDirectChildKey(parentPath, errorPath) {
         return null;
     }
     const suffix = errorPath.slice(parentPath.length);
-    const match = suffix.match(/^\.([^.[\]]+)$/);
-    return match !== null ? match[1] : null;
+    const dotMatch = suffix.match(/^\.([^.[\]]+)$/);
+    if (dotMatch !== null) {
+        return dotMatch[1];
+    }
+    const bracketMatch = suffix.match(/^\[("[^"\\]*(?:\\.[^"\\]*)*")\]$/);
+    if (bracketMatch !== null) {
+        try {
+            const parsed = JSON.parse(bracketMatch[1]);
+            if (typeof parsed === "string") {
+                return parsed;
+            }
+        } catch {}
+    }
+    return null;
 }
 
 function transformCompletionChunk(source) {
@@ -1712,9 +1770,9 @@ async function correctTypeError(ctx, callEvent, validateEvent, previousValidatio
         toolCall: {
             id: callEvent.id,
             arguments: JSON.stringify(callEvent.arguments),
-            result: [ "🚨 VALIDATION FAILURE: Your function arguments do not conform to the required schema.", "", "The validation errors below represent computed absolute truth from rigorous type validation.", "Each error is marked with ❌ comments showing the exact location, expected type, and actual value.", "", "You must fix ALL errors to achieve 100% schema compliance.", "", JsonUtil.stringifyValidateFailure(validateEvent.result) ].join("\n")
+            result: [ "🚨 VALIDATION FAILURE: Your function arguments do not conform to the required schema.", "", "The validation errors below represent computed absolute truth from rigorous type validation.", "Each error is marked with ❌ comments showing the exact location, expected type, and actual value.", "", "You must fix ALL errors to achieve 100% schema compliance.", "", JsonUtil.stringifyValidationFailure(validateEvent.result) ].join("\n")
         },
-        systemPrompt: ctx.config?.systemPrompt?.validate?.(previousValidationErrors.slice(0, -1)) ?? [ AgenticaSystemPrompt.VALIDATE, ...previousValidationErrors.length > 1 ? [ "", AgenticaSystemPrompt.VALIDATE_REPEATED.replace("${{HISTORICAL_ERRORS}}", previousValidationErrors.slice(0, -1).map(((ve, i) => [ `### ${i + 1}. Previous Validation Error`, "", JsonUtil.stringifyValidateFailure(ve.result) ].join("\n"))).join("\n\n")) ] : [] ].join("\n"),
+        systemPrompt: ctx.config?.systemPrompt?.validate?.(previousValidationErrors.slice(0, -1)) ?? [ AgenticaSystemPrompt.VALIDATE, ...previousValidationErrors.length > 1 ? [ "", AgenticaSystemPrompt.VALIDATE_REPEATED.replace("${{HISTORICAL_ERRORS}}", previousValidationErrors.slice(0, -1).map(((ve, i) => [ `### ${i + 1}. Previous Validation Error`, "", JsonUtil.stringifyValidationFailure(ve.result) ].join("\n"))).join("\n\n")) ] : [] ].join("\n"),
         life,
         previousValidationErrors
     });
@@ -1818,7 +1876,13 @@ async function correctError(ctx, props) {
         return ChatGptCompletionMessageUtil.merge(await StreamUtil.readAll(result.value));
     })();
     const toolCall = completion.choices?.[0]?.message.tool_calls?.filter((tc => tc.type === "function")).find((s => s.function.name === props.operation.name));
-    return toolCall === undefined ? props.giveUp() : predicate(ctx, props.operation, toolCall, props.previousValidationErrors, props.life);
+    if (toolCall === undefined) {
+        return correctError(ctx, {
+            ...props,
+            life: props.life - 1
+        });
+    }
+    return predicate(ctx, props.operation, toolCall, props.previousValidationErrors, props.life);
 }
 
 async function executeFunction(call, operation) {