@taskforcehq/taskforce 0.3.304 → 0.3.305

package/dist/components/views/PlansPage.test.js

@@ -14,47 +14,173 @@ vi.mock('./PlanComparisonPage', () => ({
 }));
 describe('PlansPage', () => {
     afterEach(() => {
+        vi.useRealTimers();
         vi.unstubAllGlobals();
     });
-    it('shows recovery messaging instead of false checkout success when confirmation fails', async () => {
-        const fetchMock = vi.fn()
-            .mockResolvedValueOnce({
-            ok: true,
-            json: async () => ({
-                planId: 'pro',
-                planVersionId: 'pro-v1',
-                entitlementState: 'checkout_pending',
-                gate: 'checkout_pending',
-                message: 'Complete checkout to continue.'
-            })
-        })
-            .mockResolvedValueOnce({
-            ok: false,
-            json: async () => ({
-                error: 'Checkout session has not completed yet.',
-                code: 'CHECKOUT_SESSION_INCOMPLETE'
-            })
-        })
-            .mockResolvedValueOnce({
-            ok: true,
-            json: async () => ({
-                planId: 'pro',
-                planVersionId: 'pro-v1',
-                entitlementState: 'checkout_pending',
-                gate: 'plan_selection_required',
-                message: 'Your previous checkout expired. Choose a plan to continue.',
-                planSelectionRequired: true
-            })
+    it('shows recovery messaging only after bounded retries are exhausted', async () => {
+        let profileSummaryCalls = 0;
+        let confirmCalls = 0;
+        const fetchMock = vi.fn(async (url) => {
+            if (url.includes('/api/taskforce/account/profile-summary')) {
+                profileSummaryCalls += 1;
+                if (profileSummaryCalls <= 2) {
+                    return {
+                        ok: true,
+                        json: async () => ({
+                            planId: 'basic',
+                            planVersionId: 'basic-v1',
+                            entitlementState: 'checkout_pending',
+                            gate: 'checkout_pending',
+                            message: 'Complete checkout to continue.'
+                        })
+                    };
+                }
+                return {
+                    ok: true,
+                    json: async () => ({
+                        planId: 'basic',
+                        planVersionId: 'basic-v1',
+                        entitlementState: 'pending_plan_selection',
+                        gate: 'plan_selection_required',
+                        message: 'Your previous checkout expired. Choose a plan to continue.',
+                        planSelectionRequired: true
+                    })
+                };
+            }
+            if (url.includes('/api/taskforce/billing/checkout-session/confirm')) {
+                confirmCalls += 1;
+                return {
+                    ok: false,
+                    status: 409,
+                    json: async () => ({
+                        error: 'Checkout session has not completed yet.',
+                        code: 'CHECKOUT_SESSION_INCOMPLETE'
+                    })
+                };
+            }
+            return {
+                ok: true,
+                json: async () => ({})
+            };
         });
         vi.stubGlobal('fetch', fetchMock);
         render(_jsx(MemoryRouter, { initialEntries: ['/?screen=plans&checkout=success&session_id=cs_test_123'], children: _jsx(PlansPage, { isAuthenticated: true, authUserId: "u1", runtimeMode: "cloud", authSessionResolved: true, resolveCloudAuthUrl: (path) => path }) }));
         expect(await screen.findByText('Checkout completed successfully. Finalizing your plan...')).toBeInTheDocument();
-        expect(await screen.findByText('Your previous checkout expired. Choose a plan to continue.')).toBeInTheDocument();
+        expect(confirmCalls).toBe(1);
+        await waitFor(() => {
+            expect(confirmCalls).toBe(4);
+        }, { timeout: 4500 });
+        await waitFor(() => {
+            expect(screen.getByText('Your previous checkout expired. Choose a plan to continue.')).toBeInTheDocument();
+        });
         expect(screen.queryByText('Checkout completed successfully.')).not.toBeInTheDocument();
+    }, 10000);
+    it('retries checkout confirmation when the first confirm is incomplete and later succeeds', async () => {
+        let profileSummaryCalls = 0;
+        let confirmCalls = 0;
+        const fetchMock = vi.fn(async (url) => {
+            if (url.includes('/api/taskforce/account/profile-summary')) {
+                profileSummaryCalls += 1;
+                if (profileSummaryCalls <= 2) {
+                    return {
+                        ok: true,
+                        json: async () => ({
+                            planId: 'basic',
+                            planVersionId: 'basic-v1',
+                            entitlementState: 'checkout_pending',
+                            gate: 'checkout_pending',
+                            message: 'Complete checkout to continue.'
+                        })
+                    };
+                }
+                return {
+                    ok: true,
+                    json: async () => ({
+                        entitlementState: 'active',
+                        planId: 'basic',
+                        planVersionId: 'basic-v1',
+                        billingInterval: 'month',
+                        gate: 'ok',
+                        message: null
+                    })
+                };
+            }
+            if (url.includes('/api/taskforce/billing/checkout-session/confirm')) {
+                confirmCalls += 1;
+                if (confirmCalls === 1) {
+                    return {
+                        ok: false,
+                        status: 409,
+                        json: async () => ({
+                            error: 'Checkout session has not completed yet.',
+                            code: 'CHECKOUT_SESSION_INCOMPLETE'
+                        })
+                    };
+                }
+                return {
+                    ok: true,
+                    status: 200,
+                    json: async () => ({ success: true })
+                };
+            }
+            return {
+                ok: true,
+                json: async () => ({})
+            };
+        });
+        vi.stubGlobal('fetch', fetchMock);
+        render(_jsx(MemoryRouter, { initialEntries: ['/?screen=plans&checkout=success&session_id=cs_test_retry_success'], children: _jsx(PlansPage, { isAuthenticated: true, authUserId: "u1", runtimeMode: "cloud", authSessionResolved: true, resolveCloudAuthUrl: (path) => path }) }));
+        expect(await screen.findByText('Checkout completed successfully. Finalizing your plan...')).toBeInTheDocument();
+        expect(await screen.findByText('Checkout completed successfully.')).toBeInTheDocument();
+        expect(confirmCalls).toBe(2);
+    }, 10000);
+    it('does not attempt checkout confirmation before auth session is resolved', async () => {
+        let profileSummaryCalls = 0;
+        const fetchMock = vi.fn(async (url) => {
+            if (url.includes('/api/taskforce/account/profile-summary')) {
+                profileSummaryCalls += 1;
+                if (profileSummaryCalls <= 2) {
+                    return {
+                        ok: true,
+                        json: async () => ({
+                            planId: 'basic',
+                            planVersionId: 'basic-v1',
+                            entitlementState: 'checkout_pending',
+                            gate: 'checkout_pending',
+                            message: 'Complete checkout to continue.'
+                        })
+                    };
+                }
+                return {
+                    ok: true,
+                    json: async () => ({
+                        entitlementState: 'active',
+                        planId: 'basic',
+                        planVersionId: 'basic-v1',
+                        gate: 'ok',
+                        message: null
+                    })
+                };
+            }
+            if (url.includes('/api/taskforce/billing/checkout-session/confirm')) {
+                return {
+                    ok: true,
+                    status: 200,
+                    json: async () => ({ success: true })
+                };
+            }
+            return {
+                ok: true,
+                json: async () => ({})
+            };
+        });
+        vi.stubGlobal('fetch', fetchMock);
+        const view = render(_jsx(MemoryRouter, { initialEntries: ['/?screen=plans&checkout=success&session_id=cs_test_auth_wait'], children: _jsx(PlansPage, { isAuthenticated: true, authUserId: "u_auth", runtimeMode: "cloud", authSessionResolved: false, resolveCloudAuthUrl: (path) => path }) }));
+        expect(await screen.findByText('Checkout completed successfully. Finalizing your plan...')).toBeInTheDocument();
+        expect(fetchMock.mock.calls.some(([url]) => String(url).includes('/api/taskforce/billing/checkout-session/confirm'))).toBe(false);
+        view.rerender(_jsx(MemoryRouter, { initialEntries: ['/?screen=plans&checkout=success&session_id=cs_test_auth_wait'], children: _jsx(PlansPage, { isAuthenticated: true, authUserId: "u_auth", runtimeMode: "cloud", authSessionResolved: true, resolveCloudAuthUrl: (path) => path }) }));
         await waitFor(() => {
-            expect(fetchMock).toHaveBeenNthCalledWith(2, '/api/taskforce/billing/checkout-session/confirm', expect.objectContaining({
-                method: 'POST'
-            }));
+            expect(fetchMock.mock.calls.some(([url]) => String(url).includes('/api/taskforce/billing/checkout-session/confirm'))).toBe(true);
         });
     });
     it('shows conflict-specific recovery messaging when the account lands on plans already blocked', async () => {
@@ -62,8 +188,8 @@ describe('PlansPage', () => {
             .mockResolvedValueOnce({
             ok: true,
             json: async () => ({
-                planId: 'pro',
-                planVersionId: 'pro-v1',
+                planId: 'basic',
+                planVersionId: 'basic-v1',
                 entitlementState: 'pending_plan_selection',
                 gate: 'plan_selection_required',
                 message: 'Choose a plan to continue.',
@@ -80,8 +206,8 @@ describe('PlansPage', () => {
             .mockResolvedValueOnce({
             ok: true,
             json: async () => ({
-                planId: 'pro',
-                planVersionId: 'pro-v1',
+                planId: 'basic',
+                planVersionId: 'basic-v1',
                 entitlementState: 'checkout_pending',
                 gate: 'checkout_pending',
                 message: 'Complete checkout to continue.'
@@ -90,8 +216,8 @@ describe('PlansPage', () => {
             .mockResolvedValueOnce({
             ok: true,
             json: async () => ({
-                planId: 'pro',
-                planVersionId: 'pro-v1',
+                planId: 'basic',
+                planVersionId: 'basic-v1',
                 entitlementState: 'pending_plan_selection',
                 gate: 'plan_selection_required',
                 message: 'Choose a plan to continue.',
@@ -154,4 +280,147 @@ describe('PlansPage', () => {
         expect(await screen.findByRole('button', { name: 'Back to App' })).toBeDisabled();
         expect(screen.getByText('Choose a plan to continue.')).toHaveAttribute('data-status-type', 'info');
     });
+    it('does not auto-continue after an in-place paid interval update for an already active account', async () => {
+        const onContinueToTaskforce = vi.fn();
+        let profileSummaryCalls = 0;
+        const fetchMock = vi.fn(async (url) => {
+            if (url.includes('/api/taskforce/account/profile-summary')) {
+                profileSummaryCalls += 1;
+                if (profileSummaryCalls <= 2) {
+                    return {
+                        ok: true,
+                        json: async () => ({
+                            entitlementState: 'active',
+                            planId: 'basic',
+                            planVersionId: 'basic-v1',
+                            gate: 'ok',
+                            message: null
+                        })
+                    };
+                }
+                return {
+                    ok: true,
+                    json: async () => ({
+                        entitlementState: 'active',
+                        planId: 'basic',
+                        planVersionId: 'basic-v1',
+                        billingInterval: 'year',
+                        gate: 'ok',
+                        message: null
+                    })
+                };
+            }
+            if (url.includes('/api/taskforce/billing/checkout-session')) {
+                return {
+                    ok: true,
+                    json: async () => ({
+                        checkoutState: 'updated',
+                        message: 'Your subscription was updated successfully.'
+                    })
+                };
+            }
+            return {
+                ok: true,
+                json: async () => ({})
+            };
+        });
+        vi.stubGlobal('fetch', fetchMock);
+        render(_jsx(MemoryRouter, { initialEntries: ['/?screen=plans&checkout=start&planId=basic&planVersionId=basic-v1&interval=year'], children: _jsx(PlansPage, { isAuthenticated: true, authUserId: "u6", runtimeMode: "local", authSessionResolved: true, resolveCloudAuthUrl: (path) => path, onContinueToTaskforce: onContinueToTaskforce }) }));
+        expect(await screen.findByText('Your subscription was updated successfully.')).toBeInTheDocument();
+        expect(onContinueToTaskforce).not.toHaveBeenCalled();
+    });
+    it('does not auto-continue after confirming checkout when the account was already active', async () => {
+        const onContinueToTaskforce = vi.fn();
+        let profileSummaryCalls = 0;
+        const fetchMock = vi.fn(async (url) => {
+            if (url.includes('/api/taskforce/account/profile-summary')) {
+                profileSummaryCalls += 1;
+                if (profileSummaryCalls <= 2) {
+                    return {
+                        ok: true,
+                        json: async () => ({
+                            entitlementState: 'active',
+                            planId: 'basic',
+                            planVersionId: 'basic-v1',
+                            gate: 'ok',
+                            message: null
+                        })
+                    };
+                }
+                return {
+                    ok: true,
+                    json: async () => ({
+                        entitlementState: 'active',
+                        planId: 'team-5',
+                        planVersionId: 'team-5-v1',
+                        gate: 'ok',
+                        message: null
+                    })
+                };
+            }
+            if (url.includes('/api/taskforce/billing/checkout-session/confirm')) {
+                return {
+                    ok: true,
+                    json: async () => ({ success: true })
+                };
+            }
+            return {
+                ok: true,
+                json: async () => ({})
+            };
+        });
+        vi.stubGlobal('fetch', fetchMock);
+        render(_jsx(MemoryRouter, { initialEntries: ['/?screen=plans&checkout=success&session_id=cs_test_existing_active'], children: _jsx(PlansPage, { isAuthenticated: true, authUserId: "u7", runtimeMode: "local", authSessionResolved: true, resolveCloudAuthUrl: (path) => path, onContinueToTaskforce: onContinueToTaskforce }) }));
+        expect(await screen.findByText('Checkout completed successfully.')).toBeInTheDocument();
+        expect(onContinueToTaskforce).not.toHaveBeenCalled();
+    });
+    it('shows trial-specific messaging while still allowing return to Taskforce', async () => {
+        const fetchMock = vi.fn().mockResolvedValue({
+            ok: true,
+            json: async () => ({
+                entitlementState: 'trialing',
+                planId: 'starter',
+                planVersionId: 'starter-v1',
+                gate: 'ok',
+                trialEnd: '2026-05-01T12:00:00.000Z'
+            })
+        });
+        vi.stubGlobal('fetch', fetchMock);
+        render(_jsx(MemoryRouter, { initialEntries: ['/?screen=plans'], children: _jsx(PlansPage, { isAuthenticated: true, authUserId: "u8", runtimeMode: "cloud", authSessionResolved: true, resolveCloudAuthUrl: (path) => path, onContinueToTaskforce: vi.fn() }) }));
+        expect(await screen.findByText(/Your trial is active through/)).toBeInTheDocument();
+        expect(screen.getByRole('button', { name: 'Take Me to Taskforce' })).toBeEnabled();
+    });
+    it('shows suspended accounts a billing-recovery message and keeps return blocked', async () => {
+        const fetchMock = vi.fn().mockResolvedValue({
+            ok: true,
+            json: async () => ({
+                entitlementState: 'suspended',
+                planId: 'pro',
+                planVersionId: 'pro-v1',
+                gate: 'missing_entitlement',
+                stripeCustomerId: 'cus_123'
+            })
+        });
+        vi.stubGlobal('fetch', fetchMock);
+        render(_jsx(MemoryRouter, { initialEntries: ['/?screen=plans'], children: _jsx(PlansPage, { isAuthenticated: true, authUserId: "u9", runtimeMode: "cloud", authSessionResolved: true, resolveCloudAuthUrl: (path) => path }) }));
+        expect(await screen.findByText('Your access is suspended because billing needs attention. Update billing to restore access.')).toBeInTheDocument();
+        expect(screen.getByRole('button', { name: 'Back to App' })).toBeDisabled();
+        expect(screen.getByText('Your access is suspended because billing needs attention. Update billing to restore access.')).toHaveAttribute('data-status-type', 'error');
+    });
+    it('shows canceled accounts reactivation messaging instead of generic inactive copy', async () => {
+        const fetchMock = vi.fn().mockResolvedValue({
+            ok: true,
+            json: async () => ({
+                entitlementState: 'canceled',
+                planId: 'pro',
+                planVersionId: 'pro-v1',
+                gate: 'missing_entitlement',
+                message: 'This generic message should be ignored.'
+            })
+        });
+        vi.stubGlobal('fetch', fetchMock);
+        render(_jsx(MemoryRouter, { initialEntries: ['/?screen=plans'], children: _jsx(PlansPage, { isAuthenticated: true, authUserId: "u10", runtimeMode: "cloud", authSessionResolved: true, resolveCloudAuthUrl: (path) => path }) }));
+        expect(await screen.findByText('Your access has ended. Choose a plan to reactivate your workspace.')).toBeInTheDocument();
+        expect(screen.queryByText('This generic message should be ignored.')).not.toBeInTheDocument();
+    });
 });

package/dist/components/views/StandaloneLayout.js

@@ -35,6 +35,7 @@ import { getLocale, t } from '../../localization';
 import { resolveAnnotatedAttachmentDetail } from '../../utils/annotatedAttachments';
 import { ACCOUNT_PROFILE_SUMMARY_PATH, invalidateAccountProfileSummaryCache, loadAccountProfileSummaryCached } from '../../utils/accountProfileSummaryCache';
 import { fetchTaskforceApi } from '../../utils/taskforceApiClient';
+import { resolveCommercialLifecyclePresentation } from '../../utils/commercialLifecyclePresentation';
 import { AppShellHeader } from './AppShellHeader';
 import { getTaskforceCloudEnvironmentConfig, parseTaskforceCloudEnvironment, resolveTaskforceCloudEnvironmentFromBaseUrl } from '../../config/cloudEnvironment';
 import { logBootstrapDebug, persistRemoteUiState } from '../../hooks/workspace/workspaceLocalState';
@@ -56,7 +57,6 @@ const WorkflowsModule = React.lazy(() => import('../features/WorkflowsModule').t
 const AgentsModule = React.lazy(() => import('../features/AgentsModule').then(m => ({ default: m.AgentsModule })));
 const InitiativesModule = React.lazy(() => import('../features/InitiativesModule').then(m => ({ default: m.InitiativesModule })));
 const PlansPage = React.lazy(() => import('./PlansPage').then(m => ({ default: m.PlansPage })));
-const ACTIVE_COMMERCIAL_STATES = new Set(['active', 'trialing', 'grace']);
 const PROFILE_AVATAR_ACCEPT = 'image/png,image/jpeg,image/webp,image/gif';
 const PROFILE_AVATAR_MAX_BYTES = 5 * 1024 * 1024;
 const resolveSameOriginTaskforcePath = (path) => path;
@@ -928,28 +928,36 @@ export function StandaloneLayout(props) {
         const referenceLabel = formatInitiativeReference(initiative);
         return {
             value: initiative.id,
-            label: referenceLabel ? `${referenceLabel} - ${initiative.title}` : initiative.title,
-            selectedLabel: referenceLabel || initiative.title,
+            label: referenceLabel || initiative.title,
         };
     }), [planningStructure.initiatives]);
-    const workstreamFilterOptions = useMemo(() => [
-        ...planningStructure.initiatives.flatMap((initiative) => initiative.workstreams.map((workstream) => {
+    const workstreamFilterOptions = useMemo(() => {
+        const visibleInitiativeWorkstreams = selectedPlanningInitiativeId
+            ? (planningStructure.initiativeById.get(selectedPlanningInitiativeId)?.workstreams || [])
+            : planningStructure.initiatives.flatMap((initiative) => initiative.workstreams);
+        const initiativeWorkstreams = visibleInitiativeWorkstreams.map((workstream) => {
             const referenceLabel = formatWorkstreamReference(workstream);
             return {
                 value: workstream.id,
-                label: referenceLabel ? `${referenceLabel} - ${workstream.title}` : workstream.title,
-                selectedLabel: referenceLabel || workstream.title,
+                label: referenceLabel || workstream.title,
             };
-        })),
-        ...planningStructure.standaloneWorkstreams.map((workstream) => {
-            const referenceLabel = formatWorkstreamReference(workstream);
-            return {
-                value: workstream.id,
-                label: referenceLabel ? `${referenceLabel} - ${workstream.title}` : workstream.title,
-                selectedLabel: referenceLabel || workstream.title,
-            };
-        }),
-    ], [planningStructure.initiatives, planningStructure.standaloneWorkstreams]);
+        });
+        const standaloneWorkstreams = selectedPlanningInitiativeId
+            ? []
+            : planningStructure.standaloneWorkstreams.map((workstream) => {
+                const referenceLabel = formatWorkstreamReference(workstream);
+                return {
+                    value: workstream.id,
+                    label: referenceLabel || workstream.title,
+                };
+            });
+        return [...initiativeWorkstreams, ...standaloneWorkstreams];
+    }, [
+        planningStructure.initiativeById,
+        planningStructure.initiatives,
+        planningStructure.standaloneWorkstreams,
+        selectedPlanningInitiativeId,
+    ]);
     const selectedPlanningTaskIds = useMemo(() => {
         if (selectedPlanningWorkstreamId) {
             return new Set(planningStructure.workstreamTaskIds.get(selectedPlanningWorkstreamId) || []);
@@ -1630,9 +1638,8 @@ export function StandaloneLayout(props) {
         setTeamPlanMode(nextMode);
     }, []);
     const hasActiveCommercialEntitlement = useMemo(() => {
-        const entitlementState = String(accountProfileSummary?.entitlementState || '').trim().toLowerCase();
-        return ACTIVE_COMMERCIAL_STATES.has(entitlementState);
-    }, [accountProfileSummary?.entitlementState]);
+        return resolveCommercialLifecyclePresentation(accountProfileSummary).allowReturnToApp;
+    }, [accountProfileSummary]);
     const handleStartCheckout = useCallback(async () => {
         const params = new URLSearchParams();
         params.set('screen', 'plans');
@@ -1828,8 +1835,7 @@ export function StandaloneLayout(props) {
             return;
         }
         const summary = await loadAccountProfileSummary({ force: true });
-        const entitlementState = String(summary?.entitlementState || '').trim().toLowerCase();
-        if (!ACTIVE_COMMERCIAL_STATES.has(entitlementState)) {
+        if (!resolveCommercialLifecyclePresentation(summary).allowReturnToApp) {
             return;
         }
         setPlansNavigationBusy(true);

package/dist/components/views/panels/FilterToolbar.test.js

@@ -31,15 +31,17 @@ describe('FilterToolbar', () => {
         expect(screen.getByRole('button', { name: /All Initiatives/i })).toBeInTheDocument();
         expect(screen.getByRole('button', { name: /All Workstreams/i })).toBeInTheDocument();
         rerender(_jsx(FilterToolbar, { categoryFilterOptions: [], typeFilterOptions: [], priorities: [], filterCategories: [], setFilterCategories: vi.fn(), filterTypes: [], setFilterTypes: vi.fn(), filterPriorities: [], setFilterPriorities: vi.fn(), filterStatus: [], setFilterStatus: vi.fn(), filterAssignees: [], setFilterAssignees: vi.fn(), assigneeOptions: [], initiativeFilterOptions: [
-                { value: 'initiative-1', label: 'Stability Sprint' },
+                { value: 'initiative-1', label: 'IN-101' },
             ], selectedInitiativeId: "", setSelectedInitiativeId: setSelectedInitiativeId, workstreamFilterOptions: [
-                { value: 'workstream-1', label: 'Header polish' },
+                { value: 'workstream-1', label: 'WS-202' },
             ], selectedWorkstreamId: "", setSelectedWorkstreamId: setSelectedWorkstreamId, taskScope: "open", setTaskScope: vi.fn(), showArchive: false, setShowArchive: vi.fn(), fetchArchive: vi.fn(), clearFilters: vi.fn() }));
         await user.click(screen.getByRole('button', { name: /All Initiatives/i }));
-        await user.click(screen.getByRole('button', { name: 'Stability Sprint' }));
+        expect(screen.queryByText('Stability Sprint')).not.toBeInTheDocument();
+        await user.click(screen.getByRole('button', { name: 'IN-101' }));
         expect(setSelectedInitiativeId).toHaveBeenCalledWith('initiative-1');
         await user.click(screen.getByRole('button', { name: /All Workstreams/i }));
-        await user.click(screen.getByRole('button', { name: 'Header polish' }));
+        expect(screen.queryByText('Header polish')).not.toBeInTheDocument();
+        await user.click(screen.getByRole('button', { name: 'WS-202' }));
         expect(setSelectedWorkstreamId).toHaveBeenCalledWith('workstream-1');
     });
 });

package/dist/components/views/standalone/modals/AccountHubModal.d.ts

@@ -1,17 +1,5 @@
+import type { AccountProfileSummary } from '../../../../utils/accountProfileSummaryCache';
 import type { ModalRuntimeMode, ModalThemeName } from './types';
-interface AccountProfileSummaryLike {
-    planId?: string | null;
-    planName?: string | null;
-    entitlementState?: string | null;
-    stripeStatus?: string | null;
-    effectiveUntil?: string | null;
-    stripeSubscriptionId?: string | null;
-    stripeCustomerId?: string | null;
-    gate?: string | null;
-    message?: string | null;
-    billingConflictCode?: 'CHECKOUT_SESSION_EXPIRED' | 'CHECKOUT_SESSION_SUPERSEDED' | null;
-    planSelectionRequired?: boolean;
-}
 interface AccountHubModalProps {
     isOpen: boolean;
     theme: ModalThemeName;
@@ -26,7 +14,7 @@ interface AccountHubModalProps {
     billingNotice: string | null;
     billingActionBusy: boolean;
     billingIntervalChoice: 'month' | 'year';
-    accountProfileSummary: AccountProfileSummaryLike | null;
+    accountProfileSummary: AccountProfileSummary | null;
     currentWorkspaceId: string;
     canOpenTeamManagement: boolean;
     canManageWorkspaceSync: boolean;

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

@@ -5,21 +5,19 @@ import accountStyles from '../../StandaloneAccount.module.css';
 import authStyles from '../../AuthShell.module.css';
 import managementStyles from '../../StandaloneManagement.module.css';
 import styles from '../../../../Taskforce.module.css';
+import { resolveCommercialLifecyclePresentation } from '../../../../utils/commercialLifecyclePresentation';
 export function AccountHubModal({ isOpen, theme, runtimeMode, authRequiredForApi, isAuthenticated, hasAuthIdentity, authIdentityLabel, billingLoading, billingError, billingActionError, billingNotice, billingActionBusy, billingIntervalChoice, accountProfileSummary, currentWorkspaceId, canOpenTeamManagement, canManageWorkspaceSync, workspaceCloudSyncEnabled, syncStatusLabel, workspaceSyncError, syncControlBusy, onClose, onOpenWorkspaceAudit, onBillingIntervalChange, onRefreshBilling, onUpdateInterval, onManageBilling, onStartCheckout, onToggleWorkspaceSync, onOpenHelp, }) {
-    const billingGate = String(accountProfileSummary?.gate || '').trim().toLowerCase();
-    const billingConflictCode = String(accountProfileSummary?.billingConflictCode || '').trim().toUpperCase();
-    const billingRecoveryMessage = String(accountProfileSummary?.message || '').trim()
-        || (billingConflictCode === 'CHECKOUT_SESSION_EXPIRED'
-            ? 'Your latest checkout expired. Choose a plan to continue.'
-            : (billingConflictCode === 'CHECKOUT_SESSION_SUPERSEDED'
-                ? 'A newer checkout is already in progress for this account. Open plans to continue.'
-                : ''));
-    const startCheckoutLabel = billingConflictCode === 'CHECKOUT_SESSION_EXPIRED'
-        || accountProfileSummary?.planSelectionRequired === true
-        || billingGate === 'plan_selection_required'
-        ? 'Choose Plan'
-        : (billingGate === 'checkout_pending' ? 'Open Plans' : 'Start Checkout');
+    const lifecyclePresentation = resolveCommercialLifecyclePresentation(accountProfileSummary);
+    const billingRecoveryMessage = lifecyclePresentation.message;
+    const startCheckoutLabel = lifecyclePresentation.primaryLabel || 'Start Checkout';
     const resolvedPlanLabel = String(accountProfileSummary?.planName || accountProfileSummary?.planId || 'n/a').trim() || 'n/a';
+    const primaryBillingAction = () => {
+        if (lifecyclePresentation.primaryAction === 'manage_billing') {
+            onManageBilling();
+            return;
+        }
+        onStartCheckout();
+    };
     return (_jsx(Modal, { isOpen: isOpen, onClose: onClose, title: "Account Hub", size: "md", theme: theme, draggable: true, children: _jsxs("div", { className: `${modalStyles.form} ${managementStyles.modalBody}`, children: [_jsx("p", { className: managementStyles.mutedText, children: "Manage sign in, profile, and workspace controls from one place." }), _jsxs("div", { className: accountStyles.accountHubCard, children: [_jsx("strong", { children: "Authentication" }), _jsx("p", { className: managementStyles.sectionText, children: runtimeMode === 'cloud'
                                 ? (authRequiredForApi
                                     ? (isAuthenticated ? 'Signed in. API access is enabled.' : 'Cloud mode requires sign in before app usage.')
@@ -28,7 +26,7 @@ export function AccountHubModal({ isOpen, theme, runtimeMode, authRequiredForApi
                                 ? (hasAuthIdentity
                                     ? _jsxs(_Fragment, { children: ["Signed in as ", _jsx("span", { className: accountStyles.accountIdentityEmail, children: authIdentityLabel })] })
                                     : 'Signed in')
-                                : 'Signed in as: not signed in' }), runtimeMode === 'cloud' && authRequiredForApi && !isAuthenticated && (_jsx("p", { className: managementStyles.sectionTextTop, children: "Use the `/login` screen to sign in." }))] }), _jsxs("div", { className: accountStyles.accountHubCard, children: [_jsx("strong", { children: "Profile & Account" }), _jsx("p", { className: managementStyles.sectionText, children: "Profile editing and account preferences will live here." })] }), _jsxs("div", { className: accountStyles.accountHubCard, children: [_jsx("strong", { children: "Billing" }), !isAuthenticated ? (_jsx("p", { className: managementStyles.sectionText, children: "Sign in to manage subscription billing." })) : runtimeMode !== 'cloud' ? (_jsx("p", { className: managementStyles.sectionText, children: "Billing remains cloud-backed in local runtime and uses your connected cloud account." })) : (_jsxs(_Fragment, { children: [billingLoading && (_jsx("p", { className: managementStyles.sectionTextSpaced, children: "Loading billing status..." })), billingError && (_jsx("p", { className: `${authStyles.loginError} ${managementStyles.errorText}`, children: billingError })), billingActionError && (_jsx("p", { className: `${authStyles.loginError} ${managementStyles.errorText}`, children: billingActionError })), billingNotice && (_jsx("p", { className: managementStyles.errorText, children: billingNotice })), billingRecoveryMessage && (_jsx("p", { className: managementStyles.sectionText, children: billingRecoveryMessage })), _jsxs("p", { className: managementStyles.sectionTextSpaced, children: ["Plan: ", _jsx("code", { children: resolvedPlanLabel }), ' · ', "Entitlement: ", _jsx("code", { children: String(accountProfileSummary?.entitlementState || 'n/a') })] }), _jsxs("p", { className: managementStyles.sectionText, children: ["Stripe status: ", _jsx("code", { children: String(accountProfileSummary?.stripeStatus || 'n/a') }), accountProfileSummary?.effectiveUntil ? ` · Effective until ${new Date(accountProfileSummary.effectiveUntil).toLocaleString()}` : ''] }), _jsx("div", { className: managementStyles.wrapRow, children: _jsxs("label", { className: `${accountStyles.accountMenuMeta} ${managementStyles.inlineFieldLabel}`, children: ["Interval", _jsxs("select", { className: styles.input, value: billingIntervalChoice, onChange: (event) => onBillingIntervalChange(event.target.value === 'year' ? 'year' : 'month'), disabled: billingActionBusy, children: [_jsx("option", { value: "month", children: "Monthly" }), _jsx("option", { value: "year", children: "Yearly" })] })] }) }), _jsxs("div", { className: managementStyles.actionRowEnd, children: [_jsx("button", { className: styles.cancelBtn, onClick: onRefreshBilling, disabled: billingActionBusy || billingLoading, children: "Refresh Billing" }), _jsx("button", { className: styles.cancelBtn, onClick: onUpdateInterval, disabled: billingActionBusy || !accountProfileSummary?.stripeSubscriptionId, children: "Update Interval" }), _jsx("button", { className: styles.cancelBtn, onClick: onManageBilling, disabled: billingActionBusy || !accountProfileSummary?.stripeCustomerId, children: "Manage Billing" }), _jsx("button", { className: styles.submitBtn, onClick: onStartCheckout, disabled: billingActionBusy, children: billingActionBusy ? 'Working...' : startCheckoutLabel })] })] }))] }), _jsxs("div", { className: accountStyles.accountHubCard, children: [_jsx("strong", { children: "Workspace Audit Log" }), _jsx("p", { className: managementStyles.sectionText, children: "Audit entries are workspace-scoped for the active workspace, not global account history." }), _jsxs("p", { className: managementStyles.sectionText, children: ["Active workspace: ", _jsx("code", { children: currentWorkspaceId })] }), _jsx("div", { className: managementStyles.actionRowEnd, children: _jsx("button", { className: styles.cancelBtn, onClick: onOpenWorkspaceAudit, disabled: !canOpenTeamManagement, children: "Open Workspace Audit" }) })] }), _jsxs("div", { className: accountStyles.accountHubCard, children: [_jsx("strong", { children: "Workspace Cloud Sync" }), _jsx("p", { className: managementStyles.sectionText, children: canManageWorkspaceSync
+                                : 'Signed in as: not signed in' }), runtimeMode === 'cloud' && authRequiredForApi && !isAuthenticated && (_jsx("p", { className: managementStyles.sectionTextTop, children: "Use the `/login` screen to sign in." }))] }), _jsxs("div", { className: accountStyles.accountHubCard, children: [_jsx("strong", { children: "Profile & Account" }), _jsx("p", { className: managementStyles.sectionText, children: "Profile editing and account preferences will live here." })] }), _jsxs("div", { className: accountStyles.accountHubCard, children: [_jsx("strong", { children: "Billing" }), !isAuthenticated ? (_jsx("p", { className: managementStyles.sectionText, children: "Sign in to manage subscription billing." })) : runtimeMode !== 'cloud' ? (_jsx("p", { className: managementStyles.sectionText, children: "Billing remains cloud-backed in local runtime and uses your connected cloud account." })) : (_jsxs(_Fragment, { children: [billingLoading && (_jsx("p", { className: managementStyles.sectionTextSpaced, children: "Loading billing status..." })), billingError && (_jsx("p", { className: `${authStyles.loginError} ${managementStyles.errorText}`, children: billingError })), billingActionError && (_jsx("p", { className: `${authStyles.loginError} ${managementStyles.errorText}`, children: billingActionError })), billingNotice && (_jsx("p", { className: managementStyles.errorText, children: billingNotice })), billingRecoveryMessage && (_jsx("p", { className: managementStyles.sectionText, children: billingRecoveryMessage })), _jsxs("p", { className: managementStyles.sectionTextSpaced, children: ["Plan: ", _jsx("code", { children: resolvedPlanLabel }), ' · ', "Entitlement: ", _jsx("code", { children: String(accountProfileSummary?.entitlementState || 'n/a') })] }), _jsxs("p", { className: managementStyles.sectionText, children: ["Stripe status: ", _jsx("code", { children: String(accountProfileSummary?.stripeStatus || 'n/a') }), accountProfileSummary?.effectiveUntil ? ` · Effective until ${new Date(accountProfileSummary.effectiveUntil).toLocaleString()}` : ''] }), _jsx("div", { className: managementStyles.wrapRow, children: _jsxs("label", { className: `${accountStyles.accountMenuMeta} ${managementStyles.inlineFieldLabel}`, children: ["Interval", _jsxs("select", { className: styles.input, value: billingIntervalChoice, onChange: (event) => onBillingIntervalChange(event.target.value === 'year' ? 'year' : 'month'), disabled: billingActionBusy, children: [_jsx("option", { value: "month", children: "Monthly" }), _jsx("option", { value: "year", children: "Yearly" })] })] }) }), _jsxs("div", { className: managementStyles.actionRowEnd, children: [_jsx("button", { className: styles.cancelBtn, onClick: onRefreshBilling, disabled: billingActionBusy || billingLoading, children: "Refresh Billing" }), _jsx("button", { className: styles.cancelBtn, onClick: onUpdateInterval, disabled: billingActionBusy || !accountProfileSummary?.stripeSubscriptionId, children: "Update Interval" }), _jsx("button", { className: styles.cancelBtn, onClick: onManageBilling, disabled: billingActionBusy || !accountProfileSummary?.stripeCustomerId, children: "Manage Billing" }), _jsx("button", { className: styles.submitBtn, onClick: primaryBillingAction, disabled: billingActionBusy || (lifecyclePresentation.primaryAction === 'manage_billing' && !accountProfileSummary?.stripeCustomerId), children: billingActionBusy ? 'Working...' : startCheckoutLabel })] })] }))] }), _jsxs("div", { className: accountStyles.accountHubCard, children: [_jsx("strong", { children: "Workspace Audit Log" }), _jsx("p", { className: managementStyles.sectionText, children: "Audit entries are workspace-scoped for the active workspace, not global account history." }), _jsxs("p", { className: managementStyles.sectionText, children: ["Active workspace: ", _jsx("code", { children: currentWorkspaceId })] }), _jsx("div", { className: managementStyles.actionRowEnd, children: _jsx("button", { className: styles.cancelBtn, onClick: onOpenWorkspaceAudit, disabled: !canOpenTeamManagement, children: "Open Workspace Audit" }) })] }), _jsxs("div", { className: accountStyles.accountHubCard, children: [_jsx("strong", { children: "Workspace Cloud Sync" }), _jsx("p", { className: managementStyles.sectionText, children: canManageWorkspaceSync
                                 ? (workspaceCloudSyncEnabled
                                     ? `Enabled · ${syncStatusLabel}`
                                     : 'Disabled')

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

@@ -17,10 +17,33 @@ describe('AccountHubModal', () => {
                 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('Your previous 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);
     });
+    it('makes billing recovery the primary action for suspended accounts', () => {
+        const onManageBilling = 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: 'suspended',
+                stripeCustomerId: 'cus_123'
+            }, currentWorkspaceId: "workspace-1", canOpenTeamManagement: false, canManageWorkspaceSync: false, workspaceCloudSyncEnabled: false, syncStatusLabel: "Disabled", workspaceSyncError: null, syncControlBusy: false, onClose: () => { }, onOpenWorkspaceAudit: () => { }, onBillingIntervalChange: () => { }, onRefreshBilling: () => { }, onUpdateInterval: () => { }, onManageBilling: onManageBilling, onStartCheckout: () => { }, onToggleWorkspaceSync: () => { }, onOpenHelp: () => { } }));
+        expect(screen.getByText('Your access is suspended because billing needs attention. Update billing to restore access.')).toBeInTheDocument();
+        fireEvent.click(screen.getAllByRole('button', { name: 'Manage Billing' })[1]);
+        expect(onManageBilling).toHaveBeenCalledTimes(1);
+    });
+    it('shows trialing accounts as active without blocked recovery copy', () => {
+        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: 'starter',
+                planName: 'Starter',
+                entitlementState: 'trialing',
+                stripeCustomerId: 'cus_123',
+                trialEnd: '2026-05-01T12:00:00.000Z'
+            }, currentWorkspaceId: "workspace-1", canOpenTeamManagement: false, canManageWorkspaceSync: false, workspaceCloudSyncEnabled: false, syncStatusLabel: "Disabled", workspaceSyncError: null, syncControlBusy: false, onClose: () => { }, onOpenWorkspaceAudit: () => { }, onBillingIntervalChange: () => { }, onRefreshBilling: () => { }, onUpdateInterval: () => { }, onManageBilling: () => { }, onStartCheckout: () => { }, onToggleWorkspaceSync: () => { }, onOpenHelp: () => { } }));
+        expect(screen.getByText(/Your trial is active through/)).toBeInTheDocument();
+        expect(screen.queryByText('Your access is suspended because billing needs attention. Update billing to restore access.')).not.toBeInTheDocument();
+    });
 });