@anthusai/papyrus 5.43.0-next.45 → 5.43.0-next.47

package/amplify/data/resource.js

@@ -1571,6 +1571,15 @@ const schema = a.schema({
         curationStatusReason: a.string(),
         newsroomFeedKey: a.string(),
         reviewedFeedKey: a.string(),
+        // The References page reads the feed through two indexes (docs/reference-feed-indexes.md). `feedStateKey` is
+        // "<corpusId>#unrated" or "<corpusId>#rated" for a current, not archived Reference (null otherwise: it is in no feed).
+        // `predictionSortKey` orders Best bets, `feedArrivalAt` orders Newest. The prediction is the Cyclotron's ORIGINAL
+        // P(accept), written once, and never rewritten by a vote.
+        feedStateKey: a.string(),
+        feedArrivalAt: a.datetime(),
+        predictedAcceptProbability: a.float(),
+        predictionDecidedAt: a.datetime(),
+        predictionSortKey: a.string(),
         updatedAt: a.datetime(),
     })
         .secondaryIndexes((index) => [
@@ -1583,6 +1592,8 @@ const schema = a.schema({
         index("curationStatus").sortKeys(["curationStatusUpdatedAt"]).queryField("listReferencesByCurationStatusAndUpdatedAt"),
         index("curationStatusKey").sortKeys(["curationStatusUpdatedAt"]).queryField("listReferencesByCurationStatusKeyAndUpdatedAt"),
         index("reviewedFeedKey").sortKeys(["updatedAt"]).queryField("listReferencesByReviewedFeedAndUpdatedAt"),
+        index("feedStateKey").sortKeys(["predictionSortKey"]).queryField("listReferencesByFeedStateAndPrediction"),
+        index("feedStateKey").sortKeys(["feedArrivalAt"]).queryField("listReferencesByFeedStateAndArrival"),
     ])
         .authorization((allow) => [
         allow.groups(categoryWriteGroups).to(["read"]),
@@ -1670,6 +1681,9 @@ const schema = a.schema({
         authorSub: a.string(),
         authorUserProfileId: a.id(),
         authorLabel: a.string(),
+        editedAt: a.datetime(),
+        deletedAt: a.datetime(),
+        deletedBySub: a.string(),
         threadId: a.id(),
         parentMessageId: a.id(),
         sequenceNumber: a.integer(),
@@ -1704,8 +1718,12 @@ const schema = a.schema({
         index("searchVisibility").sortKeys(["createdAt"]).name("messagesBySearchVisibilityCreatedAt").queryField("listMessagesBySearchVisibilityAndCreatedAt"),
     ])
         .authorization((allow) => [
-        allow.groups(categoryWriteGroups).to(categoryAppendOnlyOperations),
+        // One rule per group (a group may appear once per model): editors read and add; admins also delete, for moderation.
+        allow.group("editor").to(categoryAppendOnlyOperations),
+        allow.group(adminGroup).to(["read", "create", "delete"]),
         allow.authenticated("identityPool").to(["read", "create", "update"]),
+        // Messages belong to their author: the author edits (and soft-deletes) their own, and only an admin can remove someone else's.
+        allow.ownerDefinedIn("authorSub").identityClaim("sub").to(["read", "update", "delete"]),
     ]),
     MessageThread: a
         .model({

package/amplify/data/resource.ts

@@ -1684,6 +1684,15 @@ const schema = a.schema({
       curationStatusReason: a.string(),
       newsroomFeedKey: a.string(),
       reviewedFeedKey: a.string(),
+      // The References page reads the feed through two indexes (docs/reference-feed-indexes.md). `feedStateKey` is
+      // "<corpusId>#unrated" or "<corpusId>#rated" for a current, not archived Reference (null otherwise: it is in no feed).
+      // `predictionSortKey` orders Best bets, `feedArrivalAt` orders Newest. The prediction is the Cyclotron's ORIGINAL
+      // P(accept), written once, and never rewritten by a vote.
+      feedStateKey: a.string(),
+      feedArrivalAt: a.datetime(),
+      predictedAcceptProbability: a.float(),
+      predictionDecidedAt: a.datetime(),
+      predictionSortKey: a.string(),
       updatedAt: a.datetime(),
     })
     .secondaryIndexes((index) => [
@@ -1696,6 +1705,8 @@ const schema = a.schema({
       index("curationStatus").sortKeys(["curationStatusUpdatedAt"]).queryField("listReferencesByCurationStatusAndUpdatedAt"),
       index("curationStatusKey").sortKeys(["curationStatusUpdatedAt"]).queryField("listReferencesByCurationStatusKeyAndUpdatedAt"),
       index("reviewedFeedKey").sortKeys(["updatedAt"]).queryField("listReferencesByReviewedFeedAndUpdatedAt"),
+      index("feedStateKey").sortKeys(["predictionSortKey"]).queryField("listReferencesByFeedStateAndPrediction"),
+      index("feedStateKey").sortKeys(["feedArrivalAt"]).queryField("listReferencesByFeedStateAndArrival"),
     ])
     .authorization((allow) => [
       allow.groups(categoryWriteGroups).to(["read"]),
@@ -1786,6 +1797,9 @@ const schema = a.schema({
       authorSub: a.string(),
       authorUserProfileId: a.id(),
       authorLabel: a.string(),
+      editedAt: a.datetime(),
+      deletedAt: a.datetime(),
+      deletedBySub: a.string(),
       threadId: a.id(),
       parentMessageId: a.id(),
       sequenceNumber: a.integer(),
@@ -1820,8 +1834,12 @@ const schema = a.schema({
       index("searchVisibility").sortKeys(["createdAt"]).name("messagesBySearchVisibilityCreatedAt").queryField("listMessagesBySearchVisibilityAndCreatedAt"),
     ])
     .authorization((allow) => [
-      allow.groups(categoryWriteGroups).to(categoryAppendOnlyOperations),
+      // One rule per group (a group may appear once per model): editors read and add; admins also delete, for moderation.
+      allow.group("editor").to(categoryAppendOnlyOperations),
+      allow.group(adminGroup).to(["read", "create", "delete"]),
       allow.authenticated("identityPool").to(["read", "create", "update"]),
+      // Messages belong to their author: the author edits (and soft-deletes) their own, and only an admin can remove someone else's.
+      allow.ownerDefinedIn("authorSub").identityClaim("sub").to(["read", "update", "delete"]),
     ]),
 
   MessageThread: a

package/amplify/data/schema.js

@@ -1477,6 +1477,15 @@ function buildBaseDefinitions(includeEditions) {
             curationStatusReason: a.string(),
             newsroomFeedKey: a.string(),
             reviewedFeedKey: a.string(),
+            // The References page reads the feed through two indexes (docs/reference-feed-indexes.md). `feedStateKey` is
+            // "<corpusId>#unrated" or "<corpusId>#rated" for a current, not archived Reference (null otherwise: it is in no feed).
+            // `predictionSortKey` orders Best bets, `feedArrivalAt` orders Newest. The prediction is the Cyclotron's ORIGINAL
+            // P(accept), written once, and never rewritten by a vote.
+            feedStateKey: a.string(),
+            feedArrivalAt: a.datetime(),
+            predictedAcceptProbability: a.float(),
+            predictionDecidedAt: a.datetime(),
+            predictionSortKey: a.string(),
             updatedAt: a.datetime(),
         })
             .secondaryIndexes((index) => [
@@ -1489,6 +1498,8 @@ function buildBaseDefinitions(includeEditions) {
             index("curationStatus").sortKeys(["curationStatusUpdatedAt"]).queryField("listReferencesByCurationStatusAndUpdatedAt"),
             index("curationStatusKey").sortKeys(["curationStatusUpdatedAt"]).queryField("listReferencesByCurationStatusKeyAndUpdatedAt"),
             index("reviewedFeedKey").sortKeys(["updatedAt"]).queryField("listReferencesByReviewedFeedAndUpdatedAt"),
+            index("feedStateKey").sortKeys(["predictionSortKey"]).queryField("listReferencesByFeedStateAndPrediction"),
+            index("feedStateKey").sortKeys(["feedArrivalAt"]).queryField("listReferencesByFeedStateAndArrival"),
         ])
             .authorization((allow) => [
             allow.groups(categoryWriteGroups).to(["read"]),
@@ -1573,6 +1584,9 @@ function buildBaseDefinitions(includeEditions) {
             authorSub: a.string(),
             authorUserProfileId: a.id(),
             authorLabel: a.string(),
+            editedAt: a.datetime(),
+            deletedAt: a.datetime(),
+            deletedBySub: a.string(),
             threadId: a.id(),
             parentMessageId: a.id(),
             sequenceNumber: a.integer(),
@@ -1607,7 +1621,11 @@ function buildBaseDefinitions(includeEditions) {
             index("searchVisibility").sortKeys(["createdAt"]).name("messagesBySearchVisibilityCreatedAt").queryField("listMessagesBySearchVisibilityAndCreatedAt"),
         ])
             .authorization((allow) => [
-            allow.groups(categoryWriteGroups).to(categoryAppendOnlyOperations),
+            // One rule per group (a group may appear once per model): editors read and add; admins also delete, for moderation.
+            allow.group("editor").to(categoryAppendOnlyOperations),
+            allow.group(adminGroup).to(["read", "create", "delete"]),
+            // Messages belong to their author: the author edits (and soft-deletes) their own, and only an admin can remove someone else's.
+            allow.ownerDefinedIn("authorSub").identityClaim("sub").to(["read", "update", "delete"]),
         ]),
         MessageThread: realtimeModel({
             id: a.id().required(),

package/amplify/data/schema.ts

@@ -1588,6 +1588,15 @@ const definitions = {
       curationStatusReason: a.string(),
       newsroomFeedKey: a.string(),
       reviewedFeedKey: a.string(),
+      // The References page reads the feed through two indexes (docs/reference-feed-indexes.md). `feedStateKey` is
+      // "<corpusId>#unrated" or "<corpusId>#rated" for a current, not archived Reference (null otherwise: it is in no feed).
+      // `predictionSortKey` orders Best bets, `feedArrivalAt` orders Newest. The prediction is the Cyclotron's ORIGINAL
+      // P(accept), written once, and never rewritten by a vote.
+      feedStateKey: a.string(),
+      feedArrivalAt: a.datetime(),
+      predictedAcceptProbability: a.float(),
+      predictionDecidedAt: a.datetime(),
+      predictionSortKey: a.string(),
       updatedAt: a.datetime(),
     })
     .secondaryIndexes((index) => [
@@ -1600,6 +1609,8 @@ const definitions = {
       index("curationStatus").sortKeys(["curationStatusUpdatedAt"]).queryField("listReferencesByCurationStatusAndUpdatedAt"),
       index("curationStatusKey").sortKeys(["curationStatusUpdatedAt"]).queryField("listReferencesByCurationStatusKeyAndUpdatedAt"),
       index("reviewedFeedKey").sortKeys(["updatedAt"]).queryField("listReferencesByReviewedFeedAndUpdatedAt"),
+      index("feedStateKey").sortKeys(["predictionSortKey"]).queryField("listReferencesByFeedStateAndPrediction"),
+      index("feedStateKey").sortKeys(["feedArrivalAt"]).queryField("listReferencesByFeedStateAndArrival"),
     ])
     .authorization((allow) => [
       allow.groups(categoryWriteGroups).to(["read"]),
@@ -1687,6 +1698,9 @@ const definitions = {
       authorSub: a.string(),
       authorUserProfileId: a.id(),
       authorLabel: a.string(),
+      editedAt: a.datetime(),
+      deletedAt: a.datetime(),
+      deletedBySub: a.string(),
       threadId: a.id(),
       parentMessageId: a.id(),
       sequenceNumber: a.integer(),
@@ -1721,7 +1735,11 @@ const definitions = {
       index("searchVisibility").sortKeys(["createdAt"]).name("messagesBySearchVisibilityCreatedAt").queryField("listMessagesBySearchVisibilityAndCreatedAt"),
     ])
     .authorization((allow) => [
-      allow.groups(categoryWriteGroups).to(categoryAppendOnlyOperations),
+      // One rule per group (a group may appear once per model): editors read and add; admins also delete, for moderation.
+      allow.group("editor").to(categoryAppendOnlyOperations),
+      allow.group(adminGroup).to(["read", "create", "delete"]),
+      // Messages belong to their author: the author edits (and soft-deletes) their own, and only an admin can remove someone else's.
+      allow.ownerDefinedIn("authorSub").identityClaim("sub").to(["read", "update", "delete"]),
     ]),
 
   MessageThread: realtimeModel({

package/amplify/functions/category-action/handler.ts

@@ -25,6 +25,7 @@ import {
   type DelegationStore,
 } from "../shared/curation-delegation-flow";
 import { rejectionReasonCodeForWrittenReason } from "../../../lib/reference-policy";
+import { referenceFeedKeys, referenceFeedStateKey } from "../../../lib/reference-feed-keys";
 import { claimGroups } from "../../../lib/staff-groups";
 
 type ReviewHandler = Schema["reviewSteeringProposal"]["functionHandler"];
@@ -256,6 +257,8 @@ async function reviewReferenceCuration(
       curationStatusReason: note,
       newsroomFeedKey: reference.newsroomFeedKey ?? "references",
       reviewedFeedKey: reviewedFeedKeyForStatus(nextStatus),
+      // A vote moves the Reference between the unrated and rated feeds; its original prediction and arrival stay as they were.
+      feedStateKey: referenceFeedStateKey({ ...reference, curationStatus: nextStatus }),
       updatedAt: now,
     }),
     "update Reference curation status",
@@ -642,6 +645,8 @@ async function setReferenceQualityRating(event: Parameters<ReferenceQualityHandl
       curationStatusReason: note,
       newsroomFeedKey: reference.newsroomFeedKey ?? "references",
       reviewedFeedKey: reviewedFeedKeyForStatus(nextStatus),
+      // A vote moves the Reference between the unrated and rated feeds; its original prediction and arrival stay as they were.
+      feedStateKey: referenceFeedStateKey({ ...reference, curationStatus: nextStatus }),
       updatedAt: now,
     }),
     "update Reference quality status",
@@ -818,6 +823,7 @@ async function moveReferenceCorpus(event: Parameters<MoveReferenceCorpusHandler>
       client.models.Reference.update({
         id: normalizeRequiredString(current.id, "reference.id"),
         versionState: "superseded",
+        feedStateKey: null,   // a superseded version is in no feed
         updatedAt: now,
       }),
       "supersede current Reference version",
@@ -857,6 +863,19 @@ async function moveReferenceCorpus(event: Parameters<MoveReferenceCorpusHandler>
       curationStatusReason: normalizeOptionalString(current.curationStatusReason),
       newsroomFeedKey: normalizeOptionalString(current.newsroomFeedKey) ?? "references",
       reviewedFeedKey: normalizeOptionalString(current.reviewedFeedKey) ?? reviewedFeedKeyForStatus(curationStatus),
+      predictedAcceptProbability: typeof current.predictedAcceptProbability === "number" ? current.predictedAcceptProbability : null,
+      predictionDecidedAt: normalizeOptionalString(current.predictionDecidedAt),
+      ...referenceFeedKeys({
+        id: nextReferenceId,
+        corpusId: targetCorpusId,
+        curationStatus,
+        versionState: "current",
+        predictedAcceptProbability: typeof current.predictedAcceptProbability === "number" ? current.predictedAcceptProbability : null,
+        createdAt: normalizeOptionalString(current.createdAt) ?? now,
+        importedAt: normalizeOptionalString(current.importedAt),
+        retrievedAt: normalizeOptionalString(current.retrievedAt),
+        sourcePublishedAt: normalizeOptionalString(current.sourcePublishedAt),
+      }),
       updatedAt: now,
     }),
     "create moved Reference version",

package/lib/reference-feed-keys.ts

@@ -0,0 +1,69 @@
+/**
+ * The keys the References page reads through (docs/reference-feed-indexes.md). The Python twin is
+ * src/papyrus_content/reference_feed_keys.py; scripts/fixtures/reference-feed-key-vectors.json holds the vectors both test.
+ *
+ * `feedStateKey` is "<corpusId>#unrated" (pending) or "<corpusId>#rated" (accepted or rejected); a Reference that is not the current
+ * version, or is archived, has none and is in neither feed. `predictionSortKey` is the Cyclotron's ORIGINAL P(accept), then arrival, then
+ * id; a Reference nobody predicted sorts as 0.5. A vote changes `feedStateKey` and nothing else here.
+ */
+import { normalizeReferenceCurationStatus } from "./reference-policy";
+
+export const UNDECIDED_PROBABILITY = 0.5;
+const EPOCH = "1970-01-01T00:00:00.000Z";
+const ARRIVAL_FIELDS = ["createdAt", "importedAt", "retrievedAt", "sourcePublishedAt", "versionCreatedAt"] as const;
+
+export type ReferenceFeedKeyInput = {
+  id: string;
+  corpusId?: string | null;
+  curationStatus?: string | null;
+  versionState?: string | null;
+  predictedAcceptProbability?: number | null;
+  createdAt?: string | null;
+  importedAt?: string | null;
+  retrievedAt?: string | null;
+  sourcePublishedAt?: string | null;
+  versionCreatedAt?: string | null;
+};
+
+export type ReferenceFeedKeys = {
+  feedStateKey: string | null;
+  feedArrivalAt: string;
+  predictionSortKey: string;
+};
+
+function instant(value: string | null | undefined): string | null {
+  if (!value) return null;
+  const parsed = Date.parse(value);
+  return Number.isFinite(parsed) ? new Date(parsed).toISOString() : null;
+}
+
+export function referenceFeedArrivalAt(reference: ReferenceFeedKeyInput): string {
+  for (const field of ARRIVAL_FIELDS) {
+    const found = instant(reference[field]);
+    if (found) return found;
+  }
+  return EPOCH;
+}
+
+export function referenceFeedStateKey(reference: ReferenceFeedKeyInput): string | null {
+  if (reference.versionState && reference.versionState !== "current") return null;
+  if (!reference.corpusId) return null;
+  const status = normalizeReferenceCurationStatus(reference.curationStatus);
+  if (status === "archived") return null;
+  return `${reference.corpusId}#${status === "pending" ? "unrated" : "rated"}`;
+}
+
+export function predictionSortKeyFor(probability: number | null | undefined, arrival: string, referenceId: string): string {
+  const chosen = probability === null || probability === undefined ? UNDECIDED_PROBABILITY : Math.min(1, Math.max(0, probability));
+  return `${chosen.toFixed(6)}#${arrival}#${referenceId}`;
+}
+
+/** The three feed keys for a Reference as it stands. `probability` overrides the one stored on it. */
+export function referenceFeedKeys(reference: ReferenceFeedKeyInput, probability?: number | null): ReferenceFeedKeys {
+  const arrival = referenceFeedArrivalAt(reference);
+  return {
+    feedStateKey: referenceFeedStateKey(reference),
+    feedArrivalAt: arrival,
+    predictionSortKey: predictionSortKeyFor(probability ?? reference.predictedAcceptProbability, arrival, reference.id),
+  };
+}

package/package.json

@@ -354,6 +354,7 @@
     "./lib/reference-capture": "./lib/reference-capture.ts",
     "./lib/reference-display": "./lib/reference-display.ts",
     "./lib/reference-feed-cache": "./lib/reference-feed-cache.ts",
+    "./lib/reference-feed-keys": "./lib/reference-feed-keys.ts",
     "./lib/reference-feed-ranking": "./lib/reference-feed-ranking.ts",
     "./lib/reference-policy": "./lib/reference-policy.ts",
     "./lib/reference-preview": "./lib/reference-preview.ts",
@@ -516,7 +517,7 @@
       "optional": true
     }
   },
-  "version": "5.43.0-next.45",
+  "version": "5.43.0-next.47",
   "dependencies": {
     "@aws-amplify/adapter-nextjs": "^1.7.3",
     "@aws-crypto/sha256-js": "5.2.0",

package/routes.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "5.43.0-next.45",
+  "version": "5.43.0-next.47",
   "routes": [
     {
       "file": "app/%5F_preview/[[...path]]/route.ts",