@crowley/rag-mcp 1.0.5 → 1.0.6

package/dist/tool-middleware.js

@@ -0,0 +1,216 @@
+/**
+ * Tool Middleware — standalone middleware functions for MCP tool handlers.
+ *
+ * Extracted from ToolRegistry.handle() so that McpServer.registerTool()
+ * (Phase 3) can reuse the same pipeline:
+ *   auto-session → enrichment.before → handler → enrichment.after → trackUsage
+ *
+ * During Phase 2 migration, ToolRegistry continues to use its own copy.
+ * Phase 3 replaces ToolRegistry with wrapHandler() + McpServer.registerTool().
+ */
+// ── Timeouts ────────────────────────────────────────────────
+/** Default tool timeout in milliseconds */
+const DEFAULT_TIMEOUT_MS = 30_000;
+/** Per-tool timeout overrides (ms) */
+export const TOOL_TIMEOUTS = {
+    // Indexing / heavy analysis — up to 2 min
+    index_codebase: 120_000,
+    reindex_zero_downtime: 120_000,
+    cluster_code: 60_000,
+    find_duplicates: 60_000,
+    run_quality_gates: 60_000,
+    analyze_project_structure: 60_000,
+    estimate_feature: 60_000,
+    // Quick search — 15 s
+    search_codebase: 15_000,
+    hybrid_search: 15_000,
+    search_similar: 15_000,
+    search_graph: 15_000,
+    grouped_search: 15_000,
+    search_docs: 10_000,
+    find_symbol: 10_000,
+    // Memory / recall — 10 s
+    recall: 10_000,
+    remember: 10_000,
+    context_briefing: 15_000,
+};
+/** Race a promise against a timeout */
+async function withTimeout(promise, ms, name) {
+    let timer;
+    const timeout = new Promise((_, reject) => {
+        timer = setTimeout(() => reject(new Error(`Tool '${name}' timed out after ${ms}ms`)), ms);
+    });
+    try {
+        return await Promise.race([promise, timeout]);
+    }
+    finally {
+        clearTimeout(timer);
+    }
+}
+// ── Constants ───────────────────────────────────────────────
+/** Tools excluded from usage tracking (meta/admin, avoid recursion) */
+export const TRACKING_EXCLUDE = new Set([
+    "get_tool_analytics",
+    "get_knowledge_gaps",
+    "analyze_usage_patterns",
+    "get_behavior_patterns",
+    "get_quality_metrics",
+    "get_cache_stats",
+    "get_prediction_stats",
+    "get_rag_guidelines",
+]);
+/** Session management tools — skip auto-session to avoid recursion */
+export const SESSION_TOOLS = new Set([
+    "start_session",
+    "end_session",
+    "get_session_context",
+]);
+// ── Helpers ─────────────────────────────────────────────────
+/** Summarize tool args into a short string for analytics */
+export function summarizeInput(name, args) {
+    const q = args.query || args.question || args.feature || args.description || args.task || "";
+    if (q && typeof q === "string")
+        return q.slice(0, 200);
+    const content = args.content || args.code || args.diff || "";
+    if (content && typeof content === "string")
+        return content.slice(0, 100);
+    const file = args.file || args.filePath || args.currentFile || "";
+    if (file && typeof file === "string")
+        return file;
+    for (const v of Object.values(args)) {
+        if (typeof v === "string" && v.length > 0)
+            return v.slice(0, 150);
+    }
+    return name;
+}
+/** Count results from a tool response string */
+export function countResults(result) {
+    if (result.includes("No results") ||
+        result.includes("No matches") ||
+        result.includes("not found"))
+        return 0;
+    const numbered = result.match(/^\d+\./gm);
+    if (numbered)
+        return numbered.length;
+    const bullets = result.match(/^[-*] /gm);
+    if (bullets)
+        return bullets.length;
+    return 1;
+}
+// ── Session management ──────────────────────────────────────
+/** Shared lock to prevent concurrent auto-session starts */
+let autoSessionPromise = null;
+/** Auto-start a session via the RAG API if none is active */
+export async function ensureSession(ctx) {
+    if (ctx.activeSessionId)
+        return;
+    if (autoSessionPromise) {
+        await autoSessionPromise;
+        return;
+    }
+    autoSessionPromise = doAutoStartSession(ctx);
+    try {
+        await autoSessionPromise;
+    }
+    finally {
+        autoSessionPromise = null;
+    }
+}
+async function doAutoStartSession(ctx) {
+    try {
+        const response = await ctx.api.post("/api/session/start", {
+            projectName: ctx.projectName,
+            initialContext: "auto-started by MCP tool call",
+        });
+        const session = response.data?.session;
+        const sid = session?.sessionId || response.data?.sessionId;
+        if (sid) {
+            ctx.activeSessionId = sid;
+        }
+        // Fire-and-forget: ensure critical collections exist
+        ctx.api
+            .post("/api/ensure-collections", { projectName: ctx.projectName })
+            .catch(() => { });
+    }
+    catch {
+        // Silent — auto-session must never block tool execution
+    }
+}
+// ── Usage tracking ──────────────────────────────────────────
+/** Fire-and-forget usage tracking */
+export function trackUsage(name, args, startTime, success, result, errorMessage, ctx) {
+    if (TRACKING_EXCLUDE.has(name))
+        return;
+    ctx.api
+        .post("/api/track-usage", {
+        projectName: ctx.projectName,
+        sessionId: ctx.activeSessionId,
+        toolName: name,
+        inputSummary: summarizeInput(name, args),
+        startTime,
+        resultCount: success ? countResults(result) : 0,
+        success,
+        errorMessage,
+    })
+        .catch(() => { });
+}
+// ── Error formatting ────────────────────────────────────────
+/** Format an error caught during tool execution */
+export function formatToolError(error, ctx) {
+    const err = error;
+    if (err.code === "ECONNREFUSED") {
+        return (`Error: Cannot connect to RAG API at ${ctx.api.defaults.baseURL}. Is it running?\n` +
+            `Start with: cd docker && docker-compose up -d`);
+    }
+    if (err.response) {
+        return `API Error (${err.response.status}): ${JSON.stringify(err.response.data)}`;
+    }
+    return `Error: ${err.message || String(error)}`;
+}
+/**
+ * Wrap a raw ToolHandler with the full middleware pipeline:
+ * auto-session → enrichment.before → handler → enrichment.after → trackUsage
+ *
+ * Returns a ToolHandler with the same signature, so it works both
+ * with the legacy ToolRegistry and the Phase 3 McpServer adapter.
+ */
+export function wrapHandler(name, handler, deps) {
+    return async (args, ctx) => {
+        // Auto-start session (skip for session management tools)
+        if (!SESSION_TOOLS.has(name)) {
+            await ensureSession(ctx);
+        }
+        const startTime = Date.now();
+        try {
+            // Before: auto-enrich context
+            const contextPrefix = ctx.enrichmentEnabled && deps.enricher
+                ? await deps.enricher.before(name, args, ctx)
+                : null;
+            // Execute original handler (with timeout)
+            const timeoutMs = TOOL_TIMEOUTS[name] ?? DEFAULT_TIMEOUT_MS;
+            const result = await withTimeout(handler(args, ctx), timeoutMs, name);
+            // Extract text for tracking/enrichment
+            const text = typeof result === "string" ? result : result.text;
+            // After: track interaction (fire-and-forget)
+            if (deps.enricher) {
+                deps.enricher.after(name, args, text, ctx);
+            }
+            // Track usage (fire-and-forget)
+            trackUsage(name, args, startTime, true, text, undefined, ctx);
+            // Prepend context if available
+            if (contextPrefix) {
+                if (typeof result === "string") {
+                    return contextPrefix + "\n\n" + result;
+                }
+                return { text: contextPrefix + "\n\n" + result.text, structured: result.structured };
+            }
+            return result;
+        }
+        catch (error) {
+            const errorMessage = formatToolError(error, ctx);
+            // Track failed usage (fire-and-forget)
+            trackUsage(name, args, startTime, false, "", errorMessage, ctx);
+            return errorMessage;
+        }
+    };
+}

package/dist/tool-registry.js

@@ -149,7 +149,8 @@ export class ToolRegistry {
                 ? await this.enricher.before(name, args, ctx)
                 : null;
             // Execute original handler
-            const result = await handler(args, ctx);
+            const rawResult = await handler(args, ctx);
+            const result = typeof rawResult === "string" ? rawResult : rawResult.text;
             // After: track interaction (fire-and-forget)
             if (this.enricher) {
                 this.enricher.after(name, args, result, ctx);

package/dist/tools/advanced.d.ts

@@ -2,8 +2,8 @@
  * Advanced tools module - memory merging, code completion context,
  * import suggestions, type context, and behavior patterns.
  */
-import type { ToolModule } from "../types.js";
+import type { ToolSpec } from "../types.js";
 /**
  * Create the advanced tools module with project-specific descriptions.
  */
-export declare function createAdvancedTools(projectName: string): ToolModule;
+export declare function createAdvancedTools(projectName: string): ToolSpec[];