fix: knip

api/configs/feature/__init__.py

@@ -1497,6 +1497,11 @@ class LoginConfig(BaseSettings):
 
 
 class AccountConfig(BaseSettings):
+    ENABLE_CHANGE_EMAIL: bool = Field(
+        description="whether users can change their email address",
+        default=True,
+    )
+
     ACCOUNT_DELETION_TOKEN_EXPIRY_MINUTES: PositiveInt = Field(
         description="Duration in minutes for which a account deletion token remains valid",
         default=5,

api/openapi/markdown/console-openapi.md

@@ -17318,6 +17318,12 @@ Default model entity.
 | tool_name | string |  | Yes |
 | type | string |  | Yes |
 
+#### DeploymentEdition
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| DeploymentEdition | string |  |  |
+
 #### DismissNotificationPayload
 
 | Name | Type | Description | Required |
@@ -22026,6 +22032,7 @@ Model class for provider system configuration response.
 | Name | Type | Description | Required |
 | ---- | ---- | ----------- | -------- |
 | branding | [BrandingModel](#brandingmodel) |  | Yes |
+| deployment_edition | [DeploymentEdition](#deploymentedition) |  | Yes |
 | enable_app_deploy | boolean |  | Yes |
 | enable_change_email | boolean, <br>**Default:** true |  | Yes |
 | enable_collaboration_mode | boolean, <br>**Default:** true |  | Yes |

api/openapi/markdown/web-openapi.md

@@ -1058,6 +1058,12 @@ Button styles for user actions.
 | auto_generate | boolean | Automatically generate the conversation name. When `true`, the `name` field is ignored. | No |
 | name | string | Conversation name. Required when `auto_generate` is `false`. | No |
 
+#### DeploymentEdition
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| DeploymentEdition | string |  |  |
+
 #### EmailCodeLoginSendPayload
 
 | Name | Type | Description | Required |
@@ -1567,6 +1573,7 @@ Default configuration for form inputs.
 | Name | Type | Description | Required |
 | ---- | ---- | ----------- | -------- |
 | branding | [BrandingModel](#brandingmodel) |  | Yes |
+| deployment_edition | [DeploymentEdition](#deploymentedition) |  | Yes |
 | enable_app_deploy | boolean |  | Yes |
 | enable_change_email | boolean, <br>**Default:** true |  | Yes |
 | enable_collaboration_mode | boolean, <br>**Default:** true |  | Yes |

api/services/feature_service.py

@@ -75,6 +75,12 @@ class LicenseStatus(StrEnum):
     LOST = "lost"
 
 
+class DeploymentEdition(StrEnum):
+    COMMUNITY = "COMMUNITY"
+    ENTERPRISE = "ENTERPRISE"
+    CLOUD = "CLOUD"
+
+
 class LicenseModel(FeatureResponseModel):
     status: LicenseStatus = LicenseStatus.NONE
     expired_at: str = ""
@@ -162,6 +168,7 @@ class PluginManagerModel(FeatureResponseModel):
 
 
 class SystemFeatureModel(FeatureResponseModel):
+    deployment_edition: DeploymentEdition
     enable_app_deploy: bool = False
     sso_enforced_for_signin: bool = False
     sso_enforced_for_signin_protocol: str = ""
@@ -252,7 +259,7 @@ class FeatureService:
 
     @classmethod
     def get_system_features(cls, is_authenticated: bool = False) -> SystemFeatureModel:
-        system_features = SystemFeatureModel()
+        system_features = SystemFeatureModel(deployment_edition=cls._resolve_deployment_edition())
         system_features.rbac_enabled = dify_config.RBAC_ENABLED
 
         cls._fulfill_system_params_from_env(system_features)
@@ -272,6 +279,14 @@ class FeatureService:
 
         return system_features
 
+    @classmethod
+    def _resolve_deployment_edition(cls) -> DeploymentEdition:
+        if dify_config.EDITION == "CLOUD":
+            return DeploymentEdition.CLOUD
+        if dify_config.ENTERPRISE_ENABLED:
+            return DeploymentEdition.ENTERPRISE
+        return DeploymentEdition.COMMUNITY
+
     @classmethod
     def get_app_dsl_version(cls) -> str:
         return CURRENT_APP_DSL_VERSION
@@ -285,6 +300,7 @@ class FeatureService:
         system_features.is_allow_register = dify_config.ALLOW_REGISTER
         system_features.is_allow_create_workspace = dify_config.ALLOW_CREATE_WORKSPACE
         system_features.is_email_setup = dify_config.MAIL_TYPE is not None and dify_config.MAIL_TYPE != ""
+        system_features.enable_change_email = dify_config.ENABLE_CHANGE_EMAIL
         system_features.enable_trial_app = dify_config.ENABLE_TRIAL_APP
         system_features.enable_explore_banner = dify_config.ENABLE_EXPLORE_BANNER
         system_features.enable_learn_app = dify_config.ENABLE_LEARN_APP

api/tests/test_containers_integration_tests/services/test_feature_service.py

@@ -414,6 +414,7 @@ class TestFeatureService:
             mock_config.ENABLE_EMAIL_PASSWORD_LOGIN = True
             mock_config.ENABLE_SOCIAL_OAUTH_LOGIN = False
             mock_config.ENABLE_COLLABORATION_MODE = False
+            mock_config.ENABLE_CHANGE_EMAIL = True
             mock_config.ALLOW_REGISTER = True
             mock_config.ALLOW_CREATE_WORKSPACE = True
             mock_config.MAIL_TYPE = "smtp"
@@ -616,6 +617,7 @@ class TestFeatureService:
             mock_config.ENABLE_EMAIL_CODE_LOGIN = False
             mock_config.ENABLE_EMAIL_PASSWORD_LOGIN = True
             mock_config.ENABLE_SOCIAL_OAUTH_LOGIN = True
+            mock_config.ENABLE_CHANGE_EMAIL = True
             mock_config.ALLOW_REGISTER = False
             mock_config.ALLOW_CREATE_WORKSPACE = False
             mock_config.MAIL_TYPE = None

api/tests/unit_tests/controllers/console/app/test_app_import_api.py

@@ -19,7 +19,7 @@ from models.engine import db
 from models.model import App, AppMode
 from services.app_dsl_service import ImportStatus
 from services.entities.dsl_entities import CheckDependenciesResult
-from services.feature_service import SystemFeatureModel, WebAppAuthModel
+from services.feature_service import DeploymentEdition, SystemFeatureModel, WebAppAuthModel
 
 
 def _unwrap(func):
@@ -47,7 +47,10 @@ class _Result:
 
 
 def _install_features(monkeypatch: pytest.MonkeyPatch, enabled: bool) -> None:
-    features = SystemFeatureModel(webapp_auth=WebAppAuthModel(enabled=enabled))
+    features = SystemFeatureModel(
+        deployment_edition=DeploymentEdition.COMMUNITY,
+        webapp_auth=WebAppAuthModel(enabled=enabled),
+    )
     monkeypatch.setattr(app_import_module.FeatureService, "get_system_features", lambda: features)
 
 

api/tests/unit_tests/controllers/console/auth/test_email_register.py

@@ -11,7 +11,7 @@ from controllers.console.auth.email_register import (
     EmailRegisterResetApi,
     EmailRegisterSendEmailApi,
 )
-from services.feature_service import SystemFeatureModel
+from services.feature_service import DeploymentEdition, SystemFeatureModel
 
 
 class TestEmailRegisterSendEmailApi:
@@ -34,7 +34,11 @@ class TestEmailRegisterSendEmailApi:
         mock_account = MagicMock()
         mock_get_account.return_value = mock_account
 
-        feature_flags = SystemFeatureModel(enable_email_password_login=True, is_allow_register=True)
+        feature_flags = SystemFeatureModel(
+            deployment_edition=DeploymentEdition.COMMUNITY,
+            enable_email_password_login=True,
+            is_allow_register=True,
+        )
         with (
             patch("controllers.console.auth.email_register.dify_config.BILLING_ENABLED", True),
             patch("controllers.console.wraps.dify_config.EDITION", "CLOUD"),
@@ -75,7 +79,11 @@ class TestEmailRegisterCheckApi:
         mock_get_data.return_value = {"email": "User@Example.com", "code": "4321"}
         mock_generate_token.return_value = (None, "new-token")
 
-        feature_flags = SystemFeatureModel(enable_email_password_login=True, is_allow_register=True)
+        feature_flags = SystemFeatureModel(
+            deployment_edition=DeploymentEdition.COMMUNITY,
+            enable_email_password_login=True,
+            is_allow_register=True,
+        )
         with (
             patch("controllers.console.wraps.dify_config.EDITION", "CLOUD"),
             patch("controllers.console.wraps.FeatureService.get_system_features", return_value=feature_flags),
@@ -123,7 +131,11 @@ class TestEmailRegisterResetApi:
         mock_login.return_value = token_pair
         mock_get_account.return_value = None
 
-        feature_flags = SystemFeatureModel(enable_email_password_login=True, is_allow_register=True)
+        feature_flags = SystemFeatureModel(
+            deployment_edition=DeploymentEdition.COMMUNITY,
+            enable_email_password_login=True,
+            is_allow_register=True,
+        )
         with (
             patch("controllers.console.wraps.dify_config.EDITION", "CLOUD"),
             patch("controllers.console.wraps.FeatureService.get_system_features", return_value=feature_flags),
@@ -171,7 +183,11 @@ class TestEmailRegisterResetApi:
         mock_login.return_value = token_pair
         mock_get_account.return_value = None
 
-        feature_flags = SystemFeatureModel(enable_email_password_login=True, is_allow_register=True)
+        feature_flags = SystemFeatureModel(
+            deployment_edition=DeploymentEdition.COMMUNITY,
+            enable_email_password_login=True,
+            is_allow_register=True,
+        )
         with (
             patch("controllers.console.wraps.dify_config.EDITION", "CLOUD"),
             patch("controllers.console.wraps.FeatureService.get_system_features", return_value=feature_flags),
@@ -224,7 +240,11 @@ class TestEmailRegisterResetApi:
         mock_login.return_value = token_pair
         mock_get_account.return_value = None
 
-        feature_flags = SystemFeatureModel(enable_email_password_login=True, is_allow_register=True)
+        feature_flags = SystemFeatureModel(
+            deployment_edition=DeploymentEdition.COMMUNITY,
+            enable_email_password_login=True,
+            is_allow_register=True,
+        )
         with (
             patch("controllers.console.wraps.dify_config.EDITION", "CLOUD"),
             patch("controllers.console.wraps.FeatureService.get_system_features", return_value=feature_flags),

api/tests/unit_tests/controllers/console/auth/test_forgot_password.py

@@ -15,7 +15,7 @@ from controllers.console.auth.forgot_password import (
 )
 from models.account import Account
 from models.engine import db
-from services.feature_service import SystemFeatureModel
+from services.feature_service import DeploymentEdition, SystemFeatureModel
 
 
 @pytest.fixture
@@ -46,8 +46,15 @@ class TestForgotPasswordSendEmailApi:
         mock_get_account.return_value = mock_account
         mock_send_email.return_value = "token-123"
 
-        wraps_features = SystemFeatureModel(enable_email_password_login=True, is_allow_register=True)
-        controller_features = SystemFeatureModel(is_allow_register=True)
+        wraps_features = SystemFeatureModel(
+            deployment_edition=DeploymentEdition.COMMUNITY,
+            enable_email_password_login=True,
+            is_allow_register=True,
+        )
+        controller_features = SystemFeatureModel(
+            deployment_edition=DeploymentEdition.COMMUNITY,
+            is_allow_register=True,
+        )
         with (
             patch(
                 "controllers.console.auth.forgot_password.FeatureService.get_system_features",
@@ -95,7 +102,10 @@ class TestForgotPasswordCheckApi:
         mock_get_data.return_value = {"email": "Admin@Example.com", "code": "4321"}
         mock_generate_token.return_value = (None, "new-token")
 
-        wraps_features = SystemFeatureModel(enable_email_password_login=True)
+        wraps_features = SystemFeatureModel(
+            deployment_edition=DeploymentEdition.COMMUNITY,
+            enable_email_password_login=True,
+        )
         with (
             patch("controllers.console.wraps.dify_config.EDITION", "CLOUD"),
             patch("controllers.console.wraps.FeatureService.get_system_features", return_value=wraps_features),
@@ -138,7 +148,10 @@ class TestForgotPasswordResetApi:
         db.session.commit()
         mock_get_account.return_value = account
 
-        wraps_features = SystemFeatureModel(enable_email_password_login=True)
+        wraps_features = SystemFeatureModel(
+            deployment_edition=DeploymentEdition.COMMUNITY,
+            enable_email_password_login=True,
+        )
         with (
             patch("controllers.console.wraps.dify_config.EDITION", "CLOUD"),
             patch("controllers.console.wraps.FeatureService.get_system_features", return_value=wraps_features),

api/tests/unit_tests/controllers/console/auth/test_password_reset.py

@@ -24,7 +24,7 @@ from controllers.console.auth.forgot_password import (
 )
 from controllers.console.error import AccountNotFound, EmailSendIpLimitError
 from models.account import Account, Tenant, TenantAccountJoin
-from services.feature_service import SystemFeatureModel
+from services.feature_service import DeploymentEdition, SystemFeatureModel
 
 SQLITE_MODELS = (Account, Tenant, TenantAccountJoin)
 
@@ -48,7 +48,10 @@ def enable_password_login_wrappers(monkeypatch: pytest.MonkeyPatch) -> None:
     monkeypatch.setattr("controllers.console.wraps.dify_config.EDITION", "CLOUD")
     monkeypatch.setattr(
         "controllers.console.wraps.FeatureService.get_system_features",
-        lambda: SystemFeatureModel(enable_email_password_login=True),
+        lambda: SystemFeatureModel(
+            deployment_edition=DeploymentEdition.COMMUNITY,
+            enable_email_password_login=True,
+        ),
     )
 
 

api/tests/unit_tests/controllers/console/test_feature.py

@@ -3,7 +3,7 @@ from inspect import unwrap
 from pytest_mock import MockerFixture
 
 from models import Account
-from services.feature_service import FeatureModel, LimitationModel, SystemFeatureModel
+from services.feature_service import DeploymentEdition, FeatureModel, LimitationModel, SystemFeatureModel
 
 
 def make_account() -> Account:
@@ -94,7 +94,11 @@ class TestSystemFeatureApi:
             "controllers.console.feature.current_account_with_tenant_optional",
             return_value=(account, "tenant-123"),
         )
-        system_features = SystemFeatureModel(is_allow_register=True, enable_learn_app=True)
+        system_features = SystemFeatureModel(
+            deployment_edition=DeploymentEdition.COMMUNITY,
+            is_allow_register=True,
+            enable_learn_app=True,
+        )
         get_system_features = mocker.patch(
             "controllers.console.feature.FeatureService.get_system_features",
             return_value=system_features,
@@ -119,7 +123,10 @@ class TestSystemFeatureApi:
             "controllers.console.feature.current_account_with_tenant_optional",
             return_value=(None, None),
         )
-        system_features = SystemFeatureModel(is_allow_register=False)
+        system_features = SystemFeatureModel(
+            deployment_edition=DeploymentEdition.COMMUNITY,
+            is_allow_register=False,
+        )
         get_system_features = mocker.patch(
             "controllers.console.feature.FeatureService.get_system_features",
             return_value=system_features,

api/tests/unit_tests/controllers/web/test_web_forgot_password.py

@@ -16,7 +16,7 @@ from controllers.web.forgot_password import (
 )
 from models.account import Account
 from models.engine import db
-from services.feature_service import SystemFeatureModel
+from services.feature_service import DeploymentEdition, SystemFeatureModel
 
 
 @pytest.fixture
@@ -32,7 +32,10 @@ def database_app() -> Iterator[Flask]:
 
 @pytest.fixture(autouse=True)
 def _patch_wraps():
-    wraps_features = SystemFeatureModel(enable_email_password_login=True)
+    wraps_features = SystemFeatureModel(
+        deployment_edition=DeploymentEdition.COMMUNITY,
+        enable_email_password_login=True,
+    )
     with (
         patch("controllers.console.wraps.db") as mock_db,
         patch("controllers.console.wraps.dify_config.ENTERPRISE_ENABLED", True),

api/tests/unit_tests/services/plugin/test_plugin_service_installation.py

@@ -24,6 +24,7 @@ from models.engine import db
 from models.provider import Provider, ProviderCredential, TenantPreferredModelProvider
 from services.errors.plugin import PluginInstallationForbiddenError
 from services.feature_service import (
+    DeploymentEdition,
     PluginInstallationPermissionModel,
     PluginInstallationScope,
     SystemFeatureModel,
@@ -35,10 +36,11 @@ def _make_features(
     scope: PluginInstallationScope = PluginInstallationScope.ALL,
 ) -> SystemFeatureModel:
     return SystemFeatureModel(
+        deployment_edition=DeploymentEdition.COMMUNITY,
         plugin_installation_permission=PluginInstallationPermissionModel(
             restrict_to_marketplace_only=restrict_to_marketplace,
             plugin_installation_scope=scope,
-        )
+        ),
     )
 
 

api/tests/unit_tests/services/test_feature_service_change_email.py

@@ -0,0 +1,25 @@
+import pytest
+
+from services.feature_service import FeatureService
+
+
+@pytest.mark.parametrize("enabled", [False, True])
+def test_get_system_features_reads_enable_change_email(
+    monkeypatch: pytest.MonkeyPatch,
+    enabled: bool,
+) -> None:
+    monkeypatch.setattr("services.feature_service.dify_config.ENABLE_CHANGE_EMAIL", enabled)
+
+    result = FeatureService.get_system_features()
+
+    assert result.enable_change_email is enabled
+
+
+def test_enterprise_disables_change_email(monkeypatch: pytest.MonkeyPatch) -> None:
+    monkeypatch.setattr("services.feature_service.dify_config.ENABLE_CHANGE_EMAIL", True)
+    monkeypatch.setattr("services.feature_service.dify_config.ENTERPRISE_ENABLED", True)
+    monkeypatch.setattr("services.feature_service.FeatureService._fulfill_params_from_enterprise", lambda *_: None)
+
+    result = FeatureService.get_system_features()
+
+    assert result.enable_change_email is False

api/tests/unit_tests/services/test_feature_service_deployment_edition.py

@@ -0,0 +1,34 @@
+import pytest
+from pydantic import ValidationError
+
+from services.feature_service import DeploymentEdition, FeatureService, SystemFeatureModel
+
+
+def test_system_feature_model_requires_deployment_edition() -> None:
+    with pytest.raises(ValidationError):
+        SystemFeatureModel.model_validate({})
+
+
+@pytest.mark.parametrize(
+    ("edition", "enterprise_enabled", "expected"),
+    [
+        ("SELF_HOSTED", False, DeploymentEdition.COMMUNITY),
+        ("SELF_HOSTED", True, DeploymentEdition.ENTERPRISE),
+        ("CLOUD", False, DeploymentEdition.CLOUD),
+        ("CLOUD", True, DeploymentEdition.CLOUD),
+    ],
+)
+def test_get_system_features_resolves_deployment_edition(
+    monkeypatch: pytest.MonkeyPatch,
+    edition: str,
+    enterprise_enabled: bool,
+    expected: DeploymentEdition,
+) -> None:
+    monkeypatch.setattr("services.feature_service.dify_config.EDITION", edition)
+    monkeypatch.setattr("services.feature_service.dify_config.ENTERPRISE_ENABLED", enterprise_enabled)
+    monkeypatch.setattr("services.feature_service.FeatureService._fulfill_params_from_enterprise", lambda *_: None)
+
+    result = FeatureService.get_system_features()
+
+    assert result.deployment_edition is expected
+    assert result.model_dump(mode="json")["deployment_edition"] == expected.value

api/tests/unit_tests/services/test_feature_service_enable_app_deploy.py

@@ -1,7 +1,7 @@
 import pytest
 
 from services import feature_service as feature_service_module
-from services.feature_service import FeatureService, SystemFeatureModel
+from services.feature_service import DeploymentEdition, FeatureService, SystemFeatureModel
 
 
 @pytest.mark.parametrize(
@@ -29,7 +29,7 @@ def test_fulfill_params_from_enterprise_enable_app_deploy(
         staticmethod(lambda: enterprise_info),
     )
 
-    features = SystemFeatureModel()
+    features = SystemFeatureModel(deployment_edition=DeploymentEdition.COMMUNITY)
     features.enable_app_deploy = initial
 
     FeatureService._fulfill_params_from_enterprise(features)

api/tests/unit_tests/services/test_feature_service_knowledge_fs.py

@@ -1,10 +1,10 @@
 import pytest
 
-from services.feature_service import FeatureService, SystemFeatureModel
+from services.feature_service import DeploymentEdition, FeatureService, SystemFeatureModel
 
 
 def test_system_feature_model_disables_knowledge_fs_by_default() -> None:
-    assert SystemFeatureModel().knowledge_fs_enabled is False
+    assert SystemFeatureModel(deployment_edition=DeploymentEdition.COMMUNITY).knowledge_fs_enabled is False
 
 
 @pytest.mark.parametrize("enabled", [False, True])

api/tests/unit_tests/services/test_feature_service_learn_app.py

@@ -1,12 +1,14 @@
 import pytest
 
 from services import feature_service as feature_service_module
-from services.feature_service import FeatureService, SystemFeatureModel
+from services.feature_service import DeploymentEdition, FeatureService, SystemFeatureModel
 
 
 def test_system_feature_model_defaults_enable_learn_app():
-    assert SystemFeatureModel().enable_learn_app is True
-    assert SystemFeatureModel().enable_step_by_step_tour is False
+    system_features = SystemFeatureModel(deployment_edition=DeploymentEdition.COMMUNITY)
+
+    assert system_features.enable_learn_app is True
+    assert system_features.enable_step_by_step_tour is False
 
 
 @pytest.mark.parametrize("enabled", [True, False])

api/tests/unit_tests/services/test_feature_service_licensed_seats.py

@@ -1,7 +1,7 @@
 import pytest
 
 from services import feature_service as feature_service_module
-from services.feature_service import FeatureService, SystemFeatureModel
+from services.feature_service import DeploymentEdition, FeatureService, SystemFeatureModel
 
 _ENTERPRISE_INFO = {"License": {"licensedSeats": {"enabled": True, "limit": 3, "used": 1}}}
 
@@ -14,7 +14,7 @@ def test_fulfill_params_from_enterprise_parses_licensed_seats(monkeypatch: pytes
         staticmethod(lambda: _ENTERPRISE_INFO),
     )
 
-    features = SystemFeatureModel()
+    features = SystemFeatureModel(deployment_edition=DeploymentEdition.COMMUNITY)
     FeatureService._fulfill_params_from_enterprise(features, is_authenticated=True)
 
     assert features.license.seats.enabled is True
@@ -30,7 +30,7 @@ def test_fulfill_params_from_enterprise_withholds_seats_when_unauthenticated(mon
         staticmethod(lambda: _ENTERPRISE_INFO),
     )
 
-    features = SystemFeatureModel()
+    features = SystemFeatureModel(deployment_edition=DeploymentEdition.COMMUNITY)
     FeatureService._fulfill_params_from_enterprise(features, is_authenticated=False)
 
     assert features.license.seats.enabled is False

api/tests/unit_tests/services/test_feature_service_webapp_public_access.py

@@ -1,6 +1,6 @@
 import pytest
 
-from services.feature_service import FeatureService, SystemFeatureModel
+from services.feature_service import DeploymentEdition, FeatureService, SystemFeatureModel
 
 
 @pytest.mark.parametrize(
@@ -18,7 +18,7 @@ def test_fulfill_system_params_from_env_sets_allow_public_access(
 ):
     monkeypatch.setattr("services.feature_service.dify_config.WEBAPP_PUBLIC_ACCESS_ENABLED", env_value)
 
-    system_features = SystemFeatureModel()
+    system_features = SystemFeatureModel(deployment_edition=DeploymentEdition.COMMUNITY)
     FeatureService._fulfill_system_params_from_env(system_features)
 
     assert system_features.webapp_auth.allow_public_access is expected

api/tests/unit_tests/services/test_recommended_app_service.py

@@ -12,7 +12,7 @@ from sqlalchemy.orm import Session
 
 from models.model import AccountTrialAppRecord, App, AppMode, TrialApp
 from services import recommended_app_service as service_module
-from services.feature_service import SystemFeatureModel
+from services.feature_service import DeploymentEdition, SystemFeatureModel
 from services.recommended_app_service import RecommendedAppService
 
 pytestmark = pytest.mark.parametrize(
@@ -298,7 +298,10 @@ class TestRecommendedAppServiceGetDetail:
         sqlite_session: Session,
     ) -> None:
         mock_config.HOSTED_FETCH_APP_TEMPLATES_MODE = "remote"
-        mock_feature_service.get_system_features.return_value = SystemFeatureModel(enable_trial_app=False)
+        mock_feature_service.get_system_features.return_value = SystemFeatureModel(
+            deployment_edition=DeploymentEdition.COMMUNITY,
+            enable_trial_app=False,
+        )
         cases: list[tuple[str, RecommendedAppPayload]] = [
             (
                 "complex-app",
@@ -337,7 +340,10 @@ class TestRecommendedAppServiceGetDetail:
         mock_feature_service: MagicMock,
         sqlite_session: Session,
     ) -> None:
-        mock_feature_service.get_system_features.return_value = SystemFeatureModel(enable_trial_app=False)
+        mock_feature_service.get_system_features.return_value = SystemFeatureModel(
+            deployment_edition=DeploymentEdition.COMMUNITY,
+            enable_trial_app=False,
+        )
         for mode in ["remote", "builtin", "db"]:
             mock_config.HOSTED_FETCH_APP_TEMPLATES_MODE = mode
             detail = _app_detail(app_id="test-app", name=f"App from {mode}")
@@ -367,7 +373,10 @@ class TestRecommendedAppServiceGetLearnDifyApps:
         sqlite_session: Session,
     ) -> None:
         mock_config.HOSTED_FETCH_APP_TEMPLATES_MODE = "remote"
-        mock_feature_service.get_system_features.return_value = SystemFeatureModel(enable_trial_app=False)
+        mock_feature_service.get_system_features.return_value = SystemFeatureModel(
+            deployment_edition=DeploymentEdition.COMMUNITY,
+            enable_trial_app=False,
+        )
         expected_app = RecommendedAppPayload(app_id="app-1", category="Workflow")
         mock_instance = MagicMock()
         mock_instance.get_learn_dify_apps.return_value = {
@@ -402,7 +411,12 @@ class TestRecommendedAppServiceGetLearnDifyApps:
         monkeypatch.setattr(
             service_module.FeatureService,
             "get_system_features",
-            MagicMock(return_value=SystemFeatureModel(enable_trial_app=True)),
+            MagicMock(
+                return_value=SystemFeatureModel(
+                    deployment_edition=DeploymentEdition.COMMUNITY,
+                    enable_trial_app=True,
+                )
+            ),
         )
         can_trial_mock = MagicMock(return_value=True)
         monkeypatch.setattr(RecommendedAppService, "_can_trial_app", can_trial_mock)
@@ -425,7 +439,12 @@ class TestRecommendedAppServiceTrialFeatures:
         monkeypatch.setattr(
             service_module.FeatureService,
             "get_system_features",
-            MagicMock(return_value=SystemFeatureModel(enable_trial_app=False)),
+            MagicMock(
+                return_value=SystemFeatureModel(
+                    deployment_edition=DeploymentEdition.COMMUNITY,
+                    enable_trial_app=False,
+                )
+            ),
         )
 
         result = RecommendedAppService.get_recommended_apps_and_categories("en-US", session=sqlite_session)
@@ -456,7 +475,12 @@ class TestRecommendedAppServiceTrialFeatures:
         monkeypatch.setattr(
             service_module.FeatureService,
             "get_system_features",
-            MagicMock(return_value=SystemFeatureModel(enable_trial_app=True)),
+            MagicMock(
+                return_value=SystemFeatureModel(
+                    deployment_edition=DeploymentEdition.COMMUNITY,
+                    enable_trial_app=True,
+                )
+            ),
         )
 
         result = RecommendedAppService.get_recommended_apps_and_categories("ja-JP", session=sqlite_session)
@@ -492,7 +516,12 @@ class TestRecommendedAppServiceTrialFeatures:
         monkeypatch.setattr(
             service_module.FeatureService,
             "get_system_features",
-            MagicMock(return_value=SystemFeatureModel(enable_trial_app=True)),
+            MagicMock(
+                return_value=SystemFeatureModel(
+                    deployment_edition=DeploymentEdition.COMMUNITY,
+                    enable_trial_app=True,
+                )
+            ),
         )
 
         result = RecommendedAppService.get_recommend_app_detail(app_id, session=sqlite_session)

docker/envs/core-services/shared.env.example

@@ -16,11 +16,21 @@ CHECK_UPDATE_URL=https://updates.dify.ai
 OPENAI_API_BASE=https://api.openai.com/v1
 MIGRATION_ENABLED=true
 FILES_ACCESS_TIMEOUT=300
+# System Features
+MARKETPLACE_ENABLED=true
+ENABLE_EMAIL_CODE_LOGIN=false
+ENABLE_EMAIL_PASSWORD_LOGIN=true
+ENABLE_SOCIAL_OAUTH_LOGIN=false
 # Remove `collaboration` from COMPOSE_PROFILES to stop the dedicated websocket service.
 ENABLE_COLLABORATION_MODE=true
-
-# Learn app feature toggle
+ALLOW_REGISTER=false
+ALLOW_CREATE_WORKSPACE=false
+ENABLE_CHANGE_EMAIL=true
+ENABLE_TRIAL_APP=false
+ENABLE_EXPLORE_BANNER=false
 ENABLE_LEARN_APP=true
+ENABLE_STEP_BY_STEP_TOUR=false
+RBAC_ENABLED=false
 CELERY_BROKER_URL=redis://:difyai123456@redis:6379/1
 CELERY_TASK_ANNOTATIONS=null
 AZURE_BLOB_ACCOUNT_URL=https://<your_account_name>.blob.core.windows.net
@@ -90,6 +100,8 @@ WORKFLOW_LOG_CLEANUP_SPECIFIC_WORKFLOW_IDS=
 EXPOSE_PLUGIN_DEBUGGING_HOST=localhost
 EXPOSE_PLUGIN_DEBUGGING_PORT=5003
 DEPLOY_ENV=PRODUCTION
+EDITION=SELF_HOSTED
+ENTERPRISE_ENABLED=false
 ACCESS_TOKEN_EXPIRE_MINUTES=60
 REFRESH_TOKEN_EXPIRE_DAYS=30
 APP_DEFAULT_ACTIVE_REQUESTS=0

docker/envs/core-services/web.env.example

@@ -15,7 +15,6 @@ TEXT_GENERATION_TIMEOUT_MS=60000
 ALLOW_INLINE_STYLES=false
 ALLOW_UNSAFE_DATA_SCHEME=false
 MAX_TREE_DEPTH=50
-MARKETPLACE_ENABLED=true
 MARKETPLACE_API_URL=https://marketplace.dify.ai
 INDEXING_MAX_SEGMENTATION_TOKENS_LENGTH=4000
 ALLOW_EMBED=false

packages/contracts/generated/api/console/system-features/types.gen.ts

@@ -6,6 +6,7 @@ export type ClientOptions = {
 
 export type SystemFeatureModel = {
   branding: BrandingModel
+  deployment_edition: DeploymentEdition
   enable_app_deploy: boolean
   enable_change_email: boolean
   enable_collaboration_mode: boolean
@@ -40,6 +41,8 @@ export type BrandingModel = {
   workspace_logo: string
 }
 
+export type DeploymentEdition = 'CLOUD' | 'COMMUNITY' | 'ENTERPRISE'
+
 export type LicenseModel = {
   expired_at: string
   seats: LicenseLimitationModel

packages/contracts/generated/api/console/system-features/zod.gen.ts

@@ -13,6 +13,11 @@ export const zBrandingModel = z.object({
   workspace_logo: z.string().default(''),
 })
 
+/**
+ * DeploymentEdition
+ */
+export const zDeploymentEdition = z.enum(['CLOUD', 'COMMUNITY', 'ENTERPRISE'])
+
 /**
  * PluginManagerModel
  */
@@ -104,6 +109,7 @@ export const zSystemFeatureModel = z.object({
     login_page_logo: '',
     workspace_logo: '',
   }),
+  deployment_edition: zDeploymentEdition,
   enable_app_deploy: z.boolean().default(false),
   enable_change_email: z.boolean().default(true),
   enable_collaboration_mode: z.boolean().default(true),

packages/contracts/generated/api/web/types.gen.ts

@@ -118,6 +118,8 @@ export type ConversationRenamePayload = (
   name?: string | null
 }
 
+export type DeploymentEdition = 'CLOUD' | 'COMMUNITY' | 'ENTERPRISE'
+
 export type EmailCodeLoginSendPayload = {
   email: string
   language?: string | null
@@ -510,6 +512,7 @@ export type SuggestedQuestionsResponse = {
 
 export type SystemFeatureModel = {
   branding: BrandingModel
+  deployment_edition: DeploymentEdition
   enable_app_deploy: boolean
   enable_change_email: boolean
   enable_collaboration_mode: boolean

packages/contracts/generated/api/web/zod.gen.ts

@@ -132,6 +132,11 @@ export const zConversationRenamePayload = z.intersection(
   }),
 )
 
+/**
+ * DeploymentEdition
+ */
+export const zDeploymentEdition = z.enum(['CLOUD', 'COMMUNITY', 'ENTERPRISE'])
+
 /**
  * EmailCodeLoginSendPayload
  */
@@ -782,6 +787,7 @@ export const zSystemFeatureModel = z.object({
     login_page_logo: '',
     workspace_logo: '',
   }),
+  deployment_edition: zDeploymentEdition,
   enable_app_deploy: z.boolean().default(false),
   enable_change_email: z.boolean().default(true),
   enable_collaboration_mode: z.boolean().default(true),

web/.env.example

@@ -1,9 +1,5 @@
 # For production release, change this to PRODUCTION
 NEXT_PUBLIC_DEPLOY_ENV=DEVELOPMENT
-# The deployment edition, SELF_HOSTED
-NEXT_PUBLIC_EDITION=SELF_HOSTED
-# Whether a self-hosted deployment runs Enterprise Edition
-NEXT_PUBLIC_ENTERPRISE_ENABLED=false
 # The base path for the application
 NEXT_PUBLIC_BASE_PATH=
 # Server-only console API origin for server-side requests.
@@ -114,20 +110,3 @@ NEXT_PUBLIC_WEB_PREFIX=
 
 # number of concurrency
 NEXT_PUBLIC_BATCH_CONCURRENCY=5
-
-# Cloud system-features frontend defaults.
-# These values are only used when NEXT_PUBLIC_EDITION=CLOUD (IS_CLOUD_EDITION).
-NEXT_PUBLIC_ENABLE_MARKETPLACE=true
-NEXT_PUBLIC_ENABLE_EMAIL_CODE_LOGIN=true
-NEXT_PUBLIC_ENABLE_EMAIL_PASSWORD_LOGIN=false
-NEXT_PUBLIC_ENABLE_SOCIAL_OAUTH_LOGIN=true
-NEXT_PUBLIC_ENABLE_COLLABORATION_MODE=false
-NEXT_PUBLIC_ALLOW_REGISTER=true
-NEXT_PUBLIC_ALLOW_CREATE_WORKSPACE=true
-NEXT_PUBLIC_IS_EMAIL_SETUP=true
-NEXT_PUBLIC_ENABLE_CHANGE_EMAIL=true
-NEXT_PUBLIC_CREATORS_PLATFORM_FEATURES_ENABLED=true
-NEXT_PUBLIC_ENABLE_TRIAL_APP=true
-NEXT_PUBLIC_ENABLE_EXPLORE_BANNER=true
-NEXT_PUBLIC_RBAC_ENABLED=false
-NEXT_PUBLIC_KNOWLEDGE_FS_ENABLED=false

web/Dockerfile

@@ -49,7 +49,6 @@ RUN pnpm build && pnpm build:vinext
 FROM base AS production
 
 ENV NODE_ENV=production
-ENV EDITION=SELF_HOSTED
 ENV DEPLOY_ENV=PRODUCTION
 ENV CONSOLE_API_URL=http://127.0.0.1:5001
 ENV APP_API_URL=http://127.0.0.1:5001

web/__tests__/billing/billing-integration.test.tsx

@@ -1,3 +1,5 @@
+import type { RenderOptions } from '@testing-library/react'
+import type { ReactElement } from 'react'
 import type { UsagePlanInfo, UsageResetInfo } from '@/app/components/billing/type'
 import { screen } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
@@ -14,21 +16,21 @@ import TriggerEventsLimitModal from '@/app/components/billing/trigger-events-lim
 import { Plan } from '@/app/components/billing/type'
 import UpgradeBtn from '@/app/components/billing/upgrade-btn'
 import VectorSpaceFull from '@/app/components/billing/vector-space-full'
-import { render } from '@/test/console/render'
+import { createConsoleQueryWrapper } from '@/test/console/query-data'
+import { render as renderWithConsoleState } from '@/test/console/render'
+
+const render = (ui: ReactElement, options: RenderOptions = {}) => {
+  const { wrapper } = createConsoleQueryWrapper({
+    systemFeatures: { deployment_edition: 'CLOUD' },
+  })
+  return renderWithConsoleState(ui, { ...options, wrapper })
+}
 
 let mockProviderCtx: Record<string, unknown> = {}
 let mockConsoleState: Record<string, unknown> = {}
 const mockSetShowPricingModal = vi.fn()
 const mockSetShowAccountSettingModal = vi.fn()
 
-vi.mock('@/config', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('@/config')>()
-  return {
-    ...actual,
-    IS_CLOUD_EDITION: true,
-  }
-})
-
 vi.mock('@/context/provider-context', () => ({
   useProviderContext: () => mockProviderCtx,
 }))

web/__tests__/billing/education-verification-flow.test.tsx

@@ -1,3 +1,5 @@
+import type { RenderOptions } from '@testing-library/react'
+import type { ReactElement } from 'react'
 /**
  * Integration test: Education Verification Flow
  *
@@ -14,7 +16,15 @@ import * as React from 'react'
 import { defaultPlan } from '@/app/components/billing/config'
 import PlanComp from '@/app/components/billing/plan'
 import { Plan } from '@/app/components/billing/type'
-import { render } from '@/test/console/render'
+import { createConsoleQueryWrapper } from '@/test/console/query-data'
+import { render as renderWithConsoleState } from '@/test/console/render'
+
+const render = (ui: ReactElement, options: RenderOptions = {}) => {
+  const { wrapper } = createConsoleQueryWrapper({
+    systemFeatures: { deployment_edition: 'CLOUD' },
+  })
+  return renderWithConsoleState(ui, { ...options, wrapper })
+}
 
 // ─── Mock state ──────────────────────────────────────────────────────────────
 let mockProviderCtx: Record<string, unknown> = {}
@@ -25,14 +35,6 @@ const mockRouterPush = vi.fn()
 const mockMutateAsync = vi.fn()
 const mockSetEducationVerifying = vi.hoisted(() => vi.fn())
 
-vi.mock('@/config', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('@/config')>()
-  return {
-    ...actual,
-    IS_CLOUD_EDITION: true,
-  }
-})
-
 // ─── Context mocks ───────────────────────────────────────────────────────────
 vi.mock('@/context/provider-context', () => ({
   useProviderContext: () => mockProviderCtx,

web/__tests__/billing/partner-stack-flow.test.tsx

@@ -7,11 +7,15 @@
  * Covers URL param reading, cookie persistence, API bind on mount,
  * cookie cleanup after successful bind, and error handling for 400 status.
  */
-import { act, cleanup, render, renderHook, waitFor } from '@testing-library/react'
+import { act, cleanup, renderHook, waitFor } from '@testing-library/react'
 import Cookies from 'js-cookie'
 import * as React from 'react'
 import usePSInfo from '@/app/components/billing/partner-stack/use-ps-info'
 import { PARTNER_STACK_CONFIG } from '@/config'
+import { renderWithConsoleQuery } from '@/test/console/query-data'
+
+const render = (ui: React.ReactElement) =>
+  renderWithConsoleQuery(ui, { systemFeatures: { deployment_edition: 'CLOUD' } })
 
 // ─── Mock state ──────────────────────────────────────────────────────────────
 let mockSearchParams = new URLSearchParams()
@@ -39,7 +43,6 @@ vi.mock('@/config', async (importOriginal) => {
   const actual = await importOriginal<Record<string, unknown>>()
   return {
     ...actual,
-    IS_CLOUD_EDITION: true,
     PARTNER_STACK_CONFIG: {
       cookieName: 'partner_stack_info',
       saveCookieDays: 90,
@@ -288,7 +291,7 @@ describe('Partner Stack Flow', () => {
 
   // ─── 4. PartnerStack Component Mount ────────────────────────────────────
   describe('PartnerStack component mount behavior', () => {
-    it('should call saveOrUpdate and bind on mount when IS_CLOUD_EDITION is true', async () => {
+    it('should call saveOrUpdate and bind on mount', async () => {
       mockSearchParams = new URLSearchParams({
         ps_partner_key: 'mount-partner',
         ps_xid: 'mount-click',
@@ -299,18 +302,13 @@ describe('Partner Stack Flow', () => {
 
       render(<PartnerStack />)
 
-      // The component calls saveOrUpdate and bind in useEffect
       await waitFor(() => {
-        // Bind should have been called
         expect(mockMutateAsync).toHaveBeenCalledWith({
           partnerKey: 'mount-partner',
           clickId: 'mount-click',
         })
+        expect(Cookies.get(PARTNER_STACK_CONFIG.cookieName)).toBeUndefined()
       })
-
-      // Cookie should have been saved (saveOrUpdate was called before bind)
-      // After bind succeeds, cookie is removed
-      expect(Cookies.get(PARTNER_STACK_CONFIG.cookieName)).toBeUndefined()
     })
 
     it('should render nothing (return null)', async () => {

web/__tests__/env.spec.ts

@@ -1,6 +1,5 @@
 describe('env runtime transport', () => {
   const originalAgentV2Env = process.env.NEXT_PUBLIC_ENABLE_AGENT_V2
-  const originalRbacEnv = process.env.NEXT_PUBLIC_RBAC_ENABLED
 
   beforeEach(() => {
     vi.clearAllMocks()
@@ -8,17 +7,12 @@ describe('env runtime transport', () => {
     vi.doUnmock('../utils/client')
     document.body.removeAttribute('data-enable-agent-v2')
     document.body.removeAttribute('data-enable-agent-v-2')
-    document.body.removeAttribute('data-rbac-enabled')
     delete process.env.NEXT_PUBLIC_ENABLE_AGENT_V2
-    delete process.env.NEXT_PUBLIC_RBAC_ENABLED
   })
 
   afterAll(() => {
     if (originalAgentV2Env === undefined) delete process.env.NEXT_PUBLIC_ENABLE_AGENT_V2
     else process.env.NEXT_PUBLIC_ENABLE_AGENT_V2 = originalAgentV2Env
-
-    if (originalRbacEnv === undefined) delete process.env.NEXT_PUBLIC_RBAC_ENABLED
-    else process.env.NEXT_PUBLIC_RBAC_ENABLED = originalRbacEnv
   })
 
   it('should read NEXT_PUBLIC_ENABLE_AGENT_V2 from the browser runtime dataset key', async () => {
@@ -29,14 +23,6 @@ describe('env runtime transport', () => {
     expect(env.NEXT_PUBLIC_ENABLE_AGENT_V2).toBe(true)
   })
 
-  it('should read NEXT_PUBLIC_RBAC_ENABLED from the browser runtime dataset key', async () => {
-    document.body.setAttribute('data-rbac-enabled', 'true')
-
-    const { env } = await import('../env')
-
-    expect(env.NEXT_PUBLIC_RBAC_ENABLED).toBe(true)
-  })
-
   it('should emit the Agent v2 runtime dataset attribute from getDatasetMap on the server', async () => {
     process.env.NEXT_PUBLIC_ENABLE_AGENT_V2 = 'true'
 
@@ -51,18 +37,4 @@ describe('env runtime transport', () => {
     expect(datasetMap['data-enable-agent-v2']).toBe(true)
     expect(datasetMap['data-enable-agent-v-2']).toBeUndefined()
   })
-
-  it('should emit the RBAC runtime dataset attribute from getDatasetMap on the server', async () => {
-    process.env.NEXT_PUBLIC_RBAC_ENABLED = 'true'
-
-    vi.doMock('../utils/client', () => ({
-      isClient: false,
-      isServer: true,
-    }))
-
-    const { getDatasetMap } = await import('../env')
-    const datasetMap = getDatasetMap()
-
-    expect(datasetMap['data-rbac-enabled']).toBe(true)
-  })
 })

web/app/(commonLayout)/__tests__/console-bootstrap-gate.spec.tsx

@@ -2,6 +2,7 @@ import type { ReactNode } from 'react'
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
 import { act, render, screen, waitFor } from '@testing-library/react'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { createSystemFeaturesFixture } from '@/test/console/system-features'
 import { ConsoleBootstrapGate } from '../console-bootstrap-gate'
 
 const profileQueryKey = ['console', 'account', 'profile', 'get']
@@ -26,7 +27,9 @@ const createDeferred = <T,>(): Deferred<T> => {
 
 const mocks = vi.hoisted(() => ({
   profileQuery: undefined as Deferred<{ id: string }> | undefined,
-  systemFeaturesQuery: undefined as Deferred<{ branding: { enabled: boolean } }> | undefined,
+  systemFeaturesQuery: undefined as
+    | Deferred<ReturnType<typeof createSystemFeaturesFixture>>
+    | undefined,
 }))
 
 vi.mock('@/features/account-profile/client', () => ({
@@ -36,12 +39,24 @@ vi.mock('@/features/account-profile/client', () => ({
   }),
 }))
 
-vi.mock('@/features/system-features/client', () => ({
-  systemFeaturesQueryOptions: () => ({
-    queryKey: systemFeaturesQueryKey,
-    queryFn: () => mocks.systemFeaturesQuery!.promise,
-  }),
-}))
+vi.mock('@/service/client', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('@/service/client')>()
+  return {
+    ...actual,
+    consoleQuery: {
+      ...actual.consoleQuery,
+      systemFeatures: {
+        get: {
+          ...actual.consoleQuery.systemFeatures.get,
+          queryOptions: () => ({
+            queryKey: systemFeaturesQueryKey,
+            queryFn: () => mocks.systemFeaturesQuery!.promise,
+          }),
+        },
+      },
+    },
+  }
+})
 
 function createQueryClient() {
   return new QueryClient({
@@ -78,7 +93,7 @@ describe('ConsoleBootstrapGate', () => {
     expect(screen.queryByText('Console shell')).not.toBeInTheDocument()
 
     await act(async () => {
-      mocks.systemFeaturesQuery!.resolve({ branding: { enabled: false } })
+      mocks.systemFeaturesQuery!.resolve(createSystemFeaturesFixture())
     })
 
     expect(await screen.findByText('Console shell')).toBeInTheDocument()
@@ -87,11 +102,9 @@ describe('ConsoleBootstrapGate', () => {
   it('keeps atom consumers mounted when a cached profile background refetch fails', async () => {
     const queryClient = createQueryClient()
     queryClient.setQueryData(profileQueryKey, { id: 'user-1' }, { updatedAt: 1 })
-    queryClient.setQueryData(
-      systemFeaturesQueryKey,
-      { branding: { enabled: false } },
-      { updatedAt: 1 },
-    )
+    queryClient.setQueryData(systemFeaturesQueryKey, createSystemFeaturesFixture(), {
+      updatedAt: 1,
+    })
 
     renderGate(<div>Console shell</div>, queryClient)
 
@@ -102,7 +115,7 @@ describe('ConsoleBootstrapGate', () => {
 
     await act(async () => {
       mocks.profileQuery!.reject(new Error('profile refetch failed'))
-      mocks.systemFeaturesQuery!.resolve({ branding: { enabled: false } })
+      mocks.systemFeaturesQuery!.resolve(createSystemFeaturesFixture())
     })
 
     await waitFor(() => {

web/app/(commonLayout)/__tests__/hydration-boundary.spec.tsx

@@ -1,10 +1,11 @@
+import type { DehydratedState } from '@tanstack/react-query'
 import type { ReactElement } from 'react'
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
 import { render, screen } from '@testing-library/react'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
 const mocks = vi.hoisted(() => ({
-  queryClient: undefined as QueryClient | undefined,
+  rootQueryClient: undefined as QueryClient | undefined,
   profileQueryFn: vi.fn(),
   systemFeaturesQueryFn: vi.fn(),
   workspaceQueryFn: vi.fn(),
@@ -18,9 +19,14 @@ const mocks = vi.hoisted(() => ({
   basePath: '',
 }))
 
-vi.mock('@/context/query-client-server', () => ({
-  getQueryClientServer: () => mocks.queryClient,
-}))
+vi.mock('@/context/query-client-server', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('@/context/query-client-server')>()
+
+  return {
+    ...actual,
+    getQueryClientServer: () => mocks.rootQueryClient,
+  }
+})
 
 vi.mock('@/next/headers', () => ({
   headers: () => mocks.headers(),
@@ -44,6 +50,14 @@ vi.mock('@/features/account-profile/server', () => ({
   }),
 }))
 
+vi.mock('@/features/system-features/server', () => ({
+  serverSystemFeaturesQueryOptions: () => ({
+    queryKey: ['console', 'system-features'],
+    queryFn: mocks.systemFeaturesQueryFn,
+    retry: false,
+  }),
+}))
+
 vi.mock('@/service/server', () => ({
   getServerConsoleClientContext: () => mocks.getServerConsoleClientContext(),
   resolveServerConsoleApiUrl: (...args: unknown[]) => mocks.resolveServerConsoleApiUrl(...args),
@@ -58,19 +72,11 @@ vi.mock('@/service/server', () => ({
   },
 }))
 
-vi.mock('@/features/system-features/server', () => ({
-  serverSystemFeaturesQueryOptions: () => ({
-    queryKey: ['console', 'system-features'],
-    queryFn: mocks.systemFeaturesQueryFn,
-    retry: false,
-  }),
-}))
-
 describe('CommonLayoutHydrationBoundary', () => {
   beforeEach(() => {
     vi.clearAllMocks()
     mocks.basePath = ''
-    mocks.queryClient = new QueryClient({ defaultOptions: { queries: { retry: false } } })
+    mocks.rootQueryClient = new QueryClient({ defaultOptions: { queries: { retry: false } } })
     mocks.headers.mockResolvedValue(
       new Headers({
         'x-dify-pathname': '/apps',
@@ -107,7 +113,7 @@ describe('CommonLayoutHydrationBoundary', () => {
     })
   })
 
-  it('should prefetch common layout queries and render children', async () => {
+  it('should prefetch common layout queries without requesting System Features', async () => {
     const { CommonLayoutHydrationBoundary } = await import('../hydration-boundary')
 
     const element = await CommonLayoutHydrationBoundary({
@@ -121,7 +127,7 @@ describe('CommonLayoutHydrationBoundary', () => {
     )
     expect(screen.getByText('Common shell')).toBeInTheDocument()
     expect(mocks.profileQueryFn).toHaveBeenCalledTimes(1)
-    expect(mocks.systemFeaturesQueryFn).toHaveBeenCalledTimes(1)
+    expect(mocks.systemFeaturesQueryFn).not.toHaveBeenCalled()
     expect(mocks.getServerConsoleClientContext).toHaveBeenCalledTimes(1)
     expect(mocks.workspaceQueryOptions).toHaveBeenCalledWith({
       context: {
@@ -133,6 +139,25 @@ describe('CommonLayoutHydrationBoundary', () => {
     expect(mocks.workspaceQueryFn).toHaveBeenCalledTimes(1)
   })
 
+  it('should dehydrate only Common-owned queries', async () => {
+    mocks.rootQueryClient?.setQueryData(['console', 'system-features'], {
+      deployment_edition: 'CLOUD',
+    })
+    const { CommonLayoutHydrationBoundary } = await import('../hydration-boundary')
+
+    const element = await CommonLayoutHydrationBoundary({ children: null })
+    const state = (element as ReactElement<{ state: DehydratedState }>).props.state
+    const queryKeys = state.queries.map((query) => query.queryKey)
+
+    expect(queryKeys).toHaveLength(2)
+    expect(queryKeys).toEqual(
+      expect.arrayContaining([
+        ['common', 'user-profile'],
+        ['console', 'workspaces', 'current', 'post'],
+      ]),
+    )
+  })
+
   it('should redirect unauthorized users to the refresh route with the current path', async () => {
     mocks.basePath = '/workflow'
     mocks.profileQueryFn.mockRejectedValue(

web/app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/__tests__/chart-view.spec.tsx

@@ -1,5 +1,6 @@
+import type { PeriodParams } from '@/app/components/app/overview/app-chart'
 import { screen } from '@testing-library/react'
-import { renderWithAccountProfile as render } from '@/test/console/account-profile'
+import { renderWithConsoleQuery as render } from '@/test/console/query-data'
 import { AppACLPermission } from '@/utils/permission'
 import ChartView from '../chart-view'
 
@@ -13,6 +14,7 @@ const testState = vi.hoisted(() => ({
   currentUserId: 'user-1',
   workspacePermissionKeys: [] as string[],
   chartRenderSpy: vi.fn(),
+  conversationPeriodSpy: vi.fn(),
 }))
 
 vi.mock('@/context/workspace-state', async () => {
@@ -46,8 +48,9 @@ vi.mock('@/app/components/app/overview/app-chart', () => ({
     testState.chartRenderSpy('avg-user-interactions')
     return <div>avg user interactions chart</div>
   },
-  ConversationsChart: () => {
+  ConversationsChart: ({ period }: { period: PeriodParams }) => {
     testState.chartRenderSpy('conversations')
+    testState.conversationPeriodSpy(period)
     return <div>conversations chart</div>
   },
   CostChart: () => {

web/app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/chart-view.tsx

@@ -1,6 +1,8 @@
 'use client'
+import type { DeploymentEdition } from '@dify/contracts/api/console/system-features/types.gen'
 import type { PeriodParams } from '@/app/components/app/overview/app-chart'
 import type { I18nKeysByPrefix } from '@/types/i18n'
+import { useSuspenseQuery } from '@tanstack/react-query'
 import dayjs from 'dayjs'
 import quarterOfYear from 'dayjs/plugin/quarterOfYear'
 import { useAtomValue } from 'jotai'
@@ -23,10 +25,10 @@ import {
   WorkflowMessagesChart,
 } from '@/app/components/app/overview/app-chart'
 import { useStore as useAppStore } from '@/app/components/app/store'
-import { IS_CLOUD_EDITION } from '@/config'
 import { userProfileIdAtom } from '@/context/account-state'
 import { useDocLink } from '@/context/i18n'
 import { workspacePermissionKeysAtom } from '@/context/permission-state'
+import { systemFeaturesQueryOptions } from '@/features/system-features/client'
 import { getAppACLCapabilities } from '@/utils/permission'
 import LongTimeRangePicker from './long-time-range-picker'
 import TimeRangePicker from './time-range-picker'
@@ -51,7 +53,28 @@ type IChartViewProps = {
 }
 
 export default function ChartView({ appId, headerRight }: IChartViewProps) {
+  const { data: deploymentEdition } = useSuspenseQuery({
+    ...systemFeaturesQueryOptions(),
+    select: ({ deployment_edition }) => deployment_edition,
+  })
+
+  return (
+    <ChartViewContent
+      appId={appId}
+      headerRight={headerRight}
+      deploymentEdition={deploymentEdition}
+    />
+  )
+}
+
+function ChartViewContent({
+  appId,
+  headerRight,
+  deploymentEdition,
+}: IChartViewProps & { deploymentEdition: DeploymentEdition }) {
   const { t } = useTranslation()
+  const isCloudEdition = deploymentEdition === 'CLOUD'
+  const isNonCloudEdition = deploymentEdition === 'COMMUNITY' || deploymentEdition === 'ENTERPRISE'
   const docLink = useDocLink()
   const appDetail = useAppStore((state) => state.appDetail)
   const currentUserId = useAtomValue(userProfileIdAtom)
@@ -67,8 +90,8 @@ export default function ChartView({ appId, headerRight }: IChartViewProps) {
   )
   const isChatApp = appDetail?.mode !== 'completion' && appDetail?.mode !== 'workflow'
   const isWorkflow = appDetail?.mode === 'workflow'
-  const [period, setPeriod] = useState<PeriodParams>(
-    IS_CLOUD_EDITION
+  const [period, setPeriod] = useState<PeriodParams>(() =>
+    isCloudEdition
       ? {
           name: t(($) => $['filter.period.today'], { ns: 'appLog' }),
           query: {
@@ -112,13 +135,14 @@ export default function ChartView({ appId, headerRight }: IChartViewProps) {
           </div>
         </div>
         <div className="mt-1 flex h-10 items-center justify-between pr-10 pl-6">
-          {IS_CLOUD_EDITION ? (
+          {isCloudEdition && (
             <TimeRangePicker
               ranges={TIME_PERIOD_MAPPING}
               onSelect={setPeriod}
               queryDateFormat={queryDateFormat}
             />
-          ) : (
+          )}
+          {isNonCloudEdition && (
             <LongTimeRangePicker
               periodMapping={LONG_TIME_PERIOD_MAPPING}
               onSelect={setPeriod}

web/app/(commonLayout)/datasets/(datasetDetailLayout)/[datasetId]/__tests__/layout-main.spec.tsx

@@ -43,14 +43,6 @@ vi.mock('@/context/permission-state', async () => {
     workspacePermissionKeys: [],
   }))
 })
-vi.mock('@/context/system-features-state', async () => {
-  const { createSystemFeaturesStateModuleMock } = await import('@/test/console/state-fixture')
-
-  return createSystemFeaturesStateModuleMock(() => ({
-    datasetRbacEnabled: mockIsRbacEnabled,
-  }))
-})
-
 vi.mock('@/context/event-emitter', () => ({
   useEventEmitterContextContext: () => ({
     eventEmitter: undefined,

web/app/(commonLayout)/datasets/(datasetDetailLayout)/[datasetId]/layout-main.tsx

@@ -2,6 +2,7 @@
 import type { FC } from 'react'
 import type { DataSet } from '@/models/datasets'
 import { cn } from '@langgenius/dify-ui/cn'
+import { useSuspenseQuery } from '@tanstack/react-query'
 import { useAtomValue } from 'jotai'
 import * as React from 'react'
 import { useEffect } from 'react'
@@ -13,8 +14,8 @@ import {
   workspacePermissionKeysAtom,
   workspacePermissionKeysLoadingAtom,
 } from '@/context/permission-state'
-import { datasetRbacEnabledAtom } from '@/context/system-features-state'
 import { currentWorkspaceLoadingAtom } from '@/context/workspace-state'
+import { systemFeaturesQueryOptions } from '@/features/system-features/client'
 import useDocumentTitle from '@/hooks/use-document-title'
 import { usePathname, useRouter } from '@/next/navigation'
 import { useDatasetDetail } from '@/service/knowledge/use-dataset'
@@ -60,7 +61,10 @@ const DatasetDetailLayout: FC<IAppDetailLayoutProps> = (props) => {
   const pathname = usePathname()
   const isLoadingCurrentWorkspace = useAtomValue(currentWorkspaceLoadingAtom)
   const isLoadingWorkspacePermissionKeys = useAtomValue(workspacePermissionKeysLoadingAtom)
-  const isRbacEnabled = useAtomValue(datasetRbacEnabledAtom)
+  const { data: isRbacEnabled } = useSuspenseQuery({
+    ...systemFeaturesQueryOptions(),
+    select: ({ rbac_enabled }) => rbac_enabled,
+  })
   const currentUserId = useAtomValue(userProfileIdAtom)
   const workspacePermissionKeys = useAtomValue(workspacePermissionKeysAtom)
 

web/app/(commonLayout)/error.tsx

@@ -1,6 +1,7 @@
 'use client'
 
 import { Button } from '@langgenius/dify-ui/button'
+import { useQueryErrorResetBoundary } from '@tanstack/react-query'
 import { useTranslation } from 'react-i18next'
 import { FullScreenLoading } from '@/app/components/full-screen-loading'
 import { isLegacyBase401 } from '@/features/account-profile/client'
@@ -12,6 +13,7 @@ type Props = Readonly<{
 
 export default function CommonLayoutError({ error, unstable_retry }: Props) {
   const { t } = useTranslation('common')
+  const { reset } = useQueryErrorResetBoundary()
 
   console.error(error)
 
@@ -26,7 +28,14 @@ export default function CommonLayoutError({ error, unstable_retry }: Props) {
       <div className="system-sm-regular text-text-tertiary">
         {t(($) => $['errorBoundary.message'])}
       </div>
-      <Button size="small" variant="secondary" onClick={() => unstable_retry()}>
+      <Button
+        size="small"
+        variant="secondary"
+        onClick={() => {
+          reset()
+          unstable_retry()
+        }}
+      >
         {t(($) => $['errorBoundary.tryAgain'])}
       </Button>
     </div>

web/app/(commonLayout)/hydration-boundary.tsx

@@ -1,8 +1,7 @@
 import type { ReactNode } from 'react'
 import { dehydrate, HydrationBoundary } from '@tanstack/react-query'
-import { getQueryClientServer } from '@/context/query-client-server'
+import { makeQueryClient } from '@/context/query-client-server'
 import { serverUserProfileQueryOptions } from '@/features/account-profile/server'
-import { serverSystemFeaturesQueryOptions } from '@/features/system-features/server'
 import { headers } from '@/next/headers'
 import { redirect } from '@/next/navigation'
 import {
@@ -56,7 +55,7 @@ const handleProfileError = async (error: unknown) => {
 }
 
 export async function CommonLayoutHydrationBoundary({ children }: { children: ReactNode }) {
-  const queryClient = getQueryClientServer()
+  const queryClient = makeQueryClient()
   const accountProfileUrl = resolveServerConsoleApiUrl(ACCOUNT_PROFILE_PATH)
 
   if (accountProfileUrl) {
@@ -65,7 +64,6 @@ export async function CommonLayoutHydrationBoundary({ children }: { children: Re
 
       await Promise.all([
         queryClient.fetchQuery(serverUserProfileQueryOptions()),
-        queryClient.prefetchQuery(serverSystemFeaturesQueryOptions()),
         queryClient.prefetchQuery(
           serverConsoleQuery.workspaces.current.post.queryOptions({
             context,

web/app/(shareLayout)/webapp-signin/normalForm.tsx

@@ -6,7 +6,6 @@ import * as React from 'react'
 import { useCallback, useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import Loading from '@/app/components/base/loading'
-import { IS_CE_EDITION } from '@/config'
 import { systemFeaturesQueryOptions } from '@/features/system-features/client'
 import { LicenseStatus } from '@/features/system-features/constants'
 import Link from '@/next/link'
@@ -19,6 +18,9 @@ const NormalForm = () => {
 
   const [isLoading, setIsLoading] = useState(true)
   const { data: systemFeatures } = useSuspenseQuery(systemFeaturesQueryOptions())
+  const isNonCloudEdition =
+    systemFeatures.deployment_edition === 'COMMUNITY' ||
+    systemFeatures.deployment_edition === 'ENTERPRISE'
   const [authType, updateAuthType] = useState<'code' | 'password'>('password')
   const [showORLine, setShowORLine] = useState(false)
   const [allMethodsAreDisabled, setAllMethodsAreDisabled] = useState(false)
@@ -236,7 +238,7 @@ const NormalForm = () => {
                   {t(($) => $.pp, { ns: 'login' })}
                 </Link>
               </div>
-              {IS_CE_EDITION && (
+              {isNonCloudEdition && (
                 <div className="w-hull mt-2 block system-xs-regular text-text-tertiary">
                   {t(($) => $.goToInit, { ns: 'login' })}
                   &nbsp;

web/app/__tests__/error.spec.tsx

@@ -0,0 +1,39 @@
+import { QueryErrorResetBoundary } from '@tanstack/react-query'
+import { render, screen } from '@testing-library/react'
+import userEvent from '@testing-library/user-event'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import CommonLayoutError from '@/app/(commonLayout)/error'
+import AppError from '@/app/error'
+
+describe('route error recovery', () => {
+  afterEach(() => {
+    vi.restoreAllMocks()
+  })
+
+  it.each([
+    {
+      name: 'root error',
+      renderError: (retry: () => void) => <AppError error={new Error('failed')} reset={retry} />,
+    },
+    {
+      name: 'common layout error',
+      renderError: (retry: () => void) => (
+        <CommonLayoutError error={new Error('failed')} unstable_retry={retry} />
+      ),
+    },
+  ])('resets failed queries before retrying the $name', async ({ renderError }) => {
+    const user = userEvent.setup()
+    const retry = vi.fn()
+    vi.spyOn(console, 'error').mockImplementation(() => {})
+
+    render(
+      <QueryErrorResetBoundary>
+        {({ isReset }) => renderError(() => retry(isReset()))}
+      </QueryErrorResetBoundary>,
+    )
+
+    await user.click(screen.getByRole('button', { name: 'common.errorBoundary.tryAgain' }))
+
+    expect(retry).toHaveBeenCalledWith(true)
+  })
+})

web/app/__tests__/layout.spec.tsx

@@ -0,0 +1,69 @@
+import { QueryClient } from '@tanstack/react-query'
+
+let queryClient: QueryClient
+
+const mocks = vi.hoisted(() => ({
+  getSystemFeatures: vi.fn(),
+  getCloudAnalyticsBoundaryState: vi.fn(() => ({ enabled: false })),
+  requestHeaders: new Headers(),
+}))
+
+vi.mock('@/context/query-client-server', () => ({
+  getQueryClientServer: () => queryClient,
+}))
+
+vi.mock('@/env', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('@/env')>()
+
+  return {
+    ...actual,
+    getDatasetMap: () => ({}),
+  }
+})
+
+vi.mock('@/features/system-features/server', () => ({
+  serverSystemFeaturesQueryOptions: () => ({
+    queryKey: ['console', 'system-features'],
+    queryFn: mocks.getSystemFeatures,
+    retry: false,
+  }),
+}))
+
+vi.mock('@/i18n-config/server', () => ({
+  getLocaleOnServer: async () => 'en-US',
+}))
+
+vi.mock('@/next/headers', () => ({
+  headers: async () => mocks.requestHeaders,
+}))
+
+vi.mock('@/app/components/base/analytics-consent/cloud-analytics-state', () => ({
+  getCloudAnalyticsBoundaryState: mocks.getCloudAnalyticsBoundaryState,
+}))
+
+describe('Root layout System Features bootstrap', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    queryClient = new QueryClient({ defaultOptions: { queries: { retry: false } } })
+  })
+
+  it('renders with the resolved deployment edition', async () => {
+    mocks.getSystemFeatures.mockResolvedValue({ deployment_edition: 'CLOUD' })
+    const { default: RootLayout } = await import('../layout')
+
+    await expect(RootLayout({ children: <div>App</div> })).resolves.toBeDefined()
+
+    expect(mocks.getSystemFeatures).toHaveBeenCalledTimes(1)
+    expect(mocks.getCloudAnalyticsBoundaryState).toHaveBeenCalledWith(mocks.requestHeaders, 'CLOUD')
+  })
+
+  it('propagates System Features failures without rendering a fallback', async () => {
+    const error = new Error('system features unavailable')
+    mocks.getSystemFeatures.mockRejectedValue(error)
+    const { default: RootLayout } = await import('../layout')
+
+    await expect(RootLayout({ children: <div>App</div> })).rejects.toBe(error)
+
+    expect(mocks.getCloudAnalyticsBoundaryState).not.toHaveBeenCalled()
+  })
+})

web/app/account/(commonLayout)/account-page/index.tsx

@@ -12,7 +12,7 @@ import AppIcon from '@/app/components/base/app-icon'
 import Input from '@/app/components/base/input'
 import PremiumBadge from '@/app/components/base/premium-badge'
 import Collapse from '@/app/components/header/account-setting/collapse'
-import { IS_CE_EDITION, validPassword } from '@/config'
+import { validPassword } from '@/config'
 import { useProviderContext } from '@/context/provider-context'
 import { userProfileQueryOptions } from '@/features/account-profile/client'
 import { systemFeaturesQueryOptions } from '@/features/system-features/client'
@@ -243,7 +243,7 @@ export default function AccountPage() {
             wrapperClassName="mt-2"
           />
         )}
-        {!IS_CE_EDITION && (
+        {systemFeatures.deployment_edition === 'CLOUD' && (
           <Button
             className="mt-2 text-components-button-destructive-secondary-text"
             onClick={() => setShowDeleteAccountModal(true)}

web/app/auth/refresh/__tests__/route.spec.ts

@@ -4,16 +4,12 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'
 
 const mocks = vi.hoisted(() => ({
   basePath: '',
-  isCloudEdition: false,
 }))
 
 vi.mock('@/config', () => ({
   API_PREFIX: 'http://localhost:5001/console/api',
   CSRF_COOKIE_NAME: () => 'csrf_token',
   CSRF_HEADER_NAME: 'X-CSRF-Token',
-  get IS_CLOUD_EDITION() {
-    return mocks.isCloudEdition
-  },
 }))
 
 vi.mock('server-only', () => ({}))
@@ -52,7 +48,6 @@ describe('auth refresh route', () => {
     vi.resetModules()
     vi.unstubAllGlobals()
     mocks.basePath = ''
-    mocks.isCloudEdition = false
   })
 
   it('should refresh cookies and redirect back to the requested path', async () => {
@@ -244,8 +239,7 @@ describe('auth refresh route', () => {
     expect(response.headers.get('location')).toBe('/signin?redirect_url=%2F')
   })
 
-  it('should keep a Cloud staging fallback on the current deployment after refresh', async () => {
-    mocks.isCloudEdition = true
+  it('should keep a staging fallback on the current deployment after refresh', async () => {
     vi.stubGlobal('fetch', vi.fn().mockResolvedValue(new Response(null, { status: 200 })))
     const { GET } = await import('../route')
 
@@ -260,8 +254,7 @@ describe('auth refresh route', () => {
     expect(response.headers.get('location')).toBe('/')
   })
 
-  it('should carry the current Cloud deployment fallback through signin when refresh fails', async () => {
-    mocks.isCloudEdition = true
+  it('should carry the current deployment fallback through signin when refresh fails', async () => {
     vi.stubGlobal('fetch', vi.fn().mockResolvedValue(new Response(null, { status: 401 })))
     const { GET } = await import('../route')
 
@@ -277,7 +270,6 @@ describe('auth refresh route', () => {
   })
 
   it('should use the current deployment home when a trusted target loops back to auth refresh', async () => {
-    mocks.isCloudEdition = true
     vi.stubGlobal('fetch', vi.fn().mockResolvedValue(new Response(null, { status: 200 })))
     const { GET } = await import('../route')
 

web/app/components/__tests__/external-attribution-recorder.spec.tsx

@@ -6,17 +6,10 @@ import { setAnalyticsConsent } from '@/app/components/base/analytics-consent/con
 import { useSearchParams } from '@/next/navigation'
 import ExternalAttributionRecorder from '../external-attribution-recorder'
 
-const mockConfig = vi.hoisted(() => ({ IS_CLOUD_EDITION: true }))
 const { mockRememberCreateAppExternalAttribution } = vi.hoisted(() => ({
   mockRememberCreateAppExternalAttribution: vi.fn(),
 }))
 
-vi.mock('@/config', () => ({
-  get IS_CLOUD_EDITION() {
-    return mockConfig.IS_CLOUD_EDITION
-  },
-}))
-
 vi.mock('@/next/navigation', () => ({
   useSearchParams: vi.fn(),
 }))
@@ -43,7 +36,6 @@ describe('ExternalAttributionRecorder', () => {
   beforeEach(() => {
     vi.clearAllMocks()
     Cookies.remove('utm_info')
-    mockConfig.IS_CLOUD_EDITION = true
     setAnalyticsConsent('granted')
     setSearchParams()
   })
@@ -150,14 +142,4 @@ describe('ExternalAttributionRecorder', () => {
     })
     expect(mockRememberCreateAppExternalAttribution).toHaveBeenCalledTimes(1)
   })
-
-  it('is a no-op outside the cloud edition', () => {
-    mockConfig.IS_CLOUD_EDITION = false
-    setSearchParams('utm_source=dify_blog&slug=get-started-with-dify')
-
-    render(<ExternalAttributionRecorder />)
-
-    expect(getUtmInfoCookie()).toBeNull()
-    expect(mockRememberCreateAppExternalAttribution).not.toHaveBeenCalled()
-  })
 })

web/app/components/app/app-access-control/__tests__/index.spec.tsx

@@ -35,7 +35,15 @@ vi.mock('@/service/access-control', () => ({
 
 vi.mock('@/service/client', () => ({
   consoleQuery: {
-    systemFeatures: { get: { queryKey: () => ['system-features'] } },
+    systemFeatures: {
+      get: {
+        queryKey: () => ['system-features'],
+        queryOptions: (options: Record<string, unknown> = {}) => ({
+          queryKey: ['system-features'],
+          ...options,
+        }),
+      },
+    },
     enterprise: {
       webAppAuth: {
         updateWebAppWhitelistSubjects: {

web/app/components/app/app-publisher/__tests__/sections.spec.tsx

@@ -1,7 +1,8 @@
 /* oxlint-disable typescript/no-explicit-any */
 import type { ReactNode } from 'react'
-import { fireEvent, render, screen } from '@testing-library/react'
+import { fireEvent, screen } from '@testing-library/react'
 import { AccessMode } from '@/models/access-control'
+import { renderWithConsoleQuery as render } from '@/test/console/query-data'
 import { AppModeEnum } from '@/types/app'
 import {
   AccessModeDisplay,

web/app/components/app/configuration/config-var/__tests__/index.spec.tsx

@@ -3,10 +3,11 @@ import type { IConfigVarProps } from '../index'
 import type { ExternalDataTool } from '@/models/common'
 import type { PromptVariable } from '@/models/debug'
 import { toast } from '@langgenius/dify-ui/toast'
-import { act, fireEvent, render, screen, waitFor, within } from '@testing-library/react'
+import { act, fireEvent, screen, waitFor, within } from '@testing-library/react'
 import * as React from 'react'
 import { vi } from 'vitest'
 import DebugConfigurationContext from '@/context/debug-configuration'
+import { renderWithConsoleQuery as render } from '@/test/console/query-data'
 import { AppModeEnum } from '@/types/app'
 import ConfigVar, { ADD_EXTERNAL_DATA_TOOL } from '../index'
 

web/app/components/app/configuration/config-var/config-modal/__tests__/index.spec.tsx

@@ -1,10 +1,11 @@
 import type { InputVar } from '@/app/components/workflow/types'
 import type { App, AppSSO } from '@/types/app'
 import { toast } from '@langgenius/dify-ui/toast'
-import { fireEvent, render, screen } from '@testing-library/react'
+import { fireEvent, screen } from '@testing-library/react'
 import * as React from 'react'
 import { useStore } from '@/app/components/app/store'
 import { InputVarType } from '@/app/components/workflow/types'
+import { renderWithConsoleQuery as render } from '@/test/console/query-data'
 import { AppModeEnum } from '@/types/app'
 import ConfigModal from '../index'
 

web/app/components/app/configuration/dataset-config/settings-modal/__tests__/index.spec.tsx

@@ -8,7 +8,6 @@ import { IndexingType } from '@/app/components/datasets/create/step-two'
 import { ACCOUNT_SETTING_TAB } from '@/app/components/header/account-setting/constants'
 import { ModelTypeEnum } from '@/app/components/header/account-setting/model-provider-page/declarations'
 import { systemFeaturesQueryOptions } from '@/features/system-features/client'
-import { defaultSystemFeatures } from '@/features/system-features/config'
 import {
   ChunkingMode,
   DatasetPermission,
@@ -18,6 +17,7 @@ import {
 import { updateDatasetSetting } from '@/service/datasets'
 import { useMembers } from '@/service/use-common'
 import { renderWithConsoleQuery as render } from '@/test/console/query-data'
+import { createSystemFeaturesFixture } from '@/test/console/system-features'
 import { RETRIEVE_METHOD } from '@/types/app'
 import { DatasetACLPermission } from '@/utils/permission'
 import SettingsModal from '../index'
@@ -210,7 +210,7 @@ const renderWithProviders = (dataset: DataSet) => {
   const queryClient = new QueryClient({
     defaultOptions: { queries: { retry: false } },
   })
-  queryClient.setQueryData(systemFeaturesQueryOptions().queryKey, defaultSystemFeatures)
+  queryClient.setQueryData(systemFeaturesQueryOptions().queryKey, createSystemFeaturesFixture())
 
   return render(
     <QueryClientProvider client={queryClient}>

web/app/components/app/create-app-dialog/app-card/__tests__/index.spec.tsx

@@ -1,22 +1,18 @@
+import type { ReactElement } from 'react'
 import type { App } from '@/models/explore'
 import type { AppIconType } from '@/types/app'
 import { screen } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
 import { trackEvent } from '@/app/components/base/amplitude'
 import AppListContext from '@/context/app-list-context'
-import { renderWithConsoleQuery as render } from '@/test/console/query-data'
+import { renderWithConsoleQuery } from '@/test/console/query-data'
 import { AppModeEnum } from '@/types/app'
 import AppCard from '../index'
 
 vi.mock('@/app/components/base/amplitude', () => ({ trackEvent: vi.fn() }))
 
-const mockConfig = vi.hoisted(() => ({ isCloudEdition: true }))
-vi.mock('@/config', async (importOriginal) => ({
-  ...(await importOriginal<typeof import('@/config')>()),
-  get IS_CLOUD_EDITION() {
-    return mockConfig.isCloudEdition
-  },
-}))
+const render = (ui: ReactElement) =>
+  renderWithConsoleQuery(ui, { systemFeatures: { deployment_edition: 'CLOUD' } })
 
 const app: App = {
   can_trial: true,
@@ -47,7 +43,6 @@ const app: App = {
 
 describe('AppCard', () => {
   beforeEach(() => {
-    mockConfig.isCloudEdition = true
     vi.clearAllMocks()
   })
 

web/app/components/app/create-app-dialog/app-card/index.tsx

@@ -4,13 +4,14 @@ import { PlusIcon } from '@heroicons/react/20/solid'
 import { Button } from '@langgenius/dify-ui/button'
 import { cn } from '@langgenius/dify-ui/cn'
 import { RiInformation2Line } from '@remixicon/react'
+import { useSuspenseQuery } from '@tanstack/react-query'
 import { useCallback } from 'react'
 import { useTranslation } from 'react-i18next'
 import { useContextSelector } from 'use-context-selector'
 import { trackEvent } from '@/app/components/base/amplitude'
 import AppIcon from '@/app/components/base/app-icon'
-import { IS_CLOUD_EDITION } from '@/config'
 import AppListContext from '@/context/app-list-context'
+import { systemFeaturesQueryOptions } from '@/features/system-features/client'
 import { AppTypeIcon, AppTypeLabel } from '../../type-selector'
 
 type AppCardProps = {
@@ -21,8 +22,12 @@ type AppCardProps = {
 
 const AppCard = ({ app, canCreate, onCreate }: AppCardProps) => {
   const { t } = useTranslation()
+  const { data: deploymentEdition } = useSuspenseQuery({
+    ...systemFeaturesQueryOptions(),
+    select: ({ deployment_edition }) => deployment_edition,
+  })
   const { app: appBasicInfo } = app
-  const canViewApp = IS_CLOUD_EDITION
+  const canViewApp = deploymentEdition === 'CLOUD'
   const setShowTryAppPanel = useContextSelector(AppListContext, (ctx) => ctx.setShowTryAppPanel)
   const handleShowTryAppPanel = useCallback(() => {
     trackEvent('preview_template', {

web/app/components/app/in-site-message/__tests__/notification.spec.tsx

@@ -3,27 +3,26 @@ import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
 import { fireEvent, render, screen, waitFor } from '@testing-library/react'
 import InSiteMessageNotification from '../notification'
 
-const { mockConfig, mockNotification, mockNotificationDismiss } = vi.hoisted(() => ({
-  mockConfig: {
-    isCloudEdition: true,
+const { mockEdition, mockNotification, mockNotificationDismiss } = vi.hoisted(() => ({
+  mockEdition: {
+    value: 'CLOUD' as 'COMMUNITY' | 'ENTERPRISE' | 'CLOUD' | null,
   },
   mockNotification: vi.fn(),
   mockNotificationDismiss: vi.fn(),
 }))
 
-vi.mock(import('@/config'), async (importOriginal) => {
-  const actual = await importOriginal()
-
-  return {
-    ...actual,
-    get IS_CLOUD_EDITION() {
-      return mockConfig.isCloudEdition
-    },
-  }
-})
-
 vi.mock('@/service/client', () => ({
   consoleQuery: {
+    systemFeatures: {
+      get: {
+        queryKey: () => ['console', 'systemFeatures', 'get'],
+        queryOptions: (options?: Record<string, unknown>) => ({
+          queryKey: ['console', 'systemFeatures', 'get'],
+          queryFn: () => new Promise(() => {}),
+          ...options,
+        }),
+      },
+    },
     notification: {
       get: {
         queryOptions: (options?: Record<string, unknown>) => ({
@@ -56,6 +55,9 @@ const createWrapper = () => {
       },
     },
   })
+  queryClient.setQueryData(['console', 'systemFeatures', 'get'], {
+    deployment_edition: mockEdition.value,
+  })
 
   const Wrapper = ({ children }: { children: ReactNode }) => (
     <QueryClientProvider client={queryClient}>{children}</QueryClientProvider>
@@ -67,7 +69,7 @@ const createWrapper = () => {
 describe('InSiteMessageNotification', () => {
   beforeEach(() => {
     vi.clearAllMocks()
-    mockConfig.isCloudEdition = true
+    mockEdition.value = 'CLOUD'
     vi.stubGlobal('open', vi.fn())
   })
 
@@ -78,7 +80,7 @@ describe('InSiteMessageNotification', () => {
   // Validate query gating and empty state rendering.
   describe('Rendering', () => {
     it('should render null and skip query when not cloud edition', async () => {
-      mockConfig.isCloudEdition = false
+      mockEdition.value = 'COMMUNITY'
       const Wrapper = createWrapper()
       const { container } = render(<InSiteMessageNotification />, { wrapper: Wrapper })
 

web/app/components/app/in-site-message/notification.tsx

@@ -1,9 +1,9 @@
 'use client'
 
 import type { InSiteMessageActionItem } from './index'
-import { useMutation, useQuery } from '@tanstack/react-query'
+import { useMutation, useQuery, useSuspenseQuery } from '@tanstack/react-query'
 import { useTranslation } from 'react-i18next'
-import { IS_CLOUD_EDITION } from '@/config'
+import { systemFeaturesQueryOptions } from '@/features/system-features/client'
 import { consoleQuery } from '@/service/client'
 import InSiteMessage from './index'
 
@@ -56,20 +56,25 @@ function parseNotificationBody(body: string): NotificationBodyPayload | null {
 
 function InSiteMessageNotification() {
   const { t } = useTranslation()
+  const { data: deploymentEdition } = useSuspenseQuery({
+    ...systemFeaturesQueryOptions(),
+    select: ({ deployment_edition }) => deployment_edition,
+  })
+  const isCloudEdition = deploymentEdition === 'CLOUD'
   const dismissNotificationMutation = useMutation(
     consoleQuery.notification.dismiss.post.mutationOptions(),
   )
 
   const { data } = useQuery(
     consoleQuery.notification.get.queryOptions({
-      enabled: IS_CLOUD_EDITION,
+      enabled: isCloudEdition,
     }),
   )
 
   const notification = data?.notifications?.[0]
   const parsedBody = notification ? parseNotificationBody(notification.body) : null
 
-  if (!IS_CLOUD_EDITION || !notification || !notification.notification_id) return null
+  if (!isCloudEdition || !notification || !notification.notification_id) return null
 
   const notificationId = notification.notification_id
   const fallbackActions: InSiteMessageActionItem[] = [

web/app/components/app/log/__tests__/archived-logs-notice.spec.tsx

@@ -5,17 +5,10 @@ import { Plan } from '@/app/components/billing/type'
 import { ACCOUNT_SETTING_TAB } from '@/app/components/header/account-setting/constants'
 import { useModalContextSelector } from '@/context/modal-context'
 import { useProviderContext } from '@/context/provider-context'
+import { createConsoleQueryWrapper } from '@/test/console/query-data'
 import { render } from '@/test/console/render'
 import { ArchivedLogsNotice } from '../archived-logs-notice'
 
-vi.mock('@/config', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('@/config')>()
-  return {
-    ...actual,
-    IS_CLOUD_EDITION: true,
-  }
-})
-
 vi.mock('@/context/workspace-state', async () => {
   const { createWorkspaceStateModuleMock } = await import('@/test/console/state-fixture')
 
@@ -57,6 +50,12 @@ function mockProviderPlan(planType: Plan) {
 
 describe('ArchivedLogsNotice', () => {
   const setShowAccountSettingModal = vi.fn()
+  const renderNotice = () => {
+    const { wrapper } = createConsoleQueryWrapper({
+      systemFeatures: { deployment_edition: 'CLOUD' },
+    })
+    return render(<ArchivedLogsNotice />, { wrapper })
+  }
 
   beforeEach(() => {
     vi.clearAllMocks()
@@ -69,7 +68,7 @@ describe('ArchivedLogsNotice', () => {
   })
 
   it('should show notice for paid workspace managers', () => {
-    render(<ArchivedLogsNotice />)
+    renderNotice()
 
     expect(screen.getByText('appLog.archives.notice.description')).toBeInTheDocument()
     fireEvent.click(screen.getByRole('button', { name: 'appLog.archives.notice.action' }))
@@ -81,7 +80,7 @@ describe('ArchivedLogsNotice', () => {
   it('should not show notice for sandbox workspaces', () => {
     mockProviderPlan(Plan.sandbox)
 
-    render(<ArchivedLogsNotice />)
+    renderNotice()
 
     expect(screen.queryByText('appLog.archives.notice.description')).not.toBeInTheDocument()
   })

web/app/components/app/log/archived-logs-notice.tsx

@@ -1,16 +1,21 @@
 'use client'
 
+import { useSuspenseQuery } from '@tanstack/react-query'
 import { useAtomValue } from 'jotai'
 import { useTranslation } from 'react-i18next'
 import { Plan } from '@/app/components/billing/type'
 import { ACCOUNT_SETTING_TAB } from '@/app/components/header/account-setting/constants'
-import { IS_CLOUD_EDITION } from '@/config'
 import { useModalContextSelector } from '@/context/modal-context'
 import { useProviderContext } from '@/context/provider-context'
 import { isCurrentWorkspaceManagerAtom } from '@/context/workspace-state'
+import { systemFeaturesQueryOptions } from '@/features/system-features/client'
 
 export function ArchivedLogsNotice() {
   const { t } = useTranslation()
+  const { data: deploymentEdition } = useSuspenseQuery({
+    ...systemFeaturesQueryOptions(),
+    select: ({ deployment_edition }) => deployment_edition,
+  })
   const isCurrentWorkspaceManager = useAtomValue(isCurrentWorkspaceManagerAtom)
   const { enableBilling, plan } = useProviderContext()
   const setShowAccountSettingModal = useModalContextSelector(
@@ -18,7 +23,7 @@ export function ArchivedLogsNotice() {
   )
 
   if (
-    !IS_CLOUD_EDITION ||
+    deploymentEdition !== 'CLOUD' ||
     !isCurrentWorkspaceManager ||
     !enableBilling ||
     plan.type === Plan.sandbox

web/app/components/app/overview/__tests__/app-card-utils.spec.ts

@@ -313,6 +313,7 @@ describe('app-card-utils', () => {
     expect(snippet).toContain('name: "Alice"')
     expect(snippet).toContain('count: "5"')
     expect(snippet).toContain('background-color: #FF0000')
+    expect(snippet).toContain(`baseUrl: 'https://example.com${basePath}'`)
   })
 
   it('should generate an embedded script snippet with empty inputs comment', () => {

web/app/components/app/overview/apikey-info-panel/__tests__/cloud.spec.tsx

@@ -5,10 +5,9 @@ import {
   interactions,
   mockUseModalContext,
   scenarios,
+  setDeploymentEdition,
 } from './test-utils'
 
-vi.mock('@/config', () => ({ IS_CE_EDITION: false }))
-
 afterEach(cleanup)
 
 describe('APIKeyInfoPanel - Cloud Edition', () => {
@@ -16,6 +15,7 @@ describe('APIKeyInfoPanel - Cloud Edition', () => {
 
   beforeEach(() => {
     clearAllMocks()
+    setDeploymentEdition('CLOUD')
     mockUseModalContext.mockReturnValue({
       ...defaultModalContext,
       setShowAccountSettingModal,

web/app/components/app/overview/apikey-info-panel/__tests__/index.spec.tsx

@@ -5,11 +5,10 @@ import {
   interactions,
   mockUseModalContext,
   scenarios,
+  setDeploymentEdition,
   textKeys,
 } from './test-utils'
 
-vi.mock('@/config', () => ({ IS_CE_EDITION: true }))
-
 afterEach(cleanup)
 
 describe('APIKeyInfoPanel - Community Edition', () => {
@@ -17,6 +16,7 @@ describe('APIKeyInfoPanel - Community Edition', () => {
 
   beforeEach(() => {
     clearAllMocks()
+    setDeploymentEdition('COMMUNITY')
     mockUseModalContext.mockReturnValue({
       ...defaultModalContext,
       setShowAccountSettingModal,

web/app/components/app/overview/apikey-info-panel/__tests__/test-utils.tsx

@@ -1,7 +1,8 @@
+import type { DeploymentEdition } from '@dify/contracts/api/console/system-features/types.gen'
 import type { RenderOptions } from '@testing-library/react'
 import type { Mock, MockedFunction } from 'vitest'
 import type { ModalContextState } from '@/context/modal-context'
-import { fireEvent, render, screen } from '@testing-library/react'
+import { fireEvent, screen } from '@testing-library/react'
 import { noop } from 'es-toolkit/function'
 import { defaultPlan } from '@/app/components/billing/config'
 import {
@@ -9,6 +10,7 @@ import {
   useModalContextSelector as actualUseModalContextSelector,
 } from '@/context/modal-context'
 import { useProviderContext as actualUseProviderContext } from '@/context/provider-context'
+import { renderWithConsoleQuery } from '@/test/console/query-data'
 import APIKeyInfoPanel from '../index'
 
 const { mockRouterPush } = vi.hoisted(() => ({
@@ -102,6 +104,7 @@ type APIKeyInfoPanelRenderOptions = {
 } & Omit<RenderOptions, 'wrapper'>
 
 const mainButtonName = /appOverview\.apiKeyInfo\.setAPIBtn/
+let deploymentEdition: DeploymentEdition = 'COMMUNITY'
 
 // Setup function to configure mocks
 function setupMocks(overrides: MockOverrides = {}) {
@@ -129,7 +132,10 @@ function renderAPIKeyInfoPanel(options: APIKeyInfoPanelRenderOptions = {}) {
 
   setupMocks(mockOverrides)
 
-  return render(<APIKeyInfoPanel />, renderOptions)
+  return renderWithConsoleQuery(<APIKeyInfoPanel />, {
+    ...renderOptions,
+    systemFeatures: { deployment_edition: deploymentEdition },
+  })
 }
 
 // Helper functions for common test scenarios
@@ -200,5 +206,9 @@ export function clearAllMocks() {
   vi.clearAllMocks()
 }
 
+export function setDeploymentEdition(value: DeploymentEdition) {
+  deploymentEdition = value
+}
+
 // Export mock functions for external access
 export { defaultModalContext, mockUseModalContext }

web/app/components/app/overview/apikey-info-panel/index.tsx

@@ -3,17 +3,22 @@ import type { FC } from 'react'
 import { Button } from '@langgenius/dify-ui/button'
 import { cn } from '@langgenius/dify-ui/cn'
 import { RiCloseLine } from '@remixicon/react'
+import { useSuspenseQuery } from '@tanstack/react-query'
 import * as React from 'react'
 import { useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { LinkExternal02 } from '@/app/components/base/icons/src/vender/line/general'
 import { ACCOUNT_SETTING_TAB } from '@/app/components/header/account-setting/constants'
 import { useIntegrationsSetting } from '@/app/components/header/account-setting/use-integrations-setting'
-import { IS_CE_EDITION } from '@/config'
 import { useProviderContext } from '@/context/provider-context'
+import { systemFeaturesQueryOptions } from '@/features/system-features/client'
 
 const APIKeyInfoPanel: FC = () => {
-  const isCloud = !IS_CE_EDITION
+  const { data: deploymentEdition } = useSuspenseQuery({
+    ...systemFeaturesQueryOptions(),
+    select: ({ deployment_edition }) => deployment_edition,
+  })
+  const isCloud = deploymentEdition === 'CLOUD'
 
   const { isAPIKeySet } = useProviderContext()
   const openIntegrationsSetting = useIntegrationsSetting()

web/app/components/app/overview/app-card-utils.ts

@@ -2,7 +2,6 @@ import type { InputVar } from '@/app/components/workflow/types'
 import type { AppDetailResponse } from '@/models/app'
 import type { AppSSO } from '@/types/app'
 import { BlockEnum, InputVarType } from '@/app/components/workflow/types'
-import { IS_CE_EDITION } from '@/config'
 import { AccessMode } from '@/models/access-control'
 import { AppModeEnum } from '@/types/app'
 import { basePath } from '@/utils/var'
@@ -177,20 +176,16 @@ export const getEmbeddedScriptSnippet = ({
   primaryColor: string
   isTestEnv?: boolean
   inputValues: Record<string, WorkflowLaunchInputValue>
-}) =>
-  `<script>
+}) => {
+  return `<script>
  window.difyChatbotConfig = {
   token: '${token}'${
     isTestEnv
       ? `,
   isDev: true`
       : ''
-  }${
-    IS_CE_EDITION
-      ? `,
-  baseUrl: '${url}${basePath}'`
-      : ''
-  }${
+  },
+  baseUrl: '${url}${basePath}'${
     webAppRoute !== 'chatbot'
       ? `,
   routeSegment: '${webAppRoute}'`
@@ -221,6 +216,7 @@ export const getEmbeddedScriptSnippet = ({
     height: 40rem !important;
   }
 </style>`
+}
 
 export const getChromePluginContent = (iframeUrl: string) => `ChatBot URL: ${iframeUrl}`
 

web/app/components/apps/__tests__/list.spec.tsx

@@ -105,6 +105,10 @@ vi.mock('@/service/client', () => ({
     systemFeatures: {
       get: {
         queryKey: () => ['console', 'systemFeatures', 'get'],
+        queryOptions: (options: Record<string, unknown> = {}) => ({
+          queryKey: ['console', 'systemFeatures', 'get'],
+          ...options,
+        }),
       },
     },
   },

web/app/components/base/amplitude/__tests__/AmplitudeProvider.spec.tsx

@@ -5,7 +5,6 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'
 
 const mockConfig = vi.hoisted(() => ({
   AMPLITUDE_API_KEY: 'test-api-key',
-  IS_CLOUD_EDITION: true,
 }))
 const mockConsent = vi.hoisted(() => ({
   value: 'granted' as 'unknown' | 'denied' | 'granted',
@@ -17,12 +16,6 @@ vi.mock('@/config', () => ({
   get AMPLITUDE_API_KEY() {
     return mockConfig.AMPLITUDE_API_KEY
   },
-  get IS_CLOUD_EDITION() {
-    return mockConfig.IS_CLOUD_EDITION
-  },
-  get isAmplitudeEnabled() {
-    return mockConfig.IS_CLOUD_EDITION && !!mockConfig.AMPLITUDE_API_KEY
-  },
 }))
 
 vi.mock('@amplitude/analytics-browser', () => ({
@@ -44,7 +37,6 @@ describe('AmplitudeProvider', () => {
     vi.resetModules()
     vi.clearAllMocks()
     mockConfig.AMPLITUDE_API_KEY = 'test-api-key'
-    mockConfig.IS_CLOUD_EDITION = true
     mockConsent.value = 'granted'
     ;({ AmplitudeProvider } = await import('../AmplitudeProvider'))
   })

web/app/components/base/amplitude/__tests__/init.spec.ts

@@ -4,7 +4,6 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'
 
 const mockConfig = vi.hoisted(() => ({
   AMPLITUDE_API_KEY: 'test-api-key',
-  IS_CLOUD_EDITION: true,
 }))
 
 let ensureAmplitudeInitialized: typeof import('../init').ensureAmplitudeInitialized
@@ -13,12 +12,6 @@ vi.mock('@/config', () => ({
   get AMPLITUDE_API_KEY() {
     return mockConfig.AMPLITUDE_API_KEY
   },
-  get IS_CLOUD_EDITION() {
-    return mockConfig.IS_CLOUD_EDITION
-  },
-  get isAmplitudeEnabled() {
-    return mockConfig.IS_CLOUD_EDITION && !!mockConfig.AMPLITUDE_API_KEY
-  },
 }))
 
 vi.mock('@amplitude/analytics-browser', () => ({
@@ -36,7 +29,6 @@ describe('amplitude init helper', () => {
     vi.resetModules()
     vi.clearAllMocks()
     mockConfig.AMPLITUDE_API_KEY = 'test-api-key'
-    mockConfig.IS_CLOUD_EDITION = true
     ;({ ensureAmplitudeInitialized } = await import('../init'))
   })
 

web/app/components/base/amplitude/__tests__/utils.spec.ts

@@ -2,7 +2,6 @@ import { flushEvents, resetUser, setUserId, setUserProperties, trackEvent } from
 
 const mockState = vi.hoisted(() => ({
   consent: 'granted' as 'unknown' | 'denied' | 'granted',
-  enabled: true,
   initialized: true,
 }))
 
@@ -24,12 +23,6 @@ const MockIdentify = vi.hoisted(
     },
 )
 
-vi.mock('@/config', () => ({
-  get isAmplitudeEnabled() {
-    return mockState.enabled
-  },
-}))
-
 vi.mock('@/app/components/base/analytics-consent/consent-store', () => ({
   getAnalyticsConsent: () => mockState.consent,
 }))
@@ -51,12 +44,11 @@ describe('amplitude utils', () => {
   beforeEach(() => {
     vi.clearAllMocks()
     mockState.consent = 'granted'
-    mockState.enabled = true
     mockState.initialized = true
   })
 
   describe('trackEvent', () => {
-    it('should call amplitude.track and return its result when amplitude is enabled', () => {
+    it('should call amplitude.track and return its result when the consented SDK is initialized', () => {
       const trackResult = { promise: Promise.resolve({}) }
       mockTrack.mockReturnValue(trackResult)
 
@@ -67,8 +59,8 @@ describe('amplitude utils', () => {
       expect(result).toBe(trackResult)
     })
 
-    it('should not call amplitude.track when amplitude is disabled', () => {
-      mockState.enabled = false
+    it('should not call amplitude.track before the SDK initializes', () => {
+      mockState.initialized = false
 
       trackEvent('dataset_created', { source: 'wizard' })
 
@@ -93,7 +85,7 @@ describe('amplitude utils', () => {
   })
 
   describe('flushEvents', () => {
-    it('should call amplitude.flush and return its result when amplitude is enabled', () => {
+    it('should call amplitude.flush and return its result when the consented SDK is initialized', () => {
       const flushResult = { promise: Promise.resolve() }
       mockFlush.mockReturnValue(flushResult)
 
@@ -103,8 +95,8 @@ describe('amplitude utils', () => {
       expect(result).toBe(flushResult)
     })
 
-    it('should not call amplitude.flush when amplitude is disabled', () => {
-      mockState.enabled = false
+    it('should not call amplitude.flush before the SDK initializes', () => {
+      mockState.initialized = false
 
       flushEvents()
 
@@ -121,15 +113,15 @@ describe('amplitude utils', () => {
   })
 
   describe('setUserId', () => {
-    it('should call amplitude.setUserId when amplitude is enabled', () => {
+    it('should call amplitude.setUserId when the consented SDK is initialized', () => {
       setUserId('user-123')
 
       expect(mockSetUserId).toHaveBeenCalledTimes(1)
       expect(mockSetUserId).toHaveBeenCalledWith('user-123')
     })
 
-    it('should not call amplitude.setUserId when amplitude is disabled', () => {
-      mockState.enabled = false
+    it('should not call amplitude.setUserId before the SDK initializes', () => {
+      mockState.initialized = false
 
       setUserId('user-123')
 
@@ -146,7 +138,7 @@ describe('amplitude utils', () => {
   })
 
   describe('setUserProperties', () => {
-    it('should build identify event and call amplitude.identify when amplitude is enabled', () => {
+    it('should build an identify event when the consented SDK is initialized', () => {
       const properties = {
         role: 'owner',
         seats: 3,
@@ -165,8 +157,8 @@ describe('amplitude utils', () => {
       ])
     })
 
-    it('should not call amplitude.identify when amplitude is disabled', () => {
-      mockState.enabled = false
+    it('should not call amplitude.identify before the SDK initializes', () => {
+      mockState.initialized = false
 
       setUserProperties({ role: 'owner' })
 
@@ -183,14 +175,14 @@ describe('amplitude utils', () => {
   })
 
   describe('resetUser', () => {
-    it('should call amplitude.reset when amplitude is enabled', () => {
+    it('should call amplitude.reset when the consented SDK is initialized', () => {
       resetUser()
 
       expect(mockReset).toHaveBeenCalledTimes(1)
     })
 
-    it('should not call amplitude.reset when amplitude is disabled', () => {
-      mockState.enabled = false
+    it('should not call amplitude.reset before the SDK initializes', () => {
+      mockState.initialized = false
 
       resetUser()
 

web/app/components/base/amplitude/init.ts

@@ -1,6 +1,6 @@
 import * as amplitude from '@amplitude/analytics-browser'
 import { sessionReplayPlugin } from '@amplitude/plugin-session-replay-browser'
-import { AMPLITUDE_API_KEY, isAmplitudeEnabled } from '@/config'
+import { AMPLITUDE_API_KEY } from '@/config'
 
 export type AmplitudeInitializationOptions = {
   sessionReplaySampleRate?: number
@@ -61,7 +61,7 @@ const createPageNameEnrichmentPlugin = (): amplitude.Types.EnrichmentPlugin => {
 export const ensureAmplitudeInitialized = ({
   sessionReplaySampleRate = 0.5,
 }: AmplitudeInitializationOptions = {}) => {
-  if (!isAmplitudeEnabled || isAmplitudeInitialized) return
+  if (!AMPLITUDE_API_KEY || isAmplitudeInitialized) return
 
   isAmplitudeInitialized = true
 
@@ -90,6 +90,6 @@ export const ensureAmplitudeInitialized = ({
 }
 
 export const setAmplitudeOptOut = (optOut: boolean) => {
-  if (!isAmplitudeEnabled || !isAmplitudeInitialized) return
+  if (!AMPLITUDE_API_KEY || !isAmplitudeInitialized) return
   amplitude.setOptOut(optOut)
 }

web/app/components/base/amplitude/utils.ts

@@ -1,10 +1,8 @@
 import * as amplitude from '@amplitude/analytics-browser'
 import { getAnalyticsConsent } from '@/app/components/base/analytics-consent/consent-store'
-import { isAmplitudeEnabled } from '@/config'
 import { getIsAmplitudeInitialized } from './init'
 
-const canUseAmplitude = () =>
-  isAmplitudeEnabled && getAnalyticsConsent() === 'granted' && getIsAmplitudeInitialized()
+const canUseAmplitude = () => getAnalyticsConsent() === 'granted' && getIsAmplitudeInitialized()
 
 /**
  * Track custom event

web/app/components/base/analytics-consent/__tests__/cloud-analytics-boundary.spec.tsx

@@ -3,7 +3,6 @@ import { render } from '@testing-library/react'
 
 type ConfigState = {
   cookieYesSiteKey: string
-  isCloudEdition: boolean
   isProd: boolean
   webPrefix: string | undefined
 }
@@ -11,7 +10,6 @@ type ConfigState = {
 const { configState, mockHeadersGet } = vi.hoisted(() => ({
   configState: {
     cookieYesSiteKey: 'site-key',
-    isCloudEdition: true,
     isProd: true,
     webPrefix: 'https://cloud.dify.ai',
   } as ConfigState,
@@ -22,9 +20,6 @@ vi.mock('@/config', () => ({
   get COOKIEYES_SITE_KEY() {
     return configState.cookieYesSiteKey
   },
-  get IS_CLOUD_EDITION() {
-    return configState.isCloudEdition
-  },
   get IS_PROD() {
     return configState.isProd
   },
@@ -62,7 +57,7 @@ async function renderBoundary() {
     import('../cloud-analytics-boundary'),
     import('../cloud-analytics-state'),
   ])
-  const state = getCloudAnalyticsBoundaryState({ get: mockHeadersGet })
+  const state = getCloudAnalyticsBoundaryState({ get: mockHeadersGet }, 'CLOUD')
   const view = render(<CloudAnalyticsBoundary {...state} />)
   return { ...view, state }
 }
@@ -72,7 +67,6 @@ describe('CloudAnalyticsBoundary', () => {
     vi.clearAllMocks()
     vi.resetModules()
     configState.cookieYesSiteKey = 'site-key'
-    configState.isCloudEdition = true
     configState.isProd = true
     configState.webPrefix = 'https://cloud.dify.ai'
     mockHeadersGet.mockImplementation((name: string) => {
@@ -143,4 +137,17 @@ describe('CloudAnalyticsBoundary', () => {
     expect(state.enabled).toBe(false)
     expect(container.querySelector('script')).toBeNull()
   })
+
+  it.each(['COMMUNITY', 'ENTERPRISE', null] as const)(
+    'disables analytics when deployment edition is %s',
+    async (deploymentEdition) => {
+      const { CloudAnalyticsBoundary } = await import('../cloud-analytics-boundary')
+      const { getCloudAnalyticsBoundaryState } = await import('../cloud-analytics-state')
+      const state = getCloudAnalyticsBoundaryState({ get: mockHeadersGet }, deploymentEdition)
+      const { container } = render(<CloudAnalyticsBoundary {...state} />)
+
+      expect(state.enabled).toBe(false)
+      expect(container.querySelector('script')).toBeNull()
+    },
+  )
 })

web/app/components/base/analytics-consent/__tests__/cloud-analytics-runtime.spec.tsx

@@ -17,6 +17,10 @@ vi.mock('@/app/components/base/amplitude', () => ({
   ),
 }))
 
+vi.mock('@/app/components/external-attribution-recorder', () => ({
+  default: () => <span data-testid="external-attribution-recorder" />,
+}))
+
 describe('CloudAnalyticsRuntime', () => {
   beforeEach(() => {
     mockState.pathname = '/signin'
@@ -26,6 +30,7 @@ describe('CloudAnalyticsRuntime', () => {
     const { rerender } = render(<CloudAnalyticsRuntime />)
 
     expect(screen.getByTestId('cookieyes-consent-bridge')).toBeInTheDocument()
+    expect(screen.getByTestId('external-attribution-recorder')).toBeInTheDocument()
     expect(screen.getByTestId('amplitude-provider')).toHaveAttribute('data-active', 'true')
 
     mockState.pathname = '/integrations'

web/app/components/base/analytics-consent/cloud-analytics-runtime.tsx

@@ -1,6 +1,7 @@
 'use client'
 
 import AmplitudeProvider from '@/app/components/base/amplitude'
+import ExternalAttributionRecorder from '@/app/components/external-attribution-recorder'
 import { usePathname } from '@/next/navigation'
 import { CookieYesConsentBridge } from './cookieyes-consent-bridge'
 import { isCloudAnalyticsPath } from './request-boundary'
@@ -12,6 +13,7 @@ export function CloudAnalyticsRuntime() {
     <>
       <CookieYesConsentBridge />
       <AmplitudeProvider active={isCloudAnalyticsPath(pathname)} />
+      <ExternalAttributionRecorder />
     </>
   )
 }

web/app/components/base/analytics-consent/cloud-analytics-state.ts

@@ -1,4 +1,5 @@
-import { COOKIEYES_SITE_KEY, IS_CLOUD_EDITION, IS_PROD, WEB_PREFIX } from '@/config'
+import type { DeploymentEdition } from '@dify/contracts/api/console/system-features/types.gen'
+import { COOKIEYES_SITE_KEY, IS_PROD, WEB_PREFIX } from '@/config'
 import { isCloudAnalyticsRequest } from './request-boundary'
 
 const CURRENT_PATHNAME_HEADER = 'x-dify-pathname'
@@ -15,12 +16,13 @@ export type CloudAnalyticsBoundaryState = {
 
 export function getCloudAnalyticsBoundaryState(
   requestHeaders: RequestHeaders,
+  deploymentEdition: DeploymentEdition | null,
 ): CloudAnalyticsBoundaryState {
   const pathname = requestHeaders.get(CURRENT_PATHNAME_HEADER) || '/'
   const requestHost = requestHeaders.get('x-forwarded-host') || requestHeaders.get('host')
   const enabled = isCloudAnalyticsRequest({
     cookieYesSiteKey: COOKIEYES_SITE_KEY,
-    isCloudEdition: IS_CLOUD_EDITION,
+    isCloudEdition: deploymentEdition === 'CLOUD',
     isProd: IS_PROD,
     pathname,
     requestHost,

web/app/components/base/features/new-feature-panel/moderation/__tests__/moderation-setting-modal.spec.tsx

@@ -1,7 +1,8 @@
 import type { ModerationConfig } from '@/models/debug'
-import { act, fireEvent, render, screen } from '@testing-library/react'
+import { act, fireEvent, screen } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
 import * as i18n from 'react-i18next'
+import { renderWithConsoleQuery as render } from '@/test/console/query-data'
 import { withSelectorKey } from '@/test/i18n-mock'
 import ModerationSettingModal from '../moderation-setting-modal'
 
@@ -77,7 +78,7 @@ const defaultData: ModerationConfig = {
 
 describe('ModerationSettingModal', () => {
   const onSave = vi.fn()
-  const renderModal = async (ui: React.ReactNode) => {
+  const renderModal = async (ui: React.ReactElement) => {
     await act(async () => {
       render(ui)
       await Promise.resolve()

web/app/components/base/zendesk/__tests__/index.spec.tsx

@@ -4,7 +4,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'
 import Zendesk from '../index'
 
 // Shared state for mocks
-let mockIsCeEdition = false
+let mockDeploymentEdition: 'COMMUNITY' | 'ENTERPRISE' | 'CLOUD' | null = 'CLOUD'
 let mockZendeskWidgetKey: string | undefined = 'test-key'
 let mockIsProd = false
 let mockNonce: string | null = 'test-nonce'
@@ -18,11 +18,7 @@ vi.mock('react', async (importOriginal) => {
   }
 })
 
-// Mock config
 vi.mock('@/config', () => ({
-  get IS_CE_EDITION() {
-    return mockIsCeEdition
-  },
   get ZENDESK_WIDGET_KEY() {
     return mockZendeskWidgetKey
   },
@@ -31,6 +27,16 @@ vi.mock('@/config', () => ({
   },
 }))
 
+vi.mock('@/context/query-client-server', () => ({
+  getQueryClientServer: () => ({
+    ensureQueryData: vi.fn(async () => ({ deployment_edition: mockDeploymentEdition })),
+  }),
+}))
+
+vi.mock('@/features/system-features/server', () => ({
+  serverSystemFeaturesQueryOptions: vi.fn(() => ({})),
+}))
+
 // Mock next/headers
 vi.mock('@/next/headers', () => ({
   headers: vi.fn(() => ({
@@ -61,7 +67,7 @@ vi.mock('@/next/script', () => ({
 describe('Zendesk', () => {
   beforeEach(() => {
     vi.clearAllMocks()
-    mockIsCeEdition = false
+    mockDeploymentEdition = 'CLOUD'
     mockZendeskWidgetKey = 'test-key'
     mockIsProd = false
     mockNonce = 'test-nonce'
@@ -73,11 +79,14 @@ describe('Zendesk', () => {
     return await Component()
   }
 
-  it('should render nothing when IS_CE_EDITION is true', async () => {
-    mockIsCeEdition = true
-    const result = await renderZendesk()
-    expect(result).toBeNull()
-  })
+  it.each(['COMMUNITY', 'ENTERPRISE', null] as const)(
+    'should render nothing when deployment edition is %s',
+    async (deploymentEdition) => {
+      mockDeploymentEdition = deploymentEdition
+      const result = await renderZendesk()
+      expect(result).toBeNull()
+    },
+  )
 
   it('should render nothing when ZENDESK_WIDGET_KEY is missing', async () => {
     mockZendeskWidgetKey = undefined

web/app/components/base/zendesk/__tests__/utils.spec.ts

@@ -1,32 +1,27 @@
+import { openZendeskWindow, setZendeskConversationFields } from '../utils'
+
 describe('zendesk/utils', () => {
-  // Create mock for window.zE
   const mockZE = vi.fn()
 
   beforeEach(() => {
-    vi.resetModules()
     vi.clearAllMocks()
-    // Set up window.zE mock before each test
     window.zE = mockZE
   })
 
   afterEach(() => {
     vi.useRealTimers()
-    // Clean up window.zE after each test
     window.zE = mockZE
   })
 
   describe('setZendeskConversationFields', () => {
-    it('should call window.zE with correct arguments when not CE edition and zE exists', async () => {
-      vi.doMock('@/config', () => ({ IS_CE_EDITION: false }))
-      const { setZendeskConversationFields } = await import('../utils')
-
+    it('sets conversation fields in Cloud when zE exists', () => {
       const fields = [
         { id: 'field1', value: 'value1' },
         { id: 'field2', value: 'value2' },
       ]
       const callback = vi.fn()
 
-      setZendeskConversationFields(fields, callback)
+      setZendeskConversationFields(fields, 'CLOUD', callback)
 
       expect(window.zE).toHaveBeenCalledWith(
         'messenger:set',
@@ -36,24 +31,19 @@ describe('zendesk/utils', () => {
       )
     })
 
-    it('should not call window.zE when IS_CE_EDITION is true', async () => {
-      vi.doMock('@/config', () => ({ IS_CE_EDITION: true }))
-      const { setZendeskConversationFields } = await import('../utils')
+    it.each(['COMMUNITY', 'ENTERPRISE', null] as const)(
+      'does not set fields when deployment edition is %s',
+      (deploymentEdition) => {
+        setZendeskConversationFields([{ id: 'field1', value: 'value1' }], deploymentEdition)
 
+        expect(window.zE).not.toHaveBeenCalled()
+      },
+    )
+
+    it('works without a callback', () => {
       const fields = [{ id: 'field1', value: 'value1' }]
 
-      setZendeskConversationFields(fields)
-
-      expect(window.zE).not.toHaveBeenCalled()
-    })
-
-    it('should work without callback', async () => {
-      vi.doMock('@/config', () => ({ IS_CE_EDITION: false }))
-      const { setZendeskConversationFields } = await import('../utils')
-
-      const fields = [{ id: 'field1', value: 'value1' }]
-
-      setZendeskConversationFields(fields)
+      setZendeskConversationFields(fields, 'CLOUD')
 
       expect(window.zE).toHaveBeenCalledWith(
         'messenger:set',
@@ -65,38 +55,32 @@ describe('zendesk/utils', () => {
   })
 
   describe('openZendeskWindow', () => {
-    it('should show and open messenger when zE exists', async () => {
-      vi.doMock('@/config', () => ({ IS_CE_EDITION: false }))
-      const { openZendeskWindow } = await import('../utils')
-
-      openZendeskWindow()
+    it('shows and opens the messenger in Cloud when zE exists', () => {
+      openZendeskWindow('CLOUD')
 
       expect(window.zE).toHaveBeenCalledWith('messenger', 'show')
       expect(window.zE).toHaveBeenCalledWith('messenger', 'open')
     })
 
-    it('should retry opening until zE is ready', async () => {
+    it('retries opening until zE is ready', () => {
       vi.useFakeTimers()
-      vi.doMock('@/config', () => ({ IS_CE_EDITION: false }))
-      const { openZendeskWindow } = await import('../utils')
-
       window.zE = undefined
-      openZendeskWindow({ interval: 10, retries: 2 })
+
+      openZendeskWindow('CLOUD', { interval: 10, retries: 2 })
       window.zE = mockZE
       vi.advanceTimersByTime(10)
 
       expect(window.zE).toHaveBeenCalledWith('messenger', 'show')
       expect(window.zE).toHaveBeenCalledWith('messenger', 'open')
-      vi.useRealTimers()
     })
 
-    it('should not call window.zE when IS_CE_EDITION is true', async () => {
-      vi.doMock('@/config', () => ({ IS_CE_EDITION: true }))
-      const { openZendeskWindow } = await import('../utils')
+    it.each(['COMMUNITY', 'ENTERPRISE', null] as const)(
+      'does not open when deployment edition is %s',
+      (deploymentEdition) => {
+        openZendeskWindow(deploymentEdition)
 
-      openZendeskWindow()
-
-      expect(window.zE).not.toHaveBeenCalled()
-    })
+        expect(window.zE).not.toHaveBeenCalled()
+      },
+    )
   })
 })

web/app/components/base/zendesk/index.tsx

@@ -1,10 +1,17 @@
 import { memo } from 'react'
-import { IS_CE_EDITION, IS_PROD, ZENDESK_WIDGET_KEY } from '@/config'
+import { IS_PROD, ZENDESK_WIDGET_KEY } from '@/config'
+import { getQueryClientServer } from '@/context/query-client-server'
+import { serverSystemFeaturesQueryOptions } from '@/features/system-features/server'
 import { headers } from '@/next/headers'
 import Script from '@/next/script'
 
 const Zendesk = async () => {
-  if (IS_CE_EDITION || !ZENDESK_WIDGET_KEY) return null
+  if (!ZENDESK_WIDGET_KEY) return null
+
+  const systemFeatures = await getQueryClientServer().ensureQueryData(
+    serverSystemFeaturesQueryOptions(),
+  )
+  if (systemFeatures.deployment_edition !== 'CLOUD') return null
 
   const nonce = IS_PROD ? ((await headers()).get('x-nonce') ?? '') : ''
   /* v8 ignore next -- `nonce` is always a string (`''` or header value), so nullish fallback is unreachable in runtime. @preserve */

web/app/components/base/zendesk/utils.ts

@@ -1,4 +1,4 @@
-import { IS_CE_EDITION } from '@/config'
+import type { DeploymentEdition } from '@dify/contracts/api/console/system-features/types.gen'
 
 type ConversationField = {
   id: string
@@ -19,9 +19,10 @@ declare global {
 
 export const setZendeskConversationFields = (
   fields: ConversationField[],
+  deploymentEdition: DeploymentEdition | null,
   callback?: () => unknown,
 ) => {
-  if (!IS_CE_EDITION && window.zE)
+  if (deploymentEdition === 'CLOUD' && window.zE)
     window.zE('messenger:set', 'conversationFields', fields, callback)
 }
 
@@ -30,25 +31,25 @@ type OpenZendeskWindowOptions = {
   retries?: number
 }
 
-const openZendeskWindowOnce = () => {
-  if (IS_CE_EDITION || !window.zE) return false
+const openZendeskWindowOnce = (deploymentEdition: DeploymentEdition | null) => {
+  if (deploymentEdition !== 'CLOUD' || !window.zE) return false
 
   window.zE('messenger', 'show')
   window.zE('messenger', 'open')
   return true
 }
 
-export const openZendeskWindow = ({
-  interval = 100,
-  retries = 20,
-}: OpenZendeskWindowOptions = {}) => {
-  if (IS_CE_EDITION) return
+export const openZendeskWindow = (
+  deploymentEdition: DeploymentEdition | null,
+  { interval = 100, retries = 20 }: OpenZendeskWindowOptions = {},
+) => {
+  if (deploymentEdition !== 'CLOUD') return
 
-  if (openZendeskWindowOnce()) return
+  if (openZendeskWindowOnce(deploymentEdition)) return
 
   let attempts = 0
   const timer = window.setInterval(() => {
     attempts += 1
-    if (openZendeskWindowOnce() || attempts >= retries) window.clearInterval(timer)
+    if (openZendeskWindowOnce(deploymentEdition) || attempts >= retries) window.clearInterval(timer)
   }, interval)
 }

web/app/components/billing/partner-stack/cookie-recorder.tsx

@@ -1,16 +1,14 @@
 'use client'
 
 import { useEffect } from 'react'
-import { IS_CLOUD_EDITION } from '@/config'
 import usePSInfo from './use-ps-info'
 
 const PartnerStackCookieRecorder = () => {
   const { saveOrUpdate } = usePSInfo()
 
   useEffect(() => {
-    if (!IS_CLOUD_EDITION) return
     saveOrUpdate()
-  }, [])
+  }, [saveOrUpdate])
 
   return null
 }

web/app/components/billing/partner-stack/index.tsx

@@ -1,19 +1,27 @@
 'use client'
 import type { FC } from 'react'
+import { useSuspenseQuery } from '@tanstack/react-query'
 import * as React from 'react'
 import { useEffect } from 'react'
-import { IS_CLOUD_EDITION } from '@/config'
+import { systemFeaturesQueryOptions } from '@/features/system-features/client'
 import usePSInfo from './use-ps-info'
 
 const PartnerStack: FC = () => {
+  const { data: deploymentEdition } = useSuspenseQuery({
+    ...systemFeaturesQueryOptions(),
+    select: ({ deployment_edition }) => deployment_edition,
+  })
+  const isCloudEdition = deploymentEdition === 'CLOUD'
   const { saveOrUpdate, bind } = usePSInfo()
+  const hasProcessedRef = React.useRef(false)
   useEffect(() => {
-    if (!IS_CLOUD_EDITION) return
+    if (!isCloudEdition || hasProcessedRef.current) return
+    hasProcessedRef.current = true
     // Save PartnerStack info in cookie first. Because if user hasn't logged in, redirecting to login page would cause lose the partnerStack info in URL.
     saveOrUpdate()
     // bind PartnerStack info after user logged in
     bind()
-  }, [])
+  }, [bind, isCloudEdition, saveOrUpdate])
 
   return null
 }

web/app/components/billing/plan/index.tsx

@@ -2,6 +2,7 @@
 import type { FC } from 'react'
 import { Button } from '@langgenius/dify-ui/button'
 import { RiBook2Line, RiFileEditLine, RiGroupLine } from '@remixicon/react'
+import { useSuspenseQuery } from '@tanstack/react-query'
 import { useUnmountedRef } from 'ahooks'
 import { useAtomValue } from 'jotai'
 import * as React from 'react'
@@ -11,11 +12,11 @@ import { ApiAggregate, TriggerAll } from '@/app/components/base/icons/src/vender
 import UsageInfo from '@/app/components/billing/usage-info'
 import { useSetEducationVerifying } from '@/app/education-apply/storage'
 import VerifyStateModal from '@/app/education-apply/verify-state-modal'
-import { IS_CLOUD_EDITION } from '@/config'
 import { userProfileEmailAtom } from '@/context/account-state'
 import { useModalContextSelector } from '@/context/modal-context'
 import { useProviderContext } from '@/context/provider-context'
 import { isCurrentWorkspaceManagerAtom } from '@/context/workspace-state'
+import { systemFeaturesQueryOptions } from '@/features/system-features/client'
 import { usePathname, useRouter } from '@/next/navigation'
 import { useEducationVerify } from '@/service/use-education'
 import { getDaysUntilEndOfMonth } from '@/utils/time'
@@ -34,6 +35,11 @@ type Props = Readonly<{
 
 const PlanComp: FC<Props> = ({ loc }) => {
   const { t } = useTranslation()
+  const { data: deploymentEdition } = useSuspenseQuery({
+    ...systemFeaturesQueryOptions(),
+    select: ({ deployment_edition }) => deployment_edition,
+  })
+  const isCloudEdition = deploymentEdition === 'CLOUD'
   const router = useRouter()
   const path = usePathname()
   const userProfileEmail = useAtomValue(userProfileEmailAtom)
@@ -97,16 +103,14 @@ const PlanComp: FC<Props> = ({ loc }) => {
             </div>
           </div>
           <div className="flex shrink-0 items-center gap-1">
-            {IS_CLOUD_EDITION &&
-              enableEducationPlan &&
-              (!isEducationAccount || isAboutToExpire) && (
-                <Button variant="ghost" onClick={handleVerify} disabled={isPending}>
-                  <span className="mr-1 i-ri-graduation-cap-line size-4" />
-                  {t(($) => $.toVerified, { ns: 'education' })}
-                  {isPending && <Loading className="ml-1 animate-spin-slow" />}
-                </Button>
-              )}
-            {IS_CLOUD_EDITION &&
+            {isCloudEdition && enableEducationPlan && (!isEducationAccount || isAboutToExpire) && (
+              <Button variant="ghost" onClick={handleVerify} disabled={isPending}>
+                <span className="mr-1 i-ri-graduation-cap-line size-4" />
+                {t(($) => $.toVerified, { ns: 'education' })}
+                {isPending && <Loading className="ml-1 animate-spin-slow" />}
+              </Button>
+            )}
+            {isCloudEdition &&
               enableEducationPlan &&
               isEducationAccount &&
               type === Plan.sandbox &&
@@ -121,7 +125,7 @@ const PlanComp: FC<Props> = ({ loc }) => {
                   {isEducationDiscountLoading && <Loading className="ml-1 animate-spin-slow" />}
                 </Button>
               )}
-            {IS_CLOUD_EDITION && !isEnterprisePlan && (
+            {isCloudEdition && !isEnterprisePlan && (
               <UpgradeBtn className="shrink-0" isPlain={type === Plan.team} isShort loc={loc} />
             )}
           </div>

web/app/components/billing/upgrade-btn/index.tsx

@@ -2,11 +2,12 @@
 import type { CSSProperties, FC } from 'react'
 import type { I18nKeysWithPrefix } from '@/types/i18n'
 import { Button } from '@langgenius/dify-ui/button'
+import { useSuspenseQuery } from '@tanstack/react-query'
 import * as React from 'react'
 import { useTranslation } from 'react-i18next'
 import { SparklesSoft } from '@/app/components/base/icons/src/public/common'
-import { IS_CLOUD_EDITION } from '@/config'
 import { useModalContext } from '@/context/modal-context'
+import { systemFeaturesQueryOptions } from '@/features/system-features/client'
 import { PremiumBadgeButton } from '../../base/premium-badge'
 
 type Props = Readonly<{
@@ -37,9 +38,13 @@ const UpgradeBtn: FC<Props> = ({
   labelKey,
 }) => {
   const { t } = useTranslation()
+  const { data: deploymentEdition } = useSuspenseQuery({
+    ...systemFeaturesQueryOptions(),
+    select: ({ deployment_edition }) => deployment_edition,
+  })
   const { setShowPricingModal } = useModalContext()
 
-  if (!IS_CLOUD_EDITION) return null
+  if (deploymentEdition !== 'CLOUD') return null
 
   const handleClick = () => {
     if (_onClick) _onClick()

web/app/components/custom/custom-page/__tests__/index.spec.tsx

@@ -14,13 +14,13 @@ vi.mock('@/config', async (importOriginal) => {
   const actual = await importOriginal<typeof import('@/config')>()
   return {
     ...actual,
-    IS_CLOUD_EDITION: true,
   }
 })
 
 const render = (ui: ReactElement) =>
   renderWithConsoleQuery(ui, {
     systemFeatures: {
+      deployment_edition: 'CLOUD',
       branding: {
         enabled: true,
         workspace_logo: 'https://example.com/workspace-logo.png',

web/app/components/custom/custom-page/index.tsx

@@ -1,16 +1,22 @@
+import { useSuspenseQuery } from '@tanstack/react-query'
 import { useTranslation } from 'react-i18next'
 import { contactSalesUrl } from '@/app/components/billing/config'
 import { Plan } from '@/app/components/billing/type'
-import { IS_CLOUD_EDITION } from '@/config'
 import { useModalContext } from '@/context/modal-context'
 import { useProviderContext } from '@/context/provider-context'
+import { systemFeaturesQueryOptions } from '@/features/system-features/client'
 import CustomWebAppBrand from '../custom-web-app-brand'
 
 const CustomPage = () => {
   const { t } = useTranslation()
+  const { data: deploymentEdition } = useSuspenseQuery({
+    ...systemFeaturesQueryOptions(),
+    select: ({ deployment_edition }) => deployment_edition,
+  })
   const { plan, enableBilling } = useProviderContext()
   const { setShowPricingModal } = useModalContext()
-  const showBillingTip = IS_CLOUD_EDITION && enableBilling && plan.type === Plan.sandbox
+  const showBillingTip =
+    deploymentEdition === 'CLOUD' && enableBilling && plan.type === Plan.sandbox
   const showContact = enableBilling && (plan.type === Plan.professional || plan.type === Plan.team)
 
   return (

web/app/components/datasets/access-config/__tests__/index.spec.tsx

@@ -97,17 +97,6 @@ vi.mock('@/context/permission-state', async () => {
 
   return createPermissionStateModuleMock(() => mockConsoleState)
 })
-vi.mock('@/context/system-features-state', async () => {
-  const { createSystemFeaturesStateModuleMock } = await import('@/test/console/state-fixture')
-
-  return createSystemFeaturesStateModuleMock(() => ({
-    ...(() => mockConsoleState)(),
-    datasetRbacEnabled: (() => ({
-      isRbacEnabled: mockIsRbacEnabled,
-    }))().isRbacEnabled,
-  }))
-})
-
 vi.mock('@/app/components/access-rules-editor', () => ({
   default: (props: AccessRulesEditorProps) => {
     mockAccessRulesEditor.props = props

web/app/components/datasets/access-config/index.tsx

@@ -2,6 +2,7 @@
 
 import type { ResourceOpenScope } from '@/models/access-control'
 import { ScrollArea } from '@langgenius/dify-ui/scroll-area'
+import { useSuspenseQuery } from '@tanstack/react-query'
 import { useAtomValue } from 'jotai'
 import { useCallback, useMemo, useState } from 'react'
 import { useTranslation } from 'react-i18next'
@@ -11,7 +12,7 @@ import { userProfileIdAtom } from '@/context/account-state'
 import { useDatasetDetailContextWithSelector } from '@/context/dataset-detail'
 import { useLocale } from '@/context/i18n'
 import { workspacePermissionKeysAtom } from '@/context/permission-state'
-import { datasetRbacEnabledAtom } from '@/context/system-features-state'
+import { systemFeaturesQueryOptions } from '@/features/system-features/client'
 import { getAccessControlTemplateLanguage } from '@/i18n-config/language'
 import {
   useDatasetAccessRules,
@@ -33,7 +34,10 @@ const DatasetAccessConfigPage = ({ datasetId }: DatasetAccessConfigPageProps) =>
   const dataset = useDatasetDetailContextWithSelector((state) => state.dataset)
   const currentUserId = useAtomValue(userProfileIdAtom)
   const workspacePermissionKeys = useAtomValue(workspacePermissionKeysAtom)
-  const isRbacEnabled = useAtomValue(datasetRbacEnabledAtom)
+  const { data: isRbacEnabled } = useSuspenseQuery({
+    ...systemFeaturesQueryOptions(),
+    select: ({ rbac_enabled }) => rbac_enabled,
+  })
   const canAccessConfig = getDatasetACLCapabilities(dataset?.permission_keys, {
     currentUserId,
     resourceMaintainer: dataset?.maintainer,

web/app/components/datasets/create/file-uploader/__tests__/index.spec.tsx

@@ -1,9 +1,13 @@
 import type { CustomFile as File, FileItem } from '@/models/datasets'
-import { fireEvent, render, screen } from '@testing-library/react'
+import { fireEvent, screen } from '@testing-library/react'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { renderWithConsoleQuery } from '@/test/console/query-data'
 import { PROGRESS_NOT_STARTED } from '../constants'
 import FileUploader from '../index'
 
+const render = (ui: React.ReactElement) =>
+  renderWithConsoleQuery(ui, { systemFeatures: { deployment_edition: 'CLOUD' } })
+
 const mockNotify = vi.fn()
 vi.mock('use-context-selector', async () => {
   const actual =
@@ -31,10 +35,6 @@ vi.mock('@/i18n-config/language', () => ({
   LanguagesSupported: ['en-US', 'zh-Hans'],
 }))
 
-vi.mock('@/config', () => ({
-  IS_CE_EDITION: false,
-}))
-
 vi.mock('@/app/components/base/file-uploader/utils', () => ({
   getFileUploadErrorMessage: () => 'Upload error',
 }))
@@ -44,7 +44,8 @@ vi.mock('@/hooks/use-theme', () => ({
   default: () => ({ theme: 'light' }),
 }))
 
-vi.mock('@/types/app', () => ({
+vi.mock('@/types/app', async (importOriginal) => ({
+  ...(await importOriginal<typeof import('@/types/app')>()),
   Theme: { dark: 'dark', light: 'light' },
 }))
 

web/app/components/datasets/create/file-uploader/hooks/__tests__/use-file-upload.spec.tsx

@@ -1,7 +1,8 @@
-import type { ReactNode } from 'react'
+import type { ReactElement } from 'react'
 import type { CustomFile, FileItem } from '@/models/datasets'
-import { act, render, renderHook, waitFor } from '@testing-library/react'
+import { act, renderHook, waitFor } from '@testing-library/react'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { createConsoleQueryWrapper, renderWithConsoleQuery } from '@/test/console/query-data'
 import { PROGRESS_COMPLETE, PROGRESS_ERROR, PROGRESS_NOT_STARTED } from '../../constants'
 // Import after mocks
 import { useFileUpload } from '../use-file-upload'
@@ -40,18 +41,15 @@ vi.mock('@/i18n-config/language', () => ({
   LanguagesSupported: ['en-US', 'zh-Hans'],
 }))
 
-vi.mock('@/config', () => ({
-  IS_CE_EDITION: false,
-}))
-
 // Mock file upload error message
 vi.mock('@/app/components/base/file-uploader/utils', () => ({
   getFileUploadErrorMessage: (_e: unknown, defaultMsg: string) => defaultMsg,
 }))
 
-const createWrapper = () => {
-  return ({ children }: { children: ReactNode }) => <>{children}</>
-}
+const createWrapper = () =>
+  createConsoleQueryWrapper({ systemFeatures: { deployment_edition: 'CLOUD' } }).wrapper
+const render = (ui: ReactElement) =>
+  renderWithConsoleQuery(ui, { systemFeatures: { deployment_edition: 'CLOUD' } })
 
 describe('useFileUpload', () => {
   const defaultOptions = {

web/app/components/datasets/create/file-uploader/hooks/use-file-upload.ts

@@ -2,11 +2,12 @@
 import type { RefObject } from 'react'
 import type { CustomFile as File, FileItem } from '@/models/datasets'
 import { toast } from '@langgenius/dify-ui/toast'
+import { useSuspenseQuery } from '@tanstack/react-query'
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { getFileUploadErrorMessage } from '@/app/components/base/file-uploader/utils'
-import { IS_CE_EDITION } from '@/config'
 import { useLocale } from '@/context/i18n'
+import { systemFeaturesQueryOptions } from '@/features/system-features/client'
 import { LanguagesSupported } from '@/i18n-config/language'
 import { upload } from '@/service/base'
 import { useFileSupportTypes, useFileUploadConfig } from '@/service/use-common'
@@ -69,6 +70,11 @@ export const useFileUpload = ({
   allowedExtensions,
 }: UseFileUploadOptions): UseFileUploadReturn => {
   const { t } = useTranslation()
+  const { data: deploymentEdition } = useSuspenseQuery({
+    ...systemFeaturesQueryOptions(),
+    select: ({ deployment_edition }) => deployment_edition,
+  })
+  const isCloudEdition = deploymentEdition === 'CLOUD'
   const locale = useLocale()
 
   const [dragging, setDragging] = useState(false)
@@ -219,7 +225,7 @@ export const useFileUpload = ({
       const filesCountLimit = fileUploadConfig.file_upload_limit
       if (!files.length) return false
 
-      if (files.length + fileList.length > filesCountLimit && !IS_CE_EDITION) {
+      if (files.length + fileList.length > filesCountLimit && isCloudEdition) {
         toast.error(
           t(($) => $['stepOne.uploader.validation.filesNumber'], {
             ns: 'datasetCreation',
@@ -239,7 +245,7 @@ export const useFileUpload = ({
       fileListRef.current = newFiles
       uploadMultipleFiles(preparedFiles)
     },
-    [prepareFileList, uploadMultipleFiles, t, fileList, fileUploadConfig],
+    [prepareFileList, uploadMultipleFiles, t, fileList, fileUploadConfig, isCloudEdition],
   )
 
   const traverseFileEntry = useCallback(

web/app/components/datasets/create/step-one/__tests__/index.spec.tsx

@@ -1,14 +1,18 @@
 import type { DataSourceAuth } from '@/app/components/header/account-setting/data-source-page-new/types'
 import type { NotionPage } from '@/models/common'
 import type { CrawlOptions, CrawlResultItem, DataSet, FileItem } from '@/models/datasets'
-import { fireEvent, render, screen } from '@testing-library/react'
+import { fireEvent, screen } from '@testing-library/react'
 import { Plan } from '@/app/components/billing/type'
 import { DataSourceType } from '@/models/datasets'
+import { renderWithConsoleQuery } from '@/test/console/query-data'
 import StepOne from '../index'
 
+const render = (ui: React.ReactElement) =>
+  renderWithConsoleQuery(ui, { systemFeatures: { deployment_edition: 'CLOUD' } })
+
 // Mock config for website crawl features
-vi.mock('@/config', () => ({
-  IS_CLOUD_EDITION: false,
+vi.mock('@/config', async (importOriginal) => ({
+  ...(await importOriginal<typeof import('@/config')>()),
   ENABLE_WEBSITE_FIRECRAWL: true,
   ENABLE_WEBSITE_JINAREADER: false,
   ENABLE_WEBSITE_WATERCRAWL: false,

web/app/components/datasets/create/step-one/__tests__/upgrade-card.spec.tsx

@@ -1,13 +1,12 @@
-import { render, screen } from '@testing-library/react'
+import { screen } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
+import { renderWithConsoleQuery } from '@/test/console/query-data'
 import UpgradeCard from '../upgrade-card'
 
 const mockSetShowPricingModal = vi.fn()
 
-vi.mock('@/config', async (importOriginal) => ({
-  ...(await importOriginal<typeof import('@/config')>()),
-  IS_CLOUD_EDITION: true,
-}))
+const render = (ui: React.ReactElement) =>
+  renderWithConsoleQuery(ui, { systemFeatures: { deployment_edition: 'CLOUD' } })
 
 vi.mock('@/context/modal-context', () => ({
   useModalContext: () => ({ setShowPricingModal: mockSetShowPricingModal }),

web/app/components/datasets/create/step-one/components/__tests__/preview-panel.spec.tsx

@@ -1,6 +1,7 @@
 import type { NotionPage } from '@/models/common'
-import { render, screen } from '@testing-library/react'
+import { screen } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
+import { renderWithConsoleQuery as render } from '@/test/console/query-data'
 import PreviewPanel from '../preview-panel'
 
 vi.mock('../../../file-preview', () => ({

web/app/components/datasets/create/step-one/upgrade-card.tsx

@@ -1,21 +1,26 @@
 'use client'
 import type { FC } from 'react'
+import { useSuspenseQuery } from '@tanstack/react-query'
 import * as React from 'react'
 import { useCallback } from 'react'
 import { useTranslation } from 'react-i18next'
 import UpgradeBtn from '@/app/components/billing/upgrade-btn'
-import { IS_CLOUD_EDITION } from '@/config'
 import { useModalContext } from '@/context/modal-context'
+import { systemFeaturesQueryOptions } from '@/features/system-features/client'
 
 const UpgradeCard: FC = () => {
   const { t } = useTranslation()
+  const { data: deploymentEdition } = useSuspenseQuery({
+    ...systemFeaturesQueryOptions(),
+    select: ({ deployment_edition }) => deployment_edition,
+  })
   const { setShowPricingModal } = useModalContext()
 
   const handleUpgrade = useCallback(() => {
     setShowPricingModal()
   }, [setShowPricingModal])
 
-  if (!IS_CLOUD_EDITION) return null
+  if (deploymentEdition !== 'CLOUD') return null
 
   return (
     <div className="flex items-center justify-between rounded-xl border-[0.5px] border-components-panel-border-subtle bg-components-panel-on-panel-item-bg py-3 pr-3.5 pl-4 shadow-xs backdrop-blur-[5px]">

web/app/components/datasets/create/step-two/__tests__/index.spec.tsx

@@ -10,7 +10,7 @@ import type {
   Rules,
 } from '@/models/datasets'
 import type { RetrievalConfig } from '@/types/app'
-import { act, cleanup, fireEvent, render, renderHook, screen } from '@testing-library/react'
+import { act, cleanup, fireEvent, renderHook, screen } from '@testing-library/react'
 import {
   ConfigurationMethodEnum,
   ModelStatusEnum,
@@ -18,6 +18,7 @@ import {
 } from '@/app/components/header/account-setting/model-provider-page/declarations'
 import { ChunkingMode, DataSourceType, ProcessMode } from '@/models/datasets'
 import { expectLoadingButton } from '@/test/button'
+import { renderWithConsoleQuery as render } from '@/test/console/query-data'
 import { RETRIEVE_METHOD } from '@/types/app'
 import { PreviewPanel } from '../components/preview-panel'
 import { StepTwoFooter } from '../components/step-two-footer'
@@ -196,12 +197,6 @@ vi.mock('@/app/components/base/amplitude', () => ({
   trackEvent: vi.fn(),
 }))
 
-// Enable IS_CE_EDITION to show QA checkbox in tests
-vi.mock('@/config', async () => {
-  const actual = await vi.importActual('@/config')
-  return { ...actual, IS_CE_EDITION: true }
-})
-
 // Mock PreviewDocumentPicker to allow testing handlePickerChange
 vi.mock('@/app/components/datasets/common/document-picker/preview-document-picker', () => ({
   /* oxlint-disable typescript/no-explicit-any */

web/app/components/datasets/create/step-two/components/__tests__/general-chunking-options.spec.tsx

@@ -1,7 +1,8 @@
 import type { PreProcessingRule } from '@/models/datasets'
-import { fireEvent, render, screen } from '@testing-library/react'
+import { fireEvent, screen } from '@testing-library/react'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { ChunkingMode } from '@/models/datasets'
+import { renderWithConsoleQuery } from '@/test/console/query-data'
 import { GeneralChunkingOptions } from '../general-chunking-options'
 
 vi.mock('@/app/components/datasets/settings/summary-index-setting', () => ({
@@ -21,11 +22,9 @@ vi.mock('@/app/components/datasets/settings/summary-index-setting', () => ({
   ),
 }))
 
-vi.mock('@/config', () => ({
-  IS_CE_EDITION: true,
-}))
-
 const ns = 'datasetCreation'
+const render = (ui: React.ReactElement) =>
+  renderWithConsoleQuery(ui, { systemFeatures: { deployment_edition: 'COMMUNITY' } })
 
 const createRules = (): PreProcessingRule[] => [
   { id: 'remove_extra_spaces', enabled: true },

web/app/components/datasets/create/step-two/components/__tests__/indexing-mode-section.spec.tsx

@@ -1,8 +1,9 @@
 import type { DefaultModel } from '@/app/components/header/account-setting/model-provider-page/declarations'
 import type { RetrievalConfig } from '@/types/app'
-import { fireEvent, render, screen } from '@testing-library/react'
+import { fireEvent, screen } from '@testing-library/react'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { ChunkingMode } from '@/models/datasets'
+import { renderWithConsoleQuery as render } from '@/test/console/query-data'
 import { IndexingType } from '../../hooks'
 import { IndexingModeSection } from '../indexing-mode-section'
 

web/app/components/datasets/create/step-two/components/__tests__/parent-child-options.spec.tsx

@@ -1,8 +1,9 @@
 import type { ParentChildConfig } from '../../hooks'
 import type { PreProcessingRule } from '@/models/datasets'
-import { fireEvent, render, screen } from '@testing-library/react'
+import { fireEvent, screen } from '@testing-library/react'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { ChunkingMode } from '@/models/datasets'
+import { renderWithConsoleQuery } from '@/test/console/query-data'
 import { ParentChildOptions } from '../parent-child-options'
 
 vi.mock('@/app/components/datasets/settings/summary-index-setting', () => ({
@@ -22,11 +23,9 @@ vi.mock('@/app/components/datasets/settings/summary-index-setting', () => ({
   ),
 }))
 
-vi.mock('@/config', () => ({
-  IS_CE_EDITION: true,
-}))
-
 const ns = 'datasetCreation'
+const render = (ui: React.ReactElement) =>
+  renderWithConsoleQuery(ui, { systemFeatures: { deployment_edition: 'COMMUNITY' } })
 
 const createRules = (): PreProcessingRule[] => [
   { id: 'remove_extra_spaces', enabled: true },

web/app/components/datasets/create/step-two/components/general-chunking-options.tsx

@@ -8,11 +8,12 @@ import type {
 import { Button } from '@langgenius/dify-ui/button'
 import { Checkbox } from '@langgenius/dify-ui/checkbox'
 import { RiAlertFill, RiSearchEyeLine } from '@remixicon/react'
+import { useSuspenseQuery } from '@tanstack/react-query'
 import { useTranslation } from 'react-i18next'
 import Divider from '@/app/components/base/divider'
 import { Infotip } from '@/app/components/base/infotip'
 import SummaryIndexSetting from '@/app/components/datasets/settings/summary-index-setting'
-import { IS_CE_EDITION } from '@/config'
+import { systemFeaturesQueryOptions } from '@/features/system-features/client'
 import { ChunkingMode } from '@/models/datasets'
 import SettingCog from '../../assets/setting-gear-mod.svg'
 import s from '../index.module.css'
@@ -82,6 +83,11 @@ export const GeneralChunkingOptions: FC<GeneralChunkingOptionsProps> = ({
   onSummaryIndexSettingChange,
 }) => {
   const { t } = useTranslation()
+  const { data: deploymentEdition } = useSuspenseQuery({
+    ...systemFeaturesQueryOptions(),
+    select: ({ deployment_edition }) => deployment_edition,
+  })
+  const isNonCloudEdition = deploymentEdition === 'COMMUNITY' || deploymentEdition === 'ENTERPRISE'
 
   const getRuleName = (key: string): string => {
     const ruleNameMap: Record<string, string> = {
@@ -150,7 +156,7 @@ export const GeneralChunkingOptions: FC<GeneralChunkingOptionsProps> = ({
                 </span>
               </label>
             ))}
-            {showSummaryIndexSetting && IS_CE_EDITION && (
+            {showSummaryIndexSetting && isNonCloudEdition && (
               <div className="mt-3">
                 <SummaryIndexSetting
                   entry="create-document"
@@ -159,7 +165,7 @@ export const GeneralChunkingOptions: FC<GeneralChunkingOptionsProps> = ({
                 />
               </div>
             )}
-            {IS_CE_EDITION && (
+            {isNonCloudEdition && (
               <>
                 <Divider type="horizontal" className="my-4 bg-divider-subtle" />
                 <div className="flex items-center py-0.5">

web/app/components/datasets/create/step-two/components/parent-child-options.tsx

@@ -11,12 +11,13 @@ import { Button } from '@langgenius/dify-ui/button'
 import { Checkbox } from '@langgenius/dify-ui/checkbox'
 import { RadioGroup } from '@langgenius/dify-ui/radio'
 import { RiSearchEyeLine } from '@remixicon/react'
+import { useSuspenseQuery } from '@tanstack/react-query'
 import { useTranslation } from 'react-i18next'
 import Divider from '@/app/components/base/divider'
 import { ParentChildChunk } from '@/app/components/base/icons/src/vender/knowledge'
 import RadioCard from '@/app/components/base/radio-card'
 import SummaryIndexSetting from '@/app/components/datasets/settings/summary-index-setting'
-import { IS_CE_EDITION } from '@/config'
+import { systemFeaturesQueryOptions } from '@/features/system-features/client'
 import { ChunkingMode } from '@/models/datasets'
 import FileList from '../../assets/file-list-3-fill.svg'
 import Note from '../../assets/note-mod.svg'
@@ -78,6 +79,11 @@ export const ParentChildOptions: FC<ParentChildOptionsProps> = ({
   showSummaryIndexSetting,
 }) => {
   const { t } = useTranslation()
+  const { data: deploymentEdition } = useSuspenseQuery({
+    ...systemFeaturesQueryOptions(),
+    select: ({ deployment_edition }) => deployment_edition,
+  })
+  const isNonCloudEdition = deploymentEdition === 'COMMUNITY' || deploymentEdition === 'ENTERPRISE'
 
   const getRuleName = (key: string): string => {
     const ruleNameMap: Record<string, string> = {
@@ -202,7 +208,7 @@ export const ParentChildOptions: FC<ParentChildOptionsProps> = ({
                 </span>
               </label>
             ))}
-            {showSummaryIndexSetting && IS_CE_EDITION && (
+            {showSummaryIndexSetting && isNonCloudEdition && (
               <div className="mt-3">
                 <SummaryIndexSetting
                   entry="create-document"

web/app/components/datasets/documents/components/__tests__/documents-header.spec.tsx

@@ -1,7 +1,8 @@
 import type { SortType } from '@/service/datasets'
-import { fireEvent, render, screen } from '@testing-library/react'
+import { fireEvent, screen } from '@testing-library/react'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { DataSourceType } from '@/models/datasets'
+import { renderWithConsoleQuery as render } from '@/test/console/query-data'
 import DocumentsHeader from '../documents-header'
 
 // Mock the context hooks