feat: Add tools and toolset to use SkillSource in ADK agents

This change re-introduces the tools and toolset to enable ADK agents to use skills loaded via `SkillSource`.

Key changes:
- ListSkillsTool: Lists available skills.
- LoadSkillTool: Loads skill instructions. Also add a code change to support serialize the custom autovalue class
- LoadSkillResourceTool: Loads skill resources.
- SkillToolset: Groups the above tools.
- Integrates SkillSource into LlmAgent and BaseLlmFlow.
- Tests for all new tools.

The fix for the original TAP breakage (NPE in mocked tests like DataExpressAgentTest):
- Reverted the LlmRequestProcessor interface workaround proposed in CL 920071248.
- Restored the original design from CL 919759154 where `processLlmRequest` is directly on `BaseToolset`.
- Made `BaseLlmFlow.getRequestProcessorFromTools` null-safe. This safely handles null returns from `processLlmRequest`, which commonly happens in mocked environments (e.g., Mockito mocks of toolsets/tools created in test suites without explicit stubbing of processLlmRequest).

PiperOrigin-RevId: 921615212

Author: google-genai-bot

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

@@ -38,7 +38,10 @@
 import com.google.adk.models.LlmRequest;
 import com.google.adk.models.LlmResponse;
 import com.google.adk.telemetry.Tracing;
+import com.google.adk.tools.BaseTool;
+import com.google.adk.tools.BaseToolset;
 import com.google.adk.tools.ToolContext;
+import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
 import com.google.genai.types.FunctionResponse;
@@ -58,6 +61,7 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.BiFunction;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -96,20 +100,8 @@ private Flowable<Event> preprocess(
     Context currentContext = Context.current();
     LlmAgent agent = (LlmAgent) context.agent();
 
-    RequestProcessor toolsProcessor =
-        (ctx, req) -> {
-          LlmRequest.Builder builder = req.toBuilder();
-          return agent
-              .canonicalTools(new ReadonlyContext(ctx))
-              .concatMapCompletable(
-                  tool -> tool.processLlmRequest(builder, ToolContext.builder(ctx).build()))
-              .andThen(
-                  Single.fromCallable(
-                      () -> RequestProcessingResult.create(builder.build(), ImmutableList.of())));
-        };
-
     Iterable<RequestProcessor> allProcessors =
-        Iterables.concat(requestProcessors, ImmutableList.of(toolsProcessor));
+        Iterables.concat(requestProcessors, ImmutableList.of(getRequestProcessorFromTools(agent)));
 
     return Flowable.fromIterable(allProcessors)
         .concatMap(
@@ -121,6 +113,58 @@ private Flowable<Event> preprocess(
                         result -> result.events() != null ? result.events() : ImmutableList.of()));
   }
 
+  /**
+   * Constructs a {@link RequestProcessor} that sequentially applies the {@code processLlmRequest}
+   * methods of all tools and toolsets associated with this agent to the incoming {@link
+   * LlmRequest}.
+   *
+   * @return A {@link RequestProcessor} that applies tool-specific modifications to LLM requests.
+   */
+  @VisibleForTesting
+  RequestProcessor getRequestProcessorFromTools(LlmAgent agent) {
+    return (context, request) -> {
+      ReadonlyContext readonlyContext = new ReadonlyContext(context);
+      List<BiFunction<LlmRequest.Builder, ToolContext, Completable>> processors = new ArrayList<>();
+
+      for (Object toolOrToolset : agent.toolsUnion()) {
+        if (toolOrToolset instanceof BaseTool baseTool) {
+          processors.add(
+              (builder, ctx) -> {
+                Completable c = baseTool.processLlmRequest(builder, ctx);
+                return c == null ? Completable.complete() : c;
+              });
+        } else if (toolOrToolset instanceof BaseToolset baseToolset) {
+          // First apply the toolset's own request processor, then unwrap all tools from the toolset
+          // and apply each individual tool's request processor sequentially.
+          processors.add(
+              (builder, ctx) -> {
+                Completable c = baseToolset.processLlmRequest(builder, ctx);
+                Completable toolsetProcessor = c == null ? Completable.complete() : c;
+                return toolsetProcessor
+                    .andThen(baseToolset.getTools(readonlyContext))
+                    .concatMapCompletable(
+                        b -> {
+                          Completable tc = b.processLlmRequest(builder, ctx);
+                          return tc == null ? Completable.complete() : tc;
+                        });
+              });
+        } else {
+          throw new IllegalArgumentException(
+              "Object in tools list is not of a supported type: "
+                  + toolOrToolset.getClass().getName());
+        }
+      }
+
+      LlmRequest.Builder builder = request.toBuilder();
+      ToolContext toolContext = ToolContext.builder(context).build();
+      return Flowable.fromIterable(processors)
+          .concatMapCompletable(f -> f.apply(builder, toolContext))
+          .andThen(
+              Single.fromCallable(
+                  () -> RequestProcessingResult.create(builder.build(), ImmutableList.of())));
+    };
+  }
+
   /**
    * Post-processes the LLM response after receiving it from the LLM. Executes all registered {@link
    * ResponseProcessor} instances. Emits events for the model response and any subsequent function

core/src/main/java/com/google/adk/skills/AbstractSkillSource.java

@@ -16,6 +16,8 @@
 
 package com.google.adk.skills;
 
+import static com.google.adk.skills.SkillSourceException.SKILL_FORMAT_ERROR;
+import static com.google.adk.skills.SkillSourceException.SKILL_LOAD_ERROR;
 import static java.nio.channels.Channels.newReader;
 import static java.nio.charset.StandardCharsets.UTF_8;
 
@@ -82,12 +84,14 @@ private Frontmatter loadFrontmatter(String skillName, PathT skillMdPath)
       Frontmatter frontmatter = yamlMapper.readValue(yaml, Frontmatter.class);
       if (!frontmatter.name().equals(skillName)) {
         throw new SkillSourceException(
-            "Skill name '%s' does not match directory name '%s'."
-                .formatted(frontmatter.name(), skillName));
+            "Skill name in the frontmatter '%s' does not match skill name '%s'."
+                .formatted(frontmatter.name(), skillName),
+            SKILL_LOAD_ERROR);
       }
       return frontmatter;
     } catch (IOException e) {
-      throw new SkillSourceException("Cannot load frontmatter for skill '" + skillName + "'", e);
+      throw new SkillSourceException(
+          "Cannot load frontmatter for skill '" + skillName + "'", SKILL_LOAD_ERROR, e);
     }
   }
 
@@ -100,7 +104,9 @@ public Single<String> loadInstructions(String skillName) {
                 return readInstructions(reader);
               } catch (IOException e) {
                 throw new SkillSourceException(
-                    "Failed to load instruction for skill '" + skillName + "'", e);
+                    "Failed to load instruction for skill '" + skillName + "'",
+                    SKILL_LOAD_ERROR,
+                    e);
               }
             });
   }
@@ -140,7 +146,8 @@ private String readFrontmatterYaml(BufferedReader reader)
       throws IOException, SkillSourceException {
     String line = reader.readLine();
     if (line == null || !line.trim().equals(THREE_DASHES)) {
-      throw new SkillSourceException("Skill file must start with " + THREE_DASHES);
+      throw new SkillSourceException(
+          "Skill file must start with " + THREE_DASHES, SKILL_FORMAT_ERROR);
     }
 
     StringBuilder sb = new StringBuilder();
@@ -151,14 +158,15 @@ private String readFrontmatterYaml(BufferedReader reader)
       sb.append(line).append("\n");
     }
     throw new SkillSourceException(
-        "Skill file frontmatter not properly closed with " + THREE_DASHES);
+        "Skill file frontmatter not properly closed with " + THREE_DASHES, SKILL_FORMAT_ERROR);
   }
 
   private String readInstructions(BufferedReader reader) throws IOException, SkillSourceException {
     // Skip the frontmatter block
     String line = reader.readLine();
     if (line == null || !line.trim().equals(THREE_DASHES)) {
-      throw new SkillSourceException("Skill file must start with " + THREE_DASHES);
+      throw new SkillSourceException(
+          "Skill file must start with " + THREE_DASHES, SKILL_FORMAT_ERROR);
     }
     boolean dashClosed = false;
     while ((line = reader.readLine()) != null) {
@@ -169,7 +177,7 @@ private String readInstructions(BufferedReader reader) throws IOException, Skill
     }
     if (!dashClosed) {
       throw new SkillSourceException(
-          "Skill file frontmatter not properly closed with " + THREE_DASHES);
+          "Skill file frontmatter not properly closed with " + THREE_DASHES, SKILL_FORMAT_ERROR);
     }
     // Read the instructions till the end of the file
     StringBuilder sb = new StringBuilder();

core/src/main/java/com/google/adk/skills/InMemorySkillSource.java

@@ -16,6 +16,8 @@
 
 package com.google.adk.skills;
 
+import static com.google.adk.skills.SkillSourceException.RESOURCE_NOT_FOUND;
+import static com.google.adk.skills.SkillSourceException.SKILL_NOT_FOUND;
 import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static java.nio.charset.StandardCharsets.UTF_8;
@@ -56,7 +58,8 @@ public Single<ImmutableMap<String, Frontmatter>> listFrontmatters() {
   public Single<ImmutableList<String>> listResources(String skillName, String resourceDirectory) {
     SkillData data = skills.get(skillName);
     if (data == null) {
-      return Single.error(new SkillSourceException("Skill not found: " + skillName));
+      return Single.error(
+          new SkillSourceException("Skill not found: " + skillName, SKILL_NOT_FOUND));
     }
     String prefix =
         resourceDirectory.isEmpty()
@@ -67,7 +70,8 @@ public Single<ImmutableList<String>> listResources(String skillName, String reso
         && data.resources().keySet().stream().noneMatch(path -> path.startsWith(prefix))) {
       return Single.error(
           new SkillSourceException(
-              "Resource directory not found: " + resourceDirectory + " for skill: " + skillName));
+              "Resource directory not found: " + resourceDirectory + " for skill: " + skillName,
+              RESOURCE_NOT_FOUND));
     }
 
     return Single.just(
@@ -92,13 +96,16 @@ public Single<ByteSource> loadResource(String skillName, String resourcePath) {
         .map(SkillData::resources)
         .mapOptional(m -> Optional.ofNullable(m.get(resourcePath)))
         .switchIfEmpty(
-            Single.error(new SkillSourceException("Resource not found: " + resourcePath)));
+            Single.error(
+                new SkillSourceException(
+                    "Resource not found: " + resourcePath, RESOURCE_NOT_FOUND)));
   }
 
   private Single<SkillData> getSkillData(String skillName) {
     SkillData data = skills.get(skillName);
     if (data == null) {
-      return Single.error(new SkillSourceException("Skill not found: " + skillName));
+      return Single.error(
+          new SkillSourceException("Skill not found: " + skillName, SKILL_NOT_FOUND));
     }
     return Single.just(data);
   }

core/src/main/java/com/google/adk/skills/LocalSkillSource.java

@@ -16,6 +16,10 @@
 
 package com.google.adk.skills;
 
+import static com.google.adk.skills.SkillSourceException.RESOURCE_LOAD_ERROR;
+import static com.google.adk.skills.SkillSourceException.RESOURCE_NOT_FOUND;
+import static com.google.adk.skills.SkillSourceException.SKILL_LOAD_ERROR;
+import static com.google.adk.skills.SkillSourceException.SKILL_NOT_FOUND;
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static java.nio.file.Files.isDirectory;
 
@@ -43,14 +47,16 @@ public LocalSkillSource(Path skillsBasePath) {
   public Single<ImmutableList<String>> listResources(String skillName, String resourceDirectory) {
     Path skillDir = skillsBasePath.resolve(skillName);
     if (!isDirectory(skillDir)) {
-      return Single.error(new SkillSourceException("Skill not found: " + skillName));
+      return Single.error(
+          new SkillSourceException("Skill not found: " + skillName, SKILL_NOT_FOUND));
     }
     Path resourceDir = skillDir.resolve(resourceDirectory);
     if (!isDirectory(resourceDir)) {
       return Single.error(
           new SkillSourceException(
               "Resource directory '%s' not found for skill '%s'"
-                  .formatted(resourceDirectory, skillName)));
+                  .formatted(resourceDirectory, skillName),
+              RESOURCE_NOT_FOUND));
     }
 
     return Single.fromCallable(
@@ -67,7 +73,9 @@ public Single<ImmutableList<String>> listResources(String skillName, String reso
             t ->
                 Single.error(
                     new SkillSourceException(
-                        "Failed to traverse resource directory: " + resourceDirectory, t)));
+                        "Failed to traverse resource directory: " + resourceDirectory,
+                        RESOURCE_LOAD_ERROR,
+                        t)));
   }
 
   @Override
@@ -78,7 +86,9 @@ protected Flowable<SkillMdPath> listSkills() {
             t ->
                 Flowable.error(
                     new SkillSourceException(
-                        "Failed to list skills in directory: " + skillsBasePath, t)))
+                        "Failed to list skills in directory: " + skillsBasePath,
+                        SKILL_LOAD_ERROR,
+                        t)))
         .filter(Files::isDirectory)
         .mapOptional(this::findSkillMd)
         .map(skillMd -> new SkillMdPath(skillMd.getParent().getFileName().toString(), skillMd));
@@ -88,7 +98,8 @@ protected Flowable<SkillMdPath> listSkills() {
   protected Single<Path> findResourcePath(String skillName, String resourcePath) {
     Path file = skillsBasePath.resolve(skillName).resolve(resourcePath);
     if (!Files.exists(file)) {
-      return Single.error(new SkillSourceException("Resource not found: " + file));
+      return Single.error(
+          new SkillSourceException("Resource not found: " + file, RESOURCE_NOT_FOUND));
     }
     return Single.just(file);
   }
@@ -97,11 +108,13 @@ protected Single<Path> findResourcePath(String skillName, String resourcePath) {
   protected Single<Path> findSkillMdPath(String skillName) {
     Path skillDir = skillsBasePath.resolve(skillName);
     if (!isDirectory(skillDir)) {
-      return Single.error(new SkillSourceException("Skill directory not found: " + skillName));
+      return Single.error(
+          new SkillSourceException("Skill directory not found: " + skillName, SKILL_NOT_FOUND));
     }
     return Maybe.fromOptional(findSkillMd(skillDir))
         .switchIfEmpty(
-            Single.error(new SkillSourceException("SKILL.md not found in " + skillName)));
+            Single.error(
+                new SkillSourceException("SKILL.md not found in " + skillName, SKILL_NOT_FOUND)));
   }
 
   @Override

core/src/main/java/com/google/adk/skills/SkillSourceException.java

@@ -22,11 +22,43 @@
  */
 public final class SkillSourceException extends Exception {
 
-  public SkillSourceException(String message) {
+  public static final String SKILL_LOAD_ERROR = "SKILL_LOAD_ERROR";
+  public static final String SKILL_NOT_FOUND = "SKILL_NOT_FOUND";
+  public static final String SKILL_FORMAT_ERROR = "SKILL_FORMAT_ERROR";
+  public static final String RESOURCE_LOAD_ERROR = "RESOURCE_LOAD_ERROR";
+  public static final String RESOURCE_NOT_FOUND = "RESOURCE_NOT_FOUND";
+
+  private final String errorCode;
+
+  /**
+   * Constructs a new exception with the specified detail message and error code.
+   *
+   * @param message The detail message.
+   * @param errorCode The specific error code categorizing the failure.
+   */
+  public SkillSourceException(String message, String errorCode) {
     super(message);
+    this.errorCode = errorCode;
   }
 
-  public SkillSourceException(String message, Throwable cause) {
+  /**
+   * Constructs a new exception with the specified detail message, error code, and cause.
+   *
+   * @param message The detail message.
+   * @param errorCode The specific error code categorizing the failure.
+   * @param cause The cause.
+   */
+  public SkillSourceException(String message, String errorCode, Throwable cause) {
     super(message, cause);
+    this.errorCode = errorCode;
+  }
+
+  /**
+   * Returns the error code categorizing the failure.
+   *
+   * @return The error code string.
+   */
+  public String getErrorCode() {
+    return errorCode;
   }
 }

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

@@ -17,18 +17,26 @@
 package com.google.adk.tools;
 
 import com.google.adk.agents.ReadonlyContext;
+import com.google.adk.models.LlmRequest;
+import io.reactivex.rxjava3.core.Completable;
 import io.reactivex.rxjava3.core.Flowable;
 import java.util.List;
 import org.jspecify.annotations.Nullable;
 
 /** Base interface for toolsets. */
 public interface BaseToolset extends AutoCloseable {
 
+  /** Processes the outgoing {@link LlmRequest.Builder}. */
+  default Completable processLlmRequest(
+      LlmRequest.Builder llmRequestBuilder, ToolContext toolContext) {
+    return Completable.complete();
+  }
+
   /**
    * Return all tools in the toolset based on the provided context.
    *
    * @param readonlyContext Context used to filter tools available to the agent.
-   * @return A Single emitting a list of tools available under the specified context.
+   * @return A Flowable emitting tools available under the specified context.
    */
   Flowable<BaseTool> getTools(ReadonlyContext readonlyContext);