@jadenrazo/cloudcost-mcp 0.1.7 → 0.1.9

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">
@@ -322,27 +326,27 @@ Configuration priority: environment variables > config file > built-in defaults.
                         │        (src/server.ts)        │
                         └──────────────┬────────────────┘
                                        │
-              ┌────────────────────────┼─────────────────────────┐
-              │                        │                         │
-    ┌─────────▼─────────┐   ┌─────────▼─────────┐    ┌─────────▼─────────┐
-    │   Tool Handlers   │   │   HCL Parsers     │    │   Cost Engine     │
-    │  (src/tools/*.ts)  │   │  (src/parsers/)   │    │  (src/calculator/) │
-    └─────────┬─────────┘   └───────────────────┘    └─────────┬─────────┘
-              │                                                 │
-    ┌─────────▼──────────────────────────────────────────────────▼─────────┐
-    │                       PricingEngine (router)                        │
-    │                   (src/pricing/pricing-engine.ts)                    │
-    └───────┬────────────────────┬──────────────────────┬─────────────────┘
-            │                    │                      │
-  ┌─────────▼──────┐  ┌─────────▼──────┐    ┌──────────▼──────┐
-  │  AWS Bulk      │  │  Azure Retail  │    │  GCP Bundled    │
-  │  Loader        │  │  Client        │    │  Loader         │
-  │  (CSV + JSON)  │  │  (REST API)    │    │  (static JSON)  │
-  └───────┬────────┘  └───────┬────────┘    └────────┬────────┘
-          │                   │                      │
-          ▼                   ▼                      ▼
-  AWS Bulk Pricing   Azure Retail API        data/gcp-pricing/
-  CSV (public)       (public, no auth)       (bundled files)
+              ┌────────────────────────┼───────────────────────┐
+              │                        │                       │
+    ┌─────────▼─────────┐    ┌─────────▼─────────┐   ┌─────────▼─────────┐
+    │   Tool Handlers   │    │   HCL Parsers     │   │   Cost Engine     │
+    │ (src/tools/*.ts)  │    │  (src/parsers/)   │   │ (src/calculator/) │
+    └─────────┬─────────┘    └───────────────────┘   └─────────┬─────────┘
+              │                                                │
+    ┌─────────▼────────────────────────────────────────────────▼─────────┐
+    │                       PricingEngine (router)                       │
+    │                  (src/pricing/pricing-engine.ts)                   │
+    └──────┬───────────────────┬─────────────────────┬───────────────────┘
+           │                   │                     │
+  ┌────────▼───────┐  ┌────────▼───────┐    ┌────────▼───────┐
+  │  AWS Bulk      │  │  Azure Retail  │    │  GCP Bundled   │
+  │  Loader        │  │  Client        │    │  Loader        │
+  │  (CSV + JSON)  │  │  (REST API)    │    │  (static JSON) │
+  └────────┬───────┘  └────────┬───────┘    └────────┬───────┘
+           │                   │                     │
+           ▼                   ▼                     ▼
+  AWS Bulk Pricing   Azure Retail API       data/gcp-pricing/
+  CSV (public)       (public, no auth)      (bundled files)
 ```
 
 ### Key Design Decisions

package/dist/index.js

@@ -270,17 +270,30 @@ function extractUnit(priceDimensions) {
   }
   return "Hrs";
 }
+function extractFromTerms(onDemandTerms, defaultUnit) {
+  for (const skuTerms of Object.values(onDemandTerms)) {
+    if (skuTerms?.priceDimensions) {
+      return {
+        price: extractUsdPrice(skuTerms.priceDimensions),
+        unit: extractUnit(skuTerms.priceDimensions)
+      };
+    }
+    for (const offerTerm of Object.values(skuTerms ?? {})) {
+      const dims = offerTerm?.priceDimensions;
+      if (dims) {
+        return {
+          price: extractUsdPrice(dims),
+          unit: extractUnit(dims)
+        };
+      }
+    }
+  }
+  return { price: 0, unit: defaultUnit };
+}
 function normalizeAwsCompute(rawProduct, rawPrice, region) {
   const attrs = rawProduct?.attributes ?? {};
   const terms = rawPrice?.terms?.OnDemand ?? {};
-  let price = 0;
-  let unit = "Hrs";
-  for (const term of Object.values(terms)) {
-    const dims = term?.priceDimensions ?? {};
-    price = extractUsdPrice(dims);
-    unit = extractUnit(dims);
-    break;
-  }
+  const { price, unit } = extractFromTerms(terms, "Hrs");
   return {
     provider: "aws",
     service: "ec2",
@@ -295,7 +308,8 @@ function normalizeAwsCompute(rawProduct, rawPrice, region) {
       vcpu: attrs.vcpu ?? "",
       memory: attrs.memory ?? "",
       operating_system: attrs.operatingSystem ?? "Linux",
-      tenancy: attrs.tenancy ?? "Shared"
+      tenancy: attrs.tenancy ?? "Shared",
+      pricing_source: "live"
     },
     effective_date: (/* @__PURE__ */ new Date()).toISOString()
   };
@@ -303,14 +317,7 @@ function normalizeAwsCompute(rawProduct, rawPrice, region) {
 function normalizeAwsDatabase(rawProduct, rawPrice, region) {
   const attrs = rawProduct?.attributes ?? {};
   const terms = rawPrice?.terms?.OnDemand ?? {};
-  let price = 0;
-  let unit = "Hrs";
-  for (const term of Object.values(terms)) {
-    const dims = term?.priceDimensions ?? {};
-    price = extractUsdPrice(dims);
-    unit = extractUnit(dims);
-    break;
-  }
+  const { price, unit } = extractFromTerms(terms, "Hrs");
   return {
     provider: "aws",
     service: "rds",
@@ -325,7 +332,8 @@ function normalizeAwsDatabase(rawProduct, rawPrice, region) {
       database_engine: attrs.databaseEngine ?? "",
       deployment_option: attrs.deploymentOption ?? "Single-AZ",
       vcpu: attrs.vcpu ?? "",
-      memory: attrs.memory ?? ""
+      memory: attrs.memory ?? "",
+      pricing_source: "live"
     },
     effective_date: (/* @__PURE__ */ new Date()).toISOString()
   };
@@ -333,14 +341,7 @@ function normalizeAwsDatabase(rawProduct, rawPrice, region) {
 function normalizeAwsStorage(rawProduct, rawPrice, region) {
   const attrs = rawProduct?.attributes ?? {};
   const terms = rawPrice?.terms?.OnDemand ?? {};
-  let price = 0;
-  let unit = "GB-Mo";
-  for (const term of Object.values(terms)) {
-    const dims = term?.priceDimensions ?? {};
-    price = extractUsdPrice(dims);
-    unit = extractUnit(dims);
-    break;
-  }
+  const { price, unit } = extractFromTerms(terms, "GB-Mo");
   const volumeType = attrs.volumeApiName ?? attrs.volumeType ?? "gp3";
   return {
     provider: "aws",
@@ -354,7 +355,8 @@ function normalizeAwsStorage(rawProduct, rawPrice, region) {
     attributes: {
       volume_type: volumeType,
       max_iops: attrs.maxIopsvolume ?? "",
-      max_throughput: attrs.maxThroughputvolume ?? ""
+      max_throughput: attrs.maxThroughputvolume ?? "",
+      pricing_source: "live"
     },
     effective_date: (/* @__PURE__ */ new Date()).toISOString()
   };
@@ -579,7 +581,7 @@ var AwsBulkLoader = class _AwsBulkLoader {
         if (afterCsv) return afterCsv;
       }
     } catch (err) {
-      logger.debug("AWS EC2 CSV streaming failed", {
+      logger.warn("AWS EC2 CSV streaming failed", {
         region,
         instanceType,
         err: err instanceof Error ? err.message : String(err)
@@ -595,7 +597,7 @@ var AwsBulkLoader = class _AwsBulkLoader {
         }
       }
     } catch (err) {
-      logger.debug("AWS bulk EC2 JSON fetch failed, using fallback", {
+      logger.warn("AWS bulk EC2 JSON fetch failed, using fallback", {
         region,
         instanceType,
         err: err instanceof Error ? err.message : String(err)
@@ -617,7 +619,7 @@ var AwsBulkLoader = class _AwsBulkLoader {
         }
       }
     } catch (err) {
-      logger.debug("AWS bulk RDS fetch failed, using fallback", {
+      logger.warn("AWS bulk RDS fetch failed, using fallback", {
         region,
         instanceClass,
         err: err instanceof Error ? err.message : String(err)
@@ -639,7 +641,7 @@ var AwsBulkLoader = class _AwsBulkLoader {
         }
       }
     } catch (err) {
-      logger.debug("AWS bulk EBS fetch failed, using fallback", {
+      logger.warn("AWS bulk EBS fetch failed, using fallback", {
         region,
         volumeType,
         err: err instanceof Error ? err.message : String(err)
@@ -918,7 +920,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];
@@ -932,7 +935,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];
@@ -946,7 +950,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())) {
@@ -1296,7 +1301,7 @@ var AzureRetailClient = class {
         return result;
       }
     } catch (err) {
-      logger.debug("Azure Retail API VM fetch failed, using fallback", {
+      logger.warn("Azure Retail API VM fetch failed, using fallback", {
         region,
         vmSize,
         err: err instanceof Error ? err.message : String(err)
@@ -1311,15 +1316,18 @@ var AzureRetailClient = class {
     try {
       const armRegion = region.toLowerCase().replace(/\s+/g, "");
       const serviceName = `Azure Database for ${engine}`;
-      const filter = this.buildODataFilter(serviceName, armRegion, tier);
-      const items = await this.queryPricing(filter);
-      if (items.length > 0) {
-        const result = normalizeAzureDatabase(items[0]);
+      const result = await this.queryDatabasePrice(tier, armRegion, serviceName);
+      if (result) {
         this.cache.set(cacheKey, result, "azure", "db", region, CACHE_TTL2);
         return result;
       }
+      logger.warn("Azure Retail API returned no matching DB pricing", {
+        region,
+        tier,
+        engine
+      });
     } catch (err) {
-      logger.debug("Azure Retail API DB fetch failed, using fallback", {
+      logger.warn("Azure Retail API DB fetch failed, using fallback", {
         region,
         tier,
         err: err instanceof Error ? err.message : String(err)
@@ -1327,6 +1335,58 @@ var AzureRetailClient = class {
     }
     return this.fallbackDatabasePrice(tier, region, engine, cacheKey);
   }
+  /**
+   * Azure DB flexible server tier names follow the pattern:
+   *   GP_Standard_D2s_v3  →  General Purpose, D-series, 2 vCPUs, v3
+   *   MO_Standard_E4ds_v5 →  Memory Optimized, E-series, 4 vCPUs, v5
+   *
+   * The Retail API prices DB compute in two ways:
+   *   1. Per-instance entries with armSkuName like "Standard_D2ds_v5" (total price)
+   *   2. Per-vCore entries for a series (e.g., Dsv3Series_Compute) × vCPU count
+   *
+   * This method tries approach 1 first, then falls back to approach 2.
+   */
+  async queryDatabasePrice(tier, armRegion, serviceName) {
+    const vmName = tier.replace(/^(GP|MO|BC|GEN)_/i, "");
+    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];
+      return normalizeAzureDatabase(match);
+    }
+    const parsed = this.parseVmSeries(vmName);
+    if (!parsed) return null;
+    const tierPrefix = tier.match(/^(GP|MO|BC|GEN)_/i)?.[1]?.toUpperCase();
+    const seriesFamily = tierPrefix === "MO" ? "Memory_Optimized" : "General_Purpose";
+    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 };
+      return normalizeAzureDatabase(adjusted);
+    }
+    return null;
+  }
+  /**
+   * Parse a VM name like "Standard_D2s_v3" into series info.
+   * Returns { series: "Dsv3", vcpus: 2 } or null if unparseable.
+   */
+  parseVmSeries(vmName) {
+    const match = vmName.match(
+      /Standard_([A-Z])(\d+)([a-z]*)_v(\d+)/i
+    );
+    if (!match) return null;
+    const [, family, vcpuStr, variant, version] = match;
+    const vcpus = parseInt(vcpuStr, 10);
+    if (isNaN(vcpus) || vcpus === 0) return null;
+    const series = `${family}${variant}v${version}`;
+    return { series, vcpus };
+  }
   async getStoragePrice(diskType, region) {
     const cacheKey = this.buildCacheKey("disk", region, diskType);
     const cached = this.cache.get(cacheKey);
@@ -1336,12 +1396,17 @@ 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;
       }
+      logger.warn("Azure Retail API returned no matching storage pricing", {
+        region,
+        diskType
+      });
     } catch (err) {
-      logger.debug("Azure Retail API storage fetch failed, using fallback", {
+      logger.warn("Azure Retail API storage fetch failed, using fallback", {
         region,
         diskType,
         err: err instanceof Error ? err.message : String(err)
@@ -1442,16 +1507,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
@@ -2920,7 +2988,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;
     }
@@ -3657,7 +3725,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

package/package.json

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