sam-coder-cli 2.0.5 → 2.0.8

package/bin/agi-cli.js

@@ -80,7 +80,7 @@ const tools = [
                   properties: {
                     type: {
                       type: 'string',
-                      enum: ['replace', 'insert', 'delete'],
+                      enum: ['replace', 'insert', 'delete', 'replace_block'],
                       description: 'Type of edit operation'
                     },
                     startLine: {
@@ -95,6 +95,14 @@ const tools = [
                       type: 'string',
                       description: 'New text to insert or replace with'
                     },
+                    oldText: {
+                      type: 'string',
+                      description: 'Exact text to search for and replace (for replace_block)'
+                    },
+                    replacementContent: {
+                      type: 'string',
+                      description: 'New text to replace oldText with (for replace_block)'
+                    },
                     pattern: {
                       type: 'string',
                       description: 'Pattern to search for (for replace operations)'
@@ -137,21 +145,29 @@ const tools = [
                       },
                       required: ['pattern', 'replacement']
                     },
+                    {
+                      properties: {
+                        type: { const: 'replace_block' },
+                        oldText: { type: 'string' },
+                        replacementContent: { type: 'string' }
+                      },
+                      required: ['oldText', 'replacementContent']
+                    },
                     {
                       properties: {
                         type: { const: 'insert' },
                         position: { type: 'string', enum: ['start', 'end'] },
-                        text: { type: 'string' }
+                        newText: { type: 'string' }
                       },
-                      required: ['position', 'text']
+                      required: ['position', 'newText']
                     },
                     {
                       properties: {
                         type: { const: 'insert' },
                         line: { type: 'number' },
-                        text: { type: 'string' }
+                        newText: { type: 'string' }
                       },
-                      required: ['line', 'text']
+                      required: ['line', 'newText']
                     },
                     {
                       properties: {
@@ -463,56 +479,96 @@ const agentUtils = {
       const edits = typeof inputPathOrObj === 'string' ? maybeEdits : inputPathOrObj?.edits;
       if (!targetPath) throw new Error('editFile: missing path');
       if (!edits) throw new Error('editFile: missing edits');
+
       // Read the current file content
       let content = await fs.readFile(targetPath, 'utf-8');
-      const lines = content.split('\n');
+      let lines = content.split('\n');
 
       // Process each edit operation
-      for (const op of edits.operations) {
-        switch (op.type) {
-          case 'replace':
-            if (op.startLine !== undefined && op.endLine !== undefined) {
-              // Line-based replacement
-              if (op.startLine < 1 || op.endLine > lines.length) {
-                throw new Error(`Line numbers out of range (1-${lines.length})`);
+      for (let i = 0; i < edits.operations.length; i++) {
+        const op = edits.operations[i];
+        try {
+          switch (op.type) {
+            case 'replace':
+              if (op.startLine !== undefined && op.endLine !== undefined) {
+                // Line-based replacement
+                if (op.startLine < 1 || op.endLine > lines.length) {
+                  throw new Error(`Line numbers out of range (1-${lines.length})`);
+                }
+                const newText = op.newText ?? op.text;
+                if (typeof newText !== 'string') {
+                  throw new Error(`'newText' must be a string for replace operation`);
+                }
+                const before = lines.slice(0, op.startLine - 1);
+                const after = lines.slice(op.endLine);
+                const newLines = newText.split('\n');
+                lines = [...before, ...newLines, ...after];
+              } else if (op.pattern) {
+                // Pattern-based replacement
+                if (typeof op.replacement !== 'string') {
+                  throw new Error(`'replacement' must be a string for pattern-based replace`);
+                }
+                const regex = new RegExp(op.pattern, op.flags || '');
+                content = lines.join('\n');
+                content = content.replace(regex, op.replacement);
+                lines = content.split('\n');
+              } else {
+                throw new Error('Replace operation requires either startLine/endLine/newText or pattern/replacement');
               }
-              const before = lines.slice(0, op.startLine - 1);
-              const after = lines.slice(op.endLine);
-              const newLines = op.newText.split('\n');
-              lines.splice(0, lines.length, ...before, ...newLines, ...after);
-            } else if (op.pattern) {
-              // Pattern-based replacement
-              const regex = new RegExp(op.pattern, op.flags || '');
-              content = content.replace(regex, op.replacement);
-              // Update lines array for subsequent operations
-              lines.length = 0;
-              lines.push(...content.split('\n'));
-            }
-            break;
-
-          case 'insert':
-            if (op.position === 'start') {
-              lines.unshift(...op.text.split('\n'));
-            } else if (op.position === 'end') {
-              lines.push(...op.text.split('\n'));
-            } else if (op.line !== undefined) {
-              if (op.line < 1 || op.line > lines.length + 1) {
-                throw new Error(`Line number out of range (1-${lines.length + 1})`);
+              break;
+
+            case 'replace_block':
+              if (typeof op.oldText !== 'string' || typeof (op.replacementContent ?? op.newText) !== 'string') {
+                throw new Error('replace_block requires both oldText and replacementContent as strings');
               }
-              const insertLines = op.text.split('\n');
-              lines.splice(op.line - 1, 0, ...insertLines);
-            }
-            break;
+              content = lines.join('\n');
+              if (!content.includes(op.oldText)) {
+                throw new Error('Could not find exact match for oldText in file');
+              }
+              // Check for uniqueness
+              const occurrences = content.split(op.oldText).length - 1;
+              if (occurrences > 1) {
+                throw new Error(`Found ${occurrences} occurrences of oldText. Please be more specific to ensure a unique match.`);
+              }
+              content = content.replace(op.oldText, op.replacementContent ?? op.newText);
+              lines = content.split('\n');
+              break;
+
+            case 'insert':
+              const insertText = op.newText ?? op.text;
+              if (typeof insertText !== 'string') {
+                throw new Error(`'newText' must be a string for insert operation`);
+              }
+              if (op.position === 'start') {
+                lines.unshift(...insertText.split('\n'));
+              } else if (op.position === 'end') {
+                lines.push(...insertText.split('\n'));
+              } else if (op.line !== undefined) {
+                if (op.line < 1 || op.line > lines.length + 1) {
+                  throw new Error(`Line number out of range (1-${lines.length + 1})`);
+                }
+                const insertLines = insertText.split('\n');
+                lines.splice(op.line - 1, 0, ...insertLines);
+              } else {
+                throw new Error('Insert operation requires either position (start/end) or line number');
+              }
+              break;
 
-          case 'delete':
-            if (op.startLine < 1 || op.endLine > lines.length) {
-              throw new Error(`Line numbers out of range (1-${lines.length})`);
-            }
-            lines.splice(op.startLine - 1, op.endLine - op.startLine + 1);
-            break;
+            case 'delete':
+              if (op.startLine === undefined || op.endLine === undefined) {
+                throw new Error('Delete operation requires both startLine and endLine');
+              }
+              if (op.startLine < 1 || op.endLine > lines.length) {
+                throw new Error(`Line numbers out of range (1-${lines.length})`);
+              }
+              lines.splice(op.startLine - 1, op.endLine - op.startLine + 1);
+              break;
 
-          default:
-            throw new Error(`Unknown operation type: ${op.type}`);
+            default:
+              throw new Error(`Unknown operation type: ${op.type}`);
+          }
+        } catch (opError) {
+          throw new Error(`Operation #${i + 1} (${op.type}) failed: ${opError.message}`);
         }
       }
 
@@ -521,7 +577,8 @@ const agentUtils = {
       return `Successfully edited ${targetPath}`;
 
     } catch (error) {
-      throw new Error(`Failed to edit file ${typeof inputPathOrObj === 'string' ? inputPathOrObj : inputPathOrObj?.path}: ${error.message}`);
+      const pathInfo = typeof inputPathOrObj === 'string' ? inputPathOrObj : inputPathOrObj?.path;
+      throw new Error(`Failed to edit file ${pathInfo}: ${error.message}`);
     }
   },
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sam-coder-cli",
-  "version": "2.0.5",
+  "version": "2.0.8",
   "description": "SAM-CODER: An animated command-line AI assistant with agency capabilities.",
   "main": "bin/agi-cli.js",
   "bin": {