aqc-mcp 2.0.0 → 2.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aqc-mcp",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "MCP server for astronomical database queries via direct HTTP/TAP APIs",
   "keywords": [
     "mcp",

package/src/tools/esasky.ts

@@ -3,6 +3,24 @@ import { tapQuery, formatTapResult } from '../utils/http.js';
 
 const ESASKY_TAP = 'https://sky.esa.int/esasky-tap/tap/sync';
 
+const MISSION_TABLES: Record<string, string> = {
+  'xmm': 'observations.mv_v_v_xsa_esasky_photo_fdw_fdw',
+  'hst': 'observations.mv_v_v_hst_mmi_observation_fdw_fdw',
+  'alma': 'observations.mv_v_v_alma_obs_fdw',
+  'jwst': 'observations.mv_v_jwst_obs_fdw',
+  'chandra': 'observations.mv_chandra_obs_photo_fdw',
+  'herschel': 'observations.mv_v_v_hsa_esasky_photo_fdw_fdw',
+  'spitzer': 'observations.mv_spitzer_irac_fdw',
+  'suzaku': 'observations.mv_suzaku_data_fdw',
+  'cheops': 'observations.mv_cheops_obs_fdw',
+  'xmm-om': 'observations.mv_v_esasky_xmm_om_uv_fdw',
+  'iso': 'observations.mv_iso_spectra_fdw',
+  'iue': 'observations.mv_iue_spectra_fdw',
+  'akari': 'observations.mv_akari_irc_fdw',
+};
+
+const SUPPORTED_MISSIONS = Object.keys(MISSION_TABLES).join(', ');
+
 export function registerEsaskyTools(server: any) {
   server.tool(
     'esasky_query',
@@ -11,23 +29,20 @@ export function registerEsaskyTools(server: any) {
       ra: z.number().describe('Right Ascension in degrees (0-360)'),
       dec: z.number().describe('Declination in degrees (-90 to 90)'),
       radius: z.number().default(10).describe('Search radius in arcminutes'),
-      mission: z.string().default('all').describe('Mission name (e.g. "XMM", "HST", "Herschel", "all")'),
+      mission: z.string().default('xmm').describe(`Mission name: ${SUPPORTED_MISSIONS}, or "all" for XMM default`),
       max_results: z.number().default(50).describe('Maximum number of results'),
       lang: z.enum(['en', 'zh']).default('en').describe('Output language'),
     },
     async ({ ra, dec, radius, mission, max_results, lang }: { ra: number; dec: number; radius: number; mission: string; max_results: number; lang: string }) => {
-      const radiusDeg = radius / 60;
-      let tableName = 'ivoa.obscore';
-      let missionFilter = '';
+      const missionKey = mission.toLowerCase();
+      const tableName = MISSION_TABLES[missionKey] ?? MISSION_TABLES['xmm'];
 
-      if (mission !== 'all') {
-        missionFilter = ` AND obs_collection = '${mission.replace(/'/g, "''")}'`;
-      }
-
-      const adql = `SELECT TOP ${max_results} obs_id, obs_collection, target_name, s_ra, s_dec, instrument_name, t_exptime, access_url FROM ${tableName} WHERE CONTAINS(POINT('ICRS', s_ra, s_dec), CIRCLE('ICRS', ${ra}, ${dec}, ${radiusDeg})) = 1${missionFilter}`;
+      const radiusDeg = radius / 60;
+      const adql = `SELECT TOP ${max_results} observation_id, ra_deg, dec_deg, target_name, start_time, end_time FROM ${tableName} WHERE CONTAINS(POINT('ICRS', ra_deg, dec_deg), CIRCLE('ICRS', ${ra}, ${dec}, ${radiusDeg})) = 1`;
 
-      const result = await tapQuery({ endpoint: ESASKY_TAP, adql, maxrec: max_results });
-      const title = lang === 'zh' ? `ESASky 查询结果: (${ra}, ${dec})` : `ESASky Query Result: (${ra}, ${dec})`;
+      const result = await tapQuery({ endpoint: ESASKY_TAP, adql, format: 'csv', maxrec: max_results });
+      const resolvedMission = MISSION_TABLES[missionKey] ? missionKey.toUpperCase() : 'XMM';
+      const title = lang === 'zh' ? `ESASky 查询结果: (${ra}, ${dec}) [${resolvedMission}]` : `ESASky Query Result: (${ra}, ${dec}) [${resolvedMission}]`;
       return { content: [{ type: 'text' as const, text: formatTapResult(result, title) }] };
     }
   );

package/src/tools/heasarc.ts

@@ -2,6 +2,21 @@ import { z } from 'zod';
 import { tapQuery, formatTapResult } from '../utils/http.js';
 
 const HEASARC_TAP = 'https://heasarc.gsfc.nasa.gov/xamin/vo/tap/sync';
+const SIMBAD_TAP = 'https://simbad.cds.unistra.fr/simbad/sim-tap/sync';
+
+/**
+ * Resolve an object name to RA/Dec via SIMBAD TAP (supports JSON).
+ */
+async function resolveCoords(name: string): Promise<{ ra: number; dec: number }> {
+  const safeName = name.replace(/'/g, "''");
+  const adql = `SELECT ra, dec FROM basic JOIN ident ON oidref = oid WHERE id = '${safeName}'`;
+  const result = await tapQuery({ endpoint: SIMBAD_TAP, adql, format: 'json' });
+  if (result.rows.length === 0) {
+    throw new Error(`Could not resolve object name: ${name}`);
+  }
+  const row = result.rows[0];
+  return { ra: Number(row.ra), dec: Number(row.dec) };
+}
 
 export function registerHeasarcTools(server: any) {
   server.tool(
@@ -15,23 +30,16 @@ export function registerHeasarcTools(server: any) {
       lang: z.enum(['en', 'zh']).default('en').describe('Output language'),
     },
     async ({ object_name, mission, radius, max_results, lang }: { object_name: string; mission: string; radius: number; max_results: number; lang: string }) => {
-      // HEASARC TAP uses name resolver internally via a special function
-      // We query the mission table with a cone search around resolved coordinates
-      // First try a simple name-based query
+      // Step 1: Resolve object name to coordinates via SIMBAD
+      const coords = await resolveCoords(object_name);
+
+      // Step 2: Cone search on HEASARC with FORMAT=text (only format that works)
       const radiusDeg = radius / 60;
-      const adql = `SELECT TOP ${max_results} * FROM ${mission} WHERE CONTAINS(POINT('ICRS', ra, dec), CIRCLE('ICRS', COORD1(SIMBAD('${object_name.replace(/'/g, "''")}')), COORD2(SIMBAD('${object_name.replace(/'/g, "''")}')), ${radiusDeg})) = 1`;
+      const adql = `SELECT TOP ${max_results} * FROM ${mission} WHERE CONTAINS(POINT('ICRS', ra, dec), CIRCLE('ICRS', ${coords.ra}, ${coords.dec}, ${radiusDeg})) = 1`;
 
-      try {
-        const result = await tapQuery({ endpoint: HEASARC_TAP, adql, maxrec: max_results });
-        const title = lang === 'zh' ? `HEASARC 查询结果: ${object_name} (${mission})` : `HEASARC Query Result: ${object_name} (${mission})`;
-        return { content: [{ type: 'text' as const, text: formatTapResult(result, title) }] };
-      } catch {
-        // Fallback: some HEASARC tables use name column directly
-        const fallbackAdql = `SELECT TOP ${max_results} * FROM ${mission} WHERE name LIKE '%${object_name.replace(/'/g, "''").replace(/%/g, '')}%'`;
-        const result = await tapQuery({ endpoint: HEASARC_TAP, adql: fallbackAdql, maxrec: max_results });
-        const title = lang === 'zh' ? `HEASARC 查询结果: ${object_name} (${mission})` : `HEASARC Query Result: ${object_name} (${mission})`;
-        return { content: [{ type: 'text' as const, text: formatTapResult(result, title) }] };
-      }
+      const result = await tapQuery({ endpoint: HEASARC_TAP, adql, format: 'text', maxrec: max_results });
+      const title = lang === 'zh' ? `HEASARC 查询结果: ${object_name} (${mission})` : `HEASARC Query Result: ${object_name} (${mission})`;
+      return { content: [{ type: 'text' as const, text: formatTapResult(result, title) }] };
     }
   );
 }

package/src/tools/mast.ts

@@ -3,24 +3,20 @@ import { z } from 'zod';
 const MAST_API = 'https://mast.stsci.edu/api/v0/invoke';
 
 async function mastQuery(service: string, params: Record<string, unknown>, timeout = 60000): Promise<unknown> {
-  const body = JSON.stringify({ service, params, format: 'json', timeout: Math.floor(timeout / 1000) });
-
+  const requestPayload = JSON.stringify({ service, params, format: 'json', timeout: Math.floor(timeout / 1000) });
   const controller = new AbortController();
   const timer = setTimeout(() => controller.abort(), timeout);
-
   try {
     const response = await fetch(MAST_API, {
       method: 'POST',
-      headers: { 'Content-Type': 'application/json' },
-      body,
+      headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+      body: `request=${encodeURIComponent(requestPayload)}`,
       signal: controller.signal,
     });
-
     if (!response.ok) {
       const text = await response.text().catch(() => '');
       throw new Error(`MAST API error (${response.status}): ${text.slice(0, 500)}`);
     }
-
     return await response.json();
   } finally {
     clearTimeout(timer);

package/src/utils/http.ts

@@ -7,7 +7,7 @@
 export interface TapQueryOptions {
   endpoint: string;
   adql: string;
-  format?: 'json' | 'csv' | 'votable';
+  format?: 'json' | 'csv' | 'votable' | 'text';
   timeout?: number;
   maxrec?: number;
 }
@@ -68,10 +68,42 @@ function parseTapResponse(text: string, format: string): TapResult {
   if (format === 'csv') {
     return parseCsvResponse(text);
   }
+  if (format === 'text') {
+    return parseTextResponse(text);
+  }
   // votable — return raw text as single-row result
   return { columns: ['votable'], rows: [{ votable: text }] };
 }
 
+/**
+ * Parse pipe-delimited text response from HEASARC TAP.
+ * Format: header row with | separators, data rows, footer with 'Number of rows/columns'.
+ */
+function parseTextResponse(text: string): TapResult {
+  const lines = text.split('\n').filter(line => {
+    const trimmed = line.trim();
+    return trimmed.length > 0 && !trimmed.startsWith('Number of');
+  });
+  if (lines.length === 0) {
+    return { columns: [], rows: [] };
+  }
+  const headers = lines[0].split('|').map(h => h.trim()).filter(h => h.length > 0);
+  const rows: Record<string, unknown>[] = [];
+  for (let i = 1; i < lines.length; i++) {
+    const values = lines[i].split('|').map(v => v.trim());
+    // Skip separator lines (e.g. '---+---+---')
+    if (values.every(v => /^[-+]+$/.test(v) || v.length === 0)) continue;
+    const obj: Record<string, unknown> = {};
+    for (let j = 0; j < headers.length; j++) {
+      const val = values[j + (values.length > headers.length ? 1 : 0)] ?? '';
+      const num = Number(val);
+      obj[headers[j]] = val.length > 0 && !isNaN(num) && val !== '' ? num : val;
+    }
+    rows.push(obj);
+  }
+  return { columns: headers, rows };
+}
+
 function parseJsonResponse(text: string): TapResult {
   const data = JSON.parse(text);