geotap-mcp-server 2.2.1 → 3.0.1

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2026 GeoTap
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -449,7 +449,7 @@ curl -X POST "https://geotapdata.com/api/v1/export" \
 
 ## MCP Server
 
-The MCP (Model Context Protocol) server wraps the REST API into **83 AI-native tools** that Claude, Cursor, Windsurf, and other AI assistants can call directly.
+The MCP (Model Context Protocol) server wraps the REST API into **16 consolidated tools** (or 109 legacy tools) that Claude, Cursor, Windsurf, and other AI assistants can call directly.
 
 ### Installation
 
@@ -529,7 +529,7 @@ With API key:
 - *"What permits do I need to build near this stream?"*
 - *"Export this data as a shapefile"*
 
-### Available Tools (85)
+### Available Tools (109 legacy / 16 consolidated)
 
 **Core tools (start here):**
 - **query_address** — Geocode + environmental query in one call. Returns properties with plain-English interpretations. (<5KB response)

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "geotap-mcp-server",
-  "version": "2.2.1",
-  "description": "MCP server for GeoTap — access 37 US federal environmental and infrastructure data sources from Claude, Cursor, and other AI tools",
+  "version": "3.0.1",
+  "description": "MCP server for GeoTap — collect comprehensive environmental data from 80+ US federal sources for any site. One tool, all the data.",
   "type": "module",
   "main": "src/index.js",
   "bin": {
@@ -45,7 +45,8 @@
   "author": "GeoTap",
   "license": "MIT",
   "dependencies": {
-    "@modelcontextprotocol/sdk": "^1.12.1"
+    "@modelcontextprotocol/sdk": "^1.12.1",
+    "zod": "^4.3.6"
   },
   "engines": {
     "node": ">=18.0.0"

package/src/api.js

@@ -102,7 +102,7 @@ function buildStructuredError(status, errorText, endpoint, method, params) {
 export async function callApi(endpoint, method, params) {
   const headers = {
     'Content-Type': 'application/json',
-    'User-Agent': 'geotap-mcp-server/1.0.0'
+    'User-Agent': 'geotap-mcp-server/2.2.1'
   };
 
   if (API_KEY) {

package/src/index.js

@@ -3,267 +3,228 @@
 import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
 import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
 import { z } from 'zod';
-import { tools } from './tools.js';
-import { consolidatedTools } from './consolidatedTools.js';
 import { callApi, StructuredApiError } from './api.js';
-import { toolSources } from './sources.js';
-import { capResponse } from './responseCap.js';
-import { generateSummary } from './summaries.js';
-import { convertLatLng } from './latLngHelper.js';
-import { normalizeParams } from './paramNormalize.js';
-import { discoverTools } from './discoverTools.js';
 import { readFileSync } from 'fs';
 import { fileURLToPath } from 'url';
 import { dirname, join } from 'path';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
-const useLegacyTools = process.env.GEOTAP_LEGACY_TOOLS === 'true';
-
-// Build lookup map for legacy tools (used by both modes)
-const legacyToolMap = new Map(tools.map(t => [t.name, t]));
 
 const server = new McpServer({
   name: 'geotap',
-  version: '2.0.0',
-  description: 'Access US federal environmental and infrastructure data layers from 64+ agencies. Query flood zones, wetlands, soils, rainfall, watersheds, water quality, endangered species, elevation, land use, hazards, energy, infrastructure, transportation, and more for any location in the United States.',
-  instructions: useLegacyTools
-    ? `You have access to GeoTap with 85 individual tools. Use discover_tools to find the right one.`
-    : `You have access to GeoTap, which provides real-time data from 37 US federal agencies (FEMA, USGS, NOAA, EPA, NRCS, USFWS, USACE, and more).
-
-TOOL OVERVIEW (16 tools + 2 meta-tools):
-1. query_location — Start here. Query environmental data by address, coordinates, bbox, polygon, or radius.
-2. get_rainfall — NOAA Atlas 14 precipitation, IDF curves, hyetographs, climate projections.
-3. get_watershed — Watershed delineation, flow statistics, flowlines, HUC boundaries, FIRM panels.
-4. get_hydrology — Curve numbers, runoff calculations, time of concentration, peak discharge.
-5. get_water_quality — EPA water quality impairments, 303(d) listings, receiving waters.
-6. get_elevation — USGS 3DEP elevation, contours, DEM export, land use, satellite imagery.
-7. analyze_gage — USGS stream gage analysis: flood frequency, flow duration, storm events.
-8. estimate_ungaged — Flow estimation at ungaged sites: regression, similarity, transfer methods.
-9. generate_report — Site analysis, constraints, and developability reports with scoring.
-10. export_data — Export layers to GeoJSON, Shapefile, CSV.
-11. find_stations — Find monitoring stations (USGS, NOAA) and analyze waterway permit requirements.
-12. check_status — API health and federal data source connectivity.
-13. get_hazards — FEMA risk index, seismic design values, wildfires, landslides, coastal vulnerability, flood insurance claims, social vulnerability.
-14. get_energy — Solar resource, PVWatts production estimates, utility rates, EV charging stations.
-15. get_infrastructure — Hospitals, fire stations, schools, power plants, airports, railroad crossings, bridges, historic places.
-16. get_ecology — Species occurrences, essential fish habitat.
-
-Every tool uses an "action" parameter to select the specific operation. Read the tool description to see available actions.
-
-COORDINATE FLEXIBILITY:
-- All tools accept lat/lng, lat/lon, or latitude/longitude — they are automatically normalized.
-- POST tools accept flat lat/lng instead of GeoJSON — auto-converted to the correct format.
-
-RESPONSE SIZE:
-- geometry defaults to "none" for spatial queries (prevents context overflow).
-- Responses auto-capped at 40KB (~10K tokens). Use specific layers to get smaller responses.
-- Always specify layers (e.g., layers="flood_zones,wetlands") instead of querying all layers.
-
-COMMON WORKFLOWS:
-- "What flood zone is this address in?" → query_location(action: "address", address: "...")
-- "What's the 100-year rainfall?" → get_rainfall(action: "atlas14", lat, lng)
-- "Delineate the watershed" → get_watershed(action: "delineate", lat, lng)
-- "Environmental site analysis" → generate_report(action: "site_analysis", geometry: ...)
-- "What permits do I need?" → find_stations(action: "find_water_features") → find_stations(action: "analyze_permits")
+  version: '3.0.0',
+  description: 'Collect comprehensive environmental and infrastructure data from 80+ US federal sources for any site in the United States. Returns raw data from FEMA, USGS, NOAA, EPA, NRCS, USFWS, USACE, DOE, DOT, CDC, Census, and more.',
+  instructions: `You have access to GeoTap, which collects data from 80+ US federal agencies for any site in the United States.
+
+HOW IT WORKS:
+1. Call collect_site_data with a site location (address, coordinates, or GeoJSON geometry)
+2. You get back a jobId — the backend queries all 80+ federal sources (takes 60-120 seconds)
+3. Poll get_results every 10 seconds with the jobId until status is "completed"
+4. When complete, you receive ALL available data for that site — present it to the user
+
+DATA INCLUDES:
+- Flood zones (FEMA NFHL), wetlands (NWI), soils (NRCS SSURGO), geology
+- Contamination: Superfund, brownfields, USTs, EPA-regulated facilities (RCRA, GHG, FRS)
+- Water: streams, watershed, water quality impairments (ATTAINS), NPDES outfalls, groundwater
+- Hazards: seismic design (ASCE 7-22), earthquakes, wildfires, landslides, coastal vulnerability, NRI
+- Rainfall: NOAA Atlas 14 precipitation frequency data (IDF curves, design storms)
+- Land cover: NLCD 2021 classification (developed, forest, wetlands, etc.)
+- Elevation: USGS 3DEP (min/max/mean elevation, relief)
+- Infrastructure: hospitals, fire stations, schools, EMS, dams, levees, power plants, airports, railroads, bridges
+- Ecology: species (GBIF), fish habitat, critical habitat, cropland, national forests, BLM lands, historic places
+- Energy: solar potential, utility rates, EV charging stations
+- Demographics: Census ACS (population, income, housing, poverty, vacancy rates)
+- Protected lands (PAD-US), wild & scenic rivers, sole source aquifers
+
+HOW TO PRESENT RESULTS:
+When you receive completed data, organize your response using these sections (skip sections with no data):
+
+1. **Site Overview** — Location, area, county, state, elevation range, land cover
+2. **Environmental Constraints** — Flood zones, wetlands, soils (drainage class, hydrologic group), impaired waters, critical habitat. Flag any development constraints.
+3. **Contamination & Regulated Sites** — Superfund, brownfields, USTs, NPDES, EPA-regulated facilities within the search radius. Include distances and directions.
+4. **Water Resources** — Streams, watershed (HUC), water quality stations, groundwater wells, Atlas 14 rainfall (cite 2yr/10yr/100yr 24-hour depths).
+5. **Natural Hazards** — Flood risk (FEMA zones), seismic design values, NRI risk index, earthquake history, landslide susceptibility, wildfire history.
+6. **Infrastructure & Services** — Nearby hospitals, fire stations, schools, EMS, dams, airports, bridges. Include counts and distances.
+7. **Demographics & Energy** — Population, median income, housing, solar potential, utility rates.
+8. **Key Findings & Considerations** — Summarize the most important findings. Highlight anything that would affect site development, permitting, or engineering design.
+
+FORMATTING RULES:
+- Use markdown tables for structured data (flood zones, soils, nearby facilities)
+- Bold key values and findings that matter most
+- Always cite the source agency for each data point (e.g., "FEMA NFHL", "NRCS SSURGO", "NOAA Atlas 14")
+- Include distances and cardinal directions for nearby features (e.g., "0.8 miles NW")
+- For Atlas 14 rainfall, present as a compact table: return period × duration
+- For soils, include drainage class and hydrologic soil group — these drive stormwater design
+- Note when a data source was queried but returned no data ("_noData: true") — this is informative (e.g., no Superfund sites nearby is good news)
+- End with a disclaimer: "Data sourced from US federal agencies via GeoTap. Verify critical findings against authoritative sources before making engineering or regulatory decisions."
 
 IMPORTANT:
-- All data from authoritative US federal sources. Always cite the source agency.
-- Responses include _summary with plain-English descriptions — use these in answers.
+- All data from authoritative US federal sources. Always cite the source agency, not just "GeoTap."
 - Data is for informational purposes. Remind users to verify for engineering/regulatory decisions.
 - Coordinates must be within the United States (including territories).
-- API key required. Users can get a free key at https://geotapdata.com/developers (one-click signup).`
+- If a data source returns "_noData: true", it was queried but found nothing at that location — mention this where relevant (no contamination nearby is positive).
+- If a data source returns "_error", note that the source was unavailable and the user should check back.`
 });
 
-// ── Shared tool call handler ────────────────────────────────────────
+// ── Tool: collect_site_data ──────────────────────────────────────────
 
-/**
- * Handle a tool call through the standard pipeline:
- * normalize → convertLatLng → callApi → capResponse → generateSummary → checkDataQuality → enrich
- *
- * @param {string} legacyToolName - The original tool name (for routing summaries/sources)
- * @param {string} endpoint - API endpoint path
- * @param {string} method - HTTP method (GET/POST)
- * @param {object} params - Parameters from the LLM (after action extraction)
- * @returns {object} MCP tool response
- */
-async function handleToolCall(legacyToolName, endpoint, method, params) {
-  try {
-    // Fix #1: Normalize coordinate params to what backend expects
-    const normalized = normalizeParams(legacyToolName, params);
+server.tool(
+  'collect_site_data',
+  `Collect comprehensive environmental data from ALL 80+ federal data sources for a site. Accepts an address, lat/lng coordinates, or a GeoJSON geometry (Point or Polygon). Returns a jobId — poll with get_results until complete (60-120 seconds).
 
-    // Convert lat/lng to GeoJSON if needed (existing feature)
-    const convertedParams = convertLatLng(legacyToolName, normalized);
+Data returned covers: flood zones, wetlands, soils, geology, contamination sites, water quality, seismic risk, rainfall, infrastructure, ecology, energy, demographics, and much more.`,
+  {
+    address: z.string().optional().describe('US street address (e.g., "123 Main St, Houston TX"). If provided, the site is geocoded automatically. Use this OR lat/lng OR geometry.'),
+    lat: z.number().optional().describe('Latitude of the site (e.g., 34.8441). Use with lng.'),
+    lng: z.number().optional().describe('Longitude of the site (e.g., -82.4010). Use with lat.'),
+    geometry: z.any().optional().describe('GeoJSON geometry (Point or Polygon). For advanced use — most users should use address or lat/lng instead.'),
+    bufferAcres: z.number().optional().describe('Site area in acres when using a point location. Creates a circular buffer. Default: 1 acre. Range: 0.1–640.'),
+    searchRadiusMiles: z.number().optional().describe('How far to search for nearby features (contamination, infrastructure, etc.). Default: 3 miles. Range: 0.5–10.'),
+  },
+  async (params) => {
+    try {
+      const { address, lat, lng, geometry, bufferAcres, searchRadiusMiles } = params;
 
-    // Strip internal fields before sending to API
-    const apiParams = { ...convertedParams };
-    delete apiParams._latLngConverted;
+      // Build the geometry from whatever input was provided
+      let siteGeometry = geometry;
 
-    const rawResult = await callApi(endpoint, method, apiParams);
+      if (address && !siteGeometry) {
+        // Geocode the address first
+        const geocodeResult = await callApi('/geocode', 'GET', { address });
+        // API returns { success, results: [{ lat, lon, displayName, source }] }
+        const match = geocodeResult?.results?.[0];
+        if (!match?.lat || !match?.lon) {
+          return {
+            content: [{ type: 'text', text: JSON.stringify({
+              error: true,
+              message: `Could not geocode address: "${address}". Try a more specific address with city/state, or use lat/lng coordinates directly.`,
+              suggestion: 'Example: { lat: 34.8779, lng: -82.3313 }',
+            }, null, 2) }],
+            isError: true
+          };
+        }
+        siteGeometry = {
+          type: 'Point',
+          coordinates: [match.lon, match.lat]
+        };
+      } else if (lat != null && lng != null && !siteGeometry) {
+        siteGeometry = {
+          type: 'Point',
+          coordinates: [lng, lat]
+        };
+      }
 
-    // Cap response size
-    const { data: cappedResult, wasCapped, capInfo } = capResponse(legacyToolName, rawResult);
+      if (!siteGeometry) {
+        return {
+          content: [{ type: 'text', text: JSON.stringify({
+            error: true,
+            message: 'Provide a site location: address, lat/lng, or geometry.',
+            examples: [
+              { address: '123 Main St, Houston TX' },
+              { lat: 34.8441, lng: -82.4010 },
+              { geometry: { type: 'Point', coordinates: [-82.4010, 34.8441] } }
+            ]
+          }, null, 2) }],
+          isError: true
+        };
+      }
 
-    // Generate natural language summary
-    const summary = generateSummary(legacyToolName, params, cappedResult);
+      // Start the data collection job
+      const body = { geometry: siteGeometry };
+      if (bufferAcres != null) body.bufferAcres = bufferAcres;
+      if (searchRadiusMiles != null) body.searchRadiusMiles = searchRadiusMiles;
 
-    // Fix #5: Check data quality and add warnings
-    const dataQuality = checkDataQuality(legacyToolName, cappedResult);
+      const result = await callApi('/site-analysis/data-collect', 'POST', body);
 
-    // Enrich response with source attribution, summary, and metadata
-    const sources = toolSources[legacyToolName] || [];
-    const enriched = {
-      ...(summary ? { _summary: summary } : {}),
-      ...cappedResult,
-      ...(convertedParams._latLngConverted ? { _latLngConverted: convertedParams._latLngConverted } : {}),
-      ...(wasCapped ? { _responseCapped: capInfo } : {}),
-      ...(dataQuality ? { _dataQuality: dataQuality } : {}),
-      _meta: {
-        sources,
-        retrievedAt: new Date().toISOString(),
-        disclaimer: 'Data sourced from US federal agencies via GeoTap. Always verify critical data against authoritative sources before making engineering or regulatory decisions.',
+      return {
+        content: [{ type: 'text', text: JSON.stringify({
+          ...result,
+          _instructions: 'Job started. Poll get_results with this jobId every 10 seconds until status is "completed". Data collection queries 80+ federal sources and takes 60-120 seconds.',
+        }, null, 2) }]
+      };
+    } catch (error) {
+      if (error instanceof StructuredApiError) {
+        return {
+          content: [{ type: 'text', text: JSON.stringify(error.details, null, 2) }],
+          isError: true
+        };
       }
-    };
-
-    return {
-      content: [{ type: 'text', text: JSON.stringify(enriched, null, 2) }]
-    };
-  } catch (error) {
-    if (error instanceof StructuredApiError) {
       return {
-        content: [{ type: 'text', text: JSON.stringify(error.details, null, 2) }],
+        content: [{ type: 'text', text: JSON.stringify({ error: true, message: error.message }, null, 2) }],
         isError: true
       };
     }
-
-    return {
-      content: [{ type: 'text', text: JSON.stringify({
-        error: true,
-        message: error.message,
-        fix: ['Check that all required parameters are provided and valid.', 'Use discover_tools or check the tool description for available actions.'],
-        relatedTools: ['discover_tools', 'check_status']
-      }, null, 2) }],
-      isError: true
-    };
-  }
-}
-
-// ── Fix #5: Data quality warnings ───────────────────────────────────
-
-/**
- * Check API response for signs of degraded or incomplete data.
- * Returns a _dataQuality object with warnings, or null if no issues detected.
- */
-function checkDataQuality(toolName, result) {
-  if (!result || typeof result !== 'object') return null;
-
-  const warnings = [];
-
-  // Check for empty layer results in spatial queries
-  if (result.layers && typeof result.layers === 'object') {
-    const emptyLayers = [];
-    const populatedLayers = [];
-    for (const [name, data] of Object.entries(result.layers)) {
-      if (data?.features?.length === 0 || data?.featureCount === 0) {
-        emptyLayers.push(name);
-      } else if (data?.features?.length > 0) {
-        populatedLayers.push(name);
-      }
-    }
-    if (emptyLayers.length > 0 && populatedLayers.length > 0) {
-      // Only warn if some layers returned data but others didn't
-      // (if ALL are empty, that's a valid "nothing here" result)
-      warnings.push({
-        type: 'partial_results',
-        message: `${emptyLayers.length} layer(s) returned no features: ${emptyLayers.join(', ')}. This may be expected (no features at this location) or may indicate a data gap.`,
-        layers: emptyLayers,
-      });
-    }
-  }
-
-  // Check for empty watershed geometry (the 82% failure pattern)
-  if (toolName === 'delineate_watershed' || toolName === 'get_watershed') {
-    const geom = result.data?.geometry || result.geometry || result.boundary?.geometry;
-    if (geom && geom.coordinates && geom.coordinates.length === 0) {
-      warnings.push({
-        type: 'empty_geometry',
-        message: 'Watershed delineation returned empty geometry. USGS StreamStats may not have coverage for this location. Try a nearby point on a mapped stream.',
-        severity: 'error',
-      });
-    }
-    if (result.data?.characteristics?.drainageArea === null || result.data?.characteristics?.drainageArea === undefined) {
-      if (result.data?.characteristics) {
-        warnings.push({
-          type: 'missing_field',
-          message: 'Drainage area not returned by StreamStats. This basin characteristic may not be available for this region.',
-          field: 'drainageArea',
-        });
-      }
-    }
-  }
-
-  // Check for null key fields in gage data
-  if (toolName.startsWith('get_gage') || toolName.startsWith('get_flood') || toolName.startsWith('get_flow') || toolName.startsWith('get_storm')) {
-    if (result.drainageArea === null || result.drainageArea === undefined) {
-      if (result.siteName || result.siteId) {
-        warnings.push({
-          type: 'missing_field',
-          message: 'Drainage area is null for this gage. USGS NWIS may not have this metadata. Cross-reference with StreamStats if drainage area is needed.',
-          field: 'drainageArea',
-        });
-      }
-    }
   }
+);
 
-  // Check for stale NLCD data
-  if (toolName === 'export_land_use' || toolName === 'analyze_curve_numbers') {
-    warnings.push({
-      type: 'data_currency',
-      message: 'NLCD land cover data is from 2021 (latest available). For rapidly developing areas, ground-truth current conditions before relying on land use classifications.',
-      severity: 'info',
-    });
-  }
-
-  // Check for Atlas 14 metadata issues (Ohio River Basin bug)
-  if (toolName === 'get_rainfall_data' || toolName === 'get_idf_curves') {
-    const loc = result.location || result.metadata?.location;
-    if (loc?.region && /ohio\s*river\s*basin/i.test(loc.region)) {
-      // Check if the actual coordinates suggest a different region
-      const lat = result.metadata?.lat || result.lat;
-      if (lat && lat < 36) {
-        warnings.push({
-          type: 'metadata_mismatch',
-          message: 'NOAA Atlas 14 reports "Ohio River Basin" as the region, but the coordinates may be in a different region. The rainfall data values are still correct — the region label is a known NOAA metadata issue for some locations.',
-          severity: 'info',
-        });
-      }
-    }
-  }
-
-  return warnings.length > 0 ? { warnings, totalWarnings: warnings.length } : null;
-}
-
-// ── Register meta-tools ─────────────────────────────────────────────
+// ── Tool: get_results ────────────────────────────────────────────────
 
 server.tool(
-  'discover_tools',
-  useLegacyTools
-    ? 'Find the best GeoTap tools for your question. Describe what you need in plain English and get back the 3-5 most relevant tools with their parameters.'
-    : 'Find the best GeoTap tool and action for your question. Describe what you need in plain English. Helpful when you\'re unsure which tool or action to use.',
+  'get_results',
+  `Check the status of a data collection job and retrieve results. Poll every 10 seconds until status is "completed". When complete, returns the full data summary from all 80+ federal sources. Present the results to the user following the formatting instructions in the server description.`,
   {
-    question: z.string().describe('Natural language description of what you want to do (e.g., "What flood zone is this property in?" or "I need rainfall data for stormwater design")'),
-    maxResults: z.number().optional().describe('Maximum tools to return (default: 5)')
+    jobId: z.string().describe('Job ID returned from collect_site_data'),
   },
   async (params) => {
-    const result = discoverTools(params.question, params.maxResults || 5);
-    return {
-      content: [{ type: 'text', text: JSON.stringify(result, null, 2) }]
-    };
+    try {
+      const result = await callApi(`/site-analysis/data-collect/${encodeURIComponent(params.jobId)}`, 'GET', {});
+
+      const response = { ...result };
+
+      // Add presentation guidance when results are complete
+      if (result.status === 'completed') {
+        response._meta = {
+          sources: '80+ US federal agencies (FEMA, USGS, NOAA, EPA, NRCS, USFWS, USACE, DOE, DOT, CDC, Census, and more)',
+          retrievedAt: new Date().toISOString(),
+          disclaimer: 'Data sourced from US federal agencies via GeoTap. Always verify critical data against authoritative sources before making engineering or regulatory decisions.',
+        };
+        response._presentationGuide = {
+          instructions: 'Present these results to the user in a well-organized report. Follow the formatting instructions in the server description (HOW TO PRESENT RESULTS section).',
+          sections: [
+            'Site Overview (location, area, elevation, land cover)',
+            'Environmental Constraints (flood zones, wetlands, soils, impaired waters)',
+            'Contamination & Regulated Sites (Superfund, brownfields, USTs, NPDES — with distances)',
+            'Water Resources (streams, watershed, water quality, rainfall IDF data)',
+            'Natural Hazards (flood risk, seismic, NRI, earthquakes, wildfires)',
+            'Infrastructure & Services (hospitals, fire stations, schools, dams, bridges)',
+            'Demographics & Energy (Census ACS, solar potential, utility rates)',
+            'Key Findings & Considerations (summarize what matters most for this site)',
+          ],
+          tips: [
+            'Use markdown tables for structured comparisons',
+            'Bold the most critical findings (e.g., site is in a FEMA AE flood zone)',
+            'Cite source agencies, not just GeoTap',
+            'Mention when sources returned no data — "no Superfund sites" is useful info',
+            'End with the disclaimer from _meta',
+          ]
+        };
+      } else {
+        response._instructions = `Job status: ${result.status}. Poll again in 10 seconds until status is "completed".`;
+      }
+
+      return {
+        content: [{ type: 'text', text: JSON.stringify(response, null, 2) }]
+      };
+    } catch (error) {
+      if (error instanceof StructuredApiError) {
+        return {
+          content: [{ type: 'text', text: JSON.stringify(error.details, null, 2) }],
+          isError: true
+        };
+      }
+      return {
+        content: [{ type: 'text', text: JSON.stringify({ error: true, message: error.message }, null, 2) }],
+        isError: true
+      };
+    }
   }
 );
 
+// ── Tool: get_llms_txt (meta) ────────────────────────────────────────
+
 server.tool(
   'get_llms_txt',
-  'Get the GeoTap API discovery document (llms.txt). Returns a structured description of all API endpoints, data sources, and usage tips optimized for AI agents.',
+  'Get the GeoTap API discovery document. Returns a structured description of all data sources and capabilities.',
   {},
   async () => {
     try {
@@ -271,67 +232,14 @@ server.tool(
       return { content: [{ type: 'text', text: content }] };
     } catch {
       return {
-        content: [{ type: 'text', text: 'llms.txt not found. Visit https://geotapdata.com/llms.txt for API documentation.' }],
+        content: [{ type: 'text', text: 'llms.txt not found. Visit https://geotapdata.com/llms.txt for documentation.' }],
         isError: true
       };
     }
   }
 );
 
-// ── Register tools based on mode ────────────────────────────────────
-
-if (useLegacyTools) {
-  // Legacy mode: register all 85 individual tools (for existing consumers)
-  for (const tool of tools) {
-    server.tool(
-      tool.name,
-      tool.description,
-      tool.parameters,
-      async (params) => handleToolCall(tool.name, tool.endpoint, tool.method, params)
-    );
-  }
-  console.error(`[geotap] Legacy mode: registered ${tools.length} individual tools`);
-} else {
-  // Default: register 12 consolidated tools
-  for (const ctool of consolidatedTools) {
-    server.tool(
-      ctool.name,
-      ctool.description,
-      ctool.parameters,
-      async (params) => {
-        const { action, ...restParams } = params;
-
-        // Resolve consolidated action → legacy tool
-        const legacyName = ctool._actionMap[action];
-        if (!legacyName) {
-          return {
-            content: [{ type: 'text', text: JSON.stringify({
-              error: true,
-              message: `Unknown action "${action}" for tool "${ctool.name}".`,
-              validActions: Object.keys(ctool._actionMap),
-              fix: [`Use one of: ${Object.keys(ctool._actionMap).join(', ')}`],
-            }, null, 2) }],
-            isError: true
-          };
-        }
-
-        const legacyTool = legacyToolMap.get(legacyName);
-        if (!legacyTool) {
-          return {
-            content: [{ type: 'text', text: JSON.stringify({
-              error: true,
-              message: `Internal routing error: legacy tool "${legacyName}" not found.`,
-            }, null, 2) }],
-            isError: true
-          };
-        }
-
-        return handleToolCall(legacyName, legacyTool.endpoint, legacyTool.method, restParams);
-      }
-    );
-  }
-  console.error(`[geotap] Consolidated mode: registered ${consolidatedTools.length} tools (set GEOTAP_LEGACY_TOOLS=true for 85 individual tools)`);
-}
+console.error(`[geotap] v3.0.0 — 2 tools (collect_site_data, get_results) + 1 meta-tool (get_llms_txt)`);
 
 // Start server
 const transport = new StdioServerTransport();