Merge branch 'main' into develop-wolf-hit

Author: feelshana

agentscope-core/src/main/java/io/agentscope/core/ReActAgent.java

@@ -648,7 +648,10 @@ protected Mono<Msg> summarizing() {
                                                                     postEvent -> {
                                                                         Msg finalMsg =
                                                                                 postEvent
-                                                                                        .getSummaryMessage();
+                                                                                        .getSummaryMessage()
+                                                                                        .withGenerateReason(
+                                                                                                GenerateReason
+                                                                                                        .MAX_ITERATIONS);
                                                                         memory.addMessage(finalMsg);
                                                                         return finalMsg;
                                                                     }));
@@ -747,12 +750,9 @@ private boolean isFinished(Msg msg) {
         List<ToolUseBlock> toolCalls = msg.getContentBlocks(ToolUseBlock.class);
 
         // No tool calls - finished
-        if (toolCalls.isEmpty()) {
-            return true;
-        }
-
-        // Has tool calls but none are in toolkit - finished
-        return toolCalls.stream().noneMatch(tc -> toolkit.getTool(tc.getName()) != null);
+        // If there are tool calls (even non-existent ones), continue to acting phase
+        // where ToolExecutor will return "Tool not found" error for the model to see
+        return toolCalls.isEmpty();
     }
 
     /**

agentscope-core/src/main/java/io/agentscope/core/agent/AgentBase.java

@@ -26,6 +26,7 @@
 import io.agentscope.core.state.StateModule;
 import io.agentscope.core.tracing.TracerRegistry;
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
@@ -98,6 +99,8 @@ public abstract class AgentBase implements StateModule, Agent {
     // Interrupt state management (available to all agents)
     private final AtomicBoolean interruptFlag = new AtomicBoolean(false);
     private final AtomicReference<Msg> userInterruptMessage = new AtomicReference<>(null);
+    // Hook non-null
+    private static final Comparator<Hook> HOOK_COMPARATOR = Comparator.comparingInt(Hook::priority);
 
     /**
      * Constructor for AgentBase.
@@ -133,6 +136,7 @@ public AgentBase(String name, String description, boolean checkRunning, List<Hoo
         this.checkRunning = checkRunning;
         this.hooks = new CopyOnWriteArrayList<>(hooks != null ? hooks : List.of());
         this.hooks.addAll(systemHooks);
+        sortHooks();
     }
 
     @Override
@@ -474,9 +478,14 @@ public List<Hook> getHooks() {
     protected void addHook(Hook hook) {
         if (hook != null) {
             hooks.add(hook);
+            sortHooks();
         }
     }
 
+    private void sortHooks() {
+        this.hooks.sort(HOOK_COMPARATOR);
+    }
+
     /**
      * Remove a hook from this agent dynamically.
      *
@@ -498,7 +507,7 @@ protected void removeHook(Hook hook) {
      * @return Sorted list of hooks
      */
     protected List<Hook> getSortedHooks() {
-        return hooks.stream().sorted(java.util.Comparator.comparingInt(Hook::priority)).toList();
+        return hooks;
     }
 
     /**
@@ -692,7 +701,7 @@ private Flux<Event> createEventStream(StreamOptions options, Supplier<Mono<Msg>>
                                                     new StreamingHook(sink, options);
 
                                             // Add temporary hook
-                                            hooks.add(streamingHook);
+                                            addHook(streamingHook);
 
                                             // Use Mono.defer to ensure trace context propagation
                                             // while maintaining streaming hook functionality

agentscope-core/src/main/java/io/agentscope/core/formatter/openai/OpenAIConversationMerger.java

@@ -83,38 +83,16 @@ public OpenAIMessage mergeToUserMessage(
         StringBuilder textBuffer = new StringBuilder();
         textBuffer.append(conversationHistoryPrompt);
         textBuffer.append(HISTORY_START_TAG).append("\n");
-
-        // Process all messages EXCEPT the last one as history
-        int lastIndex = msgs.size() - 1;
-
-        // Append history messages
-        if (lastIndex > 0) {
-            for (int i = 0; i < lastIndex; i++) {
-                processMessage(
-                        msgs.get(i),
-                        roleFormatter,
-                        toolResultConverter,
-                        textBuffer,
-                        allParts,
-                        true);
-            }
-        }
-        textBuffer.append(HISTORY_END_TAG).append("\n");
-
-        // Process the last message (current turn)
-        if (lastIndex >= 0) {
-            // Include prefix only if there is history (multi-turn context)
-            // or if it's explicitly needed. For single-turn user queries,
-            // omitting the prefix makes it look like a standard chat request.
-            boolean includePrefix = lastIndex > 0;
+        // Include prefix only if there is history (multi-turn context)
+        // For single-turn user queries,
+        // omitting the prefix makes it look like a standard chat request.
+        boolean includePrefix = msgs.size() > 1;
+        // Process all messages as history (similar to DashScopeConversationMerger)
+        for (Msg msg : msgs) {
             processMessage(
-                    msgs.get(lastIndex),
-                    roleFormatter,
-                    toolResultConverter,
-                    textBuffer,
-                    allParts,
-                    includePrefix);
+                    msg, roleFormatter, toolResultConverter, textBuffer, allParts, includePrefix);
         }
+        textBuffer.append(HISTORY_END_TAG).append("\n");
 
         // Flush remaining text
         if (textBuffer.length() > 0) {

agentscope-core/src/main/java/io/agentscope/core/skill/repository/ClasspathSkillRepository.java

@@ -139,7 +139,9 @@ protected ClasspathSkillRepository(String resourcePath, String source, ClassLoad
             if ("jar".equals(uri.getScheme())) {
                 this.isJar = true;
                 this.fileSystem = FileSystems.newFileSystem(uri, Collections.emptyMap());
-                String actualResourcePath = uri.getSchemeSpecificPart().split("!")[1];
+                String schemeSpecificUriPath = uri.getSchemeSpecificPart();
+                String actualResourcePath =
+                        schemeSpecificUriPath.substring(schemeSpecificUriPath.lastIndexOf("!") + 1);
                 logger.info("Actual resource path: {}", actualResourcePath);
                 this.skillBasePath = fileSystem.getPath(actualResourcePath);
             } else {

agentscope-core/src/test/java/io/agentscope/core/agent/ReActAgentTest.java

@@ -29,6 +29,7 @@
 import io.agentscope.core.agent.test.TestUtils;
 import io.agentscope.core.memory.InMemoryMemory;
 import io.agentscope.core.message.ContentBlock;
+import io.agentscope.core.message.GenerateReason;
 import io.agentscope.core.message.Msg;
 import io.agentscope.core.message.MsgRole;
 import io.agentscope.core.message.TextBlock;
@@ -476,9 +477,13 @@ void testMaxIterations() {
 
         // Get response with timeout
         // Verify it completes within reasonable time (not infinite loop)
-        agent.call(userMsg)
-                .timeout(Duration.ofMillis(TestConstants.DEFAULT_TEST_TIMEOUT_MS))
-                .block(Duration.ofMillis(TestConstants.DEFAULT_TEST_TIMEOUT_MS));
+        Msg response =
+                agent.call(userMsg)
+                        .timeout(Duration.ofMillis(TestConstants.DEFAULT_TEST_TIMEOUT_MS))
+                        .block(Duration.ofMillis(TestConstants.DEFAULT_TEST_TIMEOUT_MS));
+
+        // Verify max iterations generate reason was respected
+        assertEquals(GenerateReason.MAX_ITERATIONS, response.getGenerateReason());
 
         // Verify max iterations was respected
         assertTrue(