@hypequery/datasets 0.23.1 → 0.25.0

package/README.md

@@ -72,6 +72,9 @@ The same definition can become:
 - an OpenAI, AI SDK, or MCP tool schema;
 - a stable semantic contract for CI and deployment.
 
+Schema builders and agent tools are imported from `@hypequery/datasets/schemas`.
+(Their root-entry re-exports are deprecated and removed in 1.0.)
+
 `buildCanonicalSemanticQuerySchemas()` compiles the same catalog into strict
 dataset and metric Zod validators, JSON Schemas, and a deterministic manifest
 hash. It accepts either live local Dataset definitions or an already-normalized
@@ -111,3 +114,14 @@ for module boundaries and verification requirements, and the
 ## License
 
 Apache-2.0.
+
+## Public client descriptor schemas
+
+`buildClientContractQuerySchemas(contract)` validates an RFC 0018 signed client
+contract and returns per-endpoint HTTP schemas plus the canonical dataset/metric
+MCP schemas, JSON schemas and manifest hash. It accepts public descriptors without
+constructing Dataset instances or loading project code. Filter values have their
+advertised scalar/range/list types. Runtime validation additionally checks selected
+fields, uniqueness, timezone membership and combined predicate limits; preserve it
+when using the structural JSON schemas. Empty MCP target sets remain uncallable.
+Existing catalog-based schema APIs keep their defaults.

package/dist/aggregations.d.ts

@@ -15,6 +15,7 @@
  * ```
  */
 import type { AggregationSpec } from './types.js';
+import { type AggregateStateFunction } from './utils/aggregate-state-functions.js';
 export declare function sum(field: string): AggregationSpec;
 export declare function count(field: string): AggregationSpec;
 export declare function countDistinct(field: string): AggregationSpec;
@@ -23,6 +24,8 @@ export declare function approxCountDistinct(field: string): AggregationSpec;
 export declare function avg(field: string): AggregationSpec;
 export declare function min(field: string): AggregationSpec;
 export declare function max(field: string): AggregationSpec;
+/** Finalize the aggregate states stored in `field` with `stateFunction`'s `-Merge` combinator. */
+export declare function merge(stateFunction: AggregateStateFunction, field: string): AggregationSpec;
 /** Approximate percentile of a numeric field at `level` in [0, 1]. */
 export declare function percentile(field: string, level: number): AggregationSpec;
 /** Median — sugar for `percentile(field, 0.5)`. */

package/dist/aggregations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"aggregations.d.ts","sourceRoot":"","sources":["../src/aggregations.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAmB,MAAM,YAAY,CAAC;AAWnE,wBAAgB,GAAG,CAAC,KAAK,EAAE,MAAM,GAAG,eAAe,CAElD;AAED,wBAAgB,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,eAAe,CAEpD;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,eAAe,CAE5D;AAED,oDAAoD;AACpD,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,eAAe,CAElE;AAED,wBAAgB,GAAG,CAAC,KAAK,EAAE,MAAM,GAAG,eAAe,CAElD;AAED,wBAAgB,GAAG,CAAC,KAAK,EAAE,MAAM,GAAG,eAAe,CAElD;AAED,wBAAgB,GAAG,CAAC,KAAK,EAAE,MAAM,GAAG,eAAe,CAElD;AAED,sEAAsE;AACtE,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,eAAe,CAGxE;AAED,mDAAmD;AACnD,wBAAgB,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,eAAe,CAErD;AAED,0DAA0D;AAC1D,wBAAgB,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,eAAe,CAKjE;AAED,0DAA0D;AAC1D,wBAAgB,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,eAAe,CAKjE;AAED,iCAAiC;AACjC,wBAAgB,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,eAAe,CAErD;AAED,uBAAuB;AACvB,wBAAgB,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,eAAe,CAEvD"}
+{"version":3,"file":"aggregations.d.ts","sourceRoot":"","sources":["../src/aggregations.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAmB,MAAM,YAAY,CAAC;AAEnE,OAAO,EAAgC,KAAK,sBAAsB,EAAE,MAAM,sCAAsC,CAAC;AAUjH,wBAAgB,GAAG,CAAC,KAAK,EAAE,MAAM,GAAG,eAAe,CAElD;AAED,wBAAgB,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,eAAe,CAEpD;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,eAAe,CAE5D;AAED,oDAAoD;AACpD,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,eAAe,CAElE;AAED,wBAAgB,GAAG,CAAC,KAAK,EAAE,MAAM,GAAG,eAAe,CAElD;AAED,wBAAgB,GAAG,CAAC,KAAK,EAAE,MAAM,GAAG,eAAe,CAElD;AAED,wBAAgB,GAAG,CAAC,KAAK,EAAE,MAAM,GAAG,eAAe,CAElD;AAED,kGAAkG;AAClG,wBAAgB,KAAK,CAAC,aAAa,EAAE,sBAAsB,EAAE,KAAK,EAAE,MAAM,GAAG,eAAe,CAG3F;AAED,sEAAsE;AACtE,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,eAAe,CAGxE;AAED,mDAAmD;AACnD,wBAAgB,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,eAAe,CAErD;AAED,0DAA0D;AAC1D,wBAAgB,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,eAAe,CAKjE;AAED,0DAA0D;AAC1D,wBAAgB,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,eAAe,CAKjE;AAED,iCAAiC;AACjC,wBAAgB,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,eAAe,CAErD;AAED,uBAAuB;AACvB,wBAAgB,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,eAAe,CAEvD"}

package/dist/aggregations.js

@@ -15,6 +15,7 @@
  * ```
  */
 import { validatePercentileLevel } from './measure.js';
+import { assertAggregateStateFunction } from './utils/aggregate-state-functions.js';
 function createAggregation(aggregation, field) {
     return {
         __type: 'aggregation_spec',
@@ -44,6 +45,11 @@ export function min(field) {
 export function max(field) {
     return createAggregation('max', field);
 }
+/** Finalize the aggregate states stored in `field` with `stateFunction`'s `-Merge` combinator. */
+export function merge(stateFunction, field) {
+    assertAggregateStateFunction(stateFunction, `merge(…, "${field}")`);
+    return { ...createAggregation('merge', field), stateFunction };
+}
 /** Approximate percentile of a numeric field at `level` in [0, 1]. */
 export function percentile(field, level) {
     validatePercentileLevel(level);

package/dist/cache/definition-identity.d.ts

@@ -2,7 +2,8 @@ import type { AnyDatasetInstance } from '../types.js';
 /**
  * The local definition identity RFC 0009 leaves implementation-defined: a
  * digest of every definition that could affect the rows of a query over
- * `root`, plus the metric spec, cache scope, and timezone when present.
+ * `root`, plus the metric spec, cache scope, timezone, and alternate time axis
+ * when present.
  *
  * Throws when a definition holds a function it cannot describe safely; the
  * caller then runs the query uncached.
@@ -15,12 +16,14 @@ export declare function localDefinitionIdentity(root: AnyDatasetInstance, extra?
     metric?: unknown;
     scope?: string;
     timezone?: string;
+    timeKey?: string;
 }): string;
 /**
- * Folds a cache scope and a non-default timezone into a deployed definition
- * identity. Both change the rows one release returns (`scope` picks the data
- * source, the timezone moves bucket boundaries), so they must separate keys
- * even when the definitions are identical.
+ * Folds a cache scope, a non-default timezone and an alternate time axis into
+ * a deployed definition identity. Each changes the rows one release returns
+ * (`scope` picks the data source, the timezone moves bucket boundaries, the
+ * axis picks the column they bucket), so they must separate keys even when
+ * the definitions are identical.
  */
-export declare function scopedDefinitionIdentity(identity: string, scope: string | undefined, timezone?: string): string;
+export declare function scopedDefinitionIdentity(identity: string, scope: string | undefined, timezone?: string, timeKey?: string): string;
 //# sourceMappingURL=definition-identity.d.ts.map

package/dist/cache/definition-identity.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"definition-identity.d.ts","sourceRoot":"","sources":["../../src/cache/definition-identity.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,kBAAkB,EAAe,MAAM,aAAa,CAAC;AA8InE;;;;;;;;;;;GAWG;AACH,wBAAgB,uBAAuB,CACrC,IAAI,EAAE,kBAAkB,EACxB,KAAK,GAAE;IAAE,MAAM,CAAC,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAO,GAClE,MAAM,CAWR;AAMD;;;;;GAKG;AACH,wBAAgB,wBAAwB,CACtC,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,MAAM,GAAG,SAAS,EACzB,QAAQ,CAAC,EAAE,MAAM,GAChB,MAAM,CAKR"}
+{"version":3,"file":"definition-identity.d.ts","sourceRoot":"","sources":["../../src/cache/definition-identity.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,kBAAkB,EAAe,MAAM,aAAa,CAAC;AA8InE;;;;;;;;;;;;GAYG;AACH,wBAAgB,uBAAuB,CACrC,IAAI,EAAE,kBAAkB,EACxB,KAAK,GAAE;IAAE,MAAM,CAAC,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAO,GACpF,MAAM,CAaR;AAMD;;;;;;GAMG;AACH,wBAAgB,wBAAwB,CACtC,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,MAAM,GAAG,SAAS,EACzB,QAAQ,CAAC,EAAE,MAAM,EACjB,OAAO,CAAC,EAAE,MAAM,GACf,MAAM,CAMR"}

package/dist/cache/definition-identity.js

@@ -1,5 +1,5 @@
-import { sha256 } from '@noble/hashes/sha2';
-import { bytesToHex } from '@noble/hashes/utils';
+import { sha256 } from '@noble/hashes/sha2.js';
+import { bytesToHex } from '@noble/hashes/utils.js';
 import { stableStringify } from '../utils/canonical-json.js';
 const LOCAL_DEFINITION_DOMAIN = 'hypequery.ts.local-definitions.v2\0';
 /**
@@ -124,7 +124,8 @@ class DefinitionDescriber {
 /**
  * The local definition identity RFC 0009 leaves implementation-defined: a
  * digest of every definition that could affect the rows of a query over
- * `root`, plus the metric spec, cache scope, and timezone when present.
+ * `root`, plus the metric spec, cache scope, timezone, and alternate time axis
+ * when present.
  *
  * Throws when a definition holds a function it cannot describe safely; the
  * caller then runs the query uncached.
@@ -142,6 +143,8 @@ export function localDefinitionIdentity(root, extra = {}) {
         metric,
         scope: extra.scope ?? null,
         timezone: extra.timezone ?? null,
+        // Present only for an alternate axis, so default queries keep their keys.
+        ...(extra.timeKey !== undefined ? { timeKey: extra.timeKey } : {}),
     });
     return bytesToHex(sha256(new TextEncoder().encode(LOCAL_DEFINITION_DOMAIN + description)));
 }
@@ -149,16 +152,19 @@ function foldPartition(identity, domain, value) {
     return bytesToHex(sha256(new TextEncoder().encode(`${domain}\0${identity}\0${value}`)));
 }
 /**
- * Folds a cache scope and a non-default timezone into a deployed definition
- * identity. Both change the rows one release returns (`scope` picks the data
- * source, the timezone moves bucket boundaries), so they must separate keys
- * even when the definitions are identical.
+ * Folds a cache scope, a non-default timezone and an alternate time axis into
+ * a deployed definition identity. Each changes the rows one release returns
+ * (`scope` picks the data source, the timezone moves bucket boundaries, the
+ * axis picks the column they bucket), so they must separate keys even when
+ * the definitions are identical.
  */
-export function scopedDefinitionIdentity(identity, scope, timezone) {
+export function scopedDefinitionIdentity(identity, scope, timezone, timeKey) {
     let folded = identity;
     if (scope !== undefined)
         folded = foldPartition(folded, 'hypequery.ts.cache-scope.v1', scope);
     if (timezone !== undefined)
         folded = foldPartition(folded, 'hypequery.ts.cache-timezone.v1', timezone);
+    if (timeKey !== undefined)
+        folded = foldPartition(folded, 'hypequery.ts.cache-time-key.v1', timeKey);
     return folded;
 }

package/dist/cache/protocol-cache-keys.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"protocol-cache-keys.d.ts","sourceRoot":"","sources":["../../src/cache/protocol-cache-keys.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EACV,kBAAkB,EAClB,YAAY,EACZ,gBAAgB,EAChB,gBAAgB,EAEhB,WAAW,EACX,SAAS,EACV,MAAM,aAAa,CAAC;AAIrB,sEAAsE;AACtE,eAAO,MAAM,qBAAqB,cAAc,CAAC;AACjD,eAAO,MAAM,yBAAyB,YAAY,CAAC;AAInD,0EAA0E;AAC1E,MAAM,WAAW,wBAAwB;IACvC,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC;IAC5B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,kBAAkB,CAAC,EAAE,MAAM,CAAC;CACtC;AAED,MAAM,WAAW,uBAAuB;IACtC,MAAM,CAAC,EAAE,UAAU,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B;AAID;;;;;;;;GAQG;AACH,wBAAgB,+BAA+B,CAC7C,OAAO,EAAE,uBAAuB,EAChC,WAAW,EAAE,OAAO,GACnB,wBAAwB,CAqC1B;AAkHD;;;;GAIG;AACH,wBAAgB,eAAe,CAC7B,QAAQ,EAAE,wBAAwB,EAClC,EAAE,EAAE,kBAAkB,EACtB,KAAK,EAAE,YAAY,EACnB,OAAO,EAAE,gBAAgB,GAAG,SAAS,EACrC,KAAK,EAAE,MAAM,GAAG,SAAS,GACxB,MAAM,GAAG,SAAS,CAkBpB;AAED,wEAAwE;AACxE,wBAAgB,cAAc,CAC5B,QAAQ,EAAE,wBAAwB,EAClC,MAAM,EAAE,SAAS,GAAG,gBAAgB,EACpC,KAAK,EAAE,WAAW,EAClB,OAAO,EAAE,gBAAgB,GAAG,SAAS,EACrC,KAAK,EAAE,MAAM,GAAG,SAAS,GACxB,MAAM,GAAG,SAAS,CAgBpB"}
+{"version":3,"file":"protocol-cache-keys.d.ts","sourceRoot":"","sources":["../../src/cache/protocol-cache-keys.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EACV,kBAAkB,EAClB,YAAY,EACZ,gBAAgB,EAChB,gBAAgB,EAEhB,WAAW,EACX,SAAS,EACV,MAAM,aAAa,CAAC;AAMrB,sEAAsE;AACtE,eAAO,MAAM,qBAAqB,cAAc,CAAC;AACjD,eAAO,MAAM,yBAAyB,YAAY,CAAC;AAInD,0EAA0E;AAC1E,MAAM,WAAW,wBAAwB;IACvC,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC;IAC5B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,kBAAkB,CAAC,EAAE,MAAM,CAAC;CACtC;AAED,MAAM,WAAW,uBAAuB;IACtC,MAAM,CAAC,EAAE,UAAU,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B;AAID;;;;;;;;GAQG;AACH,wBAAgB,+BAA+B,CAC7C,OAAO,EAAE,uBAAuB,EAChC,WAAW,EAAE,OAAO,GACnB,wBAAwB,CAqC1B;AAwID;;;;GAIG;AACH,wBAAgB,eAAe,CAC7B,QAAQ,EAAE,wBAAwB,EAClC,EAAE,EAAE,kBAAkB,EACtB,KAAK,EAAE,YAAY,EACnB,OAAO,EAAE,gBAAgB,GAAG,SAAS,EACrC,KAAK,EAAE,MAAM,GAAG,SAAS,GACxB,MAAM,GAAG,SAAS,CAkBpB;AAED,wEAAwE;AACxE,wBAAgB,cAAc,CAC5B,QAAQ,EAAE,wBAAwB,EAClC,MAAM,EAAE,SAAS,GAAG,gBAAgB,EACpC,KAAK,EAAE,WAAW,EAClB,OAAO,EAAE,gBAAgB,GAAG,SAAS,EACrC,KAAK,EAAE,MAAM,GAAG,SAAS,GACxB,MAAM,GAAG,SAAS,CAgBpB"}

package/dist/cache/protocol-cache-keys.js

@@ -1,6 +1,8 @@
 import { buildProtocolCachePreimage, deriveProtocolCacheKey, validateCanonicalValue, } from '@hypequery/protocol';
 import { getMetricGrain, getMetricRef } from '../utils/metric-handle.js';
+import { runtimeConstraints } from '../utils/row-scope.js';
 import { localDefinitionIdentity, scopedDefinitionIdentity } from './definition-identity.js';
+import { selectsAlternateTimeKey } from '../utils/dataset-time-keys.js';
 /** Namespace defaults, so caching works without any configuration. */
 export const DEFAULT_CACHE_PROJECT = 'hypequery';
 export const DEFAULT_CACHE_ENVIRONMENT = 'default';
@@ -91,10 +93,23 @@ function filterNode(filter) {
         right: { kind: 'literal', value: literal },
     };
 }
-function sharedQueryFields(query) {
+/**
+ * The call's filters as the preimage sees them: the caller's, then the
+ * enforced constraints (RFC 0020). Constraints change rows, so they must
+ * change the key; the preimage sorts and dedupes filters, so a constraint and
+ * an identical caller filter (which yield the same rows) share an entry.
+ */
+function effectiveFilters(query, context) {
+    const constraints = runtimeConstraints(context);
+    if (constraints.length === 0)
+        return query.filters;
+    return [...(query.filters ?? []), ...constraints];
+}
+function sharedQueryFields(query, context) {
+    const filters = effectiveFilters(query, context);
     return {
         ...(query.dimensions !== undefined ? { dimensions: [...query.dimensions] } : {}),
-        ...(query.filters !== undefined ? { filters: query.filters.map(filterNode) } : {}),
+        ...(filters !== undefined ? { filters: filters.map(filterNode) } : {}),
         ...(query.segments !== undefined ? { segments: [...query.segments] } : {}),
         ...(query.orderBy !== undefined
             ? { orderBy: query.orderBy.map(({ field, direction }) => ({ field, direction })) }
@@ -143,11 +158,19 @@ function deriveKey(settings, query, definitionIdentity, context, rowLimit) {
 function partitionTimezone(query) {
     return query.timezone === 'UTC' ? undefined : query.timezone;
 }
+/**
+ * RFC 0009's normalized query has no time axis either. An alternate axis is
+ * folded in like the timezone; the default, named or omitted, folds in nothing.
+ */
+function partitionTimeKey(root, query) {
+    return selectsAlternateTimeKey(root, query.timeKey) ? query.timeKey : undefined;
+}
 function definitionFor(settings, root, scope, query, metric) {
     const timezone = partitionTimezone(query);
+    const timeKey = partitionTimeKey(root, query);
     return settings.definitionIdentity !== undefined
-        ? scopedDefinitionIdentity(settings.definitionIdentity, scope, timezone)
-        : localDefinitionIdentity(root, { metric, scope, timezone });
+        ? scopedDefinitionIdentity(settings.definitionIdentity, scope, timezone, timeKey)
+        : localDefinitionIdentity(root, { metric, scope, timezone, timeKey });
 }
 /**
  * The RFC 0013 store key for a dataset query, or `undefined` when the call
@@ -164,7 +187,7 @@ export function datasetCacheKey(settings, ds, query, context, scope) {
         const wire = {
             kind: 'dataset',
             dataset: ds.name,
-            ...sharedQueryFields(query),
+            ...sharedQueryFields(query, context),
             ...(query.measures !== undefined ? { measures: [...query.measures] } : {}),
             ...(query.by !== undefined ? { by: query.by } : {}),
         };
@@ -184,7 +207,7 @@ export function metricCacheKey(settings, metric, query, context, scope) {
             kind: 'metric',
             dataset: ref.dataset.name,
             metric: ref.name,
-            ...sharedQueryFields(query),
+            ...sharedQueryFields(query, context),
             ...(grain !== undefined ? { by: grain } : {}),
         };
         const definition = definitionFor(settings, ref.dataset, scope, query, ref.spec);

package/dist/cache/query-signature.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"query-signature.d.ts","sourceRoot":"","sources":["../../src/cache/query-signature.ts"],"names":[],"mappings":"AACA;;;;;;;;;;;;GAYG;AAEH,OAAO,KAAK,EACV,kBAAkB,EAElB,YAAY,EACZ,gBAAgB,EAChB,gBAAgB,EAGhB,WAAW,EACX,SAAS,EACV,MAAM,aAAa,CAAC;AAIrB,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAE7D,OAAO,EAAE,eAAe,EAAE,CAAC;AA8F3B;;;;GAIG;AACH,wBAAgB,0BAA0B,CACxC,EAAE,EAAE,kBAAkB,EACtB,KAAK,EAAE,YAAY,EACnB,OAAO,CAAC,EAAE,gBAAgB,GACzB,MAAM,CAsBR;AAED,oDAAoD;AACpD,wBAAgB,yBAAyB,CACvC,MAAM,EAAE,SAAS,GAAG,gBAAgB,EACpC,KAAK,EAAE,WAAW,EAClB,OAAO,CAAC,EAAE,gBAAgB,GACzB,MAAM,CAoBR"}
+{"version":3,"file":"query-signature.d.ts","sourceRoot":"","sources":["../../src/cache/query-signature.ts"],"names":[],"mappings":"AACA;;;;;;;;;;;;GAYG;AAEH,OAAO,KAAK,EACV,kBAAkB,EAElB,YAAY,EACZ,gBAAgB,EAChB,gBAAgB,EAGhB,WAAW,EACX,SAAS,EACV,MAAM,aAAa,CAAC;AAKrB,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAE7D,OAAO,EAAE,eAAe,EAAE,CAAC;AAoG3B;;;;GAIG;AACH,wBAAgB,0BAA0B,CACxC,EAAE,EAAE,kBAAkB,EACtB,KAAK,EAAE,YAAY,EACnB,OAAO,CAAC,EAAE,gBAAgB,GACzB,MAAM,CAyBR;AAED,oDAAoD;AACpD,wBAAgB,yBAAyB,CACvC,MAAM,EAAE,SAAS,GAAG,gBAAgB,EACpC,KAAK,EAAE,WAAW,EAClB,OAAO,CAAC,EAAE,gBAAgB,GACzB,MAAM,CAsBR"}

package/dist/cache/query-signature.js

@@ -1,6 +1,7 @@
 import { windowQuerySignature } from '../utils/window-query-signature.js';
 import { getMetricGrain, getMetricRef } from '../utils/metric-handle.js';
 import { getRuntimeTenantPredicate } from '../utils/tenant-runtime.js';
+import { runtimeConstraints } from '../utils/row-scope.js';
 import { buildRelationshipBuilderContext } from '../utils/relationship-builder-plan.js';
 import { stableStringify } from '../utils/canonical-json.js';
 export { stableStringify };
@@ -41,7 +42,7 @@ function orderBySignature(orderBy) {
  */
 function activatesTenantScopedJoin(ds, query, context) {
     const joinCtx = buildRelationshipBuilderContext(ds, query, context);
-    return !!joinCtx && joinCtx.joins.some((join) => join.tenant);
+    return !!joinCtx && joinCtx.joins.some((join) => join.scope.length > 0);
 }
 /**
  * Tenant portion of the key. A dataset with a `tenantKey` is strictly
@@ -64,6 +65,11 @@ function tenantSignature(ds, query, context) {
     }
     return { key: ds.tenantKey, operator: predicate.operator, value: predicate.value };
 }
+/** Enforced constraints change rows; absent when none, keeping existing signatures. */
+function constraintSignature(context) {
+    const constraints = runtimeConstraints(context);
+    return constraints.length ? { constraints: filterSignature([...constraints]) } : {};
+}
 /**
  * Selected segments keyed by their resolved definitions, not just their names,
  * so editing a segment cannot serve rows cached under the old one. Absent when
@@ -90,6 +96,8 @@ export function buildDatasetQuerySignature(ds, query, context) {
         kind: 'dataset',
         target: ds.name,
         source: ds.source,
+        // Omitted when false so existing datasets keep their cache keys.
+        ...(ds.rowResolution ? { rowResolution: ds.rowResolution } : {}),
         dimensions: query.dimensions ?? null,
         // `null` distinguishes the "all measures" default from an explicit [].
         measures: query.measures ?? null,
@@ -104,6 +112,7 @@ export function buildDatasetQuerySignature(ds, query, context) {
         limit: query.limit ?? null,
         offset: query.offset ?? null,
         tenant: tenantSignature(ds, query, context),
+        ...constraintSignature(context),
         scope: scopeSignature(context),
     });
 }
@@ -116,6 +125,7 @@ export function buildMetricQuerySignature(metric, query, context) {
         kind: 'metric',
         target: `${ref.dataset.name}.${ref.name}`,
         source: ref.dataset.source,
+        ...(ref.dataset.rowResolution ? { rowResolution: ref.dataset.rowResolution } : {}),
         metricKind: ref.spec.__type,
         dimensions: query.dimensions ?? null,
         filters: filterSignature(query.filters),
@@ -126,6 +136,7 @@ export function buildMetricQuerySignature(metric, query, context) {
         limit: query.limit ?? null,
         offset: query.offset ?? null,
         tenant: tenantSignature(ref.dataset, query, context),
+        ...constraintSignature(context),
         scope: scopeSignature(context),
     });
 }

package/dist/catalog.d.ts

@@ -1,7 +1,9 @@
+import type { RowResolution } from './types.js';
 import type { ProtocolExpression } from '@hypequery/protocol';
 import type { RelationshipKey } from './types.js';
 import { type WindowCatalogMetadata } from './utils/window-catalog-metadata.js';
 import type { AnyDatasetInstance, DimensionDefinition, MeasureDefinition, MetricHandle, RelationshipDefinition, SemanticFilterDefinition, DatasetLimits, DatasetDefaults, DatasetFreshness, SemanticMetadata, TimeGrain } from './types.js';
+import type { AggregateStateFunction } from './utils/aggregate-state-functions.js';
 export interface DimensionCatalogEntry extends SemanticMetadata {
     type: DimensionDefinition['fieldType'];
     column?: string;
@@ -18,6 +20,8 @@ export interface MeasureCatalogEntry extends SemanticMetadata, WindowCatalogMeta
     argField?: string;
     /** Percentile level in [0, 1]. */
     level?: number;
+    /** State function a `merge` measure finalizes (`uniq` for `uniqMerge`). */
+    stateFunction?: AggregateStateFunction;
     sql?: string;
     label?: string;
     description?: string;
@@ -81,11 +85,14 @@ export interface DatasetCatalog extends SemanticMetadata {
     name: string;
     description?: string;
     source: string;
+    rowResolution?: RowResolution;
     freshness?: DatasetFreshness;
     owner?: string;
     defaults?: DatasetDefaults;
     tenantKey?: string;
     timeKey?: string;
+    /** Alternate time axes a query may select; absent when the dataset declares none. */
+    timeKeys?: string[];
     dimensions: Record<string, DimensionCatalogEntry>;
     measures: Record<string, MeasureCatalogEntry>;
     /** Dataset-owned post-aggregation measures; absent in older hosted catalogs. */

package/dist/catalog.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"catalog.d.ts","sourceRoot":"","sources":["../src/catalog.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAE9D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAGlD,OAAO,EAAyB,KAAK,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAEvG,OAAO,KAAK,EACV,kBAAkB,EAClB,mBAAmB,EACnB,iBAAiB,EACjB,YAAY,EACZ,sBAAsB,EACtB,wBAAwB,EACxB,aAAa,EACb,eAAe,EACf,gBAAgB,EAChB,gBAAgB,EAChB,SAAS,EACV,MAAM,YAAY,CAAC;AAYpB,MAAM,WAAW,qBAAsB,SAAQ,gBAAgB;IAC7D,IAAI,EAAE,mBAAmB,CAAC,WAAW,CAAC,CAAC;IACvC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,OAAO,CAAC;IACpB,SAAS,EAAE,OAAO,CAAC;CACpB;AAED,MAAM,WAAW,mBAAoB,SAAQ,gBAAgB,EAAE,qBAAqB;IAClF,WAAW,CAAC,EAAE,iBAAiB,CAAC,aAAa,CAAC,CAAC;IAC/C,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,uCAAuC;IACvC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,kCAAkC;IAClC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,gEAAgE;IAChE,WAAW,CAAC,EAAE,IAAI,CAAC;CACpB;AAED,MAAM,WAAW,0BAA2B,SAAQ,gBAAgB,EAAE,qBAAqB;IACzF,IAAI,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAC5C,UAAU,CAAC,EAAE,kBAAkB,CAAC;IAChC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,4EAA4E;IAC5E,WAAW,CAAC,EAAE,IAAI,CAAC;CACpB;AAED,oFAAoF;AACpF,MAAM,WAAW,mBAAmB;IAClC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,kBAAmB,SAAQ,gBAAgB;IAC1D,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,wBAAwB,CAAC,WAAW,CAAC,CAAC;IACjD,SAAS,CAAC,EAAE,mBAAmB,CAAC,WAAW,CAAC,CAAC;CAC9C;AAED,MAAM,WAAW,kBAAmB,SAAQ,gBAAgB;IAC1D,IAAI,EAAE,UAAU,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;IACnD,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,QAAQ,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;CACrB;AAED,MAAM,WAAW,wBAAwB;IACvC,IAAI,EAAE,sBAAsB,CAAC,MAAM,CAAC,CAAC;IACrC,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,CAAC,EAAE,SAAS,eAAe,EAAE,CAAC;IAClC,SAAS,EAAE,OAAO,CAAC;IACnB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB;;;OAGG;IACH,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,gEAAgE;IAChE,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;CAChD;AAED,MAAM,WAAW,cAAe,SAAQ,gBAAgB;IACtD,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,gBAAgB,CAAC;IAC7B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,eAAe,CAAC;IAC3B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAC;IAClD,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;IAC9C,gFAAgF;IAChF,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,0BAA0B,CAAC,CAAC;IAC7D,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;IAC5C,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;IAC5C,6DAA6D;IAC7D,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;IAC/C,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAAC;IACxD,MAAM,CAAC,EAAE,aAAa,CAAC;IACvB,cAAc,EAAE,OAAO,CAAC;IACxB,eAAe,EAAE,SAAS,EAAE,CAAC;IAC7B,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,MAAM,iBAAiB,GAAG,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;AAC/D,MAAM,MAAM,oBAAoB,GAAG,kBAAkB,GAAG;IACtD,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;CACxC,CAAC;AAiFF,kGAAkG;AAClG,wBAAgB,8BAA8B,CAAC,OAAO,EAAE,cAAc,GAAG,MAAM,EAAE,CAIhF;AAED,4DAA4D;AAC5D,wBAAgB,gCAAgC,CAAC,OAAO,EAAE,cAAc,GAAG,MAAM,EAAE,CAGlF;AAED,gFAAgF;AAChF,wBAAgB,8BAA8B,CAAC,OAAO,EAAE,cAAc,GAAG,MAAM,EAAE,CAIhF;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,oBAAoB,GAAG,cAAc,CAoG/E;AAED,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC,GAAG,iBAAiB,CAOpG"}
+{"version":3,"file":"catalog.d.ts","sourceRoot":"","sources":["../src/catalog.ts"],"names":[],"mappings":"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"}

package/dist/catalog.js

@@ -5,7 +5,7 @@ import { windowCatalogMetadata } from './utils/window-catalog-metadata.js';
 import { splitDatasetMeasures } from './utils/dataset-measures.js';
 import { SEMANTIC_FILTER_OPERATORS } from './constants.js';
 import { datasetTimeGrains } from './utils/dataset-time-grains.js';
-import { isApproximateAggregation, isApproximateDerivedMeasure, isApproximateMeasure } from './utils/approximate-measures.js';
+import { isApproximateBaseMeasure, isApproximateDerivedMeasure, isApproximateMeasure } from './utils/approximate-measures.js';
 import { usesTimeMeasure } from './utils/time-query-measures.js';
 import { measureSupportedGrains } from './utils/measure-time-grains.js';
 import { listGroupableRelationshipFields, listQueryableRelationshipFields, } from './utils/relationship-fields.js';
@@ -28,12 +28,13 @@ function measureToCatalog(measure) {
         field: measure.field,
         argField: measure.argField,
         level: measure.level,
+        ...(measure.stateFunction !== undefined ? { stateFunction: measure.stateFunction } : {}),
         sql: measure.sql,
         label: measure.label,
         description: measure.description,
         ...snapshotSemanticMetadata(measure),
         filterCount: measure.filters?.length ?? 0,
-        ...(isApproximateAggregation(measure.aggregation) ? { approximate: true } : {}),
+        ...(isApproximateBaseMeasure(measure) ? { approximate: true } : {}),
     };
 }
 function filterToCatalog(filter, dimensions) {
@@ -113,11 +114,13 @@ export function getDatasetCatalog(dataset) {
         description: dataset.description,
         ...snapshotSemanticMetadata(dataset),
         source: dataset.source,
+        ...(dataset.rowResolution === undefined ? {} : { rowResolution: { ...dataset.rowResolution } }),
         freshness: dataset.freshness,
         owner: dataset.owner,
         defaults: dataset.defaults,
         tenantKey: dataset.tenantKey,
         timeKey: dataset.timeKey,
+        ...(dataset.timeKeys?.length ? { timeKeys: [...dataset.timeKeys] } : {}),
         dimensions: Object.fromEntries(Object.entries(dataset.dimensions).map(([name, dimension]) => [
             name,
             dimensionToCatalog(dimension),

package/dist/client-contract/query-schema.d.ts

@@ -0,0 +1,19 @@
+import { type ProtocolClientContract, type ProtocolClientEndpoint } from '@hypequery/protocol';
+import { type ZodTypeAny } from 'zod';
+import { type CanonicalSemanticQuerySchemas } from '../semantic-query-schema.js';
+import type { JsonSchema } from '../tools.js';
+export interface ClientEndpointQuerySchema {
+    readonly endpoint: ProtocolClientEndpoint;
+    readonly http: ZodTypeAny;
+    readonly httpJsonSchema: JsonSchema;
+}
+export interface ClientContractQuerySchemas extends CanonicalSemanticQuerySchemas {
+    readonly contract: ProtocolClientContract;
+    readonly endpoints: ReadonlyMap<string, ClientEndpointQuerySchema>;
+}
+/** Compile typed endpoint and MCP schemas from the same validated client descriptor.
+ * JSON Schema describes structural constraints; execution must retain the runtime
+ * validator for selected-field dependencies, uniqueness, and combined budgets.
+ */
+export declare function buildClientContractQuerySchemas(input: unknown): ClientContractQuerySchemas;
+//# sourceMappingURL=query-schema.d.ts.map

package/dist/client-contract/query-schema.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"query-schema.d.ts","sourceRoot":"","sources":["../../src/client-contract/query-schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,sBAAsB,EAAE,KAAK,sBAAsB,EACzD,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAK,KAAK,UAAU,EAAE,MAAM,KAAK,CAAC;AACzC,OAAO,EAAwB,KAAK,6BAA6B,EAAE,MAAM,6BAA6B,CAAC;AACvG,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAE9C,MAAM,WAAW,yBAAyB;IACxC,QAAQ,CAAC,QAAQ,EAAE,sBAAsB,CAAC;IAC1C,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC;IAC1B,QAAQ,CAAC,cAAc,EAAE,UAAU,CAAC;CACrC;AACD,MAAM,WAAW,0BAA2B,SAAQ,6BAA6B;IAC/E,QAAQ,CAAC,QAAQ,EAAE,sBAAsB,CAAC;IAC1C,QAAQ,CAAC,SAAS,EAAE,WAAW,CAAC,MAAM,EAAE,yBAAyB,CAAC,CAAC;CACpE;AA4DD;;;GAGG;AACH,wBAAgB,+BAA+B,CAAC,KAAK,EAAE,OAAO,GAAG,0BAA0B,CAe1F"}

package/dist/client-contract/query-schema.js

@@ -0,0 +1,85 @@
+import { validateProtocolClientContract, validateProtocolClientQuery, } from '@hypequery/protocol';
+import { z } from 'zod';
+import { toSemanticJsonSchema } from '../semantic-query-schema.js';
+function union(schemas) {
+    return schemas.length === 0 ? z.never() : schemas.length === 1 ? schemas[0]
+        : z.union(schemas);
+}
+function enumeration(values) {
+    return values.length ? z.enum(values) : z.never();
+}
+function predicates(endpoint, having) {
+    const definitions = having ? Object.entries(endpoint.measures).filter(([, m]) => m.having)
+        .map(([key]) => [key, { type: 'number', operators: ['eq', 'neq', 'gt', 'gte', 'lt', 'lte', 'in', 'notIn', 'between'] }])
+        : Object.entries(endpoint.filters);
+    return union(definitions.flatMap(([key, field]) => field.operators.map(operator => {
+        const scalar = field.type === 'number' ? z.number().finite()
+            : field.type === 'boolean' ? z.boolean() : z.string();
+        const value = operator === 'between' ? z.tuple([scalar, scalar])
+            : operator === 'in' || operator === 'notIn' ? z.array(scalar).min(1).max(endpoint.limits.maxFilterValues)
+                : scalar;
+        return z.object({ [having ? 'measure' : 'field']: z.literal(key), operator: z.literal(operator), value }).strict();
+    })));
+}
+function endpointSchema(contract, endpoint, transport) {
+    const caps = endpoint.limits;
+    const groupable = Object.keys(endpoint.dimensions).filter(key => endpoint.dimensions[key].groupable);
+    const orderable = [...Object.keys(endpoint.dimensions).filter(key => endpoint.dimensions[key].groupable && endpoint.dimensions[key].orderable),
+        ...Object.keys(endpoint.measures), ...(endpoint.time ? ['period'] : [])];
+    const fields = {
+        dimensions: z.array(enumeration(groupable)).max(caps.maxDimensions).optional(),
+        filters: z.array(predicates(endpoint, false)).max(caps.maxPredicates).optional(),
+        orderBy: z.array(z.object({ field: enumeration(orderable), direction: z.enum(['asc', 'desc']) }).strict()).max(caps.maxOrderBy).optional(),
+        // HTTP clamps a larger limit to the endpoint's maximum. An agent should
+        // see the real ceiling, rather than learn of truncation from metadata.
+        limit: z.number().int().min(1).max(transport === 'mcp' ? caps.maxLimit : Number.MAX_SAFE_INTEGER).optional(),
+        offset: z.number().int().min(0).max(caps.maxOffset).optional(),
+        includeMeta: (endpoint.metadata ? z.boolean() : z.literal(false)).optional(),
+    };
+    if (endpoint.kind === 'dataset') {
+        fields.measures = z.array(enumeration(Object.keys(endpoint.measures))).max(caps.maxMeasures).optional();
+        fields.having = z.array(predicates(endpoint, true)).max(caps.maxPredicates).optional();
+    }
+    if (endpoint.time) {
+        fields[transport === 'http' ? 'by' : 'grain'] = enumeration(endpoint.time.grains).optional();
+        if (endpoint.time.timezone)
+            fields.timezone = z.string().optional();
+    }
+    if (transport === 'mcp') {
+        fields.dataset = z.literal(endpoint.dataset);
+        if (endpoint.kind === 'metric')
+            fields.metric = z.literal(endpoint.id);
+    }
+    // Validate before zod reads properties: the runtime validator snapshots input
+    // without invoking accessors, so a hostile getter cannot escape safeParse.
+    return z.preprocess((input, context) => {
+        try {
+            validateProtocolClientQuery(contract, endpoint.id, input, transport);
+        }
+        catch {
+            context.addIssue({ code: z.ZodIssueCode.custom, message: 'Invalid client query.' });
+            return z.NEVER;
+        }
+        return input;
+    }, z.object(fields).strict());
+}
+/** Compile typed endpoint and MCP schemas from the same validated client descriptor.
+ * JSON Schema describes structural constraints; execution must retain the runtime
+ * validator for selected-field dependencies, uniqueness, and combined budgets.
+ */
+export function buildClientContractQuerySchemas(input) {
+    const contract = validateProtocolClientContract(input);
+    const endpoints = new Map();
+    const datasets = [], metrics = [];
+    for (const endpoint of contract.endpoints) {
+        const http = endpointSchema(contract, endpoint, 'http');
+        endpoints.set(endpoint.id, { endpoint, http, httpJsonSchema: toSemanticJsonSchema(http) });
+        (endpoint.kind === 'dataset' ? datasets : metrics).push(endpointSchema(contract, endpoint, 'mcp'));
+    }
+    // Preserve the existing fixed MCP tool names while making empty views uncallable.
+    const queryDataset = datasets.length ? union(datasets) : z.object({ dataset: z.never() }).strict();
+    const queryMetric = metrics.length ? union(metrics) : z.object({ dataset: z.never(), metric: z.never() }).strict();
+    return { contract, endpoints, queryDataset, queryMetric,
+        queryDatasetJsonSchema: toSemanticJsonSchema(queryDataset),
+        queryMetricJsonSchema: toSemanticJsonSchema(queryMetric), manifestHash: contract.contentHash };
+}

package/dist/constants.d.ts

@@ -4,12 +4,13 @@
 import type { MetricFilter, TimeGrain } from './types.js';
 /**
  * Maps time grain to ClickHouse date truncation functions.
+ *
+ * @deprecated Grain SQL is engine-specific and now rendered by the datasets
+ * SQL dialect; use {@link SUPPORTED_TIME_GRAINS} to enumerate grains. Kept
+ * for compatibility and no longer read by the planner.
  */
 export declare const GRAIN_FUNCTIONS: Record<TimeGrain, string>;
-/**
- * The set of time grains supported by the planner. Derived from
- * {@link GRAIN_FUNCTIONS} so the two never drift apart.
- */
+/** The set of time grains supported by the planner, finest first. */
 export declare const SUPPORTED_TIME_GRAINS: TimeGrain[];
 /**
  * The filter operators accepted by semantic dataset and metric inputs.

package/dist/constants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAyB,YAAY,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEjF;;GAEG;AACH,eAAO,MAAM,eAAe,EAAE,MAAM,CAAC,SAAS,EAAE,MAAM,CAQrD,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,qBAAqB,EAAmC,SAAS,EAAE,CAAC;AAEjF;;GAEG;AACH,eAAO,MAAM,yBAAyB,oFAWkB,CAAC;AAIzD;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,OAAO,GAAG,QAAQ,IAAI,YAAY,CAAC,UAAU,CAAC,CAEhG;AAED;;;GAGG;AACH,eAAO,MAAM,yBAAyB,4EAUe,CAAC;AAEtD;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,SAAS,CAEvE"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAyB,YAAY,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEjF;;;;;;GAMG;AACH,eAAO,MAAM,eAAe,EAAE,MAAM,CAAC,SAAS,EAAE,MAAM,CAQrD,CAAC;AAEF,qEAAqE;AACrE,eAAO,MAAM,qBAAqB,EAAE,SAAS,EAAkE,CAAC;AAEhH;;GAEG;AACH,eAAO,MAAM,yBAAyB,oFAWkB,CAAC;AAIzD;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,OAAO,GAAG,QAAQ,IAAI,YAAY,CAAC,UAAU,CAAC,CAEhG;AAED;;;GAGG;AACH,eAAO,MAAM,yBAAyB,4EAUe,CAAC;AAEtD;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,SAAS,CAEvE"}

package/dist/constants.js

@@ -3,6 +3,10 @@
  */
 /**
  * Maps time grain to ClickHouse date truncation functions.
+ *
+ * @deprecated Grain SQL is engine-specific and now rendered by the datasets
+ * SQL dialect; use {@link SUPPORTED_TIME_GRAINS} to enumerate grains. Kept
+ * for compatibility and no longer read by the planner.
  */
 export const GRAIN_FUNCTIONS = {
     minute: 'toStartOfMinute',
@@ -13,11 +17,8 @@ export const GRAIN_FUNCTIONS = {
     quarter: 'toStartOfQuarter',
     year: 'toStartOfYear',
 };
-/**
- * The set of time grains supported by the planner. Derived from
- * {@link GRAIN_FUNCTIONS} so the two never drift apart.
- */
-export const SUPPORTED_TIME_GRAINS = Object.keys(GRAIN_FUNCTIONS);
+/** The set of time grains supported by the planner, finest first. */
+export const SUPPORTED_TIME_GRAINS = ['minute', 'hour', 'day', 'week', 'month', 'quarter', 'year'];
 /**
  * The filter operators accepted by semantic dataset and metric inputs.
  */
@@ -61,5 +62,5 @@ export const SEMANTIC_HAVING_OPERATORS = [
  * Narrowing guard for a runtime-provided grain value.
  */
 export function isSupportedTimeGrain(grain) {
-    return typeof grain === 'string' && Object.hasOwn(GRAIN_FUNCTIONS, grain);
+    return typeof grain === 'string' && SUPPORTED_TIME_GRAINS.includes(grain);
 }

package/dist/contract.d.ts

@@ -1,3 +1,4 @@
+import type { RowResolution } from './types.js';
 import type { RelationshipKey } from './types.js';
 import { type WindowCatalogMetadata } from './utils/window-catalog-metadata.js';
 import { type DatasetCatalog, type DatasetCatalogSource, type DimensionCatalogEntry, type MeasureCatalogEntry, type SegmentCatalogEntry, type MetricCatalogEntry, type FilterCatalogEntry, type RelationshipCatalogEntry } from './catalog.js';
@@ -23,6 +24,8 @@ export interface ContractMeasure extends SemanticMetadata, WindowCatalogMetadata
     argField?: string;
     /** Percentile level in [0, 1]. */
     level?: number;
+    /** State function a `merge` measure finalizes. */
+    stateFunction?: MeasureCatalogEntry['stateFunction'];
     sql?: string;
     label?: string;
     description?: string;
@@ -61,11 +64,13 @@ export interface ContractDataset extends SemanticMetadata {
     name: string;
     description?: string;
     source: string;
+    rowResolution?: RowResolution;
     freshness?: DatasetFreshness;
     owner?: string;
     defaults?: DatasetDefaults;
     tenantKey?: string;
     timeKey?: string;
+    timeKeys?: string[];
     requiresTenant: boolean;
     supportedGrains: string[];
     dimensions: Record<string, ContractDimension>;

package/dist/contract.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"contract.d.ts","sourceRoot":"","sources":["../src/contract.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"contract.d.ts","sourceRoot":"","sources":["../src/contract.ts"],"names":[],"mappings":"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"}