[comp] Production Deploy

apps/app/package.json

@@ -60,9 +60,9 @@
         "@tanstack/react-form": "^1.23.8",
         "@tanstack/react-query": "^5.90.7",
         "@tanstack/react-table": "^8.21.3",
-        "@tiptap/extension-mention": "3.16.0",
-        "@tiptap/extension-table": "3.16.0",
-        "@tiptap/react": "3.16.0",
+        "@tiptap/extension-mention": "3.22.1",
+        "@tiptap/extension-table": "3.22.1",
+        "@tiptap/react": "3.22.1",
         "@trigger.dev/react-hooks": "4.4.3",
         "@trigger.dev/sdk": "4.4.3",
         "@trycompai/auth": "workspace:*",
@@ -96,7 +96,7 @@
         "framer-motion": "^12.18.1",
         "geist": "^1.3.1",
         "jspdf": "^4.2.0",
-        "lucide-react": "^0.577.0",
+        "lucide-react": "^1.7.0",
         "mammoth": "^1.11.0",
         "motion": "^12.35.0",
         "nanoid": "^5.1.6",

apps/app/src/components/ai-elements/reasoning.tsx

@@ -218,7 +218,7 @@ export const ReasoningContent = memo(
       )}
       {...props}
     >
-      <Streamdown plugins={streamdownPlugins} {...props}>
+      <Streamdown plugins={streamdownPlugins}>
         {children}
       </Streamdown>
     </CollapsibleContent>

apps/app/src/trigger/tasks/task/task-schedule.ts

@@ -235,11 +235,11 @@ export const taskSchedule = schedules.task({
             : ('todo' as const);
 
           // Check if user is unsubscribed
-          const isUnsubscribed = await isUserUnsubscribed(db, recipient.email, 'taskAssignments', recipient.task.organizationId);
+          const isUnsubscribed = await isUserUnsubscribed(db, recipient.email, 'taskReminders', recipient.task.organizationId);
 
           if (isUnsubscribed) {
             logger.info(
-              `Skipping notification: user ${recipient.email} is unsubscribed from task assignments`,
+              `Skipping notification: user ${recipient.email} is unsubscribed from task reminders`,
             );
             return;
           }

apps/framework-editor/package.json

@@ -9,13 +9,13 @@
         "@tailwindcss/postcss": "^4.1.17",
         "@tanstack/react-table": "^8.21.3",
         "@tanstack/react-virtual": "^3.13.8",
-        "@tiptap/react": "^3.13.0",
+        "@tiptap/react": "3.22.1",
         "@trycompai/company": "workspace:*",
         "@trycompai/db": "workspace:*",
         "@trycompai/ui": "workspace:*",
         "better-auth": "^1.4.22",
         "framer-motion": "^12.23.9",
-        "lucide-react": "^0.518.0",
+        "lucide-react": "^1.7.0",
         "next": "^16.2.0",
         "nuqs": "^2.4.3",
         "react": "^19.0.0",

apps/portal/src/app/(app)/(home)/[orgId]/layout.tsx

@@ -0,0 +1,33 @@
+import { auth } from '@/app/lib/auth';
+import { headers } from 'next/headers';
+import { redirect } from 'next/navigation';
+
+export default async function OrgLayout({
+  children,
+  params,
+}: {
+  children: React.ReactNode;
+  params: Promise<{ orgId: string }>;
+}) {
+  const { orgId } = await params;
+  const requestHeaders = await headers();
+
+  const session = await auth.api.getSession({ headers: requestHeaders });
+
+  if (!session?.user) {
+    return redirect('/auth');
+  }
+
+  // Sync activeOrganizationId if it doesn't match the URL's orgId.
+  // Without this, multi-org users get 403s because HybridAuthGuard
+  // resolves memberId from the session's activeOrganizationId, not the URL.
+  const currentActiveOrgId = session.session.activeOrganizationId;
+  if (!currentActiveOrgId || currentActiveOrgId !== orgId) {
+    await auth.api.setActiveOrganization({
+      headers: requestHeaders,
+      body: { organizationId: orgId },
+    });
+  }
+
+  return <>{children}</>;
+}

apps/portal/src/app/lib/auth.ts

@@ -116,13 +116,44 @@ async function getSession(options: { headers: ReadonlyHeaders | Headers }): Prom
   }
 }
 
+/**
+ * Set the active organization for the current session.
+ * Calls the API's better-auth organization endpoint so both
+ * server and client session state stay in sync.
+ */
+async function setActiveOrganization(options: {
+  headers: ReadonlyHeaders | Headers;
+  body: { organizationId: string };
+}): Promise<void> {
+  try {
+    const response = await fetch(`${API_URL}/api/auth/organization/set-active`, {
+      method: 'POST',
+      headers: {
+        ...headersToObject(options.headers),
+        'Content-Type': 'application/json',
+      },
+      body: JSON.stringify({ organizationId: options.body.organizationId }),
+      cache: 'no-store',
+    });
+
+    if (!response.ok && IS_DEVELOPMENT) {
+      console.error('[auth] Failed to set active organization:', response.status);
+    }
+  } catch (error) {
+    if (IS_DEVELOPMENT) {
+      console.error('[auth] Failed to set active organization:', error);
+    }
+  }
+}
+
 /**
  * Auth object matching the interface used throughout the portal.
  * All methods call the NestJS API — no local better-auth instance.
  */
 export const auth = {
   api: {
     getSession,
+    setActiveOrganization,
   },
 };