kollabor 0.4.9__py3-none-any.whl → 0.4.15__py3-none-any.whl

core/llm/file_operations_executor.py

@@ -26,6 +26,9 @@ from typing import Any, Dict, List, Optional, Tuple
 
 logger = logging.getLogger(__name__)
 
+# Global kollabor config directory - allowed for read operations
+KOLLABOR_CONFIG_DIR = Path.home() / ".kollabor-cli"
+
 
 class FileOperationsExecutor:
     """Execute file operations with comprehensive safety features.
@@ -88,35 +91,55 @@ class FileOperationsExecutor:
             return self.config.get(key, default)
         return default
 
-    def validate_file_path(self, filepath: str) -> Tuple[bool, str]:
+    def validate_file_path(self, filepath: str, allow_kollabor_config: bool = False) -> Tuple[bool, str, str]:
         """Validate file path for security and correctness.
 
         Args:
             filepath: File path to validate
+            allow_kollabor_config: If True, allow absolute paths within ~/.kollabor-cli/
 
         Returns:
-            (is_valid, error_message)
+            (is_valid, error_message, normalized_path)
+            normalized_path will be the filepath with tilde expanded if applicable
         """
         if not filepath:
-            return False, "Empty file path"
+            return False, "Empty file path", filepath
 
         # Security: No path traversal
         if ".." in filepath:
-            return False, f"Path traversal detected: {filepath}"
+            return False, f"Path traversal detected: {filepath}", filepath
+
+        # Expand tilde if present
+        normalized_path = filepath
+        if filepath.startswith("~"):
+            normalized_path = str(Path(filepath).expanduser())
 
         # Security: No absolute paths (relative paths only)
-        if filepath.startswith("/") or (len(filepath) > 1 and filepath[1] == ":"):
-            return False, f"Absolute paths not allowed: {filepath}"
+        # Exception: Allow paths within ~/.kollabor-cli/ for read operations
+        if normalized_path.startswith("/") or (len(normalized_path) > 1 and normalized_path[1] == ":"):
+            if allow_kollabor_config:
+                # Check if path is within kollabor config directory
+                try:
+                    resolved = Path(normalized_path).resolve()
+                    if resolved.is_relative_to(KOLLABOR_CONFIG_DIR):
+                        # Path is within kollabor config - allow it
+                        pass
+                    else:
+                        return False, f"Absolute paths only allowed within {KOLLABOR_CONFIG_DIR}: {filepath}", normalized_path
+                except (ValueError, OSError):
+                    return False, f"Invalid absolute path: {filepath}", normalized_path
+            else:
+                return False, f"Absolute paths not allowed: {filepath}", normalized_path
 
         # Practical: Path length limit
-        if len(filepath) > 255:
-            return False, f"Path too long: {len(filepath)} chars (max 255)"
+        if len(normalized_path) > 255:
+            return False, f"Path too long: {len(normalized_path)} chars (max 255)", normalized_path
 
         # Security: No null bytes
-        if "\x00" in filepath:
-            return False, "Null byte in file path"
+        if "\x00" in normalized_path:
+            return False, "Null byte in file path", normalized_path
 
-        return True, ""
+        return True, "", normalized_path
 
     def is_protected_path(self, filepath: str) -> bool:
         """Check if file path is protected from deletion/modification.
@@ -374,7 +397,8 @@ class FileOperationsExecutor:
                 "error": "Missing required fields: file, find, replace"
             }
 
-        is_valid, error = self.validate_file_path(filepath)
+        # Allow editing files in ~/.kollabor-cli/ (skill files for global agents)
+        is_valid, error, filepath = self.validate_file_path(filepath, allow_kollabor_config=True)
         if not is_valid:
             return {"success": False, "error": error}
 
@@ -489,7 +513,8 @@ class FileOperationsExecutor:
         if not filepath:
             return {"success": False, "error": "Missing file path"}
 
-        is_valid, error = self.validate_file_path(filepath)
+        # Allow creating files in ~/.kollabor-cli/ (skill files for global agents)
+        is_valid, error, filepath = self.validate_file_path(filepath, allow_kollabor_config=True)
         if not is_valid:
             return {"success": False, "error": error}
 
@@ -562,7 +587,8 @@ class FileOperationsExecutor:
         if not filepath:
             return {"success": False, "error": "Missing file path"}
 
-        is_valid, error = self.validate_file_path(filepath)
+        # Allow overwriting files in ~/.kollabor-cli/ (skill files for global agents)
+        is_valid, error, filepath = self.validate_file_path(filepath, allow_kollabor_config=True)
         if not is_valid:
             return {"success": False, "error": error}
 
@@ -633,7 +659,7 @@ class FileOperationsExecutor:
         if not filepath:
             return {"success": False, "error": "Missing file path"}
 
-        is_valid, error = self.validate_file_path(filepath)
+        is_valid, error, filepath = self.validate_file_path(filepath)
         if not is_valid:
             return {"success": False, "error": error}
 
@@ -687,11 +713,11 @@ class FileOperationsExecutor:
         if not from_path or not to_path:
             return {"success": False, "error": "Missing from/to paths"}
 
-        is_valid, error = self.validate_file_path(from_path)
+        is_valid, error, from_path = self.validate_file_path(from_path)
         if not is_valid:
             return {"success": False, "error": f"Source: {error}"}
 
-        is_valid, error = self.validate_file_path(to_path)
+        is_valid, error, to_path = self.validate_file_path(to_path)
         if not is_valid:
             return {"success": False, "error": f"Destination: {error}"}
 
@@ -755,11 +781,11 @@ class FileOperationsExecutor:
         if not from_path or not to_path:
             return {"success": False, "error": "Missing from/to paths"}
 
-        is_valid, error = self.validate_file_path(from_path)
+        is_valid, error, from_path = self.validate_file_path(from_path)
         if not is_valid:
             return {"success": False, "error": f"Source: {error}"}
 
-        is_valid, error = self.validate_file_path(to_path)
+        is_valid, error, to_path = self.validate_file_path(to_path)
         if not is_valid:
             return {"success": False, "error": f"Destination: {error}"}
 
@@ -817,11 +843,11 @@ class FileOperationsExecutor:
         if not from_path or not to_path:
             return {"success": False, "error": "Missing from/to paths"}
 
-        is_valid, error = self.validate_file_path(from_path)
+        is_valid, error, from_path = self.validate_file_path(from_path)
         if not is_valid:
             return {"success": False, "error": f"Source: {error}"}
 
-        is_valid, error = self.validate_file_path(to_path)
+        is_valid, error, to_path = self.validate_file_path(to_path)
         if not is_valid:
             return {"success": False, "error": f"Destination: {error}"}
 
@@ -888,7 +914,8 @@ class FileOperationsExecutor:
         if not content:
             return {"success": False, "error": "Empty content"}
 
-        is_valid, error = self.validate_file_path(filepath)
+        # Allow appending to files in ~/.kollabor-cli/ (skill files for global agents)
+        is_valid, error, filepath = self.validate_file_path(filepath, allow_kollabor_config=True)
         if not is_valid:
             return {"success": False, "error": error}
 
@@ -949,7 +976,8 @@ class FileOperationsExecutor:
         if not filepath or not pattern:
             return {"success": False, "error": "Missing file or pattern"}
 
-        is_valid, error = self.validate_file_path(filepath)
+        # Allow inserting in files in ~/.kollabor-cli/ (skill files for global agents)
+        is_valid, error, filepath = self.validate_file_path(filepath, allow_kollabor_config=True)
         if not is_valid:
             return {"success": False, "error": error}
 
@@ -1041,7 +1069,8 @@ class FileOperationsExecutor:
         if not filepath or not pattern:
             return {"success": False, "error": "Missing file or pattern"}
 
-        is_valid, error = self.validate_file_path(filepath)
+        # Allow inserting in files in ~/.kollabor-cli/ (skill files for global agents)
+        is_valid, error, filepath = self.validate_file_path(filepath, allow_kollabor_config=True)
         if not is_valid:
             return {"success": False, "error": error}
 
@@ -1129,7 +1158,7 @@ class FileOperationsExecutor:
         if not dir_path:
             return {"success": False, "error": "Missing directory path"}
 
-        is_valid, error = self.validate_file_path(dir_path)
+        is_valid, error, dir_path = self.validate_file_path(dir_path)
         if not is_valid:
             return {"success": False, "error": error}
 
@@ -1176,7 +1205,7 @@ class FileOperationsExecutor:
         if not dir_path:
             return {"success": False, "error": "Missing directory path"}
 
-        is_valid, error = self.validate_file_path(dir_path)
+        is_valid, error, dir_path = self.validate_file_path(dir_path)
         if not is_valid:
             return {"success": False, "error": error}
 
@@ -1237,12 +1266,15 @@ class FileOperationsExecutor:
         """
         filepath = operation.get("file")
         lines_spec = operation.get("lines")  # Optional: "10-20"
+        offset = operation.get("offset")  # Optional: line offset (0-indexed)
+        limit = operation.get("limit")  # Optional: number of lines to read
 
         # Validation
         if not filepath:
             return {"success": False, "error": "Missing file path"}
 
-        is_valid, error = self.validate_file_path(filepath)
+        # Allow reading from ~/.kollabor-cli/ (agent/skill files)
+        is_valid, error, filepath = self.validate_file_path(filepath, allow_kollabor_config=True)
         if not is_valid:
             return {"success": False, "error": error}
 
@@ -1275,9 +1307,29 @@ class FileOperationsExecutor:
             }
 
         # Count total lines for display
-        total_lines = content.count('\n') + 1 if content else 0
+        all_lines = content.split('\n')
+        total_lines = len(all_lines)
+
+        # Handle offset/limit if specified (Claude Code style)
+        if offset is not None or limit is not None:
+            start_line = offset if offset is not None else 0
+            end_line = start_line + limit if limit is not None else total_lines
+            end_line = min(end_line, total_lines)
+
+            selected_lines = all_lines[start_line:end_line]
+            content = '\n'.join(selected_lines)
+            line_count = len(selected_lines)
+
+            # Calculate 1-indexed display range
+            display_start = start_line + 1
+            display_end = start_line + line_count
+
+            return {
+                "success": True,
+                "output": f"✓ Read {line_count} lines from {filepath} (lines {display_start}-{display_end}):\n\n{content}"
+            }
 
-        # Handle line range if specified
+        # Handle line range if specified (lines="10-20" style)
         if lines_spec:
             try:
                 if '-' in lines_spec:
@@ -1288,8 +1340,7 @@ class FileOperationsExecutor:
                     start_line = int(lines_spec.strip()) - 1
                     end_line = start_line + 1
 
-                lines = content.split('\n')
-                selected_lines = lines[start_line:end_line]
+                selected_lines = all_lines[start_line:end_line]
                 content = '\n'.join(selected_lines)
                 line_count = len(selected_lines)
 
@@ -1328,7 +1379,8 @@ class FileOperationsExecutor:
         if not pattern:
             return {"success": False, "error": "Missing search pattern"}
 
-        is_valid, error = self.validate_file_path(filepath)
+        # Allow grepping from ~/.kollabor-cli/ (agent/skill files)
+        is_valid, error, filepath = self.validate_file_path(filepath, allow_kollabor_config=True)
         if not is_valid:
             return {"success": False, "error": error}