simplify dynamic tool calling vs static tool call choice by adding new promptConfig to subagent definition + modularize some common functions (useToolCallService + getPromptConfig)

Author: sidwan02

.gemini/settings.json

@@ -14,16 +14,18 @@
       // "model": "gemma3n:e4b"
       "model": "gemma3:12b",
       // "model": "gemma3:12b"
-      "subagentSummarizeToolOutput": { "enabled": true }
+      "subagentSummarizeToolOutput": { "enabled": false }
     },
     "useModelRouter": {
       "useGemmaRouting": {
         "enabled": true,
-        "host": "http://localhost:8000",
+        // "host": "http://localhost:8000",
+        "host": "http://localhost:11434",
         // "model": "gemma3n:e4b"
         // "model": "gemma3n:e2b"
         "model": "gemma3:1b",
-        "provider": "litert-lm"
+        // "provider": "litert-lm"
+        "provider": "ollama"
         // "model": "gemma3:270m"
       }
     }

packages/core/src/agents/build-test-agent.ts

@@ -79,7 +79,7 @@ The user will provide you with an objective on building and/or testing code. You
 ---
 ## Available Tools
 You have access to these tools:
-\${tools_list}
+\${tool_code}
 ---
 \${directive}
 `,
@@ -134,7 +134,7 @@ Now, handle the user message and tool call responses below:
 
 ## Available Tools
 You have access to these tools:
-\${tools_list}
+\${tool_code}
 
 
 Example for gathering information (\`glob\` or \`read_file\`) or executing a command (\`run_shell_command\`):
@@ -146,6 +146,99 @@ I need to [Your concise rationale and what you are trying to do and why it will
 }
 \`\`\`
 
+Example for analyzing output and completing the task:
+I am satisfied with the results. Here are the execution highlights:
+- [Your concise highlights go here].
+- [Your concise highlights go here].
+- [Your concise highlights go here].
+- [Your concise highlights go here].
+- [Your concise highlights go here].
+\`\`\`json
+{
+  "name": "complete_task"
+}
+\`\`\`
+`,
+  },
+
+  promptConfigDynamicTools: {
+    query: `Your task is to respond to the following user objective:
+<objective>
+\${objective}
+</objective>`,
+    systemPrompt: `You are a **Build And Test Agent**, a hyper-specialized AI agent that builds and tests code in the current project. You are a sub-agent within a larger development system.
+The user will provide you with an objective on building and/or testing code. Your *SOLE PURPOSE* is to:
+1. Identify the correct build or test command for the project by inspecting the source code and project structure.
+2. Execute the build or test command.
+3. Analyze the output of the build or test command and report back to the main agent when the objective is met.
+---
+## Available Tools
+You have access to these tools:
+\${tool_code}
+---
+\${directive}
+`,
+    directive: `## Directive
+You are a **Build And Test Agent**, a hyper-specialized AI agent that builds and tests code in the current project. You are a sub-agent within a larger development system.
+The user will provide you with an objective on building and/or testing code. Your *SOLE PURPOSE* is to:
+1. Identify the correct build or test command for the project.
+2. Execute the build or test command.
+3. Analyze the output of the build or test command and report back to the main agent when the objective is met.
+
+**Information Gathering and Planning:**
+You must take as many steps as necessary to understand the project before running commands. You must first gather sufficient information about the project to identify the correct build or test command. Use the \`glob\` and \`read_file\` tools as many times as necessary to:
+- Identify files and their paths relevant to the user's objective.
+- Determine the project's build and testing environment (e.g., presence of package.json, pom.xml, CMakeLists.txt, setup.py, etc.).
+
+**Execution:**
+Once you have identified the correct command, use the \`run_shell_command\` tool to execute the build or test.
+
+**Analysis and Completion:**
+After executing a command, analyze its output.
+- If the output suggests the objective is not yet met (e.g., errors, incorrect command), you must go back to gathering information or refining the command.
+- If the command directly addresses the user's objective and you are satisfied with the result, you must highlight the most important findings to the user in no more than five bullet points and call the \`complete_task\` tool. Only report key information relevant to the user's objective (e.g., test names, file names, pass/fail status).
+
+**Output Format:**
+Your response must *ONLY* contain a one-line explanation of your rationale, followed by the tool choice in JSON format.
+
+**Tool Call Example (for gathering info or execution):**
+I need to [Your concise rationale and what you are trying to do and why it will help].
+\`\`\`json
+{
+  "name": "tool_name"
+}
+\`\`\`
+
+**Task Completion Example:**
+I am satisfied with the results. Here are the execution highlights:
+- [Your concise highlights go here].
+- [Your concise highlights go here].
+- [Your concise highlights go here].
+- [Your concise highlights go here].
+- [Your concise highlights go here].
+\`\`\`json
+{
+  "name": "complete_task"
+}
+\`\`\`
+
+Now, handle the user message and tool call responses below:
+`,
+    reminder: `Remember! You are a **Build And Test Agent** whose purpose is to build and/or test code according to the user's objective.
+
+## Available Tools
+You have access to these tools:
+\${tool_code}
+
+
+Example for gathering information (\`glob\` or \`read_file\`) or executing a command (\`run_shell_command\`):
+I need to [Your concise rationale and what you are trying to do and why it will help].
+\`\`\`json
+{
+  "name": "tool_name"
+}
+\`\`\`
+
 Example for analyzing output and completing the task:
 I am satisfied with the results. Here are the execution highlights:
 - [Your concise highlights go here].

packages/core/src/agents/executor.ts

@@ -547,8 +547,9 @@ export class AgentExecutor<TOutput extends z.ZodTypeAny> {
       signalManager.startAgentSession();
       chat = await this.createChatObject(inputs);
       tools = this.prepareToolsList();
-      const query = this.definition.promptConfig.query
-        ? templateString(this.definition.promptConfig.query, inputs)
+      const promptConfig = this._getPromptConfig();
+      const query = promptConfig.query
+        ? templateString(promptConfig.query, inputs)
         : inputs['objective'] !== undefined
           ? (inputs['objective'] as string)
           : 'Get Started!';
@@ -1079,7 +1080,8 @@ export class AgentExecutor<TOutput extends z.ZodTypeAny> {
   private async createChatObject(
     inputs: AgentInputs,
   ): Promise<GeminiChat | OllamaChat> {
-    const { promptConfig, modelConfig } = this.definition;
+    const { modelConfig } = this.definition;
+    const promptConfig = this._getPromptConfig();
 
     if (!promptConfig.systemPrompt && !promptConfig.initialMessages) {
       throw new Error(
@@ -1113,9 +1115,9 @@ export class AgentExecutor<TOutput extends z.ZodTypeAny> {
       const populatedPromptConfig: PromptConfig = {
         ...promptConfig,
         systemPrompt: this.systemInstruction ?? '',
-        directive: this.definition.promptConfig.directive,
-        query: this.definition.promptConfig.query
-          ? templateString(this.definition.promptConfig.query, inputs)
+        directive: promptConfig.directive,
+        query: promptConfig.query
+          ? templateString(promptConfig.query, inputs)
           : 'Get Started!',
       };
       return new OllamaChat(
@@ -1173,19 +1175,7 @@ export class AgentExecutor<TOutput extends z.ZodTypeAny> {
     submittedOutput: string | null;
     taskCompleted: boolean;
   }> {
-    const agentName = this.definition.name;
-    let useToolCallService = false;
-    if (agentName === 'codebase_investigator') {
-      useToolCallService =
-        !!this.runtimeContext.getCodebaseInvestigatorSettings()
-          .useToolCallService;
-    } else if (agentName === 'gemma_agent') {
-      useToolCallService =
-        !!this.runtimeContext.getGemmaSubagentSettings().useToolCallService;
-    } else if (agentName === 'build_and_test_agent') {
-      useToolCallService =
-        !!this.runtimeContext.getBuildAndTestSettings().useToolCallService;
-    }
+    const useToolCallService = this._usesToolCallService();
 
     if (useToolCallService) {
       const completeFunctionCalls: FunctionCall[] = [];
@@ -1647,9 +1637,34 @@ export class AgentExecutor<TOutput extends z.ZodTypeAny> {
     )}`;
   }
 
+  private _usesToolCallService(): boolean {
+    const agentName = this.definition.name;
+    if (agentName === 'codebase_investigator') {
+      return !!this.runtimeContext.getCodebaseInvestigatorSettings()
+        .useToolCallService;
+    } else if (agentName === 'gemma_agent') {
+      return !!this.runtimeContext.getGemmaSubagentSettings()
+        .useToolCallService;
+    } else if (agentName === 'build_and_test_agent') {
+      return !!this.runtimeContext.getBuildAndTestSettings().useToolCallService;
+    }
+    return false;
+  }
+
+  private _getPromptConfig(): PromptConfig {
+    const useToolCallService = this._usesToolCallService();
+
+    const promptConfig =
+      useToolCallService && this.definition.promptConfigDynamicTools
+        ? this.definition.promptConfigDynamicTools
+        : this.definition.promptConfig;
+
+    return promptConfig;
+  }
+
   /** Builds the system prompt from the agent definition and inputs. */
   private async buildSystemPrompt(inputs: AgentInputs): Promise<string> {
-    const { promptConfig } = this.definition;
+    const promptConfig = this._getPromptConfig();
     if (!promptConfig.systemPrompt) {
       return '';
     }
@@ -1660,45 +1675,16 @@ export class AgentExecutor<TOutput extends z.ZodTypeAny> {
       templateInputs['directive'] = promptConfig.directive;
     }
 
-    if (
-      promptConfig.systemPrompt.includes('${tool_code}') ||
-      promptConfig.systemPrompt.includes('${tools_list}')
-    ) {
+    if (promptConfig.systemPrompt.includes('${tool_code}')) {
       const tools = this.prepareToolsList();
-      let useToolCallService = false;
-      const agentName = this.definition.name;
-      if (agentName === 'codebase_investigator') {
-        useToolCallService =
-          !!this.runtimeContext.getCodebaseInvestigatorSettings()
-            .useToolCallService;
-      } else if (agentName === 'gemma_agent') {
-        useToolCallService =
-          !!this.runtimeContext.getGemmaSubagentSettings().useToolCallService;
-      } else if (agentName === 'build_and_test_agent') {
-        useToolCallService =
-          !!this.runtimeContext.getBuildAndTestSettings().useToolCallService;
-      }
+      const useToolCallService = this._usesToolCallService();
 
       if (useToolCallService) {
         const toolNames = tools.map((tool) => tool.name).join(', ');
-        templateInputs['tools_list'] = toolNames;
-        if (promptConfig.directive) {
-          const newDirective = promptConfig.directive
-            .replace(
-              /Your response must \*ONLY\* contain a one-line explanation of your rationale, followed by the tool call in JSON format\./,
-              'Your response must *ONLY* contain a one-line explanation of your rationale, followed by the tool choice in JSON format.',
-            )
-            .replace(
-              /\{[\s\S]*?\}/,
-              `{
-  "name": "tool_name"
-}`,
-            );
-          templateInputs['directive'] = newDirective;
-        }
+        templateInputs['tool_code'] = toolNames;
       } else {
         const toolCode = this._prepareGemmaToolCode(tools);
-        templateInputs['tools_list'] = toolCode;
+        templateInputs['tool_code'] = toolCode;
         if (promptConfig.directive) {
           templateInputs['directive'] = promptConfig.directive;
         }

packages/core/src/agents/types.ts

@@ -63,6 +63,7 @@ export interface AgentDefinition<TOutput extends z.ZodTypeAny = z.ZodUnknown> {
   displayName?: string;
   description: string;
   promptConfig: PromptConfig;
+  promptConfigDynamicTools?: PromptConfig;
   modelConfig: ModelConfig | OllamaModelConfig;
   runConfig: RunConfig;
   toolConfig?: ToolConfig;