@query-farm/vgi 0.28.0 → 0.29.0

package/src/generated/vgi-protocol-schemas.ts

@@ -2,7 +2,7 @@
 // GENERATED by vgi.codegen.ts_schemas. DO NOT EDIT BY HAND.
 //
 // Generator: vgi-gen-ts-schemas v2
-// Content hash: ae533ce2196c
+// Content hash: 0da278e5271a
 //
 // To regenerate:
 //   uv run --project ~/Development/vgi-python vgi-gen-ts-schemas \
@@ -15,9 +15,11 @@ import {
   bool,
   dictionary,
   field,
+  float64,
   int16,
   int32,
   int64,
+  largeBinary,
   list,
   map,
   schema,
@@ -32,7 +34,7 @@ export const CatalogInfoSchema = schema([
   field("implementation_version", utf8(), true),
   field("data_version_spec", utf8(), true),
   field("attach_option_specs", list(field("item", binary(), true)), false),
-  field("releases", list(field("item", struct([field("version", utf8(), false), field("released_at", timestamp(TimeUnit.MICROSECOND, "UTC"), false), field("summary", utf8(), false), field("notes_url", utf8(), true)]), true)), false),
+  field("releases", list(field("item", struct([field("version", utf8(), false), field("released_at", timestamp(TimeUnit.MICROSECOND, "UTC"), true), field("summary", utf8(), false), field("notes_url", utf8(), true)]), true)), false),
   field("source_url", utf8(), true),
 ]);
 
@@ -62,14 +64,14 @@ export const TableInfoSchema = schema([
   field("supports_delete", bool(), false),
   field("supports_returning", bool(), false),
   field("supports_column_statistics", bool(), false),
-  field("scan_function", binary(), false),
-  field("insert_function", binary(), false),
-  field("update_function", binary(), false),
-  field("delete_function", binary(), false),
-  field("cardinality_estimate", int64(), false),
-  field("cardinality_max", int64(), false),
-  field("column_statistics", binary(), false),
-  field("bind_result", binary(), false),
+  field("scan_function", binary(), true),
+  field("insert_function", binary(), true),
+  field("update_function", binary(), true),
+  field("delete_function", binary(), true),
+  field("cardinality_estimate", int64(), true),
+  field("cardinality_max", int64(), true),
+  field("column_statistics", binary(), true),
+  field("bind_result", binary(), true),
   field("required_filters", list(field("item", list(field("item", utf8(), true)), true)), false),
 ]);
 
@@ -103,8 +105,12 @@ export const FunctionInfoSchema = schema([
   field("late_materialization", bool(), true),
   field("supported_expression_filters", list(field("item", utf8(), true)), false),
   field("order_preservation", dictionary(utf8(), int16()), true),
-  field("max_workers", int32(), false),
+  field("max_workers", int32(), true),
   field("supports_batch_index", bool(), false),
+  field("supports_splits", bool(), false),
+  field("filters_exactly_applied", bool(), false),
+  field("supports_positions", bool(), false),
+  field("split_token_ttl_seconds", int64(), true),
   field("partition_kind", dictionary(utf8(), int16()), false),
   field("order_dependent", dictionary(utf8(), int16()), false),
   field("distinct_dependent", dictionary(utf8(), int16()), false),
@@ -127,9 +133,9 @@ export const MacroInfoSchema = schema([
   field("schema_name", utf8(), false),
   field("macro_type", dictionary(utf8(), int16()), false),
   field("parameters", list(field("item", utf8(), true)), false),
-  field("parameter_default_values", binary(), false),
+  field("parameter_default_values", binary(), true),
   field("definition", utf8(), false),
-  field("arguments_schema", binary(), false),
+  field("arguments_schema", binary(), true),
 ]);
 
 // Origin: IndexInfo
@@ -179,6 +185,23 @@ export const ScanBranchSchema = schema([
   field("source_catalog", utf8(), true),
   field("source_schema", utf8(), true),
   field("source_table", utf8(), true),
+  field("format_name", utf8(), true),
+  field("format_locations", list(field("item", utf8(), true)), true),
+  field("format_options", binary(), true),
+]);
+
+// Origin: ScanSplit
+export const ScanSplitSchema = schema([
+  field("payload", binary(), false),
+  field("token", binary(), false),
+  field("estimated_rows", int64(), true),
+  field("rows_exact", bool(), false),
+  field("estimated_bytes", int64(), true),
+  field("partition_bounds", binary(), true),
+  field("column_statistics", binary(), true),
+  field("location_ids", list(field("item", int64(), true)), true),
+  field("start_position", binary(), true),
+  field("end_position", binary(), true),
 ]);
 
 // Origin: AttachCatalogInfo
@@ -192,6 +215,184 @@ export const AttachCatalogInfoSchema = schema([
   field("secret_ref", utf8(), false),
 ]);
 
+// Origin: AggregateBindRequest
+export const AggregateBindRequestSchema = schema([
+  field("function_name", utf8(), false),
+  field("arguments", binary(), false),
+  field("input_schema", binary(), true),
+  field("settings", binary(), true),
+  field("secrets", binary(), true),
+  field("attach_opaque_data", binary(), true),
+  field("schema_name", utf8(), true),
+]);
+
+// Origin: AggregateCombineRequest
+export const AggregateCombineRequestSchema = schema([
+  field("function_name", utf8(), false),
+  field("execution_id", binary(), false),
+  field("merge_batch", binary(), false),
+  field("attach_opaque_data", binary(), true),
+  field("schema_name", utf8(), true),
+]);
+
+// Origin: AggregateDestructorRequest
+export const AggregateDestructorRequestSchema = schema([
+  field("function_name", utf8(), false),
+  field("execution_id", binary(), false),
+  field("group_ids_batch", binary(), false),
+  field("attach_opaque_data", binary(), true),
+  field("schema_name", utf8(), true),
+]);
+
+// Origin: AggregateFinalizeRequest
+export const AggregateFinalizeRequestSchema = schema([
+  field("function_name", utf8(), false),
+  field("execution_id", binary(), false),
+  field("group_ids_batch", binary(), false),
+  field("output_schema", binary(), false),
+  field("attach_opaque_data", binary(), true),
+  field("schema_name", utf8(), true),
+]);
+
+// Origin: AggregateUpdateRequest
+export const AggregateUpdateRequestSchema = schema([
+  field("function_name", utf8(), false),
+  field("execution_id", binary(), false),
+  field("input_batch", binary(), false),
+  field("attach_opaque_data", binary(), true),
+  field("schema_name", utf8(), true),
+]);
+
+// Origin: BindRequest
+export const BindRequestSchema = schema([
+  field("function_name", utf8(), false),
+  field("arguments", binary(), false),
+  field("function_type", dictionary(utf8(), int16()), false),
+  field("input_schema", binary(), true),
+  field("settings", binary(), true),
+  field("secrets", binary(), true),
+  field("attach_opaque_data", binary(), true),
+  field("transaction_opaque_data", binary(), true),
+  field("resolved_secrets_provided", bool(), false),
+  field("at_unit", utf8(), true),
+  field("at_value", utf8(), true),
+  field("copy_from", struct([field("format", utf8(), false), field("file_path", utf8(), false), field("expected_schema", binary(), false)]), true),
+  field("copy_to", struct([field("format", utf8(), false), field("file_path", utf8(), false)]), true),
+  field("schema_name", utf8(), true),
+]);
+
+// Origin: CatalogAttachRequest
+export const CatalogAttachRequestSchema = schema([
+  field("name", utf8(), false),
+  field("options", binary(), true),
+  field("data_version_spec", utf8(), true),
+  field("implementation_version", utf8(), true),
+  field("client_capabilities", binary(), true),
+]);
+
+// Origin: CopyFromContext
+export const CopyFromContextSchema = schema([
+  field("format", utf8(), false),
+  field("file_path", utf8(), false),
+  field("expected_schema", binary(), false),
+]);
+
+// Origin: CopyToContext
+export const CopyToContextSchema = schema([
+  field("format", utf8(), false),
+  field("file_path", utf8(), false),
+]);
+
+// Origin: GlobalInitResponse
+export const GlobalInitResponseSchema = schema([
+  field("execution_id", binary(), false),
+  field("opaque_data", binary(), true),
+  field("max_workers", int64(), false),
+]);
+
+// Origin: InitRequest
+export const InitRequestSchema = schema([
+  field("bind_call", binary(), false),
+  field("output_schema", binary(), false),
+  field("bind_opaque_data", binary(), true),
+  field("projection_ids", list(field("item", int64(), true)), true),
+  field("pushdown_filters", largeBinary(), true),
+  field("join_keys", list(field("item", largeBinary(), true)), true),
+  field("split_tokens", list(field("item", largeBinary(), true)), true),
+  field("row_limit", int64(), true),
+  field("phase", dictionary(utf8(), int16()), true),
+  field("finalize_state_id", binary(), true),
+  field("execution_id", binary(), true),
+  field("init_opaque_data", binary(), true),
+  field("substream_id", binary(), true),
+  field("order_by_column_name", utf8(), true),
+  field("order_by_direction", dictionary(utf8(), int16()), true),
+  field("order_by_null_order", dictionary(utf8(), int16()), true),
+  field("order_by_limit", int64(), true),
+  field("tablesample_percentage", float64(), true),
+  field("tablesample_seed", int64(), true),
+]);
+
+// Origin: TableBufferingCombineRequest
+export const TableBufferingCombineRequestSchema = schema([
+  field("function_name", utf8(), false),
+  field("execution_id", binary(), false),
+  field("state_ids", list(field("item", binary(), true)), false),
+  field("attach_opaque_data", binary(), true),
+  field("transaction_id", binary(), true),
+  field("schema_name", utf8(), true),
+]);
+
+// Origin: TableBufferingDestructorRequest
+export const TableBufferingDestructorRequestSchema = schema([
+  field("function_name", utf8(), false),
+  field("execution_id", binary(), false),
+  field("attach_opaque_data", binary(), true),
+  field("transaction_id", binary(), true),
+  field("schema_name", utf8(), true),
+]);
+
+// Origin: TableBufferingProcessRequest
+export const TableBufferingProcessRequestSchema = schema([
+  field("function_name", utf8(), false),
+  field("execution_id", binary(), false),
+  field("input_batch", binary(), false),
+  field("attach_opaque_data", binary(), true),
+  field("transaction_id", binary(), true),
+  field("batch_index", int64(), true),
+  field("schema_name", utf8(), true),
+]);
+
+// Origin: TableFunctionCardinalityRequest
+export const TableFunctionCardinalityRequestSchema = schema([
+  field("bind_call", binary(), false),
+  field("bind_opaque_data", binary(), true),
+]);
+
+// Origin: TableFunctionPlanRequest
+export const TableFunctionPlanRequestSchema = schema([
+  field("bind_call", binary(), false),
+  field("bind_opaque_data", binary(), true),
+  field("projection_ids", list(field("item", int64(), true)), true),
+  field("pushdown_filters", largeBinary(), true),
+  field("join_keys", list(field("item", largeBinary(), true)), true),
+  field("row_limit", int64(), true),
+  field("target_split_bytes", int64(), true),
+  field("min_splits", int64(), true),
+  field("max_splits_per_response", int64(), true),
+  field("cursor", binary(), true),
+  field("refined_filters", largeBinary(), true),
+  field("filters_complete", bool(), false),
+  field("start_position", binary(), true),
+  field("end_position", binary(), true),
+  field("order_by_column_name", utf8(), true),
+  field("order_by_direction", dictionary(utf8(), int16()), true),
+  field("order_by_null_order", dictionary(utf8(), int16()), true),
+  field("order_by_limit", int64(), true),
+  field("tablesample_percentage", float64(), true),
+  field("tablesample_seed", int64(), true),
+]);
+
 // Origin: method 'aggregate_bind' result
 export const AggregateBindResultSchema = schema([
   field("output_schema", binary(), false),
@@ -244,7 +445,7 @@ export const AggregateWindowInitResultSchema = schema([]);
 // Origin: method 'bind' result
 export const BindResultSchema = schema([
   field("output_schema", binary(), false),
-  field("opaque_data", binary(), false),
+  field("opaque_data", binary(), true),
   field("lookup_secret_types", list(field("item", utf8(), true)), false),
   field("lookup_scopes", list(field("item", utf8(), true)), false),
   field("lookup_names", list(field("item", utf8(), true)), false),
@@ -371,6 +572,26 @@ export const TableFunctionDynamicToStringResultSchema = schema([
   field("values", list(field("item", utf8(), true)), false),
 ]);
 
+// Origin: method 'table_function_plan' result
+export const TableFunctionPlanResultSchema = schema([
+  field("splits", list(field("item", binary(), true)), false),
+  field("next_cursors", list(field("item", binary(), true)), true),
+  field("execution_id", binary(), true),
+  field("init_opaque_data", binary(), true),
+  field("max_workers", int64(), true),
+  field("estimated_total_splits", int64(), true),
+  field("estimated_total_rows", int64(), true),
+  field("estimated_total_bytes", int64(), true),
+  field("catalog_version", int64(), true),
+  field("scope", utf8(), false),
+  field("locations", list(field("item", utf8(), true)), true),
+  field("partitioning", list(field("item", binary(), true)), true),
+  field("sort_order", list(field("item", binary(), true)), true),
+  field("cache_max_age_seconds", int64(), true),
+  field("start_position", binary(), true),
+  field("end_position", binary(), true),
+]);
+
 // Origin: method 'aggregate_bind' params
 export const AggregateBindParamsSchema = schema([
   field("request", binary(), false),
@@ -875,6 +1096,11 @@ export const TableFunctionDynamicToStringParamsSchema = schema([
   field("request", binary(), false),
 ]);
 
+// Origin: method 'table_function_plan' params
+export const TableFunctionPlanParamsSchema = schema([
+  field("request", binary(), false),
+]);
+
 // Origin: method 'table_function_statistics' params
 export const TableFunctionStatisticsParamsSchema = schema([
   field("request", binary(), false),

package/src/http/fetch.ts

@@ -10,10 +10,20 @@
 // `buildVgiProtocol` as `signingKey`, from one source. Passing different keys to
 // those two seams produces a worker that mints tokens it cannot recover.
 
-import { createHttpHandler, unpackStateToken, type Protocol } from "@query-farm/vgi-rpc";
+import {
+  AuthContext,
+  createHttpHandler,
+  unpackStateToken,
+  type AuthenticateFn,
+  type DispatchHook,
+  type DispatchInfo,
+  type HookToken,
+  type Protocol,
+} from "@query-farm/vgi-rpc";
 import { arrowStateSerializer } from "../protocol/state-serializer.js";
 import { buildVgiProtocol, type ProtocolConfig } from "../protocol/dispatch.js";
 import { createLandingRoutes, type LandingInfo } from "./landing.js";
+import { setRequestAuthScope, type RequestAuthHolder } from "../request-auth.js";
 
 export interface VgiFetchOptions {
   /** Wire-protocol config (registry + catalogInterface). */
@@ -57,8 +67,100 @@ export interface VgiFetchOptions {
    *  its required name/doc/version; the CF entry had to remember, and
    *  vgi-open-meteo shipped for weeks without it. */
   landingInfo: LandingInfo;
+  /** Authenticates each incoming request, returning the caller's
+   *  {@link AuthContext}. Forwarded verbatim to `createHttpHandler`; omit it
+   *  and every caller is anonymous, which is what this package did before the
+   *  option existed.
+   *
+   *  Supplying it is what makes a worker able to serve more than one principal,
+   *  and the identity it returns is the one the worker seals `attach_opaque_data`
+   *  and split tokens under. */
+  authenticate?: AuthenticateFn;
+}
+
+// ---------------------------------------------------------------------------
+// Request-scoped caller identity
+//
+// `@query-farm/vgi-rpc` types stream initialization as `(params) => state` —
+// no CallContext — on both dispatchers, so the `init` handler cannot be handed
+// the principal as an argument the way every unary handler is. But `init` is
+// exactly where the identity-bound envelopes minted by `catalog_attach` and
+// `table_function_plan` (both unary, both sealed under the REAL caller) are
+// opened. Opening them under the anonymous identity works for anonymous
+// callers and fails for everyone else.
+//
+// So the identity travels the way vgi-python's `current_auth()` ContextVar
+// does: an ambient per-request scope. `AsyncLocalStorage.run` wraps the whole
+// handler call, and a dispatch hook fills the holder in with whatever identity
+// the framework actually dispatched under — the hook is read AFTER
+// authentication, the PKCE cookie chain and bearer introspection have all had
+// their say, so it reports the final principal rather than re-deriving one.
+//
+// A mutable holder rather than `enterWith`: `run` is the only form Cloudflare
+// Workers supports, and the identity is not known until authentication has run
+// inside the handler.
+// ---------------------------------------------------------------------------
+
+/** The `AsyncLocalStorage` surface used here, structurally typed so this file
+ *  compiles where `node:async_hooks` has no types. */
+interface AsyncLocalStorageLike<T> {
+  run<R>(store: T, fn: () => R): R;
+  getStore(): T | undefined;
 }
 
+let requestAuthStorage: AsyncLocalStorageLike<RequestAuthHolder> | null | undefined;
+let requestAuthStoragePending: Promise<AsyncLocalStorageLike<RequestAuthHolder> | null> | undefined;
+
+/**
+ * Resolve (once) the AsyncLocalStorage this process scopes requests with.
+ *
+ * `node:async_hooks` is loaded dynamically and defensively: it exists on Node
+ * and Bun, and on Cloudflare Workers only with the `nodejs_compat` /
+ * `nodejs_als` compatibility flag. Where it is missing this resolves to `null`
+ * and the worker keeps serving exactly as it did before — anonymous callers
+ * unaffected, authenticated ones still unable to open their sealed attach.
+ * Degrading is the right failure here: refusing to start would break every
+ * anonymous deployment to fix a case it does not have.
+ */
+function ensureRequestAuthStorage(): Promise<AsyncLocalStorageLike<RequestAuthHolder> | null> {
+  if (requestAuthStorage !== undefined) return Promise.resolve(requestAuthStorage);
+  requestAuthStoragePending ??= import("node:async_hooks")
+    .then((mod) => {
+      const storage = new mod.AsyncLocalStorage<RequestAuthHolder>() as AsyncLocalStorageLike<RequestAuthHolder>;
+      requestAuthStorage = storage;
+      setRequestAuthScope(storage);
+      return storage;
+    })
+    .catch(() => {
+      requestAuthStorage = null;
+      return null;
+    });
+  return requestAuthStoragePending;
+}
+
+/**
+ * Dispatch hook that records the dispatching principal on the open scope.
+ *
+ * Reads the identity off `DispatchInfo`, which the framework populates from the
+ * resolved auth context for every method — so this sees the same principal the
+ * access log and the unary handlers see, without this package having to know
+ * how authentication was configured.
+ */
+const REQUEST_AUTH_DISPATCH_HOOK: DispatchHook = {
+  onDispatchStart(info: DispatchInfo): HookToken {
+    const holder = requestAuthStorage?.getStore();
+    if (holder) {
+      holder.auth = info.authenticated
+        ? new AuthContext(info.authDomain ?? "", true, info.principal ?? "", info.claims ?? {})
+        : AuthContext.anonymous();
+    }
+    return undefined;
+  },
+  onDispatchEnd() {
+    // Nothing to record; the scope ends when the request does.
+  },
+};
+
 /**
  * Build a fetch handler suitable for `export default { fetch }` in a CF
  * Worker module, or for `Bun.serve({ fetch })`. The returned handler is
@@ -100,6 +202,11 @@ export function createVgiFetch(opts: VgiFetchOptions): (req: Request) => Promise
     tokenKey: opts.signingKey,
     tokenTtl,
     stateSerializer: arrowStateSerializer,
+    // Records the dispatching principal on the request scope opened below, so
+    // stream `init` — the one handler the framework passes no CallContext to —
+    // can still open the identity-bound attach and split envelopes.
+    dispatchHook: REQUEST_AUTH_DISPATCH_HOOK,
+    authenticate: opts.authenticate,
     // `null` is the explicit opt-out; `undefined` (omitted) means "*".
     corsOrigins: opts.corsOrigins === null ? undefined : (opts.corsOrigins ?? "*"),
     repositoryUrl: opts.repositoryUrl,
@@ -110,5 +217,13 @@ export function createVgiFetch(opts: VgiFetchOptions): (req: Request) => Promise
     extraRoutes: createLandingRoutes(opts.landingInfo),
     enableLandingPage: false,
   });
-  return async (req: Request) => handler(req);
+  return async (req: Request) => {
+    const storage = await ensureRequestAuthStorage();
+    // No AsyncLocalStorage on this host: serve exactly as before.
+    if (!storage) return handler(req);
+    // One holder per request. The dispatch hook fills it in once the framework
+    // has resolved the principal; `init` reads it back through
+    // `currentRequestAuth()`.
+    return storage.run({}, () => handler(req));
+  };
 }

package/src/index.core.ts

@@ -77,7 +77,7 @@ export {
 export type { VgiFunction, FunctionMeta, StreamHandlers, FunctionExample, HandlerState } from "./functions/types.js";
 
 // Catalog
-export { CatalogInterface, type CatalogAttachResult, type SchemaInfo, encodeSchemaInfo, decodeSchemaInfo, type TableInfo, encodeTableInfo, decodeTableInfo, type ViewInfo, encodeViewInfo, decodeViewInfo, type CatalogInfo, encodeCatalogInfo, decodeCatalogInfo, type FunctionInfo, encodeFunctionInfo, decodeFunctionInfo, type FunctionInfoOptions, type MacroInfo, encodeMacroInfo, decodeMacroInfo, type MacroType, type CopyFromFormatInfo, encodeCopyFromFormatInfo, type AttachOpaqueData, type TransactionOpaqueData, buildScanBranchesResult, type ScanBranchInput } from "./catalog/interface.js";
+export { CatalogInterface, type CatalogAttachResult, type SchemaInfo, encodeSchemaInfo, decodeSchemaInfo, type TableInfo, encodeTableInfo, decodeTableInfo, type ViewInfo, encodeViewInfo, decodeViewInfo, type CatalogInfo, encodeCatalogInfo, decodeCatalogInfo, type FunctionInfo, encodeFunctionInfo, decodeFunctionInfo, type FunctionInfoOptions, type MacroInfo, encodeMacroInfo, decodeMacroInfo, type MacroType, type CopyFromFormatInfo, encodeCopyFromFormatInfo, type AttachOpaqueData, type TransactionOpaqueData, buildScanBranchesResult, encodeFormatOptions, type ScanBranchInput } from "./catalog/interface.js";
 export type { CatalogDescriptor, SchemaDescriptor, TableDescriptor, ViewDescriptor, MacroDescriptor, SettingDescriptor, SecretTypeDescriptor, ForeignKeyDef, DefaultValue } from "./catalog/descriptors.js";
 export { ReadOnlyCatalogInterface } from "./catalog/read-only.js";
 export { CompositeCatalogInterface } from "./catalog/composite.js";
@@ -219,7 +219,7 @@ export {
   int8, int16, int64,
   uint8, uint16, uint32, uint64,
   float16, float64,
-  utf8, binary, fixedSizeBinary,
+  utf8, largeUtf8, binary, largeBinary, fixedSizeBinary,
   decimal, decimal128, decimal256,
   date, dateDay, dateMillisecond,
   time, timeSecond, timeMillisecond, timeMicrosecond, timeNanosecond,

package/src/protocol/handlers/aggregate.ts

@@ -20,8 +20,13 @@ import { deserializeArguments } from "../serialize.js";
 import { deserializeSchema, serializeSchema, batchToSecretDict } from "../../util/arrow/index.js";
 import { toUint8Array } from "../../util/bytes.js";
 import {
+  AggregateBindParamsSchema,
   AggregateBindResultSchema,
+  AggregateCombineParamsSchema,
+  AggregateDestructorParamsSchema,
+  AggregateFinalizeParamsSchema,
   AggregateFinalizeResultSchema,
+  AggregateUpdateParamsSchema,
 } from "../../generated/vgi-protocol-schemas.js";
 import {
   getExecutionState,
@@ -65,7 +70,7 @@ export function registerAggregateMethods(protocol: Protocol, registry: FunctionR
   // aggregate_bind — allocate execution_id, return output schema
   // ------------------------------------------------------------------------
   protocol.unary("aggregate_bind", {
-    params: REQUEST_PARAMS_SCHEMA,
+    params: AggregateBindParamsSchema,
     result: RESULT_BINARY_SCHEMA,
     handler: async (params) => {
       const innerParams = unwrapRequest(params.request);
@@ -115,7 +120,7 @@ export function registerAggregateMethods(protocol: Protocol, registry: FunctionR
   // aggregate_update — fold the incoming batch into per-group state
   // ------------------------------------------------------------------------
   protocol.unary("aggregate_update", {
-    params: REQUEST_PARAMS_SCHEMA,
+    params: AggregateUpdateParamsSchema,
     result: RESULT_BINARY_SCHEMA,
     handler: (params) => {
       const innerParams = unwrapRequest(params.request);
@@ -182,7 +187,7 @@ export function registerAggregateMethods(protocol: Protocol, registry: FunctionR
   // aggregate_combine — merge (source_group_id, target_group_id) pairs
   // ------------------------------------------------------------------------
   protocol.unary("aggregate_combine", {
-    params: REQUEST_PARAMS_SCHEMA,
+    params: AggregateCombineParamsSchema,
     result: RESULT_BINARY_SCHEMA,
     handler: (params) => {
       const innerParams = unwrapRequest(params.request);
@@ -231,7 +236,7 @@ export function registerAggregateMethods(protocol: Protocol, registry: FunctionR
   // aggregate_finalize — emit one result row per requested group_id
   // ------------------------------------------------------------------------
   protocol.unary("aggregate_finalize", {
-    params: REQUEST_PARAMS_SCHEMA,
+    params: AggregateFinalizeParamsSchema,
     result: RESULT_BINARY_SCHEMA,
     handler: (params) => {
       const innerParams = unwrapRequest(params.request);
@@ -281,7 +286,7 @@ export function registerAggregateMethods(protocol: Protocol, registry: FunctionR
   // up when the worker process exits).
   // ------------------------------------------------------------------------
   protocol.unary("aggregate_destructor", {
-    params: REQUEST_PARAMS_SCHEMA,
+    params: AggregateDestructorParamsSchema,
     result: RESULT_BINARY_SCHEMA,
     handler: (params) => {
       const innerParams = unwrapRequest(params.request);