From 0a39902b98afd17c5a26d73f2e1e00ace6fdfbc7 Mon Sep 17 00:00:00 2001
From: Dhruwang Jariwala <67850763+Dhruwang@users.noreply.github.com>
Date: Wed, 29 Jul 2026 14:43:01 +0530
Subject: [PATCH 1/5] feat: soft-delete (archive) surveys (ENG-1042) (#8609)

---
 .../integrations/lib/surveys.test.ts          |   1 +
 .../workspace/integrations/lib/surveys.ts     |   2 +
 .../[surveyId]/(analysis)/summary/actions.ts  |  16 ++
 .../summary/components/SurveyAnalysisCTA.tsx  |  27 +-
 .../components/SurveyStatusDropdown.tsx       |  32 ++-
 .../[workspaceId]/environment/lib/data.ts     |   4 +
 .../v3/surveys/[surveyId]/archive/route.ts    |  28 ++
 .../v3/surveys/[surveyId]/restore/route.ts    |  28 ++
 .../app/api/v3/surveys/lib/operations.test.ts | 162 +++++++++++-
 apps/web/app/api/v3/surveys/lib/operations.ts | 249 +++++++++++++-----
 .../parse-v3-surveys-list-query.test.ts       |  21 ++
 .../v3/surveys/parse-v3-surveys-list-query.ts |  12 +-
 apps/web/app/api/v3/surveys/serializers.ts    |   3 +
 apps/web/i18n.lock                            |  14 +
 apps/web/instrumentation-jobs.test.ts         |  38 +++
 apps/web/instrumentation-jobs.ts              |  39 +++
 apps/web/lib/survey/__mock__/survey.mock.ts   |   1 +
 apps/web/lib/survey/service.test.ts           |  36 +++
 apps/web/lib/survey/service.ts                |  17 ++
 apps/web/locales/de-DE.json                   |  14 +
 apps/web/locales/en-US.json                   |  14 +
 apps/web/locales/es-ES.json                   |  14 +
 apps/web/locales/fr-FR.json                   |  14 +
 apps/web/locales/hu-HU.json                   |  14 +
 apps/web/locales/ja-JP.json                   |  14 +
 apps/web/locales/nl-NL.json                   |  14 +
 apps/web/locales/pt-BR.json                   |  14 +
 apps/web/locales/pt-PT.json                   |  14 +
 apps/web/locales/ro-RO.json                   |  14 +
 apps/web/locales/ru-RU.json                   |  14 +
 apps/web/locales/sv-SE.json                   |  14 +
 apps/web/locales/tr-TR.json                   |  14 +
 apps/web/locales/zh-Hans-CN.json              |  14 +
 apps/web/locales/zh-Hant-TW.json              |  14 +
 .../modules/ee/audit-logs/types/audit-log.ts  |   2 +
 .../modules/ee/contacts/lib/surveys.test.ts   |   2 +-
 apps/web/modules/ee/contacts/lib/surveys.ts   |   2 +-
 .../modules/survey/archive/lib/constants.ts   |  12 +
 .../process-survey-archive-purge-job.test.ts  | 135 ++++++++++
 .../lib/process-survey-archive-purge-job.ts   | 152 +++++++++++
 apps/web/modules/survey/lib/surveys.test.ts   | 170 +++++++++++-
 apps/web/modules/survey/lib/surveys.ts        | 106 +++++++-
 apps/web/modules/survey/lib/utils.test.ts     |  27 +-
 apps/web/modules/survey/lib/utils.ts          |  72 +++--
 .../link/components/survey-renderer.tsx       |   4 +-
 apps/web/modules/survey/link/lib/data.ts      |   1 +
 .../survey/list/components/survey-card.tsx    |  52 +++-
 .../list/components/survey-dropdown-menu.tsx  | 113 +++++++-
 .../survey/list/components/survey-filters.tsx |  22 +-
 .../survey/list/components/survey-list.tsx    |  38 ++-
 .../list/hooks/use-archive-survey.test.ts     | 137 ++++++++++
 .../survey/list/hooks/use-archive-survey.ts   |  10 +
 .../list/hooks/use-delete-survey.test.ts      |   2 +
 .../survey/list/hooks/use-delete-survey.ts    |  36 +--
 .../list/hooks/use-restore-survey.test.ts     | 138 ++++++++++
 .../survey/list/hooks/use-restore-survey.ts   |  10 +
 .../list/hooks/use-survey-removal-mutation.ts |  44 ++++
 .../modules/survey/list/hooks/use-surveys.ts  |   2 +
 .../modules/survey/list/lib/survey-record.ts  |   1 +
 .../modules/survey/list/lib/survey.test.ts    |  38 +++
 apps/web/modules/survey/list/lib/survey.ts    |  20 ++
 apps/web/modules/survey/list/lib/utils.ts     |   2 +-
 .../survey/list/lib/v3-surveys-client.ts      |  50 +++-
 .../survey/list/types/survey-overview.ts      |   8 +-
 apps/web/modules/survey/list/types/surveys.ts |   1 +
 .../lib/process-survey-scheduling-job.test.ts |   2 +
 .../scheduling/lib/survey-scheduling.ts       |   3 +
 .../components/confirmation-modal/index.tsx   |   4 +-
 apps/web/playwright/survey-archive.spec.ts    | 149 +++++++++++
 docs/api-v3-reference/openapi.yml             | 216 ++++++++++++++-
 .../src/components/schemas/SurveyListItem.yml |   8 +
 .../src/components/schemas/SurveyResource.yml |   8 +
 docs/api-v3-reference/src/openapi.yml         |   4 +
 .../src/paths/api_v3_surveys.yml              |  15 ++
 .../src/paths/api_v3_surveys_{surveyId}.yml   |  37 ++-
 .../api_v3_surveys_{surveyId}_archive.yml     |  84 ++++++
 .../api_v3_surveys_{surveyId}_restore.yml     |  84 ++++++
 .../migration.sql                             |   5 +
 packages/database/schema.prisma               |   2 +
 packages/jobs/src/constants.ts                |   1 +
 packages/jobs/src/definitions.ts              |  13 +-
 packages/jobs/src/index.ts                    |   5 +
 .../src/processors/survey-archive-purge.ts    |  20 ++
 packages/jobs/src/queue.ts                    |  42 +++
 packages/jobs/src/types.ts                    |   6 +
 packages/types/surveys/types.ts               |  13 +
 86 files changed, 2886 insertions(+), 184 deletions(-)
 create mode 100644 apps/web/app/api/v3/surveys/[surveyId]/archive/route.ts
 create mode 100644 apps/web/app/api/v3/surveys/[surveyId]/restore/route.ts
 create mode 100644 apps/web/modules/survey/archive/lib/constants.ts
 create mode 100644 apps/web/modules/survey/archive/lib/process-survey-archive-purge-job.test.ts
 create mode 100644 apps/web/modules/survey/archive/lib/process-survey-archive-purge-job.ts
 create mode 100644 apps/web/modules/survey/list/hooks/use-archive-survey.test.ts
 create mode 100644 apps/web/modules/survey/list/hooks/use-archive-survey.ts
 create mode 100644 apps/web/modules/survey/list/hooks/use-restore-survey.test.ts
 create mode 100644 apps/web/modules/survey/list/hooks/use-restore-survey.ts
 create mode 100644 apps/web/modules/survey/list/hooks/use-survey-removal-mutation.ts
 create mode 100644 apps/web/playwright/survey-archive.spec.ts
 create mode 100644 docs/api-v3-reference/src/paths/api_v3_surveys_{surveyId}_archive.yml
 create mode 100644 docs/api-v3-reference/src/paths/api_v3_surveys_{surveyId}_restore.yml
 create mode 100644 packages/database/migration/20260722000000_add_survey_archived_at/migration.sql
 create mode 100644 packages/jobs/src/processors/survey-archive-purge.ts

diff --git a/apps/web/app/(app)/workspaces/[workspaceId]/settings/workspace/integrations/lib/surveys.test.ts b/apps/web/app/(app)/workspaces/[workspaceId]/settings/workspace/integrations/lib/surveys.test.ts
index 78b3885b63b0..2df66e79a124 100644
--- a/apps/web/app/(app)/workspaces/[workspaceId]/settings/workspace/integrations/lib/surveys.test.ts
+++ b/apps/web/app/(app)/workspaces/[workspaceId]/settings/workspace/integrations/lib/surveys.test.ts
@@ -109,6 +109,7 @@ describe("getSurveys", () => {
         status: {
           not: "completed",
         },
+        archivedAt: null,
       },
       select: selectSurvey,
       orderBy: {
diff --git a/apps/web/app/(app)/workspaces/[workspaceId]/settings/workspace/integrations/lib/surveys.ts b/apps/web/app/(app)/workspaces/[workspaceId]/settings/workspace/integrations/lib/surveys.ts
index 959e8913100d..f667daccc970 100644
--- a/apps/web/app/(app)/workspaces/[workspaceId]/settings/workspace/integrations/lib/surveys.ts
+++ b/apps/web/app/(app)/workspaces/[workspaceId]/settings/workspace/integrations/lib/surveys.ts
@@ -20,6 +20,8 @@ export const getSurveys = reactCache(async (workspaceId: string): Promise<TSurve
         status: {
           not: "completed",
         },
+        // Archived surveys must not be selectable as integration targets.
+        archivedAt: null,
       },
       select: selectSurvey,
       orderBy: {
diff --git a/apps/web/app/(app)/workspaces/[workspaceId]/surveys/[surveyId]/(analysis)/summary/actions.ts b/apps/web/app/(app)/workspaces/[workspaceId]/surveys/[surveyId]/(analysis)/summary/actions.ts
index c11ea6d204b3..fe3c31312ddf 100644
--- a/apps/web/app/(app)/workspaces/[workspaceId]/surveys/[surveyId]/(analysis)/summary/actions.ts
+++ b/apps/web/app/(app)/workspaces/[workspaceId]/surveys/[surveyId]/(analysis)/summary/actions.ts
@@ -105,6 +105,16 @@ export const resetSurveyAction = authenticatedActionClient.inputSchema(ZResetSur
     ctx.auditLoggingCtx.surveyId = parsedInput.surveyId;
     ctx.auditLoggingCtx.oldObject = null;
 
+    // Reset is hidden client-side while archived, but re-check server-side so a stale tab or a direct
+    // action call can't wipe the responses/displays the 30-day archive window exists to preserve.
+    const survey = await getSurvey(parsedInput.surveyId);
+    if (!survey) {
+      throw new ResourceNotFoundError("Survey", parsedInput.surveyId);
+    }
+    if (survey.archivedAt) {
+      throw new OperationNotAllowedError("Cannot reset an archived survey.");
+    }
+
     const { deletedResponsesCount, deletedDisplaysCount } = await deleteResponsesAndDisplaysForSurvey(
       parsedInput.surveyId
     );
@@ -169,6 +179,12 @@ export const generateExampleResponsesAction = authenticatedActionClient
       throw new ResourceNotFoundError("Survey", parsedInput.surveyId);
     }
 
+    // Same stale-tab defense as the responseCount check below: generating examples is hidden while
+    // archived, but a direct call would still write responses/displays/a tag into an archived survey.
+    if (survey.archivedAt) {
+      throw new OperationNotAllowedError("Cannot generate example responses for an archived survey.");
+    }
+
     const existingCount = await getResponseCountBySurveyId(parsedInput.surveyId);
     if (existingCount > 0) {
       throw new OperationNotAllowedError(
diff --git a/apps/web/app/(app)/workspaces/[workspaceId]/surveys/[surveyId]/(analysis)/summary/components/SurveyAnalysisCTA.tsx b/apps/web/app/(app)/workspaces/[workspaceId]/surveys/[surveyId]/(analysis)/summary/components/SurveyAnalysisCTA.tsx
index ed2384657b89..67cb506e0298 100644
--- a/apps/web/app/(app)/workspaces/[workspaceId]/surveys/[surveyId]/(analysis)/summary/components/SurveyAnalysisCTA.tsx
+++ b/apps/web/app/(app)/workspaces/[workspaceId]/surveys/[surveyId]/(analysis)/summary/components/SurveyAnalysisCTA.tsx
@@ -223,7 +223,7 @@ export const SurveyAnalysisCTA = ({
       icon: BellRing,
       tooltip: t("workspace.surveys.summary.configure_alerts"),
       onClick: () => router.push(`/account/settings/notifications`),
-      isVisible: !isReadOnly,
+      isVisible: !isReadOnly && !survey.archivedAt,
     },
     {
       icon: Eye,
@@ -232,20 +232,20 @@ export const SurveyAnalysisCTA = ({
         const previewUrl = await getPreviewUrl();
         window.open(previewUrl, "_blank");
       },
-      isVisible: survey.type === "link",
+      isVisible: survey.type === "link" && !survey.archivedAt,
     },
     {
       icon: Wand2,
       tooltip: exampleResponsesTooltip,
       onClick: handleGenerateExampleResponses,
       disabled: isGeneratingExamples || aiUnavailableReason !== null || responseCount > 0,
-      isVisible: !isReadOnly,
+      isVisible: !isReadOnly && !survey.archivedAt,
     },
     {
       icon: ListRestart,
       tooltip: t("workspace.surveys.summary.reset_survey"),
       onClick: () => setIsResetModalOpen(true),
-      isVisible: !isReadOnly,
+      isVisible: !isReadOnly && !survey.archivedAt,
     },
     {
       icon: SquarePenIcon,
@@ -255,7 +255,8 @@ export const SurveyAnalysisCTA = ({
           ? setIsCautionDialogOpen(true)
           : router.push(`/workspaces/${workspace?.id}/surveys/${survey.id}/edit`);
       },
-      isVisible: !isReadOnly,
+      // Archived surveys are read-only; editing is blocked server-side, so hide the entry point too.
+      isVisible: !isReadOnly && !survey.archivedAt,
     },
   ];
 
@@ -266,14 +267,16 @@ export const SurveyAnalysisCTA = ({
       )}
 
       <IconBar actions={iconActions} />
-      <Button
-        onClick={() => {
-          setModalState((prev) => ({ ...prev, share: true }));
-        }}>
-        {t("workspace.surveys.summary.share_survey")}
-      </Button>
+      {!survey.archivedAt && (
+        <Button
+          onClick={() => {
+            setModalState((prev) => ({ ...prev, share: true }));
+          }}>
+          {t("workspace.surveys.summary.share_survey")}
+        </Button>
+      )}
 
-      {user && (
+      {user && !survey.archivedAt && (
         <ShareSurveyModal
           survey={survey}
           publicDomain={publicDomain}
diff --git a/apps/web/app/(app)/workspaces/[workspaceId]/surveys/[surveyId]/components/SurveyStatusDropdown.tsx b/apps/web/app/(app)/workspaces/[workspaceId]/surveys/[surveyId]/components/SurveyStatusDropdown.tsx
index e6a76ed78fa8..2cd5a6c34fef 100644
--- a/apps/web/app/(app)/workspaces/[workspaceId]/surveys/[surveyId]/components/SurveyStatusDropdown.tsx
+++ b/apps/web/app/(app)/workspaces/[workspaceId]/surveys/[surveyId]/components/SurveyStatusDropdown.tsx
@@ -1,5 +1,6 @@
 "use client";
 
+import { ArchiveIcon } from "lucide-react";
 import { useRouter } from "next/navigation";
 import toast from "react-hot-toast";
 import { useTranslation } from "react-i18next";
@@ -46,11 +47,40 @@ export const SurveyStatusDropdown = () => {
     }
   };
 
+  // Archived surveys are read-only. Render the same status-select control (so it reads as a natural
+  // status) with "Archived" as the value, but disabled — the status can't change while archived.
+  if (survey.archivedAt) {
+    return (
+      <Select value="archived" disabled>
+        <SelectTrigger className="w-[170px] bg-white md:w-[200px]">
+          <SelectValue>
+            <div className="flex items-center">
+              <div className="rounded-full bg-slate-300 p-1">
+                <ArchiveIcon className="size-3 text-slate-600" />
+              </div>
+              <span className="ml-2 text-sm text-slate-700">{t("common.archived")}</span>
+            </div>
+          </SelectValue>
+        </SelectTrigger>
+        <SelectContent className="bg-white">
+          <SelectItem value="archived">
+            <div className="flex w-full items-center justify-center gap-2">
+              <div className="rounded-full bg-slate-300 p-1">
+                <ArchiveIcon className="size-3 text-slate-600" />
+              </div>
+              {t("common.archived")}
+            </div>
+          </SelectItem>
+        </SelectContent>
+      </Select>
+    );
+  }
+
   return (
     <>
       {survey.status === "draft" ? (
         <div className="flex items-center">
-          <p className="text-sm italic text-slate-600">{t("common.draft")}</p>
+          <p className="text-sm text-slate-600 italic">{t("common.draft")}</p>
         </div>
       ) : (
         <Select
diff --git a/apps/web/app/api/v1/client/[workspaceId]/environment/lib/data.ts b/apps/web/app/api/v1/client/[workspaceId]/environment/lib/data.ts
index dee463fd9fd3..0fbb557f7c99 100644
--- a/apps/web/app/api/v1/client/[workspaceId]/environment/lib/data.ts
+++ b/apps/web/app/api/v1/client/[workspaceId]/environment/lib/data.ts
@@ -107,6 +107,10 @@ export const getWorkspaceStateData = async (workspaceId: string): Promise<Worksp
           where: {
             type: "app",
             status: "inProgress",
+            // Never ship archived surveys to SDK clients (belt-and-suspenders: archiving forces a
+            // survey out of "inProgress", so this can't currently match, but keep it explicit so an
+            // archived app survey can never be synced or triggered by a code action).
+            archivedAt: null,
           },
           orderBy: {
             createdAt: "desc",
diff --git a/apps/web/app/api/v3/surveys/[surveyId]/archive/route.ts b/apps/web/app/api/v3/surveys/[surveyId]/archive/route.ts
new file mode 100644
index 000000000000..9937bda2a0f7
--- /dev/null
+++ b/apps/web/app/api/v3/surveys/[surveyId]/archive/route.ts
@@ -0,0 +1,28 @@
+import { z } from "zod";
+import { withV3ApiWrapper } from "@/app/api/v3/lib/api-wrapper";
+import { archiveV3Survey } from "../../lib/operations";
+import { ZV3EmptyQuery } from "../../schemas";
+
+const surveyParamsSchema = z.object({
+  surveyId: z.cuid2(),
+});
+
+export const POST = withV3ApiWrapper({
+  auth: "both",
+  action: "archived",
+  targetType: "survey",
+  schemas: {
+    params: surveyParamsSchema,
+    // Single-survey endpoints locate the survey by its globally-unique id; reject stray query params.
+    query: ZV3EmptyQuery,
+  },
+  handler: async ({ parsedInput, authentication, requestId, instance, auditLog }) => {
+    return await archiveV3Survey({
+      surveyId: parsedInput.params.surveyId,
+      authentication,
+      requestId,
+      instance,
+      auditLog,
+    });
+  },
+});
diff --git a/apps/web/app/api/v3/surveys/[surveyId]/restore/route.ts b/apps/web/app/api/v3/surveys/[surveyId]/restore/route.ts
new file mode 100644
index 000000000000..6e752f23345e
--- /dev/null
+++ b/apps/web/app/api/v3/surveys/[surveyId]/restore/route.ts
@@ -0,0 +1,28 @@
+import { z } from "zod";
+import { withV3ApiWrapper } from "@/app/api/v3/lib/api-wrapper";
+import { restoreV3Survey } from "../../lib/operations";
+import { ZV3EmptyQuery } from "../../schemas";
+
+const surveyParamsSchema = z.object({
+  surveyId: z.cuid2(),
+});
+
+export const POST = withV3ApiWrapper({
+  auth: "both",
+  action: "restored",
+  targetType: "survey",
+  schemas: {
+    params: surveyParamsSchema,
+    // Single-survey endpoints locate the survey by its globally-unique id; reject stray query params.
+    query: ZV3EmptyQuery,
+  },
+  handler: async ({ parsedInput, authentication, requestId, instance, auditLog }) => {
+    return await restoreV3Survey({
+      surveyId: parsedInput.params.surveyId,
+      authentication,
+      requestId,
+      instance,
+      auditLog,
+    });
+  },
+});
diff --git a/apps/web/app/api/v3/surveys/lib/operations.test.ts b/apps/web/app/api/v3/surveys/lib/operations.test.ts
index 3db2ce0d2412..c97d7209c547 100644
--- a/apps/web/app/api/v3/surveys/lib/operations.test.ts
+++ b/apps/web/app/api/v3/surveys/lib/operations.test.ts
@@ -1,10 +1,11 @@
 import { beforeEach, describe, expect, test, vi } from "vitest";
+import { prisma } from "@formbricks/database";
 import { DatabaseError, ResourceNotFoundError } from "@formbricks/types/errors";
 import { requireV3WorkspaceAccess } from "@/app/api/v3/lib/auth";
 import { problemForbidden } from "@/app/api/v3/lib/response";
 import { capturePostHogEvent } from "@/lib/posthog";
-import { deleteSurvey } from "@/modules/survey/lib/surveys";
-import { getSurveyCount } from "@/modules/survey/list/lib/survey";
+import { archiveSurvey, deleteSurvey, restoreSurvey } from "@/modules/survey/lib/surveys";
+import { getSurveyCount, hasArchivedSurveys } from "@/modules/survey/list/lib/survey";
 import { getSurveyListPage } from "@/modules/survey/list/lib/survey-page";
 import { getAuthorizedV3Survey } from "../authorization";
 import { V3SurveyCreatePermissionError, createV3Survey } from "../create";
@@ -21,12 +22,14 @@ import {
 } from "../serializers";
 import { V3SurveyWritePermissionError } from "../write-permissions";
 import {
+  archiveV3Survey,
   createV3SurveyResponse,
   createV3SurveyResponseFromRawInput,
   deleteV3Survey,
   getV3Survey,
   listV3Surveys,
   patchV3SurveyResponse,
+  restoreV3Survey,
   validateV3Survey,
   validateV3SurveyFromRawInput,
 } from "./operations";
@@ -48,12 +51,23 @@ vi.mock("@/lib/posthog", () => ({
   capturePostHogEvent: vi.fn(),
 }));
 
+vi.mock("@formbricks/database", () => ({
+  prisma: {
+    survey: {
+      findUnique: vi.fn(),
+    },
+  },
+}));
+
 vi.mock("@/modules/survey/lib/surveys", () => ({
   deleteSurvey: vi.fn(),
+  archiveSurvey: vi.fn(),
+  restoreSurvey: vi.fn(),
 }));
 
 vi.mock("@/modules/survey/list/lib/survey", () => ({
   getSurveyCount: vi.fn(),
+  hasArchivedSurveys: vi.fn(),
 }));
 
 vi.mock("@/modules/survey/list/lib/survey-page", () => ({
@@ -169,6 +183,7 @@ describe("listV3Surveys", () => {
     vi.mocked(requireV3WorkspaceAccess).mockResolvedValue(authResult);
     vi.mocked(getSurveyListPage).mockResolvedValue({ surveys: [survey], nextCursor: "cursor_next" } as any);
     vi.mocked(getSurveyCount).mockResolvedValue(7);
+    vi.mocked(hasArchivedSurveys).mockResolvedValue(false);
     vi.mocked(serializeV3SurveyListItem).mockReturnValue(serializedSurvey as any);
   });
 
@@ -196,11 +211,24 @@ describe("listV3Surveys", () => {
     });
     expect(await readJson(response)).toEqual({
       data: [serializedSurvey],
-      meta: { limit: 20, nextCursor: "cursor_next", totalCount: 7 },
+      meta: { limit: 20, nextCursor: "cursor_next", totalCount: 7, hasArchived: false },
     });
   });
 
-  test("skips total count when it is not requested", async () => {
+  test("reports hasArchived when the workspace has archived surveys", async () => {
+    vi.mocked(hasArchivedSurveys).mockResolvedValue(true);
+
+    const response = await listV3Surveys({
+      searchParams: new URLSearchParams({ workspaceId }),
+      authentication,
+      requestId,
+      instance,
+    });
+
+    expect((await readJson(response)).meta.hasArchived).toBe(true);
+  });
+
+  test("skips total count and hasArchived when they are not requested", async () => {
     mockListQuery({ includeTotalCount: false });
 
     const response = await listV3Surveys({
@@ -212,7 +240,10 @@ describe("listV3Surveys", () => {
 
     expect(response.status).toBe(200);
     expect(vi.mocked(getSurveyCount)).not.toHaveBeenCalled();
-    expect((await readJson(response)).meta.totalCount).toBeNull();
+    expect(vi.mocked(hasArchivedSurveys)).not.toHaveBeenCalled();
+    const body = await readJson(response);
+    expect(body.meta.totalCount).toBeNull();
+    expect(body.meta.hasArchived).toBeNull();
   });
 
   test("returns bad request for invalid query parameters", async () => {
@@ -608,6 +639,7 @@ describe("deleteV3Survey", () => {
 describe("patchV3SurveyResponse", () => {
   beforeEach(() => {
     vi.resetAllMocks();
+    // Not archived by default (survey fixture has no archivedAt) so the read-only guard lets patches through.
     vi.mocked(getAuthorizedV3Survey).mockResolvedValue({ survey, authResult, response: null } as any);
     vi.mocked(patchV3Survey).mockResolvedValue(updatedSurvey as any);
     vi.mocked(serializeV3SurveyResource).mockImplementation((input) => {
@@ -667,6 +699,26 @@ describe("patchV3SurveyResponse", () => {
     expect(vi.mocked(patchV3Survey)).not.toHaveBeenCalled();
   });
 
+  test("rejects patches to an archived survey with 422 and does not patch", async () => {
+    // archivedAt is read from the survey already loaded by getAuthorizedV3Survey — no extra query.
+    vi.mocked(getAuthorizedV3Survey).mockResolvedValue({
+      survey: { ...survey, archivedAt: new Date() },
+      authResult,
+      response: null,
+    } as any);
+
+    const response = await patchV3SurveyResponse({
+      surveyId: "survey_1",
+      body: { status: "inProgress" },
+      authentication,
+      requestId,
+      instance,
+    });
+
+    expect(response.status).toBe(422);
+    expect(vi.mocked(patchV3Survey)).not.toHaveBeenCalled();
+  });
+
   test("maps validation, shape, permission, missing resource, and database errors", async () => {
     vi.mocked(patchV3Survey).mockRejectedValueOnce(
       new V3SurveyReferenceValidationError([{ name: "blocks.0", reason: "Unknown element" }])
@@ -737,6 +789,106 @@ describe("patchV3SurveyResponse", () => {
   });
 });
 
+describe("archiveV3Survey", () => {
+  beforeEach(() => {
+    vi.resetAllMocks();
+    vi.mocked(getAuthorizedV3Survey).mockResolvedValue({ survey, authResult, response: null } as any);
+    vi.mocked(archiveSurvey).mockResolvedValue({
+      id: "survey_1",
+      status: "paused",
+      archivedAt: new Date(),
+    } as any);
+  });
+
+  test("archives an authorized survey and enriches the audit log", async () => {
+    const auditLog = {} as any;
+
+    const response = await archiveV3Survey({
+      surveyId: "survey_1",
+      authentication,
+      requestId,
+      instance,
+      auditLog,
+    });
+
+    expect(response.status).toBe(200);
+    expect(vi.mocked(getAuthorizedV3Survey)).toHaveBeenCalledWith({
+      surveyId: "survey_1",
+      authentication,
+      access: "readWrite",
+      requestId,
+      instance,
+    });
+    expect(vi.mocked(archiveSurvey)).toHaveBeenCalledWith("survey_1");
+    expect(auditLog).toMatchObject({ organizationId: "org_1", targetId: "survey_1", oldObject: survey });
+  });
+
+  test("returns authorization responses from survey access", async () => {
+    vi.mocked(getAuthorizedV3Survey).mockResolvedValue({
+      survey: null,
+      authResult: null,
+      response: problemForbidden(requestId, "nope", instance),
+    } as any);
+
+    const response = await archiveV3Survey({ surveyId: "survey_1", authentication, requestId, instance });
+
+    expect(response.status).toBe(403);
+    expect(vi.mocked(archiveSurvey)).not.toHaveBeenCalled();
+  });
+
+  test("maps missing resource and database failures", async () => {
+    vi.mocked(archiveSurvey).mockRejectedValueOnce(new ResourceNotFoundError("Survey", "survey_1"));
+    expect(
+      (await archiveV3Survey({ surveyId: "survey_1", authentication, requestId, instance })).status
+    ).toBe(403);
+
+    vi.mocked(archiveSurvey).mockRejectedValueOnce(new DatabaseError("db down"));
+    expect(
+      (await archiveV3Survey({ surveyId: "survey_1", authentication, requestId, instance })).status
+    ).toBe(500);
+  });
+});
+
+describe("restoreV3Survey", () => {
+  beforeEach(() => {
+    vi.resetAllMocks();
+    vi.mocked(getAuthorizedV3Survey).mockResolvedValue({ survey, authResult, response: null } as any);
+    vi.mocked(restoreSurvey).mockResolvedValue({
+      id: "survey_1",
+      status: "paused",
+      archivedAt: null,
+    } as any);
+  });
+
+  test("restores an authorized survey and enriches the audit log", async () => {
+    const auditLog = {} as any;
+
+    const response = await restoreV3Survey({
+      surveyId: "survey_1",
+      authentication,
+      requestId,
+      instance,
+      auditLog,
+    });
+
+    expect(response.status).toBe(200);
+    expect(vi.mocked(restoreSurvey)).toHaveBeenCalledWith("survey_1");
+    expect(auditLog).toMatchObject({ organizationId: "org_1", targetId: "survey_1", oldObject: survey });
+  });
+
+  test("maps missing resource and database failures", async () => {
+    vi.mocked(restoreSurvey).mockRejectedValueOnce(new ResourceNotFoundError("Survey", "survey_1"));
+    expect(
+      (await restoreV3Survey({ surveyId: "survey_1", authentication, requestId, instance })).status
+    ).toBe(403);
+
+    vi.mocked(restoreSurvey).mockRejectedValueOnce(new DatabaseError("db down"));
+    expect(
+      (await restoreV3Survey({ surveyId: "survey_1", authentication, requestId, instance })).status
+    ).toBe(500);
+  });
+});
+
 describe("validateV3Survey", () => {
   beforeEach(() => {
     vi.resetAllMocks();
diff --git a/apps/web/app/api/v3/surveys/lib/operations.ts b/apps/web/app/api/v3/surveys/lib/operations.ts
index 87e062525044..8b358bd6eaf9 100644
--- a/apps/web/app/api/v3/surveys/lib/operations.ts
+++ b/apps/web/app/api/v3/surveys/lib/operations.ts
@@ -16,8 +16,8 @@ import {
 import type { TV3AuditLog, TV3Authentication } from "@/app/api/v3/lib/types";
 import type { V3WorkspaceContext } from "@/app/api/v3/lib/workspace-context";
 import { capturePostHogEvent } from "@/lib/posthog";
-import { deleteSurvey } from "@/modules/survey/lib/surveys";
-import { getSurveyCount } from "@/modules/survey/list/lib/survey";
+import { archiveSurvey, deleteSurvey, restoreSurvey } from "@/modules/survey/lib/surveys";
+import { getSurveyCount, hasArchivedSurveys } from "@/modules/survey/list/lib/survey";
 import { getSurveyListPage } from "@/modules/survey/list/lib/survey-page";
 import { getAuthorizedV3Survey } from "../authorization";
 import { type TV3SurveyCreateOptions, V3SurveyCreatePermissionError, createV3Survey } from "../create";
@@ -75,7 +75,9 @@ type TGetV3SurveyParams = {
   instance: string;
 };
 
-type TDeleteV3SurveyParams = {
+// Shared shape for the single-survey mutation operations (delete, archive, restore): all locate the
+// survey by its globally-unique id and enforce readWrite access + audit.
+type TV3SurveyMutationParams = {
   surveyId: string;
   authentication: TV3Authentication;
   requestId: string;
@@ -175,10 +177,19 @@ export async function listV3Surveys({
       sortBy: parsed.sortBy,
       filterCriteria: parsed.filterCriteria,
     });
+    // totalCount and hasArchived are only computed on the first page (same gate),
+    // matching the client which reads them from pages[0].meta.
     const totalCountPromise = parsed.includeTotalCount
       ? getSurveyCount(workspaceId, parsed.filterCriteria)
       : Promise.resolve(null);
-    const [surveyPage, totalCount] = await Promise.all([surveyPagePromise, totalCountPromise]);
+    const hasArchivedPromise = parsed.includeTotalCount
+      ? hasArchivedSurveys(workspaceId)
+      : Promise.resolve(null);
+    const [surveyPage, totalCount, hasArchived] = await Promise.all([
+      surveyPagePromise,
+      totalCountPromise,
+      hasArchivedPromise,
+    ]);
 
     return successListResponse(
       surveyPage.surveys.map(serializeV3SurveyListItem),
@@ -186,6 +197,7 @@ export async function listV3Surveys({
         limit: parsed.limit,
         nextCursor: surveyPage.nextCursor,
         totalCount,
+        hasArchived,
       },
       { requestId, cache: "private, no-store" }
     );
@@ -426,13 +438,38 @@ export async function getV3Survey({
   }
 }
 
+// Shared catch-block mapper for the single-survey mutation ops (delete/archive/restore): they share
+// one error contract — not-found → 403, DatabaseError → 500, anything else → 500.
+function mapV3SurveyMutationError(
+  error: unknown,
+  {
+    log,
+    requestId,
+    instance,
+    operation,
+  }: { log: ReturnType<typeof logger.withContext>; requestId: string; instance: string; operation: string }
+): Response {
+  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 ${operation} unexpected error`);
+  return problemInternalError(requestId, "An unexpected error occurred.", instance);
+}
+
 export async function deleteV3Survey({
   surveyId,
   authentication,
   requestId,
   instance,
   auditLog,
-}: TDeleteV3SurveyParams): Promise<Response> {
+}: TV3SurveyMutationParams): Promise<Response> {
   const log = logger.withContext({ requestId, surveyId });
 
   try {
@@ -459,19 +496,135 @@ export async function deleteV3Survey({
 
     return noContentResponse({ 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);
+    return mapV3SurveyMutationError(error, { log, requestId, instance, operation: "delete" });
+  }
+}
+
+// archive and restore share the exact same flow (authorize readWrite → audit old → run the lifecycle
+// service → audit new → return a minimal lifecycle ack); only the service and log label differ.
+async function runV3SurveyLifecycleMutation(
+  { surveyId, authentication, requestId, instance, auditLog }: TV3SurveyMutationParams,
+  {
+    operation,
+    mutate,
+  }: {
+    operation: "archive" | "restore";
+    mutate: (id: string) => Promise<{ id: string; status: string; archivedAt: Date | null }>;
+  }
+): Promise<Response> {
+  const log = logger.withContext({ requestId, surveyId });
+
+  try {
+    const { survey, authResult, response } = await getAuthorizedV3Survey({
+      surveyId,
+      authentication,
+      access: "readWrite",
+      requestId,
+      instance,
+    });
+
+    if (response) {
+      log.warn({ statusCode: 403 }, "Survey not found or not accessible");
+      return response;
     }
 
-    if (error instanceof DatabaseError) {
-      log.error({ error, statusCode: 500 }, "Database error");
-      return problemInternalError(requestId, "An unexpected error occurred.", instance);
+    if (auditLog) {
+      auditLog.targetId = survey.id;
+      auditLog.organizationId = authResult.organizationId;
+      auditLog.oldObject = survey;
+    }
+
+    const mutatedSurvey = await mutate(surveyId);
+
+    if (auditLog) {
+      auditLog.newObject = mutatedSurvey;
     }
 
-    log.error({ error, statusCode: 500 }, "V3 survey delete unexpected error");
+    // Intentional lifecycle ack, not the full document resource: archive/restore operate on any
+    // survey (incl. legacy question-based ones that serializeV3SurveyResource rejects), so we return
+    // an explicit minimal shape rather than leaking the raw Prisma object or blocking those surveys.
+    const ack = {
+      id: mutatedSurvey.id,
+      status: mutatedSurvey.status,
+      archivedAt: mutatedSurvey.archivedAt,
+    };
+    return successResponse(ack, { requestId, cache: "private, no-store" });
+  } catch (error) {
+    return mapV3SurveyMutationError(error, { log, requestId, instance, operation });
+  }
+}
+
+export async function archiveV3Survey(params: TV3SurveyMutationParams): Promise<Response> {
+  return runV3SurveyLifecycleMutation(params, { operation: "archive", mutate: archiveSurvey });
+}
+
+export async function restoreV3Survey(params: TV3SurveyMutationParams): Promise<Response> {
+  return runV3SurveyLifecycleMutation(params, { operation: "restore", mutate: restoreSurvey });
+}
+
+/**
+ * Map an error thrown during survey patch to its problem+json Response. Extracted from
+ * patchV3SurveyResponse to keep that handler's cognitive complexity within bounds.
+ */
+function mapV3SurveyPatchError(
+  err: unknown,
+  {
+    log,
+    requestId,
+    instance,
+    workspaceId,
+  }: {
+    log: ReturnType<typeof logger.withContext>;
+    requestId: string;
+    instance: string;
+    workspaceId: string | undefined;
+  }
+): Response {
+  if (err instanceof V3SurveyReferenceValidationError) {
+    // Semantic/reference validation failure on a well-formed document → 422 (see create handler).
+    log.warn(
+      { statusCode: 422, workspaceId, invalidParamCount: err.invalidParams.length },
+      "Survey document validation failed"
+    );
+    return problemUnprocessableContent(requestId, "Survey document failed validation", {
+      invalid_params: err.invalidParams,
+      instance,
+    });
+  }
+
+  if (err instanceof V3SurveyUnsupportedShapeError) {
+    log.warn({ statusCode: 400, workspaceId, errorCode: err.name }, "Unsupported v3 survey shape");
+    return problemBadRequest(requestId, err.message, {
+      instance,
+      invalid_params: [{ name: "survey", reason: err.message }],
+    });
+  }
+
+  if (err instanceof V3SurveyWritePermissionError) {
+    log.warn({ statusCode: 403, workspaceId, errorCode: err.name }, "Survey patch permission check failed");
+    return problemForbidden(requestId, err.message, instance);
+  }
+
+  if (err instanceof ResourceNotFoundError) {
+    log.warn({ errorCode: err.name, workspaceId, statusCode: 403 }, "Survey not found or not accessible");
+    return problemForbidden(requestId, "You are not authorized to access this resource", instance);
+  }
+
+  if (err instanceof InvalidInputError) {
+    log.warn({ errorCode: err.name, workspaceId, statusCode: 400 }, "Invalid survey input");
+    return problemBadRequest(requestId, err.message, {
+      invalid_params: [{ name: "body", reason: err.message }],
+      instance,
+    });
+  }
+
+  if (err instanceof DatabaseError) {
+    log.error({ error: err, workspaceId, statusCode: 500 }, "Database error");
     return problemInternalError(requestId, "An unexpected error occurred.", instance);
   }
+
+  log.error({ error: err, workspaceId, statusCode: 500 }, "V3 survey patch unexpected error");
+  return problemInternalError(requestId, "An unexpected error occurred.", instance);
 }
 
 export async function patchV3SurveyResponse({
@@ -500,6 +653,24 @@ export async function patchV3SurveyResponse({
     }
 
     workspaceId = survey.workspaceId;
+
+    // Archived surveys are read-only. Editing (esp. flipping status back to inProgress) would let an
+    // archived survey collect responses while it is queued for permanent deletion. Require restore first.
+    // archivedAt is already loaded on `survey` (selectSurvey includes it), so no extra query — and reading
+    // it from the same fetch the auth check used avoids a restore-between-reads TOCTOU.
+    if (survey.archivedAt) {
+      log.warn({ statusCode: 422 }, "Attempted to patch an archived survey");
+      return problemUnprocessableContent(requestId, "Survey is archived", {
+        instance,
+        invalid_params: [
+          {
+            name: "archivedAt",
+            reason: "This survey is archived. Restore it before editing.",
+          },
+        ],
+      });
+    }
+
     const updatedSurvey = await patchV3Survey(survey, body, requestId, authResult.organizationId);
     const resource = serializeV3SurveyResource(updatedSurvey);
 
@@ -515,59 +686,7 @@ export async function patchV3SurveyResponse({
       cache: "private, no-store",
     });
   } catch (error) {
-    if (error instanceof V3SurveyReferenceValidationError) {
-      // Semantic/reference validation failure on a well-formed document → 422 (see create handler).
-      log.warn(
-        { statusCode: 422, workspaceId, invalidParamCount: error.invalidParams.length },
-        "Survey document validation failed"
-      );
-      return problemUnprocessableContent(requestId, "Survey document failed validation", {
-        invalid_params: error.invalidParams,
-        instance,
-      });
-    }
-
-    if (error instanceof V3SurveyUnsupportedShapeError) {
-      log.warn({ statusCode: 400, workspaceId, errorCode: error.name }, "Unsupported v3 survey shape");
-      return problemBadRequest(requestId, error.message, {
-        instance,
-        invalid_params: [
-          {
-            name: "survey",
-            reason: error.message,
-          },
-        ],
-      });
-    }
-
-    if (error instanceof V3SurveyWritePermissionError) {
-      log.warn(
-        { statusCode: 403, workspaceId, errorCode: error.name },
-        "Survey patch permission check failed"
-      );
-      return problemForbidden(requestId, error.message, instance);
-    }
-
-    if (error instanceof ResourceNotFoundError) {
-      log.warn({ errorCode: error.name, workspaceId, statusCode: 403 }, "Survey not found or not accessible");
-      return problemForbidden(requestId, "You are not authorized to access this resource", instance);
-    }
-
-    if (error instanceof InvalidInputError) {
-      log.warn({ errorCode: error.name, workspaceId, statusCode: 400 }, "Invalid survey input");
-      return problemBadRequest(requestId, error.message, {
-        invalid_params: [{ name: "body", reason: error.message }],
-        instance,
-      });
-    }
-
-    if (error instanceof DatabaseError) {
-      log.error({ error, workspaceId, statusCode: 500 }, "Database error");
-      return problemInternalError(requestId, "An unexpected error occurred.", instance);
-    }
-
-    log.error({ error, workspaceId, statusCode: 500 }, "V3 survey patch unexpected error");
-    return problemInternalError(requestId, "An unexpected error occurred.", instance);
+    return mapV3SurveyPatchError(error, { log, requestId, instance, workspaceId });
   }
 }
 
diff --git a/apps/web/app/api/v3/surveys/parse-v3-surveys-list-query.test.ts b/apps/web/app/api/v3/surveys/parse-v3-surveys-list-query.test.ts
index 31a5a802c4d9..d4ecab40bf33 100644
--- a/apps/web/app/api/v3/surveys/parse-v3-surveys-list-query.test.ts
+++ b/apps/web/app/api/v3/surveys/parse-v3-surveys-list-query.test.ts
@@ -104,6 +104,27 @@ describe("parseV3SurveysListQuery", () => {
     expect(r.ok).toBe(false);
   });
 
+  test("maps the 'archived' pseudo-status to includeArchived and keeps real statuses", () => {
+    const r = parseV3SurveysListQuery(
+      params(`workspaceId=${wid}&filter[status][in]=inProgress&filter[status][in]=archived`)
+    );
+    expect(r.ok).toBe(true);
+    if (r.ok) {
+      expect(r.filterCriteria).toEqual({
+        status: ["inProgress"],
+        includeArchived: true,
+      });
+    }
+  });
+
+  test("maps a lone 'archived' status to includeArchived without a status filter", () => {
+    const r = parseV3SurveysListQuery(params(`workspaceId=${wid}&filter[status][in]=archived`));
+    expect(r.ok).toBe(true);
+    if (r.ok) {
+      expect(r.filterCriteria).toEqual({ includeArchived: true });
+    }
+  });
+
   test("rejects the createdBy filter", () => {
     const r = parseV3SurveysListQuery(params(`workspaceId=${wid}&filter[createdBy][in]=you`));
     expect(r.ok).toBe(false);
diff --git a/apps/web/app/api/v3/surveys/parse-v3-surveys-list-query.ts b/apps/web/app/api/v3/surveys/parse-v3-surveys-list-query.ts
index f26813a0f7a2..c1d54083528b 100644
--- a/apps/web/app/api/v3/surveys/parse-v3-surveys-list-query.ts
+++ b/apps/web/app/api/v3/surveys/parse-v3-surveys-list-query.ts
@@ -64,7 +64,9 @@ const ZV3SurveysListQuery = z.object({
     .max(512)
     .optional()
     .transform((s) => (s === undefined || s.trim() === "" ? undefined : s.trim())),
-  [FILTER_STATUS_IN_QUERY_PARAM]: z.array(ZSurveyStatus).optional(),
+  // "archived" is a pseudo-status accepted only by the list filter; it is translated
+  // into an archivedAt filter (see buildFilterCriteria) rather than a real status match.
+  [FILTER_STATUS_IN_QUERY_PARAM]: z.array(z.union([ZSurveyStatus, z.literal("archived")])).optional(),
   [FILTER_TYPE_IN_QUERY_PARAM]: z.array(ZSurveyType).optional(),
   sortBy: ZSurveyFilters.shape.sortBy.optional(),
 });
@@ -97,7 +99,13 @@ function getUnsupportedQueryParams(searchParams: URLSearchParams): InvalidParam[
 function buildFilterCriteria(q: TV3SurveysListQuery): TSurveyFilterCriteria | undefined {
   const f: TSurveyFilterCriteria = {};
   if (q[FILTER_NAME_CONTAINS_QUERY_PARAM]) f.name = q[FILTER_NAME_CONTAINS_QUERY_PARAM];
-  if (q[FILTER_STATUS_IN_QUERY_PARAM]?.length) f.status = q[FILTER_STATUS_IN_QUERY_PARAM];
+  const statusValues = q[FILTER_STATUS_IN_QUERY_PARAM] ?? [];
+  // Split the "archived" pseudo-status out from real statuses.
+  const realStatuses = statusValues.filter(
+    (status): status is z.infer<typeof ZSurveyStatus> => status !== "archived"
+  );
+  if (realStatuses.length) f.status = realStatuses;
+  if (statusValues.includes("archived")) f.includeArchived = true;
   if (q[FILTER_TYPE_IN_QUERY_PARAM]?.length) f.type = q[FILTER_TYPE_IN_QUERY_PARAM];
   return Object.keys(f).length > 0 ? f : undefined;
 }
diff --git a/apps/web/app/api/v3/surveys/serializers.ts b/apps/web/app/api/v3/surveys/serializers.ts
index aa2bf38e13f9..718a877fab12 100644
--- a/apps/web/app/api/v3/surveys/serializers.ts
+++ b/apps/web/app/api/v3/surveys/serializers.ts
@@ -22,6 +22,7 @@ type TV3SurveyListItemBase = Pick<
   | "type"
   | "status"
   | "publishOn"
+  | "archivedAt"
   | "createdAt"
   | "updatedAt"
   | "responseCount"
@@ -80,6 +81,7 @@ export function serializeV3SurveyListItem(survey: TSurveyListRecord): TV3SurveyL
     type: survey.type,
     status: survey.status,
     publishOn: survey.publishOn,
+    archivedAt: survey.archivedAt,
     createdAt: survey.createdAt,
     updatedAt: survey.updatedAt,
     responseCount: survey.responseCount,
@@ -222,6 +224,7 @@ export function serializeV3SurveyResource(survey: TInternalSurvey, options?: { l
     name: survey.name,
     type: survey.type,
     status: survey.status,
+    archivedAt: survey.archivedAt ? toIsoString(survey.archivedAt) : null,
     metadata: serializeMetadata(survey.metadata, defaultLanguage, languageCodes, {
       fallbackMissingTranslations: requestedLanguages.length > 0,
     }),
diff --git a/apps/web/i18n.lock b/apps/web/i18n.lock
index 0e15bb4fccf5..3bb65c859b46 100644
--- a/apps/web/i18n.lock
+++ b/apps/web/i18n.lock
@@ -151,6 +151,7 @@ checksums:
     common/app_survey: f076d131d20bfdadb35fba29c8275232
     common/appearance: cdd8c41c5fb859234e8a603544fce631
     common/apply_filters: 6543c1e80038b3da0f4a42848d08d4d1
+    common/archive: fa813ab3074103e5daad07462af25789
     common/archived: cf5127ecfd7e43a35466a1ba5fe16450
     common/are_you_sure: 6d5cd13628a7887711fd0c29f1123652
     common/attributes: 86d0ae6fea0fbb119722ed3841f8385a
@@ -2805,6 +2806,12 @@ checksums:
     workspace/surveys/ai_create/upgrade_plan: 81c9e7a593c0e9290f7078ecdc1c6693
     workspace/surveys/all_set_time_to_create_first_survey: 21d3bb74c3b9642b3195d17c17346399
     workspace/surveys/alphabetical: 5fcfeff9c5fd28714f0a390e0ddaaaee
+    workspace/surveys/archive: fa813ab3074103e5daad07462af25789
+    workspace/surveys/archive_survey: 542995a5dbb4ed59ec8bcc7b994d509e
+    workspace/surveys/archive_survey_description: 0870b4f36ef10db406aea2dcf871ca57
+    workspace/surveys/archive_survey_description_in_progress: 54b4b46d90b74fe486395e43c520aad9
+    workspace/surveys/archive_survey_warning: 02f30c8901f34d627bdab15e0f68e71a
+    workspace/surveys/archiving_survey: 08e4cc73698d79dc98c70df6849c7790
     workspace/surveys/change_status: abe7acd9be0d3e77c087a5459ef41059
     workspace/surveys/copy_survey: de8142b45e7bca61f2dca0069a62b417
     workspace/surveys/copy_survey_description: 5d86af9371f45852b4d1afea4978166e
@@ -3393,7 +3400,9 @@ checksums:
     workspace/surveys/edit/your_question_here_recall_information_with: 6395bd54f5167830c9d662ba403da167
     workspace/surveys/edit/your_web_app: 07234bed03a33330dc50ae9fcf0174f3
     workspace/surveys/edit/zip: 228fedb7d75304d2a3fcd9f1d1aaccee
+    workspace/surveys/error_archiving_survey: c73e729832407531134213ce2aa69a4d
     workspace/surveys/error_deleting_survey: 5a113f1cc0a430b54b21dd1fd4e65e00
+    workspace/surveys/error_restoring_survey: a070c5b584187d4f1308943d6b378bea
     workspace/surveys/error_updating_status: f163ee51d64903a0c994d39008bf7fe4
     workspace/surveys/featured_templates/churn_description: 095b315526140f3633b3da354b766ed4
     workspace/surveys/featured_templates/churn_title: 5ecbb56a7bc54e945fff08fed017a545
@@ -3449,6 +3458,8 @@ checksums:
     workspace/surveys/responses/tag_already_exists: 1337fd5cdd04311bfdca4e7538f0a4f3
     workspace/surveys/responses/this_response_is_in_progress: 7d785fcb597ea30466467084fd474904
     workspace/surveys/responses/zip_post_code: ab7dc45bd5f9e37930586e2db17e4304
+    workspace/surveys/restore: 91b4fad20d5f2d8e17cb62999942d2b7
+    workspace/surveys/restoring_survey: ec4d4c666e0addf0b710c01034c509dc
     workspace/surveys/search_by_survey_name: 44cf2e6f8ba43d233fb33939431eba99
     workspace/surveys/share/anonymous_links/custom_single_use_id_description: 994c76257cc373388a3870caf9d85dc7
     workspace/surveys/share/anonymous_links/custom_single_use_id_placeholder: e089b0f1838164b2ef2f74076477d8f2
@@ -3560,6 +3571,7 @@ checksums:
     workspace/surveys/share/social_media/title: 1bf4899b063ee8f02f7188576555828b
     workspace/surveys/status_updated_successfully: 214b25be2e5757f523d4cc008cacb3d0
     workspace/surveys/status_updating: 9e0a30920d1dba5593619393216e6fa5
+    workspace/surveys/stop_and_archive: 8d586bc9e955e171e0a38f420efd90c3
     workspace/surveys/summary/added_filter_for_responses_where_answer_to_question: ca743504c3f34b4e5fa98e3e79100624
     workspace/surveys/summary/added_filter_for_responses_where_answer_to_question_is_skipped: 74ca713c491cfc33751a5db3de972821
     workspace/surveys/summary/aggregated: 9d4e77225d5952abed414fffd828c078
@@ -3675,8 +3687,10 @@ checksums:
     workspace/surveys/summary/whats_next: 8c84e29aef3a99e374473db999c4dbdd
     workspace/surveys/summary/your_survey_is_public: c66482e2ddcf58ca4937e0123f838706
     workspace/surveys/summary/youre_not_plugged_in_yet: f19da3cd474b9a3cf28e956fd811fb00
+    workspace/surveys/survey_archived_successfully: de6e34f200a13cf43a7ca684f57d5fec
     workspace/surveys/survey_deleted_successfully: a6b654cc914b344a4475fd2fd4a98cc5
     workspace/surveys/survey_duplicated_successfully: 91e244f1e7a33640bb4817166a01ff46
+    workspace/surveys/survey_restored_successfully: 2033ab806864f98fabb5d4ed3c945626
     workspace/surveys/templates/all_channels: 6be67a82fc7326dc2304b23ab3348b87
     workspace/surveys/templates/all_industries: c7354412fe34585526ff2232aadace41
     workspace/surveys/templates/all_roles: 6582ccd0a2349c162a7ae1574cdf76be
diff --git a/apps/web/instrumentation-jobs.test.ts b/apps/web/instrumentation-jobs.test.ts
index 6dca0166528d..1bfb1a11cb36 100644
--- a/apps/web/instrumentation-jobs.test.ts
+++ b/apps/web/instrumentation-jobs.test.ts
@@ -3,6 +3,8 @@ import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
 const mockStartJobsRuntime = vi.fn();
 const mockRemoveRecurringSurveySchedulingJobSchedule = vi.fn();
 const mockUpsertRecurringSurveySchedulingJobSchedule = vi.fn();
+const mockRemoveRecurringSurveyArchivePurgeJobSchedule = vi.fn();
+const mockUpsertRecurringSurveyArchivePurgeJobSchedule = vi.fn();
 const mockDebug = vi.fn();
 const mockError = vi.fn();
 const mockWarn = vi.fn();
@@ -10,6 +12,7 @@ const mockGetJobsQueueingConfig = vi.fn();
 const mockGetJobsWorkerBootstrapConfig = vi.fn();
 const mockProcessResponsePipelineJob = vi.fn();
 const mockProcessSurveySchedulingJob = vi.fn();
+const mockProcessSurveyArchivePurgeJob = vi.fn();
 const TEST_TIMEOUT_MS = 15_000;
 
 const slowTest = (name: string, fn: () => Promise<void>): void => {
@@ -18,8 +21,10 @@ const slowTest = (name: string, fn: () => Promise<void>): void => {
 
 vi.mock("@formbricks/jobs", () => ({
   removeRecurringSurveySchedulingJobSchedule: mockRemoveRecurringSurveySchedulingJobSchedule,
+  removeRecurringSurveyArchivePurgeJobSchedule: mockRemoveRecurringSurveyArchivePurgeJobSchedule,
   startJobsRuntime: mockStartJobsRuntime,
   upsertRecurringSurveySchedulingJobSchedule: mockUpsertRecurringSurveySchedulingJobSchedule,
+  upsertRecurringSurveyArchivePurgeJobSchedule: mockUpsertRecurringSurveyArchivePurgeJobSchedule,
 }));
 
 vi.mock("@/lib/jobs/config", () => ({
@@ -44,12 +49,22 @@ vi.mock("@/modules/survey/scheduling/lib/process-survey-scheduling-job", () => (
   processSurveySchedulingJob: mockProcessSurveySchedulingJob,
 }));
 
+vi.mock("@/modules/survey/archive/lib/process-survey-archive-purge-job", () => ({
+  processSurveyArchivePurgeJob: mockProcessSurveyArchivePurgeJob,
+}));
+
 describe("instrumentation-jobs", () => {
   beforeEach(() => {
     vi.resetModules();
     vi.clearAllMocks();
     vi.useFakeTimers();
     mockRemoveRecurringSurveySchedulingJobSchedule.mockResolvedValue(true);
+    mockRemoveRecurringSurveyArchivePurgeJobSchedule.mockResolvedValue(true);
+    mockUpsertRecurringSurveyArchivePurgeJobSchedule.mockResolvedValue({
+      id: "archive-purge-schedule-1",
+      name: "survey-archive-purge.process",
+      queueName: "background-jobs",
+    });
     mockGetJobsQueueingConfig.mockReturnValue({
       enabled: false,
       redisUrl: null,
@@ -108,6 +123,7 @@ describe("instrumentation-jobs", () => {
       jobHandlerOverrides: {
         "response-pipeline.process": expect.any(Function),
         "survey-scheduling.reconcile": expect.any(Function),
+        "survey-archive-purge.process": expect.any(Function),
         "test-log.process": mockExistingOverride,
       },
       redisUrl: "redis://localhost:6379",
@@ -276,6 +292,8 @@ describe("instrumentation-jobs", () => {
       const { registerRecurringJobs } = await import("./instrumentation-jobs");
       const { SURVEY_SCHEDULING_DAILY_CRON_PATTERN, SURVEY_SCHEDULING_TIME_ZONE } =
         await import("@/modules/survey/scheduling/lib/constants");
+      const { SURVEY_ARCHIVE_PURGE_DAILY_CRON_PATTERN, SURVEY_ARCHIVE_PURGE_TIME_ZONE } =
+        await import("@/modules/survey/archive/lib/constants");
 
       await registerRecurringJobs();
       await registerRecurringJobs();
@@ -301,6 +319,26 @@ describe("instrumentation-jobs", () => {
           scope: "global",
         }
       );
+      expect(mockRemoveRecurringSurveyArchivePurgeJobSchedule).toHaveBeenCalledTimes(1);
+      expect(mockRemoveRecurringSurveyArchivePurgeJobSchedule).toHaveBeenCalledWith({
+        scheduleId: "daily-survey-archive-purge",
+        scope: "global",
+      });
+      expect(mockUpsertRecurringSurveyArchivePurgeJobSchedule).toHaveBeenCalledTimes(1);
+      expect(mockUpsertRecurringSurveyArchivePurgeJobSchedule).toHaveBeenCalledWith(
+        {
+          scheduleId: "daily-survey-archive-purge",
+          scope: "global",
+        },
+        {
+          cronPattern: SURVEY_ARCHIVE_PURGE_DAILY_CRON_PATTERN,
+          kind: "cron",
+          timeZone: SURVEY_ARCHIVE_PURGE_TIME_ZONE,
+        },
+        {
+          scope: "global",
+        }
+      );
     }
   );
 
diff --git a/apps/web/instrumentation-jobs.ts b/apps/web/instrumentation-jobs.ts
index 1afdace9abb1..82a0b77a1584 100644
--- a/apps/web/instrumentation-jobs.ts
+++ b/apps/web/instrumentation-jobs.ts
@@ -2,14 +2,24 @@ import {
   type JobHandlerOverrides,
   type JobsRuntimeHandle,
   type TResponsePipelineJobData,
+  type TSurveyArchivePurgeJobData,
   type TSurveySchedulingJobData,
+  removeRecurringSurveyArchivePurgeJobSchedule,
   removeRecurringSurveySchedulingJobSchedule,
   startJobsRuntime,
+  upsertRecurringSurveyArchivePurgeJobSchedule,
   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_ARCHIVE_PURGE_DAILY_CRON_PATTERN,
+  SURVEY_ARCHIVE_PURGE_DAILY_SCHEDULE_ID,
+  SURVEY_ARCHIVE_PURGE_GLOBAL_SCOPE,
+  SURVEY_ARCHIVE_PURGE_TIME_ZONE,
+} from "@/modules/survey/archive/lib/constants";
+import { processSurveyArchivePurgeJob } from "@/modules/survey/archive/lib/process-survey-archive-purge-job";
 import {
   SURVEY_SCHEDULING_DAILY_CRON_PATTERN,
   SURVEY_SCHEDULING_DAILY_SCHEDULE_ID,
@@ -32,6 +42,7 @@ type TJobsRuntimeGlobal = typeof globalThis & {
 const globalForJobsRuntime = globalThis as TJobsRuntimeGlobal;
 const RESPONSE_PIPELINE_JOB_NAME = "response-pipeline.process";
 const SURVEY_SCHEDULING_JOB_NAME = "survey-scheduling.reconcile";
+const SURVEY_ARCHIVE_PURGE_JOB_NAME = "survey-archive-purge.process";
 
 const responsePipelineJobHandler: NonNullable<JobHandlerOverrides[string]> = async (data, context) => {
   await processResponsePipelineJob(data as TResponsePipelineJobData, context);
@@ -39,6 +50,9 @@ const responsePipelineJobHandler: NonNullable<JobHandlerOverrides[string]> = asy
 const surveySchedulingJobHandler: NonNullable<JobHandlerOverrides[string]> = async (data, context) => {
   await processSurveySchedulingJob(data as TSurveySchedulingJobData, context);
 };
+const surveyArchivePurgeJobHandler: NonNullable<JobHandlerOverrides[string]> = async (data, context) => {
+  await processSurveyArchivePurgeJob(data as TSurveyArchivePurgeJobData, context);
+};
 
 const registerSurveySchedulingSchedule = async (): Promise<void> => {
   await removeRecurringSurveySchedulingJobSchedule({
@@ -62,6 +76,28 @@ const registerSurveySchedulingSchedule = async (): Promise<void> => {
   );
 };
 
+const registerSurveyArchivePurgeSchedule = async (): Promise<void> => {
+  await removeRecurringSurveyArchivePurgeJobSchedule({
+    scheduleId: SURVEY_ARCHIVE_PURGE_DAILY_SCHEDULE_ID,
+    scope: SURVEY_ARCHIVE_PURGE_GLOBAL_SCOPE,
+  });
+
+  await upsertRecurringSurveyArchivePurgeJobSchedule(
+    {
+      scheduleId: SURVEY_ARCHIVE_PURGE_DAILY_SCHEDULE_ID,
+      scope: SURVEY_ARCHIVE_PURGE_GLOBAL_SCOPE,
+    },
+    {
+      cronPattern: SURVEY_ARCHIVE_PURGE_DAILY_CRON_PATTERN,
+      kind: "cron",
+      timeZone: SURVEY_ARCHIVE_PURGE_TIME_ZONE,
+    },
+    {
+      scope: SURVEY_ARCHIVE_PURGE_GLOBAL_SCOPE,
+    }
+  );
+};
+
 const clearRecurringJobsRetryTimeout = (): void => {
   if (globalForJobsRuntime.formbricksJobsRecurringRetryTimeout) {
     clearTimeout(globalForJobsRuntime.formbricksJobsRecurringRetryTimeout);
@@ -132,6 +168,7 @@ export const registerRecurringJobs = async (): Promise<void> => {
 
   globalForJobsRuntime.formbricksJobsRecurringRegistration = (async () => {
     await registerSurveySchedulingSchedule();
+    await registerSurveyArchivePurgeSchedule();
     clearRecurringJobsRetryTimeout();
     globalForJobsRuntime.formbricksJobsRecurringRegistered = true;
     globalForJobsRuntime.formbricksJobsRecurringRegistration = undefined;
@@ -170,10 +207,12 @@ export const registerJobsWorker = async (): Promise<JobsRuntimeHandle | null> =>
         ...runtimeOptions.jobHandlerOverrides,
         [RESPONSE_PIPELINE_JOB_NAME]: responsePipelineJobHandler,
         [SURVEY_SCHEDULING_JOB_NAME]: surveySchedulingJobHandler,
+        [SURVEY_ARCHIVE_PURGE_JOB_NAME]: surveyArchivePurgeJobHandler,
       }
     : {
         [RESPONSE_PIPELINE_JOB_NAME]: responsePipelineJobHandler,
         [SURVEY_SCHEDULING_JOB_NAME]: surveySchedulingJobHandler,
+        [SURVEY_ARCHIVE_PURGE_JOB_NAME]: surveyArchivePurgeJobHandler,
       };
 
   globalForJobsRuntime.formbricksJobsRuntimeInitializing = (async () => {
diff --git a/apps/web/lib/survey/__mock__/survey.mock.ts b/apps/web/lib/survey/__mock__/survey.mock.ts
index d4ba032c2668..2762ed07c4e1 100644
--- a/apps/web/lib/survey/__mock__/survey.mock.ts
+++ b/apps/web/lib/survey/__mock__/survey.mock.ts
@@ -196,6 +196,7 @@ const baseSurveyProperties = {
   autoComplete: 7,
   publishOn: null,
   closeOn: null,
+  archivedAt: null,
   redirectUrl: "https://github.com/formbricks/formbricks",
   recontactDays: 3,
   displayLimit: 3,
diff --git a/apps/web/lib/survey/service.test.ts b/apps/web/lib/survey/service.test.ts
index e507e6249592..383e5cd3eb50 100644
--- a/apps/web/lib/survey/service.test.ts
+++ b/apps/web/lib/survey/service.test.ts
@@ -512,6 +512,16 @@ describe("Tests for updateSurvey", () => {
 
       expect(prisma.segment.update).not.toHaveBeenCalled();
     });
+
+    // Archived surveys are read-only on every write path that flows through updateSurveyInternal
+    // (editor save, summary status dropdown, v1/v3 update) — not just the v3 API layer.
+    test("rejects updating an archived survey and does not write", async () => {
+      prisma.survey.findUnique.mockResolvedValueOnce({ ...mockSurveyOutput, archivedAt: new Date() } as any);
+
+      await expect(updateSurveyInternal({ ...updateSurveyInput }, true)).rejects.toThrow(InvalidInputError);
+
+      expect(prisma.survey.update).not.toHaveBeenCalled();
+    });
   });
 });
 
@@ -527,6 +537,14 @@ describe("Tests for getSurveyCount service", () => {
       const count = await getSurveyCount(mockId);
       expect(count).toEqual(0);
     });
+
+    test("Counts archived surveys too so the onboarding gate stays satisfied", async () => {
+      await getSurveyCount(mockId);
+      // The onboarding count must be archive-inclusive: no archivedAt filter in the where clause.
+      expect(prisma.survey.count).toHaveBeenCalledWith({
+        where: { workspaceId: mockId },
+      });
+    });
   });
 
   describe("Sad Path", () => {
@@ -817,6 +835,24 @@ describe("Tests for createSurvey", () => {
       expect(subscribeOrganizationMembersToSurveyResponses).toHaveBeenCalled();
     });
 
+    test("strips archivedAt from a create payload so a caller can't create a pre-archived survey", async () => {
+      vi.mocked(getOrganizationByWorkspaceId).mockResolvedValueOnce(mockOrganizationOutput);
+      prisma.survey.create.mockResolvedValueOnce({
+        ...mockSurveyOutput,
+      });
+
+      await createSurvey(mockWorkspaceId, {
+        ...mockCreateSurveyInput,
+        // archivedAt is not part of the create schema; a supplied value must never reach the DB,
+        // otherwise the purge cron would hard-delete the survey with no archive audit or retention window.
+        archivedAt: new Date("2020-01-01T00:00:00Z"),
+      } as typeof mockCreateSurveyInput);
+
+      expect(prisma.survey.create).toHaveBeenCalledTimes(1);
+      const createArg = prisma.survey.create.mock.calls[0][0] as { data: Record<string, unknown> };
+      expect(createArg.data).not.toHaveProperty("archivedAt");
+    });
+
     test("throws InvalidInputError when creating a non-draft app survey with no triggers", async () => {
       await expect(
         createSurvey(mockWorkspaceId, { ...mockCreateSurveyInput, type: "app", status: "inProgress" })
diff --git a/apps/web/lib/survey/service.ts b/apps/web/lib/survey/service.ts
index 360d17393451..5e6a45b67603 100644
--- a/apps/web/lib/survey/service.ts
+++ b/apps/web/lib/survey/service.ts
@@ -56,6 +56,7 @@ export const selectSurvey = {
   autoComplete: true,
   publishOn: true,
   closeOn: true,
+  archivedAt: true,
   isVerifyEmailEnabled: true,
   isSingleResponsePerEmailEnabled: true,
   isBackButtonHidden: true,
@@ -233,6 +234,8 @@ export const getSurveys = reactCache(
       const surveysPrisma = await prisma.survey.findMany({
         where: {
           workspaceId,
+          // Archived surveys are hidden by default across the app.
+          archivedAt: null,
         },
         select: selectSurvey,
         orderBy: {
@@ -256,6 +259,11 @@ export const getSurveys = reactCache(
 export const getSurveyCount = reactCache(async (workspaceId: string): Promise<number> => {
   validateInputs([workspaceId, ZId]);
   try {
+    // Deliberately archive-inclusive. The sole consumer is the onboarding gate
+    // (redirect-if-onboarding-complete.ts): a workspace whose only survey is archived has already
+    // finished onboarding, so it must count > 0. Excluding archived here bounces such a user back
+    // into the "create your first survey" flow on every login — a full-screen page with no route to
+    // the Archived filter — while their archived survey counts down to permanent deletion.
     const surveyCount = await prisma.survey.count({
       where: {
         workspaceId,
@@ -291,6 +299,13 @@ export const updateSurveyInternal = async (
       throw new ResourceNotFoundError("Survey", surveyId);
     }
 
+    // Archived surveys are read-only. This covers every write path that flows through here
+    // (editor save, the summary status dropdown's server action, etc.) — not just the v3 API.
+    // Archive/restore themselves bypass this guard: they write archivedAt directly, not via update.
+    if (currentSurvey.archivedAt) {
+      throw new InvalidInputError("This survey is archived. Restore it before editing.");
+    }
+
     // ENG-1749: workspaceId and id are the survey's tenant anchors. Always resolve the workspace from
     // the existing survey (never the client payload), and strip workspaceId/id from the update below,
     // so an authorized editor cannot re-point their own survey into another workspace/organization.
@@ -305,6 +320,8 @@ export const updateSurveyInternal = async (
       followUps,
       workspaceId: _workspaceId,
       id: _id,
+      // archivedAt is owned exclusively by the archive/restore flows; never let a survey update touch it.
+      archivedAt: _archivedAt,
       ...surveyData
     } = updatedSurvey;
 
diff --git a/apps/web/locales/de-DE.json b/apps/web/locales/de-DE.json
index d751f62f101d..0493fd1ef31b 100644
--- a/apps/web/locales/de-DE.json
+++ b/apps/web/locales/de-DE.json
@@ -180,6 +180,7 @@
     "app_survey": "App-Umfrage",
     "appearance": "Erscheinungsbild",
     "apply_filters": "Filter anwenden",
+    "archive": "Archivieren",
     "archived": "Archiviert",
     "are_you_sure": "Bist du sicher?",
     "attributes": "Attribute",
@@ -2921,6 +2922,12 @@
       },
       "all_set_time_to_create_first_survey": "Alles klar! Zeit, deine erste Umfrage zu erstellen",
       "alphabetical": "alphabetisch",
+      "archive": "Archivieren",
+      "archive_survey": "Diese Umfrage archivieren?",
+      "archive_survey_description": "Du kannst sie jederzeit innerhalb der nächsten 30 Tage wiederherstellen.",
+      "archive_survey_description_in_progress": "Die Umfrage wird sofort keine Antworten mehr sammeln.",
+      "archive_survey_warning": "Diese Umfrage und alle zugehörigen Antworten werden nach 30 Tagen endgültig gelöscht.",
+      "archiving_survey": "Umfrage wird archiviert...",
       "change_status": "Status ändern",
       "copy_survey": "Umfrage kopieren",
       "copy_survey_description": "Wähle einen Workspace aus, in den du diese Umfrage kopieren möchtest.",
@@ -3515,7 +3522,9 @@
         "your_web_app": "Deine Web-App",
         "zip": "PLZ"
       },
+      "error_archiving_survey": "Umfrage konnte nicht archiviert werden, versuch es noch mal",
       "error_deleting_survey": "Beim Löschen der Umfrage ist ein Fehler aufgetreten",
+      "error_restoring_survey": "Umfrage konnte nicht wiederhergestellt werden, versuch es noch mal",
       "error_updating_status": "Beim Aktualisieren des Umfragestatus ist ein Fehler aufgetreten",
       "featured_templates": {
         "churn_description": "Finde heraus, warum Leute ihre Abos kündigen.",
@@ -3577,6 +3586,8 @@
         "this_response_is_in_progress": "Diese Antwort ist in Bearbeitung.",
         "zip_post_code": "Postleitzahl"
       },
+      "restore": "Wiederherstellen",
+      "restoring_survey": "Umfrage wird wiederhergestellt...",
       "search_by_survey_name": "Nach Umfragename suchen",
       "share": {
         "anonymous_links": {
@@ -3708,6 +3719,7 @@
       },
       "status_updated_successfully": "Umfragestatus erfolgreich aktualisiert",
       "status_updating": "Umfragestatus wird aktualisiert...",
+      "stop_and_archive": "Stoppen und archivieren",
       "summary": {
         "added_filter_for_responses_where_answer_to_question": "Filter hinzugefügt für Antworten, bei denen die Antwort auf Frage {questionIdx} {filterComboBoxValue} - {filterValue} ist",
         "added_filter_for_responses_where_answer_to_question_is_skipped": "Filter hinzugefügt für Antworten, bei denen die Antwort auf Frage {questionIdx} übersprungen wurde",
@@ -3827,8 +3839,10 @@
         "your_survey_is_public": "Deine Umfrage ist live",
         "youre_not_plugged_in_yet": "Du bist noch nicht verbunden!"
       },
+      "survey_archived_successfully": "Umfrage archiviert",
       "survey_deleted_successfully": "Umfrage erfolgreich gelöscht",
       "survey_duplicated_successfully": "Umfrage erfolgreich dupliziert",
+      "survey_restored_successfully": "Umfrage wiederhergestellt",
       "templates": {
         "all_channels": "Alle Kanäle",
         "all_industries": "Alle Branchen",
diff --git a/apps/web/locales/en-US.json b/apps/web/locales/en-US.json
index d0b5f0a07313..5354d64bd5ab 100644
--- a/apps/web/locales/en-US.json
+++ b/apps/web/locales/en-US.json
@@ -180,6 +180,7 @@
     "app_survey": "App Survey",
     "appearance": "Appearance",
     "apply_filters": "Apply filters",
+    "archive": "Archive",
     "archived": "Archived",
     "are_you_sure": "Are you sure?",
     "attributes": "Attributes",
@@ -2921,6 +2922,12 @@
       },
       "all_set_time_to_create_first_survey": "You are all set! Time to create your first survey",
       "alphabetical": "Alphabetical",
+      "archive": "Archive",
+      "archive_survey": "Archive this survey?",
+      "archive_survey_description": "You can restore it anytime within the next 30 days.",
+      "archive_survey_description_in_progress": "It will stop collecting responses immediately.",
+      "archive_survey_warning": "This survey and all its responses will be permanently deleted after 30 days.",
+      "archiving_survey": "Archiving survey...",
       "change_status": "Change status",
       "copy_survey": "Copy survey",
       "copy_survey_description": "Choose a workspace to copy this survey to.",
@@ -3515,7 +3522,9 @@
         "your_web_app": "Your web app",
         "zip": "Zip"
       },
+      "error_archiving_survey": "Couldn't archive survey, try again",
       "error_deleting_survey": "An error occurred while deleting survey",
+      "error_restoring_survey": "Couldn't restore survey, try again",
       "error_updating_status": "An error occurred while updating survey status",
       "featured_templates": {
         "churn_description": "Find out why people cancel their subscriptions.",
@@ -3577,6 +3586,8 @@
         "this_response_is_in_progress": "This response is in progress.",
         "zip_post_code": "ZIP / Post code"
       },
+      "restore": "Restore",
+      "restoring_survey": "Restoring survey...",
       "search_by_survey_name": "Search by survey name",
       "share": {
         "anonymous_links": {
@@ -3708,6 +3719,7 @@
       },
       "status_updated_successfully": "Survey status updated successfully",
       "status_updating": "Updating survey status...",
+      "stop_and_archive": "Stop and archive",
       "summary": {
         "added_filter_for_responses_where_answer_to_question": "Added filter for responses where answer to question {questionIdx} is {filterComboBoxValue} - {filterValue}",
         "added_filter_for_responses_where_answer_to_question_is_skipped": "Added filter for responses where answer to question {questionIdx} is skipped",
@@ -3827,8 +3839,10 @@
         "your_survey_is_public": "Your survey is live",
         "youre_not_plugged_in_yet": "You are not plugged in yet!"
       },
+      "survey_archived_successfully": "Survey archived",
       "survey_deleted_successfully": "Survey deleted successfully",
       "survey_duplicated_successfully": "Survey duplicated successfully",
+      "survey_restored_successfully": "Survey restored",
       "templates": {
         "all_channels": "All channels",
         "all_industries": "All industries",
diff --git a/apps/web/locales/es-ES.json b/apps/web/locales/es-ES.json
index b37a01207904..5ff3e76add83 100644
--- a/apps/web/locales/es-ES.json
+++ b/apps/web/locales/es-ES.json
@@ -180,6 +180,7 @@
     "app_survey": "Encuesta de aplicación",
     "appearance": "Apariencia",
     "apply_filters": "Aplicar filtros",
+    "archive": "Archivar",
     "archived": "Archivado",
     "are_you_sure": "¿Estás seguro?",
     "attributes": "Atributos",
@@ -2921,6 +2922,12 @@
       },
       "all_set_time_to_create_first_survey": "¡Todo listo! Es hora de crear tu primera encuesta",
       "alphabetical": "Alfabético",
+      "archive": "Archivar",
+      "archive_survey": "¿Archivar esta encuesta?",
+      "archive_survey_description": "Puedes restaurarla en cualquier momento dentro de los próximos 30 días.",
+      "archive_survey_description_in_progress": "Dejará de recopilar respuestas inmediatamente.",
+      "archive_survey_warning": "Esta encuesta y todas sus respuestas se eliminarán permanentemente después de 30 días.",
+      "archiving_survey": "Archivando encuesta...",
       "change_status": "Cambiar estado",
       "copy_survey": "Copiar encuesta",
       "copy_survey_description": "Elige un espacio de trabajo para copiar esta encuesta.",
@@ -3515,7 +3522,9 @@
         "your_web_app": "Tu aplicación web",
         "zip": "Código postal"
       },
+      "error_archiving_survey": "No se pudo archivar la encuesta, inténtalo de nuevo",
       "error_deleting_survey": "Se produjo un error al eliminar la encuesta",
+      "error_restoring_survey": "No se pudo restaurar la encuesta, inténtalo de nuevo",
       "error_updating_status": "Se produjo un error al actualizar el estado de la encuesta",
       "featured_templates": {
         "churn_description": "Descubre por qué la gente cancela sus suscripciones.",
@@ -3577,6 +3586,8 @@
         "this_response_is_in_progress": "Esta respuesta está en curso.",
         "zip_post_code": "Código postal"
       },
+      "restore": "Restaurar",
+      "restoring_survey": "Restaurando encuesta...",
       "search_by_survey_name": "Buscar por nombre de encuesta",
       "share": {
         "anonymous_links": {
@@ -3708,6 +3719,7 @@
       },
       "status_updated_successfully": "Estado de la encuesta actualizado correctamente",
       "status_updating": "Actualizando estado de la encuesta...",
+      "stop_and_archive": "Detener y archivar",
       "summary": {
         "added_filter_for_responses_where_answer_to_question": "Se ha añadido un filtro para las respuestas donde la respuesta a la pregunta {questionIdx} es {filterComboBoxValue} - {filterValue}",
         "added_filter_for_responses_where_answer_to_question_is_skipped": "Filtro añadido para respuestas donde la respuesta a la pregunta {questionIdx} se ha omitido",
@@ -3827,8 +3839,10 @@
         "your_survey_is_public": "Tu encuesta está activa",
         "youre_not_plugged_in_yet": "¡Aún no estás conectado!"
       },
+      "survey_archived_successfully": "Encuesta archivada",
       "survey_deleted_successfully": "¡Encuesta eliminada correctamente!",
       "survey_duplicated_successfully": "Encuesta duplicada correctamente.",
+      "survey_restored_successfully": "Encuesta restaurada",
       "templates": {
         "all_channels": "Todos los canales",
         "all_industries": "Todas las industrias",
diff --git a/apps/web/locales/fr-FR.json b/apps/web/locales/fr-FR.json
index 22d1739767c2..94a3e1d90a10 100644
--- a/apps/web/locales/fr-FR.json
+++ b/apps/web/locales/fr-FR.json
@@ -180,6 +180,7 @@
     "app_survey": "Sondage d'application",
     "appearance": "Apparence",
     "apply_filters": "Appliquer des filtres",
+    "archive": "Archiver",
     "archived": "Archivé",
     "are_you_sure": "Es-tu sûr ?",
     "attributes": "Attributs",
@@ -2921,6 +2922,12 @@
       },
       "all_set_time_to_create_first_survey": "Vous êtes prêt ! Il est temps de créer votre première enquête.",
       "alphabetical": "Alphabétique",
+      "archive": "Archiver",
+      "archive_survey": "Archiver ce sondage ?",
+      "archive_survey_description": "Tu pourras le restaurer à tout moment dans les 30 prochains jours.",
+      "archive_survey_description_in_progress": "Il cessera immédiatement de collecter des réponses.",
+      "archive_survey_warning": "Ce sondage et toutes ses réponses seront définitivement supprimés après 30 jours.",
+      "archiving_survey": "Archivage du sondage...",
       "change_status": "Changer le statut",
       "copy_survey": "Copier l'enquête",
       "copy_survey_description": "Choisis un espace de travail vers lequel copier cette enquête.",
@@ -3515,7 +3522,9 @@
         "your_web_app": "Votre application web",
         "zip": "Zip"
       },
+      "error_archiving_survey": "Impossible d'archiver le sondage, réessaye",
       "error_deleting_survey": "Une erreur s'est produite lors de la suppression du sondage",
+      "error_restoring_survey": "Impossible de restaurer le sondage, réessaye",
       "error_updating_status": "Une erreur s'est produite lors de la mise à jour du statut de l'enquête",
       "featured_templates": {
         "churn_description": "Découvrez pourquoi les utilisateurs annulent leur abonnement.",
@@ -3577,6 +3586,8 @@
         "this_response_is_in_progress": "Cette réponse est en cours.",
         "zip_post_code": "Code postal"
       },
+      "restore": "Restaurer",
+      "restoring_survey": "Restauration du sondage...",
       "search_by_survey_name": "Recherche par nom d'enquête",
       "share": {
         "anonymous_links": {
@@ -3708,6 +3719,7 @@
       },
       "status_updated_successfully": "Le statut de l'enquête a été mis à jour avec succès",
       "status_updating": "Mise à jour du statut de l'enquête...",
+      "stop_and_archive": "Arrêter et archiver",
       "summary": {
         "added_filter_for_responses_where_answer_to_question": "Filtre ajouté pour les réponses où la réponse à la question {questionIdx} est {filterComboBoxValue} - {filterValue}",
         "added_filter_for_responses_where_answer_to_question_is_skipped": "Filtre ajouté pour les réponses où la réponse à la question '{'questionIdx'}' est ignorée",
@@ -3827,8 +3839,10 @@
         "your_survey_is_public": "Ton enquête est en ligne",
         "youre_not_plugged_in_yet": "Vous n'êtes pas encore branché !"
       },
+      "survey_archived_successfully": "Sondage archivé",
       "survey_deleted_successfully": "Enquête supprimée avec succès !",
       "survey_duplicated_successfully": "Enquête dupliquée avec succès.",
+      "survey_restored_successfully": "Sondage restauré",
       "templates": {
         "all_channels": "Tous les canaux",
         "all_industries": "Tous les secteurs",
diff --git a/apps/web/locales/hu-HU.json b/apps/web/locales/hu-HU.json
index 8ae6f3860491..ba54df268768 100644
--- a/apps/web/locales/hu-HU.json
+++ b/apps/web/locales/hu-HU.json
@@ -180,6 +180,7 @@
     "app_survey": "Alkalmazás-kérdőív",
     "appearance": "Megjelenés",
     "apply_filters": "Szűrők alkalmazása",
+    "archive": "Archiválás",
     "archived": "Archiválva",
     "are_you_sure": "Biztos benne?",
     "attributes": "Attribútumok",
@@ -2921,6 +2922,12 @@
       },
       "all_set_time_to_create_first_survey": "Mindent beállított! Ideje létrehozni az első kérdőívet",
       "alphabetical": "Ábécé-sorrend",
+      "archive": "Archiválás",
+      "archive_survey": "Archiválja ezt a felmérést?",
+      "archive_survey_description": "Bármikor visszaállíthatja a következő 30 napon belül.",
+      "archive_survey_description_in_progress": "Azonnal megszűnik a válaszok gyűjtése.",
+      "archive_survey_warning": "Ez a felmérés és az összes válasz véglegesen törlésre kerül 30 nap elteltével.",
+      "archiving_survey": "Felmérés archiválása folyamatban...",
       "change_status": "Állapot módosítása",
       "copy_survey": "Felmérés másolása",
       "copy_survey_description": "Válasszon ki egy munkaterületet, amelyre ezt a felmérést másolni szeretné.",
@@ -3515,7 +3522,9 @@
         "your_web_app": "Saját webalkalmazás",
         "zip": "Irányítószám"
       },
+      "error_archiving_survey": "A felmérés archiválása sikertelen, kérjük, próbálja újra",
       "error_deleting_survey": "Hiba történt a kérdőív törlése során",
+      "error_restoring_survey": "A felmérés visszaállítása sikertelen, kérjük, próbálja újra",
       "error_updating_status": "Hiba történt a felmérés állapotának frissítése során",
       "featured_templates": {
         "churn_description": "Tudja meg, miért mondják le az emberek az előfizetésüket.",
@@ -3577,6 +3586,8 @@
         "this_response_is_in_progress": "Ez a válasz folyamatban van.",
         "zip_post_code": "Irányítószám"
       },
+      "restore": "Visszaállítás",
+      "restoring_survey": "Felmérés visszaállítása folyamatban...",
       "search_by_survey_name": "Keresés kérdőívnév alapján",
       "share": {
         "anonymous_links": {
@@ -3708,6 +3719,7 @@
       },
       "status_updated_successfully": "A felmérés állapota sikeresen frissítve",
       "status_updating": "A felmérés állapotának frissítése folyamatban...",
+      "stop_and_archive": "Leállítás és archiválás",
       "summary": {
         "added_filter_for_responses_where_answer_to_question": "Szűrő hozzáadva azokhoz a válaszokhoz, ahol a(z) {questionIdx}. kérdésre adott válasz {filterComboBoxValue} – {filterValue}",
         "added_filter_for_responses_where_answer_to_question_is_skipped": "Szűrő hozzáadva azokhoz a válaszokhoz, ahol a(z) {questionIdx}. kérdésre adott válasz kihagyva",
@@ -3827,8 +3839,10 @@
         "your_survey_is_public": "Felmérése élő",
         "youre_not_plugged_in_yet": "Még nincs csatlakoztatva!"
       },
+      "survey_archived_successfully": "Felmérés archiválva",
       "survey_deleted_successfully": "A kérdőív sikeresen törölve",
       "survey_duplicated_successfully": "A kérdőív sikeresen megkettőzve",
+      "survey_restored_successfully": "Felmérés visszaállítva",
       "templates": {
         "all_channels": "Összes csatorna",
         "all_industries": "Összes iparág",
diff --git a/apps/web/locales/ja-JP.json b/apps/web/locales/ja-JP.json
index 54225a242a02..37a9a00bc9a6 100644
--- a/apps/web/locales/ja-JP.json
+++ b/apps/web/locales/ja-JP.json
@@ -180,6 +180,7 @@
     "app_survey": "アプリ内フォーム",
     "appearance": "外観",
     "apply_filters": "フィルターを適用",
+    "archive": "アーカイブ",
     "archived": "アーカイブ済み",
     "are_you_sure": "よろしいですか？",
     "attributes": "属性",
@@ -2921,6 +2922,12 @@
       },
       "all_set_time_to_create_first_survey": "すべての準備が整いました！最初のフォームを作成しましょう",
       "alphabetical": "アルファベット順",
+      "archive": "アーカイブ",
+      "archive_survey": "このアンケートをアーカイブしますか?",
+      "archive_survey_description": "30日以内であればいつでも復元できます。",
+      "archive_survey_description_in_progress": "すぐに回答の収集が停止されます。",
+      "archive_survey_warning": "このアンケートとすべての回答は30日後に完全に削除されます。",
+      "archiving_survey": "アンケートをアーカイブ中...",
       "change_status": "ステータスを変更",
       "copy_survey": "アンケートをコピー",
       "copy_survey_description": "このアンケートをコピーするワークスペースを選択してください。",
@@ -3515,7 +3522,9 @@
         "your_web_app": "あなたのウェブアプリ",
         "zip": "郵便番号"
       },
+      "error_archiving_survey": "アンケートをアーカイブできませんでした。もう一度お試しください",
       "error_deleting_survey": "アンケートの削除中にエラーが発生しました",
+      "error_restoring_survey": "アンケートを復元できませんでした。もう一度お試しください",
       "error_updating_status": "アンケートのステータス更新中にエラーが発生しました",
       "featured_templates": {
         "churn_description": "サブスクリプションをキャンセルする理由を把握できます。",
@@ -3577,6 +3586,8 @@
         "this_response_is_in_progress": "この回答は進行中です。",
         "zip_post_code": "郵便番号"
       },
+      "restore": "復元",
+      "restoring_survey": "アンケートを復元中...",
       "search_by_survey_name": "フォーム名で検索",
       "share": {
         "anonymous_links": {
@@ -3708,6 +3719,7 @@
       },
       "status_updated_successfully": "アンケートのステータスが正常に更新されました",
       "status_updating": "アンケートのステータスを更新中...",
+      "stop_and_archive": "停止してアーカイブ",
       "summary": {
         "added_filter_for_responses_where_answer_to_question": "質問{questionIdx}の答えが{filterComboBoxValue} - {filterValue}の回答にフィルターを追加しました",
         "added_filter_for_responses_where_answer_to_question_is_skipped": "質問 {questionIdx} の回答がスキップされた回答のフィルターを追加しました",
@@ -3827,8 +3839,10 @@
         "your_survey_is_public": "アンケートが公開中です",
         "youre_not_plugged_in_yet": "まだ接続されていません！"
       },
+      "survey_archived_successfully": "アンケートをアーカイブしました",
       "survey_deleted_successfully": "フォームを正常に削除しました！",
       "survey_duplicated_successfully": "フォームを正常に複製しました。",
+      "survey_restored_successfully": "アンケートを復元しました",
       "templates": {
         "all_channels": "すべてのチャネル",
         "all_industries": "すべての業界",
diff --git a/apps/web/locales/nl-NL.json b/apps/web/locales/nl-NL.json
index 032c734eb3b1..d3bcff7730c2 100644
--- a/apps/web/locales/nl-NL.json
+++ b/apps/web/locales/nl-NL.json
@@ -180,6 +180,7 @@
     "app_survey": "App-enquête",
     "appearance": "Weergave",
     "apply_filters": "Pas filters toe",
+    "archive": "Archiveren",
     "archived": "Gearchiveerd",
     "are_you_sure": "Weet je het zeker?",
     "attributes": "Kenmerken",
@@ -2921,6 +2922,12 @@
       },
       "all_set_time_to_create_first_survey": "Je bent helemaal klaar! Tijd om uw eerste enquête te maken",
       "alphabetical": "Alfabetisch",
+      "archive": "Archiveren",
+      "archive_survey": "Deze enquête archiveren?",
+      "archive_survey_description": "Je kunt het binnen 30 dagen weer herstellen.",
+      "archive_survey_description_in_progress": "Het stopt onmiddellijk met het verzamelen van reacties.",
+      "archive_survey_warning": "Deze enquête en alle bijbehorende reacties worden na 30 dagen definitief verwijderd.",
+      "archiving_survey": "Enquête wordt gearchiveerd...",
       "change_status": "Status wijzigen",
       "copy_survey": "Enquête kopiëren",
       "copy_survey_description": "Kies een workspace waarnaar je deze enquête wilt kopiëren.",
@@ -3515,7 +3522,9 @@
         "your_web_app": "Uw web-app",
         "zip": "Ritssluiting"
       },
+      "error_archiving_survey": "Kan enquête niet archiveren, probeer het opnieuw",
       "error_deleting_survey": "Er is een fout opgetreden bij het verwijderen van de enquête",
+      "error_restoring_survey": "Kan enquête niet herstellen, probeer het opnieuw",
       "error_updating_status": "Er is een fout opgetreden bij het bijwerken van de enquêtestatus",
       "featured_templates": {
         "churn_description": "Ontdek waarom mensen hun abonnementen opzeggen.",
@@ -3577,6 +3586,8 @@
         "this_response_is_in_progress": "Deze reactie is in behandeling.",
         "zip_post_code": "Postcode"
       },
+      "restore": "Herstellen",
+      "restoring_survey": "Enquête wordt hersteld...",
       "search_by_survey_name": "Zoek op enquêtenaam",
       "share": {
         "anonymous_links": {
@@ -3708,6 +3719,7 @@
       },
       "status_updated_successfully": "Enquêtestatus succesvol bijgewerkt",
       "status_updating": "Enquêtestatus wordt bijgewerkt...",
+      "stop_and_archive": "Stoppen en archiveren",
       "summary": {
         "added_filter_for_responses_where_answer_to_question": "Filter toegevoegd voor reacties waar het antwoord op vraag {questionIdx} {filterComboBoxValue} - {filterValue} is",
         "added_filter_for_responses_where_answer_to_question_is_skipped": "Filter toegevoegd voor antwoorden waarbij het antwoord op vraag {questionIdx} wordt overgeslagen",
@@ -3827,8 +3839,10 @@
         "your_survey_is_public": "Je enquête is live",
         "youre_not_plugged_in_yet": "Je bent nog niet aangesloten!"
       },
+      "survey_archived_successfully": "Enquête gearchiveerd",
       "survey_deleted_successfully": "Enquête succesvol verwijderd!",
       "survey_duplicated_successfully": "Enquête is succesvol gedupliceerd.",
+      "survey_restored_successfully": "Enquête hersteld",
       "templates": {
         "all_channels": "Alle kanalen",
         "all_industries": "Alle industrieën",
diff --git a/apps/web/locales/pt-BR.json b/apps/web/locales/pt-BR.json
index 9b9f738a2f24..608e7d7ea5d2 100644
--- a/apps/web/locales/pt-BR.json
+++ b/apps/web/locales/pt-BR.json
@@ -180,6 +180,7 @@
     "app_survey": "Pesquisa de App",
     "appearance": "Aparência",
     "apply_filters": "Aplicar filtros",
+    "archive": "Arquivar",
     "archived": "Arquivado",
     "are_you_sure": "Certeza?",
     "attributes": "atributos",
@@ -2921,6 +2922,12 @@
       },
       "all_set_time_to_create_first_survey": "Tá tudo pronto! Hora de criar sua primeira pesquisa",
       "alphabetical": "alfabético",
+      "archive": "Arquivar",
+      "archive_survey": "Arquivar esta pesquisa?",
+      "archive_survey_description": "Você pode restaurá-la a qualquer momento nos próximos 30 dias.",
+      "archive_survey_description_in_progress": "Ela vai parar de coletar respostas imediatamente.",
+      "archive_survey_warning": "Esta pesquisa e todas as suas respostas serão excluídas permanentemente após 30 dias.",
+      "archiving_survey": "Arquivando pesquisa...",
       "change_status": "Alterar status",
       "copy_survey": "Copiar pesquisa",
       "copy_survey_description": "Escolha um espaço de trabalho para copiar esta pesquisa.",
@@ -3515,7 +3522,9 @@
         "your_web_app": "Sua aplicação web",
         "zip": "Fecho éclair"
       },
+      "error_archiving_survey": "Não foi possível arquivar a pesquisa, tente novamente",
       "error_deleting_survey": "Ocorreu um erro ao excluir a pesquisa",
+      "error_restoring_survey": "Não foi possível restaurar a pesquisa, tente novamente",
       "error_updating_status": "Ocorreu um erro ao atualizar o status da pesquisa",
       "featured_templates": {
         "churn_description": "Descubra por que as pessoas cancelam suas assinaturas.",
@@ -3577,6 +3586,8 @@
         "this_response_is_in_progress": "Essa resposta está em andamento.",
         "zip_post_code": "CEP / Código postal"
       },
+      "restore": "Restaurar",
+      "restoring_survey": "Restaurando pesquisa...",
       "search_by_survey_name": "Buscar pelo nome da pesquisa",
       "share": {
         "anonymous_links": {
@@ -3708,6 +3719,7 @@
       },
       "status_updated_successfully": "Status da pesquisa atualizado com sucesso",
       "status_updating": "Atualizando status da pesquisa...",
+      "stop_and_archive": "Parar e arquivar",
       "summary": {
         "added_filter_for_responses_where_answer_to_question": "Filtro adicionado para respostas onde a resposta da pergunta {questionIdx} é {filterComboBoxValue} - {filterValue}",
         "added_filter_for_responses_where_answer_to_question_is_skipped": "Adicionado filtro para respostas onde a resposta à pergunta {questionIdx} foi pulada",
@@ -3827,8 +3839,10 @@
         "your_survey_is_public": "Sua pesquisa está no ar",
         "youre_not_plugged_in_yet": "Você ainda não tá conectado!"
       },
+      "survey_archived_successfully": "Pesquisa arquivada",
       "survey_deleted_successfully": "Pesquisa deletada com sucesso!",
       "survey_duplicated_successfully": "Pesquisa duplicada com sucesso.",
+      "survey_restored_successfully": "Pesquisa restaurada",
       "templates": {
         "all_channels": "Todos os canais",
         "all_industries": "Todas as indústrias",
diff --git a/apps/web/locales/pt-PT.json b/apps/web/locales/pt-PT.json
index 5b7e2318d0f3..f19de62d5582 100644
--- a/apps/web/locales/pt-PT.json
+++ b/apps/web/locales/pt-PT.json
@@ -180,6 +180,7 @@
     "app_survey": "Inquérito (app)",
     "appearance": "Aparência",
     "apply_filters": "Aplicar filtros",
+    "archive": "Arquivar",
     "archived": "Arquivado",
     "are_you_sure": "Tem a certeza?",
     "attributes": "Atributos",
@@ -2921,6 +2922,12 @@
       },
       "all_set_time_to_create_first_survey": "Está tudo pronto! Hora de criar o seu primeiro inquérito",
       "alphabetical": "Alfabética",
+      "archive": "Arquivar",
+      "archive_survey": "Arquivar este inquérito?",
+      "archive_survey_description": "Podes restaurá-lo a qualquer momento nos próximos 30 dias.",
+      "archive_survey_description_in_progress": "Deixará de recolher respostas imediatamente.",
+      "archive_survey_warning": "Este inquérito e todas as suas respostas serão permanentemente eliminados após 30 dias.",
+      "archiving_survey": "A arquivar inquérito...",
       "change_status": "Alterar estado",
       "copy_survey": "Copiar inquérito",
       "copy_survey_description": "Escolhe um espaço de trabalho para copiar este inquérito.",
@@ -3515,7 +3522,9 @@
         "your_web_app": "A sua aplicação web",
         "zip": "Comprimir"
       },
+      "error_archiving_survey": "Não foi possível arquivar o inquérito, tenta novamente",
       "error_deleting_survey": "Ocorreu um erro ao eliminar o inquérito",
+      "error_restoring_survey": "Não foi possível restaurar o inquérito, tenta novamente",
       "error_updating_status": "Ocorreu um erro ao atualizar o estado do inquérito",
       "featured_templates": {
         "churn_description": "Descobre porque é que as pessoas cancelam as suas subscrições.",
@@ -3577,6 +3586,8 @@
         "this_response_is_in_progress": "Esta resposta está em progresso.",
         "zip_post_code": "Código Postal"
       },
+      "restore": "Restaurar",
+      "restoring_survey": "A restaurar inquérito...",
       "search_by_survey_name": "Pesquisar por nome do inquérito",
       "share": {
         "anonymous_links": {
@@ -3708,6 +3719,7 @@
       },
       "status_updated_successfully": "Estado do inquérito atualizado com sucesso",
       "status_updating": "A atualizar o estado do inquérito...",
+      "stop_and_archive": "Parar e arquivar",
       "summary": {
         "added_filter_for_responses_where_answer_to_question": "Foi adicionado um filtro para respostas em que a resposta à pergunta {questionIdx} é {filterComboBoxValue} - {filterValue}",
         "added_filter_for_responses_where_answer_to_question_is_skipped": "Adicionado filtro para respostas onde a resposta à pergunta {questionIdx} é ignorada",
@@ -3827,8 +3839,10 @@
         "your_survey_is_public": "O teu inquérito está no ar",
         "youre_not_plugged_in_yet": "Ainda não está ligado!"
       },
+      "survey_archived_successfully": "Inquérito arquivado",
       "survey_deleted_successfully": "Inquérito eliminado com sucesso!",
       "survey_duplicated_successfully": "Inquérito duplicado com sucesso.",
+      "survey_restored_successfully": "Inquérito restaurado",
       "templates": {
         "all_channels": "Todos os canais",
         "all_industries": "Todas as indústrias",
diff --git a/apps/web/locales/ro-RO.json b/apps/web/locales/ro-RO.json
index c9d608a332bd..26e2b8bd22c3 100644
--- a/apps/web/locales/ro-RO.json
+++ b/apps/web/locales/ro-RO.json
@@ -180,6 +180,7 @@
     "app_survey": "Sondaj aplicație",
     "appearance": "Aspect",
     "apply_filters": "Aplică filtre",
+    "archive": "Arhivează",
     "archived": "Arhivat",
     "are_you_sure": "Ești sigur?",
     "attributes": "Atribute",
@@ -2921,6 +2922,12 @@
       },
       "all_set_time_to_create_first_survey": "Ești gata! Este timpul să creezi primul tău chestionar",
       "alphabetical": "Alfabetic",
+      "archive": "Arhivează",
+      "archive_survey": "Arhivezi acest sondaj?",
+      "archive_survey_description": "Poți să-l restaurezi oricând în următoarele 30 de zile.",
+      "archive_survey_description_in_progress": "Va opri colectarea răspunsurilor imediat.",
+      "archive_survey_warning": "Acest sondaj și toate răspunsurile sale vor fi șterse definitiv după 30 de zile.",
+      "archiving_survey": "Se arhivează sondajul...",
       "change_status": "Schimbă status",
       "copy_survey": "Copiază chestionarul",
       "copy_survey_description": "Alege un spațiu de lucru în care să copiezi acest chestionar.",
@@ -3515,7 +3522,9 @@
         "your_web_app": "Aplicația dumneavoastră web",
         "zip": "Cod Poștal"
       },
+      "error_archiving_survey": "Nu s-a putut arhiva sondajul, încearcă din nou",
       "error_deleting_survey": "A apărut o eroare la ștergerea sondajului",
+      "error_restoring_survey": "Nu s-a putut restaura sondajul, încearcă din nou",
       "error_updating_status": "A apărut o eroare la actualizarea statusului sondajului",
       "featured_templates": {
         "churn_description": "Află de ce oamenii anulează abonamentele lor.",
@@ -3577,6 +3586,8 @@
         "this_response_is_in_progress": "Acest răspuns este în curs de procesare.",
         "zip_post_code": "Cod poștal"
       },
+      "restore": "Restaurează",
+      "restoring_survey": "Se restaurează sondajul...",
       "search_by_survey_name": "Căutare după nume chestionar",
       "share": {
         "anonymous_links": {
@@ -3708,6 +3719,7 @@
       },
       "status_updated_successfully": "Statusul sondajului a fost actualizat cu succes",
       "status_updating": "Se actualizează statusul sondajului...",
+      "stop_and_archive": "Oprește și arhivează",
       "summary": {
         "added_filter_for_responses_where_answer_to_question": "S-a adăugat un filtru pentru răspunsurile unde răspunsul la întrebarea {questionIdx} este {filterComboBoxValue} - {filterValue}",
         "added_filter_for_responses_where_answer_to_question_is_skipped": "Filtru adăugat pentru răspunsuri unde răspunsul la întrebarea {questionIdx} este omis",
@@ -3827,8 +3839,10 @@
         "your_survey_is_public": "Chestionarul tău este activ",
         "youre_not_plugged_in_yet": "Nu sunteţi încă conectat!"
       },
+      "survey_archived_successfully": "Sondaj arhivat",
       "survey_deleted_successfully": "\"Sondaj șters cu succes!\"",
       "survey_duplicated_successfully": "\"Sondaj duplicat cu succes!\"",
+      "survey_restored_successfully": "Sondaj restaurat",
       "templates": {
         "all_channels": "Toate canalele",
         "all_industries": "Toate industriile",
diff --git a/apps/web/locales/ru-RU.json b/apps/web/locales/ru-RU.json
index a002a3592021..6b38f2adee5f 100644
--- a/apps/web/locales/ru-RU.json
+++ b/apps/web/locales/ru-RU.json
@@ -180,6 +180,7 @@
     "app_survey": "Опрос о приложении",
     "appearance": "Внешний вид",
     "apply_filters": "Применить фильтры",
+    "archive": "Архивировать",
     "archived": "Архивный",
     "are_you_sure": "Вы уверены?",
     "attributes": "Атрибуты",
@@ -2921,6 +2922,12 @@
       },
       "all_set_time_to_create_first_survey": "Всё готово! Пора создать первый опрос",
       "alphabetical": "По алфавиту",
+      "archive": "Архивировать",
+      "archive_survey": "Архивировать этот опрос?",
+      "archive_survey_description": "Вы можете восстановить его в любое время в течение следующих 30 дней.",
+      "archive_survey_description_in_progress": "Сбор ответов будет немедленно остановлен.",
+      "archive_survey_warning": "Этот опрос и все его ответы будут безвозвратно удалены через 30 дней.",
+      "archiving_survey": "Архивируем опрос...",
       "change_status": "Изменить статус",
       "copy_survey": "Копировать опрос",
       "copy_survey_description": "Выбери рабочее пространство, в которое хочешь скопировать этот опрос.",
@@ -3515,7 +3522,9 @@
         "your_web_app": "Ваше веб-приложение",
         "zip": "Zip"
       },
+      "error_archiving_survey": "Не удалось архивировать опрос, попробуй ещё раз",
       "error_deleting_survey": "Произошла ошибка при удалении опроса",
+      "error_restoring_survey": "Не удалось восстановить опрос, попробуй ещё раз",
       "error_updating_status": "Произошла ошибка при обновлении статуса опроса",
       "featured_templates": {
         "churn_description": "Узнайте, почему люди отменяют свои подписки.",
@@ -3577,6 +3586,8 @@
         "this_response_is_in_progress": "Этот ответ в процессе заполнения.",
         "zip_post_code": "Индекс"
       },
+      "restore": "Восстановить",
+      "restoring_survey": "Восстанавливаем опрос...",
       "search_by_survey_name": "Поиск по названию опроса",
       "share": {
         "anonymous_links": {
@@ -3708,6 +3719,7 @@
       },
       "status_updated_successfully": "Статус опроса успешно обновлен",
       "status_updating": "Обновление статуса опроса...",
+      "stop_and_archive": "Остановить и архивировать",
       "summary": {
         "added_filter_for_responses_where_answer_to_question": "Добавлен фильтр для ответов, где ответ на вопрос {questionIdx} — {filterComboBoxValue} — {filterValue}",
         "added_filter_for_responses_where_answer_to_question_is_skipped": "Добавлен фильтр для ответов, где вопрос {questionIdx} был пропущен",
@@ -3827,8 +3839,10 @@
         "your_survey_is_public": "Ваш опрос запущен",
         "youre_not_plugged_in_yet": "Вы ещё не подключены!"
       },
+      "survey_archived_successfully": "Опрос архивирован",
       "survey_deleted_successfully": "Опрос успешно удалён!",
       "survey_duplicated_successfully": "Опрос успешно продублирован.",
+      "survey_restored_successfully": "Опрос восстановлен",
       "templates": {
         "all_channels": "Все каналы",
         "all_industries": "Все отрасли",
diff --git a/apps/web/locales/sv-SE.json b/apps/web/locales/sv-SE.json
index 08e674724701..7f85af83e448 100644
--- a/apps/web/locales/sv-SE.json
+++ b/apps/web/locales/sv-SE.json
@@ -180,6 +180,7 @@
     "app_survey": "App-enkät",
     "appearance": "Utseende",
     "apply_filters": "Tillämpa filter",
+    "archive": "Arkivera",
     "archived": "Arkiverad",
     "are_you_sure": "Är du säker?",
     "attributes": "Attribut",
@@ -2921,6 +2922,12 @@
       },
       "all_set_time_to_create_first_survey": "Allt klart! Dags att skapa din första enkät",
       "alphabetical": "Alfabetisk",
+      "archive": "Arkivera",
+      "archive_survey": "Arkivera denna undersökning?",
+      "archive_survey_description": "Du kan återställa den när som helst inom de kommande 30 dagarna.",
+      "archive_survey_description_in_progress": "Den kommer att sluta samla in svar omedelbart.",
+      "archive_survey_warning": "Denna undersökning och alla dess svar kommer att raderas permanent efter 30 dagar.",
+      "archiving_survey": "Arkiverar undersökning...",
       "change_status": "Ändra status",
       "copy_survey": "Kopiera undersökning",
       "copy_survey_description": "Välj en arbetsyta att kopiera den här undersökningen till.",
@@ -3515,7 +3522,9 @@
         "your_web_app": "Din webbapp",
         "zip": "Postnummer"
       },
+      "error_archiving_survey": "Kunde inte arkivera undersökningen, försök igen",
       "error_deleting_survey": "Ett fel uppstod vid borttagning av enkät",
+      "error_restoring_survey": "Kunde inte återställa undersökningen, försök igen",
       "error_updating_status": "Ett fel uppstod när undersökningens status uppdaterades",
       "featured_templates": {
         "churn_description": "Ta reda på varför människor avslutar sina prenumerationer.",
@@ -3577,6 +3586,8 @@
         "this_response_is_in_progress": "Detta svar pågår.",
         "zip_post_code": "Postnummer"
       },
+      "restore": "Återställ",
+      "restoring_survey": "Återställer undersökning...",
       "search_by_survey_name": "Sök efter enkätnamn",
       "share": {
         "anonymous_links": {
@@ -3708,6 +3719,7 @@
       },
       "status_updated_successfully": "Undersökningens status har uppdaterats",
       "status_updating": "Uppdaterar undersökningens status...",
+      "stop_and_archive": "Stoppa och arkivera",
       "summary": {
         "added_filter_for_responses_where_answer_to_question": "Filter har lagts till för svar där svaret på fråga {questionIdx} är {filterComboBoxValue} - {filterValue}",
         "added_filter_for_responses_where_answer_to_question_is_skipped": "Lade till filter för svar där svar på fråga {questionIdx} är överhoppad",
@@ -3827,8 +3839,10 @@
         "your_survey_is_public": "Din enkät är publicerad",
         "youre_not_plugged_in_yet": "Du är inte ansluten ännu!"
       },
+      "survey_archived_successfully": "Undersökningen arkiverad",
       "survey_deleted_successfully": "Enkät borttagen!",
       "survey_duplicated_successfully": "Enkät duplicerad.",
+      "survey_restored_successfully": "Undersökningen återställd",
       "templates": {
         "all_channels": "Alla kanaler",
         "all_industries": "Alla branscher",
diff --git a/apps/web/locales/tr-TR.json b/apps/web/locales/tr-TR.json
index 435a3a9fbd68..07fed7bc89a7 100644
--- a/apps/web/locales/tr-TR.json
+++ b/apps/web/locales/tr-TR.json
@@ -180,6 +180,7 @@
     "app_survey": "Uygulama Anketi",
     "appearance": "Görünüm",
     "apply_filters": "Filtreleri uygula",
+    "archive": "Arşivle",
     "archived": "Arşivlenmiş",
     "are_you_sure": "Emin misiniz?",
     "attributes": "Öznitelikler",
@@ -2921,6 +2922,12 @@
       },
       "all_set_time_to_create_first_survey": "Her şey hazır! İlk anketini oluşturma zamanı",
       "alphabetical": "Alfabetik",
+      "archive": "Arşivle",
+      "archive_survey": "Bu anketi arşivle?",
+      "archive_survey_description": "İstediğin zaman önümüzdeki 30 gün içinde geri yükleyebilirsin.",
+      "archive_survey_description_in_progress": "Yanıt toplamayı hemen durduracak.",
+      "archive_survey_warning": "Bu anket ve tüm yanıtları 30 gün sonra kalıcı olarak silinecek.",
+      "archiving_survey": "Anket arşivleniyor...",
       "change_status": "Durumu değiştir",
       "copy_survey": "Anketi kopyala",
       "copy_survey_description": "Bu anketi kopyalamak için bir çalışma alanı seç.",
@@ -3515,7 +3522,9 @@
         "your_web_app": "Web uygulaman",
         "zip": "Posta Kodu"
       },
+      "error_archiving_survey": "Anket arşivlenemedi, tekrar dene",
       "error_deleting_survey": "Anket silinirken bir hata oluştu",
+      "error_restoring_survey": "Anket geri yüklenemedi, tekrar dene",
       "error_updating_status": "Anket durumu güncellenirken bir hata oluştu",
       "featured_templates": {
         "churn_description": "İnsanların aboneliklerini neden iptal ettiğini öğren.",
@@ -3577,6 +3586,8 @@
         "this_response_is_in_progress": "Bu yanıt devam ediyor.",
         "zip_post_code": "Posta Kodu"
       },
+      "restore": "Geri yükle",
+      "restoring_survey": "Anket geri yükleniyor...",
       "search_by_survey_name": "Anket adına göre ara",
       "share": {
         "anonymous_links": {
@@ -3708,6 +3719,7 @@
       },
       "status_updated_successfully": "Anket durumu başarıyla güncellendi",
       "status_updating": "Anket durumu güncelleniyor...",
+      "stop_and_archive": "Durdur ve arşivle",
       "summary": {
         "added_filter_for_responses_where_answer_to_question": "Soru {questionIdx}'ye verilen yanıtın {filterComboBoxValue} - {filterValue} olduğu yanıtlar için filtre eklendi",
         "added_filter_for_responses_where_answer_to_question_is_skipped": "Soru {questionIdx}'ye verilen yanıtın atlandığı yanıtlar için filtre eklendi",
@@ -3827,8 +3839,10 @@
         "your_survey_is_public": "Anketin yayında",
         "youre_not_plugged_in_yet": "Henüz bağlantı kurmadın!"
       },
+      "survey_archived_successfully": "Anket arşivlendi",
       "survey_deleted_successfully": "Anket başarıyla silindi",
       "survey_duplicated_successfully": "Anket başarıyla kopyalandı",
+      "survey_restored_successfully": "Anket geri yüklendi",
       "templates": {
         "all_channels": "Tüm kanallar",
         "all_industries": "Tüm sektörler",
diff --git a/apps/web/locales/zh-Hans-CN.json b/apps/web/locales/zh-Hans-CN.json
index 3710d57ea7ba..dbc5bca39ea1 100644
--- a/apps/web/locales/zh-Hans-CN.json
+++ b/apps/web/locales/zh-Hans-CN.json
@@ -180,6 +180,7 @@
     "app_survey": "应用 程序 调查",
     "appearance": "外观",
     "apply_filters": "应用 筛选",
+    "archive": "归档",
     "archived": "已归档",
     "are_you_sure": "你 确定 吗？",
     "attributes": "属性",
@@ -2921,6 +2922,12 @@
       },
       "all_set_time_to_create_first_survey": "一切准备就绪！是时候创建您的第一个调查了",
       "alphabetical": "字母顺序",
+      "archive": "归档",
+      "archive_survey": "归档此调查问卷？",
+      "archive_survey_description": "你可以在接下来的30天内随时恢复它。",
+      "archive_survey_description_in_progress": "它将立即停止收集回复。",
+      "archive_survey_warning": "此调查问卷及其所有回复将在 30 天后永久删除。",
+      "archiving_survey": "正在归档问卷...",
       "change_status": "更改状态",
       "copy_survey": "复制问卷",
       "copy_survey_description": "选择要将此问卷复制到的工作区。",
@@ -3515,7 +3522,9 @@
         "your_web_app": "您的 网页应用",
         "zip": "邮编"
       },
+      "error_archiving_survey": "无法归档问卷，请重试",
       "error_deleting_survey": "删除问卷时发生错误",
+      "error_restoring_survey": "无法恢复问卷，请重试",
       "error_updating_status": "更新调查状态时出错",
       "featured_templates": {
         "churn_description": "了解用户取消订阅的原因。",
@@ -3577,6 +3586,8 @@
         "this_response_is_in_progress": "此 响应 正在 进行中。",
         "zip_post_code": "邮政编码"
       },
+      "restore": "恢复",
+      "restoring_survey": "正在恢复问卷...",
       "search_by_survey_name": "按 调查 名称 搜索",
       "share": {
         "anonymous_links": {
@@ -3708,6 +3719,7 @@
       },
       "status_updated_successfully": "调查状态更新成功",
       "status_updating": "正在更新调查状态...",
+      "stop_and_archive": "停止并归档",
       "summary": {
         "added_filter_for_responses_where_answer_to_question": "已添加筛选条件：问题 {questionIdx} 的答案为 {filterComboBoxValue} - {filterValue} 的回复",
         "added_filter_for_responses_where_answer_to_question_is_skipped": "为 回答 问题 {questionIdx} 的 答复 增加 了 筛选器，筛选条件 是 略过",
@@ -3827,8 +3839,10 @@
         "your_survey_is_public": "你的调查问卷已上线",
         "youre_not_plugged_in_yet": "您 还 没 有 连 接！"
       },
+      "survey_archived_successfully": "问卷已归档",
       "survey_deleted_successfully": "调查 删除 成功",
       "survey_duplicated_successfully": "调查成功复制。",
+      "survey_restored_successfully": "问卷已恢复",
       "templates": {
         "all_channels": "所有 渠道",
         "all_industries": "所有 行业",
diff --git a/apps/web/locales/zh-Hant-TW.json b/apps/web/locales/zh-Hant-TW.json
index fc272e90fcd2..9e8717215171 100644
--- a/apps/web/locales/zh-Hant-TW.json
+++ b/apps/web/locales/zh-Hant-TW.json
@@ -180,6 +180,7 @@
     "app_survey": "應用程式問卷",
     "appearance": "外觀",
     "apply_filters": "套用篩選器",
+    "archive": "封存",
     "archived": "已封存",
     "are_you_sure": "您確定嗎？",
     "attributes": "屬性",
@@ -2921,6 +2922,12 @@
       },
       "all_set_time_to_create_first_survey": "您已準備就緒！是時候建立您的第一個問卷",
       "alphabetical": "依字母順序",
+      "archive": "封存",
+      "archive_survey": "要封存這份問卷嗎?",
+      "archive_survey_description": "你可以在接下來的 30 天內隨時還原。",
+      "archive_survey_description_in_progress": "它將立即停止收集回覆。",
+      "archive_survey_warning": "這份問卷及其所有回覆將在 30 天後永久刪除。",
+      "archiving_survey": "正在封存問卷...",
       "change_status": "變更狀態",
       "copy_survey": "複製問卷",
       "copy_survey_description": "選擇要將此問卷複製到的工作區。",
@@ -3515,7 +3522,9 @@
         "your_web_app": "您的 Web 應用程式",
         "zip": "郵遞區號"
       },
+      "error_archiving_survey": "無法封存問卷,請再試一次",
       "error_deleting_survey": "刪除問卷時發生錯誤",
+      "error_restoring_survey": "無法還原問卷,請再試一次",
       "error_updating_status": "更新問卷狀態時發生錯誤",
       "featured_templates": {
         "churn_description": "了解用戶取消訂閱的原因。",
@@ -3577,6 +3586,8 @@
         "this_response_is_in_progress": "此回應正在進行中。",
         "zip_post_code": "郵遞區號"
       },
+      "restore": "還原",
+      "restoring_survey": "正在還原問卷...",
       "search_by_survey_name": "依問卷名稱搜尋",
       "share": {
         "anonymous_links": {
@@ -3708,6 +3719,7 @@
       },
       "status_updated_successfully": "問卷狀態已成功更新",
       "status_updating": "正在更新問卷狀態...",
+      "stop_and_archive": "停止並封存",
       "summary": {
         "added_filter_for_responses_where_answer_to_question": "已新增回答第 {questionIdx} 題為 {filterComboBoxValue} - {filterValue} 的回覆篩選器",
         "added_filter_for_responses_where_answer_to_question_is_skipped": "已新增回應的篩選器，其中問題 {questionIdx} 的答案被跳過",
@@ -3827,8 +3839,10 @@
         "your_survey_is_public": "您的問卷已上線",
         "youre_not_plugged_in_yet": "您尚未插入任何內容！"
       },
+      "survey_archived_successfully": "問卷已封存",
       "survey_deleted_successfully": "問卷已成功刪除！",
       "survey_duplicated_successfully": "問卷已成功複製。",
+      "survey_restored_successfully": "問卷已還原",
       "templates": {
         "all_channels": "所有管道",
         "all_industries": "所有產業",
diff --git a/apps/web/modules/ee/audit-logs/types/audit-log.ts b/apps/web/modules/ee/audit-logs/types/audit-log.ts
index 73911b44f325..beb61341f33f 100644
--- a/apps/web/modules/ee/audit-logs/types/audit-log.ts
+++ b/apps/web/modules/ee/audit-logs/types/audit-log.ts
@@ -35,6 +35,8 @@ export const ZAuditAction = z.enum([
   "created",
   "updated",
   "deleted",
+  "archived",
+  "restored",
   "signedIn",
   "merged",
   "verificationEmailSent",
diff --git a/apps/web/modules/ee/contacts/lib/surveys.test.ts b/apps/web/modules/ee/contacts/lib/surveys.test.ts
index 42a327d8c900..0cb3016051cc 100644
--- a/apps/web/modules/ee/contacts/lib/surveys.test.ts
+++ b/apps/web/modules/ee/contacts/lib/surveys.test.ts
@@ -37,7 +37,7 @@ describe("getPublishedLinkSurveys", () => {
     expect(result[2]).toEqual({ id: "survey3", name: "NPS Survey" });
 
     expect(prisma.survey.findMany).toHaveBeenCalledWith({
-      where: { workspaceId: workspaceId, status: "inProgress", type: "link" },
+      where: { workspaceId: workspaceId, status: "inProgress", type: "link", archivedAt: null },
       select: {
         id: true,
         name: true,
diff --git a/apps/web/modules/ee/contacts/lib/surveys.ts b/apps/web/modules/ee/contacts/lib/surveys.ts
index 29f2a97a9ef1..2e8ff7cdff28 100644
--- a/apps/web/modules/ee/contacts/lib/surveys.ts
+++ b/apps/web/modules/ee/contacts/lib/surveys.ts
@@ -13,7 +13,7 @@ export const getPublishedLinkSurveys = reactCache(
   async (workspaceId: string): Promise<PublishedLinkSurvey[]> => {
     try {
       const surveys = await prisma.survey.findMany({
-        where: { workspaceId, status: "inProgress", type: "link" },
+        where: { workspaceId, status: "inProgress", type: "link", archivedAt: null },
         select: {
           id: true,
           name: true,
diff --git a/apps/web/modules/survey/archive/lib/constants.ts b/apps/web/modules/survey/archive/lib/constants.ts
new file mode 100644
index 000000000000..f9a11b778d1f
--- /dev/null
+++ b/apps/web/modules/survey/archive/lib/constants.ts
@@ -0,0 +1,12 @@
+// Archived surveys are permanently deleted after this many days (see ENG-1042).
+export const SURVEY_ARCHIVE_RETENTION_DAYS = 30;
+
+// Number of archived surveys purged per DB round-trip.
+export const SURVEY_ARCHIVE_PURGE_BATCH_SIZE = 100;
+
+// Daily at 01:30 in the same time zone as survey scheduling, offset from the scheduling job.
+export const SURVEY_ARCHIVE_PURGE_TIME_ZONE =
+  process.env.NEXT_PUBLIC_SURVEY_SCHEDULING_TIME_ZONE ?? "Europe/Berlin";
+export const SURVEY_ARCHIVE_PURGE_DAILY_CRON_PATTERN = "30 1 * * *";
+export const SURVEY_ARCHIVE_PURGE_GLOBAL_SCOPE = "global";
+export const SURVEY_ARCHIVE_PURGE_DAILY_SCHEDULE_ID = "daily-survey-archive-purge";
diff --git a/apps/web/modules/survey/archive/lib/process-survey-archive-purge-job.test.ts b/apps/web/modules/survey/archive/lib/process-survey-archive-purge-job.test.ts
new file mode 100644
index 000000000000..e427d3565de9
--- /dev/null
+++ b/apps/web/modules/survey/archive/lib/process-survey-archive-purge-job.test.ts
@@ -0,0 +1,135 @@
+import { beforeEach, describe, expect, test, vi } from "vitest";
+import { prisma } from "@formbricks/database";
+import { ResourceNotFoundError } from "@formbricks/types/errors";
+import { SURVEY_ARCHIVE_PURGE_BATCH_SIZE } from "@/modules/survey/archive/lib/constants";
+import { queueAuditEventWithoutRequest } from "@/modules/ee/audit-logs/lib/handler";
+import { deleteSurvey } from "@/modules/survey/lib/surveys";
+import { getSurveyArchivePurgeCutoff, purgeExpiredArchivedSurveys } from "./process-survey-archive-purge-job";
+
+vi.mock("@formbricks/database", () => ({
+  prisma: {
+    survey: {
+      findMany: vi.fn(),
+    },
+  },
+}));
+
+vi.mock("@formbricks/logger", () => ({
+  logger: { info: vi.fn(), warn: vi.fn(), error: vi.fn() },
+}));
+
+vi.mock("@/modules/survey/lib/surveys", () => ({
+  deleteSurvey: vi.fn(),
+}));
+
+vi.mock("@/modules/ee/audit-logs/lib/handler", () => ({
+  queueAuditEventWithoutRequest: vi.fn().mockResolvedValue(undefined),
+}));
+
+const makeSurvey = (id: string) => ({
+  id,
+  workspaceId: "ws_1",
+  workspace: { organizationId: "org_1" },
+});
+
+describe("getSurveyArchivePurgeCutoff", () => {
+  test("returns a cutoff 30 days before now", () => {
+    const now = new Date("2026-07-31T00:00:00.000Z");
+    expect(getSurveyArchivePurgeCutoff(now).toISOString()).toBe("2026-07-01T00:00:00.000Z");
+  });
+});
+
+describe("purgeExpiredArchivedSurveys", () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+    vi.mocked(queueAuditEventWithoutRequest).mockResolvedValue(undefined as never);
+  });
+
+  test("queries surveys archived before the cutoff and deletes each one with the eligibility guard", async () => {
+    vi.mocked(prisma.survey.findMany)
+      .mockResolvedValueOnce([makeSurvey("s1"), makeSurvey("s2")] as never)
+      .mockResolvedValueOnce([] as never);
+    vi.mocked(deleteSurvey).mockResolvedValue({} as never);
+
+    const now = new Date("2026-07-31T00:00:00.000Z");
+    const cutoff = getSurveyArchivePurgeCutoff(now);
+    const purged = await purgeExpiredArchivedSurveys(now);
+
+    expect(purged).toBe(2);
+    // The delete is guarded so a survey restored mid-batch is skipped rather than hard-deleted.
+    expect(deleteSurvey).toHaveBeenCalledWith("s1", { requireArchivedBefore: cutoff });
+    expect(deleteSurvey).toHaveBeenCalledWith("s2", { requireArchivedBefore: cutoff });
+    expect(vi.mocked(prisma.survey.findMany).mock.calls[0][0]).toMatchObject({
+      where: { archivedAt: { lt: cutoff } },
+      orderBy: { archivedAt: "asc" },
+      take: SURVEY_ARCHIVE_PURGE_BATCH_SIZE,
+    });
+  });
+
+  test("does not stop the batch when a single deletion fails", async () => {
+    vi.mocked(prisma.survey.findMany)
+      .mockResolvedValueOnce([makeSurvey("s1"), makeSurvey("s2")] as never)
+      .mockResolvedValueOnce([] as never);
+    vi.mocked(deleteSurvey)
+      .mockRejectedValueOnce(new Error("boom"))
+      .mockResolvedValueOnce({} as never);
+
+    const purged = await purgeExpiredArchivedSurveys(new Date("2026-07-31T00:00:00.000Z"));
+
+    expect(purged).toBe(1);
+    expect(deleteSurvey).toHaveBeenCalledTimes(2);
+  });
+
+  test("treats a restored/already-gone survey (ResourceNotFoundError) as skipped, not failed", async () => {
+    vi.mocked(prisma.survey.findMany)
+      .mockResolvedValueOnce([makeSurvey("s1"), makeSurvey("s2")] as never)
+      .mockResolvedValueOnce([] as never);
+    vi.mocked(deleteSurvey)
+      .mockRejectedValueOnce(new ResourceNotFoundError("Survey", "s1"))
+      .mockResolvedValueOnce({} as never);
+
+    const purged = await purgeExpiredArchivedSurveys(new Date("2026-07-31T00:00:00.000Z"));
+
+    // s1 was restored between selection and delete, so it is skipped (not counted); s2 is purged.
+    expect(purged).toBe(1);
+    expect(deleteSurvey).toHaveBeenCalledTimes(2);
+    // The short batch ends the run in one query, and the skipped survey is never added to the
+    // failed-exclusion set (a restored survey already drops out of the archivedAt<cutoff filter).
+    expect(vi.mocked(prisma.survey.findMany)).toHaveBeenCalledTimes(1);
+  });
+
+  test("excludes a persistently failing survey from later batches so the loop terminates", async () => {
+    // First batch is full and the head survey always fails; a real DB would then exclude it via
+    // id:notIn and return the remainder. Assert the second query carries the exclusion and the run ends.
+    const fullBatch = Array.from({ length: SURVEY_ARCHIVE_PURGE_BATCH_SIZE }, (_, i) => makeSurvey(`s${i}`));
+    vi.mocked(prisma.survey.findMany)
+      .mockResolvedValueOnce(fullBatch as never)
+      .mockResolvedValueOnce([] as never);
+    // Only the first survey (s0) fails; the rest succeed.
+    vi.mocked(deleteSurvey).mockImplementation((id: string) =>
+      id === "s0" ? Promise.reject(new Error("boom")) : (Promise.resolve({}) as never)
+    );
+
+    const purged = await purgeExpiredArchivedSurveys(new Date("2026-07-31T00:00:00.000Z"));
+
+    expect(purged).toBe(SURVEY_ARCHIVE_PURGE_BATCH_SIZE - 1);
+    expect(vi.mocked(prisma.survey.findMany)).toHaveBeenCalledTimes(2);
+    const secondCallWhere = vi.mocked(prisma.survey.findMany).mock.calls[1][0] as {
+      where: { id?: { notIn: string[] } };
+    };
+    expect(secondCallWhere.where.id).toEqual({ notIn: ["s0"] });
+  });
+
+  test("counts the delete as purged even when the audit enqueue fails", async () => {
+    vi.mocked(prisma.survey.findMany)
+      .mockResolvedValueOnce([makeSurvey("s1")] as never)
+      .mockResolvedValueOnce([] as never);
+    vi.mocked(deleteSurvey).mockResolvedValue({} as never);
+    vi.mocked(queueAuditEventWithoutRequest).mockRejectedValueOnce(new Error("audit down") as never);
+
+    const purged = await purgeExpiredArchivedSurveys(new Date("2026-07-31T00:00:00.000Z"));
+
+    expect(purged).toBe(1);
+    expect(queueAuditEventWithoutRequest).toHaveBeenCalledTimes(1);
+  });
+});
diff --git a/apps/web/modules/survey/archive/lib/process-survey-archive-purge-job.ts b/apps/web/modules/survey/archive/lib/process-survey-archive-purge-job.ts
new file mode 100644
index 000000000000..4691c5c78c67
--- /dev/null
+++ b/apps/web/modules/survey/archive/lib/process-survey-archive-purge-job.ts
@@ -0,0 +1,152 @@
+import "server-only";
+import { prisma } from "@formbricks/database";
+import type { JobHandler, TSurveyArchivePurgeJobData } from "@formbricks/jobs";
+import { logger } from "@formbricks/logger";
+import { ResourceNotFoundError } from "@formbricks/types/errors";
+import { queueAuditEventWithoutRequest } from "@/modules/ee/audit-logs/lib/handler";
+import {
+  SURVEY_ARCHIVE_PURGE_BATCH_SIZE,
+  SURVEY_ARCHIVE_RETENTION_DAYS,
+} from "@/modules/survey/archive/lib/constants";
+import { deleteSurvey } from "@/modules/survey/lib/surveys";
+
+const MS_PER_DAY = 24 * 60 * 60 * 1000;
+
+/** Surveys archived on or before this cutoff are past the retention window and can be purged. */
+export const getSurveyArchivePurgeCutoff = (now: Date): Date =>
+  new Date(now.getTime() - SURVEY_ARCHIVE_RETENTION_DAYS * MS_PER_DAY);
+
+/**
+ * Permanently deletes archived surveys whose retention window has elapsed. Runs on a daily cron.
+ * Each survey is deleted independently so a single failure does not abort the batch, and each
+ * deletion is recorded in the audit log with a system actor.
+ */
+// Upper bound on batches per run. Progress is normally guaranteed (each batch either purges rows or
+// excludes failed ones), so this is a defensive backstop against an unforeseen non-terminating state,
+// not the expected exit. At 100/batch this covers 1M eligible surveys before deferring to the next run.
+const MAX_PURGE_BATCHES = 10_000;
+
+type TExpiredSurvey = {
+  id: string;
+  workspaceId: string;
+  workspace: { organizationId: string };
+};
+
+type TPurgeOutcome = "purged" | "skipped" | "failed";
+
+/**
+ * Permanently delete one archived survey and record the audit event. Returns the outcome so the
+ * caller can count purges and isolate failures without unwinding the batch:
+ * - "purged":  the survey was deleted (audit failures are logged, not fatal — the row is already gone)
+ * - "skipped": the survey was restored or already gone (no longer eligible, will not reappear)
+ * - "failed":  a real deletion error; the caller excludes it from later batches this run
+ */
+const purgeArchivedSurvey = async (survey: TExpiredSurvey, cutoff: Date): Promise<TPurgeOutcome> => {
+  try {
+    // Guarded delete: the survey is re-checked (locked) inside deleteSurvey's transaction so a
+    // survey restored after this batch was selected is skipped, not permanently deleted.
+    await deleteSurvey(survey.id, { requireArchivedBefore: cutoff });
+  } catch (error) {
+    // Restored or already gone between selection and delete — no longer eligible, won't reappear.
+    if (error instanceof ResourceNotFoundError) {
+      return "skipped";
+    }
+
+    logger.error(
+      { err: error, surveyId: survey.id, workspaceId: survey.workspaceId },
+      "Failed to purge archived survey"
+    );
+    return "failed";
+  }
+
+  // Await the audit enqueue so a hard delete is not left without an audit record if the process exits
+  // before a fire-and-forget promise flushes. A failed enqueue is logged, not fatal.
+  try {
+    await queueAuditEventWithoutRequest({
+      action: "deleted",
+      organizationId: survey.workspace.organizationId,
+      status: "success",
+      targetId: survey.id,
+      targetType: "survey",
+      userId: "system",
+      userType: "system",
+    });
+  } catch (auditError) {
+    logger.error(
+      { err: auditError, surveyId: survey.id, workspaceId: survey.workspaceId },
+      "Survey archive purge audit log failed"
+    );
+  }
+
+  return "purged";
+};
+
+export const purgeExpiredArchivedSurveys = async (now: Date = new Date()): Promise<number> => {
+  const cutoff = getSurveyArchivePurgeCutoff(now);
+  let purgedCount = 0;
+  let batches = 0;
+  // Surveys that threw a non-recoverable error this run. Excluded from subsequent batches so a single
+  // poison-pill row cannot be re-selected forever (it sorts to the head of every archivedAt-asc page).
+  const failedSurveyIds = new Set<string>();
+
+  while (batches < MAX_PURGE_BATCHES) {
+    batches += 1;
+    const expiredSurveys = await prisma.survey.findMany({
+      where: {
+        archivedAt: { lt: cutoff },
+        ...(failedSurveyIds.size > 0 ? { id: { notIn: Array.from(failedSurveyIds) } } : {}),
+      },
+      orderBy: { archivedAt: "asc" },
+      take: SURVEY_ARCHIVE_PURGE_BATCH_SIZE,
+      select: {
+        id: true,
+        workspaceId: true,
+        workspace: { select: { organizationId: true } },
+      },
+    });
+
+    if (expiredSurveys.length === 0) {
+      break;
+    }
+
+    for (const survey of expiredSurveys) {
+      const outcome = await purgeArchivedSurvey(survey, cutoff);
+      if (outcome === "purged") {
+        purgedCount += 1;
+      } else if (outcome === "failed") {
+        failedSurveyIds.add(survey.id);
+      }
+    }
+
+    // A short batch means every remaining eligible survey has been attempted; stop looping.
+    if (expiredSurveys.length < SURVEY_ARCHIVE_PURGE_BATCH_SIZE) {
+      break;
+    }
+  }
+
+  if (batches >= MAX_PURGE_BATCHES) {
+    logger.warn(
+      { cutoff: cutoff.toISOString(), purgedCount, batches },
+      "Survey archive purge hit the batch cap; remaining surveys defer to the next scheduled run"
+    );
+  }
+
+  return purgedCount;
+};
+
+export const processSurveyArchivePurgeJob: JobHandler<TSurveyArchivePurgeJobData> = async (data, context) => {
+  const logContext = {
+    attempt: context.attempt,
+    jobId: context.jobId,
+    jobName: context.jobName,
+    maxAttempts: context.maxAttempts,
+    queueName: context.queueName,
+    scope: data.scope,
+  };
+
+  logger.info(logContext, "Survey archive purge job started");
+
+  const purgedCount = await purgeExpiredArchivedSurveys(new Date());
+
+  logger.info({ ...logContext, purgedCount }, "Survey archive purge job completed");
+};
diff --git a/apps/web/modules/survey/lib/surveys.test.ts b/apps/web/modules/survey/lib/surveys.test.ts
index 97590ffb3369..33692067b9ab 100644
--- a/apps/web/modules/survey/lib/surveys.test.ts
+++ b/apps/web/modules/survey/lib/surveys.test.ts
@@ -4,7 +4,7 @@ import { Prisma } from "@formbricks/database/prisma";
 import { logger } from "@formbricks/logger";
 import { DatabaseError, ResourceNotFoundError } from "@formbricks/types/errors";
 import { validateInputs } from "@/lib/utils/validate";
-import { deleteSurvey } from "./surveys";
+import { archiveSurvey, deleteSurvey, restoreSurvey } from "./surveys";
 
 vi.mock("@/lib/utils/validate", () => ({
   validateInputs: vi.fn(),
@@ -13,6 +13,9 @@ vi.mock("@/lib/utils/validate", () => ({
 vi.mock("@formbricks/database", () => ({
   prisma: {
     $transaction: vi.fn(),
+    survey: {
+      update: vi.fn(),
+    },
   },
 }));
 
@@ -137,4 +140,169 @@ describe("deleteSurvey", () => {
     await expect(deleteSurvey(invalidSurveyId)).rejects.toThrow(validationError);
     expect(prisma.$transaction).not.toHaveBeenCalled();
   });
+
+  test("skips the guarded delete when the survey was restored before the purge deletes it", async () => {
+    const cutoff = new Date("2026-07-01T00:00:00.000Z");
+    const queryRawMock = vi.fn().mockResolvedValue([]);
+    // archivedAt cleared -> restored between batch selection and delete.
+    const findUniqueMock = vi.fn().mockResolvedValue({ archivedAt: null });
+    const deleteMock = vi.fn();
+
+    vi.mocked(prisma.$transaction).mockImplementation(async (callback) =>
+      callback({
+        $queryRaw: queryRawMock,
+        survey: { findUnique: findUniqueMock, delete: deleteMock },
+        segment: { delete: vi.fn() },
+      } as never)
+    );
+
+    await expect(deleteSurvey(surveyId, { requireArchivedBefore: cutoff })).rejects.toThrow(
+      ResourceNotFoundError
+    );
+    expect(queryRawMock).toHaveBeenCalled();
+    expect(deleteMock).not.toHaveBeenCalled();
+  });
+
+  test("performs the guarded delete when the survey is still archived before the cutoff", async () => {
+    const cutoff = new Date("2026-07-01T00:00:00.000Z");
+    const queryRawMock = vi.fn().mockResolvedValue([]);
+    const findUniqueMock = vi.fn().mockResolvedValue({ archivedAt: new Date("2026-05-01T00:00:00.000Z") });
+    const deleteMock = vi.fn().mockResolvedValue(mockDeletedSurveyLink);
+
+    vi.mocked(prisma.$transaction).mockImplementation(async (callback) =>
+      callback({
+        $queryRaw: queryRawMock,
+        survey: { findUnique: findUniqueMock, delete: deleteMock },
+        segment: { delete: vi.fn() },
+      } as never)
+    );
+
+    const result = await deleteSurvey(surveyId, { requireArchivedBefore: cutoff });
+
+    expect(queryRawMock).toHaveBeenCalled();
+    expect(deleteMock).toHaveBeenCalled();
+    expect(result).toEqual(mockDeletedSurveyLink);
+  });
+});
+
+describe("archiveSurvey", () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  test("should archive an inProgress survey by pausing it, preserving publishOn", async () => {
+    const findUniqueMock = vi
+      .fn()
+      .mockResolvedValue({ id: surveyId, status: "inProgress", archivedAt: null });
+    const updateMock = vi.fn().mockResolvedValue({ id: surveyId, status: "paused", archivedAt: new Date() });
+
+    vi.mocked(prisma.$transaction).mockImplementation(async (callback) =>
+      callback({ survey: { findUnique: findUniqueMock, update: updateMock } } as never)
+    );
+
+    await archiveSurvey(surveyId);
+
+    expect(updateMock).toHaveBeenCalledWith({
+      where: { id: surveyId },
+      data: { archivedAt: expect.any(Date), status: "paused" },
+      select: { id: true, status: true, archivedAt: true },
+    });
+  });
+
+  test("should archive a paused survey without changing its status or publishOn", async () => {
+    const findUniqueMock = vi.fn().mockResolvedValue({ id: surveyId, status: "paused", archivedAt: null });
+    const updateMock = vi.fn().mockResolvedValue({ id: surveyId, status: "paused", archivedAt: new Date() });
+
+    vi.mocked(prisma.$transaction).mockImplementation(async (callback) =>
+      callback({ survey: { findUnique: findUniqueMock, update: updateMock } } as never)
+    );
+
+    await archiveSurvey(surveyId);
+
+    expect(updateMock).toHaveBeenCalledWith({
+      where: { id: surveyId },
+      data: { archivedAt: expect.any(Date) },
+      select: { id: true, status: true, archivedAt: true },
+    });
+  });
+
+  test("should be a no-op when the survey is already archived", async () => {
+    const alreadyArchived = { id: surveyId, status: "paused", archivedAt: new Date() };
+    const findUniqueMock = vi.fn().mockResolvedValue(alreadyArchived);
+    const updateMock = vi.fn();
+
+    vi.mocked(prisma.$transaction).mockImplementation(async (callback) =>
+      callback({ survey: { findUnique: findUniqueMock, update: updateMock } } as never)
+    );
+
+    const result = await archiveSurvey(surveyId);
+
+    expect(updateMock).not.toHaveBeenCalled();
+    expect(result).toEqual(alreadyArchived);
+  });
+
+  test("should throw ResourceNotFoundError when the survey does not exist", async () => {
+    const findUniqueMock = vi.fn().mockResolvedValue(null);
+
+    vi.mocked(prisma.$transaction).mockImplementation(async (callback) =>
+      callback({ survey: { findUnique: findUniqueMock, update: vi.fn() } } as never)
+    );
+
+    await expect(archiveSurvey(surveyId)).rejects.toThrow(ResourceNotFoundError);
+  });
+
+  test("should map Prisma P2025 during archive to ResourceNotFoundError", async () => {
+    // A concurrent delete between findUnique and update raises P2025; match restoreSurvey's contract.
+    const prismaError = new Prisma.PrismaClientKnownRequestError("Record not found", {
+      code: "P2025",
+      clientVersion: "4.0.0",
+    });
+    vi.mocked(prisma.$transaction).mockRejectedValue(prismaError);
+
+    await expect(archiveSurvey(surveyId)).rejects.toThrow(ResourceNotFoundError);
+    expect(logger.warn).toHaveBeenCalledWith({ surveyId }, "Survey not found during archive");
+  });
+});
+
+describe("restoreSurvey", () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  test("should restore a survey by clearing archivedAt", async () => {
+    vi.mocked(prisma.survey.update).mockResolvedValue({
+      id: surveyId,
+      status: "paused",
+      archivedAt: null,
+    } as never);
+
+    await restoreSurvey(surveyId);
+
+    expect(prisma.survey.update).toHaveBeenCalledWith({
+      where: { id: surveyId },
+      data: { archivedAt: null },
+      select: { id: true, status: true, archivedAt: true },
+    });
+  });
+
+  test("should map Prisma P2025 during restore to ResourceNotFoundError", async () => {
+    const prismaError = new Prisma.PrismaClientKnownRequestError("Record not found", {
+      code: "P2025",
+      clientVersion: "4.0.0",
+    });
+    vi.mocked(prisma.survey.update).mockRejectedValue(prismaError);
+
+    await expect(restoreSurvey(surveyId)).rejects.toThrow(ResourceNotFoundError);
+  });
+
+  test("should map a non-P2025 PrismaClientKnownRequestError during restore to DatabaseError", async () => {
+    const prismaError = new Prisma.PrismaClientKnownRequestError("Constraint failed", {
+      code: "P2003",
+      clientVersion: "4.0.0",
+    });
+    vi.mocked(prisma.survey.update).mockRejectedValue(prismaError);
+
+    await expect(restoreSurvey(surveyId)).rejects.toThrow(DatabaseError);
+    expect(logger.error).toHaveBeenCalledWith({ error: prismaError, surveyId }, "Error restoring survey");
+  });
 });
diff --git a/apps/web/modules/survey/lib/surveys.ts b/apps/web/modules/survey/lib/surveys.ts
index b57094bba4dc..e688c539cf54 100644
--- a/apps/web/modules/survey/lib/surveys.ts
+++ b/apps/web/modules/survey/lib/surveys.ts
@@ -7,11 +7,33 @@ import { ZId } from "@formbricks/types/common";
 import { DatabaseError, ResourceNotFoundError } from "@formbricks/types/errors";
 import { validateInputs } from "@/lib/utils/validate";
 
-export const deleteSurvey = async (surveyId: string) => {
+/**
+ * Permanently deletes a survey and cascades private-segment cleanup.
+ *
+ * `options.requireArchivedBefore` guards the purge cron against a restore-vs-purge race: the survey
+ * row is locked FOR UPDATE and its `archivedAt` re-checked inside the same transaction as the delete,
+ * so a survey restored (archivedAt cleared) after the purge batch was selected is skipped rather than
+ * hard-deleted. When the guard fails the row is treated as gone (ResourceNotFoundError), never deleted.
+ */
+export const deleteSurvey = async (surveyId: string, options?: { requireArchivedBefore?: Date }) => {
   validateInputs([surveyId, ZId]);
 
   try {
     return await prisma.$transaction(async (tx) => {
+      if (options?.requireArchivedBefore) {
+        // Lock the row so a concurrent restore blocks until this transaction resolves, then re-read
+        // the current archivedAt. If the survey was restored (or moved out of the retention window),
+        // skip the delete entirely — do not permanently delete a survey that is no longer eligible.
+        await tx.$queryRaw`SELECT id FROM "Survey" WHERE id = ${surveyId} FOR UPDATE`;
+        const guard = await tx.survey.findUnique({
+          where: { id: surveyId },
+          select: { archivedAt: true },
+        });
+        if (!guard?.archivedAt || guard.archivedAt >= options.requireArchivedBefore) {
+          throw new ResourceNotFoundError("Survey", surveyId);
+        }
+      }
+
       const deletedSurvey = await tx.survey.delete({
         where: {
           id: surveyId,
@@ -50,3 +72,85 @@ export const deleteSurvey = async (surveyId: string) => {
     throw error;
   }
 };
+
+/**
+ * Soft-delete (archive) a survey. Archived surveys are hidden from the default list, stop
+ * collecting responses, and are permanently deleted by the purge job after the retention window.
+ * - Sets archivedAt to now. publishOn is preserved so restore returns the survey unchanged: the
+ *   scheduling job already excludes archived surveys (archivedAt: null) from its publish/close scan,
+ *   so an archived survey can't auto-publish regardless — clearing publishOn would only destroy a
+ *   scheduled launch date that restore is supposed to hand back.
+ * - If the survey was inProgress, moves it to paused so response/display intake stops immediately.
+ * - Idempotent: archiving an already-archived survey is a no-op.
+ */
+export const archiveSurvey = async (surveyId: string) => {
+  validateInputs([surveyId, ZId]);
+
+  try {
+    return await prisma.$transaction(async (tx) => {
+      const survey = await tx.survey.findUnique({
+        where: { id: surveyId },
+        select: { id: true, status: true, archivedAt: true },
+      });
+
+      if (!survey) {
+        throw new ResourceNotFoundError("Survey", surveyId);
+      }
+
+      if (survey.archivedAt) {
+        return survey;
+      }
+
+      return await tx.survey.update({
+        where: { id: surveyId },
+        data: {
+          archivedAt: new Date(),
+          ...(survey.status === "inProgress" ? { status: "paused" } : {}),
+        },
+        select: { id: true, status: true, archivedAt: true },
+      });
+    });
+  } catch (error) {
+    if (error instanceof ResourceNotFoundError) {
+      throw error;
+    }
+
+    if (error instanceof Prisma.PrismaClientKnownRequestError) {
+      // Match restoreSurvey's contract: a row deleted mid-transaction (P2025) is "not found", not a 500.
+      if (error.code === "P2025") {
+        logger.warn({ surveyId }, "Survey not found during archive");
+        throw new ResourceNotFoundError("Survey", surveyId);
+      }
+
+      logger.error({ error, surveyId }, "Error archiving survey");
+      throw new DatabaseError(error.message);
+    }
+
+    throw error;
+  }
+};
+
+/** Restore an archived survey by clearing archivedAt. The survey keeps its current status. */
+export const restoreSurvey = async (surveyId: string) => {
+  validateInputs([surveyId, ZId]);
+
+  try {
+    return await prisma.survey.update({
+      where: { id: surveyId },
+      data: { archivedAt: null },
+      select: { id: true, status: true, archivedAt: true },
+    });
+  } catch (error) {
+    if (error instanceof Prisma.PrismaClientKnownRequestError) {
+      if (error.code === "P2025") {
+        logger.warn({ surveyId }, "Survey not found during restore");
+        throw new ResourceNotFoundError("Survey", surveyId);
+      }
+
+      logger.error({ error, surveyId }, "Error restoring survey");
+      throw new DatabaseError(error.message);
+    }
+
+    throw error;
+  }
+};
diff --git a/apps/web/modules/survey/lib/utils.test.ts b/apps/web/modules/survey/lib/utils.test.ts
index 0440bc49b869..4c5a052d4349 100644
--- a/apps/web/modules/survey/lib/utils.test.ts
+++ b/apps/web/modules/survey/lib/utils.test.ts
@@ -105,9 +105,31 @@ describe("Survey Utils", () => {
   });
 
   describe("buildWhereClause", () => {
-    test("should return an empty AND array if no filterCriteria is provided", () => {
+    test("should exclude archived surveys by default when no filterCriteria is provided", () => {
       const result = buildWhereClause();
-      expect(result).toEqual({ AND: [] });
+      expect(result).toEqual({ AND: [{ archivedAt: null }] });
+    });
+
+    test("should exclude archived surveys by default alongside a status filter", () => {
+      const filterCriteria: TSurveyFilterCriteria = { status: ["draft"] };
+      const result = buildWhereClause(filterCriteria);
+      expect(result.AND).toContainEqual({ archivedAt: null });
+      expect(result.AND).toContainEqual({ status: { in: ["draft"] } });
+    });
+
+    test("should return only archived surveys when includeArchived is set without a status filter", () => {
+      const filterCriteria: TSurveyFilterCriteria = { includeArchived: true };
+      const result = buildWhereClause(filterCriteria);
+      expect(result.AND).toContainEqual({ archivedAt: { not: null } });
+      expect(result.AND).not.toContainEqual({ archivedAt: null });
+    });
+
+    test("should OR active surveys of the selected status with all archived surveys", () => {
+      const filterCriteria: TSurveyFilterCriteria = { status: ["inProgress"], includeArchived: true };
+      const result = buildWhereClause(filterCriteria);
+      expect(result.AND).toContainEqual({
+        OR: [{ status: { in: ["inProgress"] }, archivedAt: null }, { archivedAt: { not: null } }],
+      });
     });
 
     test("should build where clause for name", () => {
@@ -165,6 +187,7 @@ describe("Survey Utils", () => {
       const result = buildWhereClause(filterCriteria);
       expect(result.AND).toEqual([
         { name: { contains: "Feedback Survey", mode: "insensitive" } },
+        { archivedAt: null },
         { status: { in: ["inProgress" as TSurveyStatus] } },
         { type: { in: ["app" as TSurveyType] } },
         { createdBy: "user456" },
diff --git a/apps/web/modules/survey/lib/utils.ts b/apps/web/modules/survey/lib/utils.ts
index 648ccca911a6..2cb45a3e2a13 100644
--- a/apps/web/modules/survey/lib/utils.ts
+++ b/apps/web/modules/survey/lib/utils.ts
@@ -24,6 +24,48 @@ export const transformPrismaSurvey = <T extends TSurvey | TJsWorkspaceStateSurve
   return transformedSurvey;
 };
 
+// Status + archived (soft-delete) handling.
+// Archived surveys (archivedAt not null) are hidden by default. The "Archived" filter sets
+// includeArchived; the server never receives a real "archived" status.
+const buildStatusArchivedClauses = (filterCriteria?: TSurveyFilterCriteria): Prisma.SurveyWhereInput[] => {
+  const hasStatusFilter = Boolean(filterCriteria?.status?.length);
+
+  if (filterCriteria?.includeArchived) {
+    if (hasStatusFilter) {
+      // Selected active statuses OR any archived survey (Archived behaves like an extra status).
+      return [
+        { OR: [{ status: { in: filterCriteria!.status }, archivedAt: null }, { archivedAt: { not: null } }] },
+      ];
+    }
+    // Only archived surveys.
+    return [{ archivedAt: { not: null } }];
+  }
+
+  // Default: exclude archived surveys, optionally narrowing to the selected statuses.
+  const clauses: Prisma.SurveyWhereInput[] = [{ archivedAt: null }];
+  if (hasStatusFilter) {
+    clauses.push({ status: { in: filterCriteria!.status } });
+  }
+  return clauses;
+};
+
+const buildCreatedByClause = (
+  createdBy?: TSurveyFilterCriteria["createdBy"]
+): Prisma.SurveyWhereInput | null => {
+  // Only a single-value createdBy filter maps to a clause ("you" or "others").
+  if (createdBy?.value?.length !== 1) {
+    return null;
+  }
+
+  if (createdBy.value[0] === "you") {
+    return { createdBy: createdBy.userId };
+  }
+  if (createdBy.value[0] === "others") {
+    return { OR: [{ createdBy: { not: createdBy.userId } }, { createdBy: null }] };
+  }
+  return null;
+};
+
 export const buildWhereClause = (filterCriteria?: TSurveyFilterCriteria) => {
   const whereClause: Prisma.SurveyWhereInput["AND"] = [];
 
@@ -32,37 +74,17 @@ export const buildWhereClause = (filterCriteria?: TSurveyFilterCriteria) => {
     whereClause.push({ name: { contains: filterCriteria.name, mode: "insensitive" } });
   }
 
-  // for status
-  if (filterCriteria?.status && filterCriteria?.status?.length) {
-    whereClause.push({ status: { in: filterCriteria.status } });
-  }
+  whereClause.push(...buildStatusArchivedClauses(filterCriteria));
 
   // for type
-  if (filterCriteria?.type && filterCriteria?.type?.length) {
+  if (filterCriteria?.type?.length) {
     whereClause.push({ type: { in: filterCriteria.type } });
   }
 
   // for createdBy
-  if (filterCriteria?.createdBy?.value && filterCriteria?.createdBy?.value?.length) {
-    if (filterCriteria.createdBy.value.length === 1) {
-      if (filterCriteria.createdBy.value[0] === "you") {
-        whereClause.push({ createdBy: filterCriteria.createdBy.userId });
-      }
-      if (filterCriteria.createdBy.value[0] === "others") {
-        whereClause.push({
-          OR: [
-            {
-              createdBy: {
-                not: filterCriteria.createdBy.userId,
-              },
-            },
-            {
-              createdBy: null,
-            },
-          ],
-        });
-      }
-    }
+  const createdByClause = buildCreatedByClause(filterCriteria?.createdBy);
+  if (createdByClause) {
+    whereClause.push(createdByClause);
   }
 
   return { AND: whereClause };
diff --git a/apps/web/modules/survey/link/components/survey-renderer.tsx b/apps/web/modules/survey/link/components/survey-renderer.tsx
index 9cdc7514f29d..7e05e4cacd30 100644
--- a/apps/web/modules/survey/link/components/survey-renderer.tsx
+++ b/apps/web/modules/survey/link/components/survey-renderer.tsx
@@ -64,7 +64,9 @@ export const renderSurvey = async ({
   const langParam = searchParams.lang;
   const isEmbed = searchParams.embed === "true";
 
-  if (survey.status === "draft" || survey.type !== "link") {
+  // Archived surveys are absent from the workspace for respondents — treat the public link as a
+  // missing survey (same as a draft or non-link survey) rather than showing an inactive/scheduled state.
+  if (survey.status === "draft" || survey.type !== "link" || survey.archivedAt) {
     notFound();
   }
 
diff --git a/apps/web/modules/survey/link/lib/data.ts b/apps/web/modules/survey/link/lib/data.ts
index 989e940d0bd8..83a454544c19 100644
--- a/apps/web/modules/survey/link/lib/data.ts
+++ b/apps/web/modules/survey/link/lib/data.ts
@@ -25,6 +25,7 @@ export const getSurveyWithMetadata = reactCache(async (surveyId: string) => {
         workspaceId: true,
         createdBy: true,
         status: true,
+        archivedAt: true,
 
         // Survey configuration
         welcomeCard: true,
diff --git a/apps/web/modules/survey/list/components/survey-card.tsx b/apps/web/modules/survey/list/components/survey-card.tsx
index ad1b6271531f..f094021cb9ad 100644
--- a/apps/web/modules/survey/list/components/survey-card.tsx
+++ b/apps/web/modules/survey/list/components/survey-card.tsx
@@ -1,5 +1,6 @@
 "use client";
 
+import { ArchiveIcon } from "lucide-react";
 import Link from "next/link";
 import { useMemo } from "react";
 import { useTranslation } from "react-i18next";
@@ -20,6 +21,8 @@ interface SurveyCardProps {
   isReadOnly: boolean;
   deleteSurvey: (surveyId: string) => Promise<void>;
   updateSurveyStatus: (surveyId: string, status: TSurveyStatus) => Promise<void>;
+  archiveSurvey: (surveyId: string) => Promise<void>;
+  restoreSurvey: (surveyId: string) => Promise<void>;
   locale: TUserLocale;
 }
 export const SurveyCard = ({
@@ -28,12 +31,15 @@ export const SurveyCard = ({
   isReadOnly,
   deleteSurvey,
   updateSurveyStatus,
+  archiveSurvey,
+  restoreSurvey,
   locale,
 }: Readonly<SurveyCardProps>) => {
   const { t } = useTranslation();
   const { workspace } = useWorkspace();
   const workspaceBasePath = `/workspaces/${workspace?.id}`;
-  const isScheduled = survey.status === "paused" && survey.publishOn !== null;
+  const isArchived = survey.archivedAt !== null;
+  const isScheduled = !isArchived && survey.status === "paused" && survey.publishOn !== null;
   const surveyStatusLabel = (() => {
     switch (survey.status) {
       case "inProgress":
@@ -52,18 +58,27 @@ export const SurveyCard = ({
   const isSurveyCreationDeletionDisabled = isReadOnly;
 
   const linkHref = useMemo(() => {
+    // Archived surveys are read-only; always send to summary (never the editor).
+    if (isArchived) {
+      return `${workspaceBasePath}/surveys/${survey.id}/summary`;
+    }
     return survey.status === "draft"
       ? `${workspaceBasePath}/surveys/${survey.id}/edit`
       : `${workspaceBasePath}/surveys/${survey.id}/summary`;
-  }, [survey.status, survey.id, workspaceBasePath]);
+  }, [isArchived, survey.status, survey.id, workspaceBasePath]);
+
+  // A read-only draft, or an archived draft (which has no summary), is not clickable.
+  const isCardNotClickable = survey.status === "draft" && (isReadOnly || isArchived);
 
-  const isDraftAndReadOnly = survey.status === "draft" && isReadOnly;
+  // The dropdown must stay enabled for archived surveys so they can be restored or deleted; only a
+  // read-only draft (which has no available actions) disables it.
+  const isDropdownDisabled = survey.status === "draft" && isReadOnly;
 
   const CardBody = (
     <div
       className={cn(
         "grid w-full grid-cols-8 place-items-center gap-3 rounded-xl border border-slate-200 bg-white p-4 pr-8 shadow-xs transition-colors ease-in-out",
-        !isDraftAndReadOnly && "hover:border-slate-400"
+        !isCardNotClickable && "hover:border-slate-400"
       )}>
       <div className="col-span-2 flex max-w-full items-center justify-self-start text-sm font-medium text-slate-900">
         <div className="w-full truncate">{survey.name}</div>
@@ -71,12 +86,25 @@ export const SurveyCard = ({
       <div
         className={cn(
           "col-span-1 flex w-fit items-center gap-2 rounded-full py-1 pr-2 pl-1 text-sm whitespace-nowrap text-slate-800",
-          survey.status === "inProgress" && "bg-emerald-50",
-          survey.status === "completed" && "bg-slate-200",
-          survey.status === "draft" && "bg-slate-100",
-          survey.status === "paused" && "bg-slate-100"
+          isArchived && "bg-slate-100",
+          !isArchived && survey.status === "inProgress" && "bg-emerald-50",
+          !isArchived && survey.status === "completed" && "bg-slate-200",
+          !isArchived && survey.status === "draft" && "bg-slate-100",
+          !isArchived && survey.status === "paused" && "bg-slate-100"
         )}>
-        <SurveyStatusIndicator status={survey.status} isScheduled={isScheduled} /> {surveyStatusLabel}{" "}
+        {isArchived ? (
+          <>
+            <div className="rounded-full bg-slate-300 p-1">
+              <ArchiveIcon className="size-3 text-slate-600" />
+            </div>{" "}
+            {t("common.archived")}
+          </>
+        ) : (
+          <>
+            <SurveyStatusIndicator status={survey.status} isScheduled={isScheduled} />{" "}
+            {surveyStatusLabel}{" "}
+          </>
+        )}
       </div>
       <div className="col-span-1 max-w-full overflow-hidden text-sm text-ellipsis whitespace-nowrap text-slate-600">
         {survey.responseCount}
@@ -98,7 +126,7 @@ export const SurveyCard = ({
 
   return (
     <div className="relative block">
-      {isDraftAndReadOnly ? (
+      {isCardNotClickable ? (
         CardBody
       ) : (
         <Link href={linkHref} key={survey.id} className="block">
@@ -110,11 +138,13 @@ export const SurveyCard = ({
           survey={survey}
           key={`surveys-${survey.id}`}
           publicDomain={publicDomain}
-          disabled={isDraftAndReadOnly}
+          disabled={isDropdownDisabled}
           isSurveyCreationDeletionDisabled={isSurveyCreationDeletionDisabled}
           isReadOnly={isReadOnly}
           deleteSurvey={deleteSurvey}
           updateSurveyStatus={updateSurveyStatus}
+          archiveSurvey={archiveSurvey}
+          restoreSurvey={restoreSurvey}
         />
       </div>
     </div>
diff --git a/apps/web/modules/survey/list/components/survey-dropdown-menu.tsx b/apps/web/modules/survey/list/components/survey-dropdown-menu.tsx
index ff277fda2e7c..d0535650bbd0 100644
--- a/apps/web/modules/survey/list/components/survey-dropdown-menu.tsx
+++ b/apps/web/modules/survey/list/components/survey-dropdown-menu.tsx
@@ -3,6 +3,8 @@
 import { useQueryClient } from "@tanstack/react-query";
 import type { TFunction } from "i18next";
 import {
+  ArchiveIcon,
+  ArchiveRestoreIcon,
   ArrowRightLeftIcon,
   CopyIcon,
   EyeIcon,
@@ -28,6 +30,7 @@ import { copySurveyToOtherWorkspaceAction } from "@/modules/survey/list/actions"
 import { CopySurveyModal } from "@/modules/survey/list/components/copy-survey-modal";
 import { surveyKeys } from "@/modules/survey/list/lib/query";
 import { TSurveyListItem } from "@/modules/survey/list/types/survey-overview";
+import { ConfirmationModal } from "@/modules/ui/components/confirmation-modal";
 import { DeleteDialog } from "@/modules/ui/components/delete-dialog";
 import {
   DropdownMenu,
@@ -51,6 +54,8 @@ interface SurveyDropDownMenuProps {
   isReadOnly: boolean;
   deleteSurvey: (surveyId: string) => Promise<void>;
   updateSurveyStatus: (surveyId: string, status: TSurveyStatus) => Promise<void>;
+  archiveSurvey: (surveyId: string) => Promise<void>;
+  restoreSurvey: (surveyId: string) => Promise<void>;
 }
 
 // Non-draft statuses that can be targeted by a status change from the list.
@@ -64,12 +69,16 @@ export const SurveyDropDownMenu = ({
   isReadOnly,
   deleteSurvey,
   updateSurveyStatus,
+  archiveSurvey,
+  restoreSurvey,
 }: Readonly<SurveyDropDownMenuProps>) => {
   const { workspace } = useWorkspace();
 
   const { t } = useTranslation();
   const [isDeleteDialogOpen, setDeleteDialogOpen] = useState(false);
+  const [isArchiveDialogOpen, setArchiveDialogOpen] = useState(false);
   const [loading, setLoading] = useState(false);
+  const [isArchiving, setIsArchiving] = useState(false);
   const [isDuplicating, setIsDuplicating] = useState(false);
   const [isDropDownOpen, setIsDropDownOpen] = useState(false);
   const [isCautionDialogOpen, setIsCautionDialogOpen] = useState(false);
@@ -81,11 +90,15 @@ export const SurveyDropDownMenu = ({
 
   const surveyLink = useMemo(() => `${publicDomain}/s/${survey.id}`, [publicDomain, survey.id]);
   const isSingleUseEnabled = survey.singleUse?.enabled ?? false;
+  const isArchived = survey.archivedAt !== null;
   const canManageSurvey = !isSurveyCreationDeletionDisabled;
-  const canPreviewOrCopyLink = survey.type === "link" && survey.status !== "draft";
+  const canPreviewOrCopyLink = !isArchived && survey.type === "link" && survey.status !== "draft";
   // Show the status submenu for non-draft surveys when the user has write access.
-  const canChangeStatus = !isReadOnly && survey.status !== "draft";
-  const hasVisibleActions = canManageSurvey || canPreviewOrCopyLink || canChangeStatus;
+  const canChangeStatus = !isArchived && !isReadOnly && survey.status !== "draft";
+  const isInProgress = survey.status === "inProgress";
+  const hasVisibleActions = isArchived
+    ? canManageSurvey
+    : canManageSurvey || canPreviewOrCopyLink || canChangeStatus;
 
   const getStatusLabel = (t: TFunction, status: TSurveyStatus): string => {
     switch (status) {
@@ -128,6 +141,35 @@ export const SurveyDropDownMenu = ({
     }
   };
 
+  const handleArchiveSurvey = async () => {
+    setIsArchiving(true);
+    const toastId = toast.loading(t("workspace.surveys.archiving_survey"));
+    try {
+      await archiveSurvey(survey.id);
+      toast.success(t("workspace.surveys.survey_archived_successfully"), { id: toastId });
+      setArchiveDialogOpen(false);
+    } catch (error) {
+      toast.error(getV3ApiErrorMessage(error, t("workspace.surveys.error_archiving_survey")), {
+        id: toastId,
+      });
+    } finally {
+      setIsArchiving(false);
+    }
+  };
+
+  const handleRestoreSurvey = async () => {
+    setIsDropDownOpen(false);
+    const toastId = toast.loading(t("workspace.surveys.restoring_survey"));
+    try {
+      await restoreSurvey(survey.id);
+      toast.success(t("workspace.surveys.survey_restored_successfully"), { id: toastId });
+    } catch (error) {
+      toast.error(getV3ApiErrorMessage(error, t("workspace.surveys.error_restoring_survey")), {
+        id: toastId,
+      });
+    }
+  };
+
   const handleCopyLink = async (e: React.MouseEvent<HTMLButtonElement>) => {
     try {
       e.preventDefault();
@@ -193,7 +235,31 @@ export const SurveyDropDownMenu = ({
         </DropdownMenuTrigger>
         <DropdownMenuContent className="inline-block w-auto min-w-max">
           <DropdownMenuGroup>
-            {canManageSurvey && (
+            {isArchived && canManageSurvey && (
+              <DropdownMenuItem
+                data-testid="restore-survey"
+                icon={<ArchiveRestoreIcon className="size-4" />}
+                onSelect={(e) => {
+                  e.preventDefault();
+                  void handleRestoreSurvey();
+                }}>
+                {t("workspace.surveys.restore")}
+              </DropdownMenuItem>
+            )}
+            {isArchived && canManageSurvey && (
+              <DropdownMenuItem
+                data-testid="delete-survey-forever"
+                className="text-red-600 focus:text-red-600"
+                icon={<TrashIcon className="size-4" />}
+                onSelect={(e) => {
+                  e.preventDefault();
+                  setIsDropDownOpen(false);
+                  setDeleteDialogOpen(true);
+                }}>
+                {t("common.delete")}
+              </DropdownMenuItem>
+            )}
+            {!isArchived && canManageSurvey && (
               <DropdownMenuItem>
                 <Link
                   className="flex w-full items-center"
@@ -204,7 +270,7 @@ export const SurveyDropDownMenu = ({
                 </Link>
               </DropdownMenuItem>
             )}
-            {canManageSurvey && (
+            {!isArchived && canManageSurvey && (
               <DropdownMenuItem>
                 <button
                   type="button"
@@ -251,7 +317,7 @@ export const SurveyDropDownMenu = ({
                 </DropdownMenuSubContent>
               </DropdownMenuSub>
             )}
-            {canManageSurvey && workspace?.organizationId && (
+            {!isArchived && canManageSurvey && workspace?.organizationId && (
               <DropdownMenuItem
                 data-testid="copy-to-workspace"
                 onSelect={(e) => {
@@ -300,7 +366,7 @@ export const SurveyDropDownMenu = ({
                 </button>
               </DropdownMenuItem>
             )}
-            {canManageSurvey && (
+            {!isArchived && canManageSurvey && (
               <DropdownMenuItem>
                 <button
                   type="button"
@@ -315,6 +381,19 @@ export const SurveyDropDownMenu = ({
                 </button>
               </DropdownMenuItem>
             )}
+            {!isArchived && canManageSurvey && (
+              <DropdownMenuItem
+                data-testid="archive-survey"
+                className="text-red-600 focus:text-red-600"
+                icon={<ArchiveIcon className="size-4" />}
+                onSelect={(e) => {
+                  e.preventDefault();
+                  setIsDropDownOpen(false);
+                  setArchiveDialogOpen(true);
+                }}>
+                {t("workspace.surveys.archive")}
+              </DropdownMenuItem>
+            )}
           </DropdownMenuGroup>
         </DropdownMenuContent>
       </DropdownMenu>
@@ -330,6 +409,26 @@ export const SurveyDropDownMenu = ({
         />
       )}
 
+      {!isArchived && canManageSurvey && (
+        <ConfirmationModal
+          open={isArchiveDialogOpen}
+          setOpen={setArchiveDialogOpen}
+          title={t("workspace.surveys.archive_survey")}
+          description={
+            isInProgress
+              ? t("workspace.surveys.archive_survey_description_in_progress")
+              : t("workspace.surveys.archive_survey_description")
+          }
+          body={t("workspace.surveys.archive_survey_warning")}
+          buttonText={isInProgress ? t("workspace.surveys.stop_and_archive") : t("common.archive")}
+          buttonVariant={isInProgress ? "destructive" : "default"}
+          buttonLoading={isArchiving}
+          onConfirm={handleArchiveSurvey}
+          hideCloseButton={isInProgress}
+          closeOnOutsideClick={!isInProgress}
+        />
+      )}
+
       {canManageSurvey && workspace?.id && workspace.organizationId && (
         <CopySurveyModal
           open={isCopyModalOpen}
diff --git a/apps/web/modules/survey/list/components/survey-filters.tsx b/apps/web/modules/survey/list/components/survey-filters.tsx
index 121057f90f94..47c147ede81a 100644
--- a/apps/web/modules/survey/list/components/survey-filters.tsx
+++ b/apps/web/modules/survey/list/components/survey-filters.tsx
@@ -22,13 +22,19 @@ interface SurveyFilterProps {
   surveyFilters: TSurveyOverviewFilters;
   setSurveyFilters: Dispatch<SetStateAction<TSurveyOverviewFilters>>;
   currentWorkspaceChannel: TWorkspaceConfigChannel;
+  // Whether the workspace has any archived surveys; the "Archived" option is hidden when false.
+  hasArchived?: boolean;
 }
 
-const getStatusOptions = (t: TFunction): TFilterOption[] => [
+// Real statuses users can filter on, plus the "archived" pseudo-status.
+const SELECTABLE_STATUS_VALUES = new Set(["draft", "inProgress", "paused", "completed", "archived"]);
+
+const getStatusOptions = (t: TFunction, hasArchived: boolean): TFilterOption[] => [
   { label: t("common.draft"), value: "draft" },
   { label: t("common.in_progress"), value: "inProgress" },
   { label: t("common.paused"), value: "paused" },
   { label: t("common.completed"), value: "completed" },
+  ...(hasArchived ? [{ label: t("common.archived"), value: "archived" }] : []),
 ];
 
 const getSortOptions = (t: TFunction): TSortOption[] => [
@@ -54,7 +60,8 @@ export const SurveyFilters = ({
   surveyFilters,
   setSurveyFilters,
   currentWorkspaceChannel,
-}: SurveyFilterProps) => {
+  hasArchived = false,
+}: Readonly<SurveyFilterProps>) => {
   const { sortBy, status, type } = surveyFilters;
   const [name, setName] = useState(surveyFilters.name);
   const { t } = useTranslation();
@@ -81,11 +88,12 @@ export const SurveyFilters = ({
   };
 
   const handleStatusChange = (value: string) => {
-    if (value === "inProgress" || value === "paused" || value === "completed" || value === "draft") {
-      if (status.includes(value)) {
-        setSurveyFilters((prev) => ({ ...prev, status: prev.status.filter((v) => v !== value) }));
+    if (SELECTABLE_STATUS_VALUES.has(value)) {
+      const statusValue = value as TSurveyOverviewFilters["status"][number];
+      if (status.includes(statusValue)) {
+        setSurveyFilters((prev) => ({ ...prev, status: prev.status.filter((v) => v !== statusValue) }));
       } else {
-        setSurveyFilters((prev) => ({ ...prev, status: [...prev.status, value] }));
+        setSurveyFilters((prev) => ({ ...prev, status: [...prev.status, statusValue] }));
       }
     }
   };
@@ -117,7 +125,7 @@ export const SurveyFilters = ({
           <SurveyFilterDropdown
             title={t("common.status")}
             id="status"
-            options={getStatusOptions(t)}
+            options={getStatusOptions(t, hasArchived)}
             selectedOptions={status}
             setSelectedOptions={handleStatusChange}
             isOpen={dropdownOpenStates.get("status")}
diff --git a/apps/web/modules/survey/list/components/survey-list.tsx b/apps/web/modules/survey/list/components/survey-list.tsx
index d3433ca8fce4..b562520d6aa5 100644
--- a/apps/web/modules/survey/list/components/survey-list.tsx
+++ b/apps/web/modules/survey/list/components/survey-list.tsx
@@ -15,7 +15,9 @@ import { getV3ApiErrorMessage } from "@/modules/api/lib/v3-client";
 import type { TAIUnavailableReason } from "@/modules/ee/analysis/charts/lib/ai-availability";
 import { CreateWithAIDialog } from "@/modules/survey/components/template-list/components/create-with-ai-dialog";
 import { useCreateSurveyFromTemplate } from "@/modules/survey/components/template-list/hooks/use-create-survey-from-template";
+import { useArchiveSurvey } from "@/modules/survey/list/hooks/use-archive-survey";
 import { useDeleteSurvey } from "@/modules/survey/list/hooks/use-delete-survey";
+import { useRestoreSurvey } from "@/modules/survey/list/hooks/use-restore-survey";
 import { useSurveys } from "@/modules/survey/list/hooks/use-surveys";
 import { useUpdateSurveyStatus } from "@/modules/survey/list/hooks/use-update-survey-status";
 import { initialFilters } from "@/modules/survey/list/lib/constants";
@@ -193,12 +195,14 @@ export const SurveysList = ({
     fetchNextPage,
     hasNextPage,
     isError,
+    isFetching,
     isFetchingNextPage,
     isLoading,
     queryKey,
     refetch,
     surveys,
     totalCount,
+    hasArchived,
   } = useSurveys({
     workspaceId: workspace.id,
     limit: surveysPerPage,
@@ -208,11 +212,30 @@ export const SurveysList = ({
 
   const deleteSurveyMutation = useDeleteSurvey({ queryKey });
   const updateSurveyStatusMutation = useUpdateSurveyStatus({ queryKey });
+  const archiveSurveyMutation = useArchiveSurvey({ queryKey });
+  const restoreSurveyMutation = useRestoreSurvey({ queryKey });
+
+  // When the workspace no longer has archived surveys (last one restored/purged), drop a stale
+  // "archived" selection persisted in localStorage so the (now-hidden) filter can't strand the view.
+  // Guard on !isFetching so a fresh selection isn't wiped while hasArchived is still catching up
+  // during a refetch (e.g. right after archiving the last active survey).
+  useEffect(() => {
+    if (!isFetching && !hasArchived && surveyFilters.status.includes("archived")) {
+      setSurveyFilters((prev) => ({
+        ...prev,
+        status: prev.status.filter((value) => value !== "archived"),
+      }));
+    }
+  }, [hasArchived, isFetching, surveyFilters.status]);
 
   const hasAppliedFilters = hasActiveSurveyFilters(normalizedFilters);
   const showInitialLoading = !isFilterInitialized || (isLoading && surveys.length === 0);
-  const showTemplateEmptyState = !isError && totalCount === 0 && !hasAppliedFilters && !isReadOnly;
-  const showReadOnlyEmptyState = !isError && totalCount === 0 && !hasAppliedFilters && isReadOnly;
+  // Never show the "create your first survey" empty states when archived surveys exist — the user
+  // must still be able to reach the Archived filter.
+  const showTemplateEmptyState =
+    !isError && totalCount === 0 && !hasAppliedFilters && !hasArchived && !isReadOnly;
+  const showReadOnlyEmptyState =
+    !isError && totalCount === 0 && !hasAppliedFilters && !hasArchived && isReadOnly;
 
   const handleDeleteSurvey = async (surveyId: string) => {
     await deleteSurveyMutation.mutateAsync({ surveyId });
@@ -222,6 +245,14 @@ export const SurveysList = ({
     await updateSurveyStatusMutation.mutateAsync({ surveyId, status });
   };
 
+  const handleArchiveSurvey = async (surveyId: string) => {
+    await archiveSurveyMutation.mutateAsync({ surveyId });
+  };
+
+  const handleRestoreSurvey = async (surveyId: string) => {
+    await restoreSurveyMutation.mutateAsync({ surveyId });
+  };
+
   const createSurveyButton = (
     <NewSurveyMenu
       workspace={workspace}
@@ -312,6 +343,8 @@ export const SurveysList = ({
               isReadOnly={isReadOnly}
               deleteSurvey={handleDeleteSurvey}
               updateSurveyStatus={handleUpdateSurveyStatus}
+              archiveSurvey={handleArchiveSurvey}
+              restoreSurvey={handleRestoreSurvey}
               publicDomain={publicDomain}
               locale={locale}
             />
@@ -349,6 +382,7 @@ export const SurveysList = ({
           surveyFilters={normalizedFilters}
           setSurveyFilters={setSurveyFilters}
           currentWorkspaceChannel={currentWorkspaceChannel}
+          hasArchived={hasArchived}
         />
         {surveyContent}
       </div>
diff --git a/apps/web/modules/survey/list/hooks/use-archive-survey.test.ts b/apps/web/modules/survey/list/hooks/use-archive-survey.test.ts
new file mode 100644
index 000000000000..60529cae108e
--- /dev/null
+++ b/apps/web/modules/survey/list/hooks/use-archive-survey.test.ts
@@ -0,0 +1,137 @@
+/**
+ * @vitest-environment jsdom
+ */
+import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
+import { act, renderHook, waitFor } from "@testing-library/react";
+import { type ReactNode, createElement } from "react";
+import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
+import { surveyKeys } from "@/modules/survey/list/lib/query";
+import { TSurveyListPage } from "@/modules/survey/list/lib/v3-surveys-client";
+import { useArchiveSurvey } from "./use-archive-survey";
+
+function createWrapper(queryClient: QueryClient) {
+  const Wrapper = ({ children }: Readonly<{ children: ReactNode }>) =>
+    createElement(QueryClientProvider, { client: queryClient }, children);
+
+  Wrapper.displayName = "UseArchiveSurveyTestWrapper";
+
+  return Wrapper;
+}
+
+function createQueryData(): { pages: TSurveyListPage[]; pageParams: (string | null)[] } {
+  return {
+    pages: [
+      {
+        data: [
+          {
+            id: "survey_1",
+            name: "Survey 1",
+            workspaceId: "env_1",
+            type: "link",
+            status: "inProgress",
+            publishOn: null,
+            archivedAt: null,
+            createdAt: new Date("2026-04-15T10:00:00.000Z"),
+            updatedAt: new Date("2026-04-15T10:00:00.000Z"),
+            responseCount: 0,
+            creator: { name: "Alice" },
+            singleUse: null,
+          },
+        ],
+        meta: {
+          limit: 20,
+          nextCursor: null,
+          totalCount: 1,
+          hasArchived: false,
+        },
+      },
+    ],
+    pageParams: [null],
+  };
+}
+
+const queryKey = surveyKeys.list({
+  workspaceId: "env_1",
+  limit: 20,
+  filters: { name: "", status: [], type: [], sortBy: "relevance" },
+});
+
+describe("useArchiveSurvey", () => {
+  beforeEach(() => {
+    (globalThis as typeof globalThis & { IS_REACT_ACT_ENVIRONMENT?: boolean }).IS_REACT_ACT_ENVIRONMENT =
+      true;
+    vi.stubGlobal("fetch", vi.fn());
+  });
+
+  afterEach(() => {
+    vi.unstubAllGlobals();
+  });
+
+  test("optimistically removes the survey and invalidates list queries on success", async () => {
+    let resolveFetch: ((value: Response) => void) | undefined;
+    const fetchPromise = new Promise<Response>((resolve) => {
+      resolveFetch = resolve;
+    });
+
+    vi.mocked(global.fetch).mockReturnValue(fetchPromise as Promise<Response>);
+
+    const queryClient = new QueryClient({
+      defaultOptions: { mutations: { retry: false }, queries: { retry: false } },
+    });
+    queryClient.setQueryData(queryKey, createQueryData());
+
+    const invalidateQueriesSpy = vi.spyOn(queryClient, "invalidateQueries");
+
+    const { result } = renderHook(() => useArchiveSurvey({ queryKey }), {
+      wrapper: createWrapper(queryClient),
+    });
+
+    result.current.mutate({ surveyId: "survey_1" });
+
+    await waitFor(() =>
+      expect(queryClient.getQueryData<{ pages: TSurveyListPage[] }>(queryKey)?.pages[0]?.data).toEqual([])
+    );
+
+    resolveFetch?.(
+      new Response(JSON.stringify({ data: { id: "survey_1", status: "paused", archivedAt: "2026-04-16" } }), {
+        status: 200,
+        headers: { "Content-Type": "application/json" },
+      })
+    );
+
+    await waitFor(() => expect(result.current.isSuccess).toBe(true));
+    expect(invalidateQueriesSpy).toHaveBeenCalledWith({ queryKey: surveyKeys.lists() });
+  });
+
+  test("rolls the cache back when archive fails", async () => {
+    vi.mocked(global.fetch).mockResolvedValue(
+      new Response(
+        JSON.stringify({
+          title: "Forbidden",
+          status: 403,
+          detail: "You are not authorized to access this resource",
+          code: "forbidden",
+          requestId: "req_1",
+        }),
+        { status: 403, headers: { "Content-Type": "application/problem+json" } }
+      )
+    );
+
+    const queryClient = new QueryClient({
+      defaultOptions: { mutations: { retry: false }, queries: { retry: false } },
+    });
+    queryClient.setQueryData(queryKey, createQueryData());
+
+    const { result } = renderHook(() => useArchiveSurvey({ queryKey }), {
+      wrapper: createWrapper(queryClient),
+    });
+
+    await expect(
+      act(async () => {
+        await result.current.mutateAsync({ surveyId: "survey_1" });
+      })
+    ).rejects.toThrow("You are not authorized to access this resource");
+
+    expect(queryClient.getQueryData<{ pages: TSurveyListPage[] }>(queryKey)?.pages[0]?.data).toHaveLength(1);
+  });
+});
diff --git a/apps/web/modules/survey/list/hooks/use-archive-survey.ts b/apps/web/modules/survey/list/hooks/use-archive-survey.ts
new file mode 100644
index 000000000000..a2bda6ac9750
--- /dev/null
+++ b/apps/web/modules/survey/list/hooks/use-archive-survey.ts
@@ -0,0 +1,10 @@
+"use client";
+
+import { surveyKeys } from "@/modules/survey/list/lib/query";
+import { archiveSurvey } from "@/modules/survey/list/lib/v3-surveys-client";
+import { useSurveyRemovalMutation } from "./use-survey-removal-mutation";
+
+// Archiving removes the survey from the current view: the default list excludes archived surveys,
+// and the "Archived" view excludes active ones. onSettled re-fetches so mixed-filter views correct.
+export const useArchiveSurvey = ({ queryKey }: { queryKey: ReturnType<typeof surveyKeys.list> }) =>
+  useSurveyRemovalMutation({ queryKey, mutationFn: archiveSurvey });
diff --git a/apps/web/modules/survey/list/hooks/use-delete-survey.test.ts b/apps/web/modules/survey/list/hooks/use-delete-survey.test.ts
index 76f04ddb054a..cff89a4931f4 100644
--- a/apps/web/modules/survey/list/hooks/use-delete-survey.test.ts
+++ b/apps/web/modules/survey/list/hooks/use-delete-survey.test.ts
@@ -30,6 +30,7 @@ function createQueryData(): { pages: TSurveyListPage[]; pageParams: (string | nu
             type: "link",
             status: "draft",
             publishOn: null,
+            archivedAt: null,
             createdAt: new Date("2026-04-15T10:00:00.000Z"),
             updatedAt: new Date("2026-04-15T10:00:00.000Z"),
             responseCount: 0,
@@ -41,6 +42,7 @@ function createQueryData(): { pages: TSurveyListPage[]; pageParams: (string | nu
           limit: 20,
           nextCursor: null,
           totalCount: 1,
+          hasArchived: false,
         },
       },
     ],
diff --git a/apps/web/modules/survey/list/hooks/use-delete-survey.ts b/apps/web/modules/survey/list/hooks/use-delete-survey.ts
index 59692f03ff5b..ae2fc6142b89 100644
--- a/apps/web/modules/survey/list/hooks/use-delete-survey.ts
+++ b/apps/web/modules/survey/list/hooks/use-delete-survey.ts
@@ -1,34 +1,8 @@
 "use client";
 
-import { InfiniteData, useMutation, useQueryClient } from "@tanstack/react-query";
-import { removeSurveyFromInfiniteData, surveyKeys } from "@/modules/survey/list/lib/query";
-import { TSurveyListPage, deleteSurvey } from "@/modules/survey/list/lib/v3-surveys-client";
+import { surveyKeys } from "@/modules/survey/list/lib/query";
+import { deleteSurvey } from "@/modules/survey/list/lib/v3-surveys-client";
+import { useSurveyRemovalMutation } from "./use-survey-removal-mutation";
 
-export const useDeleteSurvey = ({ queryKey }: { queryKey: ReturnType<typeof surveyKeys.list> }) => {
-  const queryClient = useQueryClient();
-
-  return useMutation({
-    mutationFn: async ({ surveyId }: { surveyId: string }) => deleteSurvey(surveyId),
-    onMutate: async ({ surveyId }) => {
-      await queryClient.cancelQueries({ queryKey });
-
-      const previousData = queryClient.getQueryData<InfiniteData<TSurveyListPage>>(queryKey);
-
-      queryClient.setQueryData<InfiniteData<TSurveyListPage> | undefined>(queryKey, (currentData) =>
-        removeSurveyFromInfiniteData(currentData, surveyId)
-      );
-
-      return {
-        previousData,
-      };
-    },
-    onError: (_error, _variables, context) => {
-      if (context?.previousData) {
-        queryClient.setQueryData(queryKey, context.previousData);
-      }
-    },
-    onSettled: async () => {
-      await queryClient.invalidateQueries({ queryKey: surveyKeys.lists() });
-    },
-  });
-};
+export const useDeleteSurvey = ({ queryKey }: { queryKey: ReturnType<typeof surveyKeys.list> }) =>
+  useSurveyRemovalMutation({ queryKey, mutationFn: deleteSurvey });
diff --git a/apps/web/modules/survey/list/hooks/use-restore-survey.test.ts b/apps/web/modules/survey/list/hooks/use-restore-survey.test.ts
new file mode 100644
index 000000000000..b20244a5d2b8
--- /dev/null
+++ b/apps/web/modules/survey/list/hooks/use-restore-survey.test.ts
@@ -0,0 +1,138 @@
+/**
+ * @vitest-environment jsdom
+ */
+import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
+import { act, renderHook, waitFor } from "@testing-library/react";
+import { type ReactNode, createElement } from "react";
+import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
+import { surveyKeys } from "@/modules/survey/list/lib/query";
+import { TSurveyListPage } from "@/modules/survey/list/lib/v3-surveys-client";
+import { useRestoreSurvey } from "./use-restore-survey";
+
+function createWrapper(queryClient: QueryClient) {
+  const Wrapper = ({ children }: Readonly<{ children: ReactNode }>) =>
+    createElement(QueryClientProvider, { client: queryClient }, children);
+
+  Wrapper.displayName = "UseRestoreSurveyTestWrapper";
+
+  return Wrapper;
+}
+
+// An archived survey being viewed under the "Archived" filter.
+function createQueryData(): { pages: TSurveyListPage[]; pageParams: (string | null)[] } {
+  return {
+    pages: [
+      {
+        data: [
+          {
+            id: "survey_1",
+            name: "Survey 1",
+            workspaceId: "env_1",
+            type: "link",
+            status: "paused",
+            publishOn: null,
+            archivedAt: new Date("2026-04-15T10:00:00.000Z"),
+            createdAt: new Date("2026-04-15T10:00:00.000Z"),
+            updatedAt: new Date("2026-04-15T10:00:00.000Z"),
+            responseCount: 0,
+            creator: { name: "Alice" },
+            singleUse: null,
+          },
+        ],
+        meta: {
+          limit: 20,
+          nextCursor: null,
+          totalCount: 1,
+          hasArchived: true,
+        },
+      },
+    ],
+    pageParams: [null],
+  };
+}
+
+const queryKey = surveyKeys.list({
+  workspaceId: "env_1",
+  limit: 20,
+  filters: { name: "", status: ["archived"], type: [], sortBy: "relevance" },
+});
+
+describe("useRestoreSurvey", () => {
+  beforeEach(() => {
+    (globalThis as typeof globalThis & { IS_REACT_ACT_ENVIRONMENT?: boolean }).IS_REACT_ACT_ENVIRONMENT =
+      true;
+    vi.stubGlobal("fetch", vi.fn());
+  });
+
+  afterEach(() => {
+    vi.unstubAllGlobals();
+  });
+
+  test("optimistically removes the survey from the archived view and invalidates on success", async () => {
+    let resolveFetch: ((value: Response) => void) | undefined;
+    const fetchPromise = new Promise<Response>((resolve) => {
+      resolveFetch = resolve;
+    });
+
+    vi.mocked(global.fetch).mockReturnValue(fetchPromise as Promise<Response>);
+
+    const queryClient = new QueryClient({
+      defaultOptions: { mutations: { retry: false }, queries: { retry: false } },
+    });
+    queryClient.setQueryData(queryKey, createQueryData());
+
+    const invalidateQueriesSpy = vi.spyOn(queryClient, "invalidateQueries");
+
+    const { result } = renderHook(() => useRestoreSurvey({ queryKey }), {
+      wrapper: createWrapper(queryClient),
+    });
+
+    result.current.mutate({ surveyId: "survey_1" });
+
+    await waitFor(() =>
+      expect(queryClient.getQueryData<{ pages: TSurveyListPage[] }>(queryKey)?.pages[0]?.data).toEqual([])
+    );
+
+    resolveFetch?.(
+      new Response(JSON.stringify({ data: { id: "survey_1", status: "paused", archivedAt: null } }), {
+        status: 200,
+        headers: { "Content-Type": "application/json" },
+      })
+    );
+
+    await waitFor(() => expect(result.current.isSuccess).toBe(true));
+    expect(invalidateQueriesSpy).toHaveBeenCalledWith({ queryKey: surveyKeys.lists() });
+  });
+
+  test("rolls the cache back when restore fails", async () => {
+    vi.mocked(global.fetch).mockResolvedValue(
+      new Response(
+        JSON.stringify({
+          title: "Forbidden",
+          status: 403,
+          detail: "You are not authorized to access this resource",
+          code: "forbidden",
+          requestId: "req_1",
+        }),
+        { status: 403, headers: { "Content-Type": "application/problem+json" } }
+      )
+    );
+
+    const queryClient = new QueryClient({
+      defaultOptions: { mutations: { retry: false }, queries: { retry: false } },
+    });
+    queryClient.setQueryData(queryKey, createQueryData());
+
+    const { result } = renderHook(() => useRestoreSurvey({ queryKey }), {
+      wrapper: createWrapper(queryClient),
+    });
+
+    await expect(
+      act(async () => {
+        await result.current.mutateAsync({ surveyId: "survey_1" });
+      })
+    ).rejects.toThrow("You are not authorized to access this resource");
+
+    expect(queryClient.getQueryData<{ pages: TSurveyListPage[] }>(queryKey)?.pages[0]?.data).toHaveLength(1);
+  });
+});
diff --git a/apps/web/modules/survey/list/hooks/use-restore-survey.ts b/apps/web/modules/survey/list/hooks/use-restore-survey.ts
new file mode 100644
index 000000000000..12c3c72ffe41
--- /dev/null
+++ b/apps/web/modules/survey/list/hooks/use-restore-survey.ts
@@ -0,0 +1,10 @@
+"use client";
+
+import { surveyKeys } from "@/modules/survey/list/lib/query";
+import { restoreSurvey } from "@/modules/survey/list/lib/v3-surveys-client";
+import { useSurveyRemovalMutation } from "./use-survey-removal-mutation";
+
+// Restoring removes the survey from the "Archived" view (it is no longer archived). onSettled
+// re-fetches so the default list picks it back up.
+export const useRestoreSurvey = ({ queryKey }: { queryKey: ReturnType<typeof surveyKeys.list> }) =>
+  useSurveyRemovalMutation({ queryKey, mutationFn: restoreSurvey });
diff --git a/apps/web/modules/survey/list/hooks/use-survey-removal-mutation.ts b/apps/web/modules/survey/list/hooks/use-survey-removal-mutation.ts
new file mode 100644
index 000000000000..9bd809f0d161
--- /dev/null
+++ b/apps/web/modules/survey/list/hooks/use-survey-removal-mutation.ts
@@ -0,0 +1,44 @@
+"use client";
+
+import { InfiniteData, useMutation, useQueryClient } from "@tanstack/react-query";
+import { removeSurveyFromInfiniteData, surveyKeys } from "@/modules/survey/list/lib/query";
+import { TSurveyListPage } from "@/modules/survey/list/lib/v3-surveys-client";
+
+// Shared optimistic-mutation hook for survey actions that remove a survey from the current list view
+// (delete, archive, restore). Each optimistically drops the survey from the cached infinite data,
+// rolls back on error, and re-fetches on settle so mixed-filter views reconcile. Callers supply only
+// the v3 client request for their specific action.
+export const useSurveyRemovalMutation = ({
+  queryKey,
+  mutationFn,
+}: {
+  queryKey: ReturnType<typeof surveyKeys.list>;
+  mutationFn: (surveyId: string) => Promise<unknown>;
+}) => {
+  const queryClient = useQueryClient();
+
+  return useMutation({
+    mutationFn: async ({ surveyId }: { surveyId: string }) => mutationFn(surveyId),
+    onMutate: async ({ surveyId }) => {
+      await queryClient.cancelQueries({ queryKey });
+
+      const previousData = queryClient.getQueryData<InfiniteData<TSurveyListPage>>(queryKey);
+
+      queryClient.setQueryData<InfiniteData<TSurveyListPage> | undefined>(queryKey, (currentData) =>
+        removeSurveyFromInfiniteData(currentData, surveyId)
+      );
+
+      return {
+        previousData,
+      };
+    },
+    onError: (_error, _variables, context) => {
+      if (context?.previousData) {
+        queryClient.setQueryData(queryKey, context.previousData);
+      }
+    },
+    onSettled: async () => {
+      await queryClient.invalidateQueries({ queryKey: surveyKeys.lists() });
+    },
+  });
+};
diff --git a/apps/web/modules/survey/list/hooks/use-surveys.ts b/apps/web/modules/survey/list/hooks/use-surveys.ts
index bc7c9b275573..f024c4eb7f43 100644
--- a/apps/web/modules/survey/list/hooks/use-surveys.ts
+++ b/apps/web/modules/survey/list/hooks/use-surveys.ts
@@ -41,11 +41,13 @@ export const useSurveys = ({
 
   const surveys = flattenSurveyPages(query.data);
   const totalCount = query.data?.pages[0]?.meta.totalCount ?? 0;
+  const hasArchived = query.data?.pages[0]?.meta.hasArchived ?? false;
 
   return {
     ...query,
     queryKey,
     surveys,
     totalCount,
+    hasArchived,
   };
 };
diff --git a/apps/web/modules/survey/list/lib/survey-record.ts b/apps/web/modules/survey/list/lib/survey-record.ts
index 14e9584eb65e..7d88ffc82bd6 100644
--- a/apps/web/modules/survey/list/lib/survey-record.ts
+++ b/apps/web/modules/survey/list/lib/survey-record.ts
@@ -15,6 +15,7 @@ export const surveySelect = {
   },
   status: true,
   publishOn: true,
+  archivedAt: true,
   singleUse: true,
   workspaceId: true,
   _count: {
diff --git a/apps/web/modules/survey/list/lib/survey.test.ts b/apps/web/modules/survey/list/lib/survey.test.ts
index 08612666dbbc..112c1070c098 100644
--- a/apps/web/modules/survey/list/lib/survey.test.ts
+++ b/apps/web/modules/survey/list/lib/survey.test.ts
@@ -21,6 +21,7 @@ import {
   getSurveyCount,
   getSurveys,
   getSurveysSortedByRelevance,
+  hasArchivedSurveys,
 } from "./survey";
 import { surveySelect } from "./survey-record";
 
@@ -81,6 +82,7 @@ vi.mock("@formbricks/database", () => ({
     survey: {
       findMany: vi.fn(),
       findUnique: vi.fn(),
+      findFirst: vi.fn(),
       count: vi.fn(),
       delete: vi.fn(),
       create: vi.fn(),
@@ -128,6 +130,7 @@ const resetMocks = () => {
   vi.mocked(createId).mockClear();
   vi.mocked(prisma.survey.findMany).mockReset();
   vi.mocked(prisma.survey.findUnique).mockReset();
+  vi.mocked(prisma.survey.findFirst).mockReset();
   vi.mocked(prisma.survey.count).mockReset();
   vi.mocked(prisma.survey.delete).mockReset();
   vi.mocked(prisma.survey.create).mockReset();
@@ -861,3 +864,38 @@ describe("copySurveyToOtherWorkspace", () => {
     );
   });
 });
+
+describe("hasArchivedSurveys", () => {
+  const workspaceId = "clq5n7p1q0000m7z0h5p6g3r3";
+
+  beforeEach(() => {
+    resetMocks();
+    vi.mocked(validateInputs).mockReturnValue([] as never);
+  });
+
+  test("returns true when the workspace has at least one archived survey", async () => {
+    vi.mocked(prisma.survey.findFirst).mockResolvedValue({ id: "survey_1" } as never);
+
+    await expect(hasArchivedSurveys(workspaceId)).resolves.toBe(true);
+    expect(prisma.survey.findFirst).toHaveBeenCalledWith({
+      where: { workspaceId, archivedAt: { not: null } },
+      select: { id: true },
+    });
+  });
+
+  test("returns false when the workspace has no archived surveys", async () => {
+    vi.mocked(prisma.survey.findFirst).mockResolvedValue(null as never);
+
+    await expect(hasArchivedSurveys(workspaceId)).resolves.toBe(false);
+  });
+
+  test("throws DatabaseError on a Prisma known request error", async () => {
+    const prismaError = new Prisma.PrismaClientKnownRequestError("db down", {
+      code: "P2010",
+      clientVersion: "4.0.0",
+    });
+    vi.mocked(prisma.survey.findFirst).mockRejectedValue(prismaError);
+
+    await expect(hasArchivedSurveys(workspaceId)).rejects.toThrow(DatabaseError);
+  });
+});
diff --git a/apps/web/modules/survey/list/lib/survey.ts b/apps/web/modules/survey/list/lib/survey.ts
index 0fbe644de7fd..3b3476ff74d0 100644
--- a/apps/web/modules/survey/list/lib/survey.ts
+++ b/apps/web/modules/survey/list/lib/survey.ts
@@ -555,3 +555,23 @@ export const getSurveyCount = reactCache(
     }
   }
 );
+
+/** Whether the workspace has any archived (soft-deleted) surveys. Drives the "Archived" filter option. */
+export const hasArchivedSurveys = reactCache(async (workspaceId: string): Promise<boolean> => {
+  validateInputs([workspaceId, z.cuid2()]);
+  try {
+    const archivedSurvey = await prisma.survey.findFirst({
+      where: { workspaceId, archivedAt: { not: null } },
+      select: { id: true },
+    });
+
+    return archivedSurvey !== null;
+  } catch (error) {
+    if (error instanceof Prisma.PrismaClientKnownRequestError) {
+      logger.error(error, "Error checking for archived surveys");
+      throw new DatabaseError(error.message);
+    }
+
+    throw error;
+  }
+});
diff --git a/apps/web/modules/survey/list/lib/utils.ts b/apps/web/modules/survey/list/lib/utils.ts
index 0768a873372c..bc1070bdeb95 100644
--- a/apps/web/modules/survey/list/lib/utils.ts
+++ b/apps/web/modules/survey/list/lib/utils.ts
@@ -6,7 +6,7 @@ import {
   TSurveyOverviewType,
 } from "@/modules/survey/list/types/survey-overview";
 
-const allowedStatus = new Set(["draft", "inProgress", "paused", "completed"] as const);
+const allowedStatus = new Set(["draft", "inProgress", "paused", "completed", "archived"] as const);
 const allowedType = new Set(["app", "link"] as const);
 const allowedSort = new Set(["createdAt", "updatedAt", "name", "relevance"] as const);
 const compareNormalizedFilterValues = (left: string, right: string) => left.localeCompare(right);
diff --git a/apps/web/modules/survey/list/lib/v3-surveys-client.ts b/apps/web/modules/survey/list/lib/v3-surveys-client.ts
index 30d4cef36646..99b507c5fd7d 100644
--- a/apps/web/modules/survey/list/lib/v3-surveys-client.ts
+++ b/apps/web/modules/survey/list/lib/v3-surveys-client.ts
@@ -5,10 +5,14 @@ import { parseV3ApiError } from "@/modules/api/lib/v3-client";
 import { normalizeSurveyFilters } from "@/modules/survey/list/lib/utils";
 import { TSurveyListItem, TSurveyOverviewFilters } from "@/modules/survey/list/types/survey-overview";
 
-type TV3SurveyListItemResponse = Omit<TSurveyListItem, "createdAt" | "publishOn" | "updatedAt"> & {
+type TV3SurveyListItemResponse = Omit<
+  TSurveyListItem,
+  "createdAt" | "publishOn" | "updatedAt" | "archivedAt"
+> & {
   createdAt: string;
   publishOn: string | null;
   updatedAt: string;
+  archivedAt: string | null;
 };
 
 type TV3SurveyListResponse = {
@@ -58,6 +62,9 @@ export type TSurveyListPage = {
     limit: number;
     nextCursor: string | null;
     totalCount: number | null;
+    // Whether the workspace has any archived surveys. Only computed on the first
+    // page (when includeTotalCount is not false); null on subsequent pages.
+    hasArchived: boolean | null;
   };
 };
 
@@ -67,6 +74,7 @@ function mapSurveyListItem(survey: TV3SurveyListItemResponse): TSurveyListItem {
     createdAt: new Date(survey.createdAt),
     publishOn: survey.publishOn ? new Date(survey.publishOn) : null,
     updatedAt: new Date(survey.updatedAt),
+    archivedAt: survey.archivedAt ? new Date(survey.archivedAt) : null,
   };
 }
 
@@ -194,6 +202,46 @@ export async function deleteSurvey(surveyId: string): Promise<void> {
   }
 }
 
+type TV3ArchiveSurveyResponse = {
+  data: {
+    id: string;
+    status: TSurveyStatus;
+    archivedAt: string | null;
+  };
+};
+
+export async function archiveSurvey(
+  surveyId: string
+): Promise<{ id: string; status: TSurveyStatus; archivedAt: string | null }> {
+  const response = await fetch(`/api/v3/surveys/${surveyId}/archive`, {
+    method: "POST",
+    cache: "no-store",
+  });
+
+  if (!response.ok) {
+    throw await parseV3ApiError(response);
+  }
+
+  const responseBody = (await response.json()) as TV3ArchiveSurveyResponse;
+  return responseBody.data;
+}
+
+export async function restoreSurvey(
+  surveyId: string
+): Promise<{ id: string; status: TSurveyStatus; archivedAt: string | null }> {
+  const response = await fetch(`/api/v3/surveys/${surveyId}/restore`, {
+    method: "POST",
+    cache: "no-store",
+  });
+
+  if (!response.ok) {
+    throw await parseV3ApiError(response);
+  }
+
+  const responseBody = (await response.json()) as TV3ArchiveSurveyResponse;
+  return responseBody.data;
+}
+
 export async function generateSurveyCreatePayload(
   body: TV3SurveyGenerateBody
 ): Promise<TV3GenerateSurveyResponse["data"]> {
diff --git a/apps/web/modules/survey/list/types/survey-overview.ts b/apps/web/modules/survey/list/types/survey-overview.ts
index 5127c3f66664..9160e3fd4146 100644
--- a/apps/web/modules/survey/list/types/survey-overview.ts
+++ b/apps/web/modules/survey/list/types/survey-overview.ts
@@ -3,9 +3,12 @@ import { ZSurveyStatus } from "@formbricks/types/surveys/types";
 
 export const ZSurveyOverviewType = z.enum(["link", "app"]);
 export const ZSurveyOverviewSort = z.enum(["createdAt", "updatedAt", "name", "relevance"]);
+// "archived" is a pseudo-status used only by the list filter UI. It is not a real
+// SurveyStatus; the server translates it into an archivedAt filter.
+export const ZSurveyOverviewStatus = z.union([ZSurveyStatus, z.literal("archived")]);
 export const ZSurveyOverviewFilters = z.object({
   name: z.string(),
-  status: z.array(ZSurveyStatus),
+  status: z.array(ZSurveyOverviewStatus),
   type: z.array(ZSurveyOverviewType),
   sortBy: ZSurveyOverviewSort,
 });
@@ -17,6 +20,7 @@ export const ZSurveyListItem = z.object({
   type: z.enum(["link", "app", "website", "web"]),
   status: ZSurveyStatus,
   publishOn: z.date().nullable(),
+  archivedAt: z.date().nullable(),
   createdAt: z.date(),
   updatedAt: z.date(),
   responseCount: z.number(),
@@ -34,7 +38,7 @@ export const ZSurveyListItem = z.object({
 });
 
 export type TSurveyOverviewType = z.infer<typeof ZSurveyOverviewType>;
-export type TSurveyOverviewStatus = z.infer<typeof ZSurveyStatus>;
+export type TSurveyOverviewStatus = z.infer<typeof ZSurveyOverviewStatus>;
 export type TSurveyOverviewSort = z.infer<typeof ZSurveyOverviewSort>;
 export type TSurveyOverviewFilters = z.infer<typeof ZSurveyOverviewFilters>;
 export type TSurveyListItem = z.infer<typeof ZSurveyListItem>;
diff --git a/apps/web/modules/survey/list/types/surveys.ts b/apps/web/modules/survey/list/types/surveys.ts
index 50397c57ddb2..217fbde29ddf 100644
--- a/apps/web/modules/survey/list/types/surveys.ts
+++ b/apps/web/modules/survey/list/types/surveys.ts
@@ -9,6 +9,7 @@ export const ZSurvey = z.object({
   type: z.enum(["link", "app", "website", "web"]), //we can replace this with ZSurveyType after we remove "web" from schema
   status: ZSurveyStatus,
   publishOn: z.date().nullable(),
+  archivedAt: z.date().nullable(),
   createdAt: z.date(),
   updatedAt: z.date(),
   responseCount: z.number(),
diff --git a/apps/web/modules/survey/scheduling/lib/process-survey-scheduling-job.test.ts b/apps/web/modules/survey/scheduling/lib/process-survey-scheduling-job.test.ts
index a495640cf4ee..382949bfba9a 100644
--- a/apps/web/modules/survey/scheduling/lib/process-survey-scheduling-job.test.ts
+++ b/apps/web/modules/survey/scheduling/lib/process-survey-scheduling-job.test.ts
@@ -89,6 +89,7 @@ describe("processSurveySchedulingJob", () => {
           not: null,
         },
         status: "paused",
+        archivedAt: null,
       },
     });
     expect(mockQueueAuditEventWithoutRequest).toHaveBeenCalledTimes(1);
@@ -163,6 +164,7 @@ describe("processSurveySchedulingJob", () => {
           not: null,
         },
         status: "inProgress",
+        archivedAt: null,
       },
     });
     expect(mockQueueAuditEventWithoutRequest).toHaveBeenCalledTimes(1);
diff --git a/apps/web/modules/survey/scheduling/lib/survey-scheduling.ts b/apps/web/modules/survey/scheduling/lib/survey-scheduling.ts
index e2fa4378b74d..90c34a330481 100644
--- a/apps/web/modules/survey/scheduling/lib/survey-scheduling.ts
+++ b/apps/web/modules/survey/scheduling/lib/survey-scheduling.ts
@@ -177,6 +177,8 @@ const loadDueTransitionCandidates = async (
         not: null,
       },
       status: currentStatus,
+      // Never auto-transition archived surveys (belt-and-suspenders: archive already clears publishOn).
+      archivedAt: null,
     },
   });
 };
@@ -202,6 +204,7 @@ const applyTransition = async (
         },
         id: candidate.id,
         status: currentStatus,
+        archivedAt: null,
       },
     });
 
diff --git a/apps/web/modules/ui/components/confirmation-modal/index.tsx b/apps/web/modules/ui/components/confirmation-modal/index.tsx
index 79122cbcb6f3..8bd4eb760392 100644
--- a/apps/web/modules/ui/components/confirmation-modal/index.tsx
+++ b/apps/web/modules/ui/components/confirmation-modal/index.tsx
@@ -116,10 +116,10 @@ export const ConfirmationModal = ({
           ) : (
             <CircleAlert className="size-4 text-slate-500" />
           )}
-          <div className="flex flex-col">
+          <div className="flex flex-col gap-1">
             <DialogTitle className="w-full truncate text-left">{title}</DialogTitle>
             <DialogDescription className="w-full text-left">
-              <span className="mt-2 whitespace-pre-wrap">
+              <span className="whitespace-pre-wrap">
                 {description ?? t("workspace.general.this_action_cannot_be_undone")}
               </span>
             </DialogDescription>
diff --git a/apps/web/playwright/survey-archive.spec.ts b/apps/web/playwright/survey-archive.spec.ts
new file mode 100644
index 000000000000..2dc755c538eb
--- /dev/null
+++ b/apps/web/playwright/survey-archive.spec.ts
@@ -0,0 +1,149 @@
+import { expect } from "@playwright/test";
+import { prisma } from "@formbricks/database";
+import { test } from "./lib/fixtures";
+
+const getUserIdForEmail = async (email: string) => {
+  const user = await prisma.user.findUnique({ where: { email }, select: { id: true } });
+  if (!user) {
+    throw new Error(`User not found for email: ${email}`);
+  }
+  return user.id;
+};
+
+const createSurveySeed = async ({
+  workspaceId,
+  userId,
+  name,
+  status = "draft",
+}: {
+  workspaceId: string;
+  userId: string;
+  name: string;
+  status?: "draft" | "inProgress" | "paused" | "completed";
+}) => {
+  return prisma.survey.create({
+    data: { workspaceId, createdBy: userId, name, status, type: "link" },
+  });
+};
+
+test.describe("Survey archive @slow", () => {
+  test("archives an in-progress survey, filters, restores, then deletes it forever", async ({
+    page,
+    users,
+  }) => {
+    const timestamp = Date.now();
+    const email = `archive-${timestamp}@example.com`;
+    const surveyName = `Archive Me ${timestamp}`;
+    const user = await users.create({
+      email,
+      name: `archive-${timestamp}`,
+      workspaceName: "Archive Workspace",
+    });
+    const userId = await getUserIdForEmail(email);
+
+    await user.login();
+    await page.waitForURL(/\/workspaces\/[^/]+\/surveys/);
+    const workspaceId =
+      /\/workspaces\/([^/]+)\/surveys/.exec(page.url())?.[1] ??
+      (() => {
+        throw new Error("Unable to determine workspace id from surveys URL");
+      })();
+
+    const survey = await createSurveySeed({ workspaceId, userId, name: surveyName, status: "inProgress" });
+    // Keep the list to a single survey so assertions stay deterministic.
+    await prisma.survey.deleteMany({ where: { workspaceId, id: { not: survey.id } } });
+
+    await page.reload();
+    await expect(page.getByText(surveyName, { exact: true })).toBeVisible({ timeout: 10000 });
+
+    // Archive an in-progress survey → hard warning with "Stop and archive".
+    await page.locator("[data-testid='survey-dropdown-trigger']").click();
+    await page.getByTestId("archive-survey").click();
+    await page.getByRole("dialog").getByRole("button", { name: "Stop and archive", exact: true }).click();
+
+    await expect(page.getByText("Survey archived", { exact: true })).toBeVisible();
+    // Hidden from the default list.
+    await expect(page.getByText(surveyName, { exact: true })).toBeHidden();
+
+    // "Archived" now appears in the Status filter; selecting it reveals the survey.
+    await page.locator(".surveyFilterDropdown").filter({ hasText: "Status" }).click();
+    await page.getByRole("menuitem", { name: "Archived" }).click();
+    await page.keyboard.press("Escape");
+    await expect(page.getByText(surveyName, { exact: true })).toBeVisible();
+
+    // Archived card exposes only Restore and Delete.
+    await page.locator("[data-testid='survey-dropdown-trigger']").click();
+    await expect(page.getByTestId("restore-survey")).toBeVisible();
+    await expect(page.getByTestId("delete-survey-forever")).toBeVisible();
+    await expect(page.getByTestId("archive-survey")).toHaveCount(0);
+    await expect(page.getByTestId("duplicate-survey")).toHaveCount(0);
+
+    // Restore → survey leaves the archived view and the toast confirms.
+    await page.getByTestId("restore-survey").click();
+    await expect(page.getByText("Survey restored", { exact: true })).toBeVisible();
+
+    // With no archived surveys left, the stale "archived" filter is dropped automatically and the
+    // survey returns to the default list without any manual filter clearing.
+    await expect(page.getByText(surveyName, { exact: true })).toBeVisible();
+
+    // Archive again, then permanently delete it from the archived view.
+    // The restored survey is paused now (archiving an in-progress survey pauses it, and restore keeps
+    // the status), so this time the soft "Archive" confirm is shown instead of "Stop and archive".
+    await page.locator("[data-testid='survey-dropdown-trigger']").click();
+    await page.getByTestId("archive-survey").click();
+    await page.getByRole("dialog").getByRole("button", { name: "Archive", exact: true }).click();
+    await expect(page.getByText("Survey archived", { exact: true })).toBeVisible();
+
+    await page.locator(".surveyFilterDropdown").filter({ hasText: "Status" }).click();
+    await page.getByRole("menuitem", { name: "Archived" }).click();
+    await page.keyboard.press("Escape");
+    await expect(page.getByText(surveyName, { exact: true })).toBeVisible();
+
+    await page.locator("[data-testid='survey-dropdown-trigger']").click();
+    await page.getByTestId("delete-survey-forever").click();
+    await page.getByRole("dialog").getByRole("button", { name: "Delete", exact: true }).click();
+
+    // The permanent delete runs a cascading transaction and can take several seconds, so allow
+    // extra time for the success toast (which only fires once the request resolves).
+    await expect(page.getByText("Survey deleted successfully", { exact: true })).toBeVisible({
+      timeout: 15000,
+    });
+    await expect(page.getByText(surveyName, { exact: true })).toBeHidden();
+  });
+
+  test("shows a soft warning when archiving a draft survey", async ({ page, users }) => {
+    const timestamp = Date.now();
+    const email = `archive-draft-${timestamp}@example.com`;
+    const surveyName = `Draft Archive ${timestamp}`;
+    const user = await users.create({
+      email,
+      name: `archive-draft-${timestamp}`,
+      workspaceName: "Draft Archive Workspace",
+    });
+    const userId = await getUserIdForEmail(email);
+
+    await user.login();
+    await page.waitForURL(/\/workspaces\/[^/]+\/surveys/);
+    const workspaceId =
+      /\/workspaces\/([^/]+)\/surveys/.exec(page.url())?.[1] ??
+      (() => {
+        throw new Error("Unable to determine workspace id from surveys URL");
+      })();
+
+    const survey = await createSurveySeed({ workspaceId, userId, name: surveyName, status: "draft" });
+    await prisma.survey.deleteMany({ where: { workspaceId, id: { not: survey.id } } });
+
+    await page.reload();
+    await expect(page.getByText(surveyName, { exact: true })).toBeVisible({ timeout: 10000 });
+
+    await page.locator("[data-testid='survey-dropdown-trigger']").click();
+    await page.getByTestId("archive-survey").click();
+    // Draft surveys get the soft warning with a plain "Archive" confirm (not "Stop and archive").
+    const dialog = page.getByRole("dialog");
+    await expect(dialog.getByRole("button", { name: "Stop and archive", exact: true })).toHaveCount(0);
+    await dialog.getByRole("button", { name: "Archive", exact: true }).click();
+
+    await expect(page.getByText("Survey archived", { exact: true })).toBeVisible();
+    await expect(page.getByText(surveyName, { exact: true })).toBeHidden();
+  });
+});
diff --git a/docs/api-v3-reference/openapi.yml b/docs/api-v3-reference/openapi.yml
index db1621c28414..cf53483dfe1d 100644
--- a/docs/api-v3-reference/openapi.yml
+++ b/docs/api-v3-reference/openapi.yml
@@ -108,10 +108,12 @@ paths:
                 - inProgress
                 - paused
                 - completed
+                - archived
           style: form
           explode: true
           description: |
             Survey status filter. Repeat the parameter (`filter[status][in]=draft&filter[status][in]=inProgress`) or use comma-separated values (`filter[status][in]=draft,inProgress`). Invalid values → **400**.
+            `archived` is a pseudo-status: it does not match a real survey status but includes archived (soft-deleted) surveys in the result set. Archived surveys are otherwise excluded from the default list.
         - in: query
           name: filter[type][in]
           schema:
@@ -164,6 +166,7 @@ paths:
                       - limit
                       - nextCursor
                       - totalCount
+                      - hasArchived
                     properties:
                       limit:
                         type: integer
@@ -178,6 +181,11 @@ paths:
                           - 'null'
                         minimum: 0
                         description: Total number of surveys matching the current filters across all pages. `null` when `includeTotalCount=false`.
+                      hasArchived:
+                        type:
+                          - boolean
+                          - 'null'
+                        description: '`true` when the workspace has at least one archived (soft-deleted) survey. Computed only on the first page (same gate as `totalCount`); `null` when `includeTotalCount=false`.'
         '400':
           $ref: '#/components/responses/V3BadRequest'
         '401':
@@ -839,6 +847,7 @@ paths:
                       workspaceId: clseedworkspace000000000
                       createdAt: '2026-05-18T09:24:54.014Z'
                       updatedAt: '2026-05-18T09:24:54.014Z'
+                      archivedAt: null
                       name: CSAT Survey
                       type: link
                       status: inProgress
@@ -878,6 +887,7 @@ paths:
                       workspaceId: clseedworkspace000000000
                       createdAt: '2026-05-18T09:24:54.014Z'
                       updatedAt: '2026-05-18T09:24:54.014Z'
+                      archivedAt: null
                       name: CSAT Survey
                       type: link
                       status: inProgress
@@ -1026,11 +1036,41 @@ paths:
               schema:
                 $ref: '#/components/schemas/Problem'
         '422':
-          description: 'Unprocessable Content — the patched document passed schema validation but failed a cross-reference check that requires stored state to detect: an undeclared locale key used in content, a duplicate stable id, an immutable element-id change on a published survey, a dangling logic/jump reference, an invalid media URL, a `distribution.triggers[].actionClassId` referencing an action class that does not exist in the workspace (discover valid ids via `GET /api/v3/action-classes`), or a `targeting.filters` entry that cannot resolve in the workspace — an unknown contact-attribute key or segment, an unsupported person identifier, or an unknown device value. The `invalid_params` array pinpoints each issue (e.g. `code: invalid_reference` with the offending `identifier`).'
+          description: |-
+            Unprocessable Content — the request cannot be processed against stored state. Two cases:
+            1. The target survey is archived (soft-deleted) and therefore read-only; restore it before editing. The `invalid_params` entry reports `name: archivedAt` with the reason `This survey is archived. Restore it before editing.`
+            2. The patched document passed schema validation but failed a cross-reference check that requires stored state to detect: an undeclared locale key used in content, a duplicate stable id, an immutable element-id change on a published survey, a dangling logic/jump reference, an invalid media URL, a `distribution.triggers[].actionClassId` referencing an action class that does not exist in the workspace (discover valid ids via `GET /api/v3/action-classes`), or a `targeting.filters` entry that cannot resolve in the workspace — an unknown contact-attribute key or segment, an unsupported person identifier, or an unknown device value. The `invalid_params` array pinpoints each issue (e.g. `code: invalid_reference` with the offending `identifier`).
           content:
             application/problem+json:
               schema:
                 $ref: '#/components/schemas/Problem'
+              examples:
+                archived:
+                  summary: Survey is archived (restore before editing)
+                  value:
+                    type: about:blank
+                    title: Unprocessable Content
+                    status: 422
+                    detail: Survey is archived
+                    code: unprocessable_content
+                    requestId: req_clsv1234567890123456789012
+                    invalid_params:
+                      - name: archivedAt
+                        reason: This survey is archived. Restore it before editing.
+                invalidReference:
+                  summary: Cross-reference validation failed
+                  value:
+                    type: about:blank
+                    title: Unprocessable Content
+                    status: 422
+                    detail: Survey document failed validation
+                    code: unprocessable_content
+                    requestId: req_clsv1234567890123456789012
+                    invalid_params:
+                      - name: blocks[0].logic[0].target
+                        reason: References a block that does not exist in the survey.
+                        code: invalid_reference
+                        identifier: e0tfwzqk63op37y14z95qq3k
         '429':
           $ref: '#/components/responses/V3TooManyRequests'
         '500':
@@ -1077,6 +1117,166 @@ paths:
       security:
         - sessionAuth: []
         - apiKeyAuth: []
+  /api/v3/surveys/{surveyId}/archive:
+    post:
+      operationId: archiveSurveyV3
+      summary: Archive a survey
+      description: |
+        Archives (soft-deletes) a survey by id. Archived surveys are hidden from the default list, stop collecting responses, and become read-only until restored — a subsequent `PATCH` returns **422**. Works on any survey, including legacy question-based surveys, so this endpoint returns a minimal lifecycle acknowledgement rather than the full survey resource. Session cookie or x-api-key.
+      tags:
+        - V3 Surveys
+      parameters:
+        - in: path
+          name: surveyId
+          required: true
+          schema:
+            type: string
+            format: cuid2
+          description: Survey identifier.
+      responses:
+        '200':
+          description: Survey archived successfully
+          headers:
+            X-Request-Id:
+              schema:
+                type: string
+              description: Request correlation ID
+            Cache-Control:
+              schema:
+                type: string
+              example: private, no-store
+          content:
+            application/json:
+              schema:
+                type: object
+                required:
+                  - data
+                properties:
+                  data:
+                    type: object
+                    required:
+                      - id
+                      - status
+                      - archivedAt
+                    properties:
+                      id:
+                        type: string
+                        description: Survey identifier.
+                      status:
+                        type: string
+                        enum:
+                          - draft
+                          - inProgress
+                          - paused
+                          - completed
+                        description: Current survey status.
+                      archivedAt:
+                        type:
+                          - string
+                          - 'null'
+                        format: date-time
+                        description: Soft-delete/archive marker (ISO 8601). A timestamp after archiving; `null` when the survey is active.
+              examples:
+                archived:
+                  summary: Survey archived
+                  value:
+                    data:
+                      id: clsv1234567890123456789012
+                      status: paused
+                      archivedAt: '2026-05-18T09:24:54.014Z'
+        '400':
+          $ref: '#/components/responses/V3BadRequest'
+        '401':
+          $ref: '#/components/responses/V3Unauthorized'
+        '403':
+          $ref: '#/components/responses/V3Forbidden'
+        '429':
+          $ref: '#/components/responses/V3TooManyRequests'
+        '500':
+          $ref: '#/components/responses/V3InternalServerError'
+      security:
+        - sessionAuth: []
+        - apiKeyAuth: []
+  /api/v3/surveys/{surveyId}/restore:
+    post:
+      operationId: restoreSurveyV3
+      summary: Restore a survey
+      description: |
+        Restores a previously archived (soft-deleted) survey by id, clearing its archive marker so it reappears in the default list and becomes editable again. Works on any survey, including legacy question-based surveys, so this endpoint returns a minimal lifecycle acknowledgement rather than the full survey resource. Session cookie or x-api-key.
+      tags:
+        - V3 Surveys
+      parameters:
+        - in: path
+          name: surveyId
+          required: true
+          schema:
+            type: string
+            format: cuid2
+          description: Survey identifier.
+      responses:
+        '200':
+          description: Survey restored successfully
+          headers:
+            X-Request-Id:
+              schema:
+                type: string
+              description: Request correlation ID
+            Cache-Control:
+              schema:
+                type: string
+              example: private, no-store
+          content:
+            application/json:
+              schema:
+                type: object
+                required:
+                  - data
+                properties:
+                  data:
+                    type: object
+                    required:
+                      - id
+                      - status
+                      - archivedAt
+                    properties:
+                      id:
+                        type: string
+                        description: Survey identifier.
+                      status:
+                        type: string
+                        enum:
+                          - draft
+                          - inProgress
+                          - paused
+                          - completed
+                        description: Current survey status.
+                      archivedAt:
+                        type:
+                          - string
+                          - 'null'
+                        format: date-time
+                        description: Soft-delete/archive marker (ISO 8601). `null` after restoring; a timestamp while the survey is archived.
+              examples:
+                restored:
+                  summary: Survey restored
+                  value:
+                    data:
+                      id: clsv1234567890123456789012
+                      status: paused
+                      archivedAt: null
+        '400':
+          $ref: '#/components/responses/V3BadRequest'
+        '401':
+          $ref: '#/components/responses/V3Unauthorized'
+        '403':
+          $ref: '#/components/responses/V3Forbidden'
+        '429':
+          $ref: '#/components/responses/V3TooManyRequests'
+        '500':
+          $ref: '#/components/responses/V3InternalServerError'
+      security:
+        - sessionAuth: []
+        - apiKeyAuth: []
   /api/v3/action-classes:
     get:
       operationId: listActionClassesV3
@@ -1281,6 +1481,7 @@ components:
         - publishOn
         - createdAt
         - updatedAt
+        - archivedAt
         - responseCount
         - creator
       properties:
@@ -1310,6 +1511,12 @@ components:
         updatedAt:
           type: string
           format: date-time
+        archivedAt:
+          type:
+            - string
+            - 'null'
+          format: date-time
+          description: Soft-delete/archive marker (ISO 8601); `null` when the survey is active.
         publishOn:
           type:
             - string
@@ -3116,6 +3323,7 @@ components:
         - workspaceId
         - createdAt
         - updatedAt
+        - archivedAt
         - name
         - type
         - status
@@ -3138,6 +3346,12 @@ components:
         updatedAt:
           type: string
           format: date-time
+        archivedAt:
+          type:
+            - string
+            - 'null'
+          format: date-time
+          description: Soft-delete/archive marker (ISO 8601); `null` when the survey is active.
         name:
           type: string
         type:
diff --git a/docs/api-v3-reference/src/components/schemas/SurveyListItem.yml b/docs/api-v3-reference/src/components/schemas/SurveyListItem.yml
index 18c89b4e1d97..51b7cdc103dd 100644
--- a/docs/api-v3-reference/src/components/schemas/SurveyListItem.yml
+++ b/docs/api-v3-reference/src/components/schemas/SurveyListItem.yml
@@ -16,6 +16,7 @@ required:
   - publishOn
   - createdAt
   - updatedAt
+  - archivedAt
   - responseCount
   - creator
 properties:
@@ -45,6 +46,13 @@ properties:
   updatedAt:
     type: string
     format: date-time
+  archivedAt:
+    type:
+      - string
+      - 'null'
+    format: date-time
+    description: >-
+      Soft-delete/archive marker (ISO 8601); `null` when the survey is active.
   publishOn:
     type:
       - string
diff --git a/docs/api-v3-reference/src/components/schemas/SurveyResource.yml b/docs/api-v3-reference/src/components/schemas/SurveyResource.yml
index 7c0789ecbfe1..63161642262b 100644
--- a/docs/api-v3-reference/src/components/schemas/SurveyResource.yml
+++ b/docs/api-v3-reference/src/components/schemas/SurveyResource.yml
@@ -4,6 +4,7 @@ required:
   - workspaceId
   - createdAt
   - updatedAt
+  - archivedAt
   - name
   - type
   - status
@@ -26,6 +27,13 @@ properties:
   updatedAt:
     type: string
     format: date-time
+  archivedAt:
+    type:
+      - string
+      - 'null'
+    format: date-time
+    description: >-
+      Soft-delete/archive marker (ISO 8601); `null` when the survey is active.
   name:
     type: string
   type:
diff --git a/docs/api-v3-reference/src/openapi.yml b/docs/api-v3-reference/src/openapi.yml
index b0b9fe9e3932..99a90e2edf7b 100644
--- a/docs/api-v3-reference/src/openapi.yml
+++ b/docs/api-v3-reference/src/openapi.yml
@@ -131,6 +131,10 @@ paths:
     $ref: paths/api_v3_surveys_validate.yml
   /api/v3/surveys/{surveyId}:
     $ref: paths/api_v3_surveys_{surveyId}.yml
+  /api/v3/surveys/{surveyId}/archive:
+    $ref: paths/api_v3_surveys_{surveyId}_archive.yml
+  /api/v3/surveys/{surveyId}/restore:
+    $ref: paths/api_v3_surveys_{surveyId}_restore.yml
   /api/v3/action-classes:
     $ref: paths/api_v3_action-classes.yml
   /api/v3/contact-attribute-keys:
diff --git a/docs/api-v3-reference/src/paths/api_v3_surveys.yml b/docs/api-v3-reference/src/paths/api_v3_surveys.yml
index 6b0229247da8..f3d54c6335e2 100644
--- a/docs/api-v3-reference/src/paths/api_v3_surveys.yml
+++ b/docs/api-v3-reference/src/paths/api_v3_surveys.yml
@@ -57,6 +57,7 @@ get:
             - inProgress
             - paused
             - completed
+            - archived
       style: form
       explode: true
       description: >
@@ -64,6 +65,10 @@ get:
         (`filter[status][in]=draft&filter[status][in]=inProgress`) or use
         comma-separated values (`filter[status][in]=draft,inProgress`). Invalid
         values → **400**.
+
+        `archived` is a pseudo-status: it does not match a real survey status but
+        includes archived (soft-deleted) surveys in the result set. Archived
+        surveys are otherwise excluded from the default list.
     - in: query
       name: filter[type][in]
       schema:
@@ -120,6 +125,7 @@ get:
                   - limit
                   - nextCursor
                   - totalCount
+                  - hasArchived
                 properties:
                   limit:
                     type: integer
@@ -138,6 +144,15 @@ get:
                     description: >-
                       Total number of surveys matching the current filters
                       across all pages. `null` when `includeTotalCount=false`.
+                  hasArchived:
+                    type:
+                      - boolean
+                      - 'null'
+                    description: >-
+                      `true` when the workspace has at least one archived
+                      (soft-deleted) survey. Computed only on the first page
+                      (same gate as `totalCount`); `null` when
+                      `includeTotalCount=false`.
     '400':
       $ref: ../components/responses/V3BadRequest.yml
     '401':
diff --git a/docs/api-v3-reference/src/paths/api_v3_surveys_{surveyId}.yml b/docs/api-v3-reference/src/paths/api_v3_surveys_{surveyId}.yml
index 8ca57702f281..e363c4aa234c 100644
--- a/docs/api-v3-reference/src/paths/api_v3_surveys_{surveyId}.yml
+++ b/docs/api-v3-reference/src/paths/api_v3_surveys_{surveyId}.yml
@@ -93,6 +93,7 @@ get:
                   workspaceId: clseedworkspace000000000
                   createdAt: '2026-05-18T09:24:54.014Z'
                   updatedAt: '2026-05-18T09:24:54.014Z'
+                  archivedAt: null
                   name: CSAT Survey
                   type: link
                   status: inProgress
@@ -132,6 +133,7 @@ get:
                   workspaceId: clseedworkspace000000000
                   createdAt: '2026-05-18T09:24:54.014Z'
                   updatedAt: '2026-05-18T09:24:54.014Z'
+                  archivedAt: null
                   name: CSAT Survey
                   type: link
                   status: inProgress
@@ -320,7 +322,13 @@ patch:
             $ref: ../components/schemas/Problem.yml
     '422':
       description: >-
-        Unprocessable Content — the patched document passed schema validation but failed a
+        Unprocessable Content — the request cannot be processed against stored state. Two cases:
+
+        1. The target survey is archived (soft-deleted) and therefore read-only; restore it before
+        editing. The `invalid_params` entry reports `name: archivedAt` with the reason
+        `This survey is archived. Restore it before editing.`
+
+        2. The patched document passed schema validation but failed a
         cross-reference check that requires stored state to detect: an undeclared locale key used in
         content, a duplicate stable id, an immutable element-id change on a published survey, a
         dangling logic/jump reference, an invalid media URL, a
@@ -333,6 +341,33 @@ patch:
         application/problem+json:
           schema:
             $ref: ../components/schemas/Problem.yml
+          examples:
+            archived:
+              summary: Survey is archived (restore before editing)
+              value:
+                type: about:blank
+                title: Unprocessable Content
+                status: 422
+                detail: Survey is archived
+                code: unprocessable_content
+                requestId: req_clsv1234567890123456789012
+                invalid_params:
+                  - name: archivedAt
+                    reason: This survey is archived. Restore it before editing.
+            invalidReference:
+              summary: Cross-reference validation failed
+              value:
+                type: about:blank
+                title: Unprocessable Content
+                status: 422
+                detail: Survey document failed validation
+                code: unprocessable_content
+                requestId: req_clsv1234567890123456789012
+                invalid_params:
+                  - name: blocks[0].logic[0].target
+                    reason: References a block that does not exist in the survey.
+                    code: invalid_reference
+                    identifier: e0tfwzqk63op37y14z95qq3k
     '429':
       $ref: ../components/responses/V3TooManyRequests.yml
     '500':
diff --git a/docs/api-v3-reference/src/paths/api_v3_surveys_{surveyId}_archive.yml b/docs/api-v3-reference/src/paths/api_v3_surveys_{surveyId}_archive.yml
new file mode 100644
index 000000000000..c7f3986307ed
--- /dev/null
+++ b/docs/api-v3-reference/src/paths/api_v3_surveys_{surveyId}_archive.yml
@@ -0,0 +1,84 @@
+post:
+  operationId: archiveSurveyV3
+  summary: Archive a survey
+  description: >
+    Archives (soft-deletes) a survey by id. Archived surveys are hidden from the default list, stop
+    collecting responses, and become read-only until restored — a subsequent `PATCH` returns **422**.
+    Works on any survey, including legacy question-based surveys, so this endpoint returns a minimal
+    lifecycle acknowledgement rather than the full survey resource. Session cookie or x-api-key.
+  tags:
+    - V3 Surveys
+  parameters:
+    - in: path
+      name: surveyId
+      required: true
+      schema:
+        type: string
+        format: cuid2
+      description: Survey identifier.
+  responses:
+    '200':
+      description: Survey archived successfully
+      headers:
+        X-Request-Id:
+          schema:
+            type: string
+          description: Request correlation ID
+        Cache-Control:
+          schema:
+            type: string
+          example: private, no-store
+      content:
+        application/json:
+          schema:
+            type: object
+            required:
+              - data
+            properties:
+              data:
+                type: object
+                required:
+                  - id
+                  - status
+                  - archivedAt
+                properties:
+                  id:
+                    type: string
+                    description: Survey identifier.
+                  status:
+                    type: string
+                    enum:
+                      - draft
+                      - inProgress
+                      - paused
+                      - completed
+                    description: Current survey status.
+                  archivedAt:
+                    type:
+                      - string
+                      - 'null'
+                    format: date-time
+                    description: >-
+                      Soft-delete/archive marker (ISO 8601). A timestamp after archiving; `null`
+                      when the survey is active.
+          examples:
+            archived:
+              summary: Survey archived
+              value:
+                data:
+                  id: clsv1234567890123456789012
+                  status: paused
+                  archivedAt: '2026-05-18T09:24:54.014Z'
+    '400':
+      $ref: ../components/responses/V3BadRequest.yml
+    '401':
+      $ref: ../components/responses/V3Unauthorized.yml
+    '403':
+      $ref: ../components/responses/V3Forbidden.yml
+    '429':
+      $ref: ../components/responses/V3TooManyRequests.yml
+    '500':
+      $ref: ../components/responses/V3InternalServerError.yml
+  security:
+    - sessionAuth: []
+    - apiKeyAuth: []
diff --git a/docs/api-v3-reference/src/paths/api_v3_surveys_{surveyId}_restore.yml b/docs/api-v3-reference/src/paths/api_v3_surveys_{surveyId}_restore.yml
new file mode 100644
index 000000000000..8d20494eb39f
--- /dev/null
+++ b/docs/api-v3-reference/src/paths/api_v3_surveys_{surveyId}_restore.yml
@@ -0,0 +1,84 @@
+post:
+  operationId: restoreSurveyV3
+  summary: Restore a survey
+  description: >
+    Restores a previously archived (soft-deleted) survey by id, clearing its archive marker so it
+    reappears in the default list and becomes editable again. Works on any survey, including legacy
+    question-based surveys, so this endpoint returns a minimal lifecycle acknowledgement rather than
+    the full survey resource. Session cookie or x-api-key.
+  tags:
+    - V3 Surveys
+  parameters:
+    - in: path
+      name: surveyId
+      required: true
+      schema:
+        type: string
+        format: cuid2
+      description: Survey identifier.
+  responses:
+    '200':
+      description: Survey restored successfully
+      headers:
+        X-Request-Id:
+          schema:
+            type: string
+          description: Request correlation ID
+        Cache-Control:
+          schema:
+            type: string
+          example: private, no-store
+      content:
+        application/json:
+          schema:
+            type: object
+            required:
+              - data
+            properties:
+              data:
+                type: object
+                required:
+                  - id
+                  - status
+                  - archivedAt
+                properties:
+                  id:
+                    type: string
+                    description: Survey identifier.
+                  status:
+                    type: string
+                    enum:
+                      - draft
+                      - inProgress
+                      - paused
+                      - completed
+                    description: Current survey status.
+                  archivedAt:
+                    type:
+                      - string
+                      - 'null'
+                    format: date-time
+                    description: >-
+                      Soft-delete/archive marker (ISO 8601). `null` after restoring; a timestamp
+                      while the survey is archived.
+          examples:
+            restored:
+              summary: Survey restored
+              value:
+                data:
+                  id: clsv1234567890123456789012
+                  status: paused
+                  archivedAt: null
+    '400':
+      $ref: ../components/responses/V3BadRequest.yml
+    '401':
+      $ref: ../components/responses/V3Unauthorized.yml
+    '403':
+      $ref: ../components/responses/V3Forbidden.yml
+    '429':
+      $ref: ../components/responses/V3TooManyRequests.yml
+    '500':
+      $ref: ../components/responses/V3InternalServerError.yml
+  security:
+    - sessionAuth: []
+    - apiKeyAuth: []
diff --git a/packages/database/migration/20260722000000_add_survey_archived_at/migration.sql b/packages/database/migration/20260722000000_add_survey_archived_at/migration.sql
new file mode 100644
index 000000000000..c44ce8607db4
--- /dev/null
+++ b/packages/database/migration/20260722000000_add_survey_archived_at/migration.sql
@@ -0,0 +1,5 @@
+-- AlterTable
+ALTER TABLE "Survey" ADD COLUMN     "archivedAt" TIMESTAMP(3);
+
+-- CreateIndex
+CREATE INDEX "Survey_archivedAt_idx" ON "Survey"("archivedAt");
diff --git a/packages/database/schema.prisma b/packages/database/schema.prisma
index 5c0dcd6ee6a7..547e96b5b776 100644
--- a/packages/database/schema.prisma
+++ b/packages/database/schema.prisma
@@ -381,6 +381,7 @@ model Survey {
   delay               Int                     @default(0)
   publishOn           DateTime?
   closeOn             DateTime?
+  archivedAt          DateTime?
   /// [SurveyClosedMessage]
   surveyClosedMessage Json?
   segmentId           String?
@@ -421,6 +422,7 @@ model Survey {
   @@index([segmentId])
   @@index([status, publishOn])
   @@index([status, closeOn])
+  @@index([archivedAt])
 }
 
 /// Represents a quota configuration for a survey.
diff --git a/packages/jobs/src/constants.ts b/packages/jobs/src/constants.ts
index 9ddce5fd20a7..0d3cc97ddea6 100644
--- a/packages/jobs/src/constants.ts
+++ b/packages/jobs/src/constants.ts
@@ -7,6 +7,7 @@ export const JOB_NAMES = {
   testLog: "system.test-log",
   responsePipeline: "response-pipeline.process",
   surveyScheduling: "survey-scheduling.reconcile",
+  surveyArchivePurge: "survey-archive-purge.process",
 } as const;
 
 const JOBS_DEFAULT_BACKOFF = Object.freeze({
diff --git a/packages/jobs/src/definitions.ts b/packages/jobs/src/definitions.ts
index dbe604687fc3..11d3c28c3545 100644
--- a/packages/jobs/src/definitions.ts
+++ b/packages/jobs/src/definitions.ts
@@ -1,9 +1,15 @@
 import { JOB_NAMES } from "@/src/constants";
 import { type AnyBackgroundJobDefinition, toAnyBackgroundJobDefinition } from "@/src/contracts";
 import { processResponsePipelineJob } from "@/src/processors/response-pipeline";
+import { processSurveyArchivePurgeJob } from "@/src/processors/survey-archive-purge";
 import { processSurveySchedulingJob } from "@/src/processors/survey-scheduling";
 import { processTestLogJob } from "@/src/processors/test-log";
-import { ZResponsePipelineJobData, ZSurveySchedulingJobData, ZTestLogJobData } from "@/src/types";
+import {
+  ZResponsePipelineJobData,
+  ZSurveyArchivePurgeJobData,
+  ZSurveySchedulingJobData,
+  ZTestLogJobData,
+} from "@/src/types";
 
 export const backgroundJobDefinitions = {
   [JOB_NAMES.responsePipeline]: toAnyBackgroundJobDefinition({
@@ -16,6 +22,11 @@ export const backgroundJobDefinitions = {
     name: JOB_NAMES.surveyScheduling,
     schema: ZSurveySchedulingJobData,
   }),
+  [JOB_NAMES.surveyArchivePurge]: toAnyBackgroundJobDefinition({
+    handle: processSurveyArchivePurgeJob,
+    name: JOB_NAMES.surveyArchivePurge,
+    schema: ZSurveyArchivePurgeJobData,
+  }),
   [JOB_NAMES.testLog]: toAnyBackgroundJobDefinition({
     handle: processTestLogJob,
     name: JOB_NAMES.testLog,
diff --git a/packages/jobs/src/index.ts b/packages/jobs/src/index.ts
index 6fb26a9e6ba4..1ff5ee5774b2 100644
--- a/packages/jobs/src/index.ts
+++ b/packages/jobs/src/index.ts
@@ -13,15 +13,18 @@ export {
   enqueueSurveySchedulingJob,
   enqueueTestLogJob,
   getBackgroundJobProducer,
+  removeRecurringSurveyArchivePurgeJobSchedule,
   removeRecurringSurveySchedulingJobSchedule,
   scheduleResponsePipelineJobAt,
   scheduleSurveySchedulingJobAt,
   scheduleTestLogJobAt,
   upsertRecurringResponsePipelineJobSchedule,
+  upsertRecurringSurveyArchivePurgeJobSchedule,
   upsertRecurringSurveySchedulingJobSchedule,
   upsertRecurringTestLogJobSchedule,
 } from "./queue";
 export { processResponsePipelineJob } from "./processors/response-pipeline";
+export { processSurveyArchivePurgeJob } from "./processors/survey-archive-purge";
 export { processSurveySchedulingJob } from "./processors/survey-scheduling";
 export { processTestLogJob } from "./processors/test-log";
 export { startJobsRuntime } from "./runtime";
@@ -47,12 +50,14 @@ export type {
 export {
   ZResponsePipelineEvent,
   ZResponsePipelineJobData,
+  ZSurveyArchivePurgeJobData,
   ZSurveySchedulingJobData,
   ZTestLogJobData,
 } from "./types";
 export type {
   TResponsePipelineEvent,
   TResponsePipelineJobData,
+  TSurveyArchivePurgeJobData,
   TSurveySchedulingJobData,
   TTestLogJobData,
 } from "./types";
diff --git a/packages/jobs/src/processors/survey-archive-purge.ts b/packages/jobs/src/processors/survey-archive-purge.ts
new file mode 100644
index 000000000000..ebaf2b5008d5
--- /dev/null
+++ b/packages/jobs/src/processors/survey-archive-purge.ts
@@ -0,0 +1,20 @@
+import { logger } from "@formbricks/logger";
+import type { JobHandler } from "@/src/contracts";
+import type { TSurveyArchivePurgeJobData } from "@/src/types";
+
+export const processSurveyArchivePurgeJob: JobHandler<TSurveyArchivePurgeJobData> = (data, context) => {
+  logger.error(
+    {
+      attempt: context.attempt,
+      jobId: context.jobId,
+      jobName: context.jobName,
+      queueName: context.queueName,
+      scope: data.scope,
+    },
+    "BullMQ survey archive purge processor override is not registered"
+  );
+
+  throw new Error(
+    `BullMQ survey archive purge processor override missing for job ${context.jobId} (${data.scope})`
+  );
+};
diff --git a/packages/jobs/src/queue.ts b/packages/jobs/src/queue.ts
index a3668f541692..d200cd5403b4 100644
--- a/packages/jobs/src/queue.ts
+++ b/packages/jobs/src/queue.ts
@@ -21,6 +21,7 @@ import {
 } from "@/src/schedules";
 import {
   type TResponsePipelineJobData,
+  type TSurveyArchivePurgeJobData,
   type TSurveySchedulingJobData,
   type TTestLogJobData,
 } from "@/src/types";
@@ -371,6 +372,47 @@ export const removeRecurringSurveySchedulingJobSchedule = async (
   }
 };
 
+export const upsertRecurringSurveyArchivePurgeJobSchedule = async (
+  identity: TBackgroundJobScheduleIdentity,
+  schedule: TRecurringBackgroundJobSchedule,
+  data: TSurveyArchivePurgeJobData
+): Promise<Job> => {
+  try {
+    return await upsertRecurringBackgroundJobSchedule(JOB_NAMES.surveyArchivePurge, identity, schedule, data);
+  } catch (error) {
+    logger.error(
+      {
+        err: error,
+        jobName: JOB_NAMES.surveyArchivePurge,
+        schedule,
+        scheduleId: identity.scheduleId,
+        scope: identity.scope,
+      },
+      "Failed to upsert BullMQ survey archive purge schedule"
+    );
+    throw error;
+  }
+};
+
+export const removeRecurringSurveyArchivePurgeJobSchedule = async (
+  identity: TBackgroundJobScheduleIdentity
+): Promise<boolean> => {
+  try {
+    return await removeRecurringBackgroundJobSchedule(JOB_NAMES.surveyArchivePurge, identity);
+  } catch (error) {
+    logger.error(
+      {
+        err: error,
+        jobName: JOB_NAMES.surveyArchivePurge,
+        scheduleId: identity.scheduleId,
+        scope: identity.scope,
+      },
+      "Failed to remove BullMQ survey archive purge schedule"
+    );
+    throw error;
+  }
+};
+
 export const getBackgroundJobProducer = (): BackgroundJobProducer => ({
   enqueueResponsePipeline: async (data) => toEnqueuedJob(await enqueueResponsePipelineJob(data)),
   enqueueSurveyScheduling: async (data) => toEnqueuedJob(await enqueueSurveySchedulingJob(data)),
diff --git a/packages/jobs/src/types.ts b/packages/jobs/src/types.ts
index ea4f40dd97e6..1a821d76de23 100644
--- a/packages/jobs/src/types.ts
+++ b/packages/jobs/src/types.ts
@@ -43,3 +43,9 @@ export const ZSurveySchedulingJobData = z.object({
 });
 
 export type TSurveySchedulingJobData = z.infer<typeof ZSurveySchedulingJobData>;
+
+export const ZSurveyArchivePurgeJobData = z.object({
+  scope: z.literal("global"),
+});
+
+export type TSurveyArchivePurgeJobData = z.infer<typeof ZSurveyArchivePurgeJobData>;
diff --git a/packages/types/surveys/types.ts b/packages/types/surveys/types.ts
index 8dc3f526425f..935747a8bbda 100644
--- a/packages/types/surveys/types.ts
+++ b/packages/types/surveys/types.ts
@@ -952,6 +952,10 @@ export const ZSurveyBase = z.object({
     .date()
     .nullish()
     .transform((value) => value ?? null),
+  // Soft-delete marker (ENG-1042). Optional (no transform) so it stays non-required on the inferred
+  // TSurvey type — existing survey literals/payloads that omit it keep compiling and validating.
+  // Reads populate it from the DB so archived state is available to the editor/summary surfaces.
+  archivedAt: z.coerce.date().nullish(),
   autoComplete: z
     .number()
     .min(1, {
@@ -3843,6 +3847,9 @@ export const ZSurveyCreateInput = makeSchemaOptional(ZSurveyBase)
     workspaceOverwrites: true,
     languages: true,
     followUps: true,
+    // archivedAt is owned exclusively by the archive/restore flows; a create must never set it,
+    // otherwise a caller could POST an already-archived, purge-eligible survey.
+    archivedAt: true,
   })
   .extend({
     name: z.string(), // Keep name required
@@ -3891,6 +3898,9 @@ export const ZSurveyCreateInputWithWorkspaceId = makeSchemaOptional(ZSurveyBase)
     workspaceOverwrites: true,
     languages: true,
     followUps: true,
+    // archivedAt is owned exclusively by the archive/restore flows; a create must never set it,
+    // otherwise a caller could POST an already-archived, purge-eligible survey.
+    archivedAt: true,
   })
   .extend({
     name: z.string(), // Keep name required
@@ -4380,6 +4390,9 @@ export const ZSurveyFilterCriteria = z.object({
     })
     .optional(),
   sortBy: z.enum(["createdAt", "updatedAt", "name", "relevance"]).optional(),
+  // When true, include archived surveys (archivedAt not null) in results.
+  // When false/undefined, archived surveys are excluded (hidden by default).
+  includeArchived: z.boolean().optional(),
 });
 
 export type TSurveyFilterCriteria = z.infer<typeof ZSurveyFilterCriteria>;

From 874960c09ec8eea34e389f6d6dcd68599a50417e Mon Sep 17 00:00:00 2001
From: Matti Nannt <675065+mattinannt@users.noreply.github.com>
Date: Wed, 29 Jul 2026 11:52:54 +0200
Subject: [PATCH 2/5] feat(surveys): add Vietnamese, Traditional Chinese, Urdu
 and Indonesian translations (#8678)

Co-authored-by: Claude Opus 5 <noreply@anthropic.com>
Co-authored-by: Dhruwang <dhruwangjariwala18@gmail.com>
---
 packages/surveys/i18n.json                   |   6 +-
 packages/surveys/locales/id-ID.json          | 100 +++++++++++++++++++
 packages/surveys/locales/ur-PK.json          | 100 +++++++++++++++++++
 packages/surveys/locales/vi-VN.json          | 100 +++++++++++++++++++
 packages/surveys/locales/zh-Hant-TW.json     | 100 +++++++++++++++++++
 packages/surveys/src/lib/i18n.config.test.ts |  46 ++++++++-
 packages/surveys/src/lib/i18n.config.ts      |  33 +++++-
 7 files changed, 477 insertions(+), 8 deletions(-)
 create mode 100644 packages/surveys/locales/id-ID.json
 create mode 100644 packages/surveys/locales/ur-PK.json
 create mode 100644 packages/surveys/locales/vi-VN.json
 create mode 100644 packages/surveys/locales/zh-Hant-TW.json

diff --git a/packages/surveys/i18n.json b/packages/surveys/i18n.json
index 2bf547443c15..6e6e5ed9dd23 100644
--- a/packages/surveys/i18n.json
+++ b/packages/surveys/i18n.json
@@ -16,6 +16,7 @@
       "fr-FR",
       "hi-IN",
       "hu-HU",
+      "id-ID",
       "it-IT",
       "ja-JP",
       "nl-NL",
@@ -24,8 +25,11 @@
       "ru-RU",
       "sv-SE",
       "tr-TR",
+      "ur-PK",
       "uz-UZ",
-      "zh-Hans-CN"
+      "vi-VN",
+      "zh-Hans-CN",
+      "zh-Hant-TW"
     ]
   },
   "version": 1.8
diff --git a/packages/surveys/locales/id-ID.json b/packages/surveys/locales/id-ID.json
new file mode 100644
index 000000000000..d09b92d7627d
--- /dev/null
+++ b/packages/surveys/locales/id-ID.json
@@ -0,0 +1,100 @@
+{
+  "common": {
+    "and": "dan",
+    "apply": "terapkan",
+    "back": "Kembali",
+    "close_survey": "Tutup survei",
+    "company_logo": "Logo Perusahaan",
+    "finish": "Selesai",
+    "language_switch": "Ganti bahasa",
+    "next": "Selanjutnya",
+    "no_results_found": "Tidak ada hasil ditemukan",
+    "open_in_new_tab": "Buka di tab baru",
+    "option_number": "Opsi {number}",
+    "people_responded": "{count, plural, other {{count} orang merespons}}",
+    "please_retry_now_or_try_again_later": "Silakan coba lagi sekarang atau nanti.",
+    "powered_by": "Didukung oleh",
+    "privacy_policy": "Kebijakan Privasi",
+    "protected_by_reCAPTCHA_and_the_Google": "Dilindungi oleh reCAPTCHA dan Google",
+    "question": "Pertanyaan",
+    "question_video": "Video Pertanyaan",
+    "required": "Wajib diisi",
+    "respondents_will_not_see_this_card": "Responden tidak akan melihat kartu ini",
+    "response_saved_offline": "Respons Anda belum terkirim. Respons akan dikirim secara otomatis setelah Anda kembali online.",
+    "retry": "Coba Lagi",
+    "retrying": "Mencoba lagi…",
+    "scheduling_calendar": "Kalender penjadwalan",
+    "scroll_to_bottom": "Gulir ke bawah",
+    "search": "Cari...",
+    "select_option": "Pilih opsi",
+    "select_options": "Pilih opsi",
+    "sending_responses": "Mengirim respons…",
+    "survey_dialog": "Dialog Survei",
+    "takes_less_than_x_minutes": "{count, plural, other {Kurang dari {count} menit}}",
+    "takes_x_minutes": "{count, plural, other {{count} menit}}",
+    "takes_x_plus_minutes": "{count}+ menit",
+    "terms_of_service": "Ketentuan Layanan",
+    "the_servers_cannot_be_reached_at_the_moment": "Server tidak dapat dijangkau saat ini.",
+    "they_will_be_redirected_immediately": "Mereka akan segera diarahkan",
+    "welcome_video": "Video Kartu Selamat Datang",
+    "your_feedback_is_stuck": "Umpan balikmu macet :("
+  },
+  "errors": {
+    "all_options_must_be_ranked": "Harap urutkan semua opsi",
+    "all_rows_must_be_answered": "Harap jawab semua baris",
+    "file_extension_must_be": "Ekstensi file harus {extension}",
+    "file_extension_must_not_be": "Ekstensi file tidak boleh {extension}",
+    "file_input": {
+      "duplicate_files": "File berikut sudah diunggah: {duplicateNames}. File duplikat tidak diizinkan.",
+      "file_size_exceeded": "File berikut melebihi ukuran maksimum {maxSizeInMB} MB dan telah dihapus: {fileNames}",
+      "file_size_exceeded_alert": "Ukuran file harus kurang dari {maxSizeInMB} MB",
+      "invalid_file_name": "Nama file mengandung karakter yang tidak valid. Harap ubah nama file dan coba lagi.",
+      "no_valid_file_types_selected": "Tidak ada jenis file valid yang dipilih. Harap pilih jenis file yang valid.",
+      "only_one_file_can_be_uploaded_at_a_time": "Hanya satu file yang dapat diunggah dalam satu waktu.",
+      "placeholder_text": "Klik atau seret untuk mengunggah file",
+      "upload_failed": "Unggahan gagal! Harap coba lagi.",
+      "upload_service_unavailable": "Layanan unggah file tidak tersedia. Silakan coba lagi nanti atau hubungi pemilik survei.",
+      "uploading": "Mengunggah...",
+      "you_can_only_upload_a_maximum_of_files": "Kamu hanya dapat mengunggah maksimal {FILE_LIMIT} file."
+    },
+    "invalid_device_error": {
+      "message": "Silakan nonaktifkan perlindungan spam di pengaturan survei untuk melanjutkan menggunakan perangkat ini.",
+      "title": "Perangkat ini tidak mendukung perlindungan spam."
+    },
+    "invalid_format": "Silakan masukkan format yang valid",
+    "is_between": "Silakan pilih tanggal antara {startDate} dan {endDate}",
+    "is_earlier_than": "Silakan pilih tanggal sebelum {date}",
+    "is_greater_than": "Silakan masukkan nilai lebih besar dari {min}",
+    "is_later_than": "Silakan pilih tanggal setelah {date}",
+    "is_less_than": "Silakan masukkan nilai kurang dari {max}",
+    "is_not_between": "Silakan pilih tanggal tidak antara {startDate} dan {endDate}",
+    "max_length": "Silakan masukkan tidak lebih dari {max} karakter",
+    "max_selections": "Silakan pilih tidak lebih dari {max} opsi",
+    "max_value": "Silakan masukkan nilai tidak lebih dari {max}",
+    "min_length": "Silakan masukkan minimal {min} karakter",
+    "min_selections": "Silakan pilih minimal {min} opsi",
+    "min_value": "Silakan masukkan nilai minimal {min}",
+    "minimum_options_ranked": "Silakan urutkan minimal {min} opsi",
+    "minimum_rows_answered": "Silakan jawab minimal {min} baris",
+    "please_enter_a_valid_email_address": "Silakan masukkan alamat email yang valid",
+    "please_enter_a_valid_phone_number": "Silakan masukkan nomor telepon yang valid",
+    "please_enter_a_valid_url": "Silakan masukkan URL yang valid",
+    "please_fill_out_this_field": "Silakan isi kolom ini",
+    "recaptcha_error": {
+      "message": "Responsmu tidak dapat dikirim karena ditandai sebagai aktivitas otomatis. Jika kamu manusia, silakan coba lagi.",
+      "title": "Kami tidak dapat memverifikasi bahwa kamu adalah manusia."
+    },
+    "response_already_completed": {
+      "message": "Respons ini sudah selesai dan tidak dapat diubah lagi. Kamu dapat menutup jendela ini dengan aman.",
+      "title": "Respons ini sudah selesai."
+    },
+    "response_sending_error_permanent": {
+      "message": "Responsmu tidak dapat dikirim dan tidak dapat dicoba lagi. Silakan hubungi pemilik survei jika masalah ini terus berlanjut.",
+      "title": "Responsmu tidak dapat dikirim."
+    },
+    "value_must_contain": "Nilai harus mengandung {value}",
+    "value_must_equal": "Nilai harus sama dengan {value}",
+    "value_must_not_contain": "Nilai tidak boleh mengandung {value}",
+    "value_must_not_equal": "Nilai tidak boleh sama dengan {value}"
+  }
+}
diff --git a/packages/surveys/locales/ur-PK.json b/packages/surveys/locales/ur-PK.json
new file mode 100644
index 000000000000..0af8007161fb
--- /dev/null
+++ b/packages/surveys/locales/ur-PK.json
@@ -0,0 +1,100 @@
+{
+  "common": {
+    "and": "اور",
+    "apply": "لاگو کریں",
+    "back": "واپس",
+    "close_survey": "سروے بند کریں",
+    "company_logo": "کمپنی کا لوگو",
+    "finish": "ختم کریں",
+    "language_switch": "زبان تبدیل کریں",
+    "next": "اگلا",
+    "no_results_found": "کوئی نتائج نہیں ملے",
+    "open_in_new_tab": "نئے ٹیب میں کھولیں",
+    "option_number": "آپشن {number}",
+    "people_responded": "{count, plural, one {1 شخص نے جواب دیا} other {{count} لوگوں نے جواب دیا}}",
+    "please_retry_now_or_try_again_later": "براہ کرم ابھی دوبارہ کوشش کریں یا بعد میں دوبارہ آزمائیں۔",
+    "powered_by": "فراہم کردہ",
+    "privacy_policy": "رازداری کی پالیسی",
+    "protected_by_reCAPTCHA_and_the_Google": "reCAPTCHA اور Google کے ذریعے محفوظ",
+    "question": "سوال",
+    "question_video": "سوال کی ویڈیو",
+    "required": "ضروری",
+    "respondents_will_not_see_this_card": "جواب دہندگان کو یہ کارڈ نظر نہیں آئے گا",
+    "response_saved_offline": "آپ کا جواب ابھی تک بھیجا نہیں گیا۔ جیسے ہی آپ آن لائن ہوں گے، یہ خودکار طور پر جمع ہو جائے گا۔",
+    "retry": "دوبارہ کوشش کریں",
+    "retrying": "دوبارہ کوشش کی جا رہی ہے…",
+    "scheduling_calendar": "شیڈولنگ کیلنڈر",
+    "scroll_to_bottom": "نیچے تک سکرول کریں",
+    "search": "تلاش کریں...",
+    "select_option": "ایک اختیار منتخب کریں",
+    "select_options": "اختیارات منتخب کریں",
+    "sending_responses": "جوابات بھیجے جا رہے ہیں…",
+    "survey_dialog": "سروے ڈائیلاگ",
+    "takes_less_than_x_minutes": "{count, plural, one {1 منٹ سے بھی کم وقت لگتا ہے} other {{count} منٹ سے بھی کم وقت لگتا ہے}}",
+    "takes_x_minutes": "{count, plural, one {1 منٹ لگتا ہے} other {{count} منٹ لگتے ہیں}}",
+    "takes_x_plus_minutes": "{count}+ منٹ لگتے ہیں",
+    "terms_of_service": "استعمال کی شرائط",
+    "the_servers_cannot_be_reached_at_the_moment": "اس وقت سرورز تک رسائی نہیں ہو سکتی۔",
+    "they_will_be_redirected_immediately": "انہیں فوری طور پر ری ڈائریکٹ کیا جائے گا",
+    "welcome_video": "خوش آمدید کارڈ ویڈیو",
+    "your_feedback_is_stuck": "آپ کی رائے پھنس گئی ہے :("
+  },
+  "errors": {
+    "all_options_must_be_ranked": "براہ کرم تمام اختیارات کو درجہ بندی کریں",
+    "all_rows_must_be_answered": "براہ کرم تمام قطاروں کے جوابات دیں",
+    "file_extension_must_be": "فائل کی توسیع {extension} ہونی چاہیے",
+    "file_extension_must_not_be": "فائل کی توسیع {extension} نہیں ہونی چاہیے",
+    "file_input": {
+      "duplicate_files": "درج ذیل فائلیں پہلے ہی اپ لوڈ ہیں: {duplicateNames}۔ نقل فائلوں کی اجازت نہیں ہے۔",
+      "file_size_exceeded": "درج ذیل فائل(یں) {maxSizeInMB} MB کی زیادہ سے زیادہ حد سے تجاوز کرتی ہیں اور ہٹا دی گئی ہیں: {fileNames}",
+      "file_size_exceeded_alert": "فائل {maxSizeInMB} MB سے کم ہونی چاہیے",
+      "invalid_file_name": "فائل کے نام میں غلط حروف ہیں۔ براہ کرم فائل کا نام تبدیل کریں اور دوبارہ کوشش کریں۔",
+      "no_valid_file_types_selected": "کوئی درست فائل کی قسم منتخب نہیں کی گئی۔ براہ کرم ایک درست فائل کی قسم منتخب کریں۔",
+      "only_one_file_can_be_uploaded_at_a_time": "ایک وقت میں صرف ایک فائل اپ لوڈ کی جا سکتی ہے۔",
+      "placeholder_text": "فائلیں اپ لوڈ کرنے کے لیے کلک کریں یا گھسیٹیں",
+      "upload_failed": "اپ لوڈ ناکام ہو گیا! براہ کرم دوبارہ کوشش کریں۔",
+      "upload_service_unavailable": "فائل اپ لوڈ سروس دستیاب نہیں ہے۔ براہ کرم بعد میں دوبارہ کوشش کریں یا سروے کے مالک سے رابطہ کریں۔",
+      "uploading": "اپ لوڈ ہو رہی ہے...",
+      "you_can_only_upload_a_maximum_of_files": "آپ زیادہ سے زیادہ {FILE_LIMIT} فائلیں اپ لوڈ کر سکتے ہیں۔"
+    },
+    "invalid_device_error": {
+      "message": "اس ڈیوائس کا استعمال جاری رکھنے کے لیے براہ کرم سروے کی ترتیبات میں سپام تحفظ کو غیر فعال کریں۔",
+      "title": "یہ ڈیوائس سپام تحفظ کو سپورٹ نہیں کرتی۔"
+    },
+    "invalid_format": "براہ کرم ایک درست فارمیٹ درج کریں",
+    "is_between": "براہ کرم {startDate} اور {endDate} کے درمیان تاریخ منتخب کریں",
+    "is_earlier_than": "براہ کرم {date} سے پہلے کی تاریخ منتخب کریں",
+    "is_greater_than": "براہ کرم {min} سے زیادہ قدر درج کریں",
+    "is_later_than": "براہ کرم {date} کے بعد کی تاریخ منتخب کریں",
+    "is_less_than": "براہ کرم {max} سے کم قدر درج کریں",
+    "is_not_between": "براہ کرم {startDate} اور {endDate} کے درمیان کی تاریخ منتخب نہ کریں",
+    "max_length": "براہ کرم {max} حروف سے زیادہ درج نہ کریں",
+    "max_selections": "براہ کرم {max} سے زیادہ اختیارات منتخب نہ کریں",
+    "max_value": "براہ کرم {max} سے زیادہ قدر درج نہ کریں",
+    "min_length": "براہ کرم کم از کم {min} حروف درج کریں",
+    "min_selections": "براہ کرم کم از کم {min} اختیارات منتخب کریں",
+    "min_value": "براہ کرم کم از کم {min} کی قدر درج کریں",
+    "minimum_options_ranked": "براہ کرم کم از کم {min} اختیارات کی درجہ بندی کریں",
+    "minimum_rows_answered": "براہ کرم کم از کم {min} قطاروں کے جوابات دیں",
+    "please_enter_a_valid_email_address": "براہ کرم درست ای میل ایڈریس درج کریں",
+    "please_enter_a_valid_phone_number": "براہ کرم درست فون نمبر درج کریں",
+    "please_enter_a_valid_url": "براہ کرم درست URL درج کریں",
+    "please_fill_out_this_field": "براہ کرم یہ خانہ پُر کریں",
+    "recaptcha_error": {
+      "message": "آپ کا جواب جمع نہیں کیا جا سکا کیونکہ اسے خودکار سرگرمی کے طور پر نشان زد کیا گیا تھا۔ اگر آپ سانس لیتے ہیں تو براہ کرم دوبارہ کوشش کریں۔",
+      "title": "ہم تصدیق نہیں کر سکے کہ آپ انسان ہیں۔"
+    },
+    "response_already_completed": {
+      "message": "یہ جواب پہلے ہی مکمل ہو چکا ہے اور اب اسے تبدیل نہیں کیا جا سکتا۔ آپ اس ونڈو کو بند کر سکتے ہیں۔",
+      "title": "یہ جواب پہلے ہی مکمل ہو چکا ہے۔"
+    },
+    "response_sending_error_permanent": {
+      "message": "آپ کا جواب جمع نہیں ہو سکا اور دوبارہ کوشش نہیں کی جا سکتی۔ اگر یہ مسئلہ جاری رہے تو براہ کرم سروے کے مالک سے رابطہ کریں۔",
+      "title": "آپ کا جواب جمع نہیں ہو سکا۔"
+    },
+    "value_must_contain": "قدر میں {value} ہونا ضروری ہے",
+    "value_must_equal": "قدر {value} کے برابر ہونی چاہیے",
+    "value_must_not_contain": "قدر میں {value} نہیں ہونی چاہیے",
+    "value_must_not_equal": "قدر {value} کے برابر نہیں ہونی چاہیے"
+  }
+}
diff --git a/packages/surveys/locales/vi-VN.json b/packages/surveys/locales/vi-VN.json
new file mode 100644
index 000000000000..d9ca1db355f6
--- /dev/null
+++ b/packages/surveys/locales/vi-VN.json
@@ -0,0 +1,100 @@
+{
+  "common": {
+    "and": "và",
+    "apply": "áp dụng",
+    "back": "Quay lại",
+    "close_survey": "Đóng khảo sát",
+    "company_logo": "Logo Công ty",
+    "finish": "Hoàn tất",
+    "language_switch": "Chuyển đổi ngôn ngữ",
+    "next": "Tiếp theo",
+    "no_results_found": "Không tìm thấy kết quả",
+    "open_in_new_tab": "Mở trong tab mới",
+    "option_number": "Tùy chọn {number}",
+    "people_responded": "{count, plural, other {{count} người đã phản hồi}}",
+    "please_retry_now_or_try_again_later": "Vui lòng thử lại ngay hoặc thử lại sau.",
+    "powered_by": "Được hỗ trợ bởi",
+    "privacy_policy": "Chính sách Bảo mật",
+    "protected_by_reCAPTCHA_and_the_Google": "Được bảo vệ bởi reCAPTCHA và Google",
+    "question": "Câu hỏi",
+    "question_video": "Video Câu hỏi",
+    "required": "Bắt buộc",
+    "respondents_will_not_see_this_card": "Người trả lời sẽ không nhìn thấy thẻ này",
+    "response_saved_offline": "Phản hồi của bạn chưa được gửi đi. Nó sẽ được gửi tự động khi bạn trực tuyến trở lại.",
+    "retry": "Thử lại",
+    "retrying": "Đang thử lại…",
+    "scheduling_calendar": "Lịch đặt lịch",
+    "scroll_to_bottom": "Cuộn xuống cuối",
+    "search": "Tìm kiếm...",
+    "select_option": "Chọn một tùy chọn",
+    "select_options": "Chọn các tùy chọn",
+    "sending_responses": "Đang gửi phản hồi…",
+    "survey_dialog": "Hộp thoại khảo sát",
+    "takes_less_than_x_minutes": "{count, plural, other {Mất ít hơn {count} phút}}",
+    "takes_x_minutes": "{count, plural, other {Mất {count} phút}}",
+    "takes_x_plus_minutes": "Mất {count}+ phút",
+    "terms_of_service": "Điều khoản dịch vụ",
+    "the_servers_cannot_be_reached_at_the_moment": "Hiện không thể kết nối đến máy chủ.",
+    "they_will_be_redirected_immediately": "Họ sẽ được chuyển hướng ngay lập tức",
+    "welcome_video": "Video thẻ chào mừng",
+    "your_feedback_is_stuck": "Phản hồi của bạn bị kẹt :("
+  },
+  "errors": {
+    "all_options_must_be_ranked": "Vui lòng xếp hạng tất cả các tùy chọn",
+    "all_rows_must_be_answered": "Vui lòng trả lời tất cả các hàng",
+    "file_extension_must_be": "Phần mở rộng tệp phải là {extension}",
+    "file_extension_must_not_be": "Phần mở rộng tệp không được là {extension}",
+    "file_input": {
+      "duplicate_files": "Các tệp sau đã được tải lên: {duplicateNames}. Không cho phép tệp trùng lặp.",
+      "file_size_exceeded": "Các tệp sau vượt quá kích thước tối đa {maxSizeInMB} MB và đã bị xóa: {fileNames}",
+      "file_size_exceeded_alert": "Tệp phải nhỏ hơn {maxSizeInMB} MB",
+      "invalid_file_name": "Tên tệp chứa ký tự không hợp lệ. Vui lòng đổi tên tệp và thử lại.",
+      "no_valid_file_types_selected": "Không có loại tệp hợp lệ nào được chọn. Vui lòng chọn loại tệp hợp lệ.",
+      "only_one_file_can_be_uploaded_at_a_time": "Chỉ có thể tải lên một tệp tại một thời điểm.",
+      "placeholder_text": "Nhấp hoặc kéo thả để tải lên tệp",
+      "upload_failed": "Tải lên thất bại! Vui lòng thử lại.",
+      "upload_service_unavailable": "Dịch vụ tải tệp lên hiện không khả dụng. Vui lòng thử lại sau hoặc liên hệ với người tạo khảo sát.",
+      "uploading": "Đang tải lên...",
+      "you_can_only_upload_a_maximum_of_files": "Bạn chỉ có thể tải lên tối đa {FILE_LIMIT} tệp."
+    },
+    "invalid_device_error": {
+      "message": "Vui lòng tắt tính năng chống spam trong cài đặt khảo sát để tiếp tục sử dụng thiết bị này.",
+      "title": "Thiết bị này không hỗ trợ tính năng chống spam."
+    },
+    "invalid_format": "Vui lòng nhập đúng định dạng",
+    "is_between": "Vui lòng chọn ngày trong khoảng từ {startDate} đến {endDate}",
+    "is_earlier_than": "Vui lòng chọn ngày trước {date}",
+    "is_greater_than": "Vui lòng nhập giá trị lớn hơn {min}",
+    "is_later_than": "Vui lòng chọn ngày sau {date}",
+    "is_less_than": "Vui lòng nhập giá trị nhỏ hơn {max}",
+    "is_not_between": "Vui lòng chọn ngày không nằm trong khoảng từ {startDate} đến {endDate}",
+    "max_length": "Vui lòng nhập không quá {max} ký tự",
+    "max_selections": "Vui lòng chọn không quá {max} tùy chọn",
+    "max_value": "Vui lòng nhập giá trị không lớn hơn {max}",
+    "min_length": "Vui lòng nhập ít nhất {min} ký tự",
+    "min_selections": "Vui lòng chọn ít nhất {min} tùy chọn",
+    "min_value": "Vui lòng nhập giá trị ít nhất là {min}",
+    "minimum_options_ranked": "Vui lòng xếp hạng ít nhất {min} tùy chọn",
+    "minimum_rows_answered": "Vui lòng trả lời ít nhất {min} hàng",
+    "please_enter_a_valid_email_address": "Vui lòng nhập địa chỉ email hợp lệ",
+    "please_enter_a_valid_phone_number": "Vui lòng nhập số điện thoại hợp lệ",
+    "please_enter_a_valid_url": "Vui lòng nhập URL hợp lệ",
+    "please_fill_out_this_field": "Vui lòng điền vào trường này",
+    "recaptcha_error": {
+      "message": "Phản hồi của bạn không thể được gửi vì bị đánh dấu là hoạt động tự động. Nếu bạn là người thật, vui lòng thử lại.",
+      "title": "Chúng tôi không thể xác minh bạn là người thật."
+    },
+    "response_already_completed": {
+      "message": "Phản hồi này đã được hoàn tất và không thể thay đổi thêm. Bạn có thể đóng cửa sổ này một cách an toàn.",
+      "title": "Phản hồi này đã được hoàn tất."
+    },
+    "response_sending_error_permanent": {
+      "message": "Phản hồi của bạn không thể được gửi đi và không thể thử lại. Vui lòng liên hệ với chủ sở hữu khảo sát nếu vấn đề này tiếp tục xảy ra.",
+      "title": "Phản hồi của bạn không thể được gửi đi."
+    },
+    "value_must_contain": "Giá trị phải chứa {value}",
+    "value_must_equal": "Giá trị phải bằng {value}",
+    "value_must_not_contain": "Giá trị không được chứa {value}",
+    "value_must_not_equal": "Giá trị không được bằng {value}"
+  }
+}
diff --git a/packages/surveys/locales/zh-Hant-TW.json b/packages/surveys/locales/zh-Hant-TW.json
new file mode 100644
index 000000000000..39331afe592c
--- /dev/null
+++ b/packages/surveys/locales/zh-Hant-TW.json
@@ -0,0 +1,100 @@
+{
+  "common": {
+    "and": "和",
+    "apply": "套用",
+    "back": "返回",
+    "close_survey": "關閉問卷",
+    "company_logo": "公司標誌",
+    "finish": "完成",
+    "language_switch": "語言切換",
+    "next": "下一步",
+    "no_results_found": "找不到任何結果",
+    "open_in_new_tab": "在新分頁中開啟",
+    "option_number": "選項 {number}",
+    "people_responded": "{count, plural, other {{count} 人已回覆}}",
+    "please_retry_now_or_try_again_later": "請立即重試或稍後再試。",
+    "powered_by": "技術支援",
+    "privacy_policy": "隱私權政策",
+    "protected_by_reCAPTCHA_and_the_Google": "受 reCAPTCHA 與 Google 保護",
+    "question": "問題",
+    "question_video": "問題影片",
+    "required": "必填",
+    "respondents_will_not_see_this_card": "受訪者不會看到此卡片",
+    "response_saved_offline": "您的回覆尚未送出。當您重新連線時，系統會自動提交。",
+    "retry": "重試",
+    "retrying": "重試中…",
+    "scheduling_calendar": "行程日曆",
+    "scroll_to_bottom": "捲動至底部",
+    "search": "搜尋...",
+    "select_option": "選擇一個選項",
+    "select_options": "選擇選項",
+    "sending_responses": "正在傳送回覆…",
+    "survey_dialog": "問卷對話框",
+    "takes_less_than_x_minutes": "{count, plural, other {少於 {count} 分鐘}}",
+    "takes_x_minutes": "{count, plural, other {{count} 分鐘}}",
+    "takes_x_plus_minutes": "{count}+ 分鐘",
+    "terms_of_service": "服務條款",
+    "the_servers_cannot_be_reached_at_the_moment": "目前無法連線到伺服器。",
+    "they_will_be_redirected_immediately": "他們將立即被重新導向",
+    "welcome_video": "歡迎卡片影片",
+    "your_feedback_is_stuck": "您的意見回饋卡住了 :("
+  },
+  "errors": {
+    "all_options_must_be_ranked": "請為所有選項排序",
+    "all_rows_must_be_answered": "請回答所有列",
+    "file_extension_must_be": "檔案副檔名必須為 {extension}",
+    "file_extension_must_not_be": "檔案副檔名不得為 {extension}",
+    "file_input": {
+      "duplicate_files": "以下檔案已上傳：{duplicateNames}。不允許重複的檔案。",
+      "file_size_exceeded": "以下檔案超過 {maxSizeInMB} MB 的大小上限，已被移除：{fileNames}",
+      "file_size_exceeded_alert": "檔案大小應小於 {maxSizeInMB} MB",
+      "invalid_file_name": "檔案名稱包含無效字元。請重新命名檔案後再試一次。",
+      "no_valid_file_types_selected": "未選擇有效的檔案類型。請選擇有效的檔案類型。",
+      "only_one_file_can_be_uploaded_at_a_time": "一次只能上傳一個檔案。",
+      "placeholder_text": "點擊或拖曳以上傳檔案",
+      "upload_failed": "上傳失敗！請再試一次。",
+      "upload_service_unavailable": "檔案上傳服務目前無法使用。請稍後再試或聯絡問卷擁有者。",
+      "uploading": "上傳中...",
+      "you_can_only_upload_a_maximum_of_files": "您最多只能上傳 {FILE_LIMIT} 個檔案。"
+    },
+    "invalid_device_error": {
+      "message": "請在問卷設定中停用垃圾訊息防護，以繼續使用此裝置。",
+      "title": "此裝置不支援垃圾訊息防護。"
+    },
+    "invalid_format": "請輸入有效格式",
+    "is_between": "請選擇介於 {startDate} 和 {endDate} 之間的日期",
+    "is_earlier_than": "請選擇早於 {date} 的日期",
+    "is_greater_than": "請輸入大於 {min} 的值",
+    "is_later_than": "請選擇晚於 {date} 的日期",
+    "is_less_than": "請輸入小於 {max} 的值",
+    "is_not_between": "請選擇不在 {startDate} 和 {endDate} 之間的日期",
+    "max_length": "請輸入不超過 {max} 個字元",
+    "max_selections": "請選擇不超過 {max} 個選項",
+    "max_value": "請輸入不大於 {max} 的值",
+    "min_length": "請輸入至少 {min} 個字元",
+    "min_selections": "請選擇至少 {min} 個選項",
+    "min_value": "請輸入至少為 {min} 的值",
+    "minimum_options_ranked": "請至少排序 {min} 個選項",
+    "minimum_rows_answered": "請至少回答 {min} 行",
+    "please_enter_a_valid_email_address": "請輸入有效的電子郵件地址",
+    "please_enter_a_valid_phone_number": "請輸入有效的電話號碼",
+    "please_enter_a_valid_url": "請輸入有效的網址",
+    "please_fill_out_this_field": "請填寫此欄位",
+    "recaptcha_error": {
+      "message": "您的回應無法提交，因為它被標記為自動化活動。如果您是真人，請再試一次。",
+      "title": "我們無法驗證您是真人。"
+    },
+    "response_already_completed": {
+      "message": "此回覆已經完成且無法再更改。您可以安全地關閉此視窗。",
+      "title": "此回覆已經完成。"
+    },
+    "response_sending_error_permanent": {
+      "message": "您的回覆無法提交且無法重試。如果問題持續發生，請聯絡問卷擁有者。",
+      "title": "您的回覆無法提交。"
+    },
+    "value_must_contain": "值必須包含 {value}",
+    "value_must_equal": "值必須等於 {value}",
+    "value_must_not_contain": "值不得包含 {value}",
+    "value_must_not_equal": "值不得等於 {value}"
+  }
+}
diff --git a/packages/surveys/src/lib/i18n.config.test.ts b/packages/surveys/src/lib/i18n.config.test.ts
index 656e46c41208..4b3ccbdf4dd2 100644
--- a/packages/surveys/src/lib/i18n.config.test.ts
+++ b/packages/surveys/src/lib/i18n.config.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, test } from "vitest";
-import { resolveFallbackBundles } from "./i18n.config";
+import i18n, { resolveFallbackBundles } from "./i18n.config";
 
 // Locks down the locale-to-bundle fallback contract (ENG-1067). Bundles are keyed by each language's
 // canonical CLDR-default tag (`de-DE`, `pt-BR`, `zh-Hans-CN`); resolveFallbackBundles maps any requested
@@ -26,12 +26,32 @@ describe("resolveFallbackBundles", () => {
   });
 
   test("script is preserved: Traditional Chinese never borrows the Simplified bundle", () => {
-    // zh-Hant-TW carries an explicit Hant script -> resolves to the (unshipped) Traditional default,
-    // which equals the requested tag, so it falls straight through to English. Crucially NOT zh-Hans-CN.
+    // zh-Hant-TW carries an explicit Hant script -> resolves to the Traditional default, which equals the
+    // requested tag, so it falls straight through to English. Crucially NOT zh-Hans-CN.
     expect(resolveFallbackBundles("zh-Hant-TW")).toEqual(["en-US"]);
     expect(resolveFallbackBundles("zh-Hant-TW")).not.toContain("zh-Hans-CN");
-    // zh-Hant without a region resolves to the Traditional default tag (also unshipped -> en-US at runtime).
+    // zh-Hant without a region resolves to the Traditional default tag, which is the shipped bundle.
     expect(resolveFallbackBundles("zh-Hant")).toEqual(["zh-Hant-TW", "en-US"]);
+    // Legacy tags carry the script only in the region; recovering it keeps them off the Simplified bundle.
+    expect(resolveFallbackBundles("zh-TW")).toEqual(["zh-Hant-TW", "en-US"]);
+    expect(resolveFallbackBundles("zh-HK")).toEqual(["zh-Hant-TW", "en-US"]);
+    // Simplified legacy tags still resolve to Simplified.
+    expect(resolveFallbackBundles("zh-CN")).toEqual(["zh-Hans-CN", "en-US"]);
+    expect(resolveFallbackBundles("zh")).toEqual(["zh-Hans-CN", "en-US"]);
+  });
+
+  test("recovering the script does not leak a script subtag into non-script languages", () => {
+    // de-AT/pt-PT canonicalize to themselves (both are catalog tags), so no script is recovered and the
+    // region is still dropped — a Latin-script tag like `de-Latn-DE` would miss every shipped bundle.
+    expect(resolveFallbackBundles("de-AT")).toEqual(["de-DE", "en-US"]);
+    expect(resolveFallbackBundles("pt-PT")).toEqual(["pt-BR", "en-US"]);
+    expect(resolveFallbackBundles("ur-IN")).toEqual(["ur-PK", "en-US"]);
+  });
+
+  test("the newly shipped languages resolve to their own bundle", () => {
+    expect(resolveFallbackBundles("id")).toEqual(["id-ID", "en-US"]);
+    expect(resolveFallbackBundles("ur")).toEqual(["ur-PK", "en-US"]);
+    expect(resolveFallbackBundles("vi")).toEqual(["vi-VN", "en-US"]);
   });
 
   test("an unknown but syntactically valid tag falls back to English", () => {
@@ -46,3 +66,21 @@ describe("resolveFallbackBundles", () => {
     expect(resolveFallbackBundles("DE_de")).toEqual(["en-US"]);
   });
 });
+
+describe("shipped bundles", () => {
+  // supportedLngs, the static imports and the resources map are three hand-maintained lists that must
+  // agree — a language registered as supported without a bundle silently renders English (ENG-2068).
+  test("every supported language has a translation bundle registered", () => {
+    const supportedLngs = i18n.options.supportedLngs || [];
+    const supported = supportedLngs.filter((code: string) => code !== "cimode");
+    expect([...supported].sort()).toEqual(Object.keys(i18n.options.resources ?? {}).sort());
+  });
+
+  test("survey strings resolve for the shipped languages", () => {
+    for (const code of ["id-ID", "ur-PK", "vi-VN", "zh-Hant-TW"]) {
+      const required = i18n.getFixedT(code)("common.required");
+      expect(required).not.toBe("common.required");
+      expect(required).not.toBe(i18n.getFixedT("en-US")("common.required"));
+    }
+  });
+});
diff --git a/packages/surveys/src/lib/i18n.config.ts b/packages/surveys/src/lib/i18n.config.ts
index 7b77302bcae3..e4c4495a5a71 100644
--- a/packages/surveys/src/lib/i18n.config.ts
+++ b/packages/surveys/src/lib/i18n.config.ts
@@ -11,6 +11,7 @@ import etEETranslations from "../../locales/et-EE.json";
 import frFRTranslations from "../../locales/fr-FR.json";
 import hiINTranslations from "../../locales/hi-IN.json";
 import huHUTranslations from "../../locales/hu-HU.json";
+import idIDTranslations from "../../locales/id-ID.json";
 import itITTranslations from "../../locales/it-IT.json";
 import jaJPTranslations from "../../locales/ja-JP.json";
 import nlNLTranslations from "../../locales/nl-NL.json";
@@ -19,22 +20,40 @@ import roROTranslations from "../../locales/ro-RO.json";
 import ruRUTranslations from "../../locales/ru-RU.json";
 import svSETranslations from "../../locales/sv-SE.json";
 import trTRTranslations from "../../locales/tr-TR.json";
+import urPKTranslations from "../../locales/ur-PK.json";
 import uzUZTranslations from "../../locales/uz-UZ.json";
+import viVNTranslations from "../../locales/vi-VN.json";
 import zhHansCNTranslations from "../../locales/zh-Hans-CN.json";
+import zhHantTWTranslations from "../../locales/zh-Hant-TW.json";
+
+/** The script subtag of a BCP-47 tag, or undefined when it has none (or can't be parsed). */
+const scriptOf = (code: string | null): string | undefined => {
+  if (!code) return undefined;
+  try {
+    return new Intl.Locale(code).script;
+  } catch {
+    return undefined;
+  }
+};
 
 /**
  * Map any requested language tag to the bundle we actually ship, then English.
  *
  * Bundles are keyed by each language's canonical CLDR-default tag (`de-DE`, `ar-EG`, `zh-Hans-CN`). A
  * non-default or legacy variant resolves to its language's default bundle — `de-AT`/`de` → `de-DE`,
- * `ar-SA` → `ar-EG`, `pt-PT` → `pt-BR` — while SCRIPT is preserved: `zh-Hant-TW` resolves to a
- * Traditional bundle (none shipped yet) → English, NOT to the Simplified `zh-Hans-CN`.
+ * `ar-SA` → `ar-EG`, `pt-PT` → `pt-BR` — while SCRIPT is preserved: `zh-Hant`/`zh-TW` resolves to the
+ * Traditional bundle `zh-Hant-TW`, NOT to the Simplified `zh-Hans-CN`.
+ *
+ * A legacy tag can carry its script only in the region (`zh-TW`, `zh-HK`), and `Intl.Locale` does not
+ * infer the script, so we recover it from the tag's canonical form before dropping the region —
+ * otherwise `zh-TW` would strip to a bare `zh` and borrow the Simplified bundle.
  */
 export const resolveFallbackBundles = (code: string): string[] => {
   if (!code) return ["en-US"];
   try {
     const locale = new Intl.Locale(code);
-    const languageWithScript = [locale.language, locale.script].filter(Boolean).join("-");
+    const canonicalScript = locale.script ?? scriptOf(normalizeLanguageCode(code));
+    const languageWithScript = [locale.language, canonicalScript].filter(Boolean).join("-");
     const defaultBundle = normalizeLanguageCode(languageWithScript);
     return defaultBundle && defaultBundle !== code ? [defaultBundle, "en-US"] : ["en-US"];
   } catch {
@@ -57,6 +76,7 @@ i18n
       "fr-FR",
       "hi-IN",
       "hu-HU",
+      "id-ID",
       "it-IT",
       "ja-JP",
       "nl-NL",
@@ -65,8 +85,11 @@ i18n
       "ru-RU",
       "sv-SE",
       "tr-TR",
+      "ur-PK",
       "uz-UZ",
+      "vi-VN",
       "zh-Hans-CN",
+      "zh-Hant-TW",
     ],
 
     resources: {
@@ -79,6 +102,7 @@ i18n
       "fr-FR": { translation: frFRTranslations },
       "hi-IN": { translation: hiINTranslations },
       "hu-HU": { translation: huHUTranslations },
+      "id-ID": { translation: idIDTranslations },
       "it-IT": { translation: itITTranslations },
       "ja-JP": { translation: jaJPTranslations },
       "nl-NL": { translation: nlNLTranslations },
@@ -87,8 +111,11 @@ i18n
       "ru-RU": { translation: ruRUTranslations },
       "sv-SE": { translation: svSETranslations },
       "tr-TR": { translation: trTRTranslations },
+      "ur-PK": { translation: urPKTranslations },
       "uz-UZ": { translation: uzUZTranslations },
+      "vi-VN": { translation: viVNTranslations },
       "zh-Hans-CN": { translation: zhHansCNTranslations },
+      "zh-Hant-TW": { translation: zhHantTWTranslations },
     },
 
     interpolation: { escapeValue: false },

From f1114c15fdc9524cd332d3294b6ff6bfb647ee75 Mon Sep 17 00:00:00 2001
From: Matti Nannt <675065+mattinannt@users.noreply.github.com>
Date: Wed, 29 Jul 2026 12:34:01 +0200
Subject: [PATCH 3/5] fix(security): scope historical response import to the
 authorized workspace [1/4 critical] (#8679)

Co-authored-by: Claude <noreply@anthropic.com>
Co-authored-by: pandeymangg <anshuman.pandey9999@gmail.com>
---
 apps/web/lib/feedback-source/actions.ts       | 107 ++++------------
 apps/web/lib/feedback-source/mappings.test.ts | 120 ++++++++++++++++++
 apps/web/lib/feedback-source/mappings.ts      |  69 ++++++++++
 3 files changed, 217 insertions(+), 79 deletions(-)
 create mode 100644 apps/web/lib/feedback-source/mappings.test.ts
 create mode 100644 apps/web/lib/feedback-source/mappings.ts

diff --git a/apps/web/lib/feedback-source/actions.ts b/apps/web/lib/feedback-source/actions.ts
index 975a09e4172a..f96aa9839e33 100644
--- a/apps/web/lib/feedback-source/actions.ts
+++ b/apps/web/lib/feedback-source/actions.ts
@@ -7,15 +7,12 @@ import { ZId } from "@formbricks/types/common";
 import { AuthorizationError, InvalidInputError, ResourceNotFoundError } from "@formbricks/types/errors";
 import {
   TFeedbackSourceWithMappings,
-  THubFieldType,
   ZFeedbackSourceCreateInput,
   ZFeedbackSourceFieldMappingCreateInput,
   ZFeedbackSourceUpdateInput,
-  getHubFieldTypeFromElementType,
 } from "@formbricks/types/feedback-source";
 import { getResponseCountBySurveyId } from "@/lib/response/service";
 import { getSurvey } from "@/lib/survey/service";
-import { getElementsFromBlocks } from "@/lib/survey/utils";
 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";
@@ -29,6 +26,7 @@ import { getContactIdsByUserIds } from "@/modules/ee/unify-feedback/lib/contacts
 import { listFeedbackRecords } from "@/modules/hub/service";
 import type { FeedbackRecordListParams, FeedbackRecordListResponse } from "@/modules/hub/types";
 import { importHistoricalResponses } from "./import";
+import { resolveFormbricksMappingsInput } from "./mappings";
 import {
   TMappingsInput,
   createFeedbackSourceWithMappings,
@@ -78,55 +76,6 @@ export const deleteFeedbackSourceAction = authenticatedActionClient
     }
   );
 
-const resolveSurveyMappings = async (
-  surveyId: string,
-  elementIds: string[]
-): Promise<{ surveyId: string; elementId: string; hubFieldType: THubFieldType }[]> => {
-  const survey = await getSurvey(surveyId);
-  if (!survey) {
-    throw new ResourceNotFoundError("Survey", surveyId);
-  }
-
-  const elements = getElementsFromBlocks(survey.blocks);
-  const elementMap = new Map(elements.map((el) => [el.id, el]));
-
-  return elementIds.flatMap((elementId) => {
-    const element = elementMap.get(elementId);
-    if (!element) {
-      logger.warn(
-        { surveyId, elementId },
-        "Skipping unknown elementId when building feedbackSource mappings"
-      );
-      return [];
-    }
-
-    const hubFieldType = getHubFieldTypeFromElementType(element.type);
-    if (!hubFieldType) {
-      logger.warn(
-        { surveyId, elementId, elementType: element.type },
-        "Skipping unmappable element type when building feedbackSource mappings"
-      );
-      return [];
-    }
-
-    return [{ surveyId, elementId, hubFieldType }];
-  });
-};
-
-const resolveFormbricksMappingsInput = async (
-  entries: { surveyId: string; elementIds: string[] }[]
-): Promise<TMappingsInput> => {
-  const allMappings = await Promise.all(
-    entries.map(({ surveyId, elementIds }) => resolveSurveyMappings(surveyId, elementIds))
-  );
-  const flattenedMappings = allMappings.flat();
-  if (flattenedMappings.length === 0) {
-    throw new InvalidInputError("No supported survey questions selected for feedbackSource mapping");
-  }
-
-  return { type: "formbricks_survey", mappings: flattenedMappings };
-};
-
 const ZFormbricksSurveyMapping = z.object({
   surveyId: ZId,
   elementIds: z.array(z.string()).min(1),
@@ -218,16 +167,7 @@ export const createFeedbackSourceWithMappingsAction = authenticatedActionClient
     const { formbricksMappings, fieldMappings } = parsedInput;
 
     if (formbricksMappings?.length) {
-      await Promise.all(
-        formbricksMappings.map(async ({ surveyId }) => {
-          const orgId = await getOrganizationIdFromSurveyId(surveyId);
-          if (orgId !== organizationId) {
-            throw new AuthorizationError("You are not authorized to access this survey");
-          }
-        })
-      );
-
-      mappingsInput = await resolveFormbricksMappingsInput(formbricksMappings);
+      mappingsInput = await resolveFormbricksMappingsInput(formbricksMappings, parsedInput.workspaceId);
     } else if (fieldMappings?.length) {
       mappingsInput = {
         type: "field",
@@ -280,28 +220,27 @@ export const updateFeedbackSourceWithMappingsAction = authenticatedActionClient
         ],
       });
 
+      // The check above proves the caller may act in `workspaceId`; it does not prove this feedback
+      // source lives there, and the organization it was authorized against came from the source
+      // rather than the workspace. Pin the two together up front so every branch below — and the
+      // mappings resolved against the same workspace — operates on one tenant, and so a mismatch
+      // fails here rather than as a Prisma error from the update.
+      const feedbackSource = await prisma.feedbackSource.findUnique({
+        where: { id: parsedInput.feedbackSourceId, workspaceId: parsedInput.workspaceId },
+        select: { type: true },
+      });
+      if (!feedbackSource) {
+        throw new ResourceNotFoundError("FeedbackSource", parsedInput.feedbackSourceId);
+      }
+
       let mappingsInput: TMappingsInput | undefined;
 
       if (parsedInput.formbricksMappings?.length) {
-        await Promise.all(
-          parsedInput.formbricksMappings.map(async ({ surveyId }) => {
-            const orgId = await getOrganizationIdFromSurveyId(surveyId);
-            if (orgId !== organizationId) {
-              throw new AuthorizationError("You are not authorized to access this survey");
-            }
-          })
+        mappingsInput = await resolveFormbricksMappingsInput(
+          parsedInput.formbricksMappings,
+          parsedInput.workspaceId
         );
-
-        mappingsInput = await resolveFormbricksMappingsInput(parsedInput.formbricksMappings);
       } else if (parsedInput.fieldMappings && parsedInput.fieldMappings.length > 0) {
-        const feedbackSource = await prisma.feedbackSource.findUnique({
-          where: { id: parsedInput.feedbackSourceId, workspaceId: parsedInput.workspaceId },
-          select: { type: true },
-        });
-        if (!feedbackSource) {
-          throw new ResourceNotFoundError("FeedbackSource", parsedInput.feedbackSourceId);
-        }
-
         mappingsInput = {
           type: "field",
           mappings:
@@ -402,6 +341,16 @@ export const importHistoricalResponsesAction = authenticatedActionClient
         throw new ResourceNotFoundError("Survey", parsedInput.surveyId);
       }
 
+      // The authorization above covers the feedback source's workspace, not this survey — and the
+      // import reads every response of `surveyId` and copies them into the source's feedback
+      // directory. Without this check any caller with readWrite on one workspace could name a survey
+      // from another organization and exfiltrate its responses into their own directory. Survey ids
+      // are public (they appear in `/s/<surveyId>` links), so the id is not a secret. The picker only
+      // ever offers surveys from this workspace (`getSurveysForUnifyAction` → `getSurveys(workspaceId)`).
+      if (survey.workspaceId !== parsedInput.workspaceId) {
+        throw new ResourceNotFoundError("Survey", parsedInput.surveyId);
+      }
+
       return importHistoricalResponses(feedbackSource, survey);
     }
   );
diff --git a/apps/web/lib/feedback-source/mappings.test.ts b/apps/web/lib/feedback-source/mappings.test.ts
new file mode 100644
index 000000000000..ad2ec62abbee
--- /dev/null
+++ b/apps/web/lib/feedback-source/mappings.test.ts
@@ -0,0 +1,120 @@
+import { beforeEach, describe, expect, test, vi } from "vitest";
+import { InvalidInputError, ResourceNotFoundError } from "@formbricks/types/errors";
+import { TSurvey } from "@formbricks/types/surveys/types";
+import { resolveFormbricksMappingsInput } from "./mappings";
+
+vi.mock("@/lib/survey/service", () => ({
+  getSurvey: vi.fn(),
+}));
+
+// Deliberately unmocked: @/lib/survey/utils — getElementsFromBlocks is a plain flatMap over the
+// blocks, so the real one keeps the fixtures honest about the shape it reads.
+
+const { getSurvey } = vi.mocked(await import("@/lib/survey/service"));
+
+const WORKSPACE_ID = "clxxxxxxxxxxxxxxxx001";
+const OTHER_WORKSPACE_ID = "clxxxxxxxxxxxxxxxx002";
+const SURVEY_ID = "clxxxxxxxxxxxxxxxx003";
+const OTHER_SURVEY_ID = "clxxxxxxxxxxxxxxxx004";
+
+const buildSurvey = (id: string, workspaceId: string): TSurvey =>
+  ({
+    id,
+    workspaceId,
+    blocks: [
+      {
+        elements: [
+          { id: "el-text", type: "openText" },
+          { id: "el-nps", type: "nps" },
+        ],
+      },
+      {
+        elements: [
+          { id: "el-rating", type: "rating" },
+          // No Hub field type exists for file uploads.
+          { id: "el-file", type: "fileUpload" },
+        ],
+      },
+    ],
+  }) as unknown as TSurvey;
+
+describe("resolveFormbricksMappingsInput", () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  test("resolves elements across surveys and blocks in the workspace", async () => {
+    getSurvey.mockImplementation(async (surveyId: string) => buildSurvey(surveyId, WORKSPACE_ID));
+
+    const result = await resolveFormbricksMappingsInput(
+      [
+        { surveyId: SURVEY_ID, elementIds: ["el-text", "el-rating"] },
+        { surveyId: OTHER_SURVEY_ID, elementIds: ["el-nps"] },
+      ],
+      WORKSPACE_ID
+    );
+
+    expect(result).toEqual({
+      type: "formbricks_survey",
+      mappings: [
+        { surveyId: SURVEY_ID, elementId: "el-text", hubFieldType: "text" },
+        { surveyId: SURVEY_ID, elementId: "el-rating", hubFieldType: "rating" },
+        { surveyId: OTHER_SURVEY_ID, elementId: "el-nps", hubFieldType: "nps" },
+      ],
+    });
+  });
+
+  // Tenancy guard: the caller is authorized on `workspaceId`, but `surveyId` is caller-supplied and
+  // survey ids are not secret (they appear in every /s/<surveyId> link). Not-found rather than
+  // unauthorized, so the response cannot confirm that a foreign survey id exists.
+  test("rejects a survey from another workspace", async () => {
+    getSurvey.mockResolvedValue(buildSurvey(SURVEY_ID, OTHER_WORKSPACE_ID));
+
+    await expect(
+      resolveFormbricksMappingsInput([{ surveyId: SURVEY_ID, elementIds: ["el-text"] }], WORKSPACE_ID)
+    ).rejects.toThrow(ResourceNotFoundError);
+  });
+
+  test("rejects the whole input when only one of several surveys is foreign", async () => {
+    getSurvey.mockImplementation(async (surveyId: string) =>
+      buildSurvey(surveyId, surveyId === OTHER_SURVEY_ID ? OTHER_WORKSPACE_ID : WORKSPACE_ID)
+    );
+
+    await expect(
+      resolveFormbricksMappingsInput(
+        [
+          { surveyId: SURVEY_ID, elementIds: ["el-text"] },
+          { surveyId: OTHER_SURVEY_ID, elementIds: ["el-text"] },
+        ],
+        WORKSPACE_ID
+      )
+    ).rejects.toThrow(ResourceNotFoundError);
+  });
+
+  test("rejects a survey that does not exist", async () => {
+    getSurvey.mockResolvedValue(null);
+
+    await expect(
+      resolveFormbricksMappingsInput([{ surveyId: SURVEY_ID, elementIds: ["el-text"] }], WORKSPACE_ID)
+    ).rejects.toThrow(ResourceNotFoundError);
+  });
+
+  test("skips unknown element ids and element types with no Hub field", async () => {
+    getSurvey.mockResolvedValue(buildSurvey(SURVEY_ID, WORKSPACE_ID));
+
+    const result = await resolveFormbricksMappingsInput(
+      [{ surveyId: SURVEY_ID, elementIds: ["el-text", "el-gone", "el-file"] }],
+      WORKSPACE_ID
+    );
+
+    expect(result.mappings).toEqual([{ surveyId: SURVEY_ID, elementId: "el-text", hubFieldType: "text" }]);
+  });
+
+  test("throws InvalidInputError when nothing is mappable", async () => {
+    getSurvey.mockResolvedValue(buildSurvey(SURVEY_ID, WORKSPACE_ID));
+
+    await expect(
+      resolveFormbricksMappingsInput([{ surveyId: SURVEY_ID, elementIds: ["el-file"] }], WORKSPACE_ID)
+    ).rejects.toThrow(InvalidInputError);
+  });
+});
diff --git a/apps/web/lib/feedback-source/mappings.ts b/apps/web/lib/feedback-source/mappings.ts
new file mode 100644
index 000000000000..8326314f8dde
--- /dev/null
+++ b/apps/web/lib/feedback-source/mappings.ts
@@ -0,0 +1,69 @@
+import "server-only";
+import { logger } from "@formbricks/logger";
+import { InvalidInputError, ResourceNotFoundError } from "@formbricks/types/errors";
+import { THubFieldType, getHubFieldTypeFromElementType } from "@formbricks/types/feedback-source";
+import { getSurvey } from "@/lib/survey/service";
+import { getElementsFromBlocks } from "@/lib/survey/utils";
+import type { TMappingsInput } from "./service";
+
+const resolveSurveyMappings = async (
+  surveyId: string,
+  elementIds: string[],
+  workspaceId: string
+): Promise<{ surveyId: string; elementId: string; hubFieldType: THubFieldType }[]> => {
+  const survey = await getSurvey(surveyId);
+  // Mapping rows are written with the feedback source's workspaceId, and the composite FK
+  // (surveyId, workspaceId) → Survey(id, workspaceId) already makes a survey from another workspace
+  // impossible to persist. Reject it here so the caller gets a clean not-found instead of a raw
+  // Prisma FK error, and so the app-level check matches the workspace the caller was authorized on
+  // rather than the whole organization. Not-found rather than unauthorized: the response must not
+  // confirm that a foreign survey id exists.
+  if (survey?.workspaceId !== workspaceId) {
+    throw new ResourceNotFoundError("Survey", surveyId);
+  }
+
+  const elements = getElementsFromBlocks(survey.blocks);
+  const elementMap = new Map(elements.map((el) => [el.id, el]));
+
+  return elementIds.flatMap((elementId) => {
+    const element = elementMap.get(elementId);
+    if (!element) {
+      logger.warn(
+        { surveyId, elementId },
+        "Skipping unknown elementId when building feedbackSource mappings"
+      );
+      return [];
+    }
+
+    const hubFieldType = getHubFieldTypeFromElementType(element.type);
+    if (!hubFieldType) {
+      logger.warn(
+        { surveyId, elementId, elementType: element.type },
+        "Skipping unmappable element type when building feedbackSource mappings"
+      );
+      return [];
+    }
+
+    return [{ surveyId, elementId, hubFieldType }];
+  });
+};
+
+/**
+ * Builds the Formbricks-survey mapping input for a feedback source, and is the single place that
+ * binds the mapped surveys to the workspace the caller was authorized on. Every survey must live in
+ * `workspaceId`; unknown elements and element types with no Hub field are skipped with a warning.
+ */
+export const resolveFormbricksMappingsInput = async (
+  entries: { surveyId: string; elementIds: string[] }[],
+  workspaceId: string
+): Promise<TMappingsInput> => {
+  const allMappings = await Promise.all(
+    entries.map(({ surveyId, elementIds }) => resolveSurveyMappings(surveyId, elementIds, workspaceId))
+  );
+  const flattenedMappings = allMappings.flat();
+  if (flattenedMappings.length === 0) {
+    throw new InvalidInputError("No supported survey questions selected for feedbackSource mapping");
+  }
+
+  return { type: "formbricks_survey", mappings: flattenedMappings };
+};

From 0922e4e90d2fdf3dd13e21013bf08dc6ddbd6200 Mon Sep 17 00:00:00 2001
From: Dhruwang Jariwala <67850763+Dhruwang@users.noreply.github.com>
Date: Wed, 29 Jul 2026 16:11:47 +0530
Subject: [PATCH 4/5] fix(api): bind management response file uploads to
 authorized workspace [ENG-1981] (#8647)

Co-authored-by: pandeymangg <anshuman.pandey9999@gmail.com>
---
 .../responses/[responseId]/route.ts           |  20 +-
 .../app/api/v1/management/responses/route.ts  |  24 +-
 apps/web/lib/workspace/service.test.ts        |  47 +++
 apps/web/lib/workspace/service.ts             |  28 ++
 .../responses/[responseId]/route.test.ts      | 193 ----------
 .../responses/[responseId]/route.ts           |  26 +-
 .../api/v2/management/responses/route.ts      |  24 +-
 apps/web/modules/storage/utils.test.ts        | 355 +++++++++++-------
 apps/web/modules/storage/utils.ts             | 136 ++++---
 9 files changed, 472 insertions(+), 381 deletions(-)
 delete mode 100644 apps/web/modules/api/v2/management/responses/[responseId]/route.test.ts

diff --git a/apps/web/app/api/v1/management/responses/[responseId]/route.ts b/apps/web/app/api/v1/management/responses/[responseId]/route.ts
index 0933508d576f..5afad95a4300 100644
--- a/apps/web/app/api/v1/management/responses/[responseId]/route.ts
+++ b/apps/web/app/api/v1/management/responses/[responseId]/route.ts
@@ -8,9 +8,10 @@ import { TApiV1Authentication, THandlerParams, withV1ApiWrapper } from "@/app/li
 import { sendToPipeline } from "@/app/lib/pipelines";
 import { deleteResponse, getResponse } from "@/lib/response/service";
 import { getSurvey } from "@/lib/survey/service";
+import { getWorkspaceLegacyStoragePrefixes } from "@/lib/workspace/service";
 import { formatValidationErrorsForV1Api, validateResponseData } from "@/modules/api/lib/validation";
 import { hasPermission } from "@/modules/organization/settings/api-keys/lib/utils";
-import { resolveStorageUrlsInObject, validateFileUploads } from "@/modules/storage/utils";
+import { resolveStorageUrlsInObject, validateClientFileUploads } from "@/modules/storage/utils";
 import { updateResponseWithQuotaEvaluation } from "./lib/response";
 
 type TUncheckedResponseUpdate = Record<string, unknown> & {
@@ -138,9 +139,22 @@ export const PUT = withV1ApiWrapper({
         };
       }
 
-      if (!validateFileUploads(responseUpdate.data, result.survey.questions)) {
+      if (
+        !validateClientFileUploads({
+          data: responseUpdate.data,
+          workspaceId: result.survey.workspaceId,
+          surveyId: result.survey.id,
+          blocks: result.survey.blocks,
+          questions: result.survey.questions,
+          // Management callers replay stored responses whose file URLs may predate the scoped shape;
+          // accept those against a prefix this workspace owns (ENG-1981 review).
+          legacyOwnedStoragePrefixes: await getWorkspaceLegacyStoragePrefixes(result.survey.workspaceId),
+        })
+      ) {
         return {
-          response: responses.badRequestResponse("Invalid file upload response"),
+          response: responses.badRequestResponse(
+            "Invalid file upload response: each file URL must reference a file uploaded to this survey's file-upload element"
+          ),
         };
       }
 
diff --git a/apps/web/app/api/v1/management/responses/route.ts b/apps/web/app/api/v1/management/responses/route.ts
index 2db18fbd3cb7..fd7fac2e61da 100644
--- a/apps/web/app/api/v1/management/responses/route.ts
+++ b/apps/web/app/api/v1/management/responses/route.ts
@@ -8,9 +8,10 @@ import { transformErrorToDetails } from "@/app/lib/api/validator";
 import { withV1ApiWrapper } from "@/app/lib/api/with-api-logging";
 import { sendToPipeline } from "@/app/lib/pipelines";
 import { getSurvey } from "@/lib/survey/service";
+import { getWorkspaceLegacyStoragePrefixes } from "@/lib/workspace/service";
 import { formatValidationErrorsForV1Api, validateResponseData } from "@/modules/api/lib/validation";
 import { hasPermission } from "@/modules/organization/settings/api-keys/lib/utils";
-import { resolveStorageUrlsInObject, validateFileUploads } from "@/modules/storage/utils";
+import { resolveStorageUrlsInObject, validateClientFileUploads } from "@/modules/storage/utils";
 import { createResponseWithQuotaEvaluation, getResponses, getResponsesByWorkspaceIds } from "./lib/response";
 
 export const GET = withV1ApiWrapper({
@@ -132,9 +133,26 @@ export const POST = withV1ApiWrapper({
         };
       }
 
-      if (!validateFileUploads(responseInput.data, surveyResult.survey.questions)) {
+      if (
+        !validateClientFileUploads({
+          data: responseInput.data,
+          // Survey-authoritative workspace id (validateSurvey already asserts it equals the
+          // request-body workspaceId); binds the file-upload scope check to the resolved survey.
+          workspaceId: surveyResult.survey.workspaceId,
+          surveyId: surveyResult.survey.id,
+          blocks: surveyResult.survey.blocks,
+          questions: surveyResult.survey.questions,
+          // Management callers replay stored responses whose file URLs may predate the scoped shape;
+          // accept those against a prefix this workspace owns (ENG-1981 review).
+          legacyOwnedStoragePrefixes: await getWorkspaceLegacyStoragePrefixes(
+            surveyResult.survey.workspaceId
+          ),
+        })
+      ) {
         return {
-          response: responses.badRequestResponse("Invalid file upload response"),
+          response: responses.badRequestResponse(
+            "Invalid file upload response: each file URL must reference a file uploaded to this survey's file-upload element"
+          ),
         };
       }
 
diff --git a/apps/web/lib/workspace/service.test.ts b/apps/web/lib/workspace/service.test.ts
index 7d717d5e60ff..28524ae302db 100644
--- a/apps/web/lib/workspace/service.test.ts
+++ b/apps/web/lib/workspace/service.test.ts
@@ -8,6 +8,7 @@ import {
   getUserWorkspaces,
   getUserWorkspacesByOrganizationIds,
   getWorkspace,
+  getWorkspaceLegacyStoragePrefixes,
   getWorkspaces,
 } from "./service";
 
@@ -467,4 +468,50 @@ describe("Workspace Service", () => {
 
     await expect(getWorkspaces(organizationId)).rejects.toThrow(DatabaseError);
   });
+
+  describe("getWorkspaceLegacyStoragePrefixes", () => {
+    test("returns both the workspace id and its legacyEnvironmentId when set", async () => {
+      const workspaceId = createId();
+      const legacyEnvironmentId = createId();
+      vi.mocked(prisma.workspace.findUnique).mockResolvedValue({
+        id: workspaceId,
+        legacyEnvironmentId,
+      } as unknown as Workspace);
+
+      await expect(getWorkspaceLegacyStoragePrefixes(workspaceId)).resolves.toEqual([
+        workspaceId,
+        legacyEnvironmentId,
+      ]);
+    });
+
+    test("returns only the workspace id when legacyEnvironmentId is null", async () => {
+      const workspaceId = createId();
+      vi.mocked(prisma.workspace.findUnique).mockResolvedValue({
+        id: workspaceId,
+        legacyEnvironmentId: null,
+      } as unknown as Workspace);
+
+      await expect(getWorkspaceLegacyStoragePrefixes(workspaceId)).resolves.toEqual([workspaceId]);
+    });
+
+    test("returns an empty array when the workspace does not exist", async () => {
+      vi.mocked(prisma.workspace.findUnique).mockResolvedValue(null);
+
+      await expect(getWorkspaceLegacyStoragePrefixes(createId())).resolves.toEqual([]);
+    });
+
+    test("throws ValidationError for an invalid workspace id", async () => {
+      await expect(getWorkspaceLegacyStoragePrefixes("not-a-cuid")).rejects.toThrow(ValidationError);
+    });
+
+    test("throws DatabaseError when prisma throws", async () => {
+      const prismaError = new Prisma.PrismaClientKnownRequestError("Database error", {
+        code: "P2002",
+        clientVersion: "5.0.0",
+      });
+      vi.mocked(prisma.workspace.findUnique).mockRejectedValue(prismaError);
+
+      await expect(getWorkspaceLegacyStoragePrefixes(createId())).rejects.toThrow(DatabaseError);
+    });
+  });
 });
diff --git a/apps/web/lib/workspace/service.ts b/apps/web/lib/workspace/service.ts
index 781923031dd6..28327ae96672 100644
--- a/apps/web/lib/workspace/service.ts
+++ b/apps/web/lib/workspace/service.ts
@@ -130,6 +130,34 @@ export const getWorkspace = reactCache(async (workspaceId: string): Promise<TWor
   }
 });
 
+// Storage prefixes a workspace owns for pre-#8044 file URLs: its own id and, when present, the
+// environment id it was migrated from (old storage was keyed by environment id, mirrored by
+// `legacyEnvironmentId ?? workspaceId`). The management routes pass these to validateClientFileUploads
+// so a replayed legacy response validates without reopening cross-tenant deletion. See ENG-1981.
+export const getWorkspaceLegacyStoragePrefixes = reactCache(
+  async (workspaceId: string): Promise<string[]> => {
+    validateInputs([workspaceId, ZId]);
+
+    try {
+      const workspace = await prisma.workspace.findUnique({
+        where: { id: workspaceId },
+        select: { id: true, legacyEnvironmentId: true },
+      });
+
+      if (!workspace) return [];
+
+      return [workspace.id, workspace.legacyEnvironmentId].filter((prefix): prefix is string =>
+        Boolean(prefix)
+      );
+    } catch (error) {
+      if (error instanceof Prisma.PrismaClientKnownRequestError) {
+        throw new DatabaseError(error.message);
+      }
+      throw error;
+    }
+  }
+);
+
 export const getOrganizationWorkspacesCount = reactCache(async (organizationId: string): Promise<number> => {
   validateInputs([organizationId, ZId]);
 
diff --git a/apps/web/modules/api/v2/management/responses/[responseId]/route.test.ts b/apps/web/modules/api/v2/management/responses/[responseId]/route.test.ts
deleted file mode 100644
index 374b960c1b13..000000000000
--- a/apps/web/modules/api/v2/management/responses/[responseId]/route.test.ts
+++ /dev/null
@@ -1,193 +0,0 @@
-import { beforeEach, describe, expect, test, vi } from "vitest";
-
-const {
-  mockAuthenticatedApiClient,
-  mockFormatValidationErrorsForV2Api,
-  mockGetResponse,
-  mockGetResponseForPipeline,
-  mockGetSurveyQuestions,
-  mockGetWorkspaceId,
-  mockHandleApiError,
-  mockHasPermission,
-  mockSendToPipeline,
-  mockSuccessResponse,
-  mockUpdateResponseWithQuotaEvaluation,
-  mockValidateFileUploads,
-  mockValidateOtherOptionLengthForMultipleChoice,
-  mockValidateResponseData,
-} = vi.hoisted(() => ({
-  mockAuthenticatedApiClient: vi.fn(),
-  mockFormatValidationErrorsForV2Api: vi.fn(),
-  mockGetResponse: vi.fn(),
-  mockGetResponseForPipeline: vi.fn(),
-  mockGetSurveyQuestions: vi.fn(),
-  mockGetWorkspaceId: vi.fn(),
-  mockHandleApiError: vi.fn(),
-  mockHasPermission: vi.fn(),
-  mockSendToPipeline: vi.fn(),
-  mockSuccessResponse: vi.fn(),
-  mockUpdateResponseWithQuotaEvaluation: vi.fn(),
-  mockValidateFileUploads: vi.fn(),
-  mockValidateOtherOptionLengthForMultipleChoice: vi.fn(),
-  mockValidateResponseData: vi.fn(),
-}));
-
-vi.mock("@/app/lib/pipelines", () => ({
-  sendToPipeline: mockSendToPipeline,
-}));
-
-vi.mock("@/modules/api/lib/validation", () => ({
-  formatValidationErrorsForV2Api: mockFormatValidationErrorsForV2Api,
-  validateResponseData: mockValidateResponseData,
-}));
-
-vi.mock("@/modules/api/v2/auth/authenticated-api-client", () => ({
-  authenticatedApiClient: mockAuthenticatedApiClient,
-}));
-
-vi.mock("@/modules/api/v2/lib/element", () => ({
-  validateOtherOptionLengthForMultipleChoice: mockValidateOtherOptionLengthForMultipleChoice,
-}));
-
-vi.mock("@/modules/api/v2/lib/response", () => ({
-  responses: {
-    successResponse: mockSuccessResponse,
-  },
-}));
-
-vi.mock("@/modules/api/v2/lib/utils", () => ({
-  handleApiError: mockHandleApiError,
-}));
-
-vi.mock("@/modules/api/v2/management/lib/helper", () => ({
-  getWorkspaceId: mockGetWorkspaceId,
-}));
-
-vi.mock("@/modules/organization/settings/api-keys/lib/utils", () => ({
-  hasPermission: mockHasPermission,
-}));
-
-vi.mock("@/modules/storage/utils", () => ({
-  resolveStorageUrlsInObject: vi.fn((value) => value),
-  validateFileUploads: mockValidateFileUploads,
-}));
-
-vi.mock("./lib/response", () => ({
-  deleteResponse: vi.fn(),
-  getResponse: mockGetResponse,
-  getResponseForPipeline: mockGetResponseForPipeline,
-  updateResponseWithQuotaEvaluation: mockUpdateResponseWithQuotaEvaluation,
-}));
-
-vi.mock("./lib/survey", () => ({
-  getSurveyQuestions: mockGetSurveyQuestions,
-}));
-
-const workspaceId = "cm9workspace000108l4abcz12";
-const surveyId = "cm9survey000108l4abcz12zz";
-const responseId = "cm9response000108l4abcz12";
-const updatedAt = new Date("2026-04-13T11:00:00.000Z");
-
-const existingResponse = {
-  contactAttributes: null,
-  contactId: null,
-  createdAt: new Date("2026-04-13T10:00:00.000Z"),
-  data: {},
-  displayId: null,
-  endingId: null,
-  finished: false,
-  id: responseId,
-  language: null,
-  meta: {},
-  singleUseId: null,
-  surveyId,
-  ttc: {},
-  updatedAt: new Date("2026-04-13T10:00:00.000Z"),
-  variables: {},
-};
-
-const updatedResponse = {
-  ...existingResponse,
-  finished: true,
-  updatedAt,
-};
-
-const responseSnapshot = {
-  contact: null,
-  contactAttributes: null,
-  createdAt: existingResponse.createdAt,
-  data: {},
-  displayId: null,
-  endingId: null,
-  finished: true,
-  id: responseId,
-  language: null,
-  meta: {},
-  singleUseId: null,
-  surveyId,
-  tags: [],
-  ttc: {},
-  updatedAt,
-  variables: {},
-};
-
-describe("PUT /modules/api/v2/management/responses/[responseId]", () => {
-  beforeEach(() => {
-    vi.clearAllMocks();
-
-    mockAuthenticatedApiClient.mockImplementation(
-      async ({ handler }) =>
-        await handler({
-          auditLog: undefined,
-          authentication: {
-            workspacePermissions: [{ workspaceId, actions: ["PUT"] }],
-          },
-          parsedInput: {
-            body: {
-              data: {},
-              finished: true,
-            },
-            params: {
-              responseId,
-            },
-          },
-        })
-    );
-    mockGetWorkspaceId.mockResolvedValue({ data: { workspaceId }, ok: true });
-    mockHasPermission.mockReturnValue(true);
-    mockGetResponse.mockResolvedValue({ data: existingResponse, ok: true });
-    mockGetSurveyQuestions.mockResolvedValue({ data: { blocks: [], questions: [] }, ok: true });
-    mockValidateFileUploads.mockReturnValue(true);
-    mockValidateOtherOptionLengthForMultipleChoice.mockReturnValue(undefined);
-    mockValidateResponseData.mockReturnValue(null);
-    mockUpdateResponseWithQuotaEvaluation.mockResolvedValue({ data: updatedResponse, ok: true });
-    mockGetResponseForPipeline.mockResolvedValue({ data: responseSnapshot, ok: true });
-    mockSuccessResponse.mockImplementation((body: unknown) => Response.json(body, { status: 200 }));
-    mockHandleApiError.mockImplementation((_, error) => Response.json({ error }, { status: 400 }));
-  });
-
-  test("passes the updated response snapshot to the pipeline", async () => {
-    const { PUT } = await import("./route");
-    const response = await PUT(
-      new Request("http://localhost/api/v2/management/responses/resp_1", { method: "PUT" }),
-      {
-        params: Promise.resolve({ responseId }),
-      }
-    );
-
-    expect(response.status).toBe(200);
-    expect(mockGetResponseForPipeline).toHaveBeenCalledWith(responseId);
-    expect(mockSendToPipeline).toHaveBeenNthCalledWith(1, {
-      event: "responseUpdated",
-      response: responseSnapshot,
-      surveyId,
-      workspaceId,
-    });
-    expect(mockSendToPipeline).toHaveBeenNthCalledWith(2, {
-      event: "responseFinished",
-      response: responseSnapshot,
-      surveyId,
-      workspaceId,
-    });
-  });
-});
diff --git a/apps/web/modules/api/v2/management/responses/[responseId]/route.ts b/apps/web/modules/api/v2/management/responses/[responseId]/route.ts
index 704cc23b64f1..67b7ad2ed037 100644
--- a/apps/web/modules/api/v2/management/responses/[responseId]/route.ts
+++ b/apps/web/modules/api/v2/management/responses/[responseId]/route.ts
@@ -1,5 +1,6 @@
 import { z } from "zod";
 import { sendToPipeline } from "@/app/lib/pipelines";
+import { getWorkspaceLegacyStoragePrefixes } from "@/lib/workspace/service";
 import { formatValidationErrorsForV2Api, validateResponseData } from "@/modules/api/lib/validation";
 import { authenticatedApiClient } from "@/modules/api/v2/auth/authenticated-api-client";
 import { validateOtherOptionLengthForMultipleChoice } from "@/modules/api/v2/lib/element";
@@ -15,7 +16,7 @@ import {
 import { getSurveyQuestions } from "@/modules/api/v2/management/responses/[responseId]/lib/survey";
 import { ApiErrorResponseV2 } from "@/modules/api/v2/types/api-error";
 import { hasPermission } from "@/modules/organization/settings/api-keys/lib/utils";
-import { resolveStorageUrlsInObject, validateFileUploads } from "@/modules/storage/utils";
+import { resolveStorageUrlsInObject, validateClientFileUploads } from "@/modules/storage/utils";
 import { ZResponseIdSchema, ZResponseUpdateSchema } from "./types/responses";
 
 export const GET = async (request: Request, props: { params: Promise<{ responseId: string }> }) =>
@@ -163,12 +164,31 @@ export const PUT = (request: Request, props: { params: Promise<{ responseId: str
         return handleApiError(request, questionsResponse.error as ApiErrorResponseV2, auditLog);
       }
 
-      if (!validateFileUploads(body.data, questionsResponse.data.questions)) {
+      if (
+        !validateClientFileUploads({
+          data: body.data,
+          workspaceId: workspaceIdResult.data.workspaceId,
+          surveyId: existingResponse.data.surveyId,
+          blocks: questionsResponse.data.blocks,
+          questions: questionsResponse.data.questions,
+          // Management callers replay stored responses whose file URLs may predate the scoped shape;
+          // accept those against a prefix this workspace owns (ENG-1981 review).
+          legacyOwnedStoragePrefixes: await getWorkspaceLegacyStoragePrefixes(
+            workspaceIdResult.data.workspaceId
+          ),
+        })
+      ) {
         return handleApiError(
           request,
           {
             type: "bad_request",
-            details: [{ field: "response", issue: "Invalid file upload response" }],
+            details: [
+              {
+                field: "response",
+                issue:
+                  "Invalid file upload response: each file URL must reference a file uploaded to this survey's file-upload element",
+              },
+            ],
           },
           auditLog
         );
diff --git a/apps/web/modules/api/v2/management/responses/route.ts b/apps/web/modules/api/v2/management/responses/route.ts
index b8c299538a39..6c81b79ec6db 100644
--- a/apps/web/modules/api/v2/management/responses/route.ts
+++ b/apps/web/modules/api/v2/management/responses/route.ts
@@ -1,6 +1,7 @@
 import { NextRequest } from "next/server";
 import { Response } from "@formbricks/database/prisma";
 import { sendToPipeline } from "@/app/lib/pipelines";
+import { getWorkspaceLegacyStoragePrefixes } from "@/lib/workspace/service";
 import { formatValidationErrorsForV2Api, validateResponseData } from "@/modules/api/lib/validation";
 import { authenticatedApiClient } from "@/modules/api/v2/auth/authenticated-api-client";
 import { validateOtherOptionLengthForMultipleChoice } from "@/modules/api/v2/lib/element";
@@ -12,7 +13,7 @@ import { getSurveyQuestions } from "@/modules/api/v2/management/responses/[respo
 import { ZGetResponsesFilter, ZResponseInput } from "@/modules/api/v2/management/responses/types/responses";
 import { ApiErrorResponseV2 } from "@/modules/api/v2/types/api-error";
 import { hasPermission } from "@/modules/organization/settings/api-keys/lib/utils";
-import { resolveStorageUrlsInObject, validateFileUploads } from "@/modules/storage/utils";
+import { resolveStorageUrlsInObject, validateClientFileUploads } from "@/modules/storage/utils";
 import { createResponseWithQuotaEvaluation, getResponses } from "./lib/response";
 
 export const GET = async (request: NextRequest) =>
@@ -97,12 +98,29 @@ export const POST = async (request: Request) =>
         return handleApiError(request, surveyQuestions.error as ApiErrorResponseV2, auditLog); // NOSONAR
       }
 
-      if (!validateFileUploads(body.data, surveyQuestions.data.questions)) {
+      if (
+        !validateClientFileUploads({
+          data: body.data,
+          workspaceId,
+          surveyId: body.surveyId,
+          blocks: surveyQuestions.data.blocks,
+          questions: surveyQuestions.data.questions,
+          // Management callers replay stored responses whose file URLs may predate the scoped shape;
+          // accept those against a prefix this workspace owns (ENG-1981 review).
+          legacyOwnedStoragePrefixes: await getWorkspaceLegacyStoragePrefixes(workspaceId),
+        })
+      ) {
         return handleApiError(
           request,
           {
             type: "bad_request",
-            details: [{ field: "response", issue: "Invalid file upload response" }],
+            details: [
+              {
+                field: "response",
+                issue:
+                  "Invalid file upload response: each file URL must reference a file uploaded to this survey's file-upload element",
+              },
+            ],
           },
           auditLog
         );
diff --git a/apps/web/modules/storage/utils.test.ts b/apps/web/modules/storage/utils.test.ts
index bb3fd16f0be1..9ecb10e371f1 100644
--- a/apps/web/modules/storage/utils.test.ts
+++ b/apps/web/modules/storage/utils.test.ts
@@ -13,7 +13,6 @@ import {
   resolveStorageUrlsInObject,
   sanitizeFileName,
   validateClientFileUploads,
-  validateFileUploads,
   validateSingleFile,
   validateSurveyAllowsFileUpload,
 } from "@/modules/storage/utils";
@@ -223,138 +222,6 @@ describe("storage utils", () => {
     });
   });
 
-  describe("validateFileUploads", () => {
-    test("should return true for valid file uploads in response data", () => {
-      const responseData = {
-        question1: ["https://example.com/storage/file1.jpg", "https://example.com/storage/file2.pdf"],
-      };
-
-      const questions = [
-        {
-          id: "question1",
-          type: "fileUpload" as const,
-          allowedFileExtensions: ["jpg", "pdf"],
-        } as TSurveyQuestion,
-      ];
-
-      expect(validateFileUploads(responseData, questions)).toBe(true);
-    });
-
-    test("should return false when file url is not a string", () => {
-      const responseData = {
-        question1: [123, "https://example.com/storage/file.jpg"],
-      } as TResponseData;
-
-      const questions = [
-        {
-          id: "question1",
-          type: "fileUpload" as const,
-          allowedFileExtensions: ["jpg"],
-        } as TSurveyQuestion,
-      ];
-
-      expect(validateFileUploads(responseData, questions)).toBe(false);
-    });
-
-    test("should return false when file urls are not in an array", () => {
-      const responseData = {
-        question1: "https://example.com/storage/file.jpg",
-      };
-
-      const questions = [
-        {
-          id: "question1",
-          type: "fileUpload" as const,
-          allowedFileExtensions: ["jpg"],
-        } as TSurveyQuestion,
-      ];
-
-      expect(validateFileUploads(responseData, questions)).toBe(false);
-    });
-
-    test("should return false when file extension is not allowed", () => {
-      const responseData = {
-        question1: ["https://example.com/storage/file.exe"],
-      };
-
-      const questions = [
-        {
-          id: "question1",
-          type: "fileUpload" as const,
-          allowedFileExtensions: ["jpg", "pdf"],
-        } as TSurveyQuestion,
-      ];
-
-      expect(validateFileUploads(responseData, questions)).toBe(false);
-    });
-
-    test("should return false when file name cannot be extracted", () => {
-      // Mock implementation to return null for this specific URL
-      mockGetOriginalFileNameFromUrl.mockImplementationOnce(() => undefined);
-
-      const responseData = {
-        question1: ["https://example.com/invalid-url"],
-      };
-
-      const questions = [
-        {
-          id: "question1",
-          type: "fileUpload" as const,
-          allowedFileExtensions: ["jpg"],
-        } as TSurveyQuestion,
-      ];
-
-      expect(validateFileUploads(responseData, questions)).toBe(false);
-    });
-
-    test("should return false when file has no extension", () => {
-      mockGetOriginalFileNameFromUrl.mockImplementationOnce(() => "file-without-extension");
-
-      const responseData = {
-        question1: ["https://example.com/storage/file-without-extension"],
-      };
-
-      const questions = [
-        {
-          id: "question1",
-          type: "fileUpload" as const,
-          allowedFileExtensions: ["jpg"],
-        } as TSurveyQuestion,
-      ];
-
-      expect(validateFileUploads(responseData, questions)).toBe(false);
-    });
-
-    test("should ignore non-fileUpload questions", () => {
-      const responseData = {
-        question1: ["https://example.com/storage/file.jpg"],
-        question2: "Some text answer",
-      };
-
-      const questions = [
-        {
-          id: "question1",
-          type: "fileUpload" as const,
-          allowedFileExtensions: ["jpg"],
-        },
-        {
-          id: "question2",
-          type: "text" as const,
-        },
-      ] as TSurveyQuestion[];
-
-      expect(validateFileUploads(responseData, questions)).toBe(true);
-    });
-
-    test("should return true when no questions are provided", () => {
-      const responseData = {
-        question1: ["https://example.com/storage/file.jpg"],
-      };
-
-      expect(validateFileUploads(responseData)).toBe(true);
-    });
-  });
-
   describe("validateSurveyAllowsFileUpload", () => {
     test("should allow a matching extension from a modern file upload block element", () => {
       const blocks = [
@@ -578,6 +445,18 @@ describe("storage utils", () => {
       expect(validateClientFileUploads({ data: responseData, workspaceId, surveyId, blocks })).toBe(false);
     });
 
+    test("should reject scoped URLs for a different workspace (cross-tenant, ENG-1981)", () => {
+      // A storage URL whose workspace segment belongs to ANOTHER tenant must never validate:
+      // persisting it would let response-deletion cleanup delete that tenant's file by storageId.
+      const responseData = {
+        [elementId]: [
+          `/storage/otherWorkspace/private/surveys/${surveyId}/elements/${elementId}/report--fid--abc.pdf`,
+        ],
+      };
+
+      expect(validateClientFileUploads({ data: responseData, workspaceId, surveyId, blocks })).toBe(false);
+    });
+
     test("should reject scoped URLs for a different survey", () => {
       const responseData = {
         [elementId]: [
@@ -615,6 +494,216 @@ describe("storage utils", () => {
 
       expect(validateClientFileUploads({ data: responseData, workspaceId, surveyId, blocks })).toBe(false);
     });
+
+    test("should accept an app-origin absolute URL (the shape a GET response returns for re-submission)", () => {
+      // A response GET resolves the stored relative URL to an absolute one against the app's base
+      // (resolveStorageUrl); re-submitting that value must still validate. Build it via the same
+      // helper so the origin matches whatever WEBAPP_URL is in the test environment.
+      const absoluteUrl = resolveStorageUrl(
+        `/storage/${workspaceId}/private/surveys/${surveyId}/elements/${elementId}/report--fid--abc.pdf`,
+        "private"
+      );
+      const responseData = { [elementId]: [absoluteUrl] };
+
+      expect(validateClientFileUploads({ data: responseData, workspaceId, surveyId, blocks })).toBe(true);
+    });
+
+    test("should reject a foreign-origin absolute URL even when its path is correctly scoped", () => {
+      // A scoped path under a non-app origin must not slip through — otherwise an attacker could
+      // persist a link that renders to users pointing at an arbitrary host.
+      const responseData = {
+        [elementId]: [
+          `https://attacker.example.com/storage/${workspaceId}/private/surveys/${surveyId}/elements/${elementId}/report--fid--abc.pdf`,
+        ],
+      };
+
+      expect(validateClientFileUploads({ data: responseData, workspaceId, surveyId, blocks })).toBe(false);
+    });
+
+    // ENG-1981 review (Anshuman): file URLs uploaded before #8044 are only 4 parts
+    // (/storage/{prefix}/private/{file}) and never recorded a survey/element. A management caller
+    // replaying such a stored response (backfills, re-imports, two-way integrations) must still
+    // validate the URL — but only when {prefix} is a storage namespace the workspace owns, so
+    // cross-tenant deletion stays closed. legacyOwnedStoragePrefixes carries the owned prefixes
+    // (workspace id + Workspace.legacyEnvironmentId); it is empty for the client widget path.
+    describe("legacy 4-part URLs (management replay of pre-#8044 responses)", () => {
+      const legacyEnvironmentId = "env_legacy_abc";
+
+      test("accepts a legacy URL whose prefix is the workspace id (Formbricks 5 shape)", () => {
+        const responseData = {
+          [elementId]: [`/storage/${workspaceId}/private/resume--fid--u1.pdf`],
+        };
+
+        expect(
+          validateClientFileUploads({
+            data: responseData,
+            workspaceId,
+            surveyId,
+            blocks,
+            legacyOwnedStoragePrefixes: [workspaceId, legacyEnvironmentId],
+          })
+        ).toBe(true);
+      });
+
+      test("accepts a legacy URL whose prefix is the workspace's legacyEnvironmentId (pre-Formbricks 5 shape)", () => {
+        const responseData = {
+          [elementId]: [`/storage/${legacyEnvironmentId}/private/resume--fid--u1.pdf`],
+        };
+
+        expect(
+          validateClientFileUploads({
+            data: responseData,
+            workspaceId,
+            surveyId,
+            blocks,
+            legacyOwnedStoragePrefixes: [workspaceId, legacyEnvironmentId],
+          })
+        ).toBe(true);
+      });
+
+      test("accepts an app-origin absolute legacy URL whose prefix is owned", () => {
+        const absoluteUrl = resolveStorageUrl(
+          `/storage/${legacyEnvironmentId}/private/resume--fid--u1.pdf`,
+          "private"
+        );
+        const responseData = { [elementId]: [absoluteUrl] };
+
+        expect(
+          validateClientFileUploads({
+            data: responseData,
+            workspaceId,
+            surveyId,
+            blocks,
+            legacyOwnedStoragePrefixes: [workspaceId, legacyEnvironmentId],
+          })
+        ).toBe(true);
+      });
+
+      test("rejects a legacy URL whose prefix belongs to another tenant (cross-tenant, ENG-1981)", () => {
+        // The prefix is the only part that decides whose file a later cleanup deletes, so a legacy
+        // URL naming a prefix this workspace does not own must never validate.
+        const responseData = {
+          [elementId]: [`/storage/env_other_tenant/private/resume--fid--u1.pdf`],
+        };
+
+        expect(
+          validateClientFileUploads({
+            data: responseData,
+            workspaceId,
+            surveyId,
+            blocks,
+            legacyOwnedStoragePrefixes: [workspaceId, legacyEnvironmentId],
+          })
+        ).toBe(false);
+      });
+
+      test("rejects a legacy public URL even when the prefix is owned (file-upload answers are private)", () => {
+        const responseData = {
+          [elementId]: [`/storage/${workspaceId}/public/resume--fid--u1.pdf`],
+        };
+
+        expect(
+          validateClientFileUploads({
+            data: responseData,
+            workspaceId,
+            surveyId,
+            blocks,
+            legacyOwnedStoragePrefixes: [workspaceId, legacyEnvironmentId],
+          })
+        ).toBe(false);
+      });
+
+      test("rejects a legacy URL when no owned prefixes are supplied (client widget path stays strict)", () => {
+        const responseData = {
+          [elementId]: [`/storage/${workspaceId}/private/resume--fid--u1.pdf`],
+        };
+
+        expect(
+          validateClientFileUploads({
+            data: responseData,
+            workspaceId,
+            surveyId,
+            blocks,
+            legacyOwnedStoragePrefixes: [],
+          })
+        ).toBe(false);
+      });
+
+      test("still accepts the current scoped 8-part shape when owned prefixes are supplied", () => {
+        const responseData = {
+          [elementId]: [
+            `/storage/${workspaceId}/private/surveys/${surveyId}/elements/${elementId}/report--fid--abc.pdf`,
+          ],
+        };
+
+        expect(
+          validateClientFileUploads({
+            data: responseData,
+            workspaceId,
+            surveyId,
+            blocks,
+            legacyOwnedStoragePrefixes: [workspaceId, legacyEnvironmentId],
+          })
+        ).toBe(true);
+      });
+    });
+
+    describe("questions-only surveys (legacy shape passed by all four management routes)", () => {
+      const questions = [
+        {
+          id: elementId,
+          type: "fileUpload" as const,
+          allowedFileExtensions: ["pdf"],
+        },
+      ] as unknown as TSurveyQuestion[];
+
+      test("accepts a scoped URL resolved from a fileUpload question", () => {
+        const responseData = {
+          [elementId]: [
+            `/storage/${workspaceId}/private/surveys/${surveyId}/elements/${elementId}/report--fid--abc.pdf`,
+          ],
+        };
+
+        expect(validateClientFileUploads({ data: responseData, workspaceId, surveyId, questions })).toBe(
+          true
+        );
+      });
+
+      test("rejects a cross-tenant URL resolved from a fileUpload question", () => {
+        const responseData = {
+          [elementId]: [
+            `/storage/otherWorkspace/private/surveys/${surveyId}/elements/${elementId}/report--fid--abc.pdf`,
+          ],
+        };
+
+        expect(validateClientFileUploads({ data: responseData, workspaceId, surveyId, questions })).toBe(
+          false
+        );
+      });
+    });
+
+    test("returns true when there is no response data", () => {
+      expect(validateClientFileUploads({ data: undefined, workspaceId, surveyId, blocks })).toBe(true);
+    });
+
+    test("rejects when a file-upload answer is not an array", () => {
+      const responseData = {
+        [elementId]: `/storage/${workspaceId}/private/surveys/${surveyId}/elements/${elementId}/report--fid--abc.pdf`,
+      } as unknown as TResponseData;
+
+      expect(validateClientFileUploads({ data: responseData, workspaceId, surveyId, blocks })).toBe(false);
+    });
+
+    test("rejects when a file-upload answer array contains a non-string entry", () => {
+      const responseData = {
+        [elementId]: [
+          `/storage/${workspaceId}/private/surveys/${surveyId}/elements/${elementId}/report--fid--abc.pdf`,
+          123,
+        ],
+      } as unknown as TResponseData;
+
+      expect(validateClientFileUploads({ data: responseData, workspaceId, surveyId, blocks })).toBe(false);
+    });
   });
 
   describe("parseStorageFileUrl", () => {
diff --git a/apps/web/modules/storage/utils.ts b/apps/web/modules/storage/utils.ts
index 2b0c24236ec1..661a294d77b6 100644
--- a/apps/web/modules/storage/utils.ts
+++ b/apps/web/modules/storage/utils.ts
@@ -101,24 +101,6 @@ export const validateSingleFile = (
   return !allowedFileExtensions || allowedFileExtensions.includes(extension as TAllowedFileExtension);
 };
 
-export const validateFileUploads = (data?: TResponseData, questions?: TSurveyQuestion[]): boolean => {
-  if (!data) return true;
-  for (const key of Object.keys(data)) {
-    const question = questions?.find((q) => q.id === key);
-    if (!question || question.type !== TSurveyQuestionTypeEnum.FileUpload) continue;
-
-    const fileUrls = data[key];
-
-    if (!Array.isArray(fileUrls) || !fileUrls.every((url) => typeof url === "string")) return false;
-
-    for (const fileUrl of fileUrls) {
-      if (!validateSingleFile(fileUrl, question.allowedFileExtensions)) return false;
-    }
-  }
-
-  return true;
-};
-
 export type TSurveyFileUploadPermissionResult =
   | {
       ok: true;
@@ -202,10 +184,43 @@ export const validateSurveyAllowsFileUpload = ({
       };
 };
 
+// Origins that may legitimately prefix an absolute storage URL. A response GET resolves stored
+// relative `/storage/...` URLs to absolute ones against these app bases (see resolveStorageUrl), so
+// a client that reads a response and re-submits the same file-upload answer sends back an absolute
+// URL. Those must still validate — but only for the app's own origins, so a foreign absolute URL
+// can never be smuggled past the scope check.
+const getAppStorageOrigins = (): string[] => {
+  const origins: string[] = [];
+  for (const base of [WEBAPP_URL, getPublicDomain()]) {
+    if (!base) continue;
+    try {
+      origins.push(new URL(base).origin);
+    } catch {
+      // Ignore a misconfigured base URL rather than throwing during validation.
+    }
+  }
+  return origins;
+};
+
 const getStorageUrlPathSegments = (fileUrl: string): string[] | null => {
-  if (!fileUrl.startsWith("/storage/")) return null;
+  let pathname: string;
+
+  if (fileUrl.startsWith("/storage/")) {
+    pathname = fileUrl;
+  } else {
+    let parsed: URL;
+    try {
+      parsed = new URL(fileUrl);
+    } catch {
+      return null;
+    }
+    // Absolute URLs are only accepted when they point at one of the app's own origins.
+    if (!getAppStorageOrigins().includes(parsed.origin)) return null;
+    pathname = parsed.pathname;
+  }
 
-  const pathWithoutSearch = fileUrl.split(/[?#]/)[0];
+  const pathWithoutSearch = pathname.split(/[?#]/)[0];
+  if (!pathWithoutSearch.startsWith("/storage/")) return null;
   return pathWithoutSearch.split("/").filter(Boolean);
 };
 
@@ -249,37 +264,66 @@ const isScopedPrivateUploadUrl = ({
   workspaceId,
   surveyId,
   elementId,
+  legacyOwnedStoragePrefixes = [],
 }: {
   fileUrl: string;
   workspaceId: string;
   surveyId: string;
   elementId: string;
+  // Storage prefixes this workspace owns for pre-#8044 file URLs (its own id and, when set, its
+  // Workspace.legacyEnvironmentId). Empty for the client widget, which only ever emits the scoped
+  // shape below; passed by the management routes so replayed old responses still validate.
+  legacyOwnedStoragePrefixes?: string[];
 }): boolean => {
   const segments = getStorageUrlPathSegments(fileUrl);
 
-  if (segments?.length !== 8) return false;
-
-  const [
-    storageSegment,
-    storageWorkspaceId,
-    accessType,
-    surveysSegment,
-    storageSurveyId,
-    elementsSegment,
-    storageElementId,
-    fileName,
-  ] = segments;
-
-  return (
-    storageSegment === "storage" &&
-    storageWorkspaceId === workspaceId &&
-    accessType === "private" &&
-    surveysSegment === "surveys" &&
-    storageSurveyId === surveyId &&
-    elementsSegment === "elements" &&
-    storageElementId === elementId &&
-    Boolean(fileName)
-  );
+  if (!segments) return false;
+
+  // Current (post-#8044) fully-scoped shape:
+  // /storage/{workspaceId}/private/surveys/{surveyId}/elements/{elementId}/{file}  -> 8 parts
+  if (segments.length === 8) {
+    const [
+      storageSegment,
+      storageWorkspaceId,
+      accessType,
+      surveysSegment,
+      storageSurveyId,
+      elementsSegment,
+      storageElementId,
+      fileName,
+    ] = segments;
+
+    return (
+      storageSegment === "storage" &&
+      storageWorkspaceId === workspaceId &&
+      accessType === "private" &&
+      surveysSegment === "surveys" &&
+      storageSurveyId === surveyId &&
+      elementsSegment === "elements" &&
+      storageElementId === elementId &&
+      Boolean(fileName)
+    );
+  }
+
+  // Legacy shapes uploaded before #8044 (pre-Formbricks-5 environment-id prefix, or the Formbricks-5
+  // workspace-id prefix) never recorded a survey or element, so they are only 4 parts:
+  // /storage/{prefix}/private/{file}. A read-then-write of such a response (backfills, re-imports,
+  // two-way integrations) must still validate — but only when {prefix} is a storage namespace THIS
+  // workspace owns, so cross-tenant deletion stays closed (the prefix is the only part that decides
+  // whose file a later cleanup deletes). Survey/element binding is unavailable here because the old
+  // URL never carried it.
+  if (segments.length === 4 && legacyOwnedStoragePrefixes.length > 0) {
+    const [storageSegment, storagePrefix, accessType, fileName] = segments;
+
+    return (
+      storageSegment === "storage" &&
+      accessType === "private" &&
+      legacyOwnedStoragePrefixes.includes(storagePrefix) &&
+      Boolean(fileName)
+    );
+  }
+
+  return false;
 };
 
 export const validateClientFileUploads = ({
@@ -288,12 +332,17 @@ export const validateClientFileUploads = ({
   surveyId,
   blocks,
   questions,
+  legacyOwnedStoragePrefixes,
 }: {
   data?: TResponseData;
   workspaceId: string;
   surveyId: string;
   blocks?: TSurveyBlock[] | null;
   questions?: TSurveyQuestion[] | null;
+  // Passed by the management routes (see getWorkspaceLegacyEnvironmentId) so a replayed old response
+  // whose file URL predates the scoped shape still validates against a prefix the workspace owns.
+  // Omitted by the client widget path, which stays strict on the scoped shape.
+  legacyOwnedStoragePrefixes?: string[];
 }): boolean => {
   if (!data) return true;
 
@@ -313,6 +362,7 @@ export const validateClientFileUploads = ({
           workspaceId,
           surveyId,
           elementId: fileUploadConfig.id,
+          legacyOwnedStoragePrefixes,
         })
       ) {
         return false;

From d8d4feb00383ddc2854173c3d9366211b41155fc Mon Sep 17 00:00:00 2001
From: Tiago <1585571+xernobyl@users.noreply.github.com>
Date: Wed, 29 Jul 2026 12:42:46 +0000
Subject: [PATCH 5/5] fix(auth): resolve login-path deadlock and stop
 over-capturing auth failures (#8637)

---
 .../lib/better-auth-observability.test.ts     | 86 +++++++++++++++++++
 .../auth/lib/better-auth-observability.ts     | 26 +++++-
 apps/web/modules/auth/lib/user.test.ts        | 57 ++++++++++++
 apps/web/modules/auth/lib/user.ts             | 80 ++++++++++++-----
 apps/web/modules/auth/lib/utils.test.ts       | 27 ++----
 apps/web/modules/auth/lib/utils.ts            | 26 +-----
 .../billing/lib/organization-billing.test.ts  | 72 ++++++++++++++++
 .../ee/billing/lib/organization-billing.ts    | 45 +++++++++-
 packages/cache/src/cache-keys.test.ts         |  5 ++
 packages/cache/src/cache-keys.ts              |  3 +
 10 files changed, 359 insertions(+), 68 deletions(-)

diff --git a/apps/web/modules/auth/lib/better-auth-observability.test.ts b/apps/web/modules/auth/lib/better-auth-observability.test.ts
index 0c7643d0dd9a..6ae182d45d26 100644
--- a/apps/web/modules/auth/lib/better-auth-observability.test.ts
+++ b/apps/web/modules/auth/lib/better-auth-observability.test.ts
@@ -1,11 +1,14 @@
+import * as Sentry from "@sentry/nextjs";
 import { APIError } from "better-auth/api";
 import { beforeEach, describe, expect, test, vi } from "vitest";
 import { prisma } from "@formbricks/database";
+import { logger } from "@formbricks/logger";
 import { queueAuditEventBackground } from "@/modules/ee/audit-logs/lib/handler";
 import { UNKNOWN_DATA } from "@/modules/ee/audit-logs/types/audit-log";
 import {
   auditFailedAuthAfter,
   auditPasswordReset,
+  betterAuthLogger,
   getSignInAuthMethod,
   signInAuditDatabaseHook,
 } from "./better-auth-observability";
@@ -20,6 +23,23 @@ vi.mock("@formbricks/database", () => ({
   prisma: { user: { findUnique: vi.fn() } },
 }));
 
+vi.mock("@sentry/nextjs", () => ({
+  captureException: vi.fn(),
+}));
+
+// Stable context-logger so the betterAuthLogger tests can assert the local log level.
+const contextLoggerMock = { error: vi.fn(), warn: vi.fn(), info: vi.fn() };
+vi.mock("@formbricks/logger", () => ({
+  logger: { withContext: vi.fn(() => contextLoggerMock) },
+}));
+
+// betterAuthLogger only captures to Sentry when SENTRY_DSN && IS_PRODUCTION; force both on for the file.
+vi.mock("@/lib/constants", async (importActual) => ({
+  ...(await importActual<typeof import("@/lib/constants")>()),
+  IS_PRODUCTION: true,
+  SENTRY_DSN: "https://examplePublicKey@o0.ingest.sentry.io/0",
+}));
+
 vi.mock("./sign-in-tracking", () => ({
   finalizeSuccessfulSignIn: vi.fn(),
 }));
@@ -252,3 +272,69 @@ describe("auditPasswordReset (onPasswordReset audit)", () => {
     await expect(auditPasswordReset("user-1")).resolves.toBeUndefined();
   });
 });
+
+describe("betterAuthLogger (Sentry capture gating, ENG-2037)", () => {
+  // Optional on the BetterAuthOptions["logger"] type, but always defined here.
+  const log = betterAuthLogger.log!;
+
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  // Better Auth logs handled OAuth rejections as a bare string code (redirectOnError) — the top Sentry
+  // noise source (FORMBRICKS-16Q). These must NOT be captured, only logged locally.
+  test.each(["account_not_linked", "unable_to_create_user", "unable_to_get_user_info", "email_not_found"])(
+    "does not capture the handled OAuth rejection code %s",
+    (code) => {
+      log("error", code);
+
+      expect(Sentry.captureException).not.toHaveBeenCalled();
+      // The rejection is still visible in the application log.
+      expect(contextLoggerMock.error).toHaveBeenCalledWith(code);
+    }
+  );
+
+  test("does not capture a client-facing APIError (handled 4xx, e.g. FAILED_TO_CREATE_USER)", () => {
+    const apiError = new APIError("UNPROCESSABLE_ENTITY", {
+      message: "Failed to create user",
+      code: "FAILED_TO_CREATE_USER",
+    });
+
+    // BA logs this as ("Failed to create user", apiError) on the credential path.
+    log("error", "Failed to create user", apiError);
+
+    expect(Sentry.captureException).not.toHaveBeenCalled();
+    expect(contextLoggerMock.error).toHaveBeenCalledWith("Failed to create user");
+  });
+
+  test("captures a genuine internal fault passed as a trailing arg (DB/adapter error)", () => {
+    const dbError = new Error("Better auth was unable to query your database");
+
+    log("error", "Better auth was unable to query your database.\nError: ", dbError);
+
+    expect(Sentry.captureException).toHaveBeenCalledWith(dbError);
+  });
+
+  test("captures the deadlock DriverAdapterError so the ENG-2038 signal stays visible", () => {
+    // A non-APIError Error must still reach Sentry — this is the signal we watch post-deploy.
+    const deadlock = new Error("deadlock detected");
+
+    log("error", deadlock);
+
+    expect(Sentry.captureException).toHaveBeenCalledWith(deadlock);
+  });
+
+  test("warn-level logs are never captured", () => {
+    log("warn", "account isn't linked");
+
+    expect(Sentry.captureException).not.toHaveBeenCalled();
+    expect(contextLoggerMock.warn).toHaveBeenCalledWith("account isn't linked");
+  });
+
+  test("info/debug-level logs go to info and are never captured", () => {
+    log("info", "some info");
+
+    expect(Sentry.captureException).not.toHaveBeenCalled();
+    expect(contextLoggerMock.info).toHaveBeenCalledWith("some info");
+  });
+});
diff --git a/apps/web/modules/auth/lib/better-auth-observability.ts b/apps/web/modules/auth/lib/better-auth-observability.ts
index 467dd80e7794..c05395d78b2c 100644
--- a/apps/web/modules/auth/lib/better-auth-observability.ts
+++ b/apps/web/modules/auth/lib/better-auth-observability.ts
@@ -102,9 +102,23 @@ export const signInAuditDatabaseHook: NonNullable<
 };
 
 /**
- * Route Better Auth's logger to @formbricks/logger and capture errors to Sentry in production —
- * replaces auth.ts's placeholder logger (and the route's Sentry.captureException on auth failures).
- * Normal auth failures (wrong password) log at `warn`, so only genuine internal errors reach Sentry.
+ * Route Better Auth's logger to @formbricks/logger and capture GENUINE internal faults to Sentry in
+ * production — replaces auth.ts's placeholder logger (and the route's Sentry.captureException on auth
+ * failures).
+ *
+ * Sentry gating (ENG-2037): Better Auth logs many EXPECTED, handled rejections at `error` level, so
+ * "capture everything at error" floods Sentry with non-actionable noise. Two shapes dominate:
+ *   1. OAuth callback rejections logged as a bare string code (`logger.error("account_not_linked")`,
+ *      `"unable_to_create_user"`, `"unable_to_get_user_info"`, … via `redirectOnError`) — no Error
+ *      object; these are client-facing redirects, e.g. our blocked-domain / SSO provisioning gate
+ *      returning `false`. These were the top volume in Sentry (FORMBRICKS-16Q).
+ *   2. Credential-path rejections thrown as a Better Auth `APIError` (`FAILED_TO_CREATE_USER`,
+ *      `USER_ALREADY_EXISTS_USE_ANOTHER_EMAIL`, invalid-input codes) — a 4xx-equivalent response, not a
+ *      server fault.
+ * Neither is an actionable error, so we capture ONLY a real `Error` that is NOT an `APIError` (the
+ * genuinely-exceptional class: DB/adapter faults, misconfig, unexpected throws — including the
+ * `deadlock detected` DriverAdapterError we watch for ENG-2038). Everything still reaches the local
+ * logger, so handled rejections remain visible in logs — they just don't page via Sentry.
  */
 export const betterAuthLogger: NonNullable<BetterAuthOptions["logger"]> = {
   level: "warn",
@@ -116,7 +130,11 @@ export const betterAuthLogger: NonNullable<BetterAuthOptions["logger"]> = {
       if (SENTRY_DSN && IS_PRODUCTION) {
         // BA usually passes the Error as a trailing arg, but a couple of sites pass it as `message`.
         const cause = [...args, message].find((arg): arg is Error => arg instanceof Error);
-        Sentry.captureException(cause ?? new Error(`[better-auth] ${String(message)}`));
+        // Skip handled rejections: a bare string code (no Error) or a client-facing APIError. Capture
+        // only genuine internal faults so Sentry stays actionable (see the reason-split above).
+        if (cause && !isAPIError(cause)) {
+          Sentry.captureException(cause);
+        }
       }
     } else if (level === "warn") {
       contextLogger.warn(message);
diff --git a/apps/web/modules/auth/lib/user.test.ts b/apps/web/modules/auth/lib/user.test.ts
index 97027f0c1e80..055dfdf13593 100644
--- a/apps/web/modules/auth/lib/user.test.ts
+++ b/apps/web/modules/auth/lib/user.test.ts
@@ -178,6 +178,26 @@ describe("User Management", () => {
       expect(result).toEqual(previousLastLoginAt);
     });
 
+    test("locks with FOR NO KEY UPDATE, not FOR UPDATE (sign-in FK deadlock, ENG-2038)", async () => {
+      const queryRaw = vi.fn().mockResolvedValue([{ id: mockUser.id, lastLoginAt: null }]);
+      vi.mocked(prisma.$transaction).mockImplementationOnce(async (callback) =>
+        callback({
+          $queryRaw: queryRaw,
+          user: {
+            update: vi.fn().mockResolvedValue({ ...mockPrismaUser, lastLoginAt: new Date() }),
+          },
+        } as any)
+      );
+
+      await updateUserLastLoginAt(mockUser.email);
+
+      // $queryRaw is a tagged template: the first call arg is the array of string literals.
+      const sql = (queryRaw.mock.calls[0][0] as string[]).join(" ").replace(/\s+/g, " ");
+      expect(sql).toContain("FOR NO KEY UPDATE");
+      // FOR UPDATE conflicts with the FK FOR KEY SHARE lock — a revert must fail this test.
+      expect(sql).not.toContain("FOR UPDATE");
+    });
+
     test("throws ResourceNotFoundError when user doesn't exist", async () => {
       vi.mocked(prisma.$transaction).mockImplementationOnce(async (callback) =>
         callback({
@@ -206,6 +226,43 @@ describe("User Management", () => {
 
       await expect(updateUserLastLoginAt(mockUser.email)).rejects.toThrow("boom");
     });
+
+    test("retries on a deadlock (P2034) and succeeds on the next attempt (ENG-2038)", async () => {
+      const previousLastLoginAt = new Date("2025-04-16T10:00:00.000Z");
+      const deadlock = new Prisma.PrismaClientKnownRequestError("deadlock", {
+        code: "P2034",
+        clientVersion: "0.0.1",
+      });
+      vi.mocked(prisma.$transaction)
+        .mockRejectedValueOnce(deadlock)
+        .mockImplementationOnce(async (callback) =>
+          callback({
+            $queryRaw: vi.fn().mockResolvedValue([{ id: mockUser.id, lastLoginAt: previousLastLoginAt }]),
+            user: { update: vi.fn().mockResolvedValue({ ...mockPrismaUser, lastLoginAt: new Date() }) },
+          } as any)
+        );
+
+      const result = await updateUserLastLoginAt(mockUser.email);
+
+      expect(result).toEqual(previousLastLoginAt);
+      expect(prisma.$transaction).toHaveBeenCalledTimes(2);
+    });
+
+    test("gives up after the max attempts when a deadlock persists", async () => {
+      // A driver-adapter deadlock surfaces as a plain Error with this message (the ENG-2038 shape).
+      vi.mocked(prisma.$transaction).mockRejectedValue(new Error("deadlock detected"));
+
+      await expect(updateUserLastLoginAt(mockUser.email)).rejects.toThrow("deadlock detected");
+      expect(prisma.$transaction).toHaveBeenCalledTimes(3);
+    });
+
+    test("does not retry a non-deadlock error", async () => {
+      vi.mocked(prisma.$transaction).mockRejectedValue(new Error("boom"));
+
+      await expect(updateUserLastLoginAt(mockUser.email)).rejects.toThrow("boom");
+      // Non-deadlock errors propagate on the first attempt — no retry.
+      expect(prisma.$transaction).toHaveBeenCalledTimes(1);
+    });
   });
 
   describe("getUserByEmail", () => {
diff --git a/apps/web/modules/auth/lib/user.ts b/apps/web/modules/auth/lib/user.ts
index 67a2799729da..90a09fb67148 100644
--- a/apps/web/modules/auth/lib/user.ts
+++ b/apps/web/modules/auth/lib/user.ts
@@ -12,6 +12,37 @@ type TUserDbClient = PrismaClient | Prisma.TransactionClient;
 
 const getDbClient = (tx?: Prisma.TransactionClient): TUserDbClient => tx ?? prisma;
 
+// A Postgres deadlock aborts ONE transaction in the cycle (SQLSTATE 40P01) and is safe to retry.
+// Prisma reports it as P2034 on interactive transactions; the pg driver adapter can also surface it as
+// a DriverAdapterError whose message carries "deadlock detected" (the shape seen in Sentry for ENG-2038).
+const isDeadlockError = (error: unknown): boolean => {
+  if (isPrismaKnownRequestError(error) && error.code === "P2034") {
+    return true;
+  }
+  const message = error instanceof Error ? error.message : "";
+  return /deadlock detected/i.test(message) || message.includes("40P01");
+};
+
+const DEADLOCK_MAX_ATTEMPTS = 3;
+
+/**
+ * Retry a DB operation a bounded number of times when it fails with a deadlock, with a short linear
+ * backoff so retried transactions don't re-collide in lockstep. Non-deadlock errors propagate on the
+ * first attempt. Defense-in-depth for the login write path (ENG-2038); the caller must be idempotent.
+ */
+const retryOnDeadlock = async <T>(operation: () => Promise<T>): Promise<T> => {
+  for (let attempt = 1; ; attempt++) {
+    try {
+      return await operation();
+    } catch (error) {
+      if (attempt >= DEADLOCK_MAX_ATTEMPTS || !isDeadlockError(error)) {
+        throw error;
+      }
+      await new Promise((resolve) => setTimeout(resolve, attempt * 25));
+    }
+  }
+};
+
 export const updateUser = async (id: string, data: TUserUpdateInput, tx?: Prisma.TransactionClient) => {
   validateInputs([id, ZId], [data, ZUserUpdateInput.partial()]);
 
@@ -42,30 +73,39 @@ export const updateUserLastLoginAt = async (email: string) => {
   validateInputs([email, ZUserEmail]);
 
   try {
-    return await prisma.$transaction(async (tx) => {
-      const lockedUsers = await tx.$queryRaw<Array<{ id: string; lastLoginAt: Date | null }>>`
+    // Retry on a transient deadlock (40P01): the last-login bump is idempotent, so a bounded retry
+    // clears rare cross-transaction contention on the hot login path instead of surfacing a 500.
+    return await retryOnDeadlock(() =>
+      prisma.$transaction(async (tx) => {
+        // FOR NO KEY UPDATE (not FOR UPDATE): this serializes concurrent same-user updates of
+        // lastLoginAt, but — unlike FOR UPDATE — does NOT conflict with the FOR KEY SHARE lock that a
+        // concurrent Session→User FK insert takes on this row during sign-in. FOR UPDATE here was
+        // stronger than the subsequent UPDATE needs and created a deadlock cycle on the login path
+        // (ENG-2038). The row is only read to return the previous lastLoginAt for a login analytics flag.
+        const lockedUsers = await tx.$queryRaw<Array<{ id: string; lastLoginAt: Date | null }>>`
         SELECT "id", "lastLoginAt"
         FROM "User"
         WHERE "email" = ${email}
-        FOR UPDATE
+        FOR NO KEY UPDATE
       `;
-      const lockedUser = lockedUsers[0];
-
-      if (!lockedUser) {
-        throw new ResourceNotFoundError("email", email);
-      }
-
-      await tx.user.update({
-        where: {
-          id: lockedUser.id,
-        },
-        data: {
-          lastLoginAt: new Date(),
-        },
-      });
-
-      return lockedUser.lastLoginAt;
-    });
+        const lockedUser = lockedUsers[0];
+
+        if (!lockedUser) {
+          throw new ResourceNotFoundError("email", email);
+        }
+
+        await tx.user.update({
+          where: {
+            id: lockedUser.id,
+          },
+          data: {
+            lastLoginAt: new Date(),
+          },
+        });
+
+        return lockedUser.lastLoginAt;
+      })
+    );
   } catch (error) {
     if (error instanceof ResourceNotFoundError) {
       throw error;
diff --git a/apps/web/modules/auth/lib/utils.test.ts b/apps/web/modules/auth/lib/utils.test.ts
index 4765d05145cd..22190861d6b0 100644
--- a/apps/web/modules/auth/lib/utils.test.ts
+++ b/apps/web/modules/auth/lib/utils.test.ts
@@ -827,35 +827,22 @@ describe("Auth Utils", () => {
     });
   });
 
-  describe("Sentry Integration", () => {
-    test("should capture authentication failures to Sentry", () => {
+  describe("Sentry Integration (ENG-2037)", () => {
+    test("does NOT capture expected auth failures to Sentry, but still audits them", () => {
       logAuthEvent("authenticationAttempted", "failure", "user_123", "user@example.com", {
         failureReason: "invalid_password",
         provider: "credentials",
         authMethod: "password_validation",
-        tags: { security_event: "password_failure" },
       });
 
-      expect(Sentry.captureException).toHaveBeenCalledWith(
-        expect.any(Error),
-        expect.objectContaining({
-          tags: expect.objectContaining({
-            component: "authentication",
-            action: "authenticationAttempted",
-            status: "failure",
-            security_event: "password_failure",
-          }),
-          extra: expect.objectContaining({
-            userId: "user_123",
-            provider: "credentials",
-            authMethod: "password_validation",
-            failureReason: "invalid_password",
-          }),
-        })
+      // Expected auth failures are noise in Sentry — the audit log is the security record.
+      expect(Sentry.captureException).not.toHaveBeenCalled();
+      expect(queueAuditEventBackground).toHaveBeenCalledWith(
+        expect.objectContaining({ action: "authenticationAttempted", status: "failure" })
       );
     });
 
-    test("should not capture successful authentication to Sentry", () => {
+    test("does not capture successful authentication to Sentry", () => {
       vi.clearAllMocks();
 
       logAuthEvent("passwordVerified", "success", "user_123", "user@example.com", {
diff --git a/apps/web/modules/auth/lib/utils.ts b/apps/web/modules/auth/lib/utils.ts
index e368dfd01995..545fd67ceca0 100644
--- a/apps/web/modules/auth/lib/utils.ts
+++ b/apps/web/modules/auth/lib/utils.ts
@@ -1,9 +1,7 @@
-import * as Sentry from "@sentry/nextjs";
 import { createHash, randomUUID } from "crypto";
 import { createCacheKey } from "@formbricks/cache";
 import { logger } from "@formbricks/logger";
 import { cache } from "@/lib/cache";
-import { IS_PRODUCTION, SENTRY_DSN } from "@/lib/constants";
 import { hashSecret, verifySecret } from "@/lib/crypto";
 import { queueAuditEventBackground } from "@/modules/ee/audit-logs/lib/handler";
 import { TAuditAction, TAuditStatus, UNKNOWN_DATA } from "@/modules/ee/audit-logs/types/audit-log";
@@ -44,26 +42,10 @@ export const logAuthEvent = (
 ) => {
   const auditActorId = userId === UNKNOWN_DATA && email ? createAuditIdentifier(email, "email") : userId;
 
-  // Log failures to Sentry for monitoring and alerting
-  if (status === "failure" && SENTRY_DSN && IS_PRODUCTION) {
-    const error = new Error(`Authentication ${action} failed`);
-    Sentry.captureException(error, {
-      tags: {
-        component: "authentication",
-        action,
-        status,
-        ...(additionalData.tags ?? {}),
-      },
-      extra: {
-        userId: auditActorId,
-        provider: additionalData.provider,
-        authMethod: additionalData.authMethod,
-        failureReason: additionalData.failureReason,
-        ...additionalData,
-      },
-    });
-  }
-
+  // Auth failures are NOT sent to Sentry: they're expected (wrong password / unknown user), so
+  // capturing every attempt was noise, not signal. The security trail is the audit log below
+  // (throttled by shouldLogAuthFailure + rate-limiting); genuine *internal* auth errors are still
+  // captured via the Better Auth logger's error level (ENG-2037).
   queueAuditEventBackground({
     action,
     targetType: "user",
diff --git a/apps/web/modules/ee/billing/lib/organization-billing.test.ts b/apps/web/modules/ee/billing/lib/organization-billing.test.ts
index ba57b649b37b..a3686dc5c3d7 100644
--- a/apps/web/modules/ee/billing/lib/organization-billing.test.ts
+++ b/apps/web/modules/ee/billing/lib/organization-billing.test.ts
@@ -19,6 +19,7 @@ vi.mock("server-only", () => ({}));
 const mocks = vi.hoisted(() => ({
   isCloud: true,
   getBillingCacheKey: vi.fn(),
+  getBillingSyncLockKey: vi.fn(),
   getCustomCacheKey: vi.fn(),
   prismaOrganizationFindUnique: vi.fn(),
   prismaOrganizationBillingFindUnique: vi.fn(),
@@ -28,6 +29,7 @@ const mocks = vi.hoisted(() => ({
   cacheWithCache: vi.fn(),
   cacheWithCacheNullable: vi.fn(),
   cacheDel: vi.fn(),
+  cacheTryLock: vi.fn(),
   loggerWarn: vi.fn(),
   getCloudPlanFromProduct: vi.fn(),
   customersCreate: vi.fn(),
@@ -70,6 +72,7 @@ vi.mock("@formbricks/cache", () => ({
   createCacheKey: {
     organization: {
       billing: mocks.getBillingCacheKey,
+      billingSyncLock: mocks.getBillingSyncLockKey,
     },
     custom: mocks.getCustomCacheKey,
   },
@@ -97,6 +100,7 @@ vi.mock("@/lib/cache", () => ({
     withCache: mocks.cacheWithCache,
     withCacheNullable: mocks.cacheWithCacheNullable,
     del: mocks.cacheDel,
+    tryLock: mocks.cacheTryLock,
   },
 }));
 
@@ -167,12 +171,17 @@ describe("organization-billing", () => {
     vi.clearAllMocks();
     mocks.isCloud = true;
     mocks.getBillingCacheKey.mockReturnValue("billing-cache-key");
+    mocks.getBillingSyncLockKey.mockImplementation(
+      (organizationId: string) => `org:${organizationId}:billing-sync-lock`
+    );
     mocks.getCustomCacheKey.mockImplementation(
       (namespace: string, identifier: string, subresource?: string) =>
         [namespace, identifier, subresource].filter(Boolean).join(":")
     );
     mocks.cacheWithCache.mockImplementation(async (fn: () => Promise<unknown>) => await fn());
     mocks.cacheWithCacheNullable.mockImplementation(async (fn: () => Promise<unknown>) => await fn());
+    // Default: the read-through single-flight lock is acquired, so stale-sync tests exercise the sync.
+    mocks.cacheTryLock.mockResolvedValue({ ok: true, data: true });
     mocks.getCloudPlanFromProduct.mockReturnValue("pro");
     mocks.subscriptionsList.mockResolvedValue({ data: [] });
     mocks.customersList.mockResolvedValue({ data: [] });
@@ -2409,6 +2418,69 @@ describe("organization-billing", () => {
     );
   });
 
+  test("getOrganizationBillingWithReadThroughSync serves cached and skips sync when another process holds the lock", async () => {
+    const cachedBilling = {
+      stripeCustomerId: "cus_1",
+      stripe: { lastSyncedAt: new Date(Date.now() - 6 * 60 * 1000).toISOString() },
+    };
+    mocks.cacheWithCacheNullable.mockResolvedValue(cachedBilling);
+    // Lock NOT acquired (another request/process is already syncing this org).
+    mocks.cacheTryLock.mockResolvedValue({ ok: true, data: false });
+
+    const result = await getOrganizationBillingWithReadThroughSync("org_1");
+
+    expect(result).toEqual(cachedBilling);
+    // Single-flight: no Stripe sync + no OrganizationBilling write happen in the loser.
+    expect(mocks.subscriptionsList).not.toHaveBeenCalled();
+    expect(mocks.prismaOrganizationBillingUpdate).not.toHaveBeenCalled();
+    // Lock is scoped to this org so it can't gate a different tenant's sync.
+    expect(mocks.cacheTryLock).toHaveBeenCalledWith("org:org_1:billing-sync-lock", "1", 30_000);
+  });
+
+  test("getOrganizationBillingWithReadThroughSync serves cached and skips sync when the lock backend is unavailable", async () => {
+    const cachedBilling = {
+      stripeCustomerId: "cus_1",
+      stripe: { lastSyncedAt: new Date(Date.now() - 6 * 60 * 1000).toISOString() },
+    };
+    mocks.cacheWithCacheNullable.mockResolvedValue(cachedBilling);
+    // Redis unavailable → tryLock returns an error Result; treat as "not acquired", serve cached.
+    mocks.cacheTryLock.mockResolvedValue({ ok: false, error: { code: "RedisConnectionError" } });
+
+    const result = await getOrganizationBillingWithReadThroughSync("org_1");
+
+    expect(result).toEqual(cachedBilling);
+    expect(mocks.subscriptionsList).not.toHaveBeenCalled();
+    expect(mocks.prismaOrganizationBillingUpdate).not.toHaveBeenCalled();
+  });
+
+  test("getOrganizationBillingWithReadThroughSync stops waiting at the deadline and serves cached (never overruns the lease)", async () => {
+    vi.useFakeTimers();
+    try {
+      const cachedBilling = {
+        stripeCustomerId: "cus_1",
+        // Fixed old timestamp so staleness doesn't depend on the fake clock.
+        stripe: { lastSyncedAt: new Date("2020-01-01T00:00:00.000Z").toISOString() },
+      };
+      mocks.cacheWithCacheNullable.mockResolvedValue(cachedBilling);
+      // Sync hangs on its first DB read → it would run past the 20s deadline (which is < the 30s lease).
+      mocks.prismaOrganizationBillingFindUnique.mockReturnValue(new Promise(() => {}));
+
+      const resultPromise = getOrganizationBillingWithReadThroughSync("org_1");
+      await vi.advanceTimersByTimeAsync(20_000 + 1);
+      const result = await resultPromise;
+
+      expect(result).toEqual(cachedBilling);
+      // Deadline fired before any write, so the request returns without blocking or writing.
+      expect(mocks.prismaOrganizationBillingUpdate).not.toHaveBeenCalled();
+      expect(mocks.loggerWarn).toHaveBeenCalledWith(
+        { error: expect.any(Error), organizationId: "org_1" },
+        "Failed to refresh billing snapshot from Stripe"
+      );
+    } finally {
+      vi.useRealTimers();
+    }
+  });
+
   test("getOrganizationBillingWithReadThroughSync bypasses Redis cache in self-hosted mode", async () => {
     mocks.isCloud = false;
     mocks.prismaOrganizationBillingFindUnique.mockResolvedValue({
diff --git a/apps/web/modules/ee/billing/lib/organization-billing.ts b/apps/web/modules/ee/billing/lib/organization-billing.ts
index b0e9d5afd26a..098d828d9182 100644
--- a/apps/web/modules/ee/billing/lib/organization-billing.ts
+++ b/apps/web/modules/ee/billing/lib/organization-billing.ts
@@ -28,6 +28,25 @@ import { stripeClient } from "./stripe-client";
 import { CLOUD_PLAN_LEVEL, type TCloudStripePlan, getCloudPlanFromProduct } from "./stripe-plan";
 
 const BILLING_SYNC_STALE_MS = 5 * 60 * 1000;
+// Single-flight lock TTL for the stale read-through Stripe sync: long enough to cover a few Stripe
+// round-trips + the write, short enough that a crashed holder can't block refreshes for long. The
+// lock is released by expiry (no explicit unlock), matching the license-fetch pattern.
+const BILLING_SYNC_LOCK_TTL_MS = 30 * 1000;
+// Hard deadline for the read-through sync, strictly below the lock TTL. This runs on a hot render
+// path, so if Stripe is slow we stop waiting and serve the cached snapshot instead of blocking the
+// request. Because the OrganizationBilling write is idempotent (Stripe is the source of truth;
+// last-write-wins on a single row), a sync that finishes after the deadline — or after the lease
+// expires — can't corrupt data or deadlock, so a lease heartbeat isn't needed.
+const BILLING_SYNC_DEADLINE_MS = 20 * 1000;
+
+/** A promise that rejects after `ms`, with a canceller so the timer never outlives the race. */
+const rejectAfter = (ms: number, message: string): { promise: Promise<never>; cancel: () => void } => {
+  let timer: ReturnType<typeof setTimeout>;
+  const promise = new Promise<never>((_, reject) => {
+    timer = setTimeout(() => reject(new Error(message)), ms);
+  });
+  return { promise, cancel: () => clearTimeout(timer) };
+};
 const ACTIVE_SUBSCRIPTION_STATUSES = new Set<string>(["trialing", "active", "past_due", "unpaid", "paused"]);
 
 const ORGANIZATION_BILLING_SELECT = {
@@ -1659,9 +1678,31 @@ export const getOrganizationBillingWithReadThroughSync = async (
     return cachedBilling;
   }
 
+  // Single-flight the stale refresh: withCache does NOT dedupe concurrent callers, so without this a
+  // burst of requests for the same org (e.g. the post-login workspace layout render) would each run
+  // the Stripe sync + OrganizationBilling write — a thundering herd and a deadlock surface (ENG-2038).
+  // Only the lock winner refreshes; everyone else (incl. the Redis-unavailable case) serves the
+  // already-cached snapshot, which is at most one stale cycle old — acceptable for billing display.
+  const lockResult = await cache.tryLock(
+    createCacheKey.organization.billingSyncLock(organizationId),
+    "1",
+    BILLING_SYNC_LOCK_TTL_MS
+  );
+  if (!(lockResult.ok && lockResult.data === true)) {
+    return cachedBilling;
+  }
+
   try {
-    const syncedBilling = await syncOrganizationBillingFromStripe(organizationId);
-    return syncedBilling ?? cachedBilling;
+    const syncPromise = syncOrganizationBillingFromStripe(organizationId);
+    // Guard against an unhandled rejection if the sync settles after the deadline already won the race.
+    syncPromise.catch(() => undefined);
+    const deadline = rejectAfter(BILLING_SYNC_DEADLINE_MS, "billing sync exceeded deadline");
+    try {
+      const syncedBilling = await Promise.race([syncPromise, deadline.promise]);
+      return syncedBilling ?? cachedBilling;
+    } finally {
+      deadline.cancel();
+    }
   } catch (error) {
     logger.warn({ error, organizationId }, "Failed to refresh billing snapshot from Stripe");
     return cachedBilling;
diff --git a/packages/cache/src/cache-keys.test.ts b/packages/cache/src/cache-keys.test.ts
index b3b4ef459d58..6547b9b7aa6b 100644
--- a/packages/cache/src/cache-keys.test.ts
+++ b/packages/cache/src/cache-keys.test.ts
@@ -38,6 +38,11 @@ describe("@formbricks/cache cacheKeys", () => {
         expect(key).toBe("fb:org:org-123:billing");
       });
 
+      test("should create organization billing-sync-lock key scoped to the org", () => {
+        const key = createCacheKey.organization.billingSyncLock("org-123");
+        expect(key).toBe("fb:org:org-123:billing-sync-lock");
+      });
+
       test("should handle complex organization IDs", () => {
         const key = createCacheKey.organization.billing("org-enterprise-team_123");
         expect(key).toBe("fb:org:org-enterprise-team_123:billing");
diff --git a/packages/cache/src/cache-keys.ts b/packages/cache/src/cache-keys.ts
index dcd99fedd53a..e19fdc9cf798 100644
--- a/packages/cache/src/cache-keys.ts
+++ b/packages/cache/src/cache-keys.ts
@@ -26,6 +26,9 @@ export const createCacheKey = {
   // Organization-related keys
   organization: {
     billing: (organizationId: string): CacheKey => makeCacheKey("org", organizationId, "billing"),
+    // Single-flight lock so only one process refreshes an org's stale billing snapshot at a time.
+    billingSyncLock: (organizationId: string): CacheKey =>
+      makeCacheKey("org", organizationId, "billing-sync-lock"),
   },
 
   // License and enterprise features