@agentica/core 0.36.2 → 0.36.3

package/lib/index.mjs

@@ -6,7 +6,7 @@ import { v4 } from "uuid";
 
 import { HttpLlm, OpenApi, McpLlm } from "@samchon/openapi";
 
-import { removeTrailingCommas, addMissingBraces, removeEmptyObjectPrefix } from "es-jsonkit";
+import { jsonrepair } from "jsonrepair";
 
 import { Escaper } from "typia/lib/utils/Escaper";
 
@@ -911,14 +911,162 @@ const ChatGptTokenUsageAggregator = {
 };
 
 const JsonUtil = {
-    parse
+    parse,
+    stringifyValidateFailure
 };
 
-const pipe = (...fns) => str => fns.reduce(((acc, fn) => fn(acc)), str);
-
 function parse(str) {
-    const corrected = pipe(removeEmptyObjectPrefix, addMissingBraces, removeTrailingCommas)(str);
-    return JSON.parse(corrected);
+    str = jsonrepair(str);
+    return JSON.parse(str);
+}
+
+function stringifyValidateFailure(failure) {
+    return stringify({
+        value: failure.data,
+        errors: failure.errors,
+        path: "$input",
+        tab: 0,
+        inArray: false,
+        inToJson: false
+    });
+}
+
+function stringify(props) {
+    const {value, errors, path, tab, inArray, inToJson} = props;
+    const indent = "  ".repeat(tab);
+    const errorComment = getErrorComment(path, errors);
+    if (inArray && value === undefined) {
+        return `${indent}undefined${errorComment}`;
+    }
+    if (Array.isArray(value)) {
+        if (value.length === 0) {
+            return `${indent}[]${errorComment}`;
+        }
+        const lines = [];
+        lines.push(`${indent}[${errorComment}`);
+        value.forEach(((item, index) => {
+            const itemPath = `${path}[${index}]`;
+            let itemStr = stringify({
+                value: item,
+                errors,
+                path: itemPath,
+                tab: tab + 1,
+                inArray: true,
+                inToJson: false
+            });
+            if (index < value.length - 1) {
+                const itemLines = itemStr.split("\n");
+                const lastLine = itemLines[itemLines.length - 1];
+                const commentIndex = lastLine.indexOf(" //");
+                if (commentIndex !== -1) {
+                    itemLines[itemLines.length - 1] = `${lastLine.slice(0, commentIndex)},${lastLine.slice(commentIndex)}`;
+                } else {
+                    itemLines[itemLines.length - 1] += ",";
+                }
+                itemStr = itemLines.join("\n");
+            }
+            lines.push(itemStr);
+        }));
+        lines.push(`${indent}]`);
+        return lines.join("\n");
+    }
+    if (typeof value === "object" && value !== null) {
+        if (!inToJson && typeof value.toJSON === "function") {
+            const jsonValue = value.toJSON();
+            return stringify({
+                value: jsonValue,
+                errors,
+                path,
+                tab,
+                inArray,
+                inToJson: true
+            });
+        }
+        const existingEntries = Object.entries(value).filter((([_, val]) => val !== undefined));
+        const missingKeys = getMissingProperties(path, value, errors);
+        const allKeys = [ ...existingEntries.map((([key]) => key)), ...missingKeys ];
+        if (allKeys.length === 0) {
+            return `${indent}{}${errorComment}`;
+        }
+        const lines = [];
+        lines.push(`${indent}{${errorComment}`);
+        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];
+            if (val === undefined || val === null || typeof val === "boolean" || typeof val === "number" || typeof val === "string") {
+                const propErrorComment = getErrorComment(propPath, errors);
+                const valueStr = val === undefined ? `${propIndent}"${key}": undefined` : `${propIndent}"${key}": ${JSON.stringify(val)}`;
+                const withComma = index < array.length - 1 ? `${valueStr},` : valueStr;
+                const line = withComma + propErrorComment;
+                lines.push(line);
+            } else {
+                const keyLine = `${propIndent}"${key}": `;
+                let valStr = stringify({
+                    value: val,
+                    errors,
+                    path: propPath,
+                    tab: tab + 1,
+                    inArray: false,
+                    inToJson: false
+                });
+                const valStrWithoutIndent = valStr.trimStart();
+                if (index < array.length - 1) {
+                    const valLines = valStrWithoutIndent.split("\n");
+                    const lastLine = valLines[valLines.length - 1];
+                    const commentIndex = lastLine.indexOf(" //");
+                    if (commentIndex !== -1) {
+                        valLines[valLines.length - 1] = `${lastLine.slice(0, commentIndex)},${lastLine.slice(commentIndex)}`;
+                    } else {
+                        valLines[valLines.length - 1] += ",";
+                    }
+                    valStr = valLines.join("\n");
+                } else {
+                    valStr = valStrWithoutIndent;
+                }
+                const combined = keyLine + valStr;
+                lines.push(combined);
+            }
+        }));
+        lines.push(`${indent}}`);
+        return lines.join("\n");
+    }
+    const valStr = value === undefined ? "undefined" : JSON.stringify(value) ?? String(value);
+    return `${indent}${valStr}${errorComment}`;
+}
+
+function getErrorComment(path, errors) {
+    const pathErrors = errors.filter((e => e.path === path));
+    if (pathErrors.length === 0) {
+        return "";
+    }
+    return ` // ❌ ${JSON.stringify(pathErrors.map((e => ({
+        path: e.path,
+        expected: e.expected,
+        description: e.description
+    }))))}`;
+}
+
+function getMissingProperties(path, value, errors) {
+    const missingKeys = new Set;
+    for (const e of errors) {
+        const childKey = extractDirectChildKey(path, e.path);
+        if (childKey !== null) {
+            if (!(childKey in value)) {
+                missingKeys.add(childKey);
+            }
+        }
+    }
+    return Array.from(missingKeys);
+}
+
+function extractDirectChildKey(parentPath, errorPath) {
+    if (!errorPath.startsWith(parentPath)) {
+        return null;
+    }
+    const suffix = errorPath.slice(parentPath.length);
+    const match = suffix.match(/^\.([^.[\]]+)$/);
+    return match !== null ? match[1] : null;
 }
 
 function transformCompletionChunk(source) {
@@ -1344,155 +1492,6 @@ async function reduceStreamingWithDispatch(stream, eventProcessor, abortSignal)
     return nullableCompletion;
 }
 
-function stringifyValidateFailure(failure) {
-    return stringify({
-        value: failure.data,
-        errors: failure.errors,
-        path: "$input",
-        tab: 0,
-        inArray: false,
-        inToJson: false
-    });
-}
-
-function stringify(props) {
-    const {value, errors, path, tab, inArray, inToJson} = props;
-    const indent = "  ".repeat(tab);
-    const errorComment = getErrorComment(path, errors);
-    if (inArray && value === undefined) {
-        return `${indent}undefined${errorComment}`;
-    }
-    if (Array.isArray(value)) {
-        if (value.length === 0) {
-            return `${indent}[]${errorComment}`;
-        }
-        const lines = [];
-        lines.push(`${indent}[${errorComment}`);
-        value.forEach(((item, index) => {
-            const itemPath = `${path}[${index}]`;
-            let itemStr = stringify({
-                value: item,
-                errors,
-                path: itemPath,
-                tab: tab + 1,
-                inArray: true,
-                inToJson: false
-            });
-            if (index < value.length - 1) {
-                const itemLines = itemStr.split("\n");
-                const lastLine = itemLines[itemLines.length - 1];
-                const commentIndex = lastLine.indexOf(" //");
-                if (commentIndex !== -1) {
-                    itemLines[itemLines.length - 1] = `${lastLine.slice(0, commentIndex)},${lastLine.slice(commentIndex)}`;
-                } else {
-                    itemLines[itemLines.length - 1] += ",";
-                }
-                itemStr = itemLines.join("\n");
-            }
-            lines.push(itemStr);
-        }));
-        lines.push(`${indent}]`);
-        return lines.join("\n");
-    }
-    if (typeof value === "object" && value !== null) {
-        if (!inToJson && typeof value.toJSON === "function") {
-            const jsonValue = value.toJSON();
-            return stringify({
-                value: jsonValue,
-                errors,
-                path,
-                tab,
-                inArray,
-                inToJson: true
-            });
-        }
-        const existingEntries = Object.entries(value).filter((([_, val]) => val !== undefined));
-        const missingKeys = getMissingProperties(path, value, errors);
-        const allKeys = [ ...existingEntries.map((([key]) => key)), ...missingKeys ];
-        if (allKeys.length === 0) {
-            return `${indent}{}${errorComment}`;
-        }
-        const lines = [];
-        lines.push(`${indent}{${errorComment}`);
-        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];
-            if (val === undefined || val === null || typeof val === "boolean" || typeof val === "number" || typeof val === "string") {
-                const propErrorComment = getErrorComment(propPath, errors);
-                const valueStr = val === undefined ? `${propIndent}"${key}": undefined` : `${propIndent}"${key}": ${JSON.stringify(val)}`;
-                const withComma = index < array.length - 1 ? `${valueStr},` : valueStr;
-                const line = withComma + propErrorComment;
-                lines.push(line);
-            } else {
-                const keyLine = `${propIndent}"${key}": `;
-                let valStr = stringify({
-                    value: val,
-                    errors,
-                    path: propPath,
-                    tab: tab + 1,
-                    inArray: false,
-                    inToJson: false
-                });
-                const valStrWithoutIndent = valStr.trimStart();
-                if (index < array.length - 1) {
-                    const valLines = valStrWithoutIndent.split("\n");
-                    const lastLine = valLines[valLines.length - 1];
-                    const commentIndex = lastLine.indexOf(" //");
-                    if (commentIndex !== -1) {
-                        valLines[valLines.length - 1] = `${lastLine.slice(0, commentIndex)},${lastLine.slice(commentIndex)}`;
-                    } else {
-                        valLines[valLines.length - 1] += ",";
-                    }
-                    valStr = valLines.join("\n");
-                } else {
-                    valStr = valStrWithoutIndent;
-                }
-                const combined = keyLine + valStr;
-                lines.push(combined);
-            }
-        }));
-        lines.push(`${indent}}`);
-        return lines.join("\n");
-    }
-    const valStr = value === undefined ? "undefined" : JSON.stringify(value) ?? String(value);
-    return `${indent}${valStr}${errorComment}`;
-}
-
-function getErrorComment(path, errors) {
-    const pathErrors = errors.filter((e => e.path === path));
-    if (pathErrors.length === 0) {
-        return "";
-    }
-    return ` // ❌ ${JSON.stringify(pathErrors.map((e => ({
-        path: e.path,
-        expected: e.expected,
-        description: e.description
-    }))))}`;
-}
-
-function getMissingProperties(path, value, errors) {
-    const missingKeys = new Set;
-    for (const e of errors) {
-        const childKey = extractDirectChildKey(path, e.path);
-        if (childKey !== null) {
-            if (!(childKey in value)) {
-                missingKeys.add(childKey);
-            }
-        }
-    }
-    return Array.from(missingKeys);
-}
-
-function extractDirectChildKey(parentPath, errorPath) {
-    if (!errorPath.startsWith(parentPath)) {
-        return null;
-    }
-    const suffix = errorPath.slice(parentPath.length);
-    const match = suffix.match(/^\.([^.[\]]+)$/);
-    return match !== null ? match[1] : null;
-}
-
 function createOperationSelection(props) {
     return {
         operation: props.operation,
@@ -1644,9 +1643,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.", "", "```json", 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.", "", "```json", JsonUtil.stringifyValidateFailure(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`, "", "```json", 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`, "", "```json", JsonUtil.stringifyValidateFailure(ve.result), "```" ].join("\n"))).join("\n\n")) ] : [] ].join("\n"),
         life,
         previousValidationErrors
     });