refactor(db): remove per-workspace audit logging from verification

Verification throws on any count mismatch — per-workspace logging
adds noise without value. Aligns with the backfill migration pattern.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

.codex/environments/environment.toml

@@ -1,9 +0,0 @@
-# THIS IS AUTOGENERATED. DO NOT EDIT MANUALLY
-version = 1
-name = "formbricks"
-
-[setup]
-script = '''
-pnpm install
-pnpm dev:setup
-'''

.env.example

@@ -38,6 +38,15 @@ LOG_LEVEL=info
 
 DATABASE_URL='postgresql://postgres:postgres@localhost:5432/formbricks?schema=public'
 
+#################
+#  HUB (DEV)    #
+#################
+# The dev stack (pnpm db:up / pnpm go) runs Formbricks Hub on port 8080.
+# Set explicitly to avoid confusion; override as needed when using docker-compose.dev.yml.
+HUB_API_KEY=dev-api-key
+HUB_API_URL=http://localhost:8080
+HUB_DATABASE_URL=postgresql://postgres:postgres@postgres:5432/postgres?sslmode=disable
+
 ################
 #  MAIL SETUP  #
 ################
@@ -94,12 +103,6 @@ EMAIL_VERIFICATION_DISABLED=1
 # Password Reset. If you enable Password Reset functionality you have to setup SMTP-Settings, too.
 PASSWORD_RESET_DISABLED=1
 
-# Password reset token lifetime in minutes. Must be between 5 and 120 if set.
-# PASSWORD_RESET_TOKEN_LIFETIME_MINUTES=30
-
-# Development-only helper: log the password reset link to the server console instead of sending reset emails.
-# DEBUG_SHOW_RESET_LINK=1
-
 # Email login. Disable the ability for users to login with email.
 # EMAIL_AUTH_DISABLED=1
 
@@ -191,14 +194,6 @@ ENTERPRISE_LICENSE_KEY=
 # Ignore Rate Limiting across the Formbricks app
 # RATE_LIMITING_DISABLED=1
 
-# Disable telemetry reporting (usage stats sent to Formbricks). Ignored when an EE license is active.
-# TELEMETRY_DISABLED=1
-
-# Allow webhook URLs to point to internal/private network addresses (e.g. localhost, 192.168.x.x)
-# WARNING: Only enable this if you understand the SSRF risks. Useful for self-hosted instances
-# that need to send webhooks to internal services.
-# DANGEROUSLY_ALLOW_WEBHOOK_INTERNAL_URLS=1
-
 # OpenTelemetry OTLP endpoint (base URL, exporters append /v1/traces and /v1/metrics)
 # OTEL_EXPORTER_OTLP_ENDPOINT=http://localhost:4318
 # OTEL_EXPORTER_OTLP_PROTOCOL=http/protobuf

.gitignore

@@ -45,7 +45,7 @@ yarn-error.log*
 .direnv
 
 # Playwright
-**/test-results/
+/test-results/
 /playwright-report/
 /blob-report/
 /playwright/.cache/

README.md

@@ -127,10 +127,34 @@ Formbricks has a hosted cloud offering with a generous free plan to get you up a
 
 Formbricks is available Open-Source under AGPLv3 license. You can host Formbricks on your own servers using Docker without a subscription.
 
+If you opt for self-hosting Formbricks, here are a few options to consider:
+
 #### Docker
 
 To get started with self-hosting with Docker, take a look at our [self-hosting docs](https://formbricks.com/docs/self-hosting/deployment).
 
+#### Community-managed One Click Hosting
+
+##### Railway
+
+You can deploy Formbricks on [Railway](https://railway.app) using the button below.
+
+[![Deploy on Railway](https://railway.app/button.svg)](https://railway.app/new/template/PPDzCd)
+
+##### RepoCloud
+
+Or you can also deploy Formbricks on [RepoCloud](https://repocloud.io) using the button below.
+
+[![Deploy on RepoCloud](https://d16t0pc4846x52.cloudfront.net/deploy.png)](https://repocloud.io/details/?app_id=254)
+
+##### Zeabur
+
+Or you can also deploy Formbricks on [Zeabur](https://zeabur.com) using the button below.
+
+[![Deploy to Zeabur](https://zeabur.com/button.svg)](https://zeabur.com/templates/G4TUJL)
+
+<a id="development"></a>
+
 ## 👨‍💻 Development
 
 ### Prerequisites
@@ -223,4 +247,4 @@ We currently do not offer Formbricks white-labeled. That means that we don't sel
 
 The Enterprise Edition allows us to fund the development of Formbricks sustainably. It guarantees that the free and open-source surveying infrastructure we're building will be around for decades to come.
 
-<a id="readme-de"></a>
+<p align="right"><a href="#top">🔼 Back to top</a></p>

apps/web/app/(app)/(onboarding)/environments/[environmentId]/connect/components/ConnectWithFormbricks.tsx

@@ -5,7 +5,7 @@ import { useRouter } from "next/navigation";
 import { useEffect } from "react";
 import { useTranslation } from "react-i18next";
 import { TEnvironment } from "@formbricks/types/environment";
-import { TProjectConfigChannel } from "@formbricks/types/project";
+import { TWorkspaceConfigChannel } from "@formbricks/types/workspace";
 import { cn } from "@/lib/cn";
 import { Button } from "@/modules/ui/components/button";
 import { OnboardingSetupInstructions } from "./OnboardingSetupInstructions";
@@ -14,7 +14,7 @@ interface ConnectWithFormbricksProps {
   environment: TEnvironment;
   publicDomain: string;
   appSetupCompleted: boolean;
-  channel: TProjectConfigChannel;
+  channel: TWorkspaceConfigChannel;
 }
 
 export const ConnectWithFormbricks = ({

apps/web/app/(app)/(onboarding)/environments/[environmentId]/connect/components/OnboardingSetupInstructions.tsx

@@ -5,7 +5,7 @@ import "prismjs/themes/prism.css";
 import { useState } from "react";
 import toast from "react-hot-toast";
 import { useTranslation } from "react-i18next";
-import { TProjectConfigChannel } from "@formbricks/types/project";
+import { TWorkspaceConfigChannel } from "@formbricks/types/workspace";
 import { Button } from "@/modules/ui/components/button";
 import { CodeBlock } from "@/modules/ui/components/code-block";
 import { Html5Icon, NpmIcon } from "@/modules/ui/components/icons";
@@ -19,7 +19,7 @@ const tabs = [
 interface OnboardingSetupInstructionsProps {
   environmentId: string;
   publicDomain: string;
-  channel: TProjectConfigChannel;
+  channel: TWorkspaceConfigChannel;
   appSetupCompleted: boolean;
 }
 

apps/web/app/(app)/(onboarding)/environments/[environmentId]/connect/page.tsx

@@ -4,7 +4,7 @@ import { ResourceNotFoundError } from "@formbricks/types/errors";
 import { ConnectWithFormbricks } from "@/app/(app)/(onboarding)/environments/[environmentId]/connect/components/ConnectWithFormbricks";
 import { getEnvironment } from "@/lib/environment/service";
 import { getPublicDomain } from "@/lib/getPublicUrl";
-import { getProjectByEnvironmentId } from "@/lib/project/service";
+import { getWorkspaceByEnvironmentId } from "@/lib/workspace/service";
 import { getTranslate } from "@/lingodotdev/server";
 import { Button } from "@/modules/ui/components/button";
 import { Header } from "@/modules/ui/components/header";
@@ -24,12 +24,12 @@ const Page = async (props: ConnectPageProps) => {
     throw new ResourceNotFoundError(t("common.environment"), params.environmentId);
   }
 
-  const project = await getProjectByEnvironmentId(environment.id);
-  if (!project) {
+  const workspace = await getWorkspaceByEnvironmentId(environment.id);
+  if (!workspace) {
     throw new ResourceNotFoundError(t("common.workspace"), null);
   }
 
-  const channel = project.config.channel || null;
+  const channel = workspace.config.channel || null;
 
   const publicDomain = getPublicDomain();
 

apps/web/app/(app)/(onboarding)/environments/[environmentId]/xm-templates/components/XMTemplateList.tsx

@@ -5,10 +5,10 @@ import { useRouter } from "next/navigation";
 import { useState } from "react";
 import toast from "react-hot-toast";
 import { useTranslation } from "react-i18next";
-import { TProject } from "@formbricks/types/project";
 import { TSurveyCreateInput } from "@formbricks/types/surveys/types";
 import { TXMTemplate } from "@formbricks/types/templates";
 import { TUser } from "@formbricks/types/user";
+import { TWorkspace } from "@formbricks/types/workspace";
 import { replacePresetPlaceholders } from "@/app/(app)/(onboarding)/environments/[environmentId]/xm-templates/lib/utils";
 import { getXMTemplates } from "@/app/(app)/(onboarding)/environments/[environmentId]/xm-templates/lib/xm-templates";
 import { OnboardingOptionsContainer } from "@/app/(app)/(onboarding)/organizations/components/OnboardingOptionsContainer";
@@ -16,12 +16,12 @@ import { getFormattedErrorMessage } from "@/lib/utils/helper";
 import { createSurveyAction } from "@/modules/survey/components/template-list/actions";
 
 interface XMTemplateListProps {
-  project: TProject;
+  workspace: TWorkspace;
   user: TUser;
   environmentId: string;
 }
 
-export const XMTemplateList = ({ project, user, environmentId }: XMTemplateListProps) => {
+export const XMTemplateList = ({ workspace, user, environmentId }: XMTemplateListProps) => {
   const [activeTemplateId, setActiveTemplateId] = useState<number | null>(null);
   const { t } = useTranslation();
   const router = useRouter();
@@ -48,7 +48,7 @@ export const XMTemplateList = ({ project, user, environmentId }: XMTemplateListP
   const handleTemplateClick = (templateIdx: number) => {
     setActiveTemplateId(templateIdx);
     const template = getXMTemplates(t)[templateIdx];
-    const newTemplate = replacePresetPlaceholders(template, project);
+    const newTemplate = replacePresetPlaceholders(template, workspace);
     createSurvey(newTemplate);
   };
 

apps/web/app/(app)/(onboarding)/environments/[environmentId]/xm-templates/lib/utils.test.ts

@@ -1,17 +1,17 @@
 import "@testing-library/jest-dom/vitest";
 import { cleanup } from "@testing-library/react";
 import { afterEach, describe, expect, test } from "vitest";
-import { TProject } from "@formbricks/types/project";
 import { TSurveyElementTypeEnum } from "@formbricks/types/surveys/constants";
 import { TXMTemplate } from "@formbricks/types/templates";
+import { TWorkspace } from "@formbricks/types/workspace";
 import { replacePresetPlaceholders } from "./utils";
 
 // Mock data
-const mockProject: TProject = {
-  id: "project1",
+const mockWorkspace: TWorkspace = {
+  id: "workspace1",
   createdAt: new Date(),
   updatedAt: new Date(),
-  name: "Test Project",
+  name: "Test Workspace",
   organizationId: "org1",
   styling: {
     allowStyleOverwrite: true,
@@ -32,7 +32,7 @@ const mockProject: TProject = {
   logo: null,
 };
 const mockTemplate: TXMTemplate = {
-  name: "$[projectName] Survey",
+  name: "$[workspaceName] Survey",
   blocks: [
     {
       id: "block1",
@@ -42,7 +42,7 @@ const mockTemplate: TXMTemplate = {
           id: "q1",
           type: "openText" as TSurveyElementTypeEnum.OpenText,
           inputType: "text" as const,
-          headline: { default: "$[projectName] Question" },
+          headline: { default: "$[workspaceName] Question" },
           subheader: { default: "" },
           required: false,
           placeholder: { default: "" },
@@ -70,19 +70,19 @@ describe("replacePresetPlaceholders", () => {
     cleanup();
   });
 
-  test("replaces projectName placeholder in template name", () => {
-    const result = replacePresetPlaceholders(mockTemplate, mockProject);
-    expect(result.name).toBe("Test Project Survey");
+  test("replaces workspaceName placeholder in template name", () => {
+    const result = replacePresetPlaceholders(mockTemplate, mockWorkspace);
+    expect(result.name).toBe("Test Workspace Survey");
   });
 
-  test("replaces projectName placeholder in element headline", () => {
-    const result = replacePresetPlaceholders(mockTemplate, mockProject);
-    expect(result.blocks[0].elements[0].headline.default).toBe("Test Project Question");
+  test("replaces workspaceName placeholder in element headline", () => {
+    const result = replacePresetPlaceholders(mockTemplate, mockWorkspace);
+    expect(result.blocks[0].elements[0].headline.default).toBe("Test Workspace Question");
   });
 
   test("returns a new object without mutating the original template", () => {
     const originalTemplate = structuredClone(mockTemplate);
-    const result = replacePresetPlaceholders(mockTemplate, mockProject);
+    const result = replacePresetPlaceholders(mockTemplate, mockWorkspace);
     expect(result).not.toBe(mockTemplate);
     expect(mockTemplate).toEqual(originalTemplate);
   });

apps/web/app/(app)/(onboarding)/environments/[environmentId]/xm-templates/lib/utils.ts

@@ -1,16 +1,16 @@
-import { TProject } from "@formbricks/types/project";
 import { TSurveyBlock } from "@formbricks/types/surveys/blocks";
 import { TXMTemplate } from "@formbricks/types/templates";
+import { TWorkspace } from "@formbricks/types/workspace";
 import { replaceElementPresetPlaceholders } from "@/lib/utils/templates";
 
-// replace all occurences of projectName with the actual project name in the current template
-export const replacePresetPlaceholders = (template: TXMTemplate, project: TProject): TXMTemplate => {
+// replace all occurences of workspaceName with the actual workspace name in the current template
+export const replacePresetPlaceholders = (template: TXMTemplate, workspace: TWorkspace): TXMTemplate => {
   const survey = structuredClone(template);
 
   const modifiedBlocks = survey.blocks.map((block: TSurveyBlock) => ({
     ...block,
-    elements: block.elements.map((element) => replaceElementPresetPlaceholders(element, project)),
+    elements: block.elements.map((element) => replaceElementPresetPlaceholders(element, workspace)),
   }));
 
-  return { ...survey, name: survey.name.replace("$[projectName]", project.name), blocks: modifiedBlocks };
+  return { ...survey, name: survey.name.replace("$[workspaceName]", workspace.name), blocks: modifiedBlocks };
 };

apps/web/app/(app)/(onboarding)/environments/[environmentId]/xm-templates/page.tsx

@@ -4,9 +4,8 @@ import Link from "next/link";
 import { AuthenticationError, ResourceNotFoundError } from "@formbricks/types/errors";
 import { XMTemplateList } from "@/app/(app)/(onboarding)/environments/[environmentId]/xm-templates/components/XMTemplateList";
 import { getEnvironment } from "@/lib/environment/service";
-import { getProjectByEnvironmentId, getUserProjects } from "@/lib/project/service";
 import { getUser } from "@/lib/user/service";
-import { getOrganizationIdFromEnvironmentId } from "@/lib/utils/helper";
+import { getUserWorkspaces, getWorkspaceByEnvironmentId } from "@/lib/workspace/service";
 import { getTranslate } from "@/lingodotdev/server";
 import { authOptions } from "@/modules/auth/lib/authOptions";
 import { Button } from "@/modules/ui/components/button";
@@ -35,20 +34,18 @@ const Page = async (props: XMTemplatePageProps) => {
     throw new ResourceNotFoundError(t("common.environment"), params.environmentId);
   }
 
-  const organizationId = await getOrganizationIdFromEnvironmentId(environment.id);
-
-  const project = await getProjectByEnvironmentId(environment.id);
-  if (!project) {
+  const workspace = await getWorkspaceByEnvironmentId(environment.id);
+  if (!workspace) {
     throw new ResourceNotFoundError(t("common.workspace"), null);
   }
 
-  const projects = await getUserProjects(session.user.id, organizationId);
+  const workspaces = await getUserWorkspaces(session.user.id, workspace.organizationId);
 
   return (
     <div className="flex min-h-full min-w-full flex-col items-center justify-center space-y-12">
       <Header title={t("environments.xm-templates.headline")} />
-      <XMTemplateList project={project} user={user} environmentId={environment.id} />
-      {projects.length >= 2 && (
+      <XMTemplateList workspace={workspace} user={user} environmentId={environment.id} />
+      {workspaces.length >= 2 && (
         <Button
           className="absolute right-5 top-5 !mt-0 text-slate-500 hover:text-slate-700"
           variant="ghost"

apps/web/app/(app)/(onboarding)/organizations/[organizationId]/landing/layout.tsx

@@ -2,7 +2,7 @@ import { getServerSession } from "next-auth";
 import { notFound, redirect } from "next/navigation";
 import { getEnvironments } from "@/lib/environment/service";
 import { getMembershipByUserIdOrganizationId } from "@/lib/membership/service";
-import { getUserProjects } from "@/lib/project/service";
+import { getUserWorkspaces } from "@/lib/workspace/service";
 import { authOptions } from "@/modules/auth/lib/authOptions";
 
 const LandingLayout = async (props: {
@@ -24,11 +24,11 @@ const LandingLayout = async (props: {
     return notFound();
   }
 
-  const projects = await getUserProjects(session.user.id, params.organizationId);
+  const workspaces = await getUserWorkspaces(session.user.id, params.organizationId);
 
-  if (projects.length !== 0) {
-    const firstProject = projects[0];
-    const environments = await getEnvironments(firstProject.id);
+  if (workspaces.length !== 0) {
+    const firstWorkspace = workspaces[0];
+    const environments = await getEnvironments(firstWorkspace.id);
     const prodEnvironment = environments.find((e) => e.type === "production");
 
     if (prodEnvironment) {

apps/web/app/(app)/(onboarding)/organizations/[organizationId]/landing/page.tsx

@@ -1,6 +1,6 @@
 import { notFound, redirect } from "next/navigation";
 import { LandingSidebar } from "@/app/(app)/(onboarding)/organizations/[organizationId]/landing/components/landing-sidebar";
-import { ProjectAndOrgSwitch } from "@/app/(app)/environments/[environmentId]/components/project-and-org-switch";
+import { WorkspaceAndOrgSwitch } from "@/app/(app)/environments/[environmentId]/components/workspace-and-org-switch";
 import { IS_FORMBRICKS_CLOUD } from "@/lib/constants";
 import { getMembershipByUserIdOrganizationId } from "@/lib/membership/service";
 import { getAccessFlags } from "@/lib/membership/utils";
@@ -34,12 +34,12 @@ const Page = async (props: { params: Promise<{ organizationId: string }> }) => {
       <div className="flex-1">
         <div className="flex h-full flex-col">
           <div className="p-6">
-            {/* we only need to render organization breadcrumb on this page, organizations/projects are lazy-loaded */}
-            <ProjectAndOrgSwitch
+            {/* we only need to render organization breadcrumb on this page, organizations/workspaces are lazy-loaded */}
+            <WorkspaceAndOrgSwitch
               currentOrganizationId={organization.id}
               currentOrganizationName={organization.name}
               isMultiOrgEnabled={isMultiOrgEnabled}
-              organizationProjectsLimit={0}
+              organizationWorkspacesLimit={0}
               isFormbricksCloud={IS_FORMBRICKS_CLOUD}
               isLicenseActive={false}
               isOwnerOrManager={false}

apps/web/app/(app)/(onboarding)/organizations/[organizationId]/layout.tsx

@@ -8,7 +8,7 @@ import { getTranslate } from "@/lingodotdev/server";
 import { authOptions } from "@/modules/auth/lib/authOptions";
 import { ToasterClient } from "@/modules/ui/components/toaster-client";
 
-const ProjectOnboardingLayout = async (props: {
+const WorkspaceOnboardingLayout = async (props: {
   params: Promise<{ organizationId: string }>;
   children: React.ReactNode;
 }) => {
@@ -47,4 +47,4 @@ const ProjectOnboardingLayout = async (props: {
   );
 };
 
-export default ProjectOnboardingLayout;
+export default WorkspaceOnboardingLayout;

apps/web/app/(app)/(onboarding)/organizations/[organizationId]/workspaces/new/channel/page.tsx

@@ -2,7 +2,7 @@ import { PictureInPicture2Icon, SendIcon, XIcon } from "lucide-react";
 import Link from "next/link";
 import { redirect } from "next/navigation";
 import { OnboardingOptionsContainer } from "@/app/(app)/(onboarding)/organizations/components/OnboardingOptionsContainer";
-import { getUserProjects } from "@/lib/project/service";
+import { getUserWorkspaces } from "@/lib/workspace/service";
 import { getTranslate } from "@/lingodotdev/server";
 import { getOrganizationAuth } from "@/modules/organization/lib/utils";
 import { Button } from "@/modules/ui/components/button";
@@ -39,7 +39,7 @@ const Page = async (props: ChannelPageProps) => {
     },
   ];
 
-  const projects = await getUserProjects(session.user.id, params.organizationId);
+  const workspaces = await getUserWorkspaces(session.user.id, params.organizationId);
 
   return (
     <div className="flex min-h-full min-w-full flex-col items-center justify-center space-y-12">
@@ -48,7 +48,7 @@ const Page = async (props: ChannelPageProps) => {
         subtitle={t("organizations.workspaces.new.channel.channel_select_subtitle")}
       />
       <OnboardingOptionsContainer options={channelOptions} />
-      {projects.length >= 1 && (
+      {workspaces.length >= 1 && (
         <Button
           className="absolute right-5 top-5 !mt-0 text-slate-500 hover:text-slate-700"
           variant="ghost"

apps/web/app/(app)/(onboarding)/organizations/[organizationId]/workspaces/new/layout.tsx

@@ -4,10 +4,10 @@ import { ResourceNotFoundError } from "@formbricks/types/errors";
 import { getMembershipByUserIdOrganizationId } from "@/lib/membership/service";
 import { getAccessFlags } from "@/lib/membership/utils";
 import { getOrganization } from "@/lib/organization/service";
-import { getOrganizationProjectsCount } from "@/lib/project/service";
+import { getOrganizationWorkspacesCount } from "@/lib/workspace/service";
 import { getTranslate } from "@/lingodotdev/server";
 import { authOptions } from "@/modules/auth/lib/authOptions";
-import { getOrganizationProjectsLimit } from "@/modules/ee/license-check/lib/utils";
+import { getOrganizationWorkspacesLimit } from "@/modules/ee/license-check/lib/utils";
 
 const OnboardingLayout = async (props: {
   params: Promise<{ organizationId: string }>;
@@ -32,12 +32,12 @@ const OnboardingLayout = async (props: {
     throw new ResourceNotFoundError(t("common.organization"), params.organizationId);
   }
 
-  const [organizationProjectsLimit, organizationProjectsCount] = await Promise.all([
-    getOrganizationProjectsLimit(organization.id),
-    getOrganizationProjectsCount(organization.id),
+  const [organizationWorkspacesLimit, organizationWorkspacesCount] = await Promise.all([
+    getOrganizationWorkspacesLimit(organization.id),
+    getOrganizationWorkspacesCount(organization.id),
   ]);
 
-  if (organizationProjectsCount >= organizationProjectsLimit) {
+  if (organizationWorkspacesCount >= organizationWorkspacesLimit) {
     return redirect(`/`);
   }
 

apps/web/app/(app)/(onboarding)/organizations/[organizationId]/workspaces/new/mode/page.tsx

@@ -2,7 +2,7 @@ import { HeartIcon, ListTodoIcon, XIcon } from "lucide-react";
 import Link from "next/link";
 import { redirect } from "next/navigation";
 import { OnboardingOptionsContainer } from "@/app/(app)/(onboarding)/organizations/components/OnboardingOptionsContainer";
-import { getUserProjects } from "@/lib/project/service";
+import { getUserWorkspaces } from "@/lib/workspace/service";
 import { getTranslate } from "@/lingodotdev/server";
 import { getOrganizationAuth } from "@/modules/organization/lib/utils";
 import { Button } from "@/modules/ui/components/button";
@@ -39,13 +39,13 @@ const Page = async (props: ModePageProps) => {
     },
   ];
 
-  const projects = await getUserProjects(session.user.id, params.organizationId);
+  const workspaces = await getUserWorkspaces(session.user.id, params.organizationId);
 
   return (
     <div className="flex min-h-full min-w-full flex-col items-center justify-center space-y-12">
       <Header title={t("organizations.workspaces.new.mode.what_are_you_here_for")} />
       <OnboardingOptionsContainer options={channelOptions} />
-      {projects.length >= 1 && (
+      {workspaces.length >= 1 && (
         <Button
           className="absolute right-5 top-5 !mt-0 text-slate-500 hover:text-slate-700"
           variant="ghost"

apps/web/app/(app)/(onboarding)/organizations/[organizationId]/workspaces/new/settings/components/WorkspaceSettings.tsx

@@ -8,19 +8,19 @@ import { useForm } from "react-hook-form";
 import { toast } from "react-hot-toast";
 import { useTranslation } from "react-i18next";
 import {
-  TProjectConfigChannel,
-  TProjectConfigIndustry,
-  TProjectMode,
-  TProjectUpdateInput,
-  ZProjectUpdateInput,
-} from "@formbricks/types/project";
-import { createProjectAction } from "@/app/(app)/environments/[environmentId]/actions";
+  TWorkspaceConfigChannel,
+  TWorkspaceConfigIndustry,
+  TWorkspaceMode,
+  TWorkspaceUpdateInput,
+  ZWorkspaceUpdateInput,
+} from "@formbricks/types/workspace";
+import { createWorkspaceAction } from "@/app/(app)/environments/[environmentId]/actions";
 import { previewSurvey } from "@/app/lib/templates";
 import { FORMBRICKS_SURVEYS_FILTERS_KEY_LS } from "@/lib/localStorage";
 import { buildStylingFromBrandColor } from "@/lib/styling/constants";
 import { getFormattedErrorMessage } from "@/lib/utils/helper";
-import { TOrganizationTeam } from "@/modules/ee/teams/project-teams/types/team";
 import { CreateTeamModal } from "@/modules/ee/teams/team-list/components/create-team-modal";
+import { TOrganizationTeam } from "@/modules/ee/teams/workspace-teams/types/team";
 import { Button } from "@/modules/ui/components/button";
 import { ColorPicker } from "@/modules/ui/components/color-picker";
 import {
@@ -36,34 +36,34 @@ import { Input } from "@/modules/ui/components/input";
 import { MultiSelect } from "@/modules/ui/components/multi-select";
 import { SurveyInline } from "@/modules/ui/components/survey";
 
-interface ProjectSettingsProps {
+interface WorkspaceSettingsProps {
   organizationId: string;
-  projectMode: TProjectMode;
-  channel: TProjectConfigChannel;
-  industry: TProjectConfigIndustry;
+  workspaceMode: TWorkspaceMode;
+  channel: TWorkspaceConfigChannel;
+  industry: TWorkspaceConfigIndustry;
   defaultBrandColor: string;
   organizationTeams: TOrganizationTeam[];
   isAccessControlAllowed: boolean;
-  userProjectsCount: number;
+  userWorkspacesCount: number;
   publicDomain: string;
 }
 
-export const ProjectSettings = ({
+export const WorkspaceSettings = ({
   organizationId,
-  projectMode,
+  workspaceMode,
   channel,
   industry,
   defaultBrandColor,
   organizationTeams,
   isAccessControlAllowed = false,
-  userProjectsCount,
+  userWorkspacesCount,
   publicDomain,
-}: ProjectSettingsProps) => {
+}: WorkspaceSettingsProps) => {
   const [createTeamModalOpen, setCreateTeamModalOpen] = useState(false);
 
   const router = useRouter();
   const { t } = useTranslation();
-  const addProject = async (data: TProjectUpdateInput) => {
+  const addWorkspace = async (data: TWorkspaceUpdateInput) => {
     try {
       // Build the full styling from the chosen brand color so all derived
       // colours (question, button, input, option, progress, etc.) are persisted.
@@ -71,7 +71,7 @@ export const ProjectSettings = ({
       // back to STYLE_DEFAULTS computed from the default brand (#64748b).
       const fullStyling = buildStylingFromBrandColor(data.styling?.brandColor?.light);
 
-      const createProjectResponse = await createProjectAction({
+      const createWorkspaceResponse = await createWorkspaceAction({
         organizationId,
         data: {
           ...data,
@@ -81,14 +81,14 @@ export const ProjectSettings = ({
         },
       });
 
-      if (createProjectResponse?.data) {
+      if (createWorkspaceResponse?.data) {
         // get production environment
-        const productionEnvironment = createProjectResponse.data.environments.find(
-          (environment) => environment.type === "production"
+        const productionEnvironment = createWorkspaceResponse.data.environments.find(
+          (environment: { type: string }) => environment.type === "production"
         );
         if (productionEnvironment) {
           if (globalThis.window !== undefined) {
-            // Rmove filters when creating a new project
+            // Remove filters when creating a new workspace
             localStorage.removeItem(FORMBRICKS_SURVEYS_FILTERS_KEY_LS);
           }
         }
@@ -96,11 +96,11 @@ export const ProjectSettings = ({
           router.push(`/environments/${productionEnvironment?.id}/connect`);
         } else if (channel === "link") {
           router.push(`/environments/${productionEnvironment?.id}/surveys`);
-        } else if (projectMode === "cx") {
+        } else if (workspaceMode === "cx") {
           router.push(`/environments/${productionEnvironment?.id}/xm-templates`);
         }
       } else {
-        const errorMessage = getFormattedErrorMessage(createProjectResponse);
+        const errorMessage = getFormattedErrorMessage(createWorkspaceResponse);
         toast.error(errorMessage);
       }
     } catch (error) {
@@ -109,15 +109,15 @@ export const ProjectSettings = ({
     }
   };
 
-  const form = useForm<TProjectUpdateInput>({
+  const form = useForm<TWorkspaceUpdateInput>({
     defaultValues: {
       name: "",
       styling: { allowStyleOverwrite: true, brandColor: { light: defaultBrandColor } },
       teamIds: [],
     },
-    resolver: zodResolver(ZProjectUpdateInput),
+    resolver: zodResolver(ZWorkspaceUpdateInput),
   });
-  const projectName = form.watch("name");
+  const workspaceName = form.watch("name");
   const logoUrl = form.watch("logo.url");
   const brandColor = form.watch("styling.brandColor.light") ?? defaultBrandColor;
   const previewStyling = useMemo(() => buildStylingFromBrandColor(brandColor), [brandColor]);
@@ -132,7 +132,7 @@ export const ProjectSettings = ({
     <div className="mt-6 flex w-5/6 space-x-10 lg:w-2/3 2xl:w-1/2">
       <div className="flex w-1/2 flex-col space-y-4">
         <FormProvider {...form}>
-          <form onSubmit={form.handleSubmit(addProject)} className="w-full space-y-4">
+          <form onSubmit={form.handleSubmit(addWorkspace)} className="w-full space-y-4">
             <FormField
               control={form.control}
               name="styling.brandColor.light"
@@ -184,7 +184,7 @@ export const ProjectSettings = ({
               )}
             />
 
-            {isAccessControlAllowed && userProjectsCount > 0 && (
+            {isAccessControlAllowed && userWorkspacesCount > 0 && (
               <FormField
                 control={form.control}
                 name="teamIds"
@@ -242,7 +242,7 @@ export const ProjectSettings = ({
         <SurveyInline
           appUrl={publicDomain}
           isPreviewMode={true}
-          survey={previewSurvey(projectName || t("common.my_product"), t)}
+          survey={previewSurvey(workspaceName || t("common.my_product"), t)}
           styling={previewStyling}
           isBrandingEnabled={false}
           languageCode="default"

apps/web/app/(app)/(onboarding)/organizations/[organizationId]/workspaces/new/settings/page.tsx

@@ -2,30 +2,34 @@ import { XIcon } from "lucide-react";
 import Link from "next/link";
 import { redirect } from "next/navigation";
 import { ResourceNotFoundError } from "@formbricks/types/errors";
-import { TProjectConfigChannel, TProjectConfigIndustry, TProjectMode } from "@formbricks/types/project";
+import {
+  TWorkspaceConfigChannel,
+  TWorkspaceConfigIndustry,
+  TWorkspaceMode,
+} from "@formbricks/types/workspace";
 import { getTeamsByOrganizationId } from "@/app/(app)/(onboarding)/lib/onboarding";
-import { ProjectSettings } from "@/app/(app)/(onboarding)/organizations/[organizationId]/workspaces/new/settings/components/ProjectSettings";
+import { WorkspaceSettings } from "@/app/(app)/(onboarding)/organizations/[organizationId]/workspaces/new/settings/components/WorkspaceSettings";
 import { DEFAULT_BRAND_COLOR } from "@/lib/constants";
 import { getPublicDomain } from "@/lib/getPublicUrl";
-import { getUserProjects } from "@/lib/project/service";
+import { getUserWorkspaces } from "@/lib/workspace/service";
 import { getTranslate } from "@/lingodotdev/server";
 import { getAccessControlPermission } from "@/modules/ee/license-check/lib/utils";
 import { getOrganizationAuth } from "@/modules/organization/lib/utils";
 import { Button } from "@/modules/ui/components/button";
 import { Header } from "@/modules/ui/components/header";
 
-interface ProjectSettingsPageProps {
+interface WorkspaceSettingsPageProps {
   params: Promise<{
     organizationId: string;
   }>;
   searchParams: Promise<{
-    channel?: TProjectConfigChannel;
-    industry?: TProjectConfigIndustry;
-    mode?: TProjectMode;
+    channel?: TWorkspaceConfigChannel;
+    industry?: TWorkspaceConfigIndustry;
+    mode?: TWorkspaceMode;
   }>;
 }
 
-const Page = async (props: ProjectSettingsPageProps) => {
+const Page = async (props: WorkspaceSettingsPageProps) => {
   const searchParams = await props.searchParams;
   const params = await props.params;
   const t = await getTranslate();
@@ -39,7 +43,7 @@ const Page = async (props: ProjectSettingsPageProps) => {
   const channel = searchParams.channel ?? null;
   const industry = searchParams.industry ?? null;
   const mode = searchParams.mode ?? "surveys";
-  const projects = await getUserProjects(session.user.id, params.organizationId);
+  const workspaces = await getUserWorkspaces(session.user.id, params.organizationId);
 
   const organizationTeams = await getTeamsByOrganizationId(params.organizationId);
 
@@ -57,18 +61,18 @@ const Page = async (props: ProjectSettingsPageProps) => {
         title={t("organizations.workspaces.new.settings.workspace_settings_title")}
         subtitle={t("organizations.workspaces.new.settings.workspace_settings_subtitle")}
       />
-      <ProjectSettings
+      <WorkspaceSettings
         organizationId={params.organizationId}
-        projectMode={mode}
+        workspaceMode={mode}
         channel={channel}
         industry={industry}
         defaultBrandColor={DEFAULT_BRAND_COLOR}
         organizationTeams={organizationTeams}
         isAccessControlAllowed={isAccessControlAllowed}
-        userProjectsCount={projects.length}
+        userWorkspacesCount={workspaces.length}
         publicDomain={publicDomain}
       />
-      {projects.length >= 1 && (
+      {workspaces.length >= 1 && (
         <Button
           className="absolute right-5 top-5 !mt-0 text-slate-500 hover:text-slate-700"
           variant="ghost"

apps/web/app/(app)/environments/[environmentId]/actions.ts

@@ -7,29 +7,29 @@ import {
   OperationNotAllowedError,
   ResourceNotFoundError,
 } from "@formbricks/types/errors";
-import { ZProjectUpdateInput } from "@formbricks/types/project";
+import { ZWorkspaceUpdateInput } from "@formbricks/types/workspace";
 import { getMembershipByUserIdOrganizationId } from "@/lib/membership/service";
 import { getOrganization } from "@/lib/organization/service";
-import { getOrganizationProjectsCount } from "@/lib/project/service";
 import { updateUser } from "@/lib/user/service";
 import { authenticatedActionClient } from "@/lib/utils/action-client";
 import { checkAuthorizationUpdated } from "@/lib/utils/action-client/action-client-middleware";
+import { getOrganizationWorkspacesCount } from "@/lib/workspace/service";
 import { withAuditLogging } from "@/modules/ee/audit-logs/lib/handler";
 import {
   getAccessControlPermission,
-  getOrganizationProjectsLimit,
+  getOrganizationWorkspacesLimit,
 } from "@/modules/ee/license-check/lib/utils";
-import { createProject } from "@/modules/projects/settings/lib/project";
+import { createWorkspace } from "@/modules/workspaces/settings/lib/workspace";
 import { getOrganizationsByUserId } from "./lib/organization";
-import { getProjectsByUserId } from "./lib/project";
+import { getWorkspacesByUserId } from "./lib/workspace";
 
-const ZCreateProjectAction = z.object({
+const ZCreateWorkspaceAction = z.object({
   organizationId: ZId,
-  data: ZProjectUpdateInput,
+  data: ZWorkspaceUpdateInput,
 });
 
-export const createProjectAction = authenticatedActionClient.inputSchema(ZCreateProjectAction).action(
-  withAuditLogging("created", "project", async ({ ctx, parsedInput }) => {
+export const createWorkspaceAction = authenticatedActionClient.inputSchema(ZCreateWorkspaceAction).action(
+  withAuditLogging("created", "workspace", async ({ ctx, parsedInput }) => {
     const { user } = ctx;
 
     const organizationId = parsedInput.organizationId;
@@ -40,7 +40,7 @@ export const createProjectAction = authenticatedActionClient.inputSchema(ZCreate
       access: [
         {
           data: parsedInput.data,
-          schema: ZProjectUpdateInput,
+          schema: ZWorkspaceUpdateInput,
           type: "organization",
           roles: ["owner", "manager"],
         },
@@ -53,10 +53,10 @@ export const createProjectAction = authenticatedActionClient.inputSchema(ZCreate
       throw new ResourceNotFoundError("Organization", organizationId);
     }
 
-    const organizationProjectsLimit = await getOrganizationProjectsLimit(organization.id);
-    const organizationProjectsCount = await getOrganizationProjectsCount(organization.id);
+    const organizationWorkspacesLimit = await getOrganizationWorkspacesLimit(organization.id);
+    const organizationWorkspacesCount = await getOrganizationWorkspacesCount(organization.id);
 
-    if (organizationProjectsCount >= organizationProjectsLimit) {
+    if (organizationWorkspacesCount >= organizationWorkspacesLimit) {
       throw new OperationNotAllowedError("Organization workspace limit reached");
     }
 
@@ -68,7 +68,7 @@ export const createProjectAction = authenticatedActionClient.inputSchema(ZCreate
       }
     }
 
-    const project = await createProject(parsedInput.organizationId, parsedInput.data);
+    const workspace = await createWorkspace(parsedInput.organizationId, parsedInput.data);
     const updatedNotificationSettings = {
       ...user.notificationSettings,
       alert: {
@@ -81,9 +81,9 @@ export const createProjectAction = authenticatedActionClient.inputSchema(ZCreate
     });
 
     ctx.auditLoggingCtx.organizationId = organizationId;
-    ctx.auditLoggingCtx.projectId = project.id;
-    ctx.auditLoggingCtx.newObject = project;
-    return project;
+    ctx.auditLoggingCtx.workspaceId = workspace.id;
+    ctx.auditLoggingCtx.newObject = workspace;
+    return workspace;
   })
 );
 
@@ -112,16 +112,16 @@ export const getOrganizationsForSwitcherAction = authenticatedActionClient
     return await getOrganizationsByUserId(ctx.user.id);
   });
 
-const ZGetProjectsForSwitcherAction = z.object({
+const ZGetWorkspacesForSwitcherAction = z.object({
   organizationId: ZId, // Changed from environmentId to avoid extra query
 });
 
 /**
  * Fetches projects list for switcher dropdown.
- * Called on-demand when user opens the project switcher.
+ * Called on-demand when user opens the workspace switcher.
  */
-export const getProjectsForSwitcherAction = authenticatedActionClient
-  .inputSchema(ZGetProjectsForSwitcherAction)
+export const getWorkspacesForSwitcherAction = authenticatedActionClient
+  .inputSchema(ZGetWorkspacesForSwitcherAction)
   .action(async ({ ctx, parsedInput }) => {
     await checkAuthorizationUpdated({
       userId: ctx.user.id,
@@ -134,11 +134,11 @@ export const getProjectsForSwitcherAction = authenticatedActionClient
       ],
     });
 
-    // Need membership for getProjectsByUserId (1 DB query)
+    // Need membership for getWorkspacesByUserId (1 DB query)
     const membership = await getMembershipByUserIdOrganizationId(ctx.user.id, parsedInput.organizationId);
     if (!membership) {
       throw new AuthorizationError("Membership not found");
     }
 
-    return await getProjectsByUserId(ctx.user.id, membership);
+    return await getWorkspacesByUserId(ctx.user.id, membership);
   });

apps/web/app/(app)/environments/[environmentId]/components/EnvironmentLayout.tsx

@@ -5,7 +5,7 @@ import { IS_DEVELOPMENT, IS_FORMBRICKS_CLOUD } from "@/lib/constants";
 import { getPublicDomain } from "@/lib/getPublicUrl";
 import { getAccessFlags } from "@/lib/membership/utils";
 import { getTranslate } from "@/lingodotdev/server";
-import { getOrganizationProjectsLimit } from "@/modules/ee/license-check/lib/utils";
+import { getOrganizationWorkspacesLimit } from "@/modules/ee/license-check/lib/utils";
 import { TEnvironmentLayoutData } from "@/modules/environments/types/environment-auth";
 import { LimitsReachedBanner } from "@/modules/ui/components/limits-reached-banner";
 import { PendingDowngradeBanner } from "@/modules/ui/components/pending-downgrade-banner";
@@ -25,10 +25,10 @@ export const EnvironmentLayout = async ({ layoutData, children }: EnvironmentLay
     environment,
     organization,
     membership,
-    project, // Current project details
-    environments, // All project environments (for environment switcher)
+    workspace, // Current workspace details
+    environments, // All workspace environments (for environment switcher)
     isAccessControlAllowed,
-    projectPermission,
+    workspacePermission,
     license,
     responseCount,
   } = layoutData;
@@ -38,11 +38,11 @@ export const EnvironmentLayout = async ({ layoutData, children }: EnvironmentLay
 
   const { features, lastChecked, isPendingDowngrade, active, status } = license;
   const isMultiOrgEnabled = features?.isMultiOrgEnabled ?? false;
-  const organizationProjectsLimit = await getOrganizationProjectsLimit(organization.id);
+  const organizationWorkspacesLimit = await getOrganizationWorkspacesLimit(organization.id);
   const isOwnerOrManager = isOwner || isManager;
 
-  // Validate that project permission exists for members
-  if (isMember && !projectPermission) {
+  // Validate that workspace permission exists for members
+  if (isMember && !workspacePermission) {
     throw new ResourceNotFoundError(t("common.workspace"), null);
   }
 
@@ -70,7 +70,7 @@ export const EnvironmentLayout = async ({ layoutData, children }: EnvironmentLay
           environment={environment}
           organization={organization}
           user={user}
-          project={{ id: project.id, name: project.name }}
+          workspace={{ id: workspace.id, name: workspace.name }}
           isFormbricksCloud={IS_FORMBRICKS_CLOUD}
           isDevelopment={IS_DEVELOPMENT}
           membershipRole={membership.role}
@@ -80,9 +80,9 @@ export const EnvironmentLayout = async ({ layoutData, children }: EnvironmentLay
           <TopControlBar
             environments={environments}
             currentOrganizationId={organization.id}
-            currentProjectId={project.id}
+            currentWorkspaceId={workspace.id}
             isMultiOrgEnabled={isMultiOrgEnabled}
-            organizationProjectsLimit={organizationProjectsLimit}
+            organizationWorkspacesLimit={organizationWorkspacesLimit}
             isFormbricksCloud={IS_FORMBRICKS_CLOUD}
             isLicenseActive={active}
             isOwnerOrManager={isOwnerOrManager}

apps/web/app/(app)/environments/[environmentId]/components/MainNavigation.tsx

@@ -11,6 +11,7 @@ import {
   RocketIcon,
   UserCircleIcon,
   UserIcon,
+  WorkflowIcon,
 } from "lucide-react";
 import Image from "next/image";
 import Link from "next/link";
@@ -28,7 +29,6 @@ import { cn } from "@/lib/cn";
 import { getAccessFlags } from "@/lib/membership/utils";
 import { useSignOut } from "@/modules/auth/hooks/use-sign-out";
 import { TrialAlert } from "@/modules/ee/billing/components/trial-alert";
-import { getLatestStableFbReleaseAction } from "@/modules/projects/settings/(setup)/app-connection/actions";
 import { ProfileAvatar } from "@/modules/ui/components/avatars";
 import { Button } from "@/modules/ui/components/button";
 import {
@@ -37,13 +37,14 @@ import {
   DropdownMenuItem,
   DropdownMenuTrigger,
 } from "@/modules/ui/components/dropdown-menu";
+import { getLatestStableFbReleaseAction } from "@/modules/workspaces/settings/(setup)/app-connection/actions";
 import packageJson from "../../../../../package.json";
 
 interface NavigationProps {
   environment: TEnvironment;
   user: TUser;
   organization: TOrganization;
-  project: { id: string; name: string };
+  workspace: { id: string; name: string };
   isFormbricksCloud: boolean;
   isDevelopment: boolean;
   membershipRole?: TOrganizationRole;
@@ -54,7 +55,7 @@ export const MainNavigation = ({
   environment,
   organization,
   user,
-  project,
+  workspace,
   membershipRole,
   isFormbricksCloud,
   isDevelopment,
@@ -91,7 +92,7 @@ export const MainNavigation = ({
   }, [isCollapsed]);
 
   useEffect(() => {
-    // Auto collapse project navbar on org and account settings
+    // Auto collapse workspace navbar on org and account settings
     if (pathname?.includes("/settings")) {
       setIsCollapsed(true);
     }
@@ -115,6 +116,13 @@ export const MainNavigation = ({
           pathname?.includes("/segments") ||
           pathname?.includes("/attributes"),
       },
+      {
+        name: t("common.workflows"),
+        href: `/environments/${environment.id}/workflows`,
+        icon: WorkflowIcon,
+        isActive: pathname?.includes("/workflows"),
+        isHidden: !isFormbricksCloud,
+      },
       {
         name: t("common.configuration"),
         href: `/environments/${environment.id}/workspace/general`,
@@ -122,7 +130,7 @@ export const MainNavigation = ({
         isActive: pathname?.includes("/workspace"),
       },
     ],
-    [t, environment.id, pathname]
+    [t, environment.id, pathname, isFormbricksCloud]
   );
 
   const dropdownNavigation = [
@@ -178,7 +186,7 @@ export const MainNavigation = ({
 
   return (
     <>
-      {project && (
+      {workspace && (
         <aside
           className={cn(
             "z-40 flex flex-col justify-between rounded-r-xl border-r border-slate-200 bg-white pt-3 shadow-md transition-all duration-100",

apps/web/app/(app)/environments/[environmentId]/components/TopControlBar.tsx

@@ -2,16 +2,16 @@
 
 import { TEnvironment } from "@formbricks/types/environment";
 import { TOrganizationRole } from "@formbricks/types/memberships";
-import { ProjectAndOrgSwitch } from "@/app/(app)/environments/[environmentId]/components/project-and-org-switch";
+import { WorkspaceAndOrgSwitch } from "@/app/(app)/environments/[environmentId]/components/workspace-and-org-switch";
 import { useEnvironment } from "@/app/(app)/environments/[environmentId]/context/environment-context";
 import { getAccessFlags } from "@/lib/membership/utils";
 
 interface TopControlBarProps {
   environments: TEnvironment[];
   currentOrganizationId: string;
-  currentProjectId: string;
+  currentWorkspaceId: string;
   isMultiOrgEnabled: boolean;
-  organizationProjectsLimit: number;
+  organizationWorkspacesLimit: number;
   isFormbricksCloud: boolean;
   isLicenseActive: boolean;
   isOwnerOrManager: boolean;
@@ -22,9 +22,9 @@ interface TopControlBarProps {
 export const TopControlBar = ({
   environments,
   currentOrganizationId,
-  currentProjectId,
+  currentWorkspaceId,
   isMultiOrgEnabled,
-  organizationProjectsLimit,
+  organizationWorkspacesLimit,
   isFormbricksCloud,
   isLicenseActive,
   isOwnerOrManager,
@@ -38,13 +38,13 @@ export const TopControlBar = ({
     <div
       className="flex h-14 w-full items-center justify-between bg-slate-50 px-6"
       data-testid="fb__global-top-control-bar">
-      <ProjectAndOrgSwitch
+      <WorkspaceAndOrgSwitch
         currentEnvironmentId={environment.id}
         environments={environments}
         currentOrganizationId={currentOrganizationId}
-        currentProjectId={currentProjectId}
+        currentWorkspaceId={currentWorkspaceId}
         isMultiOrgEnabled={isMultiOrgEnabled}
-        organizationProjectsLimit={organizationProjectsLimit}
+        organizationWorkspacesLimit={organizationWorkspacesLimit}
         isFormbricksCloud={isFormbricksCloud}
         isLicenseActive={isLicenseActive}
         isOwnerOrManager={isOwnerOrManager}

apps/web/app/(app)/environments/[environmentId]/components/WorkspaceNavItem.tsx

@@ -1,13 +1,13 @@
 import Link from "next/link";
 import { ReactNode } from "react";
 
-interface ProjectNavItemProps {
+interface WorkspaceNavItemProps {
   href: string;
   children: ReactNode;
   isActive: boolean;
 }
 
-export const ProjectNavItem = ({ href, children, isActive }: ProjectNavItemProps) => {
+export const WorkspaceNavItem = ({ href, children, isActive }: WorkspaceNavItemProps) => {
   const activeClass = "bg-slate-50 font-semibold";
   const inactiveClass = "hover:bg-slate-50";
 

apps/web/app/(app)/environments/[environmentId]/components/organization-breadcrumb.tsx

@@ -138,6 +138,12 @@ export const OrganizationBreadcrumb = ({
       label: t("common.members_and_teams"),
       href: `/environments/${currentEnvironmentId}/settings/teams`,
     },
+    {
+      id: "feedback-record-directories",
+      label: t("environments.settings.feedback_record_directories.nav_label"),
+      href: `/environments/${currentEnvironmentId}/settings/feedback-record-directories`,
+      hidden: isMember,
+    },
     {
       id: "api-keys",
       label: t("common.api_keys"),

apps/web/app/(app)/environments/[environmentId]/components/workspace-and-org-switch.tsx

@@ -2,18 +2,18 @@
 
 import { EnvironmentBreadcrumb } from "@/app/(app)/environments/[environmentId]/components/environment-breadcrumb";
 import { OrganizationBreadcrumb } from "@/app/(app)/environments/[environmentId]/components/organization-breadcrumb";
-import { ProjectBreadcrumb } from "@/app/(app)/environments/[environmentId]/components/project-breadcrumb";
+import { WorkspaceBreadcrumb } from "@/app/(app)/environments/[environmentId]/components/workspace-breadcrumb";
 import { Breadcrumb, BreadcrumbList } from "@/modules/ui/components/breadcrumb";
 
-interface ProjectAndOrgSwitchProps {
+interface WorkspaceAndOrgSwitchProps {
   currentOrganizationId: string;
   currentOrganizationName?: string; // Optional: for pages without context
-  currentProjectId?: string;
-  currentProjectName?: string; // Optional: for pages without context
+  currentWorkspaceId?: string;
+  currentWorkspaceName?: string; // Optional: for pages without context
   currentEnvironmentId?: string;
   environments: { id: string; type: string }[];
   isMultiOrgEnabled: boolean;
-  organizationProjectsLimit: number;
+  organizationWorkspacesLimit: number;
   isFormbricksCloud: boolean;
   isLicenseActive: boolean;
   isOwnerOrManager: boolean;
@@ -21,21 +21,21 @@ interface ProjectAndOrgSwitchProps {
   isAccessControlAllowed: boolean;
 }
 
-export const ProjectAndOrgSwitch = ({
+export const WorkspaceAndOrgSwitch = ({
   currentOrganizationId,
   currentOrganizationName,
-  currentProjectId,
-  currentProjectName,
+  currentWorkspaceId,
+  currentWorkspaceName,
   currentEnvironmentId,
   environments,
   isMultiOrgEnabled,
-  organizationProjectsLimit,
+  organizationWorkspacesLimit,
   isFormbricksCloud,
   isLicenseActive,
   isOwnerOrManager,
   isAccessControlAllowed,
   isMember,
-}: ProjectAndOrgSwitchProps) => {
+}: WorkspaceAndOrgSwitchProps) => {
   const currentEnvironment = environments.find((env) => env.id === currentEnvironmentId);
   const showEnvironmentBreadcrumb = currentEnvironment?.type === "development";
 
@@ -51,14 +51,14 @@ export const ProjectAndOrgSwitch = ({
           isMember={isMember}
           isOwnerOrManager={isOwnerOrManager}
         />
-        {currentProjectId && currentEnvironmentId && (
-          <ProjectBreadcrumb
-            currentProjectId={currentProjectId}
-            currentProjectName={currentProjectName}
+        {currentWorkspaceId && currentEnvironmentId && (
+          <WorkspaceBreadcrumb
+            currentWorkspaceId={currentWorkspaceId}
+            currentWorkspaceName={currentWorkspaceName}
             currentOrganizationId={currentOrganizationId}
             currentEnvironmentId={currentEnvironmentId}
             isOwnerOrManager={isOwnerOrManager}
-            organizationProjectsLimit={organizationProjectsLimit}
+            organizationWorkspacesLimit={organizationWorkspacesLimit}
             isFormbricksCloud={isFormbricksCloud}
             isLicenseActive={isLicenseActive}
             isAccessControlAllowed={isAccessControlAllowed}

apps/web/app/(app)/environments/[environmentId]/components/workspace-breadcrumb.tsx

@@ -6,10 +6,8 @@ import { usePathname, useRouter } from "next/navigation";
 import { useEffect, useState, useTransition } from "react";
 import { useTranslation } from "react-i18next";
 import { logger } from "@formbricks/logger";
-import { getProjectsForSwitcherAction } from "@/app/(app)/environments/[environmentId]/actions";
+import { getWorkspacesForSwitcherAction } from "@/app/(app)/environments/[environmentId]/actions";
 import { getFormattedErrorMessage } from "@/lib/utils/helper";
-import { CreateProjectModal } from "@/modules/projects/components/create-project-modal";
-import { ProjectLimitModal } from "@/modules/projects/components/project-limit-modal";
 import { BreadcrumbItem } from "@/modules/ui/components/breadcrumb";
 import {
   DropdownMenu,
@@ -20,13 +18,15 @@ import {
   DropdownMenuTrigger,
 } from "@/modules/ui/components/dropdown-menu";
 import { ModalButton } from "@/modules/ui/components/upgrade-prompt";
-import { useProject } from "../context/environment-context";
+import { CreateWorkspaceModal } from "@/modules/workspaces/components/create-workspace-modal";
+import { WorkspaceLimitModal } from "@/modules/workspaces/components/workspace-limit-modal";
+import { useWorkspace } from "../context/environment-context";
 
-interface ProjectBreadcrumbProps {
-  currentProjectId: string;
-  currentProjectName?: string; // Optional: pass directly if context not available
+interface WorkspaceBreadcrumbProps {
+  currentWorkspaceId: string;
+  currentWorkspaceName?: string; // Optional: pass directly if context not available
   isOwnerOrManager: boolean;
-  organizationProjectsLimit: number;
+  organizationWorkspacesLimit: number;
   isFormbricksCloud: boolean;
   isLicenseActive: boolean;
   currentOrganizationId: string;
@@ -35,7 +35,7 @@ interface ProjectBreadcrumbProps {
   isEnvironmentBreadcrumbVisible: boolean;
 }
 
-const isActiveProjectSetting = (pathname: string, settingId: string): boolean => {
+const isActiveWorkspaceSetting = (pathname: string, settingId: string): boolean => {
   // Match /workspace/{settingId} or /workspace/{settingId}/... but exclude settings paths
   if (pathname.includes("/settings/")) {
     return false;
@@ -45,59 +45,59 @@ const isActiveProjectSetting = (pathname: string, settingId: string): boolean =>
   return pattern.test(pathname);
 };
 
-export const ProjectBreadcrumb = ({
-  currentProjectId,
-  currentProjectName,
+export const WorkspaceBreadcrumb = ({
+  currentWorkspaceId,
+  currentWorkspaceName,
   isOwnerOrManager,
-  organizationProjectsLimit,
+  organizationWorkspacesLimit,
   isFormbricksCloud,
   isLicenseActive,
   currentOrganizationId,
   currentEnvironmentId,
   isAccessControlAllowed,
   isEnvironmentBreadcrumbVisible,
-}: ProjectBreadcrumbProps) => {
+}: WorkspaceBreadcrumbProps) => {
   const { t } = useTranslation();
-  const [isProjectDropdownOpen, setIsProjectDropdownOpen] = useState(false);
-  const [openCreateProjectModal, setOpenCreateProjectModal] = useState(false);
+  const [isWorkspaceDropdownOpen, setIsWorkspaceDropdownOpen] = useState(false);
+  const [openCreateWorkspaceModal, setOpenCreateWorkspaceModal] = useState(false);
   const [openLimitModal, setOpenLimitModal] = useState(false);
   const router = useRouter();
-  const [isLoadingProjects, setIsLoadingProjects] = useState(false);
-  const [projects, setProjects] = useState<{ id: string; name: string }[]>([]);
+  const [isLoadingWorkspaces, setIsLoadingWorkspaces] = useState(false);
+  const [workspaces, setWorkspaces] = useState<{ id: string; name: string }[]>([]);
   const [loadError, setLoadError] = useState<string | null>(null);
   const [isPending, startTransition] = useTransition();
   const pathname = usePathname();
 
-  // Get current project name from context OR prop
+  // Get current workspace name from context OR prop
   // Context is preferred, but prop is fallback for pages without EnvironmentContextWrapper
-  const { project: currentProject } = useProject();
-  const projectName = currentProject?.name || currentProjectName || "";
+  const { workspace: currentWorkspace } = useWorkspace();
+  const workspaceName = currentWorkspace?.name || currentWorkspaceName || "";
 
-  // Lazy-load projects when dropdown opens
+  // Lazy-load workspaces when dropdown opens
   useEffect(() => {
     // Only fetch when dropdown opened for first time (and no error state)
-    if (isProjectDropdownOpen && projects.length === 0 && !isLoadingProjects && !loadError) {
-      setIsLoadingProjects(true);
+    if (isWorkspaceDropdownOpen && workspaces.length === 0 && !isLoadingWorkspaces && !loadError) {
+      setIsLoadingWorkspaces(true);
       setLoadError(null); // Clear any previous errors
-      getProjectsForSwitcherAction({ organizationId: currentOrganizationId }).then((result) => {
+      getWorkspacesForSwitcherAction({ organizationId: currentOrganizationId }).then((result) => {
         if (result?.data) {
-          // Sort projects by name
+          // Sort workspaces by name
           const sorted = [...result.data].sort((a, b) => a.name.localeCompare(b.name));
-          setProjects(sorted);
+          setWorkspaces(sorted);
         } else {
           // Handle server errors or validation errors
           const errorMessage = getFormattedErrorMessage(result);
           const error = new Error(errorMessage);
-          logger.error(error, "Failed to load projects");
+          logger.error(error, "Failed to load workspaces");
           Sentry.captureException(error);
           setLoadError(errorMessage || t("common.failed_to_load_workspaces"));
         }
-        setIsLoadingProjects(false);
+        setIsLoadingWorkspaces(false);
       });
     }
-  }, [isProjectDropdownOpen, currentOrganizationId, projects.length, isLoadingProjects, loadError, t]);
+  }, [isWorkspaceDropdownOpen, currentOrganizationId, workspaces.length, isLoadingWorkspaces, loadError, t]);
 
-  const projectSettings = [
+  const workspaceSettings = [
     {
       id: "general",
       label: t("common.general"),
@@ -135,29 +135,29 @@ export const ProjectBreadcrumb = ({
     },
   ];
 
-  if (!currentProject) {
-    const errorMessage = `Workspace not found for workspace id: ${currentProjectId}`;
+  if (!currentWorkspace) {
+    const errorMessage = `Workspace not found for workspace id: ${currentWorkspaceId}`;
     logger.error(errorMessage);
     Sentry.captureException(new Error(errorMessage));
     return;
   }
 
-  const handleProjectChange = (projectId: string) => {
-    if (projectId === currentProjectId) return;
+  const handleWorkspaceChange = (workspaceId: string) => {
+    if (workspaceId === currentWorkspaceId) return;
     startTransition(() => {
-      router.push(`/workspaces/${projectId}/`);
+      router.push(`/workspaces/${workspaceId}/`);
     });
   };
 
-  const handleAddProject = () => {
-    if (projects.length >= organizationProjectsLimit) {
+  const handleAddWorkspace = () => {
+    if (workspaces.length >= organizationWorkspacesLimit) {
       setOpenLimitModal(true);
       return;
     }
-    setOpenCreateProjectModal(true);
+    setOpenCreateWorkspaceModal(true);
   };
 
-  const handleProjectSettingsNavigation = (settingId: string) => {
+  const handleWorkspaceSettingsNavigation = (settingId: string) => {
     startTransition(() => {
       router.push(`/environments/${currentEnvironmentId}/workspace/${settingId}`);
     });
@@ -191,17 +191,17 @@ export const ProjectBreadcrumb = ({
     ];
   };
   return (
-    <BreadcrumbItem isActive={isProjectDropdownOpen}>
-      <DropdownMenu onOpenChange={setIsProjectDropdownOpen}>
+    <BreadcrumbItem isActive={isWorkspaceDropdownOpen}>
+      <DropdownMenu onOpenChange={setIsWorkspaceDropdownOpen}>
         <DropdownMenuTrigger
           className="flex cursor-pointer items-center gap-1 outline-none"
-          id="projectDropdownTrigger"
+          id="workspaceDropdownTrigger"
           asChild>
           <div className="flex items-center gap-1">
             <HotelIcon className="h-3 w-3" strokeWidth={1.5} />
-            <span>{projectName}</span>
+            <span>{workspaceName}</span>
             {isPending && <Loader2 className="h-3 w-3 animate-spin" strokeWidth={1.5} />}
-            {isEnvironmentBreadcrumbVisible && !isProjectDropdownOpen ? (
+            {isEnvironmentBreadcrumbVisible && !isWorkspaceDropdownOpen ? (
               <ChevronRightIcon className="h-3 w-3" strokeWidth={1.5} />
             ) : (
               <ChevronDownIcon className="h-3 w-3" strokeWidth={1.5} />
@@ -214,32 +214,32 @@ export const ProjectBreadcrumb = ({
             <HotelIcon className="mr-2 inline h-4 w-4" strokeWidth={1.5} />
             {t("common.choose_workspace")}
           </div>
-          {isLoadingProjects && (
+          {isLoadingWorkspaces && (
             <div className="flex items-center justify-center py-2">
               <Loader2 className="h-4 w-4 animate-spin" />
             </div>
           )}
-          {!isLoadingProjects && loadError && (
+          {!isLoadingWorkspaces && loadError && (
             <div className="px-2 py-4">
               <p className="mb-2 text-sm text-red-600">{loadError}</p>
               <button
                 onClick={() => {
                   setLoadError(null);
-                  setProjects([]);
+                  setWorkspaces([]);
                 }}
                 className="text-xs text-slate-600 underline hover:text-slate-800">
                 {t("common.try_again")}
               </button>
             </div>
           )}
-          {!isLoadingProjects && !loadError && (
+          {!isLoadingWorkspaces && !loadError && (
             <>
               <DropdownMenuGroup className="max-h-[300px] overflow-y-auto">
-                {projects.map((proj) => (
+                {workspaces.map((proj) => (
                   <DropdownMenuCheckboxItem
                     key={proj.id}
-                    checked={proj.id === currentProjectId}
-                    onClick={() => handleProjectChange(proj.id)}
+                    checked={proj.id === currentWorkspaceId}
+                    onClick={() => handleWorkspaceChange(proj.id)}
                     className="cursor-pointer">
                     <div className="flex items-center gap-2">
                       <span>{proj.name}</span>
@@ -249,7 +249,7 @@ export const ProjectBreadcrumb = ({
               </DropdownMenuGroup>
               {isOwnerOrManager && (
                 <DropdownMenuCheckboxItem
-                  onClick={handleAddProject}
+                  onClick={handleAddWorkspace}
                   className="w-full cursor-pointer justify-between">
                   <span>{t("common.add_new_workspace")}</span>
                   <PlusIcon className="ml-2 h-4 w-4" strokeWidth={1.5} />
@@ -263,11 +263,11 @@ export const ProjectBreadcrumb = ({
               <CogIcon className="mr-2 inline h-4 w-4" strokeWidth={1.5} />
               {t("common.workspace_configuration")}
             </div>
-            {projectSettings.map((setting) => (
+            {workspaceSettings.map((setting) => (
               <DropdownMenuCheckboxItem
                 key={setting.id}
-                checked={isActiveProjectSetting(pathname, setting.id)}
-                onClick={() => handleProjectSettingsNavigation(setting.id)}
+                checked={isActiveWorkspaceSetting(pathname, setting.id)}
+                onClick={() => handleWorkspaceSettingsNavigation(setting.id)}
                 className="cursor-pointer">
                 {setting.label}
               </DropdownMenuCheckboxItem>
@@ -277,17 +277,17 @@ export const ProjectBreadcrumb = ({
       </DropdownMenu>
       {/* Modals */}
       {openLimitModal && (
-        <ProjectLimitModal
+        <WorkspaceLimitModal
           open={openLimitModal}
           setOpen={setOpenLimitModal}
           buttons={LimitModalButtons()}
-          projectLimit={organizationProjectsLimit}
+          workspaceLimit={organizationWorkspacesLimit}
         />
       )}
-      {openCreateProjectModal && (
-        <CreateProjectModal
-          open={openCreateProjectModal}
-          setOpen={setOpenCreateProjectModal}
+      {openCreateWorkspaceModal && (
+        <CreateWorkspaceModal
+          open={openCreateWorkspaceModal}
+          setOpen={setOpenCreateWorkspaceModal}
           organizationId={currentOrganizationId}
           isAccessControlAllowed={isAccessControlAllowed}
         />

apps/web/app/(app)/environments/[environmentId]/context/environment-context.tsx

@@ -3,11 +3,11 @@
 import { createContext, useContext, useMemo } from "react";
 import { TEnvironment } from "@formbricks/types/environment";
 import { TOrganization } from "@formbricks/types/organizations";
-import { TProject } from "@formbricks/types/project";
+import { TWorkspace } from "@formbricks/types/workspace";
 
 export interface EnvironmentContextType {
   environment: TEnvironment;
-  project: TProject;
+  workspace: TWorkspace;
   organization: TOrganization;
   organizationId: string;
 }
@@ -22,12 +22,12 @@ export const useEnvironment = () => {
   return context;
 };
 
-export const useProject = () => {
+export const useWorkspace = () => {
   const context = useContext(EnvironmentContext);
   if (!context) {
-    return { project: null };
+    return { workspace: null };
   }
-  return { project: context.project };
+  return { workspace: context.workspace };
 };
 
 export const useOrganization = () => {
@@ -41,25 +41,25 @@ export const useOrganization = () => {
 // Client wrapper component to be used in server components
 interface EnvironmentContextWrapperProps {
   environment: TEnvironment;
-  project: TProject;
+  workspace: TWorkspace;
   organization: TOrganization;
   children: React.ReactNode;
 }
 
 export const EnvironmentContextWrapper = ({
   environment,
-  project,
+  workspace,
   organization,
   children,
 }: EnvironmentContextWrapperProps) => {
   const environmentContextValue = useMemo(
     () => ({
       environment,
-      project,
+      workspace,
       organization,
-      organizationId: project.organizationId,
+      organizationId: workspace.organizationId,
     }),
-    [environment, project, organization]
+    [environment, workspace, organization]
   );
 
   return (

apps/web/app/(app)/environments/[environmentId]/layout.tsx

@@ -27,7 +27,7 @@ const EnvLayout = async (props: {
       <EnvironmentStorageHandler environmentId={params.environmentId} />
       <EnvironmentContextWrapper
         environment={layoutData.environment}
-        project={layoutData.project}
+        workspace={layoutData.workspace}
         organization={layoutData.organization}>
         <EnvironmentLayout layoutData={layoutData}>{children}</EnvironmentLayout>
       </EnvironmentContextWrapper>

apps/web/app/(app)/environments/[environmentId]/lib/workspace.test.ts

@@ -3,18 +3,18 @@ import { describe, expect, test, vi } from "vitest";
 import { prisma } from "@formbricks/database";
 import { DatabaseError } from "@formbricks/types/errors";
 import { TMembership } from "@formbricks/types/memberships";
-import { getProjectsByUserId } from "./project";
+import { getWorkspacesByUserId } from "./workspace";
 
 vi.mock("@formbricks/database", () => ({
   prisma: {
-    project: {
+    workspace: {
       findMany: vi.fn(),
     },
   },
 }));
 
-describe("Project", () => {
-  describe("getUserProjects", () => {
+describe("Workspace", () => {
+  describe("getUserWorkspaces", () => {
     const mockAdminMembership: TMembership = {
       role: "manager",
       organizationId: "org1",
@@ -29,17 +29,17 @@ describe("Project", () => {
       accepted: true,
     };
 
-    test("should return projects for admin role", async () => {
-      const mockProjects = [
-        { id: "project1", name: "Project 1" },
-        { id: "project2", name: "Project 2" },
+    test("should return workspaces for admin role", async () => {
+      const mockWorkspaces = [
+        { id: "workspace1", name: "Workspace 1" },
+        { id: "workspace2", name: "Workspace 2" },
       ];
 
-      vi.mocked(prisma.project.findMany).mockResolvedValue(mockProjects as any);
+      vi.mocked(prisma.workspace.findMany).mockResolvedValue(mockWorkspaces as any);
 
-      const result = await getProjectsByUserId("user1", mockAdminMembership);
+      const result = await getWorkspacesByUserId("user1", mockAdminMembership);
 
-      expect(prisma.project.findMany).toHaveBeenCalledWith({
+      expect(prisma.workspace.findMany).toHaveBeenCalledWith({
         where: {
           organizationId: "org1",
         },
@@ -48,20 +48,20 @@ describe("Project", () => {
           name: true,
         },
       });
-      expect(result).toEqual(mockProjects);
+      expect(result).toEqual(mockWorkspaces);
     });
 
-    test("should return projects for member role with team restrictions", async () => {
-      const mockProjects = [{ id: "project1", name: "Project 1" }];
+    test("should return workspaces for member role with team restrictions", async () => {
+      const mockWorkspaces = [{ id: "workspace1", name: "Workspace 1" }];
 
-      vi.mocked(prisma.project.findMany).mockResolvedValue(mockProjects as any);
+      vi.mocked(prisma.workspace.findMany).mockResolvedValue(mockWorkspaces as any);
 
-      const result = await getProjectsByUserId("user1", mockMemberMembership);
+      const result = await getWorkspacesByUserId("user1", mockMemberMembership);
 
-      expect(prisma.project.findMany).toHaveBeenCalledWith({
+      expect(prisma.workspace.findMany).toHaveBeenCalledWith({
         where: {
           organizationId: "org1",
-          projectTeams: {
+          workspaceTeams: {
             some: {
               team: {
                 teamUsers: {
@@ -78,13 +78,13 @@ describe("Project", () => {
           name: true,
         },
       });
-      expect(result).toEqual(mockProjects);
+      expect(result).toEqual(mockWorkspaces);
     });
 
-    test("should return empty array when no projects found", async () => {
-      vi.mocked(prisma.project.findMany).mockResolvedValue([]);
+    test("should return empty array when no workspaces found", async () => {
+      vi.mocked(prisma.workspace.findMany).mockResolvedValue([]);
 
-      const result = await getProjectsByUserId("user1", mockAdminMembership);
+      const result = await getWorkspacesByUserId("user1", mockAdminMembership);
 
       expect(result).toEqual([]);
     });
@@ -95,27 +95,27 @@ describe("Project", () => {
         clientVersion: "5.0.0",
       });
 
-      vi.mocked(prisma.project.findMany).mockRejectedValue(prismaError);
+      vi.mocked(prisma.workspace.findMany).mockRejectedValue(prismaError);
 
-      await expect(getProjectsByUserId("user1", mockAdminMembership)).rejects.toThrow(
+      await expect(getWorkspacesByUserId("user1", mockAdminMembership)).rejects.toThrow(
         new DatabaseError("Database error")
       );
     });
 
     test("should re-throw unknown errors", async () => {
       const unknownError = new Error("Unknown error");
-      vi.mocked(prisma.project.findMany).mockRejectedValue(unknownError);
+      vi.mocked(prisma.workspace.findMany).mockRejectedValue(unknownError);
 
-      await expect(getProjectsByUserId("user1", mockAdminMembership)).rejects.toThrow(unknownError);
+      await expect(getWorkspacesByUserId("user1", mockAdminMembership)).rejects.toThrow(unknownError);
     });
 
     test("should validate inputs correctly", async () => {
-      await expect(getProjectsByUserId(123 as any, mockAdminMembership)).rejects.toThrow();
+      await expect(getWorkspacesByUserId(123 as any, mockAdminMembership)).rejects.toThrow();
     });
 
     test("should validate membership input correctly", async () => {
       const invalidMembership = {} as TMembership;
-      await expect(getProjectsByUserId("user1", invalidMembership)).rejects.toThrow();
+      await expect(getWorkspacesByUserId("user1", invalidMembership)).rejects.toThrow();
     });
 
     test("should handle owner role like manager", async () => {
@@ -126,12 +126,12 @@ describe("Project", () => {
         accepted: true,
       };
 
-      const mockProjects = [{ id: "project1", name: "Project 1" }];
-      vi.mocked(prisma.project.findMany).mockResolvedValue(mockProjects as any);
+      const mockWorkspaces = [{ id: "workspace1", name: "Workspace 1" }];
+      vi.mocked(prisma.workspace.findMany).mockResolvedValue(mockWorkspaces as any);
 
-      const result = await getProjectsByUserId("user1", mockOwnerMembership);
+      const result = await getWorkspacesByUserId("user1", mockOwnerMembership);
 
-      expect(prisma.project.findMany).toHaveBeenCalledWith({
+      expect(prisma.workspace.findMany).toHaveBeenCalledWith({
         where: {
           organizationId: "org1",
         },
@@ -140,7 +140,7 @@ describe("Project", () => {
           name: true,
         },
       });
-      expect(result).toEqual(mockProjects);
+      expect(result).toEqual(mockWorkspaces);
     });
   });
 });

apps/web/app/(app)/environments/[environmentId]/lib/workspace.ts

@@ -6,15 +6,15 @@ import { DatabaseError } from "@formbricks/types/errors";
 import { TMembership, ZMembership } from "@formbricks/types/memberships";
 import { validateInputs } from "@/lib/utils/validate";
 
-export const getProjectsByUserId = reactCache(
+export const getWorkspacesByUserId = reactCache(
   async (userId: string, orgMembership: TMembership): Promise<{ id: string; name: string }[]> => {
     validateInputs([userId, ZString], [orgMembership, ZMembership]);
 
-    let projectWhereClause: Prisma.ProjectWhereInput = {};
+    let workspaceWhereClause: Prisma.WorkspaceWhereInput = {};
 
     if (orgMembership.role === "member") {
-      projectWhereClause = {
-        projectTeams: {
+      workspaceWhereClause = {
+        workspaceTeams: {
           some: {
             team: {
               teamUsers: {
@@ -29,17 +29,17 @@ export const getProjectsByUserId = reactCache(
     }
 
     try {
-      const projects = await prisma.project.findMany({
+      const workspaces = await prisma.workspace.findMany({
         where: {
           organizationId: orgMembership.organizationId,
-          ...projectWhereClause,
+          ...workspaceWhereClause,
         },
         select: {
           id: true,
           name: true,
         },
       });
-      return projects;
+      return workspaces;
     } catch (error) {
       if (error instanceof Prisma.PrismaClientKnownRequestError) {
         throw new DatabaseError(error.message);

apps/web/app/(app)/environments/[environmentId]/settings/(account)/layout.tsx

@@ -1,7 +1,7 @@
 import { getServerSession } from "next-auth";
 import { AuthenticationError, ResourceNotFoundError } from "@formbricks/types/errors";
 import { getOrganizationByEnvironmentId } from "@/lib/organization/service";
-import { getProjectByEnvironmentId } from "@/lib/project/service";
+import { getWorkspaceByEnvironmentId } from "@/lib/workspace/service";
 import { getTranslate } from "@/lingodotdev/server";
 import { authOptions } from "@/modules/auth/lib/authOptions";
 
@@ -14,9 +14,9 @@ const AccountSettingsLayout = async (props: {
   const { children } = props;
 
   const t = await getTranslate();
-  const [organization, project, session] = await Promise.all([
+  const [organization, workspace, session] = await Promise.all([
     getOrganizationByEnvironmentId(params.environmentId),
-    getProjectByEnvironmentId(params.environmentId),
+    getWorkspaceByEnvironmentId(params.environmentId),
     getServerSession(authOptions),
   ]);
 
@@ -24,7 +24,7 @@ const AccountSettingsLayout = async (props: {
     throw new ResourceNotFoundError(t("common.organization"), null);
   }
 
-  if (!project) {
+  if (!workspace) {
     throw new ResourceNotFoundError(t("common.workspace"), null);
   }
 

apps/web/app/(app)/environments/[environmentId]/settings/(account)/notifications/components/EditAlerts.tsx

@@ -40,7 +40,7 @@ export const EditAlerts = ({
                 {t("environments.settings.notifications.auto_subscribe_to_new_surveys")}
               </p>
               <NotificationSwitch
-                surveyOrProjectOrOrganizationId={membership.organization.id}
+                surveyOrWorkspaceOrOrganizationId={membership.organization.id}
                 notificationSettings={user.notificationSettings!}
                 notificationType={"unsubscribedOrganizationIds"}
                 autoDisableNotificationType={autoDisableNotificationType}
@@ -66,13 +66,13 @@ export const EditAlerts = ({
               </TooltipProvider>
             </div>
 
-            {membership.organization.projects.some((project) =>
-              project.environments.some((environment) => environment.surveys.length > 0)
+            {membership.organization.workspaces.some((workspace) =>
+              workspace.environments.some((environment) => environment.surveys.length > 0)
             ) ? (
               <div className="grid-cols-8 space-y-1 p-2">
-                {membership.organization.projects.map((project) => (
-                  <div key={project.id}>
-                    {project.environments.map((environment) => (
+                {membership.organization.workspaces.map((workspace) => (
+                  <div key={workspace.id}>
+                    {workspace.environments.map((environment) => (
                       <div key={environment.id}>
                         {environment.surveys.map((survey) => (
                           <div
@@ -80,11 +80,11 @@ export const EditAlerts = ({
                             key={survey.name}>
                             <div className="col-span-2 text-left">
                               <div className="font-medium text-slate-900">{survey.name}</div>
-                              <div className="text-xs text-slate-400">{project.name}</div>
+                              <div className="text-xs text-slate-400">{workspace.name}</div>
                             </div>
                             <div className="col-span-1 text-center">
                               <NotificationSwitch
-                                surveyOrProjectOrOrganizationId={survey.id}
+                                surveyOrWorkspaceOrOrganizationId={survey.id}
                                 notificationSettings={user.notificationSettings!}
                                 notificationType={"alert"}
                                 autoDisableNotificationType={autoDisableNotificationType}

apps/web/app/(app)/environments/[environmentId]/settings/(account)/notifications/components/NotificationSwitch.tsx

@@ -10,7 +10,7 @@ import { Switch } from "@/modules/ui/components/switch";
 import { updateNotificationSettingsAction } from "../actions";
 
 interface NotificationSwitchProps {
-  surveyOrProjectOrOrganizationId: string;
+  surveyOrWorkspaceOrOrganizationId: string;
   notificationSettings: TUserNotificationSettings;
   notificationType: "alert" | "unsubscribedOrganizationIds";
   autoDisableNotificationType?: string;
@@ -18,7 +18,7 @@ interface NotificationSwitchProps {
 }
 
 export const NotificationSwitch = ({
-  surveyOrProjectOrOrganizationId,
+  surveyOrWorkspaceOrOrganizationId,
   notificationSettings,
   notificationType,
   autoDisableNotificationType,
@@ -29,8 +29,8 @@ export const NotificationSwitch = ({
   const router = useRouter();
   const isChecked =
     notificationType === "unsubscribedOrganizationIds"
-      ? !notificationSettings.unsubscribedOrganizationIds?.includes(surveyOrProjectOrOrganizationId)
-      : notificationSettings[notificationType]?.[surveyOrProjectOrOrganizationId] === true;
+      ? !notificationSettings.unsubscribedOrganizationIds?.includes(surveyOrWorkspaceOrOrganizationId)
+      : notificationSettings[notificationType]?.[surveyOrWorkspaceOrOrganizationId] === true;
 
   const handleSwitchChange = async () => {
     setIsLoading(true);
@@ -38,21 +38,21 @@ export const NotificationSwitch = ({
     let updatedNotificationSettings = { ...notificationSettings };
     if (notificationType === "unsubscribedOrganizationIds") {
       const unsubscribedOrganizationIds = updatedNotificationSettings.unsubscribedOrganizationIds ?? [];
-      if (unsubscribedOrganizationIds.includes(surveyOrProjectOrOrganizationId)) {
+      if (unsubscribedOrganizationIds.includes(surveyOrWorkspaceOrOrganizationId)) {
         updatedNotificationSettings.unsubscribedOrganizationIds = unsubscribedOrganizationIds.filter(
-          (id) => id !== surveyOrProjectOrOrganizationId
+          (id) => id !== surveyOrWorkspaceOrOrganizationId
         );
       } else {
         updatedNotificationSettings.unsubscribedOrganizationIds = [
           ...unsubscribedOrganizationIds,
-          surveyOrProjectOrOrganizationId,
+          surveyOrWorkspaceOrOrganizationId,
         ];
       }
     } else {
       updatedNotificationSettings[notificationType] = {
         ...updatedNotificationSettings[notificationType],
-        [surveyOrProjectOrOrganizationId]:
-          !updatedNotificationSettings[notificationType]?.[surveyOrProjectOrOrganizationId],
+        [surveyOrWorkspaceOrOrganizationId]:
+          !updatedNotificationSettings[notificationType]?.[surveyOrWorkspaceOrOrganizationId],
       };
     }
 
@@ -76,12 +76,12 @@ export const NotificationSwitch = ({
   useEffect(() => {
     if (
       autoDisableNotificationType &&
-      autoDisableNotificationElementId === surveyOrProjectOrOrganizationId &&
+      autoDisableNotificationElementId === surveyOrWorkspaceOrOrganizationId &&
       isChecked
     ) {
       switch (notificationType) {
         case "alert":
-          if (notificationSettings[notificationType]?.[surveyOrProjectOrOrganizationId] === true) {
+          if (notificationSettings[notificationType]?.[surveyOrWorkspaceOrOrganizationId] === true) {
             handleSwitchChange();
             toast.success(
               t(
@@ -95,7 +95,9 @@ export const NotificationSwitch = ({
           break;
 
         case "unsubscribedOrganizationIds":
-          if (!notificationSettings.unsubscribedOrganizationIds?.includes(surveyOrProjectOrOrganizationId)) {
+          if (
+            !notificationSettings.unsubscribedOrganizationIds?.includes(surveyOrWorkspaceOrOrganizationId)
+          ) {
             handleSwitchChange();
             toast.success(
               t(

apps/web/app/(app)/environments/[environmentId]/settings/(account)/notifications/page.tsx

@@ -22,9 +22,9 @@ const setCompleteNotificationSettings = (
     unsubscribedOrganizationIds: notificationSettings.unsubscribedOrganizationIds || [],
   };
   for (const membership of memberships) {
-    for (const project of membership.organization.projects) {
+    for (const workspace of membership.organization.workspaces) {
       // set default values for alerts
-      for (const environment of project.environments) {
+      for (const environment of workspace.environments) {
         for (const survey of environment.surveys) {
           newNotificationSettings.alert[survey.id] =
             (notificationSettings as unknown as Record<string, Record<string, boolean>>)[survey.id]
@@ -47,17 +47,17 @@ const getMemberships = async (userId: string): Promise<Membership[]> => {
       },
       OR: [
         {
-          // Fetch all projects if user role is owner or manager
+          // Fetch all workspaces if user role is owner or manager
           role: {
             in: ["owner", "manager"],
           },
         },
         {
-          // Filter projects based on team membership if user is not owner or manager
+          // Filter workspaces based on team membership if user is not owner or manager
           organization: {
-            projects: {
+            workspaces: {
               some: {
-                projectTeams: {
+                workspaceTeams: {
                   some: {
                     team: {
                       teamUsers: {
@@ -79,12 +79,12 @@ const getMemberships = async (userId: string): Promise<Membership[]> => {
         select: {
           id: true,
           name: true,
-          projects: {
+          workspaces: {
             // Apply conditional filtering based on user's role
             where: {
               OR: [
                 {
-                  // Fetch all projects if user is owner or manager
+                  // Fetch all workspaces if user is owner or manager
                   organization: {
                     memberships: {
                       some: {
@@ -97,8 +97,8 @@ const getMemberships = async (userId: string): Promise<Membership[]> => {
                   },
                 },
                 {
-                  // Only include projects accessible through teams if user is not owner or manager
-                  projectTeams: {
+                  // Only include workspaces accessible through teams if user is not owner or manager
+                  workspaceTeams: {
                     some: {
                       team: {
                         teamUsers: {

apps/web/app/(app)/environments/[environmentId]/settings/(account)/notifications/types.ts

@@ -4,7 +4,7 @@ export interface Membership {
   organization: {
     id: string;
     name: string;
-    projects: {
+    workspaces: {
       id: string;
       name: string;
       environments: {

apps/web/app/(app)/environments/[environmentId]/settings/(account)/profile/actions.ts

@@ -10,16 +10,15 @@ import {
   getIsEmailUnique,
   verifyUserPassword,
 } from "@/app/(app)/environments/[environmentId]/settings/(account)/profile/lib/user";
-import { EMAIL_VERIFICATION_DISABLED, PASSWORD_RESET_DISABLED } from "@/lib/constants";
+import { EMAIL_VERIFICATION_DISABLED } from "@/lib/constants";
 import { getUser, updateUser } from "@/lib/user/service";
 import { authenticatedActionClient } from "@/lib/utils/action-client";
 import { AuthenticatedActionClientCtx } from "@/lib/utils/action-client/types/context";
-import { requestPasswordReset } from "@/modules/auth/forgot-password/lib/password-reset-service";
 import { updateBrevoCustomer } from "@/modules/auth/lib/brevo";
 import { applyRateLimit } from "@/modules/core/rate-limit/helpers";
 import { rateLimitConfigs } from "@/modules/core/rate-limit/rate-limit-configs";
 import { withAuditLogging } from "@/modules/ee/audit-logs/lib/handler";
-import { sendVerificationNewEmail } from "@/modules/email";
+import { sendForgotPasswordEmail, sendVerificationNewEmail } from "@/modules/email";
 
 function buildUserUpdatePayload(parsedInput: TUserPersonalInfoUpdateInput): TUserUpdateInput {
   return {
@@ -86,15 +85,11 @@ export const updateUserAction = authenticatedActionClient.inputSchema(ZUserPerso
 
 export const resetPasswordAction = authenticatedActionClient.action(
   withAuditLogging("passwordReset", "user", async ({ ctx }) => {
-    if (PASSWORD_RESET_DISABLED) {
-      throw new OperationNotAllowedError("Password reset is disabled");
-    }
-
     if (ctx.user.identityProvider !== "email") {
       throw new OperationNotAllowedError("Password reset is not allowed for this user.");
     }
 
-    await requestPasswordReset(ctx.user, "profile");
+    await sendForgotPasswordEmail(ctx.user);
 
     ctx.auditLoggingCtx.userId = ctx.user.id;
 

apps/web/app/(app)/environments/[environmentId]/settings/(organization)/components/OrganizationSettingsNavbar.tsx

@@ -40,6 +40,13 @@ export const OrganizationSettingsNavbar = ({
       href: `/environments/${environmentId}/settings/teams`,
       current: pathname?.includes("/teams"),
     },
+    {
+      id: "feedback-record-directories",
+      label: t("environments.settings.feedback_record_directories.nav_label"),
+      href: `/environments/${environmentId}/settings/feedback-record-directories`,
+      current: pathname?.includes("/feedback-record-directories"),
+      hidden: isMember,
+    },
     {
       id: "api-keys",
       label: t("common.api_keys"),

apps/web/app/(app)/environments/[environmentId]/settings/(organization)/domain/components/pretty-urls-table.tsx

@@ -14,7 +14,7 @@ interface SurveyWithSlug {
   environment: {
     id: string;
     type: "production" | "development";
-    project: {
+    workspace: {
       id: string;
       name: string;
     };
@@ -40,7 +40,7 @@ export const PrettyUrlsTable = ({ surveys }: PrettyUrlsTableProps) => {
     },
     {
       label: t("environments.settings.domain.workspace"),
-      key: "project",
+      key: "workspace",
     },
     {
       label: t("environments.settings.domain.pretty_url"),
@@ -81,7 +81,7 @@ export const PrettyUrlsTable = ({ surveys }: PrettyUrlsTableProps) => {
                   {survey.name}
                 </Link>
               </TableCell>
-              <TableCell>{survey.environment.project.name}</TableCell>
+              <TableCell>{survey.environment.workspace.name}</TableCell>
               <TableCell>
                 <IdBadge id={survey.slug ?? ""} />
               </TableCell>

apps/web/app/(app)/environments/[environmentId]/settings/(organization)/enterprise/components/EnterpriseLicenseFeaturesTable.tsx

@@ -25,8 +25,8 @@ const getFeatureDefinitions = (t: TFunction): TFeatureDefinition[] => {
         "https://formbricks.com/docs/self-hosting/advanced/enterprise-features/contact-management-segments",
     },
     {
-      key: "projects",
-      labelKey: t("environments.settings.enterprise.license_feature_projects"),
+      key: "workspaces",
+      labelKey: t("environments.settings.enterprise.license_feature_workspaces"),
       docsUrl: "https://formbricks.com/docs/self-hosting/advanced/license",
     },
     {

apps/web/app/(app)/environments/[environmentId]/settings/(organization)/feedback-record-directories/page.tsx

@@ -0,0 +1 @@
+export { FeedbackRecordDirectoriesPage as default } from "@/modules/ee/feedback-record-directory/page";

apps/web/app/(app)/environments/[environmentId]/settings/(organization)/general/actions.ts

@@ -3,41 +3,13 @@
 import { z } from "zod";
 import { ZId } from "@formbricks/types/common";
 import { OperationNotAllowedError } from "@formbricks/types/errors";
-import type { TOrganizationRole } from "@formbricks/types/memberships";
 import { ZOrganizationUpdateInput } from "@formbricks/types/organizations";
 import { deleteOrganization, getOrganization, updateOrganization } from "@/lib/organization/service";
 import { authenticatedActionClient } from "@/lib/utils/action-client";
 import { checkAuthorizationUpdated } from "@/lib/utils/action-client/action-client-middleware";
-import { AuthenticatedActionClientCtx } from "@/lib/utils/action-client/types/context";
 import { withAuditLogging } from "@/modules/ee/audit-logs/lib/handler";
 import { getIsMultiOrgEnabled } from "@/modules/ee/license-check/lib/utils";
 
-async function updateOrganizationAction<T extends z.ZodRawShape>({
-  ctx,
-  organizationId,
-  schema,
-  data,
-  roles,
-}: {
-  ctx: AuthenticatedActionClientCtx;
-  organizationId: string;
-  schema: z.ZodObject<T>;
-  data: z.infer<z.ZodObject<T>>;
-  roles: TOrganizationRole[];
-}) {
-  await checkAuthorizationUpdated({
-    userId: ctx.user.id,
-    organizationId,
-    access: [{ type: "organization", schema, data, roles }],
-  });
-  ctx.auditLoggingCtx.organizationId = organizationId;
-  const oldObject = await getOrganization(organizationId);
-  const result = await updateOrganization(organizationId, data);
-  ctx.auditLoggingCtx.oldObject = oldObject;
-  ctx.auditLoggingCtx.newObject = result;
-  return result;
-}
-
 const ZUpdateOrganizationNameAction = z.object({
   organizationId: ZId,
   data: ZOrganizationUpdateInput.pick({ name: true }),
@@ -46,55 +18,26 @@ const ZUpdateOrganizationNameAction = z.object({
 export const updateOrganizationNameAction = authenticatedActionClient
   .inputSchema(ZUpdateOrganizationNameAction)
   .action(
-    withAuditLogging(
-      "updated",
-      "organization",
-      async ({
-        ctx,
-        parsedInput,
-      }: {
-        ctx: AuthenticatedActionClientCtx;
-        parsedInput: z.infer<typeof ZUpdateOrganizationNameAction>;
-      }) =>
-        updateOrganizationAction({
-          ctx,
-          organizationId: parsedInput.organizationId,
-          schema: ZOrganizationUpdateInput.pick({ name: true }),
-          data: parsedInput.data,
-          roles: ["owner"],
-        })
-    )
-  );
-
-const ZUpdateOrganizationAISettingsAction = z.object({
-  organizationId: ZId,
-  data: ZOrganizationUpdateInput.pick({ isAISmartToolsEnabled: true, isAIDataAnalysisEnabled: true }),
-});
-
-export const updateOrganizationAISettingsAction = authenticatedActionClient
-  .inputSchema(ZUpdateOrganizationAISettingsAction)
-  .action(
-    withAuditLogging(
-      "updated",
-      "organization",
-      async ({
-        ctx,
-        parsedInput,
-      }: {
-        ctx: AuthenticatedActionClientCtx;
-        parsedInput: z.infer<typeof ZUpdateOrganizationAISettingsAction>;
-      }) =>
-        updateOrganizationAction({
-          ctx,
-          organizationId: parsedInput.organizationId,
-          schema: ZOrganizationUpdateInput.pick({
-            isAISmartToolsEnabled: true,
-            isAIDataAnalysisEnabled: true,
-          }),
-          data: parsedInput.data,
-          roles: ["owner", "manager"],
-        })
-    )
+    withAuditLogging("updated", "organization", async ({ ctx, parsedInput }) => {
+      await checkAuthorizationUpdated({
+        userId: ctx.user.id,
+        organizationId: parsedInput.organizationId,
+        access: [
+          {
+            type: "organization",
+            schema: ZOrganizationUpdateInput.pick({ name: true }),
+            data: parsedInput.data,
+            roles: ["owner"],
+          },
+        ],
+      });
+      ctx.auditLoggingCtx.organizationId = parsedInput.organizationId;
+      const oldObject = await getOrganization(parsedInput.organizationId);
+      const result = await updateOrganization(parsedInput.organizationId, parsedInput.data);
+      ctx.auditLoggingCtx.oldObject = oldObject;
+      ctx.auditLoggingCtx.newObject = result;
+      return result;
+    })
   );
 
 const ZDeleteOrganizationAction = z.object({

apps/web/app/(app)/environments/[environmentId]/settings/(organization)/general/components/AISettingsToggle.tsx

@@ -1,84 +0,0 @@
-"use client";
-
-import { useRouter } from "next/navigation";
-import { useState } from "react";
-import toast from "react-hot-toast";
-import { useTranslation } from "react-i18next";
-import { TOrganizationRole } from "@formbricks/types/memberships";
-import { TOrganization } from "@formbricks/types/organizations";
-import { updateOrganizationAISettingsAction } from "@/app/(app)/environments/[environmentId]/settings/(organization)/general/actions";
-import { getAccessFlags } from "@/lib/membership/utils";
-import { getFormattedErrorMessage } from "@/lib/utils/helper";
-import { AdvancedOptionToggle } from "@/modules/ui/components/advanced-option-toggle";
-import { Alert, AlertDescription } from "@/modules/ui/components/alert";
-
-interface AISettingsToggleProps {
-  organization: TOrganization;
-  membershipRole?: TOrganizationRole;
-}
-
-export const AISettingsToggle = ({ organization, membershipRole }: Readonly<AISettingsToggleProps>) => {
-  const [loadingField, setLoadingField] = useState<string | null>(null);
-  const { t } = useTranslation();
-  const router = useRouter();
-
-  const { isOwner, isManager } = getAccessFlags(membershipRole);
-  const canEdit = isOwner || isManager;
-
-  const handleToggle = async (
-    field: "isAISmartToolsEnabled" | "isAIDataAnalysisEnabled",
-    checked: boolean
-  ) => {
-    setLoadingField(field);
-    try {
-      const response = await updateOrganizationAISettingsAction({
-        organizationId: organization.id,
-        data: { [field]: checked },
-      });
-
-      if (response?.data) {
-        toast.success(t("environments.settings.general.ai_settings_updated_successfully"));
-        router.refresh();
-      } else {
-        const errorMessage = getFormattedErrorMessage(response);
-        toast.error(errorMessage);
-      }
-    } catch {
-      toast.error(t("common.something_went_wrong"));
-    } finally {
-      setLoadingField(null);
-    }
-  };
-
-  return (
-    <div>
-      <AdvancedOptionToggle
-        isChecked={organization.isAISmartToolsEnabled}
-        onToggle={(checked) => handleToggle("isAISmartToolsEnabled", checked)}
-        htmlId="ai-smart-tools-toggle"
-        title={t("environments.settings.general.ai_smart_tools_enabled")}
-        description={t("environments.settings.general.ai_smart_tools_enabled_description")}
-        disabled={loadingField !== null || !canEdit}
-        customContainerClass="px-0"
-      />
-
-      <AdvancedOptionToggle
-        isChecked={organization.isAIDataAnalysisEnabled}
-        onToggle={(checked) => handleToggle("isAIDataAnalysisEnabled", checked)}
-        htmlId="ai-data-analysis-toggle"
-        title={t("environments.settings.general.ai_data_analysis_enabled")}
-        description={t("environments.settings.general.ai_data_analysis_enabled_description")}
-        disabled={loadingField !== null || !canEdit}
-        customContainerClass="px-0"
-      />
-
-      {!canEdit && (
-        <Alert variant="warning">
-          <AlertDescription>
-            {t("common.only_owners_managers_and_manage_access_members_can_perform_this_action")}
-          </AlertDescription>
-        </Alert>
-      )}
-    </div>
-  );
-};

apps/web/app/(app)/environments/[environmentId]/settings/(organization)/general/page.tsx

@@ -11,7 +11,6 @@ import { PageContentWrapper } from "@/modules/ui/components/page-content-wrapper
 import { PageHeader } from "@/modules/ui/components/page-header";
 import packageJson from "@/package.json";
 import { SettingsCard } from "../../components/SettingsCard";
-import { AISettingsToggle } from "./components/AISettingsToggle";
 import { DeleteOrganization } from "./components/DeleteOrganization";
 import { EditOrganizationNameForm } from "./components/EditOrganizationNameForm";
 import { SecurityListTip } from "./components/SecurityListTip";
@@ -61,11 +60,6 @@ const Page = async (props: { params: Promise<{ environmentId: string }> }) => {
           membershipRole={currentUserMembership?.role}
         />
       </SettingsCard>
-      <SettingsCard
-        title={t("environments.settings.general.ai_enabled")}
-        description={t("environments.settings.general.ai_enabled_description")}>
-        <AISettingsToggle organization={organization} membershipRole={currentUserMembership?.role} />
-      </SettingsCard>
       <EmailCustomizationSettings
         organization={organization}
         hasWhiteLabelPermission={hasWhiteLabelPermission}

apps/web/app/(app)/environments/[environmentId]/settings/(organization)/layout.tsx

@@ -1,7 +1,7 @@
 import { getServerSession } from "next-auth";
 import { AuthenticationError, ResourceNotFoundError } from "@formbricks/types/errors";
 import { getOrganizationByEnvironmentId } from "@/lib/organization/service";
-import { getProjectByEnvironmentId } from "@/lib/project/service";
+import { getWorkspaceByEnvironmentId } from "@/lib/workspace/service";
 import { getTranslate } from "@/lingodotdev/server";
 import { authOptions } from "@/modules/auth/lib/authOptions";
 
@@ -11,9 +11,9 @@ const Layout = async (props: { params: Promise<{ environmentId: string }>; child
   const { children } = props;
 
   const t = await getTranslate();
-  const [organization, project, session] = await Promise.all([
+  const [organization, workspace, session] = await Promise.all([
     getOrganizationByEnvironmentId(params.environmentId),
-    getProjectByEnvironmentId(params.environmentId),
+    getWorkspaceByEnvironmentId(params.environmentId),
     getServerSession(authOptions),
   ]);
 
@@ -21,7 +21,7 @@ const Layout = async (props: { params: Promise<{ environmentId: string }>; child
     throw new ResourceNotFoundError(t("common.organization"), null);
   }
 
-  if (!project) {
+  if (!workspace) {
     throw new ResourceNotFoundError(t("common.workspace"), null);
   }
 

apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/actions.ts

@@ -8,7 +8,7 @@ import { getDisplaysBySurveyIdWithContact } from "@/lib/display/service";
 import { getResponseCountBySurveyId, getResponses } from "@/lib/response/service";
 import { authenticatedActionClient } from "@/lib/utils/action-client";
 import { checkAuthorizationUpdated } from "@/lib/utils/action-client/action-client-middleware";
-import { getOrganizationIdFromSurveyId, getProjectIdFromSurveyId } from "@/lib/utils/helper";
+import { getOrganizationIdFromSurveyId, getWorkspaceIdFromSurveyId } from "@/lib/utils/helper";
 import { getSurveySummary } from "./summary/lib/surveySummary";
 
 export const revalidateSurveyIdPath = async (environmentId: string, surveyId: string) => {
@@ -36,9 +36,9 @@ export const getResponsesAction = authenticatedActionClient
           roles: ["owner", "manager"],
         },
         {
-          type: "projectTeam",
+          type: "workspaceTeam",
           minPermission: "read",
-          projectId: await getProjectIdFromSurveyId(parsedInput.surveyId),
+          workspaceId: await getWorkspaceIdFromSurveyId(parsedInput.surveyId),
         },
       ],
     });
@@ -70,9 +70,9 @@ export const getSurveySummaryAction = authenticatedActionClient
           roles: ["owner", "manager"],
         },
         {
-          type: "projectTeam",
+          type: "workspaceTeam",
           minPermission: "read",
-          projectId: await getProjectIdFromSurveyId(parsedInput.surveyId),
+          workspaceId: await getWorkspaceIdFromSurveyId(parsedInput.surveyId),
         },
       ],
     });
@@ -98,9 +98,9 @@ export const getResponseCountAction = authenticatedActionClient
           roles: ["owner", "manager"],
         },
         {
-          type: "projectTeam",
+          type: "workspaceTeam",
           minPermission: "read",
-          projectId: await getProjectIdFromSurveyId(parsedInput.surveyId),
+          workspaceId: await getWorkspaceIdFromSurveyId(parsedInput.surveyId),
         },
       ],
     });
@@ -126,9 +126,9 @@ export const getDisplaysWithContactAction = authenticatedActionClient
           roles: ["owner", "manager"],
         },
         {
-          type: "projectTeam",
+          type: "workspaceTeam",
           minPermission: "read",
-          projectId: await getProjectIdFromSurveyId(parsedInput.surveyId),
+          workspaceId: await getWorkspaceIdFromSurveyId(parsedInput.surveyId),
         },
       ],
     });

apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/responses/page.tsx

@@ -6,7 +6,7 @@ import { IS_FORMBRICKS_CLOUD, IS_STORAGE_CONFIGURED, RESPONSES_PER_PAGE } from "
 import { getPublicDomain } from "@/lib/getPublicUrl";
 import { getResponseCountBySurveyId, getResponses } from "@/lib/response/service";
 import { getSurvey } from "@/lib/survey/service";
-import { getTagsByEnvironmentId } from "@/lib/tag/service";
+import { getTagsByWorkspaceId } from "@/lib/tag/service";
 import { getUser } from "@/lib/user/service";
 import { getTranslate } from "@/lingodotdev/server";
 import { getSegments } from "@/modules/ee/contacts/segments/lib/segments";
@@ -21,12 +21,14 @@ const Page = async (props: { params: Promise<{ environmentId: string; surveyId:
   const params = await props.params;
   const t = await getTranslate();
 
-  const { session, environment, organization, isReadOnly } = await getEnvironmentAuth(params.environmentId);
+  const { session, environment, organization, isReadOnly, workspace } = await getEnvironmentAuth(
+    params.environmentId
+  );
 
   const [survey, user, tags, isContactsEnabled, responseCount] = await Promise.all([
     getSurvey(params.surveyId),
     getUser(session.user.id),
-    getTagsByEnvironmentId(params.environmentId),
+    getTagsByWorkspaceId(workspace.id),
     getIsContactsEnabled(organization.id),
     getResponseCountBySurveyId(params.surveyId),
   ]);
@@ -43,7 +45,7 @@ const Page = async (props: { params: Promise<{ environmentId: string; surveyId:
     throw new ResourceNotFoundError(t("common.organization"), null);
   }
 
-  const segments = isContactsEnabled ? await getSegments(params.environmentId) : [];
+  const segments = isContactsEnabled ? await getSegments(workspace.id) : [];
 
   const publicDomain = getPublicDomain();
 

apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/actions.ts

@@ -8,7 +8,7 @@ import { getSurvey, updateSurvey } from "@/lib/survey/service";
 import { authenticatedActionClient } from "@/lib/utils/action-client";
 import { checkAuthorizationUpdated } from "@/lib/utils/action-client/action-client-middleware";
 import { convertToCsv } from "@/lib/utils/file-conversion";
-import { getOrganizationIdFromSurveyId, getProjectIdFromSurveyId } from "@/lib/utils/helper";
+import { getOrganizationIdFromSurveyId, getWorkspaceIdFromSurveyId } from "@/lib/utils/helper";
 import { withAuditLogging } from "@/modules/ee/audit-logs/lib/handler";
 import { generatePersonalLinks } from "@/modules/ee/contacts/lib/contacts";
 import { getIsContactsEnabled } from "@/modules/ee/license-check/lib/utils";
@@ -35,9 +35,9 @@ export const sendEmbedSurveyPreviewEmailAction = authenticatedActionClient
           roles: ["owner", "manager"],
         },
         {
-          type: "projectTeam",
+          type: "workspaceTeam",
           minPermission: "read",
-          projectId: await getProjectIdFromSurveyId(parsedInput.surveyId),
+          workspaceId: await getWorkspaceIdFromSurveyId(parsedInput.surveyId),
         },
       ],
     });
@@ -64,13 +64,13 @@ export const sendEmbedSurveyPreviewEmailAction = authenticatedActionClient
 
 const ZResetSurveyAction = z.object({
   surveyId: ZId,
-  projectId: ZId,
+  workspaceId: ZId,
 });
 
 export const resetSurveyAction = authenticatedActionClient.inputSchema(ZResetSurveyAction).action(
   withAuditLogging("updated", "survey", async ({ ctx, parsedInput }) => {
     const organizationId = await getOrganizationIdFromSurveyId(parsedInput.surveyId);
-    const projectId = await getProjectIdFromSurveyId(parsedInput.surveyId);
+    const workspaceId = await getWorkspaceIdFromSurveyId(parsedInput.surveyId);
 
     await checkAuthorizationUpdated({
       userId: ctx.user.id,
@@ -81,9 +81,9 @@ export const resetSurveyAction = authenticatedActionClient.inputSchema(ZResetSur
           roles: ["owner", "manager"],
         },
         {
-          type: "projectTeam",
+          type: "workspaceTeam",
           minPermission: "readWrite",
-          projectId,
+          workspaceId,
         },
       ],
     });
@@ -125,9 +125,9 @@ export const getEmailHtmlAction = authenticatedActionClient
           roles: ["owner", "manager"],
         },
         {
-          type: "projectTeam",
+          type: "workspaceTeam",
           minPermission: "readWrite",
-          projectId: await getProjectIdFromSurveyId(parsedInput.surveyId),
+          workspaceId: await getWorkspaceIdFromSurveyId(parsedInput.surveyId),
         },
       ],
     });
@@ -160,8 +160,8 @@ export const generatePersonalLinksAction = authenticatedActionClient
           roles: ["owner", "manager"],
         },
         {
-          type: "projectTeam",
-          projectId: await getProjectIdFromSurveyId(parsedInput.surveyId),
+          type: "workspaceTeam",
+          workspaceId: await getWorkspaceIdFromSurveyId(parsedInput.surveyId),
           minPermission: "readWrite",
         },
       ],
@@ -234,8 +234,8 @@ export const updateSingleUseLinksAction = authenticatedActionClient
           roles: ["owner", "manager"],
         },
         {
-          type: "projectTeam",
-          projectId: await getProjectIdFromSurveyId(parsedInput.surveyId),
+          type: "workspaceTeam",
+          workspaceId: await getWorkspaceIdFromSurveyId(parsedInput.surveyId),
           minPermission: "readWrite",
         },
       ],

apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/SurveyAnalysisCTA.tsx

@@ -64,7 +64,7 @@ export const SurveyAnalysisCTA = ({
   const [isResetModalOpen, setIsResetModalOpen] = useState(false);
   const [isResetting, setIsResetting] = useState(false);
 
-  const { project } = useEnvironment();
+  const { workspace } = useEnvironment();
   const { refreshSingleUseId } = useSingleUseId(survey, isReadOnly);
 
   const appSetupCompleted = survey.type === "app" && environment.appSetupCompleted;
@@ -128,7 +128,7 @@ export const SurveyAnalysisCTA = ({
     setIsResetting(true);
     const result = await resetSurveyAction({
       surveyId: survey.id,
-      projectId: project.id,
+      workspaceId: workspace.id,
     });
     if (result?.data) {
       toast.success(
@@ -212,7 +212,7 @@ export const SurveyAnalysisCTA = ({
           isFormbricksCloud={isFormbricksCloud}
           isReadOnly={isReadOnly}
           isStorageConfigured={isStorageConfigured}
-          projectCustomScripts={project.customHeadScripts}
+          workspaceCustomScripts={workspace.customHeadScripts}
         />
       )}
       <SuccessMessage environment={environment} survey={survey} />

apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/share-survey-modal.tsx

@@ -53,7 +53,7 @@ interface ShareSurveyModalProps {
   isFormbricksCloud: boolean;
   isReadOnly: boolean;
   isStorageConfigured: boolean;
-  projectCustomScripts?: string | null;
+  workspaceCustomScripts?: string | null;
 }
 
 export const ShareSurveyModal = ({
@@ -68,7 +68,7 @@ export const ShareSurveyModal = ({
   isFormbricksCloud,
   isReadOnly,
   isStorageConfigured,
-  projectCustomScripts,
+  workspaceCustomScripts,
 }: ShareSurveyModalProps) => {
   const environmentId = survey.environmentId;
   const [surveyUrl, setSurveyUrl] = useState<string>(getSurveyUrl(survey, publicDomain, "default"));
@@ -193,7 +193,7 @@ export const ShareSurveyModal = ({
         title: t("environments.surveys.share.custom_html.nav_title"),
         description: t("environments.surveys.share.custom_html.description"),
         componentType: CustomHtmlTab,
-        componentProps: { projectCustomScripts, isReadOnly },
+        componentProps: { workspaceCustomScripts, isReadOnly },
       },
     ];
 
@@ -216,7 +216,7 @@ export const ShareSurveyModal = ({
     isFormbricksCloud,
     email,
     isStorageConfigured,
-    projectCustomScripts,
+    workspaceCustomScripts,
   ]);
 
   const getDefaultActiveId = useCallback(() => {

apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/shareEmbedModal/app-tab.tsx

@@ -88,7 +88,7 @@ const DisplayCriteriaItem = ({ icon, title, titleSuffix, description }: DisplayC
 
 export const AppTab = () => {
   const { t } = useTranslation();
-  const { environment, project } = useEnvironment();
+  const { environment, workspace } = useEnvironment();
   const { survey } = useSurvey();
 
   const documentationLinks = useMemo(() => createDocumentationLinks(t), [t]);
@@ -98,8 +98,8 @@ export const AppTab = () => {
     if (survey.recontactDays !== null) {
       return formatRecontactDaysString(survey.recontactDays, t);
     }
-    if (project.recontactDays !== null) {
-      return formatRecontactDaysString(project.recontactDays, t);
+    if (workspace.recontactDays !== null) {
+      return formatRecontactDaysString(workspace.recontactDays, t);
     }
     return t("environments.surveys.summary.in_app.display_criteria.time_based_always");
   };

apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/shareEmbedModal/custom-html-tab.tsx

@@ -22,7 +22,7 @@ import {
 import { TabToggle } from "@/modules/ui/components/tab-toggle";
 
 interface CustomHtmlTabProps {
-  projectCustomScripts: string | null | undefined;
+  workspaceCustomScripts: string | null | undefined;
   isReadOnly: boolean;
 }
 
@@ -31,7 +31,7 @@ interface CustomHtmlFormData {
   customHeadScriptsMode: TSurvey["customHeadScriptsMode"];
 }
 
-export const CustomHtmlTab = ({ projectCustomScripts, isReadOnly }: CustomHtmlTabProps) => {
+export const CustomHtmlTab = ({ workspaceCustomScripts, isReadOnly }: CustomHtmlTabProps) => {
   const { t } = useTranslation();
   const { survey } = useSurvey();
   const [isSaving, setIsSaving] = useState(false);
@@ -101,18 +101,18 @@ export const CustomHtmlTab = ({ projectCustomScripts, isReadOnly }: CustomHtmlTa
           </div>
 
           {/* Workspace Scripts Preview */}
-          {projectCustomScripts && (
+          {workspaceCustomScripts && (
             <div className={scriptsMode === "replace" ? "opacity-50" : ""}>
               <FormLabel>{t("environments.surveys.share.custom_html.workspace_scripts_label")}</FormLabel>
               <div className="mt-2 max-h-32 overflow-auto rounded-md border border-slate-200 bg-slate-50 p-3">
                 <pre className="whitespace-pre-wrap font-mono text-xs text-slate-600">
-                  {projectCustomScripts}
+                  {workspaceCustomScripts}
                 </pre>
               </div>
             </div>
           )}
 
-          {!projectCustomScripts && (
+          {!workspaceCustomScripts && (
             <div className="rounded-md border border-slate-200 bg-slate-50 p-3">
               <p className="text-sm text-slate-500">
                 {t("environments.surveys.share.custom_html.no_workspace_scripts")}

apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/lib/emailTemplate.tsx

@@ -1,8 +1,8 @@
 import { ResourceNotFoundError } from "@formbricks/types/errors";
 import { getPublicDomain } from "@/lib/getPublicUrl";
-import { getProjectByEnvironmentId } from "@/lib/project/service";
 import { getSurvey } from "@/lib/survey/service";
 import { getStyling } from "@/lib/utils/styling";
+import { getWorkspaceByEnvironmentId } from "@/lib/workspace/service";
 import { getTranslate } from "@/lingodotdev/server";
 import { getPreviewEmailTemplateHtml } from "@/modules/email/components/preview-email-template";
 
@@ -12,12 +12,12 @@ export const getEmailTemplateHtml = async (surveyId: string, locale: string) =>
   if (!survey) {
     throw new ResourceNotFoundError(t("common.survey"), surveyId);
   }
-  const project = await getProjectByEnvironmentId(survey.environmentId);
-  if (!project) {
+  const workspace = await getWorkspaceByEnvironmentId(survey.environmentId);
+  if (!workspace) {
     throw new ResourceNotFoundError(t("common.workspace"), null);
   }
 
-  const styling = getStyling(project, survey);
+  const styling = getStyling(workspace, survey);
   const surveyUrl = getPublicDomain() + "/s/" + survey.id;
   const html = await getPreviewEmailTemplateHtml(survey, surveyUrl, styling, locale, t);
   const doctype =

apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/lib/surveySummary.test.ts

@@ -2,10 +2,10 @@ import { Prisma } from "@prisma/client";
 import { beforeEach, describe, expect, test, vi } from "vitest";
 import { prisma } from "@formbricks/database";
 import { DatabaseError, ResourceNotFoundError } from "@formbricks/types/errors";
-import { TLanguage } from "@formbricks/types/project";
 import { TResponseFilterCriteria } from "@formbricks/types/responses";
 import { TSurveyElement, TSurveyElementTypeEnum } from "@formbricks/types/surveys/elements";
 import { TSurvey, TSurveySummary } from "@formbricks/types/surveys/types";
+import { TLanguage } from "@formbricks/types/workspace";
 import { getQuotasSummary } from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/lib/survey";
 import { getDisplayCountBySurveyId } from "@/lib/display/service";
 import { getLocalizedValue } from "@/lib/i18n/utils";
@@ -99,7 +99,7 @@ const mockBaseSurvey: TSurvey = {
   createdBy: "user_123",
   isSingleResponsePerEmailEnabled: false,
   isVerifyEmailEnabled: false,
-  projectOverwrites: null,
+  workspaceOverwrites: null,
   showLanguageSwitch: false,
   isBackButtonHidden: false,
   followUps: [],

apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/page.tsx

@@ -12,7 +12,6 @@ import { getTranslate } from "@/lingodotdev/server";
 import { getSegments } from "@/modules/ee/contacts/segments/lib/segments";
 import { getIsContactsEnabled, getIsQuotasEnabled } from "@/modules/ee/license-check/lib/utils";
 import { getEnvironmentAuth } from "@/modules/environments/lib/utils";
-import { getOrganizationIdFromEnvironmentId } from "@/modules/survey/lib/organization";
 import { getOrganizationBilling } from "@/modules/survey/lib/survey";
 import { IdBadge } from "@/modules/ui/components/id-badge";
 import { PageContentWrapper } from "@/modules/ui/components/page-content-wrapper";
@@ -22,7 +21,9 @@ const SurveyPage = async (props: { params: Promise<{ environmentId: string; surv
   const params = await props.params;
   const t = await getTranslate();
 
-  const { session, environment, isReadOnly } = await getEnvironmentAuth(params.environmentId);
+  const { session, environment, isReadOnly, workspace, organization } = await getEnvironmentAuth(
+    params.environmentId
+  );
 
   const surveyId = params.surveyId;
 
@@ -41,19 +42,18 @@ const SurveyPage = async (props: { params: Promise<{ environmentId: string; surv
   if (!user) {
     throw new AuthenticationError(t("common.not_authenticated"));
   }
-  const organizationId = await getOrganizationIdFromEnvironmentId(environment.id);
 
-  const isContactsEnabled = await getIsContactsEnabled(organizationId);
-  const segments = isContactsEnabled ? await getSegments(environment.id) : [];
+  const isContactsEnabled = await getIsContactsEnabled(organization.id);
+  const segments = isContactsEnabled ? await getSegments(workspace.id) : [];
 
-  if (!organizationId) {
+  if (!organization) {
     throw new ResourceNotFoundError(t("common.organization"), null);
   }
-  const organizationBilling = await getOrganizationBilling(organizationId);
+  const organizationBilling = await getOrganizationBilling(organization.id);
   if (!organizationBilling) {
-    throw new ResourceNotFoundError(t("common.organization"), organizationId);
+    throw new ResourceNotFoundError(t("common.organization"), organization.id);
   }
-  const isQuotasAllowed = await getIsQuotasEnabled(organizationId);
+  const isQuotasAllowed = await getIsQuotasEnabled(organization.id);
 
   // Fetch initial survey summary data on the server to prevent duplicate API calls during hydration
   const initialSurveySummary = await getSurveySummary(surveyId);

apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/actions.ts

@@ -6,10 +6,10 @@ import { ResourceNotFoundError } from "@formbricks/types/errors";
 import { ZResponseFilterCriteria } from "@formbricks/types/responses";
 import { getResponseDownloadFile, getResponseFilteringValues } from "@/lib/response/service";
 import { getSurvey } from "@/lib/survey/service";
-import { getTagsByEnvironmentId } from "@/lib/tag/service";
+import { getTagsByWorkspaceId } from "@/lib/tag/service";
 import { authenticatedActionClient } from "@/lib/utils/action-client";
 import { checkAuthorizationUpdated } from "@/lib/utils/action-client/action-client-middleware";
-import { getOrganizationIdFromSurveyId, getProjectIdFromSurveyId } from "@/lib/utils/helper";
+import { getOrganizationIdFromSurveyId, getWorkspaceIdFromSurveyId } from "@/lib/utils/helper";
 import { getIsQuotasEnabled } from "@/modules/ee/license-check/lib/utils";
 import { getQuotas } from "@/modules/ee/quotas/lib/quotas";
 import { getOrganizationBilling } from "@/modules/survey/lib/survey";
@@ -32,9 +32,9 @@ export const getResponsesDownloadUrlAction = authenticatedActionClient
           roles: ["owner", "manager"],
         },
         {
-          type: "projectTeam",
+          type: "workspaceTeam",
           minPermission: "read",
-          projectId: await getProjectIdFromSurveyId(parsedInput.surveyId),
+          workspaceId: await getWorkspaceIdFromSurveyId(parsedInput.surveyId),
         },
       ],
     });
@@ -70,9 +70,9 @@ export const getSurveyFilterDataAction = authenticatedActionClient
           roles: ["owner", "manager"],
         },
         {
-          type: "projectTeam",
+          type: "workspaceTeam",
           minPermission: "read",
-          projectId: await getProjectIdFromSurveyId(parsedInput.surveyId),
+          workspaceId: await getWorkspaceIdFromSurveyId(parsedInput.surveyId),
         },
       ],
     });
@@ -84,8 +84,10 @@ export const getSurveyFilterDataAction = authenticatedActionClient
 
     const isQuotasAllowed = await getIsQuotasEnabled(organizationId);
 
+    const workspaceId = await getWorkspaceIdFromSurveyId(parsedInput.surveyId);
+
     const [tags, { contactAttributes: attributes, meta, hiddenFields }, quotas = []] = await Promise.all([
-      getTagsByEnvironmentId(survey.environmentId),
+      getTagsByWorkspaceId(workspaceId),
       getResponseFilteringValues(parsedInput.surveyId),
       isQuotasAllowed ? getQuotas(parsedInput.surveyId) : [],
     ]);

apps/web/app/(app)/environments/[environmentId]/workflows/components/workflows-page.tsx

@@ -0,0 +1,208 @@
+"use client";
+
+import { CheckCircle2, Sparkles } from "lucide-react";
+import { useState } from "react";
+import { useTranslation } from "react-i18next";
+import { Button } from "@/modules/ui/components/button";
+
+const FORMBRICKS_HOST = "https://app.formbricks.com";
+const SURVEY_ID = "cr9r4b2r73x6hlmn5aa2ha44";
+const ENVIRONMENT_ID = "cmk41i8bi92bdad01svi74dec";
+
+interface WorkflowsPageProps {
+  userEmail: string;
+  organizationName: string;
+  billingPlan: string;
+}
+
+type Step = "prompt" | "followup" | "thankyou";
+
+export const WorkflowsPage = ({ userEmail, organizationName, billingPlan }: WorkflowsPageProps) => {
+  const { t } = useTranslation();
+  const [step, setStep] = useState<Step>("prompt");
+  const [promptValue, setPromptValue] = useState("");
+  const [detailsValue, setDetailsValue] = useState("");
+  const [responseId, setResponseId] = useState<string | null>(null);
+  const [isSubmitting, setIsSubmitting] = useState(false);
+
+  const handleGenerateWorkflow = async () => {
+    if (promptValue.trim().length < 100 || isSubmitting) return;
+    setIsSubmitting(true);
+
+    try {
+      const res = await fetch(`${FORMBRICKS_HOST}/api/v2/client/${ENVIRONMENT_ID}/responses`, {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({
+          surveyId: SURVEY_ID,
+          finished: false,
+          data: {
+            workflow: promptValue.trim(),
+            useremail: userEmail,
+            orgname: organizationName,
+            billingplan: billingPlan,
+          },
+        }),
+      });
+
+      if (res.ok) {
+        const json = await res.json();
+        setResponseId(json.data?.id ?? null);
+      }
+
+      setStep("followup");
+    } catch {
+      setStep("followup");
+    } finally {
+      setIsSubmitting(false);
+    }
+  };
+
+  const handleSubmitFeedback = async () => {
+    if (isSubmitting) return;
+    setIsSubmitting(true);
+
+    if (responseId) {
+      try {
+        await fetch(`${FORMBRICKS_HOST}/api/v1/client/${ENVIRONMENT_ID}/responses/${responseId}`, {
+          method: "PUT",
+          headers: { "Content-Type": "application/json" },
+          body: JSON.stringify({
+            finished: true,
+            data: {
+              details: detailsValue.trim(),
+            },
+          }),
+        });
+      } catch {
+        // silently fail
+      }
+    }
+
+    setIsSubmitting(false);
+    setStep("thankyou");
+  };
+
+  const handleSkipFeedback = async () => {
+    if (!responseId) {
+      setStep("thankyou");
+      return;
+    }
+
+    try {
+      await fetch(`${FORMBRICKS_HOST}/api/v1/client/${ENVIRONMENT_ID}/responses/${responseId}`, {
+        method: "PUT",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({
+          finished: true,
+          data: {},
+        }),
+      });
+    } catch {
+      // silently fail
+    }
+
+    setStep("thankyou");
+  };
+
+  if (step === "prompt") {
+    return (
+      <div className="flex h-full flex-col items-center px-4 pt-[15vh]">
+        <div className="w-full max-w-2xl space-y-8">
+          <div className="space-y-3 text-center">
+            <div className="mx-auto mb-4 flex h-12 w-12 items-center justify-center rounded-xl bg-gradient-to-br from-brand-light to-brand-dark shadow-md">
+              <Sparkles className="h-6 w-6 text-white" />
+            </div>
+            <h1 className="text-4xl font-bold tracking-tight text-slate-800">{t("workflows.heading")}</h1>
+            <p className="text-lg text-slate-500">{t("workflows.subheading")}</p>
+          </div>
+
+          <div className="relative">
+            <textarea
+              value={promptValue}
+              onChange={(e) => setPromptValue(e.target.value)}
+              placeholder={t("workflows.placeholder")}
+              rows={5}
+              className="w-full resize-none rounded-xl border border-slate-200 bg-white px-5 py-4 text-base text-slate-800 shadow-sm transition-all placeholder:text-slate-400 focus:border-brand-dark focus:outline-none focus:ring-2 focus:ring-brand-light/20"
+              onKeyDown={(e) => {
+                if (e.key === "Enter" && (e.metaKey || e.ctrlKey)) {
+                  handleGenerateWorkflow();
+                }
+              }}
+            />
+            <div className="mt-3 flex items-center justify-between">
+              <span
+                className={`text-xs ${promptValue.trim().length >= 100 ? "text-slate-400" : "text-amber-500"}`}>
+                {promptValue.trim().length} / 100
+              </span>
+              <Button
+                onClick={handleGenerateWorkflow}
+                disabled={promptValue.trim().length < 100 || isSubmitting}
+                loading={isSubmitting}
+                size="lg">
+                <Sparkles className="h-4 w-4" />
+                {t("workflows.generate_button")}
+              </Button>
+            </div>
+          </div>
+        </div>
+      </div>
+    );
+  }
+
+  if (step === "followup") {
+    return (
+      <div className="flex h-full flex-col items-center px-4 pt-[15vh]">
+        <div className="w-full max-w-2xl space-y-8">
+          <div className="space-y-3 text-center">
+            <div className="mx-auto mb-4 flex h-12 w-12 items-center justify-center rounded-xl bg-slate-100">
+              <Sparkles className="h-6 w-6 text-brand-dark" />
+            </div>
+            <h1 className="text-3xl font-bold tracking-tight text-slate-800">
+              {t("workflows.coming_soon_title")}
+            </h1>
+            <p className="mx-auto max-w-md text-base text-slate-500">
+              {t("workflows.coming_soon_description")}
+            </p>
+          </div>
+
+          <div className="rounded-xl border border-slate-200 bg-white p-6 shadow-sm">
+            <label className="text-md mb-2 block font-medium text-slate-700">
+              {t("workflows.follow_up_label")}
+            </label>
+            <textarea
+              value={detailsValue}
+              onChange={(e) => setDetailsValue(e.target.value)}
+              placeholder={t("workflows.follow_up_placeholder")}
+              rows={4}
+              className="w-full resize-none rounded-lg border border-slate-200 bg-slate-50 px-4 py-3 text-sm text-slate-800 transition-all placeholder:text-slate-400 focus:border-brand-dark focus:bg-white focus:outline-none focus:ring-2 focus:ring-brand-light/20"
+            />
+            <div className="mt-4 flex items-center justify-end gap-3">
+              <Button variant="ghost" onClick={handleSkipFeedback} className="text-slate-500">
+                {t("common.skip")}
+              </Button>
+              <Button
+                onClick={handleSubmitFeedback}
+                disabled={!detailsValue.trim() || isSubmitting}
+                loading={isSubmitting}>
+                {t("workflows.submit_button")}
+              </Button>
+            </div>
+          </div>
+        </div>
+      </div>
+    );
+  }
+
+  return (
+    <div className="flex h-full flex-col items-center px-4 pt-[15vh]">
+      <div className="w-full max-w-md space-y-6 text-center">
+        <div className="mx-auto flex h-16 w-16 items-center justify-center rounded-full bg-green-50">
+          <CheckCircle2 className="h-8 w-8 text-green-500" />
+        </div>
+        <h1 className="text-2xl font-bold text-slate-800">{t("workflows.thank_you_title")}</h1>
+        <p className="text-base text-slate-500">{t("workflows.thank_you_description")}</p>
+      </div>
+    </div>
+  );
+};

apps/web/app/(app)/environments/[environmentId]/workflows/page.tsx

@@ -0,0 +1,42 @@
+import { Metadata } from "next";
+import { notFound, redirect } from "next/navigation";
+import { IS_FORMBRICKS_CLOUD } from "@/lib/constants";
+import { getUser } from "@/lib/user/service";
+import { getCloudBillingDisplayContext } from "@/modules/ee/billing/lib/cloud-billing-display";
+import { getEnvironmentAuth } from "@/modules/environments/lib/utils";
+import { WorkflowsPage } from "./components/workflows-page";
+
+export const metadata: Metadata = {
+  title: "Workflows",
+};
+
+const Page = async (props: { params: Promise<{ environmentId: string }> }) => {
+  const params = await props.params;
+
+  if (!IS_FORMBRICKS_CLOUD) {
+    return notFound();
+  }
+
+  const { session, organization, isBilling } = await getEnvironmentAuth(params.environmentId);
+
+  if (isBilling) {
+    return redirect(`/environments/${params.environmentId}/settings/billing`);
+  }
+
+  const user = await getUser(session.user.id);
+  if (!user) {
+    return redirect("/auth/login");
+  }
+
+  const cloudBillingDisplayContext = await getCloudBillingDisplayContext(organization.id);
+
+  return (
+    <WorkflowsPage
+      userEmail={user.email}
+      organizationName={organization.name}
+      billingPlan={cloudBillingDisplayContext.currentCloudPlan}
+    />
+  );
+};
+
+export default Page;

apps/web/app/(app)/environments/[environmentId]/workspace/(setup)/app-connection/loading.tsx

@@ -1,3 +1,3 @@
-import { AppConnectionLoading } from "@/modules/projects/settings/(setup)/app-connection/loading";
+import { AppConnectionLoading } from "@/modules/workspaces/settings/(setup)/app-connection/loading";
 
 export default AppConnectionLoading;

apps/web/app/(app)/environments/[environmentId]/workspace/(setup)/app-connection/page.tsx

@@ -1,3 +1,3 @@
-import { AppConnectionPage } from "@/modules/projects/settings/(setup)/app-connection/page";
+import { AppConnectionPage } from "@/modules/workspaces/settings/(setup)/app-connection/page";
 
 export default AppConnectionPage;

apps/web/app/(app)/environments/[environmentId]/workspace/general/loading.tsx

@@ -1,3 +1,3 @@
-import { GeneralSettingsLoading } from "@/modules/projects/settings/general/loading";
+import { GeneralSettingsLoading } from "@/modules/workspaces/settings/general/loading";
 
 export default GeneralSettingsLoading;

apps/web/app/(app)/environments/[environmentId]/workspace/general/page.tsx

@@ -1,3 +1,3 @@
-import { GeneralSettingsPage } from "@/modules/projects/settings/general/page";
+import { GeneralSettingsPage } from "@/modules/workspaces/settings/general/page";
 
 export default GeneralSettingsPage;

apps/web/app/(app)/environments/[environmentId]/workspace/integrations/actions.ts

@@ -7,10 +7,10 @@ import { createOrUpdateIntegration, deleteIntegration } from "@/lib/integration/
 import { authenticatedActionClient } from "@/lib/utils/action-client";
 import { checkAuthorizationUpdated } from "@/lib/utils/action-client/action-client-middleware";
 import {
-  getOrganizationIdFromEnvironmentId,
   getOrganizationIdFromIntegrationId,
-  getProjectIdFromEnvironmentId,
-  getProjectIdFromIntegrationId,
+  getOrganizationIdFromWorkspaceId,
+  getWorkspaceIdFromEnvironmentId,
+  getWorkspaceIdFromIntegrationId,
 } from "@/lib/utils/helper";
 import { withAuditLogging } from "@/modules/ee/audit-logs/lib/handler";
 
@@ -23,7 +23,8 @@ export const createOrUpdateIntegrationAction = authenticatedActionClient
   .inputSchema(ZCreateOrUpdateIntegrationAction)
   .action(
     withAuditLogging("createdUpdated", "integration", async ({ ctx, parsedInput }) => {
-      const organizationId = await getOrganizationIdFromEnvironmentId(parsedInput.environmentId);
+      const workspaceId = await getWorkspaceIdFromEnvironmentId(parsedInput.environmentId);
+      const organizationId = await getOrganizationIdFromWorkspaceId(workspaceId);
 
       await checkAuthorizationUpdated({
         userId: ctx.user.id,
@@ -34,9 +35,9 @@ export const createOrUpdateIntegrationAction = authenticatedActionClient
             roles: ["owner", "manager"],
           },
           {
-            type: "projectTeam",
+            type: "workspaceTeam",
             minPermission: "readWrite",
-            projectId: await getProjectIdFromEnvironmentId(parsedInput.environmentId),
+            workspaceId,
           },
         ],
       });
@@ -66,8 +67,8 @@ export const deleteIntegrationAction = authenticatedActionClient.inputSchema(ZDe
           roles: ["owner", "manager"],
         },
         {
-          type: "projectTeam",
-          projectId: await getProjectIdFromIntegrationId(parsedInput.integrationId),
+          type: "workspaceTeam",
+          workspaceId: await getWorkspaceIdFromIntegrationId(parsedInput.integrationId),
           minPermission: "readWrite",
         },
       ],

apps/web/app/(app)/environments/[environmentId]/workspace/integrations/airtable/page.tsx

@@ -18,11 +18,11 @@ const Page = async (props: { params: Promise<{ environmentId: string }> }) => {
   const t = await getTranslate();
   const isEnabled = !!AIRTABLE_CLIENT_ID;
 
-  const { isReadOnly, environment, session } = await getEnvironmentAuth(params.environmentId);
+  const { isReadOnly, environment, session, workspace } = await getEnvironmentAuth(params.environmentId);
 
   const [surveys, integrations, locale] = await Promise.all([
-    getSurveys(params.environmentId),
-    getIntegrations(params.environmentId),
+    getSurveys(workspace.id),
+    getIntegrations(workspace.id),
     getUserLocale(session.user.id),
   ]);
 

apps/web/app/(app)/environments/[environmentId]/workspace/integrations/google-sheets/actions.ts

@@ -10,7 +10,7 @@ import { getSpreadsheetNameById, validateGoogleSheetsConnection } from "@/lib/go
 import { getIntegrationByType } from "@/lib/integration/service";
 import { authenticatedActionClient } from "@/lib/utils/action-client";
 import { checkAuthorizationUpdated } from "@/lib/utils/action-client/action-client-middleware";
-import { getOrganizationIdFromEnvironmentId, getProjectIdFromEnvironmentId } from "@/lib/utils/helper";
+import { getOrganizationIdFromWorkspaceId, getWorkspaceIdFromEnvironmentId } from "@/lib/utils/helper";
 
 const ZValidateGoogleSheetsConnectionAction = z.object({
   environmentId: ZId,
@@ -19,23 +19,25 @@ const ZValidateGoogleSheetsConnectionAction = z.object({
 export const validateGoogleSheetsConnectionAction = authenticatedActionClient
   .inputSchema(ZValidateGoogleSheetsConnectionAction)
   .action(async ({ ctx, parsedInput }) => {
+    const workspaceId = await getWorkspaceIdFromEnvironmentId(parsedInput.environmentId);
+
     await checkAuthorizationUpdated({
       userId: ctx.user.id,
-      organizationId: await getOrganizationIdFromEnvironmentId(parsedInput.environmentId),
+      organizationId: await getOrganizationIdFromWorkspaceId(workspaceId),
       access: [
         {
           type: "organization",
           roles: ["owner", "manager"],
         },
         {
-          type: "projectTeam",
-          projectId: await getProjectIdFromEnvironmentId(parsedInput.environmentId),
+          type: "workspaceTeam",
+          workspaceId,
           minPermission: "readWrite",
         },
       ],
     });
 
-    const integration = await getIntegrationByType(parsedInput.environmentId, "googleSheets");
+    const integration = await getIntegrationByType(workspaceId, "googleSheets");
     if (!integration) {
       return { data: false };
     }
@@ -53,17 +55,18 @@ const ZGetSpreadsheetNameByIdAction = z.object({
 export const getSpreadsheetNameByIdAction = authenticatedActionClient
   .inputSchema(ZGetSpreadsheetNameByIdAction)
   .action(async ({ ctx, parsedInput }) => {
+    const workspaceId = await getWorkspaceIdFromEnvironmentId(parsedInput.environmentId);
     await checkAuthorizationUpdated({
       userId: ctx.user.id,
-      organizationId: await getOrganizationIdFromEnvironmentId(parsedInput.environmentId),
+      organizationId: await getOrganizationIdFromWorkspaceId(workspaceId),
       access: [
         {
           type: "organization",
           roles: ["owner", "manager"],
         },
         {
-          type: "projectTeam",
-          projectId: await getProjectIdFromEnvironmentId(parsedInput.environmentId),
+          type: "workspaceTeam",
+          workspaceId,
           minPermission: "readWrite",
         },
       ],

apps/web/app/(app)/environments/[environmentId]/workspace/integrations/google-sheets/page.tsx

@@ -22,11 +22,11 @@ const Page = async (props: { params: Promise<{ environmentId: string }> }) => {
   const t = await getTranslate();
   const isEnabled = !!(GOOGLE_SHEETS_CLIENT_ID && GOOGLE_SHEETS_CLIENT_SECRET && GOOGLE_SHEETS_REDIRECT_URL);
 
-  const { isReadOnly, environment, session } = await getEnvironmentAuth(params.environmentId);
+  const { isReadOnly, environment, session, workspace } = await getEnvironmentAuth(params.environmentId);
 
   const [surveys, integrations, locale] = await Promise.all([
-    getSurveys(params.environmentId),
-    getIntegrations(params.environmentId),
+    getSurveys(workspace.id),
+    getIntegrations(workspace.id),
     getUserLocale(session.user.id),
   ]);
 

apps/web/app/(app)/environments/[environmentId]/workspace/integrations/lib/webhook.test.ts

@@ -14,7 +14,7 @@ vi.mock("@formbricks/database", () => ({
   },
 }));
 
-const environmentId = "test-environment-id";
+const workspaceId = "test-workspace-id";
 const sourceZapier = "zapier";
 
 describe("getWebhookCountBySource", () => {
@@ -26,16 +26,16 @@ describe("getWebhookCountBySource", () => {
     const mockCount = 5;
     vi.mocked(prisma.webhook.count).mockResolvedValue(mockCount);
 
-    const count = await getWebhookCountBySource(environmentId, sourceZapier);
+    const count = await getWebhookCountBySource(workspaceId, sourceZapier);
 
     expect(count).toBe(mockCount);
     expect(validateInputs).toHaveBeenCalledWith(
-      [environmentId, expect.any(Object)],
+      [workspaceId, expect.any(Object)],
       [sourceZapier, expect.any(Object)]
     );
     expect(prisma.webhook.count).toHaveBeenCalledWith({
       where: {
-        environmentId,
+        workspaceId: workspaceId,
         source: sourceZapier,
       },
     });
@@ -45,16 +45,16 @@ describe("getWebhookCountBySource", () => {
     const mockCount = 10;
     vi.mocked(prisma.webhook.count).mockResolvedValue(mockCount);
 
-    const count = await getWebhookCountBySource(environmentId);
+    const count = await getWebhookCountBySource(workspaceId);
 
     expect(count).toBe(mockCount);
     expect(validateInputs).toHaveBeenCalledWith(
-      [environmentId, expect.any(Object)],
+      [workspaceId, expect.any(Object)],
       [undefined, expect.any(Object)]
     );
     expect(prisma.webhook.count).toHaveBeenCalledWith({
       where: {
-        environmentId,
+        workspaceId: workspaceId,
         source: undefined,
       },
     });
@@ -67,7 +67,7 @@ describe("getWebhookCountBySource", () => {
     });
     vi.mocked(prisma.webhook.count).mockRejectedValue(prismaError);
 
-    await expect(getWebhookCountBySource(environmentId, sourceZapier)).rejects.toThrow(DatabaseError);
+    await expect(getWebhookCountBySource(workspaceId, sourceZapier)).rejects.toThrow(DatabaseError);
     expect(prisma.webhook.count).toHaveBeenCalledTimes(1);
   });
 
@@ -75,7 +75,7 @@ describe("getWebhookCountBySource", () => {
     const genericError = new Error("Something went wrong");
     vi.mocked(prisma.webhook.count).mockRejectedValue(genericError);
 
-    await expect(getWebhookCountBySource(environmentId)).rejects.toThrow(genericError);
+    await expect(getWebhookCountBySource(workspaceId)).rejects.toThrow(genericError);
     expect(prisma.webhook.count).toHaveBeenCalledTimes(1);
   });
 });

apps/web/app/(app)/environments/[environmentId]/workspace/integrations/lib/webhook.ts

@@ -6,15 +6,15 @@ import { DatabaseError } from "@formbricks/types/errors";
 import { validateInputs } from "@/lib/utils/validate";
 
 export const getWebhookCountBySource = async (
-  environmentId: string,
+  workspaceId: string,
   source?: Webhook["source"]
 ): Promise<number> => {
-  validateInputs([environmentId, ZId], [source, z.string().optional()]);
+  validateInputs([workspaceId, ZId], [source, z.string().optional()]);
 
   try {
     const count = await prisma.webhook.count({
       where: {
-        environmentId,
+        workspaceId,
         source,
       },
     });

apps/web/app/(app)/environments/[environmentId]/workspace/integrations/notion/page.tsx

@@ -29,11 +29,11 @@ const Page = async (props: { params: Promise<{ environmentId: string }> }) => {
     NOTION_REDIRECT_URI
   );
 
-  const { isReadOnly, environment, session } = await getEnvironmentAuth(params.environmentId);
+  const { isReadOnly, environment, session, workspace } = await getEnvironmentAuth(params.environmentId);
 
   const [surveys, notionIntegration, locale] = await Promise.all([
-    getSurveys(params.environmentId),
-    getIntegrationByType(params.environmentId, "notion"),
+    getSurveys(workspace.id),
+    getIntegrationByType(workspace.id, "notion"),
     getUserLocale(session.user.id),
   ]);
 

apps/web/app/(app)/environments/[environmentId]/workspace/integrations/page.tsx

@@ -16,10 +16,10 @@ import ZapierLogo from "@/images/zapier-small.png";
 import { getIntegrations } from "@/lib/integration/service";
 import { getTranslate } from "@/lingodotdev/server";
 import { getEnvironmentAuth } from "@/modules/environments/lib/utils";
-import { ProjectConfigNavigation } from "@/modules/projects/settings/components/project-config-navigation";
 import { Card } from "@/modules/ui/components/integration-card";
 import { PageContentWrapper } from "@/modules/ui/components/page-content-wrapper";
 import { PageHeader } from "@/modules/ui/components/page-header";
+import { WorkspaceConfigNavigation } from "@/modules/workspaces/settings/components/workspace-config-navigation";
 
 const getStatusText = (count: number, t: TFunction, type: string) => {
   if (count === 1) return `1 ${type}`;
@@ -31,7 +31,7 @@ const Page = async (props: { params: Promise<{ environmentId: string }> }) => {
   const params = await props.params;
   const t = await getTranslate();
 
-  const { isReadOnly, environment, isBilling } = await getEnvironmentAuth(params.environmentId);
+  const { isReadOnly, environment, isBilling, workspace } = await getEnvironmentAuth(params.environmentId);
 
   const [
     integrations,
@@ -41,12 +41,12 @@ const Page = async (props: { params: Promise<{ environmentId: string }> }) => {
     n8nwebhookCount,
     activePiecesWebhookCount,
   ] = await Promise.all([
-    getIntegrations(params.environmentId),
-    getWebhookCountBySource(params.environmentId, "user"),
-    getWebhookCountBySource(params.environmentId, "zapier"),
-    getWebhookCountBySource(params.environmentId, "make"),
-    getWebhookCountBySource(params.environmentId, "n8n"),
-    getWebhookCountBySource(params.environmentId, "activepieces"),
+    getIntegrations(workspace.id),
+    getWebhookCountBySource(workspace.id, "user"),
+    getWebhookCountBySource(workspace.id, "zapier"),
+    getWebhookCountBySource(workspace.id, "make"),
+    getWebhookCountBySource(workspace.id, "n8n"),
+    getWebhookCountBySource(workspace.id, "activepieces"),
   ]);
 
   const isIntegrationConnected = (type: TIntegrationType) =>
@@ -210,7 +210,7 @@ const Page = async (props: { params: Promise<{ environmentId: string }> }) => {
   return (
     <PageContentWrapper>
       <PageHeader pageTitle={t("common.workspace_configuration")}>
-        <ProjectConfigNavigation environmentId={params.environmentId} activeId="integrations" />
+        <WorkspaceConfigNavigation environmentId={params.environmentId} activeId="integrations" />
       </PageHeader>
       <div className="grid grid-cols-3 place-content-stretch gap-4 lg:grid-cols-3">
         {integrationCards.map((card) => (

apps/web/app/(app)/environments/[environmentId]/workspace/integrations/slack/actions.ts

@@ -5,7 +5,7 @@ import { ZId } from "@formbricks/types/common";
 import { getSlackChannels } from "@/lib/slack/service";
 import { authenticatedActionClient } from "@/lib/utils/action-client";
 import { checkAuthorizationUpdated } from "@/lib/utils/action-client/action-client-middleware";
-import { getOrganizationIdFromEnvironmentId, getProjectIdFromEnvironmentId } from "@/lib/utils/helper";
+import { getOrganizationIdFromWorkspaceId, getWorkspaceIdFromEnvironmentId } from "@/lib/utils/helper";
 
 const ZGetSlackChannelsAction = z.object({
   environmentId: ZId,
@@ -14,17 +14,18 @@ const ZGetSlackChannelsAction = z.object({
 export const getSlackChannelsAction = authenticatedActionClient
   .inputSchema(ZGetSlackChannelsAction)
   .action(async ({ ctx, parsedInput }) => {
+    const workspaceId = await getWorkspaceIdFromEnvironmentId(parsedInput.environmentId);
     await checkAuthorizationUpdated({
       userId: ctx.user.id,
-      organizationId: await getOrganizationIdFromEnvironmentId(parsedInput.environmentId),
+      organizationId: await getOrganizationIdFromWorkspaceId(workspaceId),
       access: [
         {
           type: "organization",
           roles: ["owner", "manager"],
         },
         {
-          type: "projectTeam",
-          projectId: await getProjectIdFromEnvironmentId(parsedInput.environmentId),
+          type: "workspaceTeam",
+          workspaceId,
           minPermission: "readWrite",
         },
       ],

apps/web/app/(app)/environments/[environmentId]/workspace/integrations/slack/page.tsx

@@ -17,11 +17,11 @@ const Page = async (props: { params: Promise<{ environmentId: string }> }) => {
 
   const t = await getTranslate();
 
-  const { isReadOnly, environment, session } = await getEnvironmentAuth(params.environmentId);
+  const { isReadOnly, environment, session, workspace } = await getEnvironmentAuth(params.environmentId);
 
   const [surveys, slackIntegration, locale] = await Promise.all([
-    getSurveys(params.environmentId),
-    getIntegrationByType(params.environmentId, "slack"),
+    getSurveys(workspace.id),
+    getIntegrationByType(workspace.id, "slack"),
     getUserLocale(session.user.id),
   ]);
 

apps/web/app/(app)/environments/[environmentId]/workspace/languages/loading.tsx

@@ -1,3 +1,3 @@
-import { LanguagesLoading } from "@/modules/projects/settings/languages/loading";
+import { LanguagesLoading } from "@/modules/workspaces/settings/languages/loading";
 
 export default LanguagesLoading;

apps/web/app/(app)/environments/[environmentId]/workspace/languages/page.tsx

@@ -1,3 +1,3 @@
-import { LanguagesPage } from "@/modules/projects/settings/languages/page";
+import { LanguagesPage } from "@/modules/workspaces/settings/languages/page";
 
 export default LanguagesPage;

apps/web/app/(app)/environments/[environmentId]/workspace/layout.tsx

@@ -1,4 +1,4 @@
-import { ProjectSettingsLayout, metadata } from "@/modules/projects/settings/layout";
+import { WorkspaceSettingsLayout, metadata } from "@/modules/workspaces/settings/layout";
 
 export { metadata };
-export default ProjectSettingsLayout;
+export default WorkspaceSettingsLayout;

apps/web/app/(app)/environments/[environmentId]/workspace/look/loading.tsx

@@ -1,3 +1,3 @@
-import { ProjectLookSettingsLoading } from "@/modules/projects/settings/look/loading";
+import { WorkspaceLookSettingsLoading } from "@/modules/workspaces/settings/look/loading";
 
-export default ProjectLookSettingsLoading;
+export default WorkspaceLookSettingsLoading;

apps/web/app/(app)/environments/[environmentId]/workspace/look/page.tsx

@@ -1,3 +1,3 @@
-import { ProjectLookSettingsPage } from "@/modules/projects/settings/look/page";
+import { WorkspaceLookSettingsPage } from "@/modules/workspaces/settings/look/page";
 
-export default ProjectLookSettingsPage;
+export default WorkspaceLookSettingsPage;

apps/web/app/(app)/environments/[environmentId]/workspace/page.tsx

@@ -1,3 +1,3 @@
-import { ProjectSettingsPage } from "@/modules/projects/settings/page";
+import { WorkspaceSettingsPage } from "@/modules/workspaces/settings/page";
 
-export default ProjectSettingsPage;
+export default WorkspaceSettingsPage;

apps/web/app/(app)/environments/[environmentId]/workspace/tags/loading.tsx

@@ -1,3 +1,3 @@
-import { TagsLoading } from "@/modules/projects/settings/tags/loading";
+import { TagsLoading } from "@/modules/workspaces/settings/tags/loading";
 
 export default TagsLoading;

apps/web/app/(app)/environments/[environmentId]/workspace/tags/page.tsx

@@ -1,3 +1,3 @@
-import { TagsPage } from "@/modules/projects/settings/tags/page";
+import { TagsPage } from "@/modules/workspaces/settings/tags/page";
 
 export default TagsPage;

apps/web/app/(app)/environments/[environmentId]/workspace/teams/page.tsx

@@ -1,3 +1,3 @@
-import { ProjectTeams } from "@/modules/ee/teams/project-teams/page";
+import { WorkspaceTeams } from "@/modules/ee/teams/workspace-teams/page";
 
-export default ProjectTeams;
+export default WorkspaceTeams;

apps/web/app/(redirects)/organizations/[organizationId]/route.ts

@@ -6,7 +6,7 @@ import { hasOrganizationAccess } from "@/lib/auth";
 import { getEnvironments } from "@/lib/environment/service";
 import { getMembershipByUserIdOrganizationId } from "@/lib/membership/service";
 import { getAccessFlags } from "@/lib/membership/utils";
-import { getUserProjects } from "@/lib/project/service";
+import { getUserWorkspaces } from "@/lib/workspace/service";
 import { authOptions } from "@/modules/auth/lib/authOptions";
 
 export const GET = async (_: Request, context: { params: Promise<{ organizationId: string }> }) => {
@@ -22,14 +22,14 @@ export const GET = async (_: Request, context: { params: Promise<{ organizationI
   const currentUserMembership = await getMembershipByUserIdOrganizationId(session?.user.id, organizationId);
   const { isBilling } = getAccessFlags(currentUserMembership?.role);
 
-  // redirect to first project's production environment
-  const projects = await getUserProjects(session.user.id, organizationId);
-  if (projects.length === 0) {
+  // redirect to first workspace's production environment
+  const workspaces = await getUserWorkspaces(session.user.id, organizationId);
+  if (workspaces.length === 0) {
     return redirect(`/organizations/${organizationId}/landing`);
   }
 
-  const firstProject = projects[0];
-  const environments = await getEnvironments(firstProject.id);
+  const firstWorkspace = workspaces[0];
+  const environments = await getEnvironments(firstWorkspace.id);
   const prodEnvironment = environments.find((e) => e.type === "production");
   if (!prodEnvironment) return notFound();
 

apps/web/app/(redirects)/workspaces/[workspaceId]/route.ts

@@ -3,22 +3,22 @@ import { notFound, redirect } from "next/navigation";
 import { AuthenticationError, AuthorizationError } from "@formbricks/types/errors";
 import { hasOrganizationAccess } from "@/lib/auth";
 import { getEnvironments } from "@/lib/environment/service";
-import { getProject } from "@/lib/project/service";
+import { getWorkspace } from "@/lib/workspace/service";
 import { authOptions } from "@/modules/auth/lib/authOptions";
 
-export const GET = async (_: Request, context: { params: Promise<{ projectId: string }> }) => {
+export const GET = async (_: Request, context: { params: Promise<{ workspaceId: string }> }) => {
   const params = await context?.params;
-  const projectId = params.projectId;
-  if (!projectId) return notFound();
+  const workspaceId = params.workspaceId;
+  if (!workspaceId) return notFound();
   // check auth
   const session = await getServerSession(authOptions);
   if (!session) throw new AuthenticationError("Not authenticated");
-  const project = await getProject(projectId);
-  if (!project) return notFound();
-  const hasAccess = await hasOrganizationAccess(session.user.id, project.organizationId);
+  const workspace = await getWorkspace(workspaceId);
+  if (!workspace) return notFound();
+  const hasAccess = await hasOrganizationAccess(session.user.id, workspace.organizationId);
   if (!hasAccess) throw new AuthorizationError("Unauthorized");
-  // redirect to project's production environment
-  const environments = await getEnvironments(project.id);
+  // redirect to workspace's production environment
+  const environments = await getEnvironments(workspace.id);
   const prodEnvironment = environments.find((e) => e.type === "production");
   if (!prodEnvironment) return notFound();
   return redirect(`/environments/${prodEnvironment.id}/`);

apps/web/app/api/(internal)/pipeline/lib/__mocks__/survey-follow-up.mock.ts

@@ -155,7 +155,7 @@ export const mockSurvey: TSurvey = {
   isSingleResponsePerEmailEnabled: false,
   isBackButtonHidden: false,
   recaptcha: null,
-  projectOverwrites: null,
+  workspaceOverwrites: null,
   styling: null,
   surveyClosedMessage: null,
   singleUse: {

apps/web/app/api/(internal)/pipeline/lib/telemetry.test.ts

@@ -20,7 +20,7 @@ vi.mock("@formbricks/database", () => ({
     },
     user: { count: vi.fn() },
     team: { count: vi.fn() },
-    project: { count: vi.fn() },
+    workspace: { count: vi.fn() },
     survey: { count: vi.fn() },
     response: {
       count: vi.fn(),
@@ -51,20 +51,8 @@ vi.mock("@/lib/env", () => ({
     RECAPTCHA_SECRET_KEY: "secret-key",
     GITHUB_ID: "github-id",
     SAML_DATABASE_URL: "postgresql://saml.example.com/formbricks",
-    ENTERPRISE_LICENSE_KEY: "test-license-key",
   },
 }));
-vi.mock("@/lib/constants", () => ({
-  E2E_TESTING: false,
-  IS_DEVELOPMENT: false,
-  TELEMETRY_DISABLED: false,
-}));
-vi.mock("@/lib/hash-string", () => ({
-  hashString: vi.fn((s: string) => `hashed-${s}`),
-}));
-vi.mock("@/modules/ee/license-check/lib/license", () => ({
-  getEnterpriseLicense: vi.fn(),
-}));
 
 // Mock fetch
 const fetchMock = vi.fn();
@@ -106,7 +94,7 @@ describe("sendTelemetryEvents", () => {
         organizationCount: BigInt(1),
         userCount: BigInt(5),
         teamCount: BigInt(2),
-        projectCount: BigInt(3),
+        workspaceCount: BigInt(3),
         surveyCount: BigInt(10),
         inProgressSurveyCount: BigInt(4),
         completedSurveyCount: BigInt(6),
@@ -211,14 +199,6 @@ describe("sendTelemetryEvents", () => {
   test("should handle telemetry send failure and apply cooldown", async () => {
     // Reset module to clear nextTelemetryCheck state from previous tests
     vi.resetModules();
-    vi.doMock("@/lib/constants", () => ({
-      E2E_TESTING: false,
-      IS_DEVELOPMENT: false,
-      TELEMETRY_DISABLED: false,
-    }));
-    vi.doMock("@/modules/ee/license-check/lib/license", () => ({
-      getEnterpriseLicense: vi.fn().mockResolvedValue({ active: false }),
-    }));
     const { sendTelemetryEvents: freshSendTelemetryEvents } = await import("./telemetry");
 
     // Ensure we can acquire lock by setting last sent time far in the past
@@ -241,7 +221,6 @@ describe("sendTelemetryEvents", () => {
       expect.objectContaining({
         error: networkError,
         message: "Network error",
-        hashedLicenseKey: "hashed-test-license-key",
       }),
       "Failed to send telemetry - applying 1h cooldown"
     );
@@ -263,14 +242,6 @@ describe("sendTelemetryEvents", () => {
   test("should skip if no organization exists", async () => {
     // Reset module to clear nextTelemetryCheck state from previous tests
     vi.resetModules();
-    vi.doMock("@/lib/constants", () => ({
-      E2E_TESTING: false,
-      IS_DEVELOPMENT: false,
-      TELEMETRY_DISABLED: false,
-    }));
-    vi.doMock("@/modules/ee/license-check/lib/license", () => ({
-      getEnterpriseLicense: vi.fn().mockResolvedValue({ active: false }),
-    }));
     const { sendTelemetryEvents: freshSendTelemetryEvents } = await import("./telemetry");
 
     // Ensure we can acquire lock by setting last sent time far in the past
@@ -305,113 +276,4 @@ describe("sendTelemetryEvents", () => {
     // This might be a bug, but we test the actual behavior
     expect(mockCacheService.set).toHaveBeenCalled();
   });
-
-  test("should skip telemetry when TELEMETRY_DISABLED is true and no active EE license", async () => {
-    vi.resetModules();
-    vi.doMock("@/lib/constants", () => ({
-      E2E_TESTING: false,
-      IS_DEVELOPMENT: false,
-      TELEMETRY_DISABLED: true,
-    }));
-    vi.doMock("@/modules/ee/license-check/lib/license", () => ({
-      getEnterpriseLicense: vi.fn().mockResolvedValue({ active: false }),
-    }));
-    const { sendTelemetryEvents: freshSendTelemetryEvents } = await import("./telemetry");
-
-    await freshSendTelemetryEvents();
-
-    // Should return early without touching cache or sending telemetry
-    expect(getCacheService).not.toHaveBeenCalled();
-    expect(fetchMock).not.toHaveBeenCalled();
-  });
-
-  test("should send telemetry when TELEMETRY_DISABLED is true but EE license is active", async () => {
-    vi.resetModules();
-    vi.doMock("@/lib/constants", () => ({
-      E2E_TESTING: false,
-      IS_DEVELOPMENT: false,
-      TELEMETRY_DISABLED: true,
-    }));
-    vi.doMock("@/modules/ee/license-check/lib/license", () => ({
-      getEnterpriseLicense: vi.fn().mockResolvedValue({ active: true }),
-    }));
-    const { sendTelemetryEvents: freshSendTelemetryEvents } = await import("./telemetry");
-
-    // Re-setup mocks after resetModules
-    vi.mocked(getCacheService).mockResolvedValue({
-      ok: true,
-      data: mockCacheService as any,
-    });
-    mockCacheService.tryLock.mockResolvedValue({ ok: true, data: true });
-    mockCacheService.del.mockResolvedValue({ ok: true, data: undefined });
-    mockCacheService.get.mockResolvedValue({ ok: true, data: null });
-    mockCacheService.set.mockResolvedValue({ ok: true, data: undefined });
-
-    vi.mocked(prisma.organization.findFirst).mockResolvedValue({
-      id: "org-123",
-      createdAt: new Date("2023-01-01"),
-    } as any);
-    vi.mocked(prisma.$queryRaw).mockResolvedValue([
-      {
-        organizationCount: BigInt(1),
-        userCount: BigInt(5),
-        teamCount: BigInt(2),
-        projectCount: BigInt(3),
-        surveyCount: BigInt(10),
-        inProgressSurveyCount: BigInt(4),
-        completedSurveyCount: BigInt(6),
-        responseCountAllTime: BigInt(100),
-        responseCountSinceLastUpdate: BigInt(10),
-        displayCount: BigInt(50),
-        contactCount: BigInt(20),
-        segmentCount: BigInt(4),
-        newestResponseAt: new Date("2024-01-01T00:00:00.000Z"),
-      },
-    ] as any);
-    vi.mocked(prisma.integration.findMany).mockResolvedValue([{ type: IntegrationType.notion }] as any);
-    vi.mocked(prisma.account.findMany).mockResolvedValue([{ provider: "github" }] as any);
-    fetchMock.mockResolvedValue({ ok: true });
-
-    await freshSendTelemetryEvents();
-
-    // EE license active — telemetry should bypass TELEMETRY_DISABLED and send
-    expect(fetchMock).toHaveBeenCalledTimes(1);
-  });
-
-  test("should unconditionally skip when E2E_TESTING is true even with active EE license", async () => {
-    vi.resetModules();
-    vi.doMock("@/lib/constants", () => ({
-      E2E_TESTING: true,
-      IS_DEVELOPMENT: false,
-      TELEMETRY_DISABLED: false,
-    }));
-    vi.doMock("@/modules/ee/license-check/lib/license", () => ({
-      getEnterpriseLicense: vi.fn().mockResolvedValue({ active: true }),
-    }));
-    const { sendTelemetryEvents: freshSendTelemetryEvents } = await import("./telemetry");
-
-    await freshSendTelemetryEvents();
-
-    // E2E_TESTING is a hard skip — no EE bypass, no cache, no fetch
-    expect(getCacheService).not.toHaveBeenCalled();
-    expect(fetchMock).not.toHaveBeenCalled();
-  });
-
-  test("should unconditionally skip when IS_DEVELOPMENT is true", async () => {
-    vi.resetModules();
-    vi.doMock("@/lib/constants", () => ({
-      E2E_TESTING: false,
-      IS_DEVELOPMENT: true,
-      TELEMETRY_DISABLED: false,
-    }));
-    vi.doMock("@/modules/ee/license-check/lib/license", () => ({
-      getEnterpriseLicense: vi.fn().mockResolvedValue({ active: true }),
-    }));
-    const { sendTelemetryEvents: freshSendTelemetryEvents } = await import("./telemetry");
-
-    await freshSendTelemetryEvents();
-
-    expect(getCacheService).not.toHaveBeenCalled();
-    expect(fetchMock).not.toHaveBeenCalled();
-  });
 });

apps/web/app/api/(internal)/pipeline/lib/telemetry.ts

@@ -2,11 +2,8 @@ import { IntegrationType } from "@prisma/client";
 import { createCacheKey, getCacheService } from "@formbricks/cache";
 import { prisma } from "@formbricks/database";
 import { logger } from "@formbricks/logger";
-import { E2E_TESTING, IS_DEVELOPMENT, TELEMETRY_DISABLED } from "@/lib/constants";
 import { env } from "@/lib/env";
-import { hashString } from "@/lib/hash-string";
 import { getInstanceInfo } from "@/lib/instance";
-import { getEnterpriseLicense } from "@/modules/ee/license-check/lib/license";
 import packageJson from "@/package.json";
 
 const TELEMETRY_INTERVAL_MS = 24 * 60 * 60 * 1000; // 24 hours
@@ -27,31 +24,8 @@ let nextTelemetryCheck = 0;
  * 2. Redis check (shared across instances, persists across restarts)
  * 3. Distributed lock (prevents concurrent execution in multi-instance deployments)
  */
-// Hashed license key for log context — allows correlating log entries to a specific license
-// without exposing the raw key. Computed once at module load.
-const hashedLicenseKey = env.ENTERPRISE_LICENSE_KEY ? hashString(env.ENTERPRISE_LICENSE_KEY) : null;
-
-/**
- * Returns true if telemetry is disabled via env var AND there is no active EE license.
- * EE customers cannot opt out — telemetry is always enforced for license compliance.
- */
-const isTelemetryDisabledForCE = async (): Promise<boolean> => {
-  if (!TELEMETRY_DISABLED) return false;
-  const license = await getEnterpriseLicense();
-  return !license.active;
-};
-
 export const sendTelemetryEvents = async () => {
   try {
-    // ============================================================
-    // CHECK 0: Non-Production Hard Skip
-    // ============================================================
-    // Purpose: Unconditionally skip telemetry in dev and test/CI environments.
-    // No EE bypass — these are internal flags, not customer-facing.
-    if (E2E_TESTING || IS_DEVELOPMENT) {
-      return;
-    }
-
     const now = Date.now();
 
     // ============================================================
@@ -65,18 +39,7 @@ export const sendTelemetryEvents = async () => {
     }
 
     // ============================================================
-    // CHECK 2: Telemetry Disabled Check
-    // ============================================================
-    // Purpose: Allow CE self-hosters to opt out of telemetry via env var.
-    // EE bypass: If an active Enterprise License is detected, telemetry is always sent
-    // regardless of the TELEMETRY_DISABLED setting to enforce license compliance.
-    // Placed after in-memory check to avoid calling getEnterpriseLicense() on every invocation.
-    if (await isTelemetryDisabledForCE()) {
-      return;
-    }
-
-    // ============================================================
-    // CHECK 3: Redis Check (Shared State)
+    // CHECK 2: Redis Check (Shared State)
     // ============================================================
     // Purpose: Check if telemetry was sent recently by ANY instance (shared across cluster).
     // This persists across restarts and works in multi-instance deployments.
@@ -103,7 +66,7 @@ export const sendTelemetryEvents = async () => {
     }
 
     // ============================================================
-    // CHECK 4: Distributed Lock (Prevent Concurrent Execution)
+    // CHECK 3: Distributed Lock (Prevent Concurrent Execution)
     // ============================================================
     // Purpose: Ensure only ONE instance executes telemetry at a time in a cluster.
     // How it works:
@@ -137,7 +100,7 @@ export const sendTelemetryEvents = async () => {
       // Log as warning since telemetry is non-essential
       const errorMessage = e instanceof Error ? e.message : String(e);
       logger.warn(
-        { error: e, message: errorMessage, lastSent, now, hashedLicenseKey },
+        { error: e, message: errorMessage, lastSent, now },
         "Failed to send telemetry - applying 1h cooldown"
       );
 
@@ -155,7 +118,7 @@ export const sendTelemetryEvents = async () => {
     // Log as warning since telemetry is non-essential functionality
     const errorMessage = error instanceof Error ? error.message : String(error);
     logger.warn(
-      { error, message: errorMessage, timestamp: Date.now(), hashedLicenseKey },
+      { error, message: errorMessage, timestamp: Date.now() },
       "Unexpected error in sendTelemetryEvents wrapper - telemetry check skipped"
     );
   }
@@ -185,7 +148,7 @@ const sendTelemetry = async (lastSent: number) => {
           organizationCount: bigint;
           userCount: bigint;
           teamCount: bigint;
-          projectCount: bigint;
+          workspaceCount: bigint;
           surveyCount: bigint;
           inProgressSurveyCount: bigint;
           completedSurveyCount: bigint;
@@ -202,7 +165,7 @@ const sendTelemetry = async (lastSent: number) => {
         (SELECT COUNT(*) FROM "Organization") as "organizationCount",
         (SELECT COUNT(*) FROM "User") as "userCount",
         (SELECT COUNT(*) FROM "Team") as "teamCount",
-        (SELECT COUNT(*) FROM "Project") as "projectCount",
+        (SELECT COUNT(*) FROM "Workspace") as "workspaceCount",
         (SELECT COUNT(*) FROM "Survey") as "surveyCount",
         (SELECT COUNT(*) FROM "Survey" WHERE status = 'inProgress') as "inProgressSurveyCount",
         (SELECT COUNT(*) FROM "Survey" WHERE status = 'completed') as "completedSurveyCount",
@@ -223,7 +186,7 @@ const sendTelemetry = async (lastSent: number) => {
   const organizationCount = Number(counts.organizationCount);
   const userCount = Number(counts.userCount);
   const teamCount = Number(counts.teamCount);
-  const projectCount = Number(counts.projectCount);
+  const workspaceCount = Number(counts.workspaceCount);
   const surveyCount = Number(counts.surveyCount);
   const inProgressSurveyCount = Number(counts.inProgressSurveyCount);
   const completedSurveyCount = Number(counts.completedSurveyCount);
@@ -259,7 +222,7 @@ const sendTelemetry = async (lastSent: number) => {
     organizationCount,
     userCount,
     teamCount,
-    projectCount,
+    workspaceCount,
     surveyCount,
     inProgressSurveyCount,
     completedSurveyCount,

apps/web/app/api/(internal)/pipeline/route.ts

@@ -11,10 +11,11 @@ import { transformErrorToDetails } from "@/app/lib/api/validator";
 import { CRON_SECRET } from "@/lib/constants";
 import { generateStandardWebhookSignature } from "@/lib/crypto";
 import { getIntegrations } from "@/lib/integration/service";
-import { getOrganizationByEnvironmentId } from "@/lib/organization/service";
+import { getOrganization } from "@/lib/organization/service";
 import { getResponseCountBySurveyId } from "@/lib/response/service";
 import { getSurvey, updateSurvey } from "@/lib/survey/service";
 import { convertDatesInObject } from "@/lib/time";
+import { getOrganizationIdFromWorkspaceId, getWorkspaceIdFromEnvironmentId } from "@/lib/utils/helper";
 import { validateWebhookUrl } from "@/lib/utils/validate-webhook-url";
 import { queueAuditEvent } from "@/modules/ee/audit-logs/lib/handler";
 import { TAuditStatus, UNKNOWN_DATA } from "@/modules/ee/audit-logs/types/audit-log";
@@ -54,7 +55,9 @@ export const POST = async (request: Request) => {
 
   const { environmentId, surveyId, event, response } = inputValidation.data;
 
-  const organization = await getOrganizationByEnvironmentId(environmentId);
+  const workspaceId = await getWorkspaceIdFromEnvironmentId(environmentId);
+  const organizationId = await getOrganizationIdFromWorkspaceId(workspaceId);
+  const organization = await getOrganization(organizationId);
   if (!organization) {
     throw new ResourceNotFoundError("Organization", "Organization not found");
   }
@@ -153,7 +156,7 @@ export const POST = async (request: Request) => {
   if (event === "responseFinished") {
     // Fetch integrations and responseCount in parallel
     const [integrations, responseCount] = await Promise.all([
-      getIntegrations(environmentId),
+      getIntegrations(workspaceId),
       getResponseCountBySurveyId(surveyId),
     ]);
 
@@ -168,7 +171,7 @@ export const POST = async (request: Request) => {
         memberships: {
           some: {
             organization: {
-              projects: {
+              workspaces: {
                 some: {
                   environments: {
                     some: { id: environmentId },
@@ -192,9 +195,9 @@ export const POST = async (request: Request) => {
             teamUsers: {
               some: {
                 team: {
-                  projectTeams: {
+                  workspaceTeams: {
                     some: {
-                      project: {
+                      workspace: {
                         environments: {
                           some: {
                             id: environmentId,

apps/web/app/api/auth/[...nextauth]/route.test.ts

@@ -1,139 +0,0 @@
-import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
-import { GET } from "./route";
-
-const mocks = vi.hoisted(() => {
-  const nextAuthHandler = vi.fn(async () => new Response(null, { status: 200 }));
-  const nextAuth = vi.fn(() => nextAuthHandler);
-
-  return {
-    nextAuth,
-    nextAuthHandler,
-    baseSignIn: vi.fn(async () => true),
-    baseSession: vi.fn(async ({ session }: { session: unknown }) => session),
-    baseEventSignIn: vi.fn(),
-    queueAuditEventBackground: vi.fn(),
-    captureException: vi.fn(),
-    loggerError: vi.fn(),
-  };
-});
-
-vi.mock("next-auth", () => ({
-  default: mocks.nextAuth,
-}));
-
-vi.mock("@/lib/constants", () => ({
-  IS_PRODUCTION: false,
-  SENTRY_DSN: undefined,
-}));
-
-vi.mock("@sentry/nextjs", () => ({
-  captureException: mocks.captureException,
-}));
-
-vi.mock("@formbricks/logger", () => ({
-  logger: {
-    withContext: vi.fn(() => ({
-      error: mocks.loggerError,
-    })),
-  },
-}));
-
-vi.mock("@/modules/auth/lib/authOptions", () => ({
-  authOptions: {
-    callbacks: {
-      signIn: mocks.baseSignIn,
-      session: mocks.baseSession,
-    },
-    events: {
-      signIn: mocks.baseEventSignIn,
-    },
-  },
-}));
-
-vi.mock("@/modules/ee/audit-logs/lib/handler", () => ({
-  queueAuditEventBackground: mocks.queueAuditEventBackground,
-}));
-
-const getWrappedAuthOptions = async (requestId: string = "req-123") => {
-  const request = new Request("http://localhost/api/auth/signin", {
-    headers: { "x-request-id": requestId },
-  });
-
-  await GET(request, {} as any);
-
-  expect(mocks.nextAuth).toHaveBeenCalledTimes(1);
-
-  return mocks.nextAuth.mock.calls[0][0];
-};
-
-describe("auth route audit logging", () => {
-  beforeEach(() => {
-    vi.clearAllMocks();
-  });
-
-  afterEach(() => {
-    vi.clearAllMocks();
-  });
-
-  test("logs successful sign-in from the NextAuth signIn event after session creation", async () => {
-    const authOptions = await getWrappedAuthOptions();
-    const user = { id: "user_1", email: "user@example.com", name: "User Example" };
-    const account = { provider: "keycloak" };
-
-    await expect(authOptions.callbacks.signIn({ user, account })).resolves.toBe(true);
-    expect(mocks.queueAuditEventBackground).not.toHaveBeenCalled();
-
-    await authOptions.events.signIn({ user, account, isNewUser: false });
-
-    expect(mocks.baseEventSignIn).toHaveBeenCalledWith({ user, account, isNewUser: false });
-    expect(mocks.queueAuditEventBackground).toHaveBeenCalledWith(
-      expect.objectContaining({
-        action: "signedIn",
-        targetType: "user",
-        userId: "user_1",
-        targetId: "user_1",
-        organizationId: "unknown",
-        status: "success",
-        userType: "user",
-        newObject: expect.objectContaining({
-          email: "user@example.com",
-          authMethod: "sso",
-          provider: "keycloak",
-          sessionStrategy: "database",
-          isNewUser: false,
-        }),
-      })
-    );
-  });
-
-  test("logs failed sign-in attempts from the callback stage with the request event id", async () => {
-    const error = new Error("Access denied");
-    mocks.baseSignIn.mockRejectedValueOnce(error);
-
-    const authOptions = await getWrappedAuthOptions("req-failure");
-    const user = { id: "user_2", email: "user2@example.com" };
-    const account = { provider: "credentials" };
-
-    await expect(authOptions.callbacks.signIn({ user, account })).rejects.toThrow("Access denied");
-
-    expect(mocks.baseEventSignIn).not.toHaveBeenCalled();
-    expect(mocks.queueAuditEventBackground).toHaveBeenCalledWith(
-      expect.objectContaining({
-        action: "signedIn",
-        targetType: "user",
-        userId: "user_2",
-        targetId: "user_2",
-        organizationId: "unknown",
-        status: "failure",
-        userType: "user",
-        eventId: "req-failure",
-        newObject: expect.objectContaining({
-          email: "user2@example.com",
-          authMethod: "password",
-          provider: "credentials",
-          errorMessage: "Access denied",
-        }),
-      })
-    );
-  });
-});

apps/web/app/api/auth/[...nextauth]/route.ts

@@ -6,26 +6,10 @@ import { logger } from "@formbricks/logger";
 import { IS_PRODUCTION, SENTRY_DSN } from "@/lib/constants";
 import { authOptions as baseAuthOptions } from "@/modules/auth/lib/authOptions";
 import { queueAuditEventBackground } from "@/modules/ee/audit-logs/lib/handler";
-import { UNKNOWN_DATA } from "@/modules/ee/audit-logs/types/audit-log";
+import { TAuditStatus, UNKNOWN_DATA } from "@/modules/ee/audit-logs/types/audit-log";
 
 export const fetchCache = "force-no-store";
 
-const getAuthMethod = (account: Account | null) => {
-  if (account?.provider === "credentials") {
-    return "password";
-  }
-
-  if (account?.provider === "token") {
-    return "email_verification";
-  }
-
-  if (account?.provider) {
-    return "sso";
-  }
-
-  return "unknown";
-};
-
 const handler = async (req: Request, ctx: any) => {
   const eventId = req.headers.get("x-request-id") ?? undefined;
 
@@ -33,6 +17,44 @@ const handler = async (req: Request, ctx: any) => {
     ...baseAuthOptions,
     callbacks: {
       ...baseAuthOptions.callbacks,
+      async jwt(params: any) {
+        let result: any = params.token;
+        let error: any = undefined;
+
+        try {
+          if (baseAuthOptions.callbacks?.jwt) {
+            result = await baseAuthOptions.callbacks.jwt(params);
+          }
+        } catch (err) {
+          error = err;
+          logger.withContext({ eventId, err }).error("JWT callback failed");
+
+          if (SENTRY_DSN && IS_PRODUCTION) {
+            Sentry.captureException(err);
+          }
+        }
+
+        // Audit JWT operations (token refresh, updates)
+        if (params.trigger && params.token?.profile?.id) {
+          const status: TAuditStatus = error ? "failure" : "success";
+          const auditLog = {
+            action: "jwtTokenCreated" as const,
+            targetType: "user" as const,
+            userId: params.token.profile.id,
+            targetId: params.token.profile.id,
+            organizationId: UNKNOWN_DATA,
+            status,
+            userType: "user" as const,
+            newObject: { trigger: params.trigger, tokenType: "jwt" },
+            ...(error ? { eventId } : {}),
+          };
+
+          queueAuditEventBackground(auditLog);
+        }
+
+        if (error) throw error;
+        return result;
+      },
       async session(params: any) {
         let result: any = params.session;
         let error: any = undefined;
@@ -68,7 +90,7 @@ const handler = async (req: Request, ctx: any) => {
       }) {
         let result: boolean | string = true;
         let error: any = undefined;
-        const authMethod = getAuthMethod(account);
+        let authMethod = "unknown";
 
         try {
           if (baseAuthOptions.callbacks?.signIn) {
@@ -80,6 +102,15 @@ const handler = async (req: Request, ctx: any) => {
               credentials,
             });
           }
+
+          // Determine authentication method for more detailed logging
+          if (account?.provider === "credentials") {
+            authMethod = "password";
+          } else if (account?.provider === "token") {
+            authMethod = "email_verification";
+          } else if (account?.provider && account.provider !== "credentials") {
+            authMethod = "sso";
+          }
         } catch (err) {
           error = err;
           result = false;
@@ -91,58 +122,28 @@ const handler = async (req: Request, ctx: any) => {
           }
         }
 
-        if (result === false) {
-          queueAuditEventBackground({
-            action: "signedIn",
-            targetType: "user",
-            userId: user?.id ?? UNKNOWN_DATA,
-            targetId: user?.id ?? UNKNOWN_DATA,
-            organizationId: UNKNOWN_DATA,
-            status: "failure",
-            userType: "user",
-            newObject: {
-              ...user,
-              authMethod,
-              provider: account?.provider,
-              ...(error instanceof Error ? { errorMessage: error.message } : {}),
-            },
-            eventId,
-          });
-        }
-
-        if (error) throw error;
-        return result;
-      },
-    },
-    events: {
-      ...baseAuthOptions.events,
-      async signIn({ user, account, isNewUser }: any) {
-        try {
-          await baseAuthOptions.events?.signIn?.({ user, account, isNewUser });
-        } catch (err) {
-          logger.withContext({ eventId, err }).error("Sign-in event callback failed");
-
-          if (SENTRY_DSN && IS_PRODUCTION) {
-            Sentry.captureException(err);
-          }
-        }
-
-        queueAuditEventBackground({
-          action: "signedIn",
-          targetType: "user",
+        const status: TAuditStatus = result === false ? "failure" : "success";
+        const auditLog = {
+          action: "signedIn" as const,
+          targetType: "user" as const,
           userId: user?.id ?? UNKNOWN_DATA,
           targetId: user?.id ?? UNKNOWN_DATA,
           organizationId: UNKNOWN_DATA,
-          status: "success",
-          userType: "user",
+          status,
+          userType: "user" as const,
           newObject: {
             ...user,
-            authMethod: getAuthMethod(account),
+            authMethod,
             provider: account?.provider,
-            sessionStrategy: "database",
-            isNewUser: isNewUser ?? false,
+            ...(error ? { errorMessage: error.message } : {}),
           },
-        });
+          ...(status === "failure" ? { eventId } : {}),
+        };
+
+        queueAuditEventBackground(auditLog);
+
+        if (error) throw error;
+        return result;
       },
     },
   };

apps/web/app/api/google-sheet/callback/route.ts

@@ -10,6 +10,7 @@ import {
 } from "@/lib/constants";
 import { hasUserEnvironmentAccess } from "@/lib/environment/auth";
 import { createOrUpdateIntegration, getIntegrationByType } from "@/lib/integration/service";
+import { getWorkspaceIdFromEnvironmentId } from "@/lib/utils/helper";
 import { authOptions } from "@/modules/auth/lib/authOptions";
 
 export const GET = async (req: Request) => {
@@ -67,7 +68,8 @@ export const GET = async (req: Request) => {
   }
 
   const integrationType = "googleSheets" as const;
-  const existingIntegration = await getIntegrationByType(environmentId, integrationType);
+  const workspaceId = await getWorkspaceIdFromEnvironmentId(environmentId);
+  const existingIntegration = await getIntegrationByType(workspaceId, integrationType);
   const existingConfig = existingIntegration?.config as TIntegrationGoogleSheetsConfig;
 
   const googleSheetIntegration = {

apps/web/app/api/v1/auth.test.ts

@@ -29,9 +29,9 @@ describe("getApiKeyWithPermissions", () => {
             createdAt: new Date(),
             updatedAt: new Date(),
             type: "development" as const,
-            projectId: "project-1",
+            workspaceId: "workspace-1",
             appSetupCompleted: true,
-            project: { id: "project-1", name: "Project 1" },
+            workspace: { id: "workspace-1", name: "Workspace 1" },
           },
         },
       ],
@@ -60,22 +60,22 @@ describe("hasPermission", () => {
       environmentId: "env-1",
       permission: "manage",
       environmentType: "development",
-      projectId: "project-1",
-      projectName: "Project 1",
+      workspaceId: "workspace-1",
+      workspaceName: "Workspace 1",
     },
     {
       environmentId: "env-2",
       permission: "write",
       environmentType: "production",
-      projectId: "project-2",
-      projectName: "Project 2",
+      workspaceId: "workspace-2",
+      workspaceName: "Workspace 2",
     },
     {
       environmentId: "env-3",
       permission: "read",
       environmentType: "development",
-      projectId: "project-3",
-      projectName: "Project 3",
+      workspaceId: "workspace-3",
+      workspaceName: "Workspace 3",
     },
   ];
 
@@ -125,9 +125,9 @@ describe("authenticateRequest", () => {
             createdAt: new Date(),
             updatedAt: new Date(),
             type: "development" as const,
-            projectId: "project-1",
+            workspaceId: "workspace-1",
             appSetupCompleted: true,
-            project: { id: "project-1", name: "Project 1" },
+            workspace: { id: "workspace-1", name: "Workspace 1" },
           },
         },
       ],
@@ -143,8 +143,8 @@ describe("authenticateRequest", () => {
           environmentId: "env-1",
           permission: "manage",
           environmentType: "development",
-          projectId: "project-1",
-          projectName: "Project 1",
+          workspaceId: "workspace-1",
+          workspaceName: "Workspace 1",
         },
       ],
       apiKeyId: "api-key-id",

apps/web/app/api/v1/auth.ts

@@ -22,8 +22,8 @@ export const authenticateRequest = async (request: NextRequest): Promise<TAuthen
       environmentId: env.environmentId,
       environmentType: env.environment.type,
       permission: env.permission,
-      projectId: env.environment.projectId,
-      projectName: env.environment.project.name,
+      workspaceId: env.environment.workspaceId,
+      workspaceName: env.environment.workspace.name,
     })),
     apiKeyId: apiKeyData.id,
     organizationId: apiKeyData.organizationId,

apps/web/app/api/v1/client/[environmentId]/displays/lib/display.test.ts

@@ -3,10 +3,15 @@ import { beforeEach, describe, expect, test, vi } from "vitest";
 import { prisma } from "@formbricks/database";
 import { TDisplayCreateInput } from "@formbricks/types/displays";
 import { DatabaseError, ResourceNotFoundError, ValidationError } from "@formbricks/types/errors";
+import { getWorkspaceIdFromEnvironmentId } from "@/lib/utils/helper";
 import { validateInputs } from "@/lib/utils/validate";
 import { getContactByUserId } from "./contact";
 import { createDisplay } from "./display";
 
+vi.mock("@/lib/utils/helper", () => ({
+  getWorkspaceIdFromEnvironmentId: vi.fn().mockResolvedValue("workspace-id-mock"),
+}));
+
 vi.mock("@/lib/utils/validate", () => ({
   validateInputs: vi.fn((inputs: [unknown, unknown][]) =>
     inputs.map((input: [unknown, unknown]) => input[0])
@@ -83,6 +88,7 @@ const mockSurvey = {
 describe("createDisplay", () => {
   beforeEach(() => {
     vi.clearAllMocks();
+    vi.mocked(getWorkspaceIdFromEnvironmentId).mockResolvedValue("workspace-id-mock");
     vi.mocked(prisma.survey.findUnique).mockResolvedValue(mockSurvey);
   });
 
@@ -117,6 +123,7 @@ describe("createDisplay", () => {
     expect(prisma.contact.create).toHaveBeenCalledWith({
       data: {
         environment: { connect: { id: environmentId } },
+        workspace: { connect: { id: "workspace-id-mock" } },
         attributes: {
           create: {
             attributeKey: {

apps/web/app/api/v1/client/[environmentId]/displays/lib/display.ts

@@ -2,6 +2,7 @@ import { Prisma } from "@prisma/client";
 import { prisma } from "@formbricks/database";
 import { TDisplayCreateInput, ZDisplayCreateInput } from "@formbricks/types/displays";
 import { DatabaseError, ResourceNotFoundError } from "@formbricks/types/errors";
+import { getWorkspaceIdFromEnvironmentId } from "@/lib/utils/helper";
 import { validateInputs } from "@/lib/utils/validate";
 import { getContactByUserId } from "./contact";
 
@@ -15,9 +16,11 @@ export const createDisplay = async (displayInput: TDisplayCreateInput): Promise<
     if (userId) {
       contact = await getContactByUserId(environmentId, userId);
       if (!contact) {
+        const workspaceId = await getWorkspaceIdFromEnvironmentId(environmentId);
         contact = await prisma.contact.create({
           data: {
             environment: { connect: { id: environmentId } },
+            workspace: { connect: { id: workspaceId } },
             attributes: {
               create: {
                 attributeKey: {

apps/web/app/api/v1/client/[environmentId]/environment/lib/data.test.ts

@@ -30,8 +30,8 @@ const mockEnvironmentData = {
   id: environmentId,
   type: "production",
   appSetupCompleted: true,
-  project: {
-    id: "project-123",
+  workspace: {
+    id: "workspace-123",
     recontactDays: 30,
     clickOutsideClose: true,
     overlay: "none",
@@ -73,7 +73,7 @@ const mockEnvironmentData = {
       triggers: [],
       displayPercentage: null,
       delay: 0,
-      projectOverwrites: null,
+      workspaceOverwrites: null,
     },
   ],
 };
@@ -97,8 +97,8 @@ describe("getEnvironmentStateData", () => {
         id: environmentId,
         type: "production",
         appSetupCompleted: true,
-        project: {
-          id: "project-123",
+        workspace: {
+          id: "workspace-123",
           recontactDays: 30,
           clickOutsideClose: true,
           overlay: "none",
@@ -117,7 +117,7 @@ describe("getEnvironmentStateData", () => {
         id: true,
         type: true,
         appSetupCompleted: true,
-        project: expect.any(Object),
+        workspace: expect.any(Object),
         actionClasses: expect.any(Object),
         surveys: expect.any(Object),
       }),
@@ -131,10 +131,10 @@ describe("getEnvironmentStateData", () => {
     await expect(getEnvironmentStateData(environmentId)).rejects.toThrow("environment");
   });
 
-  test("should throw ResourceNotFoundError when project is not found", async () => {
+  test("should throw ResourceNotFoundError when workspace is not found", async () => {
     vi.mocked(prisma.environment.findUnique).mockResolvedValue({
       ...mockEnvironmentData,
-      project: null,
+      workspace: null,
     } as never);
 
     await expect(getEnvironmentStateData(environmentId)).rejects.toThrow(ResourceNotFoundError);
@@ -201,9 +201,9 @@ describe("getEnvironmentStateData", () => {
     expect(result.surveys).toHaveLength(2);
   });
 
-  test("should correctly map project properties to environment.project", async () => {
-    const customProject = {
-      ...mockEnvironmentData.project,
+  test("should correctly map workspace properties to environment.workspace", async () => {
+    const customWorkspace = {
+      ...mockEnvironmentData.workspace,
       recontactDays: 14,
       clickOutsideClose: false,
       overlay: "dark",
@@ -214,13 +214,13 @@ describe("getEnvironmentStateData", () => {
 
     vi.mocked(prisma.environment.findUnique).mockResolvedValue({
       ...mockEnvironmentData,
-      project: customProject,
+      workspace: customWorkspace,
     } as never);
 
     const result = await getEnvironmentStateData(environmentId);
 
-    expect(result.environment.project).toEqual({
-      id: "project-123",
+    expect(result.environment.workspace).toEqual({
+      id: "workspace-123",
       recontactDays: 14,
       clickOutsideClose: false,
       overlay: "dark",

apps/web/app/api/v1/client/[environmentId]/environment/lib/data.ts

@@ -6,8 +6,8 @@ import { ZId } from "@formbricks/types/common";
 import { DatabaseError, ResourceNotFoundError } from "@formbricks/types/errors";
 import {
   TJsEnvironmentStateActionClass,
-  TJsEnvironmentStateProject,
   TJsEnvironmentStateSurvey,
+  TJsEnvironmentStateWorkspace,
 } from "@formbricks/types/js";
 import { validateInputs } from "@/lib/utils/validate";
 import { resolveStorageUrlsInObject } from "@/modules/storage/utils";
@@ -23,7 +23,7 @@ export interface EnvironmentStateData {
     id: string;
     type: string;
     appSetupCompleted: boolean;
-    project: TJsEnvironmentStateProject;
+    workspace: TJsEnvironmentStateWorkspace;
   };
   surveys: TJsEnvironmentStateSurvey[];
   actionClasses: TJsEnvironmentStateActionClass[];
@@ -45,8 +45,8 @@ export const getEnvironmentStateData = async (environmentId: string): Promise<En
         id: true,
         type: true,
         appSetupCompleted: true,
-        // Project data (optimized select)
-        project: {
+        // Workspace data (optimized select)
+        workspace: {
           select: {
             id: true,
             recontactDays: true,
@@ -97,7 +97,7 @@ export const getEnvironmentStateData = async (environmentId: string): Promise<En
                     alias: true,
                     createdAt: true,
                     updatedAt: true,
-                    projectId: true,
+                    workspaceId: true,
                   },
                 },
               },
@@ -132,7 +132,7 @@ export const getEnvironmentStateData = async (environmentId: string): Promise<En
             },
             displayPercentage: true,
             delay: true,
-            projectOverwrites: true,
+            workspaceOverwrites: true,
           },
         },
       },
@@ -142,8 +142,8 @@ export const getEnvironmentStateData = async (environmentId: string): Promise<En
       throw new ResourceNotFoundError("environment", environmentId);
     }
 
-    if (!environmentData.project) {
-      throw new ResourceNotFoundError("project", null);
+    if (!environmentData.workspace) {
+      throw new ResourceNotFoundError("workspace", null);
     }
 
     // Transform surveys using existing utility
@@ -156,14 +156,14 @@ export const getEnvironmentStateData = async (environmentId: string): Promise<En
         id: environmentData.id,
         type: environmentData.type,
         appSetupCompleted: environmentData.appSetupCompleted,
-        project: {
-          id: environmentData.project.id,
-          recontactDays: environmentData.project.recontactDays,
-          clickOutsideClose: environmentData.project.clickOutsideClose,
-          overlay: environmentData.project.overlay,
-          placement: environmentData.project.placement,
-          inAppSurveyBranding: environmentData.project.inAppSurveyBranding,
-          styling: resolveStorageUrlsInObject(environmentData.project.styling),
+        workspace: {
+          id: environmentData.workspace.id,
+          recontactDays: environmentData.workspace.recontactDays,
+          clickOutsideClose: environmentData.workspace.clickOutsideClose,
+          overlay: environmentData.workspace.overlay,
+          placement: environmentData.workspace.placement,
+          inAppSurveyBranding: environmentData.workspace.inAppSurveyBranding,
+          styling: resolveStorageUrlsInObject(environmentData.workspace.styling),
         },
       },
       surveys: resolveStorageUrlsInObject(transformedSurveys),

apps/web/app/api/v1/client/[environmentId]/environment/lib/environmentState.test.ts

@@ -2,7 +2,7 @@ import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
 import { prisma } from "@formbricks/database";
 import { TActionClass } from "@formbricks/types/action-classes";
 import { ResourceNotFoundError } from "@formbricks/types/errors";
-import { TJsEnvironmentState, TJsEnvironmentStateProject } from "@formbricks/types/js";
+import { TJsEnvironmentState, TJsEnvironmentStateWorkspace } from "@formbricks/types/js";
 import { TOrganization } from "@formbricks/types/organizations";
 import { TSurvey } from "@formbricks/types/surveys/types";
 import { cache } from "@/lib/cache";
@@ -49,8 +49,8 @@ vi.mock("@formbricks/cache", () => ({
 
 const environmentId = "test-environment-id";
 
-const mockProject: TJsEnvironmentStateProject = {
-  id: "test-project-id",
+const mockWorkspace: TJsEnvironmentStateWorkspace = {
+  id: "test-workspace-id",
   recontactDays: 30,
   inAppSurveyBranding: true,
   placement: "bottomRight",
@@ -69,15 +69,14 @@ const mockOrganization: TOrganization = {
   billing: {
     stripeCustomerId: null,
     limits: {
-      projects: 1,
+      workspaces: 1,
       monthly: {
         responses: 100,
       },
     },
     usageCycleAnchor: new Date(),
   },
-  isAISmartToolsEnabled: false,
-  isAIDataAnalysisEnabled: false,
+  isAIEnabled: false,
 };
 
 const mockSurveys: TSurvey[] = [
@@ -95,7 +94,7 @@ const mockSurveys: TSurvey[] = [
     isBackButtonHidden: false,
     isSingleResponsePerEmailEnabled: false,
     isVerifyEmailEnabled: false,
-    projectOverwrites: null,
+    workspaceOverwrites: null,
     showLanguageSwitch: false,
     questions: [],
     displayOption: "displayOnce",
@@ -138,11 +137,7 @@ const mockEnvironmentStateData: EnvironmentStateData = {
     id: environmentId,
     type: "production",
     appSetupCompleted: true,
-    project: mockProject,
-  },
-  organization: {
-    id: mockOrganization.id,
-    billing: mockOrganization.billing,
+    workspace: mockWorkspace,
   },
   surveys: mockSurveys,
   actionClasses: mockActionClasses,
@@ -166,11 +161,19 @@ describe("getEnvironmentState", () => {
   test("should return the correct environment state", async () => {
     const result = await getEnvironmentState(environmentId);
 
-    const expectedData: TJsEnvironmentState["data"] = {
+    // Backwards compat: response includes `project` alongside `workspace`,
+    // and each survey includes `projectOverwrites` alongside `workspaceOverwrites`
+    const surveysWithLegacy = mockSurveys.map((s) => ({
+      ...s,
+      projectOverwrites: (s as Record<string, unknown>).workspaceOverwrites ?? null,
+    }));
+
+    const expectedData = {
       recaptchaSiteKey: "mock_recaptcha_site_key",
-      surveys: mockSurveys,
+      surveys: surveysWithLegacy,
       actionClasses: mockActionClasses,
-      project: mockProject,
+      workspace: mockWorkspace,
+      project: mockWorkspace,
     };
 
     expect(result.data).toEqual(expectedData);
@@ -190,8 +193,8 @@ describe("getEnvironmentState", () => {
     await expect(getEnvironmentState(environmentId)).rejects.toThrow(ResourceNotFoundError);
   });
 
-  test("should throw ResourceNotFoundError if project not found", async () => {
-    vi.mocked(getEnvironmentStateData).mockRejectedValue(new ResourceNotFoundError("project", null));
+  test("should throw ResourceNotFoundError if workspace not found", async () => {
+    vi.mocked(getEnvironmentStateData).mockRejectedValue(new ResourceNotFoundError("workspace", null));
     await expect(getEnvironmentState(environmentId)).rejects.toThrow(ResourceNotFoundError);
   });
 
@@ -277,7 +280,12 @@ describe("getEnvironmentState", () => {
 
     const result = await getEnvironmentState(environmentId);
 
-    expect(result.data.surveys).toEqual(mixedSurveys);
+    // Backwards compat: each survey includes `projectOverwrites`
+    const expectedSurveys = mixedSurveys.map((s) => ({
+      ...s,
+      projectOverwrites: (s as Record<string, unknown>).workspaceOverwrites ?? null,
+    }));
+    expect(result.data.surveys).toEqual(expectedSurveys);
   });
 
   test("should handle empty surveys array", async () => {

apps/web/app/api/v1/client/[environmentId]/environment/lib/environmentState.ts

@@ -2,6 +2,10 @@ import "server-only";
 import { createCacheKey } from "@formbricks/cache";
 import { prisma } from "@formbricks/database";
 import { TJsEnvironmentState } from "@formbricks/types/js";
+import {
+  addLegacyProjectOverwritesToList,
+  addLegacyProjectToEnvironmentState,
+} from "@/app/lib/api/api-backwards-compat";
 import { cache } from "@/lib/cache";
 import { IS_RECAPTCHA_CONFIGURED, RECAPTCHA_SITE_KEY } from "@/lib/constants";
 import { getEnvironmentStateData } from "./data";
@@ -13,7 +17,7 @@ import { getEnvironmentStateData } from "./data";
  *
  * @param environmentId - The environment ID to fetch state for
  * @returns The environment state
- * @throws ResourceNotFoundError if environment, organization, or project not found
+ * @throws ResourceNotFoundError if environment, organization, or workspace not found
  */
 export const getEnvironmentState = async (
   environmentId: string
@@ -33,12 +37,14 @@ export const getEnvironmentState = async (
       }
 
       // Build the response data
-      const data: TJsEnvironmentState["data"] = {
-        surveys,
+      // Backwards compat: include `project` alongside `workspace`, and
+      // `projectOverwrites` alongside `workspaceOverwrites` in each survey
+      const data = addLegacyProjectToEnvironmentState({
+        surveys: addLegacyProjectOverwritesToList(surveys),
         actionClasses,
-        project: environment.project,
+        workspace: environment.workspace,
         ...(IS_RECAPTCHA_CONFIGURED ? { recaptchaSiteKey: RECAPTCHA_SITE_KEY } : {}),
-      };
+      } as TJsEnvironmentState["data"]);
 
       return { data };
     },

apps/web/app/api/v1/client/[environmentId]/environment/route.ts

@@ -86,11 +86,9 @@ export const GET = withV1ApiWrapper({
         };
       }
 
-      const error = err instanceof Error ? err : new Error(String(err));
-
       logger.error(
         {
-          error,
+          error: err,
           url: req.url,
           environmentId: params.environmentId,
         },
@@ -98,10 +96,9 @@ export const GET = withV1ApiWrapper({
       );
       return {
         response: responses.internalServerErrorResponse(
-          "An error occurred while processing your request.",
+          err instanceof Error ? err.message : "Unknown error occurred",
           true
         ),
-        error,
       };
     }
   },

apps/web/app/api/v1/client/[environmentId]/responses/[responseId]/lib/put-response-handler.test.ts

@@ -1,488 +0,0 @@
-import { beforeEach, describe, expect, test, vi } from "vitest";
-import { DatabaseError, InvalidInputError, ResourceNotFoundError } from "@formbricks/types/errors";
-import { responses } from "@/app/lib/api/response";
-import { putResponseHandler } from "./put-response-handler";
-
-const mocks = vi.hoisted(() => ({
-  formatValidationErrorsForV1Api: vi.fn((errors) => errors),
-  getResponse: vi.fn(),
-  getSurvey: vi.fn(),
-  getValidatedResponseUpdateInput: vi.fn(),
-  loggerError: vi.fn(),
-  sendToPipeline: vi.fn(),
-  updateResponseWithQuotaEvaluation: vi.fn(),
-  validateFileUploads: vi.fn(),
-  validateOtherOptionLengthForMultipleChoice: vi.fn(),
-  validateResponseData: vi.fn(),
-}));
-
-vi.mock("@formbricks/logger", () => ({
-  logger: {
-    error: mocks.loggerError,
-  },
-}));
-
-vi.mock("@/app/lib/pipelines", () => ({
-  sendToPipeline: mocks.sendToPipeline,
-}));
-
-vi.mock("@/lib/response/service", () => ({
-  getResponse: mocks.getResponse,
-}));
-
-vi.mock("@/lib/survey/service", () => ({
-  getSurvey: mocks.getSurvey,
-}));
-
-vi.mock("@/modules/api/lib/validation", () => ({
-  formatValidationErrorsForV1Api: mocks.formatValidationErrorsForV1Api,
-  validateResponseData: mocks.validateResponseData,
-}));
-
-vi.mock("@/modules/api/v2/lib/element", () => ({
-  validateOtherOptionLengthForMultipleChoice: mocks.validateOtherOptionLengthForMultipleChoice,
-}));
-
-vi.mock("@/modules/storage/utils", () => ({
-  validateFileUploads: mocks.validateFileUploads,
-}));
-
-vi.mock("./response", () => ({
-  updateResponseWithQuotaEvaluation: mocks.updateResponseWithQuotaEvaluation,
-}));
-
-vi.mock("./validated-response-update-input", () => ({
-  getValidatedResponseUpdateInput: mocks.getValidatedResponseUpdateInput,
-}));
-
-const environmentId = "environment_a";
-const responseId = "response_123";
-const surveyId = "survey_123";
-
-const createRequest = () =>
-  new Request(`https://api.test/api/v1/client/${environmentId}/responses/${responseId}`, {
-    method: "PUT",
-  });
-
-const createHandlerParams = (params?: Partial<{ environmentId: string; responseId: string }>) =>
-  ({
-    req: createRequest(),
-    props: {
-      params: Promise.resolve({
-        environmentId,
-        responseId,
-        ...params,
-      }),
-    },
-  }) as never;
-
-const getBaseResponseUpdateInput = () => ({
-  data: {
-    q1: "updated-answer",
-  },
-  language: "en",
-});
-
-const getBaseExistingResponse = () =>
-  ({
-    id: responseId,
-    surveyId,
-    data: {
-      q0: "existing-answer",
-    },
-    finished: false,
-    language: "en",
-  }) as const;
-
-const getBaseSurvey = () =>
-  ({
-    id: surveyId,
-    environmentId,
-    blocks: [],
-    questions: [],
-  }) as const;
-
-const getBaseUpdatedResponse = () =>
-  ({
-    id: responseId,
-    surveyId,
-    data: {
-      q0: "existing-answer",
-      q1: "updated-answer",
-    },
-    finished: false,
-    quotaFull: undefined,
-  }) as const;
-
-describe("putResponseHandler", () => {
-  beforeEach(() => {
-    vi.clearAllMocks();
-
-    mocks.getValidatedResponseUpdateInput.mockResolvedValue({
-      responseUpdateInput: getBaseResponseUpdateInput(),
-    });
-    mocks.getResponse.mockResolvedValue(getBaseExistingResponse());
-    mocks.getSurvey.mockResolvedValue(getBaseSurvey());
-    mocks.updateResponseWithQuotaEvaluation.mockResolvedValue(getBaseUpdatedResponse());
-    mocks.validateFileUploads.mockReturnValue(true);
-    mocks.validateOtherOptionLengthForMultipleChoice.mockReturnValue(null);
-    mocks.validateResponseData.mockReturnValue(null);
-  });
-
-  test("returns a bad request response when the response id is missing", async () => {
-    const result = await putResponseHandler(createHandlerParams({ responseId: "" }));
-
-    expect(result.response.status).toBe(400);
-    await expect(result.response.json()).resolves.toEqual({
-      code: "bad_request",
-      message: "Response ID is missing",
-      details: {},
-    });
-    expect(mocks.getValidatedResponseUpdateInput).not.toHaveBeenCalled();
-  });
-
-  test("returns the validation response from the parsed request input", async () => {
-    const validationResponse = responses.badRequestResponse(
-      "Malformed JSON in request body",
-      undefined,
-      true
-    );
-    mocks.getValidatedResponseUpdateInput.mockResolvedValue({
-      response: validationResponse,
-    });
-
-    const result = await putResponseHandler(createHandlerParams());
-
-    expect(result.response).toBe(validationResponse);
-    expect(mocks.getResponse).not.toHaveBeenCalled();
-  });
-
-  test("returns not found when the response does not exist", async () => {
-    mocks.getResponse.mockResolvedValue(null);
-
-    const result = await putResponseHandler(createHandlerParams());
-
-    expect(result.response.status).toBe(404);
-    await expect(result.response.json()).resolves.toEqual({
-      code: "not_found",
-      message: "Response not found",
-      details: {
-        resource_id: responseId,
-        resource_type: "Response",
-      },
-    });
-  });
-
-  test("maps resource lookup errors to a not found response", async () => {
-    mocks.getResponse.mockRejectedValue(new ResourceNotFoundError("Response", responseId));
-
-    const result = await putResponseHandler(createHandlerParams());
-
-    expect(result.response.status).toBe(404);
-    await expect(result.response.json()).resolves.toEqual({
-      code: "not_found",
-      message: "Response not found",
-      details: {
-        resource_id: responseId,
-        resource_type: "Response",
-      },
-    });
-  });
-
-  test("maps invalid lookup input errors to a bad request response", async () => {
-    mocks.getResponse.mockRejectedValue(new InvalidInputError("Invalid response id"));
-
-    const result = await putResponseHandler(createHandlerParams());
-
-    expect(result.response.status).toBe(400);
-    await expect(result.response.json()).resolves.toEqual({
-      code: "bad_request",
-      message: "Invalid response id",
-      details: {},
-    });
-  });
-
-  test("maps database lookup errors to a reported internal server error", async () => {
-    const error = new DatabaseError("Lookup failed");
-    mocks.getResponse.mockRejectedValue(error);
-
-    const result = await putResponseHandler(createHandlerParams());
-
-    expect(result.error).toBe(error);
-    expect(result.response.status).toBe(500);
-    await expect(result.response.json()).resolves.toEqual({
-      code: "internal_server_error",
-      message: "Lookup failed",
-      details: {},
-    });
-    expect(mocks.loggerError).toHaveBeenCalledWith(
-      {
-        error,
-        url: createRequest().url,
-      },
-      "Error in PUT /api/v1/client/[environmentId]/responses/[responseId]"
-    );
-  });
-
-  test("maps unknown lookup failures to a generic internal server error", async () => {
-    const error = new Error("boom");
-    mocks.getResponse.mockRejectedValue(error);
-
-    const result = await putResponseHandler(createHandlerParams());
-
-    expect(result.error).toBe(error);
-    expect(result.response.status).toBe(500);
-    await expect(result.response.json()).resolves.toEqual({
-      code: "internal_server_error",
-      message: "Unknown error occurred",
-      details: {},
-    });
-  });
-
-  test("rejects updates when the response survey does not belong to the requested environment", async () => {
-    mocks.getSurvey.mockResolvedValue({
-      ...getBaseSurvey(),
-      environmentId: "different_environment",
-    });
-
-    const result = await putResponseHandler(createHandlerParams());
-
-    expect(result.response.status).toBe(404);
-    await expect(result.response.json()).resolves.toEqual({
-      code: "not_found",
-      message: "Response not found",
-      details: {
-        resource_id: responseId,
-        resource_type: "Response",
-      },
-    });
-    expect(mocks.updateResponseWithQuotaEvaluation).not.toHaveBeenCalled();
-    expect(mocks.sendToPipeline).not.toHaveBeenCalled();
-  });
-
-  test("rejects updates when the response is already finished", async () => {
-    mocks.getResponse.mockResolvedValue({
-      ...getBaseExistingResponse(),
-      finished: true,
-    });
-
-    const result = await putResponseHandler(createHandlerParams());
-
-    expect(result.response.status).toBe(400);
-    await expect(result.response.json()).resolves.toEqual({
-      code: "bad_request",
-      message: "Response is already finished",
-      details: {},
-    });
-    expect(mocks.updateResponseWithQuotaEvaluation).not.toHaveBeenCalled();
-  });
-
-  test("rejects invalid file upload updates", async () => {
-    mocks.validateFileUploads.mockReturnValue(false);
-
-    const result = await putResponseHandler(createHandlerParams());
-
-    expect(result.response.status).toBe(400);
-    await expect(result.response.json()).resolves.toEqual({
-      code: "bad_request",
-      message: "Invalid file upload response",
-      details: {},
-    });
-    expect(mocks.updateResponseWithQuotaEvaluation).not.toHaveBeenCalled();
-  });
-
-  test("rejects updates when an other-option response exceeds the character limit", async () => {
-    mocks.validateOtherOptionLengthForMultipleChoice.mockReturnValue("question_123");
-
-    const result = await putResponseHandler(createHandlerParams());
-
-    expect(result.response.status).toBe(400);
-    await expect(result.response.json()).resolves.toEqual({
-      code: "bad_request",
-      message: "Response exceeds character limit",
-      details: {
-        questionId: "question_123",
-      },
-    });
-    expect(mocks.updateResponseWithQuotaEvaluation).not.toHaveBeenCalled();
-  });
-
-  test("returns validation details when merged response data is invalid", async () => {
-    mocks.validateResponseData.mockReturnValue([{ field: "q1", message: "Required" }]);
-    mocks.formatValidationErrorsForV1Api.mockReturnValue({
-      q1: "Required",
-    });
-
-    const result = await putResponseHandler(createHandlerParams());
-
-    expect(result.response.status).toBe(400);
-    await expect(result.response.json()).resolves.toEqual({
-      code: "bad_request",
-      message: "Validation failed",
-      details: {
-        q1: "Required",
-      },
-    });
-    expect(mocks.formatValidationErrorsForV1Api).toHaveBeenCalledWith([{ field: "q1", message: "Required" }]);
-  });
-
-  test("returns not found when the response disappears during update", async () => {
-    mocks.updateResponseWithQuotaEvaluation.mockRejectedValue(
-      new ResourceNotFoundError("Response", responseId)
-    );
-
-    const result = await putResponseHandler(createHandlerParams());
-
-    expect(result.response.status).toBe(404);
-    await expect(result.response.json()).resolves.toEqual({
-      code: "not_found",
-      message: "Response not found",
-      details: {
-        resource_id: responseId,
-        resource_type: "Response",
-      },
-    });
-  });
-
-  test("returns a bad request response for invalid update input during persistence", async () => {
-    mocks.updateResponseWithQuotaEvaluation.mockRejectedValue(
-      new InvalidInputError("Response update payload is invalid")
-    );
-
-    const result = await putResponseHandler(createHandlerParams());
-
-    expect(result.response.status).toBe(400);
-    await expect(result.response.json()).resolves.toEqual({
-      code: "bad_request",
-      message: "Response update payload is invalid",
-      details: {},
-    });
-  });
-
-  test("returns a reported internal server error for database update failures", async () => {
-    const error = new DatabaseError("Update failed");
-    mocks.updateResponseWithQuotaEvaluation.mockRejectedValue(error);
-
-    const result = await putResponseHandler(createHandlerParams());
-
-    expect(result.error).toBe(error);
-    expect(result.response.status).toBe(500);
-    await expect(result.response.json()).resolves.toEqual({
-      code: "internal_server_error",
-      message: "Update failed",
-      details: {},
-    });
-    expect(mocks.loggerError).toHaveBeenCalledWith(
-      {
-        error,
-        url: createRequest().url,
-      },
-      "Error in PUT /api/v1/client/[environmentId]/responses/[responseId]"
-    );
-  });
-
-  test("returns a generic internal server error for unexpected update failures", async () => {
-    const error = new Error("Unexpected persistence failure");
-    mocks.updateResponseWithQuotaEvaluation.mockRejectedValue(error);
-
-    const result = await putResponseHandler(createHandlerParams());
-
-    expect(result.error).toBe(error);
-    expect(result.response.status).toBe(500);
-    await expect(result.response.json()).resolves.toEqual({
-      code: "internal_server_error",
-      message: "Something went wrong",
-      details: {},
-    });
-    expect(mocks.loggerError).toHaveBeenCalledWith(
-      {
-        error,
-        url: createRequest().url,
-      },
-      "Error in PUT /api/v1/client/[environmentId]/responses/[responseId]"
-    );
-  });
-
-  test("returns a success payload and emits a responseUpdated pipeline event", async () => {
-    const result = await putResponseHandler(createHandlerParams());
-
-    expect(result.response.status).toBe(200);
-    await expect(result.response.json()).resolves.toEqual({
-      data: {
-        id: responseId,
-        quotaFull: false,
-      },
-    });
-    expect(mocks.sendToPipeline).toHaveBeenCalledTimes(1);
-    expect(mocks.sendToPipeline).toHaveBeenCalledWith({
-      event: "responseUpdated",
-      environmentId,
-      surveyId,
-      response: {
-        id: responseId,
-        surveyId,
-        data: {
-          q0: "existing-answer",
-          q1: "updated-answer",
-        },
-        finished: false,
-      },
-    });
-  });
-
-  test("emits both pipeline events and includes quota metadata when the response finishes", async () => {
-    mocks.updateResponseWithQuotaEvaluation.mockResolvedValue({
-      ...getBaseUpdatedResponse(),
-      finished: true,
-      quotaFull: {
-        id: "quota_123",
-        action: "endSurvey",
-        endingCardId: "ending_card_123",
-      },
-    });
-
-    const result = await putResponseHandler(createHandlerParams());
-
-    expect(result.response.status).toBe(200);
-    await expect(result.response.json()).resolves.toEqual({
-      data: {
-        id: responseId,
-        quotaFull: true,
-        quota: {
-          id: "quota_123",
-          action: "endSurvey",
-          endingCardId: "ending_card_123",
-        },
-      },
-    });
-    expect(mocks.sendToPipeline).toHaveBeenCalledTimes(2);
-    expect(mocks.sendToPipeline).toHaveBeenNthCalledWith(1, {
-      event: "responseUpdated",
-      environmentId,
-      surveyId,
-      response: {
-        id: responseId,
-        surveyId,
-        data: {
-          q0: "existing-answer",
-          q1: "updated-answer",
-        },
-        finished: true,
-      },
-    });
-    expect(mocks.sendToPipeline).toHaveBeenNthCalledWith(2, {
-      event: "responseFinished",
-      environmentId,
-      surveyId,
-      response: {
-        id: responseId,
-        surveyId,
-        data: {
-          q0: "existing-answer",
-          q1: "updated-answer",
-        },
-        finished: true,
-      },
-    });
-  });
-});