@ultimat3/query 15.0.0 → 17.0.0

package/CLAUDE.md

@@ -208,6 +208,11 @@ Owns the `query` primitive: reads, live reads, cursors, the incremental matcher.
   --json` measures, and they must stay that: `errors.ts` runs `registerErrorCodes` at import in both
   packages, and query's `registry.ts` runs `registerPrimitiveRegistrar('query', …)` — drop either
   and a bundled app loses its error titles or throws `X_REGISTRAR_MISSING`. Never `false`.
+- **Every numeric option is refused when it is not a FINITE number, `As of 2026-08-26`.**
+  `@ultimat3/core`'s `finiteOption()` guards the read cache's `ttlMs` and `search()`'s `page.max`,
+  `page.default` and `termMax`; `bun run finite-bounds` is the ratchet and this package is pinned
+  at **zero**. `??` guards nullish and `NaN` is not, so an unchecked bound is a comparison that
+  reads false forever — and `Math.max`/`Math.floor` propagate `NaN` rather than validating it.
 - **`search()` is a FACTORY over `query()`, never a ninth primitive.** It owns the input schema
   (`q` + a `limit` bounded in the schema, beside the read's own keys), trims and refuses a blank
   term, and calls `.search(term)` on the chain the app hands it — which is what makes the term
@@ -221,7 +226,22 @@ Owns the `query` primitive: reads, live reads, cursors, the incremental matcher.
   minting one from the other here, and falling through to `paginate`'s in-memory slice would cut
   inside the one page the provider fetched and report `hasNextPage: false` at its edge. Rows served
   on no page at all is the defect 12.0.0 spent a release removing from the timestamp seek; the
-  `fix:` names the entity chain, which pages this read correctly.
+  `fix:` names the entity chain, which pages this read correctly. **The refusal is on the rows that
+  would be CUT, never on the window**, `As of 2026-08-26`: a screen demanding `first >= limit`
+  refuses the framework's own default pair — `limit` defaults to 20 and `first` arrives from a
+  client — so every `pageSize` under 20 was a 500 at page ONE, including a search matching three
+  rows that fit the window twice over. `windowOf.execute` asserts on `rows.length` instead, so a
+  page that is whole is served with `hasNextPage: false` and no cursor is ever handed back that a
+  second call is guaranteed to refuse. **The one page it serves is the
+  chain's own ORDER**, `As of 2026-08-26`: `onePage.seek` narrows the window with `Builder.limit()`
+  and never with `Builder.seek()`, which sets `totalized` — `servedOrder()` is then `totalOrder([])`
+  = `id asc`, because the ranking lives inside the chain behind the row thunk and no `OrderKey` here
+  can name it, and `execute()` re-sorts the page the provider already ranked. Measured with a chain
+  serving `z, m, a`: `runQuery` answered `z, m, a` and `.page(input, { first: 2 })` answered `a, m`,
+  dropping the top-ranked row off page one. It exposes no `total()` for the same reason — an absent
+  `total` is how `SqlSource` says the source already serves one order it can be resumed in. The
+  fixture in `search.test.ts` must stay NOT id-ascending: `ROWS` is `a, b, c`, which is why the
+  shipped page test could not see this.
 - Policy runs per subscriber for live queries. Never cache a decision across actors.
 - The matcher patches from `QueryShape`, never from SQL text.
 - `paginate` has no `offset` parameter and must never grow one, and it is reachable **only** as

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ultimat3/query",
-  "version": "15.0.0",
+  "version": "17.0.0",
   "description": "The query primitive: a policy-checked read, optionally live, with cursor pagination and an incremental matcher",
   "license": "MIT",
   "type": "module",
@@ -35,10 +35,10 @@
     "test": "bun test"
   },
   "dependencies": {
-    "@ultimat3/cache": "15.0.0",
-    "@ultimat3/core": "15.0.0",
-    "@ultimat3/http": "15.0.0",
-    "@ultimat3/policy": "15.0.0",
-    "@ultimat3/schema": "15.0.0"
+    "@ultimat3/cache": "17.0.0",
+    "@ultimat3/core": "17.0.0",
+    "@ultimat3/http": "17.0.0",
+    "@ultimat3/policy": "17.0.0",
+    "@ultimat3/schema": "17.0.0"
   }
 }

package/src/read.ts

@@ -10,6 +10,7 @@ import {
   anonymousActor,
   assert,
   createContext,
+  finiteOption,
   logger,
   runWithContext,
   tryUseContext,
@@ -186,7 +187,13 @@ async function readRowsIn(
   // the process — a paginated feed over 10k tenants is 10k immortal entries.
   return def.cache === undefined
     ? await readOnce(ctx, key, read)
-    : await readThrough(ctx, key, def.cache.ttlMs ?? DEFAULT_READ_CACHE_TTL_MS, read, tags);
+    : await readThrough(
+        ctx,
+        key,
+        finiteOption('the read cache', 'ttlMs', def.cache.ttlMs ?? DEFAULT_READ_CACHE_TTL_MS),
+        read,
+        tags,
+      );
 }
 
 async function buildSource(

package/src/search.ts

@@ -6,14 +6,14 @@
  * syntax, and the tenant predicate is never optional.
  */
 
-import { assert, type Ctx } from '@ultimat3/core';
+import { assert, type Ctx, finiteOption } from '@ultimat3/core';
 import type { InferOutput, Shape, Simplify } from '@ultimat3/schema';
 import { t } from '@ultimat3/schema';
 import type { QueryPolicy } from './policy-gate';
 import type { QueryCache, QueryMcp, QueryRateLimit } from './query';
 import { query } from './query';
 import type { SeekKey } from './shape';
-import type { SqlSource, SqlText } from './source';
+import type { Builder, SqlSource, SqlText } from './source';
 import { from } from './source';
 
 /**
@@ -76,7 +76,8 @@ const limitSchema = (max: number, fallback: number) =>
   t.number.int().min(1).max(max).default(fallback);
 
 /**
- * A search serves ONE page, and asking for a second is refused rather than answered wrongly.
+ * A search serves ONE page, in the order the chain served it, and asking for a second is refused
+ * rather than answered wrongly.
  *
  * The rows come from the entity chain, which pages by its own keyset cursor — proven against a real
  * server in `packages/entity/src/pg-search.live.test.ts`. That cursor cannot cross this seam: a
@@ -86,22 +87,90 @@ const limitSchema = (max: number, fallback: number) =>
  * `hasNextPage: false` at its edge — rows served on no page at all, which is the defect 12.0.0 spent
  * a release removing from the timestamp seek. So it is a refusal with the alternative in the `fix`:
  * page with the entity chain's own `.search(term).after(cursor)`, or raise this read's `limit`.
+ *
+ * **The refusal is on the rows that would be CUT, never on the window** (`As of 2026-08-26`). It
+ * used to serve `first` rows, mint an `endCursor` and report `hasNextPage: true` — a connection
+ * protocol saying "call me again with this" for a call the cursor assert is guaranteed to throw on.
+ * A first repair demanded `first >= limit` and refused the window itself, which refuses the
+ * framework's OWN default pair: `limit` defaults to 20 and `first` arrives from a client
+ * (`{ first: query.pageSize }`), so every `pageSize` under 20 was a 500 at page ONE — including
+ * every search that matched three rows and fit the window twice over. A screen that fires on a
+ * request the read can answer completely is not protecting anyone.
+ *
+ * So the condition is the one thing that is actually wrong: the read answered MORE rows than the
+ * window carries, and this seam has no second page to put the rest on. Below that, the page is
+ * whole and `hasNextPage` is false by construction — the true stop signal, and no cursor is ever
+ * handed back that a second call is guaranteed to refuse.
+ *
+ * **`seek` narrows the WINDOW and never the ORDER, and that is the whole reason this wrapper takes a
+ * `Builder`.** `Builder.seek()` sets `totalized`, so `servedOrder()` becomes `totalOrder([])` —
+ * `id asc`, because the relevance ordering lives inside the chain behind the row thunk and no key
+ * here can name it — and `execute()` then re-sorts the page the provider already ranked. Measured
+ * with a chain serving `z, m, a`: `runQuery` answered `z, m, a` and `.page(input, { first: 2 })`
+ * answered `a, m`, dropping the top-ranked row off page one. `limit()` is the same window with no
+ * ordering claim attached, which is what an already-ranked page needs.
  */
-const onePage = <Row extends object>(base: SqlSource<Row>, entity: string): SqlSource<Row> => ({
+const onePage = <Row extends object>(
+  base: Builder<Row>,
+  entity: string,
+  /** Rows the chain was capped at — this read's `limit` input, and its whole page. */
+  served: number,
+): SqlSource<Row> => ({
   toSQL: (): SqlText => base.toSQL(),
   execute: () => base.execute(),
   shape: () => base.shape(),
-  ...(base.total === undefined ? {} : { total: () => onePage(base.total?.() ?? base, entity) }),
-  seek: (after: SeekKey | null, limit: number): SqlSource<Row> => {
+  // No `total()`: `SqlSource` reads its absence as "the source already serves one order it can be
+  // resumed in", which is exactly true of a relevance ranking — and `total()` would totalize the
+  // Builder, re-sorting that ranking by id for the same reason `seek` must not.
+  seek: (after: SeekKey | null, window: number): SqlSource<Row> => {
     assert(
       after === null,
       `search of ${entity} serves one page: a relevance-filtered read has no cursor this layer can carry`,
       `db.${entity}.search(term).orderBy('<key>').after(cursor).page()   # the entity chain pages this read — or raise its limit`,
     );
-    return onePage(base.seek?.(after, limit) ?? base, entity);
+    // `paginate` asks for `first + 1` — the extra row IS `hasNextPage` — so the window it names is
+    // one wider than the page it will serve.
+    return windowOf(base, entity, served, window - 1);
   },
 });
 
+/**
+ * The one page, narrowed to the window `paginate` asked for and refused only when it does not FIT.
+ *
+ * The check is on the rows that came back, not on the two numbers, because those two numbers cannot
+ * decide it: `first: 10` against a `limit` of 20 is a complete answer whenever the term matched ten
+ * rows or fewer, which is most searches. Refusing it on the declaration alone made the framework's
+ * own defaults a 500.
+ *
+ * The `fix:` names `served` — the read's declared `limit` — and never the count that came back: a
+ * window sized to today's result set breaks on the first row added to the corpus.
+ */
+const windowOf = <Row extends object>(
+  base: Builder<Row>,
+  entity: string,
+  served: number,
+  /** Rows `paginate` will serve. It fetched one more, to decide `hasNextPage`. */
+  first: number,
+): SqlSource<Row> => {
+  const windowed = base.limit(first + 1);
+  return {
+    toSQL: (): SqlText => windowed.toSQL(),
+    shape: () => windowed.shape(),
+    // No `seek()` and no `total()`: `paginate` seeks once, and `SqlSource` reads an absent `total`
+    // as "the source already serves one order it can be resumed in" — exactly true of a relevance
+    // ranking, which `total()` would re-sort by id for the same reason `seek` must not.
+    execute: async () => {
+      const rows = await windowed.execute();
+      assert(
+        rows.length <= first,
+        `search of ${entity} answered more than the ${String(first)} rows .page() asked for, and this read has no second page: the rest would be on no page at all`,
+        `read.page(input, { first: ${String(served)} })   # widen the window to the read's whole page — or narrow the page: read({ q, limit: ${String(first)} })`,
+      );
+      return rows;
+    },
+  };
+};
+
 /**
  * The factory. `live: false` and the source declares itself unpatchable, because the incremental
  * matcher decides membership from `QueryShape` filters and a `tsvector` match is not one of them —
@@ -111,11 +180,14 @@ export const search = <Row extends object, S extends Shape = Record<string, neve
   def: SearchDef<S, Row>,
 ) => {
   const page = def.page ?? {};
-  const max = page.max ?? DEFAULT_PAGE_MAX;
+  const max = finiteOption('search()', 'page.max', page.max ?? DEFAULT_PAGE_MAX);
   const shape = {
     ...((def.input ?? {}) as S),
-    q: termSchema(def.termMax ?? DEFAULT_TERM_MAX),
-    limit: limitSchema(max, Math.min(page.default ?? DEFAULT_PAGE_SIZE, max)),
+    q: termSchema(finiteOption('search()', 'termMax', def.termMax ?? DEFAULT_TERM_MAX)),
+    limit: limitSchema(
+      max,
+      Math.min(finiteOption('search()', 'page.default', page.default ?? DEFAULT_PAGE_SIZE), max),
+    ),
   } as SearchShape<S>;
 
   return query({
@@ -139,7 +211,7 @@ export const search = <Row extends object, S extends Shape = Record<string, neve
       const chain = def.in({ input: parsed, ctx });
       const name = chain.plan().entity;
       const rows = () => chain.search(term).limit(parsed.limit).all();
-      return onePage(from<Row>(name, rows).raw('full-text search'), name);
+      return onePage(from<Row>(name, rows).raw('full-text search'), name, parsed.limit);
     },
   });
 };