@odla-ai/chapter 0.46.0 → 0.47.1

package/dist/worker/index.d.cts

@@ -514,7 +514,7 @@ interface ChapterScheduling {
  *
  * - `"claim"` reads a role ladder from a JWT claim (the member-site model:
  *   `provisional → member → admin`). Admin is the last (highest) rung; the
- *   read-only `superAdmins` tier sits above it.
+ *   Studio-managed super-admin tier sits above it.
  * - `"table"` gates on the deny-all `admins` allowlist (the hub model):
  *   a binary "email is an admin or isn't", set only in odla Studio.
  *
@@ -526,10 +526,13 @@ interface ChapterAuth {
     /** Role ladder low→high, for `source: "claim"`. The last entry is admin.
      *  Default `["provisional", "member", "admin"]`. */
     ladder?: readonly string[];
-    /** Provision the read-only `superAdmins` tier table — the only tier that may
-     *  create/modify admins, and (like every namespace) deny-all + written only in
-     *  odla Studio. Default: `true` for `"claim"`, `false` for `"table"`. */
+    /** Enable the Studio-managed super-admin tier — the only tier that may
+     *  create/modify admins. Default: `true` for `"claim"`, `false` for `"table"`. */
     superAdmins?: boolean;
+    /** Authority behind the super-admin tier. `"table"` preserves the legacy
+     * app allowlist; `"odla"` reads protected `$users.role`. Default `"table"`
+     * for backward compatibility. */
+    superAdminSource?: "table" | "odla";
 }
 /** The fully-resolved auth policy (defaults applied) carried on the {@link Chapter}. */
 interface ResolvedAuth {
@@ -539,6 +542,7 @@ interface ResolvedAuth {
     /** The highest ladder rung (last entry) — the "admin" gate. */
     adminRole: string;
     superAdmins: boolean;
+    superAdminSource: "none" | "table" | "odla";
 }
 /** The application status pipeline. Which statuses exist, and the subsets a site
  *  allows a call to be booked from / an application approved from. Defaults to

package/dist/worker/index.d.ts

@@ -514,7 +514,7 @@ interface ChapterScheduling {
  *
  * - `"claim"` reads a role ladder from a JWT claim (the member-site model:
  *   `provisional → member → admin`). Admin is the last (highest) rung; the
- *   read-only `superAdmins` tier sits above it.
+ *   Studio-managed super-admin tier sits above it.
  * - `"table"` gates on the deny-all `admins` allowlist (the hub model):
  *   a binary "email is an admin or isn't", set only in odla Studio.
  *
@@ -526,10 +526,13 @@ interface ChapterAuth {
     /** Role ladder low→high, for `source: "claim"`. The last entry is admin.
      *  Default `["provisional", "member", "admin"]`. */
     ladder?: readonly string[];
-    /** Provision the read-only `superAdmins` tier table — the only tier that may
-     *  create/modify admins, and (like every namespace) deny-all + written only in
-     *  odla Studio. Default: `true` for `"claim"`, `false` for `"table"`. */
+    /** Enable the Studio-managed super-admin tier — the only tier that may
+     *  create/modify admins. Default: `true` for `"claim"`, `false` for `"table"`. */
     superAdmins?: boolean;
+    /** Authority behind the super-admin tier. `"table"` preserves the legacy
+     * app allowlist; `"odla"` reads protected `$users.role`. Default `"table"`
+     * for backward compatibility. */
+    superAdminSource?: "table" | "odla";
 }
 /** The fully-resolved auth policy (defaults applied) carried on the {@link Chapter}. */
 interface ResolvedAuth {
@@ -539,6 +542,7 @@ interface ResolvedAuth {
     /** The highest ladder rung (last entry) — the "admin" gate. */
     adminRole: string;
     superAdmins: boolean;
+    superAdminSource: "none" | "table" | "odla";
 }
 /** The application status pipeline. Which statuses exist, and the subsets a site
  *  allows a call to be booked from / an application approved from. Defaults to

package/dist/worker/index.js

@@ -80,12 +80,16 @@ function createWorkerContext(options) {
   }
   async function isAdminEmail(db, email) {
     if (!email) return false;
-    const { admins } = await db.query({ admins: { $: { where: { email: email.toLowerCase() }, limit: 1 } } });
+    const { admins } = await db.query({ admins: { $: { where: { email: email.trim().toLowerCase() }, limit: 1 } } });
     return Array.isArray(admins) && admins.length > 0;
   }
   async function isSuperAdminEmail(db, email) {
     if (!auth.superAdmins || !email) return false;
-    const { superAdmins } = await db.query({ superAdmins: { $: { where: { email: email.toLowerCase() }, limit: 1 } } });
+    if (auth.superAdminSource === "odla") {
+      const { $users } = await db.query({ $users: { $: { where: { email: email.trim().toLowerCase(), role: "super_admin" }, limit: 1 } } });
+      return Array.isArray($users) && $users.length > 0;
+    }
+    const { superAdmins } = await db.query({ superAdmins: { $: { where: { email: email.trim().toLowerCase() }, limit: 1 } } });
     return Array.isArray(superAdmins) && superAdmins.length > 0;
   }
   async function roleFor(db, u) {
@@ -6091,9 +6095,39 @@ var IDENTIFIER = /^[a-z][a-zA-Z0-9_]*$/;
 var MAX_PAGE = 50;
 var MAX_OFFSET = 1e4;
 var MAX_SEARCH = 200;
+var MAX_STAGE = 100;
 var MAX_BODY = 32768;
 var RECORD_ID = /^[a-zA-Z0-9][a-zA-Z0-9:_-]{0,191}$/;
 var MUTATION_ID2 = /^[a-zA-Z0-9][a-zA-Z0-9:._-]{7,127}$/;
+var NETWORK_RECORD_SORTS = [
+  { id: "updated_desc", label: "Recently updated" },
+  { id: "updated_asc", label: "Least recently updated" },
+  { id: "name_asc", label: "Name A\u2013Z" },
+  { id: "name_desc", label: "Name Z\u2013A" }
+];
+var NETWORK_RECORD_SORT_COLUMNS = {
+  updated_desc: { field: "updatedAt", dir: "desc" },
+  updated_asc: { field: "updatedAt", dir: "asc" },
+  name_asc: { field: "name", dir: "asc" },
+  name_desc: { field: "name", dir: "desc" }
+};
+function networkRecordWindow(params) {
+  const limit = integer(params.get("limit"), 25, 1, MAX_PAGE);
+  const offset = integer(params.get("offset"), 0, 0, MAX_OFFSET);
+  const search = (params.get("search") ?? "").trim();
+  const stage = (params.get("stage") ?? "").trim();
+  const requestedSort = (params.get("sort") ?? "updated_desc").trim();
+  const sortId = NETWORK_RECORD_SORTS.some((candidate) => candidate.id === requestedSort) ? requestedSort : null;
+  if (limit == null || offset == null || search.length > MAX_SEARCH || stage.length > 0 && (stage.length > MAX_STAGE || /[\u0000-\u001f\u007f]/.test(stage)) || !sortId) return null;
+  return {
+    limit,
+    offset,
+    ...search ? { search } : {},
+    ...stage ? { stage } : {},
+    sortId,
+    sort: NETWORK_RECORD_SORT_COLUMNS[sortId]
+  };
+}
 function bodyTooLarge(body) {
   return new TextEncoder().encode(body).byteLength > MAX_BODY;
 }
@@ -6296,20 +6330,22 @@ var handleNetworkRecords = async (req, url, env, ctx) => {
   const type = url.searchParams.get("type") ?? "";
   const allowed2 = reader.fields[type];
   if (!IDENTIFIER.test(type) || !allowed2) return json({ error: "record type is not shared with this reader" }, 403);
-  const limit = integer(url.searchParams.get("limit"), 25, 1, MAX_PAGE);
-  const offset = integer(url.searchParams.get("offset"), 0, 0, MAX_OFFSET);
-  const search = (url.searchParams.get("search") ?? "").trim();
-  if (limit == null || offset == null || search.length > MAX_SEARCH) {
-    return json({ error: "invalid pagination or search parameters" }, 400);
+  const window = networkRecordWindow(url.searchParams);
+  if (!window) return json({ error: "invalid record query parameters" }, 400);
+  const typeDef = ctx.chapter.crm.type(type);
+  const stages = typeDef.pipeline?.stages ?? [];
+  if (window.stage && !stages.some((stage) => stage.id === window.stage)) {
+    return json({ error: "stage is not defined for this record type" }, 400);
   }
   const page = await listRecords(
     { crm: ctx.chapter.crm, db },
     {
       type,
-      limit,
-      offset,
-      ...search ? { search } : {},
-      sort: { field: "updatedAt", dir: "desc" }
+      limit: window.limit,
+      offset: window.offset,
+      ...window.search ? { search: window.search } : {},
+      ...window.stage ? { stage: [window.stage] } : {},
+      sort: window.sort
     }
   );
   const response = {
@@ -6319,7 +6355,15 @@ var handleNetworkRecords = async (req, url, env, ctx) => {
     records: page.records.map((record4) => readerRecord(record4, reader, ctx.chapter.crm)),
     total: page.total,
     limit: page.limit,
-    offset: page.offset
+    offset: page.offset,
+    filters: {
+      stages: stages.map((stage) => ({ id: stage.id, label: stage.label ?? stage.id })),
+      sorts: [...NETWORK_RECORD_SORTS]
+    },
+    appliedQuery: {
+      ...window.stage ? { stage: window.stage } : {},
+      sort: window.sortId
+    }
   };
   return json(response);
 };
@@ -6352,7 +6396,8 @@ async function readTargetRecords(db, env, ctx, target, query) {
       const upstream = body && "error" in body && typeof body.error === "string" ? body.error : void 0;
       return {
         ok: false,
-        error: upstream ?? (response.ok ? "invalid follower record response" : `follower returned ${response.status}`)
+        error: upstream ?? (response.ok ? "invalid follower record response" : `follower returned ${response.status}`),
+        ...response.status === 400 ? { status: 400 } : {}
       };
     }
     return {
@@ -6443,16 +6488,22 @@ var handleAdminNetworkRecords = async (req, url, env, ctx) => {
   const type = url.searchParams.get("type") ?? "";
   const target = targetFor2(ctx, targetId);
   if (!target || !IDENTIFIER.test(type)) return json({ error: "configured targetId and record type are required" }, 400);
-  const limit = integer(url.searchParams.get("limit"), 25, 1, MAX_PAGE);
-  const offset = integer(url.searchParams.get("offset"), 0, 0, MAX_OFFSET);
-  const search = (url.searchParams.get("search") ?? "").trim();
-  if (limit == null || offset == null || search.length > MAX_SEARCH) {
-    return json({ error: "invalid pagination or search parameters" }, 400);
-  }
-  const query = new URLSearchParams({ type, limit: String(limit), offset: String(offset) });
-  if (search) query.set("search", search);
+  const window = networkRecordWindow(url.searchParams);
+  if (!window) return json({ error: "invalid record query parameters" }, 400);
+  const query = new URLSearchParams({
+    type,
+    limit: String(window.limit),
+    offset: String(window.offset),
+    sort: window.sortId
+  });
+  if (window.search) query.set("search", window.search);
+  if (window.stage) query.set("stage", window.stage);
   const result = await readTargetRecords(got.db, env, ctx, target, query);
-  return result.ok ? json(result.page) : json({ error: result.error }, 502);
+  if (!result.ok) return json({ error: result.error }, result.status ?? 502);
+  if ((window.stage || url.searchParams.has("sort")) && (!result.page.appliedQuery || result.page.appliedQuery.sort !== window.sortId || result.page.appliedQuery.stage !== window.stage)) {
+    return json({ error: "follower did not apply the requested record query" }, 502);
+  }
+  return json(result.page);
 };
 
 // src/worker-routes-network-notes.ts