From e41db56f16bcd97af667100b71254ec2f0af7ec5 Mon Sep 17 00:00:00 2001
From: The Doom Lab <buchananlab@gmail.com>
Date: Wed, 20 Aug 2025 15:50:27 -0500
Subject: [PATCH 1/8] fix PMs should see notes

---
 src/notes/schemas.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/notes/schemas.ts b/src/notes/schemas.ts
index 59dab6cc..f4552120 100644
--- a/src/notes/schemas.ts
+++ b/src/notes/schemas.ts
@@ -1,13 +1,14 @@
 import { z } from "zod"
+import { NoteVisibility } from "@prisma/client"
 
-export const NoteVisibilityEnum = z.enum(["PRIVATE", "SHARED"])
+export const NoteVisibilityEnum = z.nativeEnum(NoteVisibility)
 
 export const CreateNoteInput = z.object({
   projectId: z.number().int().positive(),
   title: z.string().max(200).optional(),
   contentMarkdown: z.string().optional(),
   contentJSON: z.any().optional(),
-  visibility: NoteVisibilityEnum.default("PRIVATE"),
+  visibility: NoteVisibilityEnum.default(NoteVisibility.PRIVATE),
   pinned: z.boolean().optional(),
 })
 

From 2c473e56017ea4d53834e8277a0dd7e5403992b6 Mon Sep 17 00:00:00 2001
From: The Doom Lab <buchananlab@gmail.com>
Date: Wed, 20 Aug 2025 16:26:50 -0500
Subject: [PATCH 2/8] update and fix note sharing

---
 src/notes/mutations/createNote.ts | 7 ++++++-
 src/notes/mutations/updateNote.ts | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/notes/mutations/createNote.ts b/src/notes/mutations/createNote.ts
index 128229a0..2c9d9a35 100644
--- a/src/notes/mutations/createNote.ts
+++ b/src/notes/mutations/createNote.ts
@@ -2,9 +2,14 @@ import db from "db"
 import { resolver } from "@blitzjs/rpc"
 import { CreateNoteInput } from "src/notes/schemas"
 import { NoteVisibility, MemberPrivileges } from "@prisma/client"
+import { z } from "zod"
 
 export default resolver.pipe(
-  resolver.zod(CreateNoteInput),
+  resolver.zod(
+    CreateNoteInput.extend({
+      visibility: z.nativeEnum(NoteVisibility).optional(),
+    })
+  ),
   resolver.authorize(),
   async ({ projectId, ...data }, ctx) => {
     const userId = ctx.session.userId!
diff --git a/src/notes/mutations/updateNote.ts b/src/notes/mutations/updateNote.ts
index 044ac2fc..32f0b9d8 100644
--- a/src/notes/mutations/updateNote.ts
+++ b/src/notes/mutations/updateNote.ts
@@ -2,9 +2,14 @@ import db from "db"
 import { resolver } from "@blitzjs/rpc"
 import { UpdateNoteInput } from "src/notes/schemas"
 import { NoteVisibility, MemberPrivileges } from "@prisma/client"
+import { z } from "zod"
 
 export default resolver.pipe(
-  resolver.zod(UpdateNoteInput),
+  resolver.zod(
+    UpdateNoteInput.extend({
+      visibility: z.nativeEnum(NoteVisibility).optional(),
+    })
+  ),
   resolver.authorize(),
   async ({ id, ...data }, ctx) => {
     const userId = ctx.session.userId!

From 9a62769925fcece482c297c2b723513497a966a8 Mon Sep 17 00:00:00 2001
From: The Doom Lab <buchananlab@gmail.com>
Date: Wed, 20 Aug 2025 16:38:59 -0500
Subject: [PATCH 3/8] fix type errors

---
 src/notes/mutations/createNote.ts | 2 +-
 src/notes/mutations/updateNote.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/notes/mutations/createNote.ts b/src/notes/mutations/createNote.ts
index 2c9d9a35..19df70ab 100644
--- a/src/notes/mutations/createNote.ts
+++ b/src/notes/mutations/createNote.ts
@@ -7,7 +7,7 @@ import { z } from "zod"
 export default resolver.pipe(
   resolver.zod(
     CreateNoteInput.extend({
-      visibility: z.nativeEnum(NoteVisibility).optional(),
+      visibility: z.union([z.nativeEnum(NoteVisibility), z.literal("SHARED")]).optional(),
     })
   ),
   resolver.authorize(),
diff --git a/src/notes/mutations/updateNote.ts b/src/notes/mutations/updateNote.ts
index 32f0b9d8..59db8eab 100644
--- a/src/notes/mutations/updateNote.ts
+++ b/src/notes/mutations/updateNote.ts
@@ -7,7 +7,7 @@ import { z } from "zod"
 export default resolver.pipe(
   resolver.zod(
     UpdateNoteInput.extend({
-      visibility: z.nativeEnum(NoteVisibility).optional(),
+      visibility: z.union([z.nativeEnum(NoteVisibility), z.literal("SHARED")]).optional(),
     })
   ),
   resolver.authorize(),

From 5e5e1cb53a92550c304bf5d6afc9cdc4f89a1b72 Mon Sep 17 00:00:00 2001
From: The Doom Lab <buchananlab@gmail.com>
Date: Thu, 21 Aug 2025 13:08:45 -0500
Subject: [PATCH 4/8] update main dashboard comment issues

---
 src/projects/queries/getDashboardProjects.ts  | 148 ++++++++++--------
 src/widgets/components/ColumnHelpers.tsx      |  22 ++-
 .../components/widgets/MainNotification.tsx   |   4 +-
 .../components/widgets/MainTotalTask.tsx      |   2 +-
 4 files changed, 105 insertions(+), 71 deletions(-)

diff --git a/src/projects/queries/getDashboardProjects.ts b/src/projects/queries/getDashboardProjects.ts
index 8762964f..1df8aadd 100644
--- a/src/projects/queries/getDashboardProjects.ts
+++ b/src/projects/queries/getDashboardProjects.ts
@@ -1,75 +1,91 @@
-import { ProjectWithNewCommentsCount } from "src/core/types"
 import { Ctx } from "blitz"
 import { resolver } from "@blitzjs/rpc"
-import getProjects from "./getProjects"
+import db from "db"
 
-export default resolver.pipe(resolver.authorize(), async (undefined, ctx: Ctx) => {
-  const { projects } = await getProjects(
-    {
-      where: {
-        projectMembers: {
-          some: {
-            users: {
-              some: { id: ctx.session.userId as number },
-            },
-            deleted: false,
-          },
-        },
-      },
-      orderBy: { updatedAt: "asc" },
-      take: 3,
-      include: {
-        tasks: {
-          where: {
-            taskLogs: {
-              some: {
-                assignedTo: {
-                  id: ctx.session.userId as number,
-                },
-              },
-            },
-          },
-          include: {
-            taskLogs: {
-              include: {
-                comments: {
-                  include: {
-                    commentReadStatus: {
-                      where: {
-                        read: false,
-                      },
-                    },
-                  },
-                },
-              },
-            },
-          },
-        },
+// Return shape for the dashboard widget
+type ProjectDashboardItem = {
+  id: number
+  name: string
+  updatedAt: Date | null
+  newCommentsCount: number
+}
+
+export default resolver.pipe(resolver.authorize(), async (_: unknown, ctx: Ctx) => {
+  const userId = ctx.session.userId as number
+
+  // 1) Projects for user + their projectMemberId per project (minimal select)
+  const projects = await db.project.findMany({
+    where: {
+      projectMembers: { some: { users: { some: { id: userId } }, deleted: false } },
+    },
+    select: {
+      id: true,
+      name: true,
+      createdAt: true,
+      projectMembers: {
+        where: { users: { some: { id: userId } } },
+        select: { id: true },
+        take: 1,
       },
     },
-    ctx
-  )
+  })
+
+  if (projects.length === 0) {
+    return { projects: [] as ProjectDashboardItem[] }
+  }
 
-  return {
-    projects: projects.map((project: ProjectWithNewCommentsCount) => {
-      const newCommentsCount = project.tasks.reduce((acc, task) => {
-        return (
-          acc +
-          task.taskLogs.reduce((logAcc, log) => {
-            return (
-              logAcc +
-              log.comments.reduce((commentAcc, comment) => {
-                return commentAcc + (comment.commentReadStatus?.length || 0)
-              }, 0)
-            )
-          }, 0)
-        )
-      }, 0)
+  const projectIds = projects.map((p) => p.id)
 
-      return {
-        ...project,
-        newCommentsCount,
-      }
-    }),
+  // 2) Fetch recent TaskLogs for these projects and reduce to latest per project
+  //    (order and cap to avoid scanning excessive rows in huge workspaces)
+  const recentLogs = await db.taskLog.findMany({
+    where: { task: { projectId: { in: projectIds } } },
+    select: { createdAt: true, task: { select: { projectId: true } } },
+    orderBy: { createdAt: "desc" },
+    take: 2000,
+  })
+
+  const latestByProject = new Map<number, Date>()
+  for (const l of recentLogs) {
+    const pid = l.task.projectId
+    if (!latestByProject.has(pid)) latestByProject.set(pid, l.createdAt)
+  }
+
+  // If a project has no TaskLogs in the recentLogs window, there would be no latestByProject entry.
+  // Fallback to the project's own createdAt so lastUpdate is never null.
+  const decorated = projects.map((p: any) => ({
+    id: p.id,
+    name: p.name,
+    myProjectMemberId: p.projectMembers[0]?.id as number | undefined,
+    lastUpdate: (latestByProject.get(p.id) ?? p.createdAt) as Date,
+  }))
+
+  const top3 = decorated
+    .sort((a, b) => (b.lastUpdate?.getTime() ?? 0) - (a.lastUpdate?.getTime() ?? 0))
+    .slice(0, 3)
+
+  // 4) For each project, compute unread = total comments in project - read:false for this pmId
+  const results: ProjectDashboardItem[] = []
+  for (const p of top3) {
+    const pmId = p.myProjectMemberId
+    let unread = 0
+    if (pmId) {
+      unread = await db.commentReadStatus.count({
+        where: {
+          projectMemberId: pmId,
+          read: false,
+          comment: { taskLog: { task: { projectId: p.id } } },
+        },
+      })
+    }
+
+    results.push({
+      id: p.id,
+      name: p.name,
+      updatedAt: p.lastUpdate,
+      newCommentsCount: unread,
+    })
   }
+
+  return { projects: results }
 })
diff --git a/src/widgets/components/ColumnHelpers.tsx b/src/widgets/components/ColumnHelpers.tsx
index 5b233f30..2864fb9e 100644
--- a/src/widgets/components/ColumnHelpers.tsx
+++ b/src/widgets/components/ColumnHelpers.tsx
@@ -1,11 +1,16 @@
 import { Routes } from "@blitzjs/next"
-import { ChatBubbleOvalLeftEllipsisIcon, MagnifyingGlassIcon } from "@heroicons/react/24/outline"
+import {
+  ChatBubbleOvalLeftEllipsisIcon,
+  MagnifyingGlassIcon,
+  InformationCircleIcon,
+} from "@heroicons/react/24/outline"
 import { Prisma, Notification, Task, TaskLog } from "@prisma/client"
 import { ColumnDef, createColumnHelper } from "@tanstack/react-table"
 import NotificationMessage from "src/notifications/components/NotificationMessage"
 import Link from "next/link"
 import DateFormat from "src/core/components/DateFormat"
 import { ProjectWithNewCommentsCount } from "src/core/types"
+import { Tooltip } from "react-tooltip"
 
 // Tasks table
 type TaskWithProject = Prisma.TaskGetPayload<{
@@ -78,7 +83,20 @@ export const projectColumns: ColumnDef<ProjectWithNewCommentsCount>[] = [
   }),
   projectColumnHelper.accessor("newCommentsCount", {
     id: "newComments",
-    header: "Comments",
+    header: () => (
+      <div className="table-header-tooltip">
+        <span>Comments</span>
+        <InformationCircleIcon
+          className="h-5 w-5 ml-2 text-info stroke-2"
+          data-tooltip-id="project-comments-tip"
+        />
+        <Tooltip
+          id="project-comments-tip"
+          content="Unread messages for the project. Project managers see all messages, not just their tasks."
+          className="z-[1099] ourtooltips"
+        />
+      </div>
+    ),
     enableColumnFilter: false,
     enableSorting: false,
     cell: (info) => (
diff --git a/src/widgets/components/widgets/MainNotification.tsx b/src/widgets/components/widgets/MainNotification.tsx
index f55a62fb..fab608a4 100644
--- a/src/widgets/components/widgets/MainNotification.tsx
+++ b/src/widgets/components/widgets/MainNotification.tsx
@@ -19,7 +19,7 @@ const MainNotification: React.FC<{ size: "SMALL" | "MEDIUM" | "LARGE" }> = ({ si
     <Widget
       title="Notifications"
       display={
-        <div className="flex justify-around gap-4">
+        <div className="flex justify-around gap-6 mt-4">
           {["Task", "Comment", "Project", "Other"].map((type) => (
             <div key={type} className="flex flex-col items-center relative">
               <Link href={Routes.NotificationsPage()} className="relative h-20 w-20 text-primary">
@@ -46,7 +46,7 @@ const MainNotification: React.FC<{ size: "SMALL" | "MEDIUM" | "LARGE" }> = ({ si
         />
       }
       tooltipId="tool-notifications"
-      tooltipContent="Number of notifications all projects"
+      tooltipContent="Number of notifications all projects, clear them by marking them read."
       size={size}
     />
   )
diff --git a/src/widgets/components/widgets/MainTotalTask.tsx b/src/widgets/components/widgets/MainTotalTask.tsx
index f32838ad..24206ea6 100644
--- a/src/widgets/components/widgets/MainTotalTask.tsx
+++ b/src/widgets/components/widgets/MainTotalTask.tsx
@@ -86,7 +86,7 @@ const AllTaskTotal: React.FC<{ size: "SMALL" | "MEDIUM" | "LARGE" }> = ({ size }
         />
       }
       tooltipId="tool-tasks"
-      tooltipContent="Percent of tasks completed and new comments on tasks"
+      tooltipContent="Percent of tasks completed and new comments on only tasks assigned to you"
       size={size}
       newCommentsCount={newCommentsCount}
     />

From 004e79955de30246b83918883b5c8f5ff3200b13 Mon Sep 17 00:00:00 2001
From: The Doom Lab <buchananlab@gmail.com>
Date: Thu, 21 Aug 2025 14:06:37 -0500
Subject: [PATCH 5/8] fix task comments notifications

---
 src/tasks/components/TaskItems.tsx            |  2 +-
 src/tasks/hooks/useTaskBoardData.ts           | 23 +++++++++++++++++--
 src/tasks/queries/getTaskStats.ts             |  3 +++
 .../widgets/ProjectNotification.tsx           |  4 ++--
 4 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/src/tasks/components/TaskItems.tsx b/src/tasks/components/TaskItems.tsx
index 94ac2c31..13c6b7d4 100644
--- a/src/tasks/components/TaskItems.tsx
+++ b/src/tasks/components/TaskItems.tsx
@@ -58,7 +58,7 @@ const TaskItems = ({
             <div className="relative mr-2">
               <Link href={Routes.ShowTaskPage({ taskId: id, projectId })}>
                 <ChatBubbleOvalLeftEllipsisIcon
-                  className="w-7 h-7 stroke-2 bg-accent text-accent-content border-transparent rounded-2xl shadow-sm hover:opacity-50"
+                  className="w-7 h-7 stroke-2 text-accent-content border-transparent rounded-2xl shadow-sm hover:opacity-50"
                   aria-hidden="true"
                 />
               </Link>
diff --git a/src/tasks/hooks/useTaskBoardData.ts b/src/tasks/hooks/useTaskBoardData.ts
index 328c9e18..dbc4e76a 100644
--- a/src/tasks/hooks/useTaskBoardData.ts
+++ b/src/tasks/hooks/useTaskBoardData.ts
@@ -2,12 +2,15 @@ import { useQuery } from "@blitzjs/rpc"
 import { useEffect, useMemo, useState } from "react"
 import getColumns from "../queries/getColumns"
 import { KanbanBoard, Task, Status } from "db"
+import { useCurrentUser } from "src/users/hooks/useCurrentUser"
+import getProjectMember from "src/projectmembers/queries/getProjectMember"
 
 interface ColumnWithTasks extends KanbanBoard {
   tasks: (Task & {
     taskLogs: {
       comments: {
         commentReadStatus: {
+          projectMemberId: number
           read: boolean
         }[]
       }[]
@@ -33,6 +36,20 @@ export default function useTaskBoardData(projectId: number) {
   // Create state for storing the columns with the tasks
   const [containers, setContainers] = useState<DNDType[]>([])
 
+  const currentUser = useCurrentUser()
+  const [projectMember] = useQuery(getProjectMember, {
+    where: {
+      projectId: projectId!,
+      name: null, // name IS NULL
+      users: {
+        some: { id: currentUser!.id }, // must include the current user
+        every: { id: currentUser!.id }, // and include no one else
+      },
+    },
+  })
+
+  console.log(projectMember.id)
+
   // Get data
   const [columns, { refetch }]: [ColumnWithTasks[], any] = useQuery(getColumns, {
     orderBy: { containerOrder: "asc" },
@@ -72,14 +89,16 @@ export default function useTaskBoardData(projectId: number) {
               (log.comments?.reduce((commentTotal, comment) => {
                 return (
                   commentTotal +
-                  (comment.commentReadStatus?.filter((status) => !status.read).length ?? 0)
+                  (comment.commentReadStatus?.filter(
+                    (status) => !status.read && status.projectMemberId === projectMember.id
+                  ).length ?? 0)
                 )
               }, 0) ?? 0)
             )
           }, 0) ?? 0,
       })),
     }))
-  }, [columns])
+  }, [columns, projectMember])
 
   useEffect(() => {
     setContainers(transformedData)
diff --git a/src/tasks/queries/getTaskStats.ts b/src/tasks/queries/getTaskStats.ts
index 49bec13e..59ee8d6e 100644
--- a/src/tasks/queries/getTaskStats.ts
+++ b/src/tasks/queries/getTaskStats.ts
@@ -41,6 +41,9 @@ export default resolver.pipe(
         where: {
           projectMember: {
             projectId: projectId,
+            users: {
+              some: { id: userId as number },
+            },
           },
           read: false,
         },
diff --git a/src/widgets/components/widgets/ProjectNotification.tsx b/src/widgets/components/widgets/ProjectNotification.tsx
index 3d4b441f..532a9950 100644
--- a/src/widgets/components/widgets/ProjectNotification.tsx
+++ b/src/widgets/components/widgets/ProjectNotification.tsx
@@ -47,7 +47,7 @@ const ProjectNotification: React.FC<{ size: "SMALL" | "MEDIUM" | "LARGE" }> = ({
     <Widget
       title="Notifications"
       display={
-        <div className="flex justify-around gap-4">
+        <div className="flex justify-around gap-6 mt-4">
           {["Task", "Comment", "Project", "Other"].map((type) => (
             <div key={type} className="flex flex-col items-center relative">
               <Link
@@ -77,7 +77,7 @@ const ProjectNotification: React.FC<{ size: "SMALL" | "MEDIUM" | "LARGE" }> = ({
         />
       }
       tooltipId="tool-notification"
-      tooltipContent="Number of notifications for this project"
+      tooltipContent="Number of notifications for this project, clear them by marking them read."
       size={size}
     />
   )

From 7f4eb86a9d4bd69d9820ce8192ab6e1fa04a9b89 Mon Sep 17 00:00:00 2001
From: The Doom Lab <buchananlab@gmail.com>
Date: Thu, 21 Aug 2025 14:19:09 -0500
Subject: [PATCH 6/8] debug task comment notifications

---
 src/tasks/tables/processing/processAllTasks.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/tasks/tables/processing/processAllTasks.ts b/src/tasks/tables/processing/processAllTasks.ts
index e763ab14..65c56703 100644
--- a/src/tasks/tables/processing/processAllTasks.ts
+++ b/src/tasks/tables/processing/processAllTasks.ts
@@ -49,8 +49,9 @@ export function processAllTasks(
     const taskId = log.taskId
 
     log.comments?.forEach((comment) => {
-      const isUnread =
-        comment.commentReadStatus?.length === 0 || comment.commentReadStatus?.[0]?.read === false
+      // Count as unread only if there exists an explicit read-status row with read === false
+      // This avoids false positives when the include filtered out read:true rows or returned no rows
+      const isUnread = (comment.commentReadStatus ?? []).some((s) => s.read === false)
 
       if (isUnread) {
         if (!commentSummary[taskId]) {

From f8fe38ecad331d037eb1a98d9606de0c6b7ffdaa Mon Sep 17 00:00:00 2001
From: The Doom Lab <buchananlab@gmail.com>
Date: Sat, 23 Aug 2025 11:26:27 -0500
Subject: [PATCH 7/8] make invitations case insensitive

---
 src/invites/components/InvitesList.tsx |  2 +-
 src/invites/queries/getInvites.ts      | 24 +++++++++++++++++++++++-
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/invites/components/InvitesList.tsx b/src/invites/components/InvitesList.tsx
index 3d242a38..cba73a94 100644
--- a/src/invites/components/InvitesList.tsx
+++ b/src/invites/components/InvitesList.tsx
@@ -14,7 +14,7 @@ export const InvitesListView = ({ invites }) => {
 export const InvitesList = ({ currentUser }) => {
   // Get invitations
   const [invites] = useQuery(getInvites, {
-    where: { email: currentUser!.email },
+    where: { email: currentUser!.email.toLowerCase() },
     orderBy: { id: "asc" },
     include: { project: true },
   })
diff --git a/src/invites/queries/getInvites.ts b/src/invites/queries/getInvites.ts
index ed06afc9..caecc37d 100644
--- a/src/invites/queries/getInvites.ts
+++ b/src/invites/queries/getInvites.ts
@@ -7,8 +7,30 @@ interface GetInvitationInput
 export default resolver.pipe(
   resolver.authorize(),
   async ({ where, orderBy, include }: GetInvitationInput) => {
+    // Normalize email filter to be case-insensitive if present
+    const normalizedWhere: Prisma.InvitationWhereInput | undefined = where
+      ? { ...where }
+      : undefined
+
+    if (normalizedWhere && typeof (normalizedWhere as any).email === "string") {
+      ;(normalizedWhere as any).email = {
+        equals: (normalizedWhere as any).email,
+        mode: "insensitive",
+      }
+    } else if (
+      normalizedWhere &&
+      (normalizedWhere as any).email &&
+      typeof (normalizedWhere as any).email === "object" &&
+      typeof (normalizedWhere as any).email.equals === "string"
+    ) {
+      ;(normalizedWhere as any).email = {
+        ...(normalizedWhere as any).email,
+        mode: "insensitive",
+      }
+    }
+
     const invites = await db.invitation.findMany({
-      where,
+      where: normalizedWhere,
       orderBy,
       include,
     })

From 4795d40996bd161ee16a1d8bc47791f6480c24f0 Mon Sep 17 00:00:00 2001
From: The Doom Lab <buchananlab@gmail.com>
Date: Sat, 23 Aug 2025 11:26:35 -0500
Subject: [PATCH 8/8] fix view/delete issues with notes

---
 src/notes/components/NotesEditor.tsx | 29 ++++++++++++++++++++++------
 src/notes/components/NotesPanel.tsx  | 22 ++++++++++++++-------
 src/notes/queries/listNotes.ts       |  7 ++++++-
 3 files changed, 44 insertions(+), 14 deletions(-)

diff --git a/src/notes/components/NotesEditor.tsx b/src/notes/components/NotesEditor.tsx
index 3970b53e..5a33ab15 100644
--- a/src/notes/components/NotesEditor.tsx
+++ b/src/notes/components/NotesEditor.tsx
@@ -35,6 +35,14 @@ import { HeadingNode, QuoteNode } from "@lexical/rich-text"
 import { CodeNode } from "@lexical/code"
 import { LinkNode } from "@lexical/link"
 
+const normalizeVisibility = (
+  v: "PRIVATE" | "PM_ONLY" | "CONTRIBUTORS" | "SHARED" | undefined
+): "PRIVATE" | "PM_ONLY" | "CONTRIBUTORS" => {
+  if (v === "SHARED") return "CONTRIBUTORS"
+  if (v === "PRIVATE" || v === "PM_ONLY" || v === "CONTRIBUTORS") return v
+  return "PRIVATE"
+}
+
 function ResetFormatOnEnterPlugin() {
   const [editor] = useLexicalComposerContext()
   useEffect(() => {
@@ -198,16 +206,25 @@ export default function NoteEditor({
   const [lastSavedAt, setLastSavedAt] = useState<number | null>(null)
   const [title, setTitle] = useState<string>(initialTitle || "")
   const [visibility, setVisibility] = useState<"PRIVATE" | "PM_ONLY" | "CONTRIBUTORS">(
-    initialVisibility
+    normalizeVisibility(initialVisibility as any)
   )
   const didInitialChange = useRef(false)
 
+  useEffect(() => {
+    setVisibility(normalizeVisibility(initialVisibility as any))
+  }, [initialVisibility])
+
+  const effectiveReadOnly = useMemo(() => {
+    if (visibility === "CONTRIBUTORS" && canSetContributors) return false
+    return readOnly
+  }, [readOnly, visibility, canSetContributors])
+
   const initialConfig = useMemo(
     () => ({
       namespace: "staple-notes",
       nodes: [ListNode, ListItemNode, HeadingNode, QuoteNode, CodeNode, LinkNode],
       onError: (e: any) => console.error(e),
-      editable: !readOnly,
+      editable: !effectiveReadOnly,
       editorState: (editor: any) => {
         if (initialJSON) {
           editor.setEditorState(editor.parseEditorState(initialJSON))
@@ -220,7 +237,7 @@ export default function NoteEditor({
         }
       },
     }),
-    [initialJSON, initialMarkdown, readOnly]
+    [initialJSON, initialMarkdown, effectiveReadOnly]
   )
 
   const save = useCallback(
@@ -234,7 +251,7 @@ export default function NoteEditor({
       })
       contentJSON = editorState.toJSON()
 
-      const visibilityForMutation = (visibility === "CONTRIBUTORS" ? "SHARED" : visibility) as any
+      const visibilityForMutation = visibility as any
 
       if (!currentNoteId) {
         const created = await createNoteMutation({
@@ -287,7 +304,7 @@ export default function NoteEditor({
           onSaveAndClose={(state) => save(state, true)}
           isSaving={isSaving}
           lastSavedAt={lastSavedAt}
-          readOnly={readOnly}
+          readOnly={effectiveReadOnly}
           onClose={onClose}
           visibility={visibility}
           onVisibilityChange={setVisibility}
@@ -307,7 +324,7 @@ export default function NoteEditor({
           <MarkdownShortcutPlugin transformers={TRANSFORMERS} />
           <OnChangePlugin
             onChange={(state) => {
-              if (readOnly) return
+              if (effectiveReadOnly) return
               if (!didInitialChange.current) {
                 didInitialChange.current = true
                 return
diff --git a/src/notes/components/NotesPanel.tsx b/src/notes/components/NotesPanel.tsx
index f23b9621..de1409be 100644
--- a/src/notes/components/NotesPanel.tsx
+++ b/src/notes/components/NotesPanel.tsx
@@ -22,7 +22,12 @@ export const NotesPanel = ({ projectId }: { projectId: number }) => {
     ? [...notes].sort((a, b) => new Date(b.updatedAt).getTime() - new Date(a.updatedAt).getTime())
     : []
 
-  const canEdit = (n: any) => !!(n && (n as any).editable)
+  const canEditRow = (n: any) => {
+    if (!n) return false
+    const ownerEditable = !!n.editable
+    const pmOverride = !!n.canSetContributors && n.visibility === "CONTRIBUTORS"
+    return ownerEditable || pmOverride
+  }
 
   return (
     <div className="space-y-4">
@@ -76,7 +81,11 @@ export const NotesPanel = ({ projectId }: { projectId: number }) => {
               initialTitle={n.title ?? ""}
               initialMarkdown={n.contentMarkdown ?? ""}
               initialJSON={n.contentJSON}
+              initialVisibility={n.visibility}
               className="shadow"
+              readOnly={!canEditRow(n)}
+              canSetContributors={!!n.canSetContributors}
+              onClose={() => setEditingId(null)}
               onSaved={async () => {
                 setEditingId(null)
                 await refetch()
@@ -126,7 +135,7 @@ export const NotesPanel = ({ projectId }: { projectId: number }) => {
                   <div className="flex items-center gap-2">
                     <button
                       className={`btn ${n.pinned ? "btn-warning" : "btn-secondary"}`}
-                      disabled={!canEdit(n)}
+                      disabled={!canEditRow(n)}
                       onClick={async () => {
                         await updateNoteMutation({ id: n.id, pinned: !n.pinned })
                         await refetch()
@@ -137,7 +146,7 @@ export const NotesPanel = ({ projectId }: { projectId: number }) => {
                     {!n.archived && (
                       <button
                         className="btn btn-outline"
-                        disabled={!canEdit(n)}
+                        disabled={!canEditRow(n)}
                         onClick={async () => {
                           await updateNoteMutation({ id: n.id, archived: true })
                           await refetch()
@@ -149,7 +158,7 @@ export const NotesPanel = ({ projectId }: { projectId: number }) => {
                     {n.archived && (
                       <button
                         className="btn btn-outline"
-                        disabled={!canEdit(n)}
+                        disabled={!canEditRow(n)}
                         onClick={async () => {
                           await updateNoteMutation({ id: n.id, archived: false })
                           // Optimistically update local cache to reflect unarchive
@@ -164,17 +173,16 @@ export const NotesPanel = ({ projectId }: { projectId: number }) => {
                       </button>
                     )}
                     <button className="btn btn-primary" onClick={() => setEditingId(n.id)}>
-                      {canEdit(n) ? "Edit" : "View"}
+                      {canEditRow(n) ? "Edit" : "View"}
                     </button>
                     <button
                       className="btn btn-error"
+                      disabled={!canEditRow(n)}
                       onClick={async () => {
                         if (window.confirm("This note will be permanently deleted. Continue?")) {
                           await deleteNoteMutation({ id: n.id })
-                          // Close modal/editing state regardless of delete success
                           setEditingId(null)
                           setCreating(false)
-                          // Optimistically update local cache
                           await setQueryData((prev) =>
                             Array.isArray(prev) ? prev.filter((x) => x.id !== n.id) : []
                           )
diff --git a/src/notes/queries/listNotes.ts b/src/notes/queries/listNotes.ts
index 875e482f..3f84ca39 100644
--- a/src/notes/queries/listNotes.ts
+++ b/src/notes/queries/listNotes.ts
@@ -57,7 +57,12 @@ export default resolver.pipe(
 
     return notes.map((r) => ({
       ...r,
-      editable: r.authorId === member.id || (isPM && r.visibility === NoteVisibility.PM_ONLY),
+      canSetContributors: isPM,
+      editable:
+        r.authorId === member.id ||
+        (isPM &&
+          (r.visibility === NoteVisibility.PM_ONLY ||
+            r.visibility === NoteVisibility.CONTRIBUTORS)),
     }))
   }
 )