Fix re-export issues in toolAgent module

Author: bhouston

packages/agent/src/core/toolAgent.ts

@@ -14,7 +14,7 @@ export * from './tokenTracking.js';
 export * from './types.js';
 
 // Export default system prompt for convenience
-export const getDefaultSystemPrompt = (context: any) => {
+export const getDefaultSystemPrompt = (context: Record<string, unknown>) => {
   return `You are an AI agent that can use tools to accomplish tasks.
 
 Current Context:
@@ -24,20 +24,3 @@ ${context.directoryListing ?? 'No directory listing available'}
 System: ${context.systemInfo ?? 'No system info available'}
 DateTime: ${new Date().toString()}`;
 };
-export const getDefaultSystemPrompt = (context: any) => {
-  return `You are an AI agent that can use tools to accomplish tasks.
-
-Current Context:
-Directory: ${context.workingDirectory}
-Files:
-${context.directoryListing ?? 'No directory listing available'}
-System: ${context.systemInfo ?? 'No system info available'}
-DateTime: ${new Date().toString()}`;
-};
-
-// Re-export everything from the module
-export * from './config.js';
-export * from './messageUtils.js';
-export * from './toolExecutor.js';
-export * from './tokenTracking.js';
-export * from './types.js';

packages/agent/src/core/toolAgent/index.ts

@@ -5,6 +5,15 @@ import { TokenTracker } from '../tokens.js';
 
 import { Tool, ToolCallResult, ToolContext, ToolUseContent } from './types.js';
 
+const safeParse = (value: string) => {
+  try {
+    return JSON.parse(value);
+  } catch (error) {
+    console.error('Error parsing JSON:', error, 'original value:', value);
+    return { error: value };
+  }
+};
+
 /**
  * Executes a list of tool calls and returns the results
  */
@@ -67,7 +76,7 @@ export async function executeTools(
         type: 'tool-result',
         toolCallId: call.id,
         toolName: call.name,
-        result: JSON.parse(toolResult),
+        result: safeParse(toolResult),
       } satisfies ToolResultPart;
     }),
   );

packages/agent/src/core/toolAgent/toolExecutor.ts

@@ -1,7 +1,10 @@
-// Re-export all types from the original types.ts file
-export * from '../types.js';
+// Import types from the core types file
+import { Tool, ToolContext } from '../types.js';
 
-// Only define new types specific to toolAgent here
+// Export the imported types explicitly
+export { Tool, ToolContext };
+
+// Define types specific to toolAgent here
 export interface ToolAgentResult {
   result: string;
   interactions: number;
@@ -10,7 +13,7 @@ export interface ToolAgentResult {
 export interface ToolCallResult {
   sequenceCompleted: boolean;
   completionResult?: string;
-  toolResults: any[];
+  toolResults: unknown[];
   respawn?: { context: string };
 }
 

packages/agent/src/core/toolAgent/types.ts

@@ -26,7 +26,6 @@ export * from './tools/interaction/userPrompt.js';
 export * from './core/executeToolCall.js';
 export * from './core/types.js';
 export * from './core/toolAgent/index.js';
-export * from './core/toolAgent/config.js';
 
 // Utils
 export * from './tools/getTools.js';

packages/agent/src/index.ts

@@ -1,9 +1,9 @@
 import { z } from 'zod';
 import { zodToJsonSchema } from 'zod-to-json-schema';
 
-import { getModel } from '../../core/toolAgent/config.js';
 import {
   getDefaultSystemPrompt,
+  getModel,
   toolAgent,
 } from '../../core/toolAgent/index.js';
 import { Tool, ToolContext } from '../../core/types.js';