skydeckai-code 0.1.30__py3-none-any.whl → 0.1.32__py3-none-any.whl

aidd/tools/file_tools.py

@@ -822,11 +822,41 @@ async def apply_file_edits(file_path: str, edits: List[dict], dry_run: bool = Fa
         start, end, confidence = find_best_match(working_content, search_text, partial_match)
 
         if confidence >= 0.8:
-            # Always preserve indentation of first line
+            # Fix indentation while preserving relative structure
             if start >= 0:
-                indent = re.match(r'^\s*', modified_content[start:].splitlines()[0]).group(0)
-                replacement = '\n'.join(indent + line.lstrip()
-                                      for line in new_text.splitlines())
+                # Get the indentation of the first line of the matched text
+                base_indent = re.match(r'^\s*', modified_content[start:].splitlines()[0]).group(0)
+
+                # Split the new text into lines
+                new_lines = new_text.splitlines()
+
+                # If there are multiple lines, adjust indentation while preserving structure
+                if len(new_lines) > 1:
+                    # Find the minimum indentation level in the new text (ignoring empty lines)
+                    non_empty_lines = [line for line in new_lines if line.strip()]
+                    if non_empty_lines:
+                        min_indent_length = min(len(re.match(r'^\s*', line).group(0)) for line in non_empty_lines)
+                    else:
+                        min_indent_length = 0
+
+                    # Process each line to preserve relative indentation
+                    processed_lines = []
+                    for line in new_lines:
+                        if line.strip():  # If line is not empty
+                            # Get current indentation
+                            current_indent = re.match(r'^\s*', line).group(0)
+                            # Calculate relative indentation
+                            relative_indent = len(current_indent) - min_indent_length
+                            # Apply base indent plus relative indent
+                            processed_lines.append(base_indent + ' ' * relative_indent + line.lstrip())
+                        else:
+                            # For empty lines, just use base indentation
+                            processed_lines.append(base_indent)
+
+                    replacement = '\n'.join(processed_lines)
+                else:
+                    # Single line - just use base indentation
+                    replacement = base_indent + new_text.lstrip()
             else:
                 replacement = new_text
 

aidd/tools/lint_tools.py

@@ -18,12 +18,13 @@ def check_lint_tool():
                     "when you need detailed code analysis with custom rules, or for compiled languages where linting may not apply. "
                     "RETURNS: A detailed report of linting issues found in the codebase, including file paths, line numbers, "
                     "issue descriptions, and severity levels. Issues are grouped by file and sorted by severity. "
-                    "Note: Respects config files like .pylintrc, .flake8, and .eslintrc if present.\n\n"
+                    "Note: Respects config files like .pylintrc, .flake8, .eslintrc, and analysis_options.yaml if present.\n\n"
                     "EXAMPLES:\n"
                     "- Basic usage: {\"path\": \"src\"}\n"
                     "- Python with custom line length: {\"path\": \"src\", \"linters\": {\"flake8\": \"--max-line-length=120 --ignore=E501,E302\"}}\n"
                     "- Disable specific pylint checks: {\"linters\": {\"pylint\": \"--disable=missing-docstring,invalid-name\"}}\n"
                     "- TypeScript only: {\"path\": \"src\", \"languages\": [\"typescript\"], \"linters\": {\"eslint\": \"--no-eslintrc --config .eslintrc.custom.js\"}}\n"
+                    "- Dart only: {\"path\": \"lib\", \"languages\": [\"dart\"], \"linters\": {\"dart_analyze\": \"--fatal-infos\"}}\n"
                     "- Disable a linter: {\"linters\": {\"flake8\": false}, \"max_issues\": 50}\n"
                     "- Single file check: {\"path\": \"src/main.py\"}",
         "inputSchema": {
@@ -41,12 +42,12 @@ def check_lint_tool():
                         "type": "string"
                     },
                     "description": "List of languages to lint. If empty, will auto-detect based on file extensions. "
-                                  "Supported languages include: 'python', 'javascript', 'typescript'.",
+                                  "Supported languages include: 'python', 'javascript', 'typescript', 'dart'.",
                     "default": []
                 },
                 "linters": {
                     "type": "object",
-                    "description": "Configuration for specific linters. Each key is a linter name ('pylint', 'flake8', 'eslint') "
+                    "description": "Configuration for specific linters. Each key is a linter name ('pylint', 'flake8', 'eslint', 'dart_analyze') "
                                   "and the value is either a boolean to enable/disable or a string with CLI arguments.",
                     "properties": {
                         "pylint": {
@@ -60,16 +61,21 @@ def check_lint_tool():
                         "eslint": {
                             "type": ["boolean", "string"],
                             "description": "Whether to use eslint or custom eslint arguments."
+                        },
+                        "dart_analyze": {
+                            "type": ["boolean", "string"],
+                            "description": "Whether to use 'dart analyze' or custom dart analyze arguments."
                         }
                     },
                     "default": {}
                 },
                 "max_issues": {
                     "type": "integer",
-                    "description": "Maximum number of linting issues to return. Set to 0 for unlimited.",
+                    "description": "Maximum number of issues to return. Set to 0 for unlimited.",
                     "default": 100
                 }
-            }
+            },
+            "required": []
         }
     }
 
@@ -108,8 +114,15 @@ async def handle_check_lint(arguments: dict) -> List[TextContent]:
             language = _detect_language_from_file(full_path)
             if language:
                 languages = [language]
+            else:
+                # If we can't detect a supported language for the file
+                _, ext = os.path.splitext(full_path)
+                return [TextContent(
+                    type="text",
+                    text=f"Unsupported file type: {ext}\nThe check_lint tool only supports: .py, .js, .jsx, .ts, .tsx, .dart files.\nSupported languages are: python, javascript, typescript, dart."
+                )]
         else:
-            languages = ["python", "javascript", "typescript"]  # Default to common languages
+            languages = ["python", "javascript", "typescript", "dart"]  # Default to common languages
 
     # Prepare linter configurations with defaults
     linter_defaults = {
@@ -122,9 +135,41 @@ async def handle_check_lint(arguments: dict) -> List[TextContent]:
         },
         "typescript": {
             "eslint": True
+        },
+        "dart": {
+            "dart_analyze": True
         }
     }
 
+    # Validate languages if explicitly specified
+    if languages and os.path.isfile(full_path):
+        _, ext = os.path.splitext(full_path)
+        ext_language_map = {
+            '.py': 'python',
+            '.js': 'javascript',
+            '.jsx': 'javascript',
+            '.ts': 'typescript',
+            '.tsx': 'typescript',
+            '.dart': 'dart',
+            '.flutter': 'dart'
+        }
+        detected_language = ext_language_map.get(ext.lower())
+
+        # If we have a mismatch between specified language and file extension
+        if detected_language and not any(lang == detected_language for lang in languages):
+            return [TextContent(
+                type="text",
+                text=f"Language mismatch: File has {ext} extension but you specified {languages}.\n"
+                     f"For this file extension, please use: {detected_language}"
+            )]
+
+        # If file type is not supported at all
+        if not detected_language:
+            return [TextContent(
+                type="text",
+                text=f"Unsupported file type: {ext}\nThe check_lint tool only supports: .py, .js, .jsx, .ts, .tsx, .dart files.\nSupported languages are: python, javascript, typescript, dart."
+            )]
+
     # Process each language
     all_issues = []
 
@@ -378,18 +423,105 @@ async def _run_linter(linter_name: str, path: str, custom_args: str = None) -> L
             # Silently fail if eslint is not installed
             pass
 
+    elif linter_name == "dart_analyze":
+        try:
+            # Build the command
+            cmd = ["dart", "analyze", "--format=json"]
+
+            if custom_args:
+                cmd.extend(custom_args.split())
+
+            # Add target path
+            cmd.append(path)
+
+            # Run dart analyze
+            result = subprocess.run(cmd, capture_output=True, text=True)
+
+            if result.stdout.strip():
+                # Parse Dart Analyze JSON output
+                try:
+                    dart_results = json.loads(result.stdout)
+                    for file_result in dart_results.get("issues", []):
+                        # Get file path and ensure it's absolute
+                        file_path = file_result.get("path", "")
+                        if not os.path.isabs(file_path):
+                            file_path = os.path.abspath(os.path.join(os.path.dirname(path), file_path))
+
+                        # Security check for file path and exclude system directories
+                        if not file_path.startswith(state.allowed_directory) or _is_excluded_system_directory(file_path):
+                            continue
+
+                        issues.append({
+                            "file": os.path.relpath(file_path, state.allowed_directory),
+                            "line": file_result.get("location", {}).get("startLine", 0),
+                            "column": file_result.get("location", {}).get("startColumn", 0),
+                            "message": file_result.get("message", ""),
+                            "severity": _map_dart_severity(file_result.get("severity", "")),
+                            "source": "dart",
+                            "code": file_result.get("code", "")
+                        })
+                except json.JSONDecodeError:
+                    # Try parsing Flutter-specific error format (from compilation errors)
+                    try:
+                        # For flutter/dart compilation errors which might not be in JSON format
+                        dart_issues = []
+                        for line in result.stdout.splitlines() + result.stderr.splitlines():
+                            # Check if line contains a compilation error pattern
+                            error_match = re.search(r'(.*?):(\d+):(\d+):\s+(error|warning|info):\s+(.*)', line)
+                            if error_match:
+                                file_path, line_num, col, severity, message = error_match.groups()
+
+                                # Ensure path is absolute for security check
+                                if not os.path.isabs(file_path):
+                                    file_path = os.path.abspath(os.path.join(os.path.dirname(path), file_path))
+
+                                # Security check for file path
+                                if not file_path.startswith(state.allowed_directory) or _is_excluded_system_directory(file_path):
+                                    continue
+
+                                dart_issues.append({
+                                    "file": os.path.relpath(file_path, state.allowed_directory),
+                                    "line": int(line_num),
+                                    "column": int(col),
+                                    "message": message,
+                                    "severity": severity,
+                                    "source": "dart",
+                                    "code": "compilation-error"
+                                })
+
+                        # If we found compilation errors, add them
+                        issues.extend(dart_issues)
+                    except Exception:
+                        # Handle any parsing errors
+                        if result.stderr:
+                            issues.append({
+                                "file": path if os.path.isfile(path) else "",
+                                "line": 1,
+                                "column": 1,
+                                "message": f"Error running dart analyze: {result.stderr}",
+                                "severity": "error",
+                                "source": "dart",
+                                "code": "tool-error"
+                            })
+        except (subprocess.SubprocessError, FileNotFoundError):
+            # Silently fail if dart is not installed
+            pass
+
     return issues
 
 def _detect_language_from_file(file_path: str) -> Optional[str]:
-    """Detect programming language based on file extension."""
-    ext = os.path.splitext(file_path)[1].lower()
+    """Detect the programming language based on file extension."""
+    _, ext = os.path.splitext(file_path)
+    ext = ext.lower()
 
     language_map = {
         '.py': 'python',
         '.js': 'javascript',
-        '.ts': 'typescript',
         '.jsx': 'javascript',
+        '.ts': 'typescript',
         '.tsx': 'typescript',
+        '.dart': 'dart',
+        '.flutter': 'dart'
     }
 
     return language_map.get(ext)
@@ -414,6 +546,15 @@ def _map_eslint_severity(severity: int) -> str:
     else:
         return "info"
 
+def _map_dart_severity(severity_type: str) -> str:
+    """Map dart severity levels to standard severity levels."""
+    severity_map = {
+        "info": "info",
+        "warning": "warning",
+        "error": "error",
+    }
+    return severity_map.get(severity_type.lower(), "info")
+
 def _format_lint_results(issues: List[Dict[str, Any]]) -> str:
     """Format linting issues into a readable text output."""
     if not issues:

{skydeckai_code-0.1.30.dist-info → skydeckai_code-0.1.32.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: skydeckai-code
-Version: 0.1.30
+Version: 0.1.32
 Summary: This MCP server provides a comprehensive set of tools for AI-driven Development workflows including file operations, code analysis, code linting, multi-language execution, Git operations, web content fetching with HTML-to-markdown conversion, multi-engine web search, code content searching, and system information retrieval.
 Project-URL: Homepage, https://github.com/skydeckai/skydeckai-code
 Project-URL: Repository, https://github.com/skydeckai/skydeckai-code
@@ -312,6 +312,7 @@ A detailed report of linting issues found in the codebase, including file paths,
 
 -   Python: pylint, flake8 (automatically uses what's available)
 -   JavaScript/TypeScript: ESLint
+-   Dart/Flutter: dart_analyze (also reports compilation errors)
 
 **Example Usage:**
 
@@ -335,6 +336,15 @@ skydeckai-code-cli --tool check_lint --args '{
         "flake8": false
     }
 }'
+
+# Check Dart/Flutter files for linting and compilation errors
+skydeckai-code-cli --tool check_lint --args '{
+    "path": "lib",
+    "languages": ["dart"],
+    "linters": {
+        "dart_analyze": "--fatal-infos"
+    }
+}'
 ```
 
 #### search_code

{skydeckai_code-0.1.30.dist-info → skydeckai_code-0.1.32.dist-info}/RECORD

@@ -7,20 +7,20 @@ aidd/tools/code_analysis.py,sha256=fDpm2o_If5PsngXzHN2-ezSkPVT0ZxivLuzmHrOAmVU,3
 aidd/tools/code_execution.py,sha256=dIPxHBtclsetDZY4jGlSBrw_t-7VlIVrK8mflnZ6c4w,13176
 aidd/tools/code_tools.py,sha256=3CgkQ78iVKMd5j8aLmolLp4c59seD42Qw6VbdUcg2wA,12628
 aidd/tools/directory_tools.py,sha256=Hxzge_ziYw_FsjYb5yF0R0dHEdvuWRsg7WsdYDG0AUg,12971
-aidd/tools/file_tools.py,sha256=jH1-c9sEqTPaUy1edvKIDVMfLs0osC7Xa8Mp94cICfo,42490
+aidd/tools/file_tools.py,sha256=-OQHFCL_r1TI16-xBrwKfhzHKFgG965Jr0tAmZ9mKbI,44137
 aidd/tools/get_active_apps_tool.py,sha256=BjLF7iXSDgyAmm_gfFgAul2Gn3iX-CNVYHM7Sh4jTAI,19427
 aidd/tools/get_available_windows_tool.py,sha256=OVIYhItTn9u_DftOr3vPCT-R0DOFvMEEJXA6tD6gqWQ,15952
 aidd/tools/git_tools.py,sha256=AgolgrZnpN2NALV7SfIwc6D7U7tdPrPTSFmU2WjPfVE,39846
 aidd/tools/image_tools.py,sha256=wT3EcJAfZWcM0IsXdDfbTNjgFhKZM9nu2wHN6Mk_TTQ,5970
-aidd/tools/lint_tools.py,sha256=ZV9zFb2ugFkO4PFWZk0q7GGVpRapETFBClJgUOiDkn8,18894
+aidd/tools/lint_tools.py,sha256=0RYE-cXSbfw1VV_03GiFgYhC9ElhdWc4ecEjfMd9Els,25831
 aidd/tools/other_tools.py,sha256=iG3Sd2FP0M0pRv5esPBAUMvlwxTyAMDUdS77IqA_f5s,10822
 aidd/tools/path_tools.py,sha256=RGoOhqP69eHJzM8tEgn_5-GRaR0gp25fd0XZIJ_RnQE,4045
 aidd/tools/screenshot_tool.py,sha256=NMO5B4UG8qfMEOMRd2YoOjtwz_oQ2y1UAGU22jV1yGU,46337
 aidd/tools/state.py,sha256=RWSw0Jfsui8FqC0xsI7Ik07tAg35hRwLHa5xGBVbiI4,1493
 aidd/tools/system_tools.py,sha256=H4_qveKC2HA7SIbi-j4vxA0W4jYh2wfu9A6ni5wkZyA,7249
 aidd/tools/web_tools.py,sha256=gdsj2DEVYb_oYChItK5I1ugt2w25U7IAa5kEw9q6MVg,35534
-skydeckai_code-0.1.30.dist-info/METADATA,sha256=tR4BXAlWVy99YxudlZSogxl_SnfHKbzmcuCFgTNR780,32563
-skydeckai_code-0.1.30.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-skydeckai_code-0.1.30.dist-info/entry_points.txt,sha256=cT-IHh3_ioGLk3kwIeqj1X6Li1dnJinX9qKWUl7nOLg,80
-skydeckai_code-0.1.30.dist-info/licenses/LICENSE,sha256=uHse04vmI6ZjW7TblegFl30X-sDyyF0-QvH8ItPca3c,10865
-skydeckai_code-0.1.30.dist-info/RECORD,,
+skydeckai_code-0.1.32.dist-info/METADATA,sha256=A71M20kCKentREoEa3YfXrpJF6m9repm6y4g--ua1QE,32850
+skydeckai_code-0.1.32.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+skydeckai_code-0.1.32.dist-info/entry_points.txt,sha256=cT-IHh3_ioGLk3kwIeqj1X6Li1dnJinX9qKWUl7nOLg,80
+skydeckai_code-0.1.32.dist-info/licenses/LICENSE,sha256=uHse04vmI6ZjW7TblegFl30X-sDyyF0-QvH8ItPca3c,10865
+skydeckai_code-0.1.32.dist-info/RECORD,,