@copilotkitnext/core 1.53.1-next.2 → 1.54.0-next.3

package/dist/index.cjs

@@ -898,7 +898,7 @@ var RunHandler = class {
 		if (tool?.handler) {
 			let parsedArgs;
 			try {
-				parsedArgs = JSON.parse(toolCall.function.arguments);
+				parsedArgs = ensureObjectArgs(JSON.parse(toolCall.function.arguments), toolCall.function.name);
 			} catch (error) {
 				const parseError = error instanceof Error ? error : new Error(String(error));
 				errorMessage = parseError.message;
@@ -980,7 +980,7 @@ var RunHandler = class {
 		if (wildcardTool?.handler) {
 			let parsedArgs;
 			try {
-				parsedArgs = JSON.parse(toolCall.function.arguments);
+				parsedArgs = ensureObjectArgs(JSON.parse(toolCall.function.arguments), toolCall.function.name);
 			} catch (error) {
 				const parseError = error instanceof Error ? error : new Error(String(error));
 				errorMessage = parseError.message;
@@ -1109,7 +1109,7 @@ const EMPTY_TOOL_SCHEMA = {
 */
 function createToolSchema(tool) {
 	if (!tool.parameters) return { ...EMPTY_TOOL_SCHEMA };
-	const rawSchema = (0, zod_to_json_schema.zodToJsonSchema)(tool.parameters, { $refStrategy: "none" });
+	const rawSchema = (0, _copilotkitnext_shared.schemaToJsonSchema)(tool.parameters, { zodToJsonSchema: zod_to_json_schema.zodToJsonSchema });
 	if (!rawSchema || typeof rawSchema !== "object") return { ...EMPTY_TOOL_SCHEMA };
 	const { $schema, ...schema } = rawSchema;
 	if (typeof schema.type !== "string") schema.type = "object";
@@ -1127,6 +1127,17 @@ function stripAdditionalProperties(schema) {
 	if (record.additionalProperties !== void 0) delete record.additionalProperties;
 	for (const value of Object.values(record)) stripAdditionalProperties(value);
 }
+/**
+* Ensures parsed tool arguments are a plain object.
+* Throws for non-object values so the caller's catch block can emit
+* a structured TOOL_ARGUMENT_PARSE_FAILED error.
+*
+* @internal Exported for testing only.
+*/
+function ensureObjectArgs(parsed, toolName) {
+	if (typeof parsed === "object" && parsed !== null && !Array.isArray(parsed)) return parsed;
+	throw new Error(`Tool arguments for ${toolName} parsed to non-object (${typeof parsed})`);
+}
 
 //#endregion
 //#region src/core/state-manager.ts
@@ -1910,4 +1921,5 @@ exports.StateManager = StateManager;
 exports.SuggestionEngine = SuggestionEngine;
 exports.ToolCallStatus = ToolCallStatus;
 exports.completePartialMarkdown = completePartialMarkdown;
+exports.ensureObjectArgs = ensureObjectArgs;
 //# sourceMappingURL=index.cjs.map