diff --git a/.changeset/platform-notifications-admin.md b/.changeset/platform-notifications-admin.md
new file mode 100644
index 00000000000..5fb6d12d170
--- /dev/null
+++ b/.changeset/platform-notifications-admin.md
@@ -0,0 +1,7 @@
+---
+"@trigger.dev/webapp": patch
+---
+
+feat(webapp): Platform notifications admin improvements
+
+Adds responsive design improvements, enhanced notification management (create, edit, delete, publish-now), organization/project-scoped features, and improved filtering logic for inactive notifications.
diff --git a/apps/webapp/app/components/BackgroundWrapper.tsx b/apps/webapp/app/components/BackgroundWrapper.tsx
index ecff3af6dd4..aaf06d56aaf 100644
--- a/apps/webapp/app/components/BackgroundWrapper.tsx
+++ b/apps/webapp/app/components/BackgroundWrapper.tsx
@@ -5,10 +5,9 @@ import blurredDashboardBackgroundTable from "~/assets/images/blurred-dashboard-b
 
 export function BackgroundWrapper({ children }: { children: ReactNode }) {
   return (
-    <div className="relative h-full w-full overflow-hidden">
-      {/* Left menu top background - fixed width 260px, maintains aspect ratio */}
+    <div className="relative h-full w-full overflow-hidden bg-background-dimmed lg:bg-transparent">
       <div
-        className="absolute left-0 top-0 w-[260px] bg-contain bg-left-top bg-no-repeat"
+        className="absolute left-0 top-0 hidden w-[260px] bg-contain bg-left-top bg-no-repeat lg:block"
         style={{
           backgroundImage: `url(${blurredDashboardBackgroundMenuTop})`,
           aspectRatio: "auto",
@@ -17,9 +16,8 @@ export function BackgroundWrapper({ children }: { children: ReactNode }) {
         }}
       />
 
-      {/* Left menu bottom background - fixed width 260px, maintains aspect ratio */}
       <div
-        className="absolute bottom-0 left-0 w-[260px] bg-contain bg-left-bottom bg-no-repeat"
+        className="absolute bottom-0 left-0 hidden w-[260px] bg-contain bg-left-bottom bg-no-repeat lg:block"
         style={{
           backgroundImage: `url(${blurredDashboardBackgroundMenuBottom})`,
           aspectRatio: "auto",
@@ -28,9 +26,8 @@ export function BackgroundWrapper({ children }: { children: ReactNode }) {
         }}
       />
 
-      {/* Right table background - fixed width 2000px, positioned next to menu */}
       <div
-        className="absolute top-0 bg-left-top bg-no-repeat"
+        className="absolute top-0 hidden bg-left-top bg-no-repeat lg:block"
         style={{
           left: "260px",
           backgroundImage: `url(${blurredDashboardBackgroundTable})`,
@@ -41,7 +38,6 @@ export function BackgroundWrapper({ children }: { children: ReactNode }) {
         }}
       />
 
-      {/* Content layer */}
       <div className="relative z-10 h-full w-full">{children}</div>
     </div>
   );
diff --git a/apps/webapp/app/components/LoginPageLayout.tsx b/apps/webapp/app/components/LoginPageLayout.tsx
index d9ac7ceb4d7..3e42cd6894f 100644
--- a/apps/webapp/app/components/LoginPageLayout.tsx
+++ b/apps/webapp/app/components/LoginPageLayout.tsx
@@ -46,10 +46,10 @@ export function LoginPageLayout({ children }: { children: React.ReactNode }) {
   }, []);
 
   return (
-    <main className="grid h-full grid-cols-1 md:grid-cols-2">
-      <div className="border-r border-grid-bright bg-background-bright">
-        <div className="flex h-full flex-col items-center justify-between p-6">
-          <div className="flex w-full items-center justify-between">
+    <main className="grid h-full grid-cols-1 lg:grid-cols-2">
+      <div className="bg-background-dimmed lg:border-r lg:border-grid-bright lg:bg-background-bright">
+        <div className="flex h-full flex-col items-center justify-center p-6 lg:justify-between">
+          <div className="hidden w-full items-center justify-between lg:flex">
             <a href="https://trigger.dev">
               <LogoType className="w-36" />
             </a>
@@ -63,12 +63,12 @@ export function LoginPageLayout({ children }: { children: React.ReactNode }) {
           </div>
           <div className="flex h-full max-w-sm items-center justify-center">{children}</div>
           <Paragraph variant="small" className="text-center">
-            Having login issues? <TextLink href="https://@trigger.dev/contact">Email us</TextLink>{" "}
+            Having login issues? <TextLink href="https://trigger.dev/contact">Email us</TextLink>{" "}
             or <TextLink href="https://trigger.dev/discord">ask us in Discord</TextLink>
           </Paragraph>
         </div>
       </div>
-      <div className="hidden grid-rows-[1fr_auto] pb-6 md:grid">
+      <div className="hidden grid-rows-[1fr_auto] pb-6 lg:grid">
         <div className="flex h-full flex-col items-center justify-center px-16">
           <Header3 className="relative text-center text-2xl font-normal leading-8 text-text-dimmed transition before:relative before:right-1 before:top-0 before:text-6xl before:text-charcoal-750 before:content-['❝'] lg-height:text-xl md-height:text-lg">
             {randomQuote?.quote}
diff --git a/apps/webapp/app/components/layout/AppLayout.tsx b/apps/webapp/app/components/layout/AppLayout.tsx
index 635489400ac..3da2bfbb5a5 100644
--- a/apps/webapp/app/components/layout/AppLayout.tsx
+++ b/apps/webapp/app/components/layout/AppLayout.tsx
@@ -60,13 +60,26 @@ export function PageBody({
 export function MainCenteredContainer({
   children,
   className,
+  variant = "default",
 }: {
   children: React.ReactNode;
   className?: string;
+  variant?: "default" | "onboarding";
 }) {
   return (
-    <div className="h-full w-full overflow-y-auto scrollbar-thin scrollbar-track-transparent scrollbar-thumb-charcoal-600">
-      <div className={cn("mx-auto mt-6 max-w-xs overflow-y-auto p-1 md:mt-[22vh]", className)}>
+    <div
+      className={cn(
+        "h-full w-full overflow-y-auto scrollbar-thin scrollbar-track-transparent scrollbar-thumb-charcoal-600",
+        variant === "onboarding" && "flex flex-col p-4 lg:p-0"
+      )}
+    >
+      <div
+        className={cn(
+          "mx-auto max-w-xs p-1",
+          variant === "onboarding" ? "m-auto lg:mx-auto lg:mb-0 lg:mt-[22vh]" : "mt-6 md:mt-[22vh]",
+          className
+        )}
+      >
         {children}
       </div>
     </div>
diff --git a/apps/webapp/app/components/navigation/HelpAndFeedbackPopover.tsx b/apps/webapp/app/components/navigation/HelpAndFeedbackPopover.tsx
index 39a3d386783..c205364ecbd 100644
--- a/apps/webapp/app/components/navigation/HelpAndFeedbackPopover.tsx
+++ b/apps/webapp/app/components/navigation/HelpAndFeedbackPopover.tsx
@@ -33,13 +33,17 @@ import { Badge } from "../primitives/Badge";
 export function HelpAndFeedback({
   disableShortcut = false,
   isCollapsed = false,
+  organizationId,
+  projectId,
 }: {
   disableShortcut?: boolean;
   isCollapsed?: boolean;
+  organizationId?: string;
+  projectId?: string;
 }) {
   const [isHelpMenuOpen, setHelpMenuOpen] = useState(false);
   const currentPlan = useCurrentPlan();
-  const { changelogs } = useRecentChangelogs();
+  const { changelogs } = useRecentChangelogs(organizationId, projectId);
 
   useShortcutKeys({
     shortcut: disableShortcut ? undefined : { key: "h", enabledOnInputElements: false },
diff --git a/apps/webapp/app/components/navigation/OrganizationSettingsSideMenu.tsx b/apps/webapp/app/components/navigation/OrganizationSettingsSideMenu.tsx
index e274ad20f43..c8cd131d962 100644
--- a/apps/webapp/app/components/navigation/OrganizationSettingsSideMenu.tsx
+++ b/apps/webapp/app/components/navigation/OrganizationSettingsSideMenu.tsx
@@ -205,7 +205,7 @@ export function OrganizationSettingsSideMenu({
         )}
       </div>
       <div className="flex w-full items-center justify-between border-t border-grid-bright p-1">
-        <HelpAndFeedback />
+        <HelpAndFeedback organizationId={organization.id} />
         <AskAI />
       </div>
     </div>
diff --git a/apps/webapp/app/components/navigation/SideMenu.tsx b/apps/webapp/app/components/navigation/SideMenu.tsx
index 14b3c56495b..dbc4c213f08 100644
--- a/apps/webapp/app/components/navigation/SideMenu.tsx
+++ b/apps/webapp/app/components/navigation/SideMenu.tsx
@@ -713,7 +713,7 @@ export function SideMenu({
               isCollapsed && "items-center"
             )}
           >
-            <HelpAndAI isCollapsed={isCollapsed} />
+            <HelpAndAI isCollapsed={isCollapsed} organizationId={organization.id} projectId={project.id} />
             {isFreeUser && (
               <CollapsibleHeight isCollapsed={isCollapsed}>
                 <FreePlanUsage
@@ -1003,6 +1003,7 @@ function ProjectSelector({
             title="Logout"
             icon={ArrowRightOnRectangleIcon}
             leadingIconClassName="text-text-dimmed"
+            danger
           />
         </div>
       </PopoverContent>
@@ -1162,7 +1163,7 @@ function CollapsibleHeight({
   );
 }
 
-function HelpAndAI({ isCollapsed }: { isCollapsed: boolean }) {
+function HelpAndAI({ isCollapsed, organizationId, projectId }: { isCollapsed: boolean; organizationId: string; projectId: string }) {
   return (
     <LayoutGroup>
       <div
@@ -1172,7 +1173,7 @@ function HelpAndAI({ isCollapsed }: { isCollapsed: boolean }) {
         )}
       >
         <ShortcutsAutoOpen />
-        <HelpAndFeedback isCollapsed={isCollapsed} />
+        <HelpAndFeedback isCollapsed={isCollapsed} organizationId={organizationId} projectId={projectId} />
         <AskAI isCollapsed={isCollapsed} />
       </div>
     </LayoutGroup>
diff --git a/apps/webapp/app/components/primitives/Popover.tsx b/apps/webapp/app/components/primitives/Popover.tsx
index bd84005d95e..623adbc4bb9 100644
--- a/apps/webapp/app/components/primitives/Popover.tsx
+++ b/apps/webapp/app/components/primitives/Popover.tsx
@@ -69,6 +69,7 @@ const PopoverMenuItem = React.forwardRef<
     name?: string;
     value?: string;
     type?: React.ComponentProps<"button">["type"];
+    danger?: boolean;
   }
 >(
   (
@@ -86,18 +87,23 @@ const PopoverMenuItem = React.forwardRef<
       name,
       value,
       type,
+      danger = false,
     },
     ref
   ) => {
     const contentProps = {
       variant: variant.variant,
       LeadingIcon: icon,
-      leadingIconClassName,
+      leadingIconClassName: danger
+        ? cn(leadingIconClassName, "transition-colors group-hover/button:text-error")
+        : leadingIconClassName,
       fullWidth: true,
       textAlignLeft: true,
       TrailingIcon: isSelected ? CheckIcon : undefined,
       className: cn(
-        "group-hover:bg-charcoal-700",
+        danger
+          ? "transition-colors group-hover/button:bg-error/10 group-hover/button:text-error [&_span]:transition-colors [&_span]:group-hover/button:text-error"
+          : "group-hover:bg-charcoal-700",
         isSelected ? "bg-charcoal-750 group-hover:bg-charcoal-600/50" : undefined,
         className
       ),
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug_.projects.new/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug_.projects.new/route.tsx
index abe6da43f1d..39cde0cf2d0 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug_.projects.new/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug_.projects.new/route.tsx
@@ -361,7 +361,7 @@ export default function Page() {
   return (
     <AppContainer className="bg-charcoal-900">
       <BackgroundWrapper>
-        <MainCenteredContainer className="max-w-[29rem] rounded-lg border border-grid-bright bg-background-dimmed p-5 shadow-lg">
+        <MainCenteredContainer variant="onboarding" className="max-w-[29rem] rounded-lg border border-grid-bright bg-background-dimmed p-5 shadow-lg">
           <div>
             <FormTitle
               LeadingIcon={<FolderIcon className="size-7 text-indigo-500" />}
diff --git a/apps/webapp/app/routes/_app.orgs.new/route.tsx b/apps/webapp/app/routes/_app.orgs.new/route.tsx
index fb072518c54..f4f7f995bf9 100644
--- a/apps/webapp/app/routes/_app.orgs.new/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.new/route.tsx
@@ -143,7 +143,7 @@ export default function NewOrganizationPage() {
   return (
     <AppContainer className="bg-charcoal-900">
       <BackgroundWrapper>
-        <MainCenteredContainer className="max-w-[26rem] rounded-lg border border-grid-bright bg-background-dimmed p-5 shadow-lg">
+        <MainCenteredContainer variant="onboarding" className="max-w-[26rem] rounded-lg border border-grid-bright bg-background-dimmed p-5 shadow-lg">
           <FormTitle
             LeadingIcon={<BuildingOffice2Icon className="size-6 text-fuchsia-600" />}
             title="Create an Organization"
diff --git a/apps/webapp/app/routes/admin.notifications.tsx b/apps/webapp/app/routes/admin.notifications.tsx
index d9b06816953..179ab23c3ee 100644
--- a/apps/webapp/app/routes/admin.notifications.tsx
+++ b/apps/webapp/app/routes/admin.notifications.tsx
@@ -1,11 +1,21 @@
-import { ChevronRightIcon, XMarkIcon } from "@heroicons/react/20/solid";
+import { ChevronRightIcon, TrashIcon, XMarkIcon } from "@heroicons/react/20/solid";
 import { useFetcher, useSearchParams } from "@remix-run/react";
 import type { ActionFunctionArgs, LoaderFunctionArgs } from "@remix-run/server-runtime";
 import { redirect } from "@remix-run/server-runtime";
-import { useRef, useState, useLayoutEffect } from "react";
+import { useEffect, useRef, useState, useLayoutEffect } from "react";
 import ReactMarkdown from "react-markdown";
 import { typedjson, useTypedLoaderData } from "remix-typedjson";
 import { z } from "zod";
+import {
+  Alert,
+  AlertCancel,
+  AlertContent,
+  AlertDescription,
+  AlertFooter,
+  AlertHeader,
+  AlertTitle,
+  AlertTrigger,
+} from "~/components/primitives/Alert";
 import { Button } from "~/components/primitives/Buttons";
 import {
   Dialog,
@@ -29,8 +39,12 @@ import {
 import { prisma } from "~/db.server";
 import { requireUserId } from "~/services/session.server";
 import {
+  archivePlatformNotification,
   createPlatformNotification,
+  deletePlatformNotification,
   getAdminNotificationsList,
+  publishNowPlatformNotification,
+  updatePlatformNotification,
 } from "~/services/platformNotifications.server";
 import { createSearchParams } from "~/utils/searchParams";
 import { cn } from "~/utils/cn";
@@ -42,7 +56,7 @@ const CLI_TYPES = ["info", "warn", "error", "success"] as const;
 
 const SearchParams = z.object({
   page: z.coerce.number().optional(),
-  hideArchived: z.coerce.boolean().optional(),
+  hideInactive: z.coerce.boolean().optional(),
 });
 
 export const loader = async ({ request }: LoaderFunctionArgs) => {
@@ -52,10 +66,10 @@ export const loader = async ({ request }: LoaderFunctionArgs) => {
 
   const searchParams = createSearchParams(request.url, SearchParams);
   if (!searchParams.success) throw new Error(searchParams.error);
-  const { page: rawPage, hideArchived } = searchParams.params.getAll();
+  const { page: rawPage, hideInactive } = searchParams.params.getAll();
   const page = rawPage ?? 1;
 
-  const data = await getAdminNotificationsList({ page, pageSize: PAGE_SIZE, hideArchived: hideArchived ?? false });
+  const data = await getAdminNotificationsList({ page, pageSize: PAGE_SIZE, hideInactive: hideInactive ?? false });
 
   return typedjson({ ...data, userId });
 };
@@ -76,10 +90,22 @@ export async function action({ request }: ActionFunctionArgs) {
     return handleArchiveAction(formData);
   }
 
+  if (_action === "delete") {
+    return handleDeleteAction(formData);
+  }
+
+  if (_action === "publish-now") {
+    return handlePublishNowAction(formData);
+  }
+
+  if (_action === "edit") {
+    return handleEditAction(formData);
+  }
+
   return typedjson({ error: "Unknown action" }, { status: 400 });
 }
 
-async function handleCreateAction(formData: FormData, userId: string, isPreview: boolean) {
+function parseNotificationFormData(formData: FormData) {
   const surface = formData.get("surface") as string;
   const payloadType = formData.get("payloadType") as string;
   const adminLabel = formData.get("adminLabel") as string;
@@ -91,10 +117,10 @@ async function handleCreateAction(formData: FormData, userId: string, isPreview:
   const startsAt = formData.get("startsAt") as string;
   const endsAt = formData.get("endsAt") as string;
   const priority = Number(formData.get("priority") || "0");
-
-  if (!adminLabel || !title || !description || !endsAt || !surface || !payloadType) {
-    return typedjson({ error: "Missing required fields" }, { status: 400 });
-  }
+  const scope = (formData.get("scope") as string) || "GLOBAL";
+  const scopeUserId = (formData.get("scopeUserId") as string) || undefined;
+  const scopeOrganizationId = (formData.get("scopeOrganizationId") as string) || undefined;
+  const scopeProjectId = (formData.get("scopeProjectId") as string) || undefined;
 
   const cliMaxShowCount = formData.get("cliMaxShowCount")
     ? Number(formData.get("cliMaxShowCount"))
@@ -123,39 +149,79 @@ async function handleCreateAction(formData: FormData, userId: string, isPreview:
         }
       : undefined;
 
-  const result = await createPlatformNotification({
-    title: isPreview ? `[Preview] ${adminLabel}` : adminLabel,
-    payload: {
-      version: "1" as const,
-      data: {
-        type: payloadType as "info" | "warn" | "error" | "success" | "card" | "changelog",
-        title,
-        description,
-        ...(actionUrl ? { actionUrl } : {}),
-        ...(image ? { image } : {}),
-        ...(dismissOnAction ? { dismissOnAction: true } : {}),
-        ...(discovery ? { discovery } : {}),
-      },
+  return {
+    surface,
+    payloadType,
+    adminLabel,
+    title,
+    description,
+    actionUrl,
+    image,
+    dismissOnAction,
+    startsAt,
+    endsAt,
+    priority,
+    scope,
+    scopeUserId,
+    scopeOrganizationId,
+    scopeProjectId,
+    cliMaxShowCount,
+    cliMaxDaysAfterFirstSeen,
+    cliShowEvery,
+    discovery,
+  };
+}
+
+function buildPayloadInput(fields: ReturnType<typeof parseNotificationFormData>) {
+  return {
+    version: "1" as const,
+    data: {
+      type: fields.payloadType as "info" | "warn" | "error" | "success" | "card" | "changelog",
+      title: fields.title,
+      description: fields.description,
+      ...(fields.actionUrl ? { actionUrl: fields.actionUrl } : {}),
+      ...(fields.image ? { image: fields.image } : {}),
+      ...(fields.dismissOnAction ? { dismissOnAction: true } : {}),
+      ...(fields.discovery ? { discovery: fields.discovery } : {}),
     },
-    surface: surface as "CLI" | "WEBAPP",
-    scope: isPreview ? "USER" : "GLOBAL",
-    ...(isPreview ? { userId } : {}),
+  };
+}
+
+async function handleCreateAction(formData: FormData, userId: string, isPreview: boolean) {
+  const fields = parseNotificationFormData(formData);
+
+  if (!fields.adminLabel || !fields.title || !fields.description || !fields.endsAt || !fields.surface || !fields.payloadType) {
+    return typedjson({ error: "Missing required fields" }, { status: 400 });
+  }
+
+  const result = await createPlatformNotification({
+    title: isPreview ? `[Preview] ${fields.adminLabel}` : fields.adminLabel,
+    payload: buildPayloadInput(fields),
+    surface: fields.surface as "CLI" | "WEBAPP",
+    scope: isPreview ? "USER" : (fields.scope as "USER" | "PROJECT" | "ORGANIZATION" | "GLOBAL"),
+    ...(isPreview
+      ? { userId }
+      : {
+          ...(fields.scope === "USER" && fields.scopeUserId ? { userId: fields.scopeUserId } : {}),
+          ...(fields.scope === "ORGANIZATION" && fields.scopeOrganizationId ? { organizationId: fields.scopeOrganizationId } : {}),
+          ...(fields.scope === "PROJECT" && fields.scopeProjectId ? { projectId: fields.scopeProjectId } : {}),
+        }),
     startsAt: isPreview
       ? new Date().toISOString()
-      : startsAt
-        ? new Date(startsAt + "Z").toISOString()
+      : fields.startsAt
+        ? new Date(fields.startsAt + "Z").toISOString()
         : new Date().toISOString(),
     endsAt: isPreview
       ? new Date(Date.now() + 60 * 60 * 1000).toISOString()
-      : new Date(endsAt + "Z").toISOString(),
-    priority,
-    ...(surface === "CLI"
+      : new Date(fields.endsAt + "Z").toISOString(),
+    priority: fields.priority,
+    ...(fields.surface === "CLI"
       ? isPreview
         ? { cliMaxShowCount: 1 }
         : {
-            cliMaxShowCount,
-            cliMaxDaysAfterFirstSeen,
-            cliShowEvery,
+            cliMaxShowCount: fields.cliMaxShowCount,
+            cliMaxDaysAfterFirstSeen: fields.cliMaxDaysAfterFirstSeen,
+            cliShowEvery: fields.cliShowEvery,
           }
       : {}),
   });
@@ -183,53 +249,89 @@ async function handleArchiveAction(formData: FormData) {
     return typedjson({ error: "Missing notificationId" }, { status: 400 });
   }
 
-  await prisma.platformNotification.update({
-    where: { id: notificationId },
-    data: { archivedAt: new Date() },
-  });
+  await archivePlatformNotification(notificationId);
+  return typedjson({ success: true });
+}
+
+async function handleDeleteAction(formData: FormData) {
+  const notificationId = formData.get("notificationId") as string;
+  if (!notificationId) {
+    return typedjson({ error: "Missing notificationId" }, { status: 400 });
+  }
 
+  await deletePlatformNotification(notificationId);
   return typedjson({ success: true });
 }
 
+async function handlePublishNowAction(formData: FormData) {
+  const notificationId = formData.get("notificationId") as string;
+  if (!notificationId) {
+    return typedjson({ error: "Missing notificationId" }, { status: 400 });
+  }
+
+  await publishNowPlatformNotification(notificationId);
+  return typedjson({ success: true });
+}
+
+async function handleEditAction(formData: FormData) {
+  const notificationId = formData.get("notificationId") as string;
+  const fields = parseNotificationFormData(formData);
+
+  if (!notificationId || !fields.adminLabel || !fields.title || !fields.description || !fields.endsAt || !fields.surface || !fields.payloadType || !fields.startsAt) {
+    return typedjson({ error: "Missing required fields" }, { status: 400 });
+  }
+
+  const result = await updatePlatformNotification({
+    id: notificationId,
+    title: fields.adminLabel,
+    payload: buildPayloadInput(fields),
+    surface: fields.surface as "CLI" | "WEBAPP",
+    scope: fields.scope as "USER" | "PROJECT" | "ORGANIZATION" | "GLOBAL",
+    ...(fields.scope === "USER" && fields.scopeUserId ? { userId: fields.scopeUserId } : {}),
+    ...(fields.scope === "ORGANIZATION" && fields.scopeOrganizationId ? { organizationId: fields.scopeOrganizationId } : {}),
+    ...(fields.scope === "PROJECT" && fields.scopeProjectId ? { projectId: fields.scopeProjectId } : {}),
+    startsAt: new Date(fields.startsAt + "Z").toISOString(),
+    endsAt: new Date(fields.endsAt + "Z").toISOString(),
+    priority: fields.priority,
+    ...(fields.surface === "CLI"
+      ? {
+          cliMaxShowCount: fields.cliMaxShowCount,
+          cliMaxDaysAfterFirstSeen: fields.cliMaxDaysAfterFirstSeen,
+          cliShowEvery: fields.cliShowEvery,
+        }
+      : {}),
+  });
+
+  if (result.isErr()) {
+    const err = result.error;
+    if (err.type === "validation") {
+      return typedjson(
+        { error: err.issues.map((i) => `${i.path.join(".")}: ${i.message}`).join("; ") },
+        { status: 400 }
+      );
+    }
+    return typedjson({ error: err.message }, { status: 500 });
+  }
+
+  return typedjson({ success: true, id: result.value.id });
+}
+
 export default function AdminNotificationsRoute() {
   const { notifications, total, page, pageCount } = useTypedLoaderData<typeof loader>();
   const [showCreate, setShowCreate] = useState(false);
-  const createFetcher = useFetcher<{
-    success?: boolean;
-    error?: string;
-    id?: string;
-    previewId?: string;
-  }>();
-  const archiveFetcher = useFetcher<{ success?: boolean; error?: string }>();
-  const [surface, setSurface] = useState<"CLI" | "WEBAPP">("WEBAPP");
-  const [title, setTitle] = useState("");
-  const [description, setDescription] = useState("");
-  const [actionUrl, setActionUrl] = useState("");
-  const [image, setImage] = useState("");
-  const [payloadType, setPayloadType] = useState<string>("card");
   const [detailNotification, setDetailNotification] = useState<(typeof notifications)[number] | null>(null);
-
-  const typeOptions = surface === "WEBAPP" ? WEBAPP_TYPES : CLI_TYPES;
-
-  // Reset type when surface changes if current type isn't valid for new surface
-  const handleSurfaceChange = (newSurface: "CLI" | "WEBAPP") => {
-    setSurface(newSurface);
-    const newTypes = newSurface === "WEBAPP" ? WEBAPP_TYPES : CLI_TYPES;
-    if (!newTypes.includes(payloadType as any)) {
-      setPayloadType(newTypes[0]);
-    }
-  };
+  const [editNotification, setEditNotification] = useState<(typeof notifications)[number] | null>(null);
 
   const [urlSearchParams, setUrlSearchParams] = useSearchParams();
-  const hideArchived = urlSearchParams.get("hideArchived") === "true";
+  const hideInactive = urlSearchParams.get("hideInactive") === "true";
 
-  const toggleHideArchived = () => {
+  const toggleHideInactive = () => {
     setUrlSearchParams((prev) => {
       const next = new URLSearchParams(prev);
-      if (hideArchived) {
-        next.delete("hideArchived");
+      if (hideInactive) {
+        next.delete("hideInactive");
       } else {
-        next.set("hideArchived", "true");
+        next.set("hideInactive", "true");
       }
       next.delete("page");
       return next;
@@ -240,341 +342,26 @@ export default function AdminNotificationsRoute() {
     <main className="flex h-full min-w-0 flex-1 flex-col overflow-y-auto px-4 pb-4">
       <div className="space-y-4">
         <div className="flex items-center justify-end">
-          <Button variant="primary/small" onClick={() => setShowCreate((v) => !v)}>
-            {showCreate ? "Hide form" : "Create Notification"}
+          <Button variant="primary/small" onClick={() => setShowCreate(true)}>
+            Create Notification
           </Button>
         </div>
 
-        {showCreate && (
-          <div className="rounded-md border border-grid-dimmed bg-charcoal-800 p-4 space-y-3">
-            <createFetcher.Form method="post" className="space-y-3">
-
-              <div className="flex gap-3">
-                <div className="flex-1">
-                  <label className="text-xs font-medium text-text-dimmed">Admin Label</label>
-                  <Input
-                    name="adminLabel"
-                    variant="medium"
-                    fullWidth
-                    placeholder="Internal name for this notification"
-                    className="mt-1"
-                  />
-                </div>
-
-                <div className="w-28">
-                  <label className="text-xs font-medium text-text-dimmed">Surface</label>
-                  <select
-                    name="surface"
-                    value={surface}
-                    onChange={(e) => handleSurfaceChange(e.target.value as "CLI" | "WEBAPP")}
-                    className="mt-1 block w-full rounded-sm border border-grid-dimmed bg-charcoal-900 px-2 py-1.5 text-sm text-text-bright"
-                  >
-                    <option value="WEBAPP">WEBAPP</option>
-                    <option value="CLI">CLI</option>
-                  </select>
-                </div>
-
-                <div className="w-28">
-                  <label className="text-xs font-medium text-text-dimmed">Type</label>
-                  <select
-                    name="payloadType"
-                    value={payloadType}
-                    onChange={(e) => setPayloadType(e.target.value)}
-                    className="mt-1 block w-full rounded-sm border border-grid-dimmed bg-charcoal-900 px-2 py-1.5 text-sm text-text-bright"
-                  >
-                    {typeOptions.map((t) => (
-                      <option key={t} value={t}>
-                        {t}
-                      </option>
-                    ))}
-                  </select>
-                </div>
-
-                <div className="w-16">
-                  <label className="text-xs font-medium text-text-dimmed">Priority</label>
-                  <Input
-                    name="priority"
-                    variant="medium"
-                    fullWidth
-                    defaultValue="0"
-                    type="number"
-                    className="mt-1"
-                  />
-                </div>
-              </div>
-
-              {/* CLI live preview */}
-              {surface === "CLI" && (title || description) && (
-                <div>
-                  <p className="text-[10px] font-medium text-text-dimmed/60 uppercase tracking-wider mb-1">
-                    CLI Preview
-                  </p>
-                  <div className="rounded border border-grid-dimmed bg-charcoal-900 p-3 font-mono text-xs leading-relaxed">
-                    {title && (
-                      <p className="font-bold text-text-bright">
-                        <CliColorMarkup text={title} fallbackClass="text-text-bright" />
-                      </p>
-                    )}
-                    {description && (
-                      <p className="text-text-dimmed">
-                        <CliColorMarkup text={description} fallbackClass="text-text-dimmed" />
-                      </p>
-                    )}
-                    {actionUrl && (
-                      <p className="text-text-dimmed underline">{actionUrl}</p>
-                    )}
-                  </div>
-                </div>
-              )}
-
-              <div>
-                <label className="text-xs font-medium text-text-dimmed">Title</label>
-                <Input
-                  name="title"
-                  variant="medium"
-                  fullWidth
-                  placeholder="Notification title"
-                  className="mt-1"
-                  value={title}
-                  onChange={(e) => setTitle(e.target.value)}
-                />
-              </div>
-
-              {/* Description + live preview (webapp only) */}
-              <div>
-                <label className="text-xs font-medium text-text-dimmed">
-                  Description{surface === "WEBAPP" ? " (markdown)" : ""}
-                </label>
-                {surface === "WEBAPP" ? (
-                  <div className="mt-1 flex gap-3">
-                    <textarea
-                      name="description"
-                      value={description}
-                      onChange={(e) => setDescription(e.target.value)}
-                      rows={6}
-                      placeholder="Supports **bold**, *italic*, `code`, [links](url)..."
-                      className="block min-w-0 flex-1 rounded-sm border border-grid-dimmed bg-charcoal-900 px-2 py-1.5 text-sm text-text-bright placeholder:text-text-dimmed/50 font-mono resize-y"
-                    />
-                    <div className="shrink-0">
-                      <div className="text-[10px] font-medium text-text-dimmed/60 uppercase tracking-wider mb-1">
-                        Preview
-                      </div>
-                      <div className="w-56">
-                        <NotificationPreviewCard
-                          title={title || "Notification title"}
-                          description={description || "Description preview will appear here..."}
-                          actionUrl={actionUrl || undefined}
-                          image={image || undefined}
-                        />
-                      </div>
-                    </div>
-                  </div>
-                ) : (
-                  <textarea
-                    name="description"
-                    value={description}
-                    onChange={(e) => setDescription(e.target.value)}
-                    rows={6}
-                    placeholder="Plain text description..."
-                    className="mt-1 block w-full rounded-sm border border-grid-dimmed bg-charcoal-900 px-2 py-1.5 text-sm text-text-bright placeholder:text-text-dimmed/50 font-mono resize-y"
-                  />
-                )}
-              </div>
-
-              {/* Action URL + dismiss on action (webapp gets both in one row) */}
-              {surface === "WEBAPP" ? (
-                <div className="flex items-end gap-3">
-                  <div className="flex-1">
-                    <label className="text-xs font-medium text-text-dimmed">Action URL (optional)</label>
-                    <Input
-                      name="actionUrl"
-                      variant="medium"
-                      fullWidth
-                      placeholder="https://..."
-                      className="mt-1"
-                      value={actionUrl}
-                      onChange={(e) => setActionUrl(e.target.value)}
-                    />
-                  </div>
-                  <label className="flex items-center gap-2 pb-1.5 text-xs text-text-dimmed whitespace-nowrap">
-                    <input
-                      type="checkbox"
-                      name="dismissOnAction"
-                      value="true"
-                      className="rounded border-grid-dimmed bg-charcoal-900"
-                    />
-                    Dismiss on action click
-                  </label>
-                </div>
-              ) : (
-                <div>
-                  <label className="text-xs font-medium text-text-dimmed">Action URL (optional)</label>
-                  <Input
-                    name="actionUrl"
-                    variant="medium"
-                    fullWidth
-                    placeholder="https://..."
-                    className="mt-1"
-                    value={actionUrl}
-                    onChange={(e) => setActionUrl(e.target.value)}
-                  />
-                </div>
-              )}
-
-              {surface === "WEBAPP" && (
-                <div>
-                  <label className="text-xs font-medium text-text-dimmed">Image URL (optional)</label>
-                  <Input
-                    name="image"
-                    variant="medium"
-                    fullWidth
-                    placeholder="https://example.com/image.png"
-                    className="mt-1"
-                    value={image}
-                    onChange={(e) => setImage(e.target.value)}
-                  />
-                </div>
-              )}
-
-              <div className="grid grid-cols-2 gap-3">
-                <div>
-                  <label className="text-xs font-medium text-text-dimmed">Starts At (UTC)</label>
-                  <input
-                    name="startsAt"
-                    type="datetime-local"
-                    defaultValue={defaultStartsAt()}
-                    className="mt-1 block w-full rounded-sm border border-grid-dimmed bg-charcoal-900 px-2 py-1.5 text-sm text-text-bright"
-                  />
-                </div>
-                <div>
-                  <label className="text-xs font-medium text-text-dimmed">Ends At (UTC)</label>
-                  <input
-                    name="endsAt"
-                    type="datetime-local"
-                    defaultValue={defaultEndsAt()}
-                    className="mt-1 block w-full rounded-sm border border-grid-dimmed bg-charcoal-900 px-2 py-1.5 text-sm text-text-bright"
-                    required
-                  />
-                </div>
-              </div>
-
-              {surface === "CLI" && (
-                <>
-                <div className="grid grid-cols-3 gap-3 rounded border border-grid-dimmed bg-charcoal-900 p-3">
-                  <div>
-                    <label className="text-xs font-medium text-text-dimmed">Max Show Count</label>
-                    <Input
-                      name="cliMaxShowCount"
-                      variant="medium"
-                      fullWidth
-                      type="number"
-                      placeholder="e.g. 5"
-                      className="mt-1"
-                    />
-                  </div>
-                  <div>
-                    <label className="text-xs font-medium text-text-dimmed">
-                      Max Days After First Seen
-                    </label>
-                    <Input
-                      name="cliMaxDaysAfterFirstSeen"
-                      variant="medium"
-                      fullWidth
-                      type="number"
-                      placeholder="e.g. 7"
-                      className="mt-1"
-                    />
-                  </div>
-                  <div>
-                    <label className="text-xs font-medium text-text-dimmed">Show Every (Nth)</label>
-                    <Input
-                      name="cliShowEvery"
-                      variant="medium"
-                      fullWidth
-                      type="number"
-                      placeholder="e.g. 3"
-                      className="mt-1"
-                    />
-                  </div>
-                </div>
-
-                <div className="rounded border border-grid-dimmed bg-charcoal-900 p-3 space-y-3">
-                  <div className="text-xs font-medium text-text-dimmed">
-                    Discovery (optional) — only show notification if file pattern matches
-                  </div>
-                  <div className="grid grid-cols-3 gap-3">
-                    <div>
-                      <label className="text-xs font-medium text-text-dimmed">File Patterns</label>
-                      <Input
-                        name="discoveryFilePatterns"
-                        variant="medium"
-                        fullWidth
-                        placeholder="trigger.config.ts, trigger.config.js"
-                        className="mt-1"
-                      />
-                      <span className="text-[10px] text-text-dimmed/60">Comma-separated</span>
-                    </div>
-                    <div>
-                      <label className="text-xs font-medium text-text-dimmed">Content Pattern</label>
-                      <Input
-                        name="discoveryContentPattern"
-                        variant="medium"
-                        fullWidth
-                        placeholder="e.g. syncVercelEnvVars"
-                        className="mt-1"
-                      />
-                      <span className="text-[10px] text-text-dimmed/60">Regex (optional)</span>
-                    </div>
-                    <div>
-                      <label className="text-xs font-medium text-text-dimmed">Match Behavior</label>
-                      <select
-                        name="discoveryMatchBehavior"
-                        className="mt-1 block w-full rounded-sm border border-grid-dimmed bg-charcoal-900 px-2 py-1.5 text-sm text-text-bright"
-                      >
-                        <option value="">— none —</option>
-                        <option value="show-if-found">show-if-found</option>
-                        <option value="show-if-not-found">show-if-not-found</option>
-                      </select>
-                    </div>
-                  </div>
-                </div>
-                </>
-              )}
-
-              <div className="flex items-center gap-2">
-                <Button
-                  type="submit"
-                  name="_action"
-                  value="create"
-                  variant="primary/small"
-                  disabled={createFetcher.state !== "idle"}
-                >
-                  {createFetcher.state !== "idle" ? "Creating..." : "Create"}
-                </Button>
-                <Button
-                  type="submit"
-                  name="_action"
-                  value="create-preview"
-                  variant="tertiary/small"
-                  disabled={createFetcher.state !== "idle"}
-                >
-                  Send Preview to Me
-                </Button>
-                {createFetcher.data?.error && (
-                  <span className="text-xs text-red-400">{createFetcher.data.error}</span>
-                )}
-                {createFetcher.data?.success && !createFetcher.data.previewId && (
-                  <span className="text-xs text-green-400">Created successfully</span>
-                )}
-                {createFetcher.data?.previewId && (
-                  <span className="text-xs text-green-400">
-                    Preview sent (ID: {createFetcher.data.previewId})
-                  </span>
-                )}
-              </div>
-            </createFetcher.Form>
-          </div>
-        )}
+        <Dialog
+          open={showCreate}
+          onOpenChange={(open) => { if (!open) setShowCreate(false); }}
+        >
+          <DialogContent className="max-w-2xl max-h-[90vh] overflow-y-auto">
+            <DialogHeader>
+              <DialogTitle>Create Notification</DialogTitle>
+            </DialogHeader>
+            <NotificationForm
+              key="create"
+              mode="create"
+              onClose={() => setShowCreate(false)}
+            />
+          </DialogContent>
+        </Dialog>
 
         <div className="flex items-center justify-between">
           <Paragraph className="text-text-dimmed">
@@ -583,11 +370,11 @@ export default function AdminNotificationsRoute() {
           <label className="flex items-center gap-2 text-xs text-text-dimmed">
             <input
               type="checkbox"
-              checked={hideArchived}
-              onChange={toggleHideArchived}
+              checked={hideInactive}
+              onChange={toggleHideInactive}
               className="rounded border-grid-dimmed bg-charcoal-900"
             />
-            Hide archived
+            Hide inactive
           </label>
         </div>
 
@@ -603,8 +390,8 @@ export default function AdminNotificationsRoute() {
               <TableHeaderCell>Seen</TableHeaderCell>
               <TableHeaderCell>Clicked</TableHeaderCell>
               <TableHeaderCell>Dismissed</TableHeaderCell>
-              <TableHeaderCell>Actions</TableHeaderCell>
               <TableHeaderCell>Status</TableHeaderCell>
+              <TableHeaderCell></TableHeaderCell>
             </TableRow>
           </TableHeader>
           <TableBody>
@@ -617,7 +404,7 @@ export default function AdminNotificationsRoute() {
                 const status = getNotificationStatus(n);
                 const isActive = status === "active";
                 return (
-                  <TableRow key={n.id}>
+                  <TableRow key={n.id} className="group/row">
                     <TableCell>
                       <button
                         type="button"
@@ -652,22 +439,26 @@ export default function AdminNotificationsRoute() {
                       <span className="text-xs font-mono">{n.stats.dismissed}</span>
                     </TableCell>
                     <TableCell>
-                      {isActive && (
-                        <archiveFetcher.Form method="post" className="inline">
-                          <input type="hidden" name="_action" value="archive" />
-                          <input type="hidden" name="notificationId" value={n.id} />
+                      <StatusBadge status={status} />
+                    </TableCell>
+                    <TableCell>
+                      <div className="flex items-center justify-end gap-1 opacity-0 group-hover/row:opacity-100 transition-opacity">
+                        {status === "pending" && (
+                          <PublishNowButton notificationId={n.id} />
+                        )}
+                        {(status === "pending" || status === "releasing" || status === "active") && (
                           <Button
-                            type="submit"
-                            variant="danger/small"
-                            disabled={archiveFetcher.state !== "idle"}
+                            variant="tertiary/small"
+                            onClick={() => setEditNotification(n)}
                           >
-                            Archive
+                            Edit
                           </Button>
-                        </archiveFetcher.Form>
-                      )}
-                    </TableCell>
-                    <TableCell>
-                      <StatusBadge status={status} />
+                        )}
+                        {status !== "archived" && (
+                          <ArchiveButton notificationId={n.id} />
+                        )}
+                        <DeleteConfirmationButton notificationId={n.id} />
+                      </div>
                     </TableCell>
                   </TableRow>
                 );
@@ -696,10 +487,577 @@ export default function AdminNotificationsRoute() {
           )}
         </DialogContent>
       </Dialog>
+
+      <Dialog
+        open={editNotification !== null}
+        onOpenChange={(open) => {
+          if (!open) setEditNotification(null);
+        }}
+      >
+        <DialogContent className="max-w-2xl max-h-[90vh] overflow-y-auto">
+          {editNotification && (
+            <>
+              <DialogHeader>
+                <DialogTitle>Edit Notification</DialogTitle>
+              </DialogHeader>
+              <NotificationForm
+                key={editNotification.id}
+                mode="edit"
+                notification={editNotification}
+                onClose={() => setEditNotification(null)}
+              />
+            </>
+          )}
+        </DialogContent>
+      </Dialog>
     </main>
   );
 }
 
+function ArchiveButton({ notificationId }: { notificationId: string }) {
+  const fetcher = useFetcher();
+  return (
+    <fetcher.Form method="post" className="inline">
+      <input type="hidden" name="_action" value="archive" />
+      <input type="hidden" name="notificationId" value={notificationId} />
+      <Button type="submit" variant="danger/small" disabled={fetcher.state !== "idle"}>
+        Archive
+      </Button>
+    </fetcher.Form>
+  );
+}
+
+function PublishNowButton({ notificationId }: { notificationId: string }) {
+  const [open, setOpen] = useState(false);
+  const fetcher = useFetcher();
+
+  return (
+    <Alert open={open} onOpenChange={setOpen}>
+      <AlertTrigger asChild>
+        <Button variant="secondary/small">Publish Now</Button>
+      </AlertTrigger>
+      <AlertContent>
+        <AlertHeader>
+          <AlertTitle>Publish notification now</AlertTitle>
+          <AlertDescription>
+            This will make the notification immediately visible to users.
+          </AlertDescription>
+        </AlertHeader>
+        <AlertFooter>
+          <AlertCancel asChild>
+            <Button variant="secondary/small">Cancel</Button>
+          </AlertCancel>
+          <fetcher.Form method="post" onSubmit={() => setOpen(false)}>
+            <input type="hidden" name="_action" value="publish-now" />
+            <input type="hidden" name="notificationId" value={notificationId} />
+            <Button type="submit" variant="primary/small">
+              Publish
+            </Button>
+          </fetcher.Form>
+        </AlertFooter>
+      </AlertContent>
+    </Alert>
+  );
+}
+
+function DeleteConfirmationButton({ notificationId }: { notificationId: string }) {
+  const [open, setOpen] = useState(false);
+  const fetcher = useFetcher();
+
+  return (
+    <Alert open={open} onOpenChange={setOpen}>
+      <AlertTrigger asChild>
+        <Button variant="tertiary/small">
+          <TrashIcon className="size-3.5 text-text-dimmed" />
+        </Button>
+      </AlertTrigger>
+      <AlertContent>
+        <AlertHeader>
+          <AlertTitle>Delete notification</AlertTitle>
+          <AlertDescription>
+            This will permanently delete this notification and all its interaction data. This
+            action cannot be undone.
+          </AlertDescription>
+        </AlertHeader>
+        <AlertFooter>
+          <AlertCancel asChild>
+            <Button variant="secondary/small">Cancel</Button>
+          </AlertCancel>
+          <fetcher.Form method="post" onSubmit={() => setOpen(false)}>
+            <input type="hidden" name="_action" value="delete" />
+            <input type="hidden" name="notificationId" value={notificationId} />
+            <Button type="submit" variant="danger/small">
+              Delete
+            </Button>
+          </fetcher.Form>
+        </AlertFooter>
+      </AlertContent>
+    </Alert>
+  );
+}
+
+type NotificationFormDefaults = {
+  id?: string;
+  title?: string;
+  surface?: string;
+  scope?: string;
+  userId?: string | null;
+  organizationId?: string | null;
+  projectId?: string | null;
+  priority?: number;
+  startsAt?: Date;
+  endsAt?: Date;
+  payloadTitle?: string | null;
+  payloadType?: string | null;
+  payloadDescription?: string | null;
+  payloadActionUrl?: string | null;
+  payloadImage?: string | null;
+  payloadDismissOnAction?: boolean;
+  payloadDiscovery?: {
+    filePatterns: string[];
+    contentPattern?: string;
+    matchBehavior: "show-if-found" | "show-if-not-found";
+  } | null;
+  cliMaxShowCount?: number | null;
+  cliMaxDaysAfterFirstSeen?: number | null;
+  cliShowEvery?: number | null;
+};
+
+function NotificationForm({
+  mode,
+  notification: n,
+  onClose,
+}: {
+  mode: "create" | "edit";
+  notification?: NotificationFormDefaults;
+  onClose: () => void;
+}) {
+  const fetcher = useFetcher<{ success?: boolean; error?: string; previewId?: string }>();
+  const [surface, setSurface] = useState<"CLI" | "WEBAPP">((n?.surface as "CLI" | "WEBAPP") ?? "WEBAPP");
+  const [payloadType, setPayloadType] = useState<string>(n?.payloadType ?? "card");
+  const [scope, setScope] = useState<string>(n?.scope ?? "GLOBAL");
+  const [title, setTitle] = useState(n?.payloadTitle ?? "");
+  const [description, setDescription] = useState(n?.payloadDescription ?? "");
+  const [actionUrl, setActionUrl] = useState(n?.payloadActionUrl ?? "");
+  const [image, setImage] = useState(n?.payloadImage ?? "");
+
+  const typeOptions = surface === "WEBAPP" ? WEBAPP_TYPES : CLI_TYPES;
+
+  const handleSurfaceChange = (newSurface: "CLI" | "WEBAPP") => {
+    setSurface(newSurface);
+    const newTypes = newSurface === "WEBAPP" ? WEBAPP_TYPES : CLI_TYPES;
+    if (!newTypes.includes(payloadType as any)) {
+      setPayloadType(newTypes[0]);
+    }
+  };
+
+  useEffect(() => {
+    if (fetcher.data?.success && !fetcher.data.previewId) {
+      onClose();
+    }
+  }, [fetcher.data, onClose]);
+
+  const isEdit = mode === "edit";
+
+  return (
+    <fetcher.Form method="post" className="space-y-3">
+      {isEdit && (
+        <>
+          <input type="hidden" name="_action" value="edit" />
+          <input type="hidden" name="notificationId" value={n?.id} />
+        </>
+      )}
+
+      <div className="flex gap-3">
+        <div className="flex-1">
+          <label className="text-xs font-medium text-text-dimmed">Admin Label</label>
+          <Input
+            name="adminLabel"
+            variant="medium"
+            fullWidth
+            defaultValue={n?.title ?? ""}
+            placeholder="Internal name for this notification"
+            className="mt-1"
+          />
+        </div>
+
+        <div className="w-28">
+          <label className="text-xs font-medium text-text-dimmed">Surface</label>
+          <select
+            name="surface"
+            value={surface}
+            onChange={(e) => handleSurfaceChange(e.target.value as "CLI" | "WEBAPP")}
+            className="mt-1 block w-full rounded-sm border border-grid-dimmed bg-charcoal-900 px-2 py-1.5 text-sm text-text-bright"
+          >
+            <option value="WEBAPP">WEBAPP</option>
+            <option value="CLI">CLI</option>
+          </select>
+        </div>
+
+        <div className="w-28">
+          <label className="text-xs font-medium text-text-dimmed">Type</label>
+          <select
+            name="payloadType"
+            value={payloadType}
+            onChange={(e) => setPayloadType(e.target.value)}
+            className="mt-1 block w-full rounded-sm border border-grid-dimmed bg-charcoal-900 px-2 py-1.5 text-sm text-text-bright"
+          >
+            {typeOptions.map((t) => (
+              <option key={t} value={t}>
+                {t}
+              </option>
+            ))}
+          </select>
+        </div>
+
+        <div className="w-16">
+          <label className="text-xs font-medium text-text-dimmed">Priority</label>
+          <Input
+            name="priority"
+            variant="medium"
+            fullWidth
+            defaultValue={String(n?.priority ?? 0)}
+            type="number"
+            className="mt-1"
+          />
+        </div>
+      </div>
+
+      <div className="flex gap-3">
+        <div className="w-36">
+          <label className="text-xs font-medium text-text-dimmed">Scope</label>
+          <select
+            name="scope"
+            value={scope}
+            onChange={(e) => setScope(e.target.value)}
+            className="mt-1 block w-full rounded-sm border border-grid-dimmed bg-charcoal-900 px-2 py-1.5 text-sm text-text-bright"
+          >
+            <option value="GLOBAL">GLOBAL</option>
+            <option value="USER">USER</option>
+            <option value="ORGANIZATION">ORGANIZATION</option>
+            <option value="PROJECT">PROJECT</option>
+          </select>
+        </div>
+
+        {scope === "USER" && (
+          <div className="flex-1">
+            <label className="text-xs font-medium text-text-dimmed">User ID</label>
+            <Input name="scopeUserId" variant="medium" fullWidth defaultValue={n?.userId ?? ""} placeholder="User ID" className="mt-1" />
+          </div>
+        )}
+
+        {scope === "ORGANIZATION" && (
+          <div className="flex-1">
+            <label className="text-xs font-medium text-text-dimmed">Organization ID</label>
+            <Input name="scopeOrganizationId" variant="medium" fullWidth defaultValue={n?.organizationId ?? ""} placeholder="Organization ID" className="mt-1" />
+          </div>
+        )}
+
+        {scope === "PROJECT" && (
+          <div className="flex-1">
+            <label className="text-xs font-medium text-text-dimmed">Project ID</label>
+            <Input name="scopeProjectId" variant="medium" fullWidth defaultValue={n?.projectId ?? ""} placeholder="Project ID" className="mt-1" />
+          </div>
+        )}
+      </div>
+
+      {/* CLI live preview */}
+      {surface === "CLI" && (title || description) && (
+        <div>
+          <p className="text-[10px] font-medium text-text-dimmed/60 uppercase tracking-wider mb-1">
+            CLI Preview
+          </p>
+          <div className="rounded border border-grid-dimmed bg-charcoal-900 p-3 font-mono text-xs leading-relaxed">
+            {title && (
+              <p className="font-bold text-text-bright">
+                <CliColorMarkup text={title} fallbackClass="text-text-bright" />
+              </p>
+            )}
+            {description && (
+              <p className="text-text-dimmed">
+                <CliColorMarkup text={description} fallbackClass="text-text-dimmed" />
+              </p>
+            )}
+            {actionUrl && (
+              <p className="text-text-dimmed underline">{actionUrl}</p>
+            )}
+          </div>
+        </div>
+      )}
+
+      <div>
+        <label className="text-xs font-medium text-text-dimmed">Title</label>
+        <Input
+          name="title"
+          variant="medium"
+          fullWidth
+          placeholder="Notification title"
+          value={title}
+          onChange={(e) => setTitle(e.target.value)}
+          className="mt-1"
+        />
+      </div>
+
+      <div>
+        <label className="text-xs font-medium text-text-dimmed">
+          Description{surface === "WEBAPP" ? " (markdown)" : ""}
+        </label>
+        {surface === "WEBAPP" ? (
+          <div className="mt-1 flex gap-3">
+            <textarea
+              name="description"
+              value={description}
+              onChange={(e) => setDescription(e.target.value)}
+              rows={6}
+              placeholder="Supports **bold**, *italic*, `code`, [links](url)..."
+              className="block min-w-0 flex-1 rounded-sm border border-grid-dimmed bg-charcoal-900 px-2 py-1.5 text-sm text-text-bright placeholder:text-text-dimmed/50 font-mono resize-y"
+            />
+            <div className="shrink-0">
+              <div className="text-[10px] font-medium text-text-dimmed/60 uppercase tracking-wider mb-1">
+                Preview
+              </div>
+              <div className="w-56">
+                <NotificationPreviewCard
+                  title={title || "Notification title"}
+                  description={description || "Description preview will appear here..."}
+                  actionUrl={actionUrl || undefined}
+                  image={image || undefined}
+                />
+              </div>
+            </div>
+          </div>
+        ) : (
+          <textarea
+            name="description"
+            value={description}
+            onChange={(e) => setDescription(e.target.value)}
+            rows={6}
+            placeholder="Plain text description..."
+            className="mt-1 block w-full rounded-sm border border-grid-dimmed bg-charcoal-900 px-2 py-1.5 text-sm text-text-bright placeholder:text-text-dimmed/50 font-mono resize-y"
+          />
+        )}
+      </div>
+
+      {surface === "WEBAPP" ? (
+        <div className="flex items-end gap-3">
+          <div className="flex-1">
+            <label className="text-xs font-medium text-text-dimmed">Action URL (optional)</label>
+            <Input
+              name="actionUrl"
+              variant="medium"
+              fullWidth
+              placeholder="https://..."
+              value={actionUrl}
+              onChange={(e) => setActionUrl(e.target.value)}
+              className="mt-1"
+            />
+          </div>
+          <label className="flex items-center gap-2 pb-1.5 text-xs text-text-dimmed whitespace-nowrap">
+            <input
+              type="checkbox"
+              name="dismissOnAction"
+              value="true"
+              defaultChecked={n?.payloadDismissOnAction ?? false}
+              className="rounded border-grid-dimmed bg-charcoal-900"
+            />
+            Dismiss on action click
+          </label>
+        </div>
+      ) : (
+        <div>
+          <label className="text-xs font-medium text-text-dimmed">Action URL (optional)</label>
+          <Input
+            name="actionUrl"
+            variant="medium"
+            fullWidth
+            placeholder="https://..."
+            value={actionUrl}
+            onChange={(e) => setActionUrl(e.target.value)}
+            className="mt-1"
+          />
+        </div>
+      )}
+
+      {surface === "WEBAPP" && (
+        <div>
+          <label className="text-xs font-medium text-text-dimmed">Image URL (optional)</label>
+          <Input
+            name="image"
+            variant="medium"
+            fullWidth
+            placeholder="https://example.com/image.png"
+            value={image}
+            onChange={(e) => setImage(e.target.value)}
+            className="mt-1"
+          />
+        </div>
+      )}
+
+      <div className="grid grid-cols-2 gap-3">
+        <div>
+          <label className="text-xs font-medium text-text-dimmed">Starts At (UTC)</label>
+          <input
+            name="startsAt"
+            type="datetime-local"
+            defaultValue={n?.startsAt ? toDatetimeLocalUTC(new Date(n.startsAt)) : defaultStartsAt()}
+            className="mt-1 block w-full rounded-sm border border-grid-dimmed bg-charcoal-900 px-2 py-1.5 text-sm text-text-bright"
+          />
+        </div>
+        <div>
+          <label className="text-xs font-medium text-text-dimmed">Ends At (UTC)</label>
+          <input
+            name="endsAt"
+            type="datetime-local"
+            defaultValue={n?.endsAt ? toDatetimeLocalUTC(new Date(n.endsAt)) : defaultEndsAt()}
+            className="mt-1 block w-full rounded-sm border border-grid-dimmed bg-charcoal-900 px-2 py-1.5 text-sm text-text-bright"
+            required
+          />
+        </div>
+      </div>
+
+      {surface === "CLI" && (
+        <>
+          <div className="grid grid-cols-3 gap-3 rounded border border-grid-dimmed bg-charcoal-900 p-3">
+            <div>
+              <label className="text-xs font-medium text-text-dimmed">Max Show Count</label>
+              <Input
+                name="cliMaxShowCount"
+                variant="medium"
+                fullWidth
+                type="number"
+                defaultValue={n?.cliMaxShowCount != null ? String(n.cliMaxShowCount) : ""}
+                placeholder="e.g. 5"
+                className="mt-1"
+              />
+            </div>
+            <div>
+              <label className="text-xs font-medium text-text-dimmed">
+                Max Days After First Seen
+              </label>
+              <Input
+                name="cliMaxDaysAfterFirstSeen"
+                variant="medium"
+                fullWidth
+                type="number"
+                defaultValue={n?.cliMaxDaysAfterFirstSeen != null ? String(n.cliMaxDaysAfterFirstSeen) : ""}
+                placeholder="e.g. 7"
+                className="mt-1"
+              />
+            </div>
+            <div>
+              <label className="text-xs font-medium text-text-dimmed">Show Every (Nth)</label>
+              <Input
+                name="cliShowEvery"
+                variant="medium"
+                fullWidth
+                type="number"
+                defaultValue={n?.cliShowEvery != null ? String(n.cliShowEvery) : ""}
+                placeholder="e.g. 3"
+                className="mt-1"
+              />
+            </div>
+          </div>
+
+          <div className="rounded border border-grid-dimmed bg-charcoal-900 p-3 space-y-3">
+            <div className="text-xs font-medium text-text-dimmed">
+              Discovery (optional) — only show notification if file pattern matches
+            </div>
+            <div className="grid grid-cols-3 gap-3">
+              <div>
+                <label className="text-xs font-medium text-text-dimmed">File Patterns</label>
+                <Input
+                  name="discoveryFilePatterns"
+                  variant="medium"
+                  fullWidth
+                  defaultValue={n?.payloadDiscovery?.filePatterns.join(", ") ?? ""}
+                  placeholder="trigger.config.ts, trigger.config.js"
+                  className="mt-1"
+                />
+                <span className="text-[10px] text-text-dimmed/60">Comma-separated</span>
+              </div>
+              <div>
+                <label className="text-xs font-medium text-text-dimmed">Content Pattern</label>
+                <Input
+                  name="discoveryContentPattern"
+                  variant="medium"
+                  fullWidth
+                  defaultValue={n?.payloadDiscovery?.contentPattern ?? ""}
+                  placeholder="e.g. syncVercelEnvVars"
+                  className="mt-1"
+                />
+                <span className="text-[10px] text-text-dimmed/60">Regex (optional)</span>
+              </div>
+              <div>
+                <label className="text-xs font-medium text-text-dimmed">Match Behavior</label>
+                <select
+                  name="discoveryMatchBehavior"
+                  defaultValue={n?.payloadDiscovery?.matchBehavior ?? ""}
+                  className="mt-1 block w-full rounded-sm border border-grid-dimmed bg-charcoal-900 px-2 py-1.5 text-sm text-text-bright"
+                >
+                  <option value="">— none —</option>
+                  <option value="show-if-found">show-if-found</option>
+                  <option value="show-if-not-found">show-if-not-found</option>
+                </select>
+              </div>
+            </div>
+          </div>
+        </>
+      )}
+
+      <div className="flex items-center gap-2">
+        {isEdit ? (
+          <Button
+            type="submit"
+            variant="primary/small"
+            disabled={fetcher.state !== "idle"}
+          >
+            {fetcher.state !== "idle" ? "Saving..." : "Save Changes"}
+          </Button>
+        ) : (
+          <>
+            <Button
+              type="submit"
+              name="_action"
+              value="create"
+              variant="primary/small"
+              disabled={fetcher.state !== "idle"}
+            >
+              {fetcher.state !== "idle" ? "Creating..." : "Create"}
+            </Button>
+            <Button
+              type="submit"
+              name="_action"
+              value="create-preview"
+              variant="tertiary/small"
+              disabled={fetcher.state !== "idle"}
+            >
+              Send Preview to Me
+            </Button>
+          </>
+        )}
+        <Button
+          type="button"
+          variant="tertiary/small"
+          onClick={onClose}
+        >
+          Cancel
+        </Button>
+        {fetcher.data?.error && (
+          <span className="text-xs text-red-400">{fetcher.data.error}</span>
+        )}
+        {!isEdit && fetcher.data?.success && !fetcher.data.previewId && (
+          <span className="text-xs text-green-400">Created successfully</span>
+        )}
+        {!isEdit && fetcher.data?.previewId && (
+          <span className="text-xs text-green-400">
+            Preview sent (ID: {fetcher.data.previewId})
+          </span>
+        )}
+      </div>
+    </fetcher.Form>
+  );
+}
+
 function NotificationDetailContent({
   notification: n,
 }: {
@@ -1046,7 +1404,9 @@ function sanitizeImageUrl(url: string): string {
   }
 }
 
-type NotificationStatus = "active" | "pending" | "expired" | "archived";
+type NotificationStatus = "active" | "pending" | "releasing" | "expired" | "archived";
+
+const FIVE_MINUTES_MS = 5 * 60 * 1000;
 
 function getNotificationStatus(n: {
   archivedAt: string | Date | null;
@@ -1057,7 +1417,9 @@ function getNotificationStatus(n: {
   const now = new Date();
   const starts = typeof n.startsAt === "string" ? new Date(n.startsAt) : n.startsAt;
   const ends = typeof n.endsAt === "string" ? new Date(n.endsAt) : n.endsAt;
-  if (now < starts) return "pending";
+  if (now < starts) {
+    return starts.getTime() - now.getTime() <= FIVE_MINUTES_MS ? "releasing" : "pending";
+  }
   if (now >= ends) return "expired";
   return "active";
 }
@@ -1066,6 +1428,7 @@ function StatusBadge({ status }: { status: NotificationStatus }) {
   const styles: Record<NotificationStatus, string> = {
     active: "bg-green-500/20 text-green-400",
     pending: "bg-blue-500/20 text-blue-400",
+    releasing: "bg-amber-500/20 text-amber-400",
     expired: "bg-charcoal-700 text-text-dimmed",
     archived: "bg-red-500/20 text-red-400",
   };
diff --git a/apps/webapp/app/routes/confirm-basic-details.tsx b/apps/webapp/app/routes/confirm-basic-details.tsx
index ed868186552..2c6209b74f0 100644
--- a/apps/webapp/app/routes/confirm-basic-details.tsx
+++ b/apps/webapp/app/routes/confirm-basic-details.tsx
@@ -241,7 +241,7 @@ export default function Page() {
   return (
     <AppContainer className="bg-charcoal-900">
       <BackgroundWrapper>
-        <MainCenteredContainer className="max-w-[29rem] rounded-lg border border-grid-bright bg-background-dimmed p-5 shadow-lg">
+        <MainCenteredContainer variant="onboarding" className="max-w-[29rem] rounded-lg border border-grid-bright bg-background-dimmed p-5 shadow-lg">
           <Form method="post" {...form.props}>
             <FormTitle
               title="Welcome to Trigger.dev"
diff --git a/apps/webapp/app/routes/invites.tsx b/apps/webapp/app/routes/invites.tsx
index 11998a4676a..7b234d4129b 100644
--- a/apps/webapp/app/routes/invites.tsx
+++ b/apps/webapp/app/routes/invites.tsx
@@ -101,7 +101,7 @@ export default function Page() {
   return (
     <AppContainer className="bg-charcoal-900">
       <BackgroundWrapper>
-        <MainCenteredContainer className="max-w-[26rem] rounded-lg border border-grid-bright bg-background-dimmed p-5 shadow-lg">
+        <MainCenteredContainer variant="onboarding" className="max-w-[26rem] rounded-lg border border-grid-bright bg-background-dimmed p-5 shadow-lg">
           <div>
             <FormTitle
               LeadingIcon={<EnvelopeIcon className="size-6 text-cyan-500" />}
diff --git a/apps/webapp/app/routes/resources.platform-changelogs.tsx b/apps/webapp/app/routes/resources.platform-changelogs.tsx
index da71df2e279..8eeabd6b047 100644
--- a/apps/webapp/app/routes/resources.platform-changelogs.tsx
+++ b/apps/webapp/app/routes/resources.platform-changelogs.tsx
@@ -3,7 +3,7 @@ import type { LoaderFunctionArgs } from "@remix-run/node";
 import { useFetcher, type ShouldRevalidateFunction } from "@remix-run/react";
 import { useEffect, useRef } from "react";
 import { requireUserId } from "~/services/session.server";
-import { getRecentChangelogs } from "~/services/platformNotifications.server";
+import { getRecentChangelogs, verifyOrgMembership } from "~/services/platformNotifications.server";
 
 export const shouldRevalidate: ShouldRevalidateFunction = () => false;
 
@@ -12,24 +12,37 @@ export type PlatformChangelogsLoaderData = {
 };
 
 export async function loader({ request }: LoaderFunctionArgs) {
-  await requireUserId(request);
+  const userId = await requireUserId(request);
+  const url = new URL(request.url);
+  const rawOrganizationId = url.searchParams.get("organizationId") ?? undefined;
+  const rawProjectId = url.searchParams.get("projectId") ?? undefined;
 
-  const changelogs = await getRecentChangelogs();
+  const { organizationId, projectId } = await verifyOrgMembership({
+    userId,
+    organizationId: rawOrganizationId,
+    projectId: rawProjectId,
+  });
+
+  const changelogs = await getRecentChangelogs({ userId, organizationId, projectId });
 
   return json<PlatformChangelogsLoaderData>({ changelogs });
 }
 
 const POLL_INTERVAL_MS = 60_000;
 
-export function useRecentChangelogs() {
+export function useRecentChangelogs(organizationId?: string, projectId?: string) {
   const fetcher = useFetcher<typeof loader>();
-  const hasInitiallyFetched = useRef(false);
+  const lastLoadedUrl = useRef<string | null>(null);
 
   useEffect(() => {
-    const url = "/resources/platform-changelogs";
-
-    if (!hasInitiallyFetched.current && fetcher.state === "idle") {
-      hasInitiallyFetched.current = true;
+    const params = new URLSearchParams();
+    if (organizationId) params.set("organizationId", organizationId);
+    if (projectId) params.set("projectId", projectId);
+    const qs = params.toString();
+    const url = `/resources/platform-changelogs${qs ? `?${qs}` : ""}`;
+
+    if (lastLoadedUrl.current !== url && fetcher.state === "idle") {
+      lastLoadedUrl.current = url;
       fetcher.load(url);
     }
 
@@ -40,7 +53,7 @@ export function useRecentChangelogs() {
     }, POLL_INTERVAL_MS);
 
     return () => clearInterval(interval);
-  }, []);
+  }, [organizationId, projectId]);
 
   return {
     changelogs: fetcher.data?.changelogs ?? [],
diff --git a/apps/webapp/app/routes/resources.platform-notifications.tsx b/apps/webapp/app/routes/resources.platform-notifications.tsx
index 18d54ec352b..bf3dfe41e44 100644
--- a/apps/webapp/app/routes/resources.platform-notifications.tsx
+++ b/apps/webapp/app/routes/resources.platform-notifications.tsx
@@ -5,6 +5,7 @@ import { useEffect, useRef } from "react";
 import { requireUserId } from "~/services/session.server";
 import {
   getActivePlatformNotifications,
+  verifyOrgMembership,
   type PlatformNotificationWithPayload,
 } from "~/services/platformNotifications.server";
 
@@ -18,8 +19,14 @@ export type PlatformNotificationsLoaderData = {
 export async function loader({ request }: LoaderFunctionArgs) {
   const userId = await requireUserId(request);
   const url = new URL(request.url);
-  const organizationId = url.searchParams.get("organizationId");
-  const projectId = url.searchParams.get("projectId") ?? undefined;
+  const rawOrganizationId = url.searchParams.get("organizationId") ?? undefined;
+  const rawProjectId = url.searchParams.get("projectId") ?? undefined;
+
+  const { organizationId, projectId } = await verifyOrgMembership({
+    userId,
+    organizationId: rawOrganizationId,
+    projectId: rawProjectId,
+  });
 
   if (!organizationId) {
     return json<PlatformNotificationsLoaderData>({ notifications: [], unreadCount: 0 });
diff --git a/apps/webapp/app/routes/vercel.onboarding.tsx b/apps/webapp/app/routes/vercel.onboarding.tsx
index bdd1c1d05ca..1cf351532e9 100644
--- a/apps/webapp/app/routes/vercel.onboarding.tsx
+++ b/apps/webapp/app/routes/vercel.onboarding.tsx
@@ -293,7 +293,7 @@ export default function VercelOnboardingPage() {
     return (
       <AppContainer className="bg-charcoal-900">
         <BackgroundWrapper>
-          <MainCenteredContainer className="max-w-[26rem] rounded-lg border border-grid-bright bg-background-dimmed p-5 shadow-lg">
+          <MainCenteredContainer variant="onboarding" className="max-w-[26rem] rounded-lg border border-grid-bright bg-background-dimmed p-5 shadow-lg">
             <FormTitle title="Installation Expired" description={data.error} />
             <Button
               variant="primary/medium"
@@ -325,7 +325,7 @@ export default function VercelOnboardingPage() {
     return (
       <AppContainer className="bg-charcoal-900">
         <BackgroundWrapper>
-          <MainCenteredContainer className="max-w-[26rem] rounded-lg border border-grid-bright bg-background-dimmed p-5 shadow-lg">
+          <MainCenteredContainer variant="onboarding" className="max-w-[26rem] rounded-lg border border-grid-bright bg-background-dimmed p-5 shadow-lg">
             <FormTitle
               LeadingIcon={<BuildingOfficeIcon className="size-7 text-indigo-500" />}
               title="Select Organization"
@@ -401,7 +401,7 @@ export default function VercelOnboardingPage() {
   return (
     <AppContainer className="bg-charcoal-900">
       <BackgroundWrapper>
-        <MainCenteredContainer className="max-w-[26rem] rounded-lg border border-grid-bright bg-background-dimmed p-5 shadow-lg">
+        <MainCenteredContainer variant="onboarding" className="max-w-[26rem] rounded-lg border border-grid-bright bg-background-dimmed p-5 shadow-lg">
           <FormTitle
             LeadingIcon={<FolderIcon className="size-7 text-indigo-500" />}
             title="Select Project"
diff --git a/apps/webapp/app/services/platformNotifications.server.ts b/apps/webapp/app/services/platformNotifications.server.ts
index ff91f48708f..6425b7bdb61 100644
--- a/apps/webapp/app/services/platformNotifications.server.ts
+++ b/apps/webapp/app/services/platformNotifications.server.ts
@@ -59,13 +59,15 @@ export type PlatformNotificationWithPayload = {
 export async function getAdminNotificationsList({
   page = 1,
   pageSize = 20,
-  hideArchived = false,
+  hideInactive = false,
 }: {
   page?: number;
   pageSize?: number;
-  hideArchived?: boolean;
+  hideInactive?: boolean;
 }) {
-  const where = hideArchived ? { archivedAt: null } : {};
+  const where = hideInactive
+    ? { archivedAt: null, endsAt: { gt: new Date() } }
+    : {};
 
   const [notifications, total] = await Promise.all([
     prisma.platformNotification.findMany({
@@ -98,6 +100,9 @@ export async function getAdminNotificationsList({
         title: n.title,
         surface: n.surface,
         scope: n.scope,
+        userId: n.userId,
+        organizationId: n.organizationId,
+        projectId: n.projectId,
         priority: n.priority,
         startsAt: n.startsAt,
         endsAt: n.endsAt,
@@ -109,6 +114,8 @@ export async function getAdminNotificationsList({
         payloadDescription: parsed.success ? parsed.data.data.description : null,
         payloadActionUrl: parsed.success ? parsed.data.data.actionUrl : null,
         payloadImage: parsed.success ? parsed.data.data.image : null,
+        payloadDismissOnAction: parsed.success ? (parsed.data.data.dismissOnAction ?? false) : false,
+        payloadDiscovery: parsed.success ? (parsed.data.data.discovery ?? null) : null,
         cliMaxShowCount: n.cliMaxShowCount,
         cliMaxDaysAfterFirstSeen: n.cliMaxDaysAfterFirstSeen,
         cliShowEvery: n.cliShowEvery,
@@ -280,16 +287,66 @@ export async function recordNotificationClicked({
   });
 }
 
+// --- Membership verification ---
+
+export async function verifyOrgMembership({
+  userId,
+  organizationId,
+  projectId,
+}: {
+  userId: string;
+  organizationId?: string;
+  projectId?: string;
+}): Promise<{ organizationId?: string; projectId?: string }> {
+  if (!organizationId) return {};
+
+  const membership = await prisma.orgMember.findFirst({
+    where: { userId, organizationId },
+    select: { organizationId: true },
+  });
+
+  if (!membership) return {};
+
+  if (projectId) {
+    const project = await prisma.project.findFirst({
+      where: { id: projectId, organizationId, deletedAt: null },
+      select: { id: true },
+    });
+    if (!project) return { organizationId };
+  }
+
+  return { organizationId, projectId };
+}
+
 // --- Read: recent changelogs (for Help & Feedback) ---
 
-export async function getRecentChangelogs({ limit = 2 }: { limit?: number } = {}) {
-  // NOTE: Intentionally not filtering by archivedAt, startsAt, or endsAt.
+export async function getRecentChangelogs({
+  userId,
+  organizationId,
+  projectId,
+  limit = 2,
+}: {
+  userId: string;
+  organizationId?: string;
+  projectId?: string;
+  limit?: number;
+}) {
+  // NOTE: Intentionally not filtering by archivedAt or endsAt.
   // We want to show archived and expired changelogs in the "What's new" section
   // so users can still find recent release notes.
+  // We DO filter by scope (to prevent user-scoped changelogs leaking to others)
+  // and by startsAt (to hide changelogs scheduled for the future).
   const notifications = await prisma.platformNotification.findMany({
     where: {
       surface: "WEBAPP",
       payload: { path: ["data", "type"], equals: "changelog" },
+      startsAt: { lte: new Date() },
+      OR: [
+        { scope: "GLOBAL" },
+        { scope: "USER", userId },
+        ...(organizationId ? [{ scope: "ORGANIZATION" as const, organizationId }] : []),
+        ...(projectId ? [{ scope: "PROJECT" as const, projectId }] : []),
+      ],
     },
     orderBy: [{ createdAt: "desc" }],
     take: limit,
@@ -497,28 +554,32 @@ const SCOPE_REQUIRED_FK: Record<string, "userId" | "organizationId" | "projectId
 const ALL_FK_FIELDS = ["userId", "organizationId", "projectId"] as const;
 const CLI_ONLY_FIELDS = ["cliMaxDaysAfterFirstSeen", "cliMaxShowCount", "cliShowEvery"] as const;
 
+const NotificationBaseFields = {
+  title: z.string().min(1),
+  payload: PayloadV1Schema,
+  surface: z.enum(["WEBAPP", "CLI"]),
+  scope: z.enum(["USER", "PROJECT", "ORGANIZATION", "GLOBAL"]),
+  userId: z.string().optional(),
+  organizationId: z.string().optional(),
+  projectId: z.string().optional(),
+  endsAt: z
+    .string()
+    .datetime()
+    .transform((s) => new Date(s)),
+  priority: z.number().int().default(0),
+  cliMaxDaysAfterFirstSeen: z.number().int().positive().optional(),
+  cliMaxShowCount: z.number().int().positive().optional(),
+  cliShowEvery: z.number().int().min(2).optional(),
+};
+
 export const CreatePlatformNotificationSchema = z
   .object({
-    title: z.string().min(1),
-    payload: PayloadV1Schema,
-    surface: z.enum(["WEBAPP", "CLI"]),
-    scope: z.enum(["USER", "PROJECT", "ORGANIZATION", "GLOBAL"]),
-    userId: z.string().optional(),
-    organizationId: z.string().optional(),
-    projectId: z.string().optional(),
+    ...NotificationBaseFields,
     startsAt: z
       .string()
       .datetime()
       .transform((s) => new Date(s))
       .optional(),
-    endsAt: z
-      .string()
-      .datetime()
-      .transform((s) => new Date(s)),
-    priority: z.number().int().default(0),
-    cliMaxDaysAfterFirstSeen: z.number().int().positive().optional(),
-    cliMaxShowCount: z.number().int().positive().optional(),
-    cliShowEvery: z.number().int().min(2).optional(),
   })
   .superRefine((data, ctx) => {
     validateScopeForeignKeys(data, ctx);
@@ -619,6 +680,25 @@ function validateEndsAt(data: { startsAt?: Date; endsAt: Date }, ctx: z.Refineme
 
 export type CreatePlatformNotificationInput = z.input<typeof CreatePlatformNotificationSchema>;
 
+// --- Update: admin endpoint support ---
+
+export const UpdatePlatformNotificationSchema = z
+  .object({
+    ...NotificationBaseFields,
+    id: z.string().min(1),
+    startsAt: z
+      .string()
+      .datetime()
+      .transform((s) => new Date(s)),
+  })
+  .superRefine((data, ctx) => {
+    validateScopeForeignKeys(data, ctx);
+    validateSurfaceFields(data, ctx);
+    validatePayloadTypeForSurface(data, ctx);
+    // NOTE: No validateStartsAt — existing notifications may have past startsAt
+    validateEndsAt(data, ctx);
+  });
+
 type CreateError =
   | { type: "validation"; issues: z.ZodIssue[] }
   | { type: "db"; message: string };
@@ -659,3 +739,59 @@ export function createPlatformNotification(
     })
   );
 }
+
+export function updatePlatformNotification(
+  input: z.input<typeof UpdatePlatformNotificationSchema>
+): ResultAsync<{ id: string; friendlyId: string }, CreateError> {
+  const parseResult = UpdatePlatformNotificationSchema.safeParse(input);
+
+  if (!parseResult.success) {
+    return errAsync({ type: "validation", issues: parseResult.error.issues });
+  }
+
+  const data = parseResult.data;
+
+  return fromPromise(
+    prisma.platformNotification.update({
+      where: { id: data.id },
+      data: {
+        title: data.title,
+        payload: data.payload,
+        surface: data.surface as PlatformNotificationSurface,
+        scope: data.scope as PlatformNotificationScope,
+        userId: data.scope === "USER" ? data.userId : null,
+        organizationId: data.scope === "ORGANIZATION" ? data.organizationId : null,
+        projectId: data.scope === "PROJECT" ? data.projectId : null,
+        startsAt: data.startsAt,
+        endsAt: data.endsAt,
+        priority: data.priority,
+        cliMaxDaysAfterFirstSeen: data.surface === "CLI" ? (data.cliMaxDaysAfterFirstSeen ?? null) : null,
+        cliMaxShowCount: data.surface === "CLI" ? (data.cliMaxShowCount ?? null) : null,
+        cliShowEvery: data.surface === "CLI" ? (data.cliShowEvery ?? null) : null,
+      },
+      select: { id: true, friendlyId: true },
+    }),
+    (e): CreateError => ({
+      type: "db",
+      message: e instanceof Error ? e.message : String(e),
+    })
+  );
+}
+
+export async function deletePlatformNotification(id: string): Promise<void> {
+  await prisma.platformNotification.delete({ where: { id } });
+}
+
+export async function publishNowPlatformNotification(id: string): Promise<void> {
+  await prisma.platformNotification.update({
+    where: { id },
+    data: { startsAt: new Date() },
+  });
+}
+
+export async function archivePlatformNotification(id: string): Promise<void> {
+  await prisma.platformNotification.update({
+    where: { id },
+    data: { archivedAt: new Date() },
+  });
+}