skydeckai-code 0.1.34__py3-none-any.whl → 0.1.36__py3-none-any.whl

{skydeckai_code-0.1.34.dist-info → skydeckai_code-0.1.36.dist-info}/METADATA

@@ -1,7 +1,7 @@
 Metadata-Version: 2.4
 Name: skydeckai-code
-Version: 0.1.34
-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.
+Version: 0.1.36
+Summary: This MCP server provides a comprehensive set of tools for AI-driven Development workflows including file operations, code analysis, multi-language execution, 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
 Project-URL: Documentation, https://github.com/skydeckai/skydeckai-code/blob/main/README.md
@@ -11,7 +11,6 @@ License-File: LICENSE
 Keywords: ai,aidd,code,code-analysis,development,mcp
 Requires-Python: >=3.11
 Requires-Dist: beautifulsoup4>=4.13.3
-Requires-Dist: gitpython>=3.1.44
 Requires-Dist: html2text>=2025.4.15
 Requires-Dist: mcp>=1.6.0
 Requires-Dist: mss>=10.0.0
@@ -36,7 +35,7 @@ Description-Content-Type: text/markdown
 
 # SkyDeckAI Code
 
-An MCP server that provides a comprehensive set of tools for AI-driven development workflows. Features include file system operations, code analysis using tree-sitter for multiple programming languages, Git operations, code execution, web content fetching with HTML-to-markdown conversion, multi-engine web search, code content searching, linting detection, and system information retrieval. Designed to enhance AI's capability to assist in software development tasks by providing direct access to both local and remote resources.
+An MCP server that provides a comprehensive set of tools for AI-driven development workflows. Features include file system operations, code analysis using tree-sitter for multiple programming languages, code execution, web content fetching with HTML-to-markdown conversion, multi-engine web search, code content searching, and system information retrieval. Designed to enhance AI's capability to assist in software development tasks by providing direct access to both local and remote resources.
 
 # Formerly Known As MCP-Server-AIDD
 
@@ -80,7 +79,6 @@ If you're using SkyDeck AI Helper app, you can search for "SkyDeckAI Code" and i
 -   Code linting and issue detection for Python and JavaScript/TypeScript
 -   Code content searching with regex pattern matching
 -   Multi-language code execution with safety measures
--   Git operations (status, diff, commit, branch management, cloning)
 -   Web content fetching from APIs and websites with HTML-to-markdown conversion
 -   Multi-engine web search with reliable fallback mechanisms
 -   Batch operations for parallel and serial tool execution
@@ -92,27 +90,32 @@ If you're using SkyDeck AI Helper app, you can search for "SkyDeckAI Code" and i
 
 ### Basic File Operations
 
-| Tool                | Parameters                                               | Returns                                       |
-| ------------------- | -------------------------------------------------------- | --------------------------------------------- |
-| read_file           | path: string, offset?: integer, limit?: integer          | File content (whole or partial)               |
-| read_multiple_files | paths: string[]                                          | Multiple file contents with headers           |
-| write_file          | path: string, content: string                            | Success confirmation                          |
-| move_file           | source: string, destination: string                      | Success confirmation                          |
-| copy_file           | source: string, destination: string, recursive?: boolean | Success confirmation                          |
-| delete_file         | path: string                                             | Success confirmation                          |
-| get_file_info       | path: string                                             | File metadata (size, timestamps, permissions) |
+| Tool          | Parameters                                                 | Returns                                       |
+| ------------- | ---------------------------------------------------------- | --------------------------------------------- |
+| read_file     | files: [{path: string, offset?: integer, limit?: integer}] | File content (single or multiple files)       |
+| write_file    | path: string, content: string                              | Success confirmation                          |
+| move_file     | source: string, destination: string                        | Success confirmation                          |
+| copy_file     | source: string, destination: string, recursive?: boolean   | Success confirmation                          |
+| delete_file   | path: string                                               | Success confirmation                          |
+| get_file_info | path: string                                               | File metadata (size, timestamps, permissions) |
 
 Common usage:
 
 ```bash
 # Read entire file
-skydeckai-code-cli --tool read_file --args '{"path": "src/main.py"}'
+skydeckai-code-cli --tool read_file --args '{"files": [{"path": "src/main.py"}]}'
 
 # Read 10 lines starting from line 20
-skydeckai-code-cli --tool read_file --args '{"path": "src/main.py", "offset": 20, "limit": 10}'
+skydeckai-code-cli --tool read_file --args '{"files": [{"path": "src/main.py", "offset": 20, "limit": 10}]}'
 
 # Read from line 50 to the end of the file
-skydeckai-code-cli --tool read_file --args '{"path": "src/main.py", "offset": 50}'
+skydeckai-code-cli --tool read_file --args '{"files": [{"path": "src/main.py", "offset": 50}]}'
+
+# Read multiple files with different line ranges
+skydeckai-code-cli --tool read_file --args '{"files": [
+  {"path": "src/main.py", "offset": 1, "limit": 10},
+  {"path": "README.md"}
+]}'
 
 # Write file
 skydeckai-code-cli --tool write_file --args '{"path": "output.txt", "content": "Hello World"}'
@@ -183,69 +186,6 @@ skydeckai-code-cli --tool list_directory --args '{"path": "."}'
 skydeckai-code-cli --tool search_files --args '{"pattern": ".py", "path": "src"}'
 ```
 
-### Git Operations
-
-| Tool              | Parameters                                        | Returns                          |
-| ----------------- | ------------------------------------------------- | -------------------------------- |
-| git_init          | path: string, initial_branch?: string             | Repository initialization status |
-| git_status        | repo_path: string                                 | Working directory status         |
-| git_add           | repo_path: string, files: string[]                | Staging confirmation             |
-| git_reset         | repo_path: string                                 | Unstaging confirmation           |
-| git_checkout      | repo_path: string, branch_name: string            | Branch switch confirmation       |
-| git_create_branch | repo_path: string, branch_name: string            | Branch creation confirmation     |
-| git_clone         | url: string, target_path: string, branch?: string | Clone confirmation               |
-| git_diff_unstaged | repo_path: string                                 | Unstaged changes diff            |
-| git_diff_staged   | repo_path: string                                 | Staged changes diff              |
-| git_show          | repo_path: string, commit_hash: string            | Details of a specific commit     |
-
-#### Complex Git Operations
-
-##### git_commit
-
-```json
-{
-    "repo_path": ".",
-    "message": "feat: add new feature"
-}
-```
-
-Returns: Commit hash and confirmation.
-
-##### git_diff
-
-```json
-{
-    "repo_path": ".",
-    "target": "main"
-}
-```
-
-Returns: Detailed diff output showing all changes between the current branch and the specified target branch or commit.
-
-##### git_log
-
-```json
-{
-    "repo_path": ".",
-    "max_count": 10
-}
-```
-
-Returns: Array of commit entries with hash, author, date, and message.
-
-Common usage:
-
-```bash
-# Check status
-skydeckai-code-cli --tool git_status --args '{"repo_path": "."}'
-
-# Clone a repository
-skydeckai-code-cli --tool git_clone --args '{"url": "https://github.com/username/repo.git", "target_path": "repo"}'
-
-# Create and switch to new branch
-skydeckai-code-cli --tool git_create_branch --args '{"repo_path": ".", "branch_name": "feature/new-branch"}'
-```
-
 ### Code Analysis
 
 #### codebase_mapper
@@ -269,8 +209,8 @@ Returns:
 Supported Languages:
 
 -   Python (.py)
--   JavaScript (.js, .jsx, .mjs, .cjs)
--   TypeScript (.ts, .tsx)
+-   JavaScript (.js/.jsx, .mjs, .cjs)
+-   TypeScript (.ts/.tsx)
 -   Java (.java)
 -   C++ (.cpp, .hpp, .cc)
 -   Ruby (.rb, .rake)
@@ -280,71 +220,17 @@ Supported Languages:
 -   C# (.cs)
 -   Kotlin (.kt, .kts)
 
-#### check_lint
-
-Check for linting issues in your codebase using native linting tools:
-
-```json
-{
-    "path": "src",
-    "languages": ["python", "javascript"],
-    "linters": {
-        "pylint": "--disable=C0111",
-        "flake8": true,
-        "eslint": "--fix"
-    },
-    "max_issues": 100
-}
-```
-
-**Parameters:**
-| Parameter | Type | Required | Description |
-|-----------|------|----------|-------------|
-| path | string | No | Directory or file to lint (default: ".") |
-| languages | array | No | List of languages to lint (auto-detects if empty) |
-| linters | object | No | Configuration for specific linters - can use booleans or CLI arguments |
-| max_issues | integer | No | Maximum number of issues to return (default: 100, 0 for unlimited) |
-
-**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.
-
-**Supported Languages and Linters:**
-
--   Python: pylint, flake8 (automatically uses what's available)
--   JavaScript/TypeScript: ESLint
--   Dart/Flutter: dart_analyze (also reports compilation errors)
-
 **Example Usage:**
 
 ```bash
-# Check entire codebase with default settings
-skydeckai-code-cli --tool check_lint
-
-# Check specific directory with custom pylint flags
-skydeckai-code-cli --tool check_lint --args '{
-    "path": "src",
-    "linters": {
-        "pylint": "--disable=missing-docstring,invalid-name"
-    }
-}'
+# Map the entire codebase structure
+skydeckai-code-cli --tool codebase_mapper --args '{"path": "."}'
 
-# Check only Python files and disable flake8
-skydeckai-code-cli --tool check_lint --args '{
-    "path": "src",
-    "languages": ["python"],
-    "linters": {
-        "flake8": false
-    }
-}'
+# Map only the source directory
+skydeckai-code-cli --tool codebase_mapper --args '{"path": "src"}'
 
-# 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"
-    }
-}'
+# Map a specific component or module
+skydeckai-code-cli --tool codebase_mapper --args '{"path": "src/components"}'
 ```
 
 #### search_code
@@ -353,7 +239,7 @@ Fast content search tool using regular expressions:
 
 ```json
 {
-    "pattern": "function\\s+\\w+",
+    "patterns": ["function\\s+\\w+", "class\\s+\\w+"],
     "include": "*.js",
     "exclude": "node_modules/**",
     "max_results": 50,
@@ -365,10 +251,10 @@ Fast content search tool using regular expressions:
 **Parameters:**
 | Parameter | Type | Required | Description |
 |-----------|------|----------|-------------|
-| pattern | string | Yes | Regular expression pattern to search in file contents |
+| patterns | array of strings | Yes | List of regular expression patterns to search for in file contents |
 | include | string | No | File pattern to include (glob syntax, default: "\*") |
 | exclude | string | No | File pattern to exclude (glob syntax, default: "") |
-| max_results | integer | No | Maximum results to return (default: 100) |
+| max_results | integer | No | Maximum results to return per pattern (default: 100) |
 | case_sensitive | boolean | No | Whether search is case-sensitive (default: false) |
 | path | string | No | Base directory to search from (default: ".") |
 
@@ -380,21 +266,21 @@ This tool uses ripgrep when available for optimal performance, with a Python fal
 **Example Usage:**
 
 ```bash
-# Find function declarations in JavaScript files
+# Find function and class declarations in JavaScript files
 skydeckai-code-cli --tool search_code --args '{
-    "pattern": "function\\s+\\w+",
+    "patterns": ["function\\s+\\w+", "class\\s+\\w+"],
     "include": "*.js"
 }'
 
-# Find all console.log statements with errors
+# Find all console.log statements with errors or warnings
 skydeckai-code-cli --tool search_code --args '{
-    "pattern": "console\\.log.*[eE]rror",
+    "patterns": ["console\\.log.*[eE]rror", "console\\.log.*[wW]arning"],
     "path": "src"
 }'
 
-# Find import statements in TypeScript files
+# Find import and export statements in TypeScript files
 skydeckai-code-cli --tool search_code --args '{
-    "pattern": "import.*from",
+    "patterns": ["import.*from", "export.*"],
     "include": "*.{ts,tsx}",
     "exclude": "node_modules/**"
 }'
@@ -692,10 +578,9 @@ Execute multiple tool invocations in a single request with parallel execution wh
             }
         },
         {
-            "tool": "git_init",
+            "tool": "execute_shell_script",
             "arguments": {
-                "path": ".",
-                "initial_branch": "main"
+                "script": "git init"
             }
         }
     ]

{skydeckai_code-0.1.34.dist-info → skydeckai_code-0.1.36.dist-info}/RECORD

@@ -2,26 +2,24 @@ src/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 src/aidd/__init__.py,sha256=c9HBWxWruCxoAqLCJqltylAwz_7xmaK3g8DKViJZs0Q,222
 src/aidd/cli.py,sha256=cLtaQJmMBfr7fHkd0dyJqpDrVTIwybL48PotniWGrFM,5031
 src/aidd/server.py,sha256=kPRyWeWkMCZjabelC65XTmzZG7yw8htMJKSfnUcKnb0,1575
-src/aidd/tools/__init__.py,sha256=abFameL2CdSZohi7Sa1tUEOzD2M6bcXSOkRpgxfZ1mo,5429
+src/aidd/tools/__init__.py,sha256=j1uL7WVH3xS8JTGnpSIhaz7qkc3gcxuDyvZIYP9UztI,3731
 src/aidd/tools/base.py,sha256=wHSAaGGYWM8ECmoYd7KEcmjsZRWesNQFf3zMjCKGMcc,380
 src/aidd/tools/code_analysis.py,sha256=fDpm2o_If5PsngXzHN2-ezSkPVT0ZxivLuzmHrOAmVU,33188
-src/aidd/tools/code_execution.py,sha256=dIPxHBtclsetDZY4jGlSBrw_t-7VlIVrK8mflnZ6c4w,13176
-src/aidd/tools/code_tools.py,sha256=3CgkQ78iVKMd5j8aLmolLp4c59seD42Qw6VbdUcg2wA,12628
+src/aidd/tools/code_execution.py,sha256=HRLUR1-q1PiCXKZV5QmTknDJKsfvPvFSWZbTpYFcv7I,13703
+src/aidd/tools/code_tools.py,sha256=DQ6N34Wbz5DwUPzt6RG7jk9HF2SsWFCFn99mencHK1c,14263
 src/aidd/tools/directory_tools.py,sha256=Hxzge_ziYw_FsjYb5yF0R0dHEdvuWRsg7WsdYDG0AUg,12971
-src/aidd/tools/file_tools.py,sha256=-OQHFCL_r1TI16-xBrwKfhzHKFgG965Jr0tAmZ9mKbI,44137
+src/aidd/tools/file_tools.py,sha256=GYzP6WxGbV1V42FlWNSuGIyiCtRp09kwF6lOZrFtq_U,43112
 src/aidd/tools/get_active_apps_tool.py,sha256=BjLF7iXSDgyAmm_gfFgAul2Gn3iX-CNVYHM7Sh4jTAI,19427
 src/aidd/tools/get_available_windows_tool.py,sha256=OVIYhItTn9u_DftOr3vPCT-R0DOFvMEEJXA6tD6gqWQ,15952
-src/aidd/tools/git_tools.py,sha256=AgolgrZnpN2NALV7SfIwc6D7U7tdPrPTSFmU2WjPfVE,39846
 src/aidd/tools/image_tools.py,sha256=wT3EcJAfZWcM0IsXdDfbTNjgFhKZM9nu2wHN6Mk_TTQ,5970
-src/aidd/tools/lint_tools.py,sha256=0RYE-cXSbfw1VV_03GiFgYhC9ElhdWc4ecEjfMd9Els,25831
 src/aidd/tools/other_tools.py,sha256=iG3Sd2FP0M0pRv5esPBAUMvlwxTyAMDUdS77IqA_f5s,10822
 src/aidd/tools/path_tools.py,sha256=RGoOhqP69eHJzM8tEgn_5-GRaR0gp25fd0XZIJ_RnQE,4045
 src/aidd/tools/screenshot_tool.py,sha256=NMO5B4UG8qfMEOMRd2YoOjtwz_oQ2y1UAGU22jV1yGU,46337
 src/aidd/tools/state.py,sha256=RWSw0Jfsui8FqC0xsI7Ik07tAg35hRwLHa5xGBVbiI4,1493
 src/aidd/tools/system_tools.py,sha256=H4_qveKC2HA7SIbi-j4vxA0W4jYh2wfu9A6ni5wkZyA,7249
 src/aidd/tools/web_tools.py,sha256=gdsj2DEVYb_oYChItK5I1ugt2w25U7IAa5kEw9q6MVg,35534
-skydeckai_code-0.1.34.dist-info/METADATA,sha256=t-8R2yEUD7n3NIKyztRZoxG5TfsDshSa3Su9STh8Ojs,32850
-skydeckai_code-0.1.34.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-skydeckai_code-0.1.34.dist-info/entry_points.txt,sha256=ZkU1spOhLEnz5MpUn4dDihVcE0DMUC6ejzbsF-eNth4,88
-skydeckai_code-0.1.34.dist-info/licenses/LICENSE,sha256=uHse04vmI6ZjW7TblegFl30X-sDyyF0-QvH8ItPca3c,10865
-skydeckai_code-0.1.34.dist-info/RECORD,,
+skydeckai_code-0.1.36.dist-info/METADATA,sha256=V76YaV--GsD3nv6GFQa9ch7oEgez1cOXOdFzUPXoyH4,29110
+skydeckai_code-0.1.36.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+skydeckai_code-0.1.36.dist-info/entry_points.txt,sha256=ZkU1spOhLEnz5MpUn4dDihVcE0DMUC6ejzbsF-eNth4,88
+skydeckai_code-0.1.36.dist-info/licenses/LICENSE,sha256=uHse04vmI6ZjW7TblegFl30X-sDyyF0-QvH8ItPca3c,10865
+skydeckai_code-0.1.36.dist-info/RECORD,,

src/aidd/tools/__init__.py

@@ -25,47 +25,16 @@ from .file_tools import (
     handle_get_file_info,
     handle_move_file,
     handle_read_file,
-    handle_read_multiple_files,
     handle_search_files,
     handle_write_file,
     move_file_tool,
     read_file_tool,
-    read_multiple_files_tool,
     search_files_tool,
     write_file_tool,
 )
 from .get_active_apps_tool import get_active_apps_tool, handle_get_active_apps
 from .get_available_windows_tool import get_available_windows_tool, handle_get_available_windows
-from .git_tools import (
-    git_add_tool,
-    git_checkout_tool,
-    git_clone_tool,
-    git_commit_tool,
-    git_create_branch_tool,
-    git_diff_staged_tool,
-    git_diff_tool,
-    git_diff_unstaged_tool,
-    git_init_tool,
-    git_log_tool,
-    git_reset_tool,
-    git_show_tool,
-    git_status_tool,
-    handle_git_add,
-    handle_git_checkout,
-    handle_git_clone,
-    handle_git_commit,
-    handle_git_create_branch,
-    handle_git_diff,
-    handle_git_diff_staged,
-    handle_git_diff_unstaged,
-    handle_git_init,
-    handle_git_log,
-    handle_git_reset,
-    handle_git_show,
-    handle_git_status,
-)
 from .image_tools import read_image_file_tool, handle_read_image_file
-from .lint_tools import check_lint_tool, handle_check_lint
 from .other_tools import batch_tools_tool, handle_batch_tools, think_tool, handle_think
 from .path_tools import (
     get_allowed_directory_tool,
@@ -89,7 +58,6 @@ TOOL_DEFINITIONS = [
     edit_file_tool(),
     list_directory_tool(),
     read_file_tool(),
-    read_multiple_files_tool(),
     move_file_tool(),
     copy_file_tool(),
     search_files_tool(),
@@ -100,24 +68,8 @@ TOOL_DEFINITIONS = [
     execute_shell_script_tool(),
     codebase_mapper_tool(),
     search_code_tool(),
-    check_lint_tool(),
     batch_tools_tool(),
     think_tool(),
-    # Git tools
-    git_init_tool(),
-    git_status_tool(),
-    git_diff_unstaged_tool(),
-    git_diff_staged_tool(),
-    git_diff_tool(),
-    git_commit_tool(),
-    git_add_tool(),
-    git_reset_tool(),
-    git_log_tool(),
-    git_create_branch_tool(),
-    git_checkout_tool(),
-    git_clone_tool(),
-    git_show_tool(),
-    get_system_info_tool(),
     # Screenshot tools
     capture_screenshot_tool(),
     # System context tools
@@ -128,6 +80,8 @@ TOOL_DEFINITIONS = [
     # Web tools
     web_fetch_tool(),
     web_search_tool(),
+    # System tools
+    get_system_info_tool(),
 ]
 
 # Export all handlers
@@ -139,12 +93,10 @@ TOOL_HANDLERS = {
     "read_file": handle_read_file,
     "write_file": handle_write_file,
     "edit_file": handle_edit_file,
-    "read_multiple_files": handle_read_multiple_files,
     "move_file": handle_move_file,
     "copy_file": handle_copy_file,
     "search_files": handle_search_files,
     "search_code": handle_search_code,
-    "check_lint": handle_check_lint,
     "delete_file": handle_delete_file,
     "get_file_info": handle_get_file_info,
     "directory_tree": handle_directory_tree,
@@ -153,20 +105,6 @@ TOOL_HANDLERS = {
     "codebase_mapper": handle_codebase_mapper,
     "batch_tools": handle_batch_tools,
     "think": handle_think,
-    # Git handlers
-    "git_init": handle_git_init,
-    "git_status": handle_git_status,
-    "git_diff_unstaged": handle_git_diff_unstaged,
-    "git_diff_staged": handle_git_diff_staged,
-    "git_diff": handle_git_diff,
-    "git_commit": handle_git_commit,
-    "git_add": handle_git_add,
-    "git_reset": handle_git_reset,
-    "git_log": handle_git_log,
-    "git_create_branch": handle_git_create_branch,
-    "git_checkout": handle_git_checkout,
-    "git_clone": handle_git_clone,
-    "git_show": handle_git_show,
     "get_system_info": handle_get_system_info,
     # Screenshot handlers
     "capture_screenshot": handle_capture_screenshot,

src/aidd/tools/code_execution.py

@@ -100,6 +100,9 @@ def execute_shell_script_tool() -> Dict[str, Any]:
             "Execute a shell script (bash/sh) on the user's local machine within the current working directory. "
             "WHEN TO USE: When you need to automate system tasks, run shell commands, interact with the operating system, or perform operations "
             "that are best expressed as shell commands. Useful for file system operations, system configuration, or running system utilities. "
+            "Also ideal when you need to run code linters to check for style issues or potential bugs in the codebase, "
+            "or when you need to perform version control operations such as initializing git repositories, checking status, "
+            "committing changes, cloning repositories, and other git commands without dedicated tools. "
             "WHEN NOT TO USE: When you need more structured programming (use execute_code instead), when you need to execute potentially "
             "dangerous system operations, or when you want to run commands outside the allowed directory. "
             "RETURNS: Text output including stdout, stderr, and exit code of the execution. The output sections are clearly labeled with "
@@ -110,6 +113,8 @@ def execute_shell_script_tool() -> Dict[str, Any]:
             "Examples: "
             "- script='echo \"Current directory:\" && pwd'. "
             "- script='for i in {1..5}; do echo $i; done'. "
+            "- script='eslint src/ --format stylish' (for linting). "
+            "- script='git init && git add . && git commit -m \"Initial commit\"' (for git operations)."
         ),
         "inputSchema": {
             "type": "object",

src/aidd/tools/code_tools.py

@@ -20,17 +20,19 @@ def search_code_tool():
                     "WHEN NOT TO USE: When you need to find files by name (use search_files instead), when you need "
                     "semantic code understanding (use codebase_mapper instead), or when analyzing individual file "
                     "structure. "
-                    "RETURNS: Lines of code matching the specified pattern, grouped by file with line numbers. "
+                    "RETURNS: Lines of code matching the specified patterns, grouped by file with line numbers. "
                     "Results are sorted by file modification time with newest files first. Respects file filtering "
                     "and ignores binary files. Search is restricted to the allowed directory.",
         "inputSchema": {
             "type": "object",
             "properties": {
-                "pattern": {
-                    "type": "string",
-                    "description": "Regular expression pattern to search for in file contents. Supports full regex syntax. "
-                                   "Examples: 'function\\s+\\w+' to find function declarations, 'import\\s+.*from' to find "
-                                   "import statements, 'console\\.log.*Error' to find error logs."
+                "patterns": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    },
+                    "description": "List of regular expression patterns to search for in file contents. Supports full regex syntax. "
+                                   "Examples: ['function\\s+\\w+', 'class\\s+\\w+'] to find both function and class declarations."
                 },
                 "include": {
                     "type": "string",
@@ -47,7 +49,7 @@ def search_code_tool():
                 },
                 "max_results": {
                     "type": "integer",
-                    "description": "Maximum number of matching results to return. Use to limit output size for common patterns. "
+                    "description": "Maximum number of matching results to return per pattern. Use to limit output size for common patterns. "
                                    "Default is 100, which is sufficient for most searches while preventing excessive output.",
                     "default": 100
                 },
@@ -65,22 +67,22 @@ def search_code_tool():
                     "default": "."
                 }
             },
-            "required": ["pattern"]
+            "required": ["patterns"]
         }
     }
 
 
 async def handle_search_code(arguments: dict) -> List[TextContent]:
     """Handle searching for patterns in code files."""
-    pattern = arguments.get("pattern")
+    patterns = arguments.get("patterns", [])
     include = arguments.get("include", "*")
     exclude = arguments.get("exclude", "")
     max_results = arguments.get("max_results", 100)
     case_sensitive = arguments.get("case_sensitive", False)
     path = arguments.get("path", ".")
 
-    if not pattern:
-        raise ValueError("Pattern must be provided")
+    if not patterns:
+        raise ValueError("At least one pattern must be provided")
 
     # Determine full path for search start
     if os.path.isabs(path):
@@ -97,17 +99,36 @@ async def handle_search_code(arguments: dict) -> List[TextContent]:
     if not os.path.isdir(full_path):
         raise ValueError(f"Path is not a directory: {path}")
 
+    # Results from all patterns
+    all_results = []
+
     try:
-        # Use ripgrep if available for faster results
-        try:
-            return await _search_with_ripgrep(
-                pattern, include, exclude, max_results, case_sensitive, full_path
-            )
-        except (subprocess.SubprocessError, FileNotFoundError):
-            # Fallback to Python implementation if ripgrep not available
-            return await _search_with_python(
-                pattern, include, exclude, max_results, case_sensitive, full_path
-            )
+        for i, pattern in enumerate(patterns):
+            pattern_header = f"\n{'='*30}\nPattern {i+1}: {pattern}\n{'='*30}\n" if len(patterns) > 1 else ""
+            try:
+                # Use ripgrep if available for faster results
+                try:
+                    result = await _search_with_ripgrep(
+                        pattern, include, exclude, max_results, case_sensitive, full_path
+                    )
+                except (subprocess.SubprocessError, FileNotFoundError):
+                    # Fallback to Python implementation if ripgrep not available
+                    result = await _search_with_python(
+                        pattern, include, exclude, max_results, case_sensitive, full_path
+                    )
+
+                # Add pattern header for multiple patterns
+                if len(patterns) > 1 and result and result[0].text != f"No matches found for pattern '{pattern}'.":
+                    result[0].text = pattern_header + result[0].text
+
+                all_results.extend(result)
+            except Exception as e:
+                all_results.append(TextContent(
+                    type="text",
+                    text=f"{pattern_header}Error searching for pattern '{pattern}': {str(e)}"
+                ))
+
+        return all_results
     except Exception as e:
         raise ValueError(f"Error searching code: {str(e)}")
 
@@ -193,9 +214,17 @@ async def _search_with_ripgrep(
 
         # Format output
         formatted_output = []
+        match_count = 0
         for file_path, data in sorted_files:
             formatted_output.append(f"\n{file_path} (modified: {datetime.fromtimestamp(data['mod_time']).strftime('%Y-%m-%d %H:%M:%S')})")
             formatted_output.extend(data["matches"])
+            match_count += len(data["matches"])
+
+        summary = f"Found {match_count} matches in {len(sorted_files)} files for pattern '{pattern}'"
+        if match_count > 0:
+            formatted_output.insert(0, summary)
+        else:
+            formatted_output = [summary]
 
         return [TextContent(
             type="text",
@@ -207,7 +236,7 @@ async def _search_with_ripgrep(
             # ripgrep returns 1 when no matches are found
             return [TextContent(
                 type="text",
-                text="No matches found."
+                text=f"No matches found for pattern '{pattern}'."
             )]
         raise
 
@@ -310,7 +339,7 @@ async def _search_with_python(
     if not files_with_matches:
         return [TextContent(
             type="text",
-            text="No matches found."
+            text=f"No matches found for pattern '{pattern}'."
         )]
 
     # Sort files by modification time (newest first)
@@ -322,10 +351,21 @@ async def _search_with_python(
 
     # Format output
     formatted_output = []
+    total_matches = 0
+    files_with_actual_matches = 0
+
     for file_path, data in sorted_files:
         if data["matches"]:  # Only include files that actually have matches
             formatted_output.append(f"\n{file_path} (modified: {datetime.fromtimestamp(data['mod_time']).strftime('%Y-%m-%d %H:%M:%S')})")
             formatted_output.extend(data["matches"])
+            total_matches += len(data["matches"])
+            files_with_actual_matches += 1
+
+    summary = f"Found {total_matches} matches in {files_with_actual_matches} files for pattern '{pattern}'"
+    if total_matches > 0:
+        formatted_output.insert(0, summary)
+    else:
+        formatted_output = [summary]
 
     return [TextContent(
         type="text",