fix: address vendored minimatch review comments (#7608)

Co-authored-by: Dhruwang <dhruwangjariwala18@gmail.com>

.env.example

@@ -38,15 +38,6 @@ 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  #
 ################
@@ -194,6 +185,11 @@ ENTERPRISE_LICENSE_KEY=
 # Ignore Rate Limiting across the Formbricks app
 # RATE_LIMITING_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

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 { TWorkspaceConfigChannel } from "@formbricks/types/workspace";
+import { TProjectConfigChannel } from "@formbricks/types/project";
 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: TWorkspaceConfigChannel;
+  channel: TProjectConfigChannel;
 }
 
 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 { TWorkspaceConfigChannel } from "@formbricks/types/workspace";
+import { TProjectConfigChannel } from "@formbricks/types/project";
 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: TWorkspaceConfigChannel;
+  channel: TProjectConfigChannel;
   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 { getWorkspaceByEnvironmentId } from "@/lib/workspace/service";
+import { getProjectByEnvironmentId } from "@/lib/project/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 workspace = await getWorkspaceByEnvironmentId(environment.id);
+  const project = await getProjectByEnvironmentId(environment.id);
-  if (!workspace) {
+  if (!project) {
-    throw new Error(t("common.workspace_not_found"));
+    throw new ResourceNotFoundError(t("common.workspace"), null);
   }
 
-  const channel = workspace.config.channel || null;
+  const channel = project.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 {
-  workspace: TWorkspace;
+  project: TProject;
   user: TUser;
   environmentId: string;
 }
 
-export const XMTemplateList = ({ workspace, user, environmentId }: XMTemplateListProps) => {
+export const XMTemplateList = ({ project, user, environmentId }: XMTemplateListProps) => {
   const [activeTemplateId, setActiveTemplateId] = useState<number | null>(null);
   const { t } = useTranslation();
   const router = useRouter();
@@ -48,7 +48,7 @@ export const XMTemplateList = ({ workspace, user, environmentId }: XMTemplateLis
   const handleTemplateClick = (templateIdx: number) => {
     setActiveTemplateId(templateIdx);
     const template = getXMTemplates(t)[templateIdx];
-    const newTemplate = replacePresetPlaceholders(template, workspace);
+    const newTemplate = replacePresetPlaceholders(template, project);
     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 mockWorkspace: TWorkspace = {
+const mockProject: TProject = {
-  id: "workspace1",
+  id: "project1",
   createdAt: new Date(),
   updatedAt: new Date(),
-  name: "Test Workspace",
+  name: "Test Project",
   organizationId: "org1",
   styling: {
     allowStyleOverwrite: true,
@@ -32,7 +32,7 @@ const mockWorkspace: TWorkspace = {
   logo: null,
 };
 const mockTemplate: TXMTemplate = {
-  name: "$[workspaceName] Survey",
+  name: "$[projectName] Survey",
   blocks: [
     {
       id: "block1",
@@ -42,7 +42,7 @@ const mockTemplate: TXMTemplate = {
           id: "q1",
           type: "openText" as TSurveyElementTypeEnum.OpenText,
           inputType: "text" as const,
-          headline: { default: "$[workspaceName] Question" },
+          headline: { default: "$[projectName] Question" },
           subheader: { default: "" },
           required: false,
           placeholder: { default: "" },
@@ -70,19 +70,19 @@ describe("replacePresetPlaceholders", () => {
     cleanup();
   });
 
-  test("replaces workspaceName placeholder in template name", () => {
+  test("replaces projectName placeholder in template name", () => {
-    const result = replacePresetPlaceholders(mockTemplate, mockWorkspace);
+    const result = replacePresetPlaceholders(mockTemplate, mockProject);
-    expect(result.name).toBe("Test Workspace Survey");
+    expect(result.name).toBe("Test Project Survey");
   });
 
-  test("replaces workspaceName placeholder in element headline", () => {
+  test("replaces projectName placeholder in element headline", () => {
-    const result = replacePresetPlaceholders(mockTemplate, mockWorkspace);
+    const result = replacePresetPlaceholders(mockTemplate, mockProject);
-    expect(result.blocks[0].elements[0].headline.default).toBe("Test Workspace Question");
+    expect(result.blocks[0].elements[0].headline.default).toBe("Test Project Question");
   });
 
   test("returns a new object without mutating the original template", () => {
     const originalTemplate = structuredClone(mockTemplate);
-    const result = replacePresetPlaceholders(mockTemplate, mockWorkspace);
+    const result = replacePresetPlaceholders(mockTemplate, mockProject);
     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 workspaceName with the actual workspace name in the current template
+// replace all occurences of projectName with the actual project name in the current template
-export const replacePresetPlaceholders = (template: TXMTemplate, workspace: TWorkspace): TXMTemplate => {
+export const replacePresetPlaceholders = (template: TXMTemplate, project: TProject): TXMTemplate => {
   const survey = structuredClone(template);
 
   const modifiedBlocks = survey.blocks.map((block: TSurveyBlock) => ({
     ...block,
-    elements: block.elements.map((element) => replaceElementPresetPlaceholders(element, workspace)),
+    elements: block.elements.map((element) => replaceElementPresetPlaceholders(element, project)),
   }));
 
-  return { ...survey, name: survey.name.replace("$[workspaceName]", workspace.name), blocks: modifiedBlocks };
+  return { ...survey, name: survey.name.replace("$[projectName]", project.name), blocks: modifiedBlocks };
 };

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

@@ -4,9 +4,9 @@ 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";
@@ -37,18 +37,18 @@ const Page = async (props: XMTemplatePageProps) => {
 
   const organizationId = await getOrganizationIdFromEnvironmentId(environment.id);
 
-  const workspace = await getWorkspaceByEnvironmentId(environment.id);
+  const project = await getProjectByEnvironmentId(environment.id);
-  if (!workspace) {
+  if (!project) {
-    throw new Error(t("common.workspace_not_found"));
+    throw new ResourceNotFoundError(t("common.workspace"), null);
   }
 
-  const workspaces = await getUserWorkspaces(session.user.id, organizationId);
+  const projects = await getUserProjects(session.user.id, 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 workspace={workspace} user={user} environmentId={environment.id} />
+      <XMTemplateList project={project} user={user} environmentId={environment.id} />
-      {workspaces.length >= 2 && (
+      {projects.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 { getUserWorkspaces } from "@/lib/workspace/service";
+import { getUserProjects } from "@/lib/project/service";
 import { authOptions } from "@/modules/auth/lib/authOptions";
 
 const LandingLayout = async (props: {
@@ -24,11 +24,11 @@ const LandingLayout = async (props: {
     return notFound();
   }
 
-  const workspaces = await getUserWorkspaces(session.user.id, params.organizationId);
+  const projects = await getUserProjects(session.user.id, params.organizationId);
 
-  if (workspaces.length !== 0) {
+  if (projects.length !== 0) {
-    const firstWorkspace = workspaces[0];
+    const firstProject = projects[0];
-    const environments = await getEnvironments(firstWorkspace.id);
+    const environments = await getEnvironments(firstProject.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 { WorkspaceAndOrgSwitch } from "@/app/(app)/environments/[environmentId]/components/workspace-and-org-switch";
+import { ProjectAndOrgSwitch } from "@/app/(app)/environments/[environmentId]/components/project-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/workspaces are lazy-loaded */}
+            {/* we only need to render organization breadcrumb on this page, organizations/projects are lazy-loaded */}
-            <WorkspaceAndOrgSwitch
+            <ProjectAndOrgSwitch
               currentOrganizationId={organization.id}
               currentOrganizationName={organization.name}
               isMultiOrgEnabled={isMultiOrgEnabled}
-              organizationWorkspacesLimit={0}
+              organizationProjectsLimit={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 WorkspaceOnboardingLayout = async (props: {
+const ProjectOnboardingLayout = async (props: {
   params: Promise<{ organizationId: string }>;
   children: React.ReactNode;
 }) => {
@@ -47,4 +47,4 @@ const WorkspaceOnboardingLayout = async (props: {
   );
 };
 
-export default WorkspaceOnboardingLayout;
+export default ProjectOnboardingLayout;

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 { getUserWorkspaces } from "@/lib/workspace/service";
+import { getUserProjects } from "@/lib/project/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 workspaces = await getUserWorkspaces(session.user.id, params.organizationId);
+  const projects = await getUserProjects(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} />
-      {workspaces.length >= 1 && (
+      {projects.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 { getOrganizationWorkspacesCount } from "@/lib/workspace/service";
+import { getOrganizationProjectsCount } from "@/lib/project/service";
 import { getTranslate } from "@/lingodotdev/server";
 import { authOptions } from "@/modules/auth/lib/authOptions";
-import { getOrganizationWorkspacesLimit } from "@/modules/ee/license-check/lib/utils";
+import { getOrganizationProjectsLimit } 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 [organizationWorkspacesLimit, organizationWorkspacesCount] = await Promise.all([
+  const [organizationProjectsLimit, organizationProjectsCount] = await Promise.all([
-    getOrganizationWorkspacesLimit(organization.id),
+    getOrganizationProjectsLimit(organization.id),
-    getOrganizationWorkspacesCount(organization.id),
+    getOrganizationProjectsCount(organization.id),
   ]);
 
-  if (organizationWorkspacesCount >= organizationWorkspacesLimit) {
+  if (organizationProjectsCount >= organizationProjectsLimit) {
     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 { getUserWorkspaces } from "@/lib/workspace/service";
+import { getUserProjects } from "@/lib/project/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 workspaces = await getUserWorkspaces(session.user.id, params.organizationId);
+  const projects = await getUserProjects(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} />
-      {workspaces.length >= 1 && (
+      {projects.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/ProjectSettings.tsx

@@ -8,19 +8,19 @@ import { useForm } from "react-hook-form";
 import { toast } from "react-hot-toast";
 import { useTranslation } from "react-i18next";
 import {
-  TWorkspaceConfigChannel,
+  TProjectConfigChannel,
-  TWorkspaceConfigIndustry,
+  TProjectConfigIndustry,
-  TWorkspaceMode,
+  TProjectMode,
-  TWorkspaceUpdateInput,
+  TProjectUpdateInput,
-  ZWorkspaceUpdateInput,
+  ZProjectUpdateInput,
-} from "@formbricks/types/workspace";
+} from "@formbricks/types/project";
-import { createWorkspaceAction } from "@/app/(app)/environments/[environmentId]/actions";
+import { createProjectAction } 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 WorkspaceSettingsProps {
+interface ProjectSettingsProps {
   organizationId: string;
-  workspaceMode: TWorkspaceMode;
+  projectMode: TProjectMode;
-  channel: TWorkspaceConfigChannel;
+  channel: TProjectConfigChannel;
-  industry: TWorkspaceConfigIndustry;
+  industry: TProjectConfigIndustry;
   defaultBrandColor: string;
   organizationTeams: TOrganizationTeam[];
   isAccessControlAllowed: boolean;
-  userWorkspacesCount: number;
+  userProjectsCount: number;
   publicDomain: string;
 }
 
-export const WorkspaceSettings = ({
+export const ProjectSettings = ({
   organizationId,
-  workspaceMode,
+  projectMode,
   channel,
   industry,
   defaultBrandColor,
   organizationTeams,
   isAccessControlAllowed = false,
-  userWorkspacesCount,
+  userProjectsCount,
   publicDomain,
-}: WorkspaceSettingsProps) => {
+}: ProjectSettingsProps) => {
   const [createTeamModalOpen, setCreateTeamModalOpen] = useState(false);
 
   const router = useRouter();
   const { t } = useTranslation();
-  const addWorkspace = async (data: TWorkspaceUpdateInput) => {
+  const addProject = async (data: TProjectUpdateInput) => {
     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 WorkspaceSettings = ({
       // back to STYLE_DEFAULTS computed from the default brand (#64748b).
       const fullStyling = buildStylingFromBrandColor(data.styling?.brandColor?.light);
 
-      const createWorkspaceResponse = await createWorkspaceAction({
+      const createProjectResponse = await createProjectAction({
         organizationId,
         data: {
           ...data,
@@ -81,14 +81,14 @@ export const WorkspaceSettings = ({
         },
       });
 
-      if (createWorkspaceResponse?.data) {
+      if (createProjectResponse?.data) {
         // get production environment
-        const productionEnvironment = createWorkspaceResponse.data.environments.find(
+        const productionEnvironment = createProjectResponse.data.environments.find(
-          (environment: { type: string }) => environment.type === "production"
+          (environment) => environment.type === "production"
         );
         if (productionEnvironment) {
           if (globalThis.window !== undefined) {
-            // Remove filters when creating a new workspace
+            // Rmove filters when creating a new project
             localStorage.removeItem(FORMBRICKS_SURVEYS_FILTERS_KEY_LS);
           }
         }
@@ -96,11 +96,11 @@ export const WorkspaceSettings = ({
           router.push(`/environments/${productionEnvironment?.id}/connect`);
         } else if (channel === "link") {
           router.push(`/environments/${productionEnvironment?.id}/surveys`);
-        } else if (workspaceMode === "cx") {
+        } else if (projectMode === "cx") {
           router.push(`/environments/${productionEnvironment?.id}/xm-templates`);
         }
       } else {
-        const errorMessage = getFormattedErrorMessage(createWorkspaceResponse);
+        const errorMessage = getFormattedErrorMessage(createProjectResponse);
         toast.error(errorMessage);
       }
     } catch (error) {
@@ -109,15 +109,15 @@ export const WorkspaceSettings = ({
     }
   };
 
-  const form = useForm<TWorkspaceUpdateInput>({
+  const form = useForm<TProjectUpdateInput>({
     defaultValues: {
       name: "",
       styling: { allowStyleOverwrite: true, brandColor: { light: defaultBrandColor } },
       teamIds: [],
     },
-    resolver: zodResolver(ZWorkspaceUpdateInput),
+    resolver: zodResolver(ZProjectUpdateInput),
   });
-  const workspaceName = form.watch("name");
+  const projectName = 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 WorkspaceSettings = ({
     <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(addWorkspace)} className="w-full space-y-4">
+          <form onSubmit={form.handleSubmit(addProject)} className="w-full space-y-4">
             <FormField
               control={form.control}
               name="styling.brandColor.light"
@@ -184,7 +184,7 @@ export const WorkspaceSettings = ({
               )}
             />
 
-            {isAccessControlAllowed && userWorkspacesCount > 0 && (
+            {isAccessControlAllowed && userProjectsCount > 0 && (
               <FormField
                 control={form.control}
                 name="teamIds"
@@ -242,7 +242,7 @@ export const WorkspaceSettings = ({
         <SurveyInline
           appUrl={publicDomain}
           isPreviewMode={true}
-          survey={previewSurvey(workspaceName || t("common.my_product"), t)}
+          survey={previewSurvey(projectName || t("common.my_product"), t)}
           styling={previewStyling}
           isBrandingEnabled={false}
           languageCode="default"

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

@@ -2,34 +2,30 @@ import { XIcon } from "lucide-react";
 import Link from "next/link";
 import { redirect } from "next/navigation";
 import { ResourceNotFoundError } from "@formbricks/types/errors";
-import {
+import { TProjectConfigChannel, TProjectConfigIndustry, TProjectMode } from "@formbricks/types/project";
-  TWorkspaceConfigChannel,
-  TWorkspaceConfigIndustry,
-  TWorkspaceMode,
-} from "@formbricks/types/workspace";
 import { getTeamsByOrganizationId } from "@/app/(app)/(onboarding)/lib/onboarding";
-import { WorkspaceSettings } from "@/app/(app)/(onboarding)/organizations/[organizationId]/workspaces/new/settings/components/WorkspaceSettings";
+import { ProjectSettings } from "@/app/(app)/(onboarding)/organizations/[organizationId]/workspaces/new/settings/components/ProjectSettings";
 import { DEFAULT_BRAND_COLOR } from "@/lib/constants";
 import { getPublicDomain } from "@/lib/getPublicUrl";
-import { getUserWorkspaces } from "@/lib/workspace/service";
+import { getUserProjects } from "@/lib/project/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 WorkspaceSettingsPageProps {
+interface ProjectSettingsPageProps {
   params: Promise<{
     organizationId: string;
   }>;
   searchParams: Promise<{
-    channel?: TWorkspaceConfigChannel;
+    channel?: TProjectConfigChannel;
-    industry?: TWorkspaceConfigIndustry;
+    industry?: TProjectConfigIndustry;
-    mode?: TWorkspaceMode;
+    mode?: TProjectMode;
   }>;
 }
 
-const Page = async (props: WorkspaceSettingsPageProps) => {
+const Page = async (props: ProjectSettingsPageProps) => {
   const searchParams = await props.searchParams;
   const params = await props.params;
   const t = await getTranslate();
@@ -43,7 +39,7 @@ const Page = async (props: WorkspaceSettingsPageProps) => {
   const channel = searchParams.channel ?? null;
   const industry = searchParams.industry ?? null;
   const mode = searchParams.mode ?? "surveys";
-  const workspaces = await getUserWorkspaces(session.user.id, params.organizationId);
+  const projects = await getUserProjects(session.user.id, params.organizationId);
 
   const organizationTeams = await getTeamsByOrganizationId(params.organizationId);
 
@@ -61,18 +57,18 @@ const Page = async (props: WorkspaceSettingsPageProps) => {
         title={t("organizations.workspaces.new.settings.workspace_settings_title")}
         subtitle={t("organizations.workspaces.new.settings.workspace_settings_subtitle")}
       />
-      <WorkspaceSettings
+      <ProjectSettings
         organizationId={params.organizationId}
-        workspaceMode={mode}
+        projectMode={mode}
         channel={channel}
         industry={industry}
         defaultBrandColor={DEFAULT_BRAND_COLOR}
         organizationTeams={organizationTeams}
         isAccessControlAllowed={isAccessControlAllowed}
-        userWorkspacesCount={workspaces.length}
+        userProjectsCount={projects.length}
         publicDomain={publicDomain}
       />
-      {workspaces.length >= 1 && (
+      {projects.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 { ZWorkspaceUpdateInput } from "@formbricks/types/workspace";
+import { ZProjectUpdateInput } from "@formbricks/types/project";
 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,
-  getOrganizationWorkspacesLimit,
+  getOrganizationProjectsLimit,
 } from "@/modules/ee/license-check/lib/utils";
-import { createWorkspace } from "@/modules/workspaces/settings/lib/workspace";
+import { createProject } from "@/modules/projects/settings/lib/project";
 import { getOrganizationsByUserId } from "./lib/organization";
-import { getWorkspacesByUserId } from "./lib/workspace";
+import { getProjectsByUserId } from "./lib/project";
 
-const ZCreateWorkspaceAction = z.object({
+const ZCreateProjectAction = z.object({
   organizationId: ZId,
-  data: ZWorkspaceUpdateInput,
+  data: ZProjectUpdateInput,
 });
 
-export const createWorkspaceAction = authenticatedActionClient.inputSchema(ZCreateWorkspaceAction).action(
+export const createProjectAction = authenticatedActionClient.inputSchema(ZCreateProjectAction).action(
-  withAuditLogging("created", "workspace", async ({ ctx, parsedInput }) => {
+  withAuditLogging("created", "project", async ({ ctx, parsedInput }) => {
     const { user } = ctx;
 
     const organizationId = parsedInput.organizationId;
@@ -40,7 +40,7 @@ export const createWorkspaceAction = authenticatedActionClient.inputSchema(ZCrea
       access: [
         {
           data: parsedInput.data,
-          schema: ZWorkspaceUpdateInput,
+          schema: ZProjectUpdateInput,
           type: "organization",
           roles: ["owner", "manager"],
         },
@@ -53,10 +53,10 @@ export const createWorkspaceAction = authenticatedActionClient.inputSchema(ZCrea
       throw new ResourceNotFoundError("Organization", organizationId);
     }
 
-    const organizationWorkspacesLimit = await getOrganizationWorkspacesLimit(organization.id);
+    const organizationProjectsLimit = await getOrganizationProjectsLimit(organization.id);
-    const organizationWorkspacesCount = await getOrganizationWorkspacesCount(organization.id);
+    const organizationProjectsCount = await getOrganizationProjectsCount(organization.id);
 
-    if (organizationWorkspacesCount >= organizationWorkspacesLimit) {
+    if (organizationProjectsCount >= organizationProjectsLimit) {
       throw new OperationNotAllowedError("Organization workspace limit reached");
     }
 
@@ -68,7 +68,7 @@ export const createWorkspaceAction = authenticatedActionClient.inputSchema(ZCrea
       }
     }
 
-    const workspace = await createWorkspace(parsedInput.organizationId, parsedInput.data);
+    const project = await createProject(parsedInput.organizationId, parsedInput.data);
     const updatedNotificationSettings = {
       ...user.notificationSettings,
       alert: {
@@ -81,9 +81,9 @@ export const createWorkspaceAction = authenticatedActionClient.inputSchema(ZCrea
     });
 
     ctx.auditLoggingCtx.organizationId = organizationId;
-    ctx.auditLoggingCtx.workspaceId = workspace.id;
+    ctx.auditLoggingCtx.projectId = project.id;
-    ctx.auditLoggingCtx.newObject = workspace;
+    ctx.auditLoggingCtx.newObject = project;
-    return workspace;
+    return project;
   })
 );
 
@@ -112,16 +112,16 @@ export const getOrganizationsForSwitcherAction = authenticatedActionClient
     return await getOrganizationsByUserId(ctx.user.id);
   });
 
-const ZGetWorkspacesForSwitcherAction = z.object({
+const ZGetProjectsForSwitcherAction = z.object({
   organizationId: ZId, // Changed from environmentId to avoid extra query
 });
 
 /**
  * Fetches projects list for switcher dropdown.
- * Called on-demand when user opens the workspace switcher.
+ * Called on-demand when user opens the project switcher.
  */
-export const getWorkspacesForSwitcherAction = authenticatedActionClient
+export const getProjectsForSwitcherAction = authenticatedActionClient
-  .inputSchema(ZGetWorkspacesForSwitcherAction)
+  .inputSchema(ZGetProjectsForSwitcherAction)
   .action(async ({ ctx, parsedInput }) => {
     await checkAuthorizationUpdated({
       userId: ctx.user.id,
@@ -134,11 +134,11 @@ export const getWorkspacesForSwitcherAction = authenticatedActionClient
       ],
     });
 
-    // Need membership for getWorkspacesByUserId (1 DB query)
+    // Need membership for getProjectsByUserId (1 DB query)
     const membership = await getMembershipByUserIdOrganizationId(ctx.user.id, parsedInput.organizationId);
     if (!membership) {
       throw new AuthorizationError("Membership not found");
     }
 
-    return await getWorkspacesByUserId(ctx.user.id, membership);
+    return await getProjectsByUserId(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 { getOrganizationWorkspacesLimit } from "@/modules/ee/license-check/lib/utils";
+import { getOrganizationProjectsLimit } 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,
-    workspace, // Current workspace details
+    project, // Current project details
-    environments, // All workspace environments (for environment switcher)
+    environments, // All project environments (for environment switcher)
     isAccessControlAllowed,
-    workspacePermission,
+    projectPermission,
     license,
     responseCount,
   } = layoutData;
@@ -38,12 +38,12 @@ export const EnvironmentLayout = async ({ layoutData, children }: EnvironmentLay
 
   const { features, lastChecked, isPendingDowngrade, active, status } = license;
   const isMultiOrgEnabled = features?.isMultiOrgEnabled ?? false;
-  const organizationWorkspacesLimit = await getOrganizationWorkspacesLimit(organization.id);
+  const organizationProjectsLimit = await getOrganizationProjectsLimit(organization.id);
   const isOwnerOrManager = isOwner || isManager;
 
-  // Validate that workspace permission exists for members
+  // Validate that project permission exists for members
-  if (isMember && !workspacePermission) {
+  if (isMember && !projectPermission) {
-    throw new Error(t("common.workspace_permission_not_found"));
+    throw new ResourceNotFoundError(t("common.workspace"), null);
   }
 
   return (
@@ -70,7 +70,7 @@ export const EnvironmentLayout = async ({ layoutData, children }: EnvironmentLay
           environment={environment}
           organization={organization}
           user={user}
-          workspace={{ id: workspace.id, name: workspace.name }}
+          project={{ id: project.id, name: project.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}
-            currentWorkspaceId={workspace.id}
+            currentProjectId={project.id}
             isMultiOrgEnabled={isMultiOrgEnabled}
-            organizationWorkspacesLimit={organizationWorkspacesLimit}
+            organizationProjectsLimit={organizationProjectsLimit}
             isFormbricksCloud={IS_FORMBRICKS_CLOUD}
             isLicenseActive={active}
             isOwnerOrManager={isOwnerOrManager}

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

@@ -29,6 +29,7 @@ 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,14 +38,13 @@ 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;
-  workspace: { id: string; name: string };
+  project: { id: string; name: string };
   isFormbricksCloud: boolean;
   isDevelopment: boolean;
   membershipRole?: TOrganizationRole;
@@ -55,7 +55,7 @@ export const MainNavigation = ({
   environment,
   organization,
   user,
-  workspace,
+  project,
   membershipRole,
   isFormbricksCloud,
   isDevelopment,
@@ -92,7 +92,7 @@ export const MainNavigation = ({
   }, [isCollapsed]);
 
   useEffect(() => {
-    // Auto collapse workspace navbar on org and account settings
+    // Auto collapse project navbar on org and account settings
     if (pathname?.includes("/settings")) {
       setIsCollapsed(true);
     }
@@ -186,7 +186,7 @@ export const MainNavigation = ({
 
   return (
     <>
-      {workspace && (
+      {project && (
         <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/ProjectNavItem.tsx

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

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 { WorkspaceAndOrgSwitch } from "@/app/(app)/environments/[environmentId]/components/workspace-and-org-switch";
+import { ProjectAndOrgSwitch } from "@/app/(app)/environments/[environmentId]/components/project-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;
-  currentWorkspaceId: string;
+  currentProjectId: string;
   isMultiOrgEnabled: boolean;
-  organizationWorkspacesLimit: number;
+  organizationProjectsLimit: number;
   isFormbricksCloud: boolean;
   isLicenseActive: boolean;
   isOwnerOrManager: boolean;
@@ -22,9 +22,9 @@ interface TopControlBarProps {
 export const TopControlBar = ({
   environments,
   currentOrganizationId,
-  currentWorkspaceId,
+  currentProjectId,
   isMultiOrgEnabled,
-  organizationWorkspacesLimit,
+  organizationProjectsLimit,
   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">
-      <WorkspaceAndOrgSwitch
+      <ProjectAndOrgSwitch
         currentEnvironmentId={environment.id}
         environments={environments}
         currentOrganizationId={currentOrganizationId}
-        currentWorkspaceId={currentWorkspaceId}
+        currentProjectId={currentProjectId}
         isMultiOrgEnabled={isMultiOrgEnabled}
-        organizationWorkspacesLimit={organizationWorkspacesLimit}
+        organizationProjectsLimit={organizationProjectsLimit}
         isFormbricksCloud={isFormbricksCloud}
         isLicenseActive={isLicenseActive}
         isOwnerOrManager={isOwnerOrManager}

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

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

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

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

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

apps/web/app/(app)/environments/[environmentId]/lib/project.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 getWorkspacesByUserId = reactCache(
+export const getProjectsByUserId = reactCache(
   async (userId: string, orgMembership: TMembership): Promise<{ id: string; name: string }[]> => {
     validateInputs([userId, ZString], [orgMembership, ZMembership]);
 
-    let workspaceWhereClause: Prisma.WorkspaceWhereInput = {};
+    let projectWhereClause: Prisma.ProjectWhereInput = {};
 
     if (orgMembership.role === "member") {
-      workspaceWhereClause = {
+      projectWhereClause = {
-        workspaceTeams: {
+        projectTeams: {
           some: {
             team: {
               teamUsers: {
@@ -29,17 +29,17 @@ export const getWorkspacesByUserId = reactCache(
     }
 
     try {
-      const workspaces = await prisma.workspace.findMany({
+      const projects = await prisma.project.findMany({
         where: {
           organizationId: orgMembership.organizationId,
-          ...workspaceWhereClause,
+          ...projectWhereClause,
         },
         select: {
           id: true,
           name: true,
         },
       });
-      return workspaces;
+      return projects;
     } 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 { getWorkspaceByEnvironmentId } from "@/lib/workspace/service";
+import { getProjectByEnvironmentId } from "@/lib/project/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, workspace, session] = await Promise.all([
+  const [organization, project, session] = await Promise.all([
     getOrganizationByEnvironmentId(params.environmentId),
-    getWorkspaceByEnvironmentId(params.environmentId),
+    getProjectByEnvironmentId(params.environmentId),
     getServerSession(authOptions),
   ]);
 
@@ -24,8 +24,8 @@ const AccountSettingsLayout = async (props: {
     throw new ResourceNotFoundError(t("common.organization"), null);
   }
 
-  if (!workspace) {
+  if (!project) {
-    throw new Error(t("common.workspace_not_found"));
+    throw new ResourceNotFoundError(t("common.workspace"), null);
   }
 
   if (!session) {

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
-                surveyOrWorkspaceOrOrganizationId={membership.organization.id}
+                surveyOrProjectOrOrganizationId={membership.organization.id}
                 notificationSettings={user.notificationSettings!}
                 notificationType={"unsubscribedOrganizationIds"}
                 autoDisableNotificationType={autoDisableNotificationType}
@@ -66,13 +66,13 @@ export const EditAlerts = ({
               </TooltipProvider>
             </div>
 
-            {membership.organization.workspaces.some((workspace) =>
+            {membership.organization.projects.some((project) =>
-              workspace.environments.some((environment) => environment.surveys.length > 0)
+              project.environments.some((environment) => environment.surveys.length > 0)
             ) ? (
               <div className="grid-cols-8 space-y-1 p-2">
-                {membership.organization.workspaces.map((workspace) => (
+                {membership.organization.projects.map((project) => (
-                  <div key={workspace.id}>
+                  <div key={project.id}>
-                    {workspace.environments.map((environment) => (
+                    {project.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">{workspace.name}</div>
+                              <div className="text-xs text-slate-400">{project.name}</div>
                             </div>
                             <div className="col-span-1 text-center">
                               <NotificationSwitch
-                                surveyOrWorkspaceOrOrganizationId={survey.id}
+                                surveyOrProjectOrOrganizationId={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 {
-  surveyOrWorkspaceOrOrganizationId: string;
+  surveyOrProjectOrOrganizationId: string;
   notificationSettings: TUserNotificationSettings;
   notificationType: "alert" | "unsubscribedOrganizationIds";
   autoDisableNotificationType?: string;
@@ -18,7 +18,7 @@ interface NotificationSwitchProps {
 }
 
 export const NotificationSwitch = ({
-  surveyOrWorkspaceOrOrganizationId,
+  surveyOrProjectOrOrganizationId,
   notificationSettings,
   notificationType,
   autoDisableNotificationType,
@@ -29,8 +29,8 @@ export const NotificationSwitch = ({
   const router = useRouter();
   const isChecked =
     notificationType === "unsubscribedOrganizationIds"
-      ? !notificationSettings.unsubscribedOrganizationIds?.includes(surveyOrWorkspaceOrOrganizationId)
+      ? !notificationSettings.unsubscribedOrganizationIds?.includes(surveyOrProjectOrOrganizationId)
-      : notificationSettings[notificationType]?.[surveyOrWorkspaceOrOrganizationId] === true;
+      : notificationSettings[notificationType]?.[surveyOrProjectOrOrganizationId] === 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(surveyOrWorkspaceOrOrganizationId)) {
+      if (unsubscribedOrganizationIds.includes(surveyOrProjectOrOrganizationId)) {
         updatedNotificationSettings.unsubscribedOrganizationIds = unsubscribedOrganizationIds.filter(
-          (id) => id !== surveyOrWorkspaceOrOrganizationId
+          (id) => id !== surveyOrProjectOrOrganizationId
         );
       } else {
         updatedNotificationSettings.unsubscribedOrganizationIds = [
           ...unsubscribedOrganizationIds,
-          surveyOrWorkspaceOrOrganizationId,
+          surveyOrProjectOrOrganizationId,
         ];
       }
     } else {
       updatedNotificationSettings[notificationType] = {
         ...updatedNotificationSettings[notificationType],
-        [surveyOrWorkspaceOrOrganizationId]:
+        [surveyOrProjectOrOrganizationId]:
-          !updatedNotificationSettings[notificationType]?.[surveyOrWorkspaceOrOrganizationId],
+          !updatedNotificationSettings[notificationType]?.[surveyOrProjectOrOrganizationId],
       };
     }
 
@@ -76,12 +76,12 @@ export const NotificationSwitch = ({
   useEffect(() => {
     if (
       autoDisableNotificationType &&
-      autoDisableNotificationElementId === surveyOrWorkspaceOrOrganizationId &&
+      autoDisableNotificationElementId === surveyOrProjectOrOrganizationId &&
       isChecked
     ) {
       switch (notificationType) {
         case "alert":
-          if (notificationSettings[notificationType]?.[surveyOrWorkspaceOrOrganizationId] === true) {
+          if (notificationSettings[notificationType]?.[surveyOrProjectOrOrganizationId] === true) {
             handleSwitchChange();
             toast.success(
               t(
@@ -95,9 +95,7 @@ export const NotificationSwitch = ({
           break;
 
         case "unsubscribedOrganizationIds":
-          if (
+          if (!notificationSettings.unsubscribedOrganizationIds?.includes(surveyOrProjectOrOrganizationId)) {
-            !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 workspace of membership.organization.workspaces) {
+    for (const project of membership.organization.projects) {
       // set default values for alerts
-      for (const environment of workspace.environments) {
+      for (const environment of project.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 workspaces if user role is owner or manager
+          // Fetch all projects if user role is owner or manager
           role: {
             in: ["owner", "manager"],
           },
         },
         {
-          // Filter workspaces based on team membership if user is not owner or manager
+          // Filter projects based on team membership if user is not owner or manager
           organization: {
-            workspaces: {
+            projects: {
               some: {
-                workspaceTeams: {
+                projectTeams: {
                   some: {
                     team: {
                       teamUsers: {
@@ -79,12 +79,12 @@ const getMemberships = async (userId: string): Promise<Membership[]> => {
         select: {
           id: true,
           name: true,
-          workspaces: {
+          projects: {
             // Apply conditional filtering based on user's role
             where: {
               OR: [
                 {
-                  // Fetch all workspaces if user is owner or manager
+                  // Fetch all projects if user is owner or manager
                   organization: {
                     memberships: {
                       some: {
@@ -97,8 +97,8 @@ const getMemberships = async (userId: string): Promise<Membership[]> => {
                   },
                 },
                 {
-                  // Only include workspaces accessible through teams if user is not owner or manager
+                  // Only include projects accessible through teams if user is not owner or manager
-                  workspaceTeams: {
+                  projectTeams: {
                     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;
-    workspaces: {
+    projects: {
       id: string;
       name: string;
       environments: {

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

@@ -40,13 +40,6 @@ 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";
-    workspace: {
+    project: {
       id: string;
       name: string;
     };
@@ -40,7 +40,7 @@ export const PrettyUrlsTable = ({ surveys }: PrettyUrlsTableProps) => {
     },
     {
       label: t("environments.settings.domain.workspace"),
-      key: "workspace",
+      key: "project",
     },
     {
       label: t("environments.settings.domain.pretty_url"),
@@ -81,7 +81,7 @@ export const PrettyUrlsTable = ({ surveys }: PrettyUrlsTableProps) => {
                   {survey.name}
                 </Link>
               </TableCell>
-              <TableCell>{survey.environment.workspace.name}</TableCell>
+              <TableCell>{survey.environment.project.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: "workspaces",
+      key: "projects",
-      labelKey: t("environments.settings.enterprise.license_feature_workspaces"),
+      labelKey: t("environments.settings.enterprise.license_feature_projects"),
       docsUrl: "https://formbricks.com/docs/self-hosting/advanced/license",
     },
     {

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

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

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 { getWorkspaceByEnvironmentId } from "@/lib/workspace/service";
+import { getProjectByEnvironmentId } from "@/lib/project/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, workspace, session] = await Promise.all([
+  const [organization, project, session] = await Promise.all([
     getOrganizationByEnvironmentId(params.environmentId),
-    getWorkspaceByEnvironmentId(params.environmentId),
+    getProjectByEnvironmentId(params.environmentId),
     getServerSession(authOptions),
   ]);
 
@@ -21,8 +21,8 @@ const Layout = async (props: { params: Promise<{ environmentId: string }>; child
     throw new ResourceNotFoundError(t("common.organization"), null);
   }
 
-  if (!workspace) {
+  if (!project) {
-    throw new Error(t("common.workspace_not_found"));
+    throw new ResourceNotFoundError(t("common.workspace"), null);
   }
 
   if (!session) {

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, getWorkspaceIdFromSurveyId } from "@/lib/utils/helper";
+import { getOrganizationIdFromSurveyId, getProjectIdFromSurveyId } 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: "workspaceTeam",
+          type: "projectTeam",
           minPermission: "read",
-          workspaceId: await getWorkspaceIdFromSurveyId(parsedInput.surveyId),
+          projectId: await getProjectIdFromSurveyId(parsedInput.surveyId),
         },
       ],
     });
@@ -70,9 +70,9 @@ export const getSurveySummaryAction = authenticatedActionClient
           roles: ["owner", "manager"],
         },
         {
-          type: "workspaceTeam",
+          type: "projectTeam",
           minPermission: "read",
-          workspaceId: await getWorkspaceIdFromSurveyId(parsedInput.surveyId),
+          projectId: await getProjectIdFromSurveyId(parsedInput.surveyId),
         },
       ],
     });
@@ -98,9 +98,9 @@ export const getResponseCountAction = authenticatedActionClient
           roles: ["owner", "manager"],
         },
         {
-          type: "workspaceTeam",
+          type: "projectTeam",
           minPermission: "read",
-          workspaceId: await getWorkspaceIdFromSurveyId(parsedInput.surveyId),
+          projectId: await getProjectIdFromSurveyId(parsedInput.surveyId),
         },
       ],
     });
@@ -126,9 +126,9 @@ export const getDisplaysWithContactAction = authenticatedActionClient
           roles: ["owner", "manager"],
         },
         {
-          type: "workspaceTeam",
+          type: "projectTeam",
           minPermission: "read",
-          workspaceId: await getWorkspaceIdFromSurveyId(parsedInput.surveyId),
+          projectId: await getProjectIdFromSurveyId(parsedInput.surveyId),
         },
       ],
     });

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, getWorkspaceIdFromSurveyId } from "@/lib/utils/helper";
+import { getOrganizationIdFromSurveyId, getProjectIdFromSurveyId } 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: "workspaceTeam",
+          type: "projectTeam",
           minPermission: "read",
-          workspaceId: await getWorkspaceIdFromSurveyId(parsedInput.surveyId),
+          projectId: await getProjectIdFromSurveyId(parsedInput.surveyId),
         },
       ],
     });
@@ -64,13 +64,13 @@ export const sendEmbedSurveyPreviewEmailAction = authenticatedActionClient
 
 const ZResetSurveyAction = z.object({
   surveyId: ZId,
-  workspaceId: ZId,
+  projectId: ZId,
 });
 
 export const resetSurveyAction = authenticatedActionClient.inputSchema(ZResetSurveyAction).action(
   withAuditLogging("updated", "survey", async ({ ctx, parsedInput }) => {
     const organizationId = await getOrganizationIdFromSurveyId(parsedInput.surveyId);
-    const workspaceId = await getWorkspaceIdFromSurveyId(parsedInput.surveyId);
+    const projectId = await getProjectIdFromSurveyId(parsedInput.surveyId);
 
     await checkAuthorizationUpdated({
       userId: ctx.user.id,
@@ -81,9 +81,9 @@ export const resetSurveyAction = authenticatedActionClient.inputSchema(ZResetSur
           roles: ["owner", "manager"],
         },
         {
-          type: "workspaceTeam",
+          type: "projectTeam",
           minPermission: "readWrite",
-          workspaceId,
+          projectId,
         },
       ],
     });
@@ -125,9 +125,9 @@ export const getEmailHtmlAction = authenticatedActionClient
           roles: ["owner", "manager"],
         },
         {
-          type: "workspaceTeam",
+          type: "projectTeam",
           minPermission: "readWrite",
-          workspaceId: await getWorkspaceIdFromSurveyId(parsedInput.surveyId),
+          projectId: await getProjectIdFromSurveyId(parsedInput.surveyId),
         },
       ],
     });
@@ -160,8 +160,8 @@ export const generatePersonalLinksAction = authenticatedActionClient
           roles: ["owner", "manager"],
         },
         {
-          type: "workspaceTeam",
+          type: "projectTeam",
-          workspaceId: await getWorkspaceIdFromSurveyId(parsedInput.surveyId),
+          projectId: await getProjectIdFromSurveyId(parsedInput.surveyId),
           minPermission: "readWrite",
         },
       ],
@@ -234,8 +234,8 @@ export const updateSingleUseLinksAction = authenticatedActionClient
           roles: ["owner", "manager"],
         },
         {
-          type: "workspaceTeam",
+          type: "projectTeam",
-          workspaceId: await getWorkspaceIdFromSurveyId(parsedInput.surveyId),
+          projectId: await getProjectIdFromSurveyId(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 { workspace } = useEnvironment();
+  const { project } = 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,
-      workspaceId: workspace.id,
+      projectId: project.id,
     });
     if (result?.data) {
       toast.success(
@@ -212,7 +212,7 @@ export const SurveyAnalysisCTA = ({
           isFormbricksCloud={isFormbricksCloud}
           isReadOnly={isReadOnly}
           isStorageConfigured={isStorageConfigured}
-          workspaceCustomScripts={workspace.customHeadScripts}
+          projectCustomScripts={project.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;
-  workspaceCustomScripts?: string | null;
+  projectCustomScripts?: string | null;
 }
 
 export const ShareSurveyModal = ({
@@ -68,7 +68,7 @@ export const ShareSurveyModal = ({
   isFormbricksCloud,
   isReadOnly,
   isStorageConfigured,
-  workspaceCustomScripts,
+  projectCustomScripts,
 }: 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: { workspaceCustomScripts, isReadOnly },
+        componentProps: { projectCustomScripts, isReadOnly },
       },
     ];
 
@@ -216,7 +216,7 @@ export const ShareSurveyModal = ({
     isFormbricksCloud,
     email,
     isStorageConfigured,
-    workspaceCustomScripts,
+    projectCustomScripts,
   ]);
 
   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, workspace } = useEnvironment();
+  const { environment, project } = 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 (workspace.recontactDays !== null) {
+    if (project.recontactDays !== null) {
-      return formatRecontactDaysString(workspace.recontactDays, t);
+      return formatRecontactDaysString(project.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 {
-  workspaceCustomScripts: string | null | undefined;
+  projectCustomScripts: string | null | undefined;
   isReadOnly: boolean;
 }
 
@@ -31,7 +31,7 @@ interface CustomHtmlFormData {
   customHeadScriptsMode: TSurvey["customHeadScriptsMode"];
 }
 
-export const CustomHtmlTab = ({ workspaceCustomScripts, isReadOnly }: CustomHtmlTabProps) => {
+export const CustomHtmlTab = ({ projectCustomScripts, isReadOnly }: CustomHtmlTabProps) => {
   const { t } = useTranslation();
   const { survey } = useSurvey();
   const [isSaving, setIsSaving] = useState(false);
@@ -101,18 +101,18 @@ export const CustomHtmlTab = ({ workspaceCustomScripts, isReadOnly }: CustomHtml
           </div>
 
           {/* Workspace Scripts Preview */}
-          {workspaceCustomScripts && (
+          {projectCustomScripts && (
             <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">
-                  {workspaceCustomScripts}
+                  {projectCustomScripts}
                 </pre>
               </div>
             </div>
           )}
 
-          {!workspaceCustomScripts && (
+          {!projectCustomScripts && (
             <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 workspace = await getWorkspaceByEnvironmentId(survey.environmentId);
+  const project = await getProjectByEnvironmentId(survey.environmentId);
-  if (!workspace) {
+  if (!project) {
-    throw new Error("Workspace not found");
+    throw new ResourceNotFoundError(t("common.workspace"), null);
   }
 
-  const styling = getStyling(workspace, survey);
+  const styling = getStyling(project, 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,
-  workspaceOverwrites: null,
+  projectOverwrites: null,
   showLanguageSwitch: false,
   isBackButtonHidden: false,
   followUps: [],

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

@@ -9,7 +9,7 @@ import { getSurvey } from "@/lib/survey/service";
 import { getTagsByEnvironmentId } from "@/lib/tag/service";
 import { authenticatedActionClient } from "@/lib/utils/action-client";
 import { checkAuthorizationUpdated } from "@/lib/utils/action-client/action-client-middleware";
-import { getOrganizationIdFromSurveyId, getWorkspaceIdFromSurveyId } from "@/lib/utils/helper";
+import { getOrganizationIdFromSurveyId, getProjectIdFromSurveyId } 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: "workspaceTeam",
+          type: "projectTeam",
           minPermission: "read",
-          workspaceId: await getWorkspaceIdFromSurveyId(parsedInput.surveyId),
+          projectId: await getProjectIdFromSurveyId(parsedInput.surveyId),
         },
       ],
     });
@@ -70,9 +70,9 @@ export const getSurveyFilterDataAction = authenticatedActionClient
           roles: ["owner", "manager"],
         },
         {
-          type: "workspaceTeam",
+          type: "projectTeam",
           minPermission: "read",
-          workspaceId: await getWorkspaceIdFromSurveyId(parsedInput.surveyId),
+          projectId: await getProjectIdFromSurveyId(parsedInput.surveyId),
         },
       ],
     });

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

@@ -1,3 +1,3 @@
-import { AppConnectionLoading } from "@/modules/workspaces/settings/(setup)/app-connection/loading";
+import { AppConnectionLoading } from "@/modules/projects/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/workspaces/settings/(setup)/app-connection/page";
+import { AppConnectionPage } from "@/modules/projects/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/workspaces/settings/general/loading";
+import { GeneralSettingsLoading } from "@/modules/projects/settings/general/loading";
 
 export default GeneralSettingsLoading;

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

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

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

@@ -9,8 +9,8 @@ import { checkAuthorizationUpdated } from "@/lib/utils/action-client/action-clie
 import {
   getOrganizationIdFromEnvironmentId,
   getOrganizationIdFromIntegrationId,
-  getWorkspaceIdFromEnvironmentId,
+  getProjectIdFromEnvironmentId,
-  getWorkspaceIdFromIntegrationId,
+  getProjectIdFromIntegrationId,
 } from "@/lib/utils/helper";
 import { withAuditLogging } from "@/modules/ee/audit-logs/lib/handler";
 
@@ -34,9 +34,9 @@ export const createOrUpdateIntegrationAction = authenticatedActionClient
             roles: ["owner", "manager"],
           },
           {
-            type: "workspaceTeam",
+            type: "projectTeam",
             minPermission: "readWrite",
-            workspaceId: await getWorkspaceIdFromEnvironmentId(parsedInput.environmentId),
+            projectId: await getProjectIdFromEnvironmentId(parsedInput.environmentId),
           },
         ],
       });
@@ -66,8 +66,8 @@ export const deleteIntegrationAction = authenticatedActionClient.inputSchema(ZDe
           roles: ["owner", "manager"],
         },
         {
-          type: "workspaceTeam",
+          type: "projectTeam",
-          workspaceId: await getWorkspaceIdFromIntegrationId(parsedInput.integrationId),
+          projectId: await getProjectIdFromIntegrationId(parsedInput.integrationId),
           minPermission: "readWrite",
         },
       ],

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, getWorkspaceIdFromEnvironmentId } from "@/lib/utils/helper";
+import { getOrganizationIdFromEnvironmentId, getProjectIdFromEnvironmentId } from "@/lib/utils/helper";
 
 const ZValidateGoogleSheetsConnectionAction = z.object({
   environmentId: ZId,
@@ -28,8 +28,8 @@ export const validateGoogleSheetsConnectionAction = authenticatedActionClient
           roles: ["owner", "manager"],
         },
         {
-          type: "workspaceTeam",
+          type: "projectTeam",
-          workspaceId: await getWorkspaceIdFromEnvironmentId(parsedInput.environmentId),
+          projectId: await getProjectIdFromEnvironmentId(parsedInput.environmentId),
           minPermission: "readWrite",
         },
       ],
@@ -62,8 +62,8 @@ export const getSpreadsheetNameByIdAction = authenticatedActionClient
           roles: ["owner", "manager"],
         },
         {
-          type: "workspaceTeam",
+          type: "projectTeam",
-          workspaceId: await getWorkspaceIdFromEnvironmentId(parsedInput.environmentId),
+          projectId: await getProjectIdFromEnvironmentId(parsedInput.environmentId),
           minPermission: "readWrite",
         },
       ],

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}`;
@@ -210,7 +210,7 @@ const Page = async (props: { params: Promise<{ environmentId: string }> }) => {
   return (
     <PageContentWrapper>
       <PageHeader pageTitle={t("common.workspace_configuration")}>
-        <WorkspaceConfigNavigation environmentId={params.environmentId} activeId="integrations" />
+        <ProjectConfigNavigation 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, getWorkspaceIdFromEnvironmentId } from "@/lib/utils/helper";
+import { getOrganizationIdFromEnvironmentId, getProjectIdFromEnvironmentId } from "@/lib/utils/helper";
 
 const ZGetSlackChannelsAction = z.object({
   environmentId: ZId,
@@ -23,8 +23,8 @@ export const getSlackChannelsAction = authenticatedActionClient
           roles: ["owner", "manager"],
         },
         {
-          type: "workspaceTeam",
+          type: "projectTeam",
-          workspaceId: await getWorkspaceIdFromEnvironmentId(parsedInput.environmentId),
+          projectId: await getProjectIdFromEnvironmentId(parsedInput.environmentId),
           minPermission: "readWrite",
         },
       ],

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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 { getUserWorkspaces } from "@/lib/workspace/service";
+import { getUserProjects } from "@/lib/project/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 workspace's production environment
+  // redirect to first project's production environment
-  const workspaces = await getUserWorkspaces(session.user.id, organizationId);
+  const projects = await getUserProjects(session.user.id, organizationId);
-  if (workspaces.length === 0) {
+  if (projects.length === 0) {
     return redirect(`/organizations/${organizationId}/landing`);
   }
 
-  const firstWorkspace = workspaces[0];
+  const firstProject = projects[0];
-  const environments = await getEnvironments(firstWorkspace.id);
+  const environments = await getEnvironments(firstProject.id);
   const prodEnvironment = environments.find((e) => e.type === "production");
   if (!prodEnvironment) return notFound();
 

apps/web/app/(redirects)/workspaces/[projectId]/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 { getWorkspace } from "@/lib/workspace/service";
+import { getProject } from "@/lib/project/service";
 import { authOptions } from "@/modules/auth/lib/authOptions";
 
-export const GET = async (_: Request, context: { params: Promise<{ workspaceId: string }> }) => {
+export const GET = async (_: Request, context: { params: Promise<{ projectId: string }> }) => {
   const params = await context?.params;
-  const workspaceId = params.workspaceId;
+  const projectId = params.projectId;
-  if (!workspaceId) return notFound();
+  if (!projectId) return notFound();
   // check auth
   const session = await getServerSession(authOptions);
   if (!session) throw new AuthenticationError("Not authenticated");
-  const workspace = await getWorkspace(workspaceId);
+  const project = await getProject(projectId);
-  if (!workspace) return notFound();
+  if (!project) return notFound();
-  const hasAccess = await hasOrganizationAccess(session.user.id, workspace.organizationId);
+  const hasAccess = await hasOrganizationAccess(session.user.id, project.organizationId);
   if (!hasAccess) throw new AuthorizationError("Unauthorized");
-  // redirect to workspace's production environment
+  // redirect to project's production environment
-  const environments = await getEnvironments(workspace.id);
+  const environments = await getEnvironments(project.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,
-  workspaceOverwrites: null,
+  projectOverwrites: 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() },
-    workspace: { count: vi.fn() },
+    project: { count: vi.fn() },
     survey: { count: vi.fn() },
     response: {
       count: vi.fn(),
@@ -94,7 +94,7 @@ describe("sendTelemetryEvents", () => {
         organizationCount: BigInt(1),
         userCount: BigInt(5),
         teamCount: BigInt(2),
-        workspaceCount: BigInt(3),
+        projectCount: BigInt(3),
         surveyCount: BigInt(10),
         inProgressSurveyCount: BigInt(4),
         completedSurveyCount: BigInt(6),

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

@@ -148,7 +148,7 @@ const sendTelemetry = async (lastSent: number) => {
           organizationCount: bigint;
           userCount: bigint;
           teamCount: bigint;
-          workspaceCount: bigint;
+          projectCount: bigint;
           surveyCount: bigint;
           inProgressSurveyCount: bigint;
           completedSurveyCount: bigint;
@@ -165,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 "Workspace") as "workspaceCount",
+        (SELECT COUNT(*) FROM "Project") as "projectCount",
         (SELECT COUNT(*) FROM "Survey") as "surveyCount",
         (SELECT COUNT(*) FROM "Survey" WHERE status = 'inProgress') as "inProgressSurveyCount",
         (SELECT COUNT(*) FROM "Survey" WHERE status = 'completed') as "completedSurveyCount",
@@ -186,7 +186,7 @@ const sendTelemetry = async (lastSent: number) => {
   const organizationCount = Number(counts.organizationCount);
   const userCount = Number(counts.userCount);
   const teamCount = Number(counts.teamCount);
-  const workspaceCount = Number(counts.workspaceCount);
+  const projectCount = Number(counts.projectCount);
   const surveyCount = Number(counts.surveyCount);
   const inProgressSurveyCount = Number(counts.inProgressSurveyCount);
   const completedSurveyCount = Number(counts.completedSurveyCount);
@@ -222,7 +222,7 @@ const sendTelemetry = async (lastSent: number) => {
     organizationCount,
     userCount,
     teamCount,
-    workspaceCount,
+    projectCount,
     surveyCount,
     inProgressSurveyCount,
     completedSurveyCount,

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

@@ -168,7 +168,7 @@ export const POST = async (request: Request) => {
         memberships: {
           some: {
             organization: {
-              workspaces: {
+              projects: {
                 some: {
                   environments: {
                     some: { id: environmentId },
@@ -192,9 +192,9 @@ export const POST = async (request: Request) => {
             teamUsers: {
               some: {
                 team: {
-                  workspaceTeams: {
+                  projectTeams: {
                     some: {
-                      workspace: {
+                      project: {
                         environments: {
                           some: {
                             id: environmentId,

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

@@ -0,0 +1,139 @@
+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,10 +6,26 @@ 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 { TAuditStatus, UNKNOWN_DATA } from "@/modules/ee/audit-logs/types/audit-log";
+import { 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;
 
@@ -17,44 +33,6 @@ 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;
@@ -90,7 +68,7 @@ const handler = async (req: Request, ctx: any) => {
       }) {
         let result: boolean | string = true;
         let error: any = undefined;
-        let authMethod = "unknown";
+        const authMethod = getAuthMethod(account);
 
         try {
           if (baseAuthOptions.callbacks?.signIn) {
@@ -102,15 +80,6 @@ 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;
@@ -122,30 +91,60 @@ const handler = async (req: Request, ctx: any) => {
           }
         }
 
-        const status: TAuditStatus = result === false ? "failure" : "success";
+        if (result === false) {
-        const auditLog = {
+          queueAuditEventBackground({
-          action: "signedIn" as const,
+            action: "signedIn",
-          targetType: "user" as const,
+            targetType: "user",
-          userId: user?.id ?? UNKNOWN_DATA,
+            userId: user?.id ?? UNKNOWN_DATA,
-          targetId: user?.id ?? UNKNOWN_DATA,
+            targetId: user?.id ?? UNKNOWN_DATA,
-          organizationId: UNKNOWN_DATA,
+            organizationId: UNKNOWN_DATA,
-          status,
+            status: "failure",
-          userType: "user" as const,
+            userType: "user",
-          newObject: {
+            newObject: {
-            ...user,
+              ...user,
-            authMethod,
+              authMethod,
-            provider: account?.provider,
+              provider: account?.provider,
-            ...(error ? { errorMessage: error.message } : {}),
+              ...(error instanceof Error ? { errorMessage: error.message } : {}),
-          },
+            },
-          ...(status === "failure" ? { eventId } : {}),
+            eventId,
-        };
+          });
-
+        }
-        queueAuditEventBackground(auditLog);
 
         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",
+          userId: user?.id ?? UNKNOWN_DATA,
+          targetId: user?.id ?? UNKNOWN_DATA,
+          organizationId: UNKNOWN_DATA,
+          status: "success",
+          userType: "user",
+          newObject: {
+            ...user,
+            authMethod: getAuthMethod(account),
+            provider: account?.provider,
+            sessionStrategy: "database",
+            isNewUser: isNewUser ?? false,
+          },
+        });
+      },
+    },
   };
 
   return NextAuth(authOptions)(req, ctx);

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

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

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

@@ -30,8 +30,8 @@ const mockEnvironmentData = {
   id: environmentId,
   type: "production",
   appSetupCompleted: true,
-  workspace: {
+  project: {
-    id: "workspace-123",
+    id: "project-123",
     recontactDays: 30,
     clickOutsideClose: true,
     overlay: "none",
@@ -73,7 +73,7 @@ const mockEnvironmentData = {
       triggers: [],
       displayPercentage: null,
       delay: 0,
-      workspaceOverwrites: null,
+      projectOverwrites: null,
     },
   ],
 };
@@ -97,8 +97,8 @@ describe("getEnvironmentStateData", () => {
         id: environmentId,
         type: "production",
         appSetupCompleted: true,
-        workspace: {
+        project: {
-          id: "workspace-123",
+          id: "project-123",
           recontactDays: 30,
           clickOutsideClose: true,
           overlay: "none",
@@ -117,7 +117,7 @@ describe("getEnvironmentStateData", () => {
         id: true,
         type: true,
         appSetupCompleted: true,
-        workspace: expect.any(Object),
+        project: 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 workspace is not found", async () => {
+  test("should throw ResourceNotFoundError when project is not found", async () => {
     vi.mocked(prisma.environment.findUnique).mockResolvedValue({
       ...mockEnvironmentData,
-      workspace: null,
+      project: 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 workspace properties to environment.workspace", async () => {
+  test("should correctly map project properties to environment.project", async () => {
-    const customWorkspace = {
+    const customProject = {
-      ...mockEnvironmentData.workspace,
+      ...mockEnvironmentData.project,
       recontactDays: 14,
       clickOutsideClose: false,
       overlay: "dark",
@@ -214,13 +214,13 @@ describe("getEnvironmentStateData", () => {
 
     vi.mocked(prisma.environment.findUnique).mockResolvedValue({
       ...mockEnvironmentData,
-      workspace: customWorkspace,
+      project: customProject,
     } as never);
 
     const result = await getEnvironmentStateData(environmentId);
 
-    expect(result.environment.workspace).toEqual({
+    expect(result.environment.project).toEqual({
-      id: "workspace-123",
+      id: "project-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;
-    workspace: TJsEnvironmentStateWorkspace;
+    project: TJsEnvironmentStateProject;
   };
   surveys: TJsEnvironmentStateSurvey[];
   actionClasses: TJsEnvironmentStateActionClass[];
@@ -45,8 +45,8 @@ export const getEnvironmentStateData = async (environmentId: string): Promise<En
         id: true,
         type: true,
         appSetupCompleted: true,
-        // Workspace data (optimized select)
+        // Project data (optimized select)
-        workspace: {
+        project: {
           select: {
             id: true,
             recontactDays: true,
@@ -97,7 +97,7 @@ export const getEnvironmentStateData = async (environmentId: string): Promise<En
                     alias: true,
                     createdAt: true,
                     updatedAt: true,
-                    workspaceId: true,
+                    projectId: true,
                   },
                 },
               },
@@ -132,7 +132,7 @@ export const getEnvironmentStateData = async (environmentId: string): Promise<En
             },
             displayPercentage: true,
             delay: true,
-            workspaceOverwrites: true,
+            projectOverwrites: true,
           },
         },
       },
@@ -142,8 +142,8 @@ export const getEnvironmentStateData = async (environmentId: string): Promise<En
       throw new ResourceNotFoundError("environment", environmentId);
     }
 
-    if (!environmentData.workspace) {
+    if (!environmentData.project) {
-      throw new ResourceNotFoundError("workspace", null);
+      throw new ResourceNotFoundError("project", 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,
-        workspace: {
+        project: {
-          id: environmentData.workspace.id,
+          id: environmentData.project.id,
-          recontactDays: environmentData.workspace.recontactDays,
+          recontactDays: environmentData.project.recontactDays,
-          clickOutsideClose: environmentData.workspace.clickOutsideClose,
+          clickOutsideClose: environmentData.project.clickOutsideClose,
-          overlay: environmentData.workspace.overlay,
+          overlay: environmentData.project.overlay,
-          placement: environmentData.workspace.placement,
+          placement: environmentData.project.placement,
-          inAppSurveyBranding: environmentData.workspace.inAppSurveyBranding,
+          inAppSurveyBranding: environmentData.project.inAppSurveyBranding,
-          styling: resolveStorageUrlsInObject(environmentData.workspace.styling),
+          styling: resolveStorageUrlsInObject(environmentData.project.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, TJsEnvironmentStateWorkspace } from "@formbricks/types/js";
+import { TJsEnvironmentState, TJsEnvironmentStateProject } 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 mockWorkspace: TJsEnvironmentStateWorkspace = {
+const mockProject: TJsEnvironmentStateProject = {
-  id: "test-workspace-id",
+  id: "test-project-id",
   recontactDays: 30,
   inAppSurveyBranding: true,
   placement: "bottomRight",
@@ -69,7 +69,7 @@ const mockOrganization: TOrganization = {
   billing: {
     stripeCustomerId: null,
     limits: {
-      workspaces: 1,
+      projects: 1,
       monthly: {
         responses: 100,
       },
@@ -94,7 +94,7 @@ const mockSurveys: TSurvey[] = [
     isBackButtonHidden: false,
     isSingleResponsePerEmailEnabled: false,
     isVerifyEmailEnabled: false,
-    workspaceOverwrites: null,
+    projectOverwrites: null,
     showLanguageSwitch: false,
     questions: [],
     displayOption: "displayOnce",
@@ -137,7 +137,11 @@ const mockEnvironmentStateData: EnvironmentStateData = {
     id: environmentId,
     type: "production",
     appSetupCompleted: true,
-    workspace: mockWorkspace,
+    project: mockProject,
+  },
+  organization: {
+    id: mockOrganization.id,
+    billing: mockOrganization.billing,
   },
   surveys: mockSurveys,
   actionClasses: mockActionClasses,
@@ -161,19 +165,11 @@ describe("getEnvironmentState", () => {
   test("should return the correct environment state", async () => {
     const result = await getEnvironmentState(environmentId);
 
-    // Backwards compat: response includes `project` alongside `workspace`,
+    const expectedData: TJsEnvironmentState["data"] = {
-    // 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: surveysWithLegacy,
+      surveys: mockSurveys,
       actionClasses: mockActionClasses,
-      workspace: mockWorkspace,
+      project: mockProject,
-      project: mockWorkspace,
     };
 
     expect(result.data).toEqual(expectedData);
@@ -193,8 +189,8 @@ describe("getEnvironmentState", () => {
     await expect(getEnvironmentState(environmentId)).rejects.toThrow(ResourceNotFoundError);
   });
 
-  test("should throw ResourceNotFoundError if workspace not found", async () => {
+  test("should throw ResourceNotFoundError if project not found", async () => {
-    vi.mocked(getEnvironmentStateData).mockRejectedValue(new ResourceNotFoundError("workspace", null));
+    vi.mocked(getEnvironmentStateData).mockRejectedValue(new ResourceNotFoundError("project", null));
     await expect(getEnvironmentState(environmentId)).rejects.toThrow(ResourceNotFoundError);
   });
 
@@ -280,12 +276,7 @@ describe("getEnvironmentState", () => {
 
     const result = await getEnvironmentState(environmentId);
 
-    // Backwards compat: each survey includes `projectOverwrites`
+    expect(result.data.surveys).toEqual(mixedSurveys);
-    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,10 +2,6 @@ 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";
@@ -17,7 +13,7 @@ import { getEnvironmentStateData } from "./data";
  *
  * @param environmentId - The environment ID to fetch state for
  * @returns The environment state
- * @throws ResourceNotFoundError if environment, organization, or workspace not found
+ * @throws ResourceNotFoundError if environment, organization, or project not found
  */
 export const getEnvironmentState = async (
   environmentId: string
@@ -37,14 +33,12 @@ export const getEnvironmentState = async (
       }
 
       // Build the response data
-      // Backwards compat: include `project` alongside `workspace`, and
+      const data: TJsEnvironmentState["data"] = {
-      // `projectOverwrites` alongside `workspaceOverwrites` in each survey
+        surveys,
-      const data = addLegacyProjectToEnvironmentState({
-        surveys: addLegacyProjectOverwritesToList(surveys),
         actionClasses,
-        workspace: environment.workspace,
+        project: environment.project,
         ...(IS_RECAPTCHA_CONFIGURED ? { recaptchaSiteKey: RECAPTCHA_SITE_KEY } : {}),
-      } as TJsEnvironmentState["data"]);
+      };
 
       return { data };
     },

apps/web/app/api/v1/client/[environmentId]/responses/lib/response.ts

@@ -45,7 +45,6 @@ export const responseSelection = {
           updatedAt: true,
           name: true,
           environmentId: true,
-          workspaceId: true,
         },
       },
     },

apps/web/app/api/v1/management/action-classes/lib/action-classes.ts

@@ -19,7 +19,6 @@ const selectActionClass = {
   key: true,
   noCodeConfig: true,
   environmentId: true,
-  workspaceId: true,
 } satisfies Prisma.ActionClassSelect;
 
 export const getActionClasses = reactCache(async (environmentIds: string[]): Promise<TActionClass[]> => {

apps/web/app/api/v1/management/me/route.ts

@@ -21,9 +21,9 @@ const apiKeySelect = {
           type: true,
           createdAt: true,
           updatedAt: true,
-          workspaceId: true,
+          projectId: true,
           appSetupCompleted: true,
-          workspace: {
+          project: {
             select: {
               id: true,
               name: true,
@@ -49,9 +49,9 @@ type ApiKeyData = {
       type: string;
       createdAt: Date;
       updatedAt: Date;
-      workspaceId: string;
+      projectId: string;
       appSetupCompleted: boolean;
-      workspace: {
+      project: {
         id: string;
         name: string;
       };
@@ -124,13 +124,10 @@ const buildEnvironmentResponse = (apiKeyData: ApiKeyData) => {
     createdAt: env.createdAt,
     updatedAt: env.updatedAt,
     appSetupCompleted: env.appSetupCompleted,
-    workspace: {
+    project: {
-      id: env.workspaceId,
+      id: env.projectId,
-      name: env.workspace.name,
+      name: env.project.name,
     },
-    // Backwards compat: old consumers expect project fields
-    projectId: env.workspaceId,
-    projectName: env.workspace.name,
   });
 };
 

apps/web/app/api/v1/management/responses/lib/response.test.ts

@@ -27,7 +27,7 @@ const mockOrganization = {
   updatedAt: new Date(),
   billing: {
     stripeCustomerId: null,
-    limits: { workspaces: 3, monthly: { responses: null } },
+    limits: { projects: 3, monthly: { responses: null } },
     usageCycleAnchor: new Date(),
   } as TOrganizationBilling, // Default no limit
 } as unknown as Organization;

apps/web/app/api/v1/management/responses/lib/response.ts

@@ -50,7 +50,6 @@ export const responseSelection = {
           updatedAt: true,
           name: true,
           environmentId: true,
-          workspaceId: true,
         },
       },
     },

apps/web/app/api/v1/management/storage/lib/utils.test.ts

@@ -52,8 +52,8 @@ describe("checkAuth", () => {
           environmentId: "env-123",
           permission: "read",
           environmentType: "development",
-          workspaceId: "workspace-1",
+          projectId: "project-1",
-          workspaceName: "Workspace 1",
+          projectName: "Project 1",
         },
       ],
       apiKeyId: "hashed-key",
@@ -84,8 +84,8 @@ describe("checkAuth", () => {
           environmentId: "env-123",
           permission: "write",
           environmentType: "development",
-          workspaceId: "workspace-1",
+          projectId: "project-1",
-          workspaceName: "Workspace 1",
+          projectName: "Project 1",
         },
       ],
       apiKeyId: "hashed-key",

apps/web/app/api/v1/management/surveys/[surveyId]/route.ts

@@ -4,10 +4,6 @@ import { ZSurveyUpdateInput } from "@formbricks/types/surveys/types";
 import { handleErrorResponse } from "@/app/api/v1/auth";
 import { deleteSurvey } from "@/app/api/v1/management/surveys/[surveyId]/lib/surveys";
 import { checkFeaturePermissions } from "@/app/api/v1/management/surveys/lib/utils";
-import {
-  addLegacyProjectOverwrites,
-  normaliseProjectOverwritesToWorkspace,
-} from "@/app/lib/api/api-backwards-compat";
 import { responses } from "@/app/lib/api/response";
 import {
   transformBlocksToQuestions,
@@ -61,21 +57,17 @@ export const GET = withV1ApiWrapper({
       if (shouldTransformToQuestions) {
         return {
           response: responses.successResponse(
-            addLegacyProjectOverwrites(
+            resolveStorageUrlsInObject({
-              resolveStorageUrlsInObject({
+              ...result.survey,
-                ...result.survey,
+              questions: transformBlocksToQuestions(result.survey.blocks, result.survey.endings),
-                questions: transformBlocksToQuestions(result.survey.blocks, result.survey.endings),
+              blocks: [],
-                blocks: [],
+            })
-              })
-            )
           ),
         };
       }
 
       return {
-        response: responses.successResponse(
+        response: responses.successResponse(resolveStorageUrlsInObject(result.survey)),
-          addLegacyProjectOverwrites(resolveStorageUrlsInObject(result.survey))
-        ),
       };
     } catch (error) {
       return {
@@ -167,9 +159,6 @@ export const PUT = withV1ApiWrapper({
         };
       }
 
-      // Backwards compat: accept projectOverwrites as alias for workspaceOverwrites
-      surveyUpdate = normaliseProjectOverwritesToWorkspace(surveyUpdate);
-
       const validateResult = validateSurveyInput({ ...surveyUpdate, updateOnly: true });
       if (!validateResult.ok) {
         return {
@@ -222,16 +211,12 @@ export const PUT = withV1ApiWrapper({
           };
 
           return {
-            response: responses.successResponse(
+            response: responses.successResponse(resolveStorageUrlsInObject(surveyWithQuestions)),
-              addLegacyProjectOverwrites(resolveStorageUrlsInObject(surveyWithQuestions))
-            ),
           };
         }
 
         return {
-          response: responses.successResponse(
+          response: responses.successResponse(resolveStorageUrlsInObject(updatedSurvey)),
-            addLegacyProjectOverwrites(resolveStorageUrlsInObject(updatedSurvey))
-          ),
         };
       } catch (error) {
         return {

apps/web/app/api/v1/management/surveys/lib/utils.test.ts

@@ -42,7 +42,7 @@ const mockOrganization: TOrganization = {
   billing: {
     stripeCustomerId: null,
     limits: {
-      workspaces: 3,
+      projects: 3,
       monthly: {
         responses: 1500,
       },
@@ -79,7 +79,7 @@ const mockLanguage: TSurveyCreateInputWithEnvironmentId["languages"][number] = {
     code: "en",
     alias: "English",
     createdAt: new Date(),
-    workspaceId: "mockWorkspaceId",
+    projectId: "mockProjectId",
     updatedAt: new Date(),
   },
   default: true,

apps/web/app/api/v1/management/surveys/route.ts

@@ -2,11 +2,6 @@ import { logger } from "@formbricks/logger";
 import { DatabaseError } from "@formbricks/types/errors";
 import { ZSurveyCreateInputWithEnvironmentId } from "@formbricks/types/surveys/types";
 import { checkFeaturePermissions } from "@/app/api/v1/management/surveys/lib/utils";
-import {
-  addLegacyProjectOverwrites,
-  addLegacyProjectOverwritesToList,
-  normaliseProjectOverwritesToWorkspace,
-} from "@/app/lib/api/api-backwards-compat";
 import { responses } from "@/app/lib/api/response";
 import {
   transformBlocksToQuestions,
@@ -58,9 +53,7 @@ export const GET = withV1ApiWrapper({
       });
 
       return {
-        response: responses.successResponse(
+        response: responses.successResponse(resolveStorageUrlsInObject(surveysWithQuestions)),
-          addLegacyProjectOverwritesToList(resolveStorageUrlsInObject(surveysWithQuestions))
-        ),
       };
     } catch (error) {
       if (error instanceof DatabaseError) {
@@ -90,9 +83,6 @@ export const POST = withV1ApiWrapper({
         };
       }
 
-      // Backwards compat: accept projectOverwrites as alias for workspaceOverwrites
-      surveyInput = normaliseProjectOverwritesToWorkspace(surveyInput);
-
       const inputValidation = ZSurveyCreateInputWithEnvironmentId.safeParse(surveyInput);
 
       if (!inputValidation.success) {
@@ -157,12 +147,12 @@ export const POST = withV1ApiWrapper({
         };
 
         return {
-          response: responses.successResponse(addLegacyProjectOverwrites(surveyWithQuestions)),
+          response: responses.successResponse(surveyWithQuestions),
         };
       }
 
       return {
-        response: responses.successResponse(addLegacyProjectOverwrites(survey)),
+        response: responses.successResponse(survey),
       };
     } catch (error) {
       if (error instanceof DatabaseError) {

apps/web/app/api/v2/client/[environmentId]/responses/lib/organization.test.ts

@@ -22,7 +22,7 @@ describe("getOrganizationBillingByEnvironmentId", () => {
   const mockBillingData: TOrganizationBilling = {
     limits: {
       monthly: { responses: 0 },
-      workspaces: 3,
+      projects: 3,
     },
     usageCycleAnchor: new Date(),
     stripeCustomerId: "mock-stripe-customer-id",
@@ -34,7 +34,7 @@ describe("getOrganizationBillingByEnvironmentId", () => {
     expect(result).toEqual(mockBillingData);
     expect(prisma.organization.findFirst).toHaveBeenCalledWith({
       where: {
-        workspaces: {
+        projects: {
           some: {
             environments: {
               some: {

apps/web/app/api/v2/client/[environmentId]/responses/lib/organization.ts

@@ -8,7 +8,7 @@ export const getOrganizationBillingByEnvironmentId = reactCache(
     try {
       const organization = await prisma.organization.findFirst({
         where: {
-          workspaces: {
+          projects: {
             some: {
               environments: {
                 some: {

apps/web/app/api/v2/client/[environmentId]/responses/lib/utils.test.ts

@@ -86,7 +86,7 @@ const mockSurvey: TSurvey = {
   isBackButtonHidden: false,
   isSingleResponsePerEmailEnabled: false,
   isVerifyEmailEnabled: false,
-  workspaceOverwrites: null,
+  projectOverwrites: null,
   showLanguageSwitch: false,
   blocks: [],
   isCaptureIpEnabled: false,
@@ -106,7 +106,7 @@ const mockResponseInput: TResponseInputV2 = {
 const mockBillingData: TOrganizationBilling = {
   limits: {
     monthly: { responses: 0 },
-    workspaces: 3,
+    projects: 3,
   },
   usageCycleAnchor: new Date(),
   stripeCustomerId: "mock-stripe-customer-id",

apps/web/app/api/v2/organizations/[organizationId]/project-teams/route.ts

@@ -0,0 +1,3 @@
+import { DELETE, GET, POST, PUT } from "@/modules/api/v2/organizations/[organizationId]/project-teams/route";
+
+export { GET, POST, PUT, DELETE };

apps/web/app/api/v2/organizations/[organizationId]/workspace-teams/route.ts

@@ -1,8 +0,0 @@
-import {
-  DELETE,
-  GET,
-  POST,
-  PUT,
-} from "@/modules/api/v2/organizations/[organizationId]/workspace-teams/route";
-
-export { GET, POST, PUT, DELETE };

apps/web/app/api/v3/lib/auth.test.ts

@@ -2,7 +2,7 @@ import { ApiKeyPermission, EnvironmentType } from "@prisma/client";
 import { beforeEach, describe, expect, test, vi } from "vitest";
 import { AuthorizationError, ResourceNotFoundError } from "@formbricks/types/errors";
 import { checkAuthorizationUpdated } from "@/lib/utils/action-client/action-client-middleware";
-import { getOrganizationIdFromWorkspaceId } from "@/lib/utils/helper";
+import { getOrganizationIdFromProjectId } from "@/lib/utils/helper";
 import { getEnvironment } from "@/lib/utils/services";
 import { requireSessionWorkspaceAccess, requireV3WorkspaceAccess } from "./auth";
 
@@ -16,7 +16,7 @@ vi.mock("@formbricks/logger", () => ({
 }));
 
 vi.mock("@/lib/utils/helper", () => ({
-  getOrganizationIdFromWorkspaceId: vi.fn(),
+  getOrganizationIdFromProjectId: vi.fn(),
 }));
 
 vi.mock("@/lib/utils/services", () => ({
@@ -79,9 +79,9 @@ describe("requireSessionWorkspaceAccess", () => {
   test("returns 403 when user has no access to workspace", async () => {
     vi.mocked(getEnvironment).mockResolvedValueOnce({
       id: "env_abc",
-      workspaceId: "proj_abc",
+      projectId: "proj_abc",
     } as any);
-    vi.mocked(getOrganizationIdFromWorkspaceId).mockResolvedValueOnce("org_1");
+    vi.mocked(getOrganizationIdFromProjectId).mockResolvedValueOnce("org_1");
     vi.mocked(checkAuthorizationUpdated).mockRejectedValueOnce(new AuthorizationError("Not authorized"));
     const result = await requireSessionWorkspaceAccess(
       { user: { id: "user_1" }, expires: "" } as any,
@@ -99,7 +99,7 @@ describe("requireSessionWorkspaceAccess", () => {
       organizationId: "org_1",
       access: [
         { type: "organization", roles: ["owner", "manager"] },
-        { type: "workspaceTeam", workspaceId: "proj_abc", minPermission: "read" },
+        { type: "projectTeam", projectId: "proj_abc", minPermission: "read" },
       ],
     });
   });
@@ -107,9 +107,9 @@ describe("requireSessionWorkspaceAccess", () => {
   test("returns workspace context when session is valid and user has access", async () => {
     vi.mocked(getEnvironment).mockResolvedValueOnce({
       id: "env_abc",
-      workspaceId: "proj_abc",
+      projectId: "proj_abc",
     } as any);
-    vi.mocked(getOrganizationIdFromWorkspaceId).mockResolvedValueOnce("org_1");
+    vi.mocked(getOrganizationIdFromProjectId).mockResolvedValueOnce("org_1");
     vi.mocked(checkAuthorizationUpdated).mockResolvedValueOnce(undefined as any);
     const result = await requireSessionWorkspaceAccess(
       { user: { id: "user_1" }, expires: "" } as any,
@@ -120,7 +120,7 @@ describe("requireSessionWorkspaceAccess", () => {
     expect(result).not.toBeInstanceOf(Response);
     expect(result).toEqual({
       environmentId: "env_abc",
-      workspaceId: "proj_abc",
+      projectId: "proj_abc",
       organizationId: "org_1",
     });
     expect(checkAuthorizationUpdated).toHaveBeenCalledWith({
@@ -128,7 +128,7 @@ describe("requireSessionWorkspaceAccess", () => {
       organizationId: "org_1",
       access: [
         { type: "organization", roles: ["owner", "manager"] },
-        { type: "workspaceTeam", workspaceId: "proj_abc", minPermission: "readWrite" },
+        { type: "projectTeam", projectId: "proj_abc", minPermission: "readWrite" },
       ],
     });
   });
@@ -145,8 +145,8 @@ function envPerm(environmentId: string, permission: ApiKeyPermission = ApiKeyPer
   return {
     environmentId,
     environmentType: EnvironmentType.development,
-    workspaceId: "proj_k",
+    projectId: "proj_k",
-    workspaceName: "K",
+    projectName: "K",
     permission,
   };
 }
@@ -155,9 +155,9 @@ describe("requireV3WorkspaceAccess", () => {
   beforeEach(() => {
     vi.mocked(getEnvironment).mockResolvedValue({
       id: "env_k",
-      workspaceId: "proj_k",
+      projectId: "proj_k",
     } as any);
-    vi.mocked(getOrganizationIdFromWorkspaceId).mockResolvedValue("org_k");
+    vi.mocked(getOrganizationIdFromProjectId).mockResolvedValue("org_k");
   });
 
   test("401 when authentication is null", async () => {
@@ -168,9 +168,9 @@ describe("requireV3WorkspaceAccess", () => {
   test("delegates to session flow when user is present", async () => {
     vi.mocked(getEnvironment).mockResolvedValueOnce({
       id: "env_s",
-      workspaceId: "proj_s",
+      projectId: "proj_s",
     } as any);
-    vi.mocked(getOrganizationIdFromWorkspaceId).mockResolvedValueOnce("org_s");
+    vi.mocked(getOrganizationIdFromProjectId).mockResolvedValueOnce("org_s");
     vi.mocked(checkAuthorizationUpdated).mockResolvedValueOnce(undefined as any);
     const r = await requireV3WorkspaceAccess(
       { user: { id: "user_1" }, expires: "" } as any,
@@ -180,7 +180,7 @@ describe("requireV3WorkspaceAccess", () => {
     );
     expect(r).toEqual({
       environmentId: "env_s",
-      workspaceId: "proj_s",
+      projectId: "proj_s",
       organizationId: "org_s",
     });
   });
@@ -193,7 +193,7 @@ describe("requireV3WorkspaceAccess", () => {
     const r = await requireV3WorkspaceAccess(auth as any, "ws_a", "read", requestId);
     expect(r).toEqual({
       environmentId: "ws_a",
-      workspaceId: "proj_k",
+      projectId: "proj_k",
       organizationId: "org_k",
     });
     expect(getEnvironment).toHaveBeenCalledWith("ws_a");
@@ -207,7 +207,7 @@ describe("requireV3WorkspaceAccess", () => {
     const r = await requireV3WorkspaceAccess(auth as any, "ws_b", "read", requestId);
     expect(r).toEqual({
       environmentId: "ws_b",
-      workspaceId: "proj_k",
+      projectId: "proj_k",
       organizationId: "org_k",
     });
   });
@@ -252,7 +252,7 @@ describe("requireV3WorkspaceAccess", () => {
     const r = await requireV3WorkspaceAccess(auth as any, "ws_m", "manage", requestId);
     expect(r).toEqual({
       environmentId: "ws_m",
-      workspaceId: "proj_k",
+      projectId: "proj_k",
       organizationId: "org_k",
     });
   });

apps/web/app/api/v3/lib/auth.ts

@@ -6,7 +6,7 @@ import { logger } from "@formbricks/logger";
 import type { TAuthenticationApiKey } from "@formbricks/types/auth";
 import { AuthorizationError, ResourceNotFoundError } from "@formbricks/types/errors";
 import { checkAuthorizationUpdated } from "@/lib/utils/action-client/action-client-middleware";
-import type { TTeamPermission } from "@/modules/ee/teams/workspace-teams/types/team";
+import type { TTeamPermission } from "@/modules/ee/teams/project-teams/types/team";
 import { problemForbidden, problemUnauthorized } from "./response";
 import type { TV3Authentication } from "./types";
 import { type V3WorkspaceContext, resolveV3WorkspaceContext } from "./workspace-context";
@@ -30,7 +30,7 @@ function apiKeyPermissionAllows(permission: ApiKeyPermission, minPermission: TTe
 /**
  * Require session and workspace access. workspaceId is resolved via the V3 workspace-context layer.
  * Returns a Response (401 or 403) on failure, or the resolved workspace context on success so callers
- * use internal IDs (environmentId, workspaceId, organizationId) without resolving again.
+ * use internal IDs (environmentId, projectId, organizationId) without resolving again.
  * We use 403 (not 404) when the workspace is not found to avoid leaking resource existence.
  */
 export async function requireSessionWorkspaceAccess(
@@ -52,16 +52,16 @@ export async function requireSessionWorkspaceAccess(
   const log = logger.withContext({ requestId, workspaceId });
 
   try {
-    // Resolve workspaceId → environmentId, workspaceId, organizationId (single place to change when Workspace exists).
+    // Resolve workspaceId → environmentId, projectId, organizationId (single place to change when Workspace exists).
     const context = await resolveV3WorkspaceContext(workspaceId);
 
-    // Org + workspace-team access; we use internal IDs from context.
+    // Org + project-team access; we use internal IDs from context.
     await checkAuthorizationUpdated({
       userId,
       organizationId: context.organizationId,
       access: [
         { type: "organization", roles: ["owner", "manager"] },
-        { type: "workspaceTeam", workspaceId: context.workspaceId, minPermission },
+        { type: "projectTeam", projectId: context.projectId, minPermission },
       ],
     });
 

apps/web/app/api/v3/lib/workspace-context.test.ts

@@ -1,11 +1,11 @@
 import { describe, expect, test, vi } from "vitest";
 import { ResourceNotFoundError } from "@formbricks/types/errors";
-import { getOrganizationIdFromWorkspaceId } from "@/lib/utils/helper";
+import { getOrganizationIdFromProjectId } from "@/lib/utils/helper";
 import { getEnvironment } from "@/lib/utils/services";
 import { resolveV3WorkspaceContext } from "./workspace-context";
 
 vi.mock("@/lib/utils/helper", () => ({
-  getOrganizationIdFromWorkspaceId: vi.fn(),
+  getOrganizationIdFromProjectId: vi.fn(),
 }));
 
 vi.mock("@/lib/utils/services", () => ({
@@ -13,26 +13,26 @@ vi.mock("@/lib/utils/services", () => ({
 }));
 
 describe("resolveV3WorkspaceContext", () => {
-  test("returns environmentId, workspaceId and organizationId when workspace exists (today: workspaceId === environmentId)", async () => {
+  test("returns environmentId, projectId and organizationId when workspace exists (today: workspaceId === environmentId)", async () => {
     vi.mocked(getEnvironment).mockResolvedValueOnce({
       id: "env_abc",
-      workspaceId: "proj_xyz",
+      projectId: "proj_xyz",
     } as any);
-    vi.mocked(getOrganizationIdFromWorkspaceId).mockResolvedValueOnce("org_123");
+    vi.mocked(getOrganizationIdFromProjectId).mockResolvedValueOnce("org_123");
     const result = await resolveV3WorkspaceContext("env_abc");
     expect(result).toEqual({
       environmentId: "env_abc",
-      workspaceId: "proj_xyz",
+      projectId: "proj_xyz",
       organizationId: "org_123",
     });
     expect(getEnvironment).toHaveBeenCalledWith("env_abc");
-    expect(getOrganizationIdFromWorkspaceId).toHaveBeenCalledWith("proj_xyz");
+    expect(getOrganizationIdFromProjectId).toHaveBeenCalledWith("proj_xyz");
   });
 
   test("throws when workspace (environment) does not exist", async () => {
     vi.mocked(getEnvironment).mockResolvedValueOnce(null);
     await expect(resolveV3WorkspaceContext("env_nonexistent")).rejects.toThrow(ResourceNotFoundError);
     expect(getEnvironment).toHaveBeenCalledWith("env_nonexistent");
-    expect(getOrganizationIdFromWorkspaceId).not.toHaveBeenCalled();
+    expect(getOrganizationIdFromProjectId).not.toHaveBeenCalled();
   });
 });

apps/web/app/api/v3/lib/workspace-context.ts

@@ -9,7 +9,7 @@
  * (and derive environmentId or equivalent from it). Change only this file.
  */
 import { ResourceNotFoundError } from "@formbricks/types/errors";
-import { getOrganizationIdFromWorkspaceId } from "@/lib/utils/helper";
+import { getOrganizationIdFromProjectId } from "@/lib/utils/helper";
 import { getEnvironment } from "@/lib/utils/services";
 
 /**
@@ -19,14 +19,14 @@ import { getEnvironment } from "@/lib/utils/services";
 export type V3WorkspaceContext = {
   /** Environment ID — the container for surveys today. Replaced by workspace when Environment is deprecated. */
   environmentId: string;
-  /** Workspace ID used for workspaceTeam auth. */
+  /** Project ID used for projectTeam auth. */
-  workspaceId: string;
+  projectId: string;
   /** Organization ID used for org-level auth. */
   organizationId: string;
 };
 
 /**
- * Resolves a V3 API workspaceId to internal environmentId, workspaceId, and organizationId.
+ * Resolves a V3 API workspaceId to internal environmentId, projectId, and organizationId.
  * Today: workspaceId is treated as environmentId (workspace = container for surveys = Environment).
  *
  * @throws ResourceNotFoundError if the workspace (environment) does not exist.
@@ -38,13 +38,13 @@ export async function resolveV3WorkspaceContext(workspaceId: string): Promise<V3
     throw new ResourceNotFoundError("environment", workspaceId);
   }
 
-  // Derive org for auth; workspace comes from the environment.
+  // Derive org for auth; project comes from the environment.
-  const organizationId = await getOrganizationIdFromWorkspaceId(environment.workspaceId);
+  const organizationId = await getOrganizationIdFromProjectId(environment.projectId);
 
   // We looked up by workspaceId (as environment id), so the resolved environment id is workspaceId.
   return {
     environmentId: workspaceId,
-    workspaceId: environment.workspaceId,
+    projectId: environment.projectId,
     organizationId,
   };
 }

apps/web/app/api/v3/surveys/route.test.ts

@@ -81,8 +81,8 @@ const apiKeyAuth = {
     {
       environmentId: validWorkspaceId,
       environmentType: EnvironmentType.development,
-      workspaceId: "proj_1",
+      projectId: "proj_1",
-      workspaceName: "P",
+      projectName: "P",
       permission: ApiKeyPermission.read,
     },
   ],
@@ -112,13 +112,13 @@ describe("GET /api/v3/surveys", () => {
         }
         return {
           environmentId: workspaceId,
-          workspaceId: p.workspaceId,
+          projectId: p.projectId,
           organizationId: auth.organizationId,
         };
       }
       return {
         environmentId: resolvedEnvironmentId,
-        workspaceId: "proj_1",
+        projectId: "proj_1",
         organizationId: "org_1",
       };
     });
@@ -194,8 +194,8 @@ describe("GET /api/v3/surveys", () => {
         {
           environmentId: "claa1111111111111111111111",
           environmentType: EnvironmentType.development,
-          workspaceId: "proj_x",
+          projectId: "proj_x",
-          workspaceName: "X",
+          projectName: "X",
           permission: ApiKeyPermission.read,
         },
       ],

apps/web/app/lib/api/api-backwards-compat.ts

@@ -1,65 +0,0 @@
-/**
- * Backwards compatibility layer for the project → workspace rename across APIs.
- *
- * Provides utilities to normalise legacy `project*` field names to their `workspace*`
- * equivalents in request bodies and enrich responses with legacy fields so existing
- * integrations keep working.
- */
-
-// ---------------------------------------------------------------------------
-// Input transformation: accept `projectOverwrites` as an alias for `workspaceOverwrites`
-// ---------------------------------------------------------------------------
-
-/**
- * Normalise a survey request body so that `projectOverwrites` is mapped to `workspaceOverwrites`.
- * If both are provided, `workspaceOverwrites` takes precedence.
- */
-export const normaliseProjectOverwritesToWorkspace = <T extends Record<string, unknown>>(input: T): T => {
-  if ("projectOverwrites" in input && !("workspaceOverwrites" in input)) {
-    const { projectOverwrites, ...rest } = input;
-    return { ...rest, workspaceOverwrites: projectOverwrites } as unknown as T;
-  }
-
-  // Drop stale projectOverwrites if workspaceOverwrites is already present
-  if ("projectOverwrites" in input && "workspaceOverwrites" in input) {
-    const { projectOverwrites: _, ...rest } = input;
-    return rest as unknown as T;
-  }
-
-  return input;
-};
-
-// ---------------------------------------------------------------------------
-// Output transformation: include legacy `projectOverwrites` alongside `workspaceOverwrites`
-// ---------------------------------------------------------------------------
-
-/**
- * Add `projectOverwrites` to a survey response object, mirroring `workspaceOverwrites`.
- */
-export const addLegacyProjectOverwrites = <T extends Record<string, unknown>>(survey: T): T => {
-  if ("workspaceOverwrites" in survey) {
-    return { ...survey, projectOverwrites: survey.workspaceOverwrites };
-  }
-  return survey;
-};
-
-/**
- * Add `projectOverwrites` to each survey in a list response.
- */
-export const addLegacyProjectOverwritesToList = <T extends Record<string, unknown>>(surveys: T[]): T[] =>
-  surveys.map(addLegacyProjectOverwrites);
-
-// ---------------------------------------------------------------------------
-// Environment state output: include legacy `project` key alongside `workspace`
-// ---------------------------------------------------------------------------
-
-/**
- * Enrich an environment state data object to include legacy `project` key
- * alongside `workspace` so old SDK consumers still see the field they expect.
- */
-export const addLegacyProjectToEnvironmentState = <T extends Record<string, unknown>>(data: T): T => {
-  if ("workspace" in data && !("project" in data)) {
-    return { ...data, project: data.workspace };
-  }
-  return data;
-};

apps/web/app/lib/surveys/surveys.test.ts

@@ -1,10 +1,10 @@
 import "@testing-library/jest-dom/vitest";
 import { cleanup } from "@testing-library/react";
 import { afterEach, describe, expect, test } from "vitest";
+import { TLanguage } from "@formbricks/types/project";
 import { type TSurveyElement, TSurveyElementTypeEnum } from "@formbricks/types/surveys/elements";
 import { TSurvey, TSurveyLanguage } from "@formbricks/types/surveys/types";
 import { TTag } from "@formbricks/types/tags";
-import { TLanguage } from "@formbricks/types/workspace";
 import {
   DateRange,
   SelectedFilterValue,

apps/web/app/lib/templates.ts

@@ -1647,7 +1647,7 @@ const identifyCustomerGoals = (t: TFunction): TTemplate => {
           elements: [
             buildMultipleChoiceElement({
               type: TSurveyElementTypeEnum.MultipleChoiceSingle,
-              headline: "What's your primary goal for using $[workspaceName]?",
+              headline: "What's your primary goal for using $[projectName]?",
               required: true,
               shuffleOption: "none",
               choices: [
@@ -4815,7 +4815,7 @@ export const customSurveyTemplate = (t: TFunction): TTemplate => {
   };
 };
 
-export const previewSurvey = (workspaceName: string, t: TFunction): TSurvey => {
+export const previewSurvey = (projectName: string, t: TFunction): TSurvey => {
   return {
     id: "cltxxaa6x0000g8hacxdxejeu",
     createdAt: new Date(),
@@ -4823,7 +4823,6 @@ export const previewSurvey = (workspaceName: string, t: TFunction): TSurvey => {
     name: t("templates.preview_survey_name"),
     type: "link" as const,
     environmentId: "cltwumfcz0009echxg02fh7oa",
-    workspaceId: null,
     createdBy: "cltwumfbz0000echxysz6ptvq",
     status: "inProgress" as const,
     welcomeCard: {
@@ -4879,7 +4878,7 @@ export const previewSurvey = (workspaceName: string, t: TFunction): TSurvey => {
               id: "lbdxozwikh838yc6a8vbwuju",
               range: 5,
               scale: "star",
-              headline: t("templates.preview_survey_question_1_headline", { workspaceName }),
+              headline: t("templates.preview_survey_question_1_headline", { projectName }),
               required: true,
               subheader: t("templates.preview_survey_question_1_subheader"),
               lowerLabel: t("templates.preview_survey_question_1_lower_label"),
@@ -4915,7 +4914,7 @@ export const previewSurvey = (workspaceName: string, t: TFunction): TSurvey => {
     autoComplete: 50,
     isVerifyEmailEnabled: false,
     isSingleResponsePerEmailEnabled: false,
-    workspaceOverwrites: null,
+    projectOverwrites: null,
     surveyClosedMessage: null,
     singleUse: {
       enabled: false,