@musashishao/agent-kit 1.8.2 → 1.9.1

package/.agent/mcp-gateway/src/index.ts

@@ -1,9 +1,14 @@
 #!/usr/bin/env node
 /**
- * Agent Kit MCP Gateway Server
+ * Agent Kit MCP Gateway Server v2.0
  * 
- * Provides AI agents with live access to project context, dependency graphs,
- * and semantic search with automatic sync capabilities.
+ * Enhanced MCP server with:
+ * - Dual transport (stdio + Streamable HTTP)
+ * - OAuth 2.1 / API Key authentication
+ * - OpenTelemetry observability
+ * - Semantic search with auto-sync
+ * 
+ * @version 2.0.0
  */
 
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
@@ -12,17 +17,42 @@ import { z } from "zod";
 import * as fs from "fs";
 import * as path from "path";
 
-// Import sync modules
+// Import modules
 import { IncrementalSyncer, getGlobalDebouncer, TimestampChecker } from "./sync/index.js";
+import { createStreamableHttpTransport, type StreamableHttpOptions } from "./transports/index.js";
+import { createApiKey, validateApiKey, extractApiKey, type AuthResult } from "./auth/index.js";
+import { traceToolCall, getMetrics, initializeTracing } from "./observability/index.js";
+
+// ============================================================================
+// Configuration
+// ============================================================================
 
-// Get project root from environment or command line
 const PROJECT_ROOT = process.env.PROJECT_ROOT || process.cwd();
+const HTTP_PORT = parseInt(process.env.MCP_HTTP_PORT || "3100", 10);
+const ENABLE_HTTP = process.env.MCP_ENABLE_HTTP === "true";
+const ENABLE_AUTH = process.env.MCP_ENABLE_AUTH === "true";
+const API_KEY = process.env.MCP_API_KEY;
+
+// ============================================================================
+// Initialize Components
+// ============================================================================
 
-// Initialize sync components
 const syncer = new IncrementalSyncer(PROJECT_ROOT);
-const debouncer = getGlobalDebouncer(30000); // 30 second cooldown
+const debouncer = getGlobalDebouncer(30000);
 const timestampChecker = new TimestampChecker(PROJECT_ROOT);
 
+// Initialize tracing
+initializeTracing({
+    serviceName: "agent-kit-mcp",
+    serviceVersion: "2.0.0",
+});
+
+// Create default API key if provided via env
+if (API_KEY) {
+    createApiKey("default", ["read:project", "read:graph", "read:search", "write:sync"]);
+    console.error(`[MCP] API key configured from environment`);
+}
+
 // ============================================================================
 // Auto-Sync Helper
 // ============================================================================
@@ -70,7 +100,7 @@ function readTextFile(filePath: string): string | null {
 
 const server = new McpServer({
     name: "agent-kit-gateway",
-    version: "1.1.0", // Universal Intelligence Version
+    version: "2.0.0",
 });
 
 // ============================================================================
@@ -84,38 +114,40 @@ server.tool(
         section: z.enum(["all", "tech_stack", "structure", "conventions", "commands"]).optional().default("all")
     },
     async ({ section }) => {
-        const agentsMd = readTextFile("AGENTS.md");
-        if (!agentsMd) {
-            return {
-                content: [{ type: "text" as const, text: "AGENTS.md not found. Run 'ak init' first." }]
-            };
-        }
-
-        const sections: Record<string, string> = {};
-        const lines = agentsMd.split("\n");
-        let currentSection = "";
-        let currentContent: string[] = [];
-
-        for (const line of lines) {
-            if (line.startsWith("## ")) {
-                if (currentSection) sections[currentSection] = currentContent.join("\n").trim();
-                currentSection = line.replace("## ", "").trim();
-                currentContent = [];
-            } else {
-                currentContent.push(line);
+        return traceToolCall("get_project_context", { section }, async () => {
+            const agentsMd = readTextFile("AGENTS.md");
+            if (!agentsMd) {
+                return {
+                    content: [{ type: "text" as const, text: "AGENTS.md not found. Run 'ak init' first." }]
+                };
             }
-        }
-        if (currentSection) sections[currentSection] = currentContent.join("\n").trim();
-
-        const sectionMap: Record<string, string | undefined> = {
-            tech_stack: sections["🛠️ Tech Stack"] || sections["Tech Stack"],
-            structure: sections["📁 Directory Map"] || sections["Directory Map"],
-            conventions: sections["📜 Rules & Conventions"] || sections["Rules & Conventions"],
-            commands: sections["🔧 Commands Reference"] || sections["Commands Reference"],
-            all: agentsMd,
-        };
 
-        return { content: [{ type: "text" as const, text: sectionMap[section] || agentsMd }] };
+            const sections: Record<string, string> = {};
+            const lines = agentsMd.split("\n");
+            let currentSection = "";
+            let currentContent: string[] = [];
+
+            for (const line of lines) {
+                if (line.startsWith("## ")) {
+                    if (currentSection) sections[currentSection] = currentContent.join("\n").trim();
+                    currentSection = line.replace("## ", "").trim();
+                    currentContent = [];
+                } else {
+                    currentContent.push(line);
+                }
+            }
+            if (currentSection) sections[currentSection] = currentContent.join("\n").trim();
+
+            const sectionMap: Record<string, string | undefined> = {
+                tech_stack: sections["🛠️ Tech Stack"] || sections["Tech Stack"],
+                structure: sections["📁 Directory Map"] || sections["Directory Map"],
+                conventions: sections["📜 Rules & Conventions"] || sections["Rules & Conventions"],
+                commands: sections["🔧 Commands Reference"] || sections["Commands Reference"],
+                all: agentsMd,
+            };
+
+            return { content: [{ type: "text" as const, text: sectionMap[section] || agentsMd }] };
+        });
     }
 );
 
@@ -128,22 +160,24 @@ server.tool(
     "Get high-level project summary: Code vs Docs distribution, primary types, and impact analysis.",
     {},
     async () => {
-        const graph = readJsonFile(".agent/graph.json");
-        if (!graph) return { content: [{ type: "text" as const, text: "Project data not generated." }] };
-
-        const stats = graph.metadata?.file_types || {};
-        const total = graph.metadata?.total_files || 1;
-        const docCount = (stats.documentation || 0) + (stats.document || 0) + (stats.readme || 0);
-        const codeCount = (stats.component || 0) + (stats.module || 0) + (stats.utility || 0);
-
-        const intelligence = {
-            project_name: path.basename(PROJECT_ROOT),
-            project_type: docCount > codeCount ? "Documentation-Heavy" : "Code-Centric",
-            distribution: { docs: `${Math.round((docCount / total) * 100)}%`, code: `${Math.round((codeCount / total) * 100)}%` },
-            top_files: graph.nodes?.slice(0, 5).map((n: any) => n.id)
-        };
+        return traceToolCall("get_project_intelligence", {}, async () => {
+            const graph = readJsonFile(".agent/graph.json");
+            if (!graph) return { content: [{ type: "text" as const, text: "Project data not generated." }] };
+
+            const stats = graph.metadata?.file_types || {};
+            const total = graph.metadata?.total_files || 1;
+            const docCount = (stats.documentation || 0) + (stats.document || 0) + (stats.readme || 0);
+            const codeCount = (stats.component || 0) + (stats.module || 0) + (stats.utility || 0);
+
+            const intelligence = {
+                project_name: path.basename(PROJECT_ROOT),
+                project_type: docCount > codeCount ? "Documentation-Heavy" : "Code-Centric",
+                distribution: { docs: `${Math.round((docCount / total) * 100)}%`, code: `${Math.round((codeCount / total) * 100)}%` },
+                top_files: graph.nodes?.slice(0, 5).map((n: any) => n.id)
+            };
 
-        return { content: [{ type: "text" as const, text: JSON.stringify(intelligence, null, 2) }] };
+            return { content: [{ type: "text" as const, text: JSON.stringify(intelligence, null, 2) }] };
+        });
     }
 );
 
@@ -159,25 +193,27 @@ server.tool(
         direction: z.enum(["imports", "imported_by", "both"]).optional().default("both")
     },
     async ({ file_path, direction }) => {
-        await autoSyncIfNeeded();
-        const graph = readJsonFile(".agent/graph.json");
-        if (!graph) return { content: [{ type: "text" as const, text: "Graph not found." }] };
-
-        const normalizedPath = file_path.replace(/^\.\//, "");
-        const node = graph.nodes?.find((n: any) => n.id === normalizedPath);
-        if (!node) return { content: [{ type: "text" as const, text: "File not found in graph." }] };
-
-        const isDoc = ["documentation", "readme", "document"].includes(node.type);
-        const outLabel = isDoc ? "references" : "imports";
-        const inLabel = isDoc ? "referenced_by" : "imported_by";
-
-        const result: any = { file: normalizedPath, type: node.type };
-        if (direction !== "imported_by") result[outLabel] = node.imports || [];
-        if (direction !== "imports") {
-            result[inLabel] = graph.edges?.filter((e: any) => e.target === normalizedPath).map((e: any) => e.source) || [];
-        }
+        return traceToolCall("analyze_dependencies", { file_path, direction }, async () => {
+            await autoSyncIfNeeded();
+            const graph = readJsonFile(".agent/graph.json");
+            if (!graph) return { content: [{ type: "text" as const, text: "Graph not found." }] };
+
+            const normalizedPath = file_path.replace(/^\.\//, "");
+            const node = graph.nodes?.find((n: any) => n.id === normalizedPath);
+            if (!node) return { content: [{ type: "text" as const, text: "File not found in graph." }] };
+
+            const isDoc = ["documentation", "readme", "document"].includes(node.type);
+            const outLabel = isDoc ? "references" : "imports";
+            const inLabel = isDoc ? "referenced_by" : "imported_by";
+
+            const result: any = { file: normalizedPath, type: node.type };
+            if (direction !== "imported_by") result[outLabel] = node.imports || [];
+            if (direction !== "imports") {
+                result[inLabel] = graph.edges?.filter((e: any) => e.target === normalizedPath).map((e: any) => e.source) || [];
+            }
 
-        return { content: [{ type: "text" as const, text: JSON.stringify(result, null, 2) }] };
+            return { content: [{ type: "text" as const, text: JSON.stringify(result, null, 2) }] };
+        });
     }
 );
 
@@ -186,29 +222,31 @@ server.tool(
 // ============================================================================
 
 async function handleSearch(args: { query: string, file_filter?: string, top_k: number }) {
-    await autoSyncIfNeeded();
-    const chunks = readJsonFile(".agent/rag/chunks.json");
-    if (!chunks?.chunks) return { content: [{ type: "text" as const, text: "No chunks found." }] };
-
-    const query = args.query.toLowerCase();
-    const results = chunks.chunks
-        .map((chunk: any) => {
-            let score = 0;
-            const content = chunk.content.toLowerCase();
-            if (content.includes(query)) score += 5;
-            if (chunk.metadata.name?.toLowerCase().includes(query)) score += 10;
-            return { chunk, score };
-        })
-        .filter((s: any) => s.score > 0)
-        .sort((a: any, b: any) => b.score - a.score)
-        .slice(0, args.top_k)
-        .map((s: any) => ({
-            file: s.chunk.metadata.file_path,
-            context: s.chunk.metadata.context_path || s.chunk.metadata.name,
-            preview: s.chunk.content.substring(0, 250) + "..."
-        }));
-
-    return { content: [{ type: "text" as const, text: JSON.stringify(results, null, 2) }] };
+    return traceToolCall("search_knowledge", args, async () => {
+        await autoSyncIfNeeded();
+        const chunks = readJsonFile(".agent/rag/chunks.json");
+        if (!chunks?.chunks) return { content: [{ type: "text" as const, text: "No chunks found." }] };
+
+        const query = args.query.toLowerCase();
+        const results = chunks.chunks
+            .map((chunk: any) => {
+                let score = 0;
+                const content = chunk.content.toLowerCase();
+                if (content.includes(query)) score += 5;
+                if (chunk.metadata.name?.toLowerCase().includes(query)) score += 10;
+                return { chunk, score };
+            })
+            .filter((s: any) => s.score > 0)
+            .sort((a: any, b: any) => b.score - a.score)
+            .slice(0, args.top_k)
+            .map((s: any) => ({
+                file: s.chunk.metadata.file_path,
+                context: s.chunk.metadata.context_path || s.chunk.metadata.name,
+                preview: s.chunk.content.substring(0, 250) + "..."
+            }));
+
+        return { content: [{ type: "text" as const, text: JSON.stringify(results, null, 2) }] };
+    });
 }
 
 server.tool(
@@ -242,16 +280,104 @@ server.tool(
     "Find files affected by changing a file.",
     { file_path: z.string() },
     async ({ file_path }) => {
-        await autoSyncIfNeeded();
-        const graph = readJsonFile(".agent/graph.json");
-        if (!graph) return { content: [{ type: "text" as const, text: "Graph not found." }] };
+        return traceToolCall("get_impact_zone", { file_path }, async () => {
+            await autoSyncIfNeeded();
+            const graph = readJsonFile(".agent/graph.json");
+            if (!graph) return { content: [{ type: "text" as const, text: "Graph not found." }] };
+
+            const normalizedPath = file_path.replace(/^\.\//, "");
+            const affected = graph.edges
+                ?.filter((e: any) => e.target === normalizedPath)
+                .map((e: any) => e.source) || [];
+
+            return { content: [{ type: "text" as const, text: JSON.stringify({ file: normalizedPath, affected }, null, 2) }] };
+        });
+    }
+);
 
-        const normalizedPath = file_path.replace(/^\.\//, "");
-        const affected = graph.edges
-            ?.filter((e: any) => e.target === normalizedPath)
-            .map((e: any) => e.source) || [];
+// ============================================================================
+// Tool: force_sync (NEW)
+// ============================================================================
 
-        return { content: [{ type: "text" as const, text: JSON.stringify({ file: normalizedPath, affected }, null, 2) }] };
+server.tool(
+    "force_sync",
+    "Force refresh all AI data (graph, chunks, AGENTS.md)",
+    {
+        target: z.enum(["all", "graph", "rag", "agents_md"]).optional().default("all")
+    },
+    async ({ target }) => {
+        return traceToolCall("force_sync", { target }, async () => {
+            const result = await syncer.syncAll();
+            return {
+                content: [{
+                    type: "text" as const,
+                    text: JSON.stringify({
+                        success: true,
+                        target,
+                        ...result
+                    }, null, 2)
+                }]
+            };
+        });
+    }
+);
+
+// ============================================================================
+// Tool: get_metrics (NEW - Observability)
+// ============================================================================
+
+server.tool(
+    "get_metrics",
+    "Get MCP server performance metrics",
+    {},
+    async () => {
+        return traceToolCall("get_metrics", {}, async () => {
+            const metrics = getMetrics();
+            return {
+                content: [{
+                    type: "text" as const,
+                    text: JSON.stringify(metrics, null, 2)
+                }]
+            };
+        });
+    }
+);
+
+// ============================================================================
+// Tool: get_server_info (NEW)
+// ============================================================================
+
+server.tool(
+    "get_server_info",
+    "Get MCP server information and capabilities",
+    {},
+    async () => {
+        return {
+            content: [{
+                type: "text" as const,
+                text: JSON.stringify({
+                    name: "agent-kit-gateway",
+                    version: "2.0.0",
+                    features: {
+                        transport: ENABLE_HTTP ? ["stdio", "streamable-http"] : ["stdio"],
+                        auth: ENABLE_AUTH ? ["api-key", "oauth2.1"] : ["none"],
+                        observability: ["opentelemetry", "metrics"],
+                    },
+                    tools: [
+                        "get_project_context",
+                        "get_project_intelligence",
+                        "analyze_dependencies",
+                        "search_knowledge",
+                        "search_code_logic",
+                        "get_impact_zone",
+                        "force_sync",
+                        "get_metrics",
+                        "get_server_info",
+                    ],
+                    project_root: PROJECT_ROOT,
+                }, null, 2)
+            }]
+        };
     }
 );
 
@@ -260,11 +386,32 @@ server.tool(
 // ============================================================================
 
 async function main() {
-    const transport = new StdioServerTransport();
-    await server.connect(transport);
+    console.error("[MCP] Agent Kit Gateway v2.0.0 starting...");
+    console.error(`[MCP] Project root: ${PROJECT_ROOT}`);
+
+    // Start stdio transport (always)
+    const stdioTransport = new StdioServerTransport();
+    await server.connect(stdioTransport);
+    console.error("[MCP] stdio transport connected");
+
+    // Optionally start HTTP transport
+    if (ENABLE_HTTP) {
+        const httpOptions: StreamableHttpOptions = {
+            port: HTTP_PORT,
+            enableSSE: true,
+            stateless: true,
+            enableAuth: ENABLE_AUTH,
+            corsOrigins: process.env.MCP_CORS_ORIGINS?.split(",") || [],
+        };
+
+        await createStreamableHttpTransport(httpOptions);
+        console.error(`[MCP] Streamable HTTP transport available on port ${HTTP_PORT}`);
+    }
+
+    console.error("[MCP] Gateway ready!");
 }
 
 main().catch(err => {
-    console.error(err);
+    console.error("[MCP] Fatal error:", err);
     process.exit(1);
 });

package/.agent/mcp-gateway/src/observability/index.ts

@@ -0,0 +1,5 @@
+/**
+ * Observability module exports
+ */
+
+export * from "./otel.js";