Merge branch 'fix/unstable-computehash' of https://github.com/vlooong/agentscope-java into fix/unstable-computehash

Author: Weilong-Qin

.gitignore

@@ -37,8 +37,15 @@ build/
 .flattened-pom.xml
 **/dependency-reduced-pom.xml
 
+### Python
+__pycache__/
+*.py[cod]
+*$py.class
+*.egg-info/
+
 ### Docs
 docs/_build
+.venv/
 
 
 # vibe coding
@@ -50,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

@@ -72,7 +72,12 @@ header:
     - 'CNAME'
     - 'Jenkinsfile'
     - '**/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/agent/AgentBase.java

@@ -906,11 +906,20 @@ private Flux<Event> createEventStream(StreamOptions options, Supplier<Mono<Msg>>
                                             // Add temporary hook
                                             addHook(streamingHook);
 
+                                            // Bus that subagent tools use to push child events
+                                            // into this parent sink without an extra Flux layer.
+                                            SubagentEventBus bus = sink::next;
+
                                             // Use Mono.defer to ensure trace context propagation
                                             // while maintaining streaming hook functionality
                                             Mono.defer(() -> callSupplier.get())
                                                     .contextWrite(
-                                                            context -> context.putAll(ctxView))
+                                                            context ->
+                                                                    context.put(
+                                                                                    SubagentEventBus
+                                                                                            .CONTEXT_KEY,
+                                                                                    bus)
+                                                                            .putAll(ctxView))
                                                     .doFinally(
                                                             signalType -> {
                                                                 // Remove temporary hook

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

@@ -17,6 +17,7 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.agentscope.core.message.Msg;
 
@@ -46,27 +47,60 @@
  * }</pre>
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class Event {
 
     private final EventType type;
     private final Msg message;
     private final boolean isLast;
 
     /**
-     * Creates a new event.
+     * Identifies the originating (sub)agent when this event was emitted by a nested subagent
+     * during a parent {@code stream()} call. {@code null} for events emitted by the top-level
+     * agent itself.
+     */
+    private final EventSource source;
+
+    /**
+     * Creates a new event (top-level agent — no source).
      *
      * @param type The event type (REASONING, TOOL_RESULT, etc.)
      * @param message The message content
      * @param isLast Whether this is the last/complete message for this event
      */
+    public Event(EventType type, Msg message, boolean isLast) {
+        this(type, message, isLast, null);
+    }
+
+    /**
+     * Creates a new event with optional source.
+     *
+     * @param type The event type
+     * @param message The message content
+     * @param isLast Whether this is the last/complete message
+     * @param source The originating subagent, or {@code null} for the top-level agent
+     */
     @JsonCreator
     public Event(
             @JsonProperty("type") EventType type,
             @JsonProperty("message") Msg message,
-            @JsonProperty("isLast") boolean isLast) {
+            @JsonProperty("isLast") boolean isLast,
+            @JsonProperty("source") EventSource source) {
         this.type = type;
         this.message = message;
         this.isLast = isLast;
+        this.source = source;
+    }
+
+    /**
+     * Returns a copy of this event with the given source attached. The original event is not
+     * modified (immutable copy).
+     *
+     * @param source the originating subagent descriptor
+     * @return new Event with {@code source} set
+     */
+    public Event withSource(EventSource source) {
+        return new Event(this.type, this.message, this.isLast, source);
     }
 
     /**
@@ -137,6 +171,19 @@ public boolean isLast() {
         return isLast;
     }
 
+    /**
+     * Returns the originating subagent descriptor, or {@code null} if this event was emitted by
+     * the top-level agent.
+     *
+     * <p>Consumers can use this to route subagent events to the correct UI card or log channel
+     * without needing out-of-band metadata.
+     *
+     * @return the event source, or {@code null} for the top-level agent
+     */
+    public EventSource getSource() {
+        return source;
+    }
+
     /**
      * Get the message ID (delegates to {@link Msg#getId()}).
      *
@@ -151,6 +198,11 @@ public String getMessageId() {
 
     @Override
     public String toString() {
+        if (source != null) {
+            return String.format(
+                    "Event{type=%s, isLast=%s, msgId=%s, contentBlocks=%d, source=%s}",
+                    type, isLast, message.getId(), message.getContent().size(), source);
+        }
         return String.format(
                 "Event{type=%s, isLast=%s, msgId=%s, contentBlocks=%d}",
                 type, isLast, message.getId(), message.getContent().size());