chore: merge with epic/v5

feat: integrate hub feedback records into unify workspace (#7828 )
2026-05-06 19:35:53 -05:00 · 2026-04-29 13:14:37 +05:30 · 2026-04-29 13:04:28 +05:30 · 2026-04-29 11:23:12 +05:30 · 2026-04-29 10:30:41 +05:30 · 2026-04-28 16:12:03 +05:30
549 changed files with 29722 additions and 11814 deletions
@@ -32,6 +32,24 @@ CRON_SECRET=
 # Set the minimum log level(debug, info, warn, error, fatal)
 LOG_LEVEL=info

+# BullMQ workers require REDIS_URL (for example `redis://localhost:6379`) to be set.
+# BullMQ worker startup is enabled by default outside tests. Set to 0 to disable.
+# BULLMQ_WORKER_ENABLED=1
+# Set to 1 on web/API pods that only enqueue jobs while a separate BullMQ worker deployment consumes them.
+# BULLMQ_EXTERNAL_WORKER_ENABLED=0
+
+# Number of BullMQ worker instances started per Formbricks server process.
+# BULLMQ_WORKER_COUNT=1
+
+# Number of concurrent jobs each BullMQ worker can process.
+# BULLMQ_WORKER_CONCURRENCY=1
+
+# Survey publish/close scheduling is configured with public build-time env vars because the editor UI
+# also needs to render the selected execution time and timezone.
+# NEXT_PUBLIC_SURVEY_SCHEDULING_TIME_ZONE=Europe/Berlin
+# NEXT_PUBLIC_SURVEY_SCHEDULING_LOCAL_HOUR=0
+# NEXT_PUBLIC_SURVEY_SCHEDULING_LOCAL_MINUTE=0
+
 ##############
 #  DATABASE  #
 ##############
@@ -149,16 +167,16 @@ AZUREAD_TENANT_ID=

 # Configure Formbricks AI at the instance level
 # Set the provider used for AI features on this instance.
-# Accepted values for AI_PROVIDER: aws, gcp, azure
+# Accepted values for AI_PROVIDER: aws, google, azure
 # Set AI_MODEL to the provider-specific model or deployment name and configure the matching credentials below.
-# AI_PROVIDER=gcp
+# AI_PROVIDER=google
 # AI_MODEL=gemini-2.5-flash

-# Google Vertex AI credentials
-# AI_GCP_PROJECT=
-# AI_GCP_LOCATION=
-# AI_GCP_CREDENTIALS_JSON=
-# AI_GCP_APPLICATION_CREDENTIALS=
+# Google Cloud credentials for Gemini models
+# AI_GOOGLE_CLOUD_PROJECT=
+# AI_GOOGLE_CLOUD_LOCATION=
+# AI_GOOGLE_CLOUD_CREDENTIALS_JSON=
+# AI_GOOGLE_CLOUD_APPLICATION_CREDENTIALS=

 # Amazon Bedrock credentials
 # AI_AWS_REGION=
@@ -287,14 +305,15 @@ REDIS_URL=redis://localhost:6379
 # API token sent with each Cube.js request; must match CUBEJS_API_SECRET when CUBEJS_DEV_MODE is off
 # CUBEJS_API_TOKEN=
 #
-# Cube connects to the Hub DB. With docker-compose.dev.yml defaults, use the local postgres service.
-# CUBEJS_DB_HOST=postgres
+# Cube connects to the Hub DB. When using docker-compose.dev.yml with the hub network,
+# use the container name and internal port. Hub credentials: formbricks/formbricks_dev, db: hub
+# CUBEJS_DB_HOST=formbricks_hub_postgres
 # CUBEJS_DB_PORT=5432
-# CUBEJS_DB_NAME=postgres
-# CUBEJS_DB_USER=postgres
-# CUBEJS_DB_PASS=postgres
+# CUBEJS_DB_NAME=hub
+# CUBEJS_DB_USER=formbricks
+# CUBEJS_DB_PASS=formbricks_dev
 #
-# Alternative (external Hub/Postgres on the hub network): formbricks_hub_postgres, db: hub, user/pass: formbricks/formbricks_dev
+# Alternative (when not on same Docker network): host.docker.internal and port 5433

 # Lingo.dev API key for translation generation
 LINGO_API_KEY=your_api_key_here
@@ -23,7 +23,7 @@
    "eslint-plugin-react-refresh": "0.4.26",
    "eslint-plugin-storybook": "10.2.17",
    "storybook": "10.2.17",
-    "vite": "7.3.1",
+    "vite": "7.3.2",
    "@storybook/addon-docs": "10.2.17"
  }
 }
@@ -60,8 +60,8 @@ const mockTemplate: TXMTemplate = {
  ],
  styling: {
    brandColor: { light: "#0000FF" },
-    questionColor: { light: "#00FF00" },
-    inputColor: { light: "#FF0000" },
+    elementHeadlineColor: { light: "#00FF00" },
+    inputBgColor: { light: "#FF0000" },
  },
 };

@@ -1 +1 @@
-export { WorkspaceSourcesPage as default } from "@/modules/workspaces/settings/sources/page";
+export { WorkspaceFeedbackSourcesPage as default } from "@/modules/workspaces/settings/sources/page";
@@ -337,6 +337,15 @@ export const MainNavigation = ({
      href: `/workspaces/${workspace.id}/settings/enterprise`,
      hidden: isFormbricksCloud || isMember,
    },
+    {
+      id: "feedback-record-directories",
+      label: t("workspace.settings.feedback_record_directories.title"),
+      href: `/workspaces/${workspace.id}/settings/feedback-record-directories`,
+      disabled: isMembershipPending || isMember,
+      disabledMessage: isMembershipPending
+        ? t("common.loading")
+        : t("common.you_are_not_authorized_to_perform_this_action"),
+    },
  ];

  const loadWorkspaces = useCallback(async () => {
@@ -453,16 +462,22 @@ export const MainNavigation = ({
    : `/workspaces/${workspace.id}/surveys/`;

  const handleWorkspaceChange = (workspaceId: string) => {
-    if (workspaceId === workspace.id) return;
+    const targetPath =
+      workspaceId === workspace.id ? `/workspaces/${workspace.id}/surveys` : `/workspaces/${workspaceId}/`;
    startTransition(() => {
-      router.push(`/workspaces/${workspaceId}/`);
+      setIsWorkspaceDropdownOpen(false);
+      router.push(targetPath);
    });
  };

  const handleOrganizationChange = (organizationId: string) => {
-    if (organizationId === organization.id) return;
+    const targetPath =
+      organizationId === organization.id
+        ? `/workspaces/${workspace.id}/settings/general`
+        : `/organizations/${organizationId}/`;
    startTransition(() => {
-      router.push(`/organizations/${organizationId}/`);
+      setIsOrganizationDropdownOpen(false);
+      router.push(targetPath);
    });
  };

@@ -519,7 +534,7 @@ export const MainNavigation = ({
  );

  const switcherIconClasses =
-    "flex h-9 w-9 items-center justify-center rounded-full bg-slate-100 text-slate-600";
+    "flex h-9 w-9 shrink-0 items-center justify-center rounded-full bg-slate-100 text-slate-600";
  const isInitialWorkspacesLoading =
    isWorkspaceDropdownOpen && !hasInitializedWorkspaces && !workspaceLoadError;

@@ -117,8 +117,12 @@ export const OrganizationBreadcrumb = ({
  const workspaceBasePath = `/workspaces/${workspace?.id}`;

  const handleOrganizationChange = (organizationId: string) => {
-    if (organizationId === currentOrganizationId) return;
    startTransition(() => {
+      setIsOrganizationDropdownOpen(false);
+      if (organizationId === currentOrganizationId && currentWorkspaceId) {
+        router.push(`/workspaces/${currentWorkspaceId}/settings/general`);
+        return;
+      }
      router.push(`/organizations/${organizationId}/`);
    });
  };
@@ -144,12 +148,6 @@ export const OrganizationBreadcrumb = ({
      label: t("common.members_and_teams"),
      href: `${workspaceBasePath}/settings/teams`,
    },
-    {
-      id: "feedback-record-directories",
-      label: t("workspace.settings.feedback_record_directories.nav_label"),
-      href: `${workspaceBasePath}/settings/feedback-record-directories`,
-      hidden: isMember,
-    },
    {
      id: "api-keys",
      label: t("common.api_keys"),
@@ -181,6 +179,15 @@ export const OrganizationBreadcrumb = ({
        ? t("common.loading")
        : t("common.you_are_not_authorized_to_perform_this_action"),
    },
+    {
+      id: "feedback-record-directories",
+      label: t("workspace.settings.feedback_record_directories.title"),
+      href: `${workspaceBasePath}/settings/feedback-record-directories`,
+      disabled: isMembershipPending || isMember,
+      disabledMessage: isMembershipPending
+        ? t("common.loading")
+        : t("common.you_are_not_authorized_to_perform_this_action"),
+    },
  ];

  return (
@@ -163,9 +163,13 @@ export const WorkspaceBreadcrumb = ({
  }

  const handleWorkspaceChange = (workspaceId: string) => {
-    if (workspaceId === currentWorkspaceId) return;
+    const targetPath =
+      workspaceId === currentWorkspaceId
+        ? `/workspaces/${currentWorkspaceId}/surveys`
+        : `/workspaces/${workspaceId}/`;
    startTransition(() => {
-      router.push(`/workspaces/${workspaceId}/`);
+      setIsWorkspaceDropdownOpen(false);
+      router.push(targetPath);
    });
  };

@@ -8,7 +8,7 @@ import type { TEnterpriseLicenseFeatures } from "@/modules/ee/license-check/type
 import { Badge } from "@/modules/ui/components/badge";
 import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/modules/ui/components/table";

-type TPublicLicenseFeatureKey = Exclude<keyof TEnterpriseLicenseFeatures, "isMultiOrgEnabled" | "ai">;
+type TPublicLicenseFeatureKey = Exclude<keyof TEnterpriseLicenseFeatures, "isMultiOrgEnabled">;

 type TFeatureDefinition = {
  key: TPublicLicenseFeatureKey;
@@ -61,6 +61,16 @@ const getFeatureDefinitions = (t: TFunction): TFeatureDefinition[] => {
      labelKey: t("workspace.settings.enterprise.license_feature_spam_protection"),
      docsUrl: "https://formbricks.com/docs/xm-and-surveys/surveys/general-features/spam-protection",
    },
+    {
+      key: "aiSmartTools",
+      labelKey: t("workspace.settings.general.ai_smart_tools_enabled"),
+      docsUrl: "https://formbricks.com/docs/self-hosting/configuration/ai",
+    },
+    {
+      key: "aiDataAnalysis",
+      labelKey: t("workspace.settings.general.ai_data_analysis_enabled"),
+      docsUrl: "https://formbricks.com/docs/self-hosting/configuration/ai",
+    },
    {
      key: "auditLogs",
      labelKey: t("workspace.settings.enterprise.license_feature_audit_logs"),
@@ -6,24 +6,32 @@ import toast from "react-hot-toast";
 import { useTranslation } from "react-i18next";
 import { TOrganizationRole } from "@formbricks/types/memberships";
 import { TOrganization } from "@formbricks/types/organizations";
+import { useWorkspace } from "@/app/(app)/workspaces/[workspaceId]/context/workspace-context";
 import { updateOrganizationAISettingsAction } from "@/app/(app)/workspaces/[workspaceId]/settings/(organization)/general/actions";
 import { getDisplayedOrganizationAISettingValue, getOrganizationAIEnablementState } from "@/lib/ai/utils";
 import { getAccessFlags } from "@/lib/membership/utils";
 import { getFormattedErrorMessage } from "@/lib/utils/helper";
 import { AdvancedOptionToggle } from "@/modules/ui/components/advanced-option-toggle";
 import { Alert, AlertDescription } from "@/modules/ui/components/alert";
+import { type ModalButton, UpgradePrompt } from "@/modules/ui/components/upgrade-prompt";

 interface AISettingsToggleProps {
  organization: TOrganization;
  membershipRole?: TOrganizationRole;
  isInstanceAIConfigured: boolean;
+  hasAIPermission: boolean;
+  isFormbricksCloud: boolean;
 }

 export const AISettingsToggle = ({
  organization,
  membershipRole,
  isInstanceAIConfigured,
+  hasAIPermission,
+  isFormbricksCloud,
 }: Readonly<AISettingsToggleProps>) => {
+  const { workspace } = useWorkspace();
+  const workspaceBasePath = `/workspaces/${workspace?.id}`;
  const [loadingField, setLoadingField] = useState<string | null>(null);
  const { t } = useTranslation();
  const router = useRouter();
@@ -78,6 +86,32 @@ export const AISettingsToggle = ({
    }
  };

+  const upgradeButtons: [ModalButton, ModalButton] = [
+    {
+      text: isFormbricksCloud ? t("common.upgrade_plan") : t("common.request_trial_license"),
+      href: isFormbricksCloud
+        ? `${workspaceBasePath}/settings/billing`
+        : "https://formbricks.com/upgrade-self-hosting-license",
+    },
+    {
+      text: t("common.learn_more"),
+      href: isFormbricksCloud
+        ? `${workspaceBasePath}/settings/billing`
+        : "https://formbricks.com/learn-more-self-hosting-license",
+    },
+  ];
+
+  if (!hasAIPermission) {
+    return (
+      <UpgradePrompt
+        title={t("workspace.settings.general.unlock_ai_features_with_a_higher_plan")}
+        description={t("workspace.settings.general.unlock_ai_features_description")}
+        buttons={upgradeButtons}
+        feature="ai_features"
+      />
+    );
+  }
+
  return (
    <div className="space-y-4">
      {showInstanceConfigWarning && (
@@ -3,7 +3,12 @@ import { isInstanceAIConfigured } from "@/lib/ai/service";
 import { FB_LOGO_URL, IS_FORMBRICKS_CLOUD, IS_STORAGE_CONFIGURED } from "@/lib/constants";
 import { getUser } from "@/lib/user/service";
 import { getTranslate } from "@/lingodotdev/server";
-import { getIsMultiOrgEnabled, getWhiteLabelPermission } from "@/modules/ee/license-check/lib/utils";
+import {
+  getIsAIDataAnalysisEnabled,
+  getIsAISmartToolsEnabled,
+  getIsMultiOrgEnabled,
+  getWhiteLabelPermission,
+} from "@/modules/ee/license-check/lib/utils";
 import { EmailCustomizationSettings } from "@/modules/ee/whitelabel/email-customization/components/email-customization-settings";
 import { Alert, AlertDescription } from "@/modules/ui/components/alert";
 import { IdBadge } from "@/modules/ui/components/id-badge";
@@ -27,8 +32,14 @@ const Page = async (props: { params: Promise<{ workspaceId: string }> }) => {

  const user = session?.user?.id ? await getUser(session.user.id) : null;

-  const isMultiOrgEnabled = await getIsMultiOrgEnabled();
-  const hasWhiteLabelPermission = await getWhiteLabelPermission(organization.id);
+  const [isMultiOrgEnabled, hasWhiteLabelPermission, hasAISmartToolsPermission, hasAIDataAnalysisPermission] =
+    await Promise.all([
+      getIsMultiOrgEnabled(),
+      getWhiteLabelPermission(organization.id),
+      getIsAISmartToolsEnabled(organization.id),
+      getIsAIDataAnalysisEnabled(organization.id),
+    ]);
+  const hasAIPermission = hasAISmartToolsPermission || hasAIDataAnalysisPermission;

  const isDeleteDisabled = !isOwner || !isMultiOrgEnabled;
  const currentUserRole = currentUserMembership?.role;
@@ -64,6 +75,8 @@ const Page = async (props: { params: Promise<{ workspaceId: string }> }) => {
          organization={organization}
          membershipRole={currentUserMembership?.role}
          isInstanceAIConfigured={isInstanceAIConfigured()}
+          hasAIPermission={hasAIPermission}
+          isFormbricksCloud={IS_FORMBRICKS_CLOUD}
        />
      </SettingsCard>
      <EmailCustomizationSettings
@@ -0,0 +1,51 @@
+"use client";
+
+import { CircleSlash2, SmileIcon, StarIcon } from "lucide-react";
+import { useMemo } from "react";
+import { useTranslation } from "react-i18next";
+import { type TI18nString } from "@formbricks/types/i18n";
+import { TSurveyElementTypeEnum } from "@formbricks/types/surveys/elements";
+import { TSurvey, TSurveyElementSummaryCes } from "@formbricks/types/surveys/types";
+import { RatingLikeSummary } from "./RatingLikeSummary";
+
+interface CESSummaryProps {
+  elementSummary: TSurveyElementSummaryCes;
+  survey: TSurvey;
+  setFilter: (
+    elementId: string,
+    label: TI18nString,
+    elementType: TSurveyElementTypeEnum,
+    filterValue: string,
+    filterComboBoxValue?: string | string[]
+  ) => void;
+}
+
+export const CESSummary = ({ elementSummary, survey, setFilter }: CESSummaryProps) => {
+  const { t } = useTranslation();
+
+  const getIconBasedOnScale = useMemo(() => {
+    const scale = elementSummary.element.scale;
+    if (scale === "number") return <CircleSlash2 className="h-4 w-4" />;
+    else if (scale === "star") return <StarIcon fill="rgb(250 204 21)" className="h-4 w-4 text-yellow-400" />;
+    else if (scale === "smiley") return <SmileIcon className="h-4 w-4" />;
+  }, [elementSummary.element.scale]);
+
+  return (
+    <RatingLikeSummary
+      elementSummary={elementSummary}
+      survey={survey}
+      setFilter={setFilter}
+      additionalInfo={
+        <div className="flex items-center space-x-2">
+          <div className="flex items-center space-x-2 rounded-lg bg-slate-100 p-2">
+            {getIconBasedOnScale}
+            <div>
+              {t("workspace.surveys.summary.effort_score")}: {elementSummary.average.toFixed(2)} /{" "}
+              {elementSummary.element.range}
+            </div>
+          </div>
+        </div>
+      }
+    />
+  );
+};
@@ -0,0 +1,72 @@
+"use client";
+
+import { CircleSlash2, SmileIcon, StarIcon } from "lucide-react";
+import { useMemo } from "react";
+import { useTranslation } from "react-i18next";
+import { type TI18nString } from "@formbricks/types/i18n";
+import { TSurveyElementTypeEnum } from "@formbricks/types/surveys/elements";
+import { TSurvey, TSurveyElementSummaryCsat } from "@formbricks/types/surveys/types";
+import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/modules/ui/components/tooltip";
+import { RatingLikeSummary } from "./RatingLikeSummary";
+import { SatisfactionIndicator } from "./SatisfactionIndicator";
+
+interface CSATSummaryProps {
+  elementSummary: TSurveyElementSummaryCsat;
+  survey: TSurvey;
+  setFilter: (
+    elementId: string,
+    label: TI18nString,
+    elementType: TSurveyElementTypeEnum,
+    filterValue: string,
+    filterComboBoxValue?: string | string[]
+  ) => void;
+}
+
+export const CSATSummary = ({ elementSummary, survey, setFilter }: CSATSummaryProps) => {
+  const { t } = useTranslation();
+
+  const getIconBasedOnScale = useMemo(() => {
+    const scale = elementSummary.element.scale;
+    if (scale === "number") return <CircleSlash2 className="h-4 w-4" />;
+    else if (scale === "star") return <StarIcon fill="rgb(250 204 21)" className="h-4 w-4 text-yellow-400" />;
+    else if (scale === "smiley") return <SmileIcon className="h-4 w-4" />;
+  }, [elementSummary.element.scale]);
+
+  return (
+    <RatingLikeSummary
+      elementSummary={elementSummary}
+      survey={survey}
+      setFilter={setFilter}
+      additionalInfo={
+        <div className="flex items-center space-x-2">
+          <div className="flex items-center space-x-2 rounded-lg bg-slate-100 p-2">
+            {getIconBasedOnScale}
+            <div>
+              {t("workspace.surveys.summary.overall")}: {elementSummary.average.toFixed(2)}
+            </div>
+          </div>
+
+          <TooltipProvider delayDuration={150}>
+            <Tooltip>
+              <TooltipTrigger asChild>
+                <div className="flex items-center space-x-2 rounded-lg bg-slate-100 p-2">
+                  <SatisfactionIndicator percentage={elementSummary.csat.satisfiedPercentage} />
+                  <div>
+                    {t("workspace.surveys.summary.csat_satisfied", {
+                      percentage: elementSummary.csat.satisfiedPercentage,
+                    })}
+                  </div>
+                </div>
+              </TooltipTrigger>
+              <TooltipContent side="bottom">
+                {t("workspace.surveys.summary.csat_satisfied_tooltip", {
+                  percentage: elementSummary.csat.satisfiedPercentage,
+                })}
+              </TooltipContent>
+            </Tooltip>
+          </TooltipProvider>
+        </div>
+      }
+    />
+  );
+};
@@ -8,7 +8,7 @@ import { TSurveyElementTypeEnum } from "@formbricks/types/surveys/elements";
 import { TSurvey, TSurveyElementSummaryNps } from "@formbricks/types/surveys/types";
 import { HalfCircle, ProgressBar } from "@/modules/ui/components/progress-bar";
 import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/modules/ui/components/tabs";
-import { TooltipProvider } from "@/modules/ui/components/tooltip";
+import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/modules/ui/components/tooltip";
 import { convertFloatToNDecimal } from "../lib/utils";
 import { ClickableBarSegment } from "./ClickableBarSegment";
 import { ElementSummaryHeader } from "./ElementSummaryHeader";
@@ -39,6 +39,7 @@ const calculateNPSOpacity = (rating: number): number => {
 export const NPSSummary = ({ elementSummary, survey, setFilter }: NPSSummaryProps) => {
  const { t } = useTranslation();
  const [activeTab, setActiveTab] = useState<"aggregated" | "individual">("aggregated");
+  const promotersPercentage = convertFloatToNDecimal(elementSummary.promoters.percentage, 2);

  const applyFilter = (group: string) => {
    const filters = {
@@ -81,13 +82,23 @@ export const NPSSummary = ({ elementSummary, survey, setFilter }: NPSSummaryProp
        elementSummary={elementSummary}
        survey={survey}
        additionalInfo={
-          <div className="flex items-center space-x-2 rounded-lg bg-slate-100 p-2">
-            <SatisfactionIndicator percentage={elementSummary.promoters.percentage} />
-            <div>
-              {t("workspace.surveys.summary.promoters")}:{" "}
-              {convertFloatToNDecimal(elementSummary.promoters.percentage, 2)}%
-            </div>
-          </div>
+          <TooltipProvider delayDuration={150}>
+            <Tooltip>
+              <TooltipTrigger asChild>
+                <div className="flex items-center space-x-2 rounded-lg bg-slate-100 p-2">
+                  <SatisfactionIndicator percentage={elementSummary.promoters.percentage} />
+                  <div>
+                    {t("workspace.surveys.summary.promoters")}: {promotersPercentage}%
+                  </div>
+                </div>
+              </TooltipTrigger>
+              <TooltipContent side="bottom">
+                {t("workspace.surveys.summary.nps_promoters_tooltip", {
+                  percentage: promotersPercentage,
+                })}
+              </TooltipContent>
+            </Tooltip>
+          </TooltipProvider>
        }
      />

@@ -0,0 +1,214 @@
+"use client";
+
+import { BarChart, BarChartHorizontal } from "lucide-react";
+import { type JSX, useState } from "react";
+import { useTranslation } from "react-i18next";
+import { type TI18nString } from "@formbricks/types/i18n";
+import { TSurveyElementTypeEnum } from "@formbricks/types/surveys/elements";
+import {
+  TSurvey,
+  TSurveyElementSummaryCes,
+  TSurveyElementSummaryCsat,
+  TSurveyElementSummaryRating,
+} from "@formbricks/types/surveys/types";
+import { convertFloatToNDecimal } from "@/app/(app)/workspaces/[workspaceId]/surveys/[surveyId]/(analysis)/summary/lib/utils";
+import { EmptyState } from "@/modules/ui/components/empty-state";
+import { ProgressBar } from "@/modules/ui/components/progress-bar";
+import { RatingResponse } from "@/modules/ui/components/rating-response";
+import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/modules/ui/components/tabs";
+import { TooltipProvider } from "@/modules/ui/components/tooltip";
+import { ClickableBarSegment } from "./ClickableBarSegment";
+import { ElementSummaryHeader } from "./ElementSummaryHeader";
+import { RatingScaleLegend } from "./RatingScaleLegend";
+
+type RatingLikeElementSummary =
+  | TSurveyElementSummaryCes
+  | TSurveyElementSummaryCsat
+  | TSurveyElementSummaryRating;
+
+interface RatingLikeSummaryProps {
+  elementSummary: RatingLikeElementSummary;
+  survey: TSurvey;
+  setFilter: (
+    elementId: string,
+    label: TI18nString,
+    elementType: TSurveyElementTypeEnum,
+    filterValue: string,
+    filterComboBoxValue?: string | string[]
+  ) => void;
+  additionalInfo: JSX.Element;
+}
+
+export const RatingLikeSummary = ({
+  elementSummary,
+  survey,
+  setFilter,
+  additionalInfo,
+}: RatingLikeSummaryProps) => {
+  const { t } = useTranslation();
+  const [activeTab, setActiveTab] = useState<"aggregated" | "individual">("aggregated");
+
+  return (
+    <div className="rounded-xl border border-slate-200 bg-white shadow-sm">
+      <ElementSummaryHeader elementSummary={elementSummary} survey={survey} additionalInfo={additionalInfo} />
+
+      <Tabs value={activeTab} onValueChange={(value) => setActiveTab(value as "aggregated" | "individual")}>
+        <div className="flex justify-end px-4 md:px-6">
+          <TabsList>
+            <TabsTrigger value="aggregated" icon={<BarChartHorizontal className="h-4 w-4" />}>
+              {t("workspace.surveys.summary.aggregated")}
+            </TabsTrigger>
+            <TabsTrigger value="individual" icon={<BarChart className="h-4 w-4" />}>
+              {t("workspace.surveys.summary.individual")}
+            </TabsTrigger>
+          </TabsList>
+        </div>
+
+        <TabsContent value="aggregated" className="mt-4">
+          <div className="px-4 pb-6 pt-4 md:px-6">
+            {elementSummary.responseCount === 0 ? (
+              <>
+                <EmptyState text={t("workspace.surveys.summary.no_responses_found")} variant="simple" />
+                <RatingScaleLegend
+                  scale={elementSummary.element.scale}
+                  range={elementSummary.element.range}
+                />
+              </>
+            ) : (
+              <>
+                <TooltipProvider delayDuration={200}>
+                  <div className="flex h-12 w-full overflow-hidden rounded-t-lg border border-slate-200">
+                    {elementSummary.choices.map((result, index) => {
+                      if (result.percentage === 0) return null;
+
+                      const range = elementSummary.element.range;
+                      const opacity = 0.3 + (result.rating / range) * 0.7;
+                      const isFirst = index === 0;
+                      const isLast = index === elementSummary.choices.length - 1;
+
+                      return (
+                        <ClickableBarSegment
+                          key={result.rating}
+                          className="relative h-full cursor-pointer transition-opacity hover:brightness-110"
+                          style={{
+                            width: `${result.percentage}%`,
+                            borderRight: isLast ? "none" : "1px solid rgb(226, 232, 240)",
+                          }}
+                          onClick={() =>
+                            setFilter(
+                              elementSummary.element.id,
+                              elementSummary.element.headline,
+                              elementSummary.element.type,
+                              t("workspace.surveys.summary.is_equal_to"),
+                              result.rating.toString()
+                            )
+                          }>
+                          <div
+                            className={`h-full bg-brand-dark ${isFirst ? "rounded-tl-lg" : ""} ${isLast ? "rounded-tr-lg" : ""}`}
+                            style={{ opacity }}
+                          />
+                        </ClickableBarSegment>
+                      );
+                    })}
+                  </div>
+                </TooltipProvider>
+                <div className="flex w-full overflow-hidden rounded-b-lg border border-t-0 border-slate-200 bg-slate-50">
+                  {elementSummary.choices.map((result, index) => {
+                    if (result.percentage === 0) return null;
+
+                    return (
+                      <div
+                        key={result.rating}
+                        className="flex flex-col items-center justify-center py-2"
+                        style={{
+                          width: `${result.percentage}%`,
+                          borderRight:
+                            index < elementSummary.choices.length - 1
+                              ? "1px solid rgb(226, 232, 240)"
+                              : "none",
+                        }}>
+                        <div className="mb-1 flex items-center justify-center">
+                          <RatingResponse
+                            scale={elementSummary.element.scale}
+                            answer={result.rating}
+                            range={elementSummary.element.range}
+                            addColors={false}
+                            variant="aggregated"
+                          />
+                        </div>
+                        <div className="text-xs font-medium text-slate-600">
+                          {convertFloatToNDecimal(result.percentage, 1)}%
+                        </div>
+                      </div>
+                    );
+                  })}
+                </div>
+                <RatingScaleLegend
+                  scale={elementSummary.element.scale}
+                  range={elementSummary.element.range}
+                />
+              </>
+            )}
+          </div>
+        </TabsContent>
+
+        <TabsContent value="individual" className="mt-4">
+          <div className="px-4 pb-6 pt-4 md:px-6">
+            <div className="space-y-5 text-sm md:text-base">
+              {elementSummary.choices.map((result) => (
+                <div key={result.rating}>
+                  <button
+                    className="w-full cursor-pointer hover:opacity-80"
+                    onClick={() =>
+                      setFilter(
+                        elementSummary.element.id,
+                        elementSummary.element.headline,
+                        elementSummary.element.type,
+                        t("workspace.surveys.summary.is_equal_to"),
+                        result.rating.toString()
+                      )
+                    }>
+                    <div className="text flex justify-between px-2 pb-2">
+                      <div className="mr-8 flex items-center space-x-1">
+                        <div className="font-semibold text-slate-700">
+                          <RatingResponse
+                            scale={elementSummary.element.scale}
+                            answer={result.rating}
+                            range={elementSummary.element.range}
+                            addColors={elementSummary.element.isColorCodingEnabled}
+                            variant="individual"
+                          />
+                        </div>
+                        <div>
+                          <p className="rounded-lg bg-slate-100 px-2 text-slate-700">
+                            {convertFloatToNDecimal(result.percentage, 2)}%
+                          </p>
+                        </div>
+                      </div>
+                      <p className="flex w-32 items-end justify-end text-slate-600">
+                        {t("common.count_responses", { count: result.count })}
+                      </p>
+                    </div>
+                    <ProgressBar barColor="bg-brand-dark" progress={result.percentage / 100} />
+                  </button>
+                </div>
+              ))}
+            </div>
+          </div>
+        </TabsContent>
+      </Tabs>
+      {elementSummary.dismissed && elementSummary.dismissed.count > 0 && (
+        <div className="rounded-b-lg border-t bg-white px-6 py-4">
+          <div key="dismissed">
+            <div className="text flex justify-between px-2">
+              <p className="font-semibold text-slate-700">{t("common.dismissed")}</p>
+              <p className="flex w-32 items-end justify-end text-slate-600">
+                {t("common.count_responses", { count: elementSummary.dismissed.count })}
+              </p>
+            </div>
+          </div>
+        </div>
+      )}
+    </div>
+  );
+};
@@ -1,21 +1,12 @@
 "use client";

-import { BarChart, BarChartHorizontal, CircleSlash2, SmileIcon, StarIcon } from "lucide-react";
-import { useMemo, useState } from "react";
+import { CircleSlash2, SmileIcon, StarIcon } from "lucide-react";
+import { useMemo } from "react";
 import { useTranslation } from "react-i18next";
 import { type TI18nString } from "@formbricks/types/i18n";
 import { TSurveyElementTypeEnum } from "@formbricks/types/surveys/elements";
 import { TSurvey, TSurveyElementSummaryRating } from "@formbricks/types/surveys/types";
-import { convertFloatToNDecimal } from "@/app/(app)/workspaces/[workspaceId]/surveys/[surveyId]/(analysis)/summary/lib/utils";
-import { EmptyState } from "@/modules/ui/components/empty-state";
-import { ProgressBar } from "@/modules/ui/components/progress-bar";
-import { RatingResponse } from "@/modules/ui/components/rating-response";
-import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/modules/ui/components/tabs";
-import { TooltipProvider } from "@/modules/ui/components/tooltip";
-import { ClickableBarSegment } from "./ClickableBarSegment";
-import { ElementSummaryHeader } from "./ElementSummaryHeader";
-import { RatingScaleLegend } from "./RatingScaleLegend";
-import { SatisfactionIndicator } from "./SatisfactionIndicator";
+import { RatingLikeSummary } from "./RatingLikeSummary";

 interface RatingSummaryProps {
  elementSummary: TSurveyElementSummaryRating;
@@ -31,196 +22,29 @@ interface RatingSummaryProps {

 export const RatingSummary = ({ elementSummary, survey, setFilter }: RatingSummaryProps) => {
  const { t } = useTranslation();
-  const [activeTab, setActiveTab] = useState<"aggregated" | "individual">("aggregated");

  const getIconBasedOnScale = useMemo(() => {
    const scale = elementSummary.element.scale;
    if (scale === "number") return <CircleSlash2 className="h-4 w-4" />;
    else if (scale === "star") return <StarIcon fill="rgb(250 204 21)" className="h-4 w-4 text-yellow-400" />;
    else if (scale === "smiley") return <SmileIcon className="h-4 w-4" />;
-  }, [elementSummary]);
+  }, [elementSummary.element.scale]);

  return (
-    <div className="rounded-xl border border-slate-200 bg-white shadow-sm">
-      <ElementSummaryHeader
-        elementSummary={elementSummary}
-        survey={survey}
-        additionalInfo={
-          <div className="flex items-center space-x-2">
-            <div className="flex items-center space-x-2 rounded-lg bg-slate-100 p-2">
-              {getIconBasedOnScale}
-              <div>
-                {t("workspace.surveys.summary.overall")}: {elementSummary.average.toFixed(2)}
-              </div>
-            </div>
-
-            <div className="flex items-center space-x-2 rounded-lg bg-slate-100 p-2">
-              <SatisfactionIndicator percentage={elementSummary.csat.satisfiedPercentage} />
-              <div>
-                CSAT: {elementSummary.csat.satisfiedPercentage}% {t("workspace.surveys.summary.satisfied")}
-              </div>
-            </div>
-          </div>
-        }
-      />
-
-      <Tabs value={activeTab} onValueChange={(value) => setActiveTab(value as "aggregated" | "individual")}>
-        <div className="flex justify-end px-4 md:px-6">
-          <TabsList>
-            <TabsTrigger value="aggregated" icon={<BarChartHorizontal className="h-4 w-4" />}>
-              {t("workspace.surveys.summary.aggregated")}
-            </TabsTrigger>
-            <TabsTrigger value="individual" icon={<BarChart className="h-4 w-4" />}>
-              {t("workspace.surveys.summary.individual")}
-            </TabsTrigger>
-          </TabsList>
-        </div>
-
-        <TabsContent value="aggregated" className="mt-4">
-          <div className="px-4 pb-6 pt-4 md:px-6">
-            {elementSummary.responseCount === 0 ? (
-              <>
-                <EmptyState text={t("workspace.surveys.summary.no_responses_found")} variant="simple" />
-                <RatingScaleLegend
-                  scale={elementSummary.element.scale}
-                  range={elementSummary.element.range}
-                />
-              </>
-            ) : (
-              <>
-                <TooltipProvider delayDuration={200}>
-                  <div className="flex h-12 w-full overflow-hidden rounded-t-lg border border-slate-200">
-                    {elementSummary.choices.map((result, index) => {
-                      if (result.percentage === 0) return null;
-
-                      const range = elementSummary.element.range;
-                      const opacity = 0.3 + (result.rating / range) * 0.8;
-                      const isFirst = index === 0;
-                      const isLast = index === elementSummary.choices.length - 1;
-
-                      return (
-                        <ClickableBarSegment
-                          key={result.rating}
-                          className="relative h-full cursor-pointer transition-opacity hover:brightness-110"
-                          style={{
-                            width: `${result.percentage}%`,
-                            borderRight: isLast ? "none" : "1px solid rgb(226, 232, 240)",
-                          }}
-                          onClick={() =>
-                            setFilter(
-                              elementSummary.element.id,
-                              elementSummary.element.headline,
-                              elementSummary.element.type,
-                              t("workspace.surveys.summary.is_equal_to"),
-                              result.rating.toString()
-                            )
-                          }>
-                          <div
-                            className={`h-full bg-brand-dark ${isFirst ? "rounded-tl-lg" : ""} ${isLast ? "rounded-tr-lg" : ""}`}
-                            style={{ opacity }}
-                          />
-                        </ClickableBarSegment>
-                      );
-                    })}
-                  </div>
-                </TooltipProvider>
-                <div className="flex w-full overflow-hidden rounded-b-lg border border-t-0 border-slate-200 bg-slate-50">
-                  {elementSummary.choices.map((result, index) => {
-                    if (result.percentage === 0) return null;
-
-                    return (
-                      <div
-                        key={result.rating}
-                        className="flex flex-col items-center justify-center py-2"
-                        style={{
-                          width: `${result.percentage}%`,
-                          borderRight:
-                            index < elementSummary.choices.length - 1
-                              ? "1px solid rgb(226, 232, 240)"
-                              : "none",
-                        }}>
-                        <div className="mb-1 flex items-center justify-center">
-                          <RatingResponse
-                            scale={elementSummary.element.scale}
-                            answer={result.rating}
-                            range={elementSummary.element.range}
-                            addColors={false}
-                            variant="aggregated"
-                          />
-                        </div>
-                        <div className="text-xs font-medium text-slate-600">
-                          {convertFloatToNDecimal(result.percentage, 1)}%
-                        </div>
-                      </div>
-                    );
-                  })}
-                </div>
-                <RatingScaleLegend
-                  scale={elementSummary.element.scale}
-                  range={elementSummary.element.range}
-                />
-              </>
-            )}
-          </div>
-        </TabsContent>
-
-        <TabsContent value="individual" className="mt-4">
-          <div className="px-4 pb-6 pt-4 md:px-6">
-            <div className="space-y-5 text-sm md:text-base">
-              {elementSummary.choices.map((result) => (
-                <div key={result.rating}>
-                  <button
-                    className="w-full cursor-pointer hover:opacity-80"
-                    onClick={() =>
-                      setFilter(
-                        elementSummary.element.id,
-                        elementSummary.element.headline,
-                        elementSummary.element.type,
-                        t("workspace.surveys.summary.is_equal_to"),
-                        result.rating.toString()
-                      )
-                    }>
-                    <div className="text flex justify-between px-2 pb-2">
-                      <div className="mr-8 flex items-center space-x-1">
-                        <div className="font-semibold text-slate-700">
-                          <RatingResponse
-                            scale={elementSummary.element.scale}
-                            answer={result.rating}
-                            range={elementSummary.element.range}
-                            addColors={elementSummary.element.isColorCodingEnabled}
-                            variant="individual"
-                          />
-                        </div>
-                        <div>
-                          <p className="rounded-lg bg-slate-100 px-2 text-slate-700">
-                            {convertFloatToNDecimal(result.percentage, 2)}%
-                          </p>
-                        </div>
-                      </div>
-                      <p className="flex w-32 items-end justify-end text-slate-600">
-                        {t("common.count_responses", { count: result.count })}
-                      </p>
-                    </div>
-                    <ProgressBar barColor="bg-brand-dark" progress={result.percentage / 100} />
-                  </button>
-                </div>
-              ))}
-            </div>
-          </div>
-        </TabsContent>
-      </Tabs>
-      {elementSummary.dismissed && elementSummary.dismissed.count > 0 && (
-        <div className="rounded-b-lg border-t bg-white px-6 py-4">
-          <div key="dismissed">
-            <div className="text flex justify-between px-2">
-              <p className="font-semibold text-slate-700">{t("common.dismissed")}</p>
-              <p className="flex w-32 items-end justify-end text-slate-600">
-                {t("common.count_responses", { count: elementSummary.dismissed.count })}
-              </p>
+    <RatingLikeSummary
+      elementSummary={elementSummary}
+      survey={survey}
+      setFilter={setFilter}
+      additionalInfo={
+        <div className="flex items-center space-x-2">
+          <div className="flex items-center space-x-2 rounded-lg bg-slate-100 p-2">
+            {getIconBasedOnScale}
+            <div>
+              {t("workspace.surveys.summary.overall")}: {elementSummary.average.toFixed(2)}
            </div>
          </div>
        </div>
-      )}
-    </div>
+      }
+    />
  );
 };
@@ -22,8 +22,23 @@ export const SuccessMessage = ({ survey }: SummaryMetadataProps) => {
  const appSetupCompleted = workspace.appSetupCompleted;

  useEffect(() => {
-    const newSurveyParam = searchParams?.get("success");
-    if (newSurveyParam && survey && workspace) {
+    const publishSuccessParam = searchParams.get("success");
+    const scheduledSuccessParam = searchParams.get("scheduled");
+
+    if (scheduledSuccessParam) {
+      toast.success(t("workspace.surveys.summary.survey_scheduled_successfully"), {
+        id: "survey-schedule-success-toast",
+        duration: 5000,
+        position: "bottom-right",
+      });
+
+      const url = new URL(globalThis.location.href);
+      url.searchParams.delete("scheduled");
+      globalThis.history.replaceState({}, "", url.toString());
+      return;
+    }
+
+    if (publishSuccessParam) {
      setConfetti(true);
      toast.success(
        isAppSurvey && !appSetupCompleted
@@ -38,16 +53,16 @@ export const SuccessMessage = ({ survey }: SummaryMetadataProps) => {
      );

      // Remove success param from url
-      const url = new URL(window.location.href);
+      const url = new URL(globalThis.location.href);
      url.searchParams.delete("success");
      if (survey.type === "link") {
        // Add share param to url to open share embed modal
        url.searchParams.set("share", "true");
      }

-      window.history.replaceState({}, "", url.toString());
+      globalThis.history.replaceState({}, "", url.toString());
    }
-  }, [workspace, isAppSurvey, searchParams, survey, appSetupCompleted, t]);
+  }, [appSetupCompleted, isAppSurvey, searchParams, survey.type, t]);

  return <>{confetti && <Confetti />}</>;
 };
@@ -13,6 +13,8 @@ import {
  SelectedFilterValue,
  useResponseFilter,
 } from "@/app/(app)/workspaces/[workspaceId]/surveys/[surveyId]/(analysis)/components/response-filter-context";
+import { CESSummary } from "@/app/(app)/workspaces/[workspaceId]/surveys/[surveyId]/(analysis)/summary/components/CESSummary";
+import { CSATSummary } from "@/app/(app)/workspaces/[workspaceId]/surveys/[surveyId]/(analysis)/summary/components/CSATSummary";
 import { CTASummary } from "@/app/(app)/workspaces/[workspaceId]/surveys/[surveyId]/(analysis)/summary/components/CTASummary";
 import { CalSummary } from "@/app/(app)/workspaces/[workspaceId]/surveys/[surveyId]/(analysis)/summary/components/CalSummary";
 import { ConsentSummary } from "@/app/(app)/workspaces/[workspaceId]/surveys/[surveyId]/(analysis)/summary/components/ConsentSummary";
@@ -156,6 +158,26 @@ export const SummaryList = ({ summary, responseCount, survey, locale }: SummaryL
              />
            );
          }
+          if (elementSummary.type === TSurveyElementTypeEnum.CSAT) {
+            return (
+              <CSATSummary
+                key={elementSummary.element.id}
+                elementSummary={elementSummary}
+                survey={survey}
+                setFilter={setFilter}
+              />
+            );
+          }
+          if (elementSummary.type === TSurveyElementTypeEnum.CES) {
+            return (
+              <CESSummary
+                key={elementSummary.element.id}
+                elementSummary={elementSummary}
+                survey={survey}
+                setFilter={setFilter}
+              />
+            );
+          }
          if (elementSummary.type === TSurveyElementTypeEnum.Consent) {
            return (
              <ConsentSummary
@@ -4578,3 +4578,611 @@ describe("Cal question type tests", () => {
    expect(summary[0].skipped.count).toBe(1); // Counted as skipped
  });
 });
+
+describe("CSAT question type tests", () => {
+  test("getElementSummary correctly processes CSAT question with valid responses", async () => {
+    const question = {
+      id: "csat-q1",
+      type: TSurveyElementTypeEnum.CSAT,
+      headline: { default: "How satisfied are you?" },
+      required: true,
+      scale: "smiley",
+      range: 5,
+      lowerLabel: { default: "Very unsatisfied" },
+      upperLabel: { default: "Very satisfied" },
+    };
+
+    const survey = {
+      id: "survey-1",
+      blocks: [{ id: "block1", name: "Block 1", elements: [question] }],
+      questions: [],
+      languages: [],
+      welcomeCard: { enabled: false },
+    } as unknown as TSurvey;
+
+    const responses = [
+      {
+        id: "response-1",
+        data: { "csat-q1": 5 },
+        updatedAt: new Date(),
+        contact: null,
+        contactAttributes: {},
+        language: null,
+        ttc: {},
+        finished: true,
+      },
+      {
+        id: "response-2",
+        data: { "csat-q1": 4 },
+        updatedAt: new Date(),
+        contact: null,
+        contactAttributes: {},
+        language: null,
+        ttc: {},
+        finished: true,
+      },
+      {
+        id: "response-3",
+        data: { "csat-q1": 2 },
+        updatedAt: new Date(),
+        contact: null,
+        contactAttributes: {},
+        language: null,
+        ttc: {},
+        finished: true,
+      },
+      {
+        id: "response-4",
+        data: { "csat-q1": 1 },
+        updatedAt: new Date(),
+        contact: null,
+        contactAttributes: {},
+        language: null,
+        ttc: {},
+        finished: true,
+      },
+    ];
+
+    const dropOff = [
+      { elementId: "csat-q1", impressions: 4, dropOffCount: 0, dropOffPercentage: 0 },
+    ] as unknown as TSurveySummary["dropOff"];
+
+    const summary: any = await getElementSummary(
+      survey,
+      getElementsFromBlocks(survey.blocks),
+      responses,
+      dropOff
+    );
+
+    expect(summary).toHaveLength(1);
+    expect(summary[0].type).toBe(TSurveyElementTypeEnum.CSAT);
+    expect(summary[0].responseCount).toBe(4);
+
+    // Average = (5 + 4 + 2 + 1) / 4 = 3.0
+    expect(summary[0].average).toBe(3);
+
+    // CSAT: satisfied = ratings 4 + 5 = 2 out of 4
+    expect(summary[0].csat.satisfiedCount).toBe(2);
+    expect(summary[0].csat.satisfiedPercentage).toBe(50);
+
+    // Verify choice distribution
+    const rating5 = summary[0].choices.find((c: any) => c.rating === 5);
+    expect(rating5.count).toBe(1);
+    expect(rating5.percentage).toBe(25);
+
+    const rating4 = summary[0].choices.find((c: any) => c.rating === 4);
+    expect(rating4.count).toBe(1);
+    expect(rating4.percentage).toBe(25);
+
+    const rating2 = summary[0].choices.find((c: any) => c.rating === 2);
+    expect(rating2.count).toBe(1);
+    expect(rating2.percentage).toBe(25);
+
+    const rating1 = summary[0].choices.find((c: any) => c.rating === 1);
+    expect(rating1.count).toBe(1);
+    expect(rating1.percentage).toBe(25);
+
+    expect(summary[0].dismissed.count).toBe(0);
+  });
+
+  test("getElementSummary handles CSAT question with dismissed responses", async () => {
+    const question = {
+      id: "csat-q1",
+      type: TSurveyElementTypeEnum.CSAT,
+      headline: { default: "How satisfied are you?" },
+      required: false,
+      scale: "smiley",
+      range: 5,
+      lowerLabel: { default: "Very unsatisfied" },
+      upperLabel: { default: "Very satisfied" },
+    };
+
+    const survey = {
+      id: "survey-1",
+      blocks: [{ id: "block1", name: "Block 1", elements: [question] }],
+      questions: [],
+      languages: [],
+      welcomeCard: { enabled: false },
+    } as unknown as TSurvey;
+
+    const responses = [
+      {
+        id: "response-1",
+        data: { "csat-q1": 5 },
+        updatedAt: new Date(),
+        contact: null,
+        contactAttributes: {},
+        language: null,
+        ttc: { "csat-q1": 3 },
+        finished: true,
+      },
+      {
+        id: "response-2",
+        data: {},
+        updatedAt: new Date(),
+        contact: null,
+        contactAttributes: {},
+        language: null,
+        ttc: { "csat-q1": 2 },
+        finished: true,
+      },
+      {
+        id: "response-3",
+        data: {},
+        updatedAt: new Date(),
+        contact: null,
+        contactAttributes: {},
+        language: null,
+        ttc: { "csat-q1": 4 },
+        finished: true,
+      },
+    ] as any;
+
+    const dropOff = [
+      { elementId: "csat-q1", impressions: 3, dropOffCount: 0, dropOffPercentage: 0 },
+    ] as unknown as TSurveySummary["dropOff"];
+
+    const summary: any = await getElementSummary(
+      survey,
+      getElementsFromBlocks(survey.blocks),
+      responses,
+      dropOff
+    );
+
+    expect(summary).toHaveLength(1);
+    expect(summary[0].type).toBe(TSurveyElementTypeEnum.CSAT);
+    expect(summary[0].responseCount).toBe(1);
+    expect(summary[0].average).toBe(5);
+    expect(summary[0].dismissed.count).toBe(2);
+    expect(summary[0].csat.satisfiedCount).toBe(1);
+    expect(summary[0].csat.satisfiedPercentage).toBe(100);
+  });
+
+  test("getElementSummary handles CSAT question with no valid responses", async () => {
+    const question = {
+      id: "csat-q1",
+      type: TSurveyElementTypeEnum.CSAT,
+      headline: { default: "How satisfied are you?" },
+      required: true,
+      scale: "smiley",
+      range: 5,
+    };
+
+    const survey = {
+      id: "survey-1",
+      blocks: [{ id: "block1", name: "Block 1", elements: [question] }],
+      questions: [],
+      languages: [],
+      welcomeCard: { enabled: false },
+    } as unknown as TSurvey;
+
+    const responses = [
+      {
+        id: "response-1",
+        data: { "other-q": "value" },
+        updatedAt: new Date(),
+        contact: null,
+        contactAttributes: {},
+        language: null,
+        ttc: {},
+        finished: true,
+      },
+    ];
+
+    const dropOff = [
+      { elementId: "csat-q1", impressions: 1, dropOffCount: 1, dropOffPercentage: 100 },
+    ] as unknown as TSurveySummary["dropOff"];
+
+    const summary: any = await getElementSummary(
+      survey,
+      getElementsFromBlocks(survey.blocks),
+      responses,
+      dropOff
+    );
+
+    expect(summary).toHaveLength(1);
+    expect(summary[0].type).toBe(TSurveyElementTypeEnum.CSAT);
+    expect(summary[0].responseCount).toBe(0);
+    expect(summary[0].average).toBe(0);
+    expect(summary[0].csat.satisfiedCount).toBe(0);
+    expect(summary[0].csat.satisfiedPercentage).toBe(0);
+    expect(summary[0].choices.every((c: any) => c.count === 0)).toBe(true);
+  });
+
+  test("getElementSummary CSAT correctly identifies satisfied ratings (4 and 5 only)", async () => {
+    const question = {
+      id: "csat-q1",
+      type: TSurveyElementTypeEnum.CSAT,
+      headline: { default: "How satisfied are you?" },
+      required: true,
+      scale: "smiley",
+      range: 5,
+    };
+
+    const survey = {
+      id: "survey-1",
+      blocks: [{ id: "block1", name: "Block 1", elements: [question] }],
+      questions: [],
+      languages: [],
+      welcomeCard: { enabled: false },
+    } as unknown as TSurvey;
+
+    // 3 satisfied (4,5,5), 2 not satisfied (1,3)
+    const responses = [
+      {
+        id: "r1",
+        data: { "csat-q1": 5 },
+        updatedAt: new Date(),
+        contact: null,
+        contactAttributes: {},
+        language: null,
+        ttc: {},
+        finished: true,
+      },
+      {
+        id: "r2",
+        data: { "csat-q1": 4 },
+        updatedAt: new Date(),
+        contact: null,
+        contactAttributes: {},
+        language: null,
+        ttc: {},
+        finished: true,
+      },
+      {
+        id: "r3",
+        data: { "csat-q1": 3 },
+        updatedAt: new Date(),
+        contact: null,
+        contactAttributes: {},
+        language: null,
+        ttc: {},
+        finished: true,
+      },
+      {
+        id: "r4",
+        data: { "csat-q1": 1 },
+        updatedAt: new Date(),
+        contact: null,
+        contactAttributes: {},
+        language: null,
+        ttc: {},
+        finished: true,
+      },
+      {
+        id: "r5",
+        data: { "csat-q1": 5 },
+        updatedAt: new Date(),
+        contact: null,
+        contactAttributes: {},
+        language: null,
+        ttc: {},
+        finished: true,
+      },
+    ];
+
+    const dropOff = [
+      { elementId: "csat-q1", impressions: 5, dropOffCount: 0, dropOffPercentage: 0 },
+    ] as unknown as TSurveySummary["dropOff"];
+
+    const summary: any = await getElementSummary(
+      survey,
+      getElementsFromBlocks(survey.blocks),
+      responses,
+      dropOff
+    );
+
+    // satisfied = ratings 4 and 5 = 3 out of 5
+    expect(summary[0].csat.satisfiedCount).toBe(3);
+    expect(summary[0].csat.satisfiedPercentage).toBe(60);
+  });
+});
+
+describe("CES question type tests", () => {
+  test("getElementSummary correctly processes CES question with valid responses (range 5)", async () => {
+    const question = {
+      id: "ces-q1",
+      type: TSurveyElementTypeEnum.CES,
+      headline: { default: "How easy was it?" },
+      required: true,
+      scale: "number",
+      range: 5,
+      lowerLabel: { default: "Very difficult" },
+      upperLabel: { default: "Very easy" },
+    };
+
+    const survey = {
+      id: "survey-1",
+      blocks: [{ id: "block1", name: "Block 1", elements: [question] }],
+      questions: [],
+      languages: [],
+      welcomeCard: { enabled: false },
+    } as unknown as TSurvey;
+
+    const responses = [
+      {
+        id: "response-1",
+        data: { "ces-q1": 5 },
+        updatedAt: new Date(),
+        contact: null,
+        contactAttributes: {},
+        language: null,
+        ttc: {},
+        finished: true,
+      },
+      {
+        id: "response-2",
+        data: { "ces-q1": 4 },
+        updatedAt: new Date(),
+        contact: null,
+        contactAttributes: {},
+        language: null,
+        ttc: {},
+        finished: true,
+      },
+      {
+        id: "response-3",
+        data: { "ces-q1": 2 },
+        updatedAt: new Date(),
+        contact: null,
+        contactAttributes: {},
+        language: null,
+        ttc: {},
+        finished: true,
+      },
+      {
+        id: "response-4",
+        data: { "ces-q1": 3 },
+        updatedAt: new Date(),
+        contact: null,
+        contactAttributes: {},
+        language: null,
+        ttc: {},
+        finished: true,
+      },
+    ];
+
+    const dropOff = [
+      { elementId: "ces-q1", impressions: 4, dropOffCount: 0, dropOffPercentage: 0 },
+    ] as unknown as TSurveySummary["dropOff"];
+
+    const summary: any = await getElementSummary(
+      survey,
+      getElementsFromBlocks(survey.blocks),
+      responses,
+      dropOff
+    );
+
+    expect(summary).toHaveLength(1);
+    expect(summary[0].type).toBe(TSurveyElementTypeEnum.CES);
+    expect(summary[0].responseCount).toBe(4);
+
+    // CES = average = (5 + 4 + 2 + 3) / 4 = 3.5
+    expect(summary[0].average).toBe(3.5);
+
+    // Verify choice distribution
+    const rating5 = summary[0].choices.find((c: any) => c.rating === 5);
+    expect(rating5.count).toBe(1);
+    expect(rating5.percentage).toBe(25);
+
+    const rating4 = summary[0].choices.find((c: any) => c.rating === 4);
+    expect(rating4.count).toBe(1);
+    expect(rating4.percentage).toBe(25);
+
+    const rating3 = summary[0].choices.find((c: any) => c.rating === 3);
+    expect(rating3.count).toBe(1);
+    expect(rating3.percentage).toBe(25);
+
+    const rating2 = summary[0].choices.find((c: any) => c.rating === 2);
+    expect(rating2.count).toBe(1);
+    expect(rating2.percentage).toBe(25);
+
+    expect(summary[0].dismissed.count).toBe(0);
+
+    // CES has no csat field
+    expect(summary[0].csat).toBeUndefined();
+  });
+
+  test("getElementSummary correctly processes CES question with range 7", async () => {
+    const question = {
+      id: "ces-q1",
+      type: TSurveyElementTypeEnum.CES,
+      headline: { default: "How easy was it?" },
+      required: true,
+      scale: "number",
+      range: 7,
+      lowerLabel: { default: "Very difficult" },
+      upperLabel: { default: "Very easy" },
+    };
+
+    const survey = {
+      id: "survey-1",
+      blocks: [{ id: "block1", name: "Block 1", elements: [question] }],
+      questions: [],
+      languages: [],
+      welcomeCard: { enabled: false },
+    } as unknown as TSurvey;
+
+    const responses = [
+      {
+        id: "r1",
+        data: { "ces-q1": 7 },
+        updatedAt: new Date(),
+        contact: null,
+        contactAttributes: {},
+        language: null,
+        ttc: {},
+        finished: true,
+      },
+      {
+        id: "r2",
+        data: { "ces-q1": 6 },
+        updatedAt: new Date(),
+        contact: null,
+        contactAttributes: {},
+        language: null,
+        ttc: {},
+        finished: true,
+      },
+      {
+        id: "r3",
+        data: { "ces-q1": 1 },
+        updatedAt: new Date(),
+        contact: null,
+        contactAttributes: {},
+        language: null,
+        ttc: {},
+        finished: true,
+      },
+    ];
+
+    const dropOff = [
+      { elementId: "ces-q1", impressions: 3, dropOffCount: 0, dropOffPercentage: 0 },
+    ] as unknown as TSurveySummary["dropOff"];
+
+    const summary: any = await getElementSummary(
+      survey,
+      getElementsFromBlocks(survey.blocks),
+      responses,
+      dropOff
+    );
+
+    expect(summary).toHaveLength(1);
+    expect(summary[0].type).toBe(TSurveyElementTypeEnum.CES);
+    expect(summary[0].responseCount).toBe(3);
+
+    // CES average = (7 + 6 + 1) / 3 = 4.67
+    expect(summary[0].average).toBe(4.67);
+
+    // Verify 7 choices exist (range 7)
+    expect(summary[0].choices).toHaveLength(7);
+  });
+
+  test("getElementSummary handles CES question with dismissed responses", async () => {
+    const question = {
+      id: "ces-q1",
+      type: TSurveyElementTypeEnum.CES,
+      headline: { default: "How easy was it?" },
+      required: false,
+      scale: "number",
+      range: 5,
+    };
+
+    const survey = {
+      id: "survey-1",
+      blocks: [{ id: "block1", name: "Block 1", elements: [question] }],
+      questions: [],
+      languages: [],
+      welcomeCard: { enabled: false },
+    } as unknown as TSurvey;
+
+    const responses = [
+      {
+        id: "response-1",
+        data: { "ces-q1": 3 },
+        updatedAt: new Date(),
+        contact: null,
+        contactAttributes: {},
+        language: null,
+        ttc: { "ces-q1": 5 },
+        finished: true,
+      },
+      {
+        id: "response-2",
+        data: {},
+        updatedAt: new Date(),
+        contact: null,
+        contactAttributes: {},
+        language: null,
+        ttc: { "ces-q1": 2 },
+        finished: true,
+      },
+    ] as any;
+
+    const dropOff = [
+      { elementId: "ces-q1", impressions: 2, dropOffCount: 0, dropOffPercentage: 0 },
+    ] as unknown as TSurveySummary["dropOff"];
+
+    const summary: any = await getElementSummary(
+      survey,
+      getElementsFromBlocks(survey.blocks),
+      responses,
+      dropOff
+    );
+
+    expect(summary).toHaveLength(1);
+    expect(summary[0].type).toBe(TSurveyElementTypeEnum.CES);
+    expect(summary[0].responseCount).toBe(1);
+    expect(summary[0].average).toBe(3);
+    expect(summary[0].dismissed.count).toBe(1);
+  });
+
+  test("getElementSummary handles CES question with no valid responses", async () => {
+    const question = {
+      id: "ces-q1",
+      type: TSurveyElementTypeEnum.CES,
+      headline: { default: "How easy was it?" },
+      required: true,
+      scale: "number",
+      range: 5,
+    };
+
+    const survey = {
+      id: "survey-1",
+      blocks: [{ id: "block1", name: "Block 1", elements: [question] }],
+      questions: [],
+      languages: [],
+      welcomeCard: { enabled: false },
+    } as unknown as TSurvey;
+
+    const responses = [
+      {
+        id: "response-1",
+        data: { "other-q": "value" },
+        updatedAt: new Date(),
+        contact: null,
+        contactAttributes: {},
+        language: null,
+        ttc: {},
+        finished: true,
+      },
+    ];
+
+    const dropOff = [
+      { elementId: "ces-q1", impressions: 1, dropOffCount: 1, dropOffPercentage: 100 },
+    ] as unknown as TSurveySummary["dropOff"];
+
+    const summary: any = await getElementSummary(
+      survey,
+      getElementsFromBlocks(survey.blocks),
+      responses,
+      dropOff
+    );
+
+    expect(summary).toHaveLength(1);
+    expect(summary[0].type).toBe(TSurveyElementTypeEnum.CES);
+    expect(summary[0].responseCount).toBe(0);
+    expect(summary[0].average).toBe(0);
+    expect(summary[0].choices.every((c: any) => c.count === 0)).toBe(true);
+  });
+});
@@ -25,7 +25,6 @@ import {
  TSurveyElementSummaryOpenText,
  TSurveyElementSummaryPictureSelection,
  TSurveyElementSummaryRanking,
-  TSurveyElementSummaryRating,
  TSurveyLanguage,
  TSurveySummary,
 } from "@formbricks/types/surveys/types";
@@ -272,6 +271,49 @@ const checkForI18n = (
  return responseData[id];
 };

+const computeNumericScaleStats = (
+  elementId: string,
+  range: number,
+  responses: TSurveySummaryResponse[]
+): {
+  choices: { rating: number; count: number; percentage: number }[];
+  choiceCountMap: Record<number, number>;
+  totalResponseCount: number;
+  totalRating: number;
+  dismissed: number;
+  average: number;
+} => {
+  const choiceCountMap: Record<number, number> = {};
+  for (let i = 1; i <= range; i++) {
+    choiceCountMap[i] = 0;
+  }
+
+  let totalResponseCount = 0;
+  let totalRating = 0;
+  let dismissed = 0;
+
+  responses.forEach((response) => {
+    const answer = response.data[elementId];
+    if (typeof answer === "number") {
+      totalResponseCount++;
+      choiceCountMap[answer]++;
+      totalRating += answer;
+    } else if (response.ttc && response.ttc[elementId] > 0) {
+      dismissed++;
+    }
+  });
+
+  const choices = Object.entries(choiceCountMap).map(([label, count]) => ({
+    rating: Number.parseInt(label),
+    count,
+    percentage: totalResponseCount > 0 ? convertFloatTo2Decimal((count / totalResponseCount) * 100) : 0,
+  }));
+
+  const average = totalResponseCount > 0 ? convertFloatTo2Decimal(totalRating / totalResponseCount) : 0;
+
+  return { choices, choiceCountMap, totalResponseCount, totalRating, dismissed, average };
+};
+
 export const getElementSummary = async (
  survey: TSurvey,
  elements: TSurveyElement[],
@@ -472,72 +514,16 @@ export const getElementSummary = async (
        break;
      }
      case TSurveyElementTypeEnum.Rating: {
-        let values: TSurveyElementSummaryRating["choices"] = [];
-        const choiceCountMap: Record<number, number> = {};
-        const range = element.range;
-
-        for (let i = 1; i <= range; i++) {
-          choiceCountMap[i] = 0;
-        }
-
-        let totalResponseCount = 0;
-        let totalRating = 0;
-        let dismissed = 0;
-
-        responses.forEach((response) => {
-          const answer = response.data[element.id];
-          if (typeof answer === "number") {
-            totalResponseCount++;
-            choiceCountMap[answer]++;
-            totalRating += answer;
-          } else if (response.ttc && response.ttc[element.id] > 0) {
-            dismissed++;
-          }
-        });
-
-        Object.entries(choiceCountMap).forEach(([label, count]) => {
-          values.push({
-            rating: Number.parseInt(label),
-            count,
-            percentage:
-              totalResponseCount > 0 ? convertFloatTo2Decimal((count / totalResponseCount) * 100) : 0,
-          });
-        });
-
-        // Calculate CSAT based on range
-        let satisfiedCount = 0;
-        if (range === 3) {
-          satisfiedCount = choiceCountMap[3] || 0;
-        } else if (range === 4) {
-          satisfiedCount = (choiceCountMap[3] || 0) + (choiceCountMap[4] || 0);
-        } else if (range === 5) {
-          satisfiedCount = (choiceCountMap[4] || 0) + (choiceCountMap[5] || 0);
-        } else if (range === 6) {
-          satisfiedCount = (choiceCountMap[5] || 0) + (choiceCountMap[6] || 0);
-        } else if (range === 7) {
-          satisfiedCount = (choiceCountMap[6] || 0) + (choiceCountMap[7] || 0);
-        } else if (range === 10) {
-          satisfiedCount = (choiceCountMap[8] || 0) + (choiceCountMap[9] || 0) + (choiceCountMap[10] || 0);
-        }
-        const satisfiedPercentage =
-          totalResponseCount > 0 ? Math.round((satisfiedCount / totalResponseCount) * 100) : 0;
+        const stats = computeNumericScaleStats(element.id, element.range, responses);

        summary.push({
          type: element.type,
          element,
-          average: convertFloatTo2Decimal(totalRating / totalResponseCount) || 0,
-          responseCount: totalResponseCount,
-          choices: values,
-          dismissed: {
-            count: dismissed,
-          },
-          csat: {
-            satisfiedCount,
-            satisfiedPercentage,
-          },
+          average: stats.average,
+          responseCount: stats.totalResponseCount,
+          choices: stats.choices,
+          dismissed: { count: stats.dismissed },
        });
-
-        values = [];
        break;
      }
      case TSurveyElementTypeEnum.NPS: {
@@ -612,6 +598,40 @@ export const getElementSummary = async (
        });
        break;
      }
+      case TSurveyElementTypeEnum.CSAT: {
+        const stats = computeNumericScaleStats(element.id, element.range, responses);
+
+        // CSAT: top 2 ratings out of 5 are "satisfied"
+        const satisfiedCount = (stats.choiceCountMap[4] || 0) + (stats.choiceCountMap[5] || 0);
+        const satisfiedPercentage =
+          stats.totalResponseCount > 0
+            ? convertFloatTo2Decimal((satisfiedCount / stats.totalResponseCount) * 100)
+            : 0;
+
+        summary.push({
+          type: element.type,
+          element,
+          average: stats.average,
+          responseCount: stats.totalResponseCount,
+          choices: stats.choices,
+          dismissed: { count: stats.dismissed },
+          csat: { satisfiedCount, satisfiedPercentage },
+        });
+        break;
+      }
+      case TSurveyElementTypeEnum.CES: {
+        const stats = computeNumericScaleStats(element.id, element.range, responses);
+
+        summary.push({
+          type: element.type,
+          element,
+          average: stats.average,
+          responseCount: stats.totalResponseCount,
+          choices: stats.choices,
+          dismissed: { count: stats.dismissed },
+        });
+        break;
+      }
      case TSurveyElementTypeEnum.CTA: {
        // Only calculate summary for CTA elements with external buttons (CTR tracking is only meaningful for external links)
        if (!element.buttonExternal) {
@@ -4,7 +4,6 @@ import { useRouter } from "next/navigation";
 import toast from "react-hot-toast";
 import { useTranslation } from "react-i18next";
 import { TSurvey } from "@formbricks/types/surveys/types";
-import { useWorkspaceContext } from "@/app/(app)/workspaces/[workspaceId]/context/workspace-context";
 import { getFormattedErrorMessage } from "@/lib/utils/helper";
 import { updateSurveyAction } from "@/modules/survey/editor/actions";
 import {
@@ -22,18 +21,19 @@ interface SurveyStatusDropdownProps {
 }

 export const SurveyStatusDropdown = ({ updateLocalSurveyStatus, survey }: SurveyStatusDropdownProps) => {
-  const { workspace } = useWorkspaceContext();
  const { t } = useTranslation();
  const router = useRouter();
+  const isScheduled = survey.status === "paused" && survey.publishOn !== null;

  const handleStatusChange = async (status: TSurvey["status"]) => {
    const updateSurveyActionResponse = await updateSurveyAction({ ...survey, status });

    if (updateSurveyActionResponse?.data) {
-      const resultingStatus = updateSurveyActionResponse.data.status;
+      const { publishOn, status: resultingStatus } = updateSurveyActionResponse.data;
+      const isResultScheduled = resultingStatus === "paused" && publishOn !== null;
      const statusToToastMessage: Partial<Record<TSurvey["status"], string>> = {
        inProgress: t("common.survey_live"),
-        paused: t("common.survey_paused"),
+        paused: isResultScheduled ? t("common.survey_scheduled") : t("common.survey_paused"),
        completed: t("common.survey_completed"),
      };

@@ -68,12 +68,10 @@ export const SurveyStatusDropdown = ({ updateLocalSurveyStatus, survey }: Survey
          <SelectTrigger className="w-[170px] bg-white md:w-[200px]">
            <SelectValue>
              <div className="flex items-center">
-                {(survey.type === "link" || workspace.appSetupCompleted) && (
-                  <SurveyStatusIndicator status={survey.status} />
-                )}
+                <SurveyStatusIndicator status={survey.status} isScheduled={isScheduled} />
                <span className="ml-2 text-sm text-slate-700">
                  {survey.status === "inProgress" && t("common.in_progress")}
-                  {survey.status === "paused" && t("common.paused")}
+                  {survey.status === "paused" && (isScheduled ? t("common.scheduled") : t("common.paused"))}
                  {survey.status === "completed" && t("common.completed")}
                </span>
              </div>
@@ -88,8 +86,8 @@ export const SurveyStatusDropdown = ({ updateLocalSurveyStatus, survey }: Survey
            </SelectItem>
            <SelectItem className="group font-normal hover:text-slate-900" value="paused">
              <div className="flex w-full items-center justify-center gap-2">
-                <SurveyStatusIndicator status={"paused"} />
-                {t("common.paused")}
+                <SurveyStatusIndicator status={"paused"} isScheduled={isScheduled} />
+                {isScheduled ? t("common.scheduled") : t("common.paused")}
              </div>
            </SelectItem>
            <SelectItem className="group font-normal hover:text-slate-900" value="completed">
@@ -0,0 +1,8 @@
+import { type ReactNode } from "react";
+import { SurveysQueryClientProvider } from "./query-client-provider";
+
+const SurveysLayout = ({ children }: { children: ReactNode }) => {
+  return <SurveysQueryClientProvider>{children}</SurveysQueryClientProvider>;
+};
+
+export default SurveysLayout;
@@ -0,0 +1,10 @@
+"use client";
+
+import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
+import { type ReactNode, useState } from "react";
+
+export const SurveysQueryClientProvider = ({ children }: { children: ReactNode }) => {
+  const [queryClient] = useState(() => new QueryClient());
+
+  return <QueryClientProvider client={queryClient}>{children}</QueryClientProvider>;
+};
@@ -2,7 +2,6 @@

 import { z } from "zod";
 import { ZId } from "@formbricks/types/common";
-import { AuthorizationError } from "@formbricks/types/errors";
 import { authenticatedActionClient } from "@/lib/utils/action-client";
 import { checkAuthorizationUpdated } from "@/lib/utils/action-client/action-client-middleware";
 import { AuthenticatedActionClientCtx } from "@/lib/utils/action-client/types/context";
@@ -107,9 +106,10 @@ const getWorkspaceDirectoryIds = async (workspaceId: string): Promise<Set<string
  return new Set(directories.map((directory) => directory.id));
 };

-const assertWorkspaceDirectoryAccess = (directoryIds: Set<string>, tenantId: string): void => {
+const assertRecordBelongsToWorkspace = (directoryIds: Set<string>, tenantId: string): void => {
  if (!directoryIds.has(tenantId)) {
-    throw new AuthorizationError("Invalid feedback record directory for this workspace");
+    // Throw a generic error indistinguishable from "not found" to prevent IDOR
+    throw new Error("Feedback record not found");
  }
 };

@@ -123,15 +123,17 @@ export const retrieveFeedbackRecordAction = authenticatedActionClient
      ctx: AuthenticatedActionClientCtx;
      parsedInput: z.infer<typeof ZRetrieveFeedbackRecordAction>;
    }) => {
-      await ensureAccess(ctx.user.id, parsedInput.workspaceId, "read");
+      const [, workspaceDirectoryIds] = await Promise.all([
+        ensureAccess(ctx.user.id, parsedInput.workspaceId, "read"),
+        getWorkspaceDirectoryIds(parsedInput.workspaceId),
+      ]);

      const recordResult = await retrieveFeedbackRecord(parsedInput.recordId);
      if (!recordResult.data || recordResult.error) {
-        throw new Error(recordResult.error?.message || "Failed to retrieve feedback record");
+        throw new Error("Feedback record not found");
      }

-      const workspaceDirectoryIds = await getWorkspaceDirectoryIds(parsedInput.workspaceId);
-      assertWorkspaceDirectoryAccess(workspaceDirectoryIds, recordResult.data.tenant_id);
+      assertRecordBelongsToWorkspace(workspaceDirectoryIds, recordResult.data.tenant_id);

      return recordResult.data;
    }
@@ -150,11 +152,31 @@ export const createFeedbackRecordAction = authenticatedActionClient
      await ensureAccess(ctx.user.id, parsedInput.workspaceId, "readWrite");

      const workspaceDirectoryIds = await getWorkspaceDirectoryIds(parsedInput.workspaceId);
-      assertWorkspaceDirectoryAccess(workspaceDirectoryIds, parsedInput.recordInput.tenant_id);
+      assertRecordBelongsToWorkspace(workspaceDirectoryIds, parsedInput.recordInput.tenant_id);

-      const createResult = await createFeedbackRecord(
-        parsedInput.recordInput as unknown as FeedbackRecordCreateParams
-      );
+      const { recordInput } = parsedInput;
+      const createParams: FeedbackRecordCreateParams = {
+        submission_id: recordInput.submission_id,
+        tenant_id: recordInput.tenant_id,
+        source_type: recordInput.source_type,
+        field_id: recordInput.field_id,
+        field_type: recordInput.field_type,
+        collected_at: recordInput.collected_at,
+        source_id: recordInput.source_id,
+        source_name: recordInput.source_name,
+        field_label: recordInput.field_label,
+        field_group_id: recordInput.field_group_id,
+        field_group_label: recordInput.field_group_label,
+        value_text: recordInput.value_text,
+        value_number: recordInput.value_number,
+        value_boolean: recordInput.value_boolean,
+        value_date: recordInput.value_date,
+        metadata: recordInput.metadata,
+        language: recordInput.language,
+        user_identifier: recordInput.user_identifier,
+      };
+
+      const createResult = await createFeedbackRecord(createParams);
      if (!createResult.data || createResult.error) {
        throw new Error(createResult.error?.message || "Failed to create feedback record");
      }
@@ -173,21 +195,36 @@ export const updateFeedbackRecordAction = authenticatedActionClient
      ctx: AuthenticatedActionClientCtx;
      parsedInput: z.infer<typeof ZUpdateFeedbackRecordAction>;
    }) => {
-      await ensureAccess(ctx.user.id, parsedInput.workspaceId, "readWrite");
+      const [, workspaceDirectoryIds] = await Promise.all([
+        ensureAccess(ctx.user.id, parsedInput.workspaceId, "readWrite"),
+        getWorkspaceDirectoryIds(parsedInput.workspaceId),
+      ]);

      const currentRecordResult = await retrieveFeedbackRecord(parsedInput.recordId);
      if (!currentRecordResult.data || currentRecordResult.error) {
-        throw new Error(currentRecordResult.error?.message || "Failed to retrieve feedback record");
+        throw new Error("Feedback record not found");
      }

-      const workspaceDirectoryIds = await getWorkspaceDirectoryIds(parsedInput.workspaceId);
-      assertWorkspaceDirectoryAccess(workspaceDirectoryIds, currentRecordResult.data.tenant_id);
+      assertRecordBelongsToWorkspace(workspaceDirectoryIds, currentRecordResult.data.tenant_id);

-      const updatePayload = Object.fromEntries(
-        Object.entries(parsedInput.updateInput).filter(([, value]) => value !== undefined)
-      ) as unknown as FeedbackRecordUpdateParams;
+      const { updateInput } = parsedInput;
+      const updateParams: FeedbackRecordUpdateParams = {
+        ...(updateInput.value_text !== undefined && { value_text: updateInput.value_text ?? undefined }),
+        ...(updateInput.value_number !== undefined && {
+          value_number: updateInput.value_number ?? undefined,
+        }),
+        ...(updateInput.value_boolean !== undefined && {
+          value_boolean: updateInput.value_boolean ?? undefined,
+        }),
+        ...(updateInput.value_date !== undefined && { value_date: updateInput.value_date ?? undefined }),
+        ...(updateInput.language !== undefined && { language: updateInput.language ?? undefined }),
+        ...(updateInput.metadata !== undefined && { metadata: updateInput.metadata }),
+        ...(updateInput.user_identifier !== undefined && {
+          user_identifier: updateInput.user_identifier ?? undefined,
+        }),
+      };

-      const updateResult = await updateFeedbackRecord(parsedInput.recordId, updatePayload);
+      const updateResult = await updateFeedbackRecord(parsedInput.recordId, updateParams);
      if (!updateResult.data || updateResult.error) {
        throw new Error(updateResult.error?.message || "Failed to update feedback record");
      }
@@ -6,8 +6,6 @@ import { useCallback, useEffect, useMemo, useState } from "react";
 import { useFieldArray, useForm } from "react-hook-form";
 import { toast } from "react-hot-toast";
 import { useTranslation } from "react-i18next";
-import { v7 as uuidv7 } from "uuid";
-import { z } from "zod";
 import { getFormattedErrorMessage } from "@/lib/utils/helper";
 import type { FeedbackRecordData } from "@/modules/hub/types";
 import { AlertDialog } from "@/modules/ui/components/alert-dialog";
@@ -41,7 +39,24 @@ import {
  createFeedbackRecordAction,
  retrieveFeedbackRecordAction,
  updateFeedbackRecordAction,
-} from "./actions";
+} from "../actions";
+import {
+  FIELD_TYPE_OPTIONS,
+  SOURCE_TYPE_CUSTOM_VALUE,
+  SOURCE_TYPE_PRESET_OPTIONS,
+  type TFeedbackRecordFormValues,
+  ZFeedbackRecordFormValues,
+} from "../lib/types";
+import {
+  formatSourceType,
+  getCreateDefaults,
+  getReadOnlyMetadataEntries,
+  getValueFieldByType,
+  isPresetSourceType,
+  mapRecordToValues,
+  parseNumberValue,
+  toISOOrUndefined,
+} from "../lib/utils";

 type FeedbackRecordDrawerMode = "create" | "edit";

@@ -56,198 +71,6 @@ interface FeedbackRecordFormDrawerProps {
  onSuccess: () => Promise<void> | void;
 }

-const FIELD_TYPE_OPTIONS = [
-  "text",
-  "categorical",
-  "nps",
-  "csat",
-  "ces",
-  "rating",
-  "number",
-  "boolean",
-  "date",
-] as const;
-
-const SOURCE_TYPE_PRESET_OPTIONS = [
-  "survey",
-  "review",
-  "feedback_form",
-  "support",
-  "social",
-  "interview",
-  "usability_test",
-  "nps_campaign",
-] as const;
-
-const SOURCE_TYPE_CUSTOM_VALUE = "__custom__";
-
-const ZMetadataEntry = z.object({
-  key: z.string().trim().min(1),
-  value: z.string(),
-});
-
-const ZFeedbackRecordFormValues = z.object({
-  id: z.string().optional(),
-  tenant_id: z.string().min(1),
-  submission_id: z.string().min(1),
-  collected_at: z.string().min(1),
-  created_at: z.string().optional(),
-  updated_at: z.string().optional(),
-  source_type: z.string().min(1),
-  source_id: z.string().optional(),
-  source_name: z.string().optional(),
-  field_id: z.string().min(1),
-  field_label: z.string().optional(),
-  field_type: z.enum(FIELD_TYPE_OPTIONS),
-  field_group_id: z.string().optional(),
-  field_group_label: z.string().optional(),
-  value_text: z.string().optional(),
-  value_number: z.string().optional(),
-  value_boolean: z.boolean().optional(),
-  value_date: z.string().optional(),
-  language: z.string().optional(),
-  user_identifier: z.string().optional(),
-  metadataEntries: z.array(ZMetadataEntry),
-});
-
-type TFeedbackRecordFormValues = z.infer<typeof ZFeedbackRecordFormValues>;
-
-const getValueFieldByType = (
-  fieldType: TFeedbackRecordFormValues["field_type"]
-): "value_text" | "value_number" | "value_boolean" | "value_date" => {
-  switch (fieldType) {
-    case "boolean":
-      return "value_boolean";
-    case "date":
-      return "value_date";
-    case "nps":
-    case "csat":
-    case "ces":
-    case "rating":
-    case "number":
-      return "value_number";
-    default:
-      return "value_text";
-  }
-};
-
-const toLocalDateTimeInput = (isoDate: string): string => {
-  const date = new Date(isoDate);
-  if (!Number.isFinite(date.getTime())) {
-    return "";
-  }
-
-  const year = date.getFullYear();
-  const month = String(date.getMonth() + 1).padStart(2, "0");
-  const day = String(date.getDate()).padStart(2, "0");
-  const hours = String(date.getHours()).padStart(2, "0");
-  const minutes = String(date.getMinutes()).padStart(2, "0");
-
-  return `${year}-${month}-${day}T${hours}:${minutes}`;
-};
-
-const toISOOrUndefined = (dateTimeValue: string | undefined): string | undefined => {
-  if (!dateTimeValue) {
-    return undefined;
-  }
-
-  const parsed = new Date(dateTimeValue);
-  if (!Number.isFinite(parsed.getTime())) {
-    return undefined;
-  }
-
-  return parsed.toISOString();
-};
-
-const getCreateDefaults = (directories: { id: string; name: string }[]): TFeedbackRecordFormValues => {
-  const now = new Date();
-  const defaultDirectoryId = directories[0]?.id ?? "";
-
-  return {
-    id: "",
-    tenant_id: defaultDirectoryId,
-    submission_id: uuidv7(),
-    collected_at: toLocalDateTimeInput(now.toISOString()),
-    created_at: "",
-    updated_at: "",
-    source_type: "survey",
-    source_id: "",
-    source_name: "",
-    field_id: "",
-    field_label: "",
-    field_type: "text",
-    field_group_id: "",
-    field_group_label: "",
-    value_text: "",
-    value_number: "",
-    value_boolean: undefined,
-    value_date: "",
-    language: "",
-    user_identifier: "",
-    metadataEntries: [],
-  };
-};
-
-const mapRecordToValues = (record: FeedbackRecordData): TFeedbackRecordFormValues => {
-  const metadataEntries = Object.entries(record.metadata ?? {})
-    .filter(([, value]) => typeof value === "string")
-    .map(([key, value]) => ({
-      key,
-      value: value as string,
-    }));
-
-  return {
-    id: record.id,
-    tenant_id: record.tenant_id,
-    submission_id: record.submission_id,
-    collected_at: toLocalDateTimeInput(record.collected_at),
-    created_at: record.created_at ? toLocalDateTimeInput(record.created_at) : "",
-    updated_at: record.updated_at ? toLocalDateTimeInput(record.updated_at) : "",
-    source_type: record.source_type,
-    source_id: record.source_id ?? "",
-    source_name: record.source_name ?? "",
-    field_id: record.field_id,
-    field_label: record.field_label ?? "",
-    field_type: record.field_type,
-    field_group_id: record.field_group_id ?? "",
-    field_group_label: record.field_group_label ?? "",
-    value_text: record.value_text ?? "",
-    value_number: record.value_number == null ? "" : String(record.value_number),
-    value_boolean: record.value_boolean,
-    value_date: record.value_date ? toLocalDateTimeInput(record.value_date) : "",
-    language: record.language ?? "",
-    user_identifier: record.user_identifier ?? "",
-    metadataEntries,
-  };
-};
-
-const getReadOnlyMetadataEntries = (record: FeedbackRecordData): { key: string; value: string }[] => {
-  return Object.entries(record.metadata ?? {})
-    .filter(([, value]) => typeof value !== "string")
-    .map(([key, value]) => ({
-      key,
-      value: JSON.stringify(value),
-    }));
-};
-
-const parseNumberValue = (value: string): number | null => {
-  if (value.trim() === "") return null;
-  const parsed = Number(value);
-  return Number.isFinite(parsed) ? parsed : null;
-};
-
-const formatSourceType = (sourceType: string, t: (key: string) => string): string => {
-  switch (sourceType) {
-    case "formbricks":
-    case "formbricks_survey":
-      return t("workspace.unify.formbricks_surveys");
-    case "csv":
-      return t("workspace.unify.csv_import");
-    default:
-      return sourceType;
-  }
-};
-
 export const FeedbackRecordFormDrawer = ({
  mode,
  open,
@@ -316,14 +139,9 @@ export const FeedbackRecordFormDrawer = ({

      setRecord(result.data);
      form.reset(mapRecordToValues(result.data));
-      setSourceTypeMode(
-        SOURCE_TYPE_PRESET_OPTIONS.includes(result.data.source_type as never)
-          ? result.data.source_type
-          : SOURCE_TYPE_CUSTOM_VALUE
-      );
-      setCustomSourceType(
-        SOURCE_TYPE_PRESET_OPTIONS.includes(result.data.source_type as never) ? "" : result.data.source_type
-      );
+      const isPreset = isPresetSourceType(result.data.source_type);
+      setSourceTypeMode(isPreset ? result.data.source_type : SOURCE_TYPE_CUSTOM_VALUE);
+      setCustomSourceType(isPreset ? "" : result.data.source_type);
      setIsLoadingRecord(false);
    };

@@ -442,7 +260,15 @@ export const FeedbackRecordFormDrawer = ({
          Object.entries(record?.metadata ?? {}).filter(([, value]) => typeof value !== "string")
        );

-        const updatePayload: Record<string, unknown> = {
+        const updatePayload: {
+          language: string | null;
+          user_identifier: string | null;
+          metadata: Record<string, unknown>;
+          value_text?: string;
+          value_number?: number | null;
+          value_boolean?: boolean | null;
+          value_date?: string | null;
+        } = {
          language: values.language?.trim() || null,
          user_identifier: values.user_identifier?.trim() || null,
          metadata: { ...preservedMetadata, ...metadata },
@@ -461,7 +287,7 @@ export const FeedbackRecordFormDrawer = ({
        const updateResult = await updateFeedbackRecordAction({
          workspaceId,
          recordId,
-          updateInput: updatePayload as never,
+          updateInput: updatePayload,
        });

        if (!updateResult?.data) {
@@ -4,7 +4,7 @@ import { useTranslation } from "react-i18next";
 import type { FeedbackRecordData } from "@/modules/hub/types";
 import { PageContentWrapper } from "@/modules/ui/components/page-content-wrapper";
 import { PageHeader } from "@/modules/ui/components/page-header";
-import { UnifyConfigNavigation } from "../components/UnifyConfigNavigation";
+import { UnifyConfigNavigation } from "../../components/UnifyConfigNavigation";
 import { FeedbackRecordsTable } from "./feedback-records-table";

 interface FeedbackRecordsPageClientProps {
@@ -29,7 +29,8 @@ import {
  DropdownMenuTrigger,
 } from "@/modules/ui/components/dropdown-menu";
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/modules/ui/components/tooltip";
-import { CsvImportModal } from "../sources/components/csv-import-modal";
+import { CsvImportModal } from "../../sources/components/csv-import-modal";
+import { formatSourceType } from "../lib/utils";
 import { FeedbackRecordFormDrawer } from "./feedback-record-form-drawer";

 const RECORDS_PER_PAGE = 50;
@@ -54,18 +55,6 @@ const formatValue = (record: FeedbackRecordData, t: TFunction, locale: string):
  return "—";
 };

-const formatSourceType = (sourceType: string, t: TFunction): string => {
-  switch (sourceType) {
-    case "formbricks":
-    case "formbricks_survey":
-      return t("workspace.unify.formbricks_surveys");
-    case "csv":
-      return t("workspace.unify.csv_import");
-    default:
-      return sourceType;
-  }
-};
-
 function truncate(str: string, maxLen: number): string {
  if (str.length <= maxLen) return str;
  return str.slice(0, maxLen) + "…";
@@ -102,43 +91,39 @@ export const FeedbackRecordsTable = ({
        .sort((a, b) => a.name.localeCompare(b.name)),
    [frdMap]
  );
-  const feedbackDirectoryName = useMemo(() => {
-    const directoryNames = Array.from(
-      new Set(
-        records
-          .map((record) => frdMap[record.tenant_id])
-          .filter((directoryName): directoryName is string => Boolean(directoryName))
-      )
-    );
-
-    if (directoryNames.length > 0) {
-      return directoryNames.join(", ");
-    }
-
-    return directories[0]?.name ?? "—";
-  }, [directories, frdMap, records]);
-
  const handleRefresh = async () => {
    if (isRefreshing) return;
    setIsRefreshing(true);
    setError(null);

    const toastId = toast.loading(t("workspace.unify.refreshing_feedback_records"));
+    const directoryIds = Object.keys(frdMap);
+    const results = await Promise.all(
+      directoryIds.map((frdId) =>
+        listFeedbackRecordsAction({
+          workspaceId,
+          frdId,
+          limit: RECORDS_PER_PAGE,
+        })
+      )
+    );

-    const result = await listFeedbackRecordsAction({
-      workspaceId,
-      limit: RECORDS_PER_PAGE,
-    });
+    const successfulRecords = results.flatMap((result) => result?.data?.data ?? []);

-    if (!result?.data) {
-      toast.error(getFormattedErrorMessage(result) ?? t("workspace.unify.failed_to_load_feedback_records"), {
+    if (directoryIds.length > 0 && successfulRecords.length === 0) {
+      const firstErrorResult = results.find((result) => !result?.data);
+      const errorMessage = firstErrorResult ? getFormattedErrorMessage(firstErrorResult) : undefined;
+      toast.error(errorMessage ?? t("workspace.unify.failed_to_load_feedback_records"), {
        id: toastId,
      });
      setIsRefreshing(false);
      return;
    }

-    setRecords(result.data.data);
+    const mergedRecords = successfulRecords
+      .toSorted((a, b) => (a.collected_at < b.collected_at ? 1 : -1))
+      .slice(0, RECORDS_PER_PAGE);
+    setRecords(mergedRecords);
    setIsRefreshing(false);
    toast.success(t("workspace.unify.feedback_records_refreshed"), { id: toastId });
  };
@@ -183,7 +168,6 @@ export const FeedbackRecordsTable = ({
            <p className="text-sm text-slate-500">
              {t("workspace.unify.showing_count_loaded", {
                count: records.length,
-                directoryName: feedbackDirectoryName,
              })}
            </p>
          )}
@@ -0,0 +1,57 @@
+import { z } from "zod";
+
+export const FIELD_TYPE_OPTIONS = [
+  "text",
+  "categorical",
+  "nps",
+  "csat",
+  "ces",
+  "rating",
+  "number",
+  "boolean",
+  "date",
+] as const;
+
+export const SOURCE_TYPE_PRESET_OPTIONS = [
+  "survey",
+  "review",
+  "feedback_form",
+  "support",
+  "social",
+  "interview",
+  "usability_test",
+  "nps_campaign",
+] as const;
+
+export const SOURCE_TYPE_CUSTOM_VALUE = "__custom__";
+
+const ZMetadataEntry = z.object({
+  key: z.string().trim().min(1),
+  value: z.string(),
+});
+
+export const ZFeedbackRecordFormValues = z.object({
+  id: z.string().optional(),
+  tenant_id: z.string().min(1),
+  submission_id: z.string().min(1),
+  collected_at: z.string().min(1),
+  created_at: z.string().optional(),
+  updated_at: z.string().optional(),
+  source_type: z.string().min(1),
+  source_id: z.string().optional(),
+  source_name: z.string().optional(),
+  field_id: z.string().min(1),
+  field_label: z.string().optional(),
+  field_type: z.enum(FIELD_TYPE_OPTIONS),
+  field_group_id: z.string().optional(),
+  field_group_label: z.string().optional(),
+  value_text: z.string().optional(),
+  value_number: z.string().optional(),
+  value_boolean: z.boolean().optional(),
+  value_date: z.string().optional(),
+  language: z.string().optional(),
+  user_identifier: z.string().optional(),
+  metadataEntries: z.array(ZMetadataEntry),
+});
+
+export type TFeedbackRecordFormValues = z.infer<typeof ZFeedbackRecordFormValues>;
@@ -0,0 +1,169 @@
+import { describe, expect, test, vi } from "vitest";
+import type { FeedbackRecordData } from "@/modules/hub/types";
+import {
+  formatSourceType,
+  getCreateDefaults,
+  getReadOnlyMetadataEntries,
+  getValueFieldByType,
+  isPresetSourceType,
+  mapRecordToValues,
+  parseNumberValue,
+  toISOOrUndefined,
+  toLocalDateTimeInput,
+} from "./utils";
+
+vi.mock("uuid", () => ({ v7: () => "mock-uuid-v7" }));
+
+const makeRecord = (overrides: Partial<FeedbackRecordData> = {}): FeedbackRecordData => ({
+  id: "rec-1",
+  tenant_id: "tenant-1",
+  submission_id: "sub-1",
+  collected_at: "2026-03-15T12:00:00.000Z",
+  created_at: "2026-03-15T12:00:00.000Z",
+  updated_at: "2026-03-15T12:00:00.000Z",
+  source_type: "survey",
+  field_id: "f1",
+  field_type: "text",
+  ...overrides,
+});
+
+describe("getValueFieldByType", () => {
+  test.each([
+    ["boolean", "value_boolean"],
+    ["date", "value_date"],
+    ["nps", "value_number"],
+    ["csat", "value_number"],
+    ["ces", "value_number"],
+    ["rating", "value_number"],
+    ["number", "value_number"],
+    ["text", "value_text"],
+    ["categorical", "value_text"],
+  ] as const)("returns %s → %s", (input, expected) => {
+    expect(getValueFieldByType(input)).toBe(expected);
+  });
+});
+
+describe("toLocalDateTimeInput", () => {
+  test("formats valid ISO date", () => {
+    const result = toLocalDateTimeInput("2026-03-15T14:30:00.000Z");
+    expect(result).toMatch(/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}$/);
+  });
+
+  test("returns empty string for invalid date", () => {
+    expect(toLocalDateTimeInput("not-a-date")).toBe("");
+  });
+});
+
+describe("toISOOrUndefined", () => {
+  test("returns ISO string for valid input", () => {
+    expect(toISOOrUndefined("2026-03-15T14:30")).toMatch(/2026-03-15/);
+  });
+
+  test("returns undefined for empty string", () => {
+    expect(toISOOrUndefined("")).toBeUndefined();
+  });
+
+  test("returns undefined for undefined", () => {
+    expect(toISOOrUndefined(undefined)).toBeUndefined();
+  });
+
+  test("returns undefined for invalid date", () => {
+    expect(toISOOrUndefined("not-a-date")).toBeUndefined();
+  });
+});
+
+describe("getCreateDefaults", () => {
+  test("uses first directory as tenant_id", () => {
+    const dirs = [{ id: "dir-1", name: "Dir 1" }];
+    const result = getCreateDefaults(dirs);
+    expect(result.tenant_id).toBe("dir-1");
+    expect(result.submission_id).toBe("mock-uuid-v7");
+    expect(result.field_type).toBe("text");
+    expect(result.metadataEntries).toEqual([]);
+  });
+
+  test("handles empty directories", () => {
+    const result = getCreateDefaults([]);
+    expect(result.tenant_id).toBe("");
+  });
+});
+
+describe("mapRecordToValues", () => {
+  test("maps a full record", () => {
+    const record = makeRecord({
+      value_text: "hello",
+      value_number: 42,
+      source_id: "s1",
+      source_name: "Survey",
+      metadata: { tag: "vip", nested: { a: 1 } },
+    });
+    const result = mapRecordToValues(record);
+    expect(result.id).toBe("rec-1");
+    expect(result.value_text).toBe("hello");
+    expect(result.value_number).toBe("42");
+    expect(result.source_id).toBe("s1");
+    expect(result.metadataEntries).toEqual([{ key: "tag", value: "vip" }]);
+  });
+
+  test("handles nullish optional fields", () => {
+    const record = makeRecord({ value_number: undefined, source_id: undefined });
+    const result = mapRecordToValues(record);
+    expect(result.value_number).toBe("");
+    expect(result.source_id).toBe("");
+  });
+});
+
+describe("getReadOnlyMetadataEntries", () => {
+  test("returns only non-string metadata values", () => {
+    const record = makeRecord({ metadata: { tag: "vip", count: 5, nested: { a: 1 } } });
+    const result = getReadOnlyMetadataEntries(record);
+    expect(result).toEqual([
+      { key: "count", value: "5" },
+      { key: "nested", value: '{"a":1}' },
+    ]);
+  });
+
+  test("returns empty array when no metadata", () => {
+    expect(getReadOnlyMetadataEntries(makeRecord())).toEqual([]);
+  });
+});
+
+describe("parseNumberValue", () => {
+  test.each([
+    ["42", 42],
+    ["3.14", 3.14],
+    ["-1", -1],
+    ["", null],
+    ["  ", null],
+    ["abc", null],
+    ["Infinity", null],
+  ])("parseNumberValue(%s) → %s", (input, expected) => {
+    expect(parseNumberValue(input)).toBe(expected);
+  });
+});
+
+describe("isPresetSourceType", () => {
+  test("returns true for preset values", () => {
+    expect(isPresetSourceType("survey")).toBe(true);
+    expect(isPresetSourceType("nps_campaign")).toBe(true);
+  });
+
+  test("returns false for custom values", () => {
+    expect(isPresetSourceType("custom_type")).toBe(false);
+    expect(isPresetSourceType("")).toBe(false);
+  });
+});
+
+describe("formatSourceType", () => {
+  const t = ((key: string) => key) as any;
+
+  test("maps known source types", () => {
+    expect(formatSourceType("formbricks", t)).toBe("workspace.unify.formbricks_surveys");
+    expect(formatSourceType("formbricks_survey", t)).toBe("workspace.unify.formbricks_surveys");
+    expect(formatSourceType("csv", t)).toBe("workspace.unify.csv_import");
+  });
+
+  test("returns raw value for unknown types", () => {
+    expect(formatSourceType("custom", t)).toBe("custom");
+  });
+});
@@ -0,0 +1,143 @@
+import { TFunction } from "i18next";
+import { v7 as uuidv7 } from "uuid";
+import type { FeedbackRecordData } from "@/modules/hub/types";
+import { SOURCE_TYPE_PRESET_OPTIONS, type TFeedbackRecordFormValues } from "./types";
+
+export const getValueFieldByType = (
+  fieldType: TFeedbackRecordFormValues["field_type"]
+): "value_text" | "value_number" | "value_boolean" | "value_date" => {
+  switch (fieldType) {
+    case "boolean":
+      return "value_boolean";
+    case "date":
+      return "value_date";
+    case "nps":
+    case "csat":
+    case "ces":
+    case "rating":
+    case "number":
+      return "value_number";
+    default:
+      return "value_text";
+  }
+};
+
+export const toLocalDateTimeInput = (isoDate: string): string => {
+  const date = new Date(isoDate);
+  if (!Number.isFinite(date.getTime())) {
+    return "";
+  }
+
+  const year = date.getFullYear();
+  const month = String(date.getMonth() + 1).padStart(2, "0");
+  const day = String(date.getDate()).padStart(2, "0");
+  const hours = String(date.getHours()).padStart(2, "0");
+  const minutes = String(date.getMinutes()).padStart(2, "0");
+
+  return `${year}-${month}-${day}T${hours}:${minutes}`;
+};
+
+export const toISOOrUndefined = (dateTimeValue: string | undefined): string | undefined => {
+  if (!dateTimeValue) {
+    return undefined;
+  }
+
+  const parsed = new Date(dateTimeValue);
+  if (!Number.isFinite(parsed.getTime())) {
+    return undefined;
+  }
+
+  return parsed.toISOString();
+};
+
+export const getCreateDefaults = (directories: { id: string; name: string }[]): TFeedbackRecordFormValues => {
+  const now = new Date();
+  const defaultDirectoryId = directories[0]?.id ?? "";
+
+  return {
+    id: "",
+    tenant_id: defaultDirectoryId,
+    submission_id: uuidv7(),
+    collected_at: toLocalDateTimeInput(now.toISOString()),
+    created_at: "",
+    updated_at: "",
+    source_type: "survey",
+    source_id: "",
+    source_name: "",
+    field_id: "",
+    field_label: "",
+    field_type: "text",
+    field_group_id: "",
+    field_group_label: "",
+    value_text: "",
+    value_number: "",
+    value_boolean: undefined,
+    value_date: "",
+    language: "",
+    user_identifier: "",
+    metadataEntries: [],
+  };
+};
+
+export const mapRecordToValues = (record: FeedbackRecordData): TFeedbackRecordFormValues => {
+  const metadataEntries = Object.entries(record.metadata ?? {})
+    .filter(([, value]) => typeof value === "string")
+    .map(([key, value]) => ({
+      key,
+      value: value as string,
+    }));
+
+  return {
+    id: record.id,
+    tenant_id: record.tenant_id,
+    submission_id: record.submission_id,
+    collected_at: toLocalDateTimeInput(record.collected_at),
+    created_at: record.created_at ? toLocalDateTimeInput(record.created_at) : "",
+    updated_at: record.updated_at ? toLocalDateTimeInput(record.updated_at) : "",
+    source_type: record.source_type,
+    source_id: record.source_id ?? "",
+    source_name: record.source_name ?? "",
+    field_id: record.field_id,
+    field_label: record.field_label ?? "",
+    field_type: record.field_type,
+    field_group_id: record.field_group_id ?? "",
+    field_group_label: record.field_group_label ?? "",
+    value_text: record.value_text ?? "",
+    value_number: record.value_number == null ? "" : String(record.value_number),
+    value_boolean: record.value_boolean,
+    value_date: record.value_date ? toLocalDateTimeInput(record.value_date) : "",
+    language: record.language ?? "",
+    user_identifier: record.user_identifier ?? "",
+    metadataEntries,
+  };
+};
+
+export const getReadOnlyMetadataEntries = (record: FeedbackRecordData): { key: string; value: string }[] => {
+  return Object.entries(record.metadata ?? {})
+    .filter(([, value]) => typeof value !== "string")
+    .map(([key, value]) => ({
+      key,
+      value: JSON.stringify(value),
+    }));
+};
+
+export const parseNumberValue = (value: string): number | null => {
+  if (value.trim() === "") return null;
+  const parsed = Number(value);
+  return Number.isFinite(parsed) ? parsed : null;
+};
+
+export const isPresetSourceType = (value: string): value is (typeof SOURCE_TYPE_PRESET_OPTIONS)[number] =>
+  (SOURCE_TYPE_PRESET_OPTIONS as readonly string[]).includes(value);
+
+export const formatSourceType = (sourceType: string, t: TFunction): string => {
+  switch (sourceType) {
+    case "formbricks":
+    case "formbricks_survey":
+      return t("workspace.unify.formbricks_surveys");
+    case "csv":
+      return t("workspace.unify.csv_import");
+    default:
+      return sourceType;
+  }
+};
@@ -4,7 +4,7 @@ import { getTranslate } from "@/lingodotdev/server";
 import { getFeedbackRecordDirectoriesByWorkspaceId } from "@/modules/ee/feedback-record-directory/lib/feedback-record-directory";
 import { listFeedbackRecords } from "@/modules/hub/service";
 import { getWorkspaceAuth } from "@/modules/workspaces/lib/utils";
-import { FeedbackRecordsPageClient } from "./feedback-records-page-client";
+import { FeedbackRecordsPageClient } from "./components/feedback-records-page-client";

 const INITIAL_PAGE_SIZE = 50;

@@ -41,7 +41,7 @@ export default async function UnifyFeedbackRecordsPage(

  const merged = successfulResults
    .flatMap((r) => r.data?.data ?? [])
-    .sort((a, b) => (a.collected_at < b.collected_at ? 1 : -1))
+    .toSorted((a, b) => (a.collected_at < b.collected_at ? 1 : -1))
    .slice(0, INITIAL_PAGE_SIZE);

  const frdMap = Object.fromEntries(frds.map((f) => [f.id, f.name]));
@@ -173,16 +173,11 @@ export function ConnectorsSection({
      <SettingsCard
        title={t("workspace.unify.feedback_sources")}
        description={t("workspace.unify.feedback_sources_settings_description")}
-        cta={
-          <CreateConnectorModal
-            open={isCreateModalOpen}
-            onOpenChange={setIsCreateModalOpen}
-            onCreateConnector={handleCreateConnector}
-            surveys={initialSurveys}
-            workspaceId={workspaceId}
-            directories={directories}
-          />
-        }>
+        buttonInfo={{
+          text: t("workspace.unify.add_source"),
+          onClick: () => setIsCreateModalOpen(true),
+          variant: "default",
+        }}>
        <ConnectorsTable
          connectors={initialConnectors}
          onConnectorClick={setEditingConnector}
@@ -204,6 +199,16 @@ export function ConnectorsSection({
        )}
      </SettingsCard>

+      <CreateConnectorModal
+        open={isCreateModalOpen}
+        onOpenChange={setIsCreateModalOpen}
+        onCreateConnector={handleCreateConnector}
+        surveys={initialSurveys}
+        workspaceId={workspaceId}
+        directories={directories}
+        showTrigger={false}
+      />
+
      <EditConnectorModal
        connector={editingConnector}
        open={editingConnector !== null}
@@ -71,7 +71,7 @@ export function ConnectorsTableDataRow({
        }
        return t("workspace.unify.status_live_sync");
      case "paused":
-        return t("workspace.unify.status_paused");
+        return t("common.disabled");
      case "error":
        return t("workspace.unify.status_error");
    }
@@ -27,7 +27,7 @@ export function ConnectorsTable({
  const { t } = useTranslation();

  return (
-    <div className="rounded-xl border border-slate-200 bg-white shadow-sm">
+    <div className="overflow-hidden rounded-xl border border-slate-200 bg-white shadow-sm">
      <div className="grid h-12 grid-cols-12 content-center border-b border-slate-200 text-left text-sm font-semibold text-slate-900">
        <div className="col-span-1 pl-6">{t("common.type")}</div>
        <div className="col-span-5">{t("common.name")}</div>
@@ -42,14 +42,23 @@ import {
  SelectValue,
 } from "@/modules/ui/components/select";
 import { Switch } from "@/modules/ui/components/switch";
-import { TCreateConnectorStep, TFieldMapping, TSourceField, TUnifySurvey } from "../types";
+import {
+  TCreateConnectorStep,
+  TFieldMapping,
+  TFormbricksConnectorForm,
+  TSourceField,
+  TUnifySurvey,
+  ZFormbricksConnectorForm,
+} from "../types";
 import {
  TConnectorOptionId,
  TEnumValidationError,
+  areAllRequiredFieldsMapped,
+  isConnectorNameValid,
  parseCSVColumnsToFields,
+  toggleQuestionId,
  validateEnumMappings,
 } from "../utils";
-import { areAllRequiredFieldsMapped, isConnectorNameValid } from "./connector-form-utils";
 import { ConnectorTypeSelector } from "./connector-type-selector";
 import { CsvConnectorUI } from "./csv-connector-ui";
 import { FormbricksQuestionList } from "./formbricks-question-list";
@@ -57,6 +66,7 @@ import { FormbricksQuestionList } from "./formbricks-question-list";
 interface CreateConnectorModalProps {
  open: boolean;
  onOpenChange: (open: boolean) => void;
+  showTrigger?: boolean;
  onCreateConnector: (data: {
    name: string;
    type: TConnectorType;
@@ -99,15 +109,6 @@ const getNextStepButtonLabel = (type: TConnectorOptionId | null, t: (key: string
  return t("workspace.unify.create_mapping");
 };

-const ZFormbricksConnectorForm = z.object({
-  sourceName: z.string().trim().min(1),
-  surveyId: z.string().min(1),
-  selectedQuestionIds: z.array(z.string()).min(1),
-  importHistorical: z.boolean(),
-});
-
-type TFormbricksConnectorForm = z.infer<typeof ZFormbricksConnectorForm>;
-
 const getSelectableQuestionIds = (survey: TUnifySurvey): string[] =>
  survey.elements
    .filter((element) => !(UNSUPPORTED_CONNECTOR_ELEMENT_TYPES as readonly string[]).includes(element.type))
@@ -116,6 +117,7 @@ const getSelectableQuestionIds = (survey: TUnifySurvey): string[] =>
 export const CreateConnectorModal = ({
  open,
  onOpenChange,
+  showTrigger = true,
  onCreateConnector,
  surveys,
  workspaceId,
@@ -319,11 +321,7 @@ export const CreateConnectorModal = ({
  };

  const handleFormbricksQuestionToggle = (questionId: string) => {
-    const currentSelection = formbricksForm.getValues("selectedQuestionIds");
-    const isSelected = currentSelection.includes(questionId);
-    const nextSelection = isSelected
-      ? currentSelection.filter((id) => id !== questionId)
-      : [...currentSelection, questionId];
+    const nextSelection = toggleQuestionId(formbricksForm.getValues("selectedQuestionIds"), questionId);
    formbricksForm.setValue("selectedQuestionIds", nextSelection, {
      shouldDirty: true,
      shouldValidate: true,
@@ -391,10 +389,12 @@ export const CreateConnectorModal = ({

  return (
    <>
-      <Button onClick={() => onOpenChange(true)} size="sm">
-        {t("workspace.unify.add_source")}
-        <PlusIcon className="ml-2 h-4 w-4" />
-      </Button>
+      {showTrigger && (
+        <Button onClick={() => onOpenChange(true)} size="sm">
+          {t("workspace.unify.add_source")}
+          <PlusIcon className="ml-2 h-4 w-4" />
+        </Button>
+      )}

      <Dialog open={open} onOpenChange={handleOpenChange}>
        <DialogContent className="max-w-3xl">
@@ -4,7 +4,6 @@ import { zodResolver } from "@hookform/resolvers/zod";
 import { useEffect, useMemo, useState } from "react";
 import { useForm } from "react-hook-form";
 import { useTranslation } from "react-i18next";
-import { z } from "zod";
 import { TConnectorWithMappings } from "@formbricks/types/connector";
 import { Button } from "@/modules/ui/components/button";
 import {
@@ -24,6 +23,7 @@ import {
  FormProvider,
 } from "@/modules/ui/components/form";
 import { Input } from "@/modules/ui/components/input";
+import { Label } from "@/modules/ui/components/label";
 import {
  Select,
  SelectContent,
@@ -31,10 +31,21 @@ import {
  SelectTrigger,
  SelectValue,
 } from "@/modules/ui/components/select";
-import { SAMPLE_CSV_COLUMNS, TFieldMapping, TSourceField, TUnifySurvey } from "../types";
-import { parseCSVColumnsToFields } from "../utils";
+import {
+  SAMPLE_CSV_COLUMNS,
+  TFieldMapping,
+  TFormbricksConnectorForm,
+  TSourceField,
+  TUnifySurvey,
+  ZFormbricksConnectorForm,
+} from "../types";
+import {
+  areAllRequiredFieldsMapped,
+  isConnectorNameValid,
+  parseCSVColumnsToFields,
+  toggleQuestionId,
+} from "../utils";
 import { getConnectorIcon, getConnectorTypeLabelKey } from "./connector-display";
-import { areAllRequiredFieldsMapped, isConnectorNameValid } from "./connector-form-utils";
 import { FormbricksQuestionList } from "./formbricks-question-list";
 import { MappingUI } from "./mapping-ui";

@@ -53,15 +64,6 @@ interface EditConnectorModalProps {
  onOpenCsvImport?: () => void;
 }

-const ZFormbricksEditConnectorForm = z.object({
-  sourceName: z.string().trim().min(1),
-  surveyId: z.string().min(1),
-  selectedQuestionIds: z.array(z.string()).min(1),
-  importHistorical: z.boolean(),
-});
-
-type TFormbricksEditConnectorForm = z.infer<typeof ZFormbricksEditConnectorForm>;
-
 export const EditConnectorModal = ({
  connector,
  open,
@@ -76,8 +78,8 @@ export const EditConnectorModal = ({
  const [sourceFields, setSourceFields] = useState<TSourceField[]>([]);
  const [isUpdating, setIsUpdating] = useState(false);

-  const formbricksForm = useForm<TFormbricksEditConnectorForm>({
-    resolver: zodResolver(ZFormbricksEditConnectorForm),
+  const formbricksForm = useForm<TFormbricksConnectorForm>({
+    resolver: zodResolver(ZFormbricksConnectorForm),
    defaultValues: {
      sourceName: "",
      surveyId: "",
@@ -169,7 +171,7 @@ export const EditConnectorModal = ({
    onOpenChange(newOpen);
  };

-  const handleUpdateFormbricksConnector = async (values: TFormbricksEditConnectorForm) => {
+  const handleUpdateFormbricksConnector = async (values: TFormbricksConnectorForm) => {
    if (connector?.type !== "formbricks_survey") return;
    setIsUpdating(true);
    await onUpdateConnector({
@@ -198,11 +200,7 @@ export const EditConnectorModal = ({
  };

  const handleFormbricksQuestionToggle = (questionId: string) => {
-    const currentSelection = formbricksForm.getValues("selectedQuestionIds");
-    const isSelected = currentSelection.includes(questionId);
-    const nextSelection = isSelected
-      ? currentSelection.filter((id) => id !== questionId)
-      : [...currentSelection, questionId];
+    const nextSelection = toggleQuestionId(formbricksForm.getValues("selectedQuestionIds"), questionId);
    formbricksForm.setValue("selectedQuestionIds", nextSelection, {
      shouldDirty: true,
      shouldValidate: true,
@@ -324,9 +322,7 @@ export const EditConnectorModal = ({
              </div>

              <div className="space-y-2">
-                <label htmlFor="editConnectorName" className="text-sm font-medium text-slate-700">
-                  {t("workspace.unify.source_name")}
-                </label>
+                <Label htmlFor="editConnectorName">{t("workspace.unify.source_name")}</Label>
                <Input
                  id="editConnectorName"
                  value={csvConnectorName}
@@ -80,6 +80,14 @@ export const FEEDBACK_RECORD_FIELDS: TTargetField[] = [
    required: false,
    description: "Tenant/organization identifier for multi-tenant deployments",
  },
+  {
+    id: "submission_id",
+    name: "Submission ID",
+    type: "string",
+    required: false,
+    description:
+      "Optional. Map to a stable column (e.g. order_id, ticket_id) to enable idempotent re-imports. Auto-generated UUID per row if unmapped.",
+  },
  {
    id: "source_id",
    name: "Source ID",
@@ -210,3 +218,12 @@ export const createFeedbackCSVDataSchema = (t: TFunction) =>
 export type TFeedbackCSVData = z.infer<ReturnType<typeof createFeedbackCSVDataSchema>>;

 export type TCreateConnectorStep = "selectType" | "mapping";
+
+export const ZFormbricksConnectorForm = z.object({
+  sourceName: z.string().trim().min(1),
+  surveyId: z.string().min(1),
+  selectedQuestionIds: z.array(z.string()).min(1),
+  importHistorical: z.boolean(),
+});
+
+export type TFormbricksConnectorForm = z.infer<typeof ZFormbricksConnectorForm>;
@@ -1,6 +1,13 @@
 import { describe, expect, test } from "vitest";
-import { MAX_CSV_VALUES, TSourceField } from "./types";
-import { getConnectorOptions, parseCSVColumnsToFields, validateCsvFile } from "./utils";
+import { MAX_CSV_VALUES, TFieldMapping, TSourceField } from "./types";
+import {
+  areAllRequiredFieldsMapped,
+  getConnectorOptions,
+  isConnectorNameValid,
+  parseCSVColumnsToFields,
+  toggleQuestionId,
+  validateCsvFile,
+} from "./utils";

 const mockT = (key: string) => key;

@@ -115,3 +122,111 @@ describe("validateCsvFile", () => {
    expect(result).toEqual({ valid: false, error: "workspace.unify.csv_files_only" });
  });
 });
+
+describe("isConnectorNameValid", () => {
+  test("returns true for non-empty name", () => {
+    expect(isConnectorNameValid("My Connector")).toBe(true);
+  });
+
+  test("returns false for empty string", () => {
+    expect(isConnectorNameValid("")).toBe(false);
+  });
+
+  test("returns false for whitespace-only string", () => {
+    expect(isConnectorNameValid("   ")).toBe(false);
+    expect(isConnectorNameValid("\t\n  ")).toBe(false);
+  });
+
+  test("returns true for name with surrounding whitespace", () => {
+    expect(isConnectorNameValid("  name  ")).toBe(true);
+  });
+
+  test("returns true for single character", () => {
+    expect(isConnectorNameValid("a")).toBe(true);
+  });
+});
+
+describe("areAllRequiredFieldsMapped", () => {
+  const requiredMappings: TFieldMapping[] = [
+    { targetFieldId: "collected_at", sourceFieldId: "ts" },
+    { targetFieldId: "source_type", staticValue: "csv" },
+    { targetFieldId: "field_id", sourceFieldId: "qid" },
+    { targetFieldId: "field_type", staticValue: "text" },
+  ];
+
+  test("returns true when all required fields have a sourceFieldId or staticValue", () => {
+    expect(areAllRequiredFieldsMapped(requiredMappings)).toBe(true);
+  });
+
+  test("returns false when a required field is missing entirely", () => {
+    const missing = requiredMappings.slice(0, 3);
+    expect(areAllRequiredFieldsMapped(missing)).toBe(false);
+  });
+
+  test("returns false when a required mapping has neither sourceFieldId nor staticValue", () => {
+    const incomplete: TFieldMapping[] = [...requiredMappings.slice(0, 3), { targetFieldId: "field_type" }];
+    expect(areAllRequiredFieldsMapped(incomplete)).toBe(false);
+  });
+
+  test("ignores mappings for non-required target fields", () => {
+    const withOptionals: TFieldMapping[] = [
+      ...requiredMappings,
+      { targetFieldId: "tenant_id", sourceFieldId: "tenant" },
+      { targetFieldId: "unknown_field", sourceFieldId: "anything" },
+    ];
+    expect(areAllRequiredFieldsMapped(withOptionals)).toBe(true);
+  });
+
+  test("returns false for empty mappings array", () => {
+    expect(areAllRequiredFieldsMapped([])).toBe(false);
+  });
+
+  test("treats empty staticValue and missing sourceFieldId as unmapped", () => {
+    const incomplete: TFieldMapping[] = [
+      { targetFieldId: "collected_at", sourceFieldId: "ts" },
+      { targetFieldId: "source_type", sourceFieldId: "", staticValue: "" },
+      { targetFieldId: "field_id", sourceFieldId: "qid" },
+      { targetFieldId: "field_type", staticValue: "text" },
+    ];
+    expect(areAllRequiredFieldsMapped(incomplete)).toBe(false);
+  });
+
+  test("counts required field as mapped when only staticValue is set", () => {
+    const onlyStatic: TFieldMapping[] = [
+      { targetFieldId: "collected_at", staticValue: "2026-01-01" },
+      { targetFieldId: "source_type", staticValue: "csv" },
+      { targetFieldId: "field_id", staticValue: "id" },
+      { targetFieldId: "field_type", staticValue: "text" },
+    ];
+    expect(areAllRequiredFieldsMapped(onlyStatic)).toBe(true);
+  });
+});
+
+describe("toggleQuestionId", () => {
+  test("adds id when not present", () => {
+    expect(toggleQuestionId(["a", "b"], "c")).toEqual(["a", "b", "c"]);
+  });
+
+  test("removes id when present", () => {
+    expect(toggleQuestionId(["a", "b", "c"], "b")).toEqual(["a", "c"]);
+  });
+
+  test("adds to empty selection", () => {
+    expect(toggleQuestionId([], "x")).toEqual(["x"]);
+  });
+
+  test("returns empty when removing the only id", () => {
+    expect(toggleQuestionId(["only"], "only")).toEqual([]);
+  });
+
+  test("does not mutate the input array", () => {
+    const input = ["a", "b"];
+    const result = toggleQuestionId(input, "c");
+    expect(input).toEqual(["a", "b"]);
+    expect(result).not.toBe(input);
+  });
+
+  test("removes only the matching id when duplicates exist", () => {
+    expect(toggleQuestionId(["a", "b", "a"], "a")).toEqual(["b"]);
+  });
+});
@@ -90,6 +90,32 @@ export const validateEnumMappings = (
  return errors;
 };

+export const isConnectorNameValid = (name: string): boolean => name.trim().length > 0;
+
+export const areAllRequiredFieldsMapped = (mappings: TFieldMapping[]): boolean => {
+  const requiredFieldIds = new Set(
+    FEEDBACK_RECORD_FIELDS.filter((field) => field.required).map((field) => field.id)
+  );
+
+  for (const mapping of mappings) {
+    if (!requiredFieldIds.has(mapping.targetFieldId)) {
+      continue;
+    }
+
+    if (mapping.sourceFieldId || mapping.staticValue) {
+      requiredFieldIds.delete(mapping.targetFieldId);
+    }
+  }
+
+  return requiredFieldIds.size === 0;
+};
+
+export const toggleQuestionId = (currentSelection: string[], questionId: string): string[] => {
+  return currentSelection.includes(questionId)
+    ? currentSelection.filter((id) => id !== questionId)
+    : [...currentSelection, questionId];
+};
+
 export const validateCsvFile = (
  file: File,
  t: TFunction
@@ -1,318 +0,0 @@
-import { PipelineTriggers, Webhook } from "@prisma/client";
-import { headers } from "next/headers";
-import { v7 as uuidv7 } from "uuid";
-import { prisma } from "@formbricks/database";
-import { logger } from "@formbricks/logger";
-import { ResourceNotFoundError } from "@formbricks/types/errors";
-import { sendTelemetryEvents } from "@/app/api/(internal)/pipeline/lib/telemetry";
-import { ZPipelineInput } from "@/app/api/(internal)/pipeline/types/pipelines";
-import { responses } from "@/app/lib/api/response";
-import { transformErrorToDetails } from "@/app/lib/api/validator";
-import { handleConnectorPipeline } from "@/lib/connector/pipeline-handler";
-import { CRON_SECRET, POSTHOG_KEY } from "@/lib/constants";
-import { generateStandardWebhookSignature } from "@/lib/crypto";
-import { getIntegrations } from "@/lib/integration/service";
-import { getOrganization } from "@/lib/organization/service";
-import { getResponseCountBySurveyId } from "@/lib/response/service";
-import { getSurvey, updateSurvey } from "@/lib/survey/service";
-import { convertDatesInObject } from "@/lib/time";
-import { getOrganizationIdFromWorkspaceId } from "@/lib/utils/helper";
-import { validateWebhookUrl } from "@/lib/utils/validate-webhook-url";
-import { queueAuditEvent } from "@/modules/ee/audit-logs/lib/handler";
-import { TAuditStatus, UNKNOWN_DATA } from "@/modules/ee/audit-logs/types/audit-log";
-import { recordResponseCreatedMeterEvent } from "@/modules/ee/billing/lib/metering";
-import { sendResponseFinishedEmail } from "@/modules/email";
-import { resolveStorageUrlsInObject } from "@/modules/storage/utils";
-import { sendFollowUpsForResponse } from "@/modules/survey/follow-ups/lib/follow-ups";
-import { FollowUpSendError } from "@/modules/survey/follow-ups/types/follow-up";
-import { handleIntegrations } from "./lib/handleIntegrations";
-import { captureSurveyResponsePostHogEvent } from "./lib/posthog";
-
-export const POST = async (request: Request) => {
-  const requestHeaders = await headers();
-  // Check authentication
-  if (requestHeaders.get("x-api-key") !== CRON_SECRET) {
-    return responses.notAuthenticatedResponse();
-  }
-
-  const jsonInput = await request.json();
-  const convertedJsonInput = convertDatesInObject(
-    jsonInput,
-    new Set(["contactAttributes", "variables", "data", "meta"])
-  );
-  const inputValidation = ZPipelineInput.safeParse(convertedJsonInput);
-
-  if (!inputValidation.success) {
-    logger.error(
-      { error: inputValidation.error, url: request.url },
-      "Error in POST /api/(internal)/pipeline"
-    );
-    return responses.badRequestResponse(
-      "Fields are missing or incorrectly formatted",
-      transformErrorToDetails(inputValidation.error),
-      true
-    );
-  }
-
-  const { workspaceId, surveyId, event, response } = inputValidation.data;
-
-  const organizationId = await getOrganizationIdFromWorkspaceId(workspaceId);
-  const organization = await getOrganization(organizationId);
-  if (!organization) {
-    throw new ResourceNotFoundError("Organization", "Organization not found");
-  }
-
-  // Fetch survey for webhook payload
-  const survey = await getSurvey(surveyId);
-  if (!survey) {
-    logger.error({ url: request.url, surveyId }, `Survey with id ${surveyId} not found`);
-
-    return responses.notFoundResponse("Survey", surveyId, true);
-  }
-
-  if (survey.workspaceId !== workspaceId) {
-    logger.error(
-      { url: request.url, surveyId, workspaceId, surveyWorkspaceId: survey.workspaceId },
-      `Survey ${surveyId} does not belong to workspace ${workspaceId}`
-    );
-    return responses.badRequestResponse("Survey not found in this workspace");
-  }
-
-  // Fetch webhooks
-  const getWebhooksForPipeline = async (workspaceId: string, event: PipelineTriggers, surveyId: string) => {
-    const webhooks = await prisma.webhook.findMany({
-      where: {
-        workspaceId,
-        triggers: { has: event },
-        OR: [{ surveyIds: { has: surveyId } }, { surveyIds: { isEmpty: true } }],
-      },
-    });
-    return webhooks;
-  };
-
-  const webhooks: Webhook[] = await getWebhooksForPipeline(workspaceId, event, surveyId);
-  // Prepare webhook and email promises
-
-  // Fetch with timeout of 5 seconds to prevent hanging
-  const fetchWithTimeout = (url: string, options: RequestInit, timeout: number = 5000): Promise<Response> => {
-    return Promise.race([
-      fetch(url, options),
-      new Promise<never>((_, reject) => setTimeout(() => reject(new Error("Timeout")), timeout)),
-    ]);
-  };
-
-  const resolvedResponseData = resolveStorageUrlsInObject(response.data);
-
-  const webhookPromises = webhooks.map((webhook) => {
-    const body = JSON.stringify({
-      webhookId: webhook.id,
-      event,
-      data: {
-        ...response,
-        data: resolvedResponseData,
-        survey: {
-          title: survey.name,
-          type: survey.type,
-          status: survey.status,
-          createdAt: survey.createdAt,
-          updatedAt: survey.updatedAt,
-        },
-      },
-    });
-
-    // Generate Standard Webhooks headers
-    const webhookMessageId = uuidv7();
-    const webhookTimestamp = Math.floor(Date.now() / 1000);
-
-    const requestHeaders: Record<string, string> = {
-      "content-type": "application/json",
-      "webhook-id": webhookMessageId,
-      "webhook-timestamp": webhookTimestamp.toString(),
-    };
-
-    // Add signature if webhook has a secret configured
-    if (webhook.secret) {
-      requestHeaders["webhook-signature"] = generateStandardWebhookSignature(
-        webhookMessageId,
-        webhookTimestamp,
-        body,
-        webhook.secret
-      );
-    }
-
-    return validateWebhookUrl(webhook.url)
-      .then(() =>
-        fetchWithTimeout(webhook.url, {
-          method: "POST",
-          headers: requestHeaders,
-          body,
-        })
-      )
-      .catch((error) => {
-        logger.error({ error, url: request.url }, `Webhook call to ${webhook.url} failed`);
-      });
-  });
-
-  if (event === "responseFinished") {
-    // Handle connector pipeline for Hub integration (only on responseFinished to avoid duplicates)
-    // This sends response data to the Hub for configured connectors
-    try {
-      await handleConnectorPipeline(response, survey, workspaceId);
-    } catch (error) {
-      // Log but don't throw - connector failures shouldn't break the main pipeline
-      logger.error({ error, surveyId, responseId: response.id }, "Connector pipeline failed");
-    }
-    // Fetch integrations and responseCount in parallel
-    const [integrations, responseCount] = await Promise.all([
-      getIntegrations(workspaceId),
-      getResponseCountBySurveyId(surveyId),
-    ]);
-
-    if (integrations.length > 0) {
-      await handleIntegrations(integrations, inputValidation.data, survey);
-    }
-
-    // Fetch users with notifications in a single query
-    const usersWithNotifications = await prisma.user.findMany({
-      where: {
-        memberships: {
-          some: {
-            organization: {
-              workspaces: {
-                some: {
-                  id: workspaceId,
-                },
-              },
-            },
-          },
-        },
-        OR: [
-          {
-            memberships: {
-              every: {
-                role: {
-                  in: ["owner", "manager"],
-                },
-              },
-            },
-          },
-          {
-            teamUsers: {
-              some: {
-                team: {
-                  workspaceTeams: {
-                    some: {
-                      workspace: {
-                        id: workspaceId,
-                      },
-                    },
-                  },
-                },
-              },
-            },
-          },
-        ],
-        notificationSettings: {
-          path: ["alert", surveyId],
-          equals: true,
-        },
-      },
-      select: { email: true, locale: true },
-    });
-
-    if (survey.followUps?.length > 0) {
-      // send follow up emails
-      const followUpsResult = await sendFollowUpsForResponse(response.id);
-      if (!followUpsResult.ok) {
-        const { error: followUpsError } = followUpsResult;
-        if (followUpsError.code !== FollowUpSendError.FOLLOW_UP_NOT_ALLOWED) {
-          logger.error({ error: followUpsError }, `Failed to send follow-up emails for survey ${surveyId}`);
-        }
-      }
-    }
-
-    const emailPromises = usersWithNotifications.map((user) =>
-      sendResponseFinishedEmail(user.email, user.locale, workspaceId, survey, response, responseCount).catch(
-        (error) => {
-          logger.error(
-            { error, url: request.url, userEmail: user.email },
-            `Failed to send email to ${user.email}`
-          );
-        }
-      )
-    );
-
-    // Update survey status if necessary
-    if (survey.autoComplete && responseCount >= survey.autoComplete) {
-      let logStatus: TAuditStatus = "success";
-
-      try {
-        await updateSurvey({
-          ...survey,
-          status: "completed",
-        });
-      } catch (error) {
-        logStatus = "failure";
-        logger.error(
-          { error, url: request.url, surveyId },
-          `Failed to update survey ${surveyId} status to completed`
-        );
-      } finally {
-        await queueAuditEvent({
-          status: logStatus,
-          action: "updated",
-          targetType: "survey",
-          userId: UNKNOWN_DATA,
-          userType: "system",
-          targetId: survey.id,
-          organizationId: organization.id,
-          newObject: {
-            status: "completed",
-          },
-        });
-      }
-    }
-
-    // Await webhook and email promises with allSettled to prevent early rejection
-    const results = await Promise.allSettled([...webhookPromises, ...emailPromises]);
-    results.forEach((result) => {
-      if (result.status === "rejected") {
-        logger.error({ error: result.reason, url: request.url }, "Promise rejected");
-      }
-    });
-  } else {
-    // Await webhook promises if no emails are sent (with allSettled to prevent early rejection)
-    const results = await Promise.allSettled(webhookPromises);
-    results.forEach((result) => {
-      if (result.status === "rejected") {
-        logger.error({ error: result.reason, url: request.url }, "Promise rejected");
-      }
-    });
-  }
-  if (event === "responseCreated") {
-    recordResponseCreatedMeterEvent({
-      stripeCustomerId: organization.billing.stripeCustomerId,
-      responseId: response.id,
-      createdAt: response.createdAt,
-    }).catch((error) => {
-      logger.error({ error, responseId: response.id }, "Failed to record response meter event");
-    });
-
-    if (POSTHOG_KEY) {
-      const responseCount = await getResponseCountBySurveyId(surveyId);
-
-      captureSurveyResponsePostHogEvent({
-        organizationId: organization.id,
-        surveyId,
-        surveyType: survey.type,
-        workspaceId,
-        responseCount,
-      });
-    }
-
-    // Send telemetry events
-    await sendTelemetryEvents();
-  }
-
-  return Response.json({ data: {} });
-};
@@ -1,12 +0,0 @@
-import { z } from "zod";
-import { ZWebhook } from "@formbricks/database/zod/webhooks";
-import { ZResponse } from "@formbricks/types/responses";
-
-export const ZPipelineInput = z.object({
-  event: ZWebhook.shape.triggers.element,
-  response: ZResponse,
-  workspaceId: z.string(),
-  surveyId: z.string(),
-});
-
-export type TPipelineInput = z.infer<typeof ZPipelineInput>;
@@ -0,0 +1,98 @@
+import { Prisma } from "@prisma/client";
+import { beforeEach, describe, expect, test, vi } from "vitest";
+import { prisma } from "@formbricks/database";
+import { DatabaseError, ResourceNotFoundError, ValidationError } from "@formbricks/types/errors";
+import { validateInputs } from "@/lib/utils/validate";
+import { getResponseIdByDisplayId } from "./response";
+
+vi.mock("@/lib/utils/validate", () => ({
+  validateInputs: vi.fn((inputs: [unknown, unknown][]) =>
+    inputs.map((input: [unknown, unknown]) => input[0])
+  ),
+}));
+
+vi.mock("@formbricks/database", () => ({
+  prisma: {
+    display: {
+      findFirst: vi.fn(),
+    },
+  },
+}));
+
+describe("getResponseIdByDisplayId", () => {
+  const workspaceId = "ws1234567890123456789012";
+  const displayId = "display1234567890123456789";
+
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  test("returns the linked responseId when a response exists", async () => {
+    vi.mocked(prisma.display.findFirst).mockResolvedValue({
+      response: {
+        id: "response123456789012345678",
+      },
+    } as any);
+
+    const result = await getResponseIdByDisplayId(workspaceId, displayId);
+
+    expect(validateInputs).toHaveBeenCalledWith(
+      [workspaceId, expect.any(Object)],
+      [displayId, expect.any(Object)]
+    );
+    expect(prisma.display.findFirst).toHaveBeenCalledWith({
+      where: {
+        id: displayId,
+        survey: {
+          workspaceId,
+        },
+      },
+      select: {
+        response: {
+          select: {
+            id: true,
+          },
+        },
+      },
+    });
+    expect(result).toEqual({ responseId: "response123456789012345678" });
+  });
+
+  test("returns null when the display exists but has no response", async () => {
+    vi.mocked(prisma.display.findFirst).mockResolvedValue({
+      response: null,
+    } as any);
+
+    await expect(getResponseIdByDisplayId(workspaceId, displayId)).resolves.toEqual({
+      responseId: null,
+    });
+  });
+
+  test("throws ResourceNotFoundError when the display does not exist in the workspace", async () => {
+    vi.mocked(prisma.display.findFirst).mockResolvedValue(null);
+
+    await expect(getResponseIdByDisplayId(workspaceId, displayId)).rejects.toThrow(
+      new ResourceNotFoundError("Display", displayId)
+    );
+  });
+
+  test("throws ValidationError when input validation fails", async () => {
+    const validationError = new ValidationError("Validation failed");
+    vi.mocked(validateInputs).mockImplementation(() => {
+      throw validationError;
+    });
+
+    await expect(getResponseIdByDisplayId(workspaceId, displayId)).rejects.toThrow(ValidationError);
+    expect(prisma.display.findFirst).not.toHaveBeenCalled();
+  });
+
+  test("throws DatabaseError on Prisma request errors", async () => {
+    const prismaError = new Prisma.PrismaClientKnownRequestError("Database error", {
+      code: "P2002",
+      clientVersion: "test",
+    });
+    vi.mocked(prisma.display.findFirst).mockRejectedValue(prismaError);
+
+    await expect(getResponseIdByDisplayId(workspaceId, displayId)).rejects.toThrow(DatabaseError);
+  });
+});
@@ -0,0 +1,44 @@
+import { Prisma } from "@prisma/client";
+import { prisma } from "@formbricks/database";
+import { ZId } from "@formbricks/types/common";
+import { DatabaseError, ResourceNotFoundError } from "@formbricks/types/errors";
+import { validateInputs } from "@/lib/utils/validate";
+
+export const getResponseIdByDisplayId = async (
+  workspaceId: string,
+  displayId: string
+): Promise<{ responseId: string | null }> => {
+  validateInputs([workspaceId, ZId], [displayId, ZId]);
+
+  try {
+    const display = await prisma.display.findFirst({
+      where: {
+        id: displayId,
+        survey: {
+          workspaceId,
+        },
+      },
+      select: {
+        response: {
+          select: {
+            id: true,
+          },
+        },
+      },
+    });
+
+    if (!display) {
+      throw new ResourceNotFoundError("Display", displayId);
+    }
+
+    return {
+      responseId: display.response?.id ?? null,
+    };
+  } catch (error) {
+    if (error instanceof Prisma.PrismaClientKnownRequestError) {
+      throw new DatabaseError(error.message);
+    }
+
+    throw error;
+  }
+};
@@ -0,0 +1,49 @@
+import { logger } from "@formbricks/logger";
+import { ResourceNotFoundError } from "@formbricks/types/errors";
+import { responses } from "@/app/lib/api/response";
+import { THandlerParams, withV1ApiWrapper } from "@/app/lib/api/with-api-logging";
+import { resolveClientApiIds } from "@/lib/utils/resolve-client-id";
+import { getResponseIdByDisplayId } from "./lib/response";
+
+export const OPTIONS = async (): Promise<Response> => {
+  return responses.successResponse({}, true);
+};
+
+export const GET = withV1ApiWrapper({
+  handler: async ({
+    req,
+    props,
+  }: THandlerParams<{ params: Promise<{ workspaceId: string; displayId: string }> }>) => {
+    const params = await props.params;
+
+    const resolved = await resolveClientApiIds(params.workspaceId);
+    if (!resolved) {
+      return {
+        response: responses.notFoundResponse("Workspace", params.workspaceId, true),
+      };
+    }
+    const { workspaceId } = resolved;
+
+    try {
+      const response = await getResponseIdByDisplayId(workspaceId, params.displayId);
+
+      return {
+        response: responses.successResponse(response, true),
+      };
+    } catch (error) {
+      if (error instanceof ResourceNotFoundError) {
+        return {
+          response: responses.notFoundResponse("Display", params.displayId, true),
+        };
+      }
+
+      logger.error(
+        { error, url: req.url, workspaceId, displayId: params.displayId },
+        "Error in GET /api/v1/client/[workspaceId]/displays/[displayId]/response"
+      );
+      return {
+        response: responses.internalServerErrorResponse("Something went wrong. Please try again."),
+      };
+    }
+  },
+});
@@ -33,10 +33,13 @@ vi.mock("@formbricks/logger", () => ({
 vi.mock("./data");
 vi.mock("@/app/lib/api/api-backwards-compat", () => ({
  addLegacyProjectOverwritesToList: vi.fn((surveys: unknown[]) =>
-    surveys.map((s: Record<string, unknown>) => ({
-      ...s,
-      projectOverwrites: s.workspaceOverwrites ?? null,
-    }))
+    surveys.map((survey) => {
+      const typedSurvey = survey as Record<string, unknown>;
+      return {
+        ...typedSurvey,
+        projectOverwrites: typedSurvey.workspaceOverwrites ?? null,
+      };
+    })
  ),
  addLegacyProjectToEnvironmentState: vi.fn((data: Record<string, unknown>) => ({
    ...data,
@@ -129,7 +132,7 @@ const mockActionClasses = [
    description: null,
    type: "code",
    noCodeConfig: null,
-    environmentId: workspaceId,
+    workspaceId,
    key: "action1",
  },
 ] as unknown as TActionClass[];
@@ -254,7 +254,7 @@ export const putResponseHandler = async ({

  const { quotaFull, ...responseData } = updatedResponse;

-  sendToPipeline({
+  await sendToPipeline({
    event: "responseUpdated",
    workspaceId: survey.workspaceId,
    surveyId: survey.id,
@@ -262,7 +262,7 @@ export const putResponseHandler = async ({
  });

  if (updatedResponse.finished) {
-    sendToPipeline({
+    await sendToPipeline({
      event: "responseFinished",
      workspaceId: survey.workspaceId,
      surveyId: survey.id,
@@ -126,7 +126,6 @@ export const POST = withV1ApiWrapper({
        response: responses.badRequestResponse(
          "Survey is part of another workspace",
          {
-            "survey.workspaceId": survey.workspaceId,
            workspaceId,
          },
          true
@@ -187,7 +186,7 @@ export const POST = withV1ApiWrapper({

    const { quotaFull, ...responseData } = response;

-    sendToPipeline({
+    await sendToPipeline({
      event: "responseCreated",
      workspaceId,
      surveyId: responseData.surveyId,
@@ -195,7 +194,7 @@ export const POST = withV1ApiWrapper({
    });

    if (responseInput.finished) {
-      sendToPipeline({
+      await sendToPipeline({
        event: "responseFinished",
        workspaceId,
        surveyId: responseData.surveyId,
@@ -15,20 +15,14 @@ const apiKeySelect = {
  lastUsedAt: true,
  apiKeyWorkspaces: {
    select: {
-      environment: {
+      workspace: {
        select: {
          id: true,
-          type: true,
+          legacyEnvironmentId: true,
          createdAt: true,
          updatedAt: true,
-          workspaceId: true,
+          name: true,
          appSetupCompleted: true,
-          workspace: {
-            select: {
-              id: true,
-              name: true,
-            },
-          },
        },
      },
      permission: true,
@@ -44,17 +38,13 @@ type ApiKeyData = {
  lastUsedAt: Date | null;
  apiKeyWorkspaces: Array<{
    permission: string;
-    environment: {
+    workspace: {
      id: string;
-      type: string;
+      legacyEnvironmentId: string | null;
      createdAt: Date;
      updatedAt: Date;
-      workspaceId: string;
+      name: string;
      appSetupCompleted: boolean;
-      workspace: {
-        id: string;
-        name: string;
-      };
    };
  }>;
 };
@@ -116,21 +106,24 @@ const updateApiKeyUsage = async (apiKeyId: string) => {
  });
 };

-const buildEnvironmentResponse = (apiKeyData: ApiKeyData) => {
-  const env = apiKeyData.apiKeyWorkspaces[0].environment;
+const buildWorkspaceResponse = (apiKeyData: ApiKeyData) => {
+  const workspace = apiKeyData.apiKeyWorkspaces[0].workspace;
  return Response.json({
-    id: env.id,
-    type: env.type,
-    createdAt: env.createdAt,
-    updatedAt: env.updatedAt,
-    appSetupCompleted: env.appSetupCompleted,
+    // Keep v1 payload shape stable while sourcing data from workspace.
+    id: workspace.legacyEnvironmentId ?? workspace.id,
+    type: "production",
+    createdAt: workspace.createdAt,
+    updatedAt: workspace.updatedAt,
+    appSetupCompleted: workspace.appSetupCompleted,
    workspace: {
-      id: env.workspaceId,
-      name: env.workspace.name,
+      id: workspace.id,
+      name: workspace.name,
    },
    // Backwards compat: old consumers expect project fields
-    projectId: env.workspaceId,
-    projectName: env.workspace.name,
+    project: {
+      id: workspace.id,
+      name: workspace.name,
+    },
  });
 };

@@ -157,14 +150,12 @@ const handleApiKeyAuthentication = async (apiKey: string) => {
    });
  }

-  const rateLimitError = await checkRateLimit(apiKeyData.id);
-  if (rateLimitError) return rateLimitError;
-
+  // Rate limiting for apiKey auth is enforced by Envoy in v5 — see envoy-rate-limit-coverage.ts
  if (!isValidApiKeyEnvironment(apiKeyData)) {
    return responses.badRequestResponse("You can't use this method with this API key");
  }

-  return buildEnvironmentResponse(apiKeyData);
+  return buildWorkspaceResponse(apiKeyData);
 };

 const handleSessionAuthentication = async () => {
@@ -169,7 +169,7 @@ export const PUT = withV1ApiWrapper({
        auditLog.newObject = updated;
      }

-      sendToPipeline({
+      await sendToPipeline({
        event: "responseUpdated",
        workspaceId: result.survey.workspaceId,
        surveyId: result.survey.id,
@@ -177,7 +177,7 @@ export const PUT = withV1ApiWrapper({
      });

      if (updated.finished) {
-        sendToPipeline({
+        await sendToPipeline({
          event: "responseFinished",
          workspaceId: result.survey.workspaceId,
          surveyId: result.survey.id,
@@ -73,7 +73,6 @@ const validateSurvey = async (responseInput: TResponseInput, workspaceId: string
      error: responses.badRequestResponse(
        "Survey is part of another workspace",
        {
-          "survey.workspaceId": survey.workspaceId,
          workspaceId,
        },
        true
@@ -166,7 +165,7 @@ export const POST = withV1ApiWrapper({
          auditLog.newObject = response;
        }

-        sendToPipeline({
+        await sendToPipeline({
          event: "responseCreated",
          workspaceId: surveyResult.survey.workspaceId,
          surveyId: response.surveyId,
@@ -174,7 +173,7 @@ export const POST = withV1ApiWrapper({
        });

        if (response.finished) {
-          sendToPipeline({
+          await sendToPipeline({
            event: "responseFinished",
            workspaceId: surveyResult.survey.workspaceId,
            surveyId: response.surveyId,
@@ -1,43 +1,16 @@
-import { Prisma } from "@prisma/client";
 import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
-import { prisma } from "@formbricks/database";
-import { logger } from "@formbricks/logger";
-import { DatabaseError } from "@formbricks/types/errors";
-import { validateInputs } from "@/lib/utils/validate";
 import { deleteSurvey } from "./surveys";

-vi.mock("@/lib/utils/validate", () => ({
-  validateInputs: vi.fn(),
+const { mockDeleteSharedSurvey } = vi.hoisted(() => ({
+  mockDeleteSharedSurvey: vi.fn(),
 }));
-vi.mock("@formbricks/database", () => ({
-  prisma: {
-    survey: {
-      delete: vi.fn(),
-    },
-    segment: {
-      delete: vi.fn(),
-    },
-  },
-}));
-vi.mock("@formbricks/logger", () => ({
-  logger: {
-    error: vi.fn(),
-  },
+
+vi.mock("@/modules/survey/lib/surveys", () => ({
+  deleteSurvey: mockDeleteSharedSurvey,
 }));

 const surveyId = "clq5n7p1q0000m7z0h5p6g3r2";
 const workspaceId = "clq5n7p1q0000m7z0h5p6g3r3";
-const segmentId = "clq5n7p1q0000m7z0h5p6g3r4";
-const actionClassId1 = "clq5n7p1q0000m7z0h5p6g3r5";
-const actionClassId2 = "clq5n7p1q0000m7z0h5p6g3r6";
-
-const mockDeletedSurveyAppPrivateSegment = {
-  id: surveyId,
-  workspaceId,
-  type: "app",
-  segment: { id: segmentId, isPrivate: true },
-  triggers: [{ actionClass: { id: actionClassId1 } }, { actionClass: { id: actionClassId2 } }],
-};

 const mockDeletedSurveyLink = {
  id: surveyId,
@@ -56,66 +29,20 @@ describe("deleteSurvey", () => {
    vi.clearAllMocks();
  });

-  test("should delete a link survey without a segment and revalidate caches", async () => {
-    vi.mocked(prisma.survey.delete).mockResolvedValue(mockDeletedSurveyLink as any);
+  test("delegates survey deletion to the shared service", async () => {
+    mockDeleteSharedSurvey.mockResolvedValue(mockDeletedSurveyLink);

    const deletedSurvey = await deleteSurvey(surveyId);

-    expect(validateInputs).toHaveBeenCalledWith([surveyId, expect.any(Object)]);
-    expect(prisma.survey.delete).toHaveBeenCalledWith({
-      where: { id: surveyId },
-      include: {
-        segment: true,
-        triggers: { include: { actionClass: true } },
-      },
-    });
-    expect(prisma.segment.delete).not.toHaveBeenCalled();
-
+    expect(mockDeleteSharedSurvey).toHaveBeenCalledWith(surveyId);
    expect(deletedSurvey).toEqual(mockDeletedSurveyLink);
  });

-  test("should handle PrismaClientKnownRequestError during survey deletion", async () => {
-    const prismaError = new Prisma.PrismaClientKnownRequestError("Record not found", {
-      code: "P2025",
-      clientVersion: "4.0.0",
-    });
-    vi.mocked(prisma.survey.delete).mockRejectedValue(prismaError);
-
-    await expect(deleteSurvey(surveyId)).rejects.toThrow(DatabaseError);
-    expect(logger.error).toHaveBeenCalledWith({ error: prismaError, surveyId }, "Error deleting survey");
-    expect(prisma.segment.delete).not.toHaveBeenCalled();
-  });
-
-  test("should handle PrismaClientKnownRequestError during segment deletion", async () => {
-    const prismaError = new Prisma.PrismaClientKnownRequestError("Foreign key constraint failed", {
-      code: "P2003",
-      clientVersion: "4.0.0",
-    });
-    vi.mocked(prisma.survey.delete).mockResolvedValue(mockDeletedSurveyAppPrivateSegment as any);
-    vi.mocked(prisma.segment.delete).mockRejectedValue(prismaError);
-
-    await expect(deleteSurvey(surveyId)).rejects.toThrow(DatabaseError);
-    expect(logger.error).toHaveBeenCalledWith({ error: prismaError, surveyId }, "Error deleting survey");
-    expect(prisma.segment.delete).toHaveBeenCalledWith({ where: { id: segmentId } });
-  });
-
-  test("should handle generic errors during deletion", async () => {
+  test("rethrows shared delete service errors", async () => {
    const genericError = new Error("Something went wrong");
-    vi.mocked(prisma.survey.delete).mockRejectedValue(genericError);
+    mockDeleteSharedSurvey.mockRejectedValue(genericError);

    await expect(deleteSurvey(surveyId)).rejects.toThrow(genericError);
-    expect(logger.error).not.toHaveBeenCalled();
-    expect(prisma.segment.delete).not.toHaveBeenCalled();
-  });
-
-  test("should throw validation error for invalid surveyId", async () => {
-    const invalidSurveyId = "invalid-id";
-    const validationError = new Error("Validation failed");
-    vi.mocked(validateInputs).mockImplementation(() => {
-      throw validationError;
-    });
-
-    await expect(deleteSurvey(invalidSurveyId)).rejects.toThrow(validationError);
-    expect(prisma.survey.delete).not.toHaveBeenCalled();
+    expect(mockDeleteSharedSurvey).toHaveBeenCalledWith(surveyId);
  });
 });
@@ -1,43 +1,3 @@
-import { Prisma } from "@prisma/client";
-import { z } from "zod";
-import { prisma } from "@formbricks/database";
-import { logger } from "@formbricks/logger";
-import { DatabaseError } from "@formbricks/types/errors";
-import { validateInputs } from "@/lib/utils/validate";
+import { deleteSurvey as deleteSharedSurvey } from "@/modules/survey/lib/surveys";

-export const deleteSurvey = async (surveyId: string) => {
-  validateInputs([surveyId, z.cuid2()]);
-
-  try {
-    const deletedSurvey = await prisma.survey.delete({
-      where: {
-        id: surveyId,
-      },
-      include: {
-        segment: true,
-        triggers: {
-          include: {
-            actionClass: true,
-          },
-        },
-      },
-    });
-
-    if (deletedSurvey.type === "app" && deletedSurvey.segment?.isPrivate) {
-      await prisma.segment.delete({
-        where: {
-          id: deletedSurvey.segment.id,
-        },
-      });
-    }
-
-    return deletedSurvey;
-  } catch (error) {
-    if (error instanceof Prisma.PrismaClientKnownRequestError) {
-      logger.error({ error, surveyId }, "Error deleting survey");
-      throw new DatabaseError(error.message);
-    }
-
-    throw error;
-  }
-};
+export const deleteSurvey = async (surveyId: string) => deleteSharedSurvey(surveyId);
@@ -1,5 +1,6 @@
 import { logger } from "@formbricks/logger";
 import { TAuthenticationApiKey } from "@formbricks/types/auth";
+import { ResourceNotFoundError } from "@formbricks/types/errors";
 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";
@@ -78,6 +79,12 @@ export const GET = withV1ApiWrapper({
        ),
      };
    } catch (error) {
+      if (error instanceof ResourceNotFoundError) {
+        return {
+          response: responses.notFoundResponse("Survey", params.surveyId),
+        };
+      }
+
      return {
        response: handleErrorResponse(error),
      };
@@ -1,141 +0,0 @@
-import * as Sentry from "@sentry/nextjs";
-import { type NextRequest } from "next/server";
-import { beforeEach, describe, expect, test, vi } from "vitest";
-
-const mocks = vi.hoisted(() => ({
-  applyIPRateLimit: vi.fn(),
-  getWorkspaceState: vi.fn(),
-  resolveClientApiIds: vi.fn(),
-  contextualLoggerError: vi.fn(),
-}));
-
-vi.mock("@/app/api/v1/client/[workspaceId]/environment/lib/environmentState", () => ({
-  getWorkspaceState: mocks.getWorkspaceState,
-}));
-
-vi.mock("@/lib/utils/resolve-client-id", () => ({
-  resolveClientApiIds: mocks.resolveClientApiIds,
-}));
-
-vi.mock("@/modules/core/rate-limit/helpers", () => ({
-  applyIPRateLimit: mocks.applyIPRateLimit,
-  applyRateLimit: vi.fn(),
-}));
-
-vi.mock("@/modules/core/rate-limit/rate-limit-configs", () => ({
-  rateLimitConfigs: {
-    api: {
-      client: { windowMs: 60000, max: 100 },
-      v1: { windowMs: 60000, max: 1000 },
-    },
-  },
-}));
-
-vi.mock("@sentry/nextjs", () => ({
-  captureException: vi.fn(),
-  withScope: vi.fn(),
-}));
-
-vi.mock("@formbricks/logger", () => ({
-  logger: {
-    withContext: vi.fn(() => ({
-      error: mocks.contextualLoggerError,
-      warn: vi.fn(),
-      info: vi.fn(),
-    })),
-    error: vi.fn(),
-    warn: vi.fn(),
-    info: vi.fn(),
-  },
-}));
-
-vi.mock("@/lib/constants", async (importOriginal) => {
-  const actual = await importOriginal<typeof import("@/lib/constants")>();
-  return {
-    ...actual,
-    AUDIT_LOG_ENABLED: false,
-    IS_PRODUCTION: true,
-    SENTRY_DSN: "test-dsn",
-    ENCRYPTION_KEY: "test-key",
-    REDIS_URL: "redis://localhost:6379",
-  };
-});
-
-const createMockRequest = (url: string, headers = new Map<string, string>()): NextRequest => {
-  const parsedUrl = new URL(url);
-
-  return {
-    method: "GET",
-    url,
-    headers: {
-      get: (key: string) => headers.get(key),
-    },
-    nextUrl: {
-      pathname: parsedUrl.pathname,
-    },
-  } as unknown as NextRequest;
-};
-
-describe("api/v2 client environment route", () => {
-  beforeEach(() => {
-    vi.clearAllMocks();
-    mocks.applyIPRateLimit.mockResolvedValue(undefined);
-    mocks.resolveClientApiIds.mockResolvedValue({ workspaceId: "ck12345678901234567890123" });
-  });
-
-  test("reports v1-backed failures as v2 and keeps the response payload unchanged", async () => {
-    const underlyingError = new Error("Environment load failed");
-    mocks.getWorkspaceState.mockRejectedValue(underlyingError);
-
-    const request = createMockRequest(
-      "https://api.test/api/v2/client/ck12345678901234567890123/environment",
-      new Map([["x-request-id", "req-v2-env"]])
-    );
-
-    const { GET } = await import("../../../../v1/client/[workspaceId]/environment/route");
-    const response = await GET(request, {
-      params: Promise.resolve({
-        workspaceId: "ck12345678901234567890123",
-      }),
-    });
-
-    expect(response.status).toBe(500);
-    expect(await response.json()).toEqual({
-      code: "internal_server_error",
-      message: "An error occurred while processing your request.",
-      details: {},
-    });
-
-    expect(Sentry.withScope).not.toHaveBeenCalled();
-    expect(Sentry.captureException).toHaveBeenCalledWith(
-      underlyingError,
-      expect.objectContaining({
-        tags: expect.objectContaining({
-          apiVersion: "v2",
-          correlationId: "req-v2-env",
-          method: "GET",
-          path: "/api/v2/client/ck12345678901234567890123/environment",
-        }),
-        extra: expect.objectContaining({
-          error: expect.objectContaining({
-            name: "Error",
-            message: "Environment load failed",
-          }),
-          originalError: expect.objectContaining({
-            name: "Error",
-            message: "Environment load failed",
-          }),
-        }),
-        contexts: expect.objectContaining({
-          apiRequest: expect.objectContaining({
-            apiVersion: "v2",
-            correlationId: "req-v2-env",
-            method: "GET",
-            path: "/api/v2/client/ck12345678901234567890123/environment",
-            status: 500,
-          }),
-        }),
-      })
-    );
-  });
-});
@@ -1,132 +0,0 @@
-import { beforeEach, describe, expect, test, vi } from "vitest";
-
-const mocks = vi.hoisted(() => ({
-  createDisplay: vi.fn(),
-  getIsContactsEnabled: vi.fn(),
-  getOrganizationIdFromWorkspaceId: vi.fn(),
-  reportApiError: vi.fn(),
-  resolveClientApiIds: vi.fn(),
-}));
-
-vi.mock("./lib/display", () => ({
-  createDisplay: mocks.createDisplay,
-}));
-
-vi.mock("@/modules/ee/license-check/lib/utils", () => ({
-  getIsContactsEnabled: mocks.getIsContactsEnabled,
-}));
-
-vi.mock("@/lib/utils/helper", () => ({
-  getOrganizationIdFromWorkspaceId: mocks.getOrganizationIdFromWorkspaceId,
-}));
-
-vi.mock("@/lib/utils/resolve-client-id", () => ({
-  resolveClientApiIds: mocks.resolveClientApiIds,
-}));
-
-vi.mock("@/app/lib/api/api-error-reporter", () => ({
-  reportApiError: mocks.reportApiError,
-}));
-
-const environmentId = "cld1234567890abcdef123456";
-const surveyId = "clg123456789012345678901234";
-
-describe("api/v2 client displays route", () => {
-  beforeEach(() => {
-    vi.clearAllMocks();
-    mocks.resolveClientApiIds.mockResolvedValue({ workspaceId: environmentId });
-    mocks.getOrganizationIdFromWorkspaceId.mockResolvedValue("org_123");
-    mocks.getIsContactsEnabled.mockResolvedValue(true);
-  });
-
-  test("returns a v2 bad request response for malformed JSON without reporting an internal error", async () => {
-    const request = new Request(`https://api.test/api/v2/client/${environmentId}/displays`, {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-      },
-      body: "{",
-    });
-
-    const { POST } = await import("./route");
-    const response = await POST(request, {
-      params: Promise.resolve({ workspaceId: environmentId }),
-    });
-
-    expect(response.status).toBe(400);
-    expect(await response.json()).toEqual(
-      expect.objectContaining({
-        code: "bad_request",
-        message: "Invalid JSON in request body",
-      })
-    );
-    expect(mocks.createDisplay).not.toHaveBeenCalled();
-    expect(mocks.reportApiError).not.toHaveBeenCalled();
-  });
-
-  test("reports unexpected createDisplay failures while keeping the response payload unchanged", async () => {
-    const underlyingError = new Error("display persistence failed");
-    mocks.createDisplay.mockRejectedValue(underlyingError);
-
-    const request = new Request(`https://api.test/api/v2/client/${environmentId}/displays`, {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-      },
-      body: JSON.stringify({
-        surveyId,
-      }),
-    });
-
-    const { POST } = await import("./route");
-    const response = await POST(request, {
-      params: Promise.resolve({ workspaceId: environmentId }),
-    });
-
-    expect(response.status).toBe(500);
-    expect(await response.json()).toEqual({
-      code: "internal_server_error",
-      message: "Something went wrong. Please try again.",
-      details: {},
-    });
-    expect(mocks.reportApiError).toHaveBeenCalledWith({
-      request,
-      status: 500,
-      error: underlyingError,
-    });
-  });
-
-  test("reports unexpected contact-license lookup failures with the same generic public response", async () => {
-    const underlyingError = new Error("license lookup failed");
-    mocks.getOrganizationIdFromWorkspaceId.mockRejectedValue(underlyingError);
-
-    const request = new Request(`https://api.test/api/v2/client/${environmentId}/displays`, {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-      },
-      body: JSON.stringify({
-        surveyId,
-        contactId: "clh123456789012345678901234",
-      }),
-    });
-
-    const { POST } = await import("./route");
-    const response = await POST(request, {
-      params: Promise.resolve({ workspaceId: environmentId }),
-    });
-
-    expect(response.status).toBe(500);
-    expect(await response.json()).toEqual({
-      code: "internal_server_error",
-      message: "Something went wrong. Please try again.",
-      details: {},
-    });
-    expect(mocks.reportApiError).toHaveBeenCalledWith({
-      request,
-      status: 500,
-      error: underlyingError,
-    });
-    expect(mocks.createDisplay).not.toHaveBeenCalled();
-  });
-});
@@ -2,7 +2,7 @@ import { Prisma } from "@prisma/client";
 import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
 import { prisma } from "@formbricks/database";
 import { TContactAttributes } from "@formbricks/types/contact-attribute";
-import { DatabaseError, ResourceNotFoundError } from "@formbricks/types/errors";
+import { DatabaseError, ResourceNotFoundError, UniqueConstraintError } from "@formbricks/types/errors";
 import { TResponseWithQuotaFull, TSurveyQuota } from "@formbricks/types/quota";
 import { TResponse } from "@formbricks/types/responses";
 import { TTag } from "@formbricks/types/tags";
@@ -178,10 +178,34 @@ describe("createResponse V2", () => {
    ).rejects.toThrow(ResourceNotFoundError);
  });

-  test("should throw DatabaseError on Prisma known request error", async () => {
-    const prismaError = new Prisma.PrismaClientKnownRequestError("Test Prisma Error", {
+  test("should throw UniqueConstraintError on P2002 with singleUseId target", async () => {
+    const prismaError = new Prisma.PrismaClientKnownRequestError("Unique constraint failed", {
      code: "P2002",
      clientVersion: "test",
+      meta: { target: ["surveyId", "singleUseId"] },
+    });
+    vi.mocked(mockTx.response.create).mockRejectedValue(prismaError);
+    await expect(
+      createResponse(mockResponseInput, mockTx as unknown as Prisma.TransactionClient)
+    ).rejects.toThrow(UniqueConstraintError);
+  });
+
+  test("should throw DatabaseError on P2002 without singleUseId target", async () => {
+    const prismaError = new Prisma.PrismaClientKnownRequestError("Unique constraint failed", {
+      code: "P2002",
+      clientVersion: "test",
+      meta: { target: ["displayId"] },
+    });
+    vi.mocked(mockTx.response.create).mockRejectedValue(prismaError);
+    await expect(
+      createResponse(mockResponseInput, mockTx as unknown as Prisma.TransactionClient)
+    ).rejects.toThrow(DatabaseError);
+  });
+
+  test("should throw DatabaseError on non-P2002 Prisma known request error", async () => {
+    const prismaError = new Prisma.PrismaClientKnownRequestError("Test Prisma Error", {
+      code: "P2025",
+      clientVersion: "test",
    });
    vi.mocked(mockTx.response.create).mockRejectedValue(prismaError);
    await expect(
@@ -2,7 +2,7 @@ import "server-only";
 import { Prisma } from "@prisma/client";
 import { prisma } from "@formbricks/database";
 import { TContactAttributes } from "@formbricks/types/contact-attribute";
-import { DatabaseError, ResourceNotFoundError } from "@formbricks/types/errors";
+import { DatabaseError, ResourceNotFoundError, UniqueConstraintError } from "@formbricks/types/errors";
 import { TResponseWithQuotaFull } from "@formbricks/types/quota";
 import { TResponse, ZResponseInput } from "@formbricks/types/responses";
 import { TTag } from "@formbricks/types/tags";
@@ -131,6 +131,13 @@ export const createResponse = async (
    return response;
  } catch (error) {
    if (error instanceof Prisma.PrismaClientKnownRequestError) {
+      if (error.code === "P2002") {
+        const target = (error.meta?.target as string[]) ?? [];
+        if (target?.includes("singleUseId")) {
+          throw new UniqueConstraintError("Response already submitted for this single-use link");
+        }
+      }
+
      throw new DatabaseError(error.message);
    }

@@ -92,6 +92,7 @@ const mockSurvey: TSurvey = {
  isCaptureIpEnabled: false,
  metadata: {},
  slug: null,
+  isAutoProgressingEnabled: true,
 };

 const mockResponseInput: TResponseInputV2 = {
@@ -126,7 +127,6 @@ describe("checkSurveyValidity", () => {
    expect(responses.badRequestResponse).toHaveBeenCalledWith(
      "Survey is part of another workspace",
      {
-        "survey.workspaceId": "ws-2",
        workspaceId: "ws-1",
      },
      true
@@ -20,7 +20,6 @@ export const checkSurveyValidity = async (
    return responses.badRequestResponse(
      "Survey is part of another workspace",
      {
-        "survey.workspaceId": survey.workspaceId,
        workspaceId,
      },
      true
@@ -1,150 +0,0 @@
-import { beforeEach, describe, expect, test, vi } from "vitest";
-
-const mocks = vi.hoisted(() => ({
-  checkSurveyValidity: vi.fn(),
-  createResponseWithQuotaEvaluation: vi.fn(),
-  getClientIpFromHeaders: vi.fn(),
-  getIsContactsEnabled: vi.fn(),
-  getOrganizationIdFromWorkspaceId: vi.fn(),
-  getSurvey: vi.fn(),
-  reportApiError: vi.fn(),
-  resolveClientApiIds: vi.fn(),
-  sendToPipeline: vi.fn(),
-  validateResponseData: vi.fn(),
-}));
-
-vi.mock("@/app/api/v2/client/[workspaceId]/responses/lib/utils", () => ({
-  checkSurveyValidity: mocks.checkSurveyValidity,
-}));
-
-vi.mock("./lib/response", () => ({
-  createResponseWithQuotaEvaluation: mocks.createResponseWithQuotaEvaluation,
-}));
-
-vi.mock("@/app/lib/api/api-error-reporter", () => ({
-  reportApiError: mocks.reportApiError,
-}));
-
-vi.mock("@/app/lib/pipelines", () => ({
-  sendToPipeline: mocks.sendToPipeline,
-}));
-
-vi.mock("@/lib/survey/service", () => ({
-  getSurvey: mocks.getSurvey,
-}));
-
-vi.mock("@/lib/utils/client-ip", () => ({
-  getClientIpFromHeaders: mocks.getClientIpFromHeaders,
-}));
-
-vi.mock("@/lib/utils/helper", () => ({
-  getOrganizationIdFromWorkspaceId: mocks.getOrganizationIdFromWorkspaceId,
-}));
-
-vi.mock("@/lib/utils/resolve-client-id", () => ({
-  resolveClientApiIds: mocks.resolveClientApiIds,
-}));
-
-vi.mock("@/modules/api/lib/validation", () => ({
-  formatValidationErrorsForV1Api: vi.fn((errors) => errors),
-  validateResponseData: mocks.validateResponseData,
-}));
-
-vi.mock("@/modules/ee/license-check/lib/utils", () => ({
-  getIsContactsEnabled: mocks.getIsContactsEnabled,
-}));
-
-const environmentId = "cld1234567890abcdef123456";
-const surveyId = "clg123456789012345678901234";
-
-describe("api/v2 client responses route", () => {
-  beforeEach(() => {
-    vi.clearAllMocks();
-    mocks.resolveClientApiIds.mockResolvedValue({ workspaceId: environmentId });
-    mocks.checkSurveyValidity.mockResolvedValue(null);
-    mocks.getSurvey.mockResolvedValue({
-      id: surveyId,
-      environmentId,
-      blocks: [],
-      questions: [],
-      isCaptureIpEnabled: false,
-    });
-    mocks.validateResponseData.mockReturnValue(null);
-    mocks.getOrganizationIdFromWorkspaceId.mockResolvedValue("org_123");
-    mocks.getIsContactsEnabled.mockResolvedValue(true);
-    mocks.getClientIpFromHeaders.mockResolvedValue("127.0.0.1");
-  });
-
-  test("reports unexpected response creation failures while keeping the public payload generic", async () => {
-    const underlyingError = new Error("response persistence failed");
-    mocks.createResponseWithQuotaEvaluation.mockRejectedValue(underlyingError);
-
-    const request = new Request(`https://api.test/api/v2/client/${environmentId}/responses`, {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-        "x-request-id": "req-v2-response",
-      },
-      body: JSON.stringify({
-        surveyId,
-        finished: false,
-        data: {},
-      }),
-    });
-
-    const { POST } = await import("./route");
-    const response = await POST(request, {
-      params: Promise.resolve({ workspaceId: environmentId }),
-    });
-
-    expect(response.status).toBe(500);
-    expect(await response.json()).toEqual({
-      code: "internal_server_error",
-      message: "Something went wrong. Please try again.",
-      details: {},
-    });
-    expect(mocks.reportApiError).toHaveBeenCalledWith({
-      request,
-      status: 500,
-      error: underlyingError,
-    });
-    expect(mocks.sendToPipeline).not.toHaveBeenCalled();
-  });
-
-  test("reports unexpected pre-persistence failures with the same generic public response", async () => {
-    const underlyingError = new Error("survey lookup failed");
-    mocks.getSurvey.mockRejectedValue(underlyingError);
-
-    const request = new Request(`https://api.test/api/v2/client/${environmentId}/responses`, {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-        "x-request-id": "req-v2-response-pre-check",
-      },
-      body: JSON.stringify({
-        surveyId,
-        finished: false,
-        data: {},
-      }),
-    });
-
-    const { POST } = await import("./route");
-    const response = await POST(request, {
-      params: Promise.resolve({ workspaceId: environmentId }),
-    });
-
-    expect(response.status).toBe(500);
-    expect(await response.json()).toEqual({
-      code: "internal_server_error",
-      message: "Something went wrong. Please try again.",
-      details: {},
-    });
-    expect(mocks.reportApiError).toHaveBeenCalledWith({
-      request,
-      status: 500,
-      error: underlyingError,
-    });
-    expect(mocks.createResponseWithQuotaEvaluation).not.toHaveBeenCalled();
-    expect(mocks.sendToPipeline).not.toHaveBeenCalled();
-  });
-});
@@ -1,5 +1,5 @@
 import { UAParser } from "ua-parser-js";
-import { InvalidInputError } from "@formbricks/types/errors";
+import { InvalidInputError, UniqueConstraintError } from "@formbricks/types/errors";
 import { TResponseWithQuotaFull } from "@formbricks/types/quota";
 import { checkSurveyValidity } from "@/app/api/v2/client/[workspaceId]/responses/lib/utils";
 import { reportApiError } from "@/app/lib/api/api-error-reporter";
@@ -164,6 +164,10 @@ const createResponseForRequest = async ({
      return responses.badRequestResponse(error.message, undefined, true);
    }

+    if (error instanceof UniqueConstraintError) {
+      return responses.conflictResponse(error.message, undefined, true);
+    }
+
    const response = getUnexpectedPublicErrorResponse();
    reportApiError({
      request,
@@ -233,7 +237,7 @@ export const POST = async (request: Request, context: Context): Promise<Response
    }
    const { quotaFull, ...responseData } = createdResponse;

-    sendToPipeline({
+    await sendToPipeline({
      event: "responseCreated",
      workspaceId,
      surveyId: responseData.surveyId,
@@ -241,7 +245,7 @@ export const POST = async (request: Request, context: Context): Promise<Response
    });

    if (responseData.finished) {
-      sendToPipeline({
+      await sendToPipeline({
        event: "responseFinished",
        workspaceId,
        surveyId: responseData.surveyId,
@@ -9,6 +9,22 @@ const { mockAuthenticateRequest, mockGetServerSession } = vi.hoisted(() => ({
  mockGetServerSession: vi.fn(),
 }));

+const { mockQueueAuditEvent, mockBuildAuditLogBaseObject } = vi.hoisted(() => ({
+  mockQueueAuditEvent: vi.fn().mockImplementation(async () => undefined),
+  mockBuildAuditLogBaseObject: vi.fn((action: string, targetType: string, apiUrl: string) => ({
+    action,
+    targetType,
+    userId: "unknown",
+    targetId: "unknown",
+    organizationId: "unknown",
+    status: "failure",
+    oldObject: undefined,
+    newObject: undefined,
+    userType: "api",
+    apiUrl,
+  })),
+}));
+
 vi.mock("next-auth", () => ({
  getServerSession: mockGetServerSession,
 }));
@@ -25,6 +41,14 @@ vi.mock("@/modules/core/rate-limit/helpers", () => ({
  applyRateLimit: vi.fn().mockResolvedValue(undefined),
 }));

+vi.mock("@/modules/ee/audit-logs/lib/handler", () => ({
+  queueAuditEvent: mockQueueAuditEvent,
+}));
+
+vi.mock("@/app/lib/api/with-api-logging", () => ({
+  buildAuditLogBaseObject: mockBuildAuditLogBaseObject,
+}));
+
 vi.mock("@formbricks/logger", () => ({
  logger: {
    withContext: vi.fn(() => ({
@@ -45,6 +69,114 @@ describe("withV3ApiWrapper", () => {
    vi.clearAllMocks();
  });

+  test("passes an audit log to the handler and queues success after the response", async () => {
+    const { queueAuditEvent } = await import("@/modules/ee/audit-logs/lib/handler");
+
+    mockGetServerSession.mockResolvedValue({
+      user: { id: "user_1", name: "Test", email: "t@example.com" },
+      expires: "2026-01-01",
+    });
+
+    const handler = vi.fn(async ({ auditLog }) => {
+      expect(auditLog).toEqual(
+        expect.objectContaining({
+          action: "deleted",
+          targetType: "survey",
+          userId: "user_1",
+          userType: "user",
+          status: "failure",
+        })
+      );
+
+      if (auditLog) {
+        auditLog.targetId = "survey_1";
+        auditLog.organizationId = "org_1";
+        auditLog.oldObject = { id: "survey_1" };
+      }
+
+      return Response.json({ ok: true });
+    });
+
+    const wrapped = withV3ApiWrapper({
+      auth: "both",
+      action: "deleted",
+      targetType: "survey",
+      handler,
+    });
+
+    const response = await wrapped(
+      new NextRequest("http://localhost/api/v3/surveys/survey_1", {
+        method: "DELETE",
+        headers: { "x-request-id": "req-audit" },
+      }),
+      {} as never
+    );
+
+    expect(response.status).toBe(200);
+    expect(queueAuditEvent).toHaveBeenCalledWith(
+      expect.objectContaining({
+        action: "deleted",
+        targetType: "survey",
+        targetId: "survey_1",
+        organizationId: "org_1",
+        userId: "user_1",
+        userType: "user",
+        status: "success",
+        oldObject: { id: "survey_1" },
+      })
+    );
+  });
+
+  test("queues a failure audit log when the handler returns a non-ok response", async () => {
+    const { queueAuditEvent } = await import("@/modules/ee/audit-logs/lib/handler");
+
+    mockAuthenticateRequest.mockResolvedValue({
+      type: "apiKey",
+      apiKeyId: "key_1",
+      organizationId: "org_1",
+      organizationAccess: { accessControl: { read: true, write: true } },
+      environmentPermissions: [],
+    });
+
+    const wrapped = withV3ApiWrapper({
+      auth: "both",
+      action: "deleted",
+      targetType: "survey",
+      handler: async ({ auditLog }) => {
+        if (auditLog) {
+          auditLog.targetId = "survey_2";
+        }
+
+        return new Response("forbidden", { status: 403 });
+      },
+    });
+
+    const response = await wrapped(
+      new NextRequest("http://localhost/api/v3/surveys/survey_2", {
+        method: "DELETE",
+        headers: {
+          "x-request-id": "req-failure-audit",
+          "x-api-key": "fbk_test",
+        },
+      }),
+      {} as never
+    );
+
+    expect(response.status).toBe(403);
+    expect(queueAuditEvent).toHaveBeenCalledWith(
+      expect.objectContaining({
+        action: "deleted",
+        targetType: "survey",
+        targetId: "survey_2",
+        organizationId: "org_1",
+        userId: "key_1",
+        userType: "api",
+        status: "failure",
+        eventId: "req-failure-audit",
+      })
+    );
+  });
+
  test("uses session auth first in both mode and injects request id into plain responses", async () => {
    const { applyRateLimit } = await import("@/modules/core/rate-limit/helpers");
    mockGetServerSession.mockResolvedValue({
@@ -4,10 +4,13 @@ import { z } from "zod";
 import { logger } from "@formbricks/logger";
 import { TooManyRequestsError } from "@formbricks/types/errors";
 import { authenticateRequest } from "@/app/api/v1/auth";
+import { buildAuditLogBaseObject } from "@/app/lib/api/with-api-logging";
 import { authOptions } from "@/modules/auth/lib/authOptions";
 import { applyRateLimit } from "@/modules/core/rate-limit/helpers";
 import { rateLimitConfigs } from "@/modules/core/rate-limit/rate-limit-configs";
 import type { TRateLimitConfig } from "@/modules/core/rate-limit/types/rate-limit";
+import { queueAuditEvent } from "@/modules/ee/audit-logs/lib/handler";
+import { TAuditAction, TAuditTarget } from "@/modules/ee/audit-logs/types/audit-log";
 import {
  type InvalidParam,
  problemBadRequest,
@@ -15,7 +18,7 @@ import {
  problemTooManyRequests,
  problemUnauthorized,
 } from "./response";
-import type { TV3Authentication } from "./types";
+import type { TV3AuditLog, TV3Authentication } from "./types";

 type TV3Schema = z.ZodTypeAny;
 type MaybePromise<T> = T | Promise<T>;
@@ -38,6 +41,7 @@ export type TV3HandlerParams<TParsedInput = Record<string, never>, TProps = unkn
  req: NextRequest;
  props: TProps;
  authentication: TV3Authentication;
+  auditLog?: TV3AuditLog;
  parsedInput: TParsedInput;
  requestId: string;
  instance: string;
@@ -48,6 +52,8 @@ export type TWithV3ApiWrapperParams<S extends TV3Schemas | undefined, TProps = u
  schemas?: S;
  rateLimit?: boolean;
  customRateLimitConfig?: TRateLimitConfig;
+  action?: TAuditAction;
+  targetType?: TAuditTarget;
  handler: (params: TV3HandlerParams<TV3ParsedInput<S>, TProps>) => MaybePromise<Response>;
 };

@@ -293,10 +299,61 @@ async function applyV3RateLimitOrRespond(params: {
  return null;
 }

+function buildV3AuditLog(
+  authentication: TV3Authentication,
+  action?: TAuditAction,
+  targetType?: TAuditTarget,
+  apiUrl?: string
+): TV3AuditLog | undefined {
+  if (!authentication || !action || !targetType || !apiUrl) {
+    return undefined;
+  }
+
+  const auditLog = buildAuditLogBaseObject(action, targetType, apiUrl);
+
+  if ("user" in authentication && authentication.user?.id) {
+    auditLog.userId = authentication.user.id;
+    auditLog.userType = "user";
+  } else if ("apiKeyId" in authentication) {
+    auditLog.userId = authentication.apiKeyId;
+    auditLog.userType = "api";
+    auditLog.organizationId = authentication.organizationId;
+  }
+
+  return auditLog;
+}
+
+async function queueV3AuditLog(
+  auditLog: TV3AuditLog | undefined,
+  requestId: string,
+  log: ReturnType<typeof logger.withContext>
+): Promise<void> {
+  if (!auditLog) {
+    return;
+  }
+
+  try {
+    await queueAuditEvent({
+      ...auditLog,
+      ...(auditLog.status === "failure" ? { eventId: auditLog.eventId ?? requestId } : {}),
+    });
+  } catch (error) {
+    log.error({ error }, "Failed to queue V3 audit event");
+  }
+}
+
 export const withV3ApiWrapper = <S extends TV3Schemas | undefined, TProps = unknown>(
  params: TWithV3ApiWrapperParams<S, TProps>
 ): ((req: NextRequest, props: TProps) => Promise<Response>) => {
-  const { auth = "both", schemas, rateLimit = true, customRateLimitConfig, handler } = params;
+  const {
+    auth = "both",
+    schemas,
+    rateLimit = true,
+    customRateLimitConfig,
+    handler,
+    action,
+    targetType,
+  } = params;

  return async (req: NextRequest, props: TProps): Promise<Response> => {
    const requestId = req.headers.get("x-request-id") ?? crypto.randomUUID();
@@ -306,6 +363,7 @@ export const withV3ApiWrapper = <S extends TV3Schemas | undefined, TProps = unkn
      method: req.method,
      path: instance,
    });
+    let auditLog: TV3AuditLog | undefined;

    try {
      const authResult = await authenticateV3RequestOrRespond(req, auth, requestId, instance);
@@ -331,17 +389,33 @@ export const withV3ApiWrapper = <S extends TV3Schemas | undefined, TProps = unkn
        return rateLimitResponse;
      }

+      auditLog = buildV3AuditLog(authResult.authentication, action, targetType, req.url);
+
      const response = await handler({
        req,
        props,
        authentication: authResult.authentication,
+        auditLog,
        parsedInput: parsedInputResult.parsedInput,
        requestId,
        instance,
      });

+      if (auditLog) {
+        if (response.ok) {
+          auditLog.status = "success";
+        } else {
+          auditLog.eventId = requestId;
+        }
+      }
+
+      await queueV3AuditLog(auditLog, requestId, log);
      return ensureRequestIdHeader(response, requestId);
    } catch (error) {
+      if (auditLog) {
+        auditLog.eventId = requestId;
+        await queueV3AuditLog(auditLog, requestId, log);
+      }
      log.error({ error, statusCode: 500 }, "V3 API unexpected error");
      return problemInternalError(requestId, "An unexpected error occurred.", instance);
    }
@@ -7,6 +7,7 @@ import {
  problemTooManyRequests,
  problemUnauthorized,
  successListResponse,
+  successResponse,
 } from "./response";

 describe("v3 problem responses", () => {
@@ -93,3 +94,27 @@ describe("successListResponse", () => {
    expect(res.headers.get("Cache-Control")).toBe("private, max-age=0");
  });
 });
+
+describe("successResponse", () => {
+  test("wraps the payload in a data envelope", async () => {
+    const res = successResponse({ id: "survey_1" }, { requestId: "req-success" });
+    expect(res.status).toBe(200);
+    expect(res.headers.get("X-Request-Id")).toBe("req-success");
+    expect(res.headers.get("Cache-Control")).toContain("no-store");
+    expect(await res.json()).toEqual({
+      data: { id: "survey_1" },
+    });
+  });
+
+  test("allows custom status and cache headers", async () => {
+    const res = successResponse(
+      { ok: true },
+      {
+        cache: "private, max-age=60",
+        status: 202,
+      }
+    );
+    expect(res.status).toBe(202);
+    expect(res.headers.get("Cache-Control")).toBe("private, max-age=60");
+  });
+});
@@ -147,3 +147,27 @@ export function successListResponse<T, TMeta extends Record<string, unknown>>(
  }
  return Response.json({ data, meta }, { status: 200, headers });
 }
+
+export function successResponse<T>(
+  data: T,
+  options?: { requestId?: string; cache?: string; status?: number }
+): Response {
+  const headers: Record<string, string> = {
+    "Content-Type": "application/json",
+    "Cache-Control": options?.cache ?? CACHE_NO_STORE,
+  };
+
+  if (options?.requestId) {
+    headers["X-Request-Id"] = options.requestId;
+  }
+
+  return Response.json(
+    {
+      data,
+    },
+    {
+      status: options?.status ?? 200,
+      headers,
+    }
+  );
+}
@@ -1,4 +1,6 @@
 import type { Session } from "next-auth";
 import type { TAuthenticationApiKey } from "@formbricks/types/auth";
+import type { TApiAuditLog } from "@/app/lib/api/with-api-logging";

 export type TV3Authentication = TAuthenticationApiKey | Session | null;
+export type TV3AuditLog = TApiAuditLog;
@@ -0,0 +1,318 @@
+import { ApiKeyPermission } from "@prisma/client";
+import { NextRequest } from "next/server";
+import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
+import { DatabaseError, ResourceNotFoundError } from "@formbricks/types/errors";
+import { requireV3WorkspaceAccess } from "@/app/api/v3/lib/auth";
+import { getSurvey } from "@/lib/survey/service";
+import { deleteSurvey } from "@/modules/survey/lib/surveys";
+import { DELETE } from "./route";
+
+const { mockAuthenticateRequest } = vi.hoisted(() => ({
+  mockAuthenticateRequest: vi.fn(),
+}));
+
+const { mockQueueAuditEvent, mockBuildAuditLogBaseObject } = vi.hoisted(() => ({
+  mockQueueAuditEvent: vi.fn().mockImplementation(async () => undefined),
+  mockBuildAuditLogBaseObject: vi.fn((action: string, targetType: string, apiUrl: string) => ({
+    action,
+    targetType,
+    userId: "unknown",
+    targetId: "unknown",
+    organizationId: "unknown",
+    status: "failure",
+    oldObject: undefined,
+    newObject: undefined,
+    userType: "api",
+    apiUrl,
+  })),
+}));
+
+vi.mock("next-auth", () => ({
+  getServerSession: vi.fn(),
+}));
+
+vi.mock("@/app/api/v1/auth", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("@/app/api/v1/auth")>();
+  return { ...actual, authenticateRequest: mockAuthenticateRequest };
+});
+
+vi.mock("@/modules/core/rate-limit/helpers", () => ({
+  applyRateLimit: vi.fn().mockResolvedValue(undefined),
+  applyIPRateLimit: vi.fn().mockResolvedValue(undefined),
+}));
+
+vi.mock("@/lib/constants", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("@/lib/constants")>();
+  return { ...actual, AUDIT_LOG_ENABLED: false };
+});
+
+vi.mock("@/app/api/v3/lib/auth", () => ({
+  requireV3WorkspaceAccess: vi.fn(),
+}));
+
+vi.mock("@/lib/survey/service", () => ({
+  getSurvey: vi.fn(),
+}));
+
+vi.mock("@/modules/survey/lib/surveys", () => ({
+  deleteSurvey: vi.fn(),
+}));
+
+vi.mock("@/modules/ee/audit-logs/lib/handler", () => ({
+  queueAuditEvent: mockQueueAuditEvent,
+}));
+
+vi.mock("@/app/lib/api/with-api-logging", () => ({
+  buildAuditLogBaseObject: mockBuildAuditLogBaseObject,
+}));
+
+vi.mock("@formbricks/logger", () => ({
+  logger: {
+    withContext: vi.fn(() => ({
+      warn: vi.fn(),
+      error: vi.fn(),
+    })),
+  },
+}));
+
+const getServerSession = vi.mocked((await import("next-auth")).getServerSession);
+const queueAuditEvent = vi.mocked((await import("@/modules/ee/audit-logs/lib/handler")).queueAuditEvent);
+
+const surveyId = "clxx1234567890123456789012";
+const workspaceId = "clzz9876543210987654321098";
+
+function createRequest(url: string, requestId?: string, extraHeaders?: Record<string, string>): NextRequest {
+  const headers: Record<string, string> = { ...extraHeaders };
+  if (requestId) {
+    headers["x-request-id"] = requestId;
+  }
+
+  return new NextRequest(url, {
+    method: "DELETE",
+    headers,
+  });
+}
+
+const apiKeyAuth = {
+  type: "apiKey" as const,
+  apiKeyId: "key_1",
+  organizationId: "org_1",
+  organizationAccess: {
+    accessControl: { read: true, write: true },
+  },
+  workspacePermissions: [
+    {
+      workspaceId,
+      workspaceName: "W",
+      permission: ApiKeyPermission.write,
+    },
+  ],
+};
+
+describe("DELETE /api/v3/surveys/[surveyId]", () => {
+  beforeEach(() => {
+    vi.resetAllMocks();
+    getServerSession.mockResolvedValue({
+      user: { id: "user_1", name: "User", email: "u@example.com" },
+      expires: "2026-01-01",
+    } as any);
+    mockAuthenticateRequest.mockResolvedValue(null);
+    vi.mocked(getSurvey).mockResolvedValue({
+      id: surveyId,
+      name: "Delete me",
+      workspaceId: workspaceId,
+      type: "link",
+      status: "draft",
+      createdAt: new Date("2026-04-15T10:00:00.000Z"),
+      updatedAt: new Date("2026-04-15T10:00:00.000Z"),
+      responseCount: 0,
+      creator: { name: "User" },
+      singleUse: null,
+    } as any);
+    vi.mocked(deleteSurvey).mockResolvedValue({
+      id: surveyId,
+      workspaceId,
+      type: "link",
+      segment: null,
+      triggers: [],
+    } as any);
+    vi.mocked(requireV3WorkspaceAccess).mockResolvedValue({
+      workspaceId,
+      organizationId: "org_1",
+    });
+  });
+
+  afterEach(() => {
+    vi.clearAllMocks();
+  });
+
+  test("returns 401 when no session and no API key", async () => {
+    getServerSession.mockResolvedValue(null);
+    mockAuthenticateRequest.mockResolvedValue(null);
+
+    const res = await DELETE(createRequest(`http://localhost/api/v3/surveys/${surveyId}`), {
+      params: Promise.resolve({ surveyId }),
+    } as never);
+
+    expect(res.status).toBe(401);
+    expect(vi.mocked(getSurvey)).not.toHaveBeenCalled();
+  });
+
+  test("returns 200 with session auth and deletes the survey", async () => {
+    const res = await DELETE(createRequest(`http://localhost/api/v3/surveys/${surveyId}`, "req-delete"), {
+      params: Promise.resolve({ surveyId }),
+    } as never);
+
+    expect(res.status).toBe(200);
+    expect(requireV3WorkspaceAccess).toHaveBeenCalledWith(
+      expect.objectContaining({ user: expect.any(Object) }),
+      workspaceId,
+      "readWrite",
+      "req-delete",
+      `/api/v3/surveys/${surveyId}`
+    );
+    expect(deleteSurvey).toHaveBeenCalledWith(surveyId);
+    expect(await res.json()).toEqual({
+      data: {
+        id: surveyId,
+      },
+    });
+  });
+
+  test("returns 200 with x-api-key when the key can delete in the survey workspace", async () => {
+    getServerSession.mockResolvedValue(null);
+    mockAuthenticateRequest.mockResolvedValue(apiKeyAuth as any);
+
+    const res = await DELETE(
+      createRequest(`http://localhost/api/v3/surveys/${surveyId}`, "req-api-key", {
+        "x-api-key": "fbk_test",
+      }),
+      {
+        params: Promise.resolve({ surveyId }),
+      } as never
+    );
+
+    expect(res.status).toBe(200);
+    expect(requireV3WorkspaceAccess).toHaveBeenCalledWith(
+      expect.objectContaining({ apiKeyId: "key_1" }),
+      workspaceId,
+      "readWrite",
+      "req-api-key",
+      `/api/v3/surveys/${surveyId}`
+    );
+  });
+
+  test("returns 400 when surveyId is invalid", async () => {
+    const res = await DELETE(createRequest("http://localhost/api/v3/surveys/not-a-cuid"), {
+      params: Promise.resolve({ surveyId: "not-a-cuid" }),
+    } as never);
+
+    expect(res.status).toBe(400);
+    expect(vi.mocked(getSurvey)).not.toHaveBeenCalled();
+  });
+
+  test("returns 403 when the survey does not exist", async () => {
+    vi.mocked(getSurvey).mockResolvedValueOnce(null);
+
+    const res = await DELETE(createRequest(`http://localhost/api/v3/surveys/${surveyId}`), {
+      params: Promise.resolve({ surveyId }),
+    } as never);
+
+    expect(res.status).toBe(403);
+    expect(deleteSurvey).not.toHaveBeenCalled();
+  });
+
+  test("returns 403 when the user lacks readWrite workspace access", async () => {
+    vi.mocked(requireV3WorkspaceAccess).mockResolvedValueOnce(
+      new Response(
+        JSON.stringify({
+          title: "Forbidden",
+          status: 403,
+          detail: "You are not authorized to access this resource",
+          requestId: "req-forbidden",
+        }),
+        { status: 403, headers: { "Content-Type": "application/problem+json" } }
+      )
+    );
+
+    const res = await DELETE(createRequest(`http://localhost/api/v3/surveys/${surveyId}`, "req-forbidden"), {
+      params: Promise.resolve({ surveyId }),
+    } as never);
+
+    expect(res.status).toBe(403);
+    expect(deleteSurvey).not.toHaveBeenCalled();
+    expect(queueAuditEvent).toHaveBeenCalledWith(
+      expect.objectContaining({
+        action: "deleted",
+        targetType: "survey",
+        targetId: "unknown",
+        organizationId: "unknown",
+        userId: "user_1",
+        userType: "user",
+        status: "failure",
+        oldObject: undefined,
+      })
+    );
+  });
+
+  test("returns 500 when survey deletion fails", async () => {
+    vi.mocked(deleteSurvey).mockRejectedValueOnce(new DatabaseError("db down"));
+
+    const res = await DELETE(createRequest(`http://localhost/api/v3/surveys/${surveyId}`, "req-db"), {
+      params: Promise.resolve({ surveyId }),
+    } as never);
+
+    expect(res.status).toBe(500);
+    const body = await res.json();
+    expect(body.code).toBe("internal_server_error");
+  });
+
+  test("returns 403 when the survey is deleted after authorization succeeds", async () => {
+    vi.mocked(deleteSurvey).mockRejectedValueOnce(new ResourceNotFoundError("Survey", surveyId));
+
+    const res = await DELETE(createRequest(`http://localhost/api/v3/surveys/${surveyId}`, "req-race"), {
+      params: Promise.resolve({ surveyId }),
+    } as never);
+
+    expect(res.status).toBe(403);
+    const body = await res.json();
+    expect(body.code).toBe("forbidden");
+    expect(queueAuditEvent).toHaveBeenCalledWith(
+      expect.objectContaining({
+        action: "deleted",
+        targetType: "survey",
+        targetId: surveyId,
+        organizationId: "org_1",
+        userId: "user_1",
+        userType: "user",
+        status: "failure",
+        oldObject: expect.objectContaining({
+          id: surveyId,
+          workspaceId: workspaceId,
+        }),
+      })
+    );
+  });
+
+  test("queues an audit log with target, actor, organization, and old object", async () => {
+    await DELETE(createRequest(`http://localhost/api/v3/surveys/${surveyId}`, "req-audit"), {
+      params: Promise.resolve({ surveyId }),
+    } as never);
+
+    expect(queueAuditEvent).toHaveBeenCalledWith(
+      expect.objectContaining({
+        action: "deleted",
+        targetType: "survey",
+        targetId: surveyId,
+        organizationId: "org_1",
+        userId: "user_1",
+        userType: "user",
+        status: "success",
+        oldObject: expect.objectContaining({
+          id: surveyId,
+          workspaceId: workspaceId,
+        }),
+      })
+    );
+  });
+});
@@ -0,0 +1,72 @@
+import { z } from "zod";
+import { logger } from "@formbricks/logger";
+import { DatabaseError, ResourceNotFoundError } from "@formbricks/types/errors";
+import { withV3ApiWrapper } from "@/app/api/v3/lib/api-wrapper";
+import { requireV3WorkspaceAccess } from "@/app/api/v3/lib/auth";
+import { problemForbidden, problemInternalError, successResponse } from "@/app/api/v3/lib/response";
+import { getSurvey } from "@/lib/survey/service";
+import { deleteSurvey } from "@/modules/survey/lib/surveys";
+
+export const DELETE = withV3ApiWrapper({
+  auth: "both",
+  action: "deleted",
+  targetType: "survey",
+  schemas: {
+    params: z.object({
+      surveyId: z.cuid2(),
+    }),
+  },
+  handler: async ({ parsedInput, authentication, requestId, instance, auditLog }) => {
+    const surveyId = parsedInput.params.surveyId;
+    const log = logger.withContext({ requestId, surveyId });
+
+    try {
+      const survey = await getSurvey(surveyId);
+
+      if (!survey) {
+        log.warn({ statusCode: 403 }, "Survey not found or not accessible");
+        return problemForbidden(requestId, "You are not authorized to access this resource", instance);
+      }
+
+      const authResult = await requireV3WorkspaceAccess(
+        authentication,
+        survey.workspaceId,
+        "readWrite",
+        requestId,
+        instance
+      );
+
+      if (authResult instanceof Response) {
+        return authResult;
+      }
+
+      if (auditLog) {
+        auditLog.targetId = survey.id;
+        auditLog.organizationId = authResult.organizationId;
+        auditLog.oldObject = survey;
+      }
+
+      const deletedSurvey = await deleteSurvey(surveyId);
+
+      return successResponse(
+        {
+          id: deletedSurvey.id,
+        },
+        { requestId }
+      );
+    } catch (error) {
+      if (error instanceof ResourceNotFoundError) {
+        log.warn({ errorCode: error.name, statusCode: 403 }, "Survey not found or not accessible");
+        return problemForbidden(requestId, "You are not authorized to access this resource", instance);
+      }
+
+      if (error instanceof DatabaseError) {
+        log.error({ error, statusCode: 500 }, "Database error");
+        return problemInternalError(requestId, "An unexpected error occurred.", instance);
+      }
+
+      log.error({ error, statusCode: 500 }, "V3 survey delete unexpected error");
+      return problemInternalError(requestId, "An unexpected error occurred.", instance);
+    }
+  },
+});
@@ -314,8 +314,8 @@ describe("GET /api/v3/surveys", () => {
    const res = await GET(req, {} as any);
    const body = await res.json();
    expect(body.data[0]).not.toHaveProperty("blocks");
-    expect(body.data[0]).not.toHaveProperty("singleUse");
    expect(body.data[0]).not.toHaveProperty("_count");
+    expect(body.data[0]).not.toHaveProperty("singleUse");
    expect(body.data[0].id).toBe("s1");
    expect(body.data[0].workspaceId).toBe("ws_1");
  });
@@ -93,17 +93,17 @@ describe("parseAndValidateJsonBody", () => {
      request,
      schema: z.object({
        finished: z.boolean(),
-        environmentId: z.string(),
+        workspaceId: z.string(),
      }),
      buildInput: (jsonInput) => ({
        ...(jsonInput as Record<string, unknown>),
-        environmentId: "env_123",
+        workspaceId: "ws_123",
      }),
    });

    expect(result).toEqual({
      data: {
-        environmentId: "env_123",
+        workspaceId: "ws_123",
        finished: true,
      },
    });
@@ -339,6 +339,56 @@ describe("API Response Utilities", () => {
    });
  });

+  describe("conflictResponse", () => {
+    test("should return a conflict response", () => {
+      const message = "Resource already exists";
+      const details = { field: "singleUseId" };
+      const response = responses.conflictResponse(message, details);
+
+      expect(response.status).toBe(409);
+
+      return response.json().then((body) => {
+        expect(body).toEqual({
+          code: "conflict",
+          message,
+          details,
+        });
+      });
+    });
+
+    test("should handle undefined details", () => {
+      const message = "Resource already exists";
+      const response = responses.conflictResponse(message);
+
+      expect(response.status).toBe(409);
+
+      return response.json().then((body) => {
+        expect(body).toEqual({
+          code: "conflict",
+          message,
+          details: {},
+        });
+      });
+    });
+
+    test("should include CORS headers when cors is true", () => {
+      const message = "Resource already exists";
+      const response = responses.conflictResponse(message, undefined, true);
+
+      expect(response.headers.get("Access-Control-Allow-Origin")).toBe("*");
+      expect(response.headers.get("Access-Control-Allow-Methods")).toBe("GET, POST, PUT, DELETE, OPTIONS");
+      expect(response.headers.get("Access-Control-Allow-Headers")).toBe("Content-Type, Authorization");
+    });
+
+    test("should use custom cache control header when provided", () => {
+      const message = "Resource already exists";
+      const customCache = "no-cache";
+      const response = responses.conflictResponse(message, undefined, false, customCache);
+
+      expect(response.headers.get("Cache-Control")).toBe(customCache);
+    });
+  });
+
  describe("tooManyRequestsResponse", () => {
    test("should return a too many requests response", () => {
      const message = "Rate limit exceeded";
@@ -16,7 +16,8 @@ interface ApiErrorResponse {
    | "method_not_allowed"
    | "not_authenticated"
    | "forbidden"
-    | "too_many_requests";
+    | "too_many_requests"
+    | "conflict";
  message: string;
  details: {
    [key: string]: string | string[] | number | number[] | boolean | boolean[];
@@ -236,6 +237,30 @@ const internalServerErrorResponse = (
  );
 };

+const conflictResponse = (
+  message: string,
+  details?: { [key: string]: string },
+  cors: boolean = false,
+  cache: string = "private, no-store"
+) => {
+  const headers = {
+    ...(cors && corsHeaders),
+    "Cache-Control": cache,
+  };
+
+  return Response.json(
+    {
+      code: "conflict",
+      message,
+      details: details || {},
+    } as ApiErrorResponse,
+    {
+      status: 409,
+      headers,
+    }
+  );
+};
+
 const tooManyRequestsResponse = (
  message: string,
  cors: boolean = false,
@@ -270,4 +295,5 @@ export const responses = {
  successResponse,
  tooManyRequestsResponse,
  forbiddenResponse,
+  conflictResponse,
 };
@@ -3,9 +3,16 @@ import { NextRequest } from "next/server";
 import { Mock, beforeEach, describe, expect, test, vi } from "vitest";
 import { logger } from "@formbricks/logger";
 import { TAuthenticationApiKey } from "@formbricks/types/auth";
-import { AuthenticationMethod } from "@/app/middleware/endpoint-validator";
+import type { AuthenticationMethod } from "@/app/middleware/endpoint-validator";
 import { responses } from "./response";

+const AuthMethod = {
+  ApiKey: "apiKey" as AuthenticationMethod,
+  Session: "session" as AuthenticationMethod,
+  Both: "both" as AuthenticationMethod,
+  None: "none" as AuthenticationMethod,
+} as const;
+
 vi.mock("@/modules/ee/audit-logs/lib/handler", () => ({
  __esModule: true,
  queueAuditEvent: vi.fn(),
@@ -122,7 +129,7 @@ describe("withV1ApiWrapper", () => {
    vi.mocked(isClientSideApiRoute).mockReturnValue({ isClientSideApi: false, isRateLimited: true });
    vi.mocked(isManagementApiRoute).mockReturnValue({
      isManagementApi: true,
-      authenticationMethod: AuthenticationMethod.ApiKey,
+      authenticationMethod: AuthMethod.ApiKey,
    });
    vi.mocked(isIntegrationRoute).mockReturnValue(false);

@@ -198,7 +205,7 @@ describe("withV1ApiWrapper", () => {
    vi.mocked(isClientSideApiRoute).mockReturnValue({ isClientSideApi: false, isRateLimited: true });
    vi.mocked(isManagementApiRoute).mockReturnValue({
      isManagementApi: true,
-      authenticationMethod: AuthenticationMethod.ApiKey,
+      authenticationMethod: AuthMethod.ApiKey,
    });
    vi.mocked(isIntegrationRoute).mockReturnValue(false);

@@ -244,7 +251,7 @@ describe("withV1ApiWrapper", () => {
    vi.mocked(isClientSideApiRoute).mockReturnValue({ isClientSideApi: false, isRateLimited: true });
    vi.mocked(isManagementApiRoute).mockReturnValue({
      isManagementApi: true,
-      authenticationMethod: AuthenticationMethod.ApiKey,
+      authenticationMethod: AuthMethod.ApiKey,
    });
    vi.mocked(isIntegrationRoute).mockReturnValue(false);

@@ -318,7 +325,7 @@ describe("withV1ApiWrapper", () => {
    vi.mocked(isClientSideApiRoute).mockReturnValue({ isClientSideApi: false, isRateLimited: true });
    vi.mocked(isManagementApiRoute).mockReturnValue({
      isManagementApi: true,
-      authenticationMethod: AuthenticationMethod.ApiKey,
+      authenticationMethod: AuthMethod.ApiKey,
    });
    vi.mocked(isIntegrationRoute).mockReturnValue(false);

@@ -370,7 +377,7 @@ describe("withV1ApiWrapper", () => {
    vi.mocked(isClientSideApiRoute).mockReturnValue({ isClientSideApi: false, isRateLimited: true });
    vi.mocked(isManagementApiRoute).mockReturnValue({
      isManagementApi: true,
-      authenticationMethod: AuthenticationMethod.ApiKey,
+      authenticationMethod: AuthMethod.ApiKey,
    });
    vi.mocked(isIntegrationRoute).mockReturnValue(false);

@@ -425,7 +432,7 @@ describe("withV1ApiWrapper", () => {
    vi.mocked(isClientSideApiRoute).mockReturnValue({ isClientSideApi: false, isRateLimited: true });
    vi.mocked(isManagementApiRoute).mockReturnValue({
      isManagementApi: true,
-      authenticationMethod: AuthenticationMethod.ApiKey,
+      authenticationMethod: AuthMethod.ApiKey,
    });
    vi.mocked(isIntegrationRoute).mockReturnValue(false);

@@ -449,7 +456,7 @@ describe("withV1ApiWrapper", () => {
    vi.mocked(isClientSideApiRoute).mockReturnValue({ isClientSideApi: true, isRateLimited: true });
    vi.mocked(isManagementApiRoute).mockReturnValue({
      isManagementApi: false,
-      authenticationMethod: AuthenticationMethod.None,
+      authenticationMethod: AuthMethod.None,
    });
    vi.mocked(isIntegrationRoute).mockReturnValue(false);
    vi.mocked(authenticateRequest).mockResolvedValue(null);
@@ -473,6 +480,90 @@ describe("withV1ApiWrapper", () => {
    });
  });

+  test("skips app rate limiting for Envoy-covered client routes", async () => {
+    const { isClientSideApiRoute, isManagementApiRoute, isIntegrationRoute } =
+      await import("@/app/middleware/endpoint-validator");
+    const { authenticateRequest } = await import("@/app/api/v1/auth");
+    const { applyIPRateLimit } = await import("@/modules/core/rate-limit/helpers");
+
+    vi.mocked(isClientSideApiRoute).mockReturnValue({ isClientSideApi: true, isRateLimited: true });
+    vi.mocked(isManagementApiRoute).mockReturnValue({
+      isManagementApi: false,
+      authenticationMethod: AuthMethod.None,
+    });
+    vi.mocked(isIntegrationRoute).mockReturnValue(false);
+    vi.mocked(authenticateRequest).mockResolvedValue(null);
+    vi.mocked(applyIPRateLimit).mockResolvedValue({ allowed: true });
+
+    const handler = vi.fn().mockResolvedValue({
+      response: responses.successResponse({ data: "test" }),
+    });
+
+    const req = createMockRequest({ method: "POST", url: "/api/v1/client/env_123/storage" });
+    const { withV1ApiWrapper } = await import("./with-api-logging");
+    const wrapped = withV1ApiWrapper({ handler });
+    const res = await wrapped(req, undefined);
+
+    expect(res.status).toBe(200);
+    expect(applyIPRateLimit).not.toHaveBeenCalled();
+  });
+
+  test("keeps app rate limiting for uncovered client routes", async () => {
+    const { isClientSideApiRoute, isManagementApiRoute, isIntegrationRoute } =
+      await import("@/app/middleware/endpoint-validator");
+    const { authenticateRequest } = await import("@/app/api/v1/auth");
+    const { applyIPRateLimit } = await import("@/modules/core/rate-limit/helpers");
+
+    vi.mocked(isClientSideApiRoute).mockReturnValue({ isClientSideApi: true, isRateLimited: true });
+    vi.mocked(isManagementApiRoute).mockReturnValue({
+      isManagementApi: false,
+      authenticationMethod: AuthMethod.None,
+    });
+    vi.mocked(isIntegrationRoute).mockReturnValue(false);
+    vi.mocked(authenticateRequest).mockResolvedValue(null);
+    vi.mocked(applyIPRateLimit).mockResolvedValue({ allowed: true });
+
+    const handler = vi.fn().mockResolvedValue({
+      response: responses.successResponse({ data: "test" }),
+    });
+
+    const req = createMockRequest({ method: "GET", url: "/api/v2/client/env_123/environment" });
+    const { withV1ApiWrapper } = await import("./with-api-logging");
+    const wrapped = withV1ApiWrapper({ handler });
+    const res = await wrapped(req, undefined);
+
+    expect(res.status).toBe(200);
+    expect(applyIPRateLimit).toHaveBeenCalled();
+  });
+
+  test("keeps app rate limiting for uncovered verbs on otherwise covered client paths", async () => {
+    const { isClientSideApiRoute, isManagementApiRoute, isIntegrationRoute } =
+      await import("@/app/middleware/endpoint-validator");
+    const { authenticateRequest } = await import("@/app/api/v1/auth");
+    const { applyIPRateLimit } = await import("@/modules/core/rate-limit/helpers");
+
+    vi.mocked(isClientSideApiRoute).mockReturnValue({ isClientSideApi: true, isRateLimited: true });
+    vi.mocked(isManagementApiRoute).mockReturnValue({
+      isManagementApi: false,
+      authenticationMethod: AuthMethod.None,
+    });
+    vi.mocked(isIntegrationRoute).mockReturnValue(false);
+    vi.mocked(authenticateRequest).mockResolvedValue(null);
+    vi.mocked(applyIPRateLimit).mockResolvedValue({ allowed: true });
+
+    const handler = vi.fn().mockResolvedValue({
+      response: responses.successResponse({ data: "test" }),
+    });
+
+    const req = createMockRequest({ method: "PATCH", url: "/api/v1/client/env_123/environment" });
+    const { withV1ApiWrapper } = await import("./with-api-logging");
+    const wrapped = withV1ApiWrapper({ handler });
+    const res = await wrapped(req, undefined);
+
+    expect(res.status).toBe(200);
+    expect(applyIPRateLimit).toHaveBeenCalled();
+  });
+
  test("returns authentication error for non-client routes without auth", async () => {
    const { isClientSideApiRoute, isManagementApiRoute, isIntegrationRoute } =
      await import("@/app/middleware/endpoint-validator");
@@ -481,7 +572,7 @@ describe("withV1ApiWrapper", () => {
    vi.mocked(isClientSideApiRoute).mockReturnValue({ isClientSideApi: false, isRateLimited: true });
    vi.mocked(isManagementApiRoute).mockReturnValue({
      isManagementApi: true,
-      authenticationMethod: AuthenticationMethod.ApiKey,
+      authenticationMethod: AuthMethod.ApiKey,
    });
    vi.mocked(isIntegrationRoute).mockReturnValue(false);
    vi.mocked(authenticateRequest).mockResolvedValue(null);
@@ -504,7 +595,7 @@ describe("withV1ApiWrapper", () => {
    vi.mocked(isClientSideApiRoute).mockReturnValue({ isClientSideApi: false, isRateLimited: true });
    vi.mocked(isManagementApiRoute).mockReturnValue({
      isManagementApi: true,
-      authenticationMethod: AuthenticationMethod.Session,
+      authenticationMethod: AuthMethod.Session,
    });
    vi.mocked(isIntegrationRoute).mockReturnValue(false);
    vi.mocked(getServerSession).mockResolvedValue(null);
@@ -528,7 +619,36 @@ describe("withV1ApiWrapper", () => {
    expect(mockContextualLoggerError).toHaveBeenCalled();
  });

-  test("handles rate limiting errors", async () => {
+  test("keeps app rate limiting for uncovered session-authenticated management routes", async () => {
+    const { applyRateLimit } = await import("@/modules/core/rate-limit/helpers");
+    const { isClientSideApiRoute, isManagementApiRoute, isIntegrationRoute } =
+      await import("@/app/middleware/endpoint-validator");
+    const { getServerSession } = await import("next-auth");
+
+    vi.mocked(isClientSideApiRoute).mockReturnValue({ isClientSideApi: false, isRateLimited: true });
+    vi.mocked(isManagementApiRoute).mockReturnValue({
+      isManagementApi: true,
+      authenticationMethod: AuthMethod.Both,
+    });
+    vi.mocked(isIntegrationRoute).mockReturnValue(false);
+    vi.mocked(getServerSession).mockResolvedValue({ user: { id: "user-1" } } as any);
+    const rateLimitError = new Error("Rate limit exceeded");
+    rateLimitError.message = "Rate limit exceeded";
+    vi.mocked(applyRateLimit).mockRejectedValue(rateLimitError);
+
+    const handler = vi.fn();
+    const req = createMockRequest({ method: "POST", url: "https://api.test/api/v1/management/storage" });
+    const { withV1ApiWrapper } = await import("./with-api-logging");
+    const customRateLimitConfig = { interval: 60, allowedPerInterval: 5, namespace: "storage:upload" };
+    const wrapped = withV1ApiWrapper({ handler, customRateLimitConfig });
+    const res = await wrapped(req, undefined);
+
+    expect(res.status).toBe(429);
+    expect(handler).not.toHaveBeenCalled();
+    expect(applyRateLimit).toHaveBeenCalledWith(customRateLimitConfig, "user-1");
+  });
+
+  test("skips app rate limiting for Envoy-covered API-key management routes", async () => {
    const { applyRateLimit } = await import("@/modules/core/rate-limit/helpers");
    const { isClientSideApiRoute, isManagementApiRoute, isIntegrationRoute } =
      await import("@/app/middleware/endpoint-validator");
@@ -538,21 +658,22 @@ describe("withV1ApiWrapper", () => {
    vi.mocked(isClientSideApiRoute).mockReturnValue({ isClientSideApi: false, isRateLimited: true });
    vi.mocked(isManagementApiRoute).mockReturnValue({
      isManagementApi: true,
-      authenticationMethod: AuthenticationMethod.ApiKey,
+      authenticationMethod: AuthMethod.ApiKey,
    });
    vi.mocked(isIntegrationRoute).mockReturnValue(false);
-    const rateLimitError = new Error("Rate limit exceeded");
-    rateLimitError.message = "Rate limit exceeded";
-    vi.mocked(applyRateLimit).mockRejectedValue(rateLimitError);
+    vi.mocked(applyRateLimit).mockResolvedValue({ allowed: true });
+
+    const handler = vi.fn().mockResolvedValue({
+      response: responses.successResponse({ data: "test" }),
+    });

-    const handler = vi.fn();
    const req = createMockRequest({ url: V1_MANAGEMENT_SURVEYS_URL });
    const { withV1ApiWrapper } = await import("./with-api-logging");
    const wrapped = withV1ApiWrapper({ handler });
    const res = await wrapped(req, undefined);

-    expect(res.status).toBe(429);
-    expect(handler).not.toHaveBeenCalled();
+    expect(res.status).toBe(200);
+    expect(applyRateLimit).not.toHaveBeenCalled();
  });

  test("skips audit log creation when no action/targetType provided", async () => {
@@ -566,7 +687,7 @@ describe("withV1ApiWrapper", () => {
    vi.mocked(isClientSideApiRoute).mockReturnValue({ isClientSideApi: false, isRateLimited: true });
    vi.mocked(isManagementApiRoute).mockReturnValue({
      isManagementApi: true,
-      authenticationMethod: AuthenticationMethod.ApiKey,
+      authenticationMethod: AuthMethod.ApiKey,
    });
    vi.mocked(isIntegrationRoute).mockReturnValue(false);

@@ -13,6 +13,10 @@ import {
 } from "@/app/middleware/endpoint-validator";
 import { AUDIT_LOG_ENABLED } from "@/lib/constants";
 import { authOptions } from "@/modules/auth/lib/authOptions";
+import {
+  TEnvoyRateLimitAuthType,
+  isRouteRateLimitedByEnvoy,
+} from "@/modules/core/rate-limit/envoy-rate-limit-coverage";
 import { applyIPRateLimit, applyRateLimit } from "@/modules/core/rate-limit/helpers";
 import { rateLimitConfigs } from "@/modules/core/rate-limit/rate-limit-configs";
 import { TRateLimitConfig } from "@/modules/core/rate-limit/types/rate-limit";
@@ -61,29 +65,58 @@ const applyClientRateLimit = async (customRateLimitConfig?: TRateLimitConfig): P
  await applyIPRateLimit(customRateLimitConfig ?? rateLimitConfigs.api.client);
 };

+const getEnvoyRateLimitAuthType = (
+  authentication: TApiV1Authentication
+): TEnvoyRateLimitAuthType | "unknown" => {
+  if (!authentication) {
+    return "none";
+  }
+
+  if ("user" in authentication) {
+    return "session";
+  }
+
+  if ("apiKeyId" in authentication) {
+    return "apiKey";
+  }
+
+  return "unknown";
+};
+
 /**
 * Handle rate limiting based on authentication and API type
 */
 const handleRateLimiting = async (
+  req: NextRequest,
  authentication: TApiV1Authentication,
  routeType: ApiV1RouteTypeEnum,
  customRateLimitConfig?: TRateLimitConfig
 ): Promise<Response | null> => {
+  const authType = getEnvoyRateLimitAuthType(authentication);
+
+  if (authType === "unknown") {
+    logger.error({ authentication }, "Unknown authentication type");
+    return responses.internalServerErrorResponse("Invalid authentication configuration");
+  }
+
+  const isEnvoyManagedRateLimit = isRouteRateLimitedByEnvoy({
+    pathname: req.nextUrl.pathname,
+    method: req.method,
+    authType,
+  });
+
  try {
-    if (authentication) {
+    if (authentication && !isEnvoyManagedRateLimit) {
      if ("user" in authentication) {
        // Session-based authentication for integration routes
        await applyRateLimit(customRateLimitConfig ?? rateLimitConfigs.api.v1, authentication.user.id);
      } else if ("apiKeyId" in authentication) {
        // API key authentication for general routes
        await applyRateLimit(customRateLimitConfig ?? rateLimitConfigs.api.v1, authentication.apiKeyId);
-      } else {
-        logger.error({ authentication }, "Unknown authentication type");
-        return responses.internalServerErrorResponse("Invalid authentication configuration");
      }
    }

-    if (routeType === ApiV1RouteTypeEnum.Client) {
+    if (routeType === ApiV1RouteTypeEnum.Client && !isEnvoyManagedRateLimit) {
      await applyClientRateLimit(customRateLimitConfig);
    }
  } catch (error) {
@@ -286,7 +319,12 @@ export const withV1ApiWrapper = <TResult extends { response: Response; error?: u

    // === Rate Limiting ===
    if (isRateLimited) {
-      const rateLimitResponse = await handleRateLimiting(authentication, routeType, customRateLimitConfig);
+      const rateLimitResponse = await handleRateLimiting(
+        req,
+        authentication,
+        routeType,
+        customRateLimitConfig
+      );
      if (rateLimitResponse) return rateLimitResponse;
    }

@@ -1,113 +1,84 @@
 import { PipelineTriggers } from "@prisma/client";
-import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
+import { beforeEach, describe, expect, test, vi } from "vitest";
+import { TResponsePipelineJobData, getBackgroundJobProducer } from "@formbricks/jobs";
 import { logger } from "@formbricks/logger";
 import { TResponse } from "@formbricks/types/responses";
-import { TPipelineInput } from "@/app/lib/types/pipelines";
-import { sendToPipeline } from "./pipelines";
+import { sendToPipeline } from "@/app/lib/pipelines";
+import { getJobsQueueingConfig } from "@/lib/jobs/config";

-// Mock the constants module
-vi.mock("@/lib/constants", () => ({
-  CRON_SECRET: "mocked-cron-secret",
-  WEBAPP_URL: "https://test.formbricks.com",
+const mockEnqueueResponsePipeline = vi.fn();
+
+vi.mock("@formbricks/jobs", () => ({
+  getBackgroundJobProducer: vi.fn(() => ({
+    enqueueResponsePipeline: mockEnqueueResponsePipeline,
+  })),
+}));
+
+vi.mock("@/lib/jobs/config", () => ({
+  getJobsQueueingConfig: vi.fn(),
 }));

-// Mock the logger
 vi.mock("@formbricks/logger", () => ({
  logger: {
    error: vi.fn(),
  },
 }));

-// Mock global fetch
-const mockFetch = vi.fn();
-global.fetch = mockFetch;
+describe("sendToPipeline", () => {
+  const testData: TResponsePipelineJobData = {
+    event: PipelineTriggers.responseCreated,
+    surveyId: "cm8ckvchx000008lb710n0gdn",
+    workspaceId: "cm8cmp9hp000008jf7l570ml2",
+    response: { id: "cm8cmpnjj000108jfdr9dfqe6" } as TResponse,
+  };

-describe("pipelines", () => {
-  // Reset mocks before each test
  beforeEach(() => {
    vi.clearAllMocks();
+    vi.mocked(getJobsQueueingConfig).mockReturnValue({
+      enabled: true,
+      redisUrl: "redis://localhost:6379",
+    });
  });

-  // Clean up after each test
-  afterEach(() => {
-    vi.clearAllMocks();
-  });
-
-  test("sendToPipeline should call fetch with correct parameters", async () => {
-    // Mock the fetch implementation to return a successful response
-    mockFetch.mockResolvedValueOnce({
-      ok: true,
-      json: async () => ({ success: true }),
+  test("enqueues the pipeline job through the BullMQ producer", async () => {
+    mockEnqueueResponsePipeline.mockResolvedValue({
+      jobId: "job-1",
+      jobName: "response-pipeline.process",
+      queueName: "background-jobs",
    });

-    // Create sample data for testing
-    const testData: TPipelineInput = {
-      event: PipelineTriggers.responseCreated,
-      surveyId: "cm8ckvchx000008lb710n0gdn",
-      workspaceId: "cm8cnq2hp000008jf7l570abc",
-      response: { id: "cm8cmpnjj000108jfdr9dfqe6" } as TResponse,
-    };
-
-    // Call the function with test data
    await sendToPipeline(testData);

-    // Check that fetch was called with the correct arguments
-    expect(mockFetch).toHaveBeenCalledTimes(1);
-    expect(mockFetch).toHaveBeenCalledWith("https://test.formbricks.com/api/pipeline", {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-        "x-api-key": "mocked-cron-secret",
-      },
-      body: JSON.stringify({
-        workspaceId: testData.workspaceId,
-        surveyId: testData.surveyId,
+    expect(getBackgroundJobProducer).toHaveBeenCalledTimes(1);
+    expect(mockEnqueueResponsePipeline).toHaveBeenCalledWith(testData);
+  });
+
+  test("logs enqueue failures and rethrows", async () => {
+    const testError = new Error("Redis unavailable");
+    mockEnqueueResponsePipeline.mockRejectedValue(testError);
+
+    await expect(sendToPipeline(testData)).rejects.toThrow(testError);
+
+    expect(logger.error).toHaveBeenCalledWith(
+      {
+        error: testError,
        event: testData.event,
-        response: testData.response,
-      }),
+        surveyId: testData.surveyId,
+        workspaceId: testData.workspaceId,
+      },
+      "Error queueing pipeline event"
+    );
+  });
+
+  test("throws when BullMQ queueing is disabled", async () => {
+    vi.mocked(getJobsQueueingConfig).mockReturnValue({
+      enabled: false,
+      redisUrl: null,
    });
-  });

-  test("sendToPipeline should handle fetch errors", async () => {
-    // Mock fetch to throw an error
-    const testError = new Error("Network error");
-    mockFetch.mockRejectedValueOnce(testError);
-
-    // Create sample data for testing
-    const testData: TPipelineInput = {
-      event: PipelineTriggers.responseCreated,
-      surveyId: "cm8ckvchx000008lb710n0gdn",
-      workspaceId: "cm8cnq2hp000008jf7l570abc",
-      response: { id: "cm8cmpnjj000108jfdr9dfqe6" } as TResponse,
-    };
-
-    // Call the function
-    await sendToPipeline(testData);
-
-    // Check that the error was logged using logger
-    expect(logger.error).toHaveBeenCalledWith(testError, "Error sending event to pipeline");
-  });
-
-  test("sendToPipeline should throw error if CRON_SECRET is not set", async () => {
-    // For this test, we need to mock CRON_SECRET as undefined
-    // Let's use a more compatible approach to reset the mocks
-    const originalModule = await import("@/lib/constants");
-    const mockConstants = { ...originalModule, CRON_SECRET: undefined };
-
-    vi.doMock("@/lib/constants", () => mockConstants);
-
-    // Re-import the module to get the new mocked values
-    const { sendToPipeline: sendToPipelineNoSecret } = await import("./pipelines");
-
-    // Create sample data for testing
-    const testData: TPipelineInput = {
-      event: PipelineTriggers.responseCreated,
-      surveyId: "cm8ckvchx000008lb710n0gdn",
-      workspaceId: "cm8cnq2hp000008jf7l570abc",
-      response: { id: "cm8cmpnjj000108jfdr9dfqe6" } as TResponse,
-    };
-
-    // Expect the function to throw an error
-    await expect(sendToPipelineNoSecret(testData)).rejects.toThrow("CRON_SECRET is not set");
+    await expect(sendToPipeline(testData)).rejects.toThrow(
+      "BullMQ response pipeline queueing is not enabled"
+    );
+    expect(getBackgroundJobProducer).not.toHaveBeenCalled();
  });
 });
@@ -1,25 +1,21 @@
+import { TResponsePipelineJobData, getBackgroundJobProducer } from "@formbricks/jobs";
 import { logger } from "@formbricks/logger";
-import { TPipelineInput } from "@/app/lib/types/pipelines";
-import { CRON_SECRET, WEBAPP_URL } from "@/lib/constants";
+import { getJobsQueueingConfig } from "@/lib/jobs/config";

-export const sendToPipeline = async ({ event, surveyId, workspaceId, response }: TPipelineInput) => {
-  if (!CRON_SECRET) {
-    throw new Error("CRON_SECRET is not set");
+export const sendToPipeline = async (job: TResponsePipelineJobData): Promise<void> => {
+  try {
+    const jobsQueueingConfig = getJobsQueueingConfig();
+    if (!jobsQueueingConfig.enabled) {
+      throw new Error("BullMQ response pipeline queueing is not enabled");
+    }
+
+    const producer = getBackgroundJobProducer();
+    await producer.enqueueResponsePipeline(job);
+  } catch (error) {
+    logger.error(
+      { error, event: job.event, surveyId: job.surveyId, workspaceId: job.workspaceId },
+      "Error queueing pipeline event"
+    );
+    throw error;
  }
-
-  return fetch(`${WEBAPP_URL}/api/pipeline`, {
-    method: "POST",
-    headers: {
-      "Content-Type": "application/json",
-      "x-api-key": CRON_SECRET,
-    },
-    body: JSON.stringify({
-      workspaceId,
-      surveyId,
-      event,
-      response,
-    }),
-  }).catch((error) => {
-    logger.error(error, "Error sending event to pipeline");
-  });
 };
@@ -3,7 +3,9 @@ import type { TFunction } from "i18next";
 import type { TSurveyBlock, TSurveyBlockLogic } from "@formbricks/types/surveys/blocks";
 import type {
  TSurveyCTAElement,
+  TSurveyCesElement,
  TSurveyConsentElement,
+  TSurveyCsatElement,
  TSurveyElement,
  TSurveyMultipleChoiceElement,
  TSurveyNPSElement,
@@ -96,7 +98,8 @@ export const buildOpenTextElement = ({
  };
 };

-export const buildRatingElement = ({
+const buildScaleElement = <T extends TSurveyRatingElement | TSurveyCsatElement | TSurveyCesElement>({
+  type,
  id,
  headline,
  subheader,
@@ -107,6 +110,32 @@ export const buildRatingElement = ({
  required,
  isColorCodingEnabled = false,
 }: {
+  type: T["type"];
+  id?: string;
+  headline: string;
+  scale: T["scale"];
+  range: T["range"];
+  lowerLabel?: string;
+  upperLabel?: string;
+  subheader?: string;
+  required?: boolean;
+  isColorCodingEnabled?: boolean;
+}): T => {
+  return {
+    id: id ?? createId(),
+    type,
+    subheader: subheader ? createI18nString(subheader, []) : undefined,
+    headline: createI18nString(headline, []),
+    scale,
+    range,
+    required: required ?? false,
+    isColorCodingEnabled,
+    lowerLabel: lowerLabel ? createI18nString(lowerLabel, []) : undefined,
+    upperLabel: upperLabel ? createI18nString(upperLabel, []) : undefined,
+  } as T;
+};
+
+export const buildRatingElement = (params: {
  id?: string;
  headline: string;
  scale: TSurveyRatingElement["scale"];
@@ -116,20 +145,8 @@ export const buildRatingElement = ({
  subheader?: string;
  required?: boolean;
  isColorCodingEnabled?: boolean;
-}): TSurveyRatingElement => {
-  return {
-    id: id ?? createId(),
-    type: TSurveyElementTypeEnum.Rating,
-    subheader: subheader ? createI18nString(subheader, []) : undefined,
-    headline: createI18nString(headline, []),
-    scale,
-    range,
-    required: required ?? false,
-    isColorCodingEnabled,
-    lowerLabel: lowerLabel ? createI18nString(lowerLabel, []) : undefined,
-    upperLabel: upperLabel ? createI18nString(upperLabel, []) : undefined,
-  };
-};
+}): TSurveyRatingElement =>
+  buildScaleElement<TSurveyRatingElement>({ ...params, type: TSurveyElementTypeEnum.Rating });

 export const buildConsentElement = ({
  id,
@@ -212,6 +229,38 @@ export const buildNPSElement = ({
  };
 };

+export const buildCsatElement = ({
+  scale = "smiley",
+  ...params
+}: {
+  id?: string;
+  headline: string;
+  scale?: TSurveyCsatElement["scale"];
+  lowerLabel?: string;
+  upperLabel?: string;
+  subheader?: string;
+  required?: boolean;
+  isColorCodingEnabled?: boolean;
+}): TSurveyCsatElement =>
+  buildScaleElement<TSurveyCsatElement>({ ...params, scale, range: 5, type: TSurveyElementTypeEnum.CSAT });
+
+export const buildCesElement = ({
+  scale = "number",
+  range = 5,
+  ...params
+}: {
+  id?: string;
+  headline: string;
+  scale?: TSurveyCesElement["scale"];
+  range?: TSurveyCesElement["range"];
+  lowerLabel?: string;
+  upperLabel?: string;
+  subheader?: string;
+  required?: boolean;
+  isColorCodingEnabled?: boolean;
+}): TSurveyCesElement =>
+  buildScaleElement<TSurveyCesElement>({ ...params, scale, range, type: TSurveyElementTypeEnum.CES });
+
 // Helper function to create block-level jump logic based on operator
 export const createBlockJumpLogic = (
  sourceElementId: string,
@@ -30,6 +30,8 @@ const conditionOptions: Record<string, string[]> = {
  multipleChoiceMulti: ["Includes all", "Includes either"],
  nps: ["Is equal to", "Is less than", "Is more than", "Submitted", "Skipped", "Includes either"],
  rating: ["Is equal to", "Is less than", "Is more than", "Submitted", "Skipped"],
+  csat: ["Is equal to", "Is less than", "Is more than", "Submitted", "Skipped"],
+  ces: ["Is equal to", "Is less than", "Is more than", "Submitted", "Skipped"],
  cta: ["is"],
  tags: ["is"],
  languages: ["Equals", "Not equals"],
@@ -45,6 +47,8 @@ const filterOptions: Record<string, string[]> = {
  openText: ["Filled out", "Skipped"],
  rating: ["1", "2", "3", "4", "5"],
  nps: ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10"],
+  csat: ["1", "2", "3", "4", "5"],
+  ces: ["1", "2", "3", "4", "5", "6", "7"],
  cta: ["Clicked", "Dismissed"],
  tags: ["Applied", "Not applied"],
  consent: ["Accepted", "Dismissed"],
@@ -436,6 +440,8 @@ const processElementFilters = (
        break;
      case TSurveyElementTypeEnum.NPS:
      case TSurveyElementTypeEnum.Rating:
+      case TSurveyElementTypeEnum.CSAT:
+      case TSurveyElementTypeEnum.CES:
        processNPSRatingFilter(filterType, elementId, filters);
        break;
      case TSurveyElementTypeEnum.CTA:
@@ -7,7 +7,9 @@ import type { TTemplate } from "@formbricks/types/templates";
 import {
  buildBlock,
  buildCTAElement,
+  buildCesElement,
  buildConsentElement,
+  buildCsatElement,
  buildMultipleChoiceElement,
  buildNPSElement,
  buildOpenTextElement,
@@ -971,13 +973,13 @@ const improveTrialConversion = (t: TFunction): TTemplate => {
          elements: [
            buildOpenTextElement({
              id: reusableElementIds[2],
-              headline: t("templates.improve_trial_conversion_question_2_headline"),
+              headline: t("templates.improve_trial_conversion_question_3_headline"),
              required: true,
              inputType: "text",
            }),
          ],
          logic: [createBlockJumpLogic(reusableElementIds[2], block6Id, "isSubmitted")],
-          buttonLabel: t("templates.improve_trial_conversion_question_2_button_label"),
+          buttonLabel: t("templates.improve_trial_conversion_question_3_button_label"),
          t,
        }),
        buildBlock({
@@ -1319,8 +1321,7 @@ const employeeSatisfaction = (t: TFunction): TTemplate => {
        buildBlock({
          name: t("templates.block_1"),
          elements: [
-            buildRatingElement({
-              range: 5,
+            buildCsatElement({
              scale: "star",
              headline: t("templates.employee_satisfaction_question_1_headline"),
              required: true,
@@ -1647,14 +1648,14 @@ const identifyCustomerGoals = (t: TFunction): TTemplate => {
          elements: [
            buildMultipleChoiceElement({
              type: TSurveyElementTypeEnum.MultipleChoiceSingle,
-              headline: "What's your primary goal for using $[workspaceName]?",
+              headline: t("templates.identify_customer_goals_question_1_headline"),
              required: true,
              shuffleOption: "none",
              choices: [
-                "Understand my user base deeply",
-                "Identify upselling opportunities",
-                "Build the best possible product",
-                "Rule the world to make everyone breakfast brussels sprouts.",
+                t("templates.identify_customer_goals_question_1_choice_1"),
+                t("templates.identify_customer_goals_question_1_choice_2"),
+                t("templates.identify_customer_goals_question_1_choice_3"),
+                t("templates.identify_customer_goals_question_1_choice_4"),
              ],
            }),
          ],
@@ -2723,7 +2724,7 @@ const customerEffortScore = (t: TFunction): TTemplate => {
        buildBlock({
          name: t("templates.block_1"),
          elements: [
-            buildRatingElement({
+            buildCesElement({
              range: 5,
              scale: "number",
              headline: t("templates.customer_effort_score_question_1_headline"),
@@ -3828,9 +3829,8 @@ const improveNewsletterContent = (t: TFunction): TTemplate => {
        buildBlock({
          name: t("templates.block_1"),
          elements: [
-            buildRatingElement({
+            buildCsatElement({
              id: reusableElementIds[0],
-              range: 5,
              scale: "smiley",
              headline: t("templates.improve_newsletter_content_question_1_headline"),
              required: true,
@@ -4409,8 +4409,7 @@ const longTermRetentionCheckIn = (t: TFunction): TTemplate => {
        buildBlock({
          name: t("templates.block_9"),
          elements: [
-            buildRatingElement({
-              range: 5,
+            buildCsatElement({
              scale: "smiley",
              headline: t("templates.long_term_retention_check_in_question_9_headline"),
              required: true,
@@ -4825,6 +4824,8 @@ export const previewSurvey = (workspaceName: string, t: TFunction): TSurvey => {
    workspaceId: "cmnh38nzx00003b6r3svd9pv2",
    createdBy: "cltwumfbz0000echxysz6ptvq",
    status: "inProgress" as const,
+    publishOn: null,
+    closeOn: null,
    welcomeCard: {
      enabled: false,
      headline: createI18nString(t("templates.preview_survey_welcome_card_headline"), []),
@@ -1,9 +0,0 @@
-import { PipelineTriggers } from "@prisma/client";
-import { TResponse } from "@formbricks/types/responses";
-
-export interface TPipelineInput {
-  event: PipelineTriggers;
-  response: TResponse;
-  workspaceId: string;
-  surveyId: string;
-}
@@ -121,13 +121,10 @@ export const DELETE = async (
      : responses.notAuthenticatedResponse();
  }

-  if (authResult.ok) {
+  // Rate limiting for apiKey DELETE is enforced by Envoy in v5 — see envoy-rate-limit-coverage.ts
+  if (authResult.ok && authResult.data.authType !== "apiKey") {
    try {
-      if (authResult.data.authType === "apiKey") {
-        await applyRateLimit(rateLimitConfigs.storage.delete, authResult.data.apiKeyId);
-      } else {
-        await applyRateLimit(rateLimitConfigs.storage.delete, authResult.data.userId);
-      }
+      await applyRateLimit(rateLimitConfigs.storage.delete, authResult.data.userId);
    } catch (error) {
      return responses.tooManyRequestsResponse(
        error instanceof Error ? error.message : "Unknown error occurred"
@@ -142,20 +139,20 @@ export const DELETE = async (
    idParam
  );

-  const isSuccess = deleteResult.ok;
+  if (!deleteResult.ok) {
+    const { error } = deleteResult;

-  if (!isSuccess) {
-    logger.error({ error: deleteResult.error }, "Error deleting file");
+    logger.error({ error }, "Error deleting file");

    await logFileDeletion({
-      failureReason: deleteResult.error.code,
+      failureReason: error.code,
      accessType,
      userId: session?.user?.id,
      workspaceId: resolved.workspaceId,
      apiUrl: request.url,
    });

-    const errorResponse = getErrorResponseFromStorageError(deleteResult.error, { fileName });
+    const errorResponse = getErrorResponseFromStorageError(error, { fileName });
    return errorResponse;
  }

@@ -19,6 +19,7 @@
      "ro-RO",
      "ru-RU",
      "sv-SE",
+      "tr-TR",
      "zh-Hans-CN",
      "zh-Hant-TW"
    ]
@@ -98,6 +98,8 @@ checksums:
    common/activity: 1948763de8e531483a798b68195e297e
    common/add: 87c4a663507f2bcbbf79934af8164e13
    common/add_action: 66fefc4dd6a7b939c2224272cf0d2669
+    common/add_charts: c377a42e165e8ab67bfbb8ad72026dd8
+    common/add_existing_chart_description: b1292a1d6df2e03ad7b399689312c37f
    common/add_filter: ed5d8e9bfcb05cd1e10e4c403befbae6
    common/add_logo: c8665aa9afd0d5a13528bdc96daefa53
    common/add_member: 11979625770516ca287e929381778e02
@@ -109,6 +111,7 @@ checksums:
    common/allow: 3e39cc5940255e6bff0fea95c817dd43
    common/allow_users_to_exit_by_clicking_outside_the_survey: 1c09db6e85214f1b1c3d4774c4c5cd56
    common/an_unknown_error_occurred_while_deleting_table_items: 06be3fd128aeb51eed4fba9a079ecee2
+    common/analysis: 409bac6215382c47e59f5039cc4cdcdd
    common/and: dc75b95c804b16dc617a5f16f7393bca
    common/anonymous: 77b5222e710cc1dae073dae32309f8ed
    common/api_keys: f961b547cd312cc8b9b79f0c9e0b2cc3
@@ -127,6 +130,9 @@ checksums:
    common/centered_modal: 982ff411cb7e91e30300c2ed56b7e507
    common/change_organization: 3b2c873962509445ff2cb8cde5ad913b
    common/change_workspace: 489cbcf7eef9b9b960e426fbf4da318f
+    common/chart: 6f4d9c56e45ceb8fc22d2f74454cd813
+    common/charts: 1da4564d89264c89de4ed28d7451b43e
+    common/choice_n: a6965b8fb3e479e94175b3826839d9ae
    common/choices: 8a7a77a71ec6eebc363c5dc0f8490a4d
    common/choose_organization: a8f5db68012323bfbb1a0ad0fb194603
    common/choose_workspace: f9ed22d76c69cc75aa56cf3da3fa6320
@@ -139,8 +145,9 @@ checksums:
    common/close: 2c2e22f8424a1031de89063bd0022e16
    common/code: 343bc5386149b97cece2b093c39034b2
    common/collapse_rows: 24988527f9180f37aa55d2aa183ccb21
+    common/column_n: b98315f0e504fad7e784d77f153a7d9d
    common/completed: 0e4bbce9985f25eb673d9a054c8d5334
-    common/configuration: 923ec0502721489202f6222dd4107163
+    common/configuration: e3ab18ebb36c218cd4897c620f5809ac
    common/confirm: 90930b51154032f119fa75c1bd422d8b
    common/connect: 8778ee245078a8be4a2ce855c8c56edc
    common/connect_formbricks: a9dd747575e7e035da69251366df6f95
@@ -169,6 +176,8 @@ checksums:
    common/created_by: 6775c2fa7d495fea48f1ad816daea93b
    common/customer_success: 2b0c99a5f57e1d16cf0a998f9bb116c4
    common/dark_overlay: 173e84b526414dbc70dbf9737e443b60
+    common/dashboard: c9380ea68c8c76ea451bd9613329a07c
+    common/dashboards: 4bc47e48559a6b688684dcb7ac4babc9
    common/date: 56f41c5d30a76295bb087b20b7bee4c3
    common/days: c95fe8aedde21a0b5653dbd0b3c58b48
    common/default: d9c6dc5c412fe94143dfd1d332ec81d4
@@ -176,6 +185,7 @@ checksums:
    common/delete_what: 718ddfcc1dec7f3e8b67856fba838267
    common/description: e17686a22ffad04cc7bb70524ed4478b
    common/disable: 81b754fd7962e0bd9b6ba87f3972e7fc
+    common/disabled: 0889a3dfd914a7ef638611796b17bf72
    common/disallow: 01c8ed3ce545ed836d3ccffc562c8a0c
    common/discard: de83a114a79d086e372c43dbfe9f47b4
    common/dismissed: f0e21b3fe28726c577a7238a63cc29c2
@@ -196,7 +206,6 @@ checksums:
    common/ending_card: 16d30d3a36472159da8c2dbd374dfe22
    common/enter_url: 468c2276d0f2cb971ff5a47a20fa4b97
    common/enterprise_license: e81bf506f47968870c7bd07245648a0d
-    common/environment: 0844e8dc1485339c8de066dc0a9bb6a1
    common/error: 3c95bcb32c2104b99a46f5b3dd015248
    common/error_component_description: fa9eee04f864c3fe6e6681f716caa015
    common/error_component_title: ae68fa341a143aaa13a5ea30dd57a63e
@@ -208,6 +217,7 @@ checksums:
    common/failed_to_load_organizations: 512808a2b674c7c28bca73f8f91fd87e
    common/failed_to_load_workspaces: 6ee3448097394517dc605074cd4e6ea4
    common/failed_to_parse_csv: 7a3d675ecbb3d15884faf1006a5752d6
+    common/field_placeholder: 1fedb1aab1a4d42ad49ddece6d8df372
    common/filter: 626325a05e4c8800f7ede7012b0cadaf
    common/finish: ffa7a10f71182b48fefed7135bee24fa
    common/first_name: cf040a5d6a9fd696be400380cc99f54b
@@ -219,10 +229,13 @@ checksums:
    common/generate: 0345bf322c191e70d01fd6607ec5c2f8
    common/go_back: b917ea82facb90c88c523b255d29f84b
    common/go_to_dashboard: a6efa97d25e36fedc0af794f6ba610f2
+    common/headline: 0023cbe059bbadcc77312825cbbce5ac
    common/hidden: fa290c6ada5869d744ed35e9cca64699
    common/hidden_field: 3ed5c58d0ed359e558cdf7bd33606d2d
    common/hidden_fields: 3de6cfd308293a826cb8679fd1d49972
+    common/hide: a6088b934651055bb27314d111be510b
    common/hide_column: 23ce94db148f2d8e4a0923defead6cf1
+    common/html: f750870203043349d570d8f5865ca0f8
    common/id: c8886d38aeea2ed5f785aba4fc96784b
    common/image: 048ba7a239de0fbd883ade8558415830
    common/images: 9305827c28694866f49db42b4c51831f
@@ -268,9 +281,9 @@ checksums:
    common/mobile_overlay_surveys_look_good: d85169e86077738b9837647bf6d1c7d2
    common/mobile_overlay_title: 42f52259b7527989fb3a3240f5352a8b
    common/months: da74749fbe80394fa0f72973d7b0964a
+    common/more_options: 53d90eae6a9b0243b5bc043b3d9de169
    common/move_down: 4f4de55743043355ad4a839aff2c48ff
    common/move_up: 69f25b205c677abdb26cbb69d97cd10b
-    common/multiple_languages: 7d8ddd4b40d32fcd7bd6f7bac6485b1f
    common/my_product: ad022177062f9ef6e9acf33b13e889aa
    common/name: 9368b5a047572b6051f334af5aa76819
    common/new: 126d036fae5fb6b629728ecb97e6195b
@@ -279,6 +292,7 @@ checksums:
    common/no: 8c708225830b06df2d1141c536f2a0d6
    common/no_actions_found: 4d92b789eb121fc76cd6868136dcbcd4
    common/no_background_image_found: 4108a781a9022c65671a826d4e299d5b
+    common/no_changes: 17709e3e2fbd133ddb8b3291d13de7f6
    common/no_code: f602144ab7d28a5b19a446bf74b4dcc4
    common/no_files_uploaded: c97be829e195a41b2f6b6717b87a232b
    common/no_overlay: 03cde9e91f08e4dd539d788e1e01407f
@@ -286,10 +300,12 @@ checksums:
    common/no_result_found: fedddbc0149972ea072a9e063198a16d
    common/no_results: 0e9b73265c6542240f5a3bf6b43e9280
    common/no_surveys_found: 7b74706fe4f4aacd7d858e19e444fe85
+    common/no_text_found: 27350f35bdd57b3701c7ec578a1a0e11
    common/none_of_the_above: e007f0b1e046d5ddbbcfbd87940456ee
    common/not_authenticated: fed6c62208524ea6782b5f9c07a95a4f
    common/not_authorized: 4be80383fe1a6f52c61138f1aa8d01d4
    common/not_connected: 91ebf07fff6b2ead94d85bd17212e0ba
+    common/not_set: 380482630d60ee2d1531b31246caa467
    common/note: e0337f202c911423275f834edeffc54b
    common/notifications: c52df856139b50dbb1cae7bfb1cf73bb
    common/number: 2789f8391f63e7200a5521078aab017d
@@ -300,6 +316,7 @@ checksums:
    common/on: 1929bcf2fba8003c043b446a851bcb4f
    common/only_one_file_allowed: 171be177f2e96c4bb4c4a47b3bf6c8c9
    common/only_owners_managers_and_manage_access_members_can_perform_this_action: 3c16fc506e871935f6183793e73b6709
+    common/open_options: a4578c0afbfdf4a76d5952a53085b72a
    common/option_id: ed21d97b8ab035ba89fb3f5f073229bd
    common/option_ids: e68c25215ce81ea7ad82ff7be0a0bf2d
    common/optional: 396fb9a0472daf401c392bdc3e248943
@@ -309,7 +326,7 @@ checksums:
    common/organization_settings: 11528aa89ae9935e55dcb54478058775
    common/other: 79acaa6cd481262bea4e743a422529d2
    common/other_filters: 20b09213c131db47eb8b23e72d0c4bea
-    common/others: 39160224ce0e35eb4eb252c997edf4d8
+    common/other_placeholder: f3a0fa2eaaf75aa92b290449c928c081
    common/overlay_color: 4b72073285d13fff93d094aabffe05ac
    common/overview: 30c54e4dc4ce599b87d94be34a8617f5
    common/password: 223a61cf906ab9c40d22612c588dff48
@@ -327,10 +344,8 @@ checksums:
    common/please_upgrade_your_plan: 03d54a21ecd27723c72a13644837e5ed
    common/powered_by_formbricks: 1c3e19894583292bfaf686cac84a4960
    common/preview: 3173ee1f0f1d4e50665ca4a84c38e15d
-    common/preview_survey: 7409e9c118e3e5d5f2a86201c2b354f2
    common/privacy: 7459744a63ef8af4e517a09024bd7c08
    common/product_manager: dfeadc96e6d3de22a884ee97974b505e
-    common/production: 226e0ce83b49700bc1b1c08c4c3ed23a
    common/profile: d7878693f91303a438852d617f6d35df
    common/profile_id: 0ef1286cce9d47b148e9a09deccb6655
    common/progress: dd0200d5849ebb7d64c15098ae91d229
@@ -342,6 +357,7 @@ checksums:
    common/quotas_description: a2caa44fa74664b3b6007e813f31a754
    common/read_docs: d06513c266fdd9056e0500eab838ebac
    common/recipients: f90e7f266be3f5a724858f21a9fd855e
+    common/refresh: c0aec3f31be4c984bae9a482572d2857
    common/remove: dba2fe5fe9f83f8078c687f28cba4b52
    common/remove_from_team: 69bcc7a1001c3017f9de578ee22cffd6
    common/reorder_and_hide_columns: a5e3d7c0c7ef879211d05a37be1c5069
@@ -355,13 +371,17 @@ checksums:
    common/restart: bab6232e89f24e3129f8e48268739d5b
    common/retry: 6e44d18639560596569a1278f9c83676
    common/role: 53743bbb6ca938f5b893552e839d067f
+    common/row_n: f90f7018a69f2d7025ad99a90bd23dc9
    common/saas: f01686245bcfb35a3590ab56db677bdb
    common/sales: 38758eb50094cd8190a71fe67be4d647
    common/save: f7a2929f33bc420195e59ac5a8bcd454
    common/save_as_draft: b1b38812110113627d141db981fb1b12
    common/save_changes: 53dd9f4f0a4accc822fa5c1f2f6d118a
+    common/save_without_scheduling: c6595873d611e6d1786fb15281158467
    common/saving: 27ad05746d65e2f3f17d327eb181725d
+    common/scheduled: 1283929a2810dcf6110765f387dc118e
    common/search: 49dd6c21604b5e8d4153ff1aff2177e1
+    common/search_charts: 51c3934f12f050fb2476d62da335a65c
    common/security: 4b34923fef858a2b9a4a914c3e822889
    common/segment: e8908115453de180bbda7478ba4c2d50
    common/segments: 271db72d5b973fbc5fadab216177eaae
@@ -386,6 +406,7 @@ checksums:
    common/some_files_failed_to_upload: a0e26efeb29ae905257ecf93b112dff0
    common/something_went_wrong: a3cd2f01c073f1f5ff436d4b132d39cf
    common/something_went_wrong_please_try_again: c62a7718d9a1e9c4ffb707807550f836
+    common/soon: b12e79beb0aef9414a445a1b95dd4322
    common/sort_by: 8adf3dbc5668379558957662f0c43563
    common/start_free_trial: e346e4ed7d138dcc873db187922369da
    common/status: 4e1fcce15854d824919b4a582c697c90
@@ -393,6 +414,7 @@ checksums:
    common/storage_not_configured: b0c3e339f6d71f23fdd189e7bcb076f6
    common/string: 4ddccc1974775ed7357f9beaf9361cec
    common/styling: 240fc91eb03c52d46b137f82e7aec2a1
+    common/subheader: 73a37d57cb9807e574a42bd0c7e334ed
    common/submit: 7c91ef5f747eea9f77a9c4f23e19fb2e
    common/summary: 13eb7b8a239fb4702dfdaee69100a220
    common/survey: b659d270a53dada994d926e0cc6e9a54
@@ -401,6 +423,7 @@ checksums:
    common/survey_languages: 93e4a10ab190e6b1e1f7fe5f702df249
    common/survey_live: d1f370505c67509e7b2759952daba20d
    common/survey_paused: c770d174d6b57e8425a54906a09c8b39
+    common/survey_scheduled: 704c5e76b90ea2972ad6cae50f68dcdd
    common/survey_type: 417fcfecf8eaedefc4f11172426811f9
    common/surveys: 33f68ad4111b32a6361beb9d5c184533
    common/table_items_deleted_successfully: 46f29d20b26ecfbaf34d4e7291e88b05
@@ -463,7 +486,6 @@ checksums:
    common/workspaces: 8ba082a84aa35cf851af1cf874b853e2
    common/years: eb4f5fdd2b320bf13e200fd6a6c1abff
    common/yes: ec580fd11a45779b039466f1e35eed2a
-    common/you: db2a4a796b70cc1430d1b21f6ffb6dcb
    common/you_are_downgraded_to_the_community_edition: e3ae56502ff787109cae0997519f628e
    common/you_are_not_authorized_to_perform_this_action: 1b3255ab740582ddff016a399f8bf302
    common/you_have_reached_your_limit_of_workspace_limit: 506a6ee315d9754da7ea26929bc40f52
@@ -479,11 +501,11 @@ checksums:
    emails/email_footer_text_2: 6fd719fe916a7155e1b0b88a72420717
    emails/email_template_text_1: 86b06d249ef069e0fe2457fe3889c416
    emails/embed_survey_preview_email_didnt_request: 895b4463965beac0df080ccdef847824
-    emails/embed_survey_preview_email_environment_id: 4dc6803f9b79c8a4be35a4126a582331
    emails/embed_survey_preview_email_fight_spam: 71f345df8d483d5b6c2c6dbab458d0b2
    emails/embed_survey_preview_email_heading: 2a1982b3aeb91476cefb62554031394a
    emails/embed_survey_preview_email_subject: 3240ad34aac02860909e10187745070e
    emails/embed_survey_preview_email_text: 2eceb6fdedef104db8cfad4de7fdb9aa
+    emails/embed_survey_preview_email_workspace_id: bafef925e1b57b52a69844fdf47aac3c
    emails/forgot_password_email_change_password: fe6d4ba303b82f4833b3293f0c4e88c0
    emails/forgot_password_email_did_not_request: 79d35c3800e23e9d4c95bf33f250104f
    emails/forgot_password_email_heading: fe6d4ba303b82f4833b3293f0c4e88c0
@@ -570,6 +592,7 @@ checksums:
    s/question_preview: 9d8fbc0150fc10ba851beba2d4f4d9f3
    s/response_already_received: 8e7b1a7d6e01a1939bca95285af77a69
    s/response_submitted: d5df62e1db6012bd1283126a8dd7bad6
+    s/scheduled: 0ec63111fd5efe2ac240912105c5f518
    s/survey_already_answered_heading: 4783c9c36ad0d4f8eec5dfeb14a04545
    s/survey_already_answered_subheading: 40cfe7e8680cd4fbb7318a05d3491c78
    s/survey_sent_to: 192c2b0d27e01c35953b851d3875722e
@@ -695,6 +718,10 @@ checksums:
    templates/career_development_survey_question_6_choice_6: 79acaa6cd481262bea4e743a422529d2
    templates/career_development_survey_question_6_headline: 88d2a87cbf2ec21882798890990c2225
    templates/career_development_survey_question_6_subheader: b9b478e967930358b0c74324a7c18fc8
+    templates/ces: 49fc8d0ae7b82f3e7d49922ada7ab7a1
+    templates/ces_description: 66f4aaa7e76fd87d19c4ec3bf71481e0
+    templates/ces_lower_label: c2f05d3610d8879ae503a61d49e32e80
+    templates/ces_upper_label: b88eaddaea17a4f285209c2529a9b8f8
    templates/cess_survey_name: dd706043a56d66f2895cad743935c5b4
    templates/cess_survey_question_1_headline: 70115a7960746a05acef03f815652fc3
    templates/cess_survey_question_1_lower_label: 586eedbc7b53319775e42c7cd4cef4de
@@ -758,7 +785,9 @@ checksums:
    templates/consent_description: d76e48fb1e8c291b51e783eaf7fc910d
    templates/contact_info: 73913230e8988f5f423e54e0fd43f368
    templates/contact_info_description: 0e8962e628bb0a072a4217ae172db43b
-    templates/csat_description: 4dd35d7fecfa9fdf47765c7108c3d535
+    templates/csat: 6864fe0caad3b052a4ec0837e7b71cee
+    templates/csat_description: 0e64d5594f961e5070a95f715594549e
+    templates/csat_lower_label: 206c68e770b90abd737c8c4cb99aa695
    templates/csat_name: f216066cef52693bbaa842a3305377c7
    templates/csat_question_10_headline: b6a9ca9c6c20dced146d817c9a1e9be7
    templates/csat_question_10_placeholder: 37ee9c84f3777b9220d4faec1e1c78ee
@@ -834,6 +863,7 @@ checksums:
    templates/csat_survey_question_2_placeholder: 37ee9c84f3777b9220d4faec1e1c78ee
    templates/csat_survey_question_3_headline: 25974b7f1692cad41908fe305830b6c0
    templates/csat_survey_question_3_placeholder: 37ee9c84f3777b9220d4faec1e1c78ee
+    templates/csat_upper_label: a3a49eb9cc86972bce6dc41a107f472d
    templates/cta_description: bc94a2ddc965b286a8677b0642696c7e
    templates/custom_survey_description: 0492afdea2ef1bd683eaf48a2bad2caa
    templates/custom_survey_name: 6fc756927ca9ea22c26368cccd64a67e
@@ -999,6 +1029,11 @@ checksums:
    templates/gauge_feature_satisfaction_question_2_headline: 0fcbefbfcf5c21e42de8a36cb2cad854
    templates/identify_customer_goals_description: c30d06df9e5c76334e4c3d470ee6e4d8
    templates/identify_customer_goals_name: f8123dbfa22e169517a811fae7496595
+    templates/identify_customer_goals_question_1_choice_1: a6803cfbdbd6208eedf5c691f9e106a5
+    templates/identify_customer_goals_question_1_choice_2: 7461749517d62030ec2e3915cf1d223b
+    templates/identify_customer_goals_question_1_choice_3: 725eb3ee0d4f2d229fcf588c21e66a86
+    templates/identify_customer_goals_question_1_choice_4: 3985521036afaf1cbd2bdc7a4d86d351
+    templates/identify_customer_goals_question_1_headline: 45a7347cf3ae2d498a30ca1266898cf8
    templates/identify_sign_up_barriers_description: 5b2fbee8c425d7a4d0706ec3628cea11
    templates/identify_sign_up_barriers_name: 3bbc5352dfa7a9c237bc2c6b21b608dd
    templates/identify_sign_up_barriers_question_1_button_label: 080fd22c580f56ffdcea6c3d60448b84
@@ -1073,6 +1108,8 @@ checksums:
    templates/improve_trial_conversion_question_1_subheader: 67c7047ba2365d461df14dbed3f9506d
    templates/improve_trial_conversion_question_2_button_label: 89ddbcf710eba274963494f312bdc8a9
    templates/improve_trial_conversion_question_2_headline: 54324cd652667183dd3cf647ba72dd07
+    templates/improve_trial_conversion_question_3_button_label: 89ddbcf710eba274963494f312bdc8a9
+    templates/improve_trial_conversion_question_3_headline: 8dfe1f843c8de64de7e3fa619b961152
    templates/improve_trial_conversion_question_4_button_label: d94a6a11cfdf4ebde4c5332e585e2e96
    templates/improve_trial_conversion_question_4_headline: 9b07341f65574c4165086ec107cebb45
    templates/improve_trial_conversion_question_4_html: 8ce95691eeeae7ad61c4d2f867b918ca
@@ -1540,7 +1577,6 @@ checksums:
    workspace/actions/this_action_will_be_triggered_when_the_page_is_loaded: 8d28f30cf56f50ea79aef8dd2b02185d
    workspace/actions/this_action_will_be_triggered_when_the_user_scrolls_50_percent_of_the_page: 60230ad129853377af1066e10f3b3c22
    workspace/actions/this_action_will_be_triggered_when_the_user_tries_to_leave_the_page: 504fa734659524933e3489823d820265
-    workspace/actions/this_is_a_code_action_please_make_changes_in_your_code_base: 27e64863fdebca791ca129ac0c3da3d5
    workspace/actions/time_in_seconds: 822be76950e5f614ed23f52ba1d4825f
    workspace/actions/time_in_seconds_placeholder: e54a4c40e0c6b43fb2e97bd32cab8da8
    workspace/actions/time_in_seconds_with_unit: a743b7844c71ddad364a93872682ae9e
@@ -1555,6 +1591,176 @@ checksums:
    workspace/actions/you_can_track_code_action_anywhere_in_your_app_using: 3c0bbf160b8ddbeef142403103b70554
    workspace/actions/your_survey_would_be_shown_on_this_url: 766fdeeb52d170c156af5d035a1f8c37
    workspace/actions/your_survey_would_not_be_shown: af44fe160f449ff9557ebe5d3686832d
+    workspace/analysis/charts/OR: 0208d355f231c386b19390f0bea41b95
+    workspace/analysis/charts/add_chart_to_dashboard: c2a517ada86cdda60e49bec655ca9a6d
+    workspace/analysis/charts/add_chart_to_dashboard_description: 08980a1849757e9aec21fca5881c6be4
+    workspace/analysis/charts/add_filter: ed5d8e9bfcb05cd1e10e4c403befbae6
+    workspace/analysis/charts/add_to_dashboard: 9941c3d30895bb8e25ce8d4e03d33a08
+    workspace/analysis/charts/advanced_chart_builder_config_prompt: c2fe2c1a076f27d3ae62a4db75474b0a
+    workspace/analysis/charts/ai_query_placeholder: 24c3d18f514cb3a9953f04c3b04503a2
+    workspace/analysis/charts/ai_query_section_description: 66d06342f29bf6658793403856521fd7
+    workspace/analysis/charts/ai_query_section_title: c0e450a47af7c2a516b77f73cf54db1b
+    workspace/analysis/charts/and_filter_logic: 53e8eb67a396fcb5e419bb4cbf0008df
+    workspace/analysis/charts/apply_changes: ed3da8072dbd27dc0c959777cdcbebf3
+    workspace/analysis/charts/chart: 6f4d9c56e45ceb8fc22d2f74454cd813
+    workspace/analysis/charts/chart_added_to_dashboard: 7bc429ab605cb89a9232c26be008cc00
+    workspace/analysis/charts/chart_builder_choose_chart_type: 1376de2dcafac573a2df9e4c007b0ec8
+    workspace/analysis/charts/chart_data: 6739a9576b357a58d73ff0c9bf8db0e4
+    workspace/analysis/charts/chart_data_tab: b7b46ab6ce9606032c8f81f6f6afbb9b
+    workspace/analysis/charts/chart_deleted_successfully: 79148f471cd9acc2c8d0d033fb85437e
+    workspace/analysis/charts/chart_deletion_error: 267eb65c168e726075d7cea678dd32e0
+    workspace/analysis/charts/chart_duplicated_successfully: 755c4ce5bf533764d549a53c33e32165
+    workspace/analysis/charts/chart_duplication_error: 90d7166c85188b52f821c9d9f53ff8c4
+    workspace/analysis/charts/chart_name: cdb36e2f121a7b9c28298e15ab8218dc
+    workspace/analysis/charts/chart_name_placeholder: 7370d4f88f27aea337ba1c36465c3f8b
+    workspace/analysis/charts/chart_preview: 1b7faae244d31e43f758f50b94132413
+    workspace/analysis/charts/chart_render_error: 01e9ece0c86a1fedf301afa0dbbf6aeb
+    workspace/analysis/charts/chart_saved_successfully: 2489c853c0b36790e3592ac6ea31cc61
+    workspace/analysis/charts/chart_type_area: 535754c6425f045f17e1dcb551840c93
+    workspace/analysis/charts/chart_type_bar: c11d460595d3ddfe8efd67ac068574c5
+    workspace/analysis/charts/chart_type_big_number: 9d17fb96241507c955dca25e143ae67a
+    workspace/analysis/charts/chart_type_line: f42dd53238ed4d44def306a61d47d5c4
+    workspace/analysis/charts/chart_type_not_supported: c25334de42fd6192ff8355158865a3e8
+    workspace/analysis/charts/chart_type_pie: 068a797404233ccf68d07ad63af7b50c
+    workspace/analysis/charts/chart_updated_successfully: a2c210523902c726aa1328bbeda0b357
+    workspace/analysis/charts/configure_description: 2939321f78e4ffbc57b4259ddaddb09d
+    workspace/analysis/charts/configure_title: ab767b11da1d386b98b3f634f79d3abe
+    workspace/analysis/charts/configure_type_label: cd13e4b37fb2021af55903e7690a9856
+    workspace/analysis/charts/contains: 06dd606c0a8f81f9a03b414e9ae89440
+    workspace/analysis/charts/create_chart: 636969b904e88bef5c93e859dd8a1656
+    workspace/analysis/charts/create_chart_description: b9680bd8905dea180fa59a86f61de34e
+    workspace/analysis/charts/create_chart_with_ai: b0092b5616015a29dd51fbab49bcd4c4
+    workspace/analysis/charts/custom_range: 99f4d72b64621406acc162cceeb1fed7
+    workspace/analysis/charts/dashboard: c9380ea68c8c76ea451bd9613329a07c
+    workspace/analysis/charts/dashboard_select_placeholder: 9b875f2f10050d650ae63be53fe0d4e8
+    workspace/analysis/charts/data_label: b7b46ab6ce9606032c8f81f6f6afbb9b
+    workspace/analysis/charts/data_source: c29cdd1967a3d1b1a39e91e14469b047
+    workspace/analysis/charts/date_preset_last_30_days: a738894cfc5e592052f1e16787744568
+    workspace/analysis/charts/date_preset_last_7_days: 3631df3109bfecfe358ba15dcf8bd6f5
+    workspace/analysis/charts/date_preset_last_month: 848086395b28875c050d56e3933dae61
+    workspace/analysis/charts/date_preset_this_month: 50845a38865204a97773c44dcd2ebb90
+    workspace/analysis/charts/date_preset_this_quarter: 9c77d94783dff2269c069389122cd7bd
+    workspace/analysis/charts/date_preset_this_year: 1e69651c2ac722f8ce138f43cf2e02f9
+    workspace/analysis/charts/date_preset_today: 142173f9752e18e92109623a3ee68cad
+    workspace/analysis/charts/date_preset_yesterday: eeb58908e68ff96c1b7e8f90e389afb7
+    workspace/analysis/charts/date_range: 9b3aa5954144de586931f60ef9594e99
+    workspace/analysis/charts/delete_chart_confirmation: f7fd7b0a08e81c9b392b08c9c1ad2147
+    workspace/analysis/charts/dimensions: f09d837ac25f58986a769bd48ea15022
+    workspace/analysis/charts/dimensions_toggle_description: 31eb28f3c83c04bbe37799758ca9f595
+    workspace/analysis/charts/edit_chart_description: 822890e4b6068096e2fe8b7b78b4474f
+    workspace/analysis/charts/edit_chart_title: fd3e7f8c53280bfad8f4034c055f4c71
+    workspace/analysis/charts/enable_time_dimension: cfcf0af2d22bccd197319c07680c2cb8
+    workspace/analysis/charts/end_date: acbea5a9fd7a6fadf5aa1b4f47188203
+    workspace/analysis/charts/enter_a_name_for_your_chart: b6e992a23d0628136121ebf26eec4a50
+    workspace/analysis/charts/enter_value: a4554ed67c02872e302b0042724f859d
+    workspace/analysis/charts/equals: 264ec282f7f5b67da622cc37f2b57b8a
+    workspace/analysis/charts/failed_to_add_chart_to_dashboard: 355a5606399edcbb3e6d0ba0b66f12a6
+    workspace/analysis/charts/failed_to_execute_query: d1153133aa4cd3d1cd02e39942413168
+    workspace/analysis/charts/failed_to_load_chart: abea098fbf8e728f95414d3ae8bb63a4
+    workspace/analysis/charts/failed_to_load_chart_data: ea980a6d12b1b1efed90d991dd0dd0fd
+    workspace/analysis/charts/failed_to_save_chart: e237cf1a56a8f9ee30067fdb0757f7c5
+    workspace/analysis/charts/field: cfd632297d7809a3539e90c9cd4728d9
+    workspace/analysis/charts/field_label_average_score: 5b5aa7322549521d1e813b1c8312d443
+    workspace/analysis/charts/field_label_collected_at: b41902ddb4586ba4a4611d726b5014aa
+    workspace/analysis/charts/field_label_count: 9c5848662eb8024ddf360f7e4001a968
+    workspace/analysis/charts/field_label_detractor_count: eedb15bc383eb0f14d43043e6666c62a
+    workspace/analysis/charts/field_label_emotion: eb3a31ead51b5c8a8d365d5f904e9206
+    workspace/analysis/charts/field_label_field_type: 2581066dc304c853a4a817c20996fa08
+    workspace/analysis/charts/field_label_nps_score: 9c8d0b0b460f9689bd66e81d45e0a2df
+    workspace/analysis/charts/field_label_nps_value: cb7404025044400e3d7d5600f3133e4f
+    workspace/analysis/charts/field_label_passive_count: ceb71da8d1382eb2097089dc3ecf76da
+    workspace/analysis/charts/field_label_promoter_count: c393131a4bd3a25bf6b297beed20e34f
+    workspace/analysis/charts/field_label_response_id: 73375099cc976dc7203b8e27f5f709e0
+    workspace/analysis/charts/field_label_sentiment: 9ba5719c80c0136c2d0644217619aff6
+    workspace/analysis/charts/field_label_source_name: 157675beca12efcd8ec512c5256b1a61
+    workspace/analysis/charts/field_label_source_type: d1ff69af76c687eb189db72030717570
+    workspace/analysis/charts/field_label_topic: 7f542b783cd528f00f4f485e35b48dc1
+    workspace/analysis/charts/field_label_user_identifier: b0174469c95038766744fb7e64005aec
+    workspace/analysis/charts/filter_data: 05cc68ed2896feef60bbe3829cd9063d
+    workspace/analysis/charts/filters: acf5accc113ff3c1992688058576732c
+    workspace/analysis/charts/filters_toggle_description: ea18bdb212a6a85620125cab89a4b1c1
+    workspace/analysis/charts/go_to_feedback_record_directories: 1aa0516beef8adbd330cffdcab8b521f
+    workspace/analysis/charts/granularity: 9eb09aef092e7803ce4acb7965cbbaa9
+    workspace/analysis/charts/granularity_day: 47648cd60fc313bc3f05b70357a1d675
+    workspace/analysis/charts/granularity_hour: ec3113f22fc51d01f0c615c5496f8f87
+    workspace/analysis/charts/granularity_month: ae7bef950efc406ff0980affabc1a64c
+    workspace/analysis/charts/granularity_quarter: 7a68ec90d7c90b92b7bb873834a00381
+    workspace/analysis/charts/granularity_week: 436fdd694160827dd6ea4644cdd0a8f8
+    workspace/analysis/charts/granularity_year: ed86f5f60583f9d8ffdbeed306aa0ec7
+    workspace/analysis/charts/greater_than: a4c18b3b45fcaf7c83bf489cf2b506d4
+    workspace/analysis/charts/greater_than_or_equal: d453e26d136847560148168797fece51
+    workspace/analysis/charts/group_by: 3f1cedea7783018ce83f2fab0051a738
+    workspace/analysis/charts/group_by_description: a4a85baaca87c172023cbe87e620118b
+    workspace/analysis/charts/group_data: 55c0035773d8c6b7f4d96363a61cda82
+    workspace/analysis/charts/is_not_set: 906801489132487ef457652af4835142
+    workspace/analysis/charts/is_set: 9850468156356f95884bbaf56b6687aa
+    workspace/analysis/charts/less_than: fb41255dd44bb6de78617b078610c91b
+    workspace/analysis/charts/less_than_or_equal: da4a2816aadf788d33efcdcc3c61802e
+    workspace/analysis/charts/measures: b1e6cf0f356dda0052c4fef4ad4957a2
+    workspace/analysis/charts/no_charts_found: d4a27d5b56e49ebdd38bf28791dbcc42
+    workspace/analysis/charts/no_dashboards_available: f88389b6c5278cfc4d5b360031205dfe
+    workspace/analysis/charts/no_dashboards_create_first: 28ded0d72247191eb23f6f77925df539
+    workspace/analysis/charts/no_data_available: fe1d34a45e22b5611d255b84b2d67232
+    workspace/analysis/charts/no_data_returned: 683acf7b4f3b32aa85fa26f1bb948d4f
+    workspace/analysis/charts/no_data_returned_for_chart: b9ff6c85697c683f40b3d0c05eeb2046
+    workspace/analysis/charts/no_data_source_available: 48179160e288de4a9e00f0bf110a5ced
+    workspace/analysis/charts/no_grouping: e3a6943e61407600cae057e0833a482d
+    workspace/analysis/charts/no_valid_data_to_display: d1ba2b0686520c0a2c62ee73daa1c9c9
+    workspace/analysis/charts/not_contains: 5894f5474271b8902d7892e43500d227
+    workspace/analysis/charts/not_equals: 427715f1ea349965c36f5c628784eb08
+    workspace/analysis/charts/open_chart: 729a54bbc4bcb3f431865af5e5a50dd4
+    workspace/analysis/charts/open_options: 2c6a35fec9b9d008e41728594bcd07d7
+    workspace/analysis/charts/or_filter_logic: 0208d355f231c386b19390f0bea41b95
+    workspace/analysis/charts/original: 7e55782bdf7cb49f5616b326c003c278
+    workspace/analysis/charts/please_enter_chart_name: 9258b71b2cb09d22ffe33de1755e7309
+    workspace/analysis/charts/please_enter_filter_values: ca79dfab463a3836863618fd92f82b3e
+    workspace/analysis/charts/please_select_at_least_one_dimension: 32ea97a02bb6826947bb70389d1a6231
+    workspace/analysis/charts/please_select_at_least_one_measure: d4163ede267f71ee65945f453e14ff7b
+    workspace/analysis/charts/please_select_dashboard: 8f062db96f815ed8268584dd8d292fa6
+    workspace/analysis/charts/predefined_measures: 7651141f62c991954edcff70899b2a8b
+    workspace/analysis/charts/preset: a17bb0bf56f3326c9567be3ea896ee19
+    workspace/analysis/charts/query_executed_successfully: 9d6f9dad526fcfe0161757c2d2fe2c69
+    workspace/analysis/charts/reset_to_ai_suggestion: 51ced8dd7c0eea8b7fc4e08b35cfbf30
+    workspace/analysis/charts/save_chart: 2e4505f7bf3d1c35b0b37b1e9d3dc566
+    workspace/analysis/charts/save_chart_dialog_title: 2e4505f7bf3d1c35b0b37b1e9d3dc566
+    workspace/analysis/charts/select_data_source: 983394bc0182b65ec68f713a46b97302
+    workspace/analysis/charts/select_data_source_first: 82a02846de9d6351595c97a0929f3b9a
+    workspace/analysis/charts/select_dimensions: 6d0d038d027ef9e641bf9b7700edac9f
+    workspace/analysis/charts/select_field: 45665a44f7d5707506364f17f28db3bf
+    workspace/analysis/charts/select_measures: c9f101aeb53bf0d4abdd652aaf60a1bf
+    workspace/analysis/charts/select_preset: e68bad9a209a6ca35c62184f1f1d829c
+    workspace/analysis/charts/showing_first_n_of: e9c1e76a46d0635f775a5b86bddbe1c3
+    workspace/analysis/charts/start_date: 881de78c79b56f5ceb9b7103bf23cb2c
+    workspace/analysis/charts/time_dimension: 5c967f2a6a875b00825068df5cb2ef84
+    workspace/analysis/charts/time_dimension_title: 9353ce9a075a0cc8c3ba7dfa9ef19a8d
+    workspace/analysis/charts/time_dimension_toggle_description: 77251d8b3b564390bad8b76f56905190
+    workspace/analysis/dashboards/add_count_charts: b4ee1f29efce0bb380a060e0bc5d64fa
+    workspace/analysis/dashboards/charts_add_failed: c4fda79ede798ab6747a989f083a0947
+    workspace/analysis/dashboards/charts_add_partial_failure: b1a9fc6fe18ab20fe16c16e91a05c195
+    workspace/analysis/dashboards/charts_added_to_dashboard: 917abab80231adf5af51e812352fc77b
+    workspace/analysis/dashboards/charts_load_failed: 190bf9c13d3c3cf18126a263591d6757
+    workspace/analysis/dashboards/create_dashboard: bedb308708fe9c576e161a2fa16d3439
+    workspace/analysis/dashboards/create_dashboard_description: d29f60615f6d8c96cc4265541e75ec26
+    workspace/analysis/dashboards/create_failed: 7b58f15568047a35220b3a47cc3b0f71
+    workspace/analysis/dashboards/create_success: 1fa4dea7702ba03a8a3533295276ff1b
+    workspace/analysis/dashboards/dashboard: c9380ea68c8c76ea451bd9613329a07c
+    workspace/analysis/dashboards/dashboard_delete_confirmation: 468a0fb0e24a985cc47a778b50b334ba
+    workspace/analysis/dashboards/dashboard_name: a2d344bc03f27706b42d7d6a8d0fc752
+    workspace/analysis/dashboards/dashboard_name_placeholder: 02954eeb5671f1c00e3f69b47319916e
+    workspace/analysis/dashboards/dashboard_name_required: 4a56c3ce1d73ad915815f5de4bcff566
+    workspace/analysis/dashboards/dashboard_save_failed: 2b6c7be7947bc7ebb0389b71b5922ba6
+    workspace/analysis/dashboards/dashboard_saved: 6eb27743b6b12d3d0a20b430319890b8
+    workspace/analysis/dashboards/delete_confirmation: 468a0fb0e24a985cc47a778b50b334ba
+    workspace/analysis/dashboards/delete_failed: b108acc28b1f9abcb544a358a958b54b
+    workspace/analysis/dashboards/delete_success: 9d161634daab9ea9d17fbfb413eeeffa
+    workspace/analysis/dashboards/duplicate_failed: 6ebaf8ad373b156f88f1ed79a5efd441
+    workspace/analysis/dashboards/duplicate_success: 37cbb14143776d4c215432673e32ebd9
+    workspace/analysis/dashboards/failed_to_load_chart_data: ea980a6d12b1b1efed90d991dd0dd0fd
+    workspace/analysis/dashboards/no_charts_available_description: 796ed01bcb53f770e5f627002839dcb4
+    workspace/analysis/dashboards/no_charts_to_add_message: ad4cec703aa7d59c407bbb021dce4273
+    workspace/analysis/dashboards/no_dashboards_found: e049ec0356009c3a0aa2c729d916efc6
+    workspace/analysis/dashboards/no_data_message: 464d50cf30281a5b6af2726846eb14b4
+    workspace/analysis/dashboards/please_enter_name: b9211ed8a0882c0e0109beba48685d68
    workspace/api_keys/add_api_key: 3c7633bae18a6e19af7a5af12f9bc3da
    workspace/api_keys/api_key: ce825fec5b3e1f8e27c45b1a63619985
    workspace/api_keys/api_key_copied_to_clipboard: daeeac786ba09ffa650e206609b88f9c
@@ -1565,20 +1771,27 @@ checksums:
    workspace/api_keys/api_key_updated: 0e03754eb33742b4ee8d5fdad64c9b3f
    workspace/api_keys/delete_api_key_confirmation: b2f0342d4e55f0cb244fe121eeeb10a3
    workspace/api_keys/duplicate_access: 7ac7ac5ba755ce94e6fc81afa5a21997
+    workspace/api_keys/duplicate_directory_access: e112b756627f0b5e2551451274c3781f
+    workspace/api_keys/feedback_record_directory_access: 51babe735cb94388f68108555814b4f6
    workspace/api_keys/no_api_keys_yet: 58593ed9f7e507dcd7ca7fe069add599
-    workspace/api_keys/no_env_permissions_found: 97ef49946f3ce15c2ad44dcfd2bce507
+    workspace/api_keys/no_directory_permissions_found: ae55b273dd4c71d8431d64d99b39c59f
+    workspace/api_keys/no_workspace_permissions_found: 1d719624828a9d3e433cdf6b387549f3
    workspace/api_keys/organization_access: 96a92fa907b15e0c0e47e33cac15be88
    workspace/api_keys/organization_access_description: 773dfeaf6ffbf34dd9a0a3d656a6d83c
    workspace/api_keys/permissions: 2160be68b1d6b6577e64634e9feba2ed
    workspace/api_keys/secret: f041e5eb96121c8b4f2b8af7e0f83a9b
+    workspace/api_keys/unable_to_copy_api_key: 148506832e31d033fa3569ce292d2120
    workspace/api_keys/unable_to_delete_api_key: 1fd76d9a22c5f5f8c241c4891fca8295
+    workspace/api_keys/unknown_directory: ed07f55f5dba1f451a45f2cf6e01c9a9
+    workspace/api_keys/unknown_workspace: 4b0df2d07ebc9ab084158b1b9525ae5e
    workspace/api_keys/workspace_access: b38cb73197ef5f5fa6653b88c68aa0bd
    workspace/app-connection/app_connection: 778d2305e1a9c8efe91c2c7b4af37ae4
    workspace/app-connection/app_connection_description: dde226414bd2265cbd0daf6635efcfdd
    workspace/app-connection/cache_update_delay_description: 3368e4a8090b7684117a16c94f0c409c
    workspace/app-connection/cache_update_delay_title: 60e4a0fcfbd8850bddf29b5c3f59550c
-    workspace/app-connection/environment_id: 49141af65970ea79e22ecedb97ceb2e4
-    workspace/app-connection/environment_id_description: d611755139dbe9865f1436acf6f679be
+    workspace/app-connection/environment_id_legacy: d5c701874d34b4591e780755f7ac7a58
+    workspace/app-connection/environment_id_legacy_alert: 09ac96821ff99fad4590c661503fa0cd
+    workspace/app-connection/environment_id_legacy_alert_link: 25c529078a115d1ff044a321dd8ee01b
    workspace/app-connection/formbricks_sdk_connected: 29e8a40ad6a7fdb5af5ee9451a70a9aa
    workspace/app-connection/formbricks_sdk_not_connected: 557c534e665750978ba6edb0eacb428e
    workspace/app-connection/formbricks_sdk_not_connected_description: 4ddbacae084238bd0cefeded0fe9dbb9
@@ -1587,10 +1800,12 @@ checksums:
    workspace/app-connection/receiving_data: 9f2a48c0b0278861add70b526061264c
    workspace/app-connection/recheck: f95f2bbe6990a123d60255c87bdd59f7
    workspace/app-connection/sdk_connection_details: 89f2c169fd1604c1df5a834517f1eae1
-    workspace/app-connection/sdk_connection_details_description: 8e6d79678736819bf2f2940404ba5c3e
+    workspace/app-connection/sdk_connection_details_description: 2d6824466039672fa002d72da95b4637
    workspace/app-connection/setup_alert_description: 6d676044d01dc2147731ffab7df6c259
    workspace/app-connection/setup_alert_title: 9561cca2b391e0df81e8a982921ff2bb
    workspace/app-connection/webapp_url: d64d8cc3c4c4ecce780d94755f7e4de9
+    workspace/app-connection/workspace_id: 49141af65970ea79e22ecedb97ceb2e4
+    workspace/app-connection/workspace_id_description: 77e5219be241e9973741f138787ccbb8
    workspace/connect/congrats: c2f5b597aabdf298cf9f0452863e2dc6
    workspace/connect/connection_successful_message: fa1f29883e15e8697c6c477bdf5cb645
    workspace/connect/do_it_later: ab4accfbe53d924ab3ffaf9ea78a75f3
@@ -1617,10 +1832,10 @@ checksums:
    workspace/contacts/attribute_value_placeholder: 90fb17015de807031304d7a650a6cb8c
    workspace/contacts/attributes_msg_attribute_limit_exceeded: a6c430860f307f9cc90c449f96a1284f
    workspace/contacts/attributes_msg_attribute_type_validation_error: bd70f9773ae873240d4cdb26a662334c
-    workspace/contacts/attributes_msg_email_already_exists: a3ea1265e3db885f53d0e589aecf6260
+    workspace/contacts/attributes_msg_email_already_exists: 308cf739f7b98a6b2707acf3b658f220
    workspace/contacts/attributes_msg_email_or_userid_required: febc8b0cda4dd45d2c3cdb1ac2d45dcb
    workspace/contacts/attributes_msg_new_attribute_created: 5cba6158c4305c05104814ec1479267c
-    workspace/contacts/attributes_msg_userid_already_exists: 9c695538befc152806c460f52a73821a
+    workspace/contacts/attributes_msg_userid_already_exists: 94851fa7f17ffd0da323658dbf6bdd31
    workspace/contacts/contact_deleted_successfully: c5b64a42a50e055f9e27ec49e20e03fa
    workspace/contacts/contacts_table_refresh: 6a959475991dd4ab28ad881bae569a09
    workspace/contacts/contacts_table_refresh_success: 40951396e88e5c8fdafa0b3bb4fadca8
@@ -1865,7 +2080,6 @@ checksums:
    workspace/languages/duplicate_language_or_language_id: 0e17e3794b24e2428ca6ffadae0d08f3
    workspace/languages/edit_languages: c9d36f6b28557cc7d54e87c37dc18fdd
    workspace/languages/identifier: 7d8ade6b85e96216bcd73adeeeeecd8c
-    workspace/languages/incomplete_translations: d82908b5725f18f5849c7876ad497ebc
    workspace/languages/language: 277fd1a41cc237a437cd1d5e4a80463b
    workspace/languages/language_deleted_successfully: 4a805d030491f3fe608d2371b0cfcd83
    workspace/languages/languages_updated_successfully: 60de474c99c5059c0458cddd0b016c15
@@ -1876,7 +2090,6 @@ checksums:
    workspace/languages/remove_language: 1a64563b0f37109f97b78eddd493e381
    workspace/languages/remove_language_from_surveys_to_remove_it_from_workspace: 61bc96f9db31a29a649cc9ecd684bc39
    workspace/languages/search_items: b54b751c8b075200be579d6c8e58096b
-    workspace/languages/translate: 59f9803b27e2030ba7323ed239116cf7
    workspace/look/add_background_color: 9be512ee1246e32d3958c56097d202d9
    workspace/look/add_background_color_description: adb6fcb392862b3d0e9420d9b5405ddb
    workspace/look/advanced_styling_field_border_radius: 63b8f3541a9792d705e67d5aca7b6451
@@ -2081,7 +2294,7 @@ checksums:
    workspace/settings/billing/most_popular: 03051978338d93d9abdd999bc06284f9
    workspace/settings/billing/pending_change_removed: c80cc7f1f83f28db186e897fb18282a3
    workspace/settings/billing/pending_plan_badge: 1283929a2810dcf6110765f387dc118e
-    workspace/settings/billing/pending_plan_change_description: a50400c802ab04c23019d8219c5e7e1c
+    workspace/settings/billing/pending_plan_change_description: 6923bada769d33cadcad557521362c1f
    workspace/settings/billing/pending_plan_change_title: 730a8df084494ccf06c0a2f44c28f9fc
    workspace/settings/billing/pending_plan_cta: 1283929a2810dcf6110765f387dc118e
    workspace/settings/billing/per_month: 64e96490ee2d7811496cf04adae30aa4
@@ -2234,19 +2447,20 @@ checksums:
    workspace/settings/feedback_record_directories/nav_label: cf9a57b3cbac0f04b98e06fb693e986e
    workspace/settings/feedback_record_directories/no_access: cc3385cd01a11e3949003a2cc6fb5b31
    workspace/settings/feedback_record_directories/no_connectors: b1becb4fe4e2ba7c5d277db149f092ff
+    workspace/settings/feedback_record_directories/pause_connectors_confirmation_description: a3c2c56daed9f2a9e6a853cb8b924bad
+    workspace/settings/feedback_record_directories/pause_connectors_confirmation_title: 09041363c55fb2686f8115df6fa2afc1
    workspace/settings/feedback_record_directories/select_workspaces_placeholder: 7d8c8f5910b264525f73bd32107765db
    workspace/settings/feedback_record_directories/show_archived: c4c1c3bbddc1bb1540c079b589a2d3de
    workspace/settings/feedback_record_directories/title: e3d425c27f80162f29ce094e31a3fd8f
    workspace/settings/feedback_record_directories/unarchive: 671fc7e9d7c8cb4d182a25a46551c168
-    workspace/settings/general/ai_data_analysis_disabled_for_organization: 2066fe71ecf8994ba738c79b63a1934b
+    workspace/settings/feedback_record_directories/unarchive_workspace_conflict: 82f4b8ebaf41589cfb96e6398dafcc76
+    workspace/settings/feedback_record_directories/workspace_access: 32407b39cf878fb579559c1ed3660892
    workspace/settings/general/ai_data_analysis_enabled: 45fabb594da6851f73fef50ca40fe525
    workspace/settings/general/ai_data_analysis_enabled_description: 46d4f0bdf4ebf89e78f79cc961a2de83
    workspace/settings/general/ai_enabled: 3cb1fce89c525e754448d5bd143eb6b5
    workspace/settings/general/ai_enabled_description: e8c3e9f362588898a6cea85e18c013a1
-    workspace/settings/general/ai_features_not_enabled_for_organization: e344473bd813fc43f69c51138f74bc8e
    workspace/settings/general/ai_instance_not_configured: 37a80753eb22b5bfc985d0e1f2145e3f
    workspace/settings/general/ai_settings_updated_successfully: 2a6f534dc3a246ced46becd8a4a9543d
-    workspace/settings/general/ai_smart_tools_disabled_for_organization: 13df84ae47d35dfa6e86ffa62f29c75d
    workspace/settings/general/ai_smart_tools_enabled: 1dda984f5262c5f9120ee9a409236758
    workspace/settings/general/ai_smart_tools_enabled_description: 1ceca6707746d3ab4a530712a06d91da
    workspace/settings/general/bulk_invite_warning_description: e8737a2fbd5ff353db5580d17b4b5a37
@@ -2305,6 +2519,8 @@ checksums:
    workspace/settings/general/share_invite_link: b40b7ffbcf02d7464be52fb562df5e3a
    workspace/settings/general/share_this_link_to_let_your_organization_member_join_your_organization: 6eb43d5b1c855572b7ab35f527ba953c
    workspace/settings/general/test_email_sent_successfully: aa68214f5e0707c9615e01343640ab32
+    workspace/settings/general/unlock_ai_features_description: c15c8c050a4a16d99dc595d9c6419bc4
+    workspace/settings/general/unlock_ai_features_with_a_higher_plan: e0140d3ffd07524fb8f1fec637c4149a
    workspace/settings/notifications/auto_subscribe_to_new_surveys: 8102c9ce2fbcae53bd8d979c42932fa9
    workspace/settings/notifications/email_alerts_surveys: 12be5a073d74453a531167debd947bd6
    workspace/settings/notifications/every_response: 526988e9015f37bc2d32414d7dc05c7c
@@ -2393,16 +2609,9 @@ checksums:
    workspace/settings/teams/you_are_a_member: cf5af638d5371c8fbc337e92519e5150
    workspace/surveys/all_set_time_to_create_first_survey: 21d3bb74c3b9642b3195d17c17346399
    workspace/surveys/alphabetical: 5fcfeff9c5fd28714f0a390e0ddaaaee
-    workspace/surveys/copy_survey: de8142b45e7bca61f2dca0069a62b417
-    workspace/surveys/copy_survey_description: b78f714a4a4baae883210b13fb196bd5
-    workspace/surveys/copy_survey_error: 74cab7d84ea8b669e106d4c326cac005
    workspace/surveys/copy_survey_link_to_clipboard: 77387e3d3de4be07a2a34963f73cd7e8
-    workspace/surveys/copy_survey_no_workspaces: 6f4547d91b2c14dad83c44b01df365eb
-    workspace/surveys/copy_survey_partially_success: a436a5fb7167b95c2308794d35aab070
-    workspace/surveys/copy_survey_success: a829e645fe034b3e712d0b8572a5edc4
    workspace/surveys/delete_survey_and_responses_warning: 3320c91c1fd27378b7f3d6abc003f2ae
-    workspace/surveys/edit/1_choose_the_default_language_for_this_survey: d22759857c1bb3d6b337e8e9d501dad7
-    workspace/surveys/edit/2_activate_translation_for_specific_languages: 9f23cb81ad301073df45ae36f0d94f9e
+    workspace/surveys/edit/activate_translations: af127c1bed2b47e2012e3a23e489ecb8
    workspace/surveys/edit/add: 5196f5cd4ba3a6ac8edef91345e17f66
    workspace/surveys/edit/add_a_delay_or_auto_close_the_survey: b5fa358bf3ff324014060eb0baf6dd2f
    workspace/surveys/edit/add_a_four_digit_pin: 953cb3673d2135923e3b4474d33ffb2c
@@ -2439,6 +2648,18 @@ checksums:
    workspace/surveys/edit/adjust_survey_closed_message: ae6f38c9daf08656362bd84459a312fa
    workspace/surveys/edit/adjust_survey_closed_message_description: e906aebd9af6451a2a39c73287927299
    workspace/surveys/edit/adjust_the_theme_in_the: bccdafda8af5871513266f668b55d690
+    workspace/surveys/edit/ai_data_analysis_disabled: 2066fe71ecf8994ba738c79b63a1934b
+    workspace/surveys/edit/ai_features_not_enabled: e344473bd813fc43f69c51138f74bc8e
+    workspace/surveys/edit/ai_instance_not_configured: 939ad7c3240fa8de98a325239f1b36bc
+    workspace/surveys/edit/ai_smart_tools_disabled: 13df84ae47d35dfa6e86ffa62f29c75d
+    workspace/surveys/edit/ai_translate: f25943cdeffe155ee524428f4daa5da2
+    workspace/surveys/edit/ai_translating: 098a2293b39f9f258d67f926cf03df37
+    workspace/surveys/edit/ai_translation_all_fields_populated: d78f6a663ea19ce77045970179bd200f
+    workspace/surveys/edit/ai_translation_complete: f443d0801404f728e68000b46ca67598
+    workspace/surveys/edit/ai_translation_failed: fd356a173d0abde7a0fc660394954cc7
+    workspace/surveys/edit/ai_translation_instance_not_configured: 6deeb8aeaff3982d07e1d5a045e06d2d
+    workspace/surveys/edit/ai_translation_not_available: 2f060bf93a558e6d12ec90988fdd162e
+    workspace/surveys/edit/ai_translation_not_enabled: 9066bc85f62ea0e96620c058a4004388
    workspace/surveys/edit/all_are_true: 05d02c5afac857da530b73dcf18dd8e4
    workspace/surveys/edit/all_other_answers_will_continue_to: 9a5d09eea42ff5fd1c18cc58a14dcabd
    workspace/surveys/edit/allow_multi_select: 7b4b83f7a0205e2a0a8971671a69a174
@@ -2452,7 +2673,7 @@ checksums:
    workspace/surveys/edit/audience: a4d9fab4214a641e2d358fbb28f010e0
    workspace/surveys/edit/auto_close_on_inactivity: 093db516799315ccd4242a3675693012
    workspace/surveys/edit/auto_progress_rating_and_nps: 76b98e95a5b850850baa0ccc3c7fbf7c
-    workspace/surveys/edit/auto_progress_rating_and_nps_description: cbf676789b9f3f47e36bdf35fa58282b
+    workspace/surveys/edit/auto_progress_rating_and_nps_description: 2a992dd8a5b9532f178f9a21881feb9a
    workspace/surveys/edit/auto_save_disabled: f7411fb0dcfb8f7b19b85f0be54f2231
    workspace/surveys/edit/auto_save_disabled_tooltip: 77322e1e866b7d29f7641a88bbd3b681
    workspace/surveys/edit/auto_save_on: 1524d466830b00c5d727c701db404963
@@ -2498,6 +2719,7 @@ checksums:
    workspace/surveys/edit/caution_text: 3291e962c0e4c4656832837ddc512918
    workspace/surveys/edit/change_anyway: 6377497d40373f6d0f082670194981ab
    workspace/surveys/edit/change_background: fa71a993869f7d3ac553c547c12c3e9b
+    workspace/surveys/edit/change_default: 6236a6c8a28489ba7c4cad7426806859
    workspace/surveys/edit/change_question_type: 2d555ae48df8dbedfc6a4e1ad492f4aa
    workspace/surveys/edit/change_survey_type: c26322043a476da6d94adb8b4efe1e93
    workspace/surveys/edit/change_the_background_to_a_color_image_or_animation: f1b9c9eb61497dd91b2550dd50c77836
@@ -2509,7 +2731,11 @@ checksums:
    workspace/surveys/edit/choose_the_first_question_on_your_block: bdece06ca04f89d0c445ba1554dd5b80
    workspace/surveys/edit/choose_where_to_run_the_survey: ad87bcae97c445f1fd9ac110ea24f117
    workspace/surveys/edit/city: 1831f32e1babbb29af27fac3053504a2
+    workspace/surveys/edit/clear_close_on_date: 673ed6940f36b02cf871ffacf034e114
+    workspace/surveys/edit/clear_publish_on_date: fe1ffa08c7b95d1dbd6bb8f89d22760f
+    workspace/surveys/edit/close_survey_on_date: 5588ecb41d245dacfb5f7e1b10a97a3e
    workspace/surveys/edit/close_survey_on_response_limit: 256d0bccdbcbb3d20e39aabc5b376e5e
+    workspace/surveys/edit/code: 343bc5386149b97cece2b093c39034b2
    workspace/surveys/edit/color: 9d53d1d120e8b8954bcae9a322573748
    workspace/surveys/edit/column_used_in_logic_error: deffbd3e8f4bd71a5e522682e8ee60dd
    workspace/surveys/edit/columns: 14896556dc1535d70198854757f704ec
@@ -2534,6 +2760,7 @@ checksums:
    workspace/surveys/edit/customize_survey_logo: 7f7e26026c88a727228f2d7a00d914e2
    workspace/surveys/edit/darken_or_lighten_background_of_your_choice: 304a64a8050ebf501d195e948cd25b6f
    workspace/surveys/edit/days_before_showing_this_survey_again: 9ee757e5c3a07844b12ceb406dc65b04
+    workspace/surveys/edit/default_language: 06d01d2598419e36ba97d2d8719f849b
    workspace/surveys/edit/delete_anyways: cc8683ab625280eefc9776bd381dc2e8
    workspace/surveys/edit/delete_block: c00617cb0724557e486304276063807a
    workspace/surveys/edit/delete_choice: fd750208d414b9ad8c980c161a0199e1
@@ -2553,7 +2780,6 @@ checksums:
    workspace/surveys/edit/duplicate_question: 910751de01fdd327165968214717711b
    workspace/surveys/edit/edit_link: 40ba9e15beac77a46c5baf30be84ac54
    workspace/surveys/edit/edit_recall: 38a4a7378d02453e35d06f2532eef318
-    workspace/surveys/edit/edit_translations: 2b21bea4b53e88342559272701e9fbf3
    workspace/surveys/edit/element_not_found: 196777ff6811dd177971ffc8e27a72c1
    workspace/surveys/edit/enable_participants_to_switch_the_survey_language_at_any_point_during_the_survey: c70466147d49dcbb3686452f35c46428
    workspace/surveys/edit/enable_recaptcha_to_protect_your_survey_from_spam: 4483a5763718d201ac97caa1e1216e13
@@ -2689,11 +2915,13 @@ checksums:
    workspace/surveys/edit/long_answer: 3a97f8d2e90aba6e679917a0c5670c53
    workspace/surveys/edit/long_answer_toggle_description: 86bcdfeb74d9825c2f2d5a215e92d111
    workspace/surveys/edit/lower_label: 45985bca022d4370bd6e013af75d5160
-    workspace/surveys/edit/manage_languages: 9c56d5afee8a73dfc283a452470f3a10
+    workspace/surveys/edit/manage_languages: fe82303bc27b55ccfc076b527b185e39
+    workspace/surveys/edit/manage_translations: 09b01c5c251e6dbc3dc6cd8b33fb6301
    workspace/surveys/edit/matrix_all_fields: 187240509163b2f52a400a565e57c67f
    workspace/surveys/edit/matrix_rows: 8f41f34e6ca28221cf1ebd948af4c151
    workspace/surveys/edit/max_file_size: 3d35a22048f4d22e24da698fb5fb77d7
    workspace/surveys/edit/max_file_size_limit_is: 78998639cde3587cecb272ba47e05f9e
+    workspace/surveys/edit/missing_first: a0c8802636ade7bac86a0dacba00b8d4
    workspace/surveys/edit/move_question_to_block: e8d7ef1e2f727921cb7f5788849492ad
    workspace/surveys/edit/multiply: 89a0bb629167f97750ae1645a46ced0d
    workspace/surveys/edit/needed_for_self_hosted_cal_com_instance: d241e72f0332177d32ce6c35070757dc
@@ -2701,7 +2929,7 @@ checksums:
    workspace/surveys/edit/next_button_label: 39f1e82ae1dea5e400e8ed7c98c6ad9c
    workspace/surveys/edit/no_hidden_fields_yet_add_first_one_below: 9cc6cab3a6a42dbf835215897b5b8516
    workspace/surveys/edit/no_images_found_for: 7dabcbcc7084f59c6ec0971895dfcd29
-    workspace/surveys/edit/no_languages_found_add_first_one_to_get_started: 22d7782c8504daf693cab3cf7135d6e3
+    workspace/surveys/edit/no_languages_found_add_first_one_to_get_started: 4e66397232da6a463708220dc020bf42
    workspace/surveys/edit/no_option_found: a1a3aa7e6c13b6bb8df20a1a104c7c04
    workspace/surveys/edit/no_recall_items_found: 729e2b02e412cdc79f5ad94b1918620c
    workspace/surveys/edit/no_variables_yet_add_first_one_below: c8704b9ebc9c26c0e9dd50c099ba88cd
@@ -2728,12 +2956,14 @@ checksums:
    workspace/surveys/edit/please_enter_a_valid_url: 25d43dfb802c31cb59dc88453ea72fc4
    workspace/surveys/edit/please_set_a_survey_trigger: 0358142df37dd1724f629008a1db453a
    workspace/surveys/edit/please_specify: e1faa6cd085144f7339c7e74dc6fb366
+    workspace/surveys/edit/present_your_survey_in_multiple_languages: 37f28b0a092d68322fedbc2e0c221ef3
    workspace/surveys/edit/prevent_double_submission: afc502baa2da81d9c9618da1c3b5a57a
    workspace/surveys/edit/prevent_double_submission_description: ef7d2aa22d43bdc6ccebb076c6aa9ce5
    workspace/surveys/edit/progress_saved: d7bfc189571f08bbb4d0240cb9363ffa
    workspace/surveys/edit/protect_survey_with_pin: 16d1925b6a5770f7423772d6d9a8291a
    workspace/surveys/edit/protect_survey_with_pin_description: 0e55d19b6f3578b1024e03606172a5d2
    workspace/surveys/edit/publish: 4aa95ba4793bb293e771bd73b4f87c0f
+    workspace/surveys/edit/publish_survey_on_date: 3167951ef991b911d2e2abb102842452
    workspace/surveys/edit/question: 0576462ce60d4263d7c482463fcc9547
    workspace/surveys/edit/question_deleted: ecdeb22b81ae2d732656a7742c1eec7b
    workspace/surveys/edit/question_duplicated: 3f02439fd0a8b818bc84c1b1b473898c
@@ -2802,6 +3032,7 @@ checksums:
    workspace/surveys/edit/rows: 8f41f34e6ca28221cf1ebd948af4c151
    workspace/surveys/edit/save_and_close: 6ede705b3f82f30269ff3054a5049e34
    workspace/surveys/edit/scale: 5f55a30a5bdf8f331b56bad9c073473c
+    workspace/surveys/edit/schedule_survey: aa9d0a74a96c325e3202bf1efbc4611a
    workspace/surveys/edit/search_for_images: 8b1bc3561d126cc49a1ee185c07e7aaf
    workspace/surveys/edit/seconds_after_trigger_the_survey_will_be_closed_if_no_response: 3584be059fe152e93895ef9885f8e8a7
    workspace/surveys/edit/seconds_before_showing_the_survey: 4b03756dd5f06df732bf62b2c7968b82
@@ -2817,6 +3048,7 @@ checksums:
    workspace/surveys/edit/seven_points: 4ead50fdfda45e8710767e1b1a84bf42
    workspace/surveys/edit/show_block_settings: bad99d99c9908874e45f5c350a88cc79
    workspace/surveys/edit/show_button: 6b364aac9d7ac71f34a438607c9693bc
+    workspace/surveys/edit/show_in_order: 15784a59572eb8a6dba6b918c31a9493
    workspace/surveys/edit/show_language_switch: b6915a7f26d7079f2d4d844d74440413
    workspace/surveys/edit/show_multiple_times: 05239c532c9c05ef5d2990ba6ce12f60
    workspace/surveys/edit/show_only_once: 31858baf60ebcf193c7e35d9084af0af
@@ -2848,7 +3080,8 @@ checksums:
    workspace/surveys/edit/survey_preview: 33644451073149383d3ace08be930739
    workspace/surveys/edit/survey_styling: 7f96d6563e934e65687b74374a33b1dc
    workspace/surveys/edit/survey_trigger: f0c7014a684ca566698b87074fad5579
-    workspace/surveys/edit/switch_multi_language_on_to_get_started: cca0ef91ee49095da30cd1e3f26c406f
+    workspace/surveys/edit/survey_will_be_closed_at_midnight_cet: d0a6307e352b3b54fb30d6166201db1f
+    workspace/surveys/edit/survey_will_be_published_at_midnight_cet: d6906ffe76f24b13dab15c50bc24e1a7
    workspace/surveys/edit/target_block_not_found: 0a0c401017ab32364fec2fcbf815d832
    workspace/surveys/edit/targeted: ca615f1fc3b490d5a2187b27fb4a2073
    workspace/surveys/edit/ten_points: a1317b82003859f77fb3138c55450d63
@@ -2856,9 +3089,11 @@ checksums:
    workspace/surveys/edit/the_survey_will_be_shown_once_even_if_person_doesnt_respond: e45beba7ae126775f4966776c982a3b4
    workspace/surveys/edit/then: 5e941fb7dd51a18651fcfb865edd5ba6
    workspace/surveys/edit/this_action_will_remove_all_the_translations_from_this_survey: 3340c89696f10bdc01b9a1047ff0b987
+    workspace/surveys/edit/this_will_remove_the_language_and_all_its_translations: 6a71ae70abbd61f13f15323d825a47f6
    workspace/surveys/edit/three_points: d7f299aec752d7d690ef0ab6373327ae
    workspace/surveys/edit/times: 5ab156c13df6bfd75c0b17ad0a92c78a
    workspace/surveys/edit/to_keep_the_placement_over_all_surveys_consistent_you_can: 7a078e6a39d4c30b465137d2b6ef3e67
+    workspace/surveys/edit/translated: 5b9d805410310b726f12bacb06da44e3
    workspace/surveys/edit/trigger_survey_when_one_of_the_actions_is_fired: 8570291668ec9879d204f10e861112db
    workspace/surveys/edit/try_lollipop_or_mountain: c550a0f07b3ae40a237e30a4314a249c
    workspace/surveys/edit/type_field_id: 714b845806236bb8a9d6a09933b836e9
@@ -2931,6 +3166,7 @@ checksums:
    workspace/surveys/edit/verify_email_before_submission_description: 434ab3ee6134367513b633a9d4f7d772
    workspace/surveys/edit/visibility_and_recontact: c27cb4ff3a4262266902a335c3ad5d84
    workspace/surveys/edit/visibility_and_recontact_description: 2969ab679e1f6111dd96e95cee26e219
+    workspace/surveys/edit/visible: 54ea1310fe55664c24a712eb17070fbd
    workspace/surveys/edit/wait: 014d18ade977bf08d75b995076596708
    workspace/surveys/edit/wait_a_few_seconds_after_the_trigger_before_showing_the_survey: 13d5521cf73be5afeba71f5db5847919
    workspace/surveys/edit/waiting_time_across_surveys: 6873c18d51830e2cadef67cce6a2c95c
@@ -3106,6 +3342,8 @@ checksums:
    workspace/surveys/summary/configure_alerts: 05cc642cd9398034d7e68589d22d97cf
    workspace/surveys/summary/congrats: 378f06fe96289e527153f8201088ff74
    workspace/surveys/summary/connect_your_website_or_app_with_formbricks_to_get_started: d24183c86d08b16d58daa8ad887b2837
+    workspace/surveys/summary/csat_satisfied: 4d6121afdc705a70465a230d6d1f6217
+    workspace/surveys/summary/csat_satisfied_tooltip: 3a69a76559a40fbbdff14525d83b459c
    workspace/surveys/summary/current_count: 6a3e59de8559e88e991e0aeafa9cfeec
    workspace/surveys/summary/custom_range: 9bc7e02a890644b13b5c0b0bdd96c165
    workspace/surveys/summary/delete_all_existing_responses_and_displays: e346bcbdb1e0dfbce5925e19fdf0cc78
@@ -3113,7 +3351,7 @@ checksums:
    workspace/surveys/summary/downloading_qr_code: 3c46bf636e617848a4fca9b6c5b51dac
    workspace/surveys/summary/drop_offs: 605ee950f82110132d6c5780926af109
    workspace/surveys/summary/drop_offs_tooltip: 2a01683380be45f17636365886cf3452
-    workspace/surveys/summary/failed_to_copy_link: 4e891c757c80e770674e8e74d1c08487
+    workspace/surveys/summary/effort_score: b79157d02a8ead85459c158272951ab5
    workspace/surveys/summary/filter_added_successfully: e247f65020cd87454bcec0da6f0fd034
    workspace/surveys/summary/filter_updated_successfully: 01146bc7e6394e271836be2f1b3a257b
    workspace/surveys/summary/filtered_responses_csv: aad66a98be6a09cac8bef9e4db4a75cf
@@ -3163,6 +3401,7 @@ checksums:
    workspace/surveys/summary/limit: 347051f1a068e01e8c4e4f6744d8e727
    workspace/surveys/summary/no_identified_impressions: c3bc42e6feb9010ced905ded51c5afc4
    workspace/surveys/summary/no_responses_found: f10190cffdda4ca1bed479acbb89b13f
+    workspace/surveys/summary/nps_promoters_tooltip: dea6a683c0c36189e325656d5a7596b8
    workspace/surveys/summary/other_values_found: 48a74ee68c05f7fb162072b50c683b6a
    workspace/surveys/summary/overall: 6c6d6533013d4739766af84b2871bca6
    workspace/surveys/summary/promoters: 41fbb8d0439227661253a82fda39f521
@@ -3175,7 +3414,6 @@ checksums:
    workspace/surveys/summary/quotas_completed_tooltip: ec5c4dc67eda27c06764354f695db613
    workspace/surveys/summary/reset_survey: 8c88ddb81f5f787d183d2e7cb43e7c64
    workspace/surveys/summary/reset_survey_warning: 6b44be171d7e2716f234387b100b173d
-    workspace/surveys/summary/satisfied: 4d542ba354b85e644acbca5691d2ce45
    workspace/surveys/summary/selected_responses_csv: 9cef3faccd54d4f24647791e6359db90
    workspace/surveys/summary/selected_responses_excel: a0ade8b2658e887a4a3f2ad3bdb0c686
    workspace/surveys/summary/setup_integrations: 70de06d73be671a0cd58a3fd4fa62e53
@@ -3185,6 +3423,7 @@ checksums:
    workspace/surveys/summary/starts_tooltip: 0a7dd01320490dbbea923053fa1ccad6
    workspace/surveys/summary/survey_reset_successfully: f53db36a28980ef4766215cf13f01e51
    workspace/surveys/summary/survey_results: b7d86f636beaee2b4d5746bdda058d07
+    workspace/surveys/summary/survey_scheduled_successfully: b5f39d8dc0c203466a0ffb5fa60163e8
    workspace/surveys/summary/this_month: 50845a38865204a97773c44dcd2ebb90
    workspace/surveys/summary/this_quarter: 9c77d94783dff2269c069389122cd7bd
    workspace/surveys/summary/this_year: 1e69651c2ac722f8ce138f43cf2e02f9
@@ -3198,7 +3437,6 @@ checksums:
    workspace/surveys/summary/youre_not_plugged_in_yet: f19da3cd474b9a3cf28e956fd811fb00
    workspace/surveys/survey_deleted_successfully: a6b654cc914b344a4475fd2fd4a98cc5
    workspace/surveys/survey_duplicated_successfully: 91e244f1e7a33640bb4817166a01ff46
-    workspace/surveys/survey_duplication_error: 35994330aed844ce37d8b4f09df24581
    workspace/surveys/templates/all_channels: 6be67a82fc7326dc2304b23ab3348b87
    workspace/surveys/templates/all_industries: c7354412fe34585526ff2232aadace41
    workspace/surveys/templates/all_roles: 6582ccd0a2349c162a7ae1574cdf76be
@@ -3225,16 +3463,21 @@ checksums:
    workspace/teams/permission: cc2ed7274bd8267f9e0a10b079584d8b
    workspace/teams/team_name: d1a5f99dbf503ca53f06b3a98b511d02
    workspace/teams/team_settings_description: 52f91883b9ceb6de83efbf8efd4f11c0
+    workspace/unify/add_feedback_record: 19cf2b1fef0ca1400f2400e7ee681ea0
+    workspace/unify/add_feedback_record_description: 94bca46246ba7353049b33742554b4c0
    workspace/unify/add_feedback_source: d046fb437ac478ca30b7b59d6afa8e45
    workspace/unify/add_source: 4cc055cbd6312cf0a5db1edf537ce65e
    workspace/unify/allowed_values: 430e0721aa2c52745ef8f8b6918bb7d2
+    workspace/unify/api_ingestion: a14642d27bbb6843f9f4903b6555dfbb
+    workspace/unify/api_ingestion_manage_api_keys: 116786a004fb7b16ead8a5b7a6a2debe
+    workspace/unify/api_ingestion_settings_description: a2597917ca1c724607d1d32178d670b3
+    workspace/unify/auto_generated: 6e83e8febd63275692c444cb8074531d
    workspace/unify/change_file: c5163ac18bf443370228a8ecbb0b07da
    workspace/unify/click_load_sample_csv: 0ee0bf93f10f02863fc658b359706316
    workspace/unify/click_to_upload: 74a7e7d79a88b6bbfd9f22084bffdb9b
    workspace/unify/collected_at: b41902ddb4586ba4a4611d726b5014aa
    workspace/unify/configure_import: 71d550661f7e9fe322b60e7e870aa2fd
    workspace/unify/configure_mapping: c794411c50bc511f8fc332def0e4e2f9
-    workspace/unify/connection: 421e709602c92ffbe04a266f6a092089
    workspace/unify/connector_created_successfully: ea927316021fb2a41cc69ca3ec89d0aa
    workspace/unify/connector_deleted_successfully: ea3c9842c5b8f75b02ecb9c80c74d780
    workspace/unify/connector_duplicated_successfully: eb21ce42cdbef5fa38244206bf65fe4e
@@ -3253,9 +3496,12 @@ checksums:
    workspace/unify/csv_import_duplicate_warning: 56625e4613b93690e95661e5faaa4b27
    workspace/unify/csv_inconsistent_columns: b308be183a41a581707eb5c4c0797ad6
    workspace/unify/csv_max_records: 21ce7adae30821d40a553bcf37f39bbf
+    workspace/unify/custom_source_type: d931a8a74d3a5becd568e398107979da
+    workspace/unify/custom_source_type_placeholder: f139e3e5d70dbf426d7c6b5ab2b198cc
    workspace/unify/default_connector_name_csv: ef4060fef24c4fec064987b9d2a9fa4b
    workspace/unify/default_connector_name_formbricks: e7afdf7cc1cd7bcf75e7b5d64903a110
-    workspace/unify/deselect_all: facf8871b2e84a454c6bfe40c2821922
+    workspace/unify/discard_feedback_record_changes_description: 48ccde99858dcbeb4d679749d0f51941
+    workspace/unify/discard_feedback_record_changes_title: 52df2800f7b0e8a1d04c47113e019a3e
    workspace/unify/drop_a_field_here: 884f3025e618e0a5dcbcb5567335d1bb
    workspace/unify/drop_field_or: 5287a8af30f2961ce5a8f14f73ddc353
    workspace/unify/edit_csv_mapping: 4f3bad444664d58ffe8ace3dc9e200f9
@@ -3265,47 +3511,64 @@ checksums:
    workspace/unify/enum: 96fc644f35edd6b1c09d1d503f078acc
    workspace/unify/failed_to_load_feedback_records: 57f6c8c5fa524d7c2d8777315e5036c8
    workspace/unify/feedback_date: ddba5d3270d4a6394d29721025a04400
+    workspace/unify/feedback_record_created_successfully: 0ff30472085f1313a5ad53837c83e7c1
+    workspace/unify/feedback_record_details: 823f3353db049a9d263ef31405054cda
+    workspace/unify/feedback_record_details_description: 0b6f908154161241ce6bdeb4a2acaecd
    workspace/unify/feedback_record_directory: 89a08a540d1c6eb9f0b1a4b8f56e8aca
    workspace/unify/feedback_record_fields: 88c0f13afeb88fe751f85e79b0f73064
+    workspace/unify/feedback_record_mcp: cdddbef2944489820fd7f376a49c2803
+    workspace/unify/feedback_record_updated_successfully: cb40ef4b924e21fa627ebe6809d1d826
+    workspace/unify/feedback_record_value_required: b54d4d86f82071a93dc979e8eb359cf0
    workspace/unify/feedback_records: e24cf48bb6985910f4ffe5e00512d388
    workspace/unify/feedback_records_refreshed: 4b27a8e2a8dbe8afa945d9f874aa7ef1
+    workspace/unify/feedback_sources: e58ec9be19db8789e7096a756d24f2b2
+    workspace/unify/feedback_sources_directory_access_multiple: 11d613bc1e9825aa6faa3db17ae678eb
+    workspace/unify/feedback_sources_directory_access_single: c9da6b30d410a0ca6302a00a5747dc19
+    workspace/unify/feedback_sources_settings_description: 45f162f2f81cd195c23cb3ec490bb3df
+    workspace/unify/field_group_id: 17024bb46ff1e088afb6a279dc85aad4
+    workspace/unify/field_group_label: 3df09c3b6fd22310359cf955ecff5c8e
+    workspace/unify/field_id: 7791b5d581b7a525dcadf11ec73c6ab7
    workspace/unify/field_label: 6384505ca0e40010c666b712511132a6
    workspace/unify/field_type: 2581066dc304c853a4a817c20996fa08
    workspace/unify/formbricks_surveys: eba2fce04ee68f02626e5509adf7d66a
-    workspace/unify/frd_cannot_be_changed: 265c12529f540d8309811f4e0090272f
    workspace/unify/go_to_feedback_record_directories: 16b66b62f85e7be311778f39315d118a
    workspace/unify/historical_import_complete: f46f98bf4db63bf2993bfb234dc95f62
    workspace/unify/import_csv_data: f05e1d1ed88d528256efe5702df46646
    workspace/unify/import_feedback: f05e1d1ed88d528256efe5702df46646
+    workspace/unify/import_historical_responses: d7941f65344b6bfba56a40cc53a063b4
+    workspace/unify/import_historical_responses_description: c860f7c6dbe8b74383ecf9cae9c219a0
    workspace/unify/import_rows: d2963498a7d2766264c4d67db677e8ff
+    workspace/unify/import_via_source_name: eae32ae2fc87f925ca016fe8283bcbfd
    workspace/unify/importing_data: a6d4478379a0faee05cd2c10ffe74984
    workspace/unify/importing_historical_data: f5be578704ec26dc4ec573309e9fff20
    workspace/unify/invalid_enum_values: e6ca8740dab72f64e8dc5780b5cffcc6
    workspace/unify/invalid_values_found: 5011dc9c0294a222033f9910ea919b8a
    workspace/unify/load_sample_csv: ad21fa63f4a3df96a5939c753be21f4e
-    workspace/unify/n_supported_questions: d75413d386441b5eb137a1ea191e4bd9
+    workspace/unify/manage_directories: 460e00e1cbf1f51de57a2548546e33d7
+    workspace/unify/manage_feedback_sources: 6aa6a82334ab680b5aa187b7245e8ec8
+    workspace/unify/metadata: 695d4f7da261ba76e3be4de495491028
+    workspace/unify/metadata_key: c478d228673f59fa556208ece60452f6
+    workspace/unify/metadata_read_only_entries: 1934fee46c0a117f4926b61cc3d2d602
+    workspace/unify/metadata_value: 8d69be1f5a20d9473a33c35670dff216
+    workspace/unify/missing_feedback_source_title: 9ab1b8d54b4da72dd00ce03fe3b698b5
    workspace/unify/no_feedback_record_directory_available: b8126ef5d6276d9655a9b27ffcaca824
    workspace/unify/no_feedback_records: 16a905c40f6d47a5e8f93b3d8c6f6693
    workspace/unify/no_source_fields_loaded: a597b1d16262cbe897001046eb3ff640
    workspace/unify/no_sources_connected: 0e8a5612530bfc82091091f40f95012f
-    workspace/unify/no_surveys_found: 649a2f29b4c34525778d9177605fb326
    workspace/unify/optional: 396fb9a0472daf401c392bdc3e248943
    workspace/unify/or_drag_and_drop: 6c7d6b05d39dcbfc710d35fcab25cb8c
-    workspace/unify/question_selected: b9ff13b6212874258da911867932dc7d
    workspace/unify/question_type_not_supported: 8d9f7554e3b509dfd5307d8d1fef08d7
-    workspace/unify/questions_selected: 1f13d6fecafa2ce5ea9e6d07078a1d38
-    workspace/unify/records_will_go_to: 6a3f5a6580857a931bab389ad354831c
    workspace/unify/refresh_feedback_records: c111751e02a7dee57390ed7fb79cfcc6
    workspace/unify/refreshing_feedback_records: 2a03b44510ebe19eea6473639e9a7222
+    workspace/unify/request_feedback_source: 51045caa2c81dee971d23a1841d19a7e
    workspace/unify/required: 04d7fb6f37ffe0a6ca97d49e2a8b6eb5
    workspace/unify/save_changes: 53dd9f4f0a4accc822fa5c1f2f6d118a
    workspace/unify/select_a_survey_to_see_questions: 792eba3d2f6d210231a2266401111a20
    workspace/unify/select_a_value: 115002bf2d9eec536165a7b7efc62862
-    workspace/unify/select_all: eedc7cdb02de467c15dc418a066a77f2
    workspace/unify/select_feedback_record_directory: 88afbf2c2a322249908ee5d00ec5f65d
+    workspace/unify/select_feedback_record_source_type: 10997fcbea2f93e756888cf7a7476fdf
    workspace/unify/select_questions: 13c79b8c284423eb6140534bf2137e56
    workspace/unify/select_source_type_description: fd7e3c49b81f8e89f294c8fd94efcdfc
-    workspace/unify/select_source_type_prompt: c3fce7d908ee62b9e1b7fab1b17606d7
    workspace/unify/select_survey: bac52e59c7847417bef6fe7b7096b475
    workspace/unify/select_survey_and_questions: 53914988a2f48caecea23f3b3b868b9f
    workspace/unify/select_survey_questions_description: 3386ed56085eabebefa3cc453269fc5b
@@ -3315,20 +3578,19 @@ checksums:
    workspace/unify/showing_rows: 83d3440314d1e6f2721e034369a3a131
    workspace/unify/source: 45309626f464f4bda161ee783a4c8c80
    workspace/unify/source_connect_csv_description: 2f9d1dd31668ac52578f16323157b746
+    workspace/unify/source_connect_feedback_record_mcp_description: a3f56e2a6e403f4021e83f1b1a466d95
    workspace/unify/source_connect_formbricks_description: 77bda4e1d485d76770ba2221f1faf9ff
    workspace/unify/source_fields: 1bae074990e64cbfd820a0b6462397be
+    workspace/unify/source_id: 134a9a7d473508c5623ac724a5ba4be9
    workspace/unify/source_name: 157675beca12efcd8ec512c5256b1a61
    workspace/unify/source_type: d1ff69af76c687eb189db72030717570
    workspace/unify/source_type_cannot_be_changed: bb5232c6e92df7f88731310fabbb1eb1
-    workspace/unify/sources: ecbbe6e49baa335c5afd7b04b609d006
-    workspace/unify/status_active: 3de9afebcb9d4ce8ac42e14995f79ffd
-    workspace/unify/status_completed: 0e4bbce9985f25eb673d9a054c8d5334
-    workspace/unify/status_draft: e8a92958ad300aacfe46c2bf6644927e
    workspace/unify/status_error: 3c95bcb32c2104b99a46f5b3dd015248
-    workspace/unify/status_paused: edb1f7b7219e1c9b7aa67159090d6991
+    workspace/unify/status_live_sync: 7e794257419414f57d34845ef38d0939
+    workspace/unify/status_ready: 437c0eea608e15ad5cdab94bde2f4b48
+    workspace/unify/submission_id: 02edf76883b47079dbe20f3f36b7c1a7
    workspace/unify/survey_has_no_questions: c08514b6bce5eb464a4492239be5934d
-    workspace/unify/survey_import_line: 63fa0ea1d7daa3ba333436fbc65f8b19
-    workspace/unify/total_feedback_records: 8962087650b62e4a12b81e7d09317ffa
+    workspace/unify/topics_and_subtopics: 1148eca01a1993fadca932efcdea7641
    workspace/unify/unify_feedback: cd68c8ce0445767e7dcfb4de789903d5
    workspace/unify/update_mapping_description: 58d5966c0c9b406c037dff3aa8bcb396
    workspace/unify/updated_at: 8fdb85248e591254973403755dcc3724
@@ -3336,6 +3598,10 @@ checksums:
    workspace/unify/upload_csv_file: b77797b68cb46a614b3adaa4db24d4c2
    workspace/unify/user_identifier: 61073457a5c3901084b557d065f876be
    workspace/unify/value: 34b0eaa85808b15cbc4be94c64d0146b
+    workspace/unify/value_boolean: bbdcd3f46954b6304b9069e94e1371ab
+    workspace/unify/value_date: c8d705d1975affc01c002324725fec3f
+    workspace/unify/value_number: 1f14da79d14bd7b1c2324141f4470675
+    workspace/unify/value_text: e097a597cc507c716401ad18255de578
    workspace/xm-templates/ces: e2ea309b2f7f13257967b966c2fda1e9
    workspace/xm-templates/ces_description: c8d9794dd17d5ab85a979f1b3e1bc935
    workspace/xm-templates/csat: fdfc1dc6214cce661dcdc32a71d80337
@@ -0,0 +1,370 @@
+import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
+
+const mockStartJobsRuntime = vi.fn();
+const mockRemoveRecurringSurveySchedulingJobSchedule = vi.fn();
+const mockUpsertRecurringSurveySchedulingJobSchedule = vi.fn();
+const mockDebug = vi.fn();
+const mockError = vi.fn();
+const mockWarn = vi.fn();
+const mockGetJobsQueueingConfig = vi.fn();
+const mockGetJobsWorkerBootstrapConfig = vi.fn();
+const mockProcessResponsePipelineJob = vi.fn();
+const mockProcessSurveySchedulingJob = vi.fn();
+const TEST_TIMEOUT_MS = 15_000;
+
+const slowTest = (name: string, fn: () => Promise<void>): void => {
+  test(name, fn, TEST_TIMEOUT_MS);
+};
+
+vi.mock("@formbricks/jobs", () => ({
+  removeRecurringSurveySchedulingJobSchedule: mockRemoveRecurringSurveySchedulingJobSchedule,
+  startJobsRuntime: mockStartJobsRuntime,
+  upsertRecurringSurveySchedulingJobSchedule: mockUpsertRecurringSurveySchedulingJobSchedule,
+}));
+
+vi.mock("@/lib/jobs/config", () => ({
+  getJobsQueueingConfig: mockGetJobsQueueingConfig,
+  getJobsWorkerBootstrapConfig: mockGetJobsWorkerBootstrapConfig,
+}));
+
+vi.mock("@formbricks/logger", () => ({
+  logger: {
+    debug: mockDebug,
+    error: mockError,
+    info: vi.fn(),
+    warn: mockWarn,
+  },
+}));
+
+vi.mock("@/modules/response-pipeline/lib/process-response-pipeline-job", () => ({
+  processResponsePipelineJob: mockProcessResponsePipelineJob,
+}));
+
+vi.mock("@/modules/survey/scheduling/lib/process-survey-scheduling-job", () => ({
+  processSurveySchedulingJob: mockProcessSurveySchedulingJob,
+}));
+
+describe("instrumentation-jobs", () => {
+  beforeEach(() => {
+    vi.resetModules();
+    vi.clearAllMocks();
+    vi.useFakeTimers();
+    mockRemoveRecurringSurveySchedulingJobSchedule.mockResolvedValue(true);
+    mockGetJobsQueueingConfig.mockReturnValue({
+      enabled: false,
+      redisUrl: null,
+    });
+  });
+
+  afterEach(async () => {
+    const { resetJobsWorkerRegistrationForTests } = await import("./instrumentation-jobs");
+    await resetJobsWorkerRegistrationForTests();
+    vi.useRealTimers();
+  });
+
+  slowTest("skips worker startup when disabled", async () => {
+    mockGetJobsWorkerBootstrapConfig.mockReturnValue({
+      enabled: false,
+      runtimeOptions: null,
+    });
+
+    const { registerJobsWorker } = await import("./instrumentation-jobs");
+    const result = await registerJobsWorker();
+
+    expect(result).toBeNull();
+    expect(mockStartJobsRuntime).not.toHaveBeenCalled();
+    expect(mockUpsertRecurringSurveySchedulingJobSchedule).not.toHaveBeenCalled();
+    expect(mockDebug).toHaveBeenCalledWith("BullMQ worker startup skipped");
+  });
+
+  slowTest("starts the worker once and registers handlers", async () => {
+    const mockRuntime = {
+      close: vi.fn().mockResolvedValue(undefined),
+    };
+    const mockExistingOverride = vi.fn();
+
+    mockGetJobsWorkerBootstrapConfig.mockReturnValue({
+      enabled: true,
+      runtimeOptions: {
+        concurrency: 4,
+        jobHandlerOverrides: {
+          "test-log.process": mockExistingOverride,
+        },
+        redisUrl: "redis://localhost:6379",
+        workerCount: 2,
+      },
+    });
+
+    mockStartJobsRuntime.mockResolvedValue(mockRuntime);
+    const { registerJobsWorker } = await import("./instrumentation-jobs");
+    const first = await registerJobsWorker();
+    const second = await registerJobsWorker();
+
+    expect(first).toBe(mockRuntime);
+    expect(second).toBe(mockRuntime);
+    expect(mockStartJobsRuntime).toHaveBeenCalledTimes(1);
+    expect(mockStartJobsRuntime).toHaveBeenCalledWith({
+      concurrency: 4,
+      jobHandlerOverrides: {
+        "response-pipeline.process": expect.any(Function),
+        "survey-scheduling.reconcile": expect.any(Function),
+        "test-log.process": mockExistingOverride,
+      },
+      redisUrl: "redis://localhost:6379",
+      workerCount: 2,
+    });
+    const overrides = mockStartJobsRuntime.mock.calls[0]?.[0]?.jobHandlerOverrides;
+    const responsePipelineOverride = overrides?.["response-pipeline.process"];
+    const surveySchedulingOverride = overrides?.["survey-scheduling.reconcile"];
+
+    await responsePipelineOverride?.(
+      {
+        workspaceId: "ws_123",
+        event: "responseCreated",
+        response: { id: "res_123" },
+        surveyId: "survey_123",
+      },
+      {
+        attempt: 1,
+        jobId: "job_123",
+        jobName: "response-pipeline.process",
+        maxAttempts: 3,
+        queueName: "background-jobs",
+      }
+    );
+    await surveySchedulingOverride?.(
+      {
+        scope: "global",
+      },
+      {
+        attempt: 1,
+        jobId: "job_456",
+        jobName: "survey-scheduling.reconcile",
+        maxAttempts: 3,
+        queueName: "background-jobs",
+      }
+    );
+
+    expect(mockProcessResponsePipelineJob).toHaveBeenCalledWith(
+      {
+        workspaceId: "ws_123",
+        event: "responseCreated",
+        response: { id: "res_123" },
+        surveyId: "survey_123",
+      },
+      {
+        attempt: 1,
+        jobId: "job_123",
+        jobName: "response-pipeline.process",
+        maxAttempts: 3,
+        queueName: "background-jobs",
+      }
+    );
+    expect(mockProcessSurveySchedulingJob).toHaveBeenCalledWith(
+      {
+        scope: "global",
+      },
+      {
+        attempt: 1,
+        jobId: "job_456",
+        jobName: "survey-scheduling.reconcile",
+        maxAttempts: 3,
+        queueName: "background-jobs",
+      }
+    );
+  });
+
+  slowTest("reuses the in-flight startup promise", async () => {
+    const mockRuntime = {
+      close: vi.fn().mockResolvedValue(undefined),
+    };
+
+    mockGetJobsWorkerBootstrapConfig.mockReturnValue({
+      enabled: true,
+      runtimeOptions: {
+        concurrency: 2,
+        redisUrl: "redis://localhost:6379",
+        workerCount: 1,
+      },
+    });
+
+    let resolveRuntime: ((value: typeof mockRuntime) => void) | undefined;
+    mockStartJobsRuntime.mockReturnValue(
+      new Promise((resolve) => {
+        resolveRuntime = resolve;
+      })
+    );
+    const { registerJobsWorker } = await import("./instrumentation-jobs");
+    const firstPromise = registerJobsWorker();
+    const secondPromise = registerJobsWorker();
+
+    expect(mockStartJobsRuntime).toHaveBeenCalledTimes(1);
+
+    resolveRuntime?.(mockRuntime);
+
+    await expect(firstPromise).resolves.toBe(mockRuntime);
+    await expect(secondPromise).resolves.toBe(mockRuntime);
+  });
+
+  slowTest("logs and rethrows startup failures", async () => {
+    const startupError = new Error("startup failed");
+
+    mockGetJobsWorkerBootstrapConfig.mockReturnValue({
+      enabled: true,
+      runtimeOptions: {
+        concurrency: 1,
+        redisUrl: "redis://localhost:6379",
+        workerCount: 1,
+      },
+    });
+
+    mockStartJobsRuntime.mockRejectedValue(startupError);
+
+    const { registerJobsWorker } = await import("./instrumentation-jobs");
+
+    await expect(registerJobsWorker()).rejects.toThrow("startup failed");
+    expect(mockError).toHaveBeenCalledWith({ err: startupError }, "BullMQ worker registration failed");
+    expect(mockWarn).toHaveBeenCalledWith(
+      { retryDelayMs: 30_000 },
+      "BullMQ worker registration retry scheduled"
+    );
+  });
+
+  slowTest("retries worker startup after a transient failure", async () => {
+    const startupError = new Error("startup failed");
+    const recoveredRuntime = {
+      close: vi.fn().mockResolvedValue(undefined),
+    };
+
+    mockGetJobsWorkerBootstrapConfig.mockReturnValue({
+      enabled: true,
+      runtimeOptions: {
+        concurrency: 1,
+        redisUrl: "redis://localhost:6379",
+        workerCount: 1,
+      },
+    });
+
+    mockStartJobsRuntime.mockRejectedValueOnce(startupError).mockResolvedValueOnce(recoveredRuntime);
+    const { registerJobsWorker } = await import("./instrumentation-jobs");
+
+    await expect(registerJobsWorker()).rejects.toThrow("startup failed");
+
+    await vi.advanceTimersByTimeAsync(30_000);
+
+    expect(mockStartJobsRuntime).toHaveBeenCalledTimes(2);
+    await expect(registerJobsWorker()).resolves.toBe(recoveredRuntime);
+  });
+
+  slowTest(
+    "registers recurring schedules once when queueing is enabled without an in-process worker",
+    async () => {
+      mockGetJobsQueueingConfig.mockReturnValue({
+        enabled: true,
+        redisUrl: "redis://localhost:6379",
+      });
+      mockGetJobsWorkerBootstrapConfig.mockReturnValue({
+        enabled: false,
+        runtimeOptions: null,
+      });
+      mockUpsertRecurringSurveySchedulingJobSchedule.mockResolvedValue({
+        id: "schedule-job-1",
+        name: "survey-scheduling.reconcile",
+        queueName: "background-jobs",
+      });
+
+      const { registerRecurringJobs } = await import("./instrumentation-jobs");
+      const { SURVEY_SCHEDULING_DAILY_CRON_PATTERN, SURVEY_SCHEDULING_TIME_ZONE } =
+        await import("@/modules/survey/scheduling/lib/constants");
+
+      await registerRecurringJobs();
+      await registerRecurringJobs();
+
+      expect(mockStartJobsRuntime).not.toHaveBeenCalled();
+      expect(mockRemoveRecurringSurveySchedulingJobSchedule).toHaveBeenCalledTimes(1);
+      expect(mockRemoveRecurringSurveySchedulingJobSchedule).toHaveBeenCalledWith({
+        scheduleId: "daily-survey-scheduling",
+        scope: "global",
+      });
+      expect(mockUpsertRecurringSurveySchedulingJobSchedule).toHaveBeenCalledTimes(1);
+      expect(mockUpsertRecurringSurveySchedulingJobSchedule).toHaveBeenCalledWith(
+        {
+          scheduleId: "daily-survey-scheduling",
+          scope: "global",
+        },
+        {
+          cronPattern: SURVEY_SCHEDULING_DAILY_CRON_PATTERN,
+          kind: "cron",
+          timeZone: SURVEY_SCHEDULING_TIME_ZONE,
+        },
+        {
+          scope: "global",
+        }
+      );
+    }
+  );
+
+  slowTest("retries recurring schedule registration after a transient failure", async () => {
+    const scheduleError = new Error("schedule failed");
+
+    mockGetJobsQueueingConfig.mockReturnValue({
+      enabled: true,
+      redisUrl: "redis://localhost:6379",
+    });
+    mockUpsertRecurringSurveySchedulingJobSchedule
+      .mockRejectedValueOnce(scheduleError)
+      .mockResolvedValueOnce({
+        id: "schedule-job-1",
+        name: "survey-scheduling.reconcile",
+        queueName: "background-jobs",
+      });
+
+    const { registerRecurringJobs } = await import("./instrumentation-jobs");
+
+    await expect(registerRecurringJobs()).rejects.toThrow("schedule failed");
+    expect(mockError).toHaveBeenCalledWith(
+      { err: scheduleError },
+      "BullMQ recurring job registration failed"
+    );
+    expect(mockWarn).toHaveBeenCalledWith(
+      { retryDelayMs: 30_000 },
+      "BullMQ recurring job registration retry scheduled"
+    );
+
+    await vi.advanceTimersByTimeAsync(30_000);
+
+    expect(mockUpsertRecurringSurveySchedulingJobSchedule).toHaveBeenCalledTimes(2);
+  });
+
+  slowTest("clears registration state even when reset close fails", async () => {
+    const failingRuntime = {
+      close: vi.fn().mockRejectedValue(new Error("close failed")),
+    };
+    const nextRuntime = {
+      close: vi.fn().mockResolvedValue(undefined),
+    };
+
+    mockGetJobsWorkerBootstrapConfig.mockReturnValue({
+      enabled: true,
+      runtimeOptions: {
+        concurrency: 1,
+        redisUrl: "redis://localhost:6379",
+        workerCount: 1,
+      },
+    });
+
+    mockStartJobsRuntime.mockResolvedValueOnce(failingRuntime).mockResolvedValueOnce(nextRuntime);
+    const { registerJobsWorker, resetJobsWorkerRegistrationForTests } =
+      await import("./instrumentation-jobs");
+
+    await expect(registerJobsWorker()).resolves.toBe(failingRuntime);
+    await expect(resetJobsWorkerRegistrationForTests()).resolves.toBeUndefined();
+    await expect(registerJobsWorker()).resolves.toBe(nextRuntime);
+
+    expect(mockStartJobsRuntime).toHaveBeenCalledTimes(2);
+    expect(mockError).toHaveBeenCalledWith(
+      { err: expect.any(Error) },
+      "BullMQ worker test reset close failed"
+    );
+  });
+});
@@ -0,0 +1,242 @@
+import {
+  type JobHandlerOverrides,
+  type JobsRuntimeHandle,
+  type TResponsePipelineJobData,
+  type TSurveySchedulingJobData,
+  removeRecurringSurveySchedulingJobSchedule,
+  startJobsRuntime,
+  upsertRecurringSurveySchedulingJobSchedule,
+} from "@formbricks/jobs";
+import { logger } from "@formbricks/logger";
+import { getJobsQueueingConfig, getJobsWorkerBootstrapConfig } from "@/lib/jobs/config";
+import { processResponsePipelineJob } from "@/modules/response-pipeline/lib/process-response-pipeline-job";
+import {
+  SURVEY_SCHEDULING_DAILY_CRON_PATTERN,
+  SURVEY_SCHEDULING_DAILY_SCHEDULE_ID,
+  SURVEY_SCHEDULING_GLOBAL_SCOPE,
+  SURVEY_SCHEDULING_TIME_ZONE,
+} from "@/modules/survey/scheduling/lib/constants";
+import { processSurveySchedulingJob } from "@/modules/survey/scheduling/lib/process-survey-scheduling-job";
+
+const WORKER_STARTUP_RETRY_DELAY_MS = 30_000;
+
+type TJobsRuntimeGlobal = typeof globalThis & {
+  formbricksJobsRecurringRegistration: Promise<void> | undefined;
+  formbricksJobsRecurringRegistered: boolean | undefined;
+  formbricksJobsRecurringRetryTimeout: ReturnType<typeof setTimeout> | undefined;
+  formbricksJobsRuntime: JobsRuntimeHandle | undefined;
+  formbricksJobsRuntimeInitializing: Promise<JobsRuntimeHandle> | undefined;
+  formbricksJobsRuntimeRetryTimeout: ReturnType<typeof setTimeout> | undefined;
+};
+
+const globalForJobsRuntime = globalThis as TJobsRuntimeGlobal;
+const RESPONSE_PIPELINE_JOB_NAME = "response-pipeline.process";
+const SURVEY_SCHEDULING_JOB_NAME = "survey-scheduling.reconcile";
+
+const responsePipelineJobHandler: NonNullable<JobHandlerOverrides[string]> = async (data, context) => {
+  await processResponsePipelineJob(data as TResponsePipelineJobData, context);
+};
+const surveySchedulingJobHandler: NonNullable<JobHandlerOverrides[string]> = async (data, context) => {
+  await processSurveySchedulingJob(data as TSurveySchedulingJobData, context);
+};
+
+const registerSurveySchedulingSchedule = async (): Promise<void> => {
+  await removeRecurringSurveySchedulingJobSchedule({
+    scheduleId: SURVEY_SCHEDULING_DAILY_SCHEDULE_ID,
+    scope: SURVEY_SCHEDULING_GLOBAL_SCOPE,
+  });
+
+  await upsertRecurringSurveySchedulingJobSchedule(
+    {
+      scheduleId: SURVEY_SCHEDULING_DAILY_SCHEDULE_ID,
+      scope: SURVEY_SCHEDULING_GLOBAL_SCOPE,
+    },
+    {
+      cronPattern: SURVEY_SCHEDULING_DAILY_CRON_PATTERN,
+      kind: "cron",
+      timeZone: SURVEY_SCHEDULING_TIME_ZONE,
+    },
+    {
+      scope: SURVEY_SCHEDULING_GLOBAL_SCOPE,
+    }
+  );
+};
+
+const clearRecurringJobsRetryTimeout = (): void => {
+  if (globalForJobsRuntime.formbricksJobsRecurringRetryTimeout) {
+    clearTimeout(globalForJobsRuntime.formbricksJobsRecurringRetryTimeout);
+    globalForJobsRuntime.formbricksJobsRecurringRetryTimeout = undefined;
+  }
+};
+
+const scheduleRecurringJobsRetry = (): void => {
+  if (
+    globalForJobsRuntime.formbricksJobsRecurringRegistered ||
+    globalForJobsRuntime.formbricksJobsRecurringRegistration ||
+    globalForJobsRuntime.formbricksJobsRecurringRetryTimeout
+  ) {
+    return;
+  }
+
+  globalForJobsRuntime.formbricksJobsRecurringRetryTimeout = setTimeout(() => {
+    globalForJobsRuntime.formbricksJobsRecurringRetryTimeout = undefined;
+    void registerRecurringJobs().catch(() => undefined);
+  }, WORKER_STARTUP_RETRY_DELAY_MS);
+
+  logger.warn(
+    { retryDelayMs: WORKER_STARTUP_RETRY_DELAY_MS },
+    "BullMQ recurring job registration retry scheduled"
+  );
+};
+
+const clearJobsWorkerRetryTimeout = (): void => {
+  if (globalForJobsRuntime.formbricksJobsRuntimeRetryTimeout) {
+    clearTimeout(globalForJobsRuntime.formbricksJobsRuntimeRetryTimeout);
+    globalForJobsRuntime.formbricksJobsRuntimeRetryTimeout = undefined;
+  }
+};
+
+const scheduleJobsWorkerRetry = (): void => {
+  if (
+    globalForJobsRuntime.formbricksJobsRuntime ||
+    globalForJobsRuntime.formbricksJobsRuntimeInitializing ||
+    globalForJobsRuntime.formbricksJobsRuntimeRetryTimeout
+  ) {
+    return;
+  }
+
+  globalForJobsRuntime.formbricksJobsRuntimeRetryTimeout = setTimeout(() => {
+    globalForJobsRuntime.formbricksJobsRuntimeRetryTimeout = undefined;
+    void registerJobsWorker().catch(() => undefined);
+  }, WORKER_STARTUP_RETRY_DELAY_MS);
+
+  logger.warn({ retryDelayMs: WORKER_STARTUP_RETRY_DELAY_MS }, "BullMQ worker registration retry scheduled");
+};
+
+export const registerRecurringJobs = async (): Promise<void> => {
+  const jobsQueueingConfig = getJobsQueueingConfig();
+
+  if (!jobsQueueingConfig.enabled || !jobsQueueingConfig.redisUrl) {
+    clearRecurringJobsRetryTimeout();
+    logger.debug("BullMQ recurring job registration skipped");
+    return;
+  }
+
+  if (globalForJobsRuntime.formbricksJobsRecurringRegistered) {
+    return;
+  }
+
+  if (globalForJobsRuntime.formbricksJobsRecurringRegistration) {
+    return await globalForJobsRuntime.formbricksJobsRecurringRegistration;
+  }
+
+  globalForJobsRuntime.formbricksJobsRecurringRegistration = (async () => {
+    await registerSurveySchedulingSchedule();
+    clearRecurringJobsRetryTimeout();
+    globalForJobsRuntime.formbricksJobsRecurringRegistered = true;
+    globalForJobsRuntime.formbricksJobsRecurringRegistration = undefined;
+  })();
+
+  try {
+    return await globalForJobsRuntime.formbricksJobsRecurringRegistration;
+  } catch (error) {
+    globalForJobsRuntime.formbricksJobsRecurringRegistration = undefined;
+    logger.error({ err: error }, "BullMQ recurring job registration failed");
+    scheduleRecurringJobsRetry();
+    throw error;
+  }
+};
+
+export const registerJobsWorker = async (): Promise<JobsRuntimeHandle | null> => {
+  const jobsWorkerBootstrapConfig = getJobsWorkerBootstrapConfig();
+
+  if (!jobsWorkerBootstrapConfig.enabled || !jobsWorkerBootstrapConfig.runtimeOptions) {
+    clearJobsWorkerRetryTimeout();
+    logger.debug("BullMQ worker startup skipped");
+    return null;
+  }
+
+  if (globalForJobsRuntime.formbricksJobsRuntime) {
+    return globalForJobsRuntime.formbricksJobsRuntime;
+  }
+
+  if (globalForJobsRuntime.formbricksJobsRuntimeInitializing) {
+    return await globalForJobsRuntime.formbricksJobsRuntimeInitializing;
+  }
+
+  const runtimeOptions = jobsWorkerBootstrapConfig.runtimeOptions;
+  const jobHandlerOverrides: JobHandlerOverrides = runtimeOptions.jobHandlerOverrides
+    ? {
+        ...runtimeOptions.jobHandlerOverrides,
+        [RESPONSE_PIPELINE_JOB_NAME]: responsePipelineJobHandler,
+        [SURVEY_SCHEDULING_JOB_NAME]: surveySchedulingJobHandler,
+      }
+    : {
+        [RESPONSE_PIPELINE_JOB_NAME]: responsePipelineJobHandler,
+        [SURVEY_SCHEDULING_JOB_NAME]: surveySchedulingJobHandler,
+      };
+
+  globalForJobsRuntime.formbricksJobsRuntimeInitializing = (async () => {
+    const runtime = await startJobsRuntime({
+      ...runtimeOptions,
+      jobHandlerOverrides,
+    });
+
+    clearJobsWorkerRetryTimeout();
+    globalForJobsRuntime.formbricksJobsRuntime = runtime;
+    globalForJobsRuntime.formbricksJobsRuntimeInitializing = undefined;
+    return runtime;
+  })();
+
+  try {
+    return await globalForJobsRuntime.formbricksJobsRuntimeInitializing;
+  } catch (error) {
+    globalForJobsRuntime.formbricksJobsRuntimeInitializing = undefined;
+    logger.error({ err: error }, "BullMQ worker registration failed");
+    scheduleJobsWorkerRetry();
+    throw error;
+  }
+};
+
+export const resetJobsWorkerRegistrationForTests = async (): Promise<void> => {
+  const runtime = globalForJobsRuntime.formbricksJobsRuntime;
+  const initializing = globalForJobsRuntime.formbricksJobsRuntimeInitializing;
+  clearRecurringJobsRetryTimeout();
+  clearJobsWorkerRetryTimeout();
+  globalForJobsRuntime.formbricksJobsRecurringRegistered = undefined;
+  globalForJobsRuntime.formbricksJobsRecurringRegistration = undefined;
+  globalForJobsRuntime.formbricksJobsRuntime = undefined;
+  globalForJobsRuntime.formbricksJobsRuntimeInitializing = undefined;
+
+  const runtimesToClose = new Set<JobsRuntimeHandle>();
+
+  if (runtime) {
+    runtimesToClose.add(runtime);
+  }
+
+  if (initializing) {
+    try {
+      const initializedRuntime = await initializing;
+      runtimesToClose.add(initializedRuntime);
+    } catch {
+      // Startup failures are already surfaced by the test that triggered them.
+    }
+  }
+
+  if (globalForJobsRuntime.formbricksJobsRuntime) {
+    runtimesToClose.add(globalForJobsRuntime.formbricksJobsRuntime);
+  }
+
+  globalForJobsRuntime.formbricksJobsRuntime = undefined;
+  globalForJobsRuntime.formbricksJobsRuntimeInitializing = undefined;
+
+  await Promise.all(
+    [...runtimesToClose].map(async (runtimeHandle) => {
+      try {
+        await runtimeHandle.close();
+      } catch (error) {
+        logger.error({ err: error }, "BullMQ worker test reset close failed");
+      }
+    })
+  );
+};
@@ -0,0 +1,52 @@
+import { beforeEach, describe, expect, test, vi } from "vitest";
+
+const mockRegisterJobsWorker = vi.fn();
+const mockRegisterRecurringJobs = vi.fn();
+
+vi.mock("@sentry/nextjs", () => ({
+  captureRequestError: vi.fn(),
+}));
+
+vi.mock("@/lib/constants", () => ({
+  IS_PRODUCTION: false,
+  PROMETHEUS_ENABLED: false,
+  SENTRY_DSN: undefined,
+}));
+
+vi.mock("./instrumentation-jobs", () => ({
+  registerRecurringJobs: mockRegisterRecurringJobs,
+  registerJobsWorker: mockRegisterJobsWorker,
+}));
+
+describe("instrumentation register", () => {
+  beforeEach(() => {
+    vi.resetModules();
+    vi.clearAllMocks();
+    process.env.NEXT_RUNTIME = "nodejs";
+    delete process.env.OTEL_EXPORTER_OTLP_ENDPOINT;
+  });
+
+  test("does not block Next.js boot on BullMQ worker startup", async () => {
+    mockRegisterRecurringJobs.mockReturnValue(new Promise(() => undefined));
+    mockRegisterJobsWorker.mockReturnValue(new Promise(() => undefined));
+
+    const { register } = await import("./instrumentation");
+
+    await expect(register()).resolves.toBeUndefined();
+    expect(mockRegisterRecurringJobs).toHaveBeenCalledTimes(1);
+    expect(mockRegisterJobsWorker).toHaveBeenCalledTimes(1);
+  });
+
+  test("swallows BullMQ worker startup rejections after triggering background registration", async () => {
+    mockRegisterRecurringJobs.mockRejectedValue(new Error("schedule failed"));
+    mockRegisterJobsWorker.mockRejectedValue(new Error("startup failed"));
+
+    const { register } = await import("./instrumentation");
+
+    await expect(register()).resolves.toBeUndefined();
+    await Promise.resolve();
+
+    expect(mockRegisterRecurringJobs).toHaveBeenCalledTimes(1);
+    expect(mockRegisterJobsWorker).toHaveBeenCalledTimes(1);
+  });
+});
@@ -1,5 +1,6 @@
 import * as Sentry from "@sentry/nextjs";
 import { type Instrumentation } from "next";
+import { logger } from "@formbricks/logger";
 import { isExpectedError } from "@formbricks/types/errors";
 import { IS_PRODUCTION, PROMETHEUS_ENABLED, SENTRY_DSN } from "@/lib/constants";

@@ -21,6 +22,25 @@ export const register = async () => {
    if (PROMETHEUS_ENABLED || process.env.OTEL_EXPORTER_OTLP_ENDPOINT) {
      await import("./instrumentation-node");
    }
+
+    // Skip runtime-only BullMQ bootstrapping during production builds.
+    // eslint-disable-next-line turbo/no-undeclared-env-vars -- NEXT_PHASE is a next.js env variable
+    if (process.env.NEXT_PHASE !== "phase-production-build") {
+      try {
+        const { registerJobsWorker, registerRecurringJobs } = await import("./instrumentation-jobs");
+        void registerRecurringJobs().catch((error: unknown) => {
+          logger.error(
+            { err: error },
+            "BullMQ recurring job registration failed during Next.js instrumentation"
+          );
+        });
+        void registerJobsWorker().catch((error: unknown) => {
+          logger.error({ err: error }, "BullMQ worker registration failed during Next.js instrumentation");
+        });
+      } catch (error) {
+        logger.error({ err: error }, "BullMQ instrumentation import failed during Next.js instrumentation");
+      }
+    }
  }
  // Sentry init loads after OTEL to avoid TracerProvider conflicts
  // Sentry tracing is disabled (tracesSampleRate: 0) -- SigNoz handles distributed tracing
@@ -30,7 +30,7 @@ describe("ActionClass Service", () => {
  });

  describe("getActionClasses", () => {
-    test("should return action classes for environment", async () => {
+    test("should return action classes for workspace", async () => {
      const mockActionClasses: TActionClass[] = [
        {
          id: "id1",
@@ -41,15 +41,15 @@ describe("ActionClass Service", () => {
          type: "code",
          key: "key1",
          noCodeConfig: null,
-          workspaceId: "env1",
+          workspaceId: "ws1",
        },
      ];
      vi.mocked(prisma.actionClass.findMany).mockResolvedValue(mockActionClasses);

-      const result = await getActionClasses("env1");
+      const result = await getActionClasses("ws1");
      expect(result).toEqual(mockActionClasses);
      expect(prisma.actionClass.findMany).toHaveBeenCalledWith({
-        where: { workspaceId: "env1" },
+        where: { workspaceId: "ws1" },
        select: expect.any(Object),
        take: undefined,
        skip: undefined,
@@ -59,7 +59,7 @@ describe("ActionClass Service", () => {

    test("should throw DatabaseError when prisma throws", async () => {
      vi.mocked(prisma.actionClass.findMany).mockRejectedValue(new Error("fail"));
-      await expect(getActionClasses("env1")).rejects.toThrow(DatabaseError);
+      await expect(getActionClasses("ws1")).rejects.toThrow(DatabaseError);
    });
  });

@@ -78,15 +78,15 @@ describe("ActionClass Service", () => {
          elementSelector: { cssSelector: "button" },
          urlFilters: [],
        },
-        workspaceId: "env2",
+        workspaceId: "ws2",
      };
      if (!prisma.actionClass.findFirst) prisma.actionClass.findFirst = vi.fn();
      vi.mocked(prisma.actionClass.findFirst).mockResolvedValue(mockActionClass);

-      const result = await getActionClassByWorkspaceIdAndName("env2", "Action 2");
+      const result = await getActionClassByWorkspaceIdAndName("ws2", "Action 2");
      expect(result).toEqual(mockActionClass);
      expect(prisma.actionClass.findFirst).toHaveBeenCalledWith({
-        where: { name: "Action 2", workspaceId: "env2" },
+        where: { name: "Action 2", workspaceId: "ws2" },
        select: expect.any(Object),
      });
    });
@@ -94,14 +94,14 @@ describe("ActionClass Service", () => {
    test("should return null when not found", async () => {
      if (!prisma.actionClass.findFirst) prisma.actionClass.findFirst = vi.fn();
      vi.mocked(prisma.actionClass.findFirst).mockResolvedValue(null);
-      const result = await getActionClassByWorkspaceIdAndName("env2", "Action 2");
+      const result = await getActionClassByWorkspaceIdAndName("ws2", "Action 2");
      expect(result).toBeNull();
    });

    test("should throw DatabaseError when prisma throws", async () => {
      if (!prisma.actionClass.findFirst) prisma.actionClass.findFirst = vi.fn();
      vi.mocked(prisma.actionClass.findFirst).mockRejectedValue(new Error("fail"));
-      await expect(getActionClassByWorkspaceIdAndName("env2", "Action 2")).rejects.toThrow(DatabaseError);
+      await expect(getActionClassByWorkspaceIdAndName("ws2", "Action 2")).rejects.toThrow(DatabaseError);
    });
  });

@@ -116,7 +116,7 @@ describe("ActionClass Service", () => {
        type: "code",
        key: "key3",
        noCodeConfig: null,
-        workspaceId: "env3",
+        workspaceId: "ws3",
      };
      if (!prisma.actionClass.findUnique) prisma.actionClass.findUnique = vi.fn();
      vi.mocked(prisma.actionClass.findUnique).mockResolvedValue(mockActionClass);
@@ -13,7 +13,6 @@ const mocks = vi.hoisted(() => ({
  getOrganization: vi.fn(),
  getIsAIDataAnalysisEnabled: vi.fn(),
  getIsAISmartToolsEnabled: vi.fn(),
-  getTranslate: vi.fn(),
  loggerError: vi.fn(),
 }));

@@ -40,12 +39,12 @@ vi.mock("@formbricks/logger", () => ({

 vi.mock("@/lib/env", () => ({
  env: {
-    AI_PROVIDER: "gcp",
+    AI_PROVIDER: "google",
    AI_MODEL: "gemini-2.5-flash",
-    AI_GCP_PROJECT: "vertex-project",
-    AI_GCP_LOCATION: "us-central1",
-    AI_GCP_CREDENTIALS_JSON: undefined,
-    AI_GCP_APPLICATION_CREDENTIALS: "/tmp/vertex.json",
+    AI_GOOGLE_CLOUD_PROJECT: "google-cloud-project",
+    AI_GOOGLE_CLOUD_LOCATION: "us-central1",
+    AI_GOOGLE_CLOUD_CREDENTIALS_JSON: undefined,
+    AI_GOOGLE_CLOUD_APPLICATION_CREDENTIALS: "/tmp/google-cloud.json",
    AI_AWS_REGION: "us-east-1",
    AI_AWS_ACCESS_KEY_ID: "aws-access-key-id",
    AI_AWS_SECRET_ACCESS_KEY: "aws-secret-access-key",
@@ -66,10 +65,6 @@ vi.mock("@/modules/ee/license-check/lib/utils", () => ({
  getIsAISmartToolsEnabled: mocks.getIsAISmartToolsEnabled,
 }));

-vi.mock("@/lingodotdev/server", () => ({
-  getTranslate: mocks.getTranslate,
-}));
-
 describe("AI organization service", () => {
  beforeEach(() => {
    vi.clearAllMocks();
@@ -82,9 +77,6 @@ describe("AI organization service", () => {
    });
    mocks.getIsAISmartToolsEnabled.mockResolvedValue(true);
    mocks.getIsAIDataAnalysisEnabled.mockResolvedValue(true);
-    mocks.getTranslate.mockResolvedValue((key: string, values?: Record<string, string>) =>
-      values ? `${key}:${JSON.stringify(values)}` : key
-    );
  });

  test("returns the instance AI status and organization settings", async () => {
@@ -152,9 +144,9 @@ describe("AI organization service", () => {
        prompt: "Translate this survey",
      },
      expect.objectContaining({
-        AI_PROVIDER: "gcp",
+        AI_PROVIDER: "google",
        AI_MODEL: "gemini-2.5-flash",
-        AI_GCP_PROJECT: "vertex-project",
+        AI_GOOGLE_CLOUD_PROJECT: "google-cloud-project",
      })
    );
  });
@@ -4,9 +4,17 @@ import { logger } from "@formbricks/logger";
 import { OperationNotAllowedError, ResourceNotFoundError } from "@formbricks/types/errors";
 import { env } from "@/lib/env";
 import { getOrganization } from "@/lib/organization/service";
-import { getTranslate } from "@/lingodotdev/server";
 import { getIsAIDataAnalysisEnabled, getIsAISmartToolsEnabled } from "@/modules/ee/license-check/lib/utils";

+export const AI_ERROR_CODES = {
+  FEATURES_NOT_ENABLED: "ai_features_not_enabled",
+  SMART_TOOLS_DISABLED: "ai_smart_tools_disabled",
+  DATA_ANALYSIS_DISABLED: "ai_data_analysis_disabled",
+  INSTANCE_NOT_CONFIGURED: "ai_instance_not_configured",
+} as const;
+
+export type TAIErrorCode = (typeof AI_ERROR_CODES)[keyof typeof AI_ERROR_CODES];
+
 export interface TOrganizationAIConfig {
  organizationId: string;
  isAISmartToolsEnabled: boolean;
@@ -44,31 +52,24 @@ export const assertOrganizationAIConfigured = async (
  organizationId: string,
  capability: "smartTools" | "dataAnalysis"
 ): Promise<TOrganizationAIConfig> => {
-  const t = await getTranslate();
  const aiConfig = await getOrganizationAIConfig(organizationId);
  const isCapabilityEntitled =
    capability === "smartTools" ? aiConfig.isAISmartToolsEntitled : aiConfig.isAIDataAnalysisEntitled;

  if (!isCapabilityEntitled) {
-    throw new OperationNotAllowedError(
-      t("workspace.settings.general.ai_features_not_enabled_for_organization")
-    );
+    throw new OperationNotAllowedError(AI_ERROR_CODES.FEATURES_NOT_ENABLED);
  }

  if (capability === "smartTools" && !aiConfig.isAISmartToolsEnabled) {
-    throw new OperationNotAllowedError(
-      t("workspace.settings.general.ai_smart_tools_disabled_for_organization")
-    );
+    throw new OperationNotAllowedError(AI_ERROR_CODES.SMART_TOOLS_DISABLED);
  }

  if (capability === "dataAnalysis" && !aiConfig.isAIDataAnalysisEnabled) {
-    throw new OperationNotAllowedError(
-      t("workspace.settings.general.ai_data_analysis_disabled_for_organization")
-    );
+    throw new OperationNotAllowedError(AI_ERROR_CODES.DATA_ANALYSIS_DISABLED);
  }

  if (!aiConfig.isInstanceConfigured) {
-    throw new OperationNotAllowedError(t("workspace.settings.general.ai_instance_not_configured"));
+    throw new OperationNotAllowedError(AI_ERROR_CODES.INSTANCE_NOT_CONFIGURED);
  }

  return aiConfig;
@@ -11,6 +11,8 @@ import {
  verifyPassword,
 } from "./auth";

+const PASSWORD_TEST_TIMEOUT_MS = 30_000;
+
 // Mock prisma
 vi.mock("@formbricks/database", () => ({
  prisma: {
@@ -21,26 +23,38 @@ vi.mock("@formbricks/database", () => ({
 }));

 describe("Password Management", () => {
-  test("hashPassword should hash a password", async () => {
-    const password = "testPassword123";
-    const hashedPassword = await hashPassword(password);
-    expect(hashedPassword).toBeDefined();
-    expect(hashedPassword).not.toBe(password);
-  });
+  test(
+    "hashPassword should hash a password",
+    async () => {
+      const password = "testPassword123";
+      const hashedPassword = await hashPassword(password);
+      expect(hashedPassword).toBeDefined();
+      expect(hashedPassword).not.toBe(password);
+    },
+    PASSWORD_TEST_TIMEOUT_MS
+  );

-  test("verifyPassword should verify a correct password", async () => {
-    const password = "testPassword123";
-    const hashedPassword = await hashPassword(password);
-    const isValid = await verifyPassword(password, hashedPassword);
-    expect(isValid).toBe(true);
-  });
+  test(
+    "verifyPassword should verify a correct password",
+    async () => {
+      const password = "testPassword123";
+      const hashedPassword = await hashPassword(password);
+      const isValid = await verifyPassword(password, hashedPassword);
+      expect(isValid).toBe(true);
+    },
+    PASSWORD_TEST_TIMEOUT_MS
+  );

-  test("verifyPassword should reject an incorrect password", async () => {
-    const password = "testPassword123";
-    const hashedPassword = await hashPassword(password);
-    const isValid = await verifyPassword("wrongPassword", hashedPassword);
-    expect(isValid).toBe(false);
-  });
+  test(
+    "verifyPassword should reject an incorrect password",
+    async () => {
+      const password = "testPassword123";
+      const hashedPassword = await hashPassword(password);
+      const isValid = await verifyPassword("wrongPassword", hashedPassword);
+      expect(isValid).toBe(false);
+    },
+    PASSWORD_TEST_TIMEOUT_MS
+  );
 });

 describe("Organization Access", () => {
@@ -12,7 +12,7 @@ import {
  ZConnectorUpdateInput,
  getHubFieldTypeFromElementType,
 } from "@formbricks/types/connector";
-import { AuthorizationError, ResourceNotFoundError } from "@formbricks/types/errors";
+import { AuthorizationError, InvalidInputError, ResourceNotFoundError } from "@formbricks/types/errors";
 import { getResponseCountBySurveyId } from "@/lib/response/service";
 import { getSurvey } from "@/lib/survey/service";
 import { getElementsFromBlocks } from "@/lib/survey/utils";
@@ -86,20 +86,24 @@ const resolveSurveyMappings = async (
  const elements = getElementsFromBlocks(survey.blocks);
  const elementMap = new Map(elements.map((el) => [el.id, el]));

-  return elementIds
-    .filter((elementId) => {
-      if (elementMap.has(elementId)) return true;
+  return elementIds.flatMap((elementId) => {
+    const element = elementMap.get(elementId);
+    if (!element) {
      logger.warn({ surveyId, elementId }, "Skipping unknown elementId when building connector mappings");
-      return false;
-    })
-    .map((elementId) => {
-      const element = elementMap.get(elementId)!;
-      return {
-        surveyId,
-        elementId,
-        hubFieldType: getHubFieldTypeFromElementType(element.type),
-      };
-    });
+      return [];
+    }
+
+    const hubFieldType = getHubFieldTypeFromElementType(element.type);
+    if (!hubFieldType) {
+      logger.warn(
+        { surveyId, elementId, elementType: element.type },
+        "Skipping unmappable element type when building connector mappings"
+      );
+      return [];
+    }
+
+    return [{ surveyId, elementId, hubFieldType }];
+  });
 };

 const resolveFormbricksMappingsInput = async (
@@ -108,7 +112,12 @@ const resolveFormbricksMappingsInput = async (
  const allMappings = await Promise.all(
    entries.map(({ surveyId, elementIds }) => resolveSurveyMappings(surveyId, elementIds))
  );
-  return { type: "formbricks_survey", mappings: allMappings.flat() };
+  const flattenedMappings = allMappings.flat();
+  if (flattenedMappings.length === 0) {
+    throw new InvalidInputError("No supported survey questions selected for connector mapping");
+  }
+
+  return { type: "formbricks_survey", mappings: flattenedMappings };
 };

 const ZFormbricksSurveyMapping = z.object({
@@ -116,15 +125,23 @@ const ZFormbricksSurveyMapping = z.object({
  elementIds: z.array(z.string()).min(1),
 });

+// Temporary compatibility to support legacy client payloads using `formbricks`.
+const ZConnectorCreateInputWithLegacyType = ZConnectorCreateInput.extend({
+  type: z.enum(["formbricks_survey", "csv", "formbricks"]),
+});
+
 const ZCreateConnectorWithMappingsAction = z
  .object({
    workspaceId: ZId,
-    connectorInput: ZConnectorCreateInput,
+    connectorInput: ZConnectorCreateInputWithLegacyType,
    formbricksMappings: z.array(ZFormbricksSurveyMapping).optional(),
    fieldMappings: z.array(ZConnectorFieldMappingCreateInput).optional(),
  })
  .superRefine((data, ctx) => {
-    if (data.connectorInput.type === "formbricks_survey") {
+    const normalizedType =
+      data.connectorInput.type === "formbricks" ? "formbricks_survey" : data.connectorInput.type;
+
+    if (normalizedType === "formbricks_survey") {
      if (!data.formbricksMappings?.length) {
        ctx.addIssue({
          code: "custom",
@@ -132,7 +149,7 @@ const ZCreateConnectorWithMappingsAction = z
          message: "At least one survey mapping is required for Formbricks connectors",
        });
      }
-    } else if (data.connectorInput.type === "csv") {
+    } else if (normalizedType === "csv") {
      if (!data.fieldMappings?.length) {
        ctx.addIssue({
          code: "custom",
@@ -146,6 +163,14 @@ const ZCreateConnectorWithMappingsAction = z
 export const createConnectorWithMappingsAction = authenticatedActionClient
  .inputSchema(ZCreateConnectorWithMappingsAction)
  .action(async ({ ctx, parsedInput }): Promise<TConnectorWithMappings> => {
+    const connectorInput = ZConnectorCreateInput.parse({
+      ...parsedInput.connectorInput,
+      type:
+        parsedInput.connectorInput.type === "formbricks"
+          ? "formbricks_survey"
+          : parsedInput.connectorInput.type,
+    });
+
    const organizationId = await getOrganizationIdFromWorkspaceId(parsedInput.workspaceId);
    await checkAuthorizationUpdated({
      userId: ctx.user.id,
@@ -165,7 +190,7 @@ export const createConnectorWithMappingsAction = authenticatedActionClient

    // Verify FRD belongs to same org
    const frd = await prisma.feedbackRecordDirectory.findUnique({
-      where: { id: parsedInput.connectorInput.feedbackRecordDirectoryId },
+      where: { id: connectorInput.feedbackRecordDirectoryId },
      select: { organizationId: true },
    });
    if (frd?.organizationId !== organizationId) {
@@ -193,7 +218,7 @@ export const createConnectorWithMappingsAction = authenticatedActionClient

    return createConnectorWithMappings(
      parsedInput.workspaceId,
-      { ...parsedInput.connectorInput, createdBy: ctx.user.id },
+      { ...connectorInput, createdBy: ctx.user.id },
      mappingsInput
    );
  });
@@ -467,6 +492,7 @@ export const importCsvDataAction = authenticatedActionClient

 const ZListFeedbackRecordsAction = z.object({
  workspaceId: ZId,
+  frdId: ZId,
  limit: z.number().min(1).max(1000).optional(),
  cursor: z.string().optional(),
  sourceType: z.string().optional(),
@@ -504,38 +530,28 @@ export const listFeedbackRecordsAction = authenticatedActionClient
        ],
      });

-      // tenant_id = FRD id. Fan out across all FRDs assigned to this workspace, merge + sort desc.
+      // Verify FRD belongs to workspace's accessible FRDs
      const frds = await getFeedbackRecordDirectoriesByWorkspaceId(parsedInput.workspaceId);
-      if (frds.length === 0) {
-        return { data: [], limit: parsedInput.limit ?? 50 };
+      if (!frds.some((f) => f.id === parsedInput.frdId)) {
+        throw new Error("Feedback record directory not accessible");
      }

-      const perFrdLimit = parsedInput.limit ?? 50;
-      const baseParams = {
-        limit: perFrdLimit,
-        ...(parsedInput.sourceType ? { source_type: parsedInput.sourceType } : {}),
-        ...(parsedInput.fieldType ? { field_type: parsedInput.fieldType } : {}),
-        ...(parsedInput.since ? { since: parsedInput.since } : {}),
-        ...(parsedInput.until ? { until: parsedInput.until } : {}),
+      const params: FeedbackRecordListParams = {
+        tenant_id: parsedInput.frdId,
+        limit: parsedInput.limit ?? 50,
      };
+      if (parsedInput.cursor) params.cursor = parsedInput.cursor;
+      if (parsedInput.sourceType) params.source_type = parsedInput.sourceType;
+      if (parsedInput.fieldType) params.field_type = parsedInput.fieldType;
+      if (parsedInput.since) params.since = parsedInput.since;
+      if (parsedInput.until) params.until = parsedInput.until;

-      const results = await Promise.all(
-        frds.map((frd) =>
-          listFeedbackRecords({ ...baseParams, tenant_id: frd.id } as FeedbackRecordListParams)
-        )
-      );
-
-      const errored = results.find((r) => r.error);
-      if (errored?.error) {
-        logger.warn({ error: errored.error }, "Failed to list feedback records");
-        throw new Error(errored.error.message);
+      const result = await listFeedbackRecords(params);
+      if (result.error || !result.data) {
+        logger.warn({ error: result.error }, "Failed to list feedback records");
+        throw new Error(result.error?.message ?? "Failed to load feedback records");
      }

-      const merged = results
-        .flatMap((r) => r.data?.data ?? [])
-        .sort((a, b) => (a.collected_at < b.collected_at ? 1 : -1))
-        .slice(0, perFrdLimit);
-
-      return { data: merged, limit: perFrdLimit };
+      return result.data;
    }
  );
@@ -3,6 +3,7 @@ import { TConnectorFieldMapping } from "@formbricks/types/connector";
 import { transformCsvRowToFeedbackRecord, transformCsvRowsToFeedbackRecords } from "./csv-transform";

 const NOW = new Date("2026-02-25T10:00:00.000Z");
+const TENANT = "tenant-test";

 const makeMapping = (
  sourceFieldId: string,
@@ -34,7 +35,7 @@ describe("transformCsvRowToFeedbackRecord", () => {
      timestamp: "2026-01-15T10:00:00Z",
    };

-    const result = transformCsvRowToFeedbackRecord(row, baseMappings);
+    const result = transformCsvRowToFeedbackRecord(row, baseMappings, TENANT);

    expect(result).not.toBeNull();
    expect(result!.source_type).toBe("survey");
@@ -42,13 +43,77 @@ describe("transformCsvRowToFeedbackRecord", () => {
    expect(result!.field_type).toBe("text");
    expect(result!.value_text).toBe("Great product!");
    expect(result!.collected_at).toBe("2026-01-15T10:00:00.000Z");
+    expect(result!.tenant_id).toBe(TENANT);
  });

  test("returns null when required fields are missing", () => {
    const row = { feedback_text: "Great product!" };
    const mappings = [makeMapping("feedback_text", "value_text")];

-    const result = transformCsvRowToFeedbackRecord(row, mappings);
+    const result = transformCsvRowToFeedbackRecord(row, mappings, TENANT);
+    expect(result).toBeNull();
+  });
+
+  test("returns null when tenant_id is missing", () => {
+    const row = {
+      feedback_text: "Great product!",
+      question: "q1",
+      timestamp: "2026-01-15T10:00:00Z",
+    };
+
+    const result = transformCsvRowToFeedbackRecord(row, baseMappings);
+    expect(result).toBeNull();
+  });
+
+  test("auto-generates submission_id as a UUID when unmapped", () => {
+    const row = {
+      feedback_text: "Great product!",
+      question: "q1",
+      timestamp: "2026-01-15T10:00:00Z",
+    };
+
+    const a = transformCsvRowToFeedbackRecord(row, baseMappings, TENANT);
+    const b = transformCsvRowToFeedbackRecord(row, baseMappings, TENANT);
+
+    expect(a!.submission_id).toMatch(/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i);
+    expect(b!.submission_id).not.toBe(a!.submission_id);
+  });
+
+  test("uses explicit submission_id mapping when provided", () => {
+    const mappings = [...baseMappings, makeMapping("order_id", "submission_id")];
+    const row = {
+      feedback_text: "x",
+      question: "q1",
+      timestamp: "2026-01-15",
+      order_id: "ORD-42",
+    };
+
+    const result = transformCsvRowToFeedbackRecord(row, mappings, TENANT);
+    expect(result!.submission_id).toBe("ORD-42");
+  });
+
+  test("returns null when submission_id mapped but cell is empty", () => {
+    const mappings = [...baseMappings, makeMapping("order_id", "submission_id")];
+    const row = {
+      feedback_text: "x",
+      question: "q1",
+      timestamp: "2026-01-15",
+      order_id: "",
+    };
+
+    const result = transformCsvRowToFeedbackRecord(row, mappings, TENANT);
+    expect(result).toBeNull();
+  });
+
+  test("returns null when submission_id mapped but column missing from row", () => {
+    const mappings = [...baseMappings, makeMapping("order_id", "submission_id")];
+    const row = {
+      feedback_text: "x",
+      question: "q1",
+      timestamp: "2026-01-15",
+    };
+
+    const result = transformCsvRowToFeedbackRecord(row, mappings, TENANT);
    expect(result).toBeNull();
  });

@@ -61,7 +126,7 @@ describe("transformCsvRowToFeedbackRecord", () => {
      rating: "4.5",
    };

-    const result = transformCsvRowToFeedbackRecord(row, mappings);
+    const result = transformCsvRowToFeedbackRecord(row, mappings, TENANT);
    expect(result!.value_number).toBe(4.5);
  });

@@ -74,7 +139,7 @@ describe("transformCsvRowToFeedbackRecord", () => {
      rating: "not-a-number",
    };

-    const result = transformCsvRowToFeedbackRecord(row, mappings);
+    const result = transformCsvRowToFeedbackRecord(row, mappings, TENANT);
    expect(result!.value_number).toBeUndefined();
  });

@@ -84,21 +149,24 @@ describe("transformCsvRowToFeedbackRecord", () => {
    expect(
      transformCsvRowToFeedbackRecord(
        { feedback_text: "x", question: "q1", timestamp: "2026-01-15", is_promoter: "true" },
-        mappings
+        mappings,
+        TENANT
      )!.value_boolean
    ).toBe(true);

    expect(
      transformCsvRowToFeedbackRecord(
        { feedback_text: "x", question: "q1", timestamp: "2026-01-15", is_promoter: "0" },
-        mappings
+        mappings,
+        TENANT
      )!.value_boolean
    ).toBe(false);

    expect(
      transformCsvRowToFeedbackRecord(
        { feedback_text: "x", question: "q1", timestamp: "2026-01-15", is_promoter: "yes" },
-        mappings
+        mappings,
+        TENANT
      )!.value_boolean
    ).toBe(true);
  });
@@ -114,7 +182,7 @@ describe("transformCsvRowToFeedbackRecord", () => {
      makeMapping("", "collected_at", "$now"),
    ];

-    const result = transformCsvRowToFeedbackRecord({ question: "q1" }, mappings);
+    const result = transformCsvRowToFeedbackRecord({ question: "q1" }, mappings, TENANT);
    expect(result!.collected_at).toBe(NOW.toISOString());

    vi.useRealTimers();
@@ -129,7 +197,7 @@ describe("transformCsvRowToFeedbackRecord", () => {
    ];

    const row = { question: "q1", type_column: "review", timestamp: "2026-01-15" };
-    const result = transformCsvRowToFeedbackRecord(row, mappings);
+    const result = transformCsvRowToFeedbackRecord(row, mappings, TENANT);
    expect(result!.source_type).toBe("always_survey");
  });

@@ -140,7 +208,7 @@ describe("transformCsvRowToFeedbackRecord", () => {
      timestamp: "2026-01-15T10:00:00Z",
    };

-    const result = transformCsvRowToFeedbackRecord(row, baseMappings);
+    const result = transformCsvRowToFeedbackRecord(row, baseMappings, TENANT);
    expect(result!.value_text).toBeUndefined();
  });

@@ -153,7 +221,7 @@ describe("transformCsvRowToFeedbackRecord", () => {
      meta: '{"device":"mobile","version":"2.1"}',
    };

-    const result = transformCsvRowToFeedbackRecord(row, mappings);
+    const result = transformCsvRowToFeedbackRecord(row, mappings, TENANT);
    expect(result!.metadata).toEqual({ device: "mobile", version: "2.1" });
  });

@@ -166,7 +234,7 @@ describe("transformCsvRowToFeedbackRecord", () => {
      meta: "just a string",
    };

-    const result = transformCsvRowToFeedbackRecord(row, mappings);
+    const result = transformCsvRowToFeedbackRecord(row, mappings, TENANT);
    expect(result!.metadata).toEqual({ raw: "just a string" });
  });

@@ -177,7 +245,7 @@ describe("transformCsvRowToFeedbackRecord", () => {
      timestamp: "not-a-date",
    };

-    const result = transformCsvRowToFeedbackRecord(row, baseMappings);
+    const result = transformCsvRowToFeedbackRecord(row, baseMappings, TENANT);
    expect(result!.collected_at).toBeUndefined();
  });
 });
@@ -198,16 +266,19 @@ describe("transformCsvRowsToFeedbackRecords", () => {
      makeMapping("timestamp", "collected_at"),
    ];

-    const { records, skipped } = transformCsvRowsToFeedbackRecords(rows, mappings);
+    const { records, skipped } = transformCsvRowsToFeedbackRecords(rows, mappings, TENANT);

    expect(records).toHaveLength(2);
    expect(skipped).toBe(1);
    expect(records[0].field_id).toBe("q1");
    expect(records[1].field_id).toBe("q2");
+    expect(records[0].submission_id).toBeTruthy();
+    expect(records[1].submission_id).toBeTruthy();
+    expect(records[0].submission_id).not.toBe(records[1].submission_id);
  });

  test("returns empty records for empty input", () => {
-    const { records, skipped } = transformCsvRowsToFeedbackRecords([], baseMappings);
+    const { records, skipped } = transformCsvRowsToFeedbackRecords([], baseMappings, TENANT);
    expect(records).toHaveLength(0);
    expect(skipped).toBe(0);
  });
@@ -1,3 +1,4 @@
+import { randomUUID } from "crypto";
 import { TConnectorFieldMapping, THubTargetField } from "@formbricks/types/connector";
 import { FeedbackRecordCreateParams } from "@/modules/hub";

@@ -50,8 +51,10 @@ const resolveValue = (
 /**
 * Transform a single CSV row into a FeedbackRecord using field mappings.
 *
- * Each mapping maps a CSV column (sourceFieldId) or a static value to a target field.
- * Returns null if required fields (source_type, field_id, field_type) are missing after mapping.
+ * Returns null if any of source_type, field_id, field_type, tenant_id are missing,
+ * or if submission_id is mapped but resolves empty for this row (would break
+ * idempotency on re-import). Falls back to a random UUID for submission_id only
+ * when no mapping for it exists.
 */
 export const transformCsvRowToFeedbackRecord = (
  row: Record<string, string>,
@@ -83,6 +86,18 @@ export const transformCsvRowToFeedbackRecord = (
    record.tenant_id = tenantId;
  }

+  if (!record.tenant_id) {
+    return null;
+  }
+
+  if (!("submission_id" in record)) {
+    const submissionMapped = mappings.some((m) => m.targetFieldId === "submission_id");
+    if (submissionMapped) {
+      return null;
+    }
+    record.submission_id = randomUUID();
+  }
+
  return record as unknown as FeedbackRecordCreateParams;
 };

@@ -185,6 +185,7 @@ export const AVAILABLE_LOCALES: TUserLocale[] = [
  "ro-RO",
  "ru-RU",
  "sv-SE",
+  "tr-TR",
  "zh-Hans-CN",
  "zh-Hant-TW",
 ];
@@ -14,6 +14,8 @@ import {
  verifySecret,
 } from "./crypto";

+const SECRET_HASH_TEST_TIMEOUT_MS = 45_000;
+
 // Unmock crypto for these tests since we want to test the actual crypto functions
 vi.unmock("crypto");

@@ -26,45 +28,61 @@ vi.mock("@formbricks/logger", () => ({

 describe("Crypto Utils", () => {
  describe("hashSecret and verifySecret", () => {
-    test("should hash and verify secrets correctly", async () => {
-      const secret = "test-secret-123";
-      const hash = await hashSecret(secret);
+    test(
+      "should hash and verify secrets correctly",
+      async () => {
+        const secret = "test-secret-123";
+        const hash = await hashSecret(secret);

-      expect(hash).toMatch(/^\$2[aby]\$\d+\$[./A-Za-z0-9]{53}$/);
+        expect(hash).toMatch(/^\$2[aby]\$\d+\$[./A-Za-z0-9]{53}$/);

-      const isValid = await verifySecret(secret, hash);
-      expect(isValid).toBe(true);
-    });
+        const isValid = await verifySecret(secret, hash);
+        expect(isValid).toBe(true);
+      },
+      SECRET_HASH_TEST_TIMEOUT_MS
+    );

-    test("should reject wrong secrets", async () => {
-      const secret = "test-secret-123";
-      const wrongSecret = "wrong-secret";
-      const hash = await hashSecret(secret);
+    test(
+      "should reject wrong secrets",
+      async () => {
+        const secret = "test-secret-123";
+        const wrongSecret = "wrong-secret";
+        const hash = await hashSecret(secret);

-      const isValid = await verifySecret(wrongSecret, hash);
-      expect(isValid).toBe(false);
-    });
+        const isValid = await verifySecret(wrongSecret, hash);
+        expect(isValid).toBe(false);
+      },
+      SECRET_HASH_TEST_TIMEOUT_MS
+    );

-    test("should generate different hashes for the same secret (due to salt)", async () => {
-      const secret = "test-secret-123";
-      const hash1 = await hashSecret(secret);
-      const hash2 = await hashSecret(secret);
+    test(
+      "should generate different hashes for the same secret (due to salt)",
+      async () => {
+        const secret = "test-secret-123";
+        const hash1 = await hashSecret(secret);
+        const hash2 = await hashSecret(secret);

-      expect(hash1).not.toBe(hash2);
+        expect(hash1).not.toBe(hash2);

-      // But both should verify correctly
-      expect(await verifySecret(secret, hash1)).toBe(true);
-      expect(await verifySecret(secret, hash2)).toBe(true);
-    }, 15000);
+        // But both should verify correctly
+        expect(await verifySecret(secret, hash1)).toBe(true);
+        expect(await verifySecret(secret, hash2)).toBe(true);
+      },
+      SECRET_HASH_TEST_TIMEOUT_MS
+    );

-    test("should use custom cost factor", async () => {
-      const secret = "test-secret-123";
-      const hash = await hashSecret(secret, 10);
+    test(
+      "should use custom cost factor",
+      async () => {
+        const secret = "test-secret-123";
+        const hash = await hashSecret(secret, 10);

-      // Verify the cost factor is in the hash
-      expect(hash).toMatch(/^\$2[aby]\$10\$/);
-      expect(await verifySecret(secret, hash)).toBe(true);
-    });
+        // Verify the cost factor is in the hash
+        expect(hash).toMatch(/^\$2[aby]\$10\$/);
+        expect(await verifySecret(secret, hash)).toBe(true);
+      },
+      SECRET_HASH_TEST_TIMEOUT_MS
+    );

    test("should return false for invalid hash format", async () => {
      const secret = "test-secret-123";
@@ -8,6 +8,7 @@ const setTestEnv = (overrides: Record<string, string | undefined> = {}) => {
    NODE_ENV: "test",
    DATABASE_URL: "https://example.com/db",
    ENCRYPTION_KEY: "12345678901234567890123456789012",
+    HUB_API_URL: "https://hub.formbricks.local",
    ...overrides,
  };
 };
@@ -21,13 +22,22 @@ describe("env", () => {
    process.env = ORIGINAL_ENV;
  });

+  test("allows ambient DEBUG values from external tooling", async () => {
+    setTestEnv({
+      DEBUG: "pnpm:*",
+    });
+
+    const { env } = await import("./env");
+
+    expect(env.DEBUG).toBe("pnpm:*");
+  });
+
  test("uses the default password reset token lifetime when env var is not set", async () => {
    setTestEnv({
      PASSWORD_RESET_TOKEN_LIFETIME_MINUTES: undefined,
    });

    const { env } = await import("./env");
-
    expect(env.PASSWORD_RESET_TOKEN_LIFETIME_MINUTES).toBe(30);
  });

@@ -67,6 +77,58 @@ describe("env", () => {
    expect(env.DEBUG_SHOW_RESET_LINK).toBe("1");
  });

+  test("uses the default survey scheduling configuration when env vars are not set", async () => {
+    setTestEnv({
+      NEXT_PUBLIC_SURVEY_SCHEDULING_LOCAL_HOUR: undefined,
+      NEXT_PUBLIC_SURVEY_SCHEDULING_LOCAL_MINUTE: undefined,
+      NEXT_PUBLIC_SURVEY_SCHEDULING_TIME_ZONE: undefined,
+    });
+
+    const { env } = await import("./env");
+
+    expect(env.NEXT_PUBLIC_SURVEY_SCHEDULING_TIME_ZONE).toBe("Europe/Berlin");
+    expect(env.NEXT_PUBLIC_SURVEY_SCHEDULING_LOCAL_HOUR).toBe(0);
+    expect(env.NEXT_PUBLIC_SURVEY_SCHEDULING_LOCAL_MINUTE).toBe(0);
+  });
+
+  test("uses the configured survey scheduling configuration", async () => {
+    setTestEnv({
+      NEXT_PUBLIC_SURVEY_SCHEDULING_LOCAL_HOUR: "18",
+      NEXT_PUBLIC_SURVEY_SCHEDULING_LOCAL_MINUTE: "45",
+      NEXT_PUBLIC_SURVEY_SCHEDULING_TIME_ZONE: "America/New_York",
+    });
+
+    const { env } = await import("./env");
+
+    expect(env.NEXT_PUBLIC_SURVEY_SCHEDULING_TIME_ZONE).toBe("America/New_York");
+    expect(env.NEXT_PUBLIC_SURVEY_SCHEDULING_LOCAL_HOUR).toBe(18);
+    expect(env.NEXT_PUBLIC_SURVEY_SCHEDULING_LOCAL_MINUTE).toBe(45);
+  });
+
+  test("fails to load when the survey scheduling timezone is invalid", async () => {
+    setTestEnv({
+      NEXT_PUBLIC_SURVEY_SCHEDULING_TIME_ZONE: "Mars/OlympusMons",
+    });
+
+    await expect(import("./env")).rejects.toThrow("Invalid environment variables");
+  });
+
+  test("fails to load when the survey scheduling hour is out of range", async () => {
+    setTestEnv({
+      NEXT_PUBLIC_SURVEY_SCHEDULING_LOCAL_HOUR: "24",
+    });
+
+    await expect(import("./env")).rejects.toThrow("Invalid environment variables");
+  });
+
+  test("fails to load when the survey scheduling minute is out of range", async () => {
+    setTestEnv({
+      NEXT_PUBLIC_SURVEY_SCHEDULING_LOCAL_MINUTE: "60",
+    });
+
+    await expect(import("./env")).rejects.toThrow("Invalid environment variables");
+  });
+
  test("fails to load when DEBUG_SHOW_RESET_LINK is invalid", async () => {
    setTestEnv({
      DEBUG_SHOW_RESET_LINK: "true",
@@ -6,10 +6,10 @@ const ZActiveAIProvider = z.enum(AI_PROVIDERS);
 const ZAIConfigurationEnv = z.object({
  AI_PROVIDER: ZActiveAIProvider.optional(),
  AI_MODEL: z.string().optional(),
-  AI_GCP_PROJECT: z.string().optional(),
-  AI_GCP_LOCATION: z.string().optional(),
-  AI_GCP_CREDENTIALS_JSON: z.string().optional(),
-  AI_GCP_APPLICATION_CREDENTIALS: z.string().optional(),
+  AI_GOOGLE_CLOUD_PROJECT: z.string().optional(),
+  AI_GOOGLE_CLOUD_LOCATION: z.string().optional(),
+  AI_GOOGLE_CLOUD_CREDENTIALS_JSON: z.string().optional(),
+  AI_GOOGLE_CLOUD_APPLICATION_CREDENTIALS: z.string().optional(),
  AI_AWS_REGION: z.string().optional(),
  AI_AWS_ACCESS_KEY_ID: z.string().optional(),
  AI_AWS_SECRET_ACCESS_KEY: z.string().optional(),
@@ -20,6 +20,9 @@ const ZAIConfigurationEnv = z.object({

 type TAIConfigurationEnv = z.infer<typeof ZAIConfigurationEnv>;

+const isJsonObject = (value: unknown): value is Record<string, unknown> =>
+  typeof value === "object" && value !== null && !Array.isArray(value);
+
 const addEnvIssue = (ctx: z.RefinementCtx, path: keyof TAIConfigurationEnv, message: string): void => {
  ctx.addIssue({
    code: "custom",
@@ -48,28 +51,44 @@ const validateAwsAIConfiguration = (values: TAIConfigurationEnv, ctx: z.Refineme
  }
 };

-const validateGcpAIConfiguration = (values: TAIConfigurationEnv, ctx: z.RefinementCtx): void => {
-  if (!values.AI_GCP_PROJECT) {
-    addEnvIssue(ctx, "AI_GCP_PROJECT", "AI_GCP_PROJECT is required when AI_PROVIDER=gcp");
-  }
-
-  if (!values.AI_GCP_LOCATION) {
-    addEnvIssue(ctx, "AI_GCP_LOCATION", "AI_GCP_LOCATION is required when AI_PROVIDER=gcp");
-  }
-
-  if (!values.AI_GCP_CREDENTIALS_JSON && !values.AI_GCP_APPLICATION_CREDENTIALS) {
+const validateGoogleAIConfiguration = (values: TAIConfigurationEnv, ctx: z.RefinementCtx): void => {
+  if (!values.AI_GOOGLE_CLOUD_PROJECT) {
    addEnvIssue(
      ctx,
-      "AI_GCP_CREDENTIALS_JSON",
-      "AI_GCP_CREDENTIALS_JSON or AI_GCP_APPLICATION_CREDENTIALS is required when AI_PROVIDER=gcp"
+      "AI_GOOGLE_CLOUD_PROJECT",
+      "AI_GOOGLE_CLOUD_PROJECT is required when AI_PROVIDER=google"
    );
  }

-  if (values.AI_GCP_CREDENTIALS_JSON) {
+  if (!values.AI_GOOGLE_CLOUD_LOCATION) {
+    addEnvIssue(
+      ctx,
+      "AI_GOOGLE_CLOUD_LOCATION",
+      "AI_GOOGLE_CLOUD_LOCATION is required when AI_PROVIDER=google"
+    );
+  }
+
+  if (!values.AI_GOOGLE_CLOUD_CREDENTIALS_JSON && !values.AI_GOOGLE_CLOUD_APPLICATION_CREDENTIALS) {
+    addEnvIssue(
+      ctx,
+      "AI_GOOGLE_CLOUD_CREDENTIALS_JSON",
+      "AI_GOOGLE_CLOUD_CREDENTIALS_JSON or AI_GOOGLE_CLOUD_APPLICATION_CREDENTIALS is required when AI_PROVIDER=google"
+    );
+  }
+
+  if (values.AI_GOOGLE_CLOUD_CREDENTIALS_JSON) {
    try {
-      JSON.parse(values.AI_GCP_CREDENTIALS_JSON);
+      const parsedCredentials = JSON.parse(values.AI_GOOGLE_CLOUD_CREDENTIALS_JSON) as unknown;
+
+      if (!isJsonObject(parsedCredentials)) {
+        throw new Error("AI_GOOGLE_CLOUD_CREDENTIALS_JSON must be a JSON object");
+      }
    } catch {
-      addEnvIssue(ctx, "AI_GCP_CREDENTIALS_JSON", "AI_GCP_CREDENTIALS_JSON must be valid JSON");
+      addEnvIssue(
+        ctx,
+        "AI_GOOGLE_CLOUD_CREDENTIALS_JSON",
+        "AI_GOOGLE_CLOUD_CREDENTIALS_JSON must be a valid JSON object"
+      );
    }
  }
 };
@@ -100,13 +119,29 @@ const validateActiveAIProviderConfiguration = (values: TAIConfigurationEnv, ctx:
    (values: TAIConfigurationEnv, ctx: z.RefinementCtx) => void
  > = {
    aws: validateAwsAIConfiguration,
-    gcp: validateGcpAIConfiguration,
+    google: validateGoogleAIConfiguration,
    azure: validateAzureAIConfiguration,
  };

  providerValidators[values.AI_PROVIDER](values, ctx);
 };

+const isValidIanaTimeZone = (value: string): boolean => {
+  try {
+    new Intl.DateTimeFormat("en-US", { timeZone: value });
+    return true;
+  } catch {
+    return false;
+  }
+};
+
+const ZSurveySchedulingTimeZone = z.string().trim().min(1).refine(isValidIanaTimeZone, {
+  message: "NEXT_PUBLIC_SURVEY_SCHEDULING_TIME_ZONE must be a valid IANA time zone",
+});
+
+const ZSurveySchedulingLocalHour = z.coerce.number().int().min(0).max(23);
+const ZSurveySchedulingLocalMinute = z.coerce.number().int().min(0).max(59);
+
 const parsedEnv = createEnv({
  /*
   * Serverside Environment variables, not available on the client.
@@ -124,10 +159,16 @@ const parsedEnv = createEnv({
    BREVO_LIST_ID: z.string().optional(),
    DATABASE_URL: z.url(),
    DANGEROUSLY_ALLOW_WEBHOOK_INTERNAL_URLS: z.enum(["1", "0"]).optional(),
-    DEBUG: z.enum(["1", "0"]).optional(),
    DEBUG_SHOW_RESET_LINK: z.enum(["1", "0"]).optional(),
+    // DEBUG is a common ambient env var in CI/tooling, so we accept arbitrary strings here
+    // and only treat "1" as enabling Formbricks-specific debug behavior downstream.
+    DEBUG: z.string().optional(),
    AUTH_DEFAULT_TEAM_ID: z.string().optional(),
    AUTH_SKIP_INVITE_FOR_SSO: z.enum(["1", "0"]).optional(),
+    BULLMQ_WORKER_CONCURRENCY: z.coerce.number().int().min(1).optional(),
+    BULLMQ_WORKER_COUNT: z.coerce.number().int().min(1).optional(),
+    BULLMQ_EXTERNAL_WORKER_ENABLED: z.enum(["1", "0"]).optional(),
+    BULLMQ_WORKER_ENABLED: z.enum(["1", "0"]).optional(),
    E2E_TESTING: z.enum(["1", "0"]).optional(),
    EMAIL_AUTH_DISABLED: z.enum(["1", "0"]).optional(),
    EMAIL_VERIFICATION_DISABLED: z.enum(["1", "0"]).optional(),
@@ -138,10 +179,10 @@ const parsedEnv = createEnv({
    GITHUB_SECRET: z.string().optional(),
    GOOGLE_CLIENT_ID: z.string().optional(),
    GOOGLE_CLIENT_SECRET: z.string().optional(),
-    AI_GCP_PROJECT: z.string().optional(),
-    AI_GCP_LOCATION: z.string().optional(),
-    AI_GCP_CREDENTIALS_JSON: z.string().optional(),
-    AI_GCP_APPLICATION_CREDENTIALS: z.string().optional(),
+    AI_GOOGLE_CLOUD_PROJECT: z.string().optional(),
+    AI_GOOGLE_CLOUD_LOCATION: z.string().optional(),
+    AI_GOOGLE_CLOUD_CREDENTIALS_JSON: z.string().optional(),
+    AI_GOOGLE_CLOUD_APPLICATION_CREDENTIALS: z.string().optional(),
    GOOGLE_SHEETS_CLIENT_ID: z.string().optional(),
    GOOGLE_SHEETS_CLIENT_SECRET: z.string().optional(),
    GOOGLE_SHEETS_REDIRECT_URL: z.string().optional(),
@@ -251,6 +292,11 @@ const parsedEnv = createEnv({
      .optional(),
    SENTRY_ENVIRONMENT: z.string().optional(),
  },
+  client: {
+    NEXT_PUBLIC_SURVEY_SCHEDULING_TIME_ZONE: ZSurveySchedulingTimeZone.optional().default("Europe/Berlin"),
+    NEXT_PUBLIC_SURVEY_SCHEDULING_LOCAL_HOUR: ZSurveySchedulingLocalHour.optional().default(0),
+    NEXT_PUBLIC_SURVEY_SCHEDULING_LOCAL_MINUTE: ZSurveySchedulingLocalMinute.optional().default(0),
+  },

  /*
   * Due to how Next.js bundles environment variables on Edge and Client,
@@ -274,6 +320,10 @@ const parsedEnv = createEnv({
    DEBUG_SHOW_RESET_LINK: process.env.DEBUG_SHOW_RESET_LINK,
    AUTH_DEFAULT_TEAM_ID: process.env.AUTH_SSO_DEFAULT_TEAM_ID,
    AUTH_SKIP_INVITE_FOR_SSO: process.env.AUTH_SKIP_INVITE_FOR_SSO,
+    BULLMQ_EXTERNAL_WORKER_ENABLED: process.env.BULLMQ_EXTERNAL_WORKER_ENABLED,
+    BULLMQ_WORKER_CONCURRENCY: process.env.BULLMQ_WORKER_CONCURRENCY,
+    BULLMQ_WORKER_COUNT: process.env.BULLMQ_WORKER_COUNT,
+    BULLMQ_WORKER_ENABLED: process.env.BULLMQ_WORKER_ENABLED,
    E2E_TESTING: process.env.E2E_TESTING,
    EMAIL_AUTH_DISABLED: process.env.EMAIL_AUTH_DISABLED,
    EMAIL_VERIFICATION_DISABLED: process.env.EMAIL_VERIFICATION_DISABLED,
@@ -284,10 +334,10 @@ const parsedEnv = createEnv({
    GITHUB_SECRET: process.env.GITHUB_SECRET,
    GOOGLE_CLIENT_ID: process.env.GOOGLE_CLIENT_ID,
    GOOGLE_CLIENT_SECRET: process.env.GOOGLE_CLIENT_SECRET,
-    AI_GCP_PROJECT: process.env.AI_GCP_PROJECT,
-    AI_GCP_LOCATION: process.env.AI_GCP_LOCATION,
-    AI_GCP_CREDENTIALS_JSON: process.env.AI_GCP_CREDENTIALS_JSON,
-    AI_GCP_APPLICATION_CREDENTIALS: process.env.AI_GCP_APPLICATION_CREDENTIALS,
+    AI_GOOGLE_CLOUD_PROJECT: process.env.AI_GOOGLE_CLOUD_PROJECT,
+    AI_GOOGLE_CLOUD_LOCATION: process.env.AI_GOOGLE_CLOUD_LOCATION,
+    AI_GOOGLE_CLOUD_CREDENTIALS_JSON: process.env.AI_GOOGLE_CLOUD_CREDENTIALS_JSON,
+    AI_GOOGLE_CLOUD_APPLICATION_CREDENTIALS: process.env.AI_GOOGLE_CLOUD_APPLICATION_CREDENTIALS,
    GOOGLE_SHEETS_CLIENT_ID: process.env.GOOGLE_SHEETS_CLIENT_ID,
    GOOGLE_SHEETS_CLIENT_SECRET: process.env.GOOGLE_SHEETS_CLIENT_SECRET,
    GOOGLE_SHEETS_REDIRECT_URL: process.env.GOOGLE_SHEETS_REDIRECT_URL,
@@ -315,6 +365,9 @@ const parsedEnv = createEnv({
    MAIL_FROM_NAME: process.env.MAIL_FROM_NAME,
    NEXTAUTH_URL: process.env.NEXTAUTH_URL,
    NEXTAUTH_SECRET: process.env.NEXTAUTH_SECRET,
+    NEXT_PUBLIC_SURVEY_SCHEDULING_LOCAL_HOUR: process.env.NEXT_PUBLIC_SURVEY_SCHEDULING_LOCAL_HOUR,
+    NEXT_PUBLIC_SURVEY_SCHEDULING_LOCAL_MINUTE: process.env.NEXT_PUBLIC_SURVEY_SCHEDULING_LOCAL_MINUTE,
+    NEXT_PUBLIC_SURVEY_SCHEDULING_TIME_ZONE: process.env.NEXT_PUBLIC_SURVEY_SCHEDULING_TIME_ZONE,
    SENTRY_DSN: process.env.SENTRY_DSN,
    NOTION_OAUTH_CLIENT_ID: process.env.NOTION_OAUTH_CLIENT_ID,
    NOTION_OAUTH_CLIENT_SECRET: process.env.NOTION_OAUTH_CLIENT_SECRET,
@@ -213,6 +213,13 @@ export const appLanguages = [
      native: "Svenska",
    },
  },
+  {
+    code: "tr-TR",
+    label: {
+      "en-US": "Turkish",
+      native: "Türkçe",
+    },
+  },
  {
    code: "zh-Hans-CN",
    label: {
@@ -122,7 +122,7 @@ describe("Integration Service", () => {
      },
    ];

-    test("should get all integrations for an environment", async () => {
+    test("should get all integrations for a workspace", async () => {
      vi.mocked(prisma.integration.findMany).mockResolvedValue(mockIntegrations);

      const result = await getIntegrations(mockWorkspaceId);
@@ -0,0 +1,180 @@
+import { beforeEach, describe, expect, test, vi } from "vitest";
+
+const TEST_TIMEOUT_MS = 15_000;
+
+describe("jobs runtime config", () => {
+  beforeEach(() => {
+    vi.resetModules();
+  });
+
+  test(
+    "defaults to one worker with concurrency one outside tests",
+    async () => {
+      vi.doMock("@/lib/env", () => ({
+        env: {
+          BULLMQ_EXTERNAL_WORKER_ENABLED: undefined,
+          BULLMQ_WORKER_CONCURRENCY: undefined,
+          BULLMQ_WORKER_COUNT: undefined,
+          BULLMQ_WORKER_ENABLED: undefined,
+          NODE_ENV: "development",
+          REDIS_URL: "redis://localhost:6379",
+        },
+      }));
+
+      const { getJobsQueueingConfig, getJobsWorkerBootstrapConfig } = await import("./config");
+
+      expect(getJobsWorkerBootstrapConfig()).toEqual({
+        enabled: true,
+        runtimeOptions: {
+          concurrency: 1,
+          redisUrl: "redis://localhost:6379",
+          workerCount: 1,
+        },
+      });
+      expect(getJobsQueueingConfig()).toEqual({
+        enabled: true,
+        redisUrl: "redis://localhost:6379",
+      });
+    },
+    TEST_TIMEOUT_MS
+  );
+
+  test(
+    "disables the worker by default in tests",
+    async () => {
+      vi.doMock("@/lib/env", () => ({
+        env: {
+          BULLMQ_EXTERNAL_WORKER_ENABLED: undefined,
+          BULLMQ_WORKER_CONCURRENCY: undefined,
+          BULLMQ_WORKER_COUNT: undefined,
+          BULLMQ_WORKER_ENABLED: undefined,
+          NODE_ENV: "test",
+          REDIS_URL: undefined,
+        },
+      }));
+
+      const { getJobsQueueingConfig, getJobsWorkerBootstrapConfig } = await import("./config");
+
+      expect(getJobsWorkerBootstrapConfig()).toEqual({
+        enabled: false,
+        runtimeOptions: null,
+      });
+      expect(getJobsQueueingConfig()).toEqual({
+        enabled: false,
+        redisUrl: null,
+      });
+    },
+    TEST_TIMEOUT_MS
+  );
+
+  test(
+    "uses explicit worker tuning overrides",
+    async () => {
+      vi.doMock("@/lib/env", () => ({
+        env: {
+          BULLMQ_EXTERNAL_WORKER_ENABLED: undefined,
+          BULLMQ_WORKER_CONCURRENCY: 6,
+          BULLMQ_WORKER_COUNT: 3,
+          BULLMQ_WORKER_ENABLED: "1",
+          NODE_ENV: "production",
+          REDIS_URL: "redis://cache.internal:6379",
+        },
+      }));
+
+      const { getJobsQueueingConfig, getJobsWorkerBootstrapConfig } = await import("./config");
+
+      expect(getJobsWorkerBootstrapConfig()).toEqual({
+        enabled: true,
+        runtimeOptions: {
+          concurrency: 6,
+          redisUrl: "redis://cache.internal:6379",
+          workerCount: 3,
+        },
+      });
+      expect(getJobsQueueingConfig()).toEqual({
+        enabled: true,
+        redisUrl: "redis://cache.internal:6379",
+      });
+    },
+    TEST_TIMEOUT_MS
+  );
+
+  test(
+    "disables queueing when no BullMQ consumer is configured",
+    async () => {
+      vi.doMock("@/lib/env", () => ({
+        env: {
+          BULLMQ_EXTERNAL_WORKER_ENABLED: undefined,
+          BULLMQ_WORKER_CONCURRENCY: 6,
+          BULLMQ_WORKER_COUNT: 3,
+          BULLMQ_WORKER_ENABLED: "0",
+          NODE_ENV: "production",
+          REDIS_URL: "redis://cache.internal:6379",
+        },
+      }));
+
+      const { getJobsQueueingConfig, getJobsWorkerBootstrapConfig } = await import("./config");
+
+      expect(getJobsWorkerBootstrapConfig()).toEqual({
+        enabled: false,
+        runtimeOptions: null,
+      });
+      expect(getJobsQueueingConfig()).toEqual({
+        enabled: false,
+        redisUrl: null,
+      });
+    },
+    TEST_TIMEOUT_MS
+  );
+
+  test(
+    "keeps queueing enabled when an external BullMQ worker is configured",
+    async () => {
+      vi.doMock("@/lib/env", () => ({
+        env: {
+          BULLMQ_EXTERNAL_WORKER_ENABLED: "1",
+          BULLMQ_WORKER_CONCURRENCY: 6,
+          BULLMQ_WORKER_COUNT: 3,
+          BULLMQ_WORKER_ENABLED: "0",
+          NODE_ENV: "production",
+          REDIS_URL: "redis://cache.internal:6379",
+        },
+      }));
+
+      const { getJobsQueueingConfig, getJobsWorkerBootstrapConfig } = await import("./config");
+
+      expect(getJobsWorkerBootstrapConfig()).toEqual({
+        enabled: false,
+        runtimeOptions: null,
+      });
+      expect(getJobsQueueingConfig()).toEqual({
+        enabled: true,
+        redisUrl: "redis://cache.internal:6379",
+      });
+    },
+    TEST_TIMEOUT_MS
+  );
+
+  test(
+    "throws when the worker is enabled without a redis url",
+    async () => {
+      vi.doMock("@/lib/env", () => ({
+        env: {
+          BULLMQ_EXTERNAL_WORKER_ENABLED: undefined,
+          BULLMQ_WORKER_CONCURRENCY: 2,
+          BULLMQ_WORKER_COUNT: 1,
+          BULLMQ_WORKER_ENABLED: "1",
+          NODE_ENV: "production",
+          REDIS_URL: undefined,
+        },
+      }));
+
+      const { getJobsWorkerBootstrapConfig } = await import("./config");
+
+      expect(() => getJobsWorkerBootstrapConfig()).toThrow(
+        "REDIS_URL is required to start the BullMQ worker"
+      );
+    },
+    TEST_TIMEOUT_MS
+  );
+});
--- a/Show More
+++ b/Show More