Merge branch 'main' into dependabot/maven/testing-282f29c024

Author: ehsavoie

.github/workflows/run-tck.yml

@@ -53,7 +53,7 @@ jobs:
           path: a2a-tck
           ref: ${{ env.TCK_VERSION }}
       - name: Set up Python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v7
         with:
           python-version-file: "a2a-tck/pyproject.toml"
       - name: Install uv and Python dependencies
@@ -149,7 +149,7 @@ jobs:
           path: a2a-tck
           ref: ${{ env.TCK_VERSION_0_3 }}
       - name: Set up Python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v7
         with:
           python-version-file: "a2a-tck/pyproject.toml"
       - name: Install uv and Python dependencies

server-common/src/main/java/org/a2aproject/sdk/server/requesthandlers/DefaultRequestHandler.java

@@ -312,7 +312,7 @@ public Task onGetTask(TaskQueryParams params, ServerCallContext context) throws
      * Limits the history of a task to the most recent N messages.
      *
      * @param task the task to limit
-     * @param historyLength the maximum number of recent messages to keep (0 or negative = unlimited)
+     * @param historyLength the maximum number of recent messages to keep ({@code null} = no limit, 0 = empty history)
      * @return the task with limited history, or the original task if no limiting needed
      */
     private static Task limitTaskHistory(Task task, @Nullable Integer historyLength) {
@@ -736,6 +736,10 @@ public void cancel() {
                     @Override
                     public void onNext(StreamingEventKind item) {
                         LOGGER.debug("onNext: {} for task {}", item.getClass().getSimpleName(), taskId.get());
+                        if (item instanceof Task task) {
+                            Integer historyLength = params.configuration() != null ? params.configuration().historyLength() : null;
+                            item = limitTaskHistory(task, historyLength);
+                        }
                         subscriber.onNext(item);
                     }
 

server-common/src/main/java/org/a2aproject/sdk/server/tasks/AgentEmitter.java

@@ -115,28 +115,14 @@ public AgentEmitter(RequestContext context, EventQueue eventQueue) {
         this.contextId = context.getContextId();
     }
 
-    private void updateStatus(TaskState taskState) {
-        updateStatus(taskState, null, taskState.isFinal());
-    }
-
     /**
      * Updates the task status to the given state with an optional message.
      *
      * @param taskState the new task state
      * @param message optional message to include with the status update
      */
     public void updateStatus(TaskState taskState, @Nullable Message message) {
-        updateStatus(taskState, message, taskState.isFinal());
-    }
-
-    /**
-     * Updates the task status to the given state with an optional message and finality flag.
-     *
-     * @param state the new task state
-     * @param message optional message to include with the status update
-     * @param isFinal whether this is a final status (prevents further updates)
-     */
-    private void updateStatus(TaskState state, @Nullable Message message, boolean isFinal) {
+        boolean isFinal = taskState.isFinal();
         // Check terminal state first (fail fast)
         if (terminalStateReached.get()) {
             throw new IllegalStateException("Cannot update task status - terminal state already reached");
@@ -152,7 +138,7 @@ private void updateStatus(TaskState state, @Nullable Message message, boolean is
         TaskStatusUpdateEvent event = TaskStatusUpdateEvent.builder()
                 .taskId(taskId)
                 .contextId(contextId)
-                .status(new TaskStatus(state, message, null))
+                .status(new TaskStatus(taskState, message, null))
                 .build();
         eventQueue.enqueueEvent(event);
     }
@@ -371,7 +357,7 @@ public void reject(@Nullable Message message) {
      * Marks the task as INPUT_REQUIRED, indicating the agent needs user input to continue.
      */
     public void requiresInput() {
-        requiresInput(null, false);
+        requiresInput(null);
     }
 
     /**
@@ -380,33 +366,39 @@ public void requiresInput() {
      * @param message optional message to include
      */
     public void requiresInput(@Nullable Message message) {
-        requiresInput(message, false);
+        updateStatus(TaskState.TASK_STATE_INPUT_REQUIRED, message);
     }
 
     /**
-     * Marks the task as INPUT_REQUIRED with a finality flag.
+     * Marks the task as INPUT_REQUIRED.
      *
-     * @param isFinal whether this is a final status (prevents further updates)
+     * @param isFinal ignored — interrupted states are not final per the A2A specification.
+     *                Use {@link #requiresInput()} instead.
+     * @deprecated The {@code isFinal} parameter has no effect. Use {@link #requiresInput()} instead.
      */
+    @Deprecated(forRemoval = true)
     public void requiresInput(boolean isFinal) {
-        requiresInput(null, isFinal);
+        requiresInput();
     }
 
     /**
-     * Marks the task as INPUT_REQUIRED with an optional message and finality flag.
+     * Marks the task as INPUT_REQUIRED with an optional message.
      *
      * @param message optional message to include
-     * @param isFinal whether this is a final status (prevents further updates)
+     * @param isFinal ignored — interrupted states are not final per the A2A specification.
+     *                Use {@link #requiresInput(Message)} instead.
+     * @deprecated The {@code isFinal} parameter has no effect. Use {@link #requiresInput(Message)} instead.
      */
+    @Deprecated(forRemoval = true)
     public void requiresInput(@Nullable Message message, boolean isFinal) {
-        updateStatus(TaskState.TASK_STATE_INPUT_REQUIRED, message, isFinal);
+        requiresInput(message);
     }
 
     /**
      * Marks the task as AUTH_REQUIRED, indicating the agent needs authentication to continue.
      */
     public void requiresAuth() {
-        requiresAuth(null, false);
+        requiresAuth(null);
     }
 
     /**
@@ -415,26 +407,32 @@ public void requiresAuth() {
      * @param message optional message to include
      */
     public void requiresAuth(@Nullable Message message) {
-        requiresAuth(message, false);
+        updateStatus(TaskState.TASK_STATE_AUTH_REQUIRED, message);
     }
 
     /**
-     * Marks the task as AUTH_REQUIRED with a finality flag.
+     * Marks the task as AUTH_REQUIRED.
      *
-     * @param isFinal whether this is a final status (prevents further updates)
+     * @param isFinal ignored — interrupted states are not final per the A2A specification.
+     *                Use {@link #requiresAuth()} instead.
+     * @deprecated The {@code isFinal} parameter has no effect. Use {@link #requiresAuth()} instead.
      */
+    @Deprecated(forRemoval = true)
     public void requiresAuth(boolean isFinal) {
-        requiresAuth(null, isFinal);
+        requiresAuth();
     }
 
     /**
-     * Marks the task as AUTH_REQUIRED with an optional message and finality flag.
+     * Marks the task as AUTH_REQUIRED with an optional message.
      *
      * @param message optional message to include
-     * @param isFinal whether this is a final status (prevents further updates)
+     * @param isFinal ignored — interrupted states are not final per the A2A specification.
+     *                Use {@link #requiresAuth(Message)} instead.
+     * @deprecated The {@code isFinal} parameter has no effect. Use {@link #requiresAuth(Message)} instead.
      */
+    @Deprecated(forRemoval = true)
     public void requiresAuth(@Nullable Message message, boolean isFinal) {
-        updateStatus(TaskState.TASK_STATE_AUTH_REQUIRED, message, isFinal);
+        requiresAuth(message);
     }
 
     /**
@@ -569,7 +567,6 @@ public void addTask(Task task) {
      *         .taskId(context.getTaskId())
      *         .contextId(context.getContextId())
      *         .status(new TaskStatus(TaskState.WORKING))
-     *         .isFinal(false)
      *         .build();
      *     emitter.emitEvent(event);
      * }

server-common/src/test/java/org/a2aproject/sdk/server/tasks/AgentEmitterTest.java

@@ -184,12 +184,14 @@ public void testRequiresInputWithMessage() throws Exception {
         checkTaskStatusUpdateEventOnQueue(false, TaskState.TASK_STATE_INPUT_REQUIRED, SAMPLE_MESSAGE);
     }
 
+    @SuppressWarnings("deprecation")
     @Test
     public void testRequiresInputWithFinalTrue() throws Exception {
         agentEmitter.requiresInput(true);
         checkTaskStatusUpdateEventOnQueue(false, TaskState.TASK_STATE_INPUT_REQUIRED, null);
     }
 
+    @SuppressWarnings("deprecation")
     @Test
     public void testRequiresInputWithMessageAndFinalTrue() throws Exception {
         agentEmitter.requiresInput(SAMPLE_MESSAGE, true);
@@ -208,12 +210,14 @@ public void testRequiresAuthWithMessage() throws Exception {
         checkTaskStatusUpdateEventOnQueue(false, TaskState.TASK_STATE_AUTH_REQUIRED, SAMPLE_MESSAGE);
     }
 
+    @SuppressWarnings("deprecation")
     @Test
     public void testRequiresAuthWithFinalTrue() throws Exception {
         agentEmitter.requiresAuth(true);
         checkTaskStatusUpdateEventOnQueue(false, TaskState.TASK_STATE_AUTH_REQUIRED, null);
     }
 
+    @SuppressWarnings("deprecation")
     @Test
     public void testRequiresAuthWithMessageAndFinalTrue() throws Exception {
         agentEmitter.requiresAuth(SAMPLE_MESSAGE, true);

tests/server-common/src/test/java/org/a2aproject/sdk/server/apps/common/AbstractA2AServerTest.java

@@ -3193,4 +3193,79 @@ public void testSendMessageWithHistoryLengthZero() throws Exception {
         }
     }
 
+    @Test
+    @Timeout(value = 30, unit = TimeUnit.SECONDS)
+    public void testSendStreamingMessageWithHistoryLengthZero() throws Exception {
+        AtomicReference<String> taskIdRef = new AtomicReference<>();
+
+        try {
+            Message initialMessage = Message.builder(MESSAGE)
+                    .parts(new TextPart("input-required:Trigger INPUT_REQUIRED"))
+                    .build();
+
+            CountDownLatch initialLatch = new CountDownLatch(1);
+            getClient().sendMessage(initialMessage, List.of((event, agentCard) -> {
+                if (event instanceof TaskEvent te) {
+                    taskIdRef.set(te.getTask().id());
+                    initialLatch.countDown();
+                } else if (event instanceof TaskUpdateEvent tue) {
+                    taskIdRef.set(tue.getTask().id());
+                    if (tue.getTask().status().state() == TaskState.TASK_STATE_INPUT_REQUIRED) {
+                        initialLatch.countDown();
+                    }
+                }
+            }), error -> {
+                if (!isStreamClosedError(error)) {
+                    initialLatch.countDown();
+                }
+            });
+
+            assertTrue(initialLatch.await(15, TimeUnit.SECONDS), "Initial streaming sendMessage should complete");
+            String taskId = taskIdRef.get();
+            assertNotNull(taskId, "Should have captured task ID");
+
+            Message followUp = Message.builder(MESSAGE)
+                    .taskId(taskId)
+                    .parts(new TextPart("input-required:User input"))
+                    .build();
+
+            MessageSendParams params = MessageSendParams.builder()
+                    .message(followUp)
+                    .configuration(MessageSendConfiguration.builder()
+                            .historyLength(0)
+                            .build())
+                    .build();
+
+            CountDownLatch followUpLatch = new CountDownLatch(1);
+            AtomicReference<Task> resultTaskRef = new AtomicReference<>();
+            getClient().sendMessage(params, List.of((BiConsumer<ClientEvent, AgentCard>) (event, agentCard) -> {
+                if (event instanceof TaskEvent te) {
+                    resultTaskRef.set(te.getTask());
+                    followUpLatch.countDown();
+                } else if (event instanceof TaskUpdateEvent tue) {
+                    resultTaskRef.set(tue.getTask());
+                    if (tue.getTask().status().state() == TaskState.TASK_STATE_COMPLETED) {
+                        followUpLatch.countDown();
+                    }
+                }
+            }), error -> {
+                if (!isStreamClosedError(error)) {
+                    followUpLatch.countDown();
+                }
+            }, null);
+
+            assertTrue(followUpLatch.await(15, TimeUnit.SECONDS), "Follow-up streaming sendMessage should complete");
+            Task resultTask = resultTaskRef.get();
+            assertNotNull(resultTask, "Should have received a Task response");
+            assertTrue(resultTask.history() == null || resultTask.history().isEmpty(),
+                    "historyLength=0 should return no history, but got " +
+                            (resultTask.history() != null ? resultTask.history().size() : 0) + " messages");
+        } finally {
+            String taskId = taskIdRef.get();
+            if (taskId != null) {
+                deleteTaskInTaskStore(taskId);
+            }
+        }
+    }
+
 }