@taskforcehq/taskforce 0.3.302 → 0.3.303

package/dist/components/task/TaskKanban.test.js

@@ -43,4 +43,21 @@ describe('TaskKanban schedule expired behavior', () => {
         expect(screen.getByText('Mon')).toBeInTheDocument();
         expect(screen.getAllByText('Expired dual visibility task')).toHaveLength(2);
     });
+    it('shows filtered and total counts per column', () => {
+        const mon = dateOffset(1);
+        const tue = dateOffset(2);
+        const wed = dateOffset(3);
+        const thu = dateOffset(4);
+        const fri = dateOffset(5);
+        const sat = dateOffset(6);
+        const sun = dateOffset(7);
+        const visibleTask = makeTask({ id: 'task-visible', title: 'Visible task', scheduledDate: mon });
+        const hiddenTask = makeTask({ id: 'task-hidden', title: 'Hidden task', scheduledDate: mon });
+        render(_jsx(TaskKanban, { tasks: [visibleTask], allTasks: [visibleTask, hiddenTask], columns: [
+                { value: 'backlog', label: 'Backlog', color: '#64748b', icon: 'Inbox' },
+                { value: 'expired', label: 'Expired', color: '#ef4444', icon: 'AlertTriangle' },
+                { value: 'mon', label: 'Mon', color: '#3b82f6', icon: 'Calendar' }
+            ], groupBy: "schedule", scheduleDates: { mon, tue, wed, thu, fri, sat, sun }, scheduleFilteredTaskIds: [visibleTask.id], onUpdateTask: vi.fn(), onTaskClick: vi.fn() }));
+        expect(screen.getByText('1 / 2')).toBeInTheDocument();
+    });
 });

package/dist/components/views/PlansPage.d.ts

@@ -1,5 +1,6 @@
 interface PlansPageProps {
     isAuthenticated: boolean;
+    authUserId?: string | null;
     runtimeMode: string;
     authSessionResolved: boolean;
     currentTheme?: import('../../types').TaskforceTheme;
@@ -7,8 +8,9 @@ interface PlansPageProps {
     currentWorkspaceId?: string | null;
     apiBaseUrl?: string | null;
     connectedEnvironmentSource?: string | null;
+    resolveCloudAuthUrl?: (path: string) => string;
     embedded?: boolean;
     shellOwnsScroll?: boolean;
 }
-export declare function PlansPage({ isAuthenticated, runtimeMode, authSessionResolved, currentTheme, projectName, currentWorkspaceId, apiBaseUrl, connectedEnvironmentSource, embedded, shellOwnsScroll }: PlansPageProps): import("react/jsx-runtime").JSX.Element;
+export declare function PlansPage({ isAuthenticated, authUserId, runtimeMode, authSessionResolved, currentTheme, projectName, currentWorkspaceId, apiBaseUrl, connectedEnvironmentSource, resolveCloudAuthUrl, embedded, shellOwnsScroll }: PlansPageProps): import("react/jsx-runtime").JSX.Element;
 export {};

package/dist/components/views/PlansPage.js

@@ -6,14 +6,19 @@ import styles from './PlansPage.module.css';
 import { PlanComparisonPage } from './PlanComparisonPage';
 import { AppShellHeader } from './AppShellHeader';
 import { resolveTaskforceCloudEnvironmentFromBaseUrl } from '../../config/cloudEnvironment';
-import { invalidateBillingStatusCache, loadBillingStatusCached } from '../../utils/billingStatusCache';
+import { ACCOUNT_PROFILE_SUMMARY_PATH, invalidateAccountProfileSummaryCache, loadAccountProfileSummaryCached } from '../../utils/accountProfileSummaryCache';
 const TRANSIENT_CHECKOUT_QUERY_CLEAR_DELAY_MS = 1600;
 const ACTIVE_ENTITLEMENT_STATES = new Set(['active', 'trialing', 'grace']);
 const GATE_MESSAGES = {
     planSelectionRequired: 'Choose a plan to continue.',
-    misconfigured: 'Signup monetization is misconfigured. Contact support or a system administrator.',
+    checkoutPending: 'Complete checkout to continue.',
+    misconfigured: 'Onboarding policy is misconfigured. Contact support or a system administrator.',
     missingEntitlement: 'No entitlement is linked to this account.'
 };
+const BILLING_CONFLICT_MESSAGES = {
+    CHECKOUT_SESSION_EXPIRED: 'Your previous checkout expired. Choose a plan to continue.',
+    CHECKOUT_SESSION_SUPERSEDED: 'A newer checkout replaced your previous checkout. Choose a plan to continue.'
+};
 function parseInterval(raw) {
     return raw === 'year' ? 'year' : 'month';
 }
@@ -33,10 +38,10 @@ function buildEmbeddedPlansPath(params = {}) {
     }
     return `/?${query.toString()}`;
 }
-export function PlansPage({ isAuthenticated, runtimeMode, authSessionResolved, currentTheme = 'dark', projectName, currentWorkspaceId, apiBaseUrl, connectedEnvironmentSource, embedded = false, shellOwnsScroll = false }) {
+export function PlansPage({ isAuthenticated, authUserId, runtimeMode, authSessionResolved, currentTheme = 'dark', projectName, currentWorkspaceId, apiBaseUrl, connectedEnvironmentSource, resolveCloudAuthUrl, embedded = false, shellOwnsScroll = false }) {
     const navigate = useNavigate();
     const location = useLocation();
-    const [billingStatus, setBillingStatus] = useState(null);
+    const [accountProfileSummary, setAccountProfileSummary] = useState(null);
     const [actionBusy, setActionBusy] = useState(false);
     const [feedback, setFeedback] = useState(null);
     const checkoutStartRan = useRef(false);
@@ -63,6 +68,9 @@ export function PlansPage({ isAuthenticated, runtimeMode, authSessionResolved, c
             return normalizedPath;
         return `${normalizedApiBaseUrl}${normalizedPath.startsWith('/') ? normalizedPath : `/${normalizedPath}`}`;
     }, [normalizedApiBaseUrl]);
+    const buildCloudBillingUrl = useCallback((path) => {
+        return resolveCloudAuthUrl ? resolveCloudAuthUrl(path) : buildApiUrl(path);
+    }, [buildApiUrl, resolveCloudAuthUrl]);
     const closeEmbeddedPlansScreen = useCallback(() => {
         const params = new URLSearchParams(location.search);
         params.delete('screen');
@@ -82,20 +90,31 @@ export function PlansPage({ isAuthenticated, runtimeMode, authSessionResolved, c
         return endpoints;
     }, [normalizedApiBaseUrl]);
     const hasResolvedActiveEntitlement = useMemo(() => {
-        const entitlementState = String(billingStatus?.entitlementState || '').trim().toLowerCase();
+        const entitlementState = String(accountProfileSummary?.entitlementState || '').trim().toLowerCase();
         return ACTIVE_ENTITLEMENT_STATES.has(entitlementState);
-    }, [billingStatus?.entitlementState]);
+    }, [accountProfileSummary?.entitlementState]);
     const gateMessage = useMemo(() => {
         if (hasResolvedActiveEntitlement)
             return null;
-        if (gateState === 'plan_selection_required')
+        const billingConflictCode = String(accountProfileSummary?.billingConflictCode || '').trim().toUpperCase();
+        if (billingConflictCode === 'CHECKOUT_SESSION_EXPIRED')
+            return BILLING_CONFLICT_MESSAGES.CHECKOUT_SESSION_EXPIRED;
+        if (billingConflictCode === 'CHECKOUT_SESSION_SUPERSEDED')
+            return BILLING_CONFLICT_MESSAGES.CHECKOUT_SESSION_SUPERSEDED;
+        const summaryMessage = String(accountProfileSummary?.message || '').trim();
+        if (summaryMessage)
+            return summaryMessage;
+        const effectiveGateState = String(accountProfileSummary?.gate || gateState || '').trim().toLowerCase();
+        if (effectiveGateState === 'plan_selection_required')
             return GATE_MESSAGES.planSelectionRequired;
-        if (gateState === 'misconfigured')
+        if (effectiveGateState === 'checkout_pending')
+            return GATE_MESSAGES.checkoutPending;
+        if (effectiveGateState === 'misconfigured')
             return GATE_MESSAGES.misconfigured;
-        if (gateState === 'missing_entitlement')
+        if (effectiveGateState === 'missing_entitlement')
             return GATE_MESSAGES.missingEntitlement;
         return null;
-    }, [gateState, hasResolvedActiveEntitlement]);
+    }, [accountProfileSummary?.billingConflictCode, accountProfileSummary?.gate, accountProfileSummary?.message, gateState, hasResolvedActiveEntitlement]);
     const clearTransientQueryState = useCallback(() => {
         const next = new URLSearchParams(location.search);
         next.delete('checkout');
@@ -116,21 +135,37 @@ export function PlansPage({ isAuthenticated, runtimeMode, authSessionResolved, c
             transientQueryClearTimeoutRef.current = null;
         }, TRANSIENT_CHECKOUT_QUERY_CLEAR_DELAY_MS);
     }, [clearTransientQueryState]);
-    const loadBillingStatus = useCallback(async () => {
-        const billingStatusUrl = buildApiUrl('/api/taskforce/billing/status');
+    const loadAccountProfileSummary = useCallback(async (options) => {
+        const accountProfileSummaryUrl = buildCloudBillingUrl(ACCOUNT_PROFILE_SUMMARY_PATH);
         if (!isAuthenticated) {
-            setBillingStatus(null);
-            invalidateBillingStatusCache(billingStatusUrl);
-            return;
+            setAccountProfileSummary(null);
+            invalidateAccountProfileSummaryCache(accountProfileSummaryUrl, { identityKey: authUserId });
+            return null;
         }
         try {
-            const payload = await loadBillingStatusCached(billingStatusUrl);
-            setBillingStatus(payload);
+            const payload = await loadAccountProfileSummaryCached(accountProfileSummaryUrl, {
+                identityKey: authUserId,
+                force: options?.force === true
+            });
+            setAccountProfileSummary(payload);
+            return payload;
         }
         catch {
             // best effort only
+            return null;
         }
-    }, [buildApiUrl, isAuthenticated]);
+    }, [authUserId, buildCloudBillingUrl, isAuthenticated]);
+    const resolveRecoveryMessage = useCallback((summary, fallback) => {
+        const billingConflictCode = String(summary?.billingConflictCode || '').trim().toUpperCase();
+        if (billingConflictCode === 'CHECKOUT_SESSION_EXPIRED')
+            return BILLING_CONFLICT_MESSAGES.CHECKOUT_SESSION_EXPIRED;
+        if (billingConflictCode === 'CHECKOUT_SESSION_SUPERSEDED')
+            return BILLING_CONFLICT_MESSAGES.CHECKOUT_SESSION_SUPERSEDED;
+        const summaryMessage = String(summary?.message || '').trim();
+        if (summaryMessage)
+            return summaryMessage;
+        return String(fallback || 'Unable to confirm checkout completion.').trim() || 'Unable to confirm checkout completion.';
+    }, []);
     const startCheckout = useCallback(async (planVersionId, interval) => {
         if (!planVersionId) {
             setFeedback({ type: 'error', message: 'Selected plan is missing a default plan version.' });
@@ -139,7 +174,7 @@ export function PlansPage({ isAuthenticated, runtimeMode, authSessionResolved, c
         setActionBusy(true);
         setFeedback(null);
         try {
-            const res = await fetch(buildApiUrl('/api/taskforce/billing/checkout-session'), {
+            const res = await fetch(buildCloudBillingUrl('/api/taskforce/billing/checkout-session'), {
                 method: 'POST',
                 credentials: 'include',
                 headers: { 'Content-Type': 'application/json' },
@@ -153,20 +188,20 @@ export function PlansPage({ isAuthenticated, runtimeMode, authSessionResolved, c
             const checkoutState = String(payload?.checkoutState || '').trim().toLowerCase();
             if (checkoutState === 'free') {
                 setFeedback({ type: 'success', message: 'Plan selected. Your access is ready.' });
-                invalidateBillingStatusCache(buildApiUrl('/api/taskforce/billing/status'));
-                await loadBillingStatus();
+                invalidateAccountProfileSummaryCache(buildCloudBillingUrl(ACCOUNT_PROFILE_SUMMARY_PATH), { identityKey: authUserId });
+                await loadAccountProfileSummary();
                 return;
             }
             if (checkoutState === 'updated') {
                 setFeedback({ type: 'success', message: String(payload?.message || 'Your subscription was updated successfully.') });
-                invalidateBillingStatusCache(buildApiUrl('/api/taskforce/billing/status'));
-                await loadBillingStatus();
+                invalidateAccountProfileSummaryCache(buildCloudBillingUrl(ACCOUNT_PROFILE_SUMMARY_PATH), { identityKey: authUserId });
+                await loadAccountProfileSummary();
                 return;
             }
             if (checkoutState === 'already_current_plan') {
                 setFeedback({ type: 'success', message: String(payload?.message || 'You are already on this plan.') });
-                invalidateBillingStatusCache(buildApiUrl('/api/taskforce/billing/status'));
-                await loadBillingStatus();
+                invalidateAccountProfileSummaryCache(buildCloudBillingUrl(ACCOUNT_PROFILE_SUMMARY_PATH), { identityKey: authUserId });
+                await loadAccountProfileSummary();
                 return;
             }
             const returnBaseUrl = String(payload?.returnBaseUrl || '').trim();
@@ -200,12 +235,16 @@ export function PlansPage({ isAuthenticated, runtimeMode, authSessionResolved, c
         finally {
             setActionBusy(false);
         }
-    }, [buildApiUrl, loadBillingStatus]);
+    }, [authUserId, buildCloudBillingUrl, loadAccountProfileSummary, runtimeMode]);
     const confirmCheckoutSession = useCallback(async (sessionId) => {
-        if (!sessionId)
-            return false;
+        if (!sessionId) {
+            return {
+                confirmed: false,
+                errorMessage: 'Checkout session is missing.'
+            };
+        }
         try {
-            const res = await fetch(buildApiUrl('/api/taskforce/billing/checkout-session/confirm'), {
+            const res = await fetch(buildCloudBillingUrl('/api/taskforce/billing/checkout-session/confirm'), {
                 method: 'POST',
                 credentials: 'include',
                 headers: { 'Content-Type': 'application/json' },
@@ -213,18 +252,22 @@ export function PlansPage({ isAuthenticated, runtimeMode, authSessionResolved, c
             });
             const payload = await res.json().catch(() => ({}));
             if (!res.ok) {
-                setFeedback({ type: 'error', message: String(payload?.error || 'Unable to confirm checkout completion.') });
-                return false;
+                return {
+                    confirmed: false,
+                    errorMessage: String(payload?.error || 'Unable to confirm checkout completion.')
+                };
             }
-            invalidateBillingStatusCache(buildApiUrl('/api/taskforce/billing/status'));
-            await loadBillingStatus();
-            return true;
+            invalidateAccountProfileSummaryCache(buildCloudBillingUrl(ACCOUNT_PROFILE_SUMMARY_PATH), { identityKey: authUserId });
+            await loadAccountProfileSummary();
+            return { confirmed: true };
         }
         catch {
-            setFeedback({ type: 'error', message: 'Unable to confirm checkout completion.' });
-            return false;
+            return {
+                confirmed: false,
+                errorMessage: 'Unable to confirm checkout completion.'
+            };
         }
-    }, [buildApiUrl, loadBillingStatus]);
+    }, [authUserId, buildCloudBillingUrl, loadAccountProfileSummary]);
     const openBillingPortal = useCallback(async () => {
         if (!isAuthenticated) {
             navigate(`/login?mode=login&next=${encodeURIComponent(buildEmbeddedPlansPath())}`);
@@ -233,7 +276,7 @@ export function PlansPage({ isAuthenticated, runtimeMode, authSessionResolved, c
         setActionBusy(true);
         setFeedback(null);
         try {
-            const res = await fetch(buildApiUrl('/api/taskforce/billing/portal-session'), {
+            const res = await fetch(buildCloudBillingUrl('/api/taskforce/billing/portal-session'), {
                 method: 'POST',
                 credentials: 'include'
             });
@@ -255,10 +298,10 @@ export function PlansPage({ isAuthenticated, runtimeMode, authSessionResolved, c
         finally {
             setActionBusy(false);
         }
-    }, [buildApiUrl, isAuthenticated, navigate]);
+    }, [buildCloudBillingUrl, isAuthenticated, navigate]);
     useEffect(() => {
-        void loadBillingStatus();
-    }, [loadBillingStatus]);
+        void loadAccountProfileSummary();
+    }, [loadAccountProfileSummary]);
     useEffect(() => {
         if (!hasResolvedActiveEntitlement)
             return;
@@ -276,11 +319,17 @@ export function PlansPage({ isAuthenticated, runtimeMode, authSessionResolved, c
             checkoutStartRan.current = true;
             setFeedback({ type: 'success', message: 'Checkout completed successfully. Finalizing your plan...' });
             void (async () => {
-                const confirmed = querySessionId
+                const confirmation = querySessionId
                     ? await confirmCheckoutSession(querySessionId)
-                    : false;
-                if (!confirmed) {
-                    await loadBillingStatus();
+                    : { confirmed: false, errorMessage: 'Checkout session is missing.' };
+                if (!confirmation.confirmed) {
+                    const summary = await loadAccountProfileSummary({ force: true });
+                    setFeedback({
+                        type: 'error',
+                        message: resolveRecoveryMessage(summary, confirmation.errorMessage)
+                    });
+                    scheduleTransientQueryClear();
+                    return;
                 }
                 setFeedback({ type: 'success', message: 'Checkout completed successfully.' });
                 scheduleTransientQueryClear();
@@ -288,8 +337,14 @@ export function PlansPage({ isAuthenticated, runtimeMode, authSessionResolved, c
             return;
         }
         if (checkoutState === 'cancel') {
-            setFeedback({ type: 'error', message: 'Checkout was canceled. No charge was made.' });
-            scheduleTransientQueryClear();
+            void (async () => {
+                const summary = await loadAccountProfileSummary({ force: true });
+                setFeedback({
+                    type: 'error',
+                    message: resolveRecoveryMessage(summary, 'Checkout was canceled. No charge was made.')
+                });
+                scheduleTransientQueryClear();
+            })();
             return;
         }
         if ((checkoutState === 'start' || checkoutState === 'free') && isAuthenticated && queryPlanVersionId && !checkoutStartRan.current) {
@@ -310,9 +365,13 @@ export function PlansPage({ isAuthenticated, runtimeMode, authSessionResolved, c
                 return null;
             if (current.message === GATE_MESSAGES.missingEntitlement)
                 return null;
+            if (current.message === BILLING_CONFLICT_MESSAGES.CHECKOUT_SESSION_EXPIRED)
+                return null;
+            if (current.message === BILLING_CONFLICT_MESSAGES.CHECKOUT_SESSION_SUPERSEDED)
+                return null;
             return current;
         });
-    }, [checkoutState, confirmCheckoutSession, gateMessage, isAuthenticated, loadBillingStatus, queryInterval, queryPlanVersionId, querySessionId, scheduleTransientQueryClear, startCheckout]);
+    }, [checkoutState, confirmCheckoutSession, gateMessage, isAuthenticated, loadAccountProfileSummary, queryInterval, queryPlanVersionId, querySessionId, resolveRecoveryMessage, scheduleTransientQueryClear, startCheckout]);
     const handleSelectPlan = useCallback(async (intent) => {
         if (!isAuthenticated) {
             const nextCheckoutState = intent.pricingType === 'free' ? 'free' : 'start';
@@ -326,7 +385,7 @@ export function PlansPage({ isAuthenticated, runtimeMode, authSessionResolved, c
             return;
         }
         if (intent.isCurrentPlan) {
-            if (!billingStatus?.stripeCustomerId) {
+            if (!accountProfileSummary?.stripeCustomerId) {
                 setFeedback({ type: 'success', message: 'Your current plan does not use Stripe billing.' });
                 return;
             }
@@ -350,7 +409,7 @@ export function PlansPage({ isAuthenticated, runtimeMode, authSessionResolved, c
         }
         navigate('/');
     }, [closeEmbeddedPlansScreen, embedded, navigate]);
-    const topActions = embedded ? (_jsx(_Fragment, { children: isAuthenticated && billingStatus?.stripeCustomerId && (_jsx("button", { className: styles.navAction, onClick: () => { void openBillingPortal(); }, disabled: actionBusy, children: "Manage billing" })) })) : (_jsxs(_Fragment, { children: [_jsx("button", { className: styles.navAction, onClick: handleBack, children: "Back" }), isAuthenticated && billingStatus?.stripeCustomerId && (_jsx("button", { className: styles.navAction, onClick: () => { void openBillingPortal(); }, disabled: actionBusy, children: "Manage billing" })), !isAuthenticated && (_jsxs("button", { className: styles.navAction, onClick: () => navigate(`/login?mode=login&next=${encodeURIComponent(buildEmbeddedPlansPath())}`), children: [_jsx(User, { size: 16, style: { marginRight: '8px', verticalAlign: 'text-bottom' } }), "Sign In"] }))] }));
+    const topActions = embedded ? (_jsx(_Fragment, { children: isAuthenticated && accountProfileSummary?.stripeCustomerId && (_jsx("button", { className: styles.navAction, onClick: () => { void openBillingPortal(); }, disabled: actionBusy, children: "Manage billing" })) })) : (_jsxs(_Fragment, { children: [_jsx("button", { className: styles.navAction, onClick: handleBack, children: "Back" }), isAuthenticated && accountProfileSummary?.stripeCustomerId && (_jsx("button", { className: styles.navAction, onClick: () => { void openBillingPortal(); }, disabled: actionBusy, children: "Manage billing" })), !isAuthenticated && (_jsxs("button", { className: styles.navAction, onClick: () => navigate(`/login?mode=login&next=${encodeURIComponent(buildEmbeddedPlansPath())}`), children: [_jsx(User, { size: 16, style: { marginRight: '8px', verticalAlign: 'text-bottom' } }), "Sign In"] }))] }));
     const chrome = embedded ? null : (_jsx(AppShellHeader, { projectName: projectName, currentWorkspaceId: currentWorkspaceId, runtimeMode: runtimeMode === 'cloud' ? 'cloud' : 'local', theme: currentTheme, actions: topActions }));
-    return (_jsx(PlanComparisonPage, { chrome: chrome, heading: "Subscription Plans", subtitle: "Manage your subscription and explore available features. Your current plan is highlighted below.", isAuthenticated: isAuthenticated, authSessionResolved: authSessionResolved, currentPlanId: String(billingStatus?.planId || queryPlanId || '').trim() || null, currentPlanVersionId: String(billingStatus?.planVersionId || queryPlanVersionId || '').trim() || null, currentEntitlementState: String(billingStatus?.entitlementState || '').trim() || null, canManageCurrentPlan: Boolean(billingStatus?.stripeCustomerId), pricingEndpoint: pricingEndpoints[0], statusBanner: feedback, onBack: handleBack, backLabel: embedded ? 'Back to Board' : 'Back to App', topActions: embedded ? topActions : null, shellOwnsScroll: shellOwnsScroll, showPageBackButton: !embedded, fallbackPricingSource: fallbackPricingSource, onSelectPlan: handleSelectPlan }));
+    return (_jsx(PlanComparisonPage, { chrome: chrome, heading: "Subscription Plans", subtitle: "Manage your subscription and explore available features. Your current plan is highlighted below.", isAuthenticated: isAuthenticated, authSessionResolved: authSessionResolved, currentPlanId: String(accountProfileSummary?.planId || queryPlanId || '').trim() || null, currentPlanVersionId: String(accountProfileSummary?.planVersionId || queryPlanVersionId || '').trim() || null, currentEntitlementState: String(accountProfileSummary?.entitlementState || '').trim() || null, canManageCurrentPlan: Boolean(accountProfileSummary?.stripeCustomerId), pricingEndpoint: pricingEndpoints[0], statusBanner: feedback, onBack: handleBack, backLabel: embedded ? 'Back to Board' : 'Back to App', topActions: embedded ? topActions : null, shellOwnsScroll: shellOwnsScroll, showPageBackButton: !embedded, fallbackPricingSource: fallbackPricingSource, onSelectPlan: handleSelectPlan }));
 }

package/dist/components/views/PlansPage.test.d.ts

@@ -0,0 +1 @@
+export {};

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

@@ -0,0 +1,100 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { render, screen, waitFor } from '@testing-library/react';
+import { afterEach, describe, expect, it, vi } from 'vitest';
+import { MemoryRouter } from 'react-router-dom';
+import { PlansPage } from './PlansPage';
+vi.mock('./PlanComparisonPage', () => ({
+    PlanComparisonPage: ({ heading, statusBanner }) => (_jsxs("div", { children: [_jsx("h1", { children: heading }), statusBanner?.message ? _jsx("div", { children: statusBanner.message }) : null] }))
+}));
+describe('PlansPage', () => {
+    afterEach(() => {
+        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
+            })
+        });
+        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(screen.queryByText('Checkout completed successfully.')).not.toBeInTheDocument();
+        await waitFor(() => {
+            expect(fetchMock).toHaveBeenNthCalledWith(2, '/api/taskforce/billing/checkout-session/confirm', expect.objectContaining({
+                method: 'POST'
+            }));
+        });
+    });
+    it('shows conflict-specific recovery messaging when the account lands on plans already blocked', async () => {
+        const fetchMock = vi.fn()
+            .mockResolvedValueOnce({
+            ok: true,
+            json: async () => ({
+                planId: 'pro',
+                planVersionId: 'pro-v1',
+                entitlementState: 'pending_plan_selection',
+                gate: 'plan_selection_required',
+                message: 'Choose a plan to continue.',
+                billingConflictCode: 'CHECKOUT_SESSION_SUPERSEDED',
+                planSelectionRequired: true
+            })
+        });
+        vi.stubGlobal('fetch', fetchMock);
+        render(_jsx(MemoryRouter, { initialEntries: ['/?screen=plans'], children: _jsx(PlansPage, { isAuthenticated: true, authUserId: "u2", runtimeMode: "cloud", authSessionResolved: true, resolveCloudAuthUrl: (path) => path }) }));
+        expect(await screen.findByText('A newer checkout replaced your previous checkout. Choose a plan to continue.')).toBeInTheDocument();
+    });
+    it('shows conflict-specific recovery messaging after checkout cancel when the latest attempt expired', 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: true,
+            json: async () => ({
+                planId: 'pro',
+                planVersionId: 'pro-v1',
+                entitlementState: 'pending_plan_selection',
+                gate: 'plan_selection_required',
+                message: 'Choose a plan to continue.',
+                billingConflictCode: 'CHECKOUT_SESSION_EXPIRED',
+                planSelectionRequired: true
+            })
+        });
+        vi.stubGlobal('fetch', fetchMock);
+        render(_jsx(MemoryRouter, { initialEntries: ['/?screen=plans&checkout=cancel'], children: _jsx(PlansPage, { isAuthenticated: true, authUserId: "u3", runtimeMode: "cloud", authSessionResolved: true, resolveCloudAuthUrl: (path) => path }) }));
+        expect(await screen.findByText('Your previous checkout expired. Choose a plan to continue.')).toBeInTheDocument();
+    });
+});

package/dist/components/views/StandaloneLayout.d.ts

@@ -1,6 +1,7 @@
 import React from 'react';
 import { type UseTaskforceResult } from '../../hooks/useTaskforce';
 export type StandaloneLayoutProps = UseTaskforceResult & {
+    resolveCloudAuthUrl?: (path: string) => string;
     onHeaderMouseDown?: (e: React.MouseEvent) => void;
     isDragging?: boolean;
     onClose?: () => void;