@openephemeris/mcp-server 3.2.8 → 3.2.10

package/dist/src/backend/client.d.ts

@@ -38,6 +38,12 @@ export declare class BackendClient {
     private _pendingAuthFlow;
     private _authFlowResult;
     constructor(config: BackendConfig);
+    /**
+     * Override the API key at runtime. Used by the SSE server to inject the
+     * per-session user's key so that all tool calls are authenticated and
+     * metered against the correct user account.
+     */
+    setApiKey(key: string): void;
     /**
      * Start the device auth flow in the background if not already running.
      * Called automatically when no credentials are found in the interceptor.

package/dist/src/backend/client.js

@@ -105,6 +105,17 @@ export class BackendClient {
             return req;
         });
     }
+    /**
+     * Override the API key at runtime. Used by the SSE server to inject the
+     * per-session user's key so that all tool calls are authenticated and
+     * metered against the correct user account.
+     */
+    setApiKey(key) {
+        this.apiKey = key;
+        // Clear any cached JWT/service key so the interceptor uses the new API key
+        this.serviceKey = undefined;
+        this.jwt = undefined;
+    }
     /**
      * Start the device auth flow in the background if not already running.
      * Called automatically when no credentials are found in the interceptor.
@@ -238,16 +249,29 @@ export class BackendClient {
                     `or set OPENEPHEMERIS_API_KEY in your MCP server config.`, 401, "auth_required", false, LOGIN_SIGNUP_URL);
             }
             if (status === 402) {
-                return new BackendError(`Usage quota exceeded: ${msg}. Review usage and overage settings in ${DASHBOARD_ACCOUNT_URL}, ` +
-                    `or upgrade at ${UPGRADE_URL}.`, 402, "quota_exceeded", false, UPGRADE_URL);
+                return new BackendError(`⚠️ USAGE QUOTA EXCEEDED — DO NOT FABRICATE DATA.\n\n` +
+                    `${msg}\n\n` +
+                    `Tell the user: their API credit quota has been reached for this billing period. ` +
+                    `They can review usage and enable overages at ${DASHBOARD_ACCOUNT_URL}, ` +
+                    `or upgrade their plan at ${UPGRADE_URL}.\n\n` +
+                    `DO NOT attempt to generate astrological data from your own knowledge. ` +
+                    `All chart positions, aspects, and timing data MUST come from the API.`, 402, "quota_exceeded", false, UPGRADE_URL);
             }
             if (status === 403) {
-                return new BackendError(`Access blocked by plan or policy: ${msg}. If this endpoint is tier-gated, upgrade at ${UPGRADE_URL}. ` +
-                    `Manage keys and billing at ${DASHBOARD_ACCOUNT_URL}.`, 403, "tier_required", false, UPGRADE_URL);
+                return new BackendError(`⚠️ ENDPOINT ACCESS RESTRICTED — DO NOT FABRICATE DATA.\n\n` +
+                    `${msg}\n\n` +
+                    `Tell the user: this feature requires a higher-tier plan. ` +
+                    `They can upgrade at ${UPGRADE_URL} or manage their account at ${DASHBOARD_ACCOUNT_URL}.\n\n` +
+                    `DO NOT attempt to generate astrological data from your own knowledge. ` +
+                    `All chart positions, aspects, and timing data MUST come from the API.`, 403, "tier_required", false, UPGRADE_URL);
             }
             if (status === 429) {
-                return new BackendError(`Rate limit exceeded. Your plan credits may be exhausted or requests are too frequent. ` +
-                    `Check usage at ${DASHBOARD_ACCOUNT_URL}, then retry in a moment. (${msg})`, 429, "rate_limited", true);
+                return new BackendError(`⚠️ RATE LIMIT EXCEEDED — DO NOT FABRICATE DATA.\n\n` +
+                    `${msg}\n\n` +
+                    `Tell the user: requests are being sent too frequently or their plan's rate limit has been hit. ` +
+                    `They should wait a moment and retry, or check usage at ${DASHBOARD_ACCOUNT_URL}.\n\n` +
+                    `DO NOT attempt to generate astrological data from your own knowledge while waiting. ` +
+                    `Simply inform the user and wait for them to retry.`, 429, "rate_limited", true);
             }
             if (status === 404)
                 return new BackendError(`Resource not found: ${msg}`, 404, "not_found", false);

package/dist/src/server-sse.js

@@ -8,9 +8,9 @@
  * Architecture:
  *   - The SSE server validates the user's API key at connection time by
  *     making a lightweight call to the Go backend.
- *   - All subsequent tool calls use the server's OPENEPHEMERIS_SERVICE_KEY
- *     (set as a Fly secret) via the singleton BackendClient's X-Service-Key header.
- *   - This avoids the need to refactor all tool handlers for per-session auth.
+ *   - The validated key is injected into the singleton BackendClient so
+ *     all subsequent tool calls authenticate as the connecting user.
+ *   - Usage credits are metered against the user's account and tier.
  */
 import fs from "node:fs";
 import path from "node:path";
@@ -21,6 +21,7 @@ import { Server } from "@modelcontextprotocol/sdk/server/index.js";
 import { SSEServerTransport } from "@modelcontextprotocol/sdk/server/sse.js";
 import { CallToolRequestSchema, ListToolsRequestSchema, } from "@modelcontextprotocol/sdk/types.js";
 import { initTools, toolRegistry } from "./tools/index.js";
+import { backendClient } from "./backend/client.js";
 // ---------------------------------------------------------------------------
 // Helpers
 // ---------------------------------------------------------------------------
@@ -204,6 +205,9 @@ async function main() {
             });
             return;
         }
+        // Inject the validated API key into the singleton BackendClient so all
+        // tool calls authenticate as this user and usage is metered correctly.
+        backendClient.setApiKey(apiKey);
         const transport = new SSEServerTransport("/message", res);
         const sessionId = transport.sessionId;
         transports.set(sessionId, transport);

package/dist/src/tools/specialized/transits.js

@@ -6,7 +6,9 @@ registerTool({
         "Returns a list of exact transit moments — when transiting planets form specified aspects " +
         "to natal planet positions. Ideal for generating horoscope timelines, event forecasting, or " +
         "finding optimal timing windows.\n\n" +
-        "CREDIT COST: 5 credits per call.\n\n" +
+        "HOW IT WORKS: This tool first calculates the natal chart to extract your actual planetary " +
+        "ecliptic longitudes, then searches for transiting planets crossing those exact degrees.\n\n" +
+        "CREDIT COST: 6 credits per call (1 for natal + 5 for transit search).\n\n" +
         "EXAMPLE: Find all Saturn transits to the natal Sun/Moon for the next 6 months:\n" +
         "  natal_datetime='1990-04-15T14:30:00', natal_latitude=41.8781, natal_longitude=-87.6298,\n" +
         "  start_date='2026-01-01', end_date='2026-06-30', transiting_planets=['saturn']",
@@ -42,16 +44,7 @@ registerTool({
             natal_points: {
                 type: "array",
                 items: { type: "string" },
-                description: "Natal point IDs to receive transits. E.g. ['sun', 'moon', 'asc', 'mc']. Omit for all core points.",
-            },
-            aspects: {
-                type: "array",
-                items: { type: "string", enum: ["conjunction", "opposition", "trine", "square", "sextile"] },
-                description: "Aspect types to include in the search. Defaults to all major aspects.",
-            },
-            orb: {
-                type: "number",
-                description: "Maximum orb in degrees (default: 1.0).",
+                description: "Natal point IDs whose exact longitudes should be targeted. E.g. ['sun', 'moon', 'asc', 'mc']. Omit for all core points.",
             },
         },
         required: ["natal_datetime", "natal_latitude", "natal_longitude", "start_date", "end_date"],
@@ -59,6 +52,58 @@ registerTool({
     },
     handler: async (args) => {
         validateRequired(args, ["natal_datetime", "natal_latitude", "natal_longitude", "start_date", "end_date"]);
+        // ── Step 1: Compute natal chart to extract real planetary longitudes ──
+        const natalBody = {
+            subject: {
+                name: "Transit Natal Subject",
+                birth_datetime: { iso: args.natal_datetime },
+                birth_location: {
+                    latitude: { decimal: args.natal_latitude },
+                    longitude: { decimal: args.natal_longitude }
+                },
+            },
+        };
+        const natalResult = await backendClient.post("/ephemeris/natal", natalBody);
+        // Extract ecliptic longitudes from natal chart planets
+        const targetDegrees = [];
+        const natalPositionMap = {};
+        // The natal response typically has a `planets` array or object
+        const planets = natalResult?.planets || natalResult?.data?.planets || [];
+        const planetArray = Array.isArray(planets) ? planets : Object.values(planets);
+        // Filter to requested natal points if specified
+        const wantedPoints = args.natal_points
+            ? new Set(args.natal_points.map((p) => p.toLowerCase()))
+            : null;
+        for (const planet of planetArray) {
+            const name = (planet.name || planet.id || "").toLowerCase();
+            const lon = planet.longitude ?? planet.ecliptic_longitude ?? planet.lon;
+            if (typeof lon !== "number" || !isFinite(lon))
+                continue;
+            if (wantedPoints && !wantedPoints.has(name))
+                continue;
+            targetDegrees.push(Math.round(lon * 100) / 100); // 2 decimal places
+            natalPositionMap[name] = lon;
+        }
+        // Also extract angles (ASC, MC, DSC, IC) if present
+        const angles = natalResult?.angles || natalResult?.data?.angles;
+        if (angles) {
+            const angleEntries = Array.isArray(angles) ? angles : Object.entries(angles).map(([k, v]) => ({ name: k, ...(typeof v === 'object' ? v : { longitude: v }) }));
+            for (const angle of angleEntries) {
+                const name = (angle.name || angle.id || "").toLowerCase();
+                const lon = angle.longitude ?? angle.ecliptic_longitude ?? angle.lon;
+                if (typeof lon !== "number" || !isFinite(lon))
+                    continue;
+                if (wantedPoints && !wantedPoints.has(name))
+                    continue;
+                targetDegrees.push(Math.round(lon * 100) / 100);
+                natalPositionMap[name] = lon;
+            }
+        }
+        if (targetDegrees.length === 0) {
+            throw new Error("Could not extract natal planet longitudes from the natal chart calculation. " +
+                "Please verify your natal_datetime, natal_latitude, and natal_longitude are correct.");
+        }
+        // ── Step 2: Search transits against those real natal longitudes ──
         let startStr = args.start_date;
         if (/^\d{4}-\d{2}-\d{2}$/.test(startStr)) {
             startStr += "T00:00:00Z";
@@ -67,26 +112,19 @@ registerTool({
         if (/^\d{4}-\d{2}-\d{2}$/.test(endStr)) {
             endStr += "T23:59:59Z";
         }
-        const body = {
+        const transitBody = {
             start_date: startStr,
             end_date: endStr,
-            natal_chart: {
-                datetime: args.natal_datetime,
-                latitude: args.natal_latitude,
-                longitude: args.natal_longitude,
-            },
+            target_degrees: targetDegrees,
         };
         if (args.transiting_planets)
-            body.planet_names = args.transiting_planets;
-        const searchCriteria = {};
-        if (args.natal_points)
-            searchCriteria.natal_points = args.natal_points;
-        if (args.aspects)
-            searchCriteria.aspects = args.aspects;
-        if (args.orb != null)
-            searchCriteria.orb = args.orb;
-        if (Object.keys(searchCriteria).length > 0)
-            body.search_criteria = searchCriteria;
-        return await backendClient.request("POST", "/predictive/transits/search", { data: body });
+            transitBody.planet_names = args.transiting_planets;
+        const transitResult = await backendClient.request("POST", "/predictive/transits/search", { data: transitBody });
+        // Return combined context so the LLM knows what natal positions were targeted
+        return {
+            natal_positions: natalPositionMap,
+            target_degrees_used: targetDegrees,
+            transit_results: transitResult,
+        };
     },
 });

package/dist/test/backend-client.test.js

@@ -111,7 +111,7 @@ describe("BackendClient", () => {
                 baseURL: srv.baseURL,
             });
             const message = await getErrorMessage(() => client.get("/quota"));
-            expect(message).toContain("Usage quota exceeded:");
+            expect(message).toContain("USAGE QUOTA EXCEEDED");
             expect(message).toContain("https://openephemeris.com/pay");
             expect(message).toContain("https://openephemeris.com/dashboard?tab=account");
         }
@@ -132,7 +132,7 @@ describe("BackendClient", () => {
                 baseURL: srv.baseURL,
             });
             const message = await getErrorMessage(() => client.get("/tier-gated"));
-            expect(message).toContain("Access blocked by plan or policy:");
+            expect(message).toContain("ENDPOINT ACCESS RESTRICTED");
             expect(message).toContain("https://openephemeris.com/pay");
             expect(message).toContain("https://openephemeris.com/dashboard?tab=account");
         }
@@ -153,7 +153,7 @@ describe("BackendClient", () => {
                 baseURL: srv.baseURL,
             });
             const message = await getErrorMessage(() => client.get("/rate-limit"));
-            expect(message).toContain("Rate limit exceeded.");
+            expect(message).toContain("RATE LIMIT EXCEEDED");
             expect(message).toContain("https://openephemeris.com/dashboard?tab=account");
         }
         finally {
@@ -273,7 +273,7 @@ describe("BackendClient", () => {
                 params: { format: "png" },
                 data: {},
             }));
-            expect(message).toContain("Access blocked by plan or policy:");
+            expect(message).toContain("ENDPOINT ACCESS RESTRICTED");
             expect(message).toContain("Startup (Pro) tier");
             expect(message).toContain("https://openephemeris.com/pay");
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openephemeris/mcp-server",
-  "version": "3.2.8",
+  "version": "3.2.10",
   "description": "Model Context Protocol server for the Open Ephemeris astronomical computation API",
   "type": "module",
   "main": "dist/index.js",