@query-farm/vgi 0.29.0 → 0.29.1

package/dist/serve-entry.js

@@ -1,28 +1,5 @@
 // @bun
 var __defProp = Object.defineProperty;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-function __accessProp(key) {
-  return this[key];
-}
-var __toCommonJS = (from) => {
-  var entry = (__moduleCache ??= new WeakMap).get(from), desc;
-  if (entry)
-    return entry;
-  entry = __defProp({}, "__esModule", { value: true });
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (var key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(entry, key))
-        __defProp(entry, key, {
-          get: __accessProp.bind(from, key),
-          enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
-        });
-  }
-  __moduleCache.set(from, entry);
-  return entry;
-};
-var __moduleCache;
 var __returnValue = (v) => v;
 function __exportSetter(name, newValue) {
   this[name] = __returnValue.bind(null, newValue);
@@ -36,15 +13,19 @@ var __export = (target, all) => {
       set: __exportSetter.bind(all, name)
     });
 };
-var __esm = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
-var __require = import.meta.require;
+var __esm = (fn, res, err) => () => {
+  if (fn)
+    try {
+      res = fn(fn = 0);
+    } catch (e) {
+      err = [e];
+    }
+  if (err)
+    throw err[0];
+  return res;
+};
 
 // src/functions/storage-cf-do.ts
-var exports_storage_cf_do = {};
-__export(exports_storage_cf_do, {
-  FunctionStorageCfDo: () => FunctionStorageCfDo
-});
-
 class FunctionStorageCfDo {
   _baseUrl;
   _token;
@@ -185,8 +166,8 @@ class FunctionStorageCfDo {
       let resp;
       try {
         resp = await this._fetch(url, { method: "POST", headers, body: payload });
-      } catch (err2) {
-        lastErr = err2;
+      } catch (err) {
+        lastErr = err;
         continue;
       }
       let data;
@@ -231,16 +212,16 @@ function int64FromKey(b) {
   return Number(new DataView(b.buffer, b.byteOffset, 8).getBigInt64(0, false));
 }
 function bytesToB64(buf) {
-  let binary3 = "";
+  let binary = "";
   for (let i = 0;i < buf.length; i++)
-    binary3 += String.fromCharCode(buf[i]);
-  return btoa(binary3);
+    binary += String.fromCharCode(buf[i]);
+  return btoa(binary);
 }
 function b64ToBytes(b64) {
-  const binary3 = atob(b64);
-  const out = new Uint8Array(binary3.length);
-  for (let i = 0;i < binary3.length; i++)
-    out[i] = binary3.charCodeAt(i);
+  const binary = atob(b64);
+  const out = new Uint8Array(binary.length);
+  for (let i = 0;i < binary.length; i++)
+    out[i] = binary.charCodeAt(i);
   return out;
 }
 var NS_WORKER;
@@ -482,18 +463,18 @@ class BoundStorage {
   }
 }
 function resolveStorageFromEnv() {
-  const backend2 = (process.env.VGI_WORKER_SHARED_STORAGE ?? "sqlite").toLowerCase();
-  if (backend2 === "memory") {
+  const backend = (process.env.VGI_WORKER_SHARED_STORAGE ?? "sqlite").toLowerCase();
+  if (backend === "memory") {
     return new FunctionStorageSqlite(":memory:");
   }
-  if (backend2 === "sqlite") {
+  if (backend === "sqlite") {
     return new FunctionStorageSqlite;
   }
-  if (backend2 === "cloudflare-do") {
-    const { FunctionStorageCfDo: FunctionStorageCfDo2 } = (init_storage_cf_do(), __toCommonJS(exports_storage_cf_do));
-    return FunctionStorageCfDo2.fromEnv();
+  if (backend === "cloudflare-do") {
+    init_storage_cf_do();
+    return FunctionStorageCfDo.fromEnv();
   }
-  throw new Error(`Unknown VGI_WORKER_SHARED_STORAGE backend: '${backend2}'. Supported: 'memory', 'sqlite', 'cloudflare-do'.`);
+  throw new Error(`Unknown VGI_WORKER_SHARED_STORAGE backend: '${backend}'. Supported: 'memory', 'sqlite', 'cloudflare-do'.`);
 }
 function getDefaultStorage() {
   if (_resolved == null)
@@ -531,6 +512,14 @@ var init_storage = __esm(() => {
   });
 });
 
+// src/serve-entry.ts
+import {
+  irohForwardedHeaderIdentityProvider,
+  IROH_FORWARDED_ENDPOINT_HEADER,
+  observePeerIdentity,
+  peerIdentityPrimary
+} from "@query-farm/vgi-rpc";
+
 // src/http/fetch.ts
 import {
   AuthContext,
@@ -840,8 +829,8 @@ import {
   DataType,
   makeData
 } from "@query-farm/apache-arrow";
-function emptyData(field2) {
-  const type = field2.type;
+function emptyData(field) {
+  const type = field.type;
   if (DataType.isList(type)) {
     const childField = type.children[0];
     return makeData({
@@ -868,8 +857,8 @@ function emptyData(field2) {
   }
   return makeData({ type, length: 0, nullCount: 0 });
 }
-function emptyBatch(schema2) {
-  const a = schema2;
+function emptyBatch(schema) {
+  const a = schema;
   const children = a.fields.map((f) => emptyData(f));
   const structType = new Struct(a.fields);
   const data = makeData({
@@ -1876,8 +1865,8 @@ function readUnion(type, col, data, index) {
   const children = type.children;
   const typeIds = data?.typeIds;
   const tcode = typeIds ? typeIds[index] : children.length > 0 ? 0 : -1;
-  const map2 = type.typeIdToChildIndex;
-  const childIdx = map2 && map2[tcode] !== undefined ? map2[tcode] : tcode;
+  const map = type.typeIdToChildIndex;
+  const childIdx = map && map[tcode] !== undefined ? map[tcode] : tcode;
   const childField = children[childIdx];
   if (!childField)
     return { tag: null, value: null };
@@ -1939,19 +1928,19 @@ function readDictionary(type, col, data, index) {
 function columnFromArray(values, type) {
   return vectorFromArray2(values, type).data[0];
 }
-function batchFromRows(rows, schema2) {
-  const a = schema2;
+function batchFromRows(rows, schema) {
+  const a = schema;
   if (rows.length === 0) {
     return emptyBatch(a);
   }
   const columns = {};
-  for (const field2 of a.fields) {
-    columns[field2.name] = rows.map((r) => r[field2.name] ?? null);
+  for (const field of a.fields) {
+    columns[field.name] = rows.map((r) => r[field.name] ?? null);
   }
   return batchFromColumns(columns, a);
 }
-function batchFromColumns(columns, schema2, repr = "rich") {
-  const a = schema2;
+function batchFromColumns(columns, schema, repr = "rich") {
+  const a = schema;
   const numRows = a.fields.length > 0 ? columns[a.fields[0].name]?.length ?? 0 : 0;
   const children = a.fields.map((f) => {
     const values = columns[f.name];
@@ -1979,15 +1968,15 @@ function* iterRows(batch, repr = "rich") {
   for (let i = 0;i < a.numRows; i++) {
     const row = {};
     for (let fi = 0;fi < a.schema.fields.length; fi++) {
-      const field2 = a.schema.fields[fi];
-      const col = a.getChild(field2.name);
+      const field = a.schema.fields[fi];
+      const col = a.getChild(field.name);
       if (!col) {
-        row[field2.name] = null;
+        row[field.name] = null;
         continue;
       }
-      const canonical = readCanonicalValue(field2.type, col, i);
+      const canonical = readCanonicalValue(field.type, col, i);
       const codec = codecs[fi];
-      row[field2.name] = repr === "raw" ? codec.canonicalToRaw(canonical) : codec.canonicalToRich(canonical);
+      row[field.name] = repr === "raw" ? codec.canonicalToRaw(canonical) : codec.canonicalToRich(canonical);
     }
     yield row;
   }
@@ -1999,12 +1988,12 @@ function batchToScalarDict(batch) {
   if (a.numRows === 0)
     return {};
   const result = {};
-  for (const field2 of a.schema.fields) {
-    const col = a.getChild(field2.name);
+  for (const field of a.schema.fields) {
+    const col = a.getChild(field.name);
     if (col) {
-      const type = field2.type;
+      const type = field.type;
       const canonical = readCanonicalValue(type, col, 0);
-      result[field2.name] = codecFor(type).canonicalToRich(canonical);
+      result[field.name] = codecFor(type).canonicalToRich(canonical);
     }
   }
   return result;
@@ -2030,18 +2019,18 @@ function batchToSecretDict(batch) {
   if (a.numRows === 0)
     return {};
   const result = {};
-  for (const field2 of a.schema.fields) {
-    const col = a.getChild(field2.name);
+  for (const field of a.schema.fields) {
+    const col = a.getChild(field.name);
     if (col) {
-      const type = field2.type;
+      const type = field.type;
       const val = codecFor(type).canonicalToRich(readCanonicalValue(type, col, 0));
-      let key = field2.name;
+      let key = field.name;
       let scope;
-      if (field2.name.startsWith("secret_")) {
-        const secretType = field2.metadata?.get?.("secret_type");
+      if (field.name.startsWith("secret_")) {
+        const secretType = field.metadata?.get?.("secret_type");
         if (secretType) {
           key = secretType;
-          scope = field2.metadata?.get?.("scope") ?? undefined;
+          scope = field.metadata?.get?.("scope") ?? undefined;
         }
       }
       if (val && typeof val === "object" && !ArrayBuffer.isView(val)) {
@@ -2090,11 +2079,11 @@ function filterBatch(batch, mask) {
       indices.push(i);
   }
   const columns = {};
-  for (const field2 of a.schema.fields) {
-    const col = a.getChild(field2.name);
-    const type = field2.type;
+  for (const field of a.schema.fields) {
+    const col = a.getChild(field.name);
+    const type = field.type;
     const codec = codecFor(type);
-    columns[field2.name] = indices.map((i) => codec.canonicalToRich(readCanonicalValue(type, col, i)));
+    columns[field.name] = indices.map((i) => codec.canonicalToRich(readCanonicalValue(type, col, i)));
   }
   return batchFromColumns(columns, a.schema);
 }
@@ -2116,8 +2105,8 @@ function validateProjectionIds(caller, projectionIds, fieldCount) {
   }
   return projectionIds.filter((i) => i >= 0 && i < fieldCount);
 }
-function projectSchema(projectionIds, schema2) {
-  const a = schema2;
+function projectSchema(projectionIds, schema) {
+  const a = schema;
   if (!projectionIds)
     return a;
   const validIds = validateProjectionIds("projectSchema", projectionIds, a.fields.length);
@@ -2158,9 +2147,9 @@ import {
   RecordBatchStreamWriter,
   RecordBatchReader
 } from "@query-farm/apache-arrow";
-function serializeSchema(schema2) {
+function serializeSchema(schema) {
   const writer = new RecordBatchStreamWriter;
-  writer.reset(undefined, schema2);
+  writer.reset(undefined, schema);
   writer.close();
   return writer.toUint8Array(true);
 }
@@ -2228,20 +2217,20 @@ function buildTypedColumnData(values, type) {
 function buildStatisticsBatch(stats) {
   if (stats.length === 0) {
     const nullField = new Field3("0", new Null, true);
-    const unionType2 = new SparseUnion([0], [nullField]);
-    const minData2 = makeData5({
-      type: unionType2,
+    const unionType = new SparseUnion([0], [nullField]);
+    const minData = makeData5({
+      type: unionType,
       length: 0,
       typeIds: new Int8Array(0),
       children: [makeData5({ type: new Null, length: 0, nullCount: 0 })]
     });
-    const maxData2 = makeData5({
-      type: unionType2,
+    const maxData = makeData5({
+      type: unionType,
       length: 0,
       typeIds: new Int8Array(0),
       children: [makeData5({ type: new Null, length: 0, nullCount: 0 })]
     });
-    return assemble([], minData2, maxData2, [], [], [], [], [], unionType2);
+    return assemble([], minData, maxData, [], [], [], [], [], unionType);
   }
   const typeOrder = [];
   const typeIdMap = new Map;
@@ -2285,7 +2274,7 @@ function buildStatisticsBatch(stats) {
   return assemble(stats.map((s) => s.columnName), minData, maxData, stats.map((s) => s.hasNull), stats.map((s) => s.hasNotNull), stats.map((s) => s.distinctCount == null ? null : BigInt(s.distinctCount)), stats.map((s) => s.containsUnicode), stats.map((s) => s.maxStringLength == null ? null : BigInt(s.maxStringLength)), unionType);
 }
 function assemble(columnNames, minData, maxData, hasNull, hasNotNull, distinctCount, containsUnicode, maxStringLength, unionType) {
-  const schema2 = new Schema5([
+  const schema = new Schema5([
     new Field3("column_name", new Utf8, false),
     new Field3("min", unionType, true),
     new Field3("max", unionType, true),
@@ -2306,9 +2295,9 @@ function assemble(columnNames, minData, maxData, hasNull, hasNotNull, distinctCo
     buildTypedColumnData(containsUnicode, new Bool),
     buildTypedColumnData(maxStringLength, new Uint64)
   ];
-  const structType = new Struct5(schema2.fields);
+  const structType = new Struct5(schema.fields);
   const data = makeData5({ type: structType, length: n, children, nullCount: 0 });
-  return new RecordBatch6(schema2, data);
+  return new RecordBatch6(schema, data);
 }
 
 // src/arrow/impl-arrowjs/index.ts
@@ -2326,6 +2315,7 @@ var bool2 = () => bool();
 var int162 = () => int16();
 var int322 = () => int32();
 var int642 = () => int64();
+var uint642 = () => uint64();
 var float642 = () => float64();
 var utf82 = () => utf8();
 var binary2 = () => binary();
@@ -2680,7 +2670,8 @@ var BIND_REQUEST_SCHEMA = schema2([
   field2("at_value", utf82(), true),
   field2("copy_from", COPY_FROM_STRUCT_TYPE, true),
   field2("copy_to", COPY_TO_STRUCT_TYPE, true),
-  field2("schema_name", utf82(), true)
+  field2("schema_path", list2(field2("item", utf82(), true)), true),
+  field2("argument_names", list2(field2("item", utf82(), true)), true)
 ]);
 function parseCopyFromContext(raw) {
   if (raw == null)
@@ -2732,7 +2723,8 @@ function deserializeBindRequest(params) {
     resolved_secrets_provided: params.resolved_secrets_provided ?? false,
     at_unit: params.at_unit ? String(params.at_unit) : null,
     at_value: params.at_value ? String(params.at_value) : null,
-    schema_name: params.schema_name ? String(params.schema_name) : null,
+    schema_path: params.schema_path ? (Array.isArray(params.schema_path) ? params.schema_path : [...params.schema_path]).map(String) : null,
+    argument_names: params.argument_names ? (Array.isArray(params.argument_names) ? params.argument_names : [...params.argument_names]).map((value) => value == null ? null : String(value)) : null,
     copy_from: parseCopyFromContext(params.copy_from),
     copy_to: parseCopyToContext(params.copy_to)
   };
@@ -2936,14 +2928,14 @@ var SchemaInfoSchema = schema2([
   field2("comment", utf82(), true),
   field2("tags", map2(field2("key", utf82(), false), field2("value", utf82(), true), false), false),
   field2("attach_opaque_data", binary2(), false),
-  field2("name", utf82(), false),
+  field2("path", list2(field2("item", utf82(), true)), false),
   field2("estimated_object_count", map2(field2("key", utf82(), false), field2("value", int642(), true), false), true)
 ]);
 var TableInfoSchema = schema2([
   field2("comment", utf82(), true),
   field2("tags", map2(field2("key", utf82(), false), field2("value", utf82(), true), false), false),
   field2("name", utf82(), false),
-  field2("schema_name", utf82(), false),
+  field2("schema_path", list2(field2("item", utf82(), true)), false),
   field2("columns", binary2(), false),
   field2("not_null_constraints", list2(field2("item", int322(), true)), false),
   field2("unique_constraints", list2(field2("item", list2(field2("item", int322(), true)), true)), false),
@@ -2969,7 +2961,7 @@ var ViewInfoSchema = schema2([
   field2("comment", utf82(), true),
   field2("tags", map2(field2("key", utf82(), false), field2("value", utf82(), true), false), false),
   field2("name", utf82(), false),
-  field2("schema_name", utf82(), false),
+  field2("schema_path", list2(field2("item", utf82(), true)), false),
   field2("definition", utf82(), false),
   field2("column_comments", map2(field2("key", utf82(), false), field2("value", utf82(), true), false), false)
 ]);
@@ -2977,12 +2969,14 @@ var FunctionInfoSchema = schema2([
   field2("comment", utf82(), true),
   field2("tags", map2(field2("key", utf82(), false), field2("value", utf82(), true), false), false),
   field2("name", utf82(), false),
-  field2("schema_name", utf82(), false),
+  field2("schema_path", list2(field2("item", utf82(), true)), false),
   field2("function_type", dictionary2(utf82(), int162()), false),
   field2("arguments", binary2(), false),
   field2("output_schema", binary2(), false),
+  field2("parameter_default_values", binary2(), true),
   field2("stability", dictionary2(utf82(), int162()), true),
   field2("null_handling", dictionary2(utf82(), int162()), true),
+  field2("argument_monotonicity", list2(field2("item", utf82(), true)), true),
   field2("description", utf82(), false),
   field2("examples", list2(field2("item", struct2([field2("sql", utf82(), false), field2("description", utf82(), false), field2("expected_output", utf82(), true)]), true)), false),
   field2("categories", list2(field2("item", utf82(), true)), false),
@@ -2990,7 +2984,10 @@ var FunctionInfoSchema = schema2([
   field2("filter_pushdown", bool2(), true),
   field2("sampling_pushdown", bool2(), true),
   field2("late_materialization", bool2(), true),
-  field2("supported_expression_filters", list2(field2("item", utf82(), true)), false),
+  field2("filter_semantic_profiles", list2(field2("item", utf82(), true)), false),
+  field2("additional_filter_functions", list2(field2("item", struct2([field2("namespace", utf82(), false), field2("name", utf82(), false), field2("version", uint642(), false)]), true)), false),
+  field2("runtime_filter_algorithms", list2(field2("item", struct2([field2("namespace", utf82(), false), field2("name", utf82(), false), field2("version", uint642(), false)]), true)), false),
+  field2("filter_evaluation_contexts", list2(field2("item", struct2([field2("profile", utf82(), false), field2("provider_fingerprint", utf82(), true)]), true)), false),
   field2("order_preservation", dictionary2(utf82(), int162()), true),
   field2("max_workers", int322(), true),
   field2("supports_batch_index", bool2(), false),
@@ -3015,7 +3012,7 @@ var MacroInfoSchema = schema2([
   field2("comment", utf82(), true),
   field2("tags", map2(field2("key", utf82(), false), field2("value", utf82(), true), false), false),
   field2("name", utf82(), false),
-  field2("schema_name", utf82(), false),
+  field2("schema_path", list2(field2("item", utf82(), true)), false),
   field2("macro_type", dictionary2(utf82(), int162()), false),
   field2("parameters", list2(field2("item", utf82(), true)), false),
   field2("parameter_default_values", binary2(), true),
@@ -3026,7 +3023,7 @@ var IndexInfoSchema = schema2([
   field2("comment", utf82(), true),
   field2("tags", map2(field2("key", utf82(), false), field2("value", utf82(), true), false), false),
   field2("name", utf82(), false),
-  field2("schema_name", utf82(), false),
+  field2("schema_path", list2(field2("item", utf82(), true)), false),
   field2("table_name", utf82(), false),
   field2("index_type", utf82(), false),
   field2("constraint_type", dictionary2(utf82(), int162()), false),
@@ -3046,7 +3043,8 @@ var CopyFromFormatInfoSchema = schema2([
 var ScanFunctionResultSchema = schema2([
   field2("function_name", utf82(), false),
   field2("arguments", binary2(), false),
-  field2("required_extensions", list2(field2("item", utf82(), true)), false)
+  field2("required_extensions", list2(field2("item", utf82(), true)), false),
+  field2("schema_path", list2(field2("item", utf82(), true)), true)
 ]);
 var ScanBranchesResultSchema = schema2([
   field2("branches", list2(field2("item", binary2(), true)), false),
@@ -3058,11 +3056,12 @@ var ScanBranchSchema = schema2([
   field2("branch_filter", utf82(), true),
   field2("writable", bool2(), false),
   field2("source_catalog", utf82(), true),
-  field2("source_schema", utf82(), true),
+  field2("source_schema_path", list2(field2("item", utf82(), true)), true),
   field2("source_table", utf82(), true),
   field2("format_name", utf82(), true),
   field2("format_locations", list2(field2("item", utf82(), true)), true),
-  field2("format_options", binary2(), true)
+  field2("format_options", binary2(), true),
+  field2("schema_path", list2(field2("item", utf82(), true)), true)
 ]);
 var ScanSplitSchema = schema2([
   field2("payload", binary2(), false),
@@ -3085,6 +3084,12 @@ var AttachCatalogInfoSchema = schema2([
   field2("required", bool2(), false),
   field2("secret_ref", utf82(), false)
 ]);
+var ForeignKeyInfoSchema = schema2([
+  field2("fk_columns", list2(field2("item", utf82(), true)), false),
+  field2("pk_columns", list2(field2("item", utf82(), true)), false),
+  field2("referenced_table", utf82(), false),
+  field2("referenced_schema_path", list2(field2("item", utf82(), true)), false)
+]);
 var AggregateBindRequestSchema = schema2([
   field2("function_name", utf82(), false),
   field2("arguments", binary2(), false),
@@ -3092,21 +3097,22 @@ var AggregateBindRequestSchema = schema2([
   field2("settings", binary2(), true),
   field2("secrets", binary2(), true),
   field2("attach_opaque_data", binary2(), true),
-  field2("schema_name", utf82(), true)
+  field2("schema_path", list2(field2("item", utf82(), true)), true),
+  field2("argument_names", list2(field2("item", utf82(), true)), true)
 ]);
 var AggregateCombineRequestSchema = schema2([
   field2("function_name", utf82(), false),
   field2("execution_id", binary2(), false),
   field2("merge_batch", binary2(), false),
   field2("attach_opaque_data", binary2(), true),
-  field2("schema_name", utf82(), true)
+  field2("schema_path", list2(field2("item", utf82(), true)), true)
 ]);
 var AggregateDestructorRequestSchema = schema2([
   field2("function_name", utf82(), false),
   field2("execution_id", binary2(), false),
   field2("group_ids_batch", binary2(), false),
   field2("attach_opaque_data", binary2(), true),
-  field2("schema_name", utf82(), true)
+  field2("schema_path", list2(field2("item", utf82(), true)), true)
 ]);
 var AggregateFinalizeRequestSchema = schema2([
   field2("function_name", utf82(), false),
@@ -3114,14 +3120,81 @@ var AggregateFinalizeRequestSchema = schema2([
   field2("group_ids_batch", binary2(), false),
   field2("output_schema", binary2(), false),
   field2("attach_opaque_data", binary2(), true),
-  field2("schema_name", utf82(), true)
+  field2("schema_path", list2(field2("item", utf82(), true)), true)
+]);
+var AggregateStreamingChunkRequestSchema = schema2([
+  field2("function_name", utf82(), false),
+  field2("execution_id", binary2(), false),
+  field2("input_batch", binary2(), false),
+  field2("attach_opaque_data", binary2(), true),
+  field2("schema_path", list2(field2("item", utf82(), true)), true)
+]);
+var AggregateStreamingCloseRequestSchema = schema2([
+  field2("function_name", utf82(), false),
+  field2("execution_id", binary2(), false),
+  field2("attach_opaque_data", binary2(), true),
+  field2("schema_path", list2(field2("item", utf82(), true)), true)
+]);
+var AggregateStreamingOpenRequestSchema = schema2([
+  field2("function_name", utf82(), false),
+  field2("arguments", binary2(), false),
+  field2("input_schema", binary2(), false),
+  field2("partition_key_count", int642(), false),
+  field2("order_key_count", int642(), false),
+  field2("output_schema", binary2(), false),
+  field2("settings", binary2(), true),
+  field2("secrets", binary2(), true),
+  field2("attach_opaque_data", binary2(), true),
+  field2("schema_path", list2(field2("item", utf82(), true)), true)
 ]);
 var AggregateUpdateRequestSchema = schema2([
   field2("function_name", utf82(), false),
   field2("execution_id", binary2(), false),
   field2("input_batch", binary2(), false),
   field2("attach_opaque_data", binary2(), true),
-  field2("schema_name", utf82(), true)
+  field2("schema_path", list2(field2("item", utf82(), true)), true)
+]);
+var AggregateWindowBatchRequestSchema = schema2([
+  field2("function_name", utf82(), false),
+  field2("execution_id", binary2(), false),
+  field2("partition_id", int642(), false),
+  field2("row_idx", int642(), false),
+  field2("count", int642(), false),
+  field2("frames_per_row", list2(field2("item", int642(), true)), false),
+  field2("frame_starts", list2(field2("item", int642(), true)), false),
+  field2("frame_ends", list2(field2("item", int642(), true)), false),
+  field2("attach_opaque_data", binary2(), true),
+  field2("schema_path", list2(field2("item", utf82(), true)), true)
+]);
+var AggregateWindowDestructorRequestSchema = schema2([
+  field2("function_name", utf82(), false),
+  field2("execution_id", binary2(), false),
+  field2("partition_id", int642(), false),
+  field2("attach_opaque_data", binary2(), true),
+  field2("schema_path", list2(field2("item", utf82(), true)), true)
+]);
+var AggregateWindowInitRequestSchema = schema2([
+  field2("function_name", utf82(), false),
+  field2("execution_id", binary2(), false),
+  field2("partition_id", int642(), false),
+  field2("row_count", int642(), false),
+  field2("partition_batch", binary2(), false),
+  field2("output_schema", binary2(), false),
+  field2("filter_mask", binary2(), false),
+  field2("frame_stats", binary2(), false),
+  field2("all_valid", binary2(), false),
+  field2("attach_opaque_data", binary2(), true),
+  field2("schema_path", list2(field2("item", utf82(), true)), true)
+]);
+var AggregateWindowRequestSchema = schema2([
+  field2("function_name", utf82(), false),
+  field2("execution_id", binary2(), false),
+  field2("partition_id", int642(), false),
+  field2("rid", int642(), false),
+  field2("frame_starts", list2(field2("item", int642(), true)), false),
+  field2("frame_ends", list2(field2("item", int642(), true)), false),
+  field2("attach_opaque_data", binary2(), true),
+  field2("schema_path", list2(field2("item", utf82(), true)), true)
 ]);
 var BindRequestSchema = schema2([
   field2("function_name", utf82(), false),
@@ -3137,7 +3210,8 @@ var BindRequestSchema = schema2([
   field2("at_value", utf82(), true),
   field2("copy_from", struct2([field2("format", utf82(), false), field2("file_path", utf82(), false), field2("expected_schema", binary2(), false)]), true),
   field2("copy_to", struct2([field2("format", utf82(), false), field2("file_path", utf82(), false)]), true),
-  field2("schema_name", utf82(), true)
+  field2("schema_path", list2(field2("item", utf82(), true)), true),
+  field2("argument_names", list2(field2("item", utf82(), true)), true)
 ]);
 var CatalogAttachRequestSchema = schema2([
   field2("name", utf82(), false),
@@ -3146,6 +3220,18 @@ var CatalogAttachRequestSchema = schema2([
   field2("implementation_version", utf82(), true),
   field2("client_capabilities", binary2(), true)
 ]);
+var CatalogCreateRequestSchema = schema2([
+  field2("name", utf82(), false),
+  field2("on_conflict", dictionary2(utf82(), int162()), false),
+  field2("options", binary2(), true)
+]);
+var ClientCapabilitiesSchema = schema2([
+  field2("engine", utf82(), false),
+  field2("native_formats", list2(field2("item", utf82(), true)), false),
+  field2("catalogs", list2(field2("item", utf82(), true)), false),
+  field2("can_stream", bool2(), false),
+  field2("filter_encodings", list2(field2("item", utf82(), true)), false)
+]);
 var CopyFromContextSchema = schema2([
   field2("format", utf82(), false),
   field2("file_path", utf82(), false),
@@ -3160,6 +3246,18 @@ var GlobalInitResponseSchema = schema2([
   field2("opaque_data", binary2(), true),
   field2("max_workers", int642(), false)
 ]);
+var IndexCreateRequestSchema = schema2([
+  field2("attach_opaque_data", binary2(), false),
+  field2("schema_path", list2(field2("item", utf82(), true)), false),
+  field2("name", utf82(), false),
+  field2("table_name", utf82(), false),
+  field2("index_type", utf82(), false),
+  field2("constraint_type", dictionary2(utf82(), int162()), false),
+  field2("expressions", list2(field2("item", utf82(), true)), false),
+  field2("on_conflict", dictionary2(utf82(), int162()), false),
+  field2("options", map2(field2("key", utf82(), false), field2("value", utf82(), true), false), false),
+  field2("transaction_opaque_data", binary2(), true)
+]);
 var InitRequestSchema = schema2([
   field2("bind_call", binary2(), false),
   field2("output_schema", binary2(), false),
@@ -3181,20 +3279,45 @@ var InitRequestSchema = schema2([
   field2("tablesample_percentage", float642(), true),
   field2("tablesample_seed", int642(), true)
 ]);
+var MacroCreateRequestSchema = schema2([
+  field2("attach_opaque_data", binary2(), false),
+  field2("schema_path", list2(field2("item", utf82(), true)), false),
+  field2("name", utf82(), false),
+  field2("macro_type", dictionary2(utf82(), int162()), false),
+  field2("parameters", list2(field2("item", utf82(), true)), false),
+  field2("definition", utf82(), false),
+  field2("on_conflict", dictionary2(utf82(), int162()), false),
+  field2("parameter_default_values", binary2(), true),
+  field2("arguments_schema", binary2(), true),
+  field2("transaction_opaque_data", binary2(), true)
+]);
+var TableCreateRequestSchema = schema2([
+  field2("attach_opaque_data", binary2(), false),
+  field2("schema_path", list2(field2("item", utf82(), true)), false),
+  field2("name", utf82(), false),
+  field2("columns", binary2(), false),
+  field2("on_conflict", dictionary2(utf82(), int162()), false),
+  field2("not_null_constraints", list2(field2("item", int322(), true)), false),
+  field2("unique_constraints", list2(field2("item", list2(field2("item", int322(), true)), true)), false),
+  field2("check_constraints", list2(field2("item", utf82(), true)), false),
+  field2("primary_key_constraints", list2(field2("item", list2(field2("item", int322(), true)), true)), false),
+  field2("foreign_key_constraints", list2(field2("item", binary2(), true)), false),
+  field2("transaction_opaque_data", binary2(), true)
+]);
 var TableBufferingCombineRequestSchema = schema2([
   field2("function_name", utf82(), false),
   field2("execution_id", binary2(), false),
   field2("state_ids", list2(field2("item", binary2(), true)), false),
   field2("attach_opaque_data", binary2(), true),
   field2("transaction_id", binary2(), true),
-  field2("schema_name", utf82(), true)
+  field2("schema_path", list2(field2("item", utf82(), true)), true)
 ]);
 var TableBufferingDestructorRequestSchema = schema2([
   field2("function_name", utf82(), false),
   field2("execution_id", binary2(), false),
   field2("attach_opaque_data", binary2(), true),
   field2("transaction_id", binary2(), true),
-  field2("schema_name", utf82(), true)
+  field2("schema_path", list2(field2("item", utf82(), true)), true)
 ]);
 var TableBufferingProcessRequestSchema = schema2([
   field2("function_name", utf82(), false),
@@ -3203,12 +3326,17 @@ var TableBufferingProcessRequestSchema = schema2([
   field2("attach_opaque_data", binary2(), true),
   field2("transaction_id", binary2(), true),
   field2("batch_index", int642(), true),
-  field2("schema_name", utf82(), true)
+  field2("schema_path", list2(field2("item", utf82(), true)), true)
 ]);
 var TableFunctionCardinalityRequestSchema = schema2([
   field2("bind_call", binary2(), false),
   field2("bind_opaque_data", binary2(), true)
 ]);
+var TableFunctionDynamicToStringRequestSchema = schema2([
+  field2("bind_call", binary2(), false),
+  field2("bind_opaque_data", binary2(), true),
+  field2("global_execution_id", binary2(), false)
+]);
 var TableFunctionPlanRequestSchema = schema2([
   field2("bind_call", binary2(), false),
   field2("bind_opaque_data", binary2(), true),
@@ -3231,6 +3359,10 @@ var TableFunctionPlanRequestSchema = schema2([
   field2("tablesample_percentage", float642(), true),
   field2("tablesample_seed", int642(), true)
 ]);
+var TableFunctionStatisticsRequestSchema = schema2([
+  field2("bind_call", binary2(), false),
+  field2("bind_opaque_data", binary2(), true)
+]);
 var AggregateBindResultSchema = schema2([
   field2("output_schema", binary2(), false),
   field2("execution_id", binary2(), false)
@@ -3421,7 +3553,7 @@ var CatalogIndexCreateParamsSchema = schema2([
 ]);
 var CatalogIndexDropParamsSchema = schema2([
   field2("attach_opaque_data", binary2(), false),
-  field2("schema_name", utf82(), false),
+  field2("schema_path", list2(field2("item", utf82(), true)), false),
   field2("name", utf82(), false),
   field2("ignore_not_found", bool2(), false),
   field2("cascade", bool2(), false),
@@ -3429,7 +3561,7 @@ var CatalogIndexDropParamsSchema = schema2([
 ]);
 var CatalogIndexGetParamsSchema = schema2([
   field2("attach_opaque_data", binary2(), false),
-  field2("schema_name", utf82(), false),
+  field2("schema_path", list2(field2("item", utf82(), true)), false),
   field2("name", utf82(), false),
   field2("transaction_opaque_data", binary2(), true)
 ]);
@@ -3438,47 +3570,47 @@ var CatalogMacroCreateParamsSchema = schema2([
 ]);
 var CatalogMacroDropParamsSchema = schema2([
   field2("attach_opaque_data", binary2(), false),
-  field2("schema_name", utf82(), false),
+  field2("schema_path", list2(field2("item", utf82(), true)), false),
   field2("name", utf82(), false),
   field2("ignore_not_found", bool2(), false),
   field2("transaction_opaque_data", binary2(), true)
 ]);
 var CatalogMacroGetParamsSchema = schema2([
   field2("attach_opaque_data", binary2(), false),
-  field2("schema_name", utf82(), false),
+  field2("schema_path", list2(field2("item", utf82(), true)), false),
   field2("name", utf82(), false),
   field2("transaction_opaque_data", binary2(), true)
 ]);
 var CatalogSchemaContentsFunctionsParamsSchema = schema2([
   field2("attach_opaque_data", binary2(), false),
-  field2("name", utf82(), false),
+  field2("path", list2(field2("item", utf82(), true)), false),
   field2("type", dictionary2(utf82(), int162()), false),
   field2("transaction_opaque_data", binary2(), true)
 ]);
 var CatalogSchemaContentsIndexesParamsSchema = schema2([
   field2("attach_opaque_data", binary2(), false),
-  field2("name", utf82(), false),
+  field2("path", list2(field2("item", utf82(), true)), false),
   field2("transaction_opaque_data", binary2(), true)
 ]);
 var CatalogSchemaContentsMacrosParamsSchema = schema2([
   field2("attach_opaque_data", binary2(), false),
-  field2("name", utf82(), false),
+  field2("path", list2(field2("item", utf82(), true)), false),
   field2("type", dictionary2(utf82(), int162()), false),
   field2("transaction_opaque_data", binary2(), true)
 ]);
 var CatalogSchemaContentsTablesParamsSchema = schema2([
   field2("attach_opaque_data", binary2(), false),
-  field2("name", utf82(), false),
+  field2("path", list2(field2("item", utf82(), true)), false),
   field2("transaction_opaque_data", binary2(), true)
 ]);
 var CatalogSchemaContentsViewsParamsSchema = schema2([
   field2("attach_opaque_data", binary2(), false),
-  field2("name", utf82(), false),
+  field2("path", list2(field2("item", utf82(), true)), false),
   field2("transaction_opaque_data", binary2(), true)
 ]);
 var CatalogSchemaCreateParamsSchema = schema2([
   field2("attach_opaque_data", binary2(), false),
-  field2("name", utf82(), false),
+  field2("path", list2(field2("item", utf82(), true)), false),
   field2("on_conflict", dictionary2(utf82(), int162()), false),
   field2("comment", utf82(), true),
   field2("tags", map2(field2("key", utf82(), false), field2("value", utf82(), true), false), true),
@@ -3486,14 +3618,14 @@ var CatalogSchemaCreateParamsSchema = schema2([
 ]);
 var CatalogSchemaDropParamsSchema = schema2([
   field2("attach_opaque_data", binary2(), false),
-  field2("name", utf82(), false),
+  field2("path", list2(field2("item", utf82(), true)), false),
   field2("ignore_not_found", bool2(), false),
   field2("cascade", bool2(), false),
   field2("transaction_opaque_data", binary2(), true)
 ]);
 var CatalogSchemaGetParamsSchema = schema2([
   field2("attach_opaque_data", binary2(), false),
-  field2("name", utf82(), false),
+  field2("path", list2(field2("item", utf82(), true)), false),
   field2("transaction_opaque_data", binary2(), true)
 ]);
 var CatalogSchemasParamsSchema = schema2([
@@ -3502,7 +3634,7 @@ var CatalogSchemasParamsSchema = schema2([
 ]);
 var CatalogTableColumnAddParamsSchema = schema2([
   field2("attach_opaque_data", binary2(), false),
-  field2("schema_name", utf82(), false),
+  field2("schema_path", list2(field2("item", utf82(), true)), false),
   field2("name", utf82(), false),
   field2("column_definition", binary2(), false),
   field2("ignore_not_found", bool2(), false),
@@ -3511,7 +3643,7 @@ var CatalogTableColumnAddParamsSchema = schema2([
 ]);
 var CatalogTableColumnCommentSetParamsSchema = schema2([
   field2("attach_opaque_data", binary2(), false),
-  field2("schema_name", utf82(), false),
+  field2("schema_path", list2(field2("item", utf82(), true)), false),
   field2("name", utf82(), false),
   field2("column_name", utf82(), false),
   field2("comment", utf82(), true),
@@ -3520,7 +3652,7 @@ var CatalogTableColumnCommentSetParamsSchema = schema2([
 ]);
 var CatalogTableColumnDefaultDropParamsSchema = schema2([
   field2("attach_opaque_data", binary2(), false),
-  field2("schema_name", utf82(), false),
+  field2("schema_path", list2(field2("item", utf82(), true)), false),
   field2("name", utf82(), false),
   field2("column_name", utf82(), false),
   field2("ignore_not_found", bool2(), false),
@@ -3528,7 +3660,7 @@ var CatalogTableColumnDefaultDropParamsSchema = schema2([
 ]);
 var CatalogTableColumnDefaultSetParamsSchema = schema2([
   field2("attach_opaque_data", binary2(), false),
-  field2("schema_name", utf82(), false),
+  field2("schema_path", list2(field2("item", utf82(), true)), false),
   field2("name", utf82(), false),
   field2("column_name", utf82(), false),
   field2("expression", utf82(), false),
@@ -3537,7 +3669,7 @@ var CatalogTableColumnDefaultSetParamsSchema = schema2([
 ]);
 var CatalogTableColumnDropParamsSchema = schema2([
   field2("attach_opaque_data", binary2(), false),
-  field2("schema_name", utf82(), false),
+  field2("schema_path", list2(field2("item", utf82(), true)), false),
   field2("name", utf82(), false),
   field2("column_name", utf82(), false),
   field2("ignore_not_found", bool2(), false),
@@ -3547,7 +3679,7 @@ var CatalogTableColumnDropParamsSchema = schema2([
 ]);
 var CatalogTableColumnRenameParamsSchema = schema2([
   field2("attach_opaque_data", binary2(), false),
-  field2("schema_name", utf82(), false),
+  field2("schema_path", list2(field2("item", utf82(), true)), false),
   field2("name", utf82(), false),
   field2("column_name", utf82(), false),
   field2("new_column_name", utf82(), false),
@@ -3556,13 +3688,13 @@ var CatalogTableColumnRenameParamsSchema = schema2([
 ]);
 var CatalogTableColumnStatisticsGetParamsSchema = schema2([
   field2("attach_opaque_data", binary2(), false),
-  field2("schema_name", utf82(), false),
+  field2("schema_path", list2(field2("item", utf82(), true)), false),
   field2("name", utf82(), false),
   field2("transaction_opaque_data", binary2(), true)
 ]);
 var CatalogTableColumnTypeChangeParamsSchema = schema2([
   field2("attach_opaque_data", binary2(), false),
-  field2("schema_name", utf82(), false),
+  field2("schema_path", list2(field2("item", utf82(), true)), false),
   field2("name", utf82(), false),
   field2("column_definition", binary2(), false),
   field2("expression", utf82(), true),
@@ -3571,7 +3703,7 @@ var CatalogTableColumnTypeChangeParamsSchema = schema2([
 ]);
 var CatalogTableCommentSetParamsSchema = schema2([
   field2("attach_opaque_data", binary2(), false),
-  field2("schema_name", utf82(), false),
+  field2("schema_path", list2(field2("item", utf82(), true)), false),
   field2("name", utf82(), false),
   field2("comment", utf82(), true),
   field2("ignore_not_found", bool2(), false),
@@ -3582,13 +3714,13 @@ var CatalogTableCreateParamsSchema = schema2([
 ]);
 var CatalogTableDeleteFunctionGetParamsSchema = schema2([
   field2("attach_opaque_data", binary2(), false),
-  field2("schema_name", utf82(), false),
+  field2("schema_path", list2(field2("item", utf82(), true)), false),
   field2("name", utf82(), false),
   field2("transaction_opaque_data", binary2(), true)
 ]);
 var CatalogTableDropParamsSchema = schema2([
   field2("attach_opaque_data", binary2(), false),
-  field2("schema_name", utf82(), false),
+  field2("schema_path", list2(field2("item", utf82(), true)), false),
   field2("name", utf82(), false),
   field2("ignore_not_found", bool2(), false),
   field2("cascade", bool2(), false),
@@ -3596,7 +3728,7 @@ var CatalogTableDropParamsSchema = schema2([
 ]);
 var CatalogTableGetParamsSchema = schema2([
   field2("attach_opaque_data", binary2(), false),
-  field2("schema_name", utf82(), false),
+  field2("schema_path", list2(field2("item", utf82(), true)), false),
   field2("name", utf82(), false),
   field2("at_unit", utf82(), true),
   field2("at_value", utf82(), true),
@@ -3604,14 +3736,14 @@ var CatalogTableGetParamsSchema = schema2([
 ]);
 var CatalogTableInsertFunctionGetParamsSchema = schema2([
   field2("attach_opaque_data", binary2(), false),
-  field2("schema_name", utf82(), false),
+  field2("schema_path", list2(field2("item", utf82(), true)), false),
   field2("name", utf82(), false),
   field2("transaction_opaque_data", binary2(), true),
   field2("writable_branch_function_name", utf82(), true)
 ]);
 var CatalogTableNotNullDropParamsSchema = schema2([
   field2("attach_opaque_data", binary2(), false),
-  field2("schema_name", utf82(), false),
+  field2("schema_path", list2(field2("item", utf82(), true)), false),
   field2("name", utf82(), false),
   field2("column_name", utf82(), false),
   field2("ignore_not_found", bool2(), false),
@@ -3619,7 +3751,7 @@ var CatalogTableNotNullDropParamsSchema = schema2([
 ]);
 var CatalogTableNotNullSetParamsSchema = schema2([
   field2("attach_opaque_data", binary2(), false),
-  field2("schema_name", utf82(), false),
+  field2("schema_path", list2(field2("item", utf82(), true)), false),
   field2("name", utf82(), false),
   field2("column_name", utf82(), false),
   field2("ignore_not_found", bool2(), false),
@@ -3627,7 +3759,7 @@ var CatalogTableNotNullSetParamsSchema = schema2([
 ]);
 var CatalogTableRenameParamsSchema = schema2([
   field2("attach_opaque_data", binary2(), false),
-  field2("schema_name", utf82(), false),
+  field2("schema_path", list2(field2("item", utf82(), true)), false),
   field2("name", utf82(), false),
   field2("new_name", utf82(), false),
   field2("ignore_not_found", bool2(), false),
@@ -3635,7 +3767,7 @@ var CatalogTableRenameParamsSchema = schema2([
 ]);
 var CatalogTableScanBranchesGetParamsSchema = schema2([
   field2("attach_opaque_data", binary2(), false),
-  field2("schema_name", utf82(), false),
+  field2("schema_path", list2(field2("item", utf82(), true)), false),
   field2("name", utf82(), false),
   field2("at_unit", utf82(), true),
   field2("at_value", utf82(), true),
@@ -3643,7 +3775,7 @@ var CatalogTableScanBranchesGetParamsSchema = schema2([
 ]);
 var CatalogTableScanFunctionGetParamsSchema = schema2([
   field2("attach_opaque_data", binary2(), false),
-  field2("schema_name", utf82(), false),
+  field2("schema_path", list2(field2("item", utf82(), true)), false),
   field2("name", utf82(), false),
   field2("at_unit", utf82(), true),
   field2("at_value", utf82(), true),
@@ -3651,7 +3783,7 @@ var CatalogTableScanFunctionGetParamsSchema = schema2([
 ]);
 var CatalogTableUpdateFunctionGetParamsSchema = schema2([
   field2("attach_opaque_data", binary2(), false),
-  field2("schema_name", utf82(), false),
+  field2("schema_path", list2(field2("item", utf82(), true)), false),
   field2("name", utf82(), false),
   field2("transaction_opaque_data", binary2(), true)
 ]);
@@ -3672,7 +3804,7 @@ var CatalogVersionParamsSchema = schema2([
 ]);
 var CatalogViewCommentSetParamsSchema = schema2([
   field2("attach_opaque_data", binary2(), false),
-  field2("schema_name", utf82(), false),
+  field2("schema_path", list2(field2("item", utf82(), true)), false),
   field2("name", utf82(), false),
   field2("comment", utf82(), true),
   field2("ignore_not_found", bool2(), false),
@@ -3680,7 +3812,7 @@ var CatalogViewCommentSetParamsSchema = schema2([
 ]);
 var CatalogViewCreateParamsSchema = schema2([
   field2("attach_opaque_data", binary2(), false),
-  field2("schema_name", utf82(), false),
+  field2("schema_path", list2(field2("item", utf82(), true)), false),
   field2("name", utf82(), false),
   field2("definition", utf82(), false),
   field2("on_conflict", dictionary2(utf82(), int162()), false),
@@ -3688,7 +3820,7 @@ var CatalogViewCreateParamsSchema = schema2([
 ]);
 var CatalogViewDropParamsSchema = schema2([
   field2("attach_opaque_data", binary2(), false),
-  field2("schema_name", utf82(), false),
+  field2("schema_path", list2(field2("item", utf82(), true)), false),
   field2("name", utf82(), false),
   field2("ignore_not_found", bool2(), false),
   field2("cascade", bool2(), false),
@@ -3696,13 +3828,13 @@ var CatalogViewDropParamsSchema = schema2([
 ]);
 var CatalogViewGetParamsSchema = schema2([
   field2("attach_opaque_data", binary2(), false),
-  field2("schema_name", utf82(), false),
+  field2("schema_path", list2(field2("item", utf82(), true)), false),
   field2("name", utf82(), false),
   field2("transaction_opaque_data", binary2(), true)
 ]);
 var CatalogViewRenameParamsSchema = schema2([
   field2("attach_opaque_data", binary2(), false),
-  field2("schema_name", utf82(), false),
+  field2("schema_path", list2(field2("item", utf82(), true)), false),
   field2("name", utf82(), false),
   field2("new_name", utf82(), false),
   field2("ignore_not_found", bool2(), false),
@@ -3733,6 +3865,11 @@ var TableFunctionStatisticsParamsSchema = schema2([
   field2("request", binary2(), false)
 ]);
 
+// src/schema-path.ts
+function normalizeSchemaPath(path) {
+  return typeof path === "string" ? [path] : Array.from(path, String);
+}
+
 // src/protocol/handlers/shared.ts
 var RESULT_BINARY_SCHEMA = schema2([
   field2("result", binary2(), false)
@@ -3746,7 +3883,15 @@ var RESULT_BINARY_NULLABLE_SCHEMA = schema2([
 function unwrapRequest(requestBytes) {
   const bytes = toUint8Array(requestBytes);
   const innerBatch = deserializeBatch(bytes);
-  return batchToScalarDict(innerBatch);
+  const params = batchToScalarDict(innerBatch);
+  normalizeRequestSchemaPaths(params);
+  return params;
+}
+function normalizeRequestSchemaPaths(params) {
+  if (params.path != null)
+    params.path = normalizeSchemaPath(params.path);
+  if (params.schema_path != null)
+    params.schema_path = normalizeSchemaPath(params.schema_path);
 }
 function wrapResult(values, innerSchema) {
   const a = innerSchema;
@@ -3766,7 +3911,7 @@ function overloadContext(req, catalogInterface) {
     arguments: req.arguments,
     inputSchema: req.input_schema,
     isScalar: String(req.function_type).toLowerCase() === "scalar",
-    schemaName: req.schema_name ?? null,
+    schemaPath: req.schema_path ?? null,
     catalogName
   };
 }
@@ -3954,14 +4099,14 @@ function getOutput(expectedLength, out, onlyAligned = true) {
     throw new Error("invalid output, must be aligned");
   return out;
 }
-function u64Lengths(dataLength, aadLength, isLE2) {
+function u64Lengths(dataLength, aadLength, isLE) {
   anumber(dataLength);
   anumber(aadLength);
-  abool(isLE2);
+  abool(isLE);
   const num = new Uint8Array(16);
   const view = createView(num);
-  view.setBigUint64(0, BigInt(aadLength), isLE2);
-  view.setBigUint64(8, BigInt(dataLength), isLE2);
+  view.setBigUint64(0, BigInt(aadLength), isLE);
+  view.setBigUint64(8, BigInt(dataLength), isLE);
   return num;
 }
 function isAligned32(bytes) {
@@ -4528,8 +4673,8 @@ var ATTACH_AAD_PREFIX = _UTF8.encode("vgi.attach_opaque_data.v1\x00");
 var TRANSACTION_AAD_PREFIX = _UTF8.encode("vgi.transaction_opaque_data.v1\x00");
 
 class OpaqueDataRejectedError extends Error {
-  constructor(field3 = "opaque data") {
-    super(`${field3} not recognized`);
+  constructor(field = "opaque data") {
+    super(`${field} not recognized`);
     this.name = "OpaqueDataRejectedError";
   }
 }
@@ -4572,16 +4717,16 @@ async function sealBytes(payload, key, aad, version) {
   out.set(ciphertext, 1 + NONCE_LEN);
   return out;
 }
-async function openBytes(token, key, aad, version, field3 = "opaque data") {
+async function openBytes(token, key, aad, version, field = "opaque data") {
   if (token.length < MIN_ENVELOPE_LEN || token[0] !== (version & 255)) {
-    throw new OpaqueDataRejectedError(field3);
+    throw new OpaqueDataRejectedError(field);
   }
   const nonce = token.subarray(1, 1 + NONCE_LEN);
   const ciphertext = token.subarray(1 + NONCE_LEN);
   try {
     return xchacha20poly1305(await normalizeKey(key), nonce, aad).decrypt(ciphertext);
   } catch {
-    throw new OpaqueDataRejectedError(field3);
+    throw new OpaqueDataRejectedError(field);
   }
 }
 
@@ -4634,6 +4779,7 @@ function catalogUnary(protocol, signingKey, name, config) {
     result: config.result,
     doc: config.doc,
     handler: async (params, ctx) => {
+      normalizeRequestSchemaPaths(params);
       await unwrapParamsOpaque(params, ctx, signingKey);
       return config.handler(params, ctx);
     }
@@ -4697,7 +4843,7 @@ function deserializePlanRequest(params) {
 function fingerprintInputs(bindCallBytes) {
   const dict = batchToScalarDict(deserializeBatch(bindCallBytes));
   return {
-    schemaName: dict.schema_name == null ? "" : String(dict.schema_name),
+    schemaPath: dict.schema_path == null ? [] : (Array.isArray(dict.schema_path) ? dict.schema_path : [...dict.schema_path]).map(String),
     functionName: String(dict.function_name ?? ""),
     args: dict.arguments ? toUint8Array2(dict.arguments) : new Uint8Array(0),
     settings: dict.settings ? toUint8Array2(dict.settings) : new Uint8Array(0)
@@ -4776,11 +4922,11 @@ function equalBytes2(a, b) {
     diff |= a[i] ^ b[i];
   return diff === 0;
 }
-async function bindFingerprint(schemaName, functionName, args, settings, projection) {
+async function bindFingerprint(schemaPath, functionName, args, settings, projection) {
   const enc = new TextEncoder;
   const zero = Uint8Array.of(0);
-  const field3 = (label, value) => concat2(enc.encode(label), zero, value, zero);
-  const message = concat2(AAD_PREFIX, field3("schema_name", enc.encode(schemaName)), field3("function_name", enc.encode(functionName)), field3("arguments", args), field3("settings", settings), field3("projection_ids", projection));
+  const field = (label, value) => concat2(enc.encode(label), zero, value, zero);
+  const message = concat2(AAD_PREFIX, field("schema_path", enc.encode(JSON.stringify(schemaPath))), field("function_name", enc.encode(functionName)), field("arguments", args), field("settings", settings), field("projection_ids", projection));
   const digest = await crypto.subtle.digest("SHA-256", message);
   return new Uint8Array(digest).slice(0, FINGERPRINT_LEN);
 }
@@ -4850,8 +4996,8 @@ async function openSplitToken(token, opts = {}) {
     return new Uint8Array(rest);
   try {
     return await openBytes(rest, signingKey, splitTokenAad(body, auth), SEAL_VERSION, "split token");
-  } catch (err2) {
-    throw new SplitTokenError(SPLIT_TOKEN_INVALID, `split token failed authentication: ${err2 instanceof Error ? err2.message : String(err2)}`);
+  } catch (err) {
+    throw new SplitTokenError(SPLIT_TOKEN_INVALID, `split token failed authentication: ${err instanceof Error ? err.message : String(err)}`);
   }
 }
 
@@ -4876,7 +5022,7 @@ async function resolveSplitPayloads(request, innerParams, opts) {
   if (!request.split_tokens)
     return;
   const fp = fingerprintInputs(toUint8Array(innerParams.bind_call));
-  const expected = await bindFingerprint(fp.schemaName, fp.functionName, fp.args, fp.settings, new Uint8Array(0));
+  const expected = await bindFingerprint(fp.schemaPath, fp.functionName, fp.args, fp.settings, new Uint8Array(0));
   const currentAnchor = opts.checkAnchor ? await liveSplitAnchor(opts.catalogInterface, request.bind_call, opts.auth, opts.signingKey) : undefined;
   request.split_payloads = [];
   for (const token of request.split_tokens) {
@@ -5054,7 +5200,7 @@ function registerFunctionMethods(protocol, config) {
       const func = registry.get(request.bind_call.function_name, await strippedContext(request.bind_call));
       const plan = func.plan ? await func.plan(request) : { splits: [{ payload: new Uint8Array(0) }] };
       const fp = fingerprintInputs(toUint8Array(innerParams.bind_call));
-      const fingerprint = await bindFingerprint(fp.schemaName, fp.functionName, fp.args, fp.settings, new Uint8Array(0));
+      const fingerprint = await bindFingerprint(fp.schemaPath, fp.functionName, fp.args, fp.settings, new Uint8Array(0));
       const anchor = plan.catalogVersion != null ? splitAnchor(plan.catalogVersion) : await liveSplitAnchor(catalogInterface, request.bind_call, ctx?.auth, signingKey) ?? splitAnchor(0);
       const blobs = [];
       for (const split of plan.splits) {
@@ -5100,9 +5246,9 @@ function registerFunctionMethods(protocol, config) {
       const globalExecutionId = toUint8Array(innerParams.global_execution_id);
       const bindOpaqueData = innerParams.bind_opaque_data ? toUint8Array(innerParams.bind_opaque_data) : null;
       const func = registry.get(bindCall.function_name, await strippedContext(bindCall));
-      const map3 = func.dynamicToString ? await func.dynamicToString({ bindCall, bindOpaqueData, globalExecutionId }) : {};
-      const keys = Object.keys(map3);
-      const values = keys.map((k) => map3[k] ?? "");
+      const map = func.dynamicToString ? await func.dynamicToString({ bindCall, bindOpaqueData, globalExecutionId }) : {};
+      const keys = Object.keys(map);
+      const values = keys.map((k) => map[k] ?? "");
       return wrapResult({ keys, values }, TableFunctionDynamicToStringResultSchema);
     }
   });
@@ -5277,12 +5423,12 @@ function persistGroupStates(executionId, gids) {
 
 // src/protocol/handlers/aggregate.ts
 function registerAggregateMethods(protocol, registry) {
-  function resolveAggregate(name, schemaName) {
+  function resolveAggregate(name, schemaPath) {
     const func = registry.get(name, {
       arguments: new Arguments,
       inputSchema: null,
       isScalar: false,
-      schemaName: schemaName ?? null
+      schemaPath: schemaPath ?? null
     });
     if (!func || func.kind !== "aggregate") {
       throw new Error(`Function '${name}' is not an aggregate function`);
@@ -5295,7 +5441,7 @@ function registerAggregateMethods(protocol, registry) {
     handler: async (params) => {
       const innerParams = unwrapRequest(params.request);
       const functionName = innerParams.function_name;
-      const cfg = resolveAggregate(functionName, innerParams.schema_name ?? null);
+      const cfg = resolveAggregate(functionName, innerParams.schema_path ?? null);
       const argBytes = toUint8Array(innerParams.arguments);
       const args = deserializeArguments(argBytes);
       const inputSchema = innerParams.input_schema ? deserializeSchema(toUint8Array(innerParams.input_schema)) : null;
@@ -5307,7 +5453,8 @@ function registerAggregateMethods(protocol, registry) {
         arguments: args,
         inputSchema,
         settings: {},
-        secrets
+        secrets,
+        argumentNames: innerParams.argument_names ? (Array.isArray(innerParams.argument_names) ? innerParams.argument_names : [...innerParams.argument_names]).map((value) => value == null ? null : String(value)) : null
       };
       const executionId = new Uint8Array(16);
       crypto.getRandomValues(executionId);
@@ -5328,7 +5475,7 @@ function registerAggregateMethods(protocol, registry) {
       const innerParams = unwrapRequest(params.request);
       const functionName = innerParams.function_name;
       const executionId = toUint8Array(innerParams.execution_id);
-      const cfg = resolveAggregate(functionName, innerParams.schema_name ?? null);
+      const cfg = resolveAggregate(functionName, innerParams.schema_path ?? null);
       const batch = readSingleBatch(toUint8Array(innerParams.input_batch));
       if (!batch || batch.numRows === 0)
         return wrapResult({}, schema2([]));
@@ -5381,7 +5528,7 @@ function registerAggregateMethods(protocol, registry) {
       const innerParams = unwrapRequest(params.request);
       const functionName = innerParams.function_name;
       const executionId = toUint8Array(innerParams.execution_id);
-      const cfg = resolveAggregate(functionName, innerParams.schema_name ?? null);
+      const cfg = resolveAggregate(functionName, innerParams.schema_path ?? null);
       const batch = readSingleBatch(toUint8Array(innerParams.merge_batch));
       if (!batch || batch.numRows === 0)
         return wrapResult({}, schema2([]));
@@ -5426,7 +5573,7 @@ function registerAggregateMethods(protocol, registry) {
       const innerParams = unwrapRequest(params.request);
       const functionName = innerParams.function_name;
       const executionId = toUint8Array(innerParams.execution_id);
-      const cfg = resolveAggregate(functionName, innerParams.schema_name ?? null);
+      const cfg = resolveAggregate(functionName, innerParams.schema_path ?? null);
       const outputSchema = deserializeSchema(toUint8Array(innerParams.output_schema));
       const gidBatch = readSingleBatch(toUint8Array(innerParams.group_ids_batch));
       const groupIds = [];
@@ -5496,9 +5643,9 @@ function extractArgMap(cfg, args) {
     let v;
     try {
       v = args.get(i);
-      const field3 = args.argumentsSchema?.fields.find((f) => f.name === `positional_${i}`);
-      if (field3 && isDecimal(field3.type)) {
-        const scale = field3.type.scale;
+      const field = args.argumentsSchema?.fields.find((f) => f.name === `positional_${i}`);
+      if (field && isDecimal(field.type)) {
+        const scale = field.type.scale;
         if (typeof v === "bigint")
           v = Number(v) / Math.pow(10, scale);
         else if (typeof v === "number")
@@ -5572,12 +5719,12 @@ function splitLenPrefixed(buf, count) {
 
 // src/protocol/handlers/table-buffering.ts
 function registerTableBufferingMethods(protocol, registry, signingKey) {
-  function resolveBuffering(name, schemaName) {
+  function resolveBuffering(name, schemaPath) {
     const func = registry.get(name, {
       arguments: new Arguments,
       inputSchema: null,
       isScalar: false,
-      schemaName: schemaName ?? null
+      schemaPath: schemaPath ?? null
     });
     if (!func || func.kind !== "table_buffering") {
       throw new Error(`Function '${name}' is not a table_buffering function`);
@@ -5590,7 +5737,7 @@ function registerTableBufferingMethods(protocol, registry, signingKey) {
     const rawAttach = inner.attach_opaque_data ? toUint8Array(inner.attach_opaque_data) : null;
     const attach = rawAttach && rawAttach.length > 0 ? await openAttach(rawAttach, ctx?.auth, signingKey) : rawAttach;
     const transactionId = inner.transaction_id ? toUint8Array(inner.transaction_id) : null;
-    const func = resolveBuffering(functionName, inner.schema_name ?? null);
+    const func = resolveBuffering(functionName, inner.schema_path ?? null);
     const bound = new BoundStorage(storage, executionId);
     const payload = await bound.stateGet(FrameworkNS.BUFFERING_INIT, BoundStorage.packIntKey(-1));
     if (payload == null) {
@@ -5689,8 +5836,8 @@ function hex(buf) {
 }
 
 // src/codec/asd.ts
-function encodeASD(schema3, obj) {
-  return serializeBatch(batchFromRows([obj], schema3));
+function encodeASD(schema, obj) {
+  return serializeBatch(batchFromRows([obj], schema));
 }
 
 // src/generated/vgi-client.ts
@@ -5856,7 +6003,7 @@ function registerCatalogAdminMethods(protocol, getCatalog, signingKey) {
     result: RESULT_BINARY_SCHEMA,
     handler: async (params) => {
       const cat = getCatalog();
-      const info = await cat.schemaGet(toUint8Array(params.attach_opaque_data), params.name, params.transaction_opaque_data ? toUint8Array(params.transaction_opaque_data) : undefined);
+      const info = await cat.schemaGet(toUint8Array(params.attach_opaque_data), params.path, params.transaction_opaque_data ? toUint8Array(params.transaction_opaque_data) : undefined);
       return wrapResult({
         items: info ? [encodeSchemaInfo(info)] : []
       }, CatalogSchemaGetResultSchema);
@@ -5867,7 +6014,7 @@ function registerCatalogAdminMethods(protocol, getCatalog, signingKey) {
     result: emptyResultSchema,
     handler: async (params) => {
       const cat = getCatalog();
-      await cat.schemaCreate(toUint8Array(params.attach_opaque_data), params.name, params.comment, null, params.transaction_opaque_data ? toUint8Array(params.transaction_opaque_data) : undefined);
+      await cat.schemaCreate(toUint8Array(params.attach_opaque_data), params.path, params.comment, null, params.transaction_opaque_data ? toUint8Array(params.transaction_opaque_data) : undefined);
       return {};
     }
   });
@@ -5876,7 +6023,7 @@ function registerCatalogAdminMethods(protocol, getCatalog, signingKey) {
     result: emptyResultSchema,
     handler: async (params) => {
       const cat = getCatalog();
-      await cat.schemaDrop(toUint8Array(params.attach_opaque_data), params.name, params.ignore_not_found, params.cascade, params.transaction_opaque_data ? toUint8Array(params.transaction_opaque_data) : undefined);
+      await cat.schemaDrop(toUint8Array(params.attach_opaque_data), params.path, params.ignore_not_found, params.cascade, params.transaction_opaque_data ? toUint8Array(params.transaction_opaque_data) : undefined);
       return {};
     }
   });
@@ -5885,7 +6032,7 @@ function registerCatalogAdminMethods(protocol, getCatalog, signingKey) {
     result: RESULT_BINARY_SCHEMA,
     handler: async (params) => {
       const cat = getCatalog();
-      const tables = await cat.schemaContentsTables(toUint8Array(params.attach_opaque_data), params.name, params.transaction_opaque_data ? toUint8Array(params.transaction_opaque_data) : undefined);
+      const tables = await cat.schemaContentsTables(toUint8Array(params.attach_opaque_data), params.path, params.transaction_opaque_data ? toUint8Array(params.transaction_opaque_data) : undefined);
       return wrapResult({
         items: tables.map((t) => encodeTableInfo(t))
       }, CatalogSchemaContentsTablesResultSchema);
@@ -5896,7 +6043,7 @@ function registerCatalogAdminMethods(protocol, getCatalog, signingKey) {
     result: RESULT_BINARY_SCHEMA,
     handler: async (params) => {
       const cat = getCatalog();
-      const views = await cat.schemaContentsViews(toUint8Array(params.attach_opaque_data), params.name, params.transaction_opaque_data ? toUint8Array(params.transaction_opaque_data) : undefined);
+      const views = await cat.schemaContentsViews(toUint8Array(params.attach_opaque_data), params.path, params.transaction_opaque_data ? toUint8Array(params.transaction_opaque_data) : undefined);
       return wrapResult({
         items: views.map((v) => encodeViewInfo(v))
       }, CatalogSchemaContentsViewsResultSchema);
@@ -5907,7 +6054,7 @@ function registerCatalogAdminMethods(protocol, getCatalog, signingKey) {
     result: RESULT_BINARY_SCHEMA,
     handler: async (params) => {
       const cat = getCatalog();
-      const funcs = await cat.schemaContentsFunctions(toUint8Array(params.attach_opaque_data), params.name, decodeDictValue(params.type), params.transaction_opaque_data ? toUint8Array(params.transaction_opaque_data) : undefined);
+      const funcs = await cat.schemaContentsFunctions(toUint8Array(params.attach_opaque_data), params.path, decodeDictValue(params.type), params.transaction_opaque_data ? toUint8Array(params.transaction_opaque_data) : undefined);
       return wrapResult({
         items: funcs.map((f) => encodeFunctionInfo(f))
       }, CatalogSchemaContentsFunctionsResultSchema);
@@ -5922,7 +6069,7 @@ function registerCatalogTableMethods(protocol, getCatalog, signingKey) {
     result: RESULT_BINARY_SCHEMA,
     handler: async (params) => {
       const cat = getCatalog();
-      const info = await cat.tableGet(toUint8Array(params.attach_opaque_data), params.schema_name, params.name, params.at_unit, params.at_value, params.transaction_opaque_data ? toUint8Array(params.transaction_opaque_data) : undefined);
+      const info = await cat.tableGet(toUint8Array(params.attach_opaque_data), params.schema_path, params.name, params.at_unit, params.at_value, params.transaction_opaque_data ? toUint8Array(params.transaction_opaque_data) : undefined);
       return wrapResult({
         items: info ? [encodeTableInfo(info)] : []
       }, CatalogTableGetResultSchema);
@@ -5933,7 +6080,7 @@ function registerCatalogTableMethods(protocol, getCatalog, signingKey) {
     result: emptyResultSchema,
     handler: async (params) => {
       const cat = getCatalog();
-      await cat.tableCreate(toUint8Array(params.attach_opaque_data), params.schema_name, params.name, toUint8Array(params.columns), params.on_conflict, params.not_null_constraints ?? [], params.unique_constraints ?? [], params.check_constraints ?? [], params.transaction_opaque_data ? toUint8Array(params.transaction_opaque_data) : undefined);
+      await cat.tableCreate(toUint8Array(params.attach_opaque_data), params.schema_path, params.name, toUint8Array(params.columns), params.on_conflict, params.not_null_constraints ?? [], params.unique_constraints ?? [], params.check_constraints ?? [], params.transaction_opaque_data ? toUint8Array(params.transaction_opaque_data) : undefined);
       return {};
     }
   });
@@ -5942,7 +6089,7 @@ function registerCatalogTableMethods(protocol, getCatalog, signingKey) {
     result: emptyResultSchema,
     handler: async (params) => {
       const cat = getCatalog();
-      await cat.tableDrop(toUint8Array(params.attach_opaque_data), params.schema_name, params.name, params.ignore_not_found, params.transaction_opaque_data ? toUint8Array(params.transaction_opaque_data) : undefined);
+      await cat.tableDrop(toUint8Array(params.attach_opaque_data), params.schema_path, params.name, params.ignore_not_found, params.transaction_opaque_data ? toUint8Array(params.transaction_opaque_data) : undefined);
       return {};
     }
   });
@@ -5951,7 +6098,7 @@ function registerCatalogTableMethods(protocol, getCatalog, signingKey) {
     result: RESULT_BINARY_NULLABLE_SCHEMA,
     handler: async (params) => {
       const cat = getCatalog();
-      const stats = await cat.tableColumnStatisticsGet(toUint8Array(params.attach_opaque_data), params.schema_name, params.name, params.transaction_opaque_data ? toUint8Array(params.transaction_opaque_data) : undefined);
+      const stats = await cat.tableColumnStatisticsGet(toUint8Array(params.attach_opaque_data), params.schema_path, params.name, params.transaction_opaque_data ? toUint8Array(params.transaction_opaque_data) : undefined);
       return { result: stats?.bytes ?? null };
     }
   });
@@ -5960,7 +6107,7 @@ function registerCatalogTableMethods(protocol, getCatalog, signingKey) {
     result: RESULT_BINARY_SCHEMA,
     handler: async (params) => {
       const cat = getCatalog();
-      const scanResult = await cat.tableScanFunctionGet(toUint8Array(params.attach_opaque_data), params.schema_name, params.name, params.at_unit, params.at_value, params.transaction_opaque_data ? toUint8Array(params.transaction_opaque_data) : undefined);
+      const scanResult = await cat.tableScanFunctionGet(toUint8Array(params.attach_opaque_data), params.schema_path, params.name, params.at_unit, params.at_value, params.transaction_opaque_data ? toUint8Array(params.transaction_opaque_data) : undefined);
       return wrapResult(scanResult, ScanFunctionResultSchema);
     }
   });
@@ -5969,7 +6116,7 @@ function registerCatalogTableMethods(protocol, getCatalog, signingKey) {
     result: RESULT_BINARY_SCHEMA,
     handler: async (params) => {
       const cat = getCatalog();
-      const branchesResult = await cat.tableScanBranchesGet(toUint8Array(params.attach_opaque_data), params.schema_name, params.name, params.at_unit, params.at_value, params.transaction_opaque_data ? toUint8Array(params.transaction_opaque_data) : undefined);
+      const branchesResult = await cat.tableScanBranchesGet(toUint8Array(params.attach_opaque_data), params.schema_path, params.name, params.at_unit, params.at_value, params.transaction_opaque_data ? toUint8Array(params.transaction_opaque_data) : undefined);
       return wrapResult(branchesResult, ScanBranchesResultSchema);
     }
   });
@@ -5978,7 +6125,7 @@ function registerCatalogTableMethods(protocol, getCatalog, signingKey) {
     result: emptyResultSchema,
     handler: async (params) => {
       const cat = getCatalog();
-      await cat.tableCommentSet(toUint8Array(params.attach_opaque_data), params.schema_name, params.name, params.comment, params.ignore_not_found, params.transaction_opaque_data ? toUint8Array(params.transaction_opaque_data) : undefined);
+      await cat.tableCommentSet(toUint8Array(params.attach_opaque_data), params.schema_path, params.name, params.comment, params.ignore_not_found, params.transaction_opaque_data ? toUint8Array(params.transaction_opaque_data) : undefined);
       return {};
     }
   });
@@ -5987,7 +6134,7 @@ function registerCatalogTableMethods(protocol, getCatalog, signingKey) {
     result: emptyResultSchema,
     handler: async (params) => {
       const cat = getCatalog();
-      await cat.tableRename(toUint8Array(params.attach_opaque_data), params.schema_name, params.name, params.new_name, params.ignore_not_found, params.transaction_opaque_data ? toUint8Array(params.transaction_opaque_data) : undefined);
+      await cat.tableRename(toUint8Array(params.attach_opaque_data), params.schema_path, params.name, params.new_name, params.ignore_not_found, params.transaction_opaque_data ? toUint8Array(params.transaction_opaque_data) : undefined);
       return {};
     }
   });
@@ -5996,7 +6143,7 @@ function registerCatalogTableMethods(protocol, getCatalog, signingKey) {
     result: emptyResultSchema,
     handler: async (params) => {
       const cat = getCatalog();
-      await cat.tableColumnAdd(toUint8Array(params.attach_opaque_data), params.schema_name, params.name, params.column_name, params.column_type, params.default_value, params.ignore_not_found, params.transaction_opaque_data ? toUint8Array(params.transaction_opaque_data) : undefined);
+      await cat.tableColumnAdd(toUint8Array(params.attach_opaque_data), params.schema_path, params.name, params.column_name, params.column_type, params.default_value, params.ignore_not_found, params.transaction_opaque_data ? toUint8Array(params.transaction_opaque_data) : undefined);
       return {};
     }
   });
@@ -6005,7 +6152,7 @@ function registerCatalogTableMethods(protocol, getCatalog, signingKey) {
     result: emptyResultSchema,
     handler: async (params) => {
       const cat = getCatalog();
-      await cat.tableColumnDrop(toUint8Array(params.attach_opaque_data), params.schema_name, params.name, params.column_name, params.ignore_not_found, params.transaction_opaque_data ? toUint8Array(params.transaction_opaque_data) : undefined);
+      await cat.tableColumnDrop(toUint8Array(params.attach_opaque_data), params.schema_path, params.name, params.column_name, params.ignore_not_found, params.transaction_opaque_data ? toUint8Array(params.transaction_opaque_data) : undefined);
       return {};
     }
   });
@@ -6014,7 +6161,7 @@ function registerCatalogTableMethods(protocol, getCatalog, signingKey) {
     result: emptyResultSchema,
     handler: async (params) => {
       const cat = getCatalog();
-      await cat.tableColumnRename(toUint8Array(params.attach_opaque_data), params.schema_name, params.name, params.column_name, params.new_name, params.ignore_not_found, params.transaction_opaque_data ? toUint8Array(params.transaction_opaque_data) : undefined);
+      await cat.tableColumnRename(toUint8Array(params.attach_opaque_data), params.schema_path, params.name, params.column_name, params.new_name, params.ignore_not_found, params.transaction_opaque_data ? toUint8Array(params.transaction_opaque_data) : undefined);
       return {};
     }
   });
@@ -6023,7 +6170,7 @@ function registerCatalogTableMethods(protocol, getCatalog, signingKey) {
     result: emptyResultSchema,
     handler: async (params) => {
       const cat = getCatalog();
-      await cat.tableColumnDefaultSet(toUint8Array(params.attach_opaque_data), params.schema_name, params.name, params.column_name, params.default_value, params.ignore_not_found, params.transaction_opaque_data ? toUint8Array(params.transaction_opaque_data) : undefined);
+      await cat.tableColumnDefaultSet(toUint8Array(params.attach_opaque_data), params.schema_path, params.name, params.column_name, params.default_value, params.ignore_not_found, params.transaction_opaque_data ? toUint8Array(params.transaction_opaque_data) : undefined);
       return {};
     }
   });
@@ -6032,7 +6179,7 @@ function registerCatalogTableMethods(protocol, getCatalog, signingKey) {
     result: emptyResultSchema,
     handler: async (params) => {
       const cat = getCatalog();
-      await cat.tableColumnDefaultDrop(toUint8Array(params.attach_opaque_data), params.schema_name, params.name, params.column_name, params.ignore_not_found, params.transaction_opaque_data ? toUint8Array(params.transaction_opaque_data) : undefined);
+      await cat.tableColumnDefaultDrop(toUint8Array(params.attach_opaque_data), params.schema_path, params.name, params.column_name, params.ignore_not_found, params.transaction_opaque_data ? toUint8Array(params.transaction_opaque_data) : undefined);
       return {};
     }
   });
@@ -6041,7 +6188,7 @@ function registerCatalogTableMethods(protocol, getCatalog, signingKey) {
     result: emptyResultSchema,
     handler: async (params) => {
       const cat = getCatalog();
-      await cat.tableColumnTypeChange(toUint8Array(params.attach_opaque_data), params.schema_name, params.name, params.column_name, params.new_type, params.ignore_not_found, params.transaction_opaque_data ? toUint8Array(params.transaction_opaque_data) : undefined);
+      await cat.tableColumnTypeChange(toUint8Array(params.attach_opaque_data), params.schema_path, params.name, params.column_name, params.new_type, params.ignore_not_found, params.transaction_opaque_data ? toUint8Array(params.transaction_opaque_data) : undefined);
       return {};
     }
   });
@@ -6050,7 +6197,7 @@ function registerCatalogTableMethods(protocol, getCatalog, signingKey) {
     result: emptyResultSchema,
     handler: async (params) => {
       const cat = getCatalog();
-      await cat.tableNotNullSet(toUint8Array(params.attach_opaque_data), params.schema_name, params.name, params.column_name, params.ignore_not_found, params.transaction_opaque_data ? toUint8Array(params.transaction_opaque_data) : undefined);
+      await cat.tableNotNullSet(toUint8Array(params.attach_opaque_data), params.schema_path, params.name, params.column_name, params.ignore_not_found, params.transaction_opaque_data ? toUint8Array(params.transaction_opaque_data) : undefined);
       return {};
     }
   });
@@ -6059,7 +6206,7 @@ function registerCatalogTableMethods(protocol, getCatalog, signingKey) {
     result: emptyResultSchema,
     handler: async (params) => {
       const cat = getCatalog();
-      await cat.tableNotNullDrop(toUint8Array(params.attach_opaque_data), params.schema_name, params.name, params.column_name, params.ignore_not_found, params.transaction_opaque_data ? toUint8Array(params.transaction_opaque_data) : undefined);
+      await cat.tableNotNullDrop(toUint8Array(params.attach_opaque_data), params.schema_path, params.name, params.column_name, params.ignore_not_found, params.transaction_opaque_data ? toUint8Array(params.transaction_opaque_data) : undefined);
       return {};
     }
   });
@@ -6072,7 +6219,7 @@ function registerCatalogViewMethods(protocol, getCatalog, signingKey) {
     result: RESULT_BINARY_SCHEMA,
     handler: async (params) => {
       const cat = getCatalog();
-      const info = await cat.viewGet(toUint8Array(params.attach_opaque_data), params.schema_name, params.name, params.transaction_opaque_data ? toUint8Array(params.transaction_opaque_data) : undefined);
+      const info = await cat.viewGet(toUint8Array(params.attach_opaque_data), params.schema_path, params.name, params.transaction_opaque_data ? toUint8Array(params.transaction_opaque_data) : undefined);
       return wrapResult({
         items: info ? [encodeViewInfo(info)] : []
       }, CatalogViewGetResultSchema);
@@ -6083,7 +6230,7 @@ function registerCatalogViewMethods(protocol, getCatalog, signingKey) {
     result: emptyResultSchema,
     handler: async (params) => {
       const cat = getCatalog();
-      await cat.viewCreate(toUint8Array(params.attach_opaque_data), params.schema_name, params.name, params.definition, params.on_conflict, params.transaction_opaque_data ? toUint8Array(params.transaction_opaque_data) : undefined);
+      await cat.viewCreate(toUint8Array(params.attach_opaque_data), params.schema_path, params.name, params.definition, params.on_conflict, params.transaction_opaque_data ? toUint8Array(params.transaction_opaque_data) : undefined);
       return {};
     }
   });
@@ -6092,7 +6239,7 @@ function registerCatalogViewMethods(protocol, getCatalog, signingKey) {
     result: emptyResultSchema,
     handler: async (params) => {
       const cat = getCatalog();
-      await cat.viewDrop(toUint8Array(params.attach_opaque_data), params.schema_name, params.name, params.ignore_not_found, params.transaction_opaque_data ? toUint8Array(params.transaction_opaque_data) : undefined);
+      await cat.viewDrop(toUint8Array(params.attach_opaque_data), params.schema_path, params.name, params.ignore_not_found, params.transaction_opaque_data ? toUint8Array(params.transaction_opaque_data) : undefined);
       return {};
     }
   });
@@ -6101,7 +6248,7 @@ function registerCatalogViewMethods(protocol, getCatalog, signingKey) {
     result: emptyResultSchema,
     handler: async (params) => {
       const cat = getCatalog();
-      await cat.viewRename(toUint8Array(params.attach_opaque_data), params.schema_name, params.name, params.new_name, params.ignore_not_found, params.transaction_opaque_data ? toUint8Array(params.transaction_opaque_data) : undefined);
+      await cat.viewRename(toUint8Array(params.attach_opaque_data), params.schema_path, params.name, params.new_name, params.ignore_not_found, params.transaction_opaque_data ? toUint8Array(params.transaction_opaque_data) : undefined);
       return {};
     }
   });
@@ -6110,7 +6257,7 @@ function registerCatalogViewMethods(protocol, getCatalog, signingKey) {
     result: emptyResultSchema,
     handler: async (params) => {
       const cat = getCatalog();
-      await cat.viewCommentSet(toUint8Array(params.attach_opaque_data), params.schema_name, params.name, params.comment, params.ignore_not_found, params.transaction_opaque_data ? toUint8Array(params.transaction_opaque_data) : undefined);
+      await cat.viewCommentSet(toUint8Array(params.attach_opaque_data), params.schema_path, params.name, params.comment, params.ignore_not_found, params.transaction_opaque_data ? toUint8Array(params.transaction_opaque_data) : undefined);
       return {};
     }
   });
@@ -6123,7 +6270,7 @@ function registerCatalogMacroMethods(protocol, getCatalog, signingKey) {
     result: RESULT_BINARY_SCHEMA,
     handler: async (params) => {
       const cat = getCatalog();
-      const info = await cat.macroGet(toUint8Array(params.attach_opaque_data), params.schema_name, params.name, params.transaction_opaque_data ? toUint8Array(params.transaction_opaque_data) : undefined);
+      const info = await cat.macroGet(toUint8Array(params.attach_opaque_data), params.schema_path, params.name, params.transaction_opaque_data ? toUint8Array(params.transaction_opaque_data) : undefined);
       return wrapResult({
         items: info ? [encodeMacroInfo(info)] : []
       }, CatalogMacroGetResultSchema);
@@ -6135,7 +6282,7 @@ function registerCatalogMacroMethods(protocol, getCatalog, signingKey) {
     handler: async (params) => {
       const cat = getCatalog();
       const innerParams = unwrapRequest(params.request);
-      await cat.macroCreate(toUint8Array(innerParams.attach_opaque_data), innerParams.schema_name, innerParams.name, innerParams.macro_type, innerParams.parameters ? Array.isArray(innerParams.parameters) ? innerParams.parameters : [...innerParams.parameters] : [], innerParams.definition, innerParams.on_conflict, innerParams.parameter_default_values ? toUint8Array(innerParams.parameter_default_values) : null, innerParams.arguments_schema ? toUint8Array(innerParams.arguments_schema) : null, innerParams.transaction_opaque_data ? toUint8Array(innerParams.transaction_opaque_data) : undefined);
+      await cat.macroCreate(toUint8Array(innerParams.attach_opaque_data), innerParams.schema_path, innerParams.name, innerParams.macro_type, innerParams.parameters ? Array.isArray(innerParams.parameters) ? innerParams.parameters : [...innerParams.parameters] : [], innerParams.definition, innerParams.on_conflict, innerParams.parameter_default_values ? toUint8Array(innerParams.parameter_default_values) : null, innerParams.arguments_schema ? toUint8Array(innerParams.arguments_schema) : null, innerParams.transaction_opaque_data ? toUint8Array(innerParams.transaction_opaque_data) : undefined);
       return {};
     }
   });
@@ -6144,7 +6291,7 @@ function registerCatalogMacroMethods(protocol, getCatalog, signingKey) {
     result: emptyResultSchema,
     handler: async (params) => {
       const cat = getCatalog();
-      await cat.macroDrop(toUint8Array(params.attach_opaque_data), params.schema_name, params.name, params.ignore_not_found, params.transaction_opaque_data ? toUint8Array(params.transaction_opaque_data) : undefined);
+      await cat.macroDrop(toUint8Array(params.attach_opaque_data), params.schema_path, params.name, params.ignore_not_found, params.transaction_opaque_data ? toUint8Array(params.transaction_opaque_data) : undefined);
       return {};
     }
   });
@@ -6153,7 +6300,7 @@ function registerCatalogMacroMethods(protocol, getCatalog, signingKey) {
     result: RESULT_BINARY_SCHEMA,
     handler: async (params) => {
       const cat = getCatalog();
-      const macros = await cat.schemaContentsMacros(toUint8Array(params.attach_opaque_data), params.name, decodeDictValue(params.type), params.transaction_opaque_data ? toUint8Array(params.transaction_opaque_data) : undefined);
+      const macros = await cat.schemaContentsMacros(toUint8Array(params.attach_opaque_data), params.path, decodeDictValue(params.type), params.transaction_opaque_data ? toUint8Array(params.transaction_opaque_data) : undefined);
       return wrapResult({
         items: macros.map((m) => encodeMacroInfo(m))
       }, CatalogSchemaContentsMacrosResultSchema);
@@ -6168,7 +6315,7 @@ function registerCatalogIndexMethods(protocol, getCatalog, signingKey) {
     result: RESULT_BINARY_SCHEMA,
     handler: async (params) => {
       const cat = getCatalog();
-      const indexes = await cat.schemaContentsIndexes(toUint8Array(params.attach_opaque_data), params.name, params.transaction_opaque_data ? toUint8Array(params.transaction_opaque_data) : undefined);
+      const indexes = await cat.schemaContentsIndexes(toUint8Array(params.attach_opaque_data), params.path, params.transaction_opaque_data ? toUint8Array(params.transaction_opaque_data) : undefined);
       return wrapResult({
         items: indexes.map((i) => encodeIndexInfo(i))
       }, CatalogSchemaContentsIndexesResultSchema);
@@ -6179,7 +6326,7 @@ function registerCatalogIndexMethods(protocol, getCatalog, signingKey) {
     result: RESULT_BINARY_SCHEMA,
     handler: async (params) => {
       const cat = getCatalog();
-      const info = await cat.indexGet(toUint8Array(params.attach_opaque_data), params.schema_name, params.name, params.transaction_opaque_data ? toUint8Array(params.transaction_opaque_data) : undefined);
+      const info = await cat.indexGet(toUint8Array(params.attach_opaque_data), params.schema_path, params.name, params.transaction_opaque_data ? toUint8Array(params.transaction_opaque_data) : undefined);
       return wrapResult({
         items: info ? [encodeIndexInfo(info)] : []
       }, CatalogIndexGetResultSchema);
@@ -6199,7 +6346,7 @@ function registerCatalogMethods(protocol, catalog, _catalogName, signingKey) {
 
 // src/protocol/dispatch.ts
 function buildVgiProtocol(config) {
-  const protocol = new Protocol("vgi");
+  const protocol = new Protocol("vgi", { protocolVersion: "2.0.0" });
   registerFunctionMethods(protocol, {
     registry: config.registry,
     recoverExchangeState: config.recoverExchangeState,
@@ -6261,9 +6408,9 @@ function notModified(request, etag, extra) {
 }
 function createLandingRoutes(info) {
   return (request, ctx) => {
-    const path2 = ctx.url.pathname;
+    const path = ctx.url.pathname;
     const { prefix } = ctx;
-    if (path2 === prefix || path2 === `${prefix}/`) {
+    if (path === prefix || path === `${prefix}/`) {
       const accept = request.headers.get("Accept") ?? "";
       const wantJson = ctx.url.searchParams.get("format") === "json" || accept.includes("application/json") && !accept.includes("text/html");
       if (wantJson) {
@@ -6278,9 +6425,9 @@ function createLandingRoutes(info) {
           oauth: ctx.oauthActive,
           cupola_base: info.cupolaBase ?? DEFAULT_CUPOLA_BASE
         });
-        const headers2 = new Headers({ "Content-Type": "application/json" });
-        ctx.addCorsHeaders(headers2);
-        return new Response(body, { status: 200, headers: headers2 });
+        const headers = new Headers({ "Content-Type": "application/json" });
+        ctx.addCorsHeaders(headers);
+        return new Response(body, { status: 200, headers });
       }
       landingEtag ??= etagFor(LANDING_HTML_BYTES);
       const conditional = notModified(request, landingEtag);
@@ -6296,7 +6443,7 @@ function createLandingRoutes(info) {
       ctx.addCorsHeaders(headers);
       return new Response(LANDING_HTML_BYTES, { status: 200, headers });
     }
-    if (path2 === `${prefix}/vgi-client.js`) {
+    if (path === `${prefix}/vgi-client.js`) {
       bundleEtag ??= etagFor(CLIENT_BUNDLE_BYTES);
       const conditional = notModified(request, bundleEtag);
       if (conditional) {
@@ -6322,10 +6469,10 @@ function ensureRequestAuthStorage() {
   if (requestAuthStorage !== undefined)
     return Promise.resolve(requestAuthStorage);
   requestAuthStoragePending ??= import("async_hooks").then((mod) => {
-    const storage2 = new mod.AsyncLocalStorage;
-    requestAuthStorage = storage2;
-    setRequestAuthScope(storage2);
-    return storage2;
+    const storage = new mod.AsyncLocalStorage;
+    requestAuthStorage = storage;
+    setRequestAuthScope(storage);
+    return storage;
   }).catch(() => {
     requestAuthStorage = null;
     return null;
@@ -6366,16 +6513,19 @@ function createVgiFetch(opts) {
     stateSerializer: arrowStateSerializer,
     dispatchHook: REQUEST_AUTH_DISPATCH_HOOK,
     authenticate: opts.authenticate,
+    peerIdentityProviders: opts.peerIdentityProviders,
+    peerAuthenticationPolicy: opts.peerAuthenticationPolicy,
+    peerResolutionContext: opts.peerResolutionContext,
     corsOrigins: opts.corsOrigins === null ? undefined : opts.corsOrigins ?? "*",
     repositoryUrl: opts.repositoryUrl,
     extraRoutes: createLandingRoutes(opts.landingInfo),
     enableLandingPage: false
   });
   return async (req) => {
-    const storage2 = await ensureRequestAuthStorage();
-    if (!storage2)
+    const storage = await ensureRequestAuthStorage();
+    if (!storage)
       return handler(req);
-    return storage2.run({}, () => handler(req));
+    return storage.run({}, () => handler(req));
   };
 }
 
@@ -6383,8 +6533,8 @@ function createVgiFetch(opts) {
 var DEFAULT_PORT = 8787;
 var DEFAULT_TOKEN_TTL = 3600;
 var SIGNING_KEY_BYTES = 32;
-function parseSigningKeyHex(hex2) {
-  const cleaned = hex2.trim();
+function parseSigningKeyHex(hex) {
+  const cleaned = hex.trim();
   const expected = SIGNING_KEY_BYTES * 2;
   if (cleaned.length !== expected || !/^[0-9a-fA-F]+$/.test(cleaned)) {
     throw new Error(`VGI_SIGNING_KEY must be exactly ${expected} hex characters ` + `(${SIGNING_KEY_BYTES} bytes); got ${cleaned.length}. ` + `Generate one with: openssl rand -hex ${SIGNING_KEY_BYTES}`);
@@ -6440,6 +6590,11 @@ function createVgiWorkerFetch(opts) {
   const signingKey = resolveSigningKey(opts.signingKey, env);
   const tokenTtl = resolveTokenTtl(opts.tokenTtl, env);
   const corsOrigins = opts.corsOrigins === null ? null : opts.corsOrigins ?? env.CORS_ORIGINS;
+  const bridge = opts.irohBridge;
+  if (bridge && !bridge.peerResolutionContext) {
+    throw new Error("irohBridge requires a peerResolutionContext when createVgiWorkerFetch is used without serveVgiWorker");
+  }
+  const trustedProxyAddresses = bridge?.trustedProxyAddresses ?? ["127.0.0.1"];
   return createVgiFetch({
     protocol: { registry: opts.registry, catalogInterface: opts.catalogInterface },
     signingKey,
@@ -6449,7 +6604,10 @@ function createVgiWorkerFetch(opts) {
     corsOrigins,
     repositoryUrl: opts.repositoryUrl,
     landingInfo: { name: opts.name, doc: opts.doc, version: opts.version },
-    authenticate: opts.authenticate
+    authenticate: opts.authenticate,
+    peerIdentityProviders: bridge ? [irohForwardedHeaderIdentityProvider({ issuer: bridge.issuer, trustedProxyAddresses })] : undefined,
+    peerAuthenticationPolicy: bridge ? bridge.authenticate === false ? observePeerIdentity : peerIdentityPrimary("iroh") : undefined,
+    peerResolutionContext: bridge?.peerResolutionContext
   });
 }
 function serveVgiWorker(opts) {
@@ -6459,8 +6617,24 @@ function serveVgiWorker(opts) {
   }
   const env = opts.env ?? process.env;
   const port = resolvePort(opts.port, env);
-  const fetch2 = createVgiWorkerFetch(opts);
-  const server = runtime.serve({ port, fetch: fetch2 });
+  const hostname = opts.hostname ?? (opts.irohBridge ? "127.0.0.1" : undefined);
+  if (opts.irohBridge && !["127.0.0.1", "::1", "localhost"].includes(hostname ?? "")) {
+    throw new Error("an Iroh HTTP bridge upstream must bind loopback");
+  }
+  let server;
+  const bridge = opts.irohBridge && !opts.irohBridge.peerResolutionContext ? {
+    ...opts.irohBridge,
+    peerResolutionContext(request) {
+      const immediatePeer = server.requestIP?.(request)?.address;
+      const forwarded = request.headers.get(IROH_FORWARDED_ENDPOINT_HEADER);
+      return {
+        immediatePeer,
+        headers: forwarded === null ? {} : { [IROH_FORWARDED_ENDPOINT_HEADER]: [forwarded] }
+      };
+    }
+  } : opts.irohBridge;
+  const fetch2 = createVgiWorkerFetch({ ...opts, irohBridge: bridge });
+  server = runtime.serve({ port, hostname, fetch: fetch2 });
   if (!opts.quiet) {
     const base = `http://localhost:${server.port}`;
     console.log(`${opts.name} VGI HTTP worker listening on ${base}`);
@@ -6481,4 +6655,4 @@ export {
   serveVgiWorker
 };
 
-//# debugId=09DDD8782DD92B2764756E2164756E21
+//# debugId=3C4394ABF730E98C64756E2164756E21