@anthusai/papyrus 1.19.1 → 2.0.0-next.10

package/amplify/plugins/editorial-checks/schema.js

@@ -0,0 +1,94 @@
+import { a } from "@aws-amplify/backend";
+import { editorialChecks } from "./function/resource.js";
+const editors = ["editor", "admin"];
+/**
+ * Policies, settings and editors' decisions live in Papyrus; Limatus checks
+ * content against them. Editors read policies and record decisions; admins
+ * manage policies and settings. Only the function (IAM) calls Limatus.
+ */
+export function editorialChecksSchemaDefinitions() {
+    return {
+        EditorialPolicy: a
+            .model({
+            id: a.id().required(),
+            policyKey: a.string().required(),
+            scope: a.string().required(),
+            version: a.integer().required(),
+            title: a.string().required(),
+            guidance: a.string().required(),
+            severity: a.string().required(),
+            enabled: a.boolean().required(),
+            detectors: a.json().required(),
+            examples: a.json(),
+            rewriteGuidance: a.string(),
+            source: a.string().required(),
+        })
+            .disableOperations(["subscriptions"])
+            .authorization((allow) => [allow.group("editor").to(["read"]), allow.group("admin")]),
+        EditorialCheckSettings: a
+            .model({
+            id: a.id().required(),
+            settings: a.json().required(),
+        })
+            .disableOperations(["subscriptions"])
+            .authorization((allow) => [allow.group("editor").to(["read"]), allow.group("admin")]),
+        EditorialFeedback: a
+            .model({
+            id: a.id().required(),
+            itemId: a.string().required(),
+            findingId: a.string().required(),
+            policyId: a.string().required(),
+            detectorId: a.string().required(),
+            lane: a.string().required(),
+            probability: a.float(),
+            decision: a.string().required(),
+            reason: a.string(),
+            text: a.string(),
+        })
+            .disableOperations(["subscriptions"])
+            .secondaryIndexes((index) => [index("itemId").queryField("listEditorialFeedbackByItem")])
+            .authorization((allow) => [allow.group("editor").to(["create", "read"]), allow.group("admin")]),
+        checkEditorial: a
+            .query()
+            .arguments({ body: a.string().required(), format: a.string(), section: a.string() })
+            .returns(a.json())
+            .authorization((allow) => [allow.groups(editors)])
+            .handler(a.handler.function(editorialChecks)),
+        suggestEditorialRewrite: a
+            .query()
+            .arguments({
+            body: a.string().required(),
+            format: a.string(),
+            section: a.string(),
+            finding: a.json(),
+            selection: a.json(),
+            note: a.string(),
+        })
+            .returns(a.json())
+            .authorization((allow) => [allow.groups(editors)])
+            .handler(a.handler.function(editorialChecks)),
+        draftEditorialQuestions: a
+            .query()
+            .arguments({ title: a.string().required(), guidance: a.string().required(), examples: a.json() })
+            .returns(a.json())
+            .authorization((allow) => [allow.group("admin")])
+            .handler(a.handler.function(editorialChecks)),
+        tryEditorialPolicy: a
+            .query()
+            .arguments({ policy: a.json().required(), text: a.string().required(), format: a.string() })
+            .returns(a.json())
+            .authorization((allow) => [allow.group("admin")])
+            .handler(a.handler.function(editorialChecks)),
+        importEditorialStarterPack: a
+            .mutation()
+            .arguments({ name: a.string().required() })
+            .returns(a.json())
+            .authorization((allow) => [allow.group("admin")])
+            .handler(a.handler.function(editorialChecks)),
+        recalibrateEditorialPolicies: a
+            .mutation()
+            .returns(a.json())
+            .authorization((allow) => [allow.group("admin")])
+            .handler(a.handler.function(editorialChecks)),
+    };
+}

package/amplify/plugins/editorial-checks/schema.ts

@@ -0,0 +1,96 @@
+import { a } from "@aws-amplify/backend";
+import { editorialChecks } from "./function/resource";
+
+const editors = ["editor", "admin"];
+
+/**
+ * Policies, settings and editors' decisions live in Papyrus; Limatus checks
+ * content against them. Editors read policies and record decisions; admins
+ * manage policies and settings. Only the function (IAM) calls Limatus.
+ */
+export function editorialChecksSchemaDefinitions() {
+  return {
+    EditorialPolicy: a
+      .model({
+        id: a.id().required(),
+        policyKey: a.string().required(),
+        scope: a.string().required(),
+        version: a.integer().required(),
+        title: a.string().required(),
+        guidance: a.string().required(),
+        severity: a.string().required(),
+        enabled: a.boolean().required(),
+        detectors: a.json().required(),
+        examples: a.json(),
+        rewriteGuidance: a.string(),
+        source: a.string().required(),
+      })
+      .disableOperations(["subscriptions"])
+      .authorization((allow) => [allow.group("editor").to(["read"]), allow.group("admin")]),
+    EditorialCheckSettings: a
+      .model({
+        id: a.id().required(),
+        settings: a.json().required(),
+      })
+      .disableOperations(["subscriptions"])
+      .authorization((allow) => [allow.group("editor").to(["read"]), allow.group("admin")]),
+    EditorialFeedback: a
+      .model({
+        id: a.id().required(),
+        itemId: a.string().required(),
+        findingId: a.string().required(),
+        policyId: a.string().required(),
+        detectorId: a.string().required(),
+        lane: a.string().required(),
+        probability: a.float(),
+        decision: a.string().required(),
+        reason: a.string(),
+        text: a.string(),
+      })
+      .disableOperations(["subscriptions"])
+      .secondaryIndexes((index) => [index("itemId").queryField("listEditorialFeedbackByItem")])
+      .authorization((allow) => [allow.group("editor").to(["create", "read"]), allow.group("admin")]),
+    checkEditorial: a
+      .query()
+      .arguments({ body: a.string().required(), format: a.string(), section: a.string() })
+      .returns(a.json())
+      .authorization((allow) => [allow.groups(editors)])
+      .handler(a.handler.function(editorialChecks)),
+    suggestEditorialRewrite: a
+      .query()
+      .arguments({
+        body: a.string().required(),
+        format: a.string(),
+        section: a.string(),
+        finding: a.json(),
+        selection: a.json(),
+        note: a.string(),
+      })
+      .returns(a.json())
+      .authorization((allow) => [allow.groups(editors)])
+      .handler(a.handler.function(editorialChecks)),
+    draftEditorialQuestions: a
+      .query()
+      .arguments({ title: a.string().required(), guidance: a.string().required(), examples: a.json() })
+      .returns(a.json())
+      .authorization((allow) => [allow.group("admin")])
+      .handler(a.handler.function(editorialChecks)),
+    tryEditorialPolicy: a
+      .query()
+      .arguments({ policy: a.json().required(), text: a.string().required(), format: a.string() })
+      .returns(a.json())
+      .authorization((allow) => [allow.group("admin")])
+      .handler(a.handler.function(editorialChecks)),
+    importEditorialStarterPack: a
+      .mutation()
+      .arguments({ name: a.string().required() })
+      .returns(a.json())
+      .authorization((allow) => [allow.group("admin")])
+      .handler(a.handler.function(editorialChecks)),
+    recalibrateEditorialPolicies: a
+      .mutation()
+      .returns(a.json())
+      .authorization((allow) => [allow.group("admin")])
+      .handler(a.handler.function(editorialChecks)),
+  };
+}

package/amplify/plugins/registry.js

@@ -1,6 +1,8 @@
+import { editorialChecksPlugin } from "./editorial-checks/papyrus.plugin.js";
 import { signupPlugin } from "./signup/papyrus.plugin.js";
 /** Plugins are packaged with Papyrus and pinned by its version: there is no registry to fetch from. */
 export const KNOWN_PLUGINS = {
+    "editorial-checks": editorialChecksPlugin,
     signup: signupPlugin,
 };
 export function resolvePlugins(requests) {

package/amplify/plugins/registry.ts

@@ -1,8 +1,10 @@
 import type { PapyrusPlugin, PluginRequest } from "./types";
+import { editorialChecksPlugin } from "./editorial-checks/papyrus.plugin";
 import { signupPlugin } from "./signup/papyrus.plugin";
 
 /** Plugins are packaged with Papyrus and pinned by its version: there is no registry to fetch from. */
 export const KNOWN_PLUGINS: Record<string, PapyrusPlugin<any, any>> = {
+  "editorial-checks": editorialChecksPlugin,
   signup: signupPlugin,
 };
 

package/amplify/site-backend.js

@@ -23,6 +23,7 @@ import { defineSiteData } from "./data/resource.js";
 import { resolvePlugins } from "./plugins/registry.js";
 import { wirePlugins } from "./plugins/wire.js";
 import { assignmentAction } from "./functions/assignment-action/resource.js";
+import { scopeAssignmentDataAccess } from "./functions/assignment-action/data-access.js";
 import { categoryAction } from "./functions/category-action/resource.js";
 import { ConsoleChatResponderStack } from "./functions/console-chat-responder/resource.js";
 import { contentActions, setSiteFilesForContentActionsBundle } from "./functions/content-actions/resource.js";
@@ -304,10 +305,14 @@ export function defineSiteBackend(papyrusSite) {
     }
     grantCorporaRead(backend.knowledgeQuery.resources.lambda);
     grantNewsroomReadWrite(backend.assignmentAction.resources.lambda);
+    scopeAssignmentDataAccess(backend.assignmentAction.resources.lambda, backend.data.resources.graphqlApi.arn);
     grantNewsroomReadWrite(backend.categoryAction.resources.lambda);
     grantNewsroomReadWrite(backend.newsroomSummary.resources.lambda);
     const contentActionsLambda = backend.contentActions.resources.lambda;
     grantNewsroomReadWriteDelete(contentActionsLambda);
+    // AppSync validates the token; pending intake additionally binds its actor
+    // and publication to this deployment's pool and existing API endpoint.
+    contentActionsLambda.addEnvironment("PAPYRUS_USER_POOL_ISSUER", `https://cognito-idp.${Stack.of(contentActionsLambda).region}.amazonaws.com/${backend.auth.resources.userPool.userPoolId}`);
     contentActionsLambda.addEnvironment("PAPYRUS_GRAPHQL_ENDPOINT", backend.data.resources.cfnResources.cfnGraphqlApi.attrGraphQlUrl);
     contentActionsLambda.addToRolePolicy(new PolicyStatement({
         actions: ["appsync:GraphQL"],

package/amplify/site-backend.ts

@@ -30,6 +30,7 @@ import { defineSiteData } from "./data/resource";
 import { resolvePlugins } from "./plugins/registry";
 import { wirePlugins } from "./plugins/wire";
 import { assignmentAction } from "./functions/assignment-action/resource";
+import { scopeAssignmentDataAccess } from "./functions/assignment-action/data-access";
 import { categoryAction } from "./functions/category-action/resource";
 import { ConsoleChatResponderStack } from "./functions/console-chat-responder/resource";
 import { contentActions, setSiteFilesForContentActionsBundle } from "./functions/content-actions/resource";
@@ -387,10 +388,20 @@ export function defineSiteBackend(papyrusSite: PapyrusSite) {
   }
   grantCorporaRead(backend.knowledgeQuery.resources.lambda as LambdaFunction);
   grantNewsroomReadWrite(backend.assignmentAction.resources.lambda as LambdaFunction);
+  scopeAssignmentDataAccess(
+    backend.assignmentAction.resources.lambda as LambdaFunction,
+    backend.data.resources.graphqlApi.arn,
+  );
   grantNewsroomReadWrite(backend.categoryAction.resources.lambda as LambdaFunction);
   grantNewsroomReadWrite(backend.newsroomSummary.resources.lambda as LambdaFunction);
   const contentActionsLambda = backend.contentActions.resources.lambda as LambdaFunction;
   grantNewsroomReadWriteDelete(contentActionsLambda);
+  // AppSync validates the token; pending intake additionally binds its actor
+  // and publication to this deployment's pool and existing API endpoint.
+  contentActionsLambda.addEnvironment(
+    "PAPYRUS_USER_POOL_ISSUER",
+    `https://cognito-idp.${Stack.of(contentActionsLambda).region}.amazonaws.com/${backend.auth.resources.userPool.userPoolId}`,
+  );
   contentActionsLambda.addEnvironment(
     "PAPYRUS_GRAPHQL_ENDPOINT",
     backend.data.resources.cfnResources.cfnGraphqlApi.attrGraphQlUrl,

package/app/globals.css

@@ -3749,95 +3749,6 @@ img {
   gap: 0;
 }
 
-.newsroom-deep-section {
-  border-top: 2px solid var(--rule);
-  display: grid;
-  grid-template-columns: repeat(var(--news-desk-page-columns), minmax(0, 1fr));
-  margin-top: calc(var(--paper-rhythm) * 2);
-  min-width: 0;
-  row-gap: calc(var(--paper-rhythm) * 1.5);
-}
-
-.newsroom-deep-section__header {
-  border-bottom: 1px solid rgb(var(--rule-rgb) / 0.52);
-  display: grid;
-  grid-column: 1 / -1;
-  gap: calc(var(--paper-rhythm) * 0.5);
-  padding: calc(var(--paper-rhythm) * 0.75) 0;
-}
-
-.newsroom-deep-section__header h2,
-.newsroom-deep-section > h2 {
-  color: rgb(var(--ink-solid-rgb) / var(--ink-display-alpha));
-  font-size: 3rem;
-  font-weight: 900;
-  letter-spacing: 0;
-  line-height: 0.92;
-  margin: 0;
-}
-
-.newsroom-deep-section__header a {
-  color: var(--muted);
-  font-family: Arial, Helvetica, sans-serif;
-  font-size: 0.66rem;
-  font-weight: 800;
-  letter-spacing: 0.08em;
-  text-transform: uppercase;
-}
-
-.newsroom-deep-section__header-actions {
-  align-items: center;
-  display: flex;
-  flex-wrap: wrap;
-  gap: var(--paper-rhythm);
-}
-
-.newsroom-deep-section__header-actions button {
-  background: transparent;
-  border: 1px solid rgb(var(--rule-rgb) / 0.62);
-  color: rgb(var(--ink-solid-rgb) / var(--ink-display-alpha));
-  cursor: pointer;
-  font-family: Arial, Helvetica, sans-serif;
-  font-size: 0.66rem;
-  font-weight: 800;
-  letter-spacing: 0.08em;
-  min-height: var(--paper-rhythm);
-  padding: 0 calc(var(--paper-rhythm) * 0.5);
-  text-transform: uppercase;
-}
-
-.newsroom-deep-section__header-actions button:disabled {
-  color: var(--muted);
-  cursor: not-allowed;
-}
-
-.newsroom-deep-section__body {
-  column-gap: var(--news-desk-column-gap);
-  display: grid;
-  grid-column: 1 / -1;
-  grid-template-columns: repeat(var(--news-desk-page-columns), minmax(0, 1fr));
-  row-gap: calc(var(--paper-rhythm) * 1.5);
-}
-
-.newsroom-deep-section__field {
-  border-top: 1px solid rgb(var(--rule-rgb) / 0.42);
-  grid-column: span 2;
-  min-width: 0;
-  padding-top: calc(var(--paper-rhythm) * 0.5);
-}
-
-.newsroom-deep-section__field--lead {
-  grid-column: span 3;
-}
-
-.newsroom-deep-section__field p:not(.story-label),
-.newsroom-deep-section > p:not(.story-label) {
-  color: var(--muted-strong);
-  font-size: 1.05rem;
-  line-height: var(--news-desk-text-leading, var(--paper-rhythm));
-  margin: calc(var(--paper-rhythm) * 0.5) 0 0;
-}
-
 .newsroom-recent-panel__header {
   border-bottom: 1px solid rgb(var(--rule-rgb) / 0.42);
   min-height: calc(var(--paper-rhythm, 19px) * 3);
@@ -8825,10 +8736,6 @@ img {
     grid-template-columns: repeat(3, minmax(0, 1fr));
   }
 
-  .newsroom-deep-section__field,
-  .newsroom-deep-section__field--lead {
-    grid-column: 1 / -1;
-  }
 }
 
 @media (max-width: 785px) {
@@ -10263,85 +10170,3 @@ img {
   }
 }
 
-/* Ops app chrome: sans-only content surfaces; moss primary on navigation/actions */
-[data-newsroom-chrome="app"][data-newsroom-ops-shell="true"] {
-  font-family: var(--font-sans), ui-sans-serif, system-ui, sans-serif;
-}
-
-[data-newsroom-chrome="app"][data-newsroom-ops-shell="true"] h1,
-[data-newsroom-chrome="app"][data-newsroom-ops-shell="true"] h2,
-[data-newsroom-chrome="app"][data-newsroom-ops-shell="true"] h3,
-[data-newsroom-chrome="app"][data-newsroom-ops-shell="true"] .story-label {
-  font-family: var(--font-sans), ui-sans-serif, system-ui, sans-serif;
-}
-
-[data-newsroom-chrome="app"] [data-category-steering] {
-  font-family: var(--font-sans), ui-sans-serif, system-ui, sans-serif;
-}
-
-[data-theme-pack="pilobol-us"] [data-newsroom-ops-shell="true"] a:focus-visible,
-[data-theme-pack="pilobol-us"] [data-newsroom-ops-shell="true"] button:focus-visible {
-  --tw-ring-color: var(--theme-moss);
-}
-
-/* List-row selection in ops chrome: tint wash + foreground copy; never invert to primary-foreground. */
-[data-newsroom-chrome="app"] [data-newsroom-list-row][data-selected="true"],
-[data-newsroom-chrome="app"] [data-newsroom-list-row][aria-current="true"],
-[data-newsroom-chrome="app"] .newsroom-card[data-active="true"],
-[data-newsroom-chrome="app"] .news-desk-data-grid__row[data-active="true"],
-[data-newsroom-chrome="app"] .news-desk-topic-root-button[data-selected="true"],
-[data-newsroom-chrome="app"] .news-desk-topic-focus-row[data-selected="true"],
-[data-newsroom-chrome="app"] .news-desk-topic-focus-button[data-selected="true"],
-[data-newsroom-chrome="app"] .news-desk-desk-card[data-selected="true"] {
-  background: color-mix(in srgb, var(--primary) 10%, transparent);
-  color: var(--foreground);
-}
-
-[data-newsroom-chrome="app"] .newsroom-card[data-active="true"] .newsroom-card__title,
-[data-newsroom-chrome="app"] .newsroom-card[data-active="true"] .newsroom-card__body,
-[data-newsroom-chrome="app"] .newsroom-card[data-active="true"] .newsroom-card__kicker,
-[data-newsroom-chrome="app"] .newsroom-card[data-active="true"] .newsroom-card__meta,
-[data-newsroom-chrome="app"] .newsroom-card[data-active="true"] .newsroom-card__stamp,
-[data-newsroom-chrome="app"] .news-desk-data-grid__row[data-active="true"] strong,
-[data-newsroom-chrome="app"] .news-desk-topic-root-button[data-selected="true"] strong,
-[data-newsroom-chrome="app"] .news-desk-topic-focus-button[data-selected="true"] strong {
-  color: var(--foreground);
-}
-
-[data-newsroom-chrome="app"] [role="tab"][aria-selected="true"] {
-  background: color-mix(in srgb, var(--primary) 10%, transparent);
-  color: var(--foreground);
-}
-
-@media (prefers-color-scheme: dark) {
-  :root:not([data-papyrus-theme="light"]):not(.light-theme) [data-newsroom-chrome="app"] [data-newsroom-list-row][data-selected="true"],
-  :root:not([data-papyrus-theme="light"]):not(.light-theme) [data-newsroom-chrome="app"] [data-newsroom-list-row][aria-current="true"],
-  :root:not([data-papyrus-theme="light"]):not(.light-theme) [data-newsroom-chrome="app"] .newsroom-card[data-active="true"],
-  :root:not([data-papyrus-theme="light"]):not(.light-theme) [data-newsroom-chrome="app"] .news-desk-data-grid__row[data-active="true"],
-  :root:not([data-papyrus-theme="light"]):not(.light-theme) [data-newsroom-chrome="app"] .news-desk-topic-root-button[data-selected="true"],
-  :root:not([data-papyrus-theme="light"]):not(.light-theme) [data-newsroom-chrome="app"] .news-desk-topic-focus-row[data-selected="true"],
-  :root:not([data-papyrus-theme="light"]):not(.light-theme) [data-newsroom-chrome="app"] .news-desk-topic-focus-button[data-selected="true"],
-  :root:not([data-papyrus-theme="light"]):not(.light-theme) [data-newsroom-chrome="app"] .news-desk-desk-card[data-selected="true"] {
-    background: color-mix(in srgb, var(--foreground) 8%, transparent);
-  }
-}
-
-:root.dark-theme [data-newsroom-chrome="app"] [data-newsroom-list-row][data-selected="true"],
-:root[data-papyrus-theme="dark"] [data-newsroom-chrome="app"] [data-newsroom-list-row][data-selected="true"],
-:root.dark-theme [data-newsroom-chrome="app"] [data-newsroom-list-row][aria-current="true"],
-:root[data-papyrus-theme="dark"] [data-newsroom-chrome="app"] [data-newsroom-list-row][aria-current="true"],
-:root.dark-theme [data-newsroom-chrome="app"] .newsroom-card[data-active="true"],
-:root[data-papyrus-theme="dark"] [data-newsroom-chrome="app"] .newsroom-card[data-active="true"],
-:root.dark-theme [data-newsroom-chrome="app"] .news-desk-data-grid__row[data-active="true"],
-:root[data-papyrus-theme="dark"] [data-newsroom-chrome="app"] .news-desk-data-grid__row[data-active="true"],
-:root.dark-theme [data-newsroom-chrome="app"] .news-desk-topic-root-button[data-selected="true"],
-:root[data-papyrus-theme="dark"] [data-newsroom-chrome="app"] .news-desk-topic-root-button[data-selected="true"],
-:root.dark-theme [data-newsroom-chrome="app"] .news-desk-topic-focus-row[data-selected="true"],
-:root[data-papyrus-theme="dark"] [data-newsroom-chrome="app"] .news-desk-topic-focus-row[data-selected="true"],
-:root.dark-theme [data-newsroom-chrome="app"] .news-desk-topic-focus-button[data-selected="true"],
-:root[data-papyrus-theme="dark"] [data-newsroom-chrome="app"] .news-desk-topic-focus-button[data-selected="true"],
-:root.dark-theme [data-newsroom-chrome="app"] .news-desk-desk-card[data-selected="true"],
-:root[data-papyrus-theme="dark"] [data-newsroom-chrome="app"] .news-desk-desk-card[data-selected="true"] {
-  background: color-mix(in srgb, var(--foreground) 8%, transparent);
-}
-

package/app/newsroom/[section]/[...selection]/page.tsx

@@ -1,4 +1,3 @@
-import { resolveActiveSiteBrand } from "../../../../lib/site-brand-tenant";
 import { notFound, redirect } from "next/navigation";
 import { toPublicNewsroomPath } from "../../../../lib/newsroom-base-path";
 import { NewsDeskPage } from "../../../../components/news-desk-page";
@@ -42,11 +41,6 @@ export default async function NewsDeskNestedSectionPage({ params, searchParams }
   if (section === "users") redirect(toPublicNewsroomPath("/newsroom/administration/users"));
   if (section === "doctrine") redirect(toPublicNewsroomPath("/newsroom/administration/policies"));
   if (section === "administration" && selection[0] === "analysis") redirect(toPublicNewsroomPath("/newsroom/assignments"));
-  if (section === "desks" && resolveActiveSiteBrand().newsroomLayout !== "organizer") {
-    const category = selection[0] ? decodeURIComponent(selection[0]) : null;
-    if (category) redirect(toPublicNewsroomPath(`/newsroom/topics?category=${encodeURIComponent(category)}`));
-    redirect(toPublicNewsroomPath("/newsroom/topics"));
-  }
   if (!NEWS_DESK_ROUTE_SECTIONS.has(section as NewsDeskTab)) notFound();
   return <NewsDeskPage section={section} selectionPath={selection} searchParams={searchParams} />;
 }

package/app/newsroom/[section]/page.tsx

@@ -1,4 +1,3 @@
-import { resolveActiveSiteBrand } from "../../../lib/site-brand-tenant";
 import { notFound, redirect } from "next/navigation";
 import { toPublicNewsroomPath } from "../../../lib/newsroom-base-path";
 import { contentItemBoardPathSegment } from "../../../lib/newsroom-board";
@@ -46,10 +45,9 @@ export default async function NewsDeskSectionPage({ params, searchParams }: News
   if (section === "work") redirect(toPublicNewsroomPath(`/newsroom/${contentItemBoardPathSegment()}`));
   if (section === "users") redirect(toPublicNewsroomPath("/newsroom/administration/users"));
   if (section === "doctrine") redirect(toPublicNewsroomPath("/newsroom/administration/policies"));
-  if (section === "desks" && resolveActiveSiteBrand().newsroomLayout !== "organizer") redirect(toPublicNewsroomPath("/newsroom/topics"));
-  if (section === contentItemBoardPathSegment() && resolveActiveSiteBrand().newsroomLayout === "organizer") return <NewsroomBoardView subject="contentItem" />;
+  if (section === contentItemBoardPathSegment()) return <NewsroomBoardView subject="contentItem" />;
   if (!NEWS_DESK_ROUTE_SECTIONS.has(section as NewsDeskTab)) notFound();
-  if (section === "assignments" && resolveActiveSiteBrand().newsroomLayout === "organizer") {
+  if (section === "assignments") {
     const resolved = await searchParams;
     if (!resolved?.assignment && resolved?.demo !== "1") return <NewsroomBoardView subject="assignment" />;
   }

package/app/newsroom/articles/page.tsx

@@ -2,7 +2,6 @@ import { redirect } from "next/navigation";
 import { contentItemBoardPathSegment } from "../../../lib/newsroom-board";
 import { toPublicNewsroomPath } from "../../../lib/newsroom-base-path";
 import { NewsroomBoardView } from "../../../components/newsroom-board-view";
-import { resolveActiveSiteBrand } from "../../../lib/site-brand-tenant";
 import { NewsroomArticlesView } from "../../../components/newsroom-articles-view";
 
 export const dynamic = "force-dynamic";
@@ -14,7 +13,7 @@ type NewsroomArticlesPageProps = {
 export default async function NewsroomArticlesPage({ searchParams }: NewsroomArticlesPageProps) {
   const resolved = await searchParams;
   const demoValue = Array.isArray(resolved?.demo) ? resolved?.demo[0] : resolved?.demo;
-  if (resolveActiveSiteBrand().newsroomLayout === "organizer" && demoValue !== "1") {
+  if (demoValue !== "1") {
     const boardPathSegment = contentItemBoardPathSegment();
     if (boardPathSegment !== "articles") redirect(toPublicNewsroomPath(`/newsroom/${boardPathSegment}`));
     return <NewsroomBoardView subject="contentItem" />;

package/app/newsroom/sections/[sectionId]/page.tsx

@@ -1,20 +1,16 @@
 import { notFound } from "next/navigation";
-import { resolveActiveSiteBrand } from "../../../../lib/site-brand-tenant";
 import { NewsroomBoardView } from "../../../../components/newsroom-board-view";
-import { NewsDeskPage } from "../../../../components/news-desk-page";
 
 export const dynamic = "force-dynamic";
 
 type NewsroomDeepSectionPageProps = {
   params: Promise<{ sectionId: string }>;
-  searchParams?: Promise<Record<string, string | string[] | undefined>>;
 };
 
-export default async function NewsroomDeepSectionPage({ params, searchParams }: NewsroomDeepSectionPageProps) {
+export default async function NewsroomDeepSectionPage({ params }: NewsroomDeepSectionPageProps) {
   const { sectionId } = await params;
   const normalizedSectionId = decodeURIComponent(sectionId ?? "").trim();
   if (!normalizedSectionId) notFound();
 
-  if (resolveActiveSiteBrand().newsroomLayout === "organizer") return <NewsroomBoardView subject="desk" deskId={normalizedSectionId} />;
-  return <NewsDeskPage sectionPageId={normalizedSectionId} searchParams={searchParams} />;
+  return <NewsroomBoardView subject="desk" deskId={normalizedSectionId} />;
 }

package/bin/papyrus-infra.mjs

@@ -12,6 +12,7 @@ import fs from "node:fs";
 import { spawnSync } from "node:child_process";
 import path from "node:path";
 import { createRequire } from "node:module";
+import { resolveCdkEnvironment } from "../src/cdk-environment.mjs";
 
 const USAGE = [
   "Usage: papyrus-infra synth --site infra/site.json [--out cdk.out] [--account A] [--region R]",
@@ -26,6 +27,14 @@ const opt = (name, fallback) => {
   const i = args.indexOf(`--${name}`);
   return i >= 0 ? args[i + 1] : fallback;
 };
+const resolveEnvironmentOrExit = () => {
+  try {
+    return resolveCdkEnvironment({ explicitAccount: opt("account"), explicitRegion: opt("region") });
+  } catch (error) {
+    console.error(`papyrus-infra: ${error instanceof Error ? error.message : error}`);
+    process.exit(1);
+  }
+};
 const command = args[0];
 if (command !== "synth" && command !== "print-buildspec" && command !== "deploy" && command !== "deploy-edge") {
   console.error(USAGE);
@@ -85,7 +94,7 @@ if (accountStack !== undefined) {
   const { App } = createRequire(path.join(process.cwd(), "noop.js"))("aws-cdk-lib");
   const app = new App({ outdir: path.resolve(opt("out", "cdk.out")) });
   new GithubOidcProviderStack(app, "GithubOidcProviderStack", {
-    env: { account: opt("account", process.env.CDK_DEFAULT_ACCOUNT ?? "335163751677"), region: opt("region", process.env.CDK_DEFAULT_REGION ?? "us-east-1") },
+    env: resolveEnvironmentOrExit(),
     stackName: "github-oidc-provider",
   });
   app.synth();
@@ -168,7 +177,7 @@ try {
 const { App } = createRequire(path.join(process.cwd(), "noop.js"))("aws-cdk-lib");
 const app = new App({ outdir: path.resolve(opt("out", "cdk.out")) });
 new AmplifyAppShellStack(app, `AmplifyAppShell-${config.siteId}`, config, {
-  env: { account: opt("account", process.env.CDK_DEFAULT_ACCOUNT ?? "335163751677"), region: opt("region", process.env.CDK_DEFAULT_REGION ?? "us-east-1") },
+  env: resolveEnvironmentOrExit(),
   stackName: resolveStackName(config),
 });
 app.synth();