more changes

Author: icecrasher321

apps/sim/lib/core/config/enterprise-entitlements.test.ts

@@ -6,6 +6,7 @@ import {
   ENTERPRISE_FEATURE_LEGACY_DEFAULTS,
   type EnterpriseFeature,
   resolveEnterpriseEntitlement,
+  resolveSandboxFeatureAvailability,
 } from '@/lib/core/config/enterprise-entitlements'
 
 describe('resolveEnterpriseEntitlement', () => {
@@ -114,3 +115,45 @@ describe('resolveEnterpriseEntitlement', () => {
     })
   })
 })
+
+describe('resolveSandboxFeatureAvailability', () => {
+  it.each([
+    {
+      name: 'hosted billing with a provider',
+      billingEnabled: true,
+      deploymentEntitled: false,
+      remoteProviderEnabled: true,
+      expected: true,
+    },
+    {
+      name: 'hosted billing without a provider',
+      billingEnabled: true,
+      deploymentEntitled: false,
+      remoteProviderEnabled: false,
+      expected: false,
+    },
+    {
+      name: 'billing-free Enterprise or feature entitlement with a provider',
+      billingEnabled: false,
+      deploymentEntitled: true,
+      remoteProviderEnabled: true,
+      expected: true,
+    },
+    {
+      name: 'billing-free provider credentials without an entitlement',
+      billingEnabled: false,
+      deploymentEntitled: false,
+      remoteProviderEnabled: true,
+      expected: false,
+    },
+    {
+      name: 'billing-free entitlement without a provider',
+      billingEnabled: false,
+      deploymentEntitled: true,
+      remoteProviderEnabled: false,
+      expected: false,
+    },
+  ])('$name resolves to $expected', ({ expected, ...input }) => {
+    expect(resolveSandboxFeatureAvailability(input)).toBe(expected)
+  })
+})

apps/sim/lib/core/config/enterprise-entitlements.ts

@@ -101,3 +101,25 @@ export function resolveEnterpriseEntitlement({
 }: ResolveEnterpriseEntitlementParams): boolean {
   return explicit ?? (masterEnabled || legacyDefault)
 }
+
+interface ResolveSandboxFeatureAvailabilityParams {
+  /** Whether hosted subscription enforcement supplies the deployment entitlement. */
+  billingEnabled: boolean
+  /** Enterprise-master or Sandbox-specific deployment entitlement. */
+  deploymentEntitled: boolean
+  /** Server-verified provider readiness or its public browser projection. */
+  remoteProviderEnabled: boolean
+}
+
+/**
+ * Combines Sandbox entitlement with runtime capability. Neither dimension may
+ * substitute for the other: a plan cannot create a provider, and provider
+ * credentials cannot grant a workspace feature by themselves.
+ */
+export function resolveSandboxFeatureAvailability({
+  billingEnabled,
+  deploymentEntitled,
+  remoteProviderEnabled,
+}: ResolveSandboxFeatureAvailabilityParams): boolean {
+  return remoteProviderEnabled && (billingEnabled || deploymentEntitled)
+}

apps/sim/lib/core/config/env-flags.ts

@@ -12,6 +12,7 @@ import {
   ENTERPRISE_FEATURE_LEGACY_DEFAULTS,
   type EnterpriseFeature,
   resolveEnterpriseEntitlement,
+  resolveSandboxFeatureAvailability,
 } from './enterprise-entitlements'
 import { env, envBoolean, getEnv, isFalsy, isTruthy } from './env'
 import { hasEnvCapabilityValue, inspectCapability, SANDBOX_CAPABILITY } from './env-capabilities'
@@ -441,11 +442,14 @@ export const isRemoteSandboxEnabled =
  * provider readiness into the browser; the server always verifies credentials
  * and the immutable Function base directly.
  */
-export const isSandboxesEnabled =
-  (isBillingEnabled || isSandboxDeploymentEntitled) &&
-  (typeof window === 'undefined'
-    ? isRemoteSandboxEnabled
-    : isTruthy(getEnv('NEXT_PUBLIC_SANDBOXES_ENABLED')))
+export const isSandboxesEnabled = resolveSandboxFeatureAvailability({
+  billingEnabled: isBillingEnabled,
+  deploymentEntitled: isSandboxDeploymentEntitled,
+  remoteProviderEnabled:
+    typeof window === 'undefined'
+      ? isRemoteSandboxEnabled
+      : isTruthy(getEnv('NEXT_PUBLIC_SANDBOXES_ENABLED')),
+})
 
 /**
  * Whether the selected provider can serve Mothership's own code image.