Merge branch 'main' into ssu/boolean-confirmation-hitl

Author: krwc

core/src/main/java/com/google/adk/flows/llmflows/Contents.java

@@ -209,12 +209,15 @@ private List<Event> processCompactionEvent(List<Event> events) {
     List<Event> result = new ArrayList<>();
     ListIterator<Event> iter = events.listIterator(events.size());
     Long lastCompactionStartTime = null;
+    Long lastCompactionEndTime = null;
 
     while (iter.hasPrevious()) {
       Event event = iter.previous();
       EventCompaction compaction = event.actions().compaction().orElse(null);
       if (compaction == null) {
-        if (lastCompactionStartTime == null || event.timestamp() < lastCompactionStartTime) {
+        if (lastCompactionStartTime == null
+            || event.timestamp() < lastCompactionStartTime
+            || (lastCompactionEndTime != null && event.timestamp() > lastCompactionEndTime)) {
           result.add(event);
         }
         continue;
@@ -233,6 +236,10 @@ private List<Event> processCompactionEvent(List<Event> events) {
           lastCompactionStartTime == null
               ? compaction.startTimestamp()
               : Long.min(lastCompactionStartTime, compaction.startTimestamp());
+      lastCompactionEndTime =
+          lastCompactionEndTime == null
+              ? compaction.endTimestamp()
+              : Long.max(lastCompactionEndTime, compaction.endTimestamp());
     }
     return Lists.reverse(result);
   }

core/src/test/java/com/google/adk/flows/llmflows/ContentsTest.java

@@ -561,6 +561,22 @@ public void processRequest_multipleCompactions() {
         .containsExactly("Summary 1-4", "content 5", "Summary 6-9", "content 10");
   }
 
+  @Test
+  public void processRequest_compactionWithUncompactedEventsBetween() {
+    ImmutableList<Event> events =
+        ImmutableList.of(
+            createUserEvent("e1", "content 1", "inv1", 1),
+            createUserEvent("e2", "content 2", "inv2", 2),
+            createUserEvent("e3", "content 3", "inv3", 3),
+            createCompactedEvent(1, 2, "Summary 1-2"));
+
+    List<Content> contents = runContentsProcessor(events);
+    assertThat(contents)
+        .comparingElementsUsing(
+            transforming((Content c) -> c.parts().get().get(0).text().get(), "content text"))
+        .containsExactly("content 3", "Summary 1-2");
+  }
+
   private static Event createUserEvent(String id, String text) {
     return Event.builder()
         .id(id)

core/src/test/java/com/google/adk/flows/llmflows/RequestConfirmationLlmRequestProcessorTest.java

@@ -36,38 +36,35 @@
 import com.google.genai.types.FunctionCall;
 import com.google.genai.types.FunctionResponse;
 import com.google.genai.types.Part;
+import java.util.Optional;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
 @RunWith(JUnit4.class)
 public class RequestConfirmationLlmRequestProcessorTest {
-  private static final String ORIGINAL_FUNCTION_CALL_ID = "fc0";
-  private static final String REQUEST_CONFIRMATION_FUNCTION_CALL_ID = "fc1";
   private static final String ECHO_TOOL_NAME = "echo_tool";
+  private static final String ORIGINAL_FUNCTION_CALL_ID = "original_fc_id";
+  private static final ImmutableMap<String, Object> ORIGINAL_FUNCTION_CALL_ARGS =
+      ImmutableMap.of("say", "hello");
+  private static final String FUNCTION_CALL_ID = "fc_id";
+  private static final ImmutableMap<String, Object> ARGS =
+      ImmutableMap.of(
+          "originalFunctionCall",
+          ImmutableMap.of( // original function call as a map
+              "id",
+              Optional.of("original_fc_id"),
+              "name",
+              Optional.of(ECHO_TOOL_NAME),
+              "args",
+              Optional.of(ORIGINAL_FUNCTION_CALL_ARGS)));
+  private static final FunctionCall FUNCTION_CALL =
+      FunctionCall.builder().id(FUNCTION_CALL_ID).name(ECHO_TOOL_NAME).args(ARGS).build();
 
   private static final Event REQUEST_CONFIRMATION_EVENT =
       Event.builder()
           .author("model")
-          .content(
-              Content.fromParts(
-                  Part.builder()
-                      .functionCall(
-                          FunctionCall.builder()
-                              .id(REQUEST_CONFIRMATION_FUNCTION_CALL_ID)
-                              .name(REQUEST_CONFIRMATION_FUNCTION_CALL_NAME)
-                              .args(
-                                  ImmutableMap.of(
-                                      "originalFunctionCall",
-                                      ImmutableMap.of(
-                                          "id",
-                                          ORIGINAL_FUNCTION_CALL_ID,
-                                          "name",
-                                          ECHO_TOOL_NAME,
-                                          "args",
-                                          ImmutableMap.of("say", "hello"))))
-                              .build())
-                      .build()))
+          .content(Content.fromParts(Part.builder().functionCall(FUNCTION_CALL).build()))
           .build();
 
   private static final Event USER_CONFIRMATION_EVENT =
@@ -78,7 +75,7 @@ public class RequestConfirmationLlmRequestProcessorTest {
                   Part.builder()
                       .functionResponse(
                           FunctionResponse.builder()
-                              .id(REQUEST_CONFIRMATION_FUNCTION_CALL_ID)
+                              .id(FUNCTION_CALL_ID)
                               .name(REQUEST_CONFIRMATION_FUNCTION_CALL_NAME)
                               .response(ImmutableMap.of("confirmed", true))
                               .build())
@@ -93,7 +90,7 @@ public class RequestConfirmationLlmRequestProcessorTest {
                   Part.builder()
                       .functionResponse(
                           FunctionResponse.builder()
-                              .id(REQUEST_CONFIRMATION_FUNCTION_CALL_ID)
+                              .id(FUNCTION_CALL_ID)
                               .name(REQUEST_CONFIRMATION_FUNCTION_CALL_NAME)
                               .response(ImmutableMap.of("confirmed", false))
                               .build())
@@ -208,8 +205,7 @@ public void runAsync_withConfirmationAndToolAlreadyCalled_doesNotCallOriginalFun
                             FunctionResponse.builder()
                                 .id(ORIGINAL_FUNCTION_CALL_ID)
                                 .name(ECHO_TOOL_NAME)
-                                .response(
-                                    ImmutableMap.of("result", ImmutableMap.of("say", "hello")))
+                                .response(ImmutableMap.of("result", ORIGINAL_FUNCTION_CALL_ARGS))
                                 .build())
                         .build()))
             .build();