diff --git a/.release-please-manifest.json b/.release-please-manifest.json
index be0ab283b23..5bea498bfc6 100644
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "8.23.8"
+  ".": "8.24.0"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 22b448f0890..d0f2fcf6a13 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,25 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 This CHANGELOG follows conventions [outlined here](http://keepachangelog.com/).
 
+## [8.24.0](https://github.com/ParabolInc/parabol/compare/v8.23.8...v8.24.0) (2025-02-05)
+
+
+### Added
+
+* **Mattermost Plugin:** TipTap Editor for Task and Reflection ([#10796](https://github.com/ParabolInc/parabol/issues/10796)) ([9e4a14e](https://github.com/ParabolInc/parabol/commit/9e4a14e54726af7d156593128d9a682ad390a627))
+* release standups ai to all users  ([#10724](https://github.com/ParabolInc/parabol/issues/10724)) ([260daf3](https://github.com/ParabolInc/parabol/commit/260daf3141cf67809b03fe9a764bc06e6f3b0700))
+
+
+### Fixed
+
+* update the logic to match the definition of an active team with Data Sanctum ([#10790](https://github.com/ParabolInc/parabol/issues/10790)) ([9c1df05](https://github.com/ParabolInc/parabol/commit/9c1df054457e894cde5bbb24fc01dba3d27b2030))
+
+
+### Changed
+
+* add extra logging to gql executor timeouts ([#10795](https://github.com/ParabolInc/parabol/issues/10795)) ([7ff31b1](https://github.com/ParabolInc/parabol/commit/7ff31b156ba0ebb9c7308dea51a77c34ae7f748c))
+* Refactor tiptap events  ([#10800](https://github.com/ParabolInc/parabol/issues/10800)) ([4383430](https://github.com/ParabolInc/parabol/commit/4383430ac97238dfa9a58a5c042161908f370eff))
+
 ## [8.23.8](https://github.com/ParabolInc/parabol/compare/v8.23.7...v8.23.8) (2025-02-04)
 
 
diff --git a/package.json b/package.json
index 9ecf73b6c1b..434634975b7 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "8.23.8",
+  "version": "8.24.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
diff --git a/packages/chronos/package.json b/packages/chronos/package.json
index 3be84e9e240..71fb9481df4 100644
--- a/packages/chronos/package.json
+++ b/packages/chronos/package.json
@@ -1,6 +1,6 @@
 {
   "name": "chronos",
-  "version": "8.23.8",
+  "version": "8.24.0",
   "description": "A cron job scheduler",
   "author": "Matt Krick <matt.krick@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/chronos#readme",
@@ -25,6 +25,6 @@
   },
   "dependencies": {
     "cron": "^2.3.1",
-    "parabol-server": "8.23.8"
+    "parabol-server": "8.24.0"
   }
 }
diff --git a/packages/client/components/DiscussionThreadInput.tsx b/packages/client/components/DiscussionThreadInput.tsx
index ca256b78cad..d706ddd5d03 100644
--- a/packages/client/components/DiscussionThreadInput.tsx
+++ b/packages/client/components/DiscussionThreadInput.tsx
@@ -130,7 +130,7 @@ const DiscussionThreadInput = (props: Props) => {
     if (submitting || !editor || editor.isEmpty) return
     addComment(JSON.stringify(editor.getJSON()))
   })
-  const {editor, setLinkState, linkState} = useTipTapCommentEditor(initialContent, {
+  const {editor} = useTipTapCommentEditor(initialContent, {
     readOnly: !allowComments,
     atmosphere,
     teamId,
@@ -216,8 +216,6 @@ const DiscussionThreadInput = (props: Props) => {
         <TipTapEditor
           className='flex max-h-80 min-h-0 grow overflow-auto px-0 leading-4'
           editor={editor}
-          linkState={linkState}
-          setLinkState={setLinkState}
         />
         <SendCommentButton commentSubmitState={commentSubmitState} onSubmit={onSubmit} />
       </div>
diff --git a/packages/client/components/NullableTask/NullableTask.tsx b/packages/client/components/NullableTask/NullableTask.tsx
index c9218dd8e52..25b29945e57 100644
--- a/packages/client/components/NullableTask/NullableTask.tsx
+++ b/packages/client/components/NullableTask/NullableTask.tsx
@@ -57,7 +57,7 @@ const NullableTask = (props: Props) => {
   const atmosphere = useAtmosphere()
   const isArchived = isTaskArchived(tags)
   const readOnly = isTempId(taskId) || isArchived || !!isDraggingOver || isIntegration
-  const {editor, linkState, setLinkState} = useTipTapTaskEditor(content, {
+  const {editor} = useTipTapTaskEditor(content, {
     atmosphere,
     teamId,
     readOnly
@@ -70,8 +70,6 @@ const NullableTask = (props: Props) => {
       area={area}
       className={className}
       editor={editor}
-      linkState={linkState}
-      setLinkState={setLinkState}
       isDraggingOver={isDraggingOver}
       isAgenda={isAgenda}
       task={task}
diff --git a/packages/client/components/ParabolScopingSearchResultItem.tsx b/packages/client/components/ParabolScopingSearchResultItem.tsx
index 4ad2c0cabbd..00150584c27 100644
--- a/packages/client/components/ParabolScopingSearchResultItem.tsx
+++ b/packages/client/components/ParabolScopingSearchResultItem.tsx
@@ -70,7 +70,7 @@ const ParabolScopingSearchResultItem = (props: Props) => {
   const atmosphere = useAtmosphere()
   const {onCompleted, onError, submitMutation, submitting} = useMutationProps()
   const isEditingThisItem = !plaintextContent
-  const {editor, linkState, setLinkState} = useTipTapTaskEditor(content, {
+  const {editor} = useTipTapTaskEditor(content, {
     atmosphere,
     teamId,
     readOnly: !isEditingThisItem
@@ -140,12 +140,7 @@ const ParabolScopingSearchResultItem = (props: Props) => {
           addTaskChild('root')
         }}
       >
-        <TipTapEditor
-          editor={editor}
-          linkState={linkState}
-          setLinkState={setLinkState}
-          useLinkEditor={() => useTaskChild('editor-link-changer')}
-        />
+        <TipTapEditor editor={editor} useLinkEditor={() => useTaskChild('editor-link-changer')} />
       </Task>
     </Item>
   )
diff --git a/packages/client/components/PokerEstimateHeaderCardParabol.tsx b/packages/client/components/PokerEstimateHeaderCardParabol.tsx
index 5280d62c161..b9ea6b1f5c4 100644
--- a/packages/client/components/PokerEstimateHeaderCardParabol.tsx
+++ b/packages/client/components/PokerEstimateHeaderCardParabol.tsx
@@ -90,7 +90,7 @@ const PokerEstimateHeaderCardParabol = (props: Props) => {
     }
     UpdateTaskMutation(atmosphere, {updatedTask}, {})
   })
-  const {editor, linkState, setLinkState} = useTipTapTaskEditor(content, {
+  const {editor} = useTipTapTaskEditor(content, {
     atmosphere,
     teamId,
     onBlur
@@ -108,8 +108,6 @@ const PokerEstimateHeaderCardParabol = (props: Props) => {
           <EditorWrapper isExpanded={isExpanded}>
             <TipTapEditor
               editor={editor}
-              linkState={linkState}
-              setLinkState={setLinkState}
               useLinkEditor={() => useTaskChild('editor-link-changer')}
             />
           </EditorWrapper>
diff --git a/packages/client/components/ReflectionCard/ReflectionCard.tsx b/packages/client/components/ReflectionCard/ReflectionCard.tsx
index 6b4718a8e70..183cb5c9c3d 100644
--- a/packages/client/components/ReflectionCard/ReflectionCard.tsx
+++ b/packages/client/components/ReflectionCard/ReflectionCard.tsx
@@ -186,7 +186,7 @@ const ReflectionCard = (props: Props) => {
     phases,
     isSpotlightSource
   )
-  const {editor, linkState, setLinkState} = useTipTapReflectionEditor(content, {
+  const {editor} = useTipTapReflectionEditor(content, {
     atmosphere,
     teamId,
     readOnly: !!readOnly
@@ -332,8 +332,6 @@ const ReflectionCard = (props: Props) => {
             readOnly ? (phaseType === 'discuss' ? 'select-text' : 'select-none') : undefined
           )}
           editor={editor}
-          linkState={linkState}
-          setLinkState={setLinkState}
           onFocus={handleEditorFocus}
           onBlur={handleEditorBlur}
         />
diff --git a/packages/client/components/ReflectionGroup/RemoteReflection.tsx b/packages/client/components/ReflectionGroup/RemoteReflection.tsx
index b42083f5f15..f1d77bd0706 100644
--- a/packages/client/components/ReflectionGroup/RemoteReflection.tsx
+++ b/packages/client/components/ReflectionGroup/RemoteReflection.tsx
@@ -1,8 +1,8 @@
 import {keyframes} from '@emotion/core'
 import styled from '@emotion/styled'
+import {generateHTML} from '@tiptap/core'
 import graphql from 'babel-plugin-relay/macro'
-import * as React from 'react'
-import {RefObject, useEffect, useMemo, useRef} from 'react'
+import {RefObject, useEffect, useMemo, useRef, useState} from 'react'
 import {commitLocalUpdate, useFragment} from 'react-relay'
 import useSpotlightResults from '~/hooks/useSpotlightResults'
 import {RemoteReflection_meeting$key} from '../../__generated__/RemoteReflection_meeting.graphql'
@@ -11,17 +11,16 @@ import {
   RemoteReflection_reflection$key
 } from '../../__generated__/RemoteReflection_reflection.graphql'
 import useAtmosphere from '../../hooks/useAtmosphere'
-import {useTipTapReflectionEditor} from '../../hooks/useTipTapReflectionEditor'
+import {serverTipTapExtensions} from '../../shared/tiptap/serverTipTapExtensions'
 import {Elevation} from '../../styles/elevation'
 import {BezierCurve, DragAttribute, ElementWidth, Times, ZIndex} from '../../types/constEnums'
 import {DeepNonNullable} from '../../types/generics'
-import {cn} from '../../ui/cn'
 import {VOTE} from '../../utils/constants'
 import {getMinTop} from '../../utils/retroGroup/updateClonePosition'
-import {TipTapEditor} from '../promptResponse/TipTapEditor'
 import ReflectionCardAuthor from '../ReflectionCard/ReflectionCardAuthor'
 import ReflectionCardRoot from '../ReflectionCard/ReflectionCardRoot'
 import getBBox from '../RetroReflectPhase/getBBox'
+import HTMLReflection from '../RetroReflectPhase/HTMLReflection'
 import UserDraggingHeader, {RemoteReflectionArrow} from '../UserDraggingHeader'
 
 const circleAnimation = (transform?: string) => keyframes`
@@ -214,7 +213,7 @@ const RemoteReflection = (props: Props) => {
     RemoteReflection_reflection$data['remoteDrag']
   >
   const ref = useRef<HTMLDivElement>(null)
-  const {editor} = useTipTapReflectionEditor(content, {readOnly: true})
+  const [html] = useState(() => generateHTML(JSON.parse(content), serverTipTapExtensions))
   const timeoutRef = useRef(0)
   const atmosphere = useAtmosphere()
   const spotlightResultGroups = useSpotlightResults(meeting)
@@ -253,11 +252,22 @@ const RemoteReflection = (props: Props) => {
     }
   }, [remoteDrag, meetingMembers])
 
-  if (!remoteDrag || !editor) return null
+  if (!remoteDrag) return null
   const {dragUserId, dragUserName, isSpotlight} = remoteDrag
 
   const {nextStyle, transform, minTop} = getStyle(remoteDrag, isDropping, isSpotlight, style)
-  const {headerTransform, arrow} = getHeaderTransform(ref, minTop)
+  const [arrow, setArrow] = useState<RemoteReflectionArrow | undefined>('arrow_downward')
+  const [headerTransform, setHeaderTransform] = useState<string | undefined>(undefined)
+
+  useEffect(() => {
+    requestAnimationFrame(() => {
+      const nextVal = getHeaderTransform(ref, minTop)
+      if (nextVal.headerTransform !== headerTransform) {
+        setHeaderTransform(nextVal.headerTransform)
+        setArrow(nextVal.arrow)
+      }
+    })
+  }, [])
   return (
     <>
       <RemoteReflectionModal
@@ -271,10 +281,7 @@ const RemoteReflection = (props: Props) => {
       >
         <ReflectionCardRoot>
           {!headerTransform && <UserDraggingHeader userId={dragUserId} name={dragUserName} />}
-          <TipTapEditor
-            className={cn('flex min-h-0 items-center px-4 leading-4')}
-            editor={editor}
-          />
+          <HTMLReflection html={html} disableAnonymity={disableAnonymity} />
           {disableAnonymity && (
             <ReflectionCardAuthor>{creator?.preferredName}</ReflectionCardAuthor>
           )}
diff --git a/packages/client/components/ResponseReplied.tsx b/packages/client/components/ResponseReplied.tsx
index e44dbc63fa0..61964a8ebe2 100644
--- a/packages/client/components/ResponseReplied.tsx
+++ b/packages/client/components/ResponseReplied.tsx
@@ -46,7 +46,7 @@ const ResponseReplied = (props: Props) => {
     history.push(`/meet/${meetingId}/responses?responseId=${encodeURIComponent(response.id)}`)
   }
 
-  const {editor, setLinkState, linkState} = useTipTapCommentEditor(comment.content, {
+  const {editor} = useTipTapCommentEditor(comment.content, {
     readOnly: true
   })
   if (!editor) return null
@@ -59,7 +59,7 @@ const ResponseReplied = (props: Props) => {
       action={<NotificationAction label={'See the discussion'} onClick={goThere} />}
     >
       <div className='my-1 rounded-sm bg-white p-2 text-sm leading-5 shadow-card'>
-        <TipTapEditor editor={editor} setLinkState={setLinkState} linkState={linkState} />
+        <TipTapEditor editor={editor} />
       </div>
     </NotificationTemplate>
   )
diff --git a/packages/client/components/RetroReflectPhase/HTMLReflection.tsx b/packages/client/components/RetroReflectPhase/HTMLReflection.tsx
new file mode 100644
index 00000000000..078e18d98a0
--- /dev/null
+++ b/packages/client/components/RetroReflectPhase/HTMLReflection.tsx
@@ -0,0 +1,23 @@
+import {cn} from '../../ui/cn'
+
+interface Props {
+  html: string
+  disableAnonymity: boolean
+}
+
+export const HTMLReflection = (props: Props) => {
+  const {html, disableAnonymity} = props
+  return (
+    <div className={cn('relative w-full overflow-auto text-sm leading-4 text-slate-700')}>
+      <div
+        className={cn(
+          'ProseMirror flex max-h-28 min-h-4 w-full flex-col items-start justify-center px-4 pt-3 leading-none',
+          disableAnonymity ? 'pb-0' : 'pb-3'
+        )}
+        dangerouslySetInnerHTML={{__html: html}}
+      ></div>
+    </div>
+  )
+}
+
+export default HTMLReflection
diff --git a/packages/client/components/RetroReflectPhase/PhaseItemEditor.tsx b/packages/client/components/RetroReflectPhase/PhaseItemEditor.tsx
index 6ab44e95a98..d861b5d65bb 100644
--- a/packages/client/components/RetroReflectPhase/PhaseItemEditor.tsx
+++ b/packages/client/components/RetroReflectPhase/PhaseItemEditor.tsx
@@ -17,6 +17,7 @@ import {cn} from '../../ui/cn'
 import ReflectionCardAuthor from '../ReflectionCard/ReflectionCardAuthor'
 import ReflectionCardRoot from '../ReflectionCard/ReflectionCardRoot'
 import {TipTapEditor} from '../promptResponse/TipTapEditor'
+import HTMLReflection from './HTMLReflection'
 import {ReflectColumnCardInFlight} from './PhaseItemColumn'
 import getBBox from './getBBox'
 
@@ -125,7 +126,7 @@ const PhaseItemEditor = (props: Props) => {
       setTimeout(removeCardInFlight(content), FLIGHT_TIME)
     })
   })
-  const {editor, linkState, setLinkState} = useTipTapReflectionEditor(
+  const {editor} = useTipTapReflectionEditor(
     JSON.stringify({type: 'doc', content: [{type: 'paragraph'}]}),
     {
       atmosphere,
@@ -201,8 +202,6 @@ const PhaseItemEditor = (props: Props) => {
             disableAnonymity ? 'pb-0' : 'pb-3'
           )}
           editor={editor}
-          linkState={linkState}
-          setLinkState={setLinkState}
           onBlur={onBlur}
           onFocus={onFocus}
         />
@@ -221,17 +220,7 @@ const PhaseItemEditor = (props: Props) => {
                 isStart={card.isStart}
                 onTransitionEnd={removeCardInFlight(card.key)}
               >
-                <div
-                  className={cn('relative w-full overflow-auto text-sm leading-4 text-slate-700')}
-                >
-                  <div
-                    className={cn(
-                      'ProseMirror flex max-h-28 min-h-4 w-full flex-col items-start justify-center px-4 pt-3 leading-none',
-                      disableAnonymity ? 'pb-0' : 'pb-3'
-                    )}
-                    dangerouslySetInnerHTML={{__html: card.html}}
-                  ></div>
-                </div>
+                <HTMLReflection html={card.html} disableAnonymity={disableAnonymity} />
                 {disableAnonymity && (
                   <ReflectionCardAuthor>
                     {viewerMeetingMember?.user.preferredName}
diff --git a/packages/client/components/ThreadedCommentBase.tsx b/packages/client/components/ThreadedCommentBase.tsx
index f1c08a699ee..f1625e586e3 100644
--- a/packages/client/components/ThreadedCommentBase.tsx
+++ b/packages/client/components/ThreadedCommentBase.tsx
@@ -110,7 +110,7 @@ const ThreadedCommentBase = (props: Props) => {
     editor?.setEditable(false)
   })
 
-  const {editor, setLinkState, linkState} = useTipTapCommentEditor(content, {
+  const {editor} = useTipTapCommentEditor(content, {
     readOnly: true,
     atmosphere,
     teamId,
@@ -179,12 +179,7 @@ const ThreadedCommentBase = (props: Props) => {
         />
         {isActive && (
           <div className='pr-4'>
-            <TipTapEditor
-              editor={editor}
-              setLinkState={setLinkState}
-              linkState={linkState}
-              onBlur={onSubmit}
-            />
+            <TipTapEditor editor={editor} onBlur={onSubmit} />
           </div>
         )}
         {isActive && (
diff --git a/packages/client/components/promptResponse/BubbleMenuButton.tsx b/packages/client/components/promptResponse/BubbleMenuButton.tsx
index 9ad74aa8257..6e896eb30f4 100644
--- a/packages/client/components/promptResponse/BubbleMenuButton.tsx
+++ b/packages/client/components/promptResponse/BubbleMenuButton.tsx
@@ -11,7 +11,7 @@ export const BubbleMenuButton = (props: Props) => {
     <Button
       variant='flat'
       data-highlighted={isActive}
-      className='h-5 w-5 rounded-xs py-1 hover:bg-slate-300 data-highlighted:bg-slate-300'
+      className='h-7 w-7 rounded-xs hover:bg-slate-300 data-highlighted:bg-slate-300'
       {...rest}
     >
       {children}
diff --git a/packages/client/components/promptResponse/PromptResponseEditor.tsx b/packages/client/components/promptResponse/PromptResponseEditor.tsx
index ba2b58aa216..f445671e2b2 100644
--- a/packages/client/components/promptResponse/PromptResponseEditor.tsx
+++ b/packages/client/components/promptResponse/PromptResponseEditor.tsx
@@ -2,6 +2,7 @@ import styled from '@emotion/styled'
 import {Editor} from '@tiptap/core'
 import Mention from '@tiptap/extension-mention'
 import Placeholder from '@tiptap/extension-placeholder'
+import Underline from '@tiptap/extension-underline'
 import {JSONContent, useEditor} from '@tiptap/react'
 import StarterKit from '@tiptap/starter-kit'
 import {useCallback, useEffect, useMemo, useState} from 'react'
@@ -15,7 +16,6 @@ import BaseButton from '../BaseButton'
 import {LoomExtension, unfurlLoomLinks} from './loomExtension'
 import {TipTapEditor} from './TipTapEditor'
 import {TiptapLinkExtension} from './TiptapLinkExtension'
-import {LinkMenuState} from './TipTapLinkMenu'
 
 const SubmitButton = styled(BaseButton)<{disabled?: boolean}>(({disabled}) => ({
   backgroundColor: disabled ? PALETTE.SLATE_200 : PALETTE.SKY_500,
@@ -104,13 +104,12 @@ const PromptResponseEditor = (props: Props) => {
     }
   }
 
-  const [linkState, setLinkState] = useState<LinkMenuState>(null)
-
   const editor = useEditor(
     {
       content,
       extensions: [
         StarterKit,
+        Underline,
         LoomExtension,
         Placeholder.configure({
           showOnlyWhenEditable: false,
@@ -119,10 +118,7 @@ const PromptResponseEditor = (props: Props) => {
         Mention.configure(tiptapMentionConfig(atmosphere, teamId)),
         Mention.extend({name: 'emojiMention'}).configure(tiptapEmojiConfig),
         TiptapLinkExtension.configure({
-          openOnClick: false,
-          popover: {
-            setLinkState
-          }
+          openOnClick: false
         })
       ],
       autofocus: autoFocus,
@@ -153,12 +149,7 @@ const PromptResponseEditor = (props: Props) => {
   if (!editor) return null
   return (
     <>
-      <TipTapEditor
-        linkState={linkState}
-        setLinkState={setLinkState}
-        editor={editor}
-        showBubbleMenu={!readOnly}
-      />
+      <TipTapEditor editor={editor} showBubbleMenu={!readOnly} />
       {!readOnly && (
         // The render conditions for these buttons *should* only be true when 'readOnly' is false, but let's be explicit
         // about it.
diff --git a/packages/client/components/promptResponse/StandardBubbleMenu.tsx b/packages/client/components/promptResponse/StandardBubbleMenu.tsx
index b8e46e29c0a..1328f85ef6c 100644
--- a/packages/client/components/promptResponse/StandardBubbleMenu.tsx
+++ b/packages/client/components/promptResponse/StandardBubbleMenu.tsx
@@ -2,27 +2,24 @@ import {Link} from '@mui/icons-material'
 import {BubbleMenu, Editor} from '@tiptap/react'
 import {BubbleMenuButton} from './BubbleMenuButton'
 import isTextSelected from './isTextSelected'
-import {LinkMenuState} from './TipTapLinkMenu'
 
 interface Props extends React.ButtonHTMLAttributes<HTMLButtonElement> {
   editor: Editor
-  setLinkState: (linkState: LinkMenuState) => void
 }
 export const StandardBubbleMenu = (props: Props) => {
-  const {editor, setLinkState} = props
-
+  const {editor} = props
   const shouldShowBubbleMenu = () => {
     if (!editor || editor.isActive('link')) return false
     return isTextSelected(editor)
   }
 
   const openLinkEditor = () => {
-    setLinkState('edit')
+    editor.emit('linkStateChange', {editor, linkState: 'edit'})
   }
 
   return (
     <BubbleMenu editor={editor} tippyOptions={{duration: 100}} shouldShow={shouldShowBubbleMenu}>
-      <div className='flex items-center rounded-sm border-[1px] border-solid border-slate-600 bg-white p-1'>
+      <div className='flex items-center rounded-sm border-[1px] border-solid border-slate-600 bg-white p-[3px]'>
         <BubbleMenuButton
           onClick={() => editor.chain().focus().toggleBold().run()}
           isActive={editor.isActive('bold')}
@@ -35,6 +32,12 @@ export const StandardBubbleMenu = (props: Props) => {
         >
           <i>I</i>
         </BubbleMenuButton>
+        <BubbleMenuButton
+          onClick={() => editor.chain().focus().toggleUnderline().run()}
+          isActive={editor.isActive('underline')}
+        >
+          <u>U</u>
+        </BubbleMenuButton>
         <BubbleMenuButton
           onClick={() => editor.chain().focus().toggleStrike().run()}
           isActive={editor.isActive('strike')}
diff --git a/packages/client/components/promptResponse/TipTapEditor.tsx b/packages/client/components/promptResponse/TipTapEditor.tsx
index a094220c3c7..7736e0cfcdc 100644
--- a/packages/client/components/promptResponse/TipTapEditor.tsx
+++ b/packages/client/components/promptResponse/TipTapEditor.tsx
@@ -1,34 +1,19 @@
 import {Editor, EditorContent, type EditorContentProps} from '@tiptap/react'
 import {cn} from '../../ui/cn'
 import {StandardBubbleMenu} from './StandardBubbleMenu'
-import TipTapLinkMenu, {LinkMenuState} from './TipTapLinkMenu'
+import TipTapLinkMenu from './TipTapLinkMenu'
 
 interface Props extends EditorContentProps {
   editor: Editor
-  linkState?: LinkMenuState
-  setLinkState?: (linkState: LinkMenuState) => void
   showBubbleMenu?: boolean
   useLinkEditor?: () => void
 }
 export const TipTapEditor = (props: Props) => {
-  const {className, editor, linkState, setLinkState, showBubbleMenu, useLinkEditor, ref, ...rest} =
-    props
+  const {className, editor, showBubbleMenu, useLinkEditor, ref, ...rest} = props
   return (
     <>
-      {showBubbleMenu && setLinkState && (
-        <StandardBubbleMenu editor={editor} setLinkState={setLinkState} />
-      )}
-      {setLinkState && linkState && (
-        <TipTapLinkMenu
-          editor={editor}
-          setLinkState={(linkState: LinkMenuState) => {
-            editor.commands.focus()
-            setLinkState(linkState)
-          }}
-          linkState={linkState}
-          useLinkEditor={useLinkEditor}
-        />
-      )}
+      <StandardBubbleMenu editor={editor} />
+      <TipTapLinkMenu editor={editor} useLinkEditor={useLinkEditor} />
       <EditorContent
         ref={ref as any}
         {...rest}
diff --git a/packages/client/components/promptResponse/TipTapLinkMenu.tsx b/packages/client/components/promptResponse/TipTapLinkMenu.tsx
index 8f2f223ec86..0b532cb9b2c 100644
--- a/packages/client/components/promptResponse/TipTapLinkMenu.tsx
+++ b/packages/client/components/promptResponse/TipTapLinkMenu.tsx
@@ -1,6 +1,7 @@
 import * as Popover from '@radix-ui/react-popover'
+import type {EditorEvents} from '@tiptap/core'
 import {Editor, getMarkRange, getMarkType, getTextBetween, useEditorState} from '@tiptap/react'
-import {useCallback, useRef} from 'react'
+import {useCallback, useEffect, useRef, useState} from 'react'
 import {TipTapLinkEditor} from './TipTapLinkEditor'
 import {TipTapLinkPreview} from './TipTapLinkPreview'
 
@@ -21,12 +22,29 @@ const getRangeForType = (editor: Editor, typeOrName: string) => {
 export type LinkMenuState = 'preview' | 'edit' | null
 interface Props {
   editor: Editor
-  linkState: LinkMenuState
-  setLinkState: (linkState: LinkMenuState) => void
   useLinkEditor?: () => void
 }
 export const TipTapLinkMenu = (props: Props) => {
-  const {editor, linkState, setLinkState, useLinkEditor} = props
+  const {editor, useLinkEditor} = props
+  const [linkState, _setLinkState] = useState<LinkMenuState>(null)
+
+  const setLinkState: typeof _setLinkState = (linkState) => {
+    if (!linkState) {
+      // closing the menu by hitting Esc should refocus on the editor
+      editor.commands.focus()
+    }
+    _setLinkState(linkState)
+  }
+
+  useEffect(() => {
+    const updateState = (change: EditorEvents['linkStateChange']) => {
+      setLinkState(change.linkState)
+    }
+    editor.on('linkStateChange', updateState)
+    return () => {
+      editor.off('linkStateChange', updateState)
+    }
+  }, [])
 
   const {link, text} = useEditorState({
     editor,
diff --git a/packages/client/components/promptResponse/TiptapLinkExtension.ts b/packages/client/components/promptResponse/TiptapLinkExtension.ts
index e9f4b59bc3a..196f61c3e6f 100644
--- a/packages/client/components/promptResponse/TiptapLinkExtension.ts
+++ b/packages/client/components/promptResponse/TiptapLinkExtension.ts
@@ -1,21 +1,22 @@
-import {mergeAttributes} from '@tiptap/core'
-import BaseLink, {LinkOptions} from '@tiptap/extension-link'
+import {mergeAttributes, type Editor} from '@tiptap/core'
+import BaseLink from '@tiptap/extension-link'
 import {Plugin} from '@tiptap/pm/state'
 import {EditorView} from '@tiptap/pm/view'
 import {LinkMenuState} from './TipTapLinkMenu'
 
-interface ExtendedOptions extends LinkOptions {
-  popover: {
-    setLinkState: (linkState: LinkMenuState) => void
+declare module '@tiptap/core' {
+  interface EditorEvents {
+    linkStateChange: {editor: Editor; linkState: LinkMenuState}
   }
 }
-export const TiptapLinkExtension = BaseLink.extend<ExtendedOptions>({
+
+export const TiptapLinkExtension = BaseLink.extend({
   // if the caret is at the end of the link, it is not part of the link
   inclusive: false,
   addKeyboardShortcuts(this) {
     return {
       'Mod-k': () => {
-        this.options.popover.setLinkState('edit')
+        this.editor.emit('linkStateChange', {editor: this.editor, linkState: 'edit'})
         return true
       }
     }
@@ -29,7 +30,8 @@ export const TiptapLinkExtension = BaseLink.extend<ExtendedOptions>({
   },
   onSelectionUpdate() {
     const href = this.editor.getAttributes('link').href
-    this.options.popover.setLinkState(href ? 'preview' : null)
+    const linkState = href ? 'preview' : null
+    this.editor.emit('linkStateChange', {editor: this.editor, linkState})
   },
   addProseMirrorPlugins() {
     const {editor} = this
diff --git a/packages/client/hooks/useTipTapCommentEditor.ts b/packages/client/hooks/useTipTapCommentEditor.ts
index b193ae8f132..d317713c6a7 100644
--- a/packages/client/hooks/useTipTapCommentEditor.ts
+++ b/packages/client/hooks/useTipTapCommentEditor.ts
@@ -1,12 +1,12 @@
 import Mention from '@tiptap/extension-mention'
 import Placeholder from '@tiptap/extension-placeholder'
+import Underline from '@tiptap/extension-underline'
 import {Extension, useEditor} from '@tiptap/react'
 import StarterKit from '@tiptap/starter-kit'
-import {useRef, useState} from 'react'
+import {useRef} from 'react'
 import Atmosphere from '../Atmosphere'
 import {LoomExtension} from '../components/promptResponse/loomExtension'
 import {TiptapLinkExtension} from '../components/promptResponse/TiptapLinkExtension'
-import {LinkMenuState} from '../components/promptResponse/TipTapLinkMenu'
 import {mentionConfig} from '../shared/tiptap/serverTipTapExtensions'
 import {tiptapEmojiConfig} from '../utils/tiptapEmojiConfig'
 import {tiptapMentionConfig} from '../utils/tiptapMentionConfig'
@@ -30,7 +30,6 @@ export const useTipTapCommentEditor = (
 ) => {
   const {atmosphere, teamId, readOnly, placeholder, onEnter, onEscape} = options
   const [contentJSON, editorRef] = useTipTapEditorContent(content)
-  const [linkState, setLinkState] = useState<LinkMenuState>(null)
   const placeholderRef = useRef(placeholder)
   // Keeping it in a ref means we don't have to re-initialize the editor, so content is preserved
   placeholderRef.current = placeholder
@@ -39,6 +38,7 @@ export const useTipTapCommentEditor = (
       content: contentJSON,
       extensions: [
         StarterKit,
+        Underline,
         LoomExtension,
         Placeholder.configure({
           showOnlyWhenEditable: false,
@@ -52,10 +52,7 @@ export const useTipTapCommentEditor = (
         ),
         Mention.extend({name: 'emojiMention'}).configure(tiptapEmojiConfig),
         TiptapLinkExtension.configure({
-          openOnClick: false,
-          popover: {
-            setLinkState
-          }
+          openOnClick: false
         }),
         onEnter &&
           onEscape &&
@@ -80,5 +77,5 @@ export const useTipTapCommentEditor = (
     },
     [readOnly]
   )
-  return {editor: editorRef.current, linkState, setLinkState}
+  return {editor: editorRef.current}
 }
diff --git a/packages/client/hooks/useTipTapIcebreakerEditor.ts b/packages/client/hooks/useTipTapIcebreakerEditor.ts
index 1dc6597f558..0f59fe6b903 100644
--- a/packages/client/hooks/useTipTapIcebreakerEditor.ts
+++ b/packages/client/hooks/useTipTapIcebreakerEditor.ts
@@ -1,5 +1,6 @@
 import Mention from '@tiptap/extension-mention'
 import Placeholder from '@tiptap/extension-placeholder'
+import Underline from '@tiptap/extension-underline'
 import {generateText, useEditor} from '@tiptap/react'
 import StarterKit from '@tiptap/starter-kit'
 import {serverTipTapExtensions} from '../shared/tiptap/serverTipTapExtensions'
@@ -15,6 +16,7 @@ export const useTipTapIcebreakerEditor = (content: string, options: {readOnly?:
       content: contentJSON,
       extensions: [
         StarterKit,
+        Underline,
         Placeholder.configure({
           showOnlyWhenEditable: false,
           placeholder: 'e.g. How are you?'
diff --git a/packages/client/hooks/useTipTapReflectionEditor.ts b/packages/client/hooks/useTipTapReflectionEditor.ts
index 7a644485328..dee34ab2c6c 100644
--- a/packages/client/hooks/useTipTapReflectionEditor.ts
+++ b/packages/client/hooks/useTipTapReflectionEditor.ts
@@ -5,13 +5,13 @@ import Mention from '@tiptap/extension-mention'
 import Placeholder from '@tiptap/extension-placeholder'
 import {TaskItem} from '@tiptap/extension-task-item'
 import {TaskList} from '@tiptap/extension-task-list'
+import Underline from '@tiptap/extension-underline'
 import {Extension, generateText, useEditor, type Editor} from '@tiptap/react'
 import StarterKit from '@tiptap/starter-kit'
 import {useEffect, useRef, useState} from 'react'
 import Atmosphere from '../Atmosphere'
 import {LoomExtension} from '../components/promptResponse/loomExtension'
 import {TiptapLinkExtension} from '../components/promptResponse/TiptapLinkExtension'
-import {LinkMenuState} from '../components/promptResponse/TipTapLinkMenu'
 import {isEqualWhenSerialized} from '../shared/isEqualWhenSerialized'
 import {mentionConfig, serverTipTapExtensions} from '../shared/tiptap/serverTipTapExtensions'
 import ImageBlock from '../tiptap/extensions/imageBlock/ImageBlock'
@@ -51,7 +51,6 @@ export const useTipTapReflectionEditor = (
   }
 ) => {
   const {atmosphere, teamId, readOnly, placeholder, onEnter} = options
-  const [linkState, setLinkState] = useState<LinkMenuState>(null)
   const [contentJSON] = useState(() => JSON.parse(content))
   const placeholderRef = useRef(placeholder)
   placeholderRef.current = placeholder
@@ -60,6 +59,7 @@ export const useTipTapReflectionEditor = (
       content: contentJSON,
       extensions: [
         StarterKit,
+        Underline,
         TaskList,
         TaskItem.configure({
           nested: true
@@ -87,10 +87,7 @@ export const useTipTapReflectionEditor = (
         ),
         Mention.extend({name: 'emojiMention'}).configure(tiptapEmojiConfig),
         TiptapLinkExtension.configure({
-          openOnClick: false,
-          popover: {
-            setLinkState
-          }
+          openOnClick: false
         }),
         SearchAndReplace.configure(),
         CharacterCount.configure({
@@ -147,5 +144,5 @@ export const useTipTapReflectionEditor = (
     editor.setEditable(!readOnly)
   }, [readOnly])
 
-  return {editor, linkState, setLinkState}
+  return {editor}
 }
diff --git a/packages/client/hooks/useTipTapTaskEditor.ts b/packages/client/hooks/useTipTapTaskEditor.ts
index fa34487e928..3a54cdea281 100644
--- a/packages/client/hooks/useTipTapTaskEditor.ts
+++ b/packages/client/hooks/useTipTapTaskEditor.ts
@@ -1,12 +1,11 @@
 import Mention from '@tiptap/extension-mention'
 import Placeholder from '@tiptap/extension-placeholder'
+import Underline from '@tiptap/extension-underline'
 import {generateText, useEditor} from '@tiptap/react'
 import StarterKit from '@tiptap/starter-kit'
-import {useState} from 'react'
 import Atmosphere from '../Atmosphere'
 import {LoomExtension} from '../components/promptResponse/loomExtension'
 import {TiptapLinkExtension} from '../components/promptResponse/TiptapLinkExtension'
-import {LinkMenuState} from '../components/promptResponse/TipTapLinkMenu'
 import {mentionConfig, serverTipTapExtensions} from '../shared/tiptap/serverTipTapExtensions'
 import {tiptapEmojiConfig} from '../utils/tiptapEmojiConfig'
 import {tiptapMentionConfig} from '../utils/tiptapMentionConfig'
@@ -26,12 +25,12 @@ export const useTipTapTaskEditor = (
 ) => {
   const {atmosphere, teamId, readOnly, onBlur} = options
   const [contentJSON, editorRef] = useTipTapEditorContent(content)
-  const [linkState, setLinkState] = useState<LinkMenuState>(null)
   editorRef.current = useEditor(
     {
       content: contentJSON,
       extensions: [
         StarterKit,
+        Underline,
         LoomExtension,
         Placeholder.configure({
           showOnlyWhenEditable: false,
@@ -43,10 +42,7 @@ export const useTipTapTaskEditor = (
         ),
         Mention.extend({name: 'emojiMention'}).configure(tiptapEmojiConfig),
         TiptapLinkExtension.configure({
-          openOnClick: false,
-          popover: {
-            setLinkState
-          }
+          openOnClick: false
         })
       ],
       editable: !readOnly,
@@ -55,5 +51,5 @@ export const useTipTapTaskEditor = (
     },
     [contentJSON, readOnly, onBlur]
   )
-  return {editor: editorRef.current, linkState, setLinkState}
+  return {editor: editorRef.current}
 }
diff --git a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/WholeMeetingSummary.tsx b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/WholeMeetingSummary.tsx
index 703acb56bee..9654821f834 100644
--- a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/WholeMeetingSummary.tsx
+++ b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/WholeMeetingSummary.tsx
@@ -1,5 +1,8 @@
 import graphql from 'babel-plugin-relay/macro'
-import {WholeMeetingSummary_meeting$key} from 'parabol-client/__generated__/WholeMeetingSummary_meeting.graphql'
+import {
+  WholeMeetingSummary_meeting$data,
+  WholeMeetingSummary_meeting$key
+} from 'parabol-client/__generated__/WholeMeetingSummary_meeting.graphql'
 import {useFragment} from 'react-relay'
 import WholeMeetingSummaryLoading from './WholeMeetingSummaryLoading'
 import WholeMeetingSummaryResult from './WholeMeetingSummaryResult'
@@ -13,6 +16,17 @@ const hasAiApiKey = isServer
   ? !!process.env.OPEN_AI_API_KEY
   : !!window.__ACTION__ && !!window.__ACTION__.hasOpenAI
 
+const hasContent = (meeting: WholeMeetingSummary_meeting$data): boolean => {
+  if (meeting.__typename === 'RetrospectiveMeeting') {
+    const reflections = meeting.reflectionGroups?.flatMap((group) => group.reflections)
+    return Boolean(reflections?.length && reflections.length > 1)
+  }
+  if (meeting.__typename === 'TeamPromptMeeting') {
+    return Boolean(meeting.responses?.length)
+  }
+  return false
+}
+
 const WholeMeetingSummary = (props: Props) => {
   const {meetingRef} = props
   const meeting = useFragment(
@@ -23,7 +37,6 @@ const WholeMeetingSummary = (props: Props) => {
         id
         summary
         organization {
-          hasStandupAISummaryFlag: featureFlag(featureName: "standupAISummary")
           useAI
         }
         ... on RetrospectiveMeeting {
@@ -35,6 +48,7 @@ const WholeMeetingSummary = (props: Props) => {
           }
         }
         ... on TeamPromptMeeting {
+          isLoadingSummary
           responses {
             id
           }
@@ -43,29 +57,15 @@ const WholeMeetingSummary = (props: Props) => {
     `,
     meetingRef
   )
-  if (meeting.__typename === 'RetrospectiveMeeting') {
-    const {reflectionGroups, organization, isLoadingSummary} = meeting
-    const reflections = reflectionGroups?.flatMap((group) => group.reflections) // reflectionCount hasn't been calculated yet so check reflections length
-    const hasMoreThanOneReflection = reflections?.length && reflections.length > 1
-    if (!hasMoreThanOneReflection || !organization.useAI || !hasAiApiKey) return null
-    if (isLoadingSummary) return <WholeMeetingSummaryLoading />
-    return <WholeMeetingSummaryResult meetingRef={meeting} />
-  } else if (meeting.__typename === 'TeamPromptMeeting') {
-    const {summary: wholeMeetingSummary, responses, organization} = meeting
-    const {hasStandupAISummaryFlag, useAI} = organization
-    if (
-      !hasStandupAISummaryFlag ||
-      !useAI ||
-      !hasAiApiKey ||
-      !responses ||
-      responses.length === 0
-    ) {
-      return null
-    }
-    if (!wholeMeetingSummary) return <WholeMeetingSummaryLoading />
-    return <WholeMeetingSummaryResult meetingRef={meeting} />
-  }
-  return null
+
+  const {organization} = meeting
+  const {useAI} = organization
+
+  if (!useAI || !hasAiApiKey || !hasContent(meeting)) return null
+
+  if (meeting.isLoadingSummary) return <WholeMeetingSummaryLoading />
+
+  return <WholeMeetingSummaryResult meetingRef={meeting} />
 }
 
 export default WholeMeetingSummary
diff --git a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/WholeMeetingSummaryLoading.tsx b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/WholeMeetingSummaryLoading.tsx
index fa59d75c71a..1e95289b287 100644
--- a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/WholeMeetingSummaryLoading.tsx
+++ b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/WholeMeetingSummaryLoading.tsx
@@ -24,12 +24,10 @@ const WholeMeetingSummary = () => {
           borderBottom: `1px solid ${PALETTE.SLATE_400}`
         }}
       >
-        <tr>
-          <td style={explainerStyle}>
-            {'Hold tight! Our AI 🤖 is generating your meeting summary'}
-            <Ellipsis />
-          </td>
-        </tr>
+        <div style={explainerStyle}>
+          {'Hold tight! Our AI 🤖 is generating your meeting summary'}
+          <Ellipsis />
+        </div>
       </td>
     </tr>
   )
diff --git a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/WholeMeetingSummaryResult.tsx b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/WholeMeetingSummaryResult.tsx
index 57e46e57e4b..ceb893b2512 100644
--- a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/WholeMeetingSummaryResult.tsx
+++ b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/WholeMeetingSummaryResult.tsx
@@ -81,22 +81,13 @@ const WholeMeetingSummaryResult = ({meetingRef}: Props) => {
     <>
       <tr>
         <td align='center' style={{paddingTop: 20}}>
-          <tr>
-            <td style={explainerStyle}>{explainerText}</td>
-          </tr>
-          <tr>
-            <td align='center' style={topicTitleStyle}>
-              {'🤖 Meeting Summary'}
-            </td>
-          </tr>
-          <tr>
-            <td
-              align='center'
-              style={textStyle}
-              className='link-style'
-              dangerouslySetInnerHTML={{__html: sanitizedSummary}}
-            />
-          </tr>
+          <div style={explainerStyle}>{explainerText}</div>
+          <div style={topicTitleStyle}>{'🤖 Meeting Summary'}</div>
+          <div
+            style={textStyle}
+            className='link-style'
+            dangerouslySetInnerHTML={{__html: sanitizedSummary}}
+          />
         </td>
       </tr>
       <EmailBorderBottom />
diff --git a/packages/client/modules/outcomeCard/components/OutcomeCard/OutcomeCard.tsx b/packages/client/modules/outcomeCard/components/OutcomeCard/OutcomeCard.tsx
index eb3f071f8ce..2b56844e8da 100644
--- a/packages/client/modules/outcomeCard/components/OutcomeCard/OutcomeCard.tsx
+++ b/packages/client/modules/outcomeCard/components/OutcomeCard/OutcomeCard.tsx
@@ -9,7 +9,6 @@ import EditingStatus from '~/components/EditingStatus/EditingStatus'
 import {PALETTE} from '~/styles/paletteV3'
 import IntegratedTaskContent from '../../../../components/IntegratedTaskContent'
 import {TipTapEditor} from '../../../../components/promptResponse/TipTapEditor'
-import {LinkMenuState} from '../../../../components/promptResponse/TipTapLinkMenu'
 import TaskIntegrationLink from '../../../../components/TaskIntegrationLink'
 import TaskWatermark from '../../../../components/TaskWatermark'
 import useAtmosphere from '../../../../hooks/useAtmosphere'
@@ -60,8 +59,6 @@ interface Props {
   isTaskFocused: boolean
   isTaskHovered: boolean
   editor: Editor
-  linkState: LinkMenuState
-  setLinkState: (linkState: LinkMenuState) => void
   handleCardUpdate: () => void
   isAgenda: boolean
   isDraggingOver: TaskStatusEnum | undefined
@@ -79,8 +76,6 @@ const OutcomeCard = memo((props: Props) => {
     isTaskFocused,
     isTaskHovered,
     editor,
-    linkState,
-    setLinkState,
     handleCardUpdate,
     isAgenda,
     isDraggingOver,
@@ -187,8 +182,6 @@ const OutcomeCard = memo((props: Props) => {
           >
             <TipTapEditor
               editor={editor}
-              linkState={linkState}
-              setLinkState={setLinkState}
               useLinkEditor={() => useTaskChild('editor-link-changer')}
               onBlur={onFocusChange(false)}
               onFocus={onFocusChange(true)}
diff --git a/packages/client/modules/outcomeCard/containers/OutcomeCard/OutcomeCardContainer.tsx b/packages/client/modules/outcomeCard/containers/OutcomeCard/OutcomeCardContainer.tsx
index 4869556e765..4e1285f7169 100644
--- a/packages/client/modules/outcomeCard/containers/OutcomeCard/OutcomeCardContainer.tsx
+++ b/packages/client/modules/outcomeCard/containers/OutcomeCard/OutcomeCardContainer.tsx
@@ -8,7 +8,6 @@ import {AreaEnum, TaskStatusEnum} from '~/__generated__/UpdateTaskMutation.graph
 import useClickAway from '~/hooks/useClickAway'
 import useScrollIntoView from '~/hooks/useScrollIntoVIew'
 import SetTaskHighlightMutation from '~/mutations/SetTaskHighlightMutation'
-import {LinkMenuState} from '../../../../components/promptResponse/TipTapLinkMenu'
 import useAtmosphere from '../../../../hooks/useAtmosphere'
 import useTaskChildFocus from '../../../../hooks/useTaskChildFocus'
 import DeleteTaskMutation from '../../../../mutations/DeleteTaskMutation'
@@ -23,8 +22,6 @@ const Wrapper = styled('div')({
 interface Props {
   area: AreaEnum
   editor: Editor
-  linkState: LinkMenuState
-  setLinkState: (linkState: LinkMenuState) => void
   className?: string
   isAgenda: boolean | undefined
   isDraggingOver: TaskStatusEnum | undefined
@@ -37,8 +34,6 @@ interface Props {
 const OutcomeCardContainer = memo((props: Props) => {
   const {
     editor,
-    linkState,
-    setLinkState,
     className,
     isDraggingOver,
     task: taskRef,
@@ -108,8 +103,6 @@ const OutcomeCardContainer = memo((props: Props) => {
       <OutcomeCard
         area={area}
         editor={editor}
-        linkState={linkState}
-        setLinkState={setLinkState}
         handleCardUpdate={handleCardUpdate}
         isTaskFocused={isTaskFocused()}
         isTaskHovered={isTaskHovered}
diff --git a/packages/client/modules/userDashboard/components/OrgBilling/OrgFeatureFlags.tsx b/packages/client/modules/userDashboard/components/OrgBilling/OrgFeatureFlags.tsx
index ed25a1a7c37..993901d4032 100644
--- a/packages/client/modules/userDashboard/components/OrgBilling/OrgFeatureFlags.tsx
+++ b/packages/client/modules/userDashboard/components/OrgBilling/OrgFeatureFlags.tsx
@@ -44,8 +44,7 @@ const FeatureNameGroup = styled('div')({
 const FEATURE_NAME_LOOKUP: Record<string, string> = {
   insights: 'Team Insights',
   publicTeams: 'Public Teams',
-  relatedDiscussions: 'Related Discussions',
-  standupAISummary: 'Standup AI Summary'
+  relatedDiscussions: 'Related Discussions'
 }
 
 interface Props {
diff --git a/packages/client/package.json b/packages/client/package.json
index cd48606e76b..d87596e8065 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "8.23.8",
+  "version": "8.24.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
@@ -99,6 +99,7 @@
     "@tiptap/extension-placeholder": "^2.9.1",
     "@tiptap/extension-task-item": "^2.11.0",
     "@tiptap/extension-task-list": "^2.11.0",
+    "@tiptap/extension-underline": "^2.11.5",
     "@tiptap/html": "^2.9.1",
     "@tiptap/pm": "^2.9.1",
     "@tiptap/react": "^2.9.1",
diff --git a/packages/client/shared/tiptap/addTagToTask.ts b/packages/client/shared/tiptap/addTagToTask.ts
index acb1feb3946..d5a09814d34 100644
--- a/packages/client/shared/tiptap/addTagToTask.ts
+++ b/packages/client/shared/tiptap/addTagToTask.ts
@@ -1,5 +1,5 @@
 import {JSONContent} from '@tiptap/core'
-import {TaskTag} from 'parabol-server/postgres/types'
+import {TaskTag} from '../types'
 
 const addTagToTask = (content: JSONContent, tag: TaskTag) => {
   content.content!.push({
diff --git a/packages/client/shared/tiptap/convertTipTapTaskContent.ts b/packages/client/shared/tiptap/convertTipTapTaskContent.ts
index b93c0f01e13..28399ecee42 100644
--- a/packages/client/shared/tiptap/convertTipTapTaskContent.ts
+++ b/packages/client/shared/tiptap/convertTipTapTaskContent.ts
@@ -1,6 +1,6 @@
 import {generateJSON} from '@tiptap/html'
-import {TaskTag} from 'parabol-server/postgres/types'
 import {serverTipTapExtensions} from '~/shared/tiptap/serverTipTapExtensions'
+import {TaskTag} from '../types'
 
 export const convertTipTapTaskContent = (text: string, tags?: TaskTag[]) => {
   let body = `<p>${text}</p>`
diff --git a/packages/client/shared/tiptap/serverTipTapExtensions.ts b/packages/client/shared/tiptap/serverTipTapExtensions.ts
index 663cb8a7b25..21229d6009e 100644
--- a/packages/client/shared/tiptap/serverTipTapExtensions.ts
+++ b/packages/client/shared/tiptap/serverTipTapExtensions.ts
@@ -3,6 +3,7 @@ import BaseLink from '@tiptap/extension-link'
 import Mention, {MentionNodeAttrs, MentionOptions} from '@tiptap/extension-mention'
 import {TaskItem} from '@tiptap/extension-task-item'
 import {TaskList} from '@tiptap/extension-task-list'
+import Underline from '@tiptap/extension-underline'
 import StarterKit from '@tiptap/starter-kit'
 import {LoomExtension} from '../../components/promptResponse/loomExtension'
 import {ImageBlockBase} from '../../tiptap/extensions/imageBlock/ImageBlockBase'
@@ -19,6 +20,7 @@ export const mentionConfig: Partial<MentionOptions<any, MentionNodeAttrs>> = {
 }
 export const serverTipTapExtensions = [
   StarterKit,
+  Underline,
   TaskList,
   TaskItem.configure({
     nested: true
diff --git a/packages/client/shared/types/index.d.ts b/packages/client/shared/types/index.d.ts
new file mode 100644
index 00000000000..48e7f104fbb
--- /dev/null
+++ b/packages/client/shared/types/index.d.ts
@@ -0,0 +1 @@
+export type TaskTag = 'private' | 'archived'
diff --git a/packages/client/tiptap/extensions/imageUpload/ImageUpload.ts b/packages/client/tiptap/extensions/imageUpload/ImageUpload.ts
index 960ce5bc40d..073e389b344 100644
--- a/packages/client/tiptap/extensions/imageUpload/ImageUpload.ts
+++ b/packages/client/tiptap/extensions/imageUpload/ImageUpload.ts
@@ -1,8 +1,13 @@
-import {ReactNodeViewRenderer} from '@tiptap/react'
-import {EventEmitter} from 'eventemitter3'
+import {ReactNodeViewRenderer, type Editor} from '@tiptap/react'
 import {ImageUploadBase} from '../../../shared/tiptap/extensions/ImageUploadBase'
 import {ImageUploadView} from './ImageUploadView'
 
+declare module '@tiptap/core' {
+  interface EditorEvents {
+    enter: {editor: Editor}
+  }
+}
+
 export const ImageUpload = ImageUploadBase.extend<{editorWidth: number; editorHeight: number}>({
   addOptions() {
     return {
@@ -12,7 +17,6 @@ export const ImageUpload = ImageUploadBase.extend<{editorWidth: number; editorHe
   },
   addStorage(this) {
     return {
-      emitter: new EventEmitter(),
       editorWidth: this.options.editorWidth,
       editorHeight: this.options.editorHeight
     }
@@ -25,7 +29,7 @@ export const ImageUpload = ImageUploadBase.extend<{editorWidth: number; editorHe
         // and we can't communicate with that component via props or state
         // so we attach an event emitter on the editor, since that's shared
         if (editor.isActive('imageUpload')) {
-          this.storage.emitter.emit('enter')
+          editor.emit('enter', {editor})
           return true
         }
         return false
diff --git a/packages/client/tiptap/extensions/imageUpload/ImageUploadView.tsx b/packages/client/tiptap/extensions/imageUpload/ImageUploadView.tsx
index 91ba8691092..e92f253e417 100644
--- a/packages/client/tiptap/extensions/imageUpload/ImageUploadView.tsx
+++ b/packages/client/tiptap/extensions/imageUpload/ImageUploadView.tsx
@@ -52,9 +52,9 @@ export const ImageUploadView = (props: NodeViewProps) => {
   })
 
   useEffect(() => {
-    editor.storage.imageUpload.emitter.on('enter', openPopover)
+    editor.on('enter', openPopover)
     return () => {
-      editor.storage.imageUpload.emitter.off('enter', openPopover)
+      editor.off('enter', openPopover)
     }
   }, [])
   const triggerRef = useHideWhenTriggerHidden(setOpen)
diff --git a/packages/client/types/constEnums.ts b/packages/client/types/constEnums.ts
index 7ef6a9f16e6..9daa8742fc4 100644
--- a/packages/client/types/constEnums.ts
+++ b/packages/client/types/constEnums.ts
@@ -407,9 +407,8 @@ export const enum Threshold {
   MAX_STARTER_TIER_TEAMS = 2,
   MAX_POKER_STORIES = 50,
   MAX_INTEGRATION_FETCH_TIME = 10000,
-  MIN_STICKY_TEAM_MEETING_ATTENDEES = 2,
-  MIN_STICKY_TEAM_MEETINGS = 3,
-  STICKY_TEAM_LAST_MEETING_TIMEFRAME = 2592000, // 30 days
+  MIN_ACTIVE_TEAM_MEETING_ATTENDEES = 1,
+  ACTIVE_TEAM_LAST_MEETING_TIMEFRAME = 2592000, // 30 days
   STARTER_TIER_LOCK_AFTER_DAYS = 30,
   REFRESH_JWT_AFTER = 1296000000, // 15 days
   RESET_PASSWORD_LIFESPAN = 86400000, // 1 day
@@ -421,7 +420,6 @@ export const enum Threshold {
 // Use these values for easier testing of team limits and usage stats
 export const enum ThresholdTest {
   MIN_STICKY_TEAM_MEETING_ATTENDEES = 0,
-  MIN_STICKY_TEAM_MEETINGS = 0,
   MAX_STARTER_TIER_TEAMS = 0,
   STARTER_TIER_LOCK_AFTER_DAYS = 0,
   STICKY_TEAM_LAST_MEETING_TIMEFRAME = 2592000
@@ -490,7 +488,7 @@ export const enum SprintPokerDefaults {
   SERVICE_FIELD_NULL = '',
   SERVICE_FIELD_NULL_LABEL = 'Do Not Update',
   GITHUB_DEFAULT_QUERY = 'is:issue is:open sort:updated involves:@me',
-  JIRA_FIELD_UPDATE_ERROR = 'Couldn’t fix the missing field! In Jira, use "Find my field" to determine the error',
+  JIRA_FIELD_UPDATE_ERROR = 'Couldn\'t fix the missing field! In Jira, use "Find my field" to determine the error',
   JIRA_FIELD_UPDATE_ERROR_ESTIMATION = 'Please enable estimation feature in your Jira project settings',
   JIRA_FIELD_UPDATE_ERROR_ESTIMATION_TIMETRACKING = 'Please enable estimation feature in your Jira project settings and add Time tracking field to the issue type',
   GITLAB_FIELD_TIME_ESTIMATE = '__timeEstimate',
diff --git a/packages/embedder/package.json b/packages/embedder/package.json
index 3655878c85c..3d58ee3e556 100644
--- a/packages/embedder/package.json
+++ b/packages/embedder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "parabol-embedder",
-  "version": "8.23.8",
+  "version": "8.24.0",
   "description": "A service that computes embedding vectors from Parabol objects",
   "author": "Jordan Husney <jordan.husney@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/embedder#readme",
diff --git a/packages/gql-executor/package.json b/packages/gql-executor/package.json
index d44199415bf..8dab964b0cd 100644
--- a/packages/gql-executor/package.json
+++ b/packages/gql-executor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gql-executor",
-  "version": "8.23.8",
+  "version": "8.24.0",
   "description": "A Stateless GraphQL Executor",
   "author": "Matt Krick <matt.krick@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/gqlExecutor#readme",
@@ -25,8 +25,8 @@
   },
   "dependencies": {
     "dd-trace": "^5.0.0",
-    "parabol-client": "8.23.8",
-    "parabol-server": "8.23.8",
+    "parabol-client": "8.24.0",
+    "parabol-server": "8.24.0",
     "undici": "^5.26.2"
   }
 }
diff --git a/packages/integration-tests/package.json b/packages/integration-tests/package.json
index b079957dabd..539214f5350 100644
--- a/packages/integration-tests/package.json
+++ b/packages/integration-tests/package.json
@@ -2,7 +2,7 @@
   "name": "integration-tests",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "8.23.8",
+  "version": "8.24.0",
   "description": "",
   "main": "index.js",
   "scripts": {
diff --git a/packages/mattermost-plugin/Atmosphere.ts b/packages/mattermost-plugin/Atmosphere.ts
index 7b9eba6f68e..088e211c3e6 100644
--- a/packages/mattermost-plugin/Atmosphere.ts
+++ b/packages/mattermost-plugin/Atmosphere.ts
@@ -53,6 +53,21 @@ const fetchGraphQL = (state: State) => (params: RequestParameters, variables: Va
   )
 }
 
+const login = (state: State) => async () => {
+  const {serverUrl, store} = state
+  const response = await fetch(
+    serverUrl + '/login',
+    Client4.getOptions({
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  )
+  const body = await response.json()
+  store.dispatch(onLogin(body.authToken))
+}
+
 const relayFieldLogger: RelayFieldLogger = (event) => {
   if (event.kind === 'relay_resolver.error') {
     console.warn(`Resolver error encountered in ${event.owner}.${event.fieldPath}`)
@@ -67,6 +82,7 @@ export type ResolverContext = {
 
 export class Atmosphere extends Environment {
   state: State
+  login: () => Promise<void>
 
   constructor(serverUrl: string, reduxStore: Store<GlobalState, AnyAction>) {
     const state = {
@@ -88,21 +104,8 @@ export class Atmosphere extends Environment {
       relayFieldLogger
     })
     this.state = state
-  }
-
-  async login() {
-    const {serverUrl, store} = this.state
-    const response = await fetch(
-      serverUrl + '/login',
-      Client4.getOptions({
-        method: 'POST',
-        headers: {
-          'Content-Type': 'application/json'
-        }
-      })
-    )
-    const body = await response.json()
-    store.dispatch(onLogin(body.authToken))
+    // bind it here to avoid this == undefined errors
+    this.login = login(state)
   }
 }
 
diff --git a/packages/mattermost-plugin/components/CreateTaskModal/CreateTaskModal.tsx b/packages/mattermost-plugin/components/CreateTaskModal/CreateTaskModal.tsx
index 82ec13ed8b9..5658c26f149 100644
--- a/packages/mattermost-plugin/components/CreateTaskModal/CreateTaskModal.tsx
+++ b/packages/mattermost-plugin/components/CreateTaskModal/CreateTaskModal.tsx
@@ -8,9 +8,13 @@ import {closeCreateTaskModal} from '../../reducers'
 import Select from '../Select'
 import SimpleSelect from '../SimpleSelect'
 
+import {TipTapEditor} from 'parabol-client/components/promptResponse/TipTapEditor'
+import useEventCallback from 'parabol-client/hooks/useEventCallback'
+import {convertTipTapTaskContent} from 'parabol-client/shared/tiptap/convertTipTapTaskContent'
 import type {TaskStatusEnum} from '../../__generated__/CreateTaskModalMutation.graphql'
 import {CreateTaskModalMutation} from '../../__generated__/CreateTaskModalMutation.graphql'
 import {CreateTaskModalQuery} from '../../__generated__/CreateTaskModalQuery.graphql'
+import {useTipTapTaskEditor} from '../../hooks/useTipTapTaskEditor'
 import LoadingSpinner from '../LoadingSpinner'
 import Modal from '../Modal'
 
@@ -21,6 +25,7 @@ const CreateTaskModal = () => {
     graphql`
       query CreateTaskModalQuery {
         viewer {
+          id
           teams {
             id
             name
@@ -37,7 +42,7 @@ const CreateTaskModal = () => {
   )
 
   const {viewer} = data
-  const {teams} = viewer
+  const {id: userId, teams} = viewer
 
   const [createTask, createTaskLoading] = useMutation<CreateTaskModalMutation>(graphql`
     mutation CreateTaskModalMutation($newTask: CreateTaskInput!) {
@@ -52,7 +57,6 @@ const CreateTaskModal = () => {
     }
   `)
 
-  const [description, setDescription] = useState('')
   const [selectedTeam, setSelectedTeam] = useState<NonNullable<typeof teams>[number]>()
   const [selectedStatus, setSelectedStatus] = useState<TaskStatusEnum>('active')
 
@@ -61,47 +65,40 @@ const CreateTaskModal = () => {
       setSelectedTeam(teams[0])
     }
   }, [teams, selectedTeam])
+  const teamId = selectedTeam?.id
 
   const dispatch = useDispatch()
   const handleClose = () => {
     dispatch(closeCreateTaskModal())
   }
 
-  const handleStart = async () => {
-    if (!selectedTeam || !description || !selectedStatus) {
+  const handleSubmit = useEventCallback(async () => {
+    if (!teamId || !selectedStatus || !editor || editor.isEmpty) {
       return
     }
     if (createTaskLoading) {
       return
     }
 
-    // TODO: let's cheat our way to new task content for now
-    const content = {
-      type: 'doc',
-      content: [
-        {
-          type: 'paragraph',
-          content: [
-            {
-              text: description,
-              type: 'text'
-            }
-          ]
-        }
-      ]
-    }
+    const content = editor.getJSON()
 
     createTask({
       variables: {
         newTask: {
           content: JSON.stringify(content),
           status: selectedStatus,
-          teamId: selectedTeam.id
+          userId,
+          teamId
         }
       }
     })
 
     handleClose()
+  })
+
+  const {editor} = useTipTapTaskEditor(convertTipTapTaskContent(''))
+  if (!editor) {
+    return null
   }
 
   return (
@@ -109,20 +106,19 @@ const CreateTaskModal = () => {
       title='Add a Task'
       commitButtonLabel='Add Task'
       handleClose={handleClose}
-      handleCommit={handleStart}
+      handleCommit={handleSubmit}
     >
+      <div className='absolute top-0 left-0 z-10 z-1050' />
       <div className='form-group'>
         <label className='control-label' htmlFor='description'>
           Description<span className='error-text'> *</span>
         </label>
-        <textarea
-          style={{
-            width: '100%'
-          }}
+        {/* className='channel-switch-modal' is a hack to not lose focus on key press, see 
+            https://github.com/mattermost/mattermost/blob/dc06bb21558aca05dbe330f25459528b39247c32/webapp/channels/src/components/advanced_text_editor/use_textbox_focus.tsx#L63 */}
+        <TipTapEditor
           id='description'
-          className='form-control'
-          value={description}
-          onChange={(e) => setDescription(e.target.value)}
+          className='channel-switch-modal form-control h-auto min-h-32 p-2'
+          editor={editor}
           placeholder='Description'
         />
       </div>
diff --git a/packages/mattermost-plugin/components/PushReflection/PushReflectionModal.tsx b/packages/mattermost-plugin/components/PushReflection/PushReflectionModal.tsx
index 4ab64b0904b..b7161c97c87 100644
--- a/packages/mattermost-plugin/components/PushReflection/PushReflectionModal.tsx
+++ b/packages/mattermost-plugin/components/PushReflection/PushReflectionModal.tsx
@@ -2,14 +2,15 @@ import {generateJSON, mergeAttributes} from '@tiptap/core'
 import BaseLink from '@tiptap/extension-link'
 import StarterKit from '@tiptap/starter-kit'
 import graphql from 'babel-plugin-relay/macro'
-import {marked} from 'marked'
 import {getPost} from 'mattermost-redux/selectors/entities/posts'
 import {GlobalState} from 'mattermost-redux/types/store'
+import {TipTapEditor} from 'parabol-client/components/promptResponse/TipTapEditor'
 import React, {useEffect, useMemo} from 'react'
 import {useDispatch, useSelector} from 'react-redux'
 import {useLazyLoadQuery, useMutation} from 'react-relay'
 import {PushReflectionModalMutation} from '../../__generated__/PushReflectionModalMutation.graphql'
 import {PushReflectionModalQuery} from '../../__generated__/PushReflectionModalQuery.graphql'
+import {useTipTapTaskEditor} from '../../hooks/useTipTapTaskEditor'
 import {closePushPostAsReflection} from '../../reducers'
 import {getPostURL, pushPostAsReflection} from '../../selectors'
 import Modal from '../Modal'
@@ -70,18 +71,40 @@ const PushReflectionModal = () => {
     description: string
   }>()
 
-  const [comment, setComment] = React.useState('')
-  const formattedPost = useMemo(() => {
+  const htmlPost = useMemo(() => {
     if (!post) {
-      return null
+      return ''
     }
-    const quotedMessage = post.message
-      .split('\n')
-      .map((line) => `> ${line}`)
-      .join('\n')
-    return `${quotedMessage}\n\n[See comment in Mattermost](${postUrl})`
+    const quote = PostUtils.formatText(post.message)
+    return `
+    <p />
+    <blockquote>
+      ${quote}
+    </blockquote>
+    <a href=${postUrl}>See comment in Mattermost</a>
+    `
   }, [post])
 
+  const tipTapJson = useMemo(() => {
+    const json = generateJSON(htmlPost, [
+      StarterKit,
+      BaseLink.extend({
+        parseHTML() {
+          return [{tag: 'a[href]:not([data-type="button"]):not([href *= "javascript:" i])'}]
+        },
+
+        renderHTML({HTMLAttributes}) {
+          return [
+            'a',
+            mergeAttributes(this.options.HTMLAttributes, HTMLAttributes, {class: 'link'}),
+            0
+          ]
+        }
+      })
+    ])
+    return JSON.stringify(json)
+  }, [htmlPost])
+
   const [createReflection] = useMutation<PushReflectionModalMutation>(graphql`
     mutation PushReflectionModalMutation($input: CreateReflectionInput!) {
       createReflection(input: $input) {
@@ -90,10 +113,6 @@ const PushReflectionModal = () => {
     }
   `)
 
-  useEffect(() => {
-    setComment('')
-  }, [postId])
-
   useEffect(() => {
     if (!selectedMeeting && retroMeetings && retroMeetings.length > 0) {
       setSelectedMeeting(retroMeetings[0])
@@ -116,30 +135,12 @@ const PushReflectionModal = () => {
   }
 
   const handlePush = async () => {
-    if (!selectedMeeting || !selectedPrompt || (!comment && !post.message)) {
-      console.log('missing data', selectedPrompt, selectedMeeting, comment, post.message)
+    if (!selectedMeeting || !selectedPrompt || !editor || editor.isEmpty) {
+      console.log('missing data', selectedPrompt, selectedMeeting, post.message)
       return
     }
 
-    const markdown = `${comment}\n\n${formattedPost}`
-    const html = await marked.parse(markdown)
-    const rawObject = generateJSON(html, [
-      StarterKit,
-      BaseLink.extend({
-        parseHTML() {
-          return [{tag: 'a[href]:not([data-type="button"]):not([href *= "javascript:" i])'}]
-        },
-
-        renderHTML({HTMLAttributes}) {
-          return [
-            'a',
-            mergeAttributes(this.options.HTMLAttributes, HTMLAttributes, {class: 'link'}),
-            0
-          ]
-        }
-      })
-    ])
-    const content = JSON.stringify(rawObject)
+    const content = JSON.stringify(editor.getJSON())
 
     createReflection({
       variables: {
@@ -155,6 +156,11 @@ const PushReflectionModal = () => {
     handleClose()
   }
 
+  const {editor} = useTipTapTaskEditor(tipTapJson)
+  if (!editor) {
+    return null
+  }
+
   if (!postId) {
     return null
   }
@@ -177,28 +183,12 @@ const PushReflectionModal = () => {
           <label className='control-label' htmlFor='comment'>
             Add a Comment<span className='error-text'> *</span>
           </label>
-          <div
-            className='form-control'
-            style={{
-              resize: 'none',
-              height: 'auto'
-            }}
-          >
-            <textarea
-              style={{
-                border: 'none',
-                width: '100%'
-              }}
-              id='comment'
-              value={comment}
-              onChange={(e) => setComment(e.target.value)}
-              placeholder='Add your comment for the retro...'
-            />
-            <blockquote>
-              {PostUtils.messageHtmlToComponent(PostUtils.formatText(post.message))}
-            </blockquote>
-            <a>See comment in Mattermost</a>
-          </div>
+          <TipTapEditor
+            id='comment'
+            className='channel-switch-modal form-control h-auto min-h-32 p-2'
+            editor={editor}
+            placeholder='TT Add your comment for the retro...'
+          />
         </div>
       )}
       {data && (
diff --git a/packages/mattermost-plugin/components/Sidepanel/TeamRow.tsx b/packages/mattermost-plugin/components/Sidepanel/TeamRow.tsx
index 4117d0d8af2..00e1e9d2b8c 100644
--- a/packages/mattermost-plugin/components/Sidepanel/TeamRow.tsx
+++ b/packages/mattermost-plugin/components/Sidepanel/TeamRow.tsx
@@ -6,7 +6,7 @@ import {TeamRow_team$key} from '../../__generated__/TeamRow_team.graphql'
 import {useConfig} from '../../hooks/useConfig'
 import MoreMenu from '../Menu'
 
-import plural from '../../../client/utils/plural'
+import plural from 'parabol-client/utils/plural'
 import {useUnlinkTeam} from '../../hooks/useUnlinkTeam'
 
 const Card = styled.div!`
diff --git a/packages/mattermost-plugin/components/StartActivityModal/StartActivityModal.tsx b/packages/mattermost-plugin/components/StartActivityModal/StartActivityModal.tsx
index 8aa78290428..9d0c90c4cfc 100644
--- a/packages/mattermost-plugin/components/StartActivityModal/StartActivityModal.tsx
+++ b/packages/mattermost-plugin/components/StartActivityModal/StartActivityModal.tsx
@@ -115,7 +115,7 @@ const StartActivityModal = () => {
     >
       <div>
         <p>
-          To see the full details for any activity, visit
+          To see the full details for any activity, visit{' '}
           <a href={`${config?.parabolUrl}/activity-library/`} target='_blank' rel='noreferrer'>
             {"Parabol's Activity Library"}
           </a>
diff --git a/packages/mattermost-plugin/hooks/useMassInvitationToken.tsx b/packages/mattermost-plugin/hooks/useMassInvitationToken.tsx
index fcfa45a7ad1..4cbc82e1b86 100644
--- a/packages/mattermost-plugin/hooks/useMassInvitationToken.tsx
+++ b/packages/mattermost-plugin/hooks/useMassInvitationToken.tsx
@@ -1,8 +1,8 @@
 import graphql from 'babel-plugin-relay/macro'
 import {useLazyLoadQuery, useMutation} from 'react-relay'
 
+import {Threshold} from 'parabol-client/types/constEnums'
 import {useCallback} from 'react'
-import {Threshold} from '../../client/types/constEnums'
 import {useMassInvitationTokenMutation} from '../__generated__/useMassInvitationTokenMutation.graphql'
 import {useMassInvitationTokenQuery} from '../__generated__/useMassInvitationTokenQuery.graphql'
 import {mutationResult} from '../utils/mutationResult'
diff --git a/packages/mattermost-plugin/hooks/useTipTapTaskEditor.tsx b/packages/mattermost-plugin/hooks/useTipTapTaskEditor.tsx
new file mode 100644
index 00000000000..c770c03f8b4
--- /dev/null
+++ b/packages/mattermost-plugin/hooks/useTipTapTaskEditor.tsx
@@ -0,0 +1,36 @@
+import Mention from '@tiptap/extension-mention'
+import Placeholder from '@tiptap/extension-placeholder'
+import {useEditor} from '@tiptap/react'
+import StarterKit from '@tiptap/starter-kit'
+import {TiptapLinkExtension} from 'parabol-client/components/promptResponse/TiptapLinkExtension'
+import {LinkMenuState} from 'parabol-client/components/promptResponse/TipTapLinkMenu'
+import {useTipTapEditorContent} from 'parabol-client/hooks/useTipTapEditorContent'
+import {tiptapEmojiConfig} from 'parabol-client/utils/tiptapEmojiConfig'
+import {tiptapTagConfig} from 'parabol-client/utils/tiptapTagConfig'
+import {useState} from 'react'
+
+export const useTipTapTaskEditor = (content: string) => {
+  const [contentJSON, editorRef] = useTipTapEditorContent(content)
+  const [linkState, setLinkState] = useState<LinkMenuState>(null)
+  editorRef.current = useEditor({
+    content: contentJSON,
+    extensions: [
+      StarterKit,
+      Placeholder.configure({
+        showOnlyWhenEditable: false,
+        placeholder: 'Describe what “Done” looks like'
+      }),
+      Mention.extend({name: 'taskTag'}).configure(tiptapTagConfig),
+      Mention.extend({name: 'emojiMention'}).configure(tiptapEmojiConfig),
+      TiptapLinkExtension.configure({
+        openOnClick: false,
+        popover: {
+          setLinkState
+        }
+      })
+    ],
+    editable: true,
+    autofocus: true
+  })
+  return {editor: editorRef.current, linkState, setLinkState}
+}
diff --git a/packages/mattermost-plugin/index.css b/packages/mattermost-plugin/index.css
new file mode 100644
index 00000000000..8735aeb2457
--- /dev/null
+++ b/packages/mattermost-plugin/index.css
@@ -0,0 +1,15 @@
+@layer theme, base, components, utilities;
+@import "tailwindcss/theme.css" layer(theme);
+@import "tailwindcss/utilities.css" layer(utilities);
+@source "../client";
+
+.form-control.h-auto {
+  @apply h-auto;
+}
+
+div[data-radix-popper-content-wrapper] {
+  @apply z-1500;
+  > div {
+    @apply z-1500;
+  }
+}
diff --git a/packages/mattermost-plugin/index.tsx b/packages/mattermost-plugin/index.tsx
index 464e08a63d0..e2968985edc 100644
--- a/packages/mattermost-plugin/index.tsx
+++ b/packages/mattermost-plugin/index.tsx
@@ -1,3 +1,4 @@
+import * as Tooltip from '@radix-ui/react-tooltip'
 import {AnyAction, Store} from '@reduxjs/toolkit'
 import {GlobalState} from 'mattermost-redux/types/store'
 import SidePanelRoot from './components/Sidepanel'
@@ -17,6 +18,7 @@ import {createEnvironment} from './Atmosphere'
 import AtmosphereProvider from './AtmosphereProvider'
 import AutoLogin from './components/AutoLogin'
 import ModalRoot from './components/ModalRoot'
+import './index.css'
 
 export const init = async (registry: PluginRegistry, store: Store<GlobalState, AnyAction>) => {
   const serverUrl = getPluginServerRoute(store.getState())
@@ -34,7 +36,9 @@ export const init = async (registry: PluginRegistry, store: Store<GlobalState, A
   ))
   registry.registerRootComponent(() => (
     <AtmosphereProvider environment={environment}>
-      <ModalRoot />
+      <Tooltip.Provider>
+        <ModalRoot />
+      </Tooltip.Provider>
     </AtmosphereProvider>
   ))
   const {toggleRHSPlugin} = registry.registerRightHandSidebarComponent(
diff --git a/packages/mattermost-plugin/package.json b/packages/mattermost-plugin/package.json
index 75d0befc40a..a777497fe9b 100644
--- a/packages/mattermost-plugin/package.json
+++ b/packages/mattermost-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "parabol-mattermost-plugin",
-  "version": "8.23.8",
+  "version": "8.24.0",
   "description": "A service that computes embedding vectors from Parabol objects",
   "author": "Georg Bremer <github@dschoordsch.de>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/mattermost-plugin#readme",
@@ -28,6 +28,7 @@
     "@babel/core": "7.18.6",
     "@babel/preset-react": "^7.25.9",
     "@mattermost/types": "6.7.0-0",
+    "@tailwindcss/postcss": "^4.0.3",
     "@types/franc": "^5.0.3",
     "@types/node": "^16.11.62",
     "@types/react": "16.9.11",
@@ -35,21 +36,26 @@
     "@types/react-dom": "17.0.11",
     "@types/relay-runtime": "^18.1.1",
     "@types/styled-components": "^5.1.34",
+    "autoprefixer": "^10.4.20",
     "babel-plugin-inline-import": "^3.0.0",
     "babel-plugin-relay": "^18.2.0",
     "graphql": "^16.9.0",
     "jest": "^29.5.0",
     "jest-extended": "^3.2.4",
     "jest-junit": "^16.0.0",
+    "mini-css-extract-plugin": "^2.9.2",
     "openapi-fetch": "^0.10.0",
+    "postcss-loader": "^8.1.1",
     "react": "^17.0.2",
     "relay-compiler": "^18.2.0",
+    "tailwindcss": "^4.0.3",
     "ts-jest": "^29.1.0",
     "ts-node-dev": "^1.0.0-pre.44"
   },
   "dependencies": {
-    "parabol-client": "8.23.8",
     "@mattermost/compass-icons": "0.1.47",
+    "@radix-ui/react-popover": "^1.1.2",
+    "@radix-ui/react-tooltip": "^1.1.3",
     "@reduxjs/toolkit": "1.9.7",
     "@tiptap/core": "^2.9.1",
     "@tiptap/extension-link": "^2.9.1",
@@ -57,8 +63,8 @@
     "classnames": "^2.5.1",
     "dd-trace": "^5.0.0",
     "franc-min": "^5.0.0",
-    "marked": "^15.0.4",
     "mattermost-redux": "5.33.1",
+    "parabol-client": "8.24.0",
     "react-relay": "^18.2.0",
     "react-select": "5.8.2",
     "relay-runtime": "^18.1.1",
diff --git a/packages/mattermost-plugin/postcss.config.js b/packages/mattermost-plugin/postcss.config.js
new file mode 100644
index 00000000000..9a1b2d06c44
--- /dev/null
+++ b/packages/mattermost-plugin/postcss.config.js
@@ -0,0 +1,5 @@
+module.exports = {
+  plugins: [
+    '@tailwindcss/postcss',
+  ]
+}
diff --git a/packages/mattermost-plugin/prod.webpack.config.js b/packages/mattermost-plugin/prod.webpack.config.js
index 9c2c0a94533..7ab69c03120 100644
--- a/packages/mattermost-plugin/prod.webpack.config.js
+++ b/packages/mattermost-plugin/prod.webpack.config.js
@@ -1,6 +1,7 @@
 const webpack = require('webpack')
 const TerserPlugin = require('terser-webpack-plugin')
 const path = require('path')
+const MiniCssExtractPlugin = require('mini-css-extract-plugin')
 const getProjectRoot = require('../../scripts/webpack/utils/getProjectRoot')
 
 const PROJECT_ROOT = getProjectRoot()
@@ -73,6 +74,8 @@ module.exports = (config) => {
     resolve: {
       alias: {
         '~': path.join(CLIENT_ROOT),
+        // this is for radix-ui, we import & transform ESM packages, but they can't find react/jsx-runtime
+        'react/jsx-runtime': require.resolve('react/jsx-runtime')
       },
       extensions: [".ts", ".tsx", ".js"],
     },
@@ -87,6 +90,22 @@ module.exports = (config) => {
             presets: ["@babel/preset-react", "@babel/preset-typescript"],
           },
         },
+        {
+          test: /\.css$/,
+          exclude: /node_modules/,
+          use: [
+            MiniCssExtractPlugin.loader,
+            {
+              loader: 'css-loader',
+              options: {
+                importLoaders: 1,
+              }
+            },
+            {
+              loader: 'postcss-loader',
+            },
+          ],
+        },
       ],
     },
     optimization: {
@@ -119,7 +138,12 @@ module.exports = (config) => {
           }
         },
         */
-      })
+      }),
+      new MiniCssExtractPlugin({
+        filename: '[name]_[contenthash].css',
+        // name refers to the chunk name, which would create 1 copy for each chunk referencing the css
+        chunkFilename: '[contenthash].css'
+      }),
     ],
     externals: {
       react: 'React',
diff --git a/packages/mattermost-plugin/tsconfig.json b/packages/mattermost-plugin/tsconfig.json
index b75106d1a8a..e81a3174753 100644
--- a/packages/mattermost-plugin/tsconfig.json
+++ b/packages/mattermost-plugin/tsconfig.json
@@ -3,7 +3,6 @@
   "compilerOptions": {
     "baseUrl": "../",
     "paths": {
-      "parabol-server/*": ["server/*"],
       "parabol-client/*": ["client/*"],
       "~/*": ["client/*"]
     },
diff --git a/packages/mattermost-plugin/webpack.config.js b/packages/mattermost-plugin/webpack.config.js
index 96d7e3ac7d0..15bca759e7d 100644
--- a/packages/mattermost-plugin/webpack.config.js
+++ b/packages/mattermost-plugin/webpack.config.js
@@ -62,6 +62,8 @@ module.exports = {
   resolve: {
     alias: {
       '~': path.join(CLIENT_ROOT),
+      // this is for radix-ui, we import & transform ESM packages, but they can't find react/jsx-runtime
+      'react/jsx-runtime': require.resolve('react/jsx-runtime')
     },
     extensions: [".ts", ".tsx", ".js"],
   },
@@ -76,6 +78,24 @@ module.exports = {
           presets: ["@babel/preset-react", "@babel/preset-typescript"],
         },
       },
+      {
+        test: /\.css$/,
+        exclude: /node_modules/,
+        use: [
+          {
+            loader: 'style-loader'
+          },
+          {
+            loader: 'css-loader',
+            options: {
+              importLoaders: 1,
+            }
+          },
+          {
+            loader: 'postcss-loader',
+         }
+        ]
+      }
     ],
   },
   plugins: [
diff --git a/packages/server/__tests__/isTeamActive.test.ts b/packages/server/__tests__/isTeamActive.test.ts
new file mode 100644
index 00000000000..883b93b4497
--- /dev/null
+++ b/packages/server/__tests__/isTeamActive.test.ts
@@ -0,0 +1,204 @@
+import {ThresholdTest as Threshold} from '~/types/constEnums'
+import isTeamActive from '../graphql/public/types/helpers/isTeamActive'
+import getKysely from '../postgres/getKysely'
+import {createPGTables, truncatePGTables} from './common'
+
+const TEST_DB = 'isTeamActiveTest'
+
+// Mock data
+const mockOrgId = 'org123'
+const mockTeamId = 'team123'
+const mockUserId1 = 'user1'
+const mockUserId2 = 'user2'
+
+describe('isTeamActive', () => {
+  const pg = getKysely(TEST_DB)
+
+  beforeAll(async () => {
+    await pg.schema.createSchema(TEST_DB).ifNotExists().execute()
+    await createPGTables('Organization', 'Team', 'User', 'TeamMember', 'NewMeeting')
+  })
+
+  beforeEach(async () => {
+    await truncatePGTables('Organization', 'Team', 'User', 'TeamMember', 'NewMeeting')
+    await setupBaseTestData()
+  })
+
+  afterAll(async () => {
+    await pg.destroy()
+    console.log('isTeamActive destroy')
+  })
+
+  const setupBaseTestData = async () => {
+    await pg
+      .insertInto('Organization')
+      .values({
+        id: mockOrgId,
+        name: 'Test Org',
+        tier: 'team',
+        createdAt: new Date(),
+        updatedAt: new Date()
+      })
+      .execute()
+
+    await pg
+      .insertInto('Team')
+      .values({
+        id: mockTeamId,
+        name: 'Test Team',
+        isArchived: false,
+        orgId: mockOrgId,
+        tier: 'team',
+        createdAt: new Date(),
+        updatedAt: new Date()
+      })
+      .execute()
+
+    await pg
+      .insertInto('User')
+      .values([
+        {
+          id: mockUserId1,
+          inactive: false,
+          email: 'test1@test.com',
+          picture: '',
+          preferredName: 'Test User 1',
+          lastSeenAt: new Date(),
+          createdAt: new Date(),
+          updatedAt: new Date(),
+          tms: [mockTeamId]
+        },
+        {
+          id: mockUserId2,
+          inactive: false,
+          email: 'test2@test.com',
+          picture: '',
+          preferredName: 'Test User 2',
+          lastSeenAt: new Date(),
+          createdAt: new Date(),
+          updatedAt: new Date(),
+          tms: [mockTeamId]
+        }
+      ])
+      .execute()
+  }
+
+  const addTeamMembers = async (members: Array<{userId: string; isNotRemoved: boolean}>) => {
+    await pg
+      .insertInto('TeamMember')
+      .values(
+        members.map((member) => ({
+          id: `${mockTeamId}::${member.userId}`,
+          teamId: mockTeamId,
+          userId: member.userId,
+          isNotRemoved: member.isNotRemoved,
+          email: `test${member.userId}@test.com`,
+          picture: '',
+          preferredName: `Test User ${member.userId}`,
+          createdAt: new Date(),
+          updatedAt: new Date()
+        }))
+      )
+      .execute()
+  }
+
+  const addMeeting = async (date: Date, endedAt?: Date) => {
+    await pg
+      .insertInto('NewMeeting')
+      .values({
+        id: 'meeting1',
+        teamId: mockTeamId,
+        createdAt: date,
+        facilitatorStageId: 'stage1',
+        meetingType: 'retrospective',
+        name: 'Test Meeting',
+        meetingCount: 1,
+        meetingNumber: 1,
+        facilitatorUserId: mockUserId1,
+        ...(endedAt && {endedAt}),
+        phases: JSON.stringify([
+          {
+            id: 'phase1',
+            phaseType: 'lobby',
+            stages: [
+              {
+                id: 'stage1',
+                startAt: date.toISOString(),
+                endAt: date.toISOString(),
+                isComplete: true
+              }
+            ]
+          }
+        ])
+      })
+      .execute()
+  }
+
+  it('should return false for archived team', async () => {
+    await addTeamMembers([
+      {userId: mockUserId1, isNotRemoved: true},
+      {userId: mockUserId2, isNotRemoved: true}
+    ])
+    const recentDate = new Date(Date.now() - Threshold.STICKY_TEAM_LAST_MEETING_TIMEFRAME / 2)
+    await addMeeting(recentDate)
+    await pg.updateTable('Team').set({isArchived: true}).where('id', '=', mockTeamId).execute()
+    const result = await isTeamActive(mockTeamId)
+    expect(result).toBe(false)
+  })
+
+  it('should return false when team has less than 2 active members', async () => {
+    await addTeamMembers([{userId: mockUserId1, isNotRemoved: true}])
+    const result = await isTeamActive(mockTeamId)
+    expect(result).toBe(false)
+  })
+
+  it('should return false when team has no recent meetings', async () => {
+    await addTeamMembers([
+      {userId: mockUserId1, isNotRemoved: true},
+      {userId: mockUserId2, isNotRemoved: true}
+    ])
+    const result = await isTeamActive(mockTeamId)
+    expect(result).toBe(false)
+  })
+
+  it('should return false when team has old meetings only', async () => {
+    await addTeamMembers([
+      {userId: mockUserId1, isNotRemoved: true},
+      {userId: mockUserId2, isNotRemoved: true}
+    ])
+    const oldDate = new Date(Date.now() - (Threshold.STICKY_TEAM_LAST_MEETING_TIMEFRAME + 86400000))
+    await addMeeting(oldDate, oldDate)
+    const result = await isTeamActive(mockTeamId)
+    expect(result).toBe(false)
+  })
+
+  it('should return true for active team with recent meeting', async () => {
+    await addTeamMembers([
+      {userId: mockUserId1, isNotRemoved: true},
+      {userId: mockUserId2, isNotRemoved: true}
+    ])
+    const recentDate = new Date(Date.now() - Threshold.STICKY_TEAM_LAST_MEETING_TIMEFRAME / 2)
+    await addMeeting(recentDate)
+    const result = await isTeamActive(mockTeamId)
+    expect(result).toBe(true)
+  })
+
+  it('should return false when team has inactive members', async () => {
+    await addTeamMembers([
+      {userId: mockUserId1, isNotRemoved: true},
+      {userId: mockUserId2, isNotRemoved: true}
+    ])
+    await pg.updateTable('User').set({inactive: true}).where('id', '=', mockUserId2).execute()
+    const result = await isTeamActive(mockTeamId)
+    expect(result).toBe(false)
+  })
+
+  it('should return false when team has removed members', async () => {
+    await addTeamMembers([
+      {userId: mockUserId1, isNotRemoved: true},
+      {userId: mockUserId2, isNotRemoved: false}
+    ])
+    const result = await isTeamActive(mockTeamId)
+    expect(result).toBe(false)
+  })
+})
diff --git a/packages/server/graphql/ResponseStream.ts b/packages/server/graphql/ResponseStream.ts
index 0f4fa374df7..33049450548 100644
--- a/packages/server/graphql/ResponseStream.ts
+++ b/packages/server/graphql/ResponseStream.ts
@@ -44,7 +44,17 @@ export default class ResponseStream implements AsyncIterableIterator<ExecutionRe
     } catch (e) {
       const error =
         e instanceof Error ? e : new Error(`GQL executor failed to publish. docId: ${docId}`)
-      sendToSentry(error, {userId: getUserId(authToken)})
+      sendToSentry(error, {
+        userId: getUserId(authToken),
+        tags: {
+          authToken: JSON.stringify(authToken),
+          docId: docId || '',
+          query: query || '',
+          variables: JSON.stringify(variables),
+          socketServerId: socketId,
+          executorServerId
+        }
+      })
       return this.next()
     }
   }
diff --git a/packages/server/graphql/handleGraphQLTrebuchetRequest.ts b/packages/server/graphql/handleGraphQLTrebuchetRequest.ts
index 3721f51805d..8287c965f98 100644
--- a/packages/server/graphql/handleGraphQLTrebuchetRequest.ts
+++ b/packages/server/graphql/handleGraphQLTrebuchetRequest.ts
@@ -62,7 +62,8 @@ const handleGraphQLTrebuchetRequest = async (
             authToken: JSON.stringify(authToken),
             docId: docId || '',
             query: query || '',
-            variables: JSON.stringify(variables)
+            variables: JSON.stringify(variables),
+            socketServerId: socketId
           }
         })
         return {
diff --git a/packages/server/graphql/mutations/helpers/canAccessAI.ts b/packages/server/graphql/mutations/helpers/canAccessAI.ts
index f262721ca26..f64bce81ac1 100644
--- a/packages/server/graphql/mutations/helpers/canAccessAI.ts
+++ b/packages/server/graphql/mutations/helpers/canAccessAI.ts
@@ -3,21 +3,11 @@ import {Team} from '../../../postgres/types'
 import {DataLoaderWorker} from '../../graphql'
 import {getFeatureTier} from '../../types/helpers/getFeatureTier'
 
-const canAccessAI = async (
-  team: Team,
-  meetingType: 'standup' | 'retrospective',
-  dataLoader: DataLoaderWorker
-) => {
+const canAccessAI = async (team: Team, dataLoader: DataLoaderWorker) => {
   const {qualAIMeetingsCount, orgId} = team
   const org = await dataLoader.get('organizations').loadNonNull(orgId)
 
   if (!org.useAI) return false
-  if (meetingType === 'standup') {
-    const hasStandupFlag = await dataLoader
-      .get('featureFlagByOwnerId')
-      .load({ownerId: orgId, featureName: 'standupAISummary'})
-    return hasStandupFlag
-  }
 
   if (getFeatureTier(team) !== 'starter') return true
   return qualAIMeetingsCount < Threshold.MAX_QUAL_AI_MEETINGS
diff --git a/packages/server/graphql/mutations/helpers/generateDiscussionPrompt.ts b/packages/server/graphql/mutations/helpers/generateDiscussionPrompt.ts
index 7a6fe3f59ba..d073a173746 100644
--- a/packages/server/graphql/mutations/helpers/generateDiscussionPrompt.ts
+++ b/packages/server/graphql/mutations/helpers/generateDiscussionPrompt.ts
@@ -14,7 +14,7 @@ const generateDiscussionPrompt = async (
     dataLoader.get('users').loadNonNull(facilitatorUserId),
     dataLoader.get('teams').loadNonNull(teamId)
   ])
-  const isAIAvailable = await canAccessAI(team, 'retrospective', dataLoader)
+  const isAIAvailable = await canAccessAI(team, dataLoader)
   if (!isAIAvailable) return
   const [reflections, reflectionGroups] = await Promise.all([
     dataLoader.get('retroReflectionsByMeetingId').load(meetingId),
diff --git a/packages/server/graphql/mutations/helpers/generateGroups.ts b/packages/server/graphql/mutations/helpers/generateGroups.ts
index 639ef248a59..ac32d8b9b8e 100644
--- a/packages/server/graphql/mutations/helpers/generateGroups.ts
+++ b/packages/server/graphql/mutations/helpers/generateGroups.ts
@@ -16,7 +16,7 @@ const generateGroups = async (
   if (reflections.length === 0) return
   const {meetingId} = reflections[0]!
   const team = await dataLoader.get('teams').loadNonNull(teamId)
-  if (!(await canAccessAI(team, 'retrospective', dataLoader))) return
+  if (!(await canAccessAI(team, dataLoader))) return
   const groupReflectionsInput = reflections.map((reflection) => reflection.plaintextContent)
   const manager = new OpenAIServerManager()
 
diff --git a/packages/server/graphql/mutations/helpers/generateRetroSummary.ts b/packages/server/graphql/mutations/helpers/generateRetroSummary.ts
index 6395c88cf71..90fddc3c043 100644
--- a/packages/server/graphql/mutations/helpers/generateRetroSummary.ts
+++ b/packages/server/graphql/mutations/helpers/generateRetroSummary.ts
@@ -20,7 +20,7 @@ export const generateRetroSummary = async (
   const {teamId} = meeting
 
   const team = await dataLoader.get('teams').loadNonNull(teamId)
-  const isAISummaryAccessible = await canAccessAI(team, 'retrospective', dataLoader)
+  const isAISummaryAccessible = await canAccessAI(team, dataLoader)
   if (!isAISummaryAccessible) {
     return setSummaryToNull(meetingId)
   }
diff --git a/packages/server/graphql/mutations/helpers/generateStandupMeetingSummary.ts b/packages/server/graphql/mutations/helpers/generateStandupMeetingSummary.ts
index 5c150c630c3..9b4f49e95cf 100644
--- a/packages/server/graphql/mutations/helpers/generateStandupMeetingSummary.ts
+++ b/packages/server/graphql/mutations/helpers/generateStandupMeetingSummary.ts
@@ -10,8 +10,8 @@ const generateStandupMeetingSummary = async (
   dataLoader: DataLoaderWorker
 ) => {
   const team = await dataLoader.get('teams').loadNonNull(meeting.teamId)
-  const isAIAvailable = await canAccessAI(team, 'standup', dataLoader)
-  if (!isAIAvailable) return
+  const isAIAvailable = await canAccessAI(team, dataLoader)
+  if (!isAIAvailable) return null
 
   const responses = await getTeamPromptResponsesByMeetingId(meeting.id)
 
@@ -23,11 +23,11 @@ const generateStandupMeetingSummary = async (
     user: users[idx]?.preferredName ?? 'Anonymous'
   }))
 
-  if (contentWithUsers.length === 0) return
+  if (contentWithUsers.length === 0) return null
 
   const manager = new OpenAIServerManager()
   const summary = await manager.getStandupSummary(contentWithUsers, meeting.meetingPrompt)
-  if (!summary) return
+  if (!summary) return null
   return summary
 }
 
diff --git a/packages/server/graphql/mutations/helpers/generateWholeMeetingSentimentScore.ts b/packages/server/graphql/mutations/helpers/generateWholeMeetingSentimentScore.ts
index 264cd3e0445..33b593edc08 100644
--- a/packages/server/graphql/mutations/helpers/generateWholeMeetingSentimentScore.ts
+++ b/packages/server/graphql/mutations/helpers/generateWholeMeetingSentimentScore.ts
@@ -10,7 +10,7 @@ const generateWholeMeetingSentimentScore = async (
     dataLoader.get('retroReflectionsByMeetingId').load(meetingId)
   ])
   const team = await dataLoader.get('teams').loadNonNull(meeting.teamId)
-  const isAIAvailable = await canAccessAI(team, 'retrospective', dataLoader)
+  const isAIAvailable = await canAccessAI(team, dataLoader)
   if (!isAIAvailable || reflections.length === 0) return undefined
   const reflectionsWithSentimentScores = reflections.filter(
     ({sentimentScore}) => sentimentScore !== undefined
diff --git a/packages/server/graphql/mutations/helpers/safeEndTeamPrompt.ts b/packages/server/graphql/mutations/helpers/safeEndTeamPrompt.ts
index ae049b6c0b2..2de4a455ed7 100644
--- a/packages/server/graphql/mutations/helpers/safeEndTeamPrompt.ts
+++ b/packages/server/graphql/mutations/helpers/safeEndTeamPrompt.ts
@@ -20,9 +20,7 @@ const summarizeTeamPrompt = async (meeting: TeamPromptMeeting, context: Internal
   const pg = getKysely()
 
   const summary = await generateStandupMeetingSummary(meeting, dataLoader)
-  if (summary) {
-    await pg.updateTable('NewMeeting').set({summary}).where('id', '=', meeting.id).execute()
-  }
+  await pg.updateTable('NewMeeting').set({summary}).where('id', '=', meeting.id).execute()
 
   dataLoader.clearAll('newMeetings')
   // wait for whole meeting summary to be generated before sending summary email and updating qualAIMeetingCount
@@ -61,7 +59,8 @@ const safeEndTeamPrompt = async ({
     .set({
       endedAt: sql`CURRENT_TIMESTAMP`,
       usedReactjis: JSON.stringify(insights.usedReactjis),
-      engagement: insights.engagement
+      engagement: insights.engagement,
+      summary: '<loading>' // set as "<loading>" while the AI summary is being generated
     })
     .where('id', '=', meetingId)
     .execute()
diff --git a/packages/server/graphql/mutations/helpers/updateGroupTitle.ts b/packages/server/graphql/mutations/helpers/updateGroupTitle.ts
index 1593af7d938..7f6c8a15536 100644
--- a/packages/server/graphql/mutations/helpers/updateGroupTitle.ts
+++ b/packages/server/graphql/mutations/helpers/updateGroupTitle.ts
@@ -24,7 +24,7 @@ const updateGroupTitle = async (input: Input) => {
     return
   }
   const team = await dataLoader.get('teams').loadNonNull(teamId)
-  const hasAIAccess = await canAccessAI(team, 'retrospective', dataLoader)
+  const hasAIAccess = await canAccessAI(team, dataLoader)
   if (!hasAIAccess) {
     const smartTitle = getGroupSmartTitle(reflections)
     await updateSmartGroupTitle(reflectionGroupId, smartTitle)
diff --git a/packages/server/graphql/public/typeDefs/TeamPromptMeeting.graphql b/packages/server/graphql/public/typeDefs/TeamPromptMeeting.graphql
index 31fb8b30ec9..5a77a1f7b94 100644
--- a/packages/server/graphql/public/typeDefs/TeamPromptMeeting.graphql
+++ b/packages/server/graphql/public/typeDefs/TeamPromptMeeting.graphql
@@ -128,6 +128,11 @@ type TeamPromptMeeting implements NewMeeting {
   """
   showConversionModal: Boolean!
 
+  """
+  Is the OpenAI summary still being generated?
+  """
+  isLoadingSummary: Boolean!
+
   """
   The OpenAI generated summary of all the content in the meeting, such as reflections, tasks, and comments. Undefined if the user doesnt have access to the feature or it's unavailable in this meeting type`
   """
diff --git a/packages/server/graphql/public/types/TeamPromptMeeting.ts b/packages/server/graphql/public/types/TeamPromptMeeting.ts
index 87d921b26c7..b9ab444db37 100644
--- a/packages/server/graphql/public/types/TeamPromptMeeting.ts
+++ b/packages/server/graphql/public/types/TeamPromptMeeting.ts
@@ -99,7 +99,10 @@ const TeamPromptMeeting: TeamPromptMeetingResolvers = {
     ).filter(isValid)
     const commentCount = commentCounts.reduce((cumSum, count) => cumSum + count, 0)
     return commentCount
-  }
+  },
+
+  summary: ({summary}) => (summary === '<loading>' ? null : summary),
+  isLoadingSummary: ({summary}) => summary === '<loading>'
 }
 
 export default TeamPromptMeeting
diff --git a/packages/server/graphql/public/types/helpers/getActiveTeamCountByTeamIds.ts b/packages/server/graphql/public/types/helpers/getActiveTeamCountByTeamIds.ts
index c4acbd51737..bf4ff1d3fc9 100644
--- a/packages/server/graphql/public/types/helpers/getActiveTeamCountByTeamIds.ts
+++ b/packages/server/graphql/public/types/helpers/getActiveTeamCountByTeamIds.ts
@@ -1,56 +1,13 @@
-import {Threshold} from '~/types/constEnums'
-import getKysely from '../../../../postgres/getKysely'
-import {selectMeetingMembers} from '../../../../postgres/select'
-// Uncomment for easier testing
-//import { ThresholdTest as Threshold } from "~/types/constEnums";
+import isTeamActive from './isTeamActive'
 
-// Active team is the team that completed 3 meetings with more than 1 attendee
-// and have had at least 1 meeting in the last 30 days
-// Warning: the query is very expensive
-// TODO: store all calculations in the database, e.g. meeting.attendeeCount (see #7975)
+// Active team is a team that:
+// 1. Is not archived
+// 2. Has at least 2 active team members (users who are not inactive and not removed from team)
+// 3. Has had at least 1 meeting in the last 30 days
 const getActiveTeamCountByTeamIds = async (teamIds: string[]) => {
   if (!teamIds.length) return 0
-  const pg = getKysely()
-  const meetingIdsByTeamId = await pg
-    .selectFrom('NewMeeting')
-    .select(({fn}) => ['teamId', fn<string[]>('array_agg', ['id']).as('meetingIds')])
-    .where('teamId', 'in', teamIds)
-    .groupBy('teamId')
-    .execute()
-  const meetingIds = meetingIdsByTeamId.flatMap((row) => row.meetingIds)
-  if (!meetingIds.length) return 0
-  const meetingMembers = await selectMeetingMembers().where('id', 'in', meetingIds).execute()
-  const teamsIdsWithMinMeetingsAndMembers = meetingIdsByTeamId
-    .map(({teamId, meetingIds}) => ({
-      teamId,
-      meetingIds: meetingIds.filter((meetingId) => {
-        const memberCount = meetingMembers.filter(
-          (meetingMember) => meetingMember.meetingId === meetingId
-        ).length
-        return memberCount >= Threshold.MIN_STICKY_TEAM_MEETING_ATTENDEES
-      })
-    }))
-    .filter((row) => row.meetingIds.length > Threshold.MIN_STICKY_TEAM_MEETINGS)
-    .map((row) => row.teamId)
-  if (teamsIdsWithMinMeetingsAndMembers.length === 0) return 0
-  const recentMeetings = await pg
-    .selectFrom('NewMeeting')
-    .distinctOn('teamId')
-    .select(['teamId', 'createdAt'])
-    .where('teamId', 'in', teamsIdsWithMinMeetingsAndMembers)
-    .orderBy(['teamId', 'createdAt desc'])
-    .execute()
-
-  return teamsIdsWithMinMeetingsAndMembers.filter((teamId) => {
-    const recentMeetingsForTeam = recentMeetings.find(
-      (recentMeeting) => recentMeeting.teamId === teamId
-    )
-    if (!recentMeetingsForTeam) return false
-    return (
-      recentMeetingsForTeam.createdAt.getTime() >
-      Date.now() - Threshold.STICKY_TEAM_LAST_MEETING_TIMEFRAME
-    )
-  }).length
+  const activeTeams = await Promise.all(teamIds.map(async (teamId) => await isTeamActive(teamId)))
+  return activeTeams.filter(Boolean).length
 }
 
 export default getActiveTeamCountByTeamIds
diff --git a/packages/server/graphql/public/types/helpers/isTeamActive.ts b/packages/server/graphql/public/types/helpers/isTeamActive.ts
new file mode 100644
index 00000000000..88570fd3fa2
--- /dev/null
+++ b/packages/server/graphql/public/types/helpers/isTeamActive.ts
@@ -0,0 +1,51 @@
+import {Threshold} from '~/types/constEnums'
+import getKysely from '../../../../postgres/getKysely'
+
+/**
+ * Checks if a team is active based on the following criteria:
+ * 1. Is not archived
+ * 2. Has at least 2 active team members (users who are not inactive and not removed from team)
+ * 3. Has had at least 1 meeting in the last 30 days
+ */
+const isTeamActive = async (teamId: string): Promise<boolean> => {
+  const pg = getKysely()
+
+  // Check if team is archived
+  const team = await pg
+    .selectFrom('Team')
+    .select(['id'])
+    .where('id', '=', teamId)
+    .where('isArchived', '=', false)
+    .executeTakeFirst()
+
+  if (!team) return false
+
+  // Check for active team members
+  const teamMembersWithStatus = await pg
+    .selectFrom('TeamMember')
+    .innerJoin('User', 'User.id', 'TeamMember.userId')
+    .select(['TeamMember.teamId', 'User.inactive'])
+    .where('TeamMember.teamId', '=', teamId)
+    .where('TeamMember.isNotRemoved', '=', true)
+    .execute()
+
+  const activeMembers = teamMembersWithStatus.filter((member) => !member.inactive)
+  if (activeMembers.length < Threshold.MIN_ACTIVE_TEAM_MEETING_ATTENDEES) return false
+
+  // Check for recent meeting activity
+  const recentMeeting = await pg
+    .selectFrom('NewMeeting')
+    .select(['createdAt'])
+    .where('teamId', '=', teamId)
+    .orderBy('createdAt', 'desc')
+    .limit(1)
+    .executeTakeFirst()
+
+  if (!recentMeeting) return false
+
+  return (
+    recentMeeting.createdAt.getTime() > Date.now() - Threshold.ACTIVE_TEAM_LAST_MEETING_TIMEFRAME
+  )
+}
+
+export default isTeamActive
diff --git a/packages/server/package.json b/packages/server/package.json
index 853f3a04b23..598047a275b 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "8.23.8",
+  "version": "8.24.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
@@ -126,7 +126,7 @@
     "oauth-1.0a": "^2.2.6",
     "openai": "^4.53.0",
     "oy-vey": "^0.12.1",
-    "parabol-client": "8.23.8",
+    "parabol-client": "8.24.0",
     "pg": "^8.5.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
diff --git a/packages/server/postgres/types/index.d.ts b/packages/server/postgres/types/index.d.ts
index 4b2953f312d..b0b0f00134a 100644
--- a/packages/server/postgres/types/index.d.ts
+++ b/packages/server/postgres/types/index.d.ts
@@ -28,6 +28,7 @@ import {
   TaskEstimate as TaskEstimatePG,
   TeamMember as TeamMemberPG
 } from './pg'
+export type {TaskTag} from 'parabol-client/shared/types'
 
 type ExtractTypeFromQueryBuilderSelect<T extends (...args: any[]) => any> =
   ReturnType<T> extends SelectQueryBuilder<_, _, infer X> ? X : never
@@ -56,8 +57,6 @@ export type AutogroupReflectionGroupType = {
   reflectionIds: string[]
 }
 
-export type TaskTag = 'private' | 'archived'
-
 export interface Organization
   extends ExtractTypeFromQueryBuilderSelect<typeof selectOrganizations> {}
 export type OrganizationUser = Selectable<OrganizationUserPG>
diff --git a/pm2.dev.config.js b/pm2.dev.config.js
index f6f37093fb5..93c95ee7df7 100644
--- a/pm2.dev.config.js
+++ b/pm2.dev.config.js
@@ -91,7 +91,7 @@ module.exports = {
       name: 'Mattermost Relay Compiler',
       script: 'yarn workspace parabol-mattermost-plugin relay-compiler',
       watch: [
-        'packages/mattermost-plugin/**/*.ts*'
+        'packages/mattermost-plugin/**/*.[ts*,js*,css]'
       ],
       autorestart: false,
       instances: 1
diff --git a/yarn.lock b/yarn.lock
index bf83ce7bdf4..40f556c038a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7475,61 +7475,125 @@
     jiti "^2.4.2"
     tailwindcss "4.0.1"
 
+"@tailwindcss/node@^4.0.3":
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/@tailwindcss/node/-/node-4.0.3.tgz#2ea18bdc679be00f623e3a7240ab291255dc59b4"
+  integrity sha512-QsVJokOl0pJ4AbJV33D2npvLcHGPWi5MOSZtrtE0GT3tSx+3D0JE2lokLA8yHS1x3oCY/3IyRyy7XX6tmzid7A==
+  dependencies:
+    enhanced-resolve "^5.18.0"
+    jiti "^2.4.2"
+    tailwindcss "4.0.3"
+
 "@tailwindcss/oxide-android-arm64@4.0.1":
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-android-arm64/-/oxide-android-arm64-4.0.1.tgz#d7f5c1e9e0b5680ab987c3ba71c44cd9f881cedf"
   integrity sha512-eP/rI9WaAElpeiiHDqGtDqga9iDsOClXxIqdHayHsw93F24F03b60CwgGhrGF9Io/EuWIpz3TMRhPVOLhoXivw==
 
+"@tailwindcss/oxide-android-arm64@4.0.3":
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-android-arm64/-/oxide-android-arm64-4.0.3.tgz#d96756e6a28f563f4c958e7f71cffed687bf7dbc"
+  integrity sha512-S8XOTQuMnpijZRlPm5HBzPJjZ28quB+40LSRHjRnQF6rRYKsvpr1qkY7dfwsetNdd+kMLOMDsvmuT8WnqqETvg==
+
 "@tailwindcss/oxide-darwin-arm64@4.0.1":
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-darwin-arm64/-/oxide-darwin-arm64-4.0.1.tgz#152eb573be423eedaad92f92d5e0eede60c5e22d"
   integrity sha512-jZVUo0kNd1IjxdCYwg4dwegDNsq7PoUx4LM814RmgY3gfJ63Y6GlpJXHOpd5FLv1igpeZox5LzRk2oz8MQoJwQ==
 
+"@tailwindcss/oxide-darwin-arm64@4.0.3":
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-darwin-arm64/-/oxide-darwin-arm64-4.0.3.tgz#0a62c47674ae8dbea3b8888c54595c63e5a22fdf"
+  integrity sha512-smrY2DpzhXvgDhZtQlYAl8+vxJ04lv2/64C1eiRxvsRT2nkw/q+zA1/eAYKvUHat6cIuwqDku3QucmrUT6pCeg==
+
 "@tailwindcss/oxide-darwin-x64@4.0.1":
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-darwin-x64/-/oxide-darwin-x64-4.0.1.tgz#4ab26899f746495ff0688dab3a15548f85f6f1ea"
   integrity sha512-E31wHiIf4LB0aKRohrS4U6XfFSACCL9ifUFfPQ16FhcBIL4wU5rcBidvWvT9TQFGPkpE69n5dyXUcqiMrnF/Ig==
 
+"@tailwindcss/oxide-darwin-x64@4.0.3":
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-darwin-x64/-/oxide-darwin-x64-4.0.3.tgz#8d682f563d791b99e3a6292000785d12bd7fb1bf"
+  integrity sha512-NTz8x/LcGUjpZAWUxz0ZuzHao90Wj9spoQgomwB+/hgceh5gcJDfvaBYqxLFpKzVglpnbDSq1Fg0p0zI4oa5Pg==
+
 "@tailwindcss/oxide-freebsd-x64@4.0.1":
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-freebsd-x64/-/oxide-freebsd-x64-4.0.1.tgz#1a528886c833d1497c845cba590213beec2edb2e"
   integrity sha512-8/3ZKLMYqgAsBzTeczOKWtT4geF02g9S7cntY5gvqQZ4E0ImX724cHcZJi9k6fkE6aLbvwxxHxaShFvRxblwKQ==
 
+"@tailwindcss/oxide-freebsd-x64@4.0.3":
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-freebsd-x64/-/oxide-freebsd-x64-4.0.3.tgz#1c7dfd69c84f4f5df021a698be8f982f0d5a99c9"
+  integrity sha512-yQc9Q0JCOp3kkAV8gKgDctXO60IkQhHpqGB+KgOccDtD5UmN6Q5+gd+lcsDyQ7N8dRuK1fAud51xQpZJgKfm7g==
+
 "@tailwindcss/oxide-linux-arm-gnueabihf@4.0.1":
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-linux-arm-gnueabihf/-/oxide-linux-arm-gnueabihf-4.0.1.tgz#462730729223fe388c7791830c4da05c10c21806"
   integrity sha512-EYjbh225klQfWzy6LeIAfdjHCK+p71yLV/GjdPNW47Bfkkq05fTzIhHhCgshUvNp78EIA33iQU+ktWpW06NgHw==
 
+"@tailwindcss/oxide-linux-arm-gnueabihf@4.0.3":
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-linux-arm-gnueabihf/-/oxide-linux-arm-gnueabihf-4.0.3.tgz#7b3ef6f0a44d1a1a099bfced53c3e84a267fdc3d"
+  integrity sha512-e1ivVMLSnxTOU1O3npnxN16FEyWM/g3SuH2pP6udxXwa0/SnSAijRwcAYRpqIlhVKujr158S8UeHxQjC4fGl4w==
+
 "@tailwindcss/oxide-linux-arm64-gnu@4.0.1":
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-linux-arm64-gnu/-/oxide-linux-arm64-gnu-4.0.1.tgz#8bf4c011182cc0c519e51016373b4714348cd619"
   integrity sha512-PrX2SwIqWNP5cYeSyQfrhbk4ffOM338T6CrEwIAGvLPoUZiklt19yknlsBme6bReSw7TSAMy+8KFdLLi5fcWNQ==
 
+"@tailwindcss/oxide-linux-arm64-gnu@4.0.3":
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-linux-arm64-gnu/-/oxide-linux-arm64-gnu-4.0.3.tgz#6a7b8ad88332e8dc5d12c13294f86272f64f7b8a"
+  integrity sha512-PLrToqQqX6sdJ9DmMi8IxZWWrfjc9pdi9AEEPTrtMts3Jm9HBi1WqEeF1VwZZ2aW9TXloE5OwA35zuuq1Bhb/Q==
+
 "@tailwindcss/oxide-linux-arm64-musl@4.0.1":
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-linux-arm64-musl/-/oxide-linux-arm64-musl-4.0.1.tgz#90d3ace98b53577b6bf4e20ba9982fd6edb7cebb"
   integrity sha512-iuoFGhKDojtfloi5uj6MIk4kxEOGcsAk/kPbZItF9Dp7TnzVhxo2U/718tXhxGrg6jSL3ST3cQHIjA6yw3OeXw==
 
+"@tailwindcss/oxide-linux-arm64-musl@4.0.3":
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-linux-arm64-musl/-/oxide-linux-arm64-musl-4.0.3.tgz#6545c4f5d21e2d1a1d68ff61c07a14ff9abaf05e"
+  integrity sha512-YlzRxx7N1ampfgSKzEDw0iwDkJXUInR4cgNEqmR4TzHkU2Vhg59CGPJrTI7dxOBofD8+O35R13Nk9Ytyv0JUFg==
+
 "@tailwindcss/oxide-linux-x64-gnu@4.0.1":
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-linux-x64-gnu/-/oxide-linux-x64-gnu-4.0.1.tgz#a1e7cf6b9c0f8bd5bf2df2bde870d5659b3ed3ac"
   integrity sha512-pNUrGQYyE8RK+N9yvkPmHnlKDfFbni9A3lsi37u4RoA/6Yn+zWVoegvAQMZu3w+jqnpb2A/bYJ+LumcclUZ3yg==
 
+"@tailwindcss/oxide-linux-x64-gnu@4.0.3":
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-linux-x64-gnu/-/oxide-linux-x64-gnu-4.0.3.tgz#7f87edc0930c451465fa16e1f995a567ea015f88"
+  integrity sha512-Xfc3z/li6XkuD7Hs+Uk6pjyCXnfnd9zuQTKOyDTZJ544xc2yoMKUkuDw6Et9wb31MzU2/c0CIUpTDa71lL9KHw==
+
 "@tailwindcss/oxide-linux-x64-musl@4.0.1":
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-linux-x64-musl/-/oxide-linux-x64-musl-4.0.1.tgz#06a071925c1ff156878473926e02ca767bcd42c2"
   integrity sha512-xSGWaDcT6SJ75su9zWXj8GYb2jM/przXwZGH96RTS7HGDIoI1tvgpls88YajG5Sx7hXaqAWCufjw5L/dlu+lzg==
 
+"@tailwindcss/oxide-linux-x64-musl@4.0.3":
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-linux-x64-musl/-/oxide-linux-x64-musl-4.0.3.tgz#709ba734457fa24e2a9f061e3adb94b3683568af"
+  integrity sha512-ugKVqKzwa/cjmqSQG17aS9DYrEcQ/a5NITcgmOr3JLW4Iz64C37eoDlkC8tIepD3S/Td/ywKAolTQ8fKbjEL4g==
+
 "@tailwindcss/oxide-win32-arm64-msvc@4.0.1":
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-win32-arm64-msvc/-/oxide-win32-arm64-msvc-4.0.1.tgz#c52f624c5e339e8b2e4923a3ffb5e0d0872520e6"
   integrity sha512-BUNL2isUZ2yWnbplPddggJpZxsqGHPZ1RJAYpu63W4znUnKCzI4m/jiy0WpyYqqOKL9jDM5q0QdsQ9mc3aw5YQ==
 
+"@tailwindcss/oxide-win32-arm64-msvc@4.0.3":
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-win32-arm64-msvc/-/oxide-win32-arm64-msvc-4.0.3.tgz#6acd7aa99103427d7c55be4ba7ec4274cdcaa108"
+  integrity sha512-qHPDMl+UUwsk1RMJMgAXvhraWqUUT+LR/tkXix5RA39UGxtTrHwsLIN1AhNxI5i2RFXAXfmFXDqZCdyQ4dWmAQ==
+
 "@tailwindcss/oxide-win32-x64-msvc@4.0.1":
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-win32-x64-msvc/-/oxide-win32-x64-msvc-4.0.1.tgz#df27b80c2b990e38b341d9b0f7f1a5e73d3ba367"
   integrity sha512-ZtcVu+XXOddGsPlvO5nh2fnbKmwly2C07ZB1lcYCf/b8qIWF04QY9o6vy6/+6ioLRfbp3E7H/ipFio38DZX4oQ==
 
+"@tailwindcss/oxide-win32-x64-msvc@4.0.3":
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-win32-x64-msvc/-/oxide-win32-x64-msvc-4.0.3.tgz#be9aadfaadd4522352af3bb054387b6870840350"
+  integrity sha512-+ujwN4phBGyOsPyLgGgeCyUm4Mul+gqWVCIGuSXWgrx9xVUnf6LVXrw0BDBc9Aq1S2qMyOTX4OkCGbZeoIo8Qw==
+
 "@tailwindcss/oxide@^4.0.1":
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/@tailwindcss/oxide/-/oxide-4.0.1.tgz#463be24d47dbf72169085d50b2036df0d2b0f83a"
@@ -7547,6 +7611,23 @@
     "@tailwindcss/oxide-win32-arm64-msvc" "4.0.1"
     "@tailwindcss/oxide-win32-x64-msvc" "4.0.1"
 
+"@tailwindcss/oxide@^4.0.3":
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/@tailwindcss/oxide/-/oxide-4.0.3.tgz#488ea050dddf521493e998542e8c60a6e9997348"
+  integrity sha512-FFcp3VNvRjjmFA39ORM27g2mbflMQljhvM7gxBAujHxUy4LXlKa6yMF9wbHdTbPqTONiCyyOYxccvJyVyI/XBg==
+  optionalDependencies:
+    "@tailwindcss/oxide-android-arm64" "4.0.3"
+    "@tailwindcss/oxide-darwin-arm64" "4.0.3"
+    "@tailwindcss/oxide-darwin-x64" "4.0.3"
+    "@tailwindcss/oxide-freebsd-x64" "4.0.3"
+    "@tailwindcss/oxide-linux-arm-gnueabihf" "4.0.3"
+    "@tailwindcss/oxide-linux-arm64-gnu" "4.0.3"
+    "@tailwindcss/oxide-linux-arm64-musl" "4.0.3"
+    "@tailwindcss/oxide-linux-x64-gnu" "4.0.3"
+    "@tailwindcss/oxide-linux-x64-musl" "4.0.3"
+    "@tailwindcss/oxide-win32-arm64-msvc" "4.0.3"
+    "@tailwindcss/oxide-win32-x64-msvc" "4.0.3"
+
 "@tailwindcss/postcss@^4.0.1":
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/@tailwindcss/postcss/-/postcss-4.0.1.tgz#b79b0908d0c1e285aeea4514e1a14df68c177417"
@@ -7559,6 +7640,18 @@
     postcss "^8.4.41"
     tailwindcss "4.0.1"
 
+"@tailwindcss/postcss@^4.0.3":
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/@tailwindcss/postcss/-/postcss-4.0.3.tgz#2adac55fc0659020b76b8f2963a30aa2a06b2e38"
+  integrity sha512-qUyxuhuI2eTgRJ+qfCQRAr69Cw7BdSz+PoNFUNoRuhPjikNC8+sxK+Mi/chaXAXewjv/zbf6if6z6ItVLh+e9Q==
+  dependencies:
+    "@alloc/quick-lru" "^5.2.0"
+    "@tailwindcss/node" "^4.0.3"
+    "@tailwindcss/oxide" "^4.0.3"
+    lightningcss "^1.29.1"
+    postcss "^8.4.41"
+    tailwindcss "4.0.3"
+
 "@tanstack/react-virtual@^3.0.0-beta.60":
   version "3.10.9"
   resolved "https://registry.yarnpkg.com/@tanstack/react-virtual/-/react-virtual-3.10.9.tgz#40606b6dd8aba8e977f576d8f7df07f69ca63eea"
@@ -7727,6 +7820,11 @@
   resolved "https://registry.yarnpkg.com/@tiptap/extension-text/-/extension-text-2.9.1.tgz#e4cda144b0af916ee0dafb700f833cd40eeae6d9"
   integrity sha512-3wo9uCrkLVLQFgbw2eFU37QAa1jq1/7oExa+FF/DVxdtHRS9E2rnUZ8s2hat/IWzvPUHXMwo3Zg2XfhoamQpCA==
 
+"@tiptap/extension-underline@^2.11.5":
+  version "2.11.5"
+  resolved "https://registry.yarnpkg.com/@tiptap/extension-underline/-/extension-underline-2.11.5.tgz#eacf453fec192e517fdadecb7a81c976a08a9e05"
+  integrity sha512-YpWHXNIkSoRSuzT2cvgKpyJ2tTz3LzqkTM64uC+uTJ8cUkvXIWUWejJR42q8ma/mTlQe4lHff4IQ0Sf58Digtw==
+
 "@tiptap/html@^2.9.1":
   version "2.9.1"
   resolved "https://registry.yarnpkg.com/@tiptap/html/-/html-2.9.1.tgz#0bc75c9eeb3abe6a9ed8d6285aabfdb96162519a"
@@ -9616,7 +9714,7 @@ auto-bind@~4.0.0:
   resolved "https://registry.yarnpkg.com/auto-bind/-/auto-bind-4.0.0.tgz#e3589fc6c2da8f7ca43ba9f84fa52a744fc997fb"
   integrity sha512-Hdw8qdNiqdJ8LqT0iK0sVzkFbzg6fhnQqqfWhBDxcHZvU75+B+ayzTy8x+k5Ix0Y92XOhOUlx74ps+bA6BeYMQ==
 
-autoprefixer@^10.4.13:
+autoprefixer@^10.4.13, autoprefixer@^10.4.20:
   version "10.4.20"
   resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.20.tgz#5caec14d43976ef42e32dcb4bd62878e96be5b3b"
   integrity sha512-XY25y5xSv/wEoqzDyXXME4AFfkZI0P23z6Fs3YgymDnKJkCGOnkL0iTxCa85UTqaSgfcqyf3UA6+c7wUvx/16g==
@@ -10321,9 +10419,9 @@ camelize@^1.0.0:
   integrity sha512-dU+Tx2fsypxTgtLoE36npi3UqcjSSMNYfkqgmoEhtZrraP5VWq0K7FkWVTYa8eMPtnU/G2txVsfdCJTn9uzpuQ==
 
 caniuse-lite@^1.0.30001646, caniuse-lite@^1.0.30001669, caniuse-lite@~1.0.0:
-  version "1.0.30001692"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001692.tgz#4585729d95e6b95be5b439da6ab55250cd125bf9"
-  integrity sha512-A95VKan0kdtrsnMubMKxEKUKImOPSuCpYgxSQBo036P5YYgVIcOYJEgt/txJWqObiRQeISNCfef9nvlQ0vbV7A==
+  version "1.0.30001697"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001697.tgz#040bbbb54463c4b4b3377c716b34a322d16e6fc7"
+  integrity sha512-GwNPlWJin8E+d7Gxq96jxM6w0w+VFeyyXRsjU58emtkYqnbwHqXm5uT2uCmO0RQE9htWknOP4xtBlLmM/gWxvQ==
 
 capital-case@^1.0.4:
   version "1.0.4"
@@ -11220,6 +11318,16 @@ cosmiconfig@^8.1.0, cosmiconfig@^8.1.3, cosmiconfig@^8.3.5:
     parse-json "^5.2.0"
     path-type "^4.0.0"
 
+cosmiconfig@^9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-9.0.0.tgz#34c3fc58287b915f3ae905ab6dc3de258b55ad9d"
+  integrity sha512-itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg==
+  dependencies:
+    env-paths "^2.2.1"
+    import-fresh "^3.3.0"
+    js-yaml "^4.1.0"
+    parse-json "^5.2.0"
+
 cpu-features@~0.0.10:
   version "0.0.10"
   resolved "https://registry.yarnpkg.com/cpu-features/-/cpu-features-0.0.10.tgz#9aae536db2710c7254d7ed67cb3cbc7d29ad79c5"
@@ -12214,7 +12322,7 @@ entities@^5.0.0:
   resolved "https://registry.yarnpkg.com/entities/-/entities-5.0.0.tgz#b2ab51fe40d995817979ec79dd621154c3c0f62b"
   integrity sha512-BeJFvFRJddxobhvEdm5GqHzRV/X+ACeuw0/BuuxsCh1EUZcAIz8+kYmBp/LrQuloy6K1f3a0M7+IhmZ7QnkISA==
 
-env-paths@^2.2.0:
+env-paths@^2.2.0, env-paths@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2"
   integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==
@@ -17137,11 +17245,6 @@ marked@^13.0.3:
   resolved "https://registry.yarnpkg.com/marked/-/marked-13.0.3.tgz#5c5b4a5d0198060c7c9bc6ef9420a7fed30f822d"
   integrity sha512-rqRix3/TWzE9rIoFGIn8JmsVfhiuC8VIQ8IdX5TfzmeBucdY05/0UlzKaw0eVtpcN/OdVFpBk7CjKGo9iHJ/zA==
 
-marked@^15.0.4:
-  version "15.0.4"
-  resolved "https://registry.yarnpkg.com/marked/-/marked-15.0.4.tgz#864dbf50227b6507646c771c2ef5f0de2924833e"
-  integrity sha512-TCHvDqmb3ZJ4PWG7VEGVgtefA5/euFmsIhxtD0XsBxI39gUSKL81mIRFdt0AiNQozUahd4ke98ZdirExd/vSEw==
-
 marked@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/marked/-/marked-4.3.0.tgz#796362821b019f734054582038b116481b456cf3"
@@ -17325,7 +17428,7 @@ mini-create-react-context@^0.4.0:
     "@babel/runtime" "^7.12.1"
     tiny-warning "^1.0.3"
 
-mini-css-extract-plugin@^2.7.2:
+mini-css-extract-plugin@^2.7.2, mini-css-extract-plugin@^2.9.2:
   version "2.9.2"
   resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.9.2.tgz#966031b468917a5446f4c24a80854b2947503c5b"
   integrity sha512-GJuACcS//jtq4kCtd5ii/M0SZf7OZRH+BxdqXZHaJfb8TJiVl+NgQRPwiYt2EuqeSkNydn/7vP+bcE27C5mb9w==
@@ -19367,6 +19470,15 @@ postcss-loader@^7.0.2:
     jiti "^1.20.0"
     semver "^7.5.4"
 
+postcss-loader@^8.1.1:
+  version "8.1.1"
+  resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-8.1.1.tgz#2822589e7522927344954acb55bbf26e8b195dfe"
+  integrity sha512-0IeqyAsG6tYiDRCYKQJLAmgQr47DX6N7sFSWvQxt6AcupX8DIdmykuk/o/tx0Lze3ErGHJEp5OSRxrelC6+NdQ==
+  dependencies:
+    cosmiconfig "^9.0.0"
+    jiti "^1.20.0"
+    semver "^7.5.4"
+
 postcss-modules-extract-imports@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.1.0.tgz#b4497cb85a9c0c4b5aabeb759bb25e8d89f15002"
@@ -22051,7 +22163,7 @@ string-similarity@^3.0.0:
   resolved "https://registry.yarnpkg.com/string-similarity/-/string-similarity-3.0.0.tgz#07b0bc69fae200ad88ceef4983878d03793847c7"
   integrity sha512-7kS7LyTp56OqOI2BDWQNVnLX/rCxIQn+/5M0op1WV6P8Xx6TZNdajpuqQdiJ7Xx+p1C5CsWMvdiBp9ApMhxzEQ==
 
-"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+"string-width-cjs@npm:string-width@^4.2.0":
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -22069,6 +22181,15 @@ string-width@^1.0.1:
     is-fullwidth-code-point "^1.0.0"
     strip-ansi "^3.0.0"
 
+"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
+
 string-width@^5.0.0, string-width@^5.0.1, string-width@^5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794"
@@ -22155,7 +22276,7 @@ stringify-object@^3.3.0:
     is-obj "^1.0.1"
     is-regexp "^1.0.0"
 
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -22169,6 +22290,13 @@ strip-ansi@^3.0.0, strip-ansi@^3.0.1:
   dependencies:
     ansi-regex "^2.0.0"
 
+strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
 strip-ansi@^7.0.1:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45"
@@ -22396,6 +22524,11 @@ tailwindcss@4.0.1, tailwindcss@^4.0.1:
   resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-4.0.1.tgz#ae722697352001233a8f491aeb755e83139c453b"
   integrity sha512-UK5Biiit/e+r3i0O223bisoS5+y7ZT1PM8Ojn0MxRHzXN1VPZ2KY6Lo6fhu1dOfCfyUAlK7Lt6wSxowRabATBw==
 
+tailwindcss@4.0.3, tailwindcss@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-4.0.3.tgz#8f34c24cd23e021662113bd4e13df1e700cb52f8"
+  integrity sha512-ImmZF0Lon5RrQpsEAKGxRvHwCvMgSC4XVlFRqmbzTEDb/3wvin9zfEZrMwgsa3yqBbPqahYcVI6lulM2S7IZAA==
+
 tapable@^2.0.0, tapable@^2.1.1, tapable@^2.2.0, tapable@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0"
@@ -24178,7 +24311,7 @@ workbox-window@6.6.1:
     "@types/trusted-types" "^2.0.2"
     workbox-core "6.6.1"
 
-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
@@ -24196,6 +24329,15 @@ wrap-ansi@^6.0.1, wrap-ansi@^6.2.0:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
+wrap-ansi@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
 wrap-ansi@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"