chore(db): add nullable projectId to environment-owned models (#7588)

Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>

.env.example

@@ -38,6 +38,15 @@ LOG_LEVEL=info
 
 DATABASE_URL='postgresql://postgres:postgres@localhost:5432/formbricks?schema=public'
 
+#################
+#  HUB (DEV)    #
+#################
+# The dev stack (pnpm db:up / pnpm go) runs Formbricks Hub on port 8080.
+# Set explicitly to avoid confusion; override as needed when using docker-compose.dev.yml.
+HUB_API_KEY=dev-api-key
+HUB_API_URL=http://localhost:8080
+HUB_DATABASE_URL=postgresql://postgres:postgres@postgres:5432/postgres?sslmode=disable
+
 ################
 #  MAIL SETUP  #
 ################

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

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

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

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

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

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

apps/web/app/lib/templates.ts

@@ -4823,6 +4823,7 @@ export const previewSurvey = (projectName: string, t: TFunction): TSurvey => {
     name: t("templates.preview_survey_name"),
     type: "link" as const,
     environmentId: "cltwumfcz0009echxg02fh7oa",
+    projectId: null,
     createdBy: "cltwumfbz0000echxysz6ptvq",
     status: "inProgress" as const,
     welcomeCard: {

apps/web/lib/actionClass/service.ts

@@ -21,6 +21,7 @@ const selectActionClass = {
   key: true,
   noCodeConfig: true,
   environmentId: true,
+  projectId: true,
 } satisfies Prisma.ActionClassSelect;
 
 export const getActionClasses = reactCache(

apps/web/lib/constants.ts

@@ -40,6 +40,8 @@ export const GITHUB_ID = env.GITHUB_ID;
 export const GITHUB_SECRET = env.GITHUB_SECRET;
 export const GOOGLE_CLIENT_ID = env.GOOGLE_CLIENT_ID;
 export const GOOGLE_CLIENT_SECRET = env.GOOGLE_CLIENT_SECRET;
+export const HUB_API_URL = env.HUB_API_URL;
+export const HUB_API_KEY = env.HUB_API_KEY;
 
 export const AZUREAD_CLIENT_ID = env.AZUREAD_CLIENT_ID;
 export const AZUREAD_CLIENT_SECRET = env.AZUREAD_CLIENT_SECRET;

apps/web/lib/env.ts

@@ -33,6 +33,8 @@ export const env = createEnv({
     GOOGLE_SHEETS_REDIRECT_URL: z.string().optional(),
     HTTP_PROXY: z.url().optional(),
     HTTPS_PROXY: z.url().optional(),
+    HUB_API_URL: z.url(),
+    HUB_API_KEY: z.string().optional(),
     IMPRINT_URL: z
       .url()
       .optional()
@@ -159,6 +161,8 @@ export const env = createEnv({
     GOOGLE_SHEETS_REDIRECT_URL: process.env.GOOGLE_SHEETS_REDIRECT_URL,
     HTTP_PROXY: process.env.HTTP_PROXY,
     HTTPS_PROXY: process.env.HTTPS_PROXY,
+    HUB_API_URL: process.env.HUB_API_URL,
+    HUB_API_KEY: process.env.HUB_API_KEY,
     IMPRINT_URL: process.env.IMPRINT_URL,
     IMPRINT_ADDRESS: process.env.IMPRINT_ADDRESS,
     INVITE_DISABLED: process.env.INVITE_DISABLED,

apps/web/lib/response/service.ts

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

apps/web/lib/survey/__mock__/survey.mock.ts

@@ -19,6 +19,7 @@ const selectContact = {
   createdAt: true,
   updatedAt: true,
   environmentId: true,
+  projectId: true,
   attributes: {
     select: {
       value: true,
@@ -41,6 +42,7 @@ const commonMockProperties = {
   createdAt: currentDate,
   updatedAt: currentDate,
   environmentId: mockId,
+  projectId: null,
 };
 
 type SurveyMock = Prisma.SurveyGetPayload<{

apps/web/lib/survey/service.ts

@@ -30,6 +30,7 @@ export const selectSurvey = {
   name: true,
   type: true,
   environmentId: true,
+  projectId: true,
   createdBy: true,
   status: true,
   welcomeCard: true,
@@ -84,6 +85,7 @@ export const selectSurvey = {
           createdAt: true,
           updatedAt: true,
           environmentId: true,
+          projectId: true,
           name: true,
           description: true,
           type: true,

apps/web/modules/api/v2/management/responses/[responseId]/lib/response.ts

@@ -58,6 +58,7 @@ export const getResponseForPipeline = async (
                 updatedAt: true,
                 name: true,
                 environmentId: true,
+                projectId: true,
               },
             },
           },

apps/web/modules/api/v2/management/responses/[responseId]/lib/tests/response.test.ts

@@ -184,6 +184,7 @@ describe("Response Lib", () => {
                   updatedAt: true,
                   name: true,
                   environmentId: true,
+                  projectId: true,
                 },
               },
             },

apps/web/modules/api/v2/management/webhooks/[webhookId]/types/webhooks.ts

@@ -17,6 +17,7 @@ export const ZWebhookUpdateSchema = ZWebhook.omit({
   createdAt: true,
   updatedAt: true,
   environmentId: true,
+  projectId: true,
   secret: true,
 }).meta({
   id: "webhookUpdate",

apps/web/modules/ee/billing/lib/organization-billing.ts

@@ -1313,11 +1313,26 @@ export const reconcileCloudStripeSubscriptionsForOrganization = async (
     );
 
     await Promise.all(
-      hobbySubscriptions.map(({ subscription }) =>
-        client.subscriptions.cancel(subscription.id, {
-          prorate: false,
-        })
-      )
+      hobbySubscriptions.map(async ({ subscription }) => {
+        try {
+          await client.subscriptions.cancel(subscription.id, {
+            prorate: false,
+          });
+        } catch (err) {
+          if (
+            err instanceof Stripe.errors.StripeInvalidRequestError &&
+            err.statusCode === 404 &&
+            err.code === "resource_missing"
+          ) {
+            logger.warn(
+              { subscriptionId: subscription.id, organizationId },
+              "Subscription already deleted, skipping cancel"
+            );
+            return;
+          }
+          throw err;
+        }
+      })
     );
     return;
   }

apps/web/modules/ee/contacts/lib/contacts.ts

@@ -98,6 +98,7 @@ const selectContact = {
   createdAt: true,
   updatedAt: true,
   environmentId: true,
+  projectId: true,
   attributes: {
     select: {
       value: true,

apps/web/modules/ee/contacts/segments/components/create-segment-modal.tsx

@@ -45,6 +45,7 @@ export function CreateSegmentModal({
     isPrivate: false,
     filters: [],
     environmentId,
+    projectId: null,
     id: "",
     surveys: [],
     createdAt: new Date(),

apps/web/modules/ee/contacts/segments/lib/segments.ts

@@ -55,6 +55,7 @@ export const selectSegment = {
   title: true,
   description: true,
   environmentId: true,
+  projectId: true,
   filters: true,
   isPrivate: true,
   surveys: {

apps/web/modules/integrations/webhooks/components/webhook-table.tsx

@@ -27,6 +27,7 @@ export const WebhookTable = ({
   const { t } = useTranslation();
   const [activeWebhook, setActiveWebhook] = useState<Webhook>({
     environmentId: environment.id,
+    projectId: null,
     id: "",
     name: "",
     url: "",

apps/web/modules/survey/editor/components/how-to-send-card.tsx

@@ -49,6 +49,7 @@ export const HowToSendCard = ({ localSurvey, setLocalSurvey, environment }: HowT
         isPrivate: true,
         title: localSurvey.id,
         environmentId: environment.id,
+        projectId: null,
         surveys: [localSurvey.id],
         filters: [],
         createdAt: new Date(),

apps/web/modules/survey/lib/survey.ts

@@ -14,6 +14,7 @@ export const selectSurvey = {
   name: true,
   type: true,
   environmentId: true,
+  projectId: true,
   createdBy: true,
   status: true,
   welcomeCard: true,
@@ -69,6 +70,7 @@ export const selectSurvey = {
           createdAt: true,
           updatedAt: true,
           environmentId: true,
+          projectId: true,
           name: true,
           description: true,
           type: true,
@@ -84,6 +86,7 @@ export const selectSurvey = {
       createdAt: true,
       updatedAt: true,
       environmentId: true,
+      projectId: true,
       title: true,
       description: true,
       isPrivate: true,

apps/web/modules/survey/list/lib/survey-record.ts

@@ -15,6 +15,7 @@ export const surveySelect = {
   status: true,
   singleUse: true,
   environmentId: true,
+  projectId: true,
   _count: {
     select: { responses: true },
   },

apps/web/modules/survey/templates/lib/minimal-survey.ts

@@ -9,6 +9,7 @@ export const getMinimalSurvey = (t: TFunction): TSurvey => ({
   name: "Minimal Survey",
   type: "app",
   environmentId: "someEnvId1",
+  projectId: null,
   createdBy: null,
   status: "draft",
   displayOption: "displayOnce",

apps/web/modules/ui/components/button/index.tsx

@@ -42,14 +42,14 @@ export interface ButtonProps
 }
 
 const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(
-  ({ className, variant, size, loading, asChild = false, children, ...props }, ref) => {
+  ({ className, variant, size, loading, asChild = false, disabled, children, ...props }, ref) => {
     const Comp = asChild ? Slot : "button";
     return (
       <Comp
         className={cn(buttonVariants({ variant, size, loading, className }))}
-        disabled={loading}
         ref={ref}
-        {...props}>
+        {...props}
+        disabled={loading || disabled}>
         {loading ? (
           <>
             <Loader2 className="animate-spin" />

charts/formbricks/README.md

@@ -1,6 +1,6 @@
 # formbricks
 
-![Version: 0.0.0-dev](https://img.shields.io/badge/Version-0.0.0--dev-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
+![Version: 0.0.0-dev](https://img.shields.io/badge/Version-0.0.0--dev-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.7.0](https://img.shields.io/badge/AppVersion-3.7.0-informational?style=flat-square)
 
 A Helm chart for Formbricks with PostgreSQL, Redis
 
@@ -8,150 +8,178 @@ A Helm chart for Formbricks with PostgreSQL, Redis
 
 ## Maintainers
 
-| Name       | Email                 | Url |
-| ---------- | --------------------- | --- |
-| Formbricks | <info@formbricks.com> |     |
+| Name | Email | Url |
+| ---- | ------ | --- |
+| Formbricks | <info@formbricks.com> |  |
 
 ## Requirements
 
-| Repository                               | Name       | Version |
-| ---------------------------------------- | ---------- | ------- |
+| Repository | Name | Version |
+|------------|------|---------|
 | oci://registry-1.docker.io/bitnamicharts | postgresql | 16.4.16 |
-| oci://registry-1.docker.io/bitnamicharts | redis      | 20.11.2 |
+| oci://registry-1.docker.io/bitnamicharts | redis | 20.11.2 |
 
 ## Values
 
-| Key                                                                | Type   | Default                           | Description |
-| ------------------------------------------------------------------ | ------ | --------------------------------- | ----------- |
-| autoscaling.additionalLabels                                       | object | `{}`                              |             |
-| autoscaling.annotations                                            | object | `{}`                              |             |
-| autoscaling.enabled                                                | bool   | `true`                            |             |
-| autoscaling.maxReplicas                                            | int    | `10`                              |             |
-| autoscaling.metrics[0].resource.name                               | string | `"cpu"`                           |             |
-| autoscaling.metrics[0].resource.target.averageUtilization          | int    | `60`                              |             |
-| autoscaling.metrics[0].resource.target.type                        | string | `"Utilization"`                   |             |
-| autoscaling.metrics[0].type                                        | string | `"Resource"`                      |             |
-| autoscaling.metrics[1].resource.name                               | string | `"memory"`                        |             |
-| autoscaling.metrics[1].resource.target.averageUtilization          | int    | `60`                              |             |
-| autoscaling.metrics[1].resource.target.type                        | string | `"Utilization"`                   |             |
-| autoscaling.metrics[1].type                                        | string | `"Resource"`                      |             |
-| autoscaling.minReplicas                                            | int    | `1`                               |             |
-| componentOverride                                                  | string | `""`                              |             |
-| cronJob.enabled                                                    | bool   | `false`                           |             |
-| cronJob.jobs                                                       | object | `{}`                              |             |
-| deployment.additionalLabels                                        | object | `{}`                              |             |
-| deployment.additionalPodAnnotations                                | object | `{}`                              |             |
-| deployment.additionalPodLabels                                     | object | `{}`                              |             |
-| deployment.affinity                                                | object | `{}`                              |             |
-| deployment.annotations                                             | object | `{}`                              |             |
-| deployment.args                                                    | list   | `[]`                              |             |
-| deployment.command                                                 | list   | `[]`                              |             |
-| deployment.containerSecurityContext.readOnlyRootFilesystem         | bool   | `true`                            |             |
-| deployment.containerSecurityContext.runAsNonRoot                   | bool   | `true`                            |             |
-| deployment.env.EMAIL_VERIFICATION_DISABLED.value                   | string | `"1"`                             |             |
-| deployment.env.PASSWORD_RESET_DISABLED.value                       | string | `"1"`                             |             |
-| deployment.envFrom                                                 | string | `nil`                             |             |
-| deployment.image.digest                                            | string | `""`                              |             |
-| deployment.image.pullPolicy                                        | string | `"IfNotPresent"`                  |             |
-| deployment.image.repository                                        | string | `"ghcr.io/formbricks/formbricks"` |             |
-| deployment.imagePullSecrets                                        | string | `""`                              |             |
-| deployment.nodeSelector                                            | object | `{}`                              |             |
-| deployment.ports.http.containerPort                                | int    | `3000`                            |             |
-| deployment.ports.http.exposed                                      | bool   | `true`                            |             |
-| deployment.ports.http.protocol                                     | string | `"TCP"`                           |             |
-| deployment.ports.metrics.containerPort                             | int    | `9464`                            |             |
-| deployment.ports.metrics.exposed                                   | bool   | `true`                            |             |
-| deployment.ports.metrics.protocol                                  | string | `"TCP"`                           |             |
-| deployment.probes.livenessProbe.failureThreshold                   | int    | `5`                               |             |
-| deployment.probes.livenessProbe.httpGet.path                       | string | `"/health"`                       |             |
-| deployment.probes.livenessProbe.httpGet.port                       | int    | `3000`                            |             |
-| deployment.probes.livenessProbe.initialDelaySeconds                | int    | `10`                              |             |
-| deployment.probes.livenessProbe.periodSeconds                      | int    | `10`                              |             |
-| deployment.probes.livenessProbe.successThreshold                   | int    | `1`                               |             |
-| deployment.probes.livenessProbe.timeoutSeconds                     | int    | `5`                               |             |
-| deployment.probes.readinessProbe.failureThreshold                  | int    | `5`                               |             |
-| deployment.probes.readinessProbe.httpGet.path                      | string | `"/health"`                       |             |
-| deployment.probes.readinessProbe.httpGet.port                      | int    | `3000`                            |             |
-| deployment.probes.readinessProbe.initialDelaySeconds               | int    | `10`                              |             |
-| deployment.probes.readinessProbe.periodSeconds                     | int    | `10`                              |             |
-| deployment.probes.readinessProbe.successThreshold                  | int    | `1`                               |             |
-| deployment.probes.readinessProbe.timeoutSeconds                    | int    | `5`                               |             |
-| deployment.probes.startupProbe.failureThreshold                    | int    | `30`                              |             |
-| deployment.probes.startupProbe.periodSeconds                       | int    | `10`                              |             |
-| deployment.probes.startupProbe.tcpSocket.port                      | int    | `3000`                            |             |
-| deployment.reloadOnChange                                          | bool   | `false`                           |             |
-| deployment.replicas                                                | int    | `1`                               |             |
-| deployment.resources.limits.memory                                 | string | `"2Gi"`                           |             |
-| deployment.resources.requests.cpu                                  | string | `"1"`                             |             |
-| deployment.resources.requests.memory                               | string | `"1Gi"`                           |             |
-| deployment.revisionHistoryLimit                                    | int    | `2`                               |             |
-| deployment.securityContext                                         | object | `{}`                              |             |
-| deployment.strategy.type                                           | string | `"RollingUpdate"`                 |             |
-| deployment.tolerations                                             | list   | `[]`                              |             |
-| deployment.topologySpreadConstraints                               | list   | `[]`                              |             |
-| enterprise.enabled                                                 | bool   | `false`                           |             |
-| enterprise.licenseKey                                              | string | `""`                              |             |
-| externalSecret.enabled                                             | bool   | `false`                           |             |
-| externalSecret.files                                               | object | `{}`                              |             |
-| externalSecret.refreshInterval                                     | string | `"1h"`                            |             |
-| externalSecret.secretStore.kind                                    | string | `"ClusterSecretStore"`            |             |
-| externalSecret.secretStore.name                                    | string | `"aws-secrets-manager"`           |             |
-| ingress.annotations                                                | object | `{}`                              |             |
-| ingress.enabled                                                    | bool   | `false`                           |             |
-| ingress.hosts[0].host                                              | string | `"k8s.formbricks.com"`            |             |
-| ingress.hosts[0].paths[0].path                                     | string | `"/"`                             |             |
-| ingress.hosts[0].paths[0].pathType                                 | string | `"Prefix"`                        |             |
-| ingress.hosts[0].paths[0].serviceName                              | string | `"formbricks"`                    |             |
-| ingress.ingressClassName                                           | string | `"alb"`                           |             |
-| nameOverride                                                       | string | `""`                              |             |
-| partOfOverride                                                     | string | `""`                              |             |
-| postgresql.auth.database                                           | string | `"formbricks"`                    |             |
-| postgresql.auth.existingSecret                                     | string | `"formbricks-app-secrets"`        |             |
-| postgresql.auth.secretKeys.adminPasswordKey                        | string | `"POSTGRES_ADMIN_PASSWORD"`       |             |
-| postgresql.auth.secretKeys.userPasswordKey                         | string | `"POSTGRES_USER_PASSWORD"`        |             |
-| postgresql.auth.username                                           | string | `"formbricks"`                    |             |
-| postgresql.enabled                                                 | bool   | `true`                            |             |
-| postgresql.externalDatabaseUrl                                     | string | `""`                              |             |
-| postgresql.fullnameOverride                                        | string | `"formbricks-postgresql"`         |             |
-| postgresql.global.security.allowInsecureImages                     | bool   | `true`                            |             |
-| postgresql.image.repository                                        | string | `"pgvector/pgvector"`             |             |
-| postgresql.image.tag                                               | string | `"0.8.0-pg17"`                    |             |
-| postgresql.primary.containerSecurityContext.enabled                | bool   | `true`                            |             |
-| postgresql.primary.containerSecurityContext.readOnlyRootFilesystem | bool   | `false`                           |             |
-| postgresql.primary.containerSecurityContext.runAsUser              | int    | `1001`                            |             |
-| postgresql.primary.networkPolicy.enabled                           | bool   | `false`                           |             |
-| postgresql.primary.persistence.enabled                             | bool   | `true`                            |             |
-| postgresql.primary.persistence.size                                | string | `"10Gi"`                          |             |
-| postgresql.primary.podSecurityContext.enabled                      | bool   | `true`                            |             |
-| postgresql.primary.podSecurityContext.fsGroup                      | int    | `1001`                            |             |
-| postgresql.primary.podSecurityContext.runAsUser                    | int    | `1001`                            |             |
-| rbac.enabled                                                       | bool   | `false`                           |             |
-| rbac.serviceAccount.additionalLabels                               | object | `{}`                              |             |
-| rbac.serviceAccount.annotations                                    | object | `{}`                              |             |
-| rbac.serviceAccount.enabled                                        | bool   | `false`                           |             |
-| rbac.serviceAccount.name                                           | string | `""`                              |             |
-| redis.architecture                                                 | string | `"standalone"`                    |             |
-| redis.auth.enabled                                                 | bool   | `true`                            |             |
-| redis.auth.existingSecret                                          | string | `"formbricks-app-secrets"`        |             |
-| redis.auth.existingSecretPasswordKey                               | string | `"REDIS_PASSWORD"`                |             |
-| redis.enabled                                                      | bool   | `true`                            |             |
-| redis.externalRedisUrl                                             | string | `""`                              |             |
-| redis.fullnameOverride                                             | string | `"formbricks-redis"`              |             |
-| redis.master.persistence.enabled                                   | bool   | `true`                            |             |
-| redis.networkPolicy.enabled                                        | bool   | `false`                           |             |
-| secret.enabled                                                     | bool   | `true`                            |             |
-| service.additionalLabels                                           | object | `{}`                              |             |
-| service.annotations                                                | object | `{}`                              |             |
-| service.enabled                                                    | bool   | `true`                            |             |
-| service.ports                                                      | list   | `[]`                              |             |
-| service.type                                                       | string | `"ClusterIP"`                     |             |
-| serviceMonitor.additionalLabels                                    | string | `nil`                             |             |
-| serviceMonitor.annotations                                         | string | `nil`                             |             |
-| serviceMonitor.enabled                                             | bool   | `true`                            |             |
-| serviceMonitor.endpoints[0].interval                               | string | `"5s"`                            |             |
-| serviceMonitor.endpoints[0].path                                   | string | `"/metrics"`                      |             |
-| serviceMonitor.endpoints[0].port                                   | string | `"metrics"`                       |             |
-
----
-
-Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2)
+| Key | Type | Default | Description |
+|-----|------|---------|-------------|
+| autoscaling.additionalLabels | object | `{}` |  |
+| autoscaling.annotations | object | `{}` |  |
+| autoscaling.behavior.scaleDown.policies[0].periodSeconds | int | `120` |  |
+| autoscaling.behavior.scaleDown.policies[0].type | string | `"Pods"` |  |
+| autoscaling.behavior.scaleDown.policies[0].value | int | `1` |  |
+| autoscaling.behavior.scaleDown.stabilizationWindowSeconds | int | `300` |  |
+| autoscaling.behavior.scaleUp.policies[0].periodSeconds | int | `60` |  |
+| autoscaling.behavior.scaleUp.policies[0].type | string | `"Pods"` |  |
+| autoscaling.behavior.scaleUp.policies[0].value | int | `2` |  |
+| autoscaling.behavior.scaleUp.stabilizationWindowSeconds | int | `60` |  |
+| autoscaling.enabled | bool | `true` |  |
+| autoscaling.maxReplicas | int | `10` |  |
+| autoscaling.metrics[0].resource.name | string | `"cpu"` |  |
+| autoscaling.metrics[0].resource.target.averageUtilization | int | `60` |  |
+| autoscaling.metrics[0].resource.target.type | string | `"Utilization"` |  |
+| autoscaling.metrics[0].type | string | `"Resource"` |  |
+| autoscaling.metrics[1].resource.name | string | `"memory"` |  |
+| autoscaling.metrics[1].resource.target.averageUtilization | int | `60` |  |
+| autoscaling.metrics[1].resource.target.type | string | `"Utilization"` |  |
+| autoscaling.metrics[1].type | string | `"Resource"` |  |
+| autoscaling.minReplicas | int | `1` |  |
+| componentOverride | string | `""` |  |
+| deployment.additionalLabels | object | `{}` |  |
+| deployment.additionalPodAnnotations | object | `{}` |  |
+| deployment.additionalPodLabels | object | `{}` |  |
+| deployment.affinity | object | `{}` |  |
+| deployment.annotations | object | `{}` |  |
+| deployment.args | list | `[]` |  |
+| deployment.command | list | `[]` |  |
+| deployment.containerSecurityContext.readOnlyRootFilesystem | bool | `true` |  |
+| deployment.containerSecurityContext.runAsNonRoot | bool | `true` |  |
+| deployment.env | object | `{}` |  |
+| deployment.envFrom | string | `nil` |  |
+| deployment.image.digest | string | `""` |  |
+| deployment.image.pullPolicy | string | `"IfNotPresent"` |  |
+| deployment.image.repository | string | `"ghcr.io/formbricks/formbricks"` |  |
+| deployment.image.tag | string | `""` |  |
+| deployment.imagePullSecrets | string | `""` |  |
+| deployment.nodeSelector | object | `{}` |  |
+| deployment.ports.http.containerPort | int | `3000` |  |
+| deployment.ports.http.exposed | bool | `true` |  |
+| deployment.ports.http.protocol | string | `"TCP"` |  |
+| deployment.ports.metrics.containerPort | int | `9464` |  |
+| deployment.ports.metrics.exposed | bool | `true` |  |
+| deployment.ports.metrics.protocol | string | `"TCP"` |  |
+| deployment.probes.livenessProbe.failureThreshold | int | `5` |  |
+| deployment.probes.livenessProbe.httpGet.path | string | `"/health"` |  |
+| deployment.probes.livenessProbe.httpGet.port | int | `3000` |  |
+| deployment.probes.livenessProbe.initialDelaySeconds | int | `10` |  |
+| deployment.probes.livenessProbe.periodSeconds | int | `10` |  |
+| deployment.probes.livenessProbe.successThreshold | int | `1` |  |
+| deployment.probes.livenessProbe.timeoutSeconds | int | `5` |  |
+| deployment.probes.readinessProbe.failureThreshold | int | `5` |  |
+| deployment.probes.readinessProbe.httpGet.path | string | `"/health"` |  |
+| deployment.probes.readinessProbe.httpGet.port | int | `3000` |  |
+| deployment.probes.readinessProbe.initialDelaySeconds | int | `10` |  |
+| deployment.probes.readinessProbe.periodSeconds | int | `10` |  |
+| deployment.probes.readinessProbe.successThreshold | int | `1` |  |
+| deployment.probes.readinessProbe.timeoutSeconds | int | `5` |  |
+| deployment.probes.startupProbe.failureThreshold | int | `30` |  |
+| deployment.probes.startupProbe.periodSeconds | int | `10` |  |
+| deployment.probes.startupProbe.tcpSocket.port | int | `3000` |  |
+| deployment.reloadOnChange | bool | `false` |  |
+| deployment.replicas | int | `1` |  |
+| deployment.resources.limits.memory | string | `"2Gi"` |  |
+| deployment.resources.requests.cpu | string | `"1"` |  |
+| deployment.resources.requests.memory | string | `"1Gi"` |  |
+| deployment.revisionHistoryLimit | int | `2` |  |
+| deployment.securityContext | object | `{}` |  |
+| deployment.strategy.type | string | `"RollingUpdate"` |  |
+| deployment.tolerations | list | `[]` |  |
+| deployment.topologySpreadConstraints | list | `[]` |  |
+| enterprise.enabled | bool | `false` |  |
+| enterprise.licenseKey | string | `""` |  |
+| externalSecret.enabled | bool | `false` |  |
+| externalSecret.files | object | `{}` |  |
+| externalSecret.refreshInterval | string | `"1h"` |  |
+| externalSecret.secretStore.kind | string | `"ClusterSecretStore"` |  |
+| externalSecret.secretStore.name | string | `"aws-secrets-manager"` |  |
+| formbricks.publicUrl | string | `""` |  |
+| formbricks.webappUrl | string | `""` |  |
+| hub.enabled | bool | `true` |  |
+| hub.env | object | `{}` |  |
+| hub.existingSecret | string | `""` |  |
+| hub.image.pullPolicy | string | `"IfNotPresent"` |  |
+| hub.image.repository | string | `"ghcr.io/formbricks/hub"` |  |
+| hub.image.tag | string | `"1.0.0"` |  |
+| hub.migration.activeDeadlineSeconds | int | `900` |  |
+| hub.migration.backoffLimit | int | `3` |  |
+| hub.migration.ttlSecondsAfterFinished | int | `300` |  |
+| hub.replicas | int | `1` |  |
+| hub.resources.limits.memory | string | `"512Mi"` |  |
+| hub.resources.requests.cpu | string | `"100m"` |  |
+| hub.resources.requests.memory | string | `"256Mi"` |  |
+| ingress.annotations | object | `{}` |  |
+| ingress.enabled | bool | `false` |  |
+| ingress.hosts[0].host | string | `"k8s.formbricks.com"` |  |
+| ingress.hosts[0].paths[0].path | string | `"/"` |  |
+| ingress.hosts[0].paths[0].pathType | string | `"Prefix"` |  |
+| ingress.hosts[0].paths[0].serviceName | string | `"formbricks"` |  |
+| ingress.ingressClassName | string | `"alb"` |  |
+| migration.annotations | object | `{}` |  |
+| migration.backoffLimit | int | `3` |  |
+| migration.enabled | bool | `true` |  |
+| migration.resources.limits.memory | string | `"512Mi"` |  |
+| migration.resources.requests.cpu | string | `"100m"` |  |
+| migration.resources.requests.memory | string | `"256Mi"` |  |
+| migration.ttlSecondsAfterFinished | int | `300` |  |
+| nameOverride | string | `""` |  |
+| partOfOverride | string | `""` |  |
+| pdb.additionalLabels | object | `{}` |  |
+| pdb.annotations | object | `{}` |  |
+| pdb.enabled | bool | `true` |  |
+| pdb.minAvailable | int | `1` |  |
+| postgresql.auth.database | string | `"formbricks"` |  |
+| postgresql.auth.existingSecret | string | `"formbricks-app-secrets"` |  |
+| postgresql.auth.secretKeys.adminPasswordKey | string | `"POSTGRES_ADMIN_PASSWORD"` |  |
+| postgresql.auth.secretKeys.userPasswordKey | string | `"POSTGRES_USER_PASSWORD"` |  |
+| postgresql.auth.username | string | `"formbricks"` |  |
+| postgresql.enabled | bool | `true` |  |
+| postgresql.externalDatabaseUrl | string | `""` |  |
+| postgresql.fullnameOverride | string | `"formbricks-postgresql"` |  |
+| postgresql.global.security.allowInsecureImages | bool | `true` |  |
+| postgresql.image.repository | string | `"pgvector/pgvector"` |  |
+| postgresql.image.tag | string | `"pg17"` |  |
+| postgresql.primary.containerSecurityContext.enabled | bool | `true` |  |
+| postgresql.primary.containerSecurityContext.readOnlyRootFilesystem | bool | `false` |  |
+| postgresql.primary.containerSecurityContext.runAsUser | int | `1001` |  |
+| postgresql.primary.networkPolicy.enabled | bool | `false` |  |
+| postgresql.primary.persistence.enabled | bool | `true` |  |
+| postgresql.primary.persistence.size | string | `"10Gi"` |  |
+| postgresql.primary.podSecurityContext.enabled | bool | `true` |  |
+| postgresql.primary.podSecurityContext.fsGroup | int | `1001` |  |
+| postgresql.primary.podSecurityContext.runAsUser | int | `1001` |  |
+| rbac.enabled | bool | `false` |  |
+| rbac.serviceAccount.additionalLabels | object | `{}` |  |
+| rbac.serviceAccount.annotations | object | `{}` |  |
+| rbac.serviceAccount.enabled | bool | `false` |  |
+| rbac.serviceAccount.name | string | `""` |  |
+| redis.architecture | string | `"standalone"` |  |
+| redis.auth.enabled | bool | `true` |  |
+| redis.auth.existingSecret | string | `"formbricks-app-secrets"` |  |
+| redis.auth.existingSecretPasswordKey | string | `"REDIS_PASSWORD"` |  |
+| redis.enabled | bool | `true` |  |
+| redis.externalRedisUrl | string | `""` |  |
+| redis.fullnameOverride | string | `"formbricks-redis"` |  |
+| redis.master.persistence.enabled | bool | `true` |  |
+| redis.networkPolicy.enabled | bool | `false` |  |
+| secret.enabled | bool | `true` |  |
+| service.additionalLabels | object | `{}` |  |
+| service.annotations | object | `{}` |  |
+| service.enabled | bool | `true` |  |
+| service.ports | list | `[]` |  |
+| service.type | string | `"ClusterIP"` |  |
+| serviceMonitor.additionalLabels | string | `nil` |  |
+| serviceMonitor.annotations | string | `nil` |  |
+| serviceMonitor.enabled | bool | `true` |  |
+| serviceMonitor.endpoints[0].interval | string | `"5s"` |  |
+| serviceMonitor.endpoints[0].path | string | `"/metrics"` |  |
+| serviceMonitor.endpoints[0].port | string | `"metrics"` |  |

charts/formbricks/templates/_helpers.tpl

@@ -8,6 +8,15 @@ It also truncates the name to a maximum of 63 characters and removes trailing hy
 {{- end }}
 
 
+{{/*
+Hub resource name: base name truncated to 59 chars then "-hub" so the suffix is never lost (63 char limit).
+*/}}
+{{- define "formbricks.hubname" -}}
+{{- $base := include "formbricks.name" . | trunc 59 | trimSuffix "-" }}
+{{- printf "%s-hub" $base | trimSuffix "-" }}
+{{- end }}
+
+
 {{/*
 Define the application version to be used in labels.
 The version is taken from `.Values.deployment.image.tag` if provided, otherwise it defaults to `.Chart.Version`.
@@ -85,9 +94,17 @@ If `namespaceOverride` is provided, it will be used; otherwise, it defaults to `
 {{- default .Release.Namespace .Values.namespaceOverride -}}
 {{- end -}}
 
+{{- define "formbricks.appSecretName" -}}
+{{- printf "%s-app-secrets" (include "formbricks.name" .) -}}
+{{- end }}
+
+{{- define "formbricks.hubSecretName" -}}
+{{- default (include "formbricks.appSecretName" .) .Values.hub.existingSecret -}}
+{{- end }}
+
 
 {{- define "formbricks.postgresAdminPassword" -}}
-{{- $secret := (lookup "v1" "Secret" .Release.Namespace (printf "%s-app-secrets" (include "formbricks.name" .))) }}
+{{- $secret := (lookup "v1" "Secret" .Release.Namespace (include "formbricks.appSecretName" .)) }}
 {{- if and $secret (index $secret.data "POSTGRES_ADMIN_PASSWORD") }}
     {{- index $secret.data "POSTGRES_ADMIN_PASSWORD" | b64dec -}}
 {{- else }}
@@ -96,7 +113,7 @@ If `namespaceOverride` is provided, it will be used; otherwise, it defaults to `
 {{- end }}
 
 {{- define "formbricks.postgresUserPassword" -}}
-{{- $secret := (lookup "v1" "Secret" .Release.Namespace (printf "%s-app-secrets" (include "formbricks.name" .))) }}
+{{- $secret := (lookup "v1" "Secret" .Release.Namespace (include "formbricks.appSecretName" .)) }}
 {{- if and $secret (index $secret.data "POSTGRES_USER_PASSWORD") }}
     {{- index $secret.data "POSTGRES_USER_PASSWORD" | b64dec -}}
 {{- else }}
@@ -105,7 +122,7 @@ If `namespaceOverride` is provided, it will be used; otherwise, it defaults to `
 {{- end }}
 
 {{- define "formbricks.redisPassword" -}}
-{{- $secret := (lookup "v1" "Secret" .Release.Namespace (printf "%s-app-secrets" (include "formbricks.name" .))) }}
+{{- $secret := (lookup "v1" "Secret" .Release.Namespace (include "formbricks.appSecretName" .)) }}
 {{- if and $secret (index $secret.data "REDIS_PASSWORD") }}
     {{- index $secret.data "REDIS_PASSWORD" | b64dec -}}
 {{- else }}
@@ -114,7 +131,7 @@ If `namespaceOverride` is provided, it will be used; otherwise, it defaults to `
 {{- end }}
 
 {{- define "formbricks.cronSecret" -}}	
-{{- $secret := (lookup "v1" "Secret" .Release.Namespace (printf "%s-app-secrets" (include "formbricks.name" .))) }}	
+{{- $secret := (lookup "v1" "Secret" .Release.Namespace (include "formbricks.appSecretName" .)) }}	
 {{- if $secret }}	
     {{- index $secret.data "CRON_SECRET" | b64dec -}}	
 {{- else }}	
@@ -123,7 +140,7 @@ If `namespaceOverride` is provided, it will be used; otherwise, it defaults to `
 {{- end }}
 
 {{- define "formbricks.encryptionKey" -}}
-{{- $secret := (lookup "v1" "Secret" .Release.Namespace (printf "%s-app-secrets" (include "formbricks.name" .))) }}
+{{- $secret := (lookup "v1" "Secret" .Release.Namespace (include "formbricks.appSecretName" .)) }}
 {{- if $secret }}
     {{- index $secret.data "ENCRYPTION_KEY" | b64dec -}}
 {{- else }}
@@ -132,10 +149,19 @@ If `namespaceOverride` is provided, it will be used; otherwise, it defaults to `
 {{- end }}
 
 {{- define "formbricks.nextAuthSecret" -}}
-{{- $secret := (lookup "v1" "Secret" .Release.Namespace (printf "%s-app-secrets" (include "formbricks.name" .))) }}
+{{- $secret := (lookup "v1" "Secret" .Release.Namespace (include "formbricks.appSecretName" .)) }}
 {{- if $secret }}
     {{- index $secret.data "NEXTAUTH_SECRET" | b64dec -}}
 {{- else }}
     {{- randAlphaNum 32 -}}
 {{- end -}}
 {{- end }}
+
+{{- define "formbricks.hubApiKey" -}}
+{{- $secret := (lookup "v1" "Secret" .Release.Namespace (include "formbricks.appSecretName" .)) }}
+{{- if and $secret (index $secret.data "HUB_API_KEY") }}
+    {{- index $secret.data "HUB_API_KEY" | b64dec -}}
+{{- else }}
+    {{- randAlphaNum 32 -}}
+{{- end -}}
+{{- end }}

charts/formbricks/templates/deployment.yaml

@@ -131,6 +131,10 @@ spec:
             - name: SKIP_STARTUP_MIGRATION
               value: "true"
             {{- end }}
+            {{- if not (hasKey .Values.deployment.env "HUB_API_URL") }}
+            - name: HUB_API_URL
+              value: "http://{{ include "formbricks.hubname" . }}:8080"
+            {{- end }}
             {{- range $key, $value := .Values.deployment.env }}
             - name: {{ include "formbricks.tplvalues.render" ( dict "value" $key "context" $ ) }}
               {{- if kindIs "string" $value }}

charts/formbricks/templates/hub-deployment.yaml

@@ -0,0 +1,100 @@
+{{- if not .Values.hub.enabled }}
+{{- fail "hub.enabled=false is not supported in Formbricks 5; Hub is mandatory." }}
+{{- end }}
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "formbricks.hubname" . }}
+  labels:
+    helm.sh/chart: {{ include "formbricks.chart" . }}
+    app.kubernetes.io/name: {{ include "formbricks.hubname" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/component: hub
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/part-of: {{ .Values.partOfOverride | default (include "formbricks.name" .) }}
+spec:
+  replicas: {{ .Values.hub.replicas | default 1 }}
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: {{ include "formbricks.hubname" . }}
+      app.kubernetes.io/instance: {{ .Release.Name }}
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/name: {{ include "formbricks.hubname" . }}
+        app.kubernetes.io/instance: {{ .Release.Name }}
+        app.kubernetes.io/component: hub
+    spec:
+      {{- if .Values.deployment.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml .Values.deployment.imagePullSecrets | nindent 8 }}
+      {{- end }}
+      initContainers:
+        - name: hub-migrate
+          image: {{ .Values.hub.image.repository }}:{{ .Values.hub.image.tag | default "latest" }}
+          imagePullPolicy: {{ .Values.hub.image.pullPolicy }}
+          securityContext:
+            readOnlyRootFilesystem: true
+            runAsNonRoot: true
+          command:
+            - sh
+            - -c
+            - |
+              /usr/local/bin/goose -dir /app/migrations postgres "$DATABASE_URL" up && \
+              /usr/local/bin/river migrate-up --database-url "$DATABASE_URL"
+          envFrom:
+            - secretRef:
+                name: {{ include "formbricks.hubSecretName" . }}
+      containers:
+        - name: hub
+          image: {{ .Values.hub.image.repository }}:{{ .Values.hub.image.tag | default "latest" }}
+          imagePullPolicy: {{ .Values.hub.image.pullPolicy }}
+          securityContext:
+            readOnlyRootFilesystem: true
+            runAsNonRoot: true
+          ports:
+            - name: http
+              containerPort: 8080
+              protocol: TCP
+          envFrom:
+            - secretRef:
+                name: {{ include "formbricks.hubSecretName" . }}
+          env:
+            - name: API_KEY
+              valueFrom:
+                secretKeyRef:
+                  name: {{ include "formbricks.hubSecretName" . }}
+                  key: HUB_API_KEY
+            {{- range $key, $value := .Values.hub.env }}
+            - name: {{ $key }}
+              value: {{ $value | quote }}
+            {{- end }}
+          {{- if .Values.hub.resources }}
+          resources:
+            {{- toYaml .Values.hub.resources | nindent 12 }}
+          {{- end }}
+          readinessProbe:
+            httpGet:
+              path: /health
+              port: 8080
+            initialDelaySeconds: 10
+            periodSeconds: 10
+            failureThreshold: 5
+            timeoutSeconds: 5
+            successThreshold: 1
+          livenessProbe:
+            httpGet:
+              path: /health
+              port: 8080
+            initialDelaySeconds: 10
+            periodSeconds: 10
+            failureThreshold: 5
+            timeoutSeconds: 5
+            successThreshold: 1
+          startupProbe:
+            httpGet:
+              path: /health
+              port: 8080
+            failureThreshold: 30
+            periodSeconds: 10

charts/formbricks/templates/hub-migration-job.yaml

@@ -0,0 +1,54 @@
+{{- if not .Values.hub.enabled }}
+{{- fail "hub.enabled=false is not supported in Formbricks 5; Hub is mandatory." }}
+{{- end }}
+---
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: {{ include "formbricks.hubname" . }}-migration
+  labels:
+    helm.sh/chart: {{ include "formbricks.chart" . }}
+    app.kubernetes.io/name: {{ include "formbricks.hubname" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/component: hub-migration
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+  annotations:
+    helm.sh/hook: pre-upgrade
+    helm.sh/hook-weight: "-5"
+    helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
+spec:
+  ttlSecondsAfterFinished: {{ .Values.hub.migration.ttlSecondsAfterFinished | default 300 }}
+  backoffLimit: {{ .Values.hub.migration.backoffLimit | default 3 }}
+  activeDeadlineSeconds: {{ .Values.hub.migration.activeDeadlineSeconds | default 900 }}
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/name: {{ include "formbricks.hubname" . }}
+        app.kubernetes.io/instance: {{ .Release.Name }}
+        app.kubernetes.io/component: hub-migration
+    spec:
+      restartPolicy: Never
+      securityContext:
+        runAsNonRoot: true
+        runAsUser: 1000
+      {{- if .Values.deployment.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml .Values.deployment.imagePullSecrets | nindent 8 }}
+      {{- end }}
+      containers:
+        - name: hub-migrate
+          image: {{ .Values.hub.image.repository }}:{{ .Values.hub.image.tag | default "latest" }}
+          imagePullPolicy: {{ .Values.hub.image.pullPolicy }}
+          securityContext:
+            readOnlyRootFilesystem: true
+            capabilities:
+              drop: ["ALL"]
+          command:
+            - sh
+            - -c
+            - |
+              /usr/local/bin/goose -dir /app/migrations postgres "$DATABASE_URL" up && \
+              /usr/local/bin/river migrate-up --database-url "$DATABASE_URL"
+          envFrom:
+            - secretRef:
+                name: {{ include "formbricks.hubSecretName" . }}

charts/formbricks/templates/hub-service.yaml

@@ -0,0 +1,25 @@
+{{- if not .Values.hub.enabled }}
+{{- fail "hub.enabled=false is not supported in Formbricks 5; Hub is mandatory." }}
+{{- end }}
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "formbricks.hubname" . }}
+  labels:
+    helm.sh/chart: {{ include "formbricks.chart" . }}
+    app.kubernetes.io/name: {{ include "formbricks.hubname" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/component: hub
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/part-of: {{ .Values.partOfOverride | default (include "formbricks.name" .) }}
+spec:
+  type: ClusterIP
+  selector:
+    app.kubernetes.io/name: {{ include "formbricks.hubname" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+  ports:
+    - name: http
+      port: 8080
+      targetPort: 8080
+      protocol: TCP

charts/formbricks/templates/secrets.yaml

@@ -4,11 +4,13 @@
 {{- $postgresUserPassword := include "formbricks.postgresUserPassword" . }}
 {{- $redisPassword := include "formbricks.redisPassword" . }}
 {{- $webappUrl := required "formbricks.webappUrl is required. Set it to your Formbricks instance URL (e.g., https://formbricks.example.com)" .Values.formbricks.webappUrl }}
+{{- $hubApiKey := include "formbricks.hubApiKey" . }}
+{{- $includeHubApiKeyInAppSecret := or (not .Values.hub.existingSecret) (eq .Values.hub.existingSecret (include "formbricks.appSecretName" .)) }}
 ---
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ template "formbricks.name" . }}-app-secrets
+  name: {{ include "formbricks.appSecretName" . }}
   labels:
     {{- include "formbricks.labels" . | nindent 4 }}
 data:
@@ -28,6 +30,9 @@ data:
   {{- else }}
   DATABASE_URL: {{ .Values.postgresql.externalDatabaseUrl | b64enc }}
   {{- end }}
+  {{- if $includeHubApiKeyInAppSecret }}
+  HUB_API_KEY: {{ $hubApiKey | b64enc }}
+  {{- end }}
   CRON_SECRET: {{ include "formbricks.cronSecret" . | b64enc }}
   ENCRYPTION_KEY: {{ include "formbricks.encryptionKey" . | b64enc }}
   NEXTAUTH_SECRET: {{ include "formbricks.nextAuthSecret" . | b64enc }}

charts/formbricks/values.yaml

@@ -340,6 +340,43 @@ serviceMonitor:
       path: /metrics
       port: metrics
 
+##########################################################
+# Hub API Configuration
+# Formbricks Hub image: ghcr.io/formbricks/hub
+##########################################################
+hub:
+  # Hub is mandatory in Formbricks 5. Keep this enabled.
+  enabled: true
+  replicas: 1
+
+  image:
+    repository: "ghcr.io/formbricks/hub"
+    # Pin to a semver tag for reproducible deployments; update on each Hub release.
+    tag: "1.0.0"
+    pullPolicy: IfNotPresent
+
+  # Optional override for the secret Hub reads from.
+  # Defaults to the generated app secret (<release>-app-secrets), which contains DATABASE_URL and HUB_API_KEY.
+  # If you set this, the custom secret must provide DATABASE_URL and HUB_API_KEY.
+  existingSecret: ""
+
+  # Optional env vars (non-secret). Use existingSecret for secret values such as DATABASE_URL and HUB_API_KEY.
+  env: {}
+
+  # Upgrade migration job runs goose + river before Helm upgrades Hub resources.
+  # Fresh installs run the same migrations through the Hub deployment init container.
+  migration:
+    ttlSecondsAfterFinished: 300
+    backoffLimit: 3
+    activeDeadlineSeconds: 900
+
+  resources:
+    limits:
+      memory: 512Mi
+    requests:
+      memory: 256Mi
+      cpu: "100m"
+
 ##########################################################
 # PostgreSQL Configuration
 ##########################################################
@@ -352,7 +389,7 @@ postgresql:
   fullnameOverride: "formbricks-postgresql"
   image:
     repository: pgvector/pgvector
-    tag: 0.8.0-pg17
+    tag: pg17
   auth:
     username: formbricks
     database: formbricks

docker-compose.dev.yml

@@ -1,14 +1,24 @@
 services:
+  # PostgreSQL must load the vector library so Hub (and Formbricks) can use the pgvector extension.
   postgres:
-    image: pgvector/pgvector:pg17
+    image: pgvector/pgvector:pg18
     volumes:
-      - postgres:/var/lib/postgresql/data
+      - postgres:/var/lib/postgresql
     environment:
       - POSTGRES_DB=postgres
       - POSTGRES_USER=postgres
       - POSTGRES_PASSWORD=postgres
     ports:
       - 5432:5432
+    command: >
+      postgres
+      -c shared_preload_libraries=vector
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U postgres -d postgres || exit 1"]
+      interval: 5s
+      timeout: 3s
+      retries: 30
+      start_period: 10s
 
   mailhog:
     image: arjenz/mailhog
@@ -36,6 +46,40 @@ services:
     volumes:
       - minio-data:/data
 
+  # Run Hub DB migrations (goose + river) before the API starts. Idempotent; runs on every compose up.
+  hub-migrate:
+    image: ghcr.io/formbricks/hub:latest
+    restart: "no"
+    entrypoint: ["sh", "-c"]
+    command:
+      [
+        'if [ -x /usr/local/bin/goose ] && [ -x /usr/local/bin/river ]; then /usr/local/bin/goose -dir /app/migrations postgres "$$DATABASE_URL" up && /usr/local/bin/river migrate-up --database-url "$$DATABASE_URL"; else echo ''Migration tools (goose/river) not in image.''; exit 1; fi',
+      ]
+    environment:
+      DATABASE_URL: postgresql://postgres:postgres@postgres:5432/postgres?sslmode=disable
+    depends_on:
+      postgres:
+        condition: service_healthy
+
+  # Formbricks Hub API (ghcr.io/formbricks/hub). Shares the same Postgres database as Formbricks by default.
+  hub:
+    image: ghcr.io/formbricks/hub:latest
+    depends_on:
+      hub-migrate:
+        condition: service_completed_successfully
+    ports:
+      - "8080:8080"
+    environment:
+      API_KEY: ${HUB_API_KEY:-dev-api-key}
+      DATABASE_URL: postgresql://postgres:postgres@postgres:5432/postgres?sslmode=disable
+      # Explicit Postgres env so migrations and any libpq fallback use the service host, not localhost
+      PGHOST: postgres
+      PGPORT: "5432"
+      PGUSER: postgres
+      PGPASSWORD: postgres
+      PGDATABASE: postgres
+      PGSSLMODE: disable
+
 volumes:
   postgres:
     driver: local

docker/README.md

@@ -27,3 +27,13 @@ The script will prompt you for the following information:
 3. **Domain Name**: Enter the domain name that Traefik will use to create the SSL certificate and forward requests to Formbricks.
 
 That's it! After running the command and providing the required information, visit the domain name you entered, and you should see the Formbricks home wizard!
+
+## Formbricks Hub
+
+The stack includes the [Formbricks Hub](https://github.com/formbricks/hub) API (`ghcr.io/formbricks/hub`). Hub shares the same database as Formbricks by default.
+
+- **Migrations**: A `hub-migrate` service runs Hub's database migrations (goose + river) before the Hub API starts. It runs on every `docker compose up` and is idempotent.
+- **Production** (`docker/docker-compose.yml`): Set `HUB_API_KEY` (required). `HUB_API_URL` defaults to `http://hub:8080` so the Formbricks app can reach Hub inside the compose network. Override `HUB_DATABASE_URL` only if you want Hub to use a separate database.
+- **Development** (`docker-compose.dev.yml`): Hub uses the same Postgres database; `HUB_API_KEY` defaults to `dev-api-key` (override with `HUB_API_KEY`) and the local Hub URL is `http://localhost:8080`.
+
+In development, Hub is exposed locally on port **8080**. In production Docker Compose, Hub stays internal to the compose network and is reached via `http://hub:8080`.

docker/docker-compose.yml

@@ -29,6 +29,15 @@ x-environment: &environment
     # To use external Redis/Valkey: remove the redis service below and update this URL
     REDIS_URL: redis://redis:6379
 
+    # Formbricks Hub (port 8080): API key required. Use e.g. openssl rand -hex 32
+    HUB_API_KEY:
+
+    # Base URL the Formbricks app uses to reach Hub. Defaults to the internal Hub service.
+    HUB_API_URL: ${HUB_API_URL:-http://hub:8080}
+
+    # Hub database URL (optional). Default: same Postgres as Formbricks. Set only if Hub uses a separate DB.
+    # HUB_DATABASE_URL:
+
     # Set the minimum log level(debug, info, warn, error, fatal)
     # LOG_LEVEL: info
 
@@ -202,7 +211,7 @@ x-environment: &environment
 services:
   postgres:
     restart: always
-    image: pgvector/pgvector:pg17
+    image: pgvector/pgvector:pg18
     volumes:
       - postgres:/var/lib/postgresql/data
     environment:
@@ -245,6 +254,31 @@ services:
       - ./saml-connection:/home/nextjs/apps/web/saml-connection
     <<: *environment
 
+  # Run Hub DB migrations (goose + river) before the API starts. Uses same image; migrations are idempotent.
+  hub-migrate:
+    image: ghcr.io/formbricks/hub:latest
+    restart: "no"
+    entrypoint: ["sh", "-c"]
+    command: ["if [ -x /usr/local/bin/goose ] && [ -x /usr/local/bin/river ]; then /usr/local/bin/goose -dir /app/migrations postgres \"$$DATABASE_URL\" up && /usr/local/bin/river migrate-up --database-url \"$$DATABASE_URL\"; else echo 'Migration tools (goose/river) not in image.'; exit 1; fi"]
+    environment:
+      DATABASE_URL: ${HUB_DATABASE_URL:-postgresql://postgres:postgres@postgres:5432/formbricks?sslmode=disable}
+    depends_on:
+      postgres:
+        condition: service_healthy
+
+  # Formbricks Hub API (ghcr.io/formbricks/hub). Set HUB_API_KEY. By default shares the Formbricks database; set HUB_DATABASE_URL to use a separate DB.
+  hub:
+    restart: always
+    image: ghcr.io/formbricks/hub:latest
+    depends_on:
+      hub-migrate:
+        condition: service_completed_successfully
+      postgres:
+        condition: service_healthy
+    environment:
+      API_KEY: ${HUB_API_KEY:?HUB_API_KEY is required to run Hub}
+      DATABASE_URL: ${HUB_DATABASE_URL:-postgresql://postgres:postgres@postgres:5432/formbricks?sslmode=disable}
+
 volumes:
   postgres:
     driver: local

docs/deprecate-environments-plan.md

@@ -0,0 +1,275 @@
+# Plan: Deprecate Environments in Formbricks
+
+**Issue**: https://github.com/formbricks/internal/issues/1501
+
+## Context
+
+Formbricks currently has a 4-level hierarchy: **Organization → Project → Environment (prod/dev) → Resources**. The "Environment" layer adds complexity with minimal value — the only real difference between prod and dev is separate API keys and a UI badge. The UI already calls "Project" a "Workspace".
+
+**Goal**: Collapse the Environment layer so resources live directly under Project. The production environment merges into the workspace identity. Dev environments with data become separate new workspaces.
+
+**Key decisions**:
+- DB model stays as `Project` (no table rename)
+- SDK will accept `workspaceId` as new param, `environmentId` as deprecated alias
+- Dev environments with data get promoted to separate workspaces
+
+---
+
+## Current State
+
+```
+Organization
+  └── Project ("Workspace" in UI)
+        ├── Environment (production) ──→ surveys, contacts, webhooks, tags, ...
+        └── Environment (development) ──→ surveys, contacts, webhooks, tags, ...
+```
+
+Every project always has exactly 2 environments. The only differences between them:
+- Separate data (contacts, responses, attributes, integrations, webhooks, segments, etc.)
+- Separate API keys (`ApiKeyEnvironment` grants per-environment permissions)
+- A red warning banner in the dev UI, plus an environment switcher breadcrumb
+
+Key metrics:
+- **564 files** in `apps/web` reference `environmentId`
+- **52 files** in `packages` reference `environmentId`
+- **68+ route directories** under `/environments/[environmentId]/`
+- **22 API endpoint directories** keyed by `[environmentId]`
+- **8 resource tables** FK to Environment: `Survey`, `Contact`, `ActionClass`, `ContactAttributeKey`, `Webhook`, `Tag`, `Segment`, `Integration`
+- **SDK** requires `environmentId` to initialize, all client APIs use `/api/v1/client/[environmentId]/...`
+- **Storage** paths: `private/${environmentId}/${fileName}`
+
+---
+
+## Phase 1: Add `projectId` Column to All Environment-Owned Models (PR 1 — Small, Low Risk)
+
+Add an **optional** `projectId` column alongside the existing `environmentId` on every model that currently only references Environment.
+
+**Why**: Today, Survey has `environmentId` pointing to Environment, and you have to join through Environment to reach Project. We need Survey to point directly to Project. But we can't just switch the FK in one shot — that would break everything. So we add a new nullable `projectId` column alongside the existing `environmentId`. No code changes, no runtime impact. Just schema preparation.
+
+**Modify**: `packages/database/schema.prisma`
+- Add `projectId String?` + FK to Project + index to: `Survey`, `Contact`, `ActionClass`, `ContactAttributeKey`, `Webhook`, `Tag`, `Segment`, `Integration`
+- Add reverse relations on the `Project` model
+- New Prisma migration file
+
+No code changes. No runtime behavior change. All new columns are NULL.
+
+---
+
+## Phase 2: Backfill `projectId` (PR 2 — Small, Medium Risk)
+
+Data migration to populate `projectId` on every existing row.
+
+**Why**: The new `projectId` columns are all NULL. We need to populate them by joining through the Environment table: `Survey.environmentId → Environment.id → Environment.projectId`. After this, every row has both `environmentId` (old) and `projectId` (new) filled in, but the app still only reads `environmentId`.
+
+```sql
+UPDATE "Survey" s SET "projectId" = e."projectId"
+FROM "Environment" e WHERE s."environmentId" = e."id" AND s."projectId" IS NULL;
+-- Repeat for all 8 tables
+```
+
+**Create**: Migration script (idempotent — only updates rows where `projectId IS NULL`)
+
+App behavior unchanged. New columns now populated but not yet read.
+
+---
+
+## Phase 3: Dual-Write (PR 3 — Large, Medium Risk)
+
+All create/update operations write both `environmentId` AND `projectId`.
+
+**Why**: New rows created after the backfill would still have `projectId = NULL` because the app code doesn't know about the new column yet. We update every `prisma.survey.create(...)`, `prisma.contact.create(...)`, etc. to write both `environmentId` and `projectId`. Now every new row gets both values. Old code still reads `environmentId` — nothing breaks.
+
+**Key files to modify**:
+- `apps/web/lib/survey/service.ts` — `createSurvey`
+- `apps/web/lib/environment/service.ts` — `createEnvironment` (creates default ContactAttributeKeys)
+- `apps/web/modules/projects/settings/lib/project.ts` — `createProject`
+- `apps/web/modules/survey/list/lib/survey.ts` — `copySurveyToOtherEnvironment`
+- `apps/web/modules/survey/components/template-list/lib/survey.ts` — `createSurvey`
+- `apps/web/lib/actionClass/service.ts` — `createActionClass`
+- `apps/web/modules/survey/editor/lib/action-class.ts` — `createActionClass`
+- `apps/web/modules/ee/contacts/lib/contacts.ts` — `processCsvRecord`, `createMissingAttributeKeys`
+- `apps/web/modules/ee/contacts/api/v2/management/contacts/lib/contact.ts` — `createContact`
+- `apps/web/app/api/v1/client/[environmentId]/displays/lib/display.ts` — `createDisplay` (creates contacts)
+- `apps/web/modules/ee/contacts/lib/contact-attribute-keys.ts` — `createContactAttributeKey`
+- `apps/web/modules/api/v2/management/contact-attribute-keys/lib/contact-attribute-key.ts` — `createContactAttributeKey`
+- `apps/web/modules/ee/contacts/api/v1/management/contact-attribute-keys/lib/contact-attribute-keys.ts` — `createContactAttributeKey`
+- `apps/web/modules/integrations/webhooks/lib/webhook.ts` — `createWebhook`
+- `apps/web/modules/api/v2/management/webhooks/lib/webhook.ts` — `createWebhook`
+- `apps/web/app/api/v1/webhooks/lib/webhook.ts` — `createWebhook`
+- `apps/web/lib/tag/service.ts` — `createTag`
+- `apps/web/modules/ee/contacts/segments/lib/segments.ts` — `createSegment`, `cloneSegment`, `resetSegmentInSurvey`
+- `apps/web/lib/integration/service.ts` — `createOrUpdateIntegration`
+
+Pattern:
+```typescript
+// Resolve environmentId to projectId using existing getEnvironment()
+const environment = await getEnvironment(environmentId);
+const projectId = environment.projectId;
+await prisma.survey.create({ data: { environmentId, projectId, ...rest } });
+```
+
+---
+
+## Phase 4: Switch Internal Reads to `projectId` (PR 4 — Very Large, High Risk)
+
+Change internal (non-API) queries from `WHERE environmentId = ?` to `WHERE projectId = ?`.
+
+**Why**: This is the actual migration. Every query that says `WHERE environmentId = X` changes to `WHERE projectId = X`. Functions like `getSurveys(environmentId)` become `getSurveys(projectId)`. The layout at `/environments/[environmentId]/layout.tsx` resolves the environmentId from the URL to a projectId early on and passes projectId downstream. After this phase, the app internally thinks in terms of projects, not environments, even though URLs still say `[environmentId]`.
+
+**Key files**:
+- `apps/web/modules/survey/list/lib/survey.ts` — `getSurveys(environmentId)` → `getSurveys(projectId)`
+- `apps/web/app/api/v1/client/[environmentId]/environment/lib/data.ts` — `getEnvironmentStateData`
+- `apps/web/modules/environments/lib/utils.ts` — `getEnvironmentAuth`, `getEnvironmentLayoutData`
+- `apps/web/app/(app)/environments/[environmentId]/layout.tsx` — resolve `projectId` early, pass to context
+- `apps/web/app/(app)/environments/[environmentId]/context/environment-context.tsx` — add `projectId`
+- All page server components that pass `environmentId` to service functions
+
+URL still has `[environmentId]`. Each page resolves `environmentId → projectId` at the top.
+
+**This PR can be split further** by migrating one resource type at a time (surveys first, then contacts, then actions, etc.).
+
+---
+
+## Phase 5: Client API Backwards Compatibility (PR 5 — Medium, Medium Risk)
+
+Make `/api/v1/client/[environmentId]/...` and `/api/v2/client/[environmentId]/...` accept either an `environmentId` or a `projectId`.
+
+**Why**: The SDK sends requests to `/api/v1/client/[environmentId]/...`. Existing deployed SDKs will keep sending environmentIds. New SDKs will send projectIds. Each route handler needs to accept either and resolve to a projectId internally. This ensures old SDK versions don't break.
+
+**Add fallback resolution at top of each route handler**:
+```typescript
+// Try Environment table first, fall back to Project table
+let projectId: string;
+const environment = await prisma.environment.findUnique({ where: { id: params.environmentId } });
+if (environment) {
+  projectId = environment.projectId;
+} else {
+  projectId = params.environmentId; // caller passed a projectId directly
+}
+```
+
+**Files**:
+- `apps/web/app/api/v1/client/[environmentId]/environment/route.ts`
+- `apps/web/app/api/v1/client/[environmentId]/displays/route.ts`
+- `apps/web/app/api/v1/client/[environmentId]/responses/route.ts`
+- `apps/web/app/api/v1/client/[environmentId]/storage/route.ts`
+- `apps/web/app/api/v1/client/[environmentId]/user/route.ts`
+- `apps/web/app/api/v2/client/[environmentId]/` — all routes
+
+---
+
+## Phase 6: Management API + API Key Migration (PR 6 — Medium, Medium Risk)
+
+**Why**: The `ApiKeyEnvironment` model grants per-environment permissions. API keys used by integrations (Zapier, Make, etc.) reference environmentIds. These need to work at the project level. The management API endpoints that accept `environmentId` in request bodies need to also accept `projectId`.
+
+- Modify `ApiKeyEnvironment` to also support project-level permissions (or add `projectId` to the model)
+- Update `apps/web/app/api/v1/auth.ts` — `authenticateRequest` resolves environment permissions to project
+- Management route handlers accept `environmentId` OR `projectId` in request bodies
+- API key management UI in `modules/organization/settings/api-keys/`
+
+---
+
+## Phase 7: Storage Path Migration (PR 7 — Medium, Medium Risk)
+
+**Why**: Uploaded files are stored at paths like `private/{environmentId}/{fileName}`. New uploads should use `{projectId}/...`, but old files still live at the old paths. Downloads need to check both locations for backward compatibility.
+
+- New uploads use `{projectId}/{accessType}/{fileName}`
+- Downloads check both `{projectId}/...` and `{environmentId}/...` paths for backwards compat
+- `apps/web/modules/storage/service.ts`
+- `apps/web/app/storage/[environmentId]/[accessType]/[fileName]/route.ts`
+
+---
+
+## Phase 8: Dev Environment Data Migration (PR 8 — Large, High Risk)
+
+**Why**: Currently each project has a prod and dev environment. After the migration, there's no "environment" concept — just projects. Dev environments with no data can be discarded. Dev environments with data need to be promoted into new standalone projects so that data isn't lost.
+
+For each Project with a development Environment that has data:
+1. Create new Project named `{name} (Dev)` in the same Organization
+2. Create a production Environment for the new Project
+3. Re-parent all dev environment resources to the new Project (update `projectId`)
+4. Re-parent resources to the new production environment (update `environmentId`)
+
+For development environments with NO data: leave as-is (will be cleaned up later).
+
+**Create**: Idempotent migration script in `packages/database/migration/` or `scripts/`
+
+---
+
+## Phase 9: New `/workspaces/[projectId]/` Routes + Redirects (PR 9 — Very Large, High Risk)
+
+**Why**: The URL currently says `/environments/[environmentId]/surveys/...`. After the migration, it should say `/workspaces/[projectId]/surveys/...`. This phase creates the new route group mirroring the old structure, removes the environment switcher breadcrumb, and adds redirects so old bookmarked URLs still work.
+
+- Create `/apps/web/app/(app)/workspaces/[projectId]/` route group mirroring the environments structure
+- New layout resolves `projectId` directly
+- Old `/environments/[environmentId]/...` routes redirect to `/workspaces/{projectId}/...`
+- Update `apps/web/app/page.tsx` to redirect to workspace URLs
+- Remove environment switcher breadcrumb
+
+**Can be split** into sub-PRs: layout first, then surveys, then settings, etc.
+
+---
+
+## Phase 10: Make `projectId` NOT NULL (PR 10 — Small, Low Risk)
+
+**Why**: At this point, every row has `projectId` populated (backfill + dual-write), and all reads use `projectId`. Now we can safely make it required in the schema. This is a safety net — the DB will reject any row that somehow doesn't have a projectId.
+
+```sql
+ALTER TABLE "Survey" ALTER COLUMN "projectId" SET NOT NULL;
+-- Repeat for all 8 tables
+```
+
+Pre-check: verify no NULL values remain.
+
+---
+
+## Phase 11: JS SDK Update (PR 11 — Medium, Low Risk)
+
+**Why**: Add `workspaceId` as the new init parameter. `environmentId` keeps working as a deprecated alias. Existing integrations don't break.
+
+- `packages/js-core/src/types/config.ts` — add `workspaceId` to `TConfigInput`
+- `packages/js-core/src/lib/common/setup.ts` — accept `workspaceId`, fall back to `environmentId`
+- `environmentId` continues working as deprecated alias indefinitely
+
+```typescript
+// New:
+formbricks.init({ workspaceId: "cxxx", appUrl: "..." })
+// Old (still works):
+formbricks.init({ environmentId: "cxxx", appUrl: "..." })
+```
+
+---
+
+## Verification
+
+After each PR:
+1. `pnpm build` passes
+2. Existing tests pass (`pnpm test`)
+3. Manual smoke test: create survey, submit response, check dashboard
+4. SDK initialization works with existing `environmentId`
+
+After full migration:
+- Old environment URLs redirect correctly
+- Old API keys work
+- Old SDK `environmentId` init works
+- New `workspaceId` SDK init works
+- Storage files accessible via both old and new paths
+- Dev environments with data are separate workspaces
+
+---
+
+## PR Summary
+
+| PR | Phase | Description | Size | Risk |
+|----|-------|-------------|------|------|
+| 1 | 1 | Add nullable `projectId` columns | S | Low |
+| 2 | 2 | Backfill `projectId` data migration | S | Med |
+| 3 | 3 | Dual-write `projectId` on all creates | L | Med |
+| 4 | 4 | Switch reads to `projectId` | XL | High |
+| 5 | 5 | Client API backwards compat | M | Med |
+| 6 | 6 | Management API + API key migration | M | Med |
+| 7 | 7 | Storage path migration | M | Med |
+| 8 | 8 | Dev environment → workspace promotion | L | High |
+| 9 | 9 | New workspace routes + redirects | XL | High |
+| 10 | 10 | Make `projectId` NOT NULL | S | Low |
+| 11 | 11 | JS SDK `workspaceId` support | M | Low |

docs/self-hosting/configuration/environment-variables.mdx

@@ -77,4 +77,14 @@ These variables are present inside your machine's docker-compose file. Restart t
 | AUDIT_LOG_ENABLED            | Set this to 1 to enable audit logging. Requires Redis to be configured with the REDIS_URL env variable.              | optional                                                | 0                                                                         |
 | AUDIT_LOG_GET_USER_IP        | Set to 1 to include user IP addresses in audit logs from request headers                                             | optional                                                | 0                                                                         |
 
+#### Formbricks Hub
+
+When running the stack with [Formbricks Hub](https://github.com/formbricks/hub) (for example via Docker Compose or Helm), the following variables apply:
+
+| Variable         | Description                                                                                      | Required                   | Default                                               |
+| ---------------- | ------------------------------------------------------------------------------------------------ | -------------------------- | ----------------------------------------------------- |
+| HUB_API_KEY      | API key used by the Formbricks Hub API (port 8080).                                              | required                   | (e.g. `openssl rand -hex 32`)                         |
+| HUB_API_URL      | Base URL the Formbricks app uses to call Hub. Use `http://localhost:8080` locally.              | required                   | `http://localhost:8080` in local dev                  |
+| HUB_DATABASE_URL | PostgreSQL connection URL for Hub. Omit to use the same database as Formbricks.                 | optional                   | Same as Formbricks `DATABASE_URL` (shared database)   |
+
 Note: If you want to configure something that is not possible via above, please open an issue on our GitHub repo here or reach out to us on Github Discussions and we'll try our best to work out a solution with you.

packages/database/migration/20241209110456_xm_segment_migration/migration.ts

@@ -47,7 +47,9 @@ export const xmSegmentMigration: MigrationScript = {
   id: "s644oyyqccstfdeejc4fluye",
   name: "20241209110456_xm_segment_migration",
   run: async ({ tx }) => {
-    const allSegments = await tx.segment.findMany();
+    const allSegments = await tx.segment.findMany({
+      select: { id: true, filters: true },
+    });
     const updationPromises = [];
     for (const segment of allSegments) {
       updationPromises.push(
@@ -56,6 +58,7 @@ export const xmSegmentMigration: MigrationScript = {
           data: {
             filters: findAndReplace(segment.filters),
           },
+          select: { id: true },
         })
       );
     }

packages/database/migration/20260325151229_add_project_id_to_environment_owned_models/migration.sql

@@ -0,0 +1,80 @@
+-- AlterTable
+ALTER TABLE "ActionClass" ADD COLUMN "projectId" TEXT;
+
+-- AlterTable
+ALTER TABLE "Contact" ADD COLUMN "projectId" TEXT;
+
+-- AlterTable
+ALTER TABLE "ContactAttributeKey" ADD COLUMN "projectId" TEXT;
+
+-- AlterTable
+ALTER TABLE "Integration" ADD COLUMN "projectId" TEXT;
+
+-- AlterTable
+ALTER TABLE "Segment" ADD COLUMN "projectId" TEXT;
+
+-- AlterTable
+ALTER TABLE "Survey" ADD COLUMN "projectId" TEXT;
+
+-- AlterTable
+ALTER TABLE "Tag" ADD COLUMN "projectId" TEXT;
+
+-- AlterTable
+ALTER TABLE "Webhook" ADD COLUMN "projectId" TEXT;
+
+-- AlterTable
+ALTER TABLE "ApiKeyEnvironment" ADD COLUMN "projectId" TEXT;
+
+-- CreateIndex
+CREATE INDEX "ActionClass_projectId_createdAt_idx" ON "ActionClass"("projectId", "created_at");
+
+-- CreateIndex
+CREATE INDEX "Contact_projectId_idx" ON "Contact"("projectId");
+
+-- CreateIndex
+CREATE INDEX "ContactAttributeKey_projectId_createdAt_idx" ON "ContactAttributeKey"("projectId", "created_at");
+
+-- CreateIndex
+CREATE INDEX "Integration_projectId_idx" ON "Integration"("projectId");
+
+-- CreateIndex
+CREATE INDEX "Segment_projectId_idx" ON "Segment"("projectId");
+
+-- CreateIndex
+CREATE INDEX "Survey_projectId_updatedAt_idx" ON "Survey"("projectId", "updated_at");
+
+-- CreateIndex
+CREATE INDEX "Tag_projectId_idx" ON "Tag"("projectId");
+
+-- CreateIndex
+CREATE INDEX "Webhook_projectId_idx" ON "Webhook"("projectId");
+
+-- CreateIndex
+CREATE INDEX "ApiKeyEnvironment_projectId_idx" ON "ApiKeyEnvironment"("projectId");
+
+-- AddForeignKey
+ALTER TABLE "Webhook" ADD CONSTRAINT "Webhook_projectId_fkey" FOREIGN KEY ("projectId") REFERENCES "Project"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "ContactAttributeKey" ADD CONSTRAINT "ContactAttributeKey_projectId_fkey" FOREIGN KEY ("projectId") REFERENCES "Project"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "Contact" ADD CONSTRAINT "Contact_projectId_fkey" FOREIGN KEY ("projectId") REFERENCES "Project"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "Tag" ADD CONSTRAINT "Tag_projectId_fkey" FOREIGN KEY ("projectId") REFERENCES "Project"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "Survey" ADD CONSTRAINT "Survey_projectId_fkey" FOREIGN KEY ("projectId") REFERENCES "Project"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "ActionClass" ADD CONSTRAINT "ActionClass_projectId_fkey" FOREIGN KEY ("projectId") REFERENCES "Project"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "Integration" ADD CONSTRAINT "Integration_projectId_fkey" FOREIGN KEY ("projectId") REFERENCES "Project"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "Segment" ADD CONSTRAINT "Segment_projectId_fkey" FOREIGN KEY ("projectId") REFERENCES "Project"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "ApiKeyEnvironment" ADD CONSTRAINT "ApiKeyEnvironment_projectId_fkey" FOREIGN KEY ("projectId") REFERENCES "Project"("id") ON DELETE CASCADE ON UPDATE CASCADE;

packages/database/schema.prisma

@@ -49,11 +49,14 @@ model Webhook {
   source        WebhookSource      @default(user)
   environment   Environment        @relation(fields: [environmentId], references: [id], onDelete: Cascade)
   environmentId String
+  project       Project?           @relation(fields: [projectId], references: [id], onDelete: Cascade)
+  projectId     String?
   triggers      PipelineTriggers[]
   surveyIds     String[]
   secret        String?
 
   @@index([environmentId])
+  @@index([projectId])
 }
 
 /// Represents an attribute value associated with a contact.
@@ -116,11 +119,14 @@ model ContactAttributeKey {
   dataType         ContactAttributeDataType @default(string)
   environment      Environment              @relation(fields: [environmentId], references: [id], onDelete: Cascade)
   environmentId    String
+  project          Project?                 @relation(fields: [projectId], references: [id], onDelete: Cascade)
+  projectId        String?
   attributes       ContactAttribute[]
   attributeFilters SurveyAttributeFilter[]
 
   @@unique([key, environmentId])
   @@index([environmentId, createdAt])
+  @@index([projectId, createdAt])
 }
 
 /// Represents a person or user who can receive and respond to surveys.
@@ -137,11 +143,14 @@ model Contact {
   updatedAt     DateTime           @updatedAt @map(name: "updated_at")
   environment   Environment        @relation(fields: [environmentId], references: [id], onDelete: Cascade)
   environmentId String
+  project       Project?           @relation(fields: [projectId], references: [id], onDelete: Cascade)
+  projectId     String?
   responses     Response[]
   attributes    ContactAttribute[]
   displays      Display[]
 
   @@index([environmentId])
+  @@index([projectId])
 }
 
 /// Stores a user's response to a survey, including their answers and metadata.
@@ -204,8 +213,11 @@ model Tag {
   responses     TagsOnResponses[]
   environmentId String
   environment   Environment       @relation(fields: [environmentId], references: [id], onDelete: Cascade)
+  project       Project?          @relation(fields: [projectId], references: [id], onDelete: Cascade)
+  projectId     String?
 
   @@unique([environmentId, name])
+  @@index([projectId])
 }
 
 /// Junction table linking tags to responses.
@@ -350,6 +362,8 @@ model Survey {
   type                SurveyType              @default(app)
   environment         Environment             @relation(fields: [environmentId], references: [id], onDelete: Cascade)
   environmentId       String
+  project             Project?                @relation(fields: [projectId], references: [id], onDelete: Cascade)
+  projectId           String?
   creator             User?                   @relation(fields: [createdBy], references: [id])
   createdBy           String?
   status              SurveyStatus            @default(draft)
@@ -413,6 +427,7 @@ model Survey {
 
   @@index([environmentId, updatedAt])
   @@index([segmentId])
+  @@index([projectId, updatedAt])
 }
 
 /// Represents a quota configuration for a survey.
@@ -507,11 +522,14 @@ model ActionClass {
   noCodeConfig   Json?
   environment    Environment     @relation(fields: [environmentId], references: [id], onDelete: Cascade)
   environmentId  String
+  project        Project?        @relation(fields: [projectId], references: [id], onDelete: Cascade)
+  projectId      String?
   surveyTriggers SurveyTrigger[]
 
   @@unique([key, environmentId])
   @@unique([name, environmentId])
   @@index([environmentId, createdAt])
+  @@index([projectId, createdAt])
 }
 
 enum EnvironmentType {
@@ -540,9 +558,12 @@ model Integration {
   /// [IntegrationConfig]
   config        Json
   environment   Environment     @relation(fields: [environmentId], references: [id], onDelete: Cascade)
+  project       Project?        @relation(fields: [projectId], references: [id], onDelete: Cascade)
+  projectId     String?
 
   @@unique([type, environmentId])
   @@index([environmentId])
+  @@index([projectId])
 }
 
 enum DataMigrationStatus {
@@ -648,6 +669,17 @@ model Project {
   projectTeams        ProjectTeam[]
   customHeadScripts   String? // Custom HTML scripts for link surveys (self-hosted only)
 
+  // Direct resource relations (for environment deprecation migration)
+  surveys              Survey[]
+  contacts             Contact[]
+  actionClasses        ActionClass[]
+  contactAttributeKeys ContactAttributeKey[]
+  webhooks             Webhook[]
+  tags                 Tag[]
+  segments             Segment[]
+  integrations         Integration[]
+  apiKeyEnvironments   ApiKeyEnvironment[]
+
   @@unique([organizationId, name])
 }
 
@@ -807,10 +839,13 @@ model ApiKeyEnvironment {
   apiKey        ApiKey           @relation(fields: [apiKeyId], references: [id], onDelete: Cascade)
   environmentId String
   environment   Environment      @relation(fields: [environmentId], references: [id], onDelete: Cascade)
+  project       Project?         @relation(fields: [projectId], references: [id], onDelete: Cascade)
+  projectId     String?
   permission    ApiKeyPermission
 
   @@unique([apiKeyId, environmentId])
   @@index([environmentId])
+  @@index([projectId])
 }
 
 enum IdentityProvider {
@@ -910,9 +945,12 @@ model Segment {
   filters       Json        @default("[]")
   environmentId String
   environment   Environment @relation(fields: [environmentId], references: [id], onDelete: Cascade)
+  project       Project?    @relation(fields: [projectId], references: [id], onDelete: Cascade)
+  projectId     String?
   surveys       Survey[]
 
   @@unique([environmentId, title])
+  @@index([projectId])
 }
 
 /// Represents a supported language in the system.

packages/database/zod/api-keys.ts

@@ -10,7 +10,7 @@ export const ZApiKeyEnvironment = z.object({
   updatedAt: z.date(),
   apiKeyId: z.cuid2(),
   environmentId: z.cuid2(),
-  projectId: z.cuid2(),
+  projectId: z.cuid2().nullable(),
   projectName: z.string(),
   environmentType: z.enum(EnvironmentType),
   permission: ZApiKeyPermission,

packages/database/zod/contact-attribute-keys.ts

@@ -54,6 +54,7 @@ export const ZContactAttributeKey = z.object({
     })
     .describe("The data type of the attribute (string, number, date)"),
   environmentId: z.cuid2().describe("The ID of the environment this attribute belongs to"),
+  projectId: z.string().nullable().describe("The ID of the project this attribute belongs to"),
 }) satisfies z.ZodType<ContactAttributeKey>;
 
 ZContactAttributeKey.meta({

packages/database/zod/contact.ts

@@ -17,6 +17,7 @@ export const ZContact = z.object({
     })
     .describe("When the contact was last updated"),
   environmentId: z.string().describe("The environment this contact belongs to"),
+  projectId: z.string().nullable().describe("The project this contact belongs to"),
 }) satisfies z.ZodType<Contact>;
 
 ZContact.meta({

packages/database/zod/surveys.ts

@@ -72,6 +72,7 @@ const ZSurveyBase = z.object({
   pin: z.string().nullable().describe("The pin of the survey"),
   createdBy: z.string().nullable().describe("The user who created the survey"),
   environmentId: z.cuid2().describe("The environment ID of the survey"),
+  projectId: z.string().nullable().describe("The project ID of the survey"),
   questions: z.array(ZSurveyQuestion).describe("The questions of the survey"),
   blocks: ZSurveyBlocks.prefault([]).describe("The blocks of the survey"),
   endings: z.array(ZSurveyEnding).prefault([]).describe("The endings of the survey"),

packages/database/zod/webhooks.ts

@@ -19,6 +19,7 @@ export const ZWebhook = z.object({
   url: z.url().describe("The URL of the webhook"),
   source: z.enum(["user", "zapier", "make", "n8n"]).describe("The source of the webhook"),
   environmentId: z.cuid2().describe("The ID of the environment"),
+  projectId: z.string().nullable().describe("The ID of the project"),
   triggers: z
     .array(z.enum(["responseFinished", "responseCreated", "responseUpdated"]))
     .describe("The triggers of the webhook")

packages/js-core/src/lib/survey/tests/__mocks__/widget.mock.ts

@@ -62,6 +62,7 @@ export const mockSurvey: TEnvironmentStateSurvey = {
         createdAt: new Date("2025-01-01T10:00:00Z"),
         updatedAt: new Date("2025-01-01T10:00:00Z"),
         environmentId: mockEnvironmentId,
+        projectId: null,
         description: "Manual Trigger",
         noCodeConfig: {
           elementSelector: { cssSelector: ".btn", innerHtml: "Click me" },

packages/survey-ui/src/components/elements/consent.tsx

@@ -73,7 +73,7 @@ function Consent({
       />
 
       {/* Consent Checkbox */}
-      <div className="relative">
+      <div className="relative" data-element-input>
         <ElementError errorMessage={errorMessage} dir={dir} />
 
         <label

packages/survey-ui/src/components/elements/cta.tsx

@@ -83,7 +83,7 @@ function CTA({
       />
 
       {/* CTA Button */}
-      <div className="relative space-y-2">
+      <div className="relative space-y-2" data-element-input>
         <ElementError errorMessage={errorMessage} dir={dir} />
 
         {buttonExternal ? (
@@ -95,7 +95,7 @@ function CTA({
               disabled={disabled}
               className="text-button font-button-weight flex items-center gap-2"
               variant={buttonVariant}
-              size={"custom"}>
+              size="custom">
               {buttonLabel}
               <SquareArrowOutUpRightIcon className="size-4" />
             </Button>

packages/survey-ui/src/components/elements/date.tsx

@@ -161,7 +161,7 @@ function DateElement({
         videoUrl={videoUrl}
       />
 
-      <div className="relative">
+      <div className="relative" data-element-input>
         <ElementError errorMessage={errorMessage} dir={dir} />
         {/* Calendar - Always visible */}
         <div className="w-full">

packages/survey-ui/src/components/elements/file-upload.tsx

@@ -292,7 +292,7 @@ function FileUpload({
         imageAltText={imageAltText}
       />
 
-      <div className="relative">
+      <div className="relative" data-element-input>
         <ElementError errorMessage={errorMessage} dir={dir} />
 
         <div

packages/survey-ui/src/components/elements/form-field.tsx

@@ -112,7 +112,7 @@ function FormField({
       />
 
       {/* Form Fields */}
-      <div className="relative">
+      <div className="relative" data-element-input>
         <ElementError errorMessage={errorMessage} dir={dir} />
         <div className="space-y-3">
           {visibleFields.map((field) => {

packages/survey-ui/src/components/elements/matrix.tsx

@@ -94,7 +94,7 @@ function Matrix({
       />
 
       {/* Matrix Table */}
-      <div className="relative">
+      <div className="relative" data-element-input>
         <ElementError errorMessage={errorMessage} dir={dir} />
 
         {/* Table container with overflow for mobile */}

packages/survey-ui/src/components/elements/multi-select.tsx

@@ -145,7 +145,7 @@ function DropdownVariant({
   searchPlaceholder,
   searchNoResultsText,
 }: Readonly<DropdownVariantProps>): React.JSX.Element {
-  const handleOptionToggle = (optionId: string) => {
+  const handleOptionToggle = (optionId: string): void => {
     if (selectedValues.includes(optionId)) {
       handleOptionRemove(optionId);
     } else {
@@ -540,7 +540,7 @@ function MultiSelect({
       />
 
       {/* Options */}
-      <div className="relative">
+      <div className="relative" data-element-input>
         {variant === "dropdown" ? (
           <DropdownVariant
             inputId={inputId}

packages/survey-ui/src/components/elements/nps.tsx

@@ -172,7 +172,7 @@ function NPS({
       />
 
       {/* NPS Options */}
-      <div className="relative">
+      <div className="relative" data-element-input>
         <ElementError errorMessage={errorMessage} dir={dir} />
         <fieldset className="w-full px-[2px]" dir={dir}>
           <legend className="sr-only">NPS rating options</legend>

packages/survey-ui/src/components/elements/open-text.tsx

@@ -79,7 +79,7 @@ function OpenText({
         imageUrl={imageUrl}
         videoUrl={videoUrl}
       />
-      <div className="relative">
+      <div className="relative" data-element-input>
         <ElementError errorMessage={errorMessage} />
         {/* Input or Textarea */}
         <div className="space-y-1">

packages/survey-ui/src/components/elements/picture-select.tsx

@@ -106,7 +106,7 @@ function PictureSelect({
       />
 
       {/* Picture Grid - 2 columns */}
-      <div className="relative">
+      <div className="relative" data-element-input>
         <ElementError errorMessage={errorMessage} dir={dir} />
         {allowMulti ? (
           <div className="grid grid-cols-2 gap-2">

packages/survey-ui/src/components/elements/ranking.tsx

@@ -223,7 +223,7 @@ function Ranking({
       />
 
       {/* Ranking Options */}
-      <div className="relative">
+      <div className="relative" data-element-input>
         <ElementError errorMessage={errorMessage} dir={dir} />
         <fieldset className="w-full" dir={dir}>
           <legend className="sr-only">Ranking options</legend>

packages/survey-ui/src/components/elements/rating.tsx

@@ -407,7 +407,7 @@ function Rating({
       />
 
       {/* Rating Options */}
-      <div className="relative">
+      <div className="relative" data-element-input>
         <ElementError errorMessage={errorMessage} dir={dir} />
         <fieldset className="w-full" dir={dir}>
           <legend className="sr-only">Rating options</legend>

packages/survey-ui/src/components/elements/single-select.tsx

@@ -181,7 +181,7 @@ function SingleSelect({
       />
 
       {/* Options */}
-      <div>
+      <div data-element-input>
         {variant === "dropdown" ? (
           <>
             <ElementError errorMessage={errorMessage} dir={dir} />
@@ -278,7 +278,7 @@ function SingleSelect({
             ) : null}
           </>
         ) : (
-          <div className="relative">
+          <div className="relative" data-element-input>
             <ElementError errorMessage={errorMessage} dir={dir} />
             <RadioGroup
               name={inputId}

packages/surveys/src/components/general/block-conditional.tsx

@@ -278,11 +278,12 @@ export function BlockConditional({
     if (hasValidationErrors) {
       setElementErrors(errorMap);
 
-      // Find the first element with an error and scroll to it
+      // Find the first element with an error and scroll to its input area (not the headline)
       const firstErrorElementId = Object.keys(errorMap)[0];
       const form = elementFormRefs.current.get(firstErrorElementId);
       if (form) {
-        form.scrollIntoView({ behavior: "smooth", block: "center" });
+        const scrollTarget = form.querySelector("[data-element-input]") ?? form;
+        scrollTarget.scrollIntoView({ behavior: "smooth", block: "center" });
       }
       return;
     }
@@ -290,7 +291,8 @@ export function BlockConditional({
     // Also run legacy validation for elements not yet migrated to centralized validation
     const firstInvalidForm = findFirstInvalidForm();
     if (firstInvalidForm) {
-      firstInvalidForm.scrollIntoView({ behavior: "smooth", block: "center" });
+      const scrollTarget = firstInvalidForm.querySelector("[data-element-input]") ?? firstInvalidForm;
+      scrollTarget.scrollIntoView({ behavior: "smooth", block: "center" });
       return;
     }
 

packages/types/action-classes.ts

@@ -135,6 +135,7 @@ export const ZActionClass = z.object({
   key: z.string().trim().min(1).nullable(),
   noCodeConfig: ZActionClassNoCodeConfig.nullable(),
   environmentId: z.string(),
+  projectId: z.string().nullable(),
   createdAt: z.coerce.date(),
   updatedAt: z.coerce.date(),
 });

packages/types/contact-attribute-key.ts

@@ -19,6 +19,7 @@ export const ZContactAttributeKey = z.object({
   type: ZContactAttributeKeyType,
   dataType: ZContactAttributeDataType.prefault("string"),
   environmentId: z.string(),
+  projectId: z.string().nullable(),
 });
 
 export type TContactAttributeKey = z.infer<typeof ZContactAttributeKey>;

packages/types/integration/index.ts

@@ -19,6 +19,7 @@ export type TIntegrationConfig = z.infer<typeof ZIntegrationConfig>;
 export const ZIntegrationBase = z.object({
   id: z.string(),
   environmentId: z.string(),
+  projectId: z.string().nullable(),
 });
 
 export const ZIntegration = ZIntegrationBase.extend({

packages/types/integration/shared-types.ts

@@ -3,6 +3,7 @@ import { z } from "zod";
 export const ZIntegrationBase = z.object({
   id: z.string(),
   environmentId: z.string(),
+  projectId: z.string().nullable(),
 });
 
 export const ZIntegrationBaseSurveyData = z.object({

packages/types/segment.ts

@@ -344,6 +344,7 @@ export const ZSegment = z.object({
   isPrivate: z.boolean().prefault(true),
   filters: ZSegmentFilters,
   environmentId: z.string(),
+  projectId: z.string().nullable(),
   createdAt: z.date(),
   updatedAt: z.date(),
   surveys: z.array(z.string()),

packages/types/surveys/elements-validation.ts

@@ -1,7 +1,7 @@
 import { type z } from "zod";
 import type { TI18nString } from "../i18n";
 import type { TSurveyLanguage } from "./types";
-import { getTextContent } from "./validation";
+import { findLanguageCodesForDuplicateLabels, getTextContent } from "./validation";
 
 const extractLanguageCodes = (surveyLanguages?: TSurveyLanguage[]): string[] => {
   if (!surveyLanguages) return [];
@@ -92,28 +92,5 @@ export const validateElementLabels = (
   return null;
 };
 
-export const findLanguageCodesForDuplicateLabels = (
-  labels: TI18nString[],
-  surveyLanguages: TSurveyLanguage[]
-): string[] => {
-  const enabledLanguages = surveyLanguages.filter((lang) => lang.enabled);
-  const languageCodes = extractLanguageCodes(enabledLanguages);
-
-  const languagesToCheck = languageCodes.length === 0 ? ["default"] : languageCodes;
-
-  const duplicateLabels = new Set<string>();
-
-  for (const language of languagesToCheck) {
-    const labelTexts = labels
-      .map((label) => label[language])
-      .filter((text): text is string => typeof text === "string" && text.trim().length > 0)
-      .map((text) => text.trim());
-    const uniqueLabels = new Set(labelTexts);
-
-    if (uniqueLabels.size !== labelTexts.length) {
-      duplicateLabels.add(language);
-    }
-  }
-
-  return Array.from(duplicateLabels);
-};
+// Re-export for backwards compatibility
+export { findLanguageCodesForDuplicateLabels };

packages/types/surveys/types.ts

@@ -826,6 +826,7 @@ export const ZSurveyBase = z.object({
   name: z.string(),
   type: ZSurveyType,
   environmentId: z.string(),
+  projectId: z.string().nullable(),
   createdBy: z.string().nullable(),
   status: ZSurveyStatus,
   displayOption: ZSurveyDisplayOption,

packages/types/surveys/validation.ts

@@ -228,7 +228,10 @@ export const findLanguageCodesForDuplicateLabels = (
   const duplicateLabels = new Set<string>();
 
   for (const language of languagesToCheck) {
-    const labelTexts = labels.map((label) => label[language].trim()).filter(Boolean);
+    const labelTexts = labels
+      .map((label) => label[language])
+      .filter((text): text is string => typeof text === "string" && text.trim().length > 0)
+      .map((text) => text.trim());
     const uniqueLabels = new Set(labelTexts);
 
     if (uniqueLabels.size !== labelTexts.length) {

packages/types/tags.ts

@@ -6,6 +6,7 @@ export const ZTag = z.object({
   updatedAt: z.date(),
   name: z.string(),
   environmentId: z.string(),
+  projectId: z.string().nullable(),
 });
 export type TTag = z.infer<typeof ZTag>;
 

turbo.json

@@ -156,6 +156,8 @@
         "GOOGLE_SHEETS_CLIENT_ID",
         "GOOGLE_SHEETS_CLIENT_SECRET",
         "GOOGLE_SHEETS_REDIRECT_URL",
+        "HUB_API_KEY",
+        "HUB_API_URL",
         "NOTION_OAUTH_CLIENT_ID",
         "NOTION_OAUTH_CLIENT_SECRET",
         "HEROKU_APP_NAME",