@open-mercato/shared 0.6.8-develop.7030.1.b84302d973 → 0.6.8-develop.7032.1.70d74d4bfe

package/dist/lib/openapi/crud.js

@@ -8,7 +8,10 @@ function createPagedListResponseSchema(itemSchema, options = {}) {
     total: z.number(),
     page: paginationMetaOptional ? z.number().optional() : z.number(),
     pageSize: paginationMetaOptional ? z.number().optional() : z.number(),
-    totalPages: z.number()
+    totalPages: z.number(),
+    // Present (true) only when the list count was bounded at OM_LIST_COUNT_CAP:
+    // `total` is then a floor, not an exact value.
+    totalIsCapped: z.boolean().optional()
   });
 }
 function withIdsQueryParam(schema) {

package/dist/lib/openapi/crud.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/lib/openapi/crud.ts"],
-  "sourcesContent": ["import { z, type ZodTypeAny } from 'zod'\nimport type { OpenApiResponseDoc, OpenApiRouteDoc } from './types'\n\nexport const defaultCreateResponseSchema = z.object({ id: z.string().uuid().nullable() })\nexport const defaultOkResponseSchema = z.object({ ok: z.literal(true) })\n\nexport type PagedListResponseOptions = {\n  paginationMetaOptional?: boolean\n}\n\nexport function createPagedListResponseSchema(itemSchema: ZodTypeAny, options: PagedListResponseOptions = {}) {\n  const paginationMetaOptional = options.paginationMetaOptional ?? false\n\n  return z.object({\n    items: z.array(itemSchema),\n    total: z.number(),\n    page: paginationMetaOptional ? z.number().optional() : z.number(),\n    pageSize: paginationMetaOptional ? z.number().optional() : z.number(),\n    totalPages: z.number(),\n  })\n}\n\ntype CrudMethodConfig = {\n  schema: ZodTypeAny\n  description?: string\n  responseSchema?: ZodTypeAny\n}\n\ntype CrudCreateConfig = CrudMethodConfig & {\n  status?: number\n}\n\ntype CrudDeleteConfig = {\n  schema?: ZodTypeAny\n  description?: string\n  responseSchema?: ZodTypeAny\n  errors?: OpenApiResponseDoc[]\n}\n\nexport type CrudOpenApiOptions = {\n  tag?: string\n  resourceName: string\n  pluralName?: string\n  description?: string\n  querySchema?: ZodTypeAny\n  listResponseSchema: ZodTypeAny\n  create?: CrudCreateConfig\n  update?: CrudMethodConfig\n  del?: CrudDeleteConfig\n}\n\nexport type CrudTextContext = {\n  resourceName: string\n  resourceLower: string\n  pluralName: string\n  pluralLower: string\n}\n\nexport type CrudOpenApiFactoryConfig = {\n  defaultTag: string\n  defaultCreateResponseSchema?: ZodTypeAny\n  defaultOkResponseSchema?: ZodTypeAny\n  makeListDescription?: (ctx: CrudTextContext) => string\n  makeCreateDescription?: (ctx: CrudTextContext) => string\n  makeCreateRequestBodyDescription?: (ctx: CrudTextContext) => string\n  makeUpdateDescription?: (ctx: CrudTextContext) => string\n  makeUpdateRequestBodyDescription?: (ctx: CrudTextContext) => string\n  makeDeleteDescription?: (ctx: CrudTextContext) => string\n  makeDeleteRequestBodyDescription?: (ctx: CrudTextContext) => string\n}\n\nfunction withIdsQueryParam(schema: ZodTypeAny | undefined): ZodTypeAny | undefined {\n  if (!schema) return schema\n  if (!(schema instanceof z.ZodObject)) return schema\n  return schema.extend({\n    ids: z\n      .string()\n      .optional()\n      .describe('Comma-separated list of record UUIDs to filter by (max 200).'),\n  })\n}\n\nfunction resolveDefault(\n  factory: ((ctx: CrudTextContext) => string) | undefined,\n  ctx: CrudTextContext,\n  fallback: string,\n) {\n  if (typeof factory === 'function') return factory(ctx)\n  return fallback\n}\n\nexport function createCrudOpenApiFactory(config: CrudOpenApiFactoryConfig) {\n  return function createCrudOpenApi(options: CrudOpenApiOptions): OpenApiRouteDoc {\n    const {\n      resourceName,\n      pluralName,\n      tag,\n      description,\n      querySchema,\n      listResponseSchema,\n      create,\n      update,\n      del,\n    } = options\n\n    const plural = pluralName ?? `${resourceName}s`\n    const resourceLower = resourceName.toLowerCase()\n    const pluralLower = plural.toLowerCase()\n    const context: CrudTextContext = {\n      resourceName,\n      resourceLower,\n      pluralName: plural,\n      pluralLower,\n    }\n\n    const fallbackCreateResponseSchema = config.defaultCreateResponseSchema ?? defaultCreateResponseSchema\n    const fallbackOkResponseSchema = config.defaultOkResponseSchema ?? defaultOkResponseSchema\n\n    const methods: NonNullable<OpenApiRouteDoc['methods']> = {}\n\n    methods.GET = {\n      summary: `List ${pluralLower}`,\n      description:\n        description ?? resolveDefault(config.makeListDescription, context, `Returns a paginated collection of ${pluralLower}.`),\n      query: withIdsQueryParam(querySchema),\n      responses: [\n        {\n          status: 200,\n          description: `Paginated ${pluralLower}`,\n          schema: listResponseSchema,\n        },\n      ],\n    }\n\n    if (create) {\n      const createDescription =\n        create.description ??\n        resolveDefault(config.makeCreateDescription, context, `Creates a new ${resourceLower}.`)\n\n      const createBodyDescription =\n        resolveDefault(\n          config.makeCreateRequestBodyDescription,\n          context,\n          create.description ?? `Payload describing the ${resourceLower} to create.`,\n        )\n\n      methods.POST = {\n        summary: `Create ${resourceLower}`,\n        description: createDescription,\n        requestBody: {\n          schema: create.schema,\n          description: createBodyDescription,\n        },\n        responses: [\n          {\n            status: create.status ?? 201,\n            description: `${resourceName} created`,\n            schema: create.responseSchema ?? fallbackCreateResponseSchema,\n          },\n        ],\n      }\n    }\n\n    if (update) {\n      const updateDescription =\n        update.description ??\n        resolveDefault(config.makeUpdateDescription, context, `Updates an existing ${resourceLower} by id.`)\n\n      const updateBodyDescription =\n        resolveDefault(\n          config.makeUpdateRequestBodyDescription,\n          context,\n          update.description ?? `Fields to update on the ${resourceLower}.`,\n        )\n\n      methods.PUT = {\n        summary: `Update ${resourceLower}`,\n        description: updateDescription,\n        requestBody: {\n          schema: update.schema,\n          description: updateBodyDescription,\n        },\n        responses: [\n          {\n            status: 200,\n            description: `${resourceName} updated`,\n            schema: update.responseSchema ?? fallbackOkResponseSchema,\n          },\n        ],\n      }\n    }\n\n    if (del) {\n      const deleteDescription =\n        del.description ??\n        resolveDefault(config.makeDeleteDescription, context, `Deletes a ${resourceLower} identified by id.`)\n\n      const deleteBodyDescription =\n        resolveDefault(\n          config.makeDeleteRequestBodyDescription,\n          context,\n          del.description ?? 'Identifier payload.',\n        )\n\n      methods.DELETE = {\n        summary: `Delete ${resourceLower}`,\n        description: deleteDescription,\n        requestBody: del.schema\n          ? {\n              schema: del.schema,\n              description: deleteBodyDescription,\n            }\n          : undefined,\n        responses: [\n          {\n            status: 200,\n            description: `${resourceName} deleted`,\n            schema: del.responseSchema ?? fallbackOkResponseSchema,\n          },\n        ],\n        ...(del.errors && del.errors.length > 0 ? { errors: del.errors } : {}),\n      }\n    }\n\n    return {\n      tag: tag ?? config.defaultTag,\n      summary: `${resourceName} management`,\n      methods,\n    }\n  }\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["import { z, type ZodTypeAny } from 'zod'\nimport type { OpenApiResponseDoc, OpenApiRouteDoc } from './types'\n\nexport const defaultCreateResponseSchema = z.object({ id: z.string().uuid().nullable() })\nexport const defaultOkResponseSchema = z.object({ ok: z.literal(true) })\n\nexport type PagedListResponseOptions = {\n  paginationMetaOptional?: boolean\n}\n\nexport function createPagedListResponseSchema(itemSchema: ZodTypeAny, options: PagedListResponseOptions = {}) {\n  const paginationMetaOptional = options.paginationMetaOptional ?? false\n\n  return z.object({\n    items: z.array(itemSchema),\n    total: z.number(),\n    page: paginationMetaOptional ? z.number().optional() : z.number(),\n    pageSize: paginationMetaOptional ? z.number().optional() : z.number(),\n    totalPages: z.number(),\n    // Present (true) only when the list count was bounded at OM_LIST_COUNT_CAP:\n    // `total` is then a floor, not an exact value.\n    totalIsCapped: z.boolean().optional(),\n  })\n}\n\ntype CrudMethodConfig = {\n  schema: ZodTypeAny\n  description?: string\n  responseSchema?: ZodTypeAny\n}\n\ntype CrudCreateConfig = CrudMethodConfig & {\n  status?: number\n}\n\ntype CrudDeleteConfig = {\n  schema?: ZodTypeAny\n  description?: string\n  responseSchema?: ZodTypeAny\n  errors?: OpenApiResponseDoc[]\n}\n\nexport type CrudOpenApiOptions = {\n  tag?: string\n  resourceName: string\n  pluralName?: string\n  description?: string\n  querySchema?: ZodTypeAny\n  listResponseSchema: ZodTypeAny\n  create?: CrudCreateConfig\n  update?: CrudMethodConfig\n  del?: CrudDeleteConfig\n}\n\nexport type CrudTextContext = {\n  resourceName: string\n  resourceLower: string\n  pluralName: string\n  pluralLower: string\n}\n\nexport type CrudOpenApiFactoryConfig = {\n  defaultTag: string\n  defaultCreateResponseSchema?: ZodTypeAny\n  defaultOkResponseSchema?: ZodTypeAny\n  makeListDescription?: (ctx: CrudTextContext) => string\n  makeCreateDescription?: (ctx: CrudTextContext) => string\n  makeCreateRequestBodyDescription?: (ctx: CrudTextContext) => string\n  makeUpdateDescription?: (ctx: CrudTextContext) => string\n  makeUpdateRequestBodyDescription?: (ctx: CrudTextContext) => string\n  makeDeleteDescription?: (ctx: CrudTextContext) => string\n  makeDeleteRequestBodyDescription?: (ctx: CrudTextContext) => string\n}\n\nfunction withIdsQueryParam(schema: ZodTypeAny | undefined): ZodTypeAny | undefined {\n  if (!schema) return schema\n  if (!(schema instanceof z.ZodObject)) return schema\n  return schema.extend({\n    ids: z\n      .string()\n      .optional()\n      .describe('Comma-separated list of record UUIDs to filter by (max 200).'),\n  })\n}\n\nfunction resolveDefault(\n  factory: ((ctx: CrudTextContext) => string) | undefined,\n  ctx: CrudTextContext,\n  fallback: string,\n) {\n  if (typeof factory === 'function') return factory(ctx)\n  return fallback\n}\n\nexport function createCrudOpenApiFactory(config: CrudOpenApiFactoryConfig) {\n  return function createCrudOpenApi(options: CrudOpenApiOptions): OpenApiRouteDoc {\n    const {\n      resourceName,\n      pluralName,\n      tag,\n      description,\n      querySchema,\n      listResponseSchema,\n      create,\n      update,\n      del,\n    } = options\n\n    const plural = pluralName ?? `${resourceName}s`\n    const resourceLower = resourceName.toLowerCase()\n    const pluralLower = plural.toLowerCase()\n    const context: CrudTextContext = {\n      resourceName,\n      resourceLower,\n      pluralName: plural,\n      pluralLower,\n    }\n\n    const fallbackCreateResponseSchema = config.defaultCreateResponseSchema ?? defaultCreateResponseSchema\n    const fallbackOkResponseSchema = config.defaultOkResponseSchema ?? defaultOkResponseSchema\n\n    const methods: NonNullable<OpenApiRouteDoc['methods']> = {}\n\n    methods.GET = {\n      summary: `List ${pluralLower}`,\n      description:\n        description ?? resolveDefault(config.makeListDescription, context, `Returns a paginated collection of ${pluralLower}.`),\n      query: withIdsQueryParam(querySchema),\n      responses: [\n        {\n          status: 200,\n          description: `Paginated ${pluralLower}`,\n          schema: listResponseSchema,\n        },\n      ],\n    }\n\n    if (create) {\n      const createDescription =\n        create.description ??\n        resolveDefault(config.makeCreateDescription, context, `Creates a new ${resourceLower}.`)\n\n      const createBodyDescription =\n        resolveDefault(\n          config.makeCreateRequestBodyDescription,\n          context,\n          create.description ?? `Payload describing the ${resourceLower} to create.`,\n        )\n\n      methods.POST = {\n        summary: `Create ${resourceLower}`,\n        description: createDescription,\n        requestBody: {\n          schema: create.schema,\n          description: createBodyDescription,\n        },\n        responses: [\n          {\n            status: create.status ?? 201,\n            description: `${resourceName} created`,\n            schema: create.responseSchema ?? fallbackCreateResponseSchema,\n          },\n        ],\n      }\n    }\n\n    if (update) {\n      const updateDescription =\n        update.description ??\n        resolveDefault(config.makeUpdateDescription, context, `Updates an existing ${resourceLower} by id.`)\n\n      const updateBodyDescription =\n        resolveDefault(\n          config.makeUpdateRequestBodyDescription,\n          context,\n          update.description ?? `Fields to update on the ${resourceLower}.`,\n        )\n\n      methods.PUT = {\n        summary: `Update ${resourceLower}`,\n        description: updateDescription,\n        requestBody: {\n          schema: update.schema,\n          description: updateBodyDescription,\n        },\n        responses: [\n          {\n            status: 200,\n            description: `${resourceName} updated`,\n            schema: update.responseSchema ?? fallbackOkResponseSchema,\n          },\n        ],\n      }\n    }\n\n    if (del) {\n      const deleteDescription =\n        del.description ??\n        resolveDefault(config.makeDeleteDescription, context, `Deletes a ${resourceLower} identified by id.`)\n\n      const deleteBodyDescription =\n        resolveDefault(\n          config.makeDeleteRequestBodyDescription,\n          context,\n          del.description ?? 'Identifier payload.',\n        )\n\n      methods.DELETE = {\n        summary: `Delete ${resourceLower}`,\n        description: deleteDescription,\n        requestBody: del.schema\n          ? {\n              schema: del.schema,\n              description: deleteBodyDescription,\n            }\n          : undefined,\n        responses: [\n          {\n            status: 200,\n            description: `${resourceName} deleted`,\n            schema: del.responseSchema ?? fallbackOkResponseSchema,\n          },\n        ],\n        ...(del.errors && del.errors.length > 0 ? { errors: del.errors } : {}),\n      }\n    }\n\n    return {\n      tag: tag ?? config.defaultTag,\n      summary: `${resourceName} management`,\n      methods,\n    }\n  }\n}\n"],
+  "mappings": "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",
   "names": []
 }

package/dist/lib/query/count-cap.js

@@ -0,0 +1,11 @@
+import { parseNumberWithDefault } from "../number.js";
+const DEFAULT_LIST_COUNT_CAP = 1e4;
+function resolveListCountCap() {
+  const parsed = parseNumberWithDefault(process.env.OM_LIST_COUNT_CAP, DEFAULT_LIST_COUNT_CAP, { integer: true });
+  return parsed <= 0 ? null : parsed;
+}
+export {
+  DEFAULT_LIST_COUNT_CAP,
+  resolveListCountCap
+};
+//# sourceMappingURL=count-cap.js.map

package/dist/lib/query/count-cap.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../src/lib/query/count-cap.ts"],
+  "sourcesContent": ["import { parseNumberWithDefault } from '../number'\n\nexport const DEFAULT_LIST_COUNT_CAP = 10_000\n\n/**\n * Cap on how many matching rows a list COUNT may visit before reporting\n * `total: cap` with `meta.listCountCapWarning` (surfaced to clients as\n * `totalIsCapped`). Returns the cap as a number, or `null` when capping is\n * disabled.\n *\n * Resolution of `OM_LIST_COUNT_CAP`:\n * - unset / blank / unparseable \u2192 `DEFAULT_LIST_COUNT_CAP` (the cap is on by\n *   default, and bad input must not silently disable it)\n * - `0` (or negative) \u2192 `null` \u2014 capping disabled, exact counts everywhere\n */\nexport function resolveListCountCap(): number | null {\n  const parsed = parseNumberWithDefault(process.env.OM_LIST_COUNT_CAP, DEFAULT_LIST_COUNT_CAP, { integer: true })\n  return parsed <= 0 ? null : parsed\n}\n"],
+  "mappings": "AAAA,SAAS,8BAA8B;AAEhC,MAAM,yBAAyB;AAa/B,SAAS,sBAAqC;AACnD,QAAM,SAAS,uBAAuB,QAAQ,IAAI,mBAAmB,wBAAwB,EAAE,SAAS,KAAK,CAAC;AAC9G,SAAO,UAAU,IAAI,OAAO;AAC9B;",
+  "names": []
+}

package/dist/lib/query/engine.js

@@ -20,6 +20,7 @@ import {
 } from "../crud/custom-field-definition-index.js";
 import { warnOnCiphertextLikeFallback } from "./ciphertext-search-warning.js";
 import { resolveEncryptedSortFields, resolveEncryptedSortMaxRows, sortRowsInMemory } from "./encrypted-sort.js";
+import { resolveListCountCap } from "./count-cap.js";
 import { mapWithConcurrency } from "./bounded-decrypt.js";
 import { createLogger } from "../logger/index.js";
 const logger = createLogger("shared").child({ component: "query" });
@@ -440,6 +441,7 @@ class BasicQueryEngine {
     const sanitize = (s) => s.replace(/[^a-zA-Z0-9_]/g, "_");
     const buildQuery = async (projection) => {
       const isSortKeysProjection = projection === "sortKeys";
+      const isCountProjection = projection === "count";
       let q = db.selectFrom(table);
       if (!skipAutoScope && orgScope && await this.columnExists(table, "organization_id")) {
         q = this.applyOrganizationScope(q, qualify("organization_id"), orgScope);
@@ -513,7 +515,8 @@ class BasicQueryEngine {
         applyJoinFilterOp,
         columnExists: (tbl, column) => this.columnExists(tbl, column)
       });
-      if (isSortKeysProjection) {
+      if (isCountProjection) {
+      } else if (isSortKeysProjection) {
         q = q.select(sql.ref(qualify("id")).as("id"));
         if (await this.columnExists(table, "tenant_id")) {
           q = q.select(sql.ref(qualify("tenant_id")).as("tenant_id"));
@@ -535,18 +538,18 @@ class BasicQueryEngine {
       } else {
         q = q.select(sql`${sql.ref(table)}.*`.as("__all"));
       }
-      const cfSourcesResult = this.configureCustomFieldSources(q, table, entity, db, opts, qualify);
+      const cfSourcesResult = this.configureCustomFieldSources(q, table, entity, db, opts, qualify, !isCountProjection);
       q = cfSourcesResult.builder;
       const cfSources = cfSourcesResult.sources;
       const entityIdToSource = /* @__PURE__ */ new Map();
       for (const source of cfSources) {
         entityIdToSource.set(String(source.entityId), source);
       }
-      const requestedCustomFieldKeys = !isSortKeysProjection && Array.isArray(opts.includeCustomFields) ? opts.includeCustomFields.map((key) => String(key)) : [];
+      const requestedCustomFieldKeys = projection === "full" && Array.isArray(opts.includeCustomFields) ? opts.includeCustomFields.map((key) => String(key)) : [];
       const cfKeys = /* @__PURE__ */ new Set();
       const keySource = /* @__PURE__ */ new Map();
       let resolvedCustomFieldDefinitions2;
-      if (!isSortKeysProjection) {
+      if (projection === "full") {
         for (const f of opts.fields || []) {
           if (typeof f === "string" && f.startsWith("cf:")) cfKeys.add(f.slice(3));
         }
@@ -554,7 +557,7 @@ class BasicQueryEngine {
       for (const f of cfFilters) {
         if (typeof f.field === "string" && f.field.startsWith("cf:")) cfKeys.add(f.field.slice(3));
       }
-      if (!isSortKeysProjection && opts.includeCustomFields === true) {
+      if (projection === "full" && opts.includeCustomFields === true) {
         if (entityIdToSource.size > 0) {
           const entityIdList = Array.from(entityIdToSource.keys());
           const entityOrder = /* @__PURE__ */ new Map();
@@ -653,6 +656,7 @@ class BasicQueryEngine {
       for (const key of cfKeys) {
         const source = keySource.get(key);
         if (!source) continue;
+        if (isCountProjection) continue;
         const entityIdForKey = source.entityId;
         const recordIdExpr = source.recordIdExpr;
         const sourceAliasSafe = sanitize(source.alias || "src");
@@ -700,8 +704,10 @@ class BasicQueryEngine {
       for (const f of regularCfFilters) {
         if (!f.field.startsWith("cf:")) continue;
         const key = f.field.slice(3);
+        const filterSource = keySource.get(key);
+        if (!filterSource) continue;
         const expr = cfValueExprByKey[key];
-        if (!expr) continue;
+        if (!isCountProjection && !expr) continue;
         if ((f.op === "like" || f.op === "ilike") && searchActive && typeof f.value === "string") {
           const tokens = tokenizeText(String(f.value), searchConfig);
           const hashes = tokens.hashes;
@@ -736,15 +742,39 @@ class BasicQueryEngine {
             });
           }
         }
+        if (isCountProjection) {
+          q = this.applyCfValueExistsFilter(q, {
+            source: filterSource,
+            qualify,
+            tenantId: tenantId ?? null,
+            key,
+            op: f.op,
+            value: f.value
+          });
+          continue;
+        }
         q = this.applyColumnOp(q, expr, f.op, f.value);
       }
-      const applicableGroupFilters = resolvedGroupFilters.map((group) => group.filter((rf) => rf.kind !== "cf" || Boolean(cfValueExprByKey[rf.key]))).filter((group) => group.length > 0);
+      const cfLeafApplicable = (key) => isCountProjection ? keySource.has(key) : Boolean(cfValueExprByKey[key]);
+      const applicableGroupFilters = resolvedGroupFilters.map((group) => group.filter((rf) => rf.kind !== "cf" || cfLeafApplicable(rf.key))).filter((group) => group.length > 0);
       if (applicableGroupFilters.length > 0) {
         q = q.where((eb) => {
           const disjuncts = applicableGroupFilters.map((group) => {
             const parts = group.map((rf) => {
               if (rf.kind === "column") return this.buildColumnOpExpression(eb, rf.qualified, rf.op, rf.value);
-              if (rf.kind === "cf") return this.buildColumnOpExpression(eb, cfValueExprByKey[rf.key], rf.op, rf.value);
+              if (rf.kind === "cf") {
+                if (isCountProjection) {
+                  return this.buildCfValueExistsExpression(eb, {
+                    source: keySource.get(rf.key),
+                    qualify,
+                    tenantId: tenantId ?? null,
+                    key: rf.key,
+                    op: rf.op,
+                    value: rf.value
+                  });
+                }
+                return this.buildColumnOpExpression(eb, cfValueExprByKey[rf.key], rf.op, rf.value);
+              }
               return this.buildIndexDocOpExpression(eb, {
                 entity: String(entity),
                 field: rf.field,
@@ -761,7 +791,7 @@ class BasicQueryEngine {
           return disjuncts.length === 1 ? disjuncts[0] : eb.or(disjuncts);
         });
       }
-      if (opts.includeExtensions) {
+      if (opts.includeExtensions && !isCountProjection) {
         const { getModules } = await import("@open-mercato/shared/lib/i18n/server");
         const allMods = getModules();
         const allExts = allMods.flatMap((m) => m.entityExtensions || []);
@@ -778,7 +808,7 @@ class BasicQueryEngine {
           );
         }
       }
-      for (const s of resolvedSorts) {
+      for (const s of isCountProjection ? [] : resolvedSorts) {
         if (s.field.startsWith("cf:")) {
           const key = s.field.slice(3);
           const alias = sanitize(`cf:${key}`);
@@ -794,7 +824,7 @@ class BasicQueryEngine {
           if (!requiresPlaintextSort) q = q.orderBy(qualify(s.field), s.dir ?? "asc");
         }
       }
-      const hasJoinedAggregates2 = opts.includeExtensions && (Array.isArray(opts.includeExtensions) ? opts.includeExtensions.length > 0 : true) || Object.keys(cfValueExprByKey).length > 0;
+      const hasJoinedAggregates2 = !isCountProjection && (opts.includeExtensions && (Array.isArray(opts.includeExtensions) ? opts.includeExtensions.length > 0 : true) || Object.keys(cfValueExprByKey).length > 0);
       if (hasJoinedAggregates2) {
         q = q.groupBy(`${table}.id`);
       }
@@ -809,11 +839,24 @@ class BasicQueryEngine {
       cfMultiAliasByAlias,
       resolvedCustomFieldDefinitions
     } = await buildQuery("full");
-    const mayMultiplyBaseRows = hasJoinedAggregates || Array.isArray(opts.joins) && opts.joins.length > 0 || Array.isArray(opts.customFieldSources) && opts.customFieldSources.length > 0;
-    const countExpr = mayMultiplyBaseRows ? sql`count(distinct ${sql.ref(`${table}.id`)})` : sql`count(*)`;
-    const countBuilder = hasJoinedAggregates ? qFull.clearSelect().clearOrderBy().clearGroupBy().select(countExpr.as("count")) : qFull.clearSelect().clearOrderBy().select(countExpr.as("count"));
-    const countRow = await countBuilder.executeTakeFirst();
-    const total = Number(countRow?.count ?? 0);
+    const countCap = resolveListCountCap();
+    const { builder: countShape } = await buildQuery("count");
+    let total;
+    let listCountCapWarning;
+    if (countCap !== null) {
+      const probe = countShape.select(sql`1`.as("one")).limit(countCap + 1);
+      const countRow = await db.selectFrom(probe.as("om_count_probe")).select(sql`count(*)`.as("count")).executeTakeFirst();
+      const probed = Number(countRow?.count ?? 0);
+      if (probed > countCap) {
+        total = countCap;
+        listCountCapWarning = { entity, cap: countCap };
+      } else {
+        total = probed;
+      }
+    } else {
+      const countRow = await countShape.select(sql`count(*)`.as("count")).executeTakeFirst();
+      total = Number(countRow?.count ?? 0);
+    }
     const svc = encryptionService;
     const decryptPayload = svc?.decryptEntityPayload?.bind(svc);
     const decryptRow = async (item) => {
@@ -862,13 +905,15 @@ class BasicQueryEngine {
       const cap = resolveEncryptedSortMaxRows();
       let qSort = (await buildQuery("sortKeys")).builder;
       if (cap !== null) {
-        qSort = qSort.limit(cap).orderBy(qualify("id"), "asc");
+        qSort = qSort.limit(cap + 1).orderBy(qualify("id"), "asc");
       }
-      const candidateRows = await qSort.execute();
+      const candidateRowsRaw = await qSort.execute();
+      const sortTruncated = cap !== null && candidateRowsRaw.length > cap;
+      const candidateRows = sortTruncated && cap !== null ? candidateRowsRaw.slice(0, cap) : candidateRowsRaw;
       const decryptedCandidates = decryptPayload ? await mapWithConcurrency(candidateRows, DECRYPT_CONCURRENCY, decryptRow) : candidateRows;
       const orderedCandidates = sortRowsInMemory(decryptedCandidates, resolvedSorts);
       const pageIds = orderedCandidates.slice((page - 1) * pageSize, page * pageSize).map((row) => row.id);
-      if (cap !== null && total > cap) {
+      if (sortTruncated && cap !== null) {
         encryptedSortRowCapWarning = {
           entity,
           sortFields: resolvedSorts.map((s) => s.field),
@@ -892,8 +937,10 @@ class BasicQueryEngine {
       pagedItems = decryptPayload ? await mapWithConcurrency(items, DECRYPT_CONCURRENCY, decryptRow) : items;
     }
     let queryResult = { items: pagedItems, page, pageSize, total };
-    if (encryptedSortRowCapWarning) {
-      const meta = { encryptedSortRowCapWarning };
+    if (encryptedSortRowCapWarning || listCountCapWarning) {
+      const meta = {};
+      if (encryptedSortRowCapWarning) meta.encryptedSortRowCapWarning = encryptedSortRowCapWarning;
+      if (listCountCapWarning) meta.listCountCapWarning = listCountCapWarning;
       queryResult.meta = meta;
     }
     if (ext && extensionCtx) {
@@ -938,6 +985,101 @@ class BasicQueryEngine {
         return builder;
     }
   }
+  /**
+   * Apply a `cf:*` filter as a correlated EXISTS semi-join over
+   * `custom_field_values` (+ `custom_field_defs` for kind-based coercion) —
+   * the count shape's equivalent of the projection path's leftJoin + WHERE.
+   * A semi-join returns each base row at most once, so the count query needs
+   * no DISTINCT or GROUP BY and stays boundable by an outer LIMIT.
+   *
+   * Predicates satisfied by the *absence* of a value row (`eq null`,
+   * `exists: false`) become `NOT EXISTS(value) OR EXISTS(null value)`,
+   * matching the leftJoin form where a missing row yields a NULL expression.
+   */
+  applyCfValueExistsFilter(q, opts) {
+    return q.where((eb) => this.buildCfValueExistsExpression(eb, opts));
+  }
+  /**
+   * Expression-returning core of `applyCfValueExistsFilter`, so a cf leaf
+   * inside an OR group can compile to an EXISTS predicate on the count shape
+   * instead of being dropped for lacking a `cfValueExprByKey` entry.
+   */
+  buildCfValueExistsExpression(eb, opts) {
+    const { source, qualify, tenantId, key, op, value } = opts;
+    const seq = this.searchAliasSeq++;
+    const valAlias = `cfev_${seq}`;
+    const defAlias = `cfed_${seq}`;
+    const srcAlias = `cfes_${seq}`;
+    const caseExpr = sql`CASE ${sql.ref(`${defAlias}.kind`)}
+         WHEN 'integer' THEN (${sql.ref(`${valAlias}.value_int`)})::text
+         WHEN 'float' THEN (${sql.ref(`${valAlias}.value_float`)})::text
+         WHEN 'boolean' THEN (${sql.ref(`${valAlias}.value_bool`)})::text
+         WHEN 'multiline' THEN (${sql.ref(`${valAlias}.value_multiline`)})::text
+         ELSE (${sql.ref(`${valAlias}.value_text`)})::text
+       END`;
+    const buildSub = (eb2) => {
+      let sub = eb2.selectFrom(`custom_field_values as ${valAlias}`).select(sql`1`.as("one")).leftJoin(`custom_field_defs as ${defAlias}`, (jb) => jb.on(`${defAlias}.entity_id`, "=", String(source.entityId)).on(`${defAlias}.key`, "=", key).on(`${defAlias}.is_active`, "=", true).on((jeb) => jeb.or([
+        jeb(`${defAlias}.tenant_id`, "=", tenantId),
+        jeb(`${defAlias}.tenant_id`, "is", null)
+      ]))).where(`${valAlias}.entity_id`, "=", String(source.entityId)).where(`${valAlias}.field_key`, "=", key).where((web) => web.or([
+        web(`${valAlias}.tenant_id`, "=", tenantId),
+        web(`${valAlias}.tenant_id`, "is", null)
+      ]));
+      if (source.hop) {
+        sub = sub.innerJoin(`${source.table} as ${srcAlias}`, (jb) => jb.on(sql`${sql.ref(`${valAlias}.record_id`)} = (${sql.ref(`${srcAlias}.${source.hop.recordIdColumn}`)})::text`)).whereRef(`${srcAlias}.${source.hop.toField}`, "=", qualify(source.hop.fromField));
+      } else {
+        sub = sub.where(sql`${sql.ref(`${valAlias}.record_id`)} = ${source.recordIdExpr}`);
+      }
+      return sub;
+    };
+    const absenceSatisfiable = op === "eq" && value === null || op === "exists" && !value;
+    if (absenceSatisfiable) {
+      return eb.or([
+        eb.not(eb.exists(buildSub(eb))),
+        eb.exists(buildSub(eb).where(sql`${caseExpr} is null`))
+      ]);
+    }
+    let predicate = null;
+    switch (op) {
+      case "eq":
+        predicate = sql`${caseExpr} = ${value}`;
+        break;
+      case "ne":
+        predicate = value === null ? sql`${caseExpr} is not null` : sql`${caseExpr} != ${value}`;
+        break;
+      case "gt":
+      case "gte":
+      case "lt":
+      case "lte": {
+        const operator = sql.raw(op === "gt" ? ">" : op === "gte" ? ">=" : op === "lt" ? "<" : "<=");
+        predicate = sql`${caseExpr} ${operator} ${value}`;
+        break;
+      }
+      case "in": {
+        const vals = Array.isArray(value) ? value : [value];
+        predicate = sql`${caseExpr} in (${sql.join(vals.map((v) => sql`${v}`), sql`, `)})`;
+        break;
+      }
+      case "nin": {
+        const vals = Array.isArray(value) ? value : [value];
+        predicate = sql`${caseExpr} not in (${sql.join(vals.map((v) => sql`${v}`), sql`, `)})`;
+        break;
+      }
+      case "like":
+        predicate = sql`${caseExpr} like ${value}`;
+        break;
+      case "ilike":
+        predicate = sql`${caseExpr} ilike ${value}`;
+        break;
+      case "exists":
+        predicate = sql`${caseExpr} is not null`;
+        break;
+      default:
+        return eb.val(true);
+    }
+    const captured = predicate;
+    return eb.exists(buildSub(eb).where(captured));
+  }
   buildColumnOpExpression(eb, column, op, value) {
     switch (op) {
       case "eq":
@@ -1119,7 +1261,7 @@ class BasicQueryEngine {
       return sub;
     })());
   }
-  configureCustomFieldSources(q, baseTable, baseEntity, db, opts, qualify) {
+  configureCustomFieldSources(q, baseTable, baseEntity, db, opts, qualify, attachJoins = true) {
     const sources = [
       {
         entityId: baseEntity,
@@ -1137,14 +1279,22 @@ class BasicQueryEngine {
       if (!join) {
         throw new Error(`QueryEngine: customFieldSources entry for ${String(srcOpt.entityId)} requires a join configuration`);
       }
-      const joinFn = (join.type ?? "left") === "inner" ? "innerJoin" : "leftJoin";
-      next = next[joinFn](`${joinTable} as ${alias}`, (jb) => jb.onRef(`${alias}.${join.toField}`, "=", qualify(join.fromField)));
+      const joinType = (join.type ?? "left") === "inner" ? "inner" : "left";
+      if (attachJoins) {
+        const joinFn = joinType === "inner" ? "innerJoin" : "leftJoin";
+        next = next[joinFn](`${joinTable} as ${alias}`, (jb) => jb.onRef(`${alias}.${join.toField}`, "=", qualify(join.fromField)));
+      } else if (joinType === "inner") {
+        next = next.where((eb) => eb.exists(
+          eb.selectFrom(`${joinTable} as ${alias}`).select(sql`1`.as("one")).whereRef(`${alias}.${join.toField}`, "=", qualify(join.fromField))
+        ));
+      }
       const recordColumn = srcOpt.recordIdColumn ?? "id";
       sources.push({
         entityId: srcOpt.entityId,
         alias,
         table: joinTable,
-        recordIdExpr: sql`${sql.ref(`${alias}.${recordColumn}`)}::text`
+        recordIdExpr: sql`${sql.ref(`${alias}.${recordColumn}`)}::text`,
+        hop: { fromField: join.fromField, toField: join.toField, recordIdColumn: recordColumn, type: joinType }
       });
     });
     return { builder: next, sources };