@taskforcehq/taskforce 0.3.302 → 0.3.303

package/dist/components/views/standalone/modals/AccountHubModal.test.js

@@ -0,0 +1,26 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { fireEvent, render, screen } from '@testing-library/react';
+import { describe, expect, it, vi } from 'vitest';
+import { AccountHubModal } from './AccountHubModal';
+vi.mock('../../../ui/Modal', () => ({
+    Modal: ({ isOpen, children, title }) => (isOpen ? _jsxs("div", { children: [_jsx("h1", { children: title }), children] }) : null)
+}));
+describe('AccountHubModal', () => {
+    it('shows checkout recovery guidance and a plan-selection CTA for expired checkout attempts', () => {
+        const onStartCheckout = vi.fn();
+        render(_jsx(AccountHubModal, { isOpen: true, theme: "dark", runtimeMode: "cloud", authRequiredForApi: true, isAuthenticated: true, hasAuthIdentity: true, authIdentityLabel: "owner@example.com", billingLoading: false, billingError: null, billingActionError: null, billingNotice: null, billingActionBusy: false, billingIntervalChoice: "month", accountProfileSummary: {
+                planId: 'pro',
+                planName: 'Pro Plan',
+                entitlementState: 'pending_plan_selection',
+                gate: 'plan_selection_required',
+                message: 'Your latest checkout expired. Choose a plan to continue.',
+                billingConflictCode: 'CHECKOUT_SESSION_EXPIRED',
+                planSelectionRequired: true
+            }, currentWorkspaceId: "workspace-1", canOpenTeamManagement: false, canManageWorkspaceSync: false, workspaceCloudSyncEnabled: false, syncStatusLabel: "Disabled", workspaceSyncError: null, syncControlBusy: false, onClose: () => { }, onOpenWorkspaceAudit: () => { }, onBillingIntervalChange: () => { }, onRefreshBilling: () => { }, onUpdateInterval: () => { }, onManageBilling: () => { }, onStartCheckout: onStartCheckout, onToggleWorkspaceSync: () => { }, onOpenHelp: () => { } }));
+        expect(screen.getByText('Your latest checkout expired. Choose a plan to continue.')).toBeInTheDocument();
+        expect(screen.getByText('Pro Plan')).toBeInTheDocument();
+        const cta = screen.getByRole('button', { name: 'Choose Plan' });
+        fireEvent.click(cta);
+        expect(onStartCheckout).toHaveBeenCalledTimes(1);
+    });
+});

package/dist/core/EntitlementsPolicy.test.js

@@ -171,8 +171,8 @@ describe('Taskforce entitlements policy engine', () => {
                     email: 'member3@example.com',
                     role: 'member'
                 });
-            }).toThrowError(TaskforceRuleError);
-            expect(() => core.assertSeatAvailable('workspace-cap')).toThrowError(TaskforceRuleError);
+            }).toThrowError(/Seat limit reached/);
+            expect(() => core.assertSeatAvailable('workspace-cap')).toThrowError(/Seat limit reached/);
         }
         finally {
             core.close();

package/dist/core/GlobalSettingsService.js

@@ -11,6 +11,9 @@ function splitGlobalSettingsPayload(settings) {
     if (settings.site && typeof settings.site === 'object') {
         system.site = { ...settings.site };
     }
+    if (settings.billing && typeof settings.billing === 'object') {
+        system.billing = { ...settings.billing };
+    }
     if (settings.setup && typeof settings.setup === 'object') {
         system.setup = { ...settings.setup };
     }
@@ -98,6 +101,17 @@ export function getGlobalSettingsService(deps) {
     const global = readGlobalConfigService(deps);
     const sourcePrefs = global.schedulePreferences || {};
     const sourceCapacity = sourcePrefs.dailyCapacity || {};
+    const billingOnboardingPolicy = global.billing?.onboardingPolicy && typeof global.billing.onboardingPolicy === 'object'
+        && (global.billing.onboardingPolicy.mode === 'require_plan_selection'
+            || global.billing.onboardingPolicy.mode === 'auto_grant_free'
+            || global.billing.onboardingPolicy.mode === 'auto_start_trial')
+        ? {
+            mode: global.billing.onboardingPolicy.mode,
+            planVersionId: typeof global.billing.onboardingPolicy.planVersionId === 'string'
+                ? (global.billing.onboardingPolicy.planVersionId.trim() || null)
+                : null
+        }
+        : null;
     const schedulePreferences = {
         ...(typeof sourcePrefs.showWeekends === 'boolean' ? { showWeekends: sourcePrefs.showWeekends } : {}),
         ...(typeof sourcePrefs.isCalendarSidebarOpen === 'boolean' ? { isCalendarSidebarOpen: sourcePrefs.isCalendarSidebarOpen } : {}),
@@ -163,14 +177,6 @@ export function getGlobalSettingsService(deps) {
                     ...(typeof global.auth.authRateLimitWindowMs === 'number' && Number.isFinite(global.auth.authRateLimitWindowMs)
                         ? { authRateLimitWindowMs: Math.max(1000, Math.floor(global.auth.authRateLimitWindowMs)) }
                         : {}),
-                    ...((global.auth.signupMonetizationStrategy === 'auto_assign_default' || global.auth.signupMonetizationStrategy === 'plan_selection_required')
-                        ? { signupMonetizationStrategy: global.auth.signupMonetizationStrategy }
-                        : {}),
-                    ...(typeof global.auth.defaultSignupPlanVersionId === 'string'
-                        ? { defaultSignupPlanVersionId: global.auth.defaultSignupPlanVersionId.trim() || null }
-                        : global.auth.defaultSignupPlanVersionId === null
-                            ? { defaultSignupPlanVersionId: null }
-                            : {})
                 }
             }
             : {}),
@@ -186,6 +192,13 @@ export function getGlobalSettingsService(deps) {
                 }
             }
             : {}),
+        ...(billingOnboardingPolicy
+            ? {
+                billing: {
+                    onboardingPolicy: billingOnboardingPolicy
+                }
+            }
+            : {}),
         ...(global.setup && typeof global.setup === 'object'
             ? {
                 setup: {
@@ -289,7 +302,24 @@ export function updateGlobalSettingsService(deps, settings) {
         const currentAuth = next.auth && typeof next.auth === 'object' ? next.auth : {};
         const incoming = settings.auth;
         next.auth = {
-            ...currentAuth,
+            ...(typeof currentAuth.allowSelfRegistration === 'boolean'
+                ? { allowSelfRegistration: currentAuth.allowSelfRegistration }
+                : {}),
+            ...(typeof currentAuth.requireVerifiedEmail === 'boolean'
+                ? { requireVerifiedEmail: currentAuth.requireVerifiedEmail }
+                : {}),
+            ...(typeof currentAuth.defaultNewUserBetaAccess === 'boolean'
+                ? { defaultNewUserBetaAccess: currentAuth.defaultNewUserBetaAccess }
+                : {}),
+            ...(typeof currentAuth.authRateLimitEnabled === 'boolean'
+                ? { authRateLimitEnabled: currentAuth.authRateLimitEnabled }
+                : {}),
+            ...(typeof currentAuth.authRateLimitMaxRequests === 'number' && Number.isFinite(currentAuth.authRateLimitMaxRequests)
+                ? { authRateLimitMaxRequests: Math.max(1, Math.floor(currentAuth.authRateLimitMaxRequests)) }
+                : {}),
+            ...(typeof currentAuth.authRateLimitWindowMs === 'number' && Number.isFinite(currentAuth.authRateLimitWindowMs)
+                ? { authRateLimitWindowMs: Math.max(1000, Math.floor(currentAuth.authRateLimitWindowMs)) }
+                : {}),
             ...(typeof incoming.allowSelfRegistration === 'boolean'
                 ? { allowSelfRegistration: incoming.allowSelfRegistration }
                 : {}),
@@ -307,15 +337,7 @@ export function updateGlobalSettingsService(deps, settings) {
                 : {}),
             ...(typeof incoming.authRateLimitWindowMs === 'number' && Number.isFinite(incoming.authRateLimitWindowMs)
                 ? { authRateLimitWindowMs: Math.max(1000, Math.floor(incoming.authRateLimitWindowMs)) }
-                : {}),
-            ...((incoming.signupMonetizationStrategy === 'auto_assign_default' || incoming.signupMonetizationStrategy === 'plan_selection_required')
-                ? { signupMonetizationStrategy: incoming.signupMonetizationStrategy }
-                : {}),
-            ...(typeof incoming.defaultSignupPlanVersionId === 'string'
-                ? { defaultSignupPlanVersionId: incoming.defaultSignupPlanVersionId.trim() || null }
-                : incoming.defaultSignupPlanVersionId === null
-                    ? { defaultSignupPlanVersionId: null }
-                    : {})
+                : {})
         };
     }
     if (settings.site && typeof settings.site === 'object') {
@@ -331,6 +353,44 @@ export function updateGlobalSettingsService(deps, settings) {
                 : {})
         };
     }
+    if (settings.billing && typeof settings.billing === 'object') {
+        const currentBilling = next.billing && typeof next.billing === 'object' ? next.billing : {};
+        const incoming = settings.billing;
+        const currentOnboardingPolicy = currentBilling.onboardingPolicy && typeof currentBilling.onboardingPolicy === 'object'
+            && (currentBilling.onboardingPolicy.mode === 'require_plan_selection'
+                || currentBilling.onboardingPolicy.mode === 'auto_grant_free'
+                || currentBilling.onboardingPolicy.mode === 'auto_start_trial')
+            ? {
+                mode: currentBilling.onboardingPolicy.mode,
+                planVersionId: typeof currentBilling.onboardingPolicy.planVersionId === 'string'
+                    ? (currentBilling.onboardingPolicy.planVersionId.trim() || null)
+                    : null
+            }
+            : null;
+        const incomingOnboardingPolicy = incoming.onboardingPolicy && typeof incoming.onboardingPolicy === 'object'
+            && (incoming.onboardingPolicy.mode === 'require_plan_selection'
+                || incoming.onboardingPolicy.mode === 'auto_grant_free'
+                || incoming.onboardingPolicy.mode === 'auto_start_trial')
+            ? {
+                mode: incoming.onboardingPolicy.mode,
+                planVersionId: typeof incoming.onboardingPolicy.planVersionId === 'string'
+                    ? (incoming.onboardingPolicy.planVersionId.trim() || null)
+                    : null
+            }
+            : null;
+        next.billing = {
+            ...(currentOnboardingPolicy
+                ? {
+                    onboardingPolicy: currentOnboardingPolicy
+                }
+                : {}),
+            ...(incomingOnboardingPolicy
+                ? {
+                    onboardingPolicy: incomingOnboardingPolicy
+                }
+                : {})
+        };
+    }
     if (settings.setup && typeof settings.setup === 'object') {
         const currentSetup = next.setup && typeof next.setup === 'object' ? next.setup : {};
         const incoming = settings.setup;

package/dist/core/PlanEntitlementService.d.ts

@@ -1,10 +1,11 @@
 import type { DatabaseAdapter } from '../storage/databaseAdapter.js';
-import type { EntitlementState, PlanFeatureAccess, PlanFeatureSnapshot, PlanFeatureCatalogItem, PlanVersionSnapshot, PlanCatalogSnapshot, AccountEntitlementSnapshot, SeatUsageSnapshot, FeatureEvaluationResult, AccountAccessStatus, GlobalTaskforceSettings, SignupMonetizationSettings, SignupMonetizationValidationResult } from './types.js';
+import type { EntitlementState, PlanFeatureAccess, PlanFeatureSnapshot, PlanFeatureCatalogItem, PlanVersionSnapshot, PlanCatalogSnapshot, AccountEntitlementSnapshot, SeatUsageSnapshot, FeatureEvaluationResult, AccountAccessStatus, GlobalTaskforceSettings, OnboardingPolicy, OnboardingPolicyValidationResult } from './types.js';
 export interface PlanEntitlementServiceDeps {
     getWorkspaceOwnerUserId: (workspaceId: string) => string | null;
     readGlobalConfig: () => GlobalTaskforceSettings;
     writeGlobalConfig: (config: GlobalTaskforceSettings) => void;
 }
+type CommercialStateTransitionSource = 'registration' | 'checkout-start' | 'checkout-confirm' | 'stripe-webhook' | 'backfill' | 'legacy-plan-mode' | 'admin' | 'system';
 /**
  * Handles all plan catalog, plan version, and account entitlement logic.
  * Extracted from Taskforce.ts to reduce monolith size.
@@ -24,9 +25,15 @@ export declare class PlanEntitlementService {
     private applyPlanVersionTrialDaysMetadata;
     private sanitizePlanFeatureConfig;
     private isEntitlementStateAllowed;
+    private isIsoTimestampExpired;
+    private readAccountEntitlementRow;
+    private normalizeExpiredCheckoutPendingRow;
+    private isBillingConfirmedTransitionSource;
+    private resolveCanonicalTransitionSource;
+    private resolvePendingPlanVersionId;
+    private buildBlockedAccessStatus;
     private repairPlanDefaultVersionIfNeeded;
     repairPlanCatalogDefaultsIfNeeded(): void;
-    repairSignupMonetizationSettingsIfNeeded(): void;
     normalizeLegacyPlanDataIfNeeded(): void;
     private removeLegacyPlanFeatureRows;
     private migrateLegacySeatLimitFeatureConfigToVersionSeatLimit;
@@ -34,6 +41,18 @@ export declare class PlanEntitlementService {
     backfillAccountEntitlements(): void;
     private getRequiredDefaultPlanVersion;
     private resolveCanonicalEntitlementStateFromBilling;
+    transitionCanonicalCommercialState(input: {
+        accountId: string;
+        planVersionId?: string | null;
+        state: EntitlementState;
+        effectiveAt?: string | null;
+        effectiveUntil?: string | null;
+        billingMirrorPlanId?: string | null;
+        source: CommercialStateTransitionSource;
+        updatedBy: string;
+        createdAt?: string | null;
+        updatedAt?: string | null;
+    }): AccountEntitlementSnapshot;
     upsertCanonicalEntitlementRecord(input: {
         accountId: string;
         planVersionId: string;
@@ -55,12 +74,18 @@ export declare class PlanEntitlementService {
         feature: PlanFeatureSnapshot | null;
     };
     private planHasAnyActivePricing;
+    private planVersionHasActiveFreePricing;
+    private planVersionIsTrialEligible;
     private tryGetDefaultPlanVersionByPlanId;
     private getActiveDefaultPlanVersions;
     private getDefaultPlanVersionByMode;
     private tryGetDefaultPlanVersionByMode;
-    resolveRegistrationPlanAssignment(selectedPlanVersionIdRaw?: string): {
+    getOnboardingPolicy(): OnboardingPolicy;
+    validateOnboardingPolicy(input?: Partial<OnboardingPolicy>): OnboardingPolicyValidationResult;
+    resolveRegistrationOnboardingOutcome(selectedPlanVersionIdRaw?: string): {
         requiresPlanSelection: boolean;
+        checkoutPending: boolean;
+        commercialState: EntitlementState;
         planVersionId: string | null;
         planId: string | null;
     };
@@ -98,8 +123,6 @@ export declare class PlanEntitlementService {
         planId: string;
         entitlementState: EntitlementState;
     };
-    getSignupMonetizationSettings(): SignupMonetizationSettings;
-    validateSignupMonetizationSettings(input?: Partial<SignupMonetizationSettings>): SignupMonetizationValidationResult;
     private isValidEntitlementTransition;
     addEntitlementAuditLog(input: {
         actorUserId: string;
@@ -199,3 +222,4 @@ export declare class PlanEntitlementService {
         }>;
     };
 }
+export {};