dynamic tool call works! with context injection (chat History not shared with tool call service, only 'tool call goal' and tool choice from build-test subagent)

Author: sidwan02

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

@@ -178,13 +178,16 @@ You have access to these tools:
 \${directive}
 `,
     directive: `## Output Format
+If you decide to choose a tool to further the task, your response must *ONLY* contain the tool choice in JSON format.
 
-If you decide to choose a tool to further the task, your response must *ONLY* contain a one-line explanation of your rationale, followed by the tool choice in JSON format.
+The \`goal\` you provide is critical, as it will be passed to a separate, specialized agent that executes the command. This agent has **no access to our conversation history**. Therefore, your \`goal\` **must be a fully self-contained and actionable instruction**. It needs to include not just *what* to do, but also *why*, so the other agent understands the context.
 
-**Example:**
-I have chosen \`tool_name\` because [Your concise rationale and what you are trying to do and why it will help].
+**JSON Structure:**
 \`\`\`json
-{ "name": "tool_name" }
+{
+  "name": "run_shell_command",
+  "goal": "<Your fully self-contained goal>"
+}
 \`\`\`
 
 If you decide the user's objective is met, your response must *ONLY* contain a five bullet point summary (e.g., test names, file names, pass/fail status), followed by the \`complete_task\` tool call in JSON format.
@@ -202,20 +205,24 @@ I am satisfied with the results. Here are the execution highlights:
 
 `,
     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}
 
 
 ## Output Format
+If you decide to choose a tool to further the task, your response must *ONLY* contain the tool choice in JSON format.
 
-If you decide to choose a tool to further the task, your response must *ONLY* contain a one-line explanation of your rationale, followed by the tool choice in JSON format.
+The \`goal\` you provide is critical, as it will be passed to a separate, specialized agent that executes the command. This agent has **no access to our conversation history**. Therefore, your \`goal\` **must be a fully self-contained and actionable instruction**. It needs to include not just *what* to do, but also *why*, so the other agent understands the context.
 
-**Example:**
-I have chosen \`tool_name\` because [Your concise rationale and what you are trying to do and why it will help].
+
+**JSON Structure:**
 \`\`\`json
-{ "name": "tool_name" }
+{
+  "name": "run_shell_command",
+  "goal": "<Your fully self-contained goal>"
+}
 \`\`\`
 
 If you decide the user's objective is met, your response must *ONLY* contain a five bullet point summary (e.g., test names, file names, pass/fail status), followed by the \`complete_task\` tool call in JSON format.

packages/core/src/agents/executor.ts

@@ -1058,10 +1058,16 @@ export class AgentExecutor<TOutput extends z.ZodTypeAny> {
         if (functionCall.name) {
           const tool = this.toolRegistry.getTool(functionCall.name);
           if (tool) {
+            const goal = (functionCall.args as { goal?: string })?.goal ?? '';
+            if (!goal) {
+              throw new Error(
+                'The "goal" argument is missing from the tool call.',
+              );
+            }
             const completeFunctionCall =
               await this.toolCallService.generateToolCall(
                 functionCall.name,
-                chat,
+                goal,
                 this.definition.modelConfig,
               );
             completeFunctionCalls.push(completeFunctionCall);

packages/core/src/services/toolCallService.ts

@@ -6,7 +6,6 @@
 
 import type { FunctionCall, FunctionDeclaration, Schema } from '@google/genai';
 
-import type { GeminiChat } from '../core/geminiChat.js';
 import { OllamaChat, StreamEventType } from '../core/ollamaChat.js';
 import { debugLogger } from '../utils/debugLogger.js';
 import type { ModelConfig, OllamaModelConfig } from '../agents/types.js';
@@ -83,7 +82,7 @@ export class ToolCallService {
    */
   async generateToolCall(
     toolName: string,
-    chat: GeminiChat | OllamaChat,
+    goal: string,
     modelConfig: ModelConfig | OllamaModelConfig,
   ): Promise<FunctionCall> {
     const tool = this.toolRegistry.getTool(toolName);
@@ -96,51 +95,46 @@ export class ToolCallService {
 
     const formattedSchema = this._prepareGemmaToolCode(functionDeclarations);
 
-    const chatHistory = await chat.getHistory();
-    const lastMessage = chatHistory[chatHistory.length - 1];
-
-    if (!lastMessage || !('parts' in lastMessage)) {
-      throw new Error('Could not get last message from chat history');
-    }
-
-    const lastMessageText = lastMessage
-      .parts!.map((part) => ('text' in part ? part.text : ''))
-      .join(' ');
+    let fileContents = 'Tool Call Service Chat History\n\n';
 
     const systemPrompt = `You are a tool call generator. Your task is to generate a valid tool call for the tool named "${toolName}".
-You will be provided with the schema of the tool and the chat history.
-Generate a tool call that best helps with the user's request.
+You will be provided with the schema of the tool and a goal.
+Generate a tool call that best helps with achieving the goal.
+
+You must return a single JSON object with the following structure:
+{
+  "name": "${toolName}",
+  "parameters": { ... }
+}
 The tool schema is:
 ${formattedSchema}
 
 Respond with only the JSON for the tool call. Do not include any other text or markdown.
-
-The 
 `;
-
-    const reminder = `Remember! 
-You must look at the preceding chat history to understand the user's objective and current step in the process.
-Only respond with the JSON for the tool call. Do not include any other text or markdown.`;
-
-    // TODO: add a user message which actually has the formatted schema and a reiteration of the user's objective and asks what command must be called. that will replace text: ''. maybe it's fine to have the schema and tool name in the system prompt.
+    fileContents += `--- ROLE: system ---\n${systemPrompt}\n---\n\n`;
+    await this._writeChatHistoryToFile(fileContents);
 
     const tempChat = new OllamaChat(
       modelConfig as OllamaModelConfig,
       systemPrompt,
-      // [],
-      chatHistory,
+      [],
       {
         query: '',
         systemPrompt,
       },
     );
 
+    const userMessage = `The goal is: ${goal}`;
+    fileContents += `--- ROLE: user ---\n${userMessage}\n---\n\n`;
+    await this._writeChatHistoryToFile(fileContents);
+
     const responseStream = await tempChat.sendMessageStream(modelConfig.model, {
-      // message: [{ text: lastMessageText }],
-      message: [{ text: reminder }],
+      message: [{ text: userMessage }],
     });
 
     let textResponse = '';
+    fileContents += `--- ROLE: model ---\n`;
+    await this._writeChatHistoryToFile(fileContents);
     for await (const resp of responseStream) {
       if (resp.type === StreamEventType.CHUNK) {
         const chunk = resp.value;
@@ -153,6 +147,8 @@ Only respond with the JSON for the tool call. Do not include any other text or m
         }
       }
     }
+    fileContents += `${textResponse}\n---\n\n`;
+    await this._writeChatHistoryToFile(fileContents);
 
     const responseText = textResponse;
     const functionCalls = parseToolCalls(responseText, 'tool-call-service');
@@ -166,34 +162,21 @@ Only respond with the JSON for the tool call. Do not include any other text or m
 
     const parsedFunctionCall = functionCalls[0];
 
-    try {
-      await this._writeChatHistoryToFile(
-        systemPrompt,
-        lastMessageText,
-        textResponse,
-      );
-    } catch (error) {
-      debugLogger.error(
-        '[DEBUG] Failed to save summarized tool output to tool_call_chat_history.txt:',
-        error,
-      );
-    }
-
     return {
       name: parsedFunctionCall.name,
       args: parsedFunctionCall.args,
     };
   }
 
-  private async _writeChatHistoryToFile(
-    systemPrompt: string,
-    userMessage: string,
-    modelResponse: string,
-  ): Promise<void> {
-    let fileContent = 'Tool Call Service Chat History\n\n';
-    fileContent += `--- ROLE: system ---\n${systemPrompt}\n---\n\n`;
-    fileContent += `--- ROLE: user ---\n${userMessage}\n---\n\n`;
-    fileContent += `--- ROLE: model ---\n${modelResponse}\n---\n\n`;
-    await fs.writeFile(`tool_call_chat_history.txt`, fileContent);
+  private async _writeChatHistoryToFile(content: string): Promise<void> {
+    try {
+      await fs.writeFile(`tool_call_chat_history.txt`, content);
+    } catch (error) {
+      debugLogger.error(
+        '[DEBUG] Failed to write to tool_call_chat_history.txt:',
+
+        error,
+      );
+    }
   }
 }

packages/core/src/utils/toolCallParser.ts

@@ -34,16 +34,29 @@ export function parseToolCalls(text: string, promptId: string): FunctionCall[] {
         toolCall !== null &&
         'name' in toolCall
       ) {
-        const tc = toolCall as {
-          name: string;
-          parameters?: Record<string, unknown>;
-        };
-        if (typeof tc.name === 'string') {
-          return {
-            // id: `${promptId}-ollama-${index}`,
-            name: tc.name,
-            args: tc.parameters ?? {},
+        // Handle dynamic tool calls with 'goal'
+        if ('goal' in toolCall) {
+          debugLogger.log(`[Debug] Processing dynamic tool call with goal.`);
+          const tc = toolCall as { name: string; goal: string };
+          if (typeof tc.name === 'string' && typeof tc.goal === 'string') {
+            return {
+              name: tc.name,
+              args: { goal: tc.goal },
+            };
+          }
+        } else {
+          // Handle static tool calls with 'parameters'
+          const tc = toolCall as {
+            name: string;
+            parameters?: Record<string, unknown>;
           };
+          if (typeof tc.name === 'string') {
+            return {
+              // id: `${promptId}-ollama-${index}`,
+              name: tc.name,
+              args: tc.parameters ?? {},
+            };
+          }
         }
       }
       return null;
@@ -70,6 +83,7 @@ export function parseToolCalls(text: string, promptId: string): FunctionCall[] {
     // Not a valid JSON, proceed with regex parsing
     debugLogger.log(
       '[Debug] Failed to parse tool calls as JSON, falling back to regex.',
+      e,
     );
   }
 
@@ -123,8 +137,5 @@ export function parseToolCalls(text: string, promptId: string): FunctionCall[] {
       args,
     });
   }
-  // debugLogger.log(
-  //   `[Debug] Parsed Ollama tool calls: ${JSON.stringify(functionCalls)}`,
-  // );
   return functionCalls;
 }