fix: populate finishReason in LlmResponse

PiperOrigin-RevId: 853628038

Author: google-genai-bot

core/src/main/java/com/google/adk/agents/LlmAgent.java

@@ -48,7 +48,6 @@
 import com.google.adk.models.Model;
 import com.google.adk.tools.BaseTool;
 import com.google.adk.tools.BaseToolset;
-import com.google.adk.tools.ToolMarker;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
@@ -85,7 +84,7 @@ public enum IncludeContents {
   private final Optional<Model> model;
   private final Instruction instruction;
   private final Instruction globalInstruction;
-  private final List<ToolMarker> toolsUnion;
+  private final List<Object> toolsUnion;
   private final ImmutableList<BaseToolset> toolsets;
   private final Optional<GenerateContentConfig> generateContentConfig;
   // TODO: Remove exampleProvider field - examples should only be provided via ExampleTool
@@ -153,7 +152,7 @@ public static Builder builder() {
   }
 
   /** Extracts BaseToolset instances from the toolsUnion list. */
-  private static ImmutableList<BaseToolset> extractToolsets(List<ToolMarker> toolsUnion) {
+  private static ImmutableList<BaseToolset> extractToolsets(List<Object> toolsUnion) {
     return toolsUnion.stream()
         .filter(obj -> obj instanceof BaseToolset)
         .map(obj -> (BaseToolset) obj)
@@ -166,7 +165,7 @@ public static class Builder extends BaseAgent.Builder<Builder> {
 
     private Instruction instruction;
     private Instruction globalInstruction;
-    private ImmutableList<ToolMarker> toolsUnion;
+    private ImmutableList<Object> toolsUnion;
     private GenerateContentConfig generateContentConfig;
     private BaseExampleProvider exampleProvider;
     private IncludeContents includeContents;
@@ -222,13 +221,13 @@ public Builder globalInstruction(String globalInstruction) {
     }
 
     @CanIgnoreReturnValue
-    public Builder tools(List<? extends ToolMarker> tools) {
+    public Builder tools(List<?> tools) {
       this.toolsUnion = ImmutableList.copyOf(tools);
       return this;
     }
 
     @CanIgnoreReturnValue
-    public Builder tools(ToolMarker... tools) {
+    public Builder tools(Object... tools) {
       this.toolsUnion = ImmutableList.copyOf(tools);
       return this;
     }
@@ -680,7 +679,7 @@ public Single<Map.Entry<String, Boolean>> canonicalGlobalInstruction(ReadonlyCon
    */
   public Flowable<BaseTool> canonicalTools(Optional<ReadonlyContext> context) {
     List<Flowable<BaseTool>> toolFlowables = new ArrayList<>();
-    for (ToolMarker toolOrToolset : toolsUnion) {
+    for (Object toolOrToolset : toolsUnion) {
       if (toolOrToolset instanceof BaseTool baseTool) {
         toolFlowables.add(Flowable.just(baseTool));
       } else if (toolOrToolset instanceof BaseToolset baseToolset) {
@@ -741,7 +740,7 @@ public Single<List<BaseTool>> tools() {
     return canonicalTools().toList();
   }
 
-  public List<ToolMarker> toolsUnion() {
+  public List<Object> toolsUnion() {
     return toolsUnion;
   }
 

core/src/main/java/com/google/adk/agents/ToolResolver.java

@@ -23,7 +23,6 @@
 import com.google.adk.tools.BaseTool.ToolArgsConfig;
 import com.google.adk.tools.BaseTool.ToolConfig;
 import com.google.adk.tools.BaseToolset;
-import com.google.adk.tools.ToolMarker;
 import com.google.adk.utils.ComponentRegistry;
 import com.google.common.collect.ImmutableList;
 import java.lang.reflect.Constructor;
@@ -57,14 +56,14 @@ private ToolResolver() {}
    * @throws ConfigurationException if any tool configuration is invalid (e.g., missing name), if a
    *     tool cannot be found by its name or class, or if tool instantiation fails.
    */
-  static ImmutableList<ToolMarker> resolveToolsAndToolsets(
+  static ImmutableList<Object> resolveToolsAndToolsets(
       List<ToolConfig> toolConfigs, String configAbsPath) throws ConfigurationException {
 
     if (toolConfigs == null || toolConfigs.isEmpty()) {
       return ImmutableList.of();
     }
 
-    ImmutableList.Builder<ToolMarker> resolvedItems = ImmutableList.builder();
+    ImmutableList.Builder<Object> resolvedItems = ImmutableList.builder();
 
     for (ToolConfig toolConfig : toolConfigs) {
       try {

core/src/main/java/com/google/adk/models/LlmResponse.java

@@ -180,6 +180,7 @@ public final Builder response(GenerateContentResponse response) {
       Optional<List<Candidate>> candidatesOpt = response.candidates();
       if (candidatesOpt.isPresent() && !candidatesOpt.get().isEmpty()) {
         Candidate candidate = candidatesOpt.get().get(0);
+        this.finishReason(candidate.finishReason());
         if (candidate.content().isPresent()) {
           this.content(candidate.content().get());
           this.groundingMetadata(candidate.groundingMetadata());

core/src/main/java/com/google/adk/tools/BaseTool.java

@@ -44,7 +44,7 @@
 import org.slf4j.LoggerFactory;
 
 /** The base class for all ADK tools. */
-public abstract class BaseTool implements ToolMarker {
+public abstract class BaseTool {
   private final String name;
   private final String description;
   private final boolean isLongRunning;

core/src/main/java/com/google/adk/tools/BaseToolset.java

@@ -6,7 +6,7 @@
 import java.util.Optional;
 
 /** Base interface for toolsets. */
-public interface BaseToolset extends AutoCloseable, ToolMarker {
+public interface BaseToolset extends AutoCloseable {
 
   /**
    * Return all tools in the toolset based on the provided context.