@jadenrazo/cloudcost-mcp 0.1.8 → 0.2.0

package/README.md

@@ -1,16 +1,20 @@
+<h1 align="center">CloudCost MCP Server</h1>
+
 <p align="center">
-  <h1 align="center">CloudCost MCP Server</h1>
-  <p align="center">
-    Multi-cloud cost analysis for Terraform — powered by live pricing data from AWS, Azure, and GCP.
-    <br />
-    Built on the <a href="https://modelcontextprotocol.io">Model Context Protocol</a> for seamless AI agent integration.
-  </p>
+  Multi-cloud cost analysis for Terraform — powered by live pricing data from AWS, Azure, and GCP.
+  <br />
+  Built on the <a href="https://modelcontextprotocol.io">Model Context Protocol</a> for seamless AI agent integration.
 </p>
 
 <p align="center">
+  <a href="https://github.com/jadenrazo/CloudCostMCP/actions/workflows/ci.yml"><img src="https://github.com/jadenrazo/CloudCostMCP/actions/workflows/ci.yml/badge.svg" alt="CI" /></a>
+  <a href="https://www.npmjs.com/package/@jadenrazo/cloudcost-mcp"><img src="https://img.shields.io/npm/v/@jadenrazo/cloudcost-mcp.svg" alt="npm version" /></a>
+  <a href="https://opensource.org/licenses/MIT"><img src="https://img.shields.io/badge/License-MIT-yellow.svg" alt="License: MIT" /></a>
+  <img src="https://img.shields.io/badge/node-%3E%3D20-brightgreen" alt="Node.js" />
+</p>
 
-![CI](https://github.com/jadenrazo/CloudCostMCP/actions/workflows/ci.yml/badge.svg) [![npm version](https://img.shields.io/npm/v/@jadenrazo/cloudcost-mcp.svg)](https://www.npmjs.com/package/@jadenrazo/cloudcost-mcp) [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT) ![Node.js](https://img.shields.io/badge/node-%3E%3D20-brightgreen)
-
+<p align="right">
+  <img src="https://github.com/user-attachments/assets/7d5f613a-851e-4480-900f-438d13f9a56e" alt="CloudCost MCP demo" width="700" />
 </p>
 
 <p align="center">

package/dist/index.js

@@ -14,6 +14,7 @@ import {
 } from "./chunk-KZJSZMWM.js";
 
 // src/server.ts
+import { createRequire } from "module";
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
 
@@ -55,8 +56,9 @@ function loadEnvConfig() {
   const config = {};
   const env = process.env;
   if (env.CLOUDCOST_CACHE_TTL || env.CLOUDCOST_CACHE_PATH) {
+    const parsedTtl = env.CLOUDCOST_CACHE_TTL ? parseInt(env.CLOUDCOST_CACHE_TTL, 10) : NaN;
     config.cache = {
-      ttl_seconds: env.CLOUDCOST_CACHE_TTL ? parseInt(env.CLOUDCOST_CACHE_TTL, 10) : DEFAULT_CONFIG.cache.ttl_seconds,
+      ttl_seconds: !isNaN(parsedTtl) ? parsedTtl : DEFAULT_CONFIG.cache.ttl_seconds,
       db_path: env.CLOUDCOST_CACHE_PATH ?? ""
     };
   }
@@ -66,9 +68,10 @@ function loadEnvConfig() {
     };
   }
   if (env.CLOUDCOST_MONTHLY_HOURS) {
+    const parsedHours = parseInt(env.CLOUDCOST_MONTHLY_HOURS, 10);
     config.pricing = {
       ...DEFAULT_CONFIG.pricing,
-      monthly_hours: parseInt(env.CLOUDCOST_MONTHLY_HOURS, 10)
+      monthly_hours: !isNaN(parsedHours) ? parsedHours : DEFAULT_CONFIG.pricing.monthly_hours
     };
   }
   return config;
@@ -157,18 +160,26 @@ var PricingCache = class {
    * table self-trims on read.
    */
   get(key) {
-    const row = this.db.prepare(
-      "SELECT * FROM pricing_cache WHERE key = ?"
-    ).get(key);
-    if (!row) return null;
-    const now = (/* @__PURE__ */ new Date()).toISOString();
-    if (row.expires_at <= now) {
-      this.db.prepare("DELETE FROM pricing_cache WHERE key = ?").run(key);
-      logger.debug("Cache miss (expired)", { key });
+    try {
+      const row = this.db.prepare(
+        "SELECT * FROM pricing_cache WHERE key = ?"
+      ).get(key);
+      if (!row) return null;
+      const now = (/* @__PURE__ */ new Date()).toISOString();
+      if (row.expires_at <= now) {
+        this.db.prepare("DELETE FROM pricing_cache WHERE key = ?").run(key);
+        logger.debug("Cache miss (expired)", { key });
+        return null;
+      }
+      logger.debug("Cache hit", { key });
+      return JSON.parse(row.data);
+    } catch (err) {
+      logger.warn("Cache get failed, treating as miss", {
+        key,
+        err: err instanceof Error ? err.message : String(err)
+      });
       return null;
     }
-    logger.debug("Cache hit", { key });
-    return JSON.parse(row.data);
   }
   /**
    * Store a value in the cache.
@@ -181,10 +192,11 @@ var PricingCache = class {
    * be reused for other cache domains in the future.
    */
   set(key, data, provider, service, region, ttlSeconds) {
-    const now = /* @__PURE__ */ new Date();
-    const expiresAt = new Date(now.getTime() + ttlSeconds * 1e3);
-    this.db.prepare(
-      `INSERT INTO pricing_cache (key, data, provider, service, region, created_at, expires_at)
+    try {
+      const now = /* @__PURE__ */ new Date();
+      const expiresAt = new Date(now.getTime() + ttlSeconds * 1e3);
+      this.db.prepare(
+        `INSERT INTO pricing_cache (key, data, provider, service, region, created_at, expires_at)
          VALUES (?, ?, ?, ?, ?, ?, ?)
          ON CONFLICT (key) DO UPDATE SET
            data       = excluded.data,
@@ -193,58 +205,92 @@ var PricingCache = class {
            region     = excluded.region,
            created_at = excluded.created_at,
            expires_at = excluded.expires_at`
-    ).run(
-      key,
-      JSON.stringify(data),
-      provider,
-      service,
-      region,
-      now.toISOString(),
-      expiresAt.toISOString()
-    );
-    logger.debug("Cache set", { key, ttlSeconds });
+      ).run(
+        key,
+        JSON.stringify(data),
+        provider,
+        service,
+        region,
+        now.toISOString(),
+        expiresAt.toISOString()
+      );
+      logger.debug("Cache set", { key, ttlSeconds });
+    } catch (err) {
+      logger.warn("Cache set failed, continuing without caching", {
+        key,
+        err: err instanceof Error ? err.message : String(err)
+      });
+    }
   }
   /** Remove a single cache entry. */
   invalidate(key) {
-    const result = this.db.prepare("DELETE FROM pricing_cache WHERE key = ?").run(key);
-    logger.debug("Cache invalidated", { key, removed: result.changes });
+    try {
+      const result = this.db.prepare("DELETE FROM pricing_cache WHERE key = ?").run(key);
+      logger.debug("Cache invalidated", { key, removed: result.changes });
+    } catch (err) {
+      logger.warn("Cache invalidate failed", {
+        key,
+        err: err instanceof Error ? err.message : String(err)
+      });
+    }
   }
   /** Remove every cache entry belonging to a provider. */
   invalidateByProvider(provider) {
-    const result = this.db.prepare("DELETE FROM pricing_cache WHERE provider = ?").run(provider);
-    logger.debug("Cache invalidated by provider", {
-      provider,
-      removed: result.changes
-    });
+    try {
+      const result = this.db.prepare("DELETE FROM pricing_cache WHERE provider = ?").run(provider);
+      logger.debug("Cache invalidated by provider", {
+        provider,
+        removed: result.changes
+      });
+    } catch (err) {
+      logger.warn("Cache invalidateByProvider failed", {
+        provider,
+        err: err instanceof Error ? err.message : String(err)
+      });
+    }
   }
   /**
    * Delete all entries whose expiry timestamp is in the past.
    * Returns the number of rows removed.
    */
   cleanup() {
-    const now = (/* @__PURE__ */ new Date()).toISOString();
-    const result = this.db.prepare("DELETE FROM pricing_cache WHERE expires_at <= ?").run(now);
-    const removed = result.changes;
-    logger.debug("Cache cleanup complete", { removed });
-    return removed;
+    try {
+      const now = (/* @__PURE__ */ new Date()).toISOString();
+      const result = this.db.prepare("DELETE FROM pricing_cache WHERE expires_at <= ?").run(now);
+      const removed = result.changes;
+      logger.debug("Cache cleanup complete", { removed });
+      return removed;
+    } catch (err) {
+      logger.warn("Cache cleanup failed", {
+        err: err instanceof Error ? err.message : String(err)
+      });
+      return 0;
+    }
   }
   /** Return aggregate statistics about the current cache state. */
   getStats() {
-    const now = (/* @__PURE__ */ new Date()).toISOString();
-    const totals = this.db.prepare(
-      `SELECT
+    try {
+      const now = (/* @__PURE__ */ new Date()).toISOString();
+      const totals = this.db.prepare(
+        `SELECT
            COUNT(*)                        AS total_entries,
            COALESCE(SUM(LENGTH(data)), 0)  AS size_bytes
          FROM pricing_cache`
-    ).get();
-    const expired = this.db.prepare(
-      "SELECT COUNT(*) AS expired_entries FROM pricing_cache WHERE expires_at <= ?"
-    ).get(now);
-    return {
-      total_entries: totals.total_entries,
-      expired_entries: expired.expired_entries,
-      size_bytes: totals.size_bytes
-    };
+      ).get();
+      const expired = this.db.prepare(
+        "SELECT COUNT(*) AS expired_entries FROM pricing_cache WHERE expires_at <= ?"
+      ).get(now);
+      return {
+        total_entries: totals.total_entries,
+        expired_entries: expired.expired_entries,
+        size_bytes: totals.size_bytes
+      };
+    } catch (err) {
+      logger.warn("Cache getStats failed", {
+        err: err instanceof Error ? err.message : String(err)
+      });
+      return { total_entries: 0, expired_entries: 0, size_bytes: 0 };
+    }
   }
   /** Close the underlying database connection. */
   close() {
@@ -920,7 +966,8 @@ var AwsBulkLoader = class _AwsBulkLoader {
   extractEc2Price(bulk, instanceType, region, os) {
     const products = bulk?.products ?? {};
     const onDemand = bulk?.terms?.OnDemand ?? {};
-    for (const [sku, product] of Object.entries(products)) {
+    const sortedEntries = Object.entries(products).sort(([a], [b]) => a.localeCompare(b));
+    for (const [sku, product] of sortedEntries) {
       const attrs = product?.attributes ?? {};
       if (attrs.instanceType === instanceType && (attrs.operatingSystem ?? "").toLowerCase() === os.toLowerCase() && attrs.tenancy === "Shared" && attrs.capacitystatus === "Used") {
         const priceTerms = onDemand[sku];
@@ -934,7 +981,8 @@ var AwsBulkLoader = class _AwsBulkLoader {
   extractRdsPrice(bulk, instanceClass, region, engine) {
     const products = bulk?.products ?? {};
     const onDemand = bulk?.terms?.OnDemand ?? {};
-    for (const [sku, product] of Object.entries(products)) {
+    const sortedEntries = Object.entries(products).sort(([a], [b]) => a.localeCompare(b));
+    for (const [sku, product] of sortedEntries) {
       const attrs = product?.attributes ?? {};
       if (attrs.instanceType === instanceClass && (attrs.databaseEngine ?? "").toLowerCase().includes(engine.toLowerCase()) && attrs.deploymentOption === "Single-AZ") {
         const priceTerms = onDemand[sku];
@@ -948,7 +996,8 @@ var AwsBulkLoader = class _AwsBulkLoader {
   extractEbsPrice(bulk, volumeType, region) {
     const products = bulk?.products ?? {};
     const onDemand = bulk?.terms?.OnDemand ?? {};
-    for (const [sku, product] of Object.entries(products)) {
+    const sortedEntries = Object.entries(products).sort(([a], [b]) => a.localeCompare(b));
+    for (const [sku, product] of sortedEntries) {
       const attrs = product?.attributes ?? {};
       const apiName = (attrs.volumeApiName ?? "").toLowerCase();
       if (product?.productFamily === "Storage" && (apiName === volumeType.toLowerCase() || (attrs.volumeType ?? "").toLowerCase() === volumeType.toLowerCase())) {
@@ -1124,7 +1173,7 @@ function normalizeAzureCompute(item) {
       service_name: item.serviceName ?? "Virtual Machines",
       product_name: item.productName ?? "",
       meter_name: item.meterName ?? "",
-      pricing_source: "azure-retail-api"
+      pricing_source: "live"
     },
     effective_date: item.effectiveStartDate ?? (/* @__PURE__ */ new Date()).toISOString()
   };
@@ -1144,7 +1193,7 @@ function normalizeAzureDatabase(item) {
       service_name: item.serviceName ?? "",
       product_name: item.productName ?? "",
       meter_name: item.meterName ?? "",
-      pricing_source: "azure-retail-api"
+      pricing_source: "live"
     },
     effective_date: item.effectiveStartDate ?? (/* @__PURE__ */ new Date()).toISOString()
   };
@@ -1164,7 +1213,7 @@ function normalizeAzureStorage(item) {
       service_name: item.serviceName ?? "",
       product_name: item.productName ?? "",
       meter_name: item.meterName ?? "",
-      pricing_source: "azure-retail-api"
+      pricing_source: "live"
     },
     effective_date: item.effectiveStartDate ?? (/* @__PURE__ */ new Date()).toISOString()
   };
@@ -1348,6 +1397,7 @@ var AzureRetailClient = class {
     const exactFilter = `serviceName eq '${serviceName}' and armRegionName eq '${armRegion}' and priceType eq 'Consumption' and armSkuName eq '${vmName}'`;
     const exactItems = await this.queryPricing(exactFilter);
     if (exactItems.length > 0) {
+      exactItems.sort((a, b) => (a.skuId ?? "").localeCompare(b.skuId ?? ""));
       const match = exactItems.find(
         (i) => (i.meterName ?? "").toLowerCase().includes("vcore")
       ) ?? exactItems[0];
@@ -1360,6 +1410,7 @@ var AzureRetailClient = class {
     const seriesFilter = `serviceName eq '${serviceName}' and armRegionName eq '${armRegion}' and priceType eq 'Consumption' and contains(armSkuName, '${seriesFamily}') and contains(armSkuName, '${parsed.series}')`;
     const seriesItems = await this.queryPricing(seriesFilter);
     if (seriesItems.length > 0) {
+      seriesItems.sort((a, b) => (a.skuId ?? "").localeCompare(b.skuId ?? ""));
       const perVcore = seriesItems[0].retailPrice ?? 0;
       const totalPrice = perVcore * parsed.vcpus;
       const adjusted = { ...seriesItems[0], retailPrice: totalPrice };
@@ -1376,10 +1427,10 @@ var AzureRetailClient = class {
       /Standard_([A-Z])(\d+)([a-z]*)_v(\d+)/i
     );
     if (!match) return null;
-    const [, family, vcpuStr, variant, version] = match;
+    const [, family, vcpuStr, variant, version2] = match;
     const vcpus = parseInt(vcpuStr, 10);
     if (isNaN(vcpus) || vcpus === 0) return null;
-    const series = `${family}${variant}v${version}`;
+    const series = `${family}${variant}v${version2}`;
     return { series, vcpus };
   }
   async getStoragePrice(diskType, region) {
@@ -1391,6 +1442,7 @@ var AzureRetailClient = class {
       const filter = this.buildODataFilter("Storage", armRegion, diskType);
       const items = await this.queryPricing(filter);
       if (items.length > 0) {
+        items.sort((a, b) => (a.skuId ?? "").localeCompare(b.skuId ?? ""));
         const result = normalizeAzureStorage(items[0]);
         this.cache.set(cacheKey, result, "azure", "storage", region, CACHE_TTL2);
         return result;
@@ -1501,16 +1553,19 @@ var AzureRetailClient = class {
    */
   pickVmItem(items, vmSize, os) {
     if (items.length === 0) return null;
+    const sorted = [...items].sort(
+      (a, b) => (a.skuId ?? "").localeCompare(b.skuId ?? "")
+    );
     const vmLower = vmSize.toLowerCase();
     const isWindows = os.toLowerCase().includes("windows");
-    for (const item of items) {
+    for (const item of sorted) {
       const skuLower = (item.skuName ?? "").toLowerCase();
       const hasWindows = skuLower.includes("windows");
       if (skuLower.includes(vmLower) && (isWindows && hasWindows || !isWindows && !hasWindows)) {
         return item;
       }
     }
-    return items[0];
+    return sorted[0];
   }
   // -------------------------------------------------------------------------
   // Internal helpers – size interpolation
@@ -1995,8 +2050,11 @@ var GcpProvider = class {
   getNatGatewayPrice(region) {
     return this.loader.getNatGatewayPrice(region);
   }
-  getKubernetesPrice(region) {
-    return this.loader.getKubernetesPrice(region);
+  getKubernetesPrice(region, mode) {
+    return this.loader.getKubernetesPrice(
+      region,
+      mode === "autopilot" ? "autopilot" : "standard"
+    );
   }
 };
 var PricingEngine = class {
@@ -2056,7 +2114,7 @@ var PricingEngine = class {
       return p.getNatGatewayPrice(region);
     }
     if (svc === "k8s" || svc === "kubernetes" || svc === "eks" || svc === "aks" || svc === "gke") {
-      return p.getKubernetesPrice(region);
+      return p.getKubernetesPrice(region, attributes.mode);
     }
     logger.warn("PricingEngine: unrecognised service", { service, provider });
     return null;
@@ -2979,7 +3037,7 @@ function findNearestInstance(spec, targetProvider) {
     if (candidate.category === spec.category) {
       score += SCORE_CATEGORY;
     }
-    if (score > bestScore) {
+    if (score > bestScore || score === bestScore && bestType !== null && candidate.instance_type < bestType) {
       bestScore = score;
       bestType = candidate.instance_type;
     }
@@ -3716,7 +3774,9 @@ var CostEngine = class {
       total_monthly: Math.round(totalMonthly * 100) / 100,
       total_yearly: Math.round(totalMonthly * 12 * 100) / 100,
       currency: "USD",
-      by_service: byService,
+      by_service: Object.fromEntries(
+        Object.entries(byService).map(([k, v]) => [k, Math.round(v * 100) / 100])
+      ),
       by_resource: estimates,
       generated_at: (/* @__PURE__ */ new Date()).toISOString(),
       warnings
@@ -4363,7 +4423,7 @@ async function getEquivalents(params) {
 import { z as z5 } from "zod";
 var getPricingSchema = z5.object({
   provider: z5.enum(["aws", "azure", "gcp"]).describe("Cloud provider to look up pricing for"),
-  service: z5.enum(["compute", "database", "storage", "network", "kubernetes"]).describe("Service category"),
+  service: z5.enum(["compute", "database", "storage", "network", "load_balancer", "nat_gateway", "kubernetes"]).describe("Service category (network defaults to nat_gateway for backward compatibility)"),
   resource_type: z5.string().describe(
     "Instance type, storage type, or resource identifier (e.g. t3.large, gp3, Standard_D4s_v3)"
   ),
@@ -4376,6 +4436,8 @@ async function getPricing(params, pricingEngine) {
     database: "database",
     storage: "storage",
     network: "nat-gateway",
+    load_balancer: "load-balancer",
+    nat_gateway: "nat-gateway",
     kubernetes: "kubernetes"
   };
   const service = serviceMap[params.service] ?? params.service;
@@ -4514,12 +4576,14 @@ function registerTools(server, config) {
 }
 
 // src/server.ts
+var require2 = createRequire(import.meta.url);
+var { version } = require2("../package.json");
 async function startServer() {
   const config = loadConfig();
   setLogLevel(config.logging.level);
   const server = new McpServer({
     name: "cloudcost-mcp",
-    version: "0.1.0"
+    version
   });
   registerTools(server, config);
   const transport = new StdioServerTransport();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jadenrazo/cloudcost-mcp",
-  "version": "0.1.8",
+  "version": "0.2.0",
   "description": "MCP server for multi-cloud cost analysis of Terraform codebases",
   "type": "module",
   "license": "MIT",