@vespermcp/mcp-server 1.3.0 → 1.4.0

package/build/lib/mcp-analytics.js

@@ -0,0 +1,164 @@
+import { getSupabaseAdminClient, resolveUserIdFromApiKey } from "./plan-resolve.js";
+import { inferSourceFromDatasetId, normalizeProviderSource, PLAN_GATE_EXEMPT_TOOLS, } from "./plan-gate.js";
+function truncateDatasetName(raw) {
+    const t = raw.trim();
+    if (!t)
+        return "unknown";
+    return t.length > 256 ? t.slice(0, 253) + "..." : t;
+}
+function pickDatasetName(args) {
+    const a = args || {};
+    const candidates = [
+        a.dataset_id,
+        a.query,
+        a.datasetId,
+        a.url,
+        a.file_path,
+    ];
+    for (const c of candidates) {
+        if (typeof c === "string" && c.trim()) {
+            return truncateDatasetName(c);
+        }
+    }
+    return "unknown";
+}
+function pickSource(toolName, args) {
+    const a = args || {};
+    const explicit = normalizeProviderSource(String(a.source ?? ""));
+    if (explicit)
+        return explicit;
+    const fromId = inferSourceFromDatasetId(String(a.dataset_id ?? a.query ?? ""));
+    if (fromId)
+        return fromId;
+    if (toolName === "vesper_web_find" && Array.isArray(a.sources) && a.sources.length > 0) {
+        return String(a.sources[0]).toLowerCase();
+    }
+    return null;
+}
+function pickFormat(args) {
+    const a = args || {};
+    const f = a.format ?? a.target_format ?? a.output_format;
+    if (typeof f === "string" && f.trim())
+        return f.trim().toLowerCase().slice(0, 32);
+    return null;
+}
+function mapToolToEvent(toolName) {
+    switch (toolName) {
+        case "vesper_search":
+        case "discover_datasets":
+        case "vesper_web_find":
+        case "vesper.extract_web":
+        case "get_dataset_info":
+            return { event_type: "dataset_search" };
+        case "download_dataset":
+        case "vesper_download_assets":
+            return { event_type: "dataset_download" };
+        case "quality_analyze":
+        case "analyze_quality":
+        case "analyze_image_quality":
+        case "analyze_media_quality":
+        case "generate_quality_report":
+        case "preview_cleaning":
+            return { event_type: "quality_analysis" };
+        case "prepare_dataset":
+            return { event_type: "dataset_prepare" };
+        case "export_dataset":
+        case "vesper_convert_format":
+            return { event_type: "export" };
+        default:
+            return { event_type: "data_processed" };
+    }
+}
+function mapToolToEventWithArgs(toolName, args) {
+    if (toolName === "unified_dataset_api") {
+        const op = String(args.operation ?? "").trim().toLowerCase();
+        if (op === "discover" || op === "providers" || op === "info") {
+            return { event_type: "dataset_search" };
+        }
+        if (op === "download") {
+            return { event_type: "dataset_download" };
+        }
+    }
+    return mapToolToEvent(toolName);
+}
+async function hasAnalyticsConsent(userId) {
+    const supabase = getSupabaseAdminClient();
+    if (!supabase)
+        return false;
+    const { data, error } = await supabase
+        .from("analytics_consent")
+        .select("consented")
+        .eq("user_id", userId)
+        .maybeSingle();
+    if (error) {
+        return false;
+    }
+    return data?.consented === true;
+}
+/**
+ * After each MCP tool call: insert one row into `analytics_events` (same table as
+ * `/api/analytics/ingest` and the landing Operations tab) when the user has opted in
+ * and `VESPER_API_KEY` / `api_key` resolves to a user.
+ */
+export async function recordMcpToolAnalyticsAfterCall(opts) {
+    if (process.env.VESPER_DISABLE_MCP_ANALYTICS === "1" || process.env.VESPER_DISABLE_MCP_ANALYTICS === "true") {
+        return;
+    }
+    const toolName = String(opts.toolName || "").trim();
+    if (!toolName || PLAN_GATE_EXEMPT_TOOLS.has(toolName)) {
+        return;
+    }
+    const supabase = getSupabaseAdminClient();
+    if (!supabase) {
+        return;
+    }
+    const args = opts.args || {};
+    const apiKey = String(args.api_key ?? process.env.VESPER_API_KEY ?? "").trim();
+    if (!apiKey) {
+        return;
+    }
+    const userId = await resolveUserIdFromApiKey(apiKey);
+    if (!userId) {
+        return;
+    }
+    if (!(await hasAnalyticsConsent(userId))) {
+        return;
+    }
+    const { event_type } = mapToolToEventWithArgs(toolName, args);
+    const dataset_name = pickDatasetName(args);
+    const source = pickSource(toolName, args);
+    const format = pickFormat(args);
+    const metadata = {
+        mcp_tool: toolName,
+        ok: opts.result !== undefined && opts.result.isError !== true,
+    };
+    if (opts.result?.isError) {
+        const first = opts.result.content?.[0];
+        if (first && typeof first.text === "string") {
+            metadata.error_preview = first.text.slice(0, 500);
+        }
+    }
+    const row = {
+        user_id: userId,
+        event_type,
+        dataset_name,
+        source: source || null,
+        format: format || null,
+        size_bytes: null,
+        quality_score: null,
+        metadata,
+        created_at: new Date().toISOString(),
+    };
+    let { error } = await supabase.from("analytics_events").insert(row);
+    // Older DBs may lack `dataset_prepare` in CHECK constraint — fall back.
+    if (error && event_type === "dataset_prepare" && /check|constraint/i.test(error.message || "")) {
+        ({ error } = await supabase.from("analytics_events").insert({
+            ...row,
+            event_type: "data_processed",
+            metadata: { ...metadata, event_type_fallback: "dataset_prepare" },
+        }));
+    }
+    if (error) {
+        console.error("[mcp-analytics] insert failed:", error.message);
+    }
+}

package/build/lib/plan-resolve.js

@@ -45,7 +45,7 @@ async function getUserPlanForUserId(userId) {
     }
     return "free";
 }
-async function resolveUserFromApiKey(apiKey) {
+async function lookupUserByApiKey(apiKey) {
     const supabase = getSupabase();
     if (!supabase)
         return null;
@@ -59,6 +59,14 @@ async function resolveUserFromApiKey(apiKey) {
     }
     return { userId: data.user_id };
 }
+/** For analytics / profile sync — same lookup as plan gate. */
+export async function resolveUserIdFromApiKey(apiKey) {
+    const row = await lookupUserByApiKey(apiKey);
+    return row?.userId ?? null;
+}
+export function getSupabaseAdminClient() {
+    return getSupabase();
+}
 /**
  * Central gate: same rules as `landing/lib/plan-entitlements` + landing analytics ingest.
  */
@@ -77,7 +85,7 @@ export async function enforcePlanGateForTool(toolName, args) {
             message: "Plan enforcement is enabled (Supabase configured). Set `VESPER_API_KEY` in the MCP env or pass `api_key` on tool calls to your Vesper API key so your tier can be verified.",
         };
     }
-    const user = await resolveUserFromApiKey(apiKey);
+    const user = await lookupUserByApiKey(apiKey);
     if (!user) {
         return {
             ok: false,

package/mcp-config-template.json

@@ -9,9 +9,8 @@
                 "vespermcp"
             ],
             "env": {
-                "KAGGLE_USERNAME": "your-kaggle-username",
-                "KAGGLE_KEY": "your-kaggle-api-key",
-                "HF_TOKEN": "your-huggingface-token"
+                "VESPER_API_KEY": "your-key-from-getvesper.dev",
+                "VESPER_API_URL": "https://getvesper.dev"
             }
         }
     }

package/package.json

@@ -1,12 +1,11 @@
 {
   "name": "@vespermcp/mcp-server",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "description": "AI-powered dataset discovery, quality analysis, and preparation MCP server with multimodal support (text, image, audio, video)",
   "type": "module",
   "main": "build/index.js",
   "bin": {
-    "vespermcp": "build/index.js",
-    "vesper-wizard": "wizard.cjs"
+    "vespermcp": "build/index.js"
   },
   "files": [
     "build/**/*",

package/scripts/postinstall.cjs

@@ -135,6 +135,37 @@ function getClaudeConfigPath() {
 
 const configPath = getClaudeConfigPath();
 
+function readVesperConfigToml() {
+    const p = path.join(vesperDataDir, 'config.toml');
+    if (!fs.existsSync(p)) return {};
+    const content = fs.readFileSync(p, 'utf8');
+    const obj = {};
+    for (const line of content.split('\n')) {
+        const m = line.match(/^\s*(\w+)\s*=\s*"(.*)"\s*$/);
+        if (m) obj[m[1]] = m[2];
+    }
+    return obj;
+}
+
+function getMcpVesperApiUrl() {
+    const raw = (process.env.VESPER_API_URL || '').trim();
+    return raw.replace(/\/$/, '') || 'https://getvesper.dev';
+}
+
+function buildClaudeMcpVesperEntry() {
+    const vesperToml = readVesperConfigToml();
+    const apiKey = String(vesperToml.api_key || '').trim();
+    const npxCmd = process.platform === 'win32' ? 'npx.cmd' : 'npx';
+    return {
+        command: npxCmd,
+        args: ['-y', '-p', '@vespermcp/mcp-server@latest', 'vespermcp'],
+        env: {
+            VESPER_API_KEY: apiKey || 'your-key-from-getvesper.dev',
+            VESPER_API_URL: getMcpVesperApiUrl(),
+        },
+    };
+}
+
 if (configPath && fs.existsSync(configPath)) {
     try {
         const configContent = fs.readFileSync(configPath, 'utf8');
@@ -142,17 +173,22 @@ if (configPath && fs.existsSync(configPath)) {
 
         if (!config.mcpServers) config.mcpServers = {};
 
-        if (!config.mcpServers.vesper) {
-            config.mcpServers.vesper = {
-                command: "vesper",
-                args: [],
-                env: {
-                    "HF_TOKEN": ""
-                }
-            };
+        const entry = buildClaudeMcpVesperEntry();
+        const existing = config.mcpServers.vesper;
+        const isLegacy =
+            existing &&
+            existing.command === 'vesper' &&
+            existing.env &&
+            Object.prototype.hasOwnProperty.call(existing.env, 'HF_TOKEN');
 
+        if (!existing) {
+            config.mcpServers.vesper = entry;
+            fs.writeFileSync(configPath, JSON.stringify(config, null, 2));
+            console.log(`✅ Automatically added 'vesper' (npx + VESPER_* env) to ${configPath}`);
+        } else if (isLegacy) {
+            config.mcpServers.vesper = entry;
             fs.writeFileSync(configPath, JSON.stringify(config, null, 2));
-            console.log(`✅ Automatically added 'vesper' to ${configPath}`);
+            console.log(`✅ Updated legacy Vesper MCP entry to npx + VESPER_* env in ${configPath}`);
         } else {
             console.log(`ℹ️  'vesper' is already configured in ${configPath}`);
         }

package/scripts/wizard.cjs

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 
 // ─────────────────────────────────────────────────────────────
-//  vesper-wizard  —  Zero-friction local setup for Vesper MCP
-//  Run:  npx vesper-wizard@latest
+//  @vespermcp/setup  —  Zero-friction local setup for Vesper MCP
+//  Run:  npx @vespermcp/setup@latest
 // ─────────────────────────────────────────────────────────────
 
 const fs = require('fs');
@@ -379,6 +379,46 @@ ${dim('────────────────────────
 }
 
 // ── MCP Auto-Config ──────────────────────────────────────────
+function getMcpVesperApiUrl() {
+  const raw = (process.env.VESPER_API_URL || '').trim();
+  return raw.replace(/\/$/, '') || 'https://getvesper.dev';
+}
+
+function buildMcpServerEntry() {
+  const npxCmd = IS_WIN ? 'npx.cmd' : 'npx';
+  const state = readToml(CONFIG_TOML);
+  const apiKey = String(state.api_key || '').trim();
+  return {
+    command: npxCmd,
+    args: ['-y', '-p', '@vespermcp/mcp-server@latest', 'vespermcp'],
+    env: {
+      VESPER_API_URL: getMcpVesperApiUrl(),
+      VESPER_API_KEY: apiKey || 'your-key-from-getvesper.dev',
+    },
+  };
+}
+
+function escapeTomlDoubleQuoted(value) {
+  return String(value).replace(/\\/g, '\\\\').replace(/"/g, '\\"');
+}
+
+function upsertTomlMcpVesperBlock(content, serverEntry) {
+  const key = escapeTomlDoubleQuoted(serverEntry.env.VESPER_API_KEY);
+  const url = escapeTomlDoubleQuoted(serverEntry.env.VESPER_API_URL);
+  const block =
+    `[mcp_servers.vesper]\n` +
+    `command = "${serverEntry.command}"\n` +
+    `args = [${serverEntry.args.map((a) => `"${a}"`).join(', ')}]\n\n` +
+    `[mcp_servers.vesper.env]\n` +
+    `VESPER_API_KEY = "${key}"\n` +
+    `VESPER_API_URL = "${url}"\n`;
+  const re = /\[mcp_servers\.vesper\][\s\S]*?(?=\n\[|$)/;
+  if (re.test(content)) {
+    return content.replace(re, block.trim() + '\n');
+  }
+  return content + (content && !content.endsWith('\n') ? '\n' : '') + block;
+}
+
 function getAllAgentConfigs() {
   const isMac = process.platform === 'darwin';
   return [
@@ -424,15 +464,13 @@ function getAllAgentConfigs() {
 }
 
 function installMcpToAgent(agent) {
-  const npxCmd = IS_WIN ? 'npx.cmd' : 'npx';
-  const serverEntry = { command: npxCmd, args: ['-y', '-p', '@vespermcp/mcp-server@latest', 'vespermcp'] };
+  const serverEntry = buildMcpServerEntry();
 
   try {
     if (agent.format === 'toml') {
       let content = fs.existsSync(agent.path) ? fs.readFileSync(agent.path, 'utf8') : '';
-      if (content.includes('[mcp_servers.vesper]')) return true;
       ensureDir(path.dirname(agent.path));
-      content += `\n[mcp_servers.vesper]\ncommand = "${serverEntry.command}"\nargs = [${serverEntry.args.map(a => `"${a}"`).join(', ')}]\n`;
+      content = upsertTomlMcpVesperBlock(content, serverEntry);
       fs.writeFileSync(agent.path, content, 'utf8');
       return true;
     }
@@ -477,7 +515,7 @@ async function checkServerHealth() {
 // ── Main Wizard ──────────────────────────────────────────────
 async function main() {
   if (!isInteractiveTerminal()) {
-    console.error(red('vesper-wizard is interactive and cannot run in MCP stdio mode.'));
+    console.error(red('@vespermcp/setup is interactive and cannot run in MCP stdio mode.'));
     console.error(dim('Use this command for MCP server runtime instead:'));
     console.error(cyan('npx -y -p @vespermcp/mcp-server@latest vespermcp'));
     process.exit(2);

package/scripts/wizard.js

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 
 // ─────────────────────────────────────────────────────────────
-//  vesper-wizard  —  Zero-friction local setup for Vesper MCP
-//  Run:  npx vesper-wizard@latest
+//  @vespermcp/setup  —  Zero-friction local setup for Vesper MCP
+//  Run:  npx @vespermcp/setup@latest
 // ─────────────────────────────────────────────────────────────
 
 const fs = require('fs');