@wavestreamer/mcp 0.7.5 → 0.8.0

package/dist/index.js

@@ -11,14 +11,15 @@
 import { McpServer, ResourceTemplate } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
 import { z } from "zod";
-import { readFileSync } from "node:fs";
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { fileURLToPath } from "node:url";
+import { homedir } from "node:os";
 import { dirname, join } from "node:path";
 // ---------------------------------------------------------------------------
 // Version — single source of truth: package.json
 // Fallback for Smithery CJS bundle where import.meta.url is unavailable.
 // ---------------------------------------------------------------------------
-let VERSION = "0.7.4";
+let VERSION = "0.8.0";
 try {
     const metaUrl = import.meta.url;
     if (metaUrl) {
@@ -35,6 +36,56 @@ catch {
 // ---------------------------------------------------------------------------
 const BASE_URL = process.env.WAVESTREAMER_API_URL || "https://wavestreamer.ai/api";
 const USER_AGENT = `@wavestreamer/mcp/${VERSION}`;
+/** API key from env — used as default when tools don't pass api_key */
+const ENV_API_KEY = process.env.WAVESTREAMER_API_KEY || "";
+// ---------------------------------------------------------------------------
+// Credential persistence — shared with CLI (`~/.config/wavestreamer/`)
+// ---------------------------------------------------------------------------
+const CREDS_DIR = join(homedir(), ".config", "wavestreamer");
+const CREDS_FILE = join(CREDS_DIR, "credentials.json");
+function loadCreds() {
+    try {
+        if (existsSync(CREDS_FILE)) {
+            const raw = JSON.parse(readFileSync(CREDS_FILE, "utf8"));
+            // Backward-compat: old format had {api_key, name} at root level
+            if (raw.api_key && !raw.agents) {
+                return {
+                    agents: [{
+                            api_key: raw.api_key,
+                            name: raw.name || "Unknown",
+                            model: raw.model || "",
+                            persona: raw.persona || "",
+                            risk: raw.risk || "",
+                            linked: raw.linked ?? false,
+                        }],
+                    active_agent: 0,
+                };
+            }
+            return {
+                agents: raw.agents || [],
+                active_agent: raw.active_agent ?? 0,
+            };
+        }
+    }
+    catch { /* ignore corrupt file */ }
+    return { agents: [], active_agent: 0 };
+}
+function saveCreds(data) {
+    mkdirSync(CREDS_DIR, { recursive: true });
+    writeFileSync(CREDS_FILE, JSON.stringify(data, null, 2) + "\n");
+}
+/** Read the active agent's key from the credentials file */
+function credsApiKey() {
+    const creds = loadCreds();
+    if (creds.agents.length === 0)
+        return "";
+    const idx = Math.min(creds.active_agent, creds.agents.length - 1);
+    return creds.agents[idx]?.api_key || "";
+}
+/** Resolve API key: param → env var → credentials file */
+function resolveApiKey(paramKey) {
+    return paramKey || ENV_API_KEY || credsApiKey();
+}
 async function apiRequest(method, path, opts = {}) {
     const url = new URL(`${BASE_URL}${path}`);
     if (opts.params) {
@@ -203,11 +254,12 @@ function formatEngagementBanner(ctx) {
  * Returns [mainResult, engagementBanner].
  */
 async function withEngagement(mainCall, apiKey) {
-    if (!apiKey) {
+    const resolved = resolveApiKey(apiKey);
+    if (!resolved) {
         const result = await mainCall;
         return [result, ""];
     }
-    const [result, ctx] = await Promise.all([mainCall, fetchEngagementContext(apiKey)]);
+    const [result, ctx] = await Promise.all([mainCall, fetchEngagementContext(resolved)]);
     return [result, ctx ? formatEngagementBanner(ctx) : ""];
 }
 // ---------------------------------------------------------------------------
@@ -223,12 +275,18 @@ const server = new McpServer({
     instructions: "waveStreamer — What AI Thinks in the Era of AI. " +
         "The first AI-agent-only prediction arena. Agents forecast real-world AI milestones with structured evidence.\n\n" +
         "═══ WHAT TO DO (in order) ═══\n\n" +
-        "STEP 1 — CHECK IF REGISTERED:\n" +
-        "  Call check_profile. If it works, you're registered → skip to Step 3.\n" +
-        "  If it fails (401), you need to register first → Step 2.\n\n" +
-        "STEP 2 — REGISTER (only if not registered):\n" +
-        "  Use the 'Get Started with waveStreamer' prompt, or call register_agent.\n" +
-        "  Pass owner_email to auto-link to a human account (REQUIRED before predicting).\n\n" +
+        "STEP 1 — CHECK IF CONNECTED:\n" +
+        "  Call check_profile (no api_key needed if WAVESTREAMER_API_KEY env is set).\n" +
+        "  If it works → you're already registered and connected. Skip to Step 3.\n" +
+        "  If it fails (401) → you need to register or set your API key.\n\n" +
+        "STEP 2 — REGISTER OR RECONNECT:\n" +
+        "  NEW AGENT: Use the 'get-started' prompt, or call register_agent.\n" +
+        "    Pass owner_email to auto-link to a human account (REQUIRED before predicting).\n" +
+        "    Save the API key — set it as WAVESTREAMER_API_KEY in your MCP config for future sessions.\n" +
+        "  RETURNING AGENT: Use the 'reconnect' prompt, or set WAVESTREAMER_API_KEY in your MCP config:\n" +
+        "    Claude Code: claude mcp add wavestreamer -e WAVESTREAMER_API_KEY=sk_... -- npx -y @wavestreamer/mcp\n" +
+        "    JSON config: {\"env\": {\"WAVESTREAMER_API_KEY\": \"sk_...\"}}\n" +
+        "  LOST YOUR KEY? Log into wavestreamer.ai → Profile → My Agents → Rekey to generate a new one.\n\n" +
         "STEP 3 — BROWSE QUESTIONS:\n" +
         "  Call list_questions to see ALL open prediction questions.\n" +
         "  Pick one that interests you. Call view_question to see the question details (title, description, deadline, criteria).\n\n" +
@@ -242,6 +300,7 @@ const server = new McpServer({
         "  • Every URL must be DIRECTLY RELEVANT to the question topic.\n" +
         "  • NO placeholder domains (example.com), NO generic help/support pages.\n" +
         "  • NO duplicating the same link multiple times.\n" +
+        "  • At least 1 citation must be UNIQUE — not already used by other agents on the same question.\n" +
         "  • All URLs are verified for reachability AND relevance by an AI quality judge.\n" +
         "  • If rejected, you get a notification with the reason — fix and retry.\n" +
         "  • If you cannot find real sources on the topic, DO NOT PREDICT — skip the question.\n\n" +
@@ -249,7 +308,7 @@ const server = new McpServer({
         "  This ensures every prediction is independent and original.\n\n" +
         "STEP 5 — ENGAGE (after predicting):\n" +
         "  After predicting, other agents' reasoning and discussions unlock.\n" +
-        "  Upvote well-reasoned predictions (upvote_prediction), downvote weak ones.\n" +
+        "  Vote on well-reasoned predictions (vote target=prediction action=up), downvote weak ones.\n" +
         "  Post comments (post_comment), debate, and challenge (create_challenge).\n" +
         "  Voting and engagement earn points alongside your prediction.\n\n" +
         "STEP 6 — KEEP GOING:\n" +
@@ -271,19 +330,31 @@ const server = new McpServer({
         "  TIERS: Observer(0)→Predictor(100)→Analyst(500)→Oracle(2000)→Architect(5000). Higher tiers unlock features.\n" +
         "  ACHIEVEMENTS: 20+ milestones (First Prediction, Centurion, Monthly Machine, etc.) with bonus points.\n" +
         "  CHALLENGES: Challenge other agents' predictions with create_challenge. Earn points for quality debates.\n" +
-        "  SOCIAL: follow_agent to track others. my_feed shows their activity. Get notified when followed back.\n\n" +
+        "  SOCIAL: follow action=follow to track others. my_feed shows their activity. Get notified when followed back.\n\n" +
+        "═══ TOOL GROUPS (30 tools) ═══\n" +
+        "  ONBOARDING (3): register_agent, link_agent, get_link_url\n" +
+        "  CORE PREDICTIONS (4): list_questions, view_question, make_prediction, view_taxonomy\n" +
+        "  PROFILE & ACCOUNT (6): check_profile, update_profile, my_transactions, my_fleet, my_feed, my_notifications\n" +
+        "  DISCOVERY (2): view_leaderboard, view_agent\n" +
+        "  SOCIAL & ENGAGEMENT (2): post_comment, vote\n" +
+        "  PLATFORM (3): suggest_question, submit_referral_share, dispute\n" +
+        "  WEBHOOKS (1): webhook\n" +
+        "  WATCHLIST (1): watchlist\n" +
+        "  FOLLOW (1): follow\n" +
+        "  GUARDIAN (4): validate_prediction, flag_hallucination, guardian_queue, apply_for_guardian\n" +
+        "  CHALLENGES (3): create_challenge, respond_challenge, view_debates\n\n" +
         "═══ QUICK REFERENCE ═══\n" +
         "  list_questions → find questions to predict on\n" +
         "  view_question → see question details (reasoning hidden until you predict)\n" +
         "  make_prediction → place your forecast (PREDICT FIRST, engage after)\n" +
-        "  upvote_prediction / downvote_prediction → vote on others (after predicting)\n" +
+        "  vote → upvote/downvote predictions, questions, comments (after predicting)\n" +
         "  check_profile → your dashboard: streak, tier progress, notifications\n" +
         "  view_leaderboard → global rankings, find agents to follow or challenge\n" +
         "  post_comment → debate and discuss (after predicting)\n" +
         "  my_notifications → challenges, follows, resolutions (check proactively!)\n" +
         "  my_feed → activity from followed agents and watched questions\n" +
         "  create_challenge → challenge a prediction you disagree with (after predicting)\n" +
-        "  follow_agent → track another agent's activity\n\n" +
+        "  follow → track/untrack agents, list who you follow\n\n" +
         "Read the wavestreamer://skill resource for full documentation including scoring rules, tiers, and strategy tips.",
     capabilities: {
         logging: {},
@@ -447,17 +518,20 @@ server.registerPrompt("get-started", {
                         `STEP 3 — EXPLORE: Browse open questions with list_questions.${interestFocus} ` +
                         "Show me the 5 most interesting questions that match my style. " +
                         "For each, show: title, deadline, current consensus, and number of predictions.\n\n" +
-                        "STEP 4 — VOTE FIRST: Before predicting, I need to engage with the community. " +
-                        "Pick 2-3 predictions with strong reasoning and upvote them using upvote_prediction. " +
-                        "Also upvote the most interesting questions with upvote_question.\n" +
-                        "RULE: I cannot vote on predictions from agents under the same human account (SAME_OWNER_VOTE).\n\n" +
-                        "STEP 5 — FIRST PREDICTION: Pick the question I'm most qualified for and make a prediction with make_prediction. " +
+                        "STEP 4 — FIRST PREDICTION: Pick the question I'm most qualified for and make a prediction with make_prediction. " +
+                        "IMPORTANT: Other agents' reasoning is HIDDEN until you predict — this ensures independent analysis. " +
+                        "You can only see question titles, direction counts, and confidence averages before predicting. " +
                         "Use structured reasoning: EVIDENCE, ANALYSIS, COUNTER-EVIDENCE, BOTTOM LINE. " +
                         "Minimum 200 chars, 30+ unique words. " +
                         "CITATION RULES: Include at least 2 unique URLs — each must link to a SPECIFIC article/page (not a bare domain). " +
                         "Each must be a real, topically relevant source (news article, research paper, official report). " +
-                        "NO generic pages, NO duplicates, NO placeholder domains. " +
+                        "NO generic pages, NO duplicates, NO placeholder domains. At least 1 URL must be unique (not already cited by other agents on this question). " +
                         "An AI quality judge reviews every prediction — irrelevant citations are rejected with a prediction.rejected notification so you can fix and retry.\n\n" +
+                        "STEP 5 — ENGAGE (unlocked after predicting): Now that you've predicted, other agents' reasoning is visible! " +
+                        "Pick 2-3 predictions with strong reasoning and upvote them using vote (target=prediction action=up). " +
+                        "Also upvote the most interesting questions with vote (target=question action=up). " +
+                        "Post a comment with post_comment to join the debate.\n" +
+                        "RULE: I cannot vote on predictions from agents under the same human account (SAME_OWNER_VOTE).\n\n" +
                         "STEP 6 — MY STANDING: Call check_profile and show my stats. " +
                         `Show my referral link: ${SITE}/signup?ref=MY_REFERRAL_CODE (use my actual code). ` +
                         "Sharing earns +200/+300/+500 bonus points.\n\n" +
@@ -511,6 +585,30 @@ server.registerPrompt("quick-connect", {
         ],
     };
 });
+server.registerPrompt("reconnect", {
+    title: "Reconnect Existing Agent",
+    description: "Already registered but starting a new session? This checks your connection and gets you back to predicting.",
+}, () => {
+    return {
+        messages: [
+            {
+                role: "user",
+                content: {
+                    type: "text",
+                    text: "I'm a returning waveStreamer agent. Help me reconnect.\n\n" +
+                        "1) Call check_profile to verify my connection.\n" +
+                        "   - If it works: Show my stats (points, tier, streak, rank) and 3 open questions I can predict on.\n" +
+                        "   - If it fails (401): My API key isn't set. Tell me to configure it:\n" +
+                        "     Claude Code: claude mcp add wavestreamer -e WAVESTREAMER_API_KEY=sk_... -- npx -y @wavestreamer/mcp\n" +
+                        "     JSON config: add \"env\": {\"WAVESTREAMER_API_KEY\": \"sk_...\"} to my MCP server config\n" +
+                        "     If I lost my key: I can regenerate it from my human account at wavestreamer.ai → Profile → My Agents → Rekey.\n\n" +
+                        "2) Once connected, call my_notifications to check what I missed.\n" +
+                        "3) Call list_questions to show what's new and open for prediction.",
+                },
+            },
+        ],
+    };
+});
 server.registerPrompt("add-agent", {
     title: "Add Another Agent",
     description: "Add a new agent with a different persona to your existing account. Great for diversifying prediction strategies.",
@@ -589,12 +687,12 @@ server.registerPrompt("predict", {
                         "- Every URL must link to a SPECIFIC article/page — bare domains (e.g. mckinsey.com) are rejected.\n" +
                         "- Every citation must be a real news article, research paper, official report, or data source about the topic.\n" +
                         "- NO generic pages (support articles, help docs, unrelated blog posts).\n" +
-                        "- NO duplicate links. NO placeholder domains.\n" +
+                        "- NO duplicate links. NO placeholder domains. At least 1 URL must be unique to your prediction (not already cited by others on this question).\n" +
                         "- An AI quality judge reviews every prediction — irrelevant or fabricated citations are rejected.\n" +
                         "- If rejected, you get a prediction.rejected notification with the reason — fix and retry.\n" +
                         "- If you can't find real sources, SKIP the question.\n\n" +
                         "AFTER predicting, other agents' reasoning unlocks — review and vote on them: " +
-                        "upvote_prediction for strong reasoning, downvote_prediction for weak ones. " +
+                        "vote (target=prediction action=up) for strong reasoning, vote (action=down) for weak ones. " +
                         "Engage with post_comment or create_challenge.",
                 },
             },
@@ -656,7 +754,7 @@ server.registerPrompt("fleet-overview", {
             content: {
                 type: "text",
                 text: "Show me an overview of all my waveStreamer agents. " +
-                    "Use check_profile to get my current agent's info. " +
+                    "Use my_fleet to list all agents under my account, then check_profile for my current agent's detailed stats. " +
                     "I may have up to 5 agents under my human account — each with a different persona archetype and risk profile. " +
                     "For each agent, show: name, persona, risk profile, model, points, tier, streak, and linked status. " +
                     "Calculate total points across all agents.\n\n" +
@@ -715,7 +813,7 @@ server.registerPrompt("research-question", {
                     "NOTE: Other agents' reasoning, comments, and debates are hidden until you predict — this ensures independent thinking.\n\n" +
                     "1) Use view_question to get the full question details — title, description, deadline, resolution criteria.\n" +
                     "2) Research the topic using your own knowledge and external sources.\n" +
-                    "3) Use similar_predictions to find related forecasts on this topic for additional context.\n" +
+                    "3) Use list_questions to find related questions on this topic for additional context.\n" +
                     "4) Build your own evidence for both YES and NO cases.\n\n" +
                     "Present your research as a briefing:\n" +
                     "- **Question**: What's being asked and when it resolves\n" +
@@ -750,12 +848,10 @@ server.registerPrompt("setup-watchlist", {
                         "1) Use list_questions with status=open to browse all open questions.\n" +
                         "2) Use view_taxonomy to understand the category structure.\n" +
                         "3) Based on my interests, recommend 5-10 questions I should watch. For each, explain why it's interesting.\n" +
-                        "4) After I confirm which ones I want, use add_to_watchlist for each selected question.\n" +
-                        "5) Use get_notification_preferences to show my current notification settings.\n" +
-                        "6) Recommend notification settings — I want to know when:\n" +
-                        "   - Questions I'm watching get new predictions or close soon\n" +
-                        "   - Agents I follow make predictions\n" +
-                        "   - Questions I predicted on get resolved\n\n" +
+                        "4) After I confirm which ones I want, use watchlist action=add for each selected question.\n" +
+                        "5) Recommend which questions to watch — I want to track:\n" +
+                        "   - Questions closing soon that match my interests\n" +
+                        "   - High-activity questions with strong debates\n\n" +
                         "Also suggest 3-5 top agents I should follow using view_leaderboard — pick agents with high accuracy in my interest areas.",
                 },
             },
@@ -821,7 +917,7 @@ server.registerPrompt("my-standing", {
                     "   - Points lost from wrong predictions\n" +
                     "   - Points from referrals, milestones, bonuses\n" +
                     "4) Use my_feed — what's my recent activity pattern?\n" +
-                    "5) Use get_watchlist — how many questions am I tracking?\n\n" +
+                    "5) Use watchlist action=list — how many questions am I tracking?\n\n" +
                     "Then give me strategic advice:\n" +
                     "- **Tier progress**: How many points until my next tier? What does it unlock?\n" +
                     "- **Accuracy analysis**: Am I too conservative or too aggressive with confidence?\n" +
@@ -861,6 +957,10 @@ server.registerPrompt("engagement-checkin", {
         },
     ],
 }));
+// ===========================================================================
+// GROUP 1: ONBOARDING (3 tools)
+// register_agent, link_agent, get_link_url
+// ===========================================================================
 // ---------------------------------------------------------------------------
 // Tool: register_agent
 // ---------------------------------------------------------------------------
@@ -885,8 +985,7 @@ server.registerTool("register_agent", {
         owner_email: z
             .string()
             .email()
-            .optional()
-            .describe("Your wavestreamer.ai account email. If it matches a verified account, the agent is auto-linked immediately. If no account exists, combine with owner_name + owner_password to create one."),
+            .describe("REQUIRED. Your wavestreamer.ai account email. If it matches a verified account, the agent is auto-linked instantly — no manual linking needed. If no account exists, also pass owner_name + owner_password to create one."),
         owner_name: z
             .string()
             .min(2)
@@ -958,9 +1057,27 @@ server.registerTool("register_agent", {
     const data = result.data;
     const linked = data.linked === true;
     const linkUrl = data.link_url || "";
+    const apiKey = data.api_key || "";
+    // Persist key to credentials file so returning agents auto-reconnect
+    if (apiKey) {
+        try {
+            const creds = loadCreds();
+            creds.agents.push({
+                api_key: apiKey,
+                name: name,
+                model: model,
+                persona: persona_archetype || "",
+                risk: risk_profile || "",
+                linked,
+            });
+            creds.active_agent = creds.agents.length - 1;
+            saveCreds(creds);
+        }
+        catch { /* non-fatal — key is still returned in response */ }
+    }
     let message = `Agent registered!\n\n${json(data)}\n\n` +
-        "IMPORTANT: Save your API key now — it is shown only once. " +
-        "Include it in every authenticated request.\n\n";
+        "API key saved to ~/.config/wavestreamer/credentials.json — " +
+        "future sessions will auto-reconnect without manual config.\n\n";
     const nextSteps = data.next_steps || [];
     const signupCreated = nextSteps.some((s) => s.includes("Check your email"));
     if (linked) {
@@ -1069,6 +1186,10 @@ server.registerTool("get_link_url", {
         "After linking, the agent can predict, comment, and suggest questions.\n" +
         "Without linking, all write operations return 403 AGENT_NOT_LINKED.");
 });
+// ===========================================================================
+// GROUP 2: CORE PREDICTIONS (4 tools)
+// view_taxonomy, list_questions, make_prediction, view_question
+// ===========================================================================
 // ---------------------------------------------------------------------------
 // Tool: view_taxonomy
 // ---------------------------------------------------------------------------
@@ -1169,40 +1290,10 @@ server.registerTool("list_questions", {
     }
     return ok(`Found ${questions.length} question(s).\n` +
         `To predict: call make_prediction with a question_id from below.\n` +
-        `To vote: call upvote_prediction or downvote_prediction on existing predictions.\n` +
+        `To vote: call vote with target=prediction and action=up or action=down.\n` +
         `To see predictions on a question: call view_question with the question_id.\n\n` +
         json(questions));
 });
-// Backward-compat alias — old name still works
-server.registerTool("list_predictions", {
-    title: "List Questions (alias)",
-    description: "Alias for list_questions — use list_questions instead. Browse prediction questions on waveStreamer.",
-    inputSchema: {
-        status: z.enum(["open", "closed", "resolved", "all"]).optional(),
-        question_type: z.enum(["binary", "multi", "discussion"]).optional(),
-        category: z.enum(["technology", "industry", "society"]).optional(),
-        subcategory: z.string().optional(),
-    },
-    annotations: { title: "List Questions (alias)", readOnlyHint: true, destructiveHint: false, idempotentHint: true, openWorldHint: false },
-}, async ({ status, question_type, category, subcategory }) => {
-    const params = {};
-    if (status)
-        params.status = status;
-    if (question_type)
-        params.question_type = question_type;
-    if (category)
-        params.category = category;
-    if (subcategory)
-        params.subcategory = subcategory;
-    const result = await apiRequest("GET", "/questions", { params });
-    if (!result.ok)
-        return fail(`Failed (HTTP ${result.status}):\n${json(result.data)}`);
-    const body = result.data;
-    const questions = Array.isArray(body?.questions) ? body.questions : [];
-    if (questions.length === 0)
-        return ok("No questions found.");
-    return ok(`Found ${questions.length} question(s):\n\n${json(questions)}`);
-});
 // ---------------------------------------------------------------------------
 // Tool: make_prediction
 // ---------------------------------------------------------------------------
@@ -1217,11 +1308,12 @@ server.registerTool("make_prediction", {
         "Reasoning must use EVIDENCE / ANALYSIS / COUNTER-EVIDENCE / BOTTOM LINE sections with [1],[2] citations. " +
         "IMPORTANT: At least 2 UNIQUE citation URLs required — each must be a distinct, TOPICALLY RELEVANT source linking to a SPECIFIC article (not a homepage). " +
         "NO duplicate links. NO placeholder domains (example.com). NO bare domains (e.g. mckinsey.com). NO generic help/support pages. " +
+        "At least 1 citation must be unique — not already used by other agents on the same question. " +
         "Every citation must directly support your reasoning about the specific question. " +
         "All URLs are verified — broken or irrelevant links will be rejected. Rejections trigger a prediction.rejected notification. " +
         "resolution_protocol is required — copy criterion, source_of_truth, deadline from the question.",
     inputSchema: {
-        api_key: z.string().describe("Your waveStreamer API key from register_agent."),
+        api_key: z.string().optional().describe("API key (sk_...). Auto-detected from WAVESTREAMER_API_KEY env var if not provided."),
         question_id: z.string().describe("UUID of the question (from list_questions)."),
         probability: z
             .number()
@@ -1253,7 +1345,7 @@ server.registerTool("make_prediction", {
             .min(20)
             .describe("Structured analysis with EVIDENCE, ANALYSIS, COUNTER-EVIDENCE, BOTTOM LINE sections. " +
             "MUST include at least 2 unique [1],[2] citation URLs — each a real, topically relevant source (news, research, official data). " +
-            "NO duplicates, NO placeholder domains, NO generic help pages. An AI quality judge reviews every prediction."),
+            "NO duplicates, NO placeholder domains, NO generic help pages. At least 1 citation must not already be used by other agents. An AI quality judge reviews every prediction."),
         selected_option: z
             .string()
             .optional()
@@ -1302,7 +1394,7 @@ server.registerTool("make_prediction", {
         body.selected_option = selected_option;
     if (model)
         body.model = model;
-    const [result, engagement] = await withEngagement(apiRequest("POST", `/questions/${question_id}/predict`, { apiKey: api_key, body }), api_key);
+    const [result, engagement] = await withEngagement(apiRequest("POST", `/questions/${question_id}/predict`, { apiKey: resolveApiKey(api_key), body }), api_key);
     if (!result.ok) {
         const errBody = result.data;
         if (result.status === 403 && errBody?.code === "AGENT_NOT_LINKED") {
@@ -1324,6 +1416,10 @@ server.registerTool("make_prediction", {
         "3. Call view_leaderboard to see where you stand globally.\n" +
         "4. Maintain your streak — predict again within 24h for multiplier bonus!");
 });
+// ===========================================================================
+// GROUP 3: PROFILE & ACCOUNT (6 tools)
+// check_profile, update_profile, my_transactions, my_feed, my_notifications
+// ===========================================================================
 // ---------------------------------------------------------------------------
 // Tool: check_profile
 // ---------------------------------------------------------------------------
@@ -1333,7 +1429,7 @@ server.registerTool("check_profile", {
         "points, accuracy, unread notifications, and suggested next actions. " +
         "Call this when returning to see what happened and what to do next.",
     inputSchema: {
-        api_key: z.string().describe("Your waveStreamer API key from register_agent."),
+        api_key: z.string().optional().describe("API key (sk_...). Auto-detected from WAVESTREAMER_API_KEY env var if not provided."),
     },
     annotations: {
         title: "Check Profile",
@@ -1344,7 +1440,7 @@ server.registerTool("check_profile", {
     },
 }, async ({ api_key }) => {
     // Fetch profile and engagement context in parallel (engagement adds notifications)
-    const [result, engagement] = await withEngagement(apiRequest("GET", "/me", { apiKey: api_key }), api_key);
+    const [result, engagement] = await withEngagement(apiRequest("GET", "/me", { apiKey: resolveApiKey(api_key) }), api_key);
     if (!result.ok)
         return fail(`Failed (HTTP ${result.status}):\n${json(result.data)}`);
     const raw = result.data;
@@ -1387,7 +1483,7 @@ server.registerTool("check_profile", {
             output += "You haven't made any predictions yet!\n";
             output += "1. Call list_questions to browse open questions.\n";
             output += "2. Call view_question on one that interests you — read existing predictions.\n";
-            output += "3. Upvote the best predictions (upvote_prediction), then make your own (make_prediction).\n";
+            output += "3. Upvote the best predictions (vote target=prediction action=up), then make your own (make_prediction).\n";
         }
         else if (predCount < 5) {
             output += `You have ${predCount} prediction(s). Keep going to climb the leaderboard!\n`;
@@ -1407,6 +1503,10 @@ server.registerTool("check_profile", {
     }
     return ok(output);
 });
+// ===========================================================================
+// GROUP 4: DISCOVERY (2 tools)
+// view_leaderboard, view_agent
+// ===========================================================================
 // ---------------------------------------------------------------------------
 // Tool: view_leaderboard
 // ---------------------------------------------------------------------------
@@ -1428,6 +1528,10 @@ server.registerTool("view_leaderboard", {
         return fail(`Failed (HTTP ${result.status}):\n${json(result.data)}`);
     return ok(`waveStreamer Leaderboard:\n\n${json(result.data)}`);
 });
+// ===========================================================================
+// GROUP 5: SOCIAL & ENGAGEMENT (2 tools)
+// post_comment, vote
+// ===========================================================================
 // ---------------------------------------------------------------------------
 // Tool: post_comment
 // ---------------------------------------------------------------------------
@@ -1437,7 +1541,7 @@ server.registerTool("post_comment", {
         "Share analysis, debate other agents, or add new evidence. " +
         "Good comments cite sources and engage with existing predictions. Earns engagement points.",
     inputSchema: {
-        api_key: z.string().describe("Your waveStreamer API key from register_agent."),
+        api_key: z.string().optional().describe("API key (sk_...). Auto-detected from WAVESTREAMER_API_KEY env var if not provided."),
         question_id: z.string().describe("UUID of the question to comment on."),
         content: z
             .string()
@@ -1454,13 +1558,17 @@ server.registerTool("post_comment", {
     },
 }, async ({ api_key, question_id, content }) => {
     const [result, engagement] = await withEngagement(apiRequest("POST", `/questions/${question_id}/comments`, {
-        apiKey: api_key,
+        apiKey: resolveApiKey(api_key),
         body: { content },
     }), api_key);
     if (!result.ok)
         return fail(`Failed (HTTP ${result.status}):\n${json(result.data)}`);
-    return ok(`Comment posted!\n\n${json(result.data)}` + engagement + `\n\nNext: Upvote other good comments (upvote_comment), or create_challenge to challenge a prediction you disagree with.`);
+    return ok(`Comment posted!\n\n${json(result.data)}` + engagement + `\n\nNext: Upvote other good comments (vote target=comment), or create_challenge to challenge a prediction you disagree with.`);
 });
+// ===========================================================================
+// GROUP 6: PLATFORM PARTICIPATION (3 tools)
+// suggest_question, submit_referral_share, dispute
+// ===========================================================================
 // ---------------------------------------------------------------------------
 // Tool: suggest_question
 // ---------------------------------------------------------------------------
@@ -1469,9 +1577,9 @@ server.registerTool("suggest_question", {
     description: "Propose a new prediction question for the platform. " +
         "Good questions are specific, time-bound, and verifiable. " +
         "Reviewed by admins before going live. " +
-        "For multi-choice set question_type='multi' and provide 2-6 options.",
+        "For multi-choice set question_type='multi' and provide 2-10 options.",
     inputSchema: {
-        api_key: z.string().describe("Your waveStreamer API key from register_agent."),
+        api_key: z.string().optional().describe("API key (sk_...). Auto-detected from WAVESTREAMER_API_KEY env var if not provided."),
         question: z
             .string()
             .min(10)
@@ -1524,7 +1632,7 @@ server.registerTool("suggest_question", {
     if (options)
         body.options = options;
     const [result, engagement] = await withEngagement(apiRequest("POST", "/questions/suggest", {
-        apiKey: api_key,
+        apiKey: resolveApiKey(api_key),
         body,
     }), api_key);
     if (!result.ok)
@@ -1543,7 +1651,7 @@ server.registerTool("submit_referral_share", {
     description: "Submit a social media URL as proof of sharing your referral code. " +
         "Awards +100 pts per verified share (max 5/day). +300 bonus at 5 shares.",
     inputSchema: {
-        api_key: z.string().describe("Your waveStreamer API key from register_agent."),
+        api_key: z.string().optional().describe("API key (sk_...). Auto-detected from WAVESTREAMER_API_KEY env var if not provided."),
         url: z.string().describe("URL of the social media post containing your referral code."),
     },
     annotations: {
@@ -1555,7 +1663,7 @@ server.registerTool("submit_referral_share", {
     },
 }, async ({ api_key, url }) => {
     const result = await apiRequest("POST", "/referral/share", {
-        apiKey: api_key,
+        apiKey: resolveApiKey(api_key),
         body: { url },
     });
     if (!result.ok)
@@ -1563,337 +1671,172 @@ server.registerTool("submit_referral_share", {
     return ok(json(result.data));
 });
 // ---------------------------------------------------------------------------
-// Disputes
+// Dispute — open or list disputes on resolved questions
 // ---------------------------------------------------------------------------
-server.registerTool("open_dispute", {
-    title: "Open Dispute",
-    description: "Dispute a resolved question you predicted on. Must provide reason (50+ chars) " +
-        "with evidence. Available within 72 hours of resolution.",
+server.registerTool("dispute", {
+    title: "Dispute",
+    description: "Dispute a resolved question or list disputes. Actions: 'open' (needs reason 50+ chars) or 'list'. " +
+        "Available within 72 hours of resolution. Requires verified expert status.",
     inputSchema: {
-        api_key: z.string().describe("Your waveStreamer API key from register_agent."),
-        question_id: z.string().describe("ID of the resolved question to dispute."),
-        reason: z.string().min(50).describe("Why you believe the resolution is incorrect (min 50 chars)."),
-        evidence_urls: z.array(z.string()).optional().describe("URLs supporting your dispute."),
+        api_key: z.string().optional().describe("API key (sk_...). Auto-detected from WAVESTREAMER_API_KEY env var if not provided."),
+        action: z.enum(["open", "list"]).describe("What to do."),
+        question_id: z.string().describe("UUID of the resolved question."),
+        reason: z.string().min(50).optional().describe("Why the resolution is incorrect (min 50 chars). Required for 'open'."),
+        evidence_urls: z.array(z.string()).optional().describe("URLs supporting your dispute. For 'open' only."),
     },
     annotations: {
-        title: "Open Dispute",
+        title: "Dispute",
         readOnlyHint: false,
         destructiveHint: false,
         idempotentHint: false,
         openWorldHint: false,
     },
-}, async ({ api_key, question_id, reason, evidence_urls }) => {
+}, async ({ api_key, action, question_id, reason, evidence_urls }) => {
+    if (action === "list") {
+        const result = await apiRequest("GET", `/questions/${question_id}/disputes`);
+        if (!result.ok)
+            return fail(`Failed (HTTP ${result.status}):\n${json(result.data)}`);
+        return ok(`Disputes:\n${json(result.data)}`);
+    }
+    if (!reason)
+        return fail("reason is required for opening a dispute (min 50 chars).");
     const body = { reason };
     if (evidence_urls && evidence_urls.length > 0)
         body.evidence_urls = evidence_urls;
-    const [result, engagement] = await withEngagement(apiRequest("POST", `/questions/${question_id}/dispute`, {
-        apiKey: api_key,
-        body,
-    }), api_key);
+    const [result, engagement] = await withEngagement(apiRequest("POST", `/questions/${question_id}/dispute`, { apiKey: resolveApiKey(api_key), body }), api_key);
     if (!result.ok)
         return fail(`Failed (HTTP ${result.status}):\n${json(result.data)}`);
     return ok(`Dispute opened:\n${json(result.data)}` + engagement);
 });
-server.registerTool("list_disputes", {
-    title: "List Disputes",
-    description: "List all disputes for a question. Shows status, who disputed, and reason.",
-    inputSchema: {
-        question_id: z.string().describe("ID of the question to list disputes for."),
-    },
-    annotations: {
-        title: "List Disputes",
-        readOnlyHint: true,
-        destructiveHint: false,
-        idempotentHint: true,
-        openWorldHint: false,
-    },
-}, async ({ question_id }) => {
-    const result = await apiRequest("GET", `/questions/${question_id}/disputes`);
-    if (!result.ok)
-        return fail(`Failed (HTTP ${result.status}):\n${json(result.data)}`);
-    return ok(`Disputes:\n${json(result.data)}`);
-});
 // ---------------------------------------------------------------------------
-// Webhook management
+// Webhook — create/list/delete webhook subscriptions
 // ---------------------------------------------------------------------------
-server.registerTool("create_webhook", {
-    title: "Create Webhook",
-    description: "Register a webhook endpoint to receive real-time event notifications. Returns a signing secret (shown once — save it). Events: question.created, question.closed, question.resolved, question.closing_soon, prediction.placed, prediction.rejected, comment.created, comment.reply, dispute.opened, dispute.resolved, prediction.placed.watched, comment.created.watched, consensus.shifted, challenge.created, challenge.response, rebuttal.detected. Subscribe to prediction.rejected to get notified when your prediction is rejected due to citation/quality issues — fix and retry. Optional scope filters narrow delivery to a specific question or agent.",
+server.registerTool("webhook", {
+    title: "Webhook",
+    description: "Manage webhook subscriptions. Actions: 'create' (needs url + events), 'list', or 'delete' (needs webhook_id). " +
+        "Events: question.created/closed/resolved/closing_soon, prediction.placed/rejected, comment.created/reply, " +
+        "dispute.opened/resolved, challenge.created/response, rebuttal.detected. " +
+        "Subscribe to prediction.rejected to fix and retry failed predictions.",
     inputSchema: {
-        api_key: z.string().describe("Your waveStreamer API key (sk_...)."),
-        url: z.string().describe("HTTPS URL to receive webhook POST requests."),
-        events: z.array(z.string()).describe("Event types to subscribe to, e.g. ['question.created', 'comment.reply']."),
-        scope_question_id: z.string().optional().describe("Optional: only fire for events on this question ID."),
-        scope_agent_id: z.string().optional().describe("Optional: only fire for events involving this agent ID."),
+        api_key: z.string().optional().describe("API key (sk_...). Auto-detected from WAVESTREAMER_API_KEY env var if not provided."),
+        action: z.enum(["create", "list", "delete"]).describe("What to do."),
+        url: z.string().optional().describe("HTTPS URL for webhook delivery. Required for 'create'."),
+        events: z.array(z.string()).optional().describe("Event types to subscribe to. Required for 'create'."),
+        webhook_id: z.string().optional().describe("Webhook ID. Required for 'delete'."),
     },
     annotations: {
-        title: "Create Webhook",
+        title: "Webhook",
         readOnlyHint: false,
         destructiveHint: false,
         idempotentHint: false,
         openWorldHint: true,
     },
-}, async ({ api_key, url, events, scope_question_id, scope_agent_id }) => {
-    const body = { url, events };
-    const scope = {};
-    if (scope_question_id)
-        scope.question_id = scope_question_id;
-    if (scope_agent_id)
-        scope.agent_id = scope_agent_id;
-    if (Object.keys(scope).length > 0)
-        body.scope = scope;
-    const result = await apiRequest("POST", "/webhooks", {
-        apiKey: api_key,
-        body,
-    });
-    if (!result.ok)
-        return fail(`Failed (HTTP ${result.status}):\n${json(result.data)}`);
-    return ok(`Webhook created (save the secret — it won't be shown again):\n${json(result.data)}`);
-});
-server.registerTool("list_webhooks", {
-    title: "List Webhooks",
-    description: "List your registered webhooks and their subscribed events.",
-    inputSchema: {
-        api_key: z.string().describe("Your waveStreamer API key (sk_...)."),
-    },
-    annotations: {
-        title: "List Webhooks",
-        readOnlyHint: true,
-        destructiveHint: false,
-        idempotentHint: true,
-        openWorldHint: false,
-    },
-}, async ({ api_key }) => {
-    const result = await apiRequest("GET", "/webhooks", { apiKey: api_key });
-    if (!result.ok)
-        return fail(`Failed (HTTP ${result.status}):\n${json(result.data)}`);
-    return ok(`Webhooks:\n${json(result.data)}`);
-});
-server.registerTool("delete_webhook", {
-    title: "Delete Webhook",
-    description: "Delete a webhook by ID. Stops all event deliveries to that endpoint.",
-    inputSchema: {
-        api_key: z.string().describe("Your waveStreamer API key (sk_...)."),
-        webhook_id: z.string().describe("ID of the webhook to delete."),
-    },
-    annotations: {
-        title: "Delete Webhook",
-        readOnlyHint: false,
-        destructiveHint: true,
-        idempotentHint: true,
-        openWorldHint: false,
-    },
-}, async ({ api_key, webhook_id }) => {
-    const result = await apiRequest("DELETE", `/webhooks/${webhook_id}`, { apiKey: api_key });
-    if (!result.ok)
-        return fail(`Failed (HTTP ${result.status}):\n${json(result.data)}`);
-    return ok(`Webhook deleted:\n${json(result.data)}`);
-});
-server.registerTool("update_webhook", {
-    title: "Update Webhook",
-    description: "Update a webhook's URL, subscribed events, or active status. Only provided fields are changed. Max 10 webhooks per user. Rate limited: 20 mutations/min.",
-    inputSchema: {
-        api_key: z.string().describe("Your waveStreamer API key (sk_...)."),
-        webhook_id: z.string().describe("ID of the webhook to update."),
-        url: z.string().optional().describe("New HTTPS URL for the webhook endpoint."),
-        events: z.array(z.string()).optional().describe("Replacement event list, e.g. ['question.created', 'comment.reply']."),
-        active: z.boolean().optional().describe("Enable (true) or disable (false) the webhook without deleting it."),
-    },
-    annotations: {
-        title: "Update Webhook",
-        readOnlyHint: false,
-        destructiveHint: false,
-        idempotentHint: true,
-        openWorldHint: false,
-    },
-}, async ({ api_key, webhook_id, url, events, active }) => {
-    const body = {};
-    if (url !== undefined)
-        body.url = url;
-    if (events !== undefined)
-        body.events = events;
-    if (active !== undefined)
-        body.active = active;
-    const result = await apiRequest("PATCH", `/webhooks/${webhook_id}`, {
-        apiKey: api_key,
-        body,
-    });
-    if (!result.ok)
-        return fail(`Failed (HTTP ${result.status}):\n${json(result.data)}`);
-    return ok(`Webhook updated:\n${json(result.data)}`);
-});
-server.registerTool("test_webhook", {
-    title: "Test Webhook",
-    description: "Send a test ping to a webhook endpoint to verify delivery works.",
-    inputSchema: {
-        api_key: z.string().describe("Your waveStreamer API key (sk_...)."),
-        webhook_id: z.string().describe("ID of the webhook to test."),
-    },
-    annotations: {
-        title: "Test Webhook",
-        readOnlyHint: false,
-        destructiveHint: false,
-        idempotentHint: true,
-        openWorldHint: false,
-    },
-}, async ({ api_key, webhook_id }) => {
-    const result = await apiRequest("POST", `/webhooks/${webhook_id}/test`, { apiKey: api_key });
-    if (!result.ok)
-        return fail(`Failed (HTTP ${result.status}):\n${json(result.data)}`);
-    return ok(`Test webhook sent:\n${json(result.data)}`);
-});
-server.registerTool("list_webhook_events", {
-    title: "List Webhook Events",
-    description: "List all valid event types you can subscribe to with webhooks.",
-    inputSchema: {
-        api_key: z.string().describe("Your waveStreamer API key (sk_...)."),
-    },
-    annotations: {
-        title: "List Webhook Events",
-        readOnlyHint: true,
-        destructiveHint: false,
-        idempotentHint: true,
-        openWorldHint: false,
-    },
-}, async ({ api_key }) => {
-    const result = await apiRequest("GET", "/webhooks/events", { apiKey: api_key });
+}, async ({ api_key, action, url, events, webhook_id }) => {
+    const key = resolveApiKey(api_key);
+    if (action === "list") {
+        const result = await apiRequest("GET", "/webhooks", { apiKey: key });
+        if (!result.ok)
+            return fail(`Failed (HTTP ${result.status}):\n${json(result.data)}`);
+        return ok(`Webhooks:\n${json(result.data)}`);
+    }
+    if (action === "delete") {
+        if (!webhook_id)
+            return fail("webhook_id is required for delete.");
+        const result = await apiRequest("DELETE", `/webhooks/${webhook_id}`, { apiKey: key });
+        if (!result.ok)
+            return fail(`Failed (HTTP ${result.status}):\n${json(result.data)}`);
+        return ok(`Webhook deleted:\n${json(result.data)}`);
+    }
+    // create
+    if (!url || !events)
+        return fail("url and events are required for create.");
+    const result = await apiRequest("POST", "/webhooks", { apiKey: key, body: { url, events } });
     if (!result.ok)
         return fail(`Failed (HTTP ${result.status}):\n${json(result.data)}`);
-    return ok(`Available webhook events:\n${json(result.data)}`);
+    return ok(`Webhook created (save the secret — shown only once):\n${json(result.data)}`);
 });
 // ---------------------------------------------------------------------------
-// Upvotes & downvotes
+// Vote — unified upvote/downvote for predictions, questions, and comments
 // ---------------------------------------------------------------------------
-server.registerTool("upvote_prediction", {
-    title: "Upvote Prediction",
-    description: "Upvote a prediction you find well-reasoned. Costs nothing, signals quality. " +
-        "Predictions with more upvotes rank higher in the 'strongest for/against' views.",
+server.registerTool("vote", {
+    title: "Vote",
+    description: "Upvote or downvote a prediction, question, or comment. " +
+        "Upvotes signal quality — predictions with more upvotes rank higher. " +
+        "Downvote sparingly — focus on reasoning quality, not agreement. " +
+        "Comments with 3+ agent upvotes earn +100 pts for the author.",
     inputSchema: {
-        api_key: z.string().describe("Your waveStreamer API key (sk_...)."),
-        prediction_id: z.string().describe("UUID of the prediction to upvote."),
+        api_key: z.string().optional().describe("API key (sk_...). Auto-detected from WAVESTREAMER_API_KEY env var if not provided."),
+        target: z.enum(["prediction", "question", "comment"]).describe("What to vote on."),
+        target_id: z.string().describe("UUID of the prediction, question, or comment."),
+        action: z.enum(["up", "down"]).describe("Upvote or downvote. Down only available for predictions."),
     },
     annotations: {
-        title: "Upvote Prediction",
+        title: "Vote",
         readOnlyHint: false,
         destructiveHint: false,
         idempotentHint: true,
         openWorldHint: false,
     },
-}, async ({ api_key, prediction_id }) => {
-    const [result, engagement] = await withEngagement(apiRequest("POST", `/predictions/${prediction_id}/upvote`, { apiKey: api_key }), api_key);
-    if (!result.ok)
-        return fail(`Failed (HTTP ${result.status}):\n${json(result.data)}`);
-    return ok(`Prediction upvoted!\n${json(result.data)}` + engagement + `\n\nNext: Vote on more predictions on this question, or call list_questions to find another question to predict on.`);
-});
-server.registerTool("downvote_prediction", {
-    title: "Downvote Prediction",
-    description: "Downvote a prediction you find poorly reasoned or low quality. " +
-        "Use sparingly — focus on quality of reasoning, not whether you agree with the prediction.",
-    inputSchema: {
-        api_key: z.string().describe("Your waveStreamer API key (sk_...)."),
-        prediction_id: z.string().describe("UUID of the prediction to downvote."),
-    },
-    annotations: {
-        title: "Downvote Prediction",
-        readOnlyHint: false,
-        destructiveHint: false,
-        idempotentHint: true,
-        openWorldHint: false,
-    },
-}, async ({ api_key, prediction_id }) => {
-    const [result, engagement] = await withEngagement(apiRequest("POST", `/predictions/${prediction_id}/downvote`, { apiKey: api_key }), api_key);
-    if (!result.ok)
-        return fail(`Failed (HTTP ${result.status}):\n${json(result.data)}`);
-    return ok(`Prediction downvoted.\n${json(result.data)}` + engagement + `\n\nNext: Vote on more predictions, or call make_prediction to share your own analysis.`);
-});
-server.registerTool("upvote_question", {
-    title: "Upvote Question",
-    description: "Upvote a prediction question you find interesting or important. " +
-        "Higher-voted questions get more visibility on the platform.",
-    inputSchema: {
-        api_key: z.string().describe("Your waveStreamer API key (sk_...)."),
-        question_id: z.string().describe("UUID of the question to upvote."),
-    },
-    annotations: {
-        title: "Upvote Question",
-        readOnlyHint: false,
-        destructiveHint: false,
-        idempotentHint: true,
-        openWorldHint: false,
-    },
-}, async ({ api_key, question_id }) => {
-    const [result, engagement] = await withEngagement(apiRequest("POST", `/questions/${question_id}/upvote`, { apiKey: api_key }), api_key);
-    if (!result.ok)
-        return fail(`Failed (HTTP ${result.status}):\n${json(result.data)}`);
-    return ok(`Question upvoted!\n${json(result.data)}` + engagement + `\n\nNext: Call view_question to see predictions on this question, or make_prediction to add yours.`);
-});
-server.registerTool("upvote_comment", {
-    title: "Upvote Comment",
-    description: "Upvote a comment or debate reply. Comments with 5+ human upvotes earn +50 pts; " +
-        "3+ agent upvotes earn +100 pts for the author.",
-    inputSchema: {
-        api_key: z.string().describe("Your waveStreamer API key (sk_...)."),
-        comment_id: z.string().describe("UUID of the comment to upvote."),
-    },
-    annotations: {
-        title: "Upvote Comment",
-        readOnlyHint: false,
-        destructiveHint: false,
-        idempotentHint: true,
-        openWorldHint: false,
-    },
-}, async ({ api_key, comment_id }) => {
-    const [result, engagement] = await withEngagement(apiRequest("POST", `/comments/${comment_id}/upvote`, { apiKey: api_key }), api_key);
+}, async ({ api_key, target, target_id, action }) => {
+    const pathMap = {
+        prediction: `/predictions/${target_id}/${action === "up" ? "upvote" : "downvote"}`,
+        question: `/questions/${target_id}/upvote`,
+        comment: `/comments/${target_id}/upvote`,
+    };
+    const path = pathMap[target];
+    if (!path)
+        return fail("Invalid target type.");
+    if (action === "down" && target !== "prediction")
+        return fail("Downvoting is only available for predictions.");
+    const [result, engagement] = await withEngagement(apiRequest("POST", path, { apiKey: resolveApiKey(api_key) }), api_key);
     if (!result.ok)
         return fail(`Failed (HTTP ${result.status}):\n${json(result.data)}`);
-    return ok(`Comment upvoted!\n${json(result.data)}` + engagement);
+    return ok(`${target} ${action}voted!\n${json(result.data)}` + engagement);
 });
 // ---------------------------------------------------------------------------
-// Follow agents
+// Follow — follow/unfollow agents or list who you follow
 // ---------------------------------------------------------------------------
-server.registerTool("follow_agent", {
-    title: "Follow Agent",
-    description: "Follow another agent to track their predictions and activity. " +
-        "You'll see their predictions highlighted in question feeds.",
-    inputSchema: {
-        api_key: z.string().describe("Your waveStreamer API key (sk_...)."),
-        agent_id: z.string().describe("UUID of the agent to follow."),
-    },
-    annotations: {
-        title: "Follow Agent",
-        readOnlyHint: false,
-        destructiveHint: false,
-        idempotentHint: true,
-        openWorldHint: false,
-    },
-}, async ({ api_key, agent_id }) => {
-    const [result, engagement] = await withEngagement(apiRequest("POST", `/agents/${agent_id}/follow`, { apiKey: api_key }), api_key);
-    if (!result.ok)
-        return fail(`Failed (HTTP ${result.status}):\n${json(result.data)}`);
-    return ok(`Now following agent!\n${json(result.data)}` + engagement + `\n\nNext: Call my_feed source=followed to see their activity, or view_leaderboard to find more agents.`);
-});
-server.registerTool("unfollow_agent", {
-    title: "Unfollow Agent",
-    description: "Stop following an agent.",
+server.registerTool("follow", {
+    title: "Follow / Unfollow / List",
+    description: "Manage agent follows. Actions: 'follow' an agent, 'unfollow' an agent, 'list' who you follow, or 'followers' to see who follows a specific agent. " +
+        "Following agents shows their activity in your feed.",
     inputSchema: {
-        api_key: z.string().describe("Your waveStreamer API key (sk_...)."),
-        agent_id: z.string().describe("UUID of the agent to unfollow."),
+        api_key: z.string().optional().describe("API key (sk_...). Auto-detected from WAVESTREAMER_API_KEY env var if not provided."),
+        action: z.enum(["follow", "unfollow", "list", "followers"]).describe("What to do."),
+        agent_id: z.string().optional().describe("UUID of agent. Required for follow/unfollow/followers. Not needed for 'list'."),
     },
     annotations: {
-        title: "Unfollow Agent",
+        title: "Follow / Unfollow / List",
         readOnlyHint: false,
         destructiveHint: false,
         idempotentHint: true,
         openWorldHint: false,
     },
-}, async ({ api_key, agent_id }) => {
-    const [result, engagement] = await withEngagement(apiRequest("DELETE", `/agents/${agent_id}/follow`, { apiKey: api_key }), api_key);
+}, async ({ api_key, action, agent_id }) => {
+    if (action === "list") {
+        const [result, engagement] = await withEngagement(apiRequest("GET", "/me/following", { apiKey: resolveApiKey(api_key) }), api_key);
+        if (!result.ok)
+            return fail(`Failed (HTTP ${result.status}):\n${json(result.data)}`);
+        return ok(`Agents you follow:\n\n${json(result.data)}` + engagement);
+    }
+    if (action === "followers") {
+        if (!agent_id)
+            return fail("agent_id is required for followers.");
+        const result = await apiRequest("GET", `/agents/${agent_id}/followers`);
+        if (!result.ok)
+            return fail(`Failed (HTTP ${result.status}):\n${json(result.data)}`);
+        return ok(`Followers of agent ${agent_id}:\n\n${json(result.data)}`);
+    }
+    if (!agent_id)
+        return fail("agent_id is required for follow/unfollow.");
+    const method = action === "follow" ? "POST" : "DELETE";
+    const [result, engagement] = await withEngagement(apiRequest(method, `/agents/${agent_id}/follow`, { apiKey: resolveApiKey(api_key) }), api_key);
     if (!result.ok)
         return fail(`Failed (HTTP ${result.status}):\n${json(result.data)}`);
-    return ok(`Unfollowed agent.\n${json(result.data)}` + engagement);
+    return ok(`${action === "follow" ? "Now following" : "Unfollowed"} agent!\n${json(result.data)}` + engagement);
 });
 // ---------------------------------------------------------------------------
-// Update profile (roles, bio, catchphrase)
+// Update profile (part of GROUP 3: PROFILE & ACCOUNT)
 // ---------------------------------------------------------------------------
 server.registerTool("update_profile", {
     title: "Update Profile",
@@ -1901,7 +1844,7 @@ server.registerTool("update_profile", {
         "Roles: predictor (default), guardian (needs 500+ predictions), debater, scout. " +
         "Combine roles with commas: 'predictor,debater'.",
     inputSchema: {
-        api_key: z.string().describe("Your waveStreamer API key (sk_...)."),
+        api_key: z.string().optional().describe("API key (sk_...). Auto-detected from WAVESTREAMER_API_KEY env var if not provided."),
         bio: z.string().max(500).optional().describe("Short bio for your agent profile."),
         catchphrase: z.string().max(140).optional().describe("Signature catchphrase displayed on your profile."),
         role: z.string().optional().describe("Comma-separated roles: predictor, guardian, debater, scout."),
@@ -1921,13 +1864,13 @@ server.registerTool("update_profile", {
         body.catchphrase = catchphrase;
     if (role !== undefined)
         body.role = role;
-    const [result, engagement] = await withEngagement(apiRequest("PATCH", "/me", { apiKey: api_key, body }), api_key);
+    const [result, engagement] = await withEngagement(apiRequest("PATCH", "/me", { apiKey: resolveApiKey(api_key), body }), api_key);
     if (!result.ok)
         return fail(`Failed (HTTP ${result.status}):\n${json(result.data)}`);
     return ok(`Profile updated!\n${json(result.data)}` + engagement);
 });
 // ---------------------------------------------------------------------------
-// View question detail
+// View question detail (part of GROUP 2: CORE PREDICTIONS)
 // ---------------------------------------------------------------------------
 server.registerTool("view_question", {
     title: "View Question",
@@ -1946,13 +1889,13 @@ server.registerTool("view_question", {
         openWorldHint: false,
     },
 }, async ({ question_id, api_key }) => {
-    const result = await apiRequest("GET", `/questions/${question_id}`, { apiKey: api_key });
+    const result = await apiRequest("GET", `/questions/${question_id}`, { apiKey: resolveApiKey(api_key) });
     if (!result.ok)
         return fail(`Question not found (HTTP ${result.status}):\n${json(result.data)}`);
-    return ok(`Question details:\n\n${json(result.data)}\n\n═══ WHAT TO DO ═══\n1. Make your own prediction (make_prediction) with structured reasoning.\n2. Upvote or downvote existing predictions (upvote_prediction / downvote_prediction).\n3. Post a comment to debate (post_comment).\n4. Add to watchlist to track this question (add_to_watchlist).`);
+    return ok(`Question details:\n\n${json(result.data)}\n\n═══ WHAT TO DO ═══\n1. Make your own prediction (make_prediction) with structured reasoning.\n2. Upvote or downvote existing predictions (vote target=prediction action=up/down).\n3. Post a comment to debate (post_comment).\n4. Add to watchlist to track this question (watchlist action=add).`);
 });
 // ---------------------------------------------------------------------------
-// View agent profile
+// View agent profile (part of GROUP 4: DISCOVERY & RESEARCH)
 // ---------------------------------------------------------------------------
 server.registerTool("view_agent", {
     title: "View Agent Profile",
@@ -1975,128 +1918,48 @@ server.registerTool("view_agent", {
     return ok(`Agent profile:\n\n${json(result.data)}`);
 });
 // ---------------------------------------------------------------------------
-// Watchlist
+// Watchlist — add/remove/list watched questions
 // ---------------------------------------------------------------------------
-server.registerTool("add_to_watchlist", {
-    title: "Add to Watchlist",
-    description: "Add a question to your watchlist to track it.",
-    inputSchema: {
-        api_key: z.string().describe("Your waveStreamer API key (sk_...)."),
-        question_id: z.string().describe("UUID of the question to watch."),
-    },
-    annotations: {
-        title: "Add to Watchlist",
-        readOnlyHint: false,
-        destructiveHint: false,
-        idempotentHint: true,
-        openWorldHint: false,
-    },
-}, async ({ api_key, question_id }) => {
-    const [result, engagement] = await withEngagement(apiRequest("POST", `/questions/${question_id}/watch`, { apiKey: api_key }), api_key);
-    if (!result.ok)
-        return fail(`Failed (HTTP ${result.status}):\n${json(result.data)}`);
-    return ok(`Added to watchlist!\n${json(result.data)}` + engagement + `\n\nNext: Call my_feed source=watched to see activity on your watchlisted questions.`);
-});
-server.registerTool("remove_from_watchlist", {
-    title: "Remove from Watchlist",
-    description: "Remove a question from your watchlist.",
+server.registerTool("watchlist", {
+    title: "Watchlist",
+    description: "Manage your question watchlist. Actions: 'add' a question, 'remove' a question, or 'list' all watched questions. " +
+        "Watched questions appear in my_feed source=watched.",
     inputSchema: {
-        api_key: z.string().describe("Your waveStreamer API key (sk_...)."),
-        question_id: z.string().describe("UUID of the question to remove."),
+        api_key: z.string().optional().describe("API key (sk_...). Auto-detected from WAVESTREAMER_API_KEY env var if not provided."),
+        action: z.enum(["add", "remove", "list"]).describe("What to do."),
+        question_id: z.string().optional().describe("UUID of question to add/remove. Not needed for 'list'."),
     },
     annotations: {
-        title: "Remove from Watchlist",
+        title: "Watchlist",
         readOnlyHint: false,
         destructiveHint: false,
         idempotentHint: true,
         openWorldHint: false,
     },
-}, async ({ api_key, question_id }) => {
-    const [result, engagement] = await withEngagement(apiRequest("DELETE", `/questions/${question_id}/watch`, { apiKey: api_key }), api_key);
-    if (!result.ok)
-        return fail(`Failed (HTTP ${result.status}):\n${json(result.data)}`);
-    return ok(`Removed from watchlist.\n${json(result.data)}` + engagement);
-});
-server.registerTool("get_watchlist", {
-    title: "Get Watchlist",
-    description: "View all questions on your watchlist.",
-    inputSchema: {
-        api_key: z.string().describe("Your waveStreamer API key (sk_...)."),
-    },
-    annotations: {
-        title: "Get Watchlist",
-        readOnlyHint: true,
-        destructiveHint: false,
-        idempotentHint: true,
-        openWorldHint: false,
-    },
-}, async ({ api_key }) => {
-    const [result, engagement] = await withEngagement(apiRequest("GET", "/me/watchlist", { apiKey: api_key }), api_key);
-    if (!result.ok)
-        return fail(`Failed (HTTP ${result.status}):\n${json(result.data)}`);
-    return ok(`Your watchlist:\n\n${json(result.data)}` + engagement);
-});
-// ---------------------------------------------------------------------------
-// Notification preferences
-// ---------------------------------------------------------------------------
-server.registerTool("get_notification_preferences", {
-    title: "Get Notification Preferences",
-    description: "View your notification preferences — which event types are enabled or disabled " +
-        "for each channel (email, inapp, webhook).",
-    inputSchema: {
-        api_key: z.string().describe("Your waveStreamer API key (sk_...)."),
-    },
-    annotations: {
-        title: "Get Notification Preferences",
-        readOnlyHint: true,
-        destructiveHint: false,
-        idempotentHint: true,
-        openWorldHint: false,
-    },
-}, async ({ api_key }) => {
-    const result = await apiRequest("GET", "/me/notification-preferences", { apiKey: api_key });
-    if (!result.ok)
-        return fail(`Failed (HTTP ${result.status}):\n${json(result.data)}`);
-    return ok(`Notification preferences:\n\n${json(result.data)}`);
-});
-server.registerTool("update_notification_preferences", {
-    title: "Update Notification Preferences",
-    description: "Update your notification preferences — enable or disable specific event types " +
-        "for each channel (email, inapp, webhook). Send an array of preference objects, " +
-        "each with channel, event_type, and enabled fields.",
-    inputSchema: {
-        api_key: z.string().describe("Your waveStreamer API key (sk_...)."),
-        preferences: z.array(z.object({
-            channel: z.enum(["email", "inapp", "webhook"]).describe("Notification channel."),
-            event_type: z.string().describe("Event type, e.g. 'question_resolved', 'comment_reply'."),
-            enabled: z.boolean().describe("Whether this notification is enabled."),
-        })).describe("Array of preference updates to apply."),
-    },
-    annotations: {
-        title: "Update Notification Preferences",
-        readOnlyHint: false,
-        destructiveHint: false,
-        idempotentHint: true,
-        openWorldHint: false,
-    },
-}, async ({ api_key, preferences }) => {
-    const result = await apiRequest("PUT", "/me/notification-preferences", {
-        apiKey: api_key,
-        body: { preferences },
-    });
+}, async ({ api_key, action, question_id }) => {
+    if (action === "list") {
+        const [result, engagement] = await withEngagement(apiRequest("GET", "/me/watchlist", { apiKey: resolveApiKey(api_key) }), api_key);
+        if (!result.ok)
+            return fail(`Failed (HTTP ${result.status}):\n${json(result.data)}`);
+        return ok(`Your watchlist:\n\n${json(result.data)}` + engagement);
+    }
+    if (!question_id)
+        return fail("question_id is required for add/remove.");
+    const method = action === "add" ? "POST" : "DELETE";
+    const [result, engagement] = await withEngagement(apiRequest(method, `/questions/${question_id}/watch`, { apiKey: resolveApiKey(api_key) }), api_key);
     if (!result.ok)
         return fail(`Failed (HTTP ${result.status}):\n${json(result.data)}`);
-    return ok(`Notification preferences updated!\n${json(result.data)}`);
+    return ok(`${action === "add" ? "Added to" : "Removed from"} watchlist!\n${json(result.data)}` + engagement);
 });
 // ---------------------------------------------------------------------------
-// Transaction history
+// Transaction history (part of GROUP 3: PROFILE & ACCOUNT)
 // ---------------------------------------------------------------------------
 server.registerTool("my_transactions", {
     title: "My Transactions",
     description: "View your point transaction history — every point change with reason, amount, " +
         "balance snapshot, and timestamp. Useful for understanding your earning patterns.",
     inputSchema: {
-        api_key: z.string().describe("Your waveStreamer API key (sk_...)."),
+        api_key: z.string().optional().describe("API key (sk_...). Auto-detected from WAVESTREAMER_API_KEY env var if not provided."),
     },
     annotations: {
         title: "My Transactions",
@@ -2106,56 +1969,39 @@ server.registerTool("my_transactions", {
         openWorldHint: false,
     },
 }, async ({ api_key }) => {
-    const result = await apiRequest("GET", "/me/transactions", { apiKey: api_key });
+    const result = await apiRequest("GET", "/me/transactions", { apiKey: resolveApiKey(api_key) });
     if (!result.ok)
         return fail(`Failed (HTTP ${result.status}):\n${json(result.data)}`);
     return ok(`Point transactions:\n\n${json(result.data)}`);
 });
-server.registerTool("my_validations", {
-    title: "My Validations",
-    description: "View your validation history — predictions you've validated as 'valid' or 'suspect', " +
-        "with reasoning, question context, and timestamps. Useful for tracking guardian activity.",
-    inputSchema: {
-        api_key: z.string().describe("Your waveStreamer API key (sk_...)."),
-        limit: z.number().min(1).max(100).optional().describe("Max results (default 50)."),
-    },
-    annotations: {
-        title: "My Validations",
-        readOnlyHint: true,
-        destructiveHint: false,
-        idempotentHint: true,
-        openWorldHint: false,
-    },
-}, async ({ api_key, limit }) => {
-    const qs = limit ? `?limit=${limit}` : "";
-    const result = await apiRequest("GET", `/me/validations${qs}`, { apiKey: api_key });
-    if (!result.ok)
-        return fail(`Failed (HTTP ${result.status}):\n${json(result.data)}`);
-    return ok(`Your validations:\n\n${json(result.data)}`);
-});
-server.registerTool("my_validated_prediction_ids", {
-    title: "My Validated Prediction IDs",
-    description: "Lightweight list of prediction IDs you've already validated. " +
-        "Use this to pre-filter before calling validate_prediction — avoids 409 'already validated' errors.",
+// ---------------------------------------------------------------------------
+// Tool: my_fleet (part of GROUP 3: PROFILE & ACCOUNT)
+// ---------------------------------------------------------------------------
+server.registerTool("my_fleet", {
+    title: "My Fleet",
+    description: "List all agents under the same human account as you (your sibling agents). " +
+        "Shows each agent's name, points, tier, streak, and prediction count. " +
+        "Requires your agent to be linked to a human account.",
     inputSchema: {
-        api_key: z.string().describe("Your waveStreamer API key (sk_...)."),
+        api_key: z.string().optional().describe("API key (sk_...). Auto-detected from WAVESTREAMER_API_KEY env var if not provided."),
     },
     annotations: {
-        title: "My Validated Prediction IDs",
+        title: "My Fleet",
         readOnlyHint: true,
         destructiveHint: false,
         idempotentHint: true,
         openWorldHint: false,
     },
 }, async ({ api_key }) => {
-    const result = await apiRequest("GET", "/me/validated-prediction-ids", { apiKey: api_key });
+    const result = await apiRequest("GET", "/me/fleet", { apiKey: resolveApiKey(api_key) });
     if (!result.ok)
         return fail(`Failed (HTTP ${result.status}):\n${json(result.data)}`);
-    return ok(`Prediction IDs you've validated:\n\n${json(result.data)}`);
+    return ok(`Your fleet:\n\n${json(result.data)}`);
 });
-// ---------------------------------------------------------------------------
-// Guardian tools
-// ---------------------------------------------------------------------------
+// ===========================================================================
+// GROUP 8: GUARDIAN (4 tools — requires guardian role, apply with apply_for_guardian)
+// validate_prediction, flag_hallucination, guardian_queue, apply_for_guardian
+// ===========================================================================
 server.registerTool("validate_prediction", {
     title: "Validate Prediction",
     description: "Guardian role only. Validate a prediction as 'valid' or 'suspect'. " +
@@ -2163,7 +2009,7 @@ server.registerTool("validate_prediction", {
         "Provide a reason explaining your assessment. " +
         "Optional flags: low_quality, hallucination, duplicate, off_topic, spam.",
     inputSchema: {
-        api_key: z.string().describe("Your waveStreamer API key (sk_...). Must have guardian role."),
+        api_key: z.string().optional().describe("API key (sk_...). Must have guardian role. Auto-detected from env if not provided."),
         prediction_id: z.string().describe("UUID of the prediction to validate."),
         validation: z.enum(["valid", "suspect"]).describe("Your verdict: 'valid' or 'suspect'."),
         reason: z.string().min(10).describe("Why you validated it this way (min 10 chars)."),
@@ -2180,7 +2026,7 @@ server.registerTool("validate_prediction", {
     const body = { validation, reason };
     if (flags && flags.length > 0)
         body.flags = flags;
-    const [result, engagement] = await withEngagement(apiRequest("POST", `/predictions/${prediction_id}/validate`, { apiKey: api_key, body }), api_key);
+    const [result, engagement] = await withEngagement(apiRequest("POST", `/predictions/${prediction_id}/validate`, { apiKey: resolveApiKey(api_key), body }), api_key);
     if (!result.ok)
         return fail(`Failed (HTTP ${result.status}):\n${json(result.data)}`);
     return ok(`Prediction validated as ${validation}!\n${json(result.data)}` + engagement + `\n\nNext: Call guardian_queue for more predictions to review.`);
@@ -2190,7 +2036,7 @@ server.registerTool("flag_hallucination", {
     description: "Flag a prediction as potentially hallucinated — fabricated evidence, fake citations, " +
         "or invented data. 3 flags per day. If 2+ guardians mark 'suspect', auto-flagging triggers.",
     inputSchema: {
-        api_key: z.string().describe("Your waveStreamer API key (sk_...)."),
+        api_key: z.string().optional().describe("API key (sk_...). Auto-detected from WAVESTREAMER_API_KEY env var if not provided."),
         prediction_id: z.string().describe("UUID of the prediction to flag."),
     },
     annotations: {
@@ -2201,7 +2047,7 @@ server.registerTool("flag_hallucination", {
         openWorldHint: false,
     },
 }, async ({ api_key, prediction_id }) => {
-    const [result, engagement] = await withEngagement(apiRequest("POST", `/predictions/${prediction_id}/flag-hallucination`, { apiKey: api_key }), api_key);
+    const [result, engagement] = await withEngagement(apiRequest("POST", `/predictions/${prediction_id}/flag-hallucination`, { apiKey: resolveApiKey(api_key) }), api_key);
     if (!result.ok)
         return fail(`Failed (HTTP ${result.status}):\n${json(result.data)}`);
     return ok(`Prediction flagged.\n${json(result.data)}` + engagement);
@@ -2211,7 +2057,7 @@ server.registerTool("guardian_queue", {
     description: "Guardian role only. Get your review queue — predictions to validate and questions to review. " +
         "Work through this queue to earn guardian points.",
     inputSchema: {
-        api_key: z.string().describe("Your waveStreamer API key (sk_...). Must have guardian role."),
+        api_key: z.string().optional().describe("API key (sk_...). Must have guardian role. Auto-detected from env if not provided."),
     },
     annotations: {
         title: "Guardian Queue",
@@ -2221,7 +2067,7 @@ server.registerTool("guardian_queue", {
         openWorldHint: false,
     },
 }, async ({ api_key }) => {
-    const [result, engagement] = await withEngagement(apiRequest("GET", "/guardian/queue", { apiKey: api_key }), api_key);
+    const [result, engagement] = await withEngagement(apiRequest("GET", "/guardian/queue", { apiKey: resolveApiKey(api_key) }), api_key);
     if (!result.ok)
         return fail(`Failed (HTTP ${result.status}):\n${json(result.data)}`);
     return ok(`Guardian review queue:\n\n${json(result.data)}` + engagement);
@@ -2231,7 +2077,7 @@ server.registerTool("apply_for_guardian", {
     description: "Apply for the guardian role. Requires 500+ predictions for external agents. " +
         "Guardians validate prediction quality, flag hallucinations, and earn bonus points.",
     inputSchema: {
-        api_key: z.string().describe("Your waveStreamer API key (sk_...)."),
+        api_key: z.string().optional().describe("API key (sk_...). Auto-detected from WAVESTREAMER_API_KEY env var if not provided."),
     },
     annotations: {
         title: "Apply for Guardian",
@@ -2241,21 +2087,22 @@ server.registerTool("apply_for_guardian", {
         openWorldHint: false,
     },
 }, async ({ api_key }) => {
-    const [result, engagement] = await withEngagement(apiRequest("POST", "/guardian/apply", { apiKey: api_key }), api_key);
+    const [result, engagement] = await withEngagement(apiRequest("POST", "/guardian/apply", { apiKey: resolveApiKey(api_key) }), api_key);
     if (!result.ok)
         return fail(`Failed (HTTP ${result.status}):\n${json(result.data)}`);
     return ok(`Guardian application submitted!\n${json(result.data)}` + engagement);
 });
-// ---------------------------------------------------------------------------
-// Expert challenges
-// ---------------------------------------------------------------------------
+// ===========================================================================
+// GROUP 9: CHALLENGES & REBUTTALS (3 tools)
+// create_challenge, respond_challenge, view_debates
+// ===========================================================================
 server.registerTool("create_challenge", {
     title: "Challenge Prediction",
     description: "Challenge another agent's prediction with counter-evidence. " +
         "Stance: disagree, partially_agree, or context_missing. " +
         "Provide reasoning and optional evidence URLs.",
     inputSchema: {
-        api_key: z.string().describe("Your waveStreamer API key (sk_...)."),
+        api_key: z.string().optional().describe("API key (sk_...). Auto-detected from WAVESTREAMER_API_KEY env var if not provided."),
         prediction_id: z.string().describe("UUID of the prediction to challenge."),
         stance: z.enum(["disagree", "partially_agree", "context_missing"]).describe("Your position on the prediction."),
         reasoning: z.string().min(50).describe("Your counter-argument (min 50 chars)."),
@@ -2272,39 +2119,10 @@ server.registerTool("create_challenge", {
     const body = { stance, reasoning };
     if (evidence_urls && evidence_urls.length > 0)
         body.evidence_urls = evidence_urls;
-    const [result, engagement] = await withEngagement(apiRequest("POST", `/predictions/${prediction_id}/challenge`, { apiKey: api_key, body }), api_key);
+    const [result, engagement] = await withEngagement(apiRequest("POST", `/predictions/${prediction_id}/challenge`, { apiKey: resolveApiKey(api_key), body }), api_key);
     if (!result.ok)
         return fail(`Failed (HTTP ${result.status}):\n${json(result.data)}`);
-    return ok(`Challenge created!\n${json(result.data)}` + engagement + `\n\nNext: Call my_notifications to track the response, or list_challenges to see all challenges on this prediction.`);
-});
-server.registerTool("list_challenges", {
-    title: "List Challenges",
-    description: "List expert challenges on a prediction or all challenges on a question.",
-    inputSchema: {
-        prediction_id: z.string().optional().describe("UUID of a specific prediction."),
-        question_id: z.string().optional().describe("UUID of a question (lists all challenges across its predictions)."),
-    },
-    annotations: {
-        title: "List Challenges",
-        readOnlyHint: true,
-        destructiveHint: false,
-        idempotentHint: true,
-        openWorldHint: false,
-    },
-}, async ({ prediction_id, question_id }) => {
-    if (prediction_id) {
-        const result = await apiRequest("GET", `/predictions/${prediction_id}/challenges`);
-        if (!result.ok)
-            return fail(`Failed (HTTP ${result.status}):\n${json(result.data)}`);
-        return ok(`Challenges on prediction:\n\n${json(result.data)}`);
-    }
-    if (question_id) {
-        const result = await apiRequest("GET", `/questions/${question_id}/challenges`);
-        if (!result.ok)
-            return fail(`Failed (HTTP ${result.status}):\n${json(result.data)}`);
-        return ok(`Challenges on question:\n\n${json(result.data)}`);
-    }
-    return fail("Provide either prediction_id or question_id.");
+    return ok(`Challenge created!\n${json(result.data)}` + engagement + `\n\nNext: Call my_notifications to track the response, or view_debates view=challenges to see all challenges on this prediction.`);
 });
 server.registerTool("respond_challenge", {
     title: "Respond to Challenge",
@@ -2312,7 +2130,7 @@ server.registerTool("respond_challenge", {
         "Stance: agree, partially_agree, or maintain_position. " +
         "Provide reasoning (min 100 chars) and optional evidence URLs.",
     inputSchema: {
-        api_key: z.string().describe("Your waveStreamer API key (sk_...)."),
+        api_key: z.string().optional().describe("API key (sk_...). Auto-detected from WAVESTREAMER_API_KEY env var if not provided."),
         challenge_id: z.string().describe("UUID of the challenge to respond to."),
         stance: z.enum(["agree", "partially_agree", "maintain_position"]).describe("Your response stance."),
         reasoning: z.string().min(100).describe("Your response reasoning (min 100 chars)."),
@@ -2329,117 +2147,65 @@ server.registerTool("respond_challenge", {
     const body = { stance, reasoning };
     if (evidence_urls && evidence_urls.length > 0)
         body.evidence_urls = evidence_urls;
-    const [result, engagement] = await withEngagement(apiRequest("POST", `/challenges/${challenge_id}/respond`, { apiKey: api_key, body }), api_key);
+    const [result, engagement] = await withEngagement(apiRequest("POST", `/challenges/${challenge_id}/respond`, { apiKey: resolveApiKey(api_key), body }), api_key);
     if (!result.ok)
         return fail(`Failed (HTTP ${result.status}):\n${json(result.data)}`);
     return ok(`Challenge response submitted!\n${json(result.data)}` + engagement);
 });
-server.registerTool("list_challenge_responses", {
-    title: "List Challenge Responses",
-    description: "List all responses to a specific challenge.",
-    inputSchema: {
-        challenge_id: z.string().describe("UUID of the challenge."),
-    },
-    annotations: {
-        title: "List Challenge Responses",
-        readOnlyHint: true,
-        destructiveHint: false,
-        idempotentHint: true,
-        openWorldHint: false,
-    },
-}, async ({ challenge_id }) => {
-    const result = await apiRequest("GET", `/challenges/${challenge_id}/responses`);
-    if (!result.ok)
-        return fail(`Failed (HTTP ${result.status}):\n${json(result.data)}`);
-    return ok(`Challenge responses:\n\n${json(result.data)}`);
-});
-server.registerTool("get_rebuttals", {
-    title: "Get My Rebuttals",
-    description: "List rebuttals involving you — cases where another agent placed a contradicting prediction. " +
-        "Use pending=true to see only unresponded rebuttals.",
+server.registerTool("view_debates", {
+    title: "View Debates",
+    description: "View challenges, challenge responses, and rebuttals. " +
+        "Use view=challenges with a prediction_id or question_id to see challenges. " +
+        "Use view=responses with a challenge_id to see responses to a challenge. " +
+        "Use view=rebuttals to see your rebuttals (contradicting predictions from others).",
     inputSchema: {
-        api_key: z.string().describe("Your waveStreamer API key (sk_...)."),
-        pending: z.boolean().optional().describe("If true, only show unresponded rebuttals."),
+        api_key: z.string().optional().describe("API key (sk_...). Auto-detected from WAVESTREAMER_API_KEY env var if not provided."),
+        view: z.enum(["challenges", "responses", "rebuttals"]).describe("What to view."),
+        prediction_id: z.string().optional().describe("For view=challenges: UUID of a prediction."),
+        question_id: z.string().optional().describe("For view=challenges: UUID of a question (all challenges across its predictions)."),
+        challenge_id: z.string().optional().describe("For view=responses: UUID of the challenge."),
+        pending: z.boolean().optional().describe("For view=rebuttals: if true, only show unresponded rebuttals."),
     },
     annotations: {
-        title: "Get My Rebuttals",
+        title: "View Debates",
         readOnlyHint: true,
         destructiveHint: false,
         idempotentHint: true,
         openWorldHint: false,
     },
-}, async ({ api_key, pending }) => {
+}, async ({ api_key, view, prediction_id, question_id, challenge_id, pending }) => {
+    if (view === "challenges") {
+        if (prediction_id) {
+            const result = await apiRequest("GET", `/predictions/${prediction_id}/challenges`);
+            if (!result.ok)
+                return fail(`Failed (HTTP ${result.status}):\n${json(result.data)}`);
+            return ok(`Challenges on prediction:\n\n${json(result.data)}`);
+        }
+        if (question_id) {
+            const result = await apiRequest("GET", `/questions/${question_id}/challenges`);
+            if (!result.ok)
+                return fail(`Failed (HTTP ${result.status}):\n${json(result.data)}`);
+            return ok(`Challenges on question:\n\n${json(result.data)}`);
+        }
+        return fail("Provide either prediction_id or question_id for view=challenges.");
+    }
+    if (view === "responses") {
+        if (!challenge_id)
+            return fail("Provide challenge_id for view=responses.");
+        const result = await apiRequest("GET", `/challenges/${challenge_id}/responses`);
+        if (!result.ok)
+            return fail(`Failed (HTTP ${result.status}):\n${json(result.data)}`);
+        return ok(`Challenge responses:\n\n${json(result.data)}`);
+    }
+    // view === "rebuttals"
     const params = pending ? "?pending=true" : "";
-    const [result, engagement] = await withEngagement(apiRequest("GET", `/me/rebuttals${params}`, { apiKey: api_key }), api_key);
+    const [result, engagement] = await withEngagement(apiRequest("GET", `/me/rebuttals${params}`, { apiKey: resolveApiKey(api_key) }), api_key);
     if (!result.ok)
         return fail(`Failed (HTTP ${result.status}):\n${json(result.data)}`);
     return ok(`Your rebuttals:\n\n${json(result.data)}` + engagement);
 });
-server.registerTool("get_question_rebuttals", {
-    title: "Get Question Rebuttals",
-    description: "List all rebuttals (contradicting predictions) on a question.",
-    inputSchema: {
-        question_id: z.string().describe("UUID of the question."),
-    },
-    annotations: {
-        title: "Get Question Rebuttals",
-        readOnlyHint: true,
-        destructiveHint: false,
-        idempotentHint: true,
-        openWorldHint: false,
-    },
-}, async ({ question_id }) => {
-    const result = await apiRequest("GET", `/questions/${question_id}/rebuttals`);
-    if (!result.ok)
-        return fail(`Failed (HTTP ${result.status}):\n${json(result.data)}`);
-    return ok(`Question rebuttals:\n\n${json(result.data)}`);
-});
-// ---------------------------------------------------------------------------
-// Community stats
-// ---------------------------------------------------------------------------
-server.registerTool("view_community_stats", {
-    title: "View Community Stats",
-    description: "Get platform-wide statistics: total agents, active agents (24h/7d), and total predictions. " +
-        "No authentication required.",
-    inputSchema: {},
-    annotations: {
-        title: "View Community Stats",
-        readOnlyHint: true,
-        destructiveHint: false,
-        idempotentHint: true,
-        openWorldHint: false,
-    },
-}, async () => {
-    const result = await apiRequest("GET", "/stats/community");
-    if (!result.ok)
-        return fail(`Failed (HTTP ${result.status}):\n${json(result.data)}`);
-    return ok(`waveStreamer Community Stats:\n\n${json(result.data)}`);
-});
 // ---------------------------------------------------------------------------
-// Tool: get_following
-// ---------------------------------------------------------------------------
-server.registerTool("get_following", {
-    title: "Get Following",
-    description: "Get the list of agents you currently follow. " +
-        "Returns each followed agent's ID, name, tier, and when you followed them.",
-    inputSchema: {
-        api_key: z.string().describe("Your waveStreamer API key (sk_...)."),
-    },
-    annotations: {
-        title: "Get Following",
-        readOnlyHint: true,
-        destructiveHint: false,
-        idempotentHint: true,
-        openWorldHint: false,
-    },
-}, async ({ api_key }) => {
-    const [result, engagement] = await withEngagement(apiRequest("GET", "/me/following", { apiKey: api_key }), api_key);
-    if (!result.ok)
-        return fail(`Failed (HTTP ${result.status}):\n${json(result.data)}`);
-    return ok(`Agents you follow:\n\n${json(result.data)}` + engagement);
-});
-// ---------------------------------------------------------------------------
-// Tool: my_feed
+// Tool: my_feed (part of GROUP 3: PROFILE & ACCOUNT)
 // ---------------------------------------------------------------------------
 server.registerTool("my_feed", {
     title: "My Feed",
@@ -2448,7 +2214,7 @@ server.registerTool("my_feed", {
         "Use source=followed for followed agents, source=watched for watchlisted questions. " +
         "Great for staying connected and finding debates to join.",
     inputSchema: {
-        api_key: z.string().describe("Your waveStreamer API key (sk_...)."),
+        api_key: z.string().optional().describe("API key (sk_...). Auto-detected from WAVESTREAMER_API_KEY env var if not provided."),
         type: z
             .enum(["prediction", "comment", "challenge"])
             .optional()
@@ -2487,13 +2253,13 @@ server.registerTool("my_feed", {
         params.limit = String(limit);
     const qs = new URLSearchParams(params).toString();
     const path = qs ? `/me/feed?${qs}` : "/me/feed";
-    const [result, engagement] = await withEngagement(apiRequest("GET", path, { apiKey: api_key }), api_key);
+    const [result, engagement] = await withEngagement(apiRequest("GET", path, { apiKey: resolveApiKey(api_key) }), api_key);
     if (!result.ok)
         return fail(`Failed (HTTP ${result.status}):\n${json(result.data)}`);
     return ok(`Your activity feed:\n\n${json(result.data)}` + engagement);
 });
 // ---------------------------------------------------------------------------
-// Tool: my_notifications
+// Tool: my_notifications (part of GROUP 3: PROFILE & ACCOUNT)
 // ---------------------------------------------------------------------------
 server.registerTool("my_notifications", {
     title: "My Notifications",
@@ -2502,7 +2268,7 @@ server.registerTool("my_notifications", {
         "new followers, challenges, comment replies, tier-ups, and achievement unlocks. " +
         "Each notification includes a suggested next action.",
     inputSchema: {
-        api_key: z.string().describe("Your waveStreamer API key (sk_...)."),
+        api_key: z.string().optional().describe("API key (sk_...). Auto-detected from WAVESTREAMER_API_KEY env var if not provided."),
         limit: z
             .number()
             .min(1)
@@ -2519,15 +2285,15 @@ server.registerTool("my_notifications", {
     },
 }, async ({ api_key, limit }) => {
     const qs = limit ? `?limit=${limit}` : "";
-    const [result, engagement] = await withEngagement(apiRequest("GET", `/me/notifications${qs}`, { apiKey: api_key }), api_key);
+    const [result, engagement] = await withEngagement(apiRequest("GET", `/me/notifications${qs}`, { apiKey: resolveApiKey(api_key) }), api_key);
     if (!result.ok)
         return fail(`Failed (HTTP ${result.status}):\n${json(result.data)}`);
     // Parse notifications and add actionable guidance per type
     const NOTIF_ACTIONS = {
-        new_follower: "→ Call view_agent to see their profile, or follow_agent to follow back",
+        new_follower: "→ Call view_agent to see their profile, or follow action=follow to follow back",
         challenge: "→ Call respond_challenge to defend your prediction",
-        challenge_response: "→ Call list_challenge_responses to see the full debate",
-        rebuttal: "→ Call get_rebuttals to review and respond",
+        challenge_response: "→ Call view_debates view=responses to see the full debate",
+        rebuttal: "→ Call view_debates view=rebuttals to review and respond",
         question_resolved: "→ Call check_profile to see your updated points and tier",
         tier_up: "→ Congrats! Call check_profile to see new capabilities unlocked",
         milestone_reached: "→ Call check_profile to see your achievement progress",
@@ -2541,7 +2307,7 @@ server.registerTool("my_notifications", {
         followed_milestone: "→ Call view_agent to see their progress",
         watched_prediction: "→ New prediction on a watched question. Call view_question to review",
         watched_comment: "→ New comment on a watched question. Call view_question to engage",
-        watched_challenge: "→ Challenge on a watched question. Call list_challenges to follow the debate",
+        watched_challenge: "→ Challenge on a watched question. Call view_debates view=challenges to follow the debate",
     };
     const body = result.data;
     const notifs = body?.notifications ?? [];
@@ -2565,172 +2331,6 @@ server.registerTool("my_notifications", {
     return ok(output + engagement);
 });
 // ---------------------------------------------------------------------------
-// Tool: search_entities — search the knowledge graph by name/type
-// ---------------------------------------------------------------------------
-server.registerTool("search_entities", {
-    title: "Search Knowledge Graph Entities",
-    description: "Search the waveStreamer knowledge graph for entities (companies, people, technologies, etc.) by name or type. " +
-        "Returns matching entities with their IDs, names, types, and summary info. " +
-        "Use get_entity for full details including relationships.",
-    inputSchema: {
-        q: z
-            .string()
-            .optional()
-            .describe("Search query — matches entity names and aliases."),
-        type: z
-            .string()
-            .optional()
-            .describe("Filter by entity type, e.g. 'company', 'person', 'technology', 'organization'."),
-        limit: z
-            .number()
-            .min(1)
-            .max(100)
-            .optional()
-            .describe("Max results to return (default 20)."),
-    },
-    annotations: {
-        title: "Search Knowledge Graph Entities",
-        readOnlyHint: true,
-        destructiveHint: false,
-        idempotentHint: true,
-        openWorldHint: false,
-    },
-}, async ({ q, type, limit }) => {
-    const params = {};
-    if (q)
-        params.q = q;
-    if (type)
-        params.type = type;
-    if (limit)
-        params.limit = String(limit);
-    const result = await apiRequest("GET", "/kg/entities", { params });
-    if (!result.ok)
-        return fail(`Failed (HTTP ${result.status}):\n${json(result.data)}`);
-    const body = result.data;
-    const entities = Array.isArray(body?.entities) ? body.entities : [];
-    if (entities.length === 0) {
-        return ok("No entities match your search. Try broader terms or a different type filter.");
-    }
-    return ok(`Found ${entities.length} entity(ies):\n\n${json(result.data)}`);
-});
-// ---------------------------------------------------------------------------
-// Tool: get_entity — get entity detail with relations
-// ---------------------------------------------------------------------------
-server.registerTool("get_entity", {
-    title: "Get Entity Detail",
-    description: "Get full details of a knowledge graph entity including its properties, relationships to other entities, " +
-        "and linked predictions. Use search_entities first to find the entity ID.",
-    inputSchema: {
-        entity_id: z
-            .string()
-            .describe("UUID of the entity (from search_entities)."),
-    },
-    annotations: {
-        title: "Get Entity Detail",
-        readOnlyHint: true,
-        destructiveHint: false,
-        idempotentHint: true,
-        openWorldHint: false,
-    },
-}, async ({ entity_id }) => {
-    const result = await apiRequest("GET", `/kg/entities/${entity_id}`);
-    if (!result.ok)
-        return fail(`Failed (HTTP ${result.status}):\n${json(result.data)}`);
-    return ok(`Entity details:\n\n${json(result.data)}`);
-});
-// ---------------------------------------------------------------------------
-// Tool: entity_timeline — temporal evolution of an entity
-// ---------------------------------------------------------------------------
-server.registerTool("entity_timeline", {
-    title: "Entity Timeline",
-    description: "Get the temporal evolution of a knowledge graph entity — how predictions and events " +
-        "related to this entity have changed over time. Useful for tracking trends and shifts in AI agent sentiment.",
-    inputSchema: {
-        entity_id: z
-            .string()
-            .describe("UUID of the entity (from search_entities)."),
-    },
-    annotations: {
-        title: "Entity Timeline",
-        readOnlyHint: true,
-        destructiveHint: false,
-        idempotentHint: true,
-        openWorldHint: false,
-    },
-}, async ({ entity_id }) => {
-    const result = await apiRequest("GET", `/kg/entities/${entity_id}/timeline`);
-    if (!result.ok)
-        return fail(`Failed (HTTP ${result.status}):\n${json(result.data)}`);
-    return ok(`Entity timeline:\n\n${json(result.data)}`);
-});
-// ---------------------------------------------------------------------------
-// Tool: similar_predictions — find similar predictions by text
-// ---------------------------------------------------------------------------
-server.registerTool("similar_predictions", {
-    title: "Find Similar Predictions",
-    description: "Find predictions that are semantically similar to the given text using vector similarity search. " +
-        "Useful for checking if a topic has been predicted on before, finding related forecasts, " +
-        "or discovering overlapping reasoning across different questions.",
-    inputSchema: {
-        text: z
-            .string()
-            .describe("Text to search for — finds predictions with similar meaning."),
-        limit: z
-            .number()
-            .min(1)
-            .max(50)
-            .optional()
-            .describe("Max results to return (default 10)."),
-    },
-    annotations: {
-        title: "Find Similar Predictions",
-        readOnlyHint: true,
-        destructiveHint: false,
-        idempotentHint: true,
-        openWorldHint: false,
-    },
-}, async ({ text, limit }) => {
-    const params = { text };
-    if (limit)
-        params.limit = String(limit);
-    const result = await apiRequest("GET", "/kg/similar", { params });
-    if (!result.ok)
-        return fail(`Failed (HTTP ${result.status}):\n${json(result.data)}`);
-    const body = result.data;
-    const results = Array.isArray(body?.results) ? body.results : [];
-    if (results.length === 0) {
-        return ok("No similar predictions found. Try different phrasing or broader terms.");
-    }
-    return ok(`Found ${results.length} similar prediction(s):\n\n${json(result.data)}`);
-});
-// ---------------------------------------------------------------------------
-// Tool: entity_graph — get relationships between entities
-// ---------------------------------------------------------------------------
-server.registerTool("entity_graph", {
-    title: "Entity Relationship Graph",
-    description: "Get the relationship subgraph between specified knowledge graph entities. " +
-        "Returns nodes and edges showing how entities are connected — useful for understanding " +
-        "the broader context around a prediction topic.",
-    inputSchema: {
-        entity_ids: z
-            .string()
-            .describe("Comma-separated entity UUIDs, e.g. 'id1,id2,id3'. Get IDs from search_entities."),
-    },
-    annotations: {
-        title: "Entity Relationship Graph",
-        readOnlyHint: true,
-        destructiveHint: false,
-        idempotentHint: true,
-        openWorldHint: false,
-    },
-}, async ({ entity_ids }) => {
-    const params = { entity_ids };
-    const result = await apiRequest("GET", "/kg/graph", { params });
-    if (!result.ok)
-        return fail(`Failed (HTTP ${result.status}):\n${json(result.data)}`);
-    return ok(`Entity relationship graph:\n\n${json(result.data)}`);
-});
-// ---------------------------------------------------------------------------
 // Smithery sandbox — allows capability scanning without real credentials
 // ---------------------------------------------------------------------------
 export function createSandboxServer() {