@anthusai/papyrus 1.4.0-next.1 → 1.4.0-next.10

package/components/newsroom-board-view.tsx

@@ -1,13 +1,13 @@
 "use client";
 
-import { useEffect, useMemo, useRef, useState } from "react";
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import Link from "next/link";
-import { IssueCollection, IssueDetailPanel } from "@kanbus/ui";
+import { usePathname, useRouter, useSearchParams } from "next/navigation";
+import { IssueCollection, IssueDetailPanel, IssueTypeFilter, issueTypeFromFilter, useBoardColumnState } from "@kanbus/ui";
 import "@kanbus/ui/styles/kanban.css";
+import "@kanbus/ui/styles/newsprint.css";
 import "./newsroom-newsprint-board.css";
 import { PlusIcon } from "lucide-react";
-import { buttonVariants } from "./ui/button";
-import { cn } from "../lib/utils";
 import { newsroomHref } from "../lib/newsroom-base-path";
 import {
   ASSIGNMENT_BOARD_TYPE,
@@ -15,22 +15,34 @@ import {
   canReadNewsroomBoard,
   contentItemBoardConfig,
   contentItemBoardType,
+  deskBoardConfig,
+  deskContainsAssignment,
+  deskContainsContentItem,
   projectAssignmentBoard,
   projectContentItemBoard,
   type NativeBoardIssue,
 } from "../lib/newsroom-board";
-import type { AssignmentRecord } from "../lib/category-repository";
-import { getContentItemName, SITE_BRAND } from "../lib/site-brand";
+import type { AssignmentRecord, NewsroomSectionRecord } from "../lib/category-repository";
+import { displayNewsroomSectionShortTitle, newsroomDeskOptions } from "../lib/newsroom-sections";
+import { getContentItemName, getContentItemStageDefinitions, SITE_BRAND } from "../lib/site-brand";
 import { getNewsroomNavHref } from "../lib/newsroom-nav";
-import { loadNewsroomAssignmentPage, loadNewsroomContentItemVersions, loadNewsroomPublishedContentItemVersions } from "./news-desk-taxonomy-client";
+import { loadNewsroomAssignmentPage, loadNewsroomPublishedContentItemVersions, saveNewsroomAssignmentDesk } from "./news-desk-taxonomy-client";
+import { usePagedContentItemVersions } from "./use-paged-content-item-versions";
+import type { ContentItemVersionRecord } from "../lib/content-item-lifecycle";
 import { useOptionalNewsDeskClient } from "./news-desk-client-provider";
 import { NewsDeskAccessGate } from "./newsroom-access-gate";
+import { isLocalPreviewEnabled } from "../lib/local-preview";
+import { NewsroomArticleEditor } from "./newsroom-article-editor";
+import { NewsroomAssignmentDetail } from "./newsroom-assignment-detail";
 import { NewsroomOpsShell, NewsroomOpsStatusBanner } from "./newsroom-ops-shell";
 import { useResolvedPapyrusTheme } from "./use-resolved-papyrus-theme";
 import { readLocalReaderSettings, subscribeReaderSettingsChanges } from "./reader-settings";
 
+/** A board with a story or assignment open lives at `?open=<id>`, distinct from the standalone page for that record. */
+const SELECTED_ISSUE_PARAMETER = "open";
 const STATIC_MOTION = { mode: "static" } as const;
 const BOARD_REFRESH_INTERVAL_MILLISECONDS = 30_000;
+const COLUMN_LOAD_MORE_DISTANCE_PIXELS = 240;
 
 async function loadEveryNewsroomAssignment() {
   const assignments: AssignmentRecord[] = [];
@@ -43,43 +55,68 @@ async function loadEveryNewsroomAssignment() {
   return assignments;
 }
 
-export type NewsroomBoardSubject = "contentItem" | "assignment";
+export type NewsroomBoardSubject = "contentItem" | "assignment" | "desk";
 
 /** Read-only board of one record kind over authenticated CMS records; existing workspaces own every mutation. */
-export function NewsroomBoardView({ subject }: { subject: NewsroomBoardSubject }) {
+export function NewsroomBoardView({ subject, deskId }: { subject: NewsroomBoardSubject; deskId?: string }) {
   const session = useOptionalNewsDeskClient();
   const allowed = canReadNewsroomBoard(session?.shell.phase);
   const theme = useResolvedPapyrusTheme();
   const [lowMotion, setLowMotion] = useState(false);
-  const [issues, setIssues] = useState<NativeBoardIssue[]>([]);
+  const [assignmentBoardIssues, setAssignmentBoardIssues] = useState<NativeBoardIssue[]>([]);
+  const [publishedVersions, setPublishedVersions] = useState<ContentItemVersionRecord[]>([]);
+  const [assignments, setAssignments] = useState<AssignmentRecord[]>([]);
   const [view, setView] = useState<"board" | "list">("board");
-  const [selected, setSelected] = useState<string | null>(null);
-  const [loading, setLoading] = useState(false);
-  const [error, setError] = useState<string | null>(null);
+  const router = useRouter();
+  const pathname = usePathname();
+  const searchParams = useSearchParams();
+  const selected = searchParams.get(SELECTED_ISSUE_PARAMETER);
+  const setSelected = useCallback((issueId: string | null) => {
+    const next = new URLSearchParams(searchParams.toString());
+    if (issueId) next.set(SELECTED_ISSUE_PARAMETER, issueId); else next.delete(SELECTED_ISSUE_PARAMETER);
+    const query = next.toString();
+    router.push(query ? `${pathname}?${query}` : pathname, { scroll: false });
+  }, [pathname, router, searchParams]);
+  const [supportingRecordsLoading, setSupportingRecordsLoading] = useState(false);
+  const [supportingRecordsError, setSupportingRecordsError] = useState<string | null>(null);
   const generation = useRef(0);
+  const boardBodyRef = useRef<HTMLDivElement | null>(null);
+  const [typeFilter, setTypeFilter] = useState<string | null>("all");
+  const showsContentItems = subject !== "assignment";
+  const contentItemColumnKeyPrefix = `${contentItemBoardType()}/`;
+  const boardType = subject === "assignment" ? ASSIGNMENT_BOARD_TYPE : contentItemBoardType();
+  const deskAssignmentIssues = useMemo(() => subject === "desk" && deskId
+    ? projectAssignmentBoard(assignments.filter(assignment => deskContainsAssignment(assignment, deskId))) : [], [assignments, deskId, subject]);
+  const columnStateConfig = useMemo(() => subject === "contentItem" ? contentItemBoardConfig([])
+    : subject === "desk" ? deskBoardConfig(deskAssignmentIssues)
+    : assignmentBoardConfig(assignmentBoardIssues), [assignmentBoardIssues, deskAssignmentIssues, subject]);
+  const columnState = useBoardColumnState({ config: columnStateConfig, storageKey: `papyrus.cms.columns.v1.${SITE_BRAND.id}.${subject}` });
+  const openedCollapsedUntilOpenedStages = useMemo(() => !showsContentItems ? [] : getContentItemStageDefinitions()
+    .filter(definition => definition.collapsedUntilOpened && !columnState.collapsedColumns.has(`${contentItemColumnKeyPrefix}${definition.key}`))
+    .map(definition => definition.key), [contentItemColumnKeyPrefix, columnState.collapsedColumns, showsContentItems]);
+  const pagedContentItems = usePagedContentItemVersions({ enabled: allowed && showsContentItems, openedCollapsedUntilOpenedStages });
   useEffect(() => {
     setLowMotion(readLocalReaderSettings().motion === "low");
     return subscribeReaderSettingsChanges(settings => setLowMotion(settings.motion === "low"));
   }, []);
   useEffect(() => {
     const request = ++generation.current;
-    setIssues([]); setSelected(null); setError(null);
-    if (!allowed) { setLoading(false); return; }
-    const loadIssues = () => subject === "contentItem"
-      ? Promise.all([
-        Promise.all([loadNewsroomContentItemVersions(), loadNewsroomPublishedContentItemVersions()]).then(([workingVersions, publishedVersions]) => [...workingVersions, ...publishedVersions]),
-        loadEveryNewsroomAssignment(),
-      ]).then(([contentItemVersions, assignments]) => projectContentItemBoard({ contentItemVersions, assignments }))
-      : loadEveryNewsroomAssignment().then(projectAssignmentBoard);
+    setAssignmentBoardIssues([]); setPublishedVersions([]); setAssignments([]); setSupportingRecordsError(null);
+    if (!allowed) { setSupportingRecordsLoading(false); return; }
+    const loadSupportingRecords = () => subject !== "assignment"
+      ? Promise.all([loadNewsroomPublishedContentItemVersions(), loadEveryNewsroomAssignment()]).then(([published, everyAssignment]) => {
+        if (generation.current === request) { setPublishedVersions(published); setAssignments(everyAssignment); }
+      })
+      : loadEveryNewsroomAssignment().then(everyAssignment => {
+        if (generation.current === request) { setAssignments(everyAssignment); setAssignmentBoardIssues(projectAssignmentBoard(everyAssignment)); }
+      });
     const refresh = (initial: boolean) => {
-      if (initial) setLoading(true);
-      loadIssues().then(loadedIssues => {
-        if (generation.current !== request) return;
-        setIssues(loadedIssues);
-        setError(null);
+      if (initial) setSupportingRecordsLoading(true);
+      loadSupportingRecords().then(() => {
+        if (generation.current === request) setSupportingRecordsError(null);
       }).catch((reason: unknown) => {
-        if (generation.current === request && initial) setError(reason instanceof Error ? reason.message : "Could not load newsroom records.");
-      }).finally(() => { if (generation.current === request && initial) setLoading(false); });
+        if (generation.current === request && initial) setSupportingRecordsError(reason instanceof Error ? reason.message : "Could not load newsroom records.");
+      }).finally(() => { if (generation.current === request && initial) setSupportingRecordsLoading(false); });
     };
     refresh(true);
     const refreshWhenVisible = () => { if (document.visibilityState === "visible") refresh(false); };
@@ -87,35 +124,75 @@ export function NewsroomBoardView({ subject }: { subject: NewsroomBoardSubject }
     document.addEventListener("visibilitychange", refreshWhenVisible);
     return () => { generation.current = request + 1; window.clearInterval(interval); document.removeEventListener("visibilitychange", refreshWhenVisible); };
   }, [allowed, subject]);
-  const config = useMemo(() => subject === "contentItem" ? contentItemBoardConfig(issues) : assignmentBoardConfig(issues), [issues, subject]);
-  const boardType = subject === "contentItem" ? contentItemBoardType() : ASSIGNMENT_BOARD_TYPE;
-  const pageTitle = subject === "contentItem" ? getContentItemName().plural : "Assignments";
+  const issues = useMemo(() => {
+    if (subject === "assignment") return assignmentBoardIssues;
+    if (subject === "contentItem") return projectContentItemBoard({ contentItemVersions: [...pagedContentItems.versions, ...publishedVersions], assignments });
+    const versionsOnDesk = [...pagedContentItems.versions, ...publishedVersions].filter(version => deskId && deskContainsContentItem(version, deskId));
+    return [...projectContentItemBoard({ contentItemVersions: versionsOnDesk, assignments: assignments.filter(assignment => deskId && deskContainsAssignment(assignment, deskId)) }), ...deskAssignmentIssues];
+  }, [assignmentBoardIssues, assignments, deskAssignmentIssues, deskId, pagedContentItems.versions, publishedVersions, subject]);
+  const loading = supportingRecordsLoading || (showsContentItems && pagedContentItems.loading);
+  const error = supportingRecordsError ?? (showsContentItems ? pagedContentItems.error : null);
+  const config = useMemo(() => subject === "contentItem" ? contentItemBoardConfig(issues) : subject === "desk" ? deskBoardConfig(issues) : assignmentBoardConfig(issues), [issues, subject]);
+  const columnStageFromElement = (element: Element | null) => {
+    const columnKey = element?.closest("[data-column-key]")?.getAttribute("data-column-key");
+    return columnKey?.startsWith(contentItemColumnKeyPrefix) ? columnKey.slice(contentItemColumnKeyPrefix.length) : null;
+  };
+  const loadMoreWhenColumnIsNearItsEnd = (columnScroll: HTMLElement) => {
+    const distanceToEnd = columnScroll.scrollHeight - columnScroll.scrollTop - columnScroll.clientHeight;
+    const stage = columnStageFromElement(columnScroll);
+    if (stage && distanceToEnd < COLUMN_LOAD_MORE_DISTANCE_PIXELS) pagedContentItems.loadMoreForStage(stage);
+  };
+  const handleBoardScroll = (event: React.UIEvent<HTMLDivElement>) => {
+    const target = event.target as HTMLElement;
+    if (showsContentItems && target.classList?.contains("kb-column-scroll")) loadMoreWhenColumnIsNearItsEnd(target);
+  };
+  useEffect(() => {
+    if (!showsContentItems) return;
+    boardBodyRef.current?.querySelectorAll<HTMLElement>(".kb-column-scroll").forEach(loadMoreWhenColumnIsNearItsEnd);
+  });
+  const deskTitle = session?.shell.dashboard?.newsroomSections?.find(section => section.id === deskId)?.title ?? (deskId ? displayNewsroomSectionShortTitle({ id: deskId } as NewsroomSectionRecord) : "Desk");
+  const pageTitle = subject === "contentItem" ? getContentItemName().plural : subject === "desk" ? deskTitle : "Assignments";
+  const deskOptions = useMemo(() => newsroomDeskOptions(session?.shell.dashboard?.newsroomSections ?? []), [session?.shell.dashboard?.newsroomSections]);
+  const changeAssignmentDesk = async (record: AssignmentRecord, deskId: string | null) => {
+    await saveNewsroomAssignmentDesk(record.id, deskId);
+    const moved = { ...record, sectionId: deskId, sectionKey: deskId };
+    setAssignments(current => current.map(candidate => candidate.id === record.id ? moved : candidate));
+    setAssignmentBoardIssues(current => current.map(candidate => candidate.nativeId === record.id ? { ...candidate } : candidate));
+  };
   const issue = issues.find(item => item.id === selected);
   if (!allowed) return <NewsDeskAccessGate shell={session?.shell ?? null} />;
-  return <NewsroomOpsShell activeTab={subject === "contentItem" ? "articles" : "assignments"} appTitle={SITE_BRAND.appTitle} backLabel={SITE_BRAND.backToHomeLabel} pageTitle={pageTitle}
-    headerActions={subject === "contentItem" ? (
-      <Link className={cn(buttonVariants({ size: "sm" }))} data-newsroom-article-new href={getNewsroomNavHref(newsroomHref("articles", "new"))}>
-        <PlusIcon aria-hidden="true" />
-        {`New ${getContentItemName().singular.toLowerCase()}`}
-      </Link>
-    ) : undefined}>
-    <div className="organizer-native-board papyrus-newsprint-board" data-color-mode={theme}>
-      <div className="organizer-board-toolbar">
-        <div role="group" aria-label="Record presentation"><button type="button" aria-pressed={view === "board"} onClick={() => setView("board")}>Board</button><button type="button" aria-pressed={view === "list"} onClick={() => setView("list")}>List</button></div>
-      </div>
-      <p className="organizer-board-note">{subject === "contentItem"
-        ? `Each ${getContentItemName().singular.toLowerCase()} appears once, in the column for its stage. Open one to use its existing editor.`
-        : "Each assignment appears once, in the column for its status. Open one to use its existing workflow controls."}</p>
+  return <NewsroomOpsShell activeTab={subject === "contentItem" ? "articles" : subject === "desk" ? "desks" : "assignments"} appTitle={SITE_BRAND.appTitle} backLabel={SITE_BRAND.backToHomeLabel} pageTitle={pageTitle}
+    headerActions={<>
+      <span role="status" className="organizer-board-note">{loading ? "Loading records…" : `${issues.length} records loaded.`}</span>
+      <div role="group" aria-label="Record presentation" className="organizer-board-view-toggle"><button type="button" className="organizer-header-button" aria-pressed={view === "board"} onClick={() => setView("board")}>Board</button><button type="button" className="organizer-header-button" aria-pressed={view === "list"} onClick={() => setView("list")}>List</button></div>
+      {showsContentItems && (
+        <Link className="organizer-header-button" data-newsroom-article-new href={getNewsroomNavHref(newsroomHref("articles", "new"))}>
+          <PlusIcon size={14} aria-hidden="true" />
+          {`New ${getContentItemName().singular.toLowerCase()}`}
+        </Link>
+      )}
+    </>}>
+    <div className="organizer-native-board papyrus-newsprint-board" data-kanbus-theme="newsprint" data-color-mode={theme}>
       {error && <NewsroomOpsStatusBanner tone="error">{error}</NewsroomOpsStatusBanner>}
-      <p role="status" className="organizer-board-note">{loading ? "Loading records…" : `${issues.length} records loaded.`}</p>
-      <div className="organizer-board-body" data-detail-open={Boolean(issue)}>
-        <IssueCollection issues={issues} config={config} query={{ type: boardType }} view={view}
+      {subject === "desk" && <IssueTypeFilter config={config} value={typeFilter} onChange={setTypeFilter} name="Record type" className="organizer-board-type-filter" />}
+      <div className="organizer-board-body" data-detail-open={Boolean(issue)} ref={boardBodyRef} onScrollCapture={handleBoardScroll}>
+        <IssueCollection issues={issues} config={config} query={{ type: subject === "desk" ? issueTypeFromFilter(typeFilter) : boardType }} view={view}
           motion={lowMotion ? STATIC_MOTION : undefined}
-          columnStateKey={`papyrus.cms.columns.v1.${SITE_BRAND.id}.${subject}`} initialScroll="start"
+          collapsedColumns={columnState.collapsedColumns} onToggleCollapse={columnState.toggleColumn} initialScroll="start"
           selectedIssueId={selected} detailOpen={Boolean(issue)} onSelectIssue={item => setSelected(item.id)} ariaLabel={pageTitle}
           emptyMessage={loading ? "Loading records…" : error ? "Records could not be loaded." : "No records in this selection."} />
-        {issue && <IssueDetailPanel issue={issue} onClose={() => setSelected(null)} fields={[{ label: "CMS record ID", value: issue.nativeId }, { label: "Status", value: issue.nativeStatus }]}>
-          <Link href={getNewsroomNavHref(issue.href)}>Open {issue.type}</Link>
+        {issue && <IssueDetailPanel issue={issue} onClose={() => setSelected(null)} fields={[]}>
+          {issue.kind === "contentItem"
+            ? <>
+              <NewsroomArticleEditor key={issue.id} articleId={decodeURIComponent(issue.href.split("/").pop() ?? "")} demo={isLocalPreviewEnabled()} embedded />
+              <Link className="organizer-header-button" href={getNewsroomNavHref(issue.href)}>Open full page</Link>
+            </>
+            : (() => {
+              const record = assignments.find(candidate => candidate.id === issue.nativeId);
+              return record
+                ? <NewsroomAssignmentDetail assignment={record} deskOptions={deskOptions} onDeskChange={deskId => changeAssignmentDesk(record, deskId)} pageHref={getNewsroomNavHref(issue.href)} showTitle={false} />
+                : <Link href={getNewsroomNavHref(issue.href)}>Open {issue.type}</Link>;
+            })()}
         </IssueDetailPanel>}
       </div>
     </div>

package/components/newsroom-newsprint-board.css

@@ -1,48 +1,7 @@
 .papyrus-newsprint-board {
-  --background: var(--org-paper);
-  --card: var(--org-paper);
-  --frame: var(--org-paper);
-  --column: var(--org-paper);
-  --border: var(--org-line);
-  --text-foreground: var(--org-ink);
-  --text-muted: var(--org-muted);
-  --text-selected: var(--org-ink);
-  --font-body: Newsroom UI, system-ui, sans-serif;
-  --kb-column-width: 245px;
-  --kb-column-radius: 0;
-  --kb-card-radius: 0;
-  --kb-card-border-width: 0;
-  --kb-card-shadow: none;
-  --kb-card-selected-shadow: none;
-  --kb-board-gap: 18px;
-  color: var(--org-ink);
-  background: transparent;
+  --kb-newsprint-paper: var(--org-paper);
+  --kb-newsprint-ink: var(--org-ink);
+  --kb-newsprint-line: var(--org-line);
+  --kb-newsprint-display-font: Newsroom Display, Georgia, serif;
+  --kb-newsprint-body-font: Newsroom UI, system-ui, sans-serif;
 }
-.papyrus-newsprint-board .kb-grid { height: 100%; min-height: 0; scrollbar-width: thin; }
-.papyrus-newsprint-board .kb-column { border-left: 1px solid var(--org-line); padding-left: 10px; }
-.papyrus-newsprint-board .kb-column-header {
-  border-bottom: 2px solid var(--org-ink);
-  padding: 5px 0;
-  font: 700 12px Newsroom Display, Georgia, serif;
-  text-transform: uppercase;
-  letter-spacing: .6px;
-  min-height: 32px;
-}
-.papyrus-newsprint-board .issue-card {
-  --issue-accent: var(--org-paper) !important;
-  --issue-accent-muted: var(--muted) !important;
-  --issue-accent-foreground: var(--org-ink) !important;
-  --issue-priority-bg: var(--org-paper) !important;
-  background: transparent !important;
-  border-radius: 0;
-  border-bottom: 1px solid var(--org-line) !important;
-  box-shadow: none !important;
-}
-.papyrus-newsprint-board .issue-accent-bar { border-bottom: 1px solid var(--org-line); background: var(--org-paper) !important; color: var(--org-ink) !important; }
-.papyrus-newsprint-board .issue-accent-id { font: 400 9px Newsroom UI, system-ui, sans-serif; letter-spacing: .8px; white-space: nowrap; color: var(--org-ink) !important; }
-.papyrus-newsprint-board .issue-accent-priority { border-radius: 0; color: var(--org-muted) !important; background: transparent !important; font-size: 8px; }
-.papyrus-newsprint-board .issue-card h3 { font: 700 19px/1.2 Newsroom Display, Georgia, serif !important; letter-spacing: -.2px; }
-.papyrus-newsprint-board .issue-card[data-selected=true] { outline: 2px solid var(--org-ink); outline-offset: -2px; }
-.papyrus-newsprint-board .issue-card[data-selected=true] h3 { color: var(--org-ink) !important; }
-.papyrus-newsprint-board .kb-issue-detail { background: var(--org-paper); border: 1px solid var(--org-line); border-radius: 0; box-shadow: none; }
-.papyrus-newsprint-board .kb-issue-detail h2 { font: 700 28px/1.2 Newsroom Display, Georgia, serif; border-bottom: 3px double var(--org-ink); padding-bottom: 12px; }

package/components/newsroom-ops-overview.tsx

@@ -5,7 +5,6 @@ import {
   ClipboardListIcon,
   FileTextIcon,
   LayersIcon,
-  LightbulbIcon,
   MessageSquareIcon,
   NetworkIcon,
   SearchIcon,
@@ -30,6 +29,7 @@ import {
   buildNewsroomSectionHref,
   displayNewsroomSectionShortTitle,
   isEnabledNewsroomSection,
+  newsroomDeskKind,
   sortNewsroomSections,
 } from "../lib/newsroom-sections";
 import { newsroomInboxRowClassName } from "../lib/newsroom-list-selection";
@@ -49,7 +49,6 @@ const DESTINATION_ICONS: Record<DestinationKey, typeof BookOpenIcon> = {
   assignments: ClipboardListIcon,
   references: BookOpenIcon,
   messages: MessageSquareIcon,
-  insights: LightbulbIcon,
   topics: LayersIcon,
   concepts: NetworkIcon,
   administration: SettingsIcon,
@@ -102,6 +101,8 @@ export function NewsroomOpsOverview({
     () => sortNewsroomSections(newsroomSections).filter(isEnabledNewsroomSection),
     [newsroomSections],
   );
+  const coreDesks = useMemo(() => desks.filter(desk => newsroomDeskKind(desk) === "core"), [desks]);
+  const rotatingDesks = useMemo(() => desks.filter(desk => newsroomDeskKind(desk) === "rotating"), [desks]);
 
   const destinationCounts: Partial<Record<DestinationKey, number | null>> = {
     references: referenceCounts.pending ?? 0,
@@ -174,11 +175,11 @@ export function NewsroomOpsOverview({
                     href={href}
                     key={lineageId}
                   >
-                    <Badge className="mt-0.5 shrink-0" variant="outline">Pending</Badge>
                     <div className="min-w-0 flex-1">
                       <p className="truncate text-sm font-medium text-foreground">{referenceDisplayTitle(reference)}</p>
                       <p className="text-xs text-muted-foreground">Review source intake · {formatReferenceListDate(reference)}</p>
                     </div>
+                    <Badge className="mt-0.5 shrink-0" variant="outline">Pending</Badge>
                   </Link>
                 );
               })}
@@ -195,11 +196,11 @@ export function NewsroomOpsOverview({
                     href={href}
                     key={assignment.id}
                   >
-                    <Badge className="mt-0.5 shrink-0" variant="secondary">{assignment.status}</Badge>
                     <div className="min-w-0 flex-1">
                       <p className="truncate text-sm font-medium text-foreground">{assignment.title}</p>
                       <p className="text-xs text-muted-foreground">Assignment · {assignment.assignmentTypeKey}</p>
                     </div>
+                    <Badge className="mt-0.5 shrink-0" variant="secondary">{assignment.status}</Badge>
                   </Link>
                 );
               })}
@@ -216,8 +217,9 @@ export function NewsroomOpsOverview({
         {desks.length ? (
           <section aria-label="Desks" className="space-y-3" data-newsroom-ops-desks>
             <h2 className="text-sm font-medium text-muted-foreground">Desks</h2>
+            {coreDesks.length ? <h3 className="newsroom-desk-group-heading" data-newsroom-ops-desk-group="core">Core desks</h3> : null}
             <div className="grid gap-3 sm:grid-cols-2 lg:grid-cols-3">
-              {desks.map((section) => (
+              {coreDesks.map((section) => (
                 <Link
                   className="block rounded-xl focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring"
                   data-newsroom-ops-desk={section.id}
@@ -235,6 +237,26 @@ export function NewsroomOpsOverview({
                 </Link>
               ))}
             </div>
+            {rotatingDesks.length ? <h3 className="newsroom-desk-group-heading" data-newsroom-ops-desk-group="rotating">Rotating desks <small>appear for a while, then rotate out</small></h3> : null}
+            {rotatingDesks.length ? <div className="grid gap-3 sm:grid-cols-2 lg:grid-cols-3">
+              {rotatingDesks.map((section) => (
+                <Link
+                  className="block rounded-xl focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring"
+                  data-newsroom-ops-desk={section.id}
+                  href={buildNewsroomSectionHref(section.id, demo)}
+                  key={section.id}
+                >
+                  <Card className="h-full transition-colors hover:border-primary/30">
+                    <CardHeader className="p-4">
+                      <CardTitle className="text-base font-semibold">{section.title}</CardTitle>
+                      <CardDescription className="uppercase tracking-wide text-[0.65rem]">
+                        {displayNewsroomSectionShortTitle(section)}
+                      </CardDescription>
+                    </CardHeader>
+                  </Card>
+                </Link>
+              ))}
+            </div> : null}
           </section>
         ) : null}
       </div>

package/components/newsroom-organizer-shell.tsx

@@ -2,26 +2,42 @@
 
 import { useEffect, useId, useState } from "react";
 import Link from "next/link";
-import { usePathname } from "next/navigation";
-import { BookOpen, ClipboardList, LayoutDashboard, Menu, MessagesSquare, PanelLeftClose, PanelLeftOpen, Settings, UserRound, LogIn, LogOut } from "lucide-react";
+import { usePathname, useRouter, useSearchParams } from "next/navigation";
+import { BookOpen, ClipboardList, Menu, Search, MessagesSquare, PanelLeftClose, PanelLeftOpen, Settings, UserRound, LogIn, LogOut } from "lucide-react";
 import { ORGANIZER_NAV_GROUPS, ORGANIZER_PRIMARY_NAV, ORGANIZER_SETTINGS_DESTINATION } from "../lib/newsroom-organizer-nav";
 import { browserPathToInternalNewsroomPath } from "../lib/newsroom-base-path";
 import { getNewsroomNavHref } from "../lib/newsroom-nav";
 import { SITE_BRAND } from "../lib/site-brand";
 import { useOptionalNewsDeskClient } from "./news-desk-client-provider";
 import { ReaderAuthControl } from "./reader-auth-control";
+import { ProspectusAccountChooser, useProspectusAccountSummary } from "./prospectus-account-chooser";
 import { Sheet, SheetContent, SheetHeader, SheetTitle, SheetDescription, SheetTrigger } from "./ui/sheet";
 import { DropdownMenu, DropdownMenuTrigger, DropdownMenuContent, DropdownMenuGroup, DropdownMenuLabel, DropdownMenuItem, DropdownMenuSeparator } from "./ui/dropdown-menu";
 import type { NewsroomOpsShellProps } from "./newsroom-ops-shell";
 import "./newsroom-organizer.css";
 
-const ICONS = { overview: LayoutDashboard, articles: ClipboardList, references: BookOpen, messages: MessagesSquare };
+/** The standard place to search the knowledge base; the Search page is the results page. */
+function OrganizerSearch({ demo }: { demo: boolean }) {
+  const router = useRouter();
+  const searchParams = useSearchParams();
+  const [text, setText] = useState(searchParams.get("q") ?? "");
+  return <form className="organizer-search" role="search" onSubmit={event => {
+    event.preventDefault();
+    const query = text.trim();
+    if (query) router.push(getNewsroomNavHref(`/newsroom/search?q=${encodeURIComponent(query)}`, demo));
+  }}>
+    <Search size={14} aria-hidden="true" />
+    <input aria-label="Search the knowledge base" data-newsroom-search type="search" onChange={event => setText(event.target.value)} placeholder="Search" value={text} />
+  </form>;
+}
+
+const ICONS = { articles: ClipboardList, references: BookOpen, messages: MessagesSquare };
 
 /** Navigation is a presentation layer; existing route and server authorization still own access. */
 function Navigation({ activePath, demo, admin, surface, onNavigate }: { activePath: string; demo: boolean; admin: boolean; surface: string; onNavigate?: () => void }) {
   const id = useId();
   const all = ORGANIZER_NAV_GROUPS.flatMap(group => group.items);
-  const active = all.filter(item => activePath === item.path || (item.path !== "/newsroom" && activePath.startsWith(item.path + "/"))).sort((a, b) => b.path.length - a.path.length)[0]?.key;
+  const active = all.filter(item => [item.path, ...(item.alsoActiveOnPaths ?? [])].some(candidate => activePath === candidate || (candidate !== "/newsroom" && activePath.startsWith(candidate + "/")))).sort((a, b) => b.path.length - a.path.length)[0]?.key;
   return <nav className="organizer-destinations" aria-label={surface === "sidebar" ? "Newsroom" : "All workspaces"}>
     {ORGANIZER_NAV_GROUPS.map((group, index) => <section key={group.title} aria-labelledby={`${id}-${index}`}>
       <h3 id={`${id}-${index}`}>{group.title}</h3>
@@ -39,6 +55,7 @@ function Account({ placement }: { placement: "sidebar" | "header" }) {
   const session = useOptionalNewsDeskClient();
   const auth = session?.shell.auth ?? { status: "loading" as const, label: "Checking sign-in" };
   const [open, setOpen] = useState(false);
+  const accountSummary = useProspectusAccountSummary();
   useEffect(() => {
     const media = matchMedia("(max-width: 900px)");
     const close = () => setOpen(false);
@@ -46,12 +63,13 @@ function Account({ placement }: { placement: "sidebar" | "header" }) {
     return () => media.removeEventListener("change", close);
   }, []);
   return <DropdownMenu open={open} onOpenChange={setOpen}>
-    <DropdownMenuTrigger className={`organizer-account organizer-account-${placement}`} aria-label="Account menu" title="Account menu">
-      <UserRound size={18} aria-hidden="true" /><span><strong>{auth.label}</strong><small>{auth.status === "signedIn" ? "Account & preferences" : auth.status === "signedOut" ? "Not signed in" : "Checking session"}</small></span>
+    <DropdownMenuTrigger id={`organizer-account-trigger-${placement}`} className={`organizer-account organizer-account-${placement}`} aria-label="Account menu" title="Account menu">
+      <UserRound size={18} aria-hidden="true" /><span><strong>{auth.label}</strong><small>{accountSummary ?? (auth.status === "signedIn" ? "Account & preferences" : auth.status === "signedOut" ? "Not signed in" : "Checking session")}</small></span>
     </DropdownMenuTrigger>
     <DropdownMenuContent className="organizer-account-popup" side={placement === "sidebar" ? "top" : "bottom"} align="end">
       <DropdownMenuGroup>
         <DropdownMenuLabel>{auth.label}</DropdownMenuLabel><DropdownMenuSeparator />
+        <ProspectusAccountChooser />
         <DropdownMenuItem render={<Link href={getNewsroomNavHref(ORGANIZER_SETTINGS_DESTINATION.path)} />}><Settings aria-hidden="true" />{ORGANIZER_SETTINGS_DESTINATION.label}</DropdownMenuItem>
         <ReaderAuthControl authState={auth} renderAction={({ disabled, onClick, signedIn }) => <DropdownMenuItem disabled={disabled} closeOnClick={false} onClick={onClick}>
           {signedIn ? <LogOut aria-hidden="true" /> : <LogIn aria-hidden="true" />}{signedIn ? "Sign out" : "Sign in"}
@@ -107,7 +125,7 @@ export function NewsroomOrganizerShell({ activeTab, appTitle, backHref = "/", ba
   return <div className="newsroom-organizer" data-news-desk data-newsroom-ops-shell="true" data-newsroom-chrome="organizer" data-sidebar-collapsed={collapsed || !showNavigation ? "true" : "false"}>
     {showNavigation && <aside className="organizer-sidebar" hidden={collapsed} id="organizer-sidebar">
       <div className="organizer-sidebar-head">
-        <Link className="organizer-brand" href={getNewsroomNavHref("/newsroom", demo)}>{appTitle}<small>The newsroom</small></Link>
+        <Link className="organizer-brand" href={getNewsroomNavHref("/newsroom", demo)}>{SITE_BRAND.components?.NewsroomLogo ? <SITE_BRAND.components.NewsroomLogo className="organizer-brand-logo" /> : appTitle}<small>The newsroom</small></Link>
         {sidebarToggle}
       </div>
       <Navigation activePath={activePath} demo={demo} admin={admin} surface="sidebar" />
@@ -117,7 +135,7 @@ export function NewsroomOrganizerShell({ activeTab, appTitle, backHref = "/", ba
       <header className="organizer-topbar" data-newsroom-ops-topbar>
         {showNavigation && collapsed && sidebarToggle}
         <Link className="organizer-masthead" href={backHref} title={backLabel}>{appTitle}</Link>
-        <h1 data-newsroom-ops-title>{pageTitle}</h1><div className="organizer-header-actions">{headerActions}</div><Account placement="header" />
+        <h1 data-newsroom-ops-title>{pageTitle}</h1><OrganizerSearch demo={demo} /><div className="organizer-header-actions">{headerActions}</div><Account placement="header" />
       </header>
       <main className="organizer-main">{demo && <p className="organizer-demo-notice">Demo workspace · synthetic examples</p>}{children}</main>
     </div>