@mushi-mushi/mcp 0.17.0 → 0.18.0

package/dist/server.js

@@ -2,13 +2,14 @@ import {
   CODEBASE_TOOL_CATALOG,
   TDD_TOOL_CATALOG,
   TOOL_CATALOG
-} from "./chunk-MM3IMFM4.js";
+} from "./chunk-KNVB6HA7.js";
 import {
   MUSHI_SERVER_METADATA
-} from "./chunk-EHB2BGWX.js";
+} from "./chunk-EANW5YTI.js";
 import {
+  DEPRECATED_TOOL_ALIASES,
   toolMatchesFeatures
-} from "./chunk-ZX3XIJ7S.js";
+} from "./chunk-VBXXUK5G.js";
 
 // src/server.ts
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
@@ -45,8 +46,8 @@ var MUSHI_DOCS_INDEX = [
   {
     title: "Cursor MCP troubleshooting",
     path: `${BASE}/guides/mcp-setup`,
-    keywords: ["cursor", "mcp.json", "red badge", "transport error", "stdout", "stderr", "json-rpc", "INVALID_TOKEN", "syntax helper", "diagnose_connection"],
-    excerpt: "Cursor stdio MCP requires stdout to contain only JSON-RPC. Use the console syntax helper, restart Cursor MCP, then run diagnose_connection."
+    keywords: ["cursor", "mcp.json", "red badge", "transport error", "stdout", "stderr", "json-rpc", "INVALID_TOKEN", "syntax helper", "diagnose_setup"],
+    excerpt: "Cursor stdio MCP requires stdout to contain only JSON-RPC. Use the console syntax helper, restart Cursor MCP, then run diagnose_setup."
   },
   {
     title: "Judge loop",
@@ -123,6 +124,7 @@ function searchMushiDocs(query, limit = 8) {
 }
 
 // src/server.ts
+var NO_ARG_INPUT = {};
 var MushiApiError = class extends Error {
   constructor(status, code, message) {
     super(`[${code}] ${message}`);
@@ -359,7 +361,7 @@ function createMushiServer(config) {
       title: titleOf("get_two_way_comms_health"),
       description: descOf("get_two_way_comms_health"),
       annotations: annotationsFor("get_two_way_comms_health"),
-      inputSchema: {}
+      inputSchema: NO_ARG_INPUT
     },
     async () => jsonText(await apiCall("/v1/sync/two-way-health"))
   );
@@ -501,14 +503,14 @@ function createMushiServer(config) {
     }
   );
   server.registerTool(
-    "graph_neighborhood",
+    "get_graph_neighborhood",
     {
-      title: titleOf("graph_neighborhood"),
-      description: descOf("graph_neighborhood"),
-      annotations: annotationsFor("graph_neighborhood"),
+      title: titleOf("get_graph_neighborhood"),
+      description: descOf("get_graph_neighborhood"),
+      annotations: annotationsFor("get_graph_neighborhood"),
       inputSchema: {
-        seed: z.string().describe("Starting node id or label"),
-        depth: z.number().optional().describe("Traversal depth (default 2, max 4)")
+        seed: z.string().describe("Starting graph node id or label to expand around (e.g. an inventory Action id or component name)"),
+        depth: z.number().int().min(1).max(4).optional().describe("BFS hops to traverse outward. Default 2; clamped to a max of 4.")
       }
     },
     async (args) => {
@@ -520,65 +522,65 @@ function createMushiServer(config) {
     }
   );
   server.registerTool(
-    "graph_node_status",
+    "get_graph_node",
     {
-      title: titleOf("graph_node_status"),
-      description: descOf("graph_node_status"),
-      annotations: annotationsFor("graph_node_status"),
-      inputSchema: { nodeId: z.string().describe("graph_nodes.id") }
+      title: titleOf("get_graph_node"),
+      description: descOf("get_graph_node"),
+      annotations: annotationsFor("get_graph_node"),
+      inputSchema: { nodeId: z.string().describe("The graph_nodes.id of the node to fetch (UUID).") }
     },
     async (args) => jsonText(await apiCall(`/v1/admin/graph/node/${args.nodeId}`))
   );
   server.registerTool(
-    "inventory_get",
+    "get_inventory",
     {
-      title: titleOf("inventory_get"),
-      description: descOf("inventory_get"),
-      annotations: annotationsFor("inventory_get"),
+      title: titleOf("get_inventory"),
+      description: descOf("get_inventory"),
+      annotations: annotationsFor("get_inventory"),
       inputSchema: {
         projectId: z.string().optional().describe("Project UUID \u2014 defaults to the server-configured project when omitted")
       }
     },
     async (args) => {
       const pid = args.projectId ?? projectId;
-      if (!pid) throw new MushiApiError(400, "MISSING_PROJECT", "projectId is required for inventory_get");
+      if (!pid) throw new MushiApiError(400, "MISSING_PROJECT", "projectId is required for get_inventory");
       return jsonText(await apiCall(`/v1/admin/inventory/${pid}`));
     }
   );
   server.registerTool(
-    "inventory_diff",
+    "diff_inventory",
     {
-      title: titleOf("inventory_diff"),
-      description: descOf("inventory_diff"),
-      annotations: annotationsFor("inventory_diff"),
+      title: titleOf("diff_inventory"),
+      description: descOf("diff_inventory"),
+      annotations: annotationsFor("diff_inventory"),
       inputSchema: {
         projectId: z.string().optional().describe("Project UUID \u2014 defaults to configured project"),
-        fromSha: z.string().describe("Older commit SHA (baseline)"),
-        toSha: z.string().describe("Newer commit SHA (candidate)")
+        fromSha: z.string().describe("Older commit SHA (the baseline to diff from)"),
+        toSha: z.string().describe("Newer commit SHA (the candidate to diff to)")
       }
     },
     async (args) => {
       const pid = args.projectId ?? projectId;
-      if (!pid) throw new MushiApiError(400, "MISSING_PROJECT", "projectId is required for inventory_diff");
+      if (!pid) throw new MushiApiError(400, "MISSING_PROJECT", "projectId is required for diff_inventory");
       const q = new URLSearchParams({ from: args.fromSha, to: args.toSha });
       return jsonText(await apiCall(`/v1/admin/inventory/${pid}/diff?${q}`));
     }
   );
   server.registerTool(
-    "inventory_findings",
+    "list_gate_findings",
     {
-      title: titleOf("inventory_findings"),
-      description: descOf("inventory_findings"),
-      annotations: annotationsFor("inventory_findings"),
+      title: titleOf("list_gate_findings"),
+      description: descOf("list_gate_findings"),
+      annotations: annotationsFor("list_gate_findings"),
       inputSchema: {
         projectId: z.string().optional().describe("Project UUID \u2014 defaults to configured project"),
-        gate: z.string().optional().describe("Filter by gate id (e.g. dead_handler, status_claim)"),
-        severity: z.string().optional().describe("Filter findings by severity")
+        gate: z.string().optional().describe("Filter to one gate id: dead-handler | mock-leak | crawl | status-claim"),
+        severity: z.string().optional().describe("Minimum severity to include: low | medium | high | critical")
       }
     },
     async (args) => {
       const pid = args.projectId ?? projectId;
-      if (!pid) throw new MushiApiError(400, "MISSING_PROJECT", "projectId is required for inventory_findings");
+      if (!pid) throw new MushiApiError(400, "MISSING_PROJECT", "projectId is required for list_gate_findings");
       const q = new URLSearchParams();
       if (args.gate) q.set("gate", args.gate);
       if (args.severity) q.set("severity", args.severity);
@@ -587,17 +589,25 @@ function createMushiServer(config) {
     }
   );
   server.registerTool(
-    "fix_suggest",
+    "suggest_fix",
     {
-      title: titleOf("fix_suggest"),
-      description: descOf("fix_suggest"),
-      annotations: annotationsFor("fix_suggest"),
-      inputSchema: { reportId: z.string().describe("Report UUID") }
+      title: titleOf("suggest_fix"),
+      description: descOf("suggest_fix"),
+      annotations: annotationsFor("suggest_fix"),
+      inputSchema: { reportId: z.string().describe("Report UUID to read the Stage-2 suggested-fix slice for") },
+      outputSchema: {
+        reportId: z.string().describe("The report this slice was read from"),
+        rootCause: z.unknown().describe("Stage-2 root-cause hint, or null if not yet classified"),
+        suggestedFix: z.unknown().describe("Stage-2 suggested fix, or null if not yet classified"),
+        reproductionSteps: z.unknown().describe("Reproduction steps recorded on the report (array; [] if none)"),
+        summary: z.unknown().describe("One-line report summary, or null"),
+        component: z.unknown().describe("Component/page the bug was attributed to, or null")
+      }
     },
     async (args) => {
       const report = await apiCall(`/v1/admin/reports/${args.reportId}`);
       const s2 = report.stage2_analysis;
-      return jsonText({
+      return jsonResult({
         reportId: args.reportId,
         rootCause: s2?.rootCause ?? null,
         suggestedFix: s2?.suggestedFix ?? null,
@@ -623,73 +633,6 @@ function createMushiServer(config) {
       return jsonText(data);
     }
   );
-  server.registerTool(
-    "setup_check",
-    {
-      title: titleOf("setup_check"),
-      description: descOf("setup_check"),
-      annotations: annotationsFor("setup_check"),
-      inputSchema: {
-        projectId: z.string().optional().describe(
-          "Project UUID to check. Falls back to the projectId the server was initialised with."
-        )
-      }
-    },
-    async (args) => {
-      const resolvedId = args.projectId ?? projectId;
-      if (!resolvedId) {
-        return jsonText({
-          ok: false,
-          error: "No projectId provided and none configured on the MCP server. Pass projectId explicitly."
-        });
-      }
-      const data = await apiCall(`/v1/admin/projects/${resolvedId}/preflight`);
-      const summary = data.checks.map((c) => ({
-        check: c.key,
-        label: c.label,
-        passed: c.ready,
-        hint: c.hint,
-        fixPath: c.fixHref
-      }));
-      return jsonText({
-        ready: data.ready,
-        repoUrl: data.repoUrl ?? null,
-        checks: summary,
-        // Human-readable summary for agents that paste the result into a prompt
-        summary: data.ready ? `Project ${resolvedId} is ready to dispatch auto-fixes${data.repoUrl ? ` (target: ${data.repoUrl})` : ""}.` : `Project ${resolvedId} cannot dispatch yet \u2014 ${summary.filter((c) => !c.passed).map((c) => c.label).join(", ")}.`
-      });
-    }
-  );
-  server.registerTool(
-    "ingest_setup_check",
-    {
-      title: titleOf("ingest_setup_check"),
-      description: descOf("ingest_setup_check"),
-      annotations: annotationsFor("ingest_setup_check"),
-      inputSchema: {}
-    },
-    async () => {
-      const data = await apiCall("/v1/sync/ingest-setup");
-      const failed = data.steps.filter((s) => s.required && !s.complete);
-      const summary = data.ready ? `Ingest setup complete (${data.required_complete}/${data.required_total}) for ${data.project_name}.` : `Ingest incomplete (${data.required_complete}/${data.required_total}) \u2014 still need: ${failed.map((s) => s.label).join(", ")}.`;
-      return jsonText({
-        ready: data.ready,
-        projectId: data.project_id,
-        projectName: data.project_name,
-        requiredComplete: data.required_complete,
-        requiredTotal: data.required_total,
-        steps: data.steps.map((s) => ({
-          id: s.id,
-          label: s.label,
-          passed: s.complete,
-          required: s.required,
-          hint: s.hint
-        })),
-        diagnostic: data.diagnostic ?? null,
-        summary
-      });
-    }
-  );
   server.registerTool(
     "diagnose_setup",
     {
@@ -707,7 +650,8 @@ function createMushiServer(config) {
         summary: z.string(),
         nextAction: z.string().optional(),
         ingest: z.unknown().optional(),
-        dispatch: z.unknown().optional()
+        dispatch: z.unknown().optional(),
+        connection: z.unknown().optional()
       }
     },
     async (args) => {
@@ -747,160 +691,99 @@ function createMushiServer(config) {
           dispatch: { repoUrl: data.repoUrl ?? null, checks: data.checks }
         });
       }
-      const ingest = await apiCall("/v1/sync/ingest-setup");
-      let dispatchReady = true;
-      let dispatchBlock;
-      let dispatchChecks = null;
-      if (resolvedId) {
-        try {
-          const preflight = await apiCall(`/v1/admin/projects/${resolvedId}/preflight`);
-          dispatchReady = preflight.ready;
-          dispatchChecks = preflight.checks;
-          if (!preflight.ready) {
-            const failed = preflight.checks.filter((c) => !c.ready);
-            dispatchBlock = failed[0]?.hint;
-          }
-        } catch {
-          dispatchReady = false;
-          dispatchBlock = "Could not run dispatch preflight \u2014 verify project_id and API key scope.";
-        }
-      }
-      const ingestFailed = ingest.steps.filter((s) => s.required && !s.complete);
-      const ingestBlock = ingestFailed[0]?.hint;
-      const ready = ingest.ready && dispatchReady;
-      const nextAction = !ingest.ready ? ingestBlock ?? "Complete SDK ingest setup." : !dispatchReady ? dispatchBlock ?? "Complete dispatch preflight in Settings \u2192 Integrations." : "All setup checks pass \u2014 submit a test report to confirm end-to-end.";
-      const summary = ready ? "Mushi ingest and dispatch setup look healthy." : !ingest.ready ? `Ingest incomplete \u2014 ${ingestFailed.map((s) => s.label).join(", ")}.` : "Ingest OK; dispatch preflight still has blockers.";
-      return jsonResult({
-        mode: "full",
-        ready,
-        summary,
-        nextAction,
-        ingest: { ready: ingest.ready, steps: ingest.steps },
-        dispatch: resolvedId ? { ready: dispatchReady, checks: dispatchChecks } : null
-      });
-    }
-  );
-  server.registerTool(
-    "diagnose_connection",
-    {
-      title: titleOf("diagnose_connection"),
-      description: descOf("diagnose_connection"),
-      annotations: annotationsFor("diagnose_connection"),
-      inputSchema: {},
-      outputSchema: {
-        ready: z.boolean(),
-        healthOk: z.boolean(),
-        ingestReady: z.boolean(),
-        dispatchReady: z.boolean(),
-        endpoint: z.string().nullable(),
-        projectId: z.string().nullable(),
-        accessibleProjectCount: z.number().nullable(),
-        issues: z.array(z.unknown()),
-        nextAction: z.string(),
-        summary: z.string()
-      }
-    },
-    async () => {
-      const issues = [];
+      const connIssues = [];
+      let healthOk = false;
       if (!apiKey?.startsWith("mushi_")) {
-        issues.push({
+        connIssues.push({
           check: "mcp_api_key",
-          detail: "MCP server API key missing or malformed",
-          fix: "Run `mushi connect` to write MUSHI_API_KEY into .cursor/mcp.json, then restart the MCP server."
+          detail: "MCP server API key missing or malformed (expected prefix: mushi_)",
+          fix: "Run `mushi connect` or set MUSHI_API_KEY to a valid key in your MCP config."
         });
       }
       if (!apiEndpoint) {
-        issues.push({
+        connIssues.push({
           check: "mcp_endpoint",
           detail: "No API endpoint configured",
-          fix: "Set MUSHI_API_ENDPOINT to your `\u2026/functions/v1/api` URL in .cursor/mcp.json."
+          fix: "Set MUSHI_API_ENDPOINT to your `.../functions/v1/api` URL in your MCP config."
         });
-      }
-      let healthOk = false;
-      if (apiEndpoint) {
+      } else {
         try {
           const healthRes = await doFetch(`${apiEndpoint.replace(/\/$/, "")}/health`, {
             signal: AbortSignal.timeout(5e3)
           });
           healthOk = healthRes.status === 200;
           if (!healthOk) {
-            issues.push({
+            connIssues.push({
               check: "endpoint_health",
               detail: `GET /health \u2192 HTTP ${healthRes.status}`,
               fix: "Verify MUSHI_API_ENDPOINT and that the Supabase edge function is deployed."
             });
           }
         } catch (err) {
-          issues.push({
+          connIssues.push({
             check: "endpoint_health",
             detail: err instanceof Error ? err.message : String(err),
-            fix: "Check network connectivity and the endpoint URL in .cursor/mcp.json."
+            fix: "Check network connectivity and MUSHI_API_ENDPOINT in your MCP config."
           });
         }
       }
-      let ingestReady = false;
-      let dispatchReady = false;
       let accessibleProjectCount = null;
-      if (!projectId && healthOk) {
+      if (!resolvedId && healthOk) {
         try {
-          const overview = await apiCall("/v1/admin/mcp/account-overview");
+          const overview = await apiCall(
+            "/v1/admin/mcp/account-overview"
+          );
           accessibleProjectCount = overview.total;
           if (overview.total === 0) {
-            issues.push({
+            connIssues.push({
               check: "no_accessible_projects",
               detail: "API key has no accessible projects",
-              fix: "Mint an API key on a project (console \u2192 Projects \u2192 API Keys) or add MUSHI_PROJECT_ID to restrict to a single project."
+              fix: "Mint an API key on a project (console \u2192 Projects \u2192 API Keys) or add MUSHI_PROJECT_ID."
             });
           }
         } catch {
         }
       }
-      try {
-        const ingest = await apiCall("/v1/sync/ingest-setup");
-        ingestReady = ingest.ready;
-        if (!ingest.ready) {
-          const failed = ingest.steps.filter((s) => s.required && !s.complete);
-          issues.push({
-            check: "ingest_setup",
-            detail: `Incomplete: ${failed.map((s) => s.label).join(", ")}`,
-            fix: failed[0]?.hint ?? "Paste the SDK snippet, start your dev server, submit a test report."
-          });
-        }
-      } catch (err) {
-        issues.push({
-          check: "ingest_setup",
-          detail: err instanceof Error ? err.message : String(err),
-          fix: "Confirm API key is active for this project (Projects \u2192 API Keys)."
-        });
-      }
-      if (projectId) {
+      const ingest = await apiCall("/v1/sync/ingest-setup");
+      let dispatchReady = true;
+      let dispatchBlock;
+      let dispatchChecks = null;
+      if (resolvedId) {
         try {
-          const preflight = await apiCall(`/v1/admin/projects/${projectId}/preflight`);
+          const preflight = await apiCall(`/v1/admin/projects/${resolvedId}/preflight`);
           dispatchReady = preflight.ready;
+          dispatchChecks = preflight.checks;
           if (!preflight.ready) {
             const failed = preflight.checks.filter((c) => !c.ready);
-            issues.push({
-              check: "dispatch_preflight",
-              detail: `Blocked: ${failed.map((c) => c.label).join(", ")}`,
-              fix: failed[0]?.hint ?? "Open Settings \u2192 Integrations and complete GitHub + BYOK setup."
-            });
+            dispatchBlock = failed[0]?.hint;
           }
-        } catch {
+        } catch (err) {
+          dispatchReady = false;
+          const detail = err instanceof Error ? err.message : String(err);
+          dispatchBlock = `Could not run dispatch preflight \u2014 ${detail}`;
+          apiLog.warn("diagnose_setup dispatch preflight failed", { error: detail });
         }
       }
-      const ready = issues.length === 0 && healthOk && ingestReady;
-      const nextAction = issues[0]?.fix ?? (ready ? "Connection healthy \u2014 SDK ingest is working. Submit a report to confirm end-to-end." : "Run `mushi doctor` in your app repo for a full local checklist.");
+      const ingestFailed = ingest.steps.filter((s) => s.required && !s.complete);
+      const ingestBlock = ingestFailed[0]?.hint;
+      const connOk = connIssues.length === 0;
+      const ready = connOk && ingest.ready && dispatchReady;
+      const nextAction = !connOk ? connIssues[0]?.fix ?? "Fix the connection issue above." : !ingest.ready ? ingestBlock ?? "Complete SDK ingest setup." : !dispatchReady ? dispatchBlock ?? "Complete dispatch preflight in Settings \u2192 Integrations." : "All setup checks pass \u2014 submit a test report to confirm end-to-end.";
+      const summary = ready ? "Mushi connection, ingest, and dispatch setup look healthy." : !connOk ? `Connection issue \u2014 ${connIssues[0]?.check}: ${connIssues[0]?.detail}` : !ingest.ready ? `Ingest incomplete \u2014 ${ingestFailed.map((s) => s.label).join(", ")}.` : "Ingest OK; dispatch preflight still has blockers.";
       return jsonResult({
+        mode: "full",
         ready,
-        healthOk,
-        ingestReady,
-        dispatchReady,
-        endpoint: apiEndpoint ?? null,
-        projectId: projectId ?? null,
-        accessibleProjectCount,
-        issues,
+        summary,
         nextAction,
-        summary: ready ? "MCP credentials valid; ingest pipeline ready." : `Connection issue \u2014 ${issues[0]?.check ?? "unknown"}: ${nextAction}`
+        connection: {
+          healthOk,
+          endpoint: apiEndpoint ?? null,
+          projectId: resolvedId ?? null,
+          accessibleProjectCount,
+          issues: connIssues
+        },
+        ingest: { ready: ingest.ready, steps: ingest.steps },
+        dispatch: resolvedId ? { ready: dispatchReady, checks: dispatchChecks } : null
       });
     }
   );
@@ -939,7 +822,7 @@ function createMushiServer(config) {
       title: titleOf("list_projects"),
       description: descOf("list_projects"),
       annotations: annotationsFor("list_projects"),
-      inputSchema: {},
+      inputSchema: NO_ARG_INPUT,
       outputSchema: {
         projects: z.array(z.unknown()),
         total: z.number().optional(),
@@ -960,7 +843,7 @@ function createMushiServer(config) {
       title: titleOf("get_account_overview"),
       description: descOf("get_account_overview"),
       annotations: annotationsFor("get_account_overview"),
-      inputSchema: {},
+      inputSchema: NO_ARG_INPUT,
       outputSchema: {
         projects: z.array(z.unknown()),
         total: z.number(),
@@ -1079,7 +962,7 @@ function createMushiServer(config) {
       description: descOf("triage_issue"),
       annotations: annotationsFor("triage_issue"),
       inputSchema: {
-        report_id: z.string().describe("Report UUID to triage."),
+        report_id: z.string().uuid().describe("Report UUID to triage."),
         project_id: z.string().optional().describe("Project UUID. Defaults to configured project."),
         include_logs: z.boolean().optional().describe("Include recent pipeline logs in triage packet (default: true).")
       },
@@ -1140,11 +1023,31 @@ function createMushiServer(config) {
           args: { reportId: args.report_id }
         });
       }
+      const partial_errors = [];
+      if (reportRes.status === "rejected") {
+        partial_errors.push(`report: ${String(reportRes.reason)}`);
+      }
+      if (evidenceRes.status === "rejected") {
+        partial_errors.push(`timeline: ${String(evidenceRes.reason)}`);
+      }
+      if (similarRes.status === "rejected") {
+        partial_errors.push(`similarity: ${String(similarRes.reason)}`);
+      }
+      if (fixCtxRes.status === "rejected") {
+        partial_errors.push(`fix_context: ${String(fixCtxRes.reason)}`);
+      }
+      if (blastRes.status === "rejected") {
+        partial_errors.push(`blast_radius: ${String(blastRes.reason)}`);
+      }
+      if (includeLogs && logsRes.status === "rejected") {
+        partial_errors.push(`recent_logs: ${String(logsRes.reason)}`);
+      }
       const result = {
         report_id: args.report_id,
         severity,
         category,
         status,
+        partial_errors,
         report: reportRes.status === "fulfilled" ? reportRes.value : { error: String(reportRes.reason) },
         reporter_thread: evidenceRes.status === "fulfilled" ? evidenceRes.value : null,
         similar_bugs: similarRes.status === "fulfilled" ? similarRes.value : null,
@@ -1209,7 +1112,7 @@ function createMushiServer(config) {
       description: descOf("dispatch_fix"),
       annotations: annotationsFor("dispatch_fix"),
       inputSchema: {
-        reportId: z.string().describe("Report UUID to fix"),
+        reportId: z.string().uuid().describe("Report UUID to fix"),
         agent: z.enum(["claude_code", "codex", "rest_worker", "mcp"]).optional().describe("Override the agent adapter"),
         idempotencyKey: z.string().uuid().optional().describe("Optional RFC 4122 UUID. Resend the same key to safely retry without dispatching a duplicate fix job (Idempotency-Key IETF draft)."),
         inventoryActionNodeId: z.string().uuid().optional().describe("Optional inventory Action node UUID for spec-traceability (\xA72.10). When provided, the fix-worker embeds the expected_outcome contract in the LLM prompt and runs validateAgainstSpec before opening the PR.")
@@ -1293,8 +1196,8 @@ function createMushiServer(config) {
   server.registerTool(
     "merge_fix",
     {
-      title: "Merge fix PR",
-      description: "Squash-merge a fix attempt PR and mark the linked report fixed.",
+      title: titleOf("merge_fix"),
+      description: descOf("merge_fix"),
       annotations: annotationsFor("merge_fix"),
       inputSchema: {
         fixId: z.string().describe("Fix attempt UUID"),
@@ -1312,8 +1215,8 @@ function createMushiServer(config) {
   server.registerTool(
     "refresh_ci",
     {
-      title: "Refresh fix CI status",
-      description: "Pull the latest GitHub check-run status for a fix attempt.",
+      title: titleOf("refresh_ci"),
+      description: descOf("refresh_ci"),
       annotations: annotationsFor("refresh_ci"),
       inputSchema: {
         fixId: z.string().describe("Fix attempt UUID")
@@ -1595,6 +1498,22 @@ function createMushiServer(config) {
       };
     }
   );
+  server.registerTool(
+    "activation_status",
+    {
+      title: titleOf("activation_status"),
+      description: descOf("activation_status"),
+      annotations: annotationsFor("activation_status"),
+      inputSchema: {
+        project_id: z.string().optional().describe("Project UUID (defaults to the configured project).")
+      }
+    },
+    async (args) => {
+      const pid = args.project_id ?? projectId;
+      const qs = pid ? `?project_id=${encodeURIComponent(pid)}` : "";
+      return jsonResult(await apiCall(`/v1/admin/activation${qs}`));
+    }
+  );
   server.resource(
     "activation_status",
     "mushi://activation",
@@ -1693,7 +1612,7 @@ Prefer items that are bottlenecks or critical severity. Skip filler.`
           text: `You are a Mushi onboarding copilot. Use the MCP tools:
 1. Read mushi://activation for unified setup posture.
 2. Read project://integration-health if GitHub or Sentry looks blocked.
-3. Call get_activation_status if the resource is unavailable.
+3. Call diagnose_setup if the resource is unavailable.
 
 Then output:
 - **Status:** one sentence on what is done vs blocked
@@ -2126,36 +2045,6 @@ Be specific. No generic advice.`
       return jsonText({ ok: true, message: `Step ${step_index} \u2192 ${args.status}` });
     }
   );
-  server.registerTool(
-    "get_activation_status",
-    {
-      title: titleOf("get_activation_status"),
-      description: descOf("get_activation_status"),
-      annotations: annotationsFor("get_activation_status"),
-      inputSchema: {
-        project_id: z.string().optional().describe("Optional project UUID override")
-      }
-    },
-    async (args) => {
-      const qs = args.project_id ? `?project_id=${encodeURIComponent(args.project_id)}` : "";
-      const data = await apiCall(`/v1/admin/activation${qs}`);
-      return jsonText(data);
-    }
-  );
-  server.registerTool(
-    "get_reporter_thread",
-    {
-      title: titleOf("get_reporter_thread"),
-      description: descOf("get_reporter_thread"),
-      annotations: annotationsFor("get_reporter_thread"),
-      inputSchema: { reportId: z.string().describe("The report UUID") }
-    },
-    // The reporter thread is the `comments` lane of the unified report
-    // timeline. There is no standalone admin `/comments` route (only the
-    // reporter-token-gated `/v1/reporter/reports/:id/comments`), so we read the
-    // admin-authed timeline, which also carries fix / QA / status lanes.
-    async (args) => jsonText(await apiCall(`/v1/admin/reports/${args.reportId}/timeline`))
-  );
   server.registerTool(
     "ask_codebase",
     {
@@ -2372,6 +2261,39 @@ Be specific. No generic advice.`
       return result;
     });
   }
+  {
+    const llAliasServer = server.server;
+    const innerHandler = llAliasServer?._requestHandlers?.get("tools/call");
+    if (typeof innerHandler === "function") {
+      llAliasServer._requestHandlers.set("tools/call", async (...args) => {
+        const req = args[0];
+        const originalName = req?.params?.name;
+        const canonicalName = originalName ? DEPRECATED_TOOL_ALIASES[originalName] : void 0;
+        if (canonicalName) {
+          const rewritten = {
+            ...args[0],
+            params: { ...req?.params ?? {}, name: canonicalName }
+          };
+          const result = await innerHandler(rewritten, ...args.slice(1));
+          if (result != null && typeof result === "object" && "content" in result && Array.isArray(result.content)) {
+            const r = result;
+            return {
+              ...r,
+              content: [
+                {
+                  type: "text",
+                  text: `\u26A0\uFE0F Deprecated: \`${originalName}\` was renamed to \`${canonicalName}\`. Update your agent config \u2014 this alias will be removed in the next release.`
+                },
+                ...r.content
+              ]
+            };
+          }
+          return result;
+        }
+        return innerHandler(...args);
+      });
+    }
+  }
   return server;
 }
 export {