@hypequery/mcp 0.6.0 → 0.7.0

package/dist/discovery-executor.d.ts

@@ -0,0 +1,78 @@
+/**
+ * Discovery without execution.
+ *
+ * A hosted gateway lists tools for one principal against one activated
+ * deployment, and does that before — and independently of — being able to run
+ * anything. `HypequeryMCPExecutor` cannot serve that: it requires a
+ * `DatasetClient` it would never call, and refuses to construct at all when a
+ * dataset is tenant-scoped and no fixed `tenantId` is configured. Both are
+ * correct for a local server, where one process serves one tenant and every
+ * listed tool is runnable. Neither holds for a gateway, which resolves a tenant
+ * per request through the deployment data plane.
+ *
+ * The alternative would be a second manifest generator in the gateway, which
+ * `CORE-03` exists to prevent: the tool schemas an agent is given and the
+ * validators a query is checked against have to come from one catalog.
+ *
+ * So this shares the schema compiler and the catalog tools, and refuses the two
+ * tools that need a query engine. Listing a tool it will not run is deliberate:
+ * the manifest a client caches must be the one it will keep seeing once
+ * execution is wired in behind it, or every client re-lists on the day that
+ * lands.
+ */
+import type { CallToolResult, GetPromptResult, ListPromptsResult, ListToolsResult } from '@modelcontextprotocol/sdk/types.js';
+import type { MCPToolExecutor } from './executor.js';
+import type { DatasetRegistry, MCPQueryLimits } from './types.js';
+/**
+ * Provenance a client needs to cache a manifest and know when it went stale.
+ *
+ * Namespaced under `com.hypequery/` in the result's `_meta`, as the MCP spec
+ * requires of implementation-defined keys.
+ */
+export interface MCPToolManifestMeta {
+    /** The immutable generation these tools were listed from. */
+    readonly activationRevision?: string;
+    /** Content-addressed identity of the contract behind them. */
+    readonly deploymentIdentity?: string;
+    /** How the tools were shaped — `catalog` for the fixed compatibility set. */
+    readonly toolMode?: string;
+}
+export interface MCPDiscoveryExecutorConfig {
+    /** Datasets to advertise. Already narrowed to what the caller may see. */
+    datasets: DatasetRegistry;
+    /**
+     * Datasets offered as a `query_dataset` target. Defaults to all of them.
+     *
+     * A deployment authorizes a dataset and each of its metrics through separate
+     * endpoint policies, so a caller can be entitled to a metric on a dataset it
+     * may not query directly. Such a dataset still belongs in `datasets` — its
+     * metrics are reachable, and it may be joined to — but naming it here would
+     * advertise a target execution refuses.
+     */
+    queryableDatasets?: readonly string[];
+    /** Server-side query ceilings, so advertised schemas match what will run. */
+    queryLimits?: MCPQueryLimits;
+    /** Attached to `listTools`, so a client can pin what it listed. */
+    meta?: MCPToolManifestMeta;
+}
+/**
+ * A read-only executor over a catalog.
+ *
+ * `list_datasets`, `get_dataset_schema`, and the prompts read the agent-safe
+ * catalog and need no query engine, so they answer normally. `query_dataset`
+ * and `query_metric` are advertised with their exact schemas and refuse.
+ */
+export declare class HypequeryMCPDiscoveryExecutor implements MCPToolExecutor {
+    private readonly config;
+    private readonly querySchemas;
+    private readonly meta;
+    constructor(config: MCPDiscoveryExecutorConfig);
+    /** The catalog these tools were compiled from, for caching by content. */
+    getManifestHash(): string;
+    listTools(): Promise<ListToolsResult>;
+    callTool(name: string, args?: Record<string, unknown>): Promise<CallToolResult>;
+    listPrompts(): Promise<ListPromptsResult>;
+    getPrompt(name: string, args?: Record<string, string>): Promise<GetPromptResult>;
+}
+export declare function createMCPDiscoveryExecutor(config: MCPDiscoveryExecutorConfig): MCPToolExecutor;
+//# sourceMappingURL=discovery-executor.d.ts.map

package/dist/discovery-executor.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"discovery-executor.d.ts","sourceRoot":"","sources":["../src/discovery-executor.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAEH,OAAO,KAAK,EACV,cAAc,EACd,eAAe,EACf,iBAAiB,EACjB,eAAe,EAChB,MAAM,oCAAoC,CAAC;AAG5C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAOrD,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAElE;;;;;GAKG;AACH,MAAM,WAAW,mBAAmB;IAClC,6DAA6D;IAC7D,QAAQ,CAAC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IACrC,8DAA8D;IAC9D,QAAQ,CAAC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IACrC,6EAA6E;IAC7E,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED,MAAM,WAAW,0BAA0B;IACzC,0EAA0E;IAC1E,QAAQ,EAAE,eAAe,CAAC;IAC1B;;;;;;;;OAQG;IACH,iBAAiB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACtC,6EAA6E;IAC7E,WAAW,CAAC,EAAE,cAAc,CAAC;IAC7B,mEAAmE;IACnE,IAAI,CAAC,EAAE,mBAAmB,CAAC;CAC5B;AAeD;;;;;;GAMG;AACH,qBAAa,6BAA8B,YAAW,eAAe;IAIvD,OAAO,CAAC,QAAQ,CAAC,MAAM;IAHnC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAgC;IAC7D,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAqC;gBAE7B,MAAM,EAAE,0BAA0B;IAW/D,0EAA0E;IAC1E,eAAe,IAAI,MAAM;IAInB,SAAS,IAAI,OAAO,CAAC,eAAe,CAAC;IAKrC,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,cAAc,CAAC;IAyB/E,WAAW,IAAI,OAAO,CAAC,iBAAiB,CAAC;IAczC,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,eAAe,CAAC;CAMvF;AAED,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,0BAA0B,GACjC,eAAe,CAEjB"}

package/dist/discovery-executor.js

@@ -0,0 +1,111 @@
+/**
+ * Discovery without execution.
+ *
+ * A hosted gateway lists tools for one principal against one activated
+ * deployment, and does that before — and independently of — being able to run
+ * anything. `HypequeryMCPExecutor` cannot serve that: it requires a
+ * `DatasetClient` it would never call, and refuses to construct at all when a
+ * dataset is tenant-scoped and no fixed `tenantId` is configured. Both are
+ * correct for a local server, where one process serves one tenant and every
+ * listed tool is runnable. Neither holds for a gateway, which resolves a tenant
+ * per request through the deployment data plane.
+ *
+ * The alternative would be a second manifest generator in the gateway, which
+ * `CORE-03` exists to prevent: the tool schemas an agent is given and the
+ * validators a query is checked against have to come from one catalog.
+ *
+ * So this shares the schema compiler and the catalog tools, and refuses the two
+ * tools that need a query engine. Listing a tool it will not run is deliberate:
+ * the manifest a client caches must be the one it will keep seeing once
+ * execution is wired in behind it, or every client re-lists on the day that
+ * lands.
+ */
+import { MCPToolError } from './errors.js';
+import { datasetGuidePrompt } from './prompts/dataset-guide.js';
+import { getDatasetSchemaTool } from './tools/introspect.js';
+import { listDatasetsTool } from './tools/list-datasets.js';
+import { buildMCPToolManifest } from './tools/tool-manifest.js';
+import { buildMCPQuerySchemas } from './tools/utils/canonical-query-schemas.js';
+import { createMCPErrorResponse } from './tools/utils/tool-response.js';
+const NOT_EXECUTABLE = 'This endpoint lists datasets and metrics but does not execute queries.';
+function metaEntries(meta) {
+    if (meta === undefined)
+        return undefined;
+    const entries = Object.entries({
+        'com.hypequery/activationRevision': meta.activationRevision,
+        'com.hypequery/deploymentIdentity': meta.deploymentIdentity,
+        'com.hypequery/toolMode': meta.toolMode,
+    }).filter((entry) => entry[1] !== undefined);
+    return entries.length === 0 ? undefined : Object.fromEntries(entries);
+}
+/**
+ * A read-only executor over a catalog.
+ *
+ * `list_datasets`, `get_dataset_schema`, and the prompts read the agent-safe
+ * catalog and need no query engine, so they answer normally. `query_dataset`
+ * and `query_metric` are advertised with their exact schemas and refuse.
+ */
+export class HypequeryMCPDiscoveryExecutor {
+    config;
+    querySchemas;
+    meta;
+    constructor(config) {
+        this.config = config;
+        // Deliberately no tenant assertion. A gateway has no fixed tenant to
+        // declare, and none is needed: nothing here reaches a table.
+        this.querySchemas = buildMCPQuerySchemas(config.datasets ?? {}, config.queryLimits, config.queryableDatasets);
+        this.meta = metaEntries(config.meta);
+    }
+    /** The catalog these tools were compiled from, for caching by content. */
+    getManifestHash() {
+        return this.querySchemas.manifestHash;
+    }
+    async listTools() {
+        const manifest = buildMCPToolManifest(this.querySchemas);
+        return this.meta === undefined ? manifest : { ...manifest, _meta: this.meta };
+    }
+    async callTool(name, args) {
+        try {
+            switch (name) {
+                case 'list_datasets':
+                    return await listDatasetsTool(this.config.datasets);
+                case 'get_dataset_schema':
+                    return await getDatasetSchemaTool(this.config.datasets, args);
+                case 'query_dataset':
+                case 'query_metric':
+                    // Not `MCP_UNKNOWN_TOOL`: the tool exists and is listed, and telling a
+                    // client it does not would invite it to stop asking for good.
+                    throw new MCPToolError('MCP_EXECUTION_FAILED', NOT_EXECUTABLE, {
+                        retryable: false,
+                    });
+                default:
+                    throw new MCPToolError('MCP_UNKNOWN_TOOL', `Unknown tool: ${name}`);
+            }
+        }
+        catch (error) {
+            return createMCPErrorResponse(error);
+        }
+    }
+    async listPrompts() {
+        return {
+            prompts: [{
+                    name: 'dataset_guide',
+                    description: 'Guide for querying datasets with natural language',
+                    arguments: [{
+                            name: 'dataset',
+                            description: 'Name of the dataset to get guidance for',
+                            required: false,
+                        }],
+                }],
+        };
+    }
+    async getPrompt(name, args) {
+        if (name === 'dataset_guide') {
+            return datasetGuidePrompt(this.config.datasets, args?.dataset);
+        }
+        throw new Error(`Unknown prompt: ${name}`);
+    }
+}
+export function createMCPDiscoveryExecutor(config) {
+    return new HypequeryMCPDiscoveryExecutor(config);
+}

package/dist/index.d.ts

@@ -6,6 +6,7 @@
  */
 export { HypequeryMCPServer, createMCPServer, type MCPServerConfig } from './server.js';
 export { HypequeryMCPExecutor, createMCPExecutor, type MCPExecutorConfig, type MCPToolExecutor, } from './executor.js';
+export { HypequeryMCPDiscoveryExecutor, createMCPDiscoveryExecutor, type MCPDiscoveryExecutorConfig, type MCPToolManifestMeta, } from './discovery-executor.js';
 export { HypequeryMCPProtocolServer, createMCPProtocolServer, type MCPProtocolServerOptions, } from './protocol-server.js';
 export { connectMCPServerStdio, startStdioMCPServer } from './stdio.js';
 export { listDatasetsTool } from './tools/list-datasets.js';

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,kBAAkB,EAAE,eAAe,EAAE,KAAK,eAAe,EAAE,MAAM,aAAa,CAAC;AACxF,OAAO,EACL,oBAAoB,EACpB,iBAAiB,EACjB,KAAK,iBAAiB,EACtB,KAAK,eAAe,GACrB,MAAM,eAAe,CAAC;AACvB,OAAO,EACL,0BAA0B,EAC1B,uBAAuB,EACvB,KAAK,wBAAwB,GAC9B,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AACxE,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAE,oBAAoB,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AACtF,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAGhE,YAAY,EACV,eAAe,EACf,eAAe,EACf,gBAAgB,EAChB,gBAAgB,EAChB,kBAAkB,EAClB,cAAc,EACd,iBAAiB,EACjB,oBAAoB,EACpB,eAAe,EACf,aAAa,EACb,eAAe,EACf,YAAY,EACZ,kBAAkB,EAClB,eAAe,EACf,oBAAoB,EACpB,mBAAmB,EACnB,eAAe,GAChB,MAAM,YAAY,CAAC;AACpB,OAAO,EACL,uBAAuB,EACvB,YAAY,EACZ,oBAAoB,EACpB,kBAAkB,EAClB,KAAK,eAAe,EACpB,KAAK,qBAAqB,EAC1B,KAAK,gBAAgB,EACrB,KAAK,oBAAoB,GAC1B,MAAM,aAAa,CAAC;AACrB,OAAO,EACL,eAAe,EACf,mBAAmB,EACnB,gBAAgB,EAChB,oBAAoB,EACpB,kBAAkB,EAClB,iBAAiB,EACjB,kBAAkB,EAClB,wBAAwB,EACxB,oBAAoB,EACpB,sBAAsB,EACtB,kBAAkB,GACnB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,kBAAkB,EAAE,eAAe,EAAE,KAAK,eAAe,EAAE,MAAM,aAAa,CAAC;AACxF,OAAO,EACL,oBAAoB,EACpB,iBAAiB,EACjB,KAAK,iBAAiB,EACtB,KAAK,eAAe,GACrB,MAAM,eAAe,CAAC;AACvB,OAAO,EACL,6BAA6B,EAC7B,0BAA0B,EAC1B,KAAK,0BAA0B,EAC/B,KAAK,mBAAmB,GACzB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACL,0BAA0B,EAC1B,uBAAuB,EACvB,KAAK,wBAAwB,GAC9B,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AACxE,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAE,oBAAoB,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AACtF,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAGhE,YAAY,EACV,eAAe,EACf,eAAe,EACf,gBAAgB,EAChB,gBAAgB,EAChB,kBAAkB,EAClB,cAAc,EACd,iBAAiB,EACjB,oBAAoB,EACpB,eAAe,EACf,aAAa,EACb,eAAe,EACf,YAAY,EACZ,kBAAkB,EAClB,eAAe,EACf,oBAAoB,EACpB,mBAAmB,EACnB,eAAe,GAChB,MAAM,YAAY,CAAC;AACpB,OAAO,EACL,uBAAuB,EACvB,YAAY,EACZ,oBAAoB,EACpB,kBAAkB,EAClB,KAAK,eAAe,EACpB,KAAK,qBAAqB,EAC1B,KAAK,gBAAgB,EACrB,KAAK,oBAAoB,GAC1B,MAAM,aAAa,CAAC;AACrB,OAAO,EACL,eAAe,EACf,mBAAmB,EACnB,gBAAgB,EAChB,oBAAoB,EACpB,kBAAkB,EAClB,iBAAiB,EACjB,kBAAkB,EAClB,wBAAwB,EACxB,oBAAoB,EACpB,sBAAsB,EACtB,kBAAkB,GACnB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC"}

package/dist/index.js

@@ -6,6 +6,7 @@
  */
 export { HypequeryMCPServer, createMCPServer } from './server.js';
 export { HypequeryMCPExecutor, createMCPExecutor, } from './executor.js';
+export { HypequeryMCPDiscoveryExecutor, createMCPDiscoveryExecutor, } from './discovery-executor.js';
 export { HypequeryMCPProtocolServer, createMCPProtocolServer, } from './protocol-server.js';
 export { connectMCPServerStdio, startStdioMCPServer } from './stdio.js';
 export { listDatasetsTool } from './tools/list-datasets.js';

package/dist/tools/utils/canonical-query-schemas.d.ts

@@ -5,5 +5,13 @@ import type { DatasetRegistry, MCPQueryLimits } from '../../types.js';
  * type also accepts legacy metadata-only objects; retain a generic validator for
  * those compatibility inputs until the publishing API replaces them.
  */
-export declare function buildMCPQuerySchemas(datasets: DatasetRegistry, configured?: MCPQueryLimits): CanonicalSemanticQuerySchemas;
+export declare function buildMCPQuerySchemas(datasets: DatasetRegistry, configured?: MCPQueryLimits, 
+/**
+ * Datasets offered as a `query_dataset` target. Defaults to all of them.
+ *
+ * A dataset outside this list keeps its metrics and its joins; it is only
+ * withheld as a direct target, which a hosted gateway needs when a caller is
+ * entitled to a metric on a dataset it may not query itself.
+ */
+queryableDatasets?: readonly string[]): CanonicalSemanticQuerySchemas;
 //# sourceMappingURL=canonical-query-schemas.d.ts.map

package/dist/tools/utils/canonical-query-schemas.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"canonical-query-schemas.d.ts","sourceRoot":"","sources":["../../../src/tools/utils/canonical-query-schemas.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,KAAK,6BAA6B,EAEnC,MAAM,qBAAqB,CAAC;AAE7B,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AA0BtE;;;;GAIG;AACH,wBAAgB,oBAAoB,CAClC,QAAQ,EAAE,eAAe,EACzB,UAAU,CAAC,EAAE,cAAc,GAC1B,6BAA6B,CAqF/B"}
+{"version":3,"file":"canonical-query-schemas.d.ts","sourceRoot":"","sources":["../../../src/tools/utils/canonical-query-schemas.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,KAAK,6BAA6B,EAEnC,MAAM,qBAAqB,CAAC;AAE7B,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AA0BtE;;;;GAIG;AACH,wBAAgB,oBAAoB,CAClC,QAAQ,EAAE,eAAe,EACzB,UAAU,CAAC,EAAE,cAAc;AAC3B;;;;;;GAMG;AACH,iBAAiB,CAAC,EAAE,SAAS,MAAM,EAAE,GACpC,6BAA6B,CAqG/B"}

package/dist/tools/utils/canonical-query-schemas.js

@@ -26,8 +26,17 @@ function withLegacyDirectMetrics(datasets) {
  * type also accepts legacy metadata-only objects; retain a generic validator for
  * those compatibility inputs until the publishing API replaces them.
  */
-export function buildMCPQuerySchemas(datasets, configured) {
+export function buildMCPQuerySchemas(datasets, configured, 
+/**
+ * Datasets offered as a `query_dataset` target. Defaults to all of them.
+ *
+ * A dataset outside this list keeps its metrics and its joins; it is only
+ * withheld as a direct target, which a hosted gateway needs when a caller is
+ * entitled to a metric on a dataset it may not query itself.
+ */
+queryableDatasets) {
     const limits = resolveQueryLimits(undefined, configured);
+    const queryable = queryableDatasets === undefined ? undefined : new Set(queryableDatasets);
     const entries = Object.entries(datasets).sort(([left], [right]) => (left < right ? -1 : left > right ? 1 : 0));
     if (entries.length === 0) {
         const queryDatasetJsonSchema = toSemanticJsonSchema(queryDatasetArgsSchema);
@@ -45,7 +54,11 @@ export function buildMCPQuerySchemas(datasets, configured) {
         });
     }
     if (entries.every(([, dataset]) => isCanonicalSchemaSource(dataset))) {
-        return buildCanonicalSemanticQuerySchemas(withLegacyDirectMetrics(datasets), { grainField: 'grain', ...limits });
+        return buildCanonicalSemanticQuerySchemas(withLegacyDirectMetrics(datasets), {
+            grainField: 'grain',
+            ...limits,
+            ...(queryableDatasets === undefined ? {} : { queryableDatasets }),
+        });
     }
     const datasetSchemas = [];
     const metricSchemas = [];
@@ -54,9 +67,11 @@ export function buildMCPQuerySchemas(datasets, configured) {
     for (const [name, dataset] of entries) {
         if (isCanonicalSchemaSource(dataset)) {
             const exact = buildCanonicalSemanticQuerySchemas(withLegacyDirectMetrics({ [name]: dataset }), { grainField: 'grain', ...limits });
-            datasetSchemas.push(exact.queryDataset);
+            if (queryable === undefined || queryable.has(name)) {
+                datasetSchemas.push(exact.queryDataset);
+                datasetJsonSchemas.push(exact.queryDatasetJsonSchema);
+            }
             metricSchemas.push(exact.queryMetric);
-            datasetJsonSchemas.push(exact.queryDatasetJsonSchema);
             metricJsonSchemas.push(exact.queryMetricJsonSchema);
         }
         else {
@@ -67,16 +82,18 @@ export function buildMCPQuerySchemas(datasets, configured) {
                 dataset: z.literal(name),
                 metric: z.string().min(1),
             });
-            datasetSchemas.push(queryDataset);
+            if (queryable === undefined || queryable.has(name)) {
+                datasetSchemas.push(queryDataset);
+                datasetJsonSchemas.push(advertiseDatasetQueryLimits(toSemanticJsonSchema(queryDataset), { [name]: dataset }, configured, true));
+            }
             metricSchemas.push(queryMetric);
-            datasetJsonSchemas.push(advertiseDatasetQueryLimits(toSemanticJsonSchema(queryDataset), { [name]: dataset }, configured, true));
             metricJsonSchemas.push(advertiseDatasetQueryLimits(toSemanticJsonSchema(queryMetric), { [name]: dataset }, configured, false));
         }
     }
-    const queryDataset = unionSchemas(datasetSchemas);
-    const queryMetric = unionSchemas(metricSchemas);
-    const queryDatasetJsonSchema = unionJsonSchemas(datasetJsonSchemas);
-    const queryMetricJsonSchema = unionJsonSchemas(metricJsonSchemas);
+    const queryDataset = unionSchemas(datasetSchemas, z.object({ dataset: z.never() }).strict());
+    const queryMetric = unionSchemas(metricSchemas, z.object({ dataset: z.never(), metric: z.never() }).strict());
+    const queryDatasetJsonSchema = unionJsonSchemas(datasetJsonSchemas, toSemanticJsonSchema(queryDataset));
+    const queryMetricJsonSchema = unionJsonSchemas(metricJsonSchemas, toSemanticJsonSchema(queryMetric));
     const manifestHash = createHash('sha256').update(JSON.stringify({
         query_dataset: queryDatasetJsonSchema,
         query_metric: queryMetricJsonSchema,
@@ -96,12 +113,18 @@ function isCanonicalSchemaSource(dataset) {
     return source.__type === 'dataset'
         || ('requiresTenant' in source && 'supportedGrains' in source && 'orderableFields' in source);
 }
-function unionSchemas(schemas) {
+function unionSchemas(schemas, empty) {
+    // No variants means nothing is offered under this tool. `z.union([])` throws,
+    // and a permissive fallback would advertise every dataset instead of none.
+    if (schemas.length === 0)
+        return empty;
     return schemas.length === 1
         ? schemas[0]
         : z.union(schemas);
 }
-function unionJsonSchemas(schemas) {
+function unionJsonSchemas(schemas, empty) {
+    if (schemas.length === 0)
+        return empty;
     return schemas.length === 1
         ? schemas[0]
         : { type: 'object', anyOf: schemas };

package/dist/version.d.ts

@@ -1,2 +1,2 @@
-export declare const MCP_PACKAGE_VERSION = "0.6.0";
+export declare const MCP_PACKAGE_VERSION = "0.7.0";
 //# sourceMappingURL=version.d.ts.map

package/dist/version.js

@@ -2,4 +2,4 @@
 //
 // Resolved at build time rather than read from package.json at import time, so
 // importing this package touches no filesystem and survives bundling.
-export const MCP_PACKAGE_VERSION = '0.6.0';
+export const MCP_PACKAGE_VERSION = '0.7.0';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hypequery/mcp",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "description": "Governed ClickHouse MCP server for semantic metrics, datasets, Claude, Cursor, and AI agents",
   "keywords": [
     "mcp",
@@ -33,7 +33,7 @@
     "dist"
   ],
   "dependencies": {
-    "@hypequery/datasets": "^0.14.0",
+    "@hypequery/datasets": "^0.15.0",
     "@modelcontextprotocol/sdk": "^1.29.0",
     "zod": "^3.23.8"
   },
@@ -41,7 +41,7 @@
     "@types/node": "^20.11.30",
     "typescript": "^5.7.3",
     "vitest": "^3.2.6",
-    "@hypequery/clickhouse": "2.10.0"
+    "@hypequery/clickhouse": "2.10.1"
   },
   "repository": {
     "type": "git",