@rocicorp/zero 0.21.2025060401 → 0.21.2025060600

package/out/analyze-query/src/bin-analyze.js

@@ -12,17 +12,20 @@ import { transformAndHashQuery } from "../../zero-cache/src/auth/read-authorizer
 import { appOptions, shardOptions, ZERO_ENV_VAR_PREFIX, zeroOptions, } from "../../zero-cache/src/config/zero-config.js";
 import { loadSchemaAndPermissions } from "../../zero-cache/src/scripts/permissions.js";
 import { pgClient } from "../../zero-cache/src/types/pg.js";
+import { hydrate } from "../../zero-cache/src/services/view-syncer/pipeline-driver.js";
 import { getShardID, upstreamSchema } from "../../zero-cache/src/types/shards.js";
 import { mapAST, } from "../../zero-protocol/src/ast.js";
 import { clientToServer, serverToClient, } from "../../zero-schema/src/name-mapper.js";
 import { buildPipeline } from "../../zql/src/builder/builder.js";
-import { Catch } from "../../zql/src/ivm/catch.js";
 import { MemoryStorage } from "../../zql/src/ivm/memory-storage.js";
 import { completedAST, newQuery, } from "../../zql/src/query/query-impl.js";
 import {} from "../../zql/src/query/query.js";
 import { Database } from "../../zqlite/src/db.js";
 import { runtimeDebugFlags, runtimeDebugStats, } from "../../zqlite/src/runtime-debug.js";
 import { TableSource } from "../../zqlite/src/table-source.js";
+import { hashOfAST } from "../../zero-protocol/src/query-hash.js";
+import { computeZqlSpecs } from "../../zero-cache/src/db/lite-tables.js";
+import { assert } from "../../shared/src/asserts.js";
 const options = {
     replica: zeroOptions.replica,
     ast: {
@@ -77,6 +80,19 @@ const options = {
     },
     app: appOptions,
     shard: shardOptions,
+    outputVendedRows: {
+        type: v.boolean().default(false),
+        desc: [
+            'Whether to output the rows which were read from the replica in order to execute the analyzed query. ',
+            'If the same row is read more than once it will be logged once for each time it was read.',
+        ],
+    },
+    outputSyncedRows: {
+        type: v.boolean().default(false),
+        desc: [
+            'Whether to output the rows which would be synced to the client for the analyzed query.',
+        ],
+    },
     // This args is hidden as it is only present to:
     // 1. Parse it out of the env if it exists
     // 2. Use it to default the `cvr` to `upstream` if `cvr` is not provided
@@ -101,7 +117,9 @@ const config = {
         db: cfg.cvr.db ?? cfg.upstream.db,
     },
 };
-runtimeDebugFlags.trackRowsVended = true;
+runtimeDebugFlags.trackRowCountsVended = true;
+runtimeDebugFlags.trackRowsVended = config.outputVendedRows;
+const clientGroupID = 'clientGroupIDForAnalyze';
 const lc = createSilentLogContext();
 const db = new Database(lc, config.replica.file);
 const { schema, permissions } = await loadSchemaAndPermissions(lc, config.schemaPath);
@@ -115,7 +133,7 @@ const host = {
         if (source) {
             return source;
         }
-        source = new TableSource(lc, testLogConfig, '', db, serverTableName, Object.fromEntries(Object.entries(schema.tables[clientTableName].columns).map(([colName, column]) => [
+        source = new TableSource(lc, testLogConfig, clientGroupID, db, serverTableName, Object.fromEntries(Object.entries(schema.tables[clientTableName].columns).map(([colName, column]) => [
             clientToServerMapper.columnName(clientTableName, colName),
             column,
         ])), schema.tables[clientTableName].primaryKey.map(col => clientToServerMapper.columnName(clientTableName, col)));
@@ -135,6 +153,9 @@ const host = {
     addServerQuery() {
         return () => { };
     },
+    addCustomQuery() {
+        return () => { };
+    },
     updateServerQuery() { },
     onQueryMaterialized() { },
     onTransactionCommit() {
@@ -171,14 +192,36 @@ async function runAst(ast, isTransformed) {
         if (!config.authData) {
             console.warn(chalk.yellow('No auth data provided. Permission rules will compare to `NULL` wherever an auth data field is referenced.'));
         }
-        ast = transformAndHashQuery(lc, ast, permissions, authData, false).query;
+        ast = transformAndHashQuery(lc, clientGroupID, ast, permissions, authData, false).transformedAst;
         console.log(chalk.blue.bold('\n\n=== Query After Permissions: ===\n'));
         console.log(await formatOutput(ast.table + astToZQL(ast)));
     }
+    const tableSpecs = computeZqlSpecs(lc, db);
     const pipeline = buildPipeline(ast, host);
-    const output = new Catch(pipeline);
     const start = performance.now();
-    output.fetch();
+    if (config.outputSyncedRows) {
+        console.log(chalk.blue.bold('\n\n=== Synced rows: ===\n'));
+    }
+    let syncedRowCount = 0;
+    const rowsByTable = {};
+    for (const rowChange of hydrate(pipeline, hashOfAST(ast), tableSpecs)) {
+        assert(rowChange.type === 'add');
+        syncedRowCount++;
+        if (config.outputSyncedRows) {
+            let rows = rowsByTable[rowChange.table];
+            if (!rows) {
+                rows = [];
+                rowsByTable[rowChange.table] = rows;
+            }
+            rows.push(rowChange.row);
+        }
+    }
+    if (config.outputSyncedRows) {
+        for (const [source, rows] of Object.entries(rowsByTable)) {
+            console.log(chalk.bold(`${source}:`), rows);
+        }
+        console.log(chalk.bold('total synced rows:'), syncedRowCount);
+    }
     const end = performance.now();
     return [start, end];
 }
@@ -205,24 +248,44 @@ async function runHash(hash) {
 }
 console.log(chalk.blue.bold('=== Query Stats: ===\n'));
 showStats();
+if (config.outputVendedRows) {
+    console.log(chalk.blue.bold('=== Vended Rows: ===\n'));
+    for (const source of sources.values()) {
+        const entries = [
+            ...(runtimeDebugStats
+                .getVendedRows()
+                .get(clientGroupID)
+                ?.get(source.table)
+                ?.entries() ?? []),
+        ];
+        console.log(chalk.bold(`${source.table}:`), Object.fromEntries(entries));
+    }
+}
 console.log(chalk.blue.bold('\n\n=== Query Plans: ===\n'));
 explainQueries();
 function showStats() {
     let totalRowsConsidered = 0;
     for (const source of sources.values()) {
-        const entires = [
-            ...(runtimeDebugStats.getRowsVended('')?.get(source.table)?.entries() ??
-                []),
+        const entries = [
+            ...(runtimeDebugStats
+                .getVendedRowCounts()
+                .get(clientGroupID)
+                ?.get(source.table)
+                ?.entries() ?? []),
         ];
-        totalRowsConsidered += entires.reduce((acc, entry) => acc + entry[1], 0);
-        console.log(chalk.bold(source.table + ' vended:'), entires);
+        totalRowsConsidered += entries.reduce((acc, entry) => acc + entry[1], 0);
+        console.log(chalk.bold(source.table + ' vended:'), Object.fromEntries(entries));
     }
     console.log(chalk.bold('total rows considered:'), colorRowsConsidered(totalRowsConsidered));
     console.log(chalk.bold('time:'), colorTime(end - start), 'ms');
 }
 function explainQueries() {
     for (const source of sources.values()) {
-        const queries = runtimeDebugStats.getRowsVended('')?.get(source.table)?.keys() ?? [];
+        const queries = runtimeDebugStats
+            .getVendedRowCounts()
+            .get(clientGroupID)
+            ?.get(source.table)
+            ?.keys() ?? [];
         for (const query of queries) {
             console.log(chalk.bold('query'), query);
             console.log(db

package/out/analyze-query/src/bin-analyze.js.map

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

package/out/analyze-query/src/bin-transform.js

@@ -29,7 +29,7 @@ const lc = new LogContext('debug', {}, consoleLogSink);
 const { permissions } = await loadSchemaAndPermissions(lc, config.schema);
 const cvrDB = pgClient(lc, config.cvr.db);
 const rows = await cvrDB `select "clientAST", "internal" from ${cvrDB(upstreamSchema(getShardID(config)) + '/cvr')}."queries" where "queryHash" = ${must(config.hash)} limit 1;`;
-const queryAst = transformAndHashQuery(lc, rows[0].clientAST, permissions, {}, rows[0].internal).query;
+const queryAst = transformAndHashQuery(lc, '', rows[0].clientAST, permissions, {}, rows[0].internal).transformedAst;
 console.log('\n=== AST ===\n');
 console.log(JSON.stringify(queryAst, null, 2));
 console.log('\n=== ZQL ===\n');

package/out/analyze-query/src/bin-transform.js.map

@@ -1 +1 @@
-{"version":3,"file":"bin-transform.js","sourceRoot":"","sources":["../../../../analyze-query/src/bin-transform.ts"],"names":[],"mappings":"AAAA,+BAA+B;AAC/B,OAAO,yBAAyB,CAAC;AAEjC,OAAO,EAAC,cAAc,EAAE,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAC5D,OAAO,EAAC,IAAI,EAAC,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAC,YAAY,EAAC,MAAM,6BAA6B,CAAC;AACzD,OAAO,KAAK,CAAC,MAAM,4BAA4B,CAAC;AAChD,OAAO,EAAC,qBAAqB,EAAC,MAAM,8CAA8C,CAAC;AACnF,OAAO,EACL,UAAU,EACV,YAAY,EACZ,mBAAmB,GACpB,MAAM,4CAA4C,CAAC;AACpD,OAAO,EAAC,QAAQ,EAAC,MAAM,kCAAkC,CAAC;AAC1D,OAAO,EAAC,wBAAwB,EAAC,MAAM,6CAA6C,CAAC;AACrF,OAAO,EAAC,UAAU,EAAE,cAAc,EAAC,MAAM,sCAAsC,CAAC;AAChF,OAAO,EAAC,QAAQ,EAAC,MAAM,oCAAoC,CAAC;AAC5D,OAAO,EAAC,YAAY,EAAC,MAAM,gCAAgC,CAAC;AAE5D,MAAM,OAAO,GAAG;IACd,GAAG,EAAE,EAAC,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,EAAC;IACrB,MAAM,EAAE;QACN,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,aAAa,CAAC;QACvC,IAAI,EAAE,CAAC,0BAA0B,CAAC;KACnC;IACD,GAAG,EAAE,UAAU;IACf,KAAK,EAAE,YAAY;IACnB,IAAI,EAAE;QACJ,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;QAC3B,IAAI,EAAE,CAAC,yCAAyC,CAAC;KAClD;CACF,CAAC;AAEF,MAAM,MAAM,GAAG,YAAY,CACzB,OAAO,EACP,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EACrB,mBAAmB,CACpB,CAAC;AAEF,MAAM,EAAE,GAAG,IAAI,UAAU,CAAC,OAAO,EAAE,EAAE,EAAE,cAAc,CAAC,CAAC;AACvD,MAAM,EAAC,WAAW,EAAC,GAAG,MAAM,wBAAwB,CAAC,EAAE,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;AAExE,MAAM,KAAK,GAAG,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;AAE1C,MAAM,IAAI,GACR,MAAM,KAAK,CAAA,uCAAuC,KAAK,CAAC,cAAc,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,GAAG,MAAM,CAAC,kCAAkC,IAAI,CACxI,MAAM,CAAC,IAAI,CACZ,WAAW,CAAC;AAEf,MAAM,QAAQ,GAAG,qBAAqB,CACpC,EAAE,EACF,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,EACjB,WAAW,EACX,EAAE,EACF,IAAI,CAAC,CAAC,CAAC,CAAC,QAAQ,CACjB,CAAC,KAAK,CAAC;AAER,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;AAC/B,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;AAC/C,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;AAC/B,OAAO,CAAC,GAAG,CAAC,MAAM,YAAY,CAAC,QAAQ,CAAC,KAAK,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;AAErE,MAAM,KAAK,CAAC,GAAG,EAAE,CAAC"}
+{"version":3,"file":"bin-transform.js","sourceRoot":"","sources":["../../../../analyze-query/src/bin-transform.ts"],"names":[],"mappings":"AAAA,+BAA+B;AAC/B,OAAO,yBAAyB,CAAC;AAEjC,OAAO,EAAC,cAAc,EAAE,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAC5D,OAAO,EAAC,IAAI,EAAC,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAC,YAAY,EAAC,MAAM,6BAA6B,CAAC;AACzD,OAAO,KAAK,CAAC,MAAM,4BAA4B,CAAC;AAChD,OAAO,EAAC,qBAAqB,EAAC,MAAM,8CAA8C,CAAC;AACnF,OAAO,EACL,UAAU,EACV,YAAY,EACZ,mBAAmB,GACpB,MAAM,4CAA4C,CAAC;AACpD,OAAO,EAAC,QAAQ,EAAC,MAAM,kCAAkC,CAAC;AAC1D,OAAO,EAAC,wBAAwB,EAAC,MAAM,6CAA6C,CAAC;AACrF,OAAO,EAAC,UAAU,EAAE,cAAc,EAAC,MAAM,sCAAsC,CAAC;AAChF,OAAO,EAAC,QAAQ,EAAC,MAAM,oCAAoC,CAAC;AAC5D,OAAO,EAAC,YAAY,EAAC,MAAM,gCAAgC,CAAC;AAE5D,MAAM,OAAO,GAAG;IACd,GAAG,EAAE,EAAC,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,EAAC;IACrB,MAAM,EAAE;QACN,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,aAAa,CAAC;QACvC,IAAI,EAAE,CAAC,0BAA0B,CAAC;KACnC;IACD,GAAG,EAAE,UAAU;IACf,KAAK,EAAE,YAAY;IACnB,IAAI,EAAE;QACJ,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;QAC3B,IAAI,EAAE,CAAC,yCAAyC,CAAC;KAClD;CACF,CAAC;AAEF,MAAM,MAAM,GAAG,YAAY,CACzB,OAAO,EACP,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EACrB,mBAAmB,CACpB,CAAC;AAEF,MAAM,EAAE,GAAG,IAAI,UAAU,CAAC,OAAO,EAAE,EAAE,EAAE,cAAc,CAAC,CAAC;AACvD,MAAM,EAAC,WAAW,EAAC,GAAG,MAAM,wBAAwB,CAAC,EAAE,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;AAExE,MAAM,KAAK,GAAG,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;AAE1C,MAAM,IAAI,GACR,MAAM,KAAK,CAAA,uCAAuC,KAAK,CAAC,cAAc,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,GAAG,MAAM,CAAC,kCAAkC,IAAI,CACxI,MAAM,CAAC,IAAI,CACZ,WAAW,CAAC;AAEf,MAAM,QAAQ,GAAG,qBAAqB,CACpC,EAAE,EACF,EAAE,EACF,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,EACjB,WAAW,EACX,EAAE,EACF,IAAI,CAAC,CAAC,CAAC,CAAC,QAAQ,CACjB,CAAC,cAAc,CAAC;AAEjB,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;AAC/B,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;AAC/C,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;AAC/B,OAAO,CAAC,GAAG,CAAC,MAAM,YAAY,CAAC,QAAQ,CAAC,KAAK,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;AAErE,MAAM,KAAK,CAAC,GAAG,EAAE,CAAC"}

package/out/{chunk-QZEJQQ3P.js → chunk-46FHIAMH.js}

@@ -87,7 +87,7 @@ import {
   withWrite,
   withWriteNoImplicitCommit,
   wrapIterable
-} from "./chunk-JZAY4BJA.js";
+} from "./chunk-PGFRDN5O.js";
 import {
   AbstractQuery,
   ExpressionBuilder,
@@ -103,6 +103,7 @@ import {
   h64,
   hasOwn,
   hashOfAST,
+  hashOfNameAndArgs,
   isProd,
   jsonObjectSchema,
   jsonSchema,
@@ -114,6 +115,7 @@ import {
   normalizeAST,
   parse,
   parseTTL,
+  readonly,
   readonlyArray,
   readonlyObject,
   rowSchema,
@@ -122,7 +124,7 @@ import {
   toStaticParam,
   transformFilters,
   valita_exports
-} from "./chunk-UAWIBMWA.js";
+} from "./chunk-FMORHZZ3.js";
 import {
   __export,
   assert,
@@ -5858,11 +5860,26 @@ var StaticQuery = class _StaticQuery extends AbstractQuery {
   expressionBuilder() {
     return new ExpressionBuilder(this._exists);
   }
-  constructor(schema, tableName, ast, format, currentJunction) {
-    super(schema, tableName, ast, format, "permissions", currentJunction);
+  constructor(schema, tableName, ast, format, customQueryID, currentJunction) {
+    super(
+      schema,
+      tableName,
+      ast,
+      format,
+      "permissions",
+      customQueryID,
+      currentJunction
+    );
   }
-  [newQuerySymbol](schema, tableName, ast, format, currentJunction) {
-    return new _StaticQuery(schema, tableName, ast, format, currentJunction);
+  [newQuerySymbol](schema, tableName, ast, format, customQueryID, currentJunction) {
+    return new _StaticQuery(
+      schema,
+      tableName,
+      ast,
+      format,
+      customQueryID,
+      currentJunction
+    );
   }
   get ast() {
     return this._completeAst();
@@ -6180,7 +6197,12 @@ var putOpSchema = valita_exports.object({
   ttl: valita_exports.number().optional()
 });
 var upPutOpSchema = putOpSchema.extend({
-  ast: astSchema
+  // All fields are optional in this transitional period.
+  // - ast is filled in for client queries
+  // - name and args are filled in for custom queries
+  ast: astSchema.optional(),
+  name: valita_exports.string().optional(),
+  args: readonly(valita_exports.array(jsonSchema)).optional()
 });
 var delOpSchema = valita_exports.object({
   op: valita_exports.literal("del"),
@@ -6551,7 +6573,7 @@ var downstreamSchema = valita_exports.union(
 );
 
 // ../zero-protocol/src/protocol-version.ts
-var PROTOCOL_VERSION = 17;
+var PROTOCOL_VERSION = 18;
 var MIN_SERVER_SUPPORTED_SYNC_PROTOCOL = 6;
 assert(MIN_SERVER_SUPPORTED_SYNC_PROTOCOL < PROTOCOL_VERSION);
 
@@ -7806,6 +7828,7 @@ var ZeroContext = class {
   // that needs to be fixed.
   #mainSources;
   #addQuery;
+  #addCustomQuery;
   #updateQuery;
   #batchViewUpdates;
   #commitListeners = /* @__PURE__ */ new Set();
@@ -7817,7 +7840,7 @@ var ZeroContext = class {
    * "complete" once the server has sent back the query result.
    */
   defaultQueryComplete = false;
-  constructor(lc, mainSources, addQuery, updateQuery, batchViewUpdates, slowMaterializeThreshold, assertValidRunOptions3) {
+  constructor(lc, mainSources, addQuery, addCustomQuery, updateQuery, batchViewUpdates, slowMaterializeThreshold, assertValidRunOptions3) {
     this.#mainSources = mainSources;
     this.#addQuery = addQuery;
     this.#updateQuery = updateQuery;
@@ -7825,10 +7848,19 @@ var ZeroContext = class {
     this.#lc = lc;
     this.#slowMaterializeThreshold = slowMaterializeThreshold;
     this.assertValidRunOptions = assertValidRunOptions3;
+    this.#addCustomQuery = addCustomQuery;
   }
   getSource(name) {
     return this.#mainSources.getSource(name);
   }
+  addCustomQuery(customQueryID, ttl, gotCallback) {
+    return this.#addCustomQuery(
+      customQueryID.name,
+      customQueryID.args,
+      ttl,
+      gotCallback
+    );
+  }
   addServerQuery(ast, ttl, gotCallback) {
     return this.#addQuery(ast, ttl, gotCallback);
   }
@@ -8195,6 +8227,7 @@ function makeSchemaQuery(lc, schema, ivmBranch, slowMaterializeThreshold) {
     lc,
     ivmBranch,
     () => emptyFunction,
+    () => emptyFunction,
     () => {
     },
     (applyViewUpdates) => applyViewUpdates(),
@@ -8544,7 +8577,7 @@ function makeMessage(message, context, logLevel) {
 }
 
 // ../zero-client/src/client/version.ts
-var version2 = "0.21.2025060401";
+var version2 = "0.21.2025060600";
 
 // ../zero-client/src/client/log-options.ts
 var LevelFilterLogSink = class {
@@ -9125,37 +9158,76 @@ var QueryManager = class {
     }
     return patch;
   }
-  add(ast, ttl, gotCallback) {
+  addCustom(name, args, ttl, gotCallback) {
+    const queryId = hashOfNameAndArgs(name, args);
+    return this.#add(
+      queryId,
+      void 0,
+      // normalized is undefined for custom queries
+      name,
+      args,
+      ttl,
+      gotCallback
+    );
+  }
+  addLegacy(ast, ttl, gotCallback) {
     const normalized = normalizeAST(ast);
     const astHash = hashOfAST(normalized);
-    let entry = this.#queries.get(astHash);
-    this.#recentQueries.delete(astHash);
+    return this.#add(
+      astHash,
+      normalized,
+      void 0,
+      // name is undefined for legacy queries
+      void 0,
+      // args are undefined for legacy queries
+      ttl,
+      gotCallback
+    );
+  }
+  #add(queryId, normalized, name, args, ttl, gotCallback) {
+    assert(
+      normalized === void 0 && name !== void 0 && args !== void 0 || normalized !== void 0 && name === void 0 && args === void 0,
+      "Either normalized or name and args must be defined, but not both."
+    );
+    let entry = this.#queries.get(queryId);
+    this.#recentQueries.delete(queryId);
     if (!entry) {
-      const serverAST = mapAST(normalized, this.#clientToServer);
+      if (normalized !== void 0) {
+        normalized = mapAST(normalized, this.#clientToServer);
+      }
       entry = {
-        normalized: serverAST,
+        normalized,
+        name,
+        args,
         count: 1,
         gotCallbacks: gotCallback ? [gotCallback] : [],
         ttl
       };
-      this.#queries.set(astHash, entry);
+      this.#queries.set(queryId, entry);
       this.#send([
         "changeDesiredQueries",
         {
           desiredQueriesPatch: [
-            { op: "put", hash: astHash, ast: serverAST, ttl: parseTTL(ttl) }
+            {
+              op: "put",
+              hash: queryId,
+              ast: normalized,
+              name,
+              args,
+              ttl: parseTTL(ttl)
+            }
           ]
         }
       ]);
     } else {
       ++entry.count;
-      this.#updateEntry(entry, astHash, ttl);
+      this.#updateEntry(entry, queryId, ttl);
       if (gotCallback) {
         entry.gotCallbacks.push(gotCallback);
       }
     }
     if (gotCallback) {
-      gotCallback(this.#gotQueries.has(astHash));
+      gotCallback(this.#gotQueries.has(queryId));
     }
     let removed = false;
     return () => {
@@ -9165,11 +9237,11 @@ var QueryManager = class {
       removed = true;
       if (this.#mutationTracker.size > 0) {
         this.#pendingRemovals.push(
-          () => this.#remove(entry, astHash, gotCallback)
+          () => this.#remove(entry, queryId, gotCallback)
         );
         return;
       }
-      this.#remove(entry, astHash, gotCallback);
+      this.#remove(entry, queryId, gotCallback);
     };
   }
   update(ast, ttl) {
@@ -9189,6 +9261,8 @@ var QueryManager = class {
               op: "put",
               hash,
               ast: entry.normalized,
+              name: entry.name,
+              args: entry.args,
               ttl: parseTTL(ttl)
             }
           ]
@@ -10021,7 +10095,8 @@ var Zero = class {
     this.#zeroContext = new ZeroContext(
       lc,
       this.#ivmMain,
-      (ast, ttl, gotCallback) => this.#queryManager.add(ast, ttl, gotCallback),
+      (ast, ttl, gotCallback) => this.#queryManager.addLegacy(ast, ttl, gotCallback),
+      (customQueryID, ttl, gotCallback) => this.#queryManager.addCustom(customQueryID, ttl, gotCallback),
       (ast, ttl) => this.#queryManager.update(ast, ttl),
       batchViewUpdates,
       slowMaterializeThreshold,
@@ -11020,7 +11095,7 @@ var Zero = class {
    */
   async inspect() {
     BUNDLE_SIZE: {
-      const m = await import("./inspector-KBNUEBWB.js");
+      const m = await import("./inspector-M3BFJT55.js");
       return m.newInspector(this.#rep, this.#schema, async () => {
         await this.#connectResolver.promise;
         return this.#socket;
@@ -11147,4 +11222,4 @@ export {
   update_needed_reason_type_enum_exports,
   Zero
 };
-//# sourceMappingURL=chunk-QZEJQQ3P.js.map
+//# sourceMappingURL=chunk-46FHIAMH.js.map