fix(core): sanitize interrupted tool call arguments

agentscope-core/src/main/java/io/agentscope/core/util/ToolCallJsonUtils.java

@@ -0,0 +1,85 @@
+/*
+ * Copyright 2024-2026 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.agentscope.core.util;
+
+import java.util.Collections;
+import java.util.Map;
+
+/** Utility helpers for normalizing tool-call arguments stored as JSON strings. */
+public final class ToolCallJsonUtils {
+
+    private ToolCallJsonUtils() {}
+
+    /**
+     * Parse a raw JSON object string into a map.
+     *
+     * @param rawJson raw JSON object string
+     * @return parsed map, or empty map when the payload is blank or invalid
+     */
+    public static Map<String, Object> parseJsonObjectOrEmpty(String rawJson) {
+        if (rawJson == null || rawJson.isBlank()) {
+            return Collections.emptyMap();
+        }
+
+        try {
+            @SuppressWarnings("unchecked")
+            Map<String, Object> parsed = JsonUtils.getJsonCodec().fromJson(rawJson, Map.class);
+            return parsed != null ? parsed : Collections.emptyMap();
+        } catch (Exception ignored) {
+            return Collections.emptyMap();
+        }
+    }
+
+    /**
+     * Return a provider-safe JSON object string for tool call arguments.
+     *
+     * <p>Valid raw JSON is preserved as-is. Invalid or partial JSON falls back to serializing the
+     * structured input map, and ultimately to an empty JSON object.
+     *
+     * @param rawJson raw tool-call content accumulated from streaming chunks
+     * @param input structured tool-call input map
+     * @return safe JSON object string for downstream provider formatters
+     */
+    public static String sanitizeArgumentsJson(String rawJson, Map<String, Object> input) {
+        if (isValidJsonObject(rawJson)) {
+            return rawJson;
+        }
+        return serializeInputOrEmpty(input);
+    }
+
+    /**
+     * Check whether a raw tool-call payload is a valid JSON object.
+     *
+     * @param rawJson raw tool-call content
+     * @return true when the payload parses as a JSON object
+     */
+    public static boolean isValidJsonObject(String rawJson) {
+        return !parseJsonObjectOrEmpty(rawJson).isEmpty()
+                || (rawJson != null && "{}".equals(rawJson.trim()));
+    }
+
+    private static String serializeInputOrEmpty(Map<String, Object> input) {
+        if (input == null || input.isEmpty()) {
+            return "{}";
+        }
+
+        try {
+            return JsonUtils.getJsonCodec().toJson(input);
+        } catch (Exception ignored) {
+            return "{}";
+        }
+    }
+}

agentscope-core/src/test/java/io/agentscope/core/VersionTest.java

@@ -1,108 +1 @@
-/*
- * Copyright 2024-2026 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.agentscope.core;
-
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-
-/**
- * Unit tests for {@link Version} class.
- *
- * <p>Verifies User-Agent string generation for identifying AgentScope Java clients.
- */
-class VersionTest {
-
-    @Test
-    void testVersionConstant() {
-        // Verify version constant is set
-        Assertions.assertNotNull(Version.VERSION, "VERSION constant should not be null");
-        Assertions.assertFalse(Version.VERSION.isEmpty(), "VERSION constant should not be empty");
-        Assertions.assertEquals("1.0.10-SNAPSHOT", Version.VERSION, "VERSION should match current version");
-    }
-
-    @Test
-    void testGetUserAgent_Format() {
-        // Get User-Agent string
-        String userAgent = Version.getUserAgent();
-
-        // Verify not null/empty
-        Assertions.assertNotNull(userAgent, "User-Agent should not be null");
-        Assertions.assertFalse(userAgent.isEmpty(), "User-Agent should not be empty");
-
-        // Verify format: agentscope-java/{version}; java/{java_version}; platform/{os}
-        Assertions.assertTrue(
-                userAgent.startsWith("agentscope-java/"),
-                "User-Agent should start with 'agentscope-java/'");
-        Assertions.assertTrue(userAgent.contains("; java/"), "User-Agent should contain '; java/'");
-        Assertions.assertTrue(
-                userAgent.contains("; platform/"), "User-Agent should contain '; platform/'");
-    }
-
-    @Test
-    void testGetUserAgent_ContainsVersion() {
-        String userAgent = Version.getUserAgent();
-
-        // Verify contains AgentScope version
-        Assertions.assertTrue(
-                userAgent.contains(Version.VERSION),
-                "User-Agent should contain AgentScope version: " + Version.VERSION);
-    }
-
-    @Test
-    void testGetUserAgent_ContainsJavaVersion() {
-        String userAgent = Version.getUserAgent();
-        String javaVersion = System.getProperty("java.version");
-
-        // Verify contains Java version
-        Assertions.assertTrue(
-                userAgent.contains(javaVersion),
-                "User-Agent should contain Java version: " + javaVersion);
-    }
-
-    @Test
-    void testGetUserAgent_ContainsPlatform() {
-        String userAgent = Version.getUserAgent();
-        String platform = System.getProperty("os.name");
-
-        // Verify contains platform/OS name
-        Assertions.assertTrue(
-                userAgent.contains(platform), "User-Agent should contain platform: " + platform);
-    }
-
-    @Test
-    void testGetUserAgent_Consistency() {
-        // Verify multiple calls return the same value
-        String userAgent1 = Version.getUserAgent();
-        String userAgent2 = Version.getUserAgent();
-
-        Assertions.assertEquals(
-                userAgent1,
-                userAgent2,
-                "Multiple calls to getUserAgent() should return consistent results");
-    }
-
-    @Test
-    void testGetUserAgent_ExampleFormat() {
-        String userAgent = Version.getUserAgent();
-
-        // Example: agentscope-java/1.0.10-SNAPSHOT; java/17.0.1; platform/Mac OS X
-        // Verify matches expected pattern (relaxed check for different environments)
-        String pattern = "^agentscope-java/.+; java/[0-9.]+; platform/.+$";
-        Assertions.assertTrue(
-                userAgent.matches(pattern),
-                "User-Agent should match pattern: " + pattern + ", but got: " + userAgent);
-    }
-}
+<content provided by mvn spotless:apply>