protoagent 0.0.3 → 0.0.4

package/dist/config/system-prompt.js

@@ -175,38 +175,66 @@ When users ask you to work with files or run commands, you should:
 
 **MANDATORY: If a user mentions specific codebases or asks you to analyze source code, you MUST start using tools immediately to explore and understand the code before providing any analysis.**
 
-## TODO TRACKING - MANDATORY REQUIREMENT:
+## WORK TRACKING - MANDATORY REQUIREMENT:
 
-**YOU MUST ALWAYS USE TODO TRACKING FOR ANY NON-TRIVIAL TASK:**
+**YOU MUST ALWAYS CREATE AND MAINTAIN A PROTOAGENT_TODO.md FILE FOR ANY NON-TRIVIAL TASK:**
 
-Before starting any complex task (more than a single file operation), you MUST:
-1. Use the todo_write tool to create a detailed plan breaking down the work into steps
-2. Update the TODO file as you complete each step using todo_write
-3. Use todo_read to check your current progress and remaining tasks
-4. Keep the TODO file updated throughout the entire process
+For any complex task (more than a single file operation), you MUST:
+1. **Create or update PROTOAGENT_TODO.md** in the project root using write_file or edit_file
+2. **Document your work plan** before starting any implementation
+3. **Update progress continuously** as you complete each step
+4. **Keep the file current** throughout the entire process so users can check in anytime
 
-**TODO File Format Requirements:**
-- Use clear, actionable items with checkboxes: [ ] for incomplete, [x] for complete
+**PROTOAGENT_TODO.md Format Requirements:**
+- Use clear markdown with checkboxes: [ ] for incomplete, [x] for complete
 - Include relevant file paths and specific changes needed
 - Break down complex tasks into smaller, manageable steps
 - Add context and rationale for decisions
-- Update status as you progress through the work
+- Include current status and next steps
+- Add timestamps for major updates
 
-**Examples of tasks that REQUIRE TODO tracking:**
-- Implementing new features
-- Refactoring code across multiple files
-- Setting up project structures
+**Structure your PROTOAGENT_TODO.md like this:**
+
+# ProtoAgent Work Session
+
+## Current Task: [Brief Description]
+**Started:** [timestamp]
+**Last Updated:** [timestamp]
+
+## Work Plan:
+- [ ] Step 1: Description with file paths
+- [ ] Step 2: Specific changes needed
+- [ ] Step 3: Testing/validation steps
+
+## Progress:
+- [x] Completed step with details
+- [ ] Current step being worked on
+- [ ] Remaining steps
+
+## Files Modified:
+- path/to/file1.js - Description of changes
+- path/to/file2.ts - Description of changes
+
+## Notes:
+- Important decisions made
+- Issues encountered and solutions
+- Next session pickup points
+
+**Examples of tasks that REQUIRE PROTOAGENT_TODO.md tracking:**
+- Implementing new features across multiple files
+- Refactoring code or project structure
+- Setting up development environments
 - Debugging complex issues
 - Any task involving more than 2 file operations
+- Multi-step processes like build setup, testing, deployment
 
-**Example TODO format:**
-Use markdown format with checkboxes and clear structure like this:
-# Task: Implement user authentication system
-## Plan: [ ] Create user model, [ ] Set up middleware, [ ] Create endpoints
-## Progress: [x] User model created, [ ] Working on middleware
-## Notes: Using JWT tokens with 24h expiration
+**CRITICAL: The PROTOAGENT_TODO.md file serves as:**
+1. **Communication tool** - Users can read it anytime to understand progress
+2. **Session continuity** - Next sessions can pick up exactly where you left off
+3. **Accountability** - Clear tracking of what was planned vs completed
+4. **Context preservation** - Maintains reasoning and decision history
 
-**FAILURE TO USE TODO TRACKING WILL RESULT IN POOR TASK COMPLETION.**
+**FAILURE TO CREATE AND MAINTAIN PROTOAGENT_TODO.md WILL RESULT IN POOR TASK COMPLETION AND USER CONFUSION.**
 
 ## File Operation Guidelines - CRITICAL:
 
@@ -262,6 +290,9 @@ Shell Command Non-Interactive Mode:
 
 ${generateToolDescriptions()}
 
+**CRITICAL TOOL USAGE NOTE:**
+When using edit_file and it reports "Found X occurrences of the old string", you MUST include the expected_replacements parameter to specify how many replacements you want to make. Without this parameter, the edit will fail.
+
 Be helpful, accurate, and always explain what you're doing with the files and commands.
 
 ---
@@ -360,4 +391,7 @@ Shell Command Non-Interactive Mode:
 
 ${generateToolDescriptions()}
 
+**CRITICAL TOOL USAGE NOTE:**
+When using edit_file and it reports "Found X occurrences of the old string", you MUST include the expected_replacements parameter to specify how many replacements you want to make. Without this parameter, the edit will fail.
+
 Be helpful, accurate, and always explain what you're doing with the files and commands.`;

package/dist/tools/edit-file.js

@@ -2,6 +2,7 @@ import fs from 'fs/promises';
 import path from 'path';
 import { randomBytes } from 'crypto';
 import { requestFileOperationApproval } from '../utils/file-operations-approval.js';
+import { isUserCancellation } from '../utils/user-cancellation.js';
 import { logger } from '../utils/logger.js';
 // Current working directory for file operations
 const workingDirectory = process.cwd();
@@ -72,18 +73,28 @@ export async function editFile(filePath, oldString, newString, expectedReplaceme
         if (updatedContent === currentContent) {
             throw new Error(`No changes were made to the file. The old_string and new_string appear to be identical.`);
         }
+        // Calculate change context for better preview
+        const oldLines = currentContent.split('\n');
+        const newLines = updatedContent.split('\n');
+        const changeContext = {
+            linesAdded: newLines.length - oldLines.length,
+            linesRemoved: oldLines.length > newLines.length ? oldLines.length - newLines.length : 0,
+            totalLines: newLines.length,
+            affectedLineNumbers: findAffectedLineNumbers(oldString, currentContent)
+        };
         // Request user approval for edit operation
         const replacementCount = expectedReplacements || 1;
         const approvalContext = {
             operation: 'edit',
             filePath: filePath,
-            description: `Replace ${replacementCount} occurrence${replacementCount === 1 ? '' : 's'} of text in file`,
-            contentPreview: `OLD TEXT (${oldString.length} chars):\n${oldString.substring(0, 200)}${oldString.length > 200 ? '...' : ''}\n\nNEW TEXT (${newString.length} chars):\n${newString.substring(0, 200)}${newString.length > 200 ? '...' : ''}`
+            description: `Replace ${replacementCount} occurrence${replacementCount === 1 ? '' : 's'} of text (${oldString.length} → ${newString.length} chars)`,
+            contentPreview: createEditPreview(oldString, newString),
+            oldContent: currentContent,
+            newContent: updatedContent,
+            changeContext
         };
-        const approved = await requestFileOperationApproval(approvalContext);
-        if (!approved) {
-            return `Edit operation cancelled by user: ${filePath}`;
-        }
+        // Request user approval for edit operation (throws UserCancellationError if cancelled)
+        await requestFileOperationApproval(approvalContext);
         logger.debug(`✏️  Editing file: ${filePath} (${replacementCount} replacement${replacementCount === 1 ? '' : 's'})`, { component: 'EditFile', operation: 'editFile' });
         // Write the updated content using atomic operation
         const tempPath = `${validPath}.${randomBytes(16).toString('hex')}.tmp`;
@@ -102,6 +113,10 @@ export async function editFile(filePath, oldString, newString, expectedReplaceme
         return `Successfully edited ${filePath} - replaced ${replacementCount} occurrence${replacementCount === 1 ? '' : 's'} of the specified text`;
     }
     catch (error) {
+        // Re-throw UserCancellationError without modification
+        if (isUserCancellation(error)) {
+            throw error;
+        }
         if (error instanceof Error) {
             throw new Error(`Failed to edit file: ${error.message}`);
         }
@@ -112,6 +127,28 @@ export async function editFile(filePath, oldString, newString, expectedReplaceme
 function escapeRegExp(string) {
     return string.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
 }
+// Helper function to find affected line numbers
+function findAffectedLineNumbers(searchString, content) {
+    const lines = content.split('\n');
+    const affectedLines = [];
+    lines.forEach((line, index) => {
+        if (line.includes(searchString)) {
+            affectedLines.push(index + 1); // Line numbers are 1-based
+        }
+    });
+    return affectedLines;
+}
+// Helper function to create a concise edit preview
+function createEditPreview(oldText, newText) {
+    const maxLength = 150;
+    const oldPreview = oldText.length > maxLength
+        ? `${oldText.substring(0, maxLength)}...`
+        : oldText;
+    const newPreview = newText.length > maxLength
+        ? `${newText.substring(0, maxLength)}...`
+        : newText;
+    return `REMOVE: "${oldPreview}"\nADD: "${newPreview}"`;
+}
 // Tool definition
 export const editFileTool = {
     type: 'function',

package/dist/tools/index.js

@@ -7,7 +7,6 @@ export { createDirectory, createDirectoryTool } from './create-directory.js';
 export { viewDirectoryTree, viewDirectoryTreeTool } from './view-directory-tree.js';
 export { searchFiles, searchFilesTool } from './search-files.js';
 export { runShellCommand, setShellConfig, setDangerouslyAcceptAll, runShellCommandTool } from './run-shell-command.js';
-export { handleTodoTool, todoReadTool, todoWriteTool } from './todo.js';
 export { setFileOperationConfig, setDangerouslyAcceptAllFileOps, getSessionApprovalStatus, clearSessionApprovals, showApprovalStatus } from '../utils/file-operations-approval.js';
 // Import all tool definitions
 import { readFileTool } from './read-file.js';
@@ -18,7 +17,6 @@ import { createDirectoryTool } from './create-directory.js';
 import { viewDirectoryTreeTool } from './view-directory-tree.js';
 import { searchFilesTool } from './search-files.js';
 import { runShellCommandTool } from './run-shell-command.js';
-import { todoReadTool, todoWriteTool } from './todo.js';
 // Import all tool implementations
 import { readFile } from './read-file.js';
 import { writeFile } from './write-file.js';
@@ -28,8 +26,8 @@ import { createDirectory } from './create-directory.js';
 import { viewDirectoryTree } from './view-directory-tree.js';
 import { searchFiles } from './search-files.js';
 import { runShellCommand } from './run-shell-command.js';
-import { handleTodoTool } from './todo.js';
 import { logger } from '../utils/logger.js';
+import { isUserCancellation } from '../utils/user-cancellation.js';
 // Consolidated tool definitions
 export const tools = [
     readFileTool,
@@ -39,9 +37,7 @@ export const tools = [
     createDirectoryTool,
     viewDirectoryTreeTool,
     searchFilesTool,
-    runShellCommandTool,
-    todoReadTool,
-    todoWriteTool
+    runShellCommandTool
 ];
 // Tool handler function
 export async function handleToolCall(toolName, args) {
@@ -105,14 +101,10 @@ export async function handleToolCall(toolName, args) {
                     component: 'ToolHandler',
                     command: args.command,
                     argsCount: args.args?.length || 0,
-                    timeout: args.timeout_ms || 30000
+                    timeout: args.timeout_ms || 30000,
+                    directory: args.directory || 'current'
                 });
-                result = await runShellCommand(args.command, args.args || [], args.timeout_ms || 30000);
-                break;
-            case 'todo_read':
-            case 'todo_write':
-                logger.debug('📋 Executing todo tool', { component: 'ToolHandler', toolName });
-                result = await handleTodoTool(toolName, args);
+                result = await runShellCommand(args.command, args.args || [], args.timeout_ms || 30000, args.directory);
                 break;
             default:
                 logger.error('❌ Unknown tool requested', { component: 'ToolHandler', toolName });
@@ -129,6 +121,15 @@ export async function handleToolCall(toolName, args) {
         return result;
     }
     catch (error) {
+        // Re-throw UserCancellationError so it can be handled properly by the agentic loop
+        if (isUserCancellation(error)) {
+            logger.debug('🚪 Re-throwing UserCancellationError for proper handling', {
+                component: 'ToolHandler',
+                toolName,
+                cancellationReason: error.message
+            });
+            throw error; // Re-throw to let the agentic loop handle it
+        }
         const errorMessage = error instanceof Error ? error.message : 'Unknown error';
         logger.error('❌ Tool execution failed with exception', {
             component: 'ToolHandler',