Merge pull request #3 from mobilehackinglab/small_improvements

Pagination + new tool to search classes and small improvements

Author: Arno-MHL

README.md

@@ -1,6 +1,6 @@
 ## ⚙️ Jadx MCP Plugin — Decompiler Access for Claude via MCP
 
-This project provides a [Jadx](https://github.com/skylot/jadx) plugin written in **Java**, which exposes the **Jadx API over HTTP** — enabling live interaction through [Claude](https://www.anthropic.com/index/introducing-claude) via the [Model Context Protocol (MCP)](https://modelcontextprotocol.io/). A lightweight [FastMCP](https://github.com/pacocoursey/fastmcp) adapter in Python acts as a bridge between Claude and the plugin.
+This project provides a [Jadx](https://github.com/skylot/jadx) plugin written in **Java**, which exposes the **Jadx API over HTTP** — enabling live interaction through MCP clients like [Claude](https://www.anthropic.com/index/introducing-claude) via the [Model Context Protocol (MCP)](https://modelcontextprotocol.io/). A lightweight [FastMCP](https://github.com/modelcontextprotocol/python-sdk?tab=readme-ov-file#resources) adapter in Python acts as a bridge between Claude and the plugin. This enables intelligent navigation and automation of reverse engineering workflows, ideal for AI-assisted security analysis of Android apps.
 
 ---
 
@@ -70,8 +70,9 @@ After restart it should look like this:
 | Tool                  | Description                           |
 |-----------------------|---------------------------------------|
 | `list_all_classes`    | Get all decompiled class names        |
+| `search_class_by_name` | Find classes matching a string       |
 | `get_class_source`    | Get full source of a given class      |
-| `search_method_by_name` | Find methods matching a string     |
+| `search_method_by_name` | Find methods matching a string      |
 | `get_methods_of_class` | List all method names in a class     |
 | `get_fields_of_class`  | List all field names in a class      |
 | `get_method_code`     | Extract decompiled code for a method  |
@@ -126,5 +127,5 @@ This project is maintained by [Mobile Hacking Lab](https://github.com/mobilehack
 ## 🧩 Credits
 
 - [Jadx](https://github.com/skylot/jadx)
-- [FastMCP](https://github.com/jlowin/fastmcp)
+- [FastMCP](https://github.com/modelcontextprotocol/python-sdk)
 - [Claude by Anthropic](https://www.anthropic.com)

fastmcp_adapter.py

@@ -1,13 +1,18 @@
-from fastmcp import FastMCP
+from mcp.server.fastmcp import FastMCP
 import requests
 from requests.exceptions import ConnectionError
 import sys
 
+# Create the MCP adapter with a human-readable name
 mcp = FastMCP("Jadx MCP Server")
 
+# Address of the Jadx MCP plugin's HTTP server
 MCP_SERVER = "http://localhost:8085"
 
-def invoke_jadx(tool, parameters={}):
+def invoke_jadx(tool: str, parameters: dict = {}) -> dict:
+    """
+    Internal helper to send a tool request to the Jadx MCP HTTP server.
+    """
     try:
         resp = requests.post(f"{MCP_SERVER}/invoke", json={"tool": tool, "parameters": parameters})
         resp.raise_for_status()
@@ -20,38 +25,75 @@ def invoke_jadx(tool, parameters={}):
     except Exception as e:
         raise RuntimeError(f"Unexpected error: {str(e)}")
 
+
+@mcp.tool()
+def list_all_classes(limit: int = 250, offset: int = 0) -> dict:
+    """
+    Returns a paginated list of class names.
+
+    Params:
+    - limit: Max number of classes to return (default 250)
+    - offset: Starting index of class list
+    """
+    return invoke_jadx("list_all_classes", {"limit": limit, "offset": offset})
+
+
 @mcp.tool()
-def list_all_classes() -> list:
-    result = invoke_jadx("list_all_classes")
-    return result
+def search_class_by_name(query: str) -> dict:
+    """Search for class names that contain the given query string (case-insensitive)."""
+    return invoke_jadx("search_class_by_name", {"query": query})
+
 
 @mcp.tool()
 def get_class_source(class_name: str) -> str:
-    result = invoke_jadx("get_class_source", {"class_name": class_name})
-    return result
+    """
+   Returns the full decompiled source code of a given class.
+    """
+    return invoke_jadx("get_class_source", {"class_name": class_name})
+
 
 @mcp.tool()
 def search_method_by_name(method_name: str) -> str:
-    result = invoke_jadx("search_method_by_name", {"method_name": method_name})
-    return result
+    """
+   Searches for all methods matching the provided name.
+   Returns class and method pairs as string.
+    """
+    return invoke_jadx("search_method_by_name", {"method_name": method_name})
+
 
 @mcp.tool()
 def get_methods_of_class(class_name: str) -> list:
-    result = invoke_jadx("get_methods_of_class", {"class_name": class_name})
-    return result
+    """
+   Returns all method names declared in the specified class.
+    """
+    return invoke_jadx("get_methods_of_class", {"class_name": class_name})
+
 
 @mcp.tool()
 def get_fields_of_class(class_name: str) -> list:
-    result = invoke_jadx("get_fields_of_class", {"class_name": class_name})
-    return result
+    """
+   Returns all field names declared in the specified class.
+    """
+    return invoke_jadx("get_fields_of_class", {"class_name": class_name})
+
 
 @mcp.tool()
 def get_method_code(class_name: str, method_name: str) -> str:
-    result = invoke_jadx("get_method_code", {"class_name": class_name, "method_name": method_name})
-    return result
+    """
+   Returns only the source code block of a specific method within a class.
+    """
+    return invoke_jadx("get_method_code", {
+        "class_name": class_name,
+        "method_name": method_name
+    })
+
 
 @mcp.resource("jadx://tools")
 def get_tools_resource() -> dict:
+    """
+   Fetches the list of all available tools and their descriptions from the Jadx plugin.
+    Used for dynamic tool discovery.
+    """
     try:
         resp = requests.get(f"{MCP_SERVER}/tools")
         resp.raise_for_status()

plugin/build.gradle

@@ -4,7 +4,7 @@ plugins {
 }
 
 group = 'jadx.plugins'
-version = '1.0'
+version = '1.1'
 
 repositories {
     mavenCentral()
@@ -29,7 +29,7 @@ jar {
         attributes(
             'Jadx-Plugin': 'true',
             'Jadx-Plugin-Class': 'com.mobilehackinglab.jadxplugin.McpPlugin',
-            'Jadx-Plugin-Version': '1.0.0',
+            'Jadx-Plugin-Version': '1.1.0',
             'Jadx-Plugin-Id': 'jadx-mcp-plugin',
             'Jadx-Plugin-Description': 'Exposes Jadx info over HTTP',
             'Jadx-Plugin-Author': 'Mobile Hacking Lab'
@@ -47,6 +47,6 @@ jar {
 
 shadowJar {
     archiveBaseName = 'jadx-mcp-plugin'
-    archiveVersion = '1.0.0'
+    archiveVersion = '1.1.0'
     mergeServiceFiles()
 }