drivecore
diff --git a/‎packages/agent/src/index.ts
Lines changed: 2 additions & 3 deletions b/‎packages/agent/src/index.ts
Lines changed: 2 additions & 3 deletions
diff --git a/‎packages/agent/src/tools/agent/agentMessage.ts
Lines changed: 2 additions & 1 deletion b/‎packages/agent/src/tools/agent/agentMessage.ts
Lines changed: 2 additions & 1 deletion
diff --git a/‎packages/agent/src/tools/io/fetch.ts renamed to ‎packages/agent/src/tools/fetch/fetch.ts b/‎packages/agent/src/tools/io/fetch.ts renamed to ‎packages/agent/src/tools/fetch/fetch.ts
diff --git a/‎packages/agent/src/tools/getTools.ts
Lines changed: 16 additions & 11 deletions b/‎packages/agent/src/tools/getTools.ts
Lines changed: 16 additions & 11 deletions
diff --git a/‎packages/agent/src/tools/system/sleep.test.ts renamed to ‎packages/agent/src/tools/sleep/sleep.test.ts b/‎packages/agent/src/tools/system/sleep.test.ts renamed to ‎packages/agent/src/tools/sleep/sleep.test.ts
diff --git a/‎packages/agent/src/tools/system/sleep.ts renamed to ‎packages/agent/src/tools/sleep/sleep.ts b/‎packages/agent/src/tools/system/sleep.ts renamed to ‎packages/agent/src/tools/sleep/sleep.ts
diff --git a/‎packages/agent/src/tools/system/respawn.test.ts
Lines changed: 0 additions & 22 deletions b/‎packages/agent/src/tools/system/respawn.test.ts
Lines changed: 0 additions & 22 deletions
diff --git a/‎packages/agent/src/tools/system/respawn.ts
Lines changed: 0 additions & 36 deletions b/‎packages/agent/src/tools/system/respawn.ts
Lines changed: 0 additions & 36 deletions
diff --git a/‎packages/agent/src/tools/io/textEditor.test.ts renamed to ‎packages/agent/src/tools/textEditor/textEditor.test.ts b/‎packages/agent/src/tools/io/textEditor.test.ts renamed to ‎packages/agent/src/tools/textEditor/textEditor.test.ts
diff --git a/‎packages/agent/src/tools/io/textEditor.ts renamed to ‎packages/agent/src/tools/textEditor/textEditor.ts b/‎packages/agent/src/tools/io/textEditor.ts renamed to ‎packages/agent/src/tools/textEditor/textEditor.ts
@@ -1,11 +1,10 @@
 // Tools - IO
 
-export * from './tools/io/fetch.js';
+export * from './tools/fetch/fetch.js';
 
 // Tools - System
 export * from './tools/shell/shellStart.js';
-export * from './tools/system/sleep.js';
-export * from './tools/system/respawn.js';
+export * from './tools/sleep/sleep.js';
 export * from './tools/agent/agentDone.js';
 export * from './tools/shell/shellMessage.js';
 export * from './tools/shell/shellExecute.js';
 
@@ -110,9 +110,10 @@ export const agentMessageTool: Tool<Parameters, ReturnType> = {
         );
       }
 
-      // Get the current output
+      // Get the current output, reset it to an empty string
       const output =
         agentState.result?.result || agentState.output || 'No output yet';
+      agentState.output = '';
 
       return {
         output,
 
@@ -3,19 +3,20 @@ import { Tool } from '../core/types.js';
 
 // Import tools
 import { agentDoneTool } from './agent/agentDone.js';
-import { agentExecuteTool } from './agent/agentExecute.js';
+import { agentMessageTool } from './agent/agentMessage.js';
+import { agentStartTool } from './agent/agentStart.js';
 import { listAgentsTool } from './agent/listAgents.js';
+import { fetchTool } from './fetch/fetch.js';
 import { userPromptTool } from './interaction/userPrompt.js';
-import { fetchTool } from './io/fetch.js';
-import { textEditorTool } from './io/textEditor.js';
 import { createMcpTool } from './mcp.js';
 import { listSessionsTool } from './session/listSessions.js';
 import { sessionMessageTool } from './session/sessionMessage.js';
 import { sessionStartTool } from './session/sessionStart.js';
 import { listShellsTool } from './shell/listShells.js';
 import { shellMessageTool } from './shell/shellMessage.js';
 import { shellStartTool } from './shell/shellStart.js';
-import { sleepTool } from './system/sleep.js';
+import { sleepTool } from './sleep/sleep.js';
+import { textEditorTool } from './textEditor/textEditor.js';
 
 // Import these separately to avoid circular dependencies
 
@@ -31,20 +32,24 @@ export function getTools(options?: GetToolsOptions): Tool[] {
   // Force cast to Tool type to avoid TypeScript issues
   const tools: Tool[] = [
     textEditorTool as unknown as Tool,
-    agentExecuteTool as unknown as Tool,
-    listSessionsTool as unknown as Tool,
-    /*agentStartTool as unknown as Tool,
-    agentMessageTool as unknown as Tool,*/
+
+    //agentExecuteTool as unknown as Tool,
+    agentStartTool as unknown as Tool,
+    agentMessageTool as unknown as Tool,
+    listAgentsTool as unknown as Tool,
     agentDoneTool as unknown as Tool,
+
     fetchTool as unknown as Tool,
+
     shellStartTool as unknown as Tool,
     shellMessageTool as unknown as Tool,
+    listShellsTool as unknown as Tool,
+
     sessionStartTool as unknown as Tool,
     sessionMessageTool as unknown as Tool,
-    //respawnTool as unknown as Tool,  this is a confusing tool for now.
+    listSessionsTool as unknown as Tool,
+
     sleepTool as unknown as Tool,
-    listShellsTool as unknown as Tool,
-    listAgentsTool as unknown as Tool,
   ];
 
   // Only include userPrompt tool if enabled