@virsanghavi/axis-server 1.5.0 → 1.7.0

package/dist/mcp-server.mjs

@@ -1035,12 +1035,13 @@ ${conventions}`;
   }
   // --- Billing & Usage ---
   async getSubscriptionStatus(email) {
-    logger.info(`[getSubscriptionStatus] Starting - email: ${email}`);
+    logger.info(`[getSubscriptionStatus] Starting - email: ${email || "(API key identity)"}`);
     logger.info(`[getSubscriptionStatus] Config - apiUrl: ${this.contextManager.apiUrl}, apiSecret: ${this.contextManager.apiSecret ? "SET" : "NOT SET"}, useSupabase: ${this.useSupabase}`);
     if (this.contextManager.apiUrl) {
       try {
-        logger.info(`[getSubscriptionStatus] Attempting API call to: usage?email=${encodeURIComponent(email)}`);
-        const result = await this.callCoordination(`usage?email=${encodeURIComponent(email)}`);
+        const endpoint = email ? `usage?email=${encodeURIComponent(email)}` : "usage";
+        logger.info(`[getSubscriptionStatus] Attempting API call to: ${endpoint}`);
+        const result = await this.callCoordination(endpoint);
         logger.info(`[getSubscriptionStatus] API call successful: ${JSON.stringify(result).substring(0, 200)}`);
         return result;
       } catch (e) {
@@ -1050,8 +1051,8 @@ ${conventions}`;
     } else {
       logger.warn("[getSubscriptionStatus] No API URL configured");
     }
-    if (this.useSupabase && this.supabase) {
-      const { data: profile, error } = await this.supabase.from("profiles").select("subscription_status, stripe_customer_id, current_period_end").eq("email", email).single();
+    if (this.useSupabase && this.supabase && email) {
+      const { data: profile, error } = await this.supabase.from("profiles").select("subscription_status, stripe_customer_id, current_period_end").ilike("email", email).single();
       if (error || !profile) {
         return { status: "unknown", message: "Profile not found." };
       }
@@ -1066,21 +1067,22 @@ ${conventions}`;
     return { error: "Coordination not configured. API URL not set and Supabase not available." };
   }
   async getUsageStats(email) {
-    logger.info(`[getUsageStats] Starting - email: ${email}`);
+    logger.info(`[getUsageStats] Starting - email: ${email || "(API key identity)"}`);
     logger.info(`[getUsageStats] Config - apiUrl: ${this.contextManager.apiUrl}, apiSecret: ${this.contextManager.apiSecret ? "SET" : "NOT SET"}, useSupabase: ${this.useSupabase}`);
     if (this.contextManager.apiUrl) {
       try {
-        logger.info(`[getUsageStats] Attempting API call to: usage?email=${encodeURIComponent(email)}`);
-        const result = await this.callCoordination(`usage?email=${encodeURIComponent(email)}`);
+        const endpoint = email ? `usage?email=${encodeURIComponent(email)}` : "usage";
+        logger.info(`[getUsageStats] Attempting API call to: ${endpoint}`);
+        const result = await this.callCoordination(endpoint);
         logger.info(`[getUsageStats] API call successful: ${JSON.stringify(result).substring(0, 200)}`);
-        return { email, usageCount: result.usageCount || 0 };
+        return { email: email || result.email, usageCount: result.usageCount || 0 };
       } catch (e) {
         logger.error(`[getUsageStats] API call failed: ${e.message}`, e);
         return { error: `API call failed: ${e.message}` };
       }
     }
-    if (this.useSupabase && this.supabase) {
-      const { data: profile } = await this.supabase.from("profiles").select("usage_count").eq("email", email).single();
+    if (this.useSupabase && this.supabase && email) {
+      const { data: profile } = await this.supabase.from("profiles").select("usage_count").ilike("email", email).single();
       return { email, usageCount: profile?.usage_count || 0 };
     }
     return { error: "Coordination not configured. API URL not set and Supabase not available." };
@@ -1166,6 +1168,7 @@ import fs4 from "fs";
 
 // ../../src/local/local-search.ts
 import fs3 from "fs/promises";
+import fsSync2 from "fs";
 import path3 from "path";
 var SKIP_DIRS = /* @__PURE__ */ new Set([
   "node_modules",
@@ -1321,34 +1324,61 @@ var STOP_WORDS = /* @__PURE__ */ new Set([
   "most",
   "some",
   "any",
-  "find",
-  "show",
-  "get",
-  "look",
-  "search",
-  "locate",
-  "check",
-  "file",
-  "files",
-  "code",
-  "function",
-  "class",
-  "method",
   "there",
   "here",
   "just",
   "also",
   "very",
   "really",
-  "quite"
+  "quite",
+  "show",
+  "look",
+  "locate",
+  "using",
+  "used",
+  "need",
+  "want"
 ]);
 var MAX_FILE_SIZE = 256 * 1024;
 var MAX_RESULTS = 20;
 var CONTEXT_LINES = 2;
 var MAX_MATCHES_PER_FILE = 6;
 function extractKeywords(query) {
-  const raw = query.toLowerCase().replace(/[^\w\s\-_.]/g, " ").split(/\s+/).filter((w) => w.length >= 2 && !STOP_WORDS.has(w));
-  return [...new Set(raw)];
+  const words = query.toLowerCase().replace(/[^\w\s\-_.]/g, " ").split(/\s+/).filter((w) => w.length >= 2);
+  const filtered = words.filter((w) => !STOP_WORDS.has(w));
+  const result = filtered.length > 0 ? filtered : words.filter((w) => w.length >= 3);
+  return [...new Set(result)];
+}
+var PROJECT_ROOT_MARKERS = [
+  ".git",
+  ".axis",
+  "package.json",
+  "Cargo.toml",
+  "go.mod",
+  "pyproject.toml",
+  "setup.py",
+  "Gemfile",
+  "pom.xml",
+  "tsconfig.json",
+  ".cursorrules",
+  "AGENTS.md"
+];
+function detectProjectRoot(startDir) {
+  let current = startDir;
+  const root = path3.parse(current).root;
+  while (current !== root) {
+    for (const marker of PROJECT_ROOT_MARKERS) {
+      try {
+        fsSync2.accessSync(path3.join(current, marker));
+        return current;
+      } catch {
+      }
+    }
+    const parent = path3.dirname(current);
+    if (parent === current) break;
+    current = parent;
+  }
+  return startDir;
 }
 async function walkDir(dir, maxDepth = 12) {
   const results = [];
@@ -1428,8 +1458,12 @@ async function searchFile(filePath, rootDir, keywords) {
   return { filePath, relativePath, score, matchedKeywords, regions };
 }
 async function localSearch(query, rootDir) {
-  const cwd = rootDir || process.cwd();
+  const rawCwd = rootDir || process.cwd();
+  const cwd = detectProjectRoot(rawCwd);
   const keywords = extractKeywords(query);
+  if (cwd !== rawCwd) {
+    logger.info(`[localSearch] Detected project root: ${cwd} (CWD was: ${rawCwd})`);
+  }
   if (keywords.length === 0) {
     return "Could not extract meaningful search terms from the query. Try being more specific (e.g. 'authentication middleware' instead of 'how does it work').";
   }
@@ -1557,8 +1591,20 @@ var subscription = {
 };
 async function verifySubscription() {
   if (!apiSecret) {
-    subscription = { checked: true, valid: true, plan: "local", reason: "No API key configured \u2014 local mode", checkedAt: Date.now() };
-    logger.info("[subscription] No API key \u2014 running in local/dev mode, skipping verification");
+    const hasDirectSupabase = !useRemoteApiOnly && !!process.env.NEXT_PUBLIC_SUPABASE_URL && !!process.env.SUPABASE_SERVICE_ROLE_KEY;
+    if (hasDirectSupabase) {
+      subscription = { checked: true, valid: true, plan: "developer", reason: "Direct Supabase mode \u2014 no API key needed", checkedAt: Date.now() };
+      logger.info("[subscription] Direct Supabase credentials found \u2014 developer mode, skipping verification");
+      return subscription;
+    }
+    subscription = {
+      checked: true,
+      valid: false,
+      plan: "none",
+      reason: "no_api_key",
+      checkedAt: Date.now()
+    };
+    logger.error("[subscription] No API key configured. Axis requires an API key from https://useaxis.dev/dashboard");
     return subscription;
   }
   const verifyUrl = apiUrl.endsWith("/v1") ? `${apiUrl}/verify` : `${apiUrl}/v1/verify`;
@@ -1616,6 +1662,22 @@ function isSubscriptionStale() {
   return Date.now() - subscription.checkedAt > RECHECK_INTERVAL_MS;
 }
 function getSubscriptionBlockMessage() {
+  if (subscription.reason === "no_api_key") {
+    return [
+      "\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550",
+      "  Axis API key required",
+      "",
+      "  No API key found. Axis requires an active subscription",
+      "  and a valid API key to operate.",
+      "",
+      "  1. Sign up or log in at https://useaxis.dev",
+      "  2. Subscribe to Axis Pro",
+      "  3. Generate an API key from the dashboard",
+      "  4. Add AXIS_API_KEY to your mcp.json configuration",
+      "  5. Restart your IDE",
+      "\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550"
+    ].join("\n");
+  }
   return [
     "\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550",
     "  Axis Pro subscription required",
@@ -1644,7 +1706,7 @@ async function ensureFileSystem() {
   try {
     const fs5 = await import("fs/promises");
     const path5 = await import("path");
-    const fsSync2 = await import("fs");
+    const fsSync3 = await import("fs");
     const cwd = process.cwd();
     logger.info(`Server CWD: ${cwd}`);
     const historyDir = path5.join(cwd, "history");
@@ -1653,7 +1715,7 @@ async function ensureFileSystem() {
     const axisDir = path5.join(cwd, ".axis");
     const axisInstructions = path5.join(axisDir, "instructions");
     const legacyInstructions = path5.join(cwd, "agent-instructions");
-    if (fsSync2.existsSync(legacyInstructions) && !fsSync2.existsSync(axisDir)) {
+    if (fsSync3.existsSync(legacyInstructions) && !fsSync3.existsSync(axisDir)) {
       logger.info("Using legacy agent-instructions directory");
     } else {
       await fs5.mkdir(axisInstructions, { recursive: true }).catch(() => {
@@ -1828,24 +1890,22 @@ server.setRequestHandler(ListToolsRequestSchema, async () => {
     // --- Billing & Usage ---
     {
       name: "get_subscription_status",
-      description: "**BILLING CHECK**: specific to the Axis business logic.\n- Returns the user's subscription tier (Pro vs Free), Stripe customer ID, and current period end.\n- Critical for gating features behind paywalls.\n- Returns 'Profile not found' if the user doesn't exist in the database.",
+      description: "**BILLING CHECK**: Returns the user's subscription tier (Pro vs Free), Stripe customer ID, and current period end.\n- If no email is provided, returns the subscription status of the current API key owner.\n- Critical for gating features behind paywalls.",
       inputSchema: {
         type: "object",
         properties: {
-          email: { type: "string", description: "User email to check." }
-        },
-        required: ["email"]
+          email: { type: "string", description: "Optional. User email to check. If omitted, checks the subscription of the current API key owner." }
+        }
       }
     },
     {
       name: "get_usage_stats",
-      description: "**API USAGE**: Returns a user's token usage and request counts.\n- Useful for debugging rate limits or explaining quota usage to users.",
+      description: "**API USAGE**: Returns token usage and request counts.\n- If no email is provided, returns usage for the current API key owner.\n- Useful for debugging rate limits or explaining quota usage to users.",
       inputSchema: {
         type: "object",
         properties: {
-          email: { type: "string", description: "User email to check." }
-        },
-        required: ["email"]
+          email: { type: "string", description: "Optional. User email to check. If omitted, checks usage of the current API key owner." }
+        }
       }
     },
     {
@@ -2036,46 +2096,56 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
   }
   if (name === SEARCH_CONTEXT_TOOL) {
     const query = String(args?.query);
-    let ragResults = null;
-    try {
-      const remote = await manager.searchContext(query, nerveCenter.currentProjectName);
-      if (remote && !remote.includes("No results found") && remote.trim().length > 20) {
-        ragResults = remote;
-      }
-    } catch {
-    }
-    if (!ragResults && ragEngine) {
-      try {
-        const localRag = await ragEngine.search(query);
-        if (localRag.length > 0) {
-          ragResults = localRag.join("\n---\n");
-        }
-      } catch {
-      }
-    }
-    let localResults = null;
+    logger.info(`[search_codebase] Query: "${query}"`);
+    let localResults = "";
     try {
       localResults = await localSearch(query);
+      logger.info(`[search_codebase] Local search completed: ${localResults.length} chars`);
     } catch (e) {
       logger.warn(`[search_codebase] Local search error: ${e}`);
+      localResults = "";
     }
-    const parts = [];
-    if (ragResults) {
-      parts.push("## Indexed Results (RAG)\n\n" + ragResults);
-    }
-    if (localResults && !localResults.startsWith("No matches found") && !localResults.startsWith("Could not extract")) {
-      parts.push("## Local Codebase Search\n\n" + localResults);
-    } else if (!ragResults) {
-      return { content: [{ type: "text", text: localResults || "No results found." }] };
+    let ragResults = null;
+    const RAG_TIMEOUT_MS = 3e3;
+    try {
+      const ragPromise = (async () => {
+        try {
+          const remote = await manager.searchContext(query, nerveCenter.currentProjectName);
+          if (remote && !remote.includes("No results found") && remote.trim().length > 20) {
+            return remote;
+          }
+        } catch {
+        }
+        if (ragEngine) {
+          try {
+            const results = await ragEngine.search(query);
+            if (results.length > 0) return results.join("\n---\n");
+          } catch {
+          }
+        }
+        return null;
+      })();
+      ragResults = await Promise.race([
+        ragPromise,
+        new Promise((resolve) => setTimeout(() => resolve(null), RAG_TIMEOUT_MS))
+      ]);
+      if (ragResults) {
+        logger.info(`[search_codebase] RAG returned results (${ragResults.length} chars)`);
+      }
+    } catch {
     }
-    if (parts.length === 0) {
-      return { content: [{ type: "text", text: "No results found for this query." }] };
+    const hasLocal = localResults && !localResults.startsWith("No matches found") && !localResults.startsWith("Could not extract");
+    if (!hasLocal && !ragResults) {
+      return { content: [{ type: "text", text: localResults || "No results found for this query." }] };
     }
+    const parts = [];
+    if (hasLocal) parts.push(localResults);
+    if (ragResults) parts.push("## Indexed Results (RAG)\n\n" + ragResults);
     return { content: [{ type: "text", text: parts.join("\n\n---\n\n") }] };
   }
   if (name === "get_subscription_status") {
-    const email = String(args?.email);
-    logger.info(`[get_subscription_status] Called with email: ${email}`);
+    const email = args?.email ? String(args.email) : void 0;
+    logger.info(`[get_subscription_status] Called with email: ${email || "(using API key identity)"}`);
     try {
       const result = await nerveCenter.getSubscriptionStatus(email);
       logger.info(`[get_subscription_status] Result: ${JSON.stringify(result).substring(0, 200)}`);
@@ -2086,8 +2156,8 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
     }
   }
   if (name === "get_usage_stats") {
-    const email = String(args?.email);
-    logger.info(`[get_usage_stats] Called with email: ${email}`);
+    const email = args?.email ? String(args.email) : void 0;
+    logger.info(`[get_usage_stats] Called with email: ${email || "(using API key identity)"}`);
     try {
       const result = await nerveCenter.getUsageStats(email);
       logger.info(`[get_usage_stats] Result: ${JSON.stringify(result).substring(0, 200)}`);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@virsanghavi/axis-server",
-    "version": "1.5.0",
+    "version": "1.7.0",
     "description": "Axis MCP Server CLI",
     "main": "dist/index.js",
     "bin": {