Merge branch 'main' into main

Author: sunwg2

.github/workflows/maven-ci.yml

@@ -127,7 +127,8 @@ jobs:
         if: runner.os == 'Windows'
         run: |
           # -T1: single-threaded build so reactor order is respected (see Linux step).
-          & "~\.mvnd\bin\mvnd.cmd" -B -T1 clean verify
+          # -Dmvnd.maxLostKeepAlive=120: avoid StaleAddressException on long javadoc phases (mvnd#161).
+          & "~\.mvnd\bin\mvnd.cmd" -B -T1 "-Dmvnd.maxLostKeepAlive=120" clean verify
 
       - name: Upload coverage reports to Codecov
         if: runner.os == 'Linux'

.gitignore

@@ -57,10 +57,28 @@ CLAUDE.md
 ##Log
 logs/
 
-## boba-tea-shop example
+## Frontend (all frontend/ directories across examples and extensions)
+# Dependencies
+**/frontend/node_modules/
+# Build output
+**/frontend/dist/
+**/frontend/build/
+**/frontend/.output/
+# Vite / bundler caches
+**/frontend/.vite/
+**/frontend/.cache/
+**/frontend/.parcel-cache/
+# Type-check / tsc output
+**/frontend/*.tsbuildinfo
+# Env files (may contain secrets)
+**/frontend/.env.local
+**/frontend/.env.*.local
+# Coverage
+**/frontend/coverage/
+# Storybook
+**/frontend/storybook-static/
+# boba-tea-shop: generated static assets served by the supervisor-agent
 **/boba-tea-shop/supervisor-agent/**/static/
-**/boba-tea-shop/**/node_modules/
-**/boba-tea-shop/**/dist/
 
 ##agentscope
 .agentscope/

.licenserc.yaml

@@ -74,6 +74,10 @@ header:
     - '**/vendor/**'
     - '**/docs/**'
     - '**/.prettierrc'
+    - 'agentscope-examples/**/frontend/**'
+    - '**/Dockerfile'
+    - '**/src/main/resources/**'
+    - '**/src/test/resources/**'
   comment: on-failure
 
   license-location-threshold: 130

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

@@ -828,6 +828,28 @@ private Mono<PostActingEvent> notifyPostActingHook(
     protected Mono<Msg> summarizing() {
         log.debug("Maximum iterations reached. Generating summary...");
 
+        // Handle pending tool calls that were not completed before max iterations
+        if (hasPendingToolUse()) {
+            List<ToolUseBlock> pendingTools = extractPendingToolCalls();
+            log.warn(
+                    "Max iterations reached with {} pending tool calls. Adding error results.",
+                    pendingTools.size());
+
+            for (ToolUseBlock toolUse : pendingTools) {
+                ToolResultBlock errorResult =
+                        buildErrorToolResult(
+                                toolUse.getId(),
+                                "Tool execution cancelled because maximum iterations limit ("
+                                        + maxIters
+                                        + ") was reached");
+
+                Msg errorResultMsg =
+                        ToolResultMessageBuilder.buildToolResultMsg(
+                                errorResult, toolUse, getName());
+                memory.addMessage(errorResultMsg);
+            }
+        }
+
         List<Msg> messageList = prepareSummaryMessages();
         GenerateOptions generateOptions = buildGenerateOptions();
 

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

@@ -29,7 +29,7 @@
  *   <li>No name field in messages (returns HTTP 400 if present)</li>
  *   <li>System messages should be converted to user messages</li>
  *   <li>Does NOT support strict parameter in tool definitions</li>
- *   <li>reasoning_content must be kept within current turn but removed for previous turns</li>
+ *   <li>In thinking mode, reasoning_content is preserved for segments with tool calls</li>
  * </ul>
  *
  * <p>Usage:
@@ -85,8 +85,8 @@ protected boolean supportsStrict() {
      * <ul>
      *   <li>No name field in messages</li>
      *   <li>System messages converted to user</li>
-     *   <li>reasoning_content kept within current turn (after last user message)</li>
-     *   <li>reasoning_content removed for previous turns (before last user message)</li>
+     *   <li>In thinking mode, reasoning_content preserved for segments with tool calls</li>
+     *   <li>reasoning_content removed for segments without tool calls in thinking mode</li>
      * </ul>
      *
      * <p>This method is static to allow sharing with {@link DeepSeekMultiAgentFormatter}.
@@ -95,16 +95,51 @@ protected boolean supportsStrict() {
      * @return the fixed messages for DeepSeek API
      */
     static List<OpenAIMessage> applyDeepSeekFixes(List<OpenAIMessage> messages) {
-        // Find the last user message index to determine current turn boundary
         int lastUserIndex = findLastUserIndex(messages);
+        boolean thinkingMode = messages.stream().anyMatch(m -> m.getReasoningContent() != null);
+        boolean[] segHasTool = thinkingMode ? computeSegmentToolFlags(messages) : null;
 
         List<OpenAIMessage> result = new ArrayList<>(messages.size());
         for (int i = 0; i < messages.size(); i++) {
-            result.add(fixMessage(messages.get(i), i >= lastUserIndex));
+            boolean isCurrentTurn = i >= lastUserIndex;
+            boolean needReasoning =
+                    thinkingMode
+                            ? (isCurrentTurn || (segHasTool != null && segHasTool[i]))
+                            : isCurrentTurn;
+            result.add(fixMessage(messages.get(i), needReasoning));
         }
         return result;
     }
 
+    /**
+     * Scans messages in a single pass to identify segments (between consecutive
+     * user messages) that contain tool calls. Messages within such segments
+     * are flagged to preserve their reasoning_content.
+     */
+    private static boolean[] computeSegmentToolFlags(List<OpenAIMessage> messages) {
+        boolean[] flags = new boolean[messages.size()];
+        int prevUser = -1;
+        for (int i = 0; i <= messages.size(); i++) {
+            if (i == messages.size() || "user".equals(messages.get(i).getRole())) {
+                if (prevUser >= 0) {
+                    // Check if segment (prevUser, i) has any tool call
+                    boolean hasTool = false;
+                    for (int j = prevUser + 1; j < i && !hasTool; j++) {
+                        OpenAIMessage m = messages.get(j);
+                        hasTool = m.getToolCalls() != null && !m.getToolCalls().isEmpty();
+                    }
+                    if (hasTool) {
+                        for (int j = prevUser + 1; j < i; j++) {
+                            flags[j] = true;
+                        }
+                    }
+                }
+                prevUser = i;
+            }
+        }
+        return flags;
+    }
+
     /**
      * Append an empty user message if the conversation ends with an assistant message.
      *
@@ -133,12 +168,13 @@ private static int findLastUserIndex(List<OpenAIMessage> messages) {
     }
 
     @SuppressWarnings("unchecked")
-    private static OpenAIMessage fixMessage(OpenAIMessage msg, boolean isCurrentTurn) {
+    private static OpenAIMessage fixMessage(OpenAIMessage msg, boolean needReasoning) {
         boolean isSystem = "system".equals(msg.getRole());
         boolean hasName = msg.getName() != null;
         boolean hasReasoning = msg.getReasoningContent() != null;
-        // Remove reasoning_content for previous turns, keep for current turn
-        boolean shouldRemoveReasoning = hasReasoning && !isCurrentTurn;
+        // needReasoning is determined by applyDeepSeekFixes:
+        // true = current turn, or segment had tool calls in thinking mode
+        boolean shouldRemoveReasoning = hasReasoning && !needReasoning;
 
         if (!isSystem && !hasName && !shouldRemoveReasoning) {
             return msg;
@@ -162,8 +198,7 @@ private static OpenAIMessage fixMessage(OpenAIMessage msg, boolean isCurrentTurn
             builder.toolCallId(msg.getToolCallId());
         }
 
-        // Keep reasoning_content only for current turn
-        if (hasReasoning && isCurrentTurn) {
+        if (needReasoning && hasReasoning) {
             builder.reasoningContent(msg.getReasoningContent());
         }
 

agentscope-core/src/main/java/io/agentscope/core/model/AnthropicChatModel.java

@@ -25,6 +25,8 @@
 import io.agentscope.core.formatter.anthropic.AnthropicChatFormatter;
 import io.agentscope.core.formatter.anthropic.AnthropicResponseParser;
 import io.agentscope.core.message.Msg;
+import io.agentscope.core.model.transport.ProxyConfig;
+import java.net.Proxy;
 import java.time.Instant;
 import java.util.List;
 import org.slf4j.Logger;
@@ -74,14 +76,16 @@ public class AnthropicChatModel extends ChatModelBase {
      * @param defaultOptions default generation options
      * @param formatter      the message formatter to use (null for default
      *                       Anthropic formatter)
+     * @param proxyConfig    the proxy configuration (null for no proxy)
      */
     public AnthropicChatModel(
             String baseUrl,
             String apiKey,
             String modelName,
             boolean streamEnabled,
             GenerateOptions defaultOptions,
-            AnthropicBaseFormatter formatter) {
+            AnthropicBaseFormatter formatter,
+            ProxyConfig proxyConfig) {
         this.baseUrl = baseUrl;
         this.apiKey = apiKey;
         this.modelName = modelName;
@@ -101,6 +105,12 @@ public AnthropicChatModel(
             clientBuilder.baseUrl(baseUrl);
         }
 
+        // Configure proxy if provided
+        if (proxyConfig != null) {
+            Proxy proxy = proxyConfig.toJavaProxy();
+            clientBuilder.proxy(proxy);
+        }
+
         this.client = clientBuilder.build();
     }
 
@@ -237,6 +247,7 @@ public static class Builder {
         private boolean streamEnabled = true;
         private GenerateOptions defaultOptions;
         private AnthropicBaseFormatter formatter;
+        private ProxyConfig proxyConfig;
 
         /**
          * Sets the base URL for the Anthropic API.
@@ -304,14 +315,35 @@ public Builder formatter(AnthropicBaseFormatter formatter) {
             return this;
         }
 
+        /**
+         * Sets the proxy configuration for HTTP traffic.
+         *
+         * <p>The Anthropic Java SDK does not support proxy authentication or {@code nonProxyHosts}. Only
+         * {@link ProxyConfig#toJavaProxy()} is used; {@code username}, {@code password}, and {@code nonProxyHosts} on
+         * {@link ProxyConfig} have no effect.
+         *
+         * @param proxyConfig the proxy configuration (see {@link ProxyConfig})
+         * @return this builder
+         */
+        public Builder proxy(ProxyConfig proxyConfig) {
+            this.proxyConfig = proxyConfig;
+            return this;
+        }
+
         /**
          * Builds the AnthropicChatModel instance.
          *
          * @return a new AnthropicChatModel
          */
         public AnthropicChatModel build() {
             return new AnthropicChatModel(
-                    baseUrl, apiKey, modelName, streamEnabled, defaultOptions, formatter);
+                    baseUrl,
+                    apiKey,
+                    modelName,
+                    streamEnabled,
+                    defaultOptions,
+                    formatter,
+                    proxyConfig);
         }
     }
 }