Refactor code structure for improved readability and maintainability

Author: johnhuang316

.well-known/mcp.json

@@ -0,0 +1,28 @@
+{
+    "$schema": "https://modelcontextprotocol.io/schemas/mcp.json",
+    "mcpServers": {
+        "code-index": {
+            "command": "uv",
+            "args": [
+                "run",
+                "code-index-mcp"
+            ],
+            "transport": {
+                "type": "stdio"
+            },
+            "metadata": {
+                "name": "Code Index MCP",
+                "description": "Local code-aware MCP server with project indexing, search, and file tools.",
+                "homepage": "https://github.com/johnhuang316/code-index-mcp",
+                "capabilities": [
+                    "code-search",
+                    "symbol-indexing",
+                    "file-system"
+                ]
+            }
+        }
+    },
+    "llmfeed_extension": {
+        "path": ".well-known/mcp.llmfeed.json"
+    }
+}

.well-known/mcp.llmfeed.json

@@ -0,0 +1,32 @@
+{
+    "$schema": "https://modelcontextprotocol.io/schemas/mcp-llmfeed.json",
+    "feed_type": "mcp_server_list",
+    "servers": [
+        {
+            "id": "code-index",
+            "name": "Code Index MCP",
+            "description": "Exposes project-aware indexing, search, and file utilities for LLM agents via MCP transports.",
+            "version": "2.8.1",
+            "transport": "stdio",
+            "command": "uv",
+            "args": [
+                "run",
+                "code-index-mcp"
+            ],
+            "links": {
+                "documentation": "https://github.com/johnhuang316/code-index-mcp#readme",
+                "source": "https://github.com/johnhuang316/code-index-mcp"
+            },
+            "capabilities": [
+                "code-search",
+                "symbol-indexing",
+                "file-system"
+            ],
+            "tags": [
+                "fastmcp",
+                "code-intelligence",
+                "watcher"
+            ]
+        }
+    ]
+}

README.md

@@ -87,6 +87,21 @@ Linux and macOS already expose the required XDG paths and `HOME`, so you can usu
 table there.
 Add overrides only if you run the CLI inside a restricted container.
 
+### FastMCP & Discovery Manifests
+
+- Run `fastmcp run fastmcp.json` to launch the server via [FastMCP](https://fastmcp.wiki/) with
+  the correct source entrypoint and dependency metadata. Pass `--project-path` (or call the
+  `set_project_path` tool after startup) so the index boots against the right repository.
+- Serve or copy `.well-known/mcp.json` to share a standards-compliant MCP manifest. Clients that
+  support the `.well-known` convention (e.g., Claude Desktop, Codex CLI) can import this file
+  directly instead of crafting configs manually.
+- Publish `.well-known/mcp.llmfeed.json` when you want to expose the richer LLM Feed metadata.
+  It references the same `code-index` server definition plus documentation/source links, which
+  helps registries present descriptions, tags, and capabilities automatically.
+
+When sharing the manifests, remind consumers to supply `--project-path` (or to call
+`set_project_path`) so the server indexes the intended repository.
+
 ## Typical Use Cases
 
 **Code Review**: "Find all places using the old API"  

fastmcp.json

@@ -0,0 +1,43 @@
+{
+    "$schema": "https://fastmcp.wiki/en/schemas/fastmcp.json",
+    "name": "Code Index MCP",
+    "description": "Indexes a local repository and exposes search, indexing, and file utilities via the Model Context Protocol.",
+    "license": "MIT",
+    "keywords": [
+        "mcp",
+        "code-index",
+        "search",
+        "fastmcp"
+    ],
+    "links": [
+        {
+            "rel": "source",
+            "href": "https://github.com/johnhuang316/code-index-mcp"
+        },
+        {
+            "rel": "documentation",
+            "href": "https://github.com/johnhuang316/code-index-mcp#readme"
+        }
+    ],
+    "source": {
+        "path": "src/code_index_mcp/server.py",
+        "entrypoint": "mcp"
+    },
+    "environment": {
+        "python": ">=3.10",
+        "dependencies": [
+            "mcp>=1.21.0,<2.0.0",
+            "watchdog>=3.0.0",
+            "tree-sitter>=0.20.0",
+            "tree-sitter-javascript>=0.20.0",
+            "tree-sitter-typescript>=0.20.0",
+            "tree-sitter-java>=0.20.0",
+            "tree-sitter-zig>=0.20.0",
+            "pathspec>=0.12.1",
+            "msgpack>=1.0.0"
+        ]
+    },
+    "deployment": {
+        "transport": "stdio"
+    }
+}

pyproject.toml

@@ -13,7 +13,7 @@ authors = [
     {name = "johnhuang316"}
 ]
 dependencies = [
-    "mcp>=0.3.0",
+    "mcp>=1.21.0,<2.0.0",
     "watchdog>=3.0.0",
     "tree-sitter>=0.20.0",
     "tree-sitter-javascript>=0.20.0",

requirements.txt

@@ -1,4 +1,4 @@
-mcp>=0.3.0
+mcp>=1.21.0,<2.0.0
 watchdog>=3.0.0
 protobuf>=4.21.0
 tree-sitter>=0.20.0

src/code_index_mcp/server.py

@@ -130,16 +130,14 @@ async def indexer_lifespan(_server: FastMCP) -> AsyncIterator[CodeIndexerContext
 
 @mcp.resource("config://code-indexer")
 @handle_mcp_resource_errors
-def get_config() -> str:
+def get_config(ctx: Context) -> str:
     """Get the current configuration of the Code Indexer."""
-    ctx = mcp.get_context()
     return ProjectManagementService(ctx).get_project_config()
 
 @mcp.resource("files://{file_path}")
 @handle_mcp_resource_errors
-def get_file_content(file_path: str) -> str:
+def get_file_content(file_path: str, ctx: Context) -> str:
     """Get the content of a specific file."""
-    ctx = mcp.get_context()
     # Use FileService for simple file reading - this is appropriate for a resource
     return FileService(ctx).get_file_content(file_path)
 

src/code_index_mcp/utils/error_handler.py

@@ -76,8 +76,7 @@ def handle_mcp_resource_errors(func: Callable) -> Callable:
     Example:
         @mcp.resource("config://code-indexer")
         @handle_mcp_resource_errors
-        def get_config() -> str:
-            ctx = mcp.get_context()
+        def get_config(ctx: Context) -> str:
             from ..services.project_management_service import ProjectManagementService
             return ProjectManagementService(ctx).get_project_config()
     """