@taskforcehq/taskforce 0.3.302 → 0.3.304

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

@@ -0,0 +1,114 @@
+import { describe, expect, it } from 'vitest';
+import { buildBacklogDropUpdates, buildScheduleDropResult, buildScheduledDayDropUpdates, buildStatusTransitionUpdates, } from './taskKanbanDropRules';
+const makeTask = (overrides = {}) => ({
+    id: 'task-1',
+    title: 'Task',
+    description: null,
+    category: 'default',
+    type: 'feature',
+    priority: 2,
+    status: 'task',
+    createdAt: '2026-01-01T00:00:00.000Z',
+    ...overrides,
+});
+const toMap = (pairs) => new Map(pairs.map((pair) => [pair.taskId, pair.updates]));
+describe('taskKanbanDropRules', () => {
+    it('reorders backlog tasks and recalculates orderInDay', () => {
+        const activeTask = makeTask({ id: 'task-2' });
+        const result = toMap(buildBacklogDropUpdates({
+            activeTask,
+            sourceColumnId: 'backlog',
+            targetTasks: [makeTask({ id: 'task-1' }), makeTask({ id: 'task-3' })],
+            sourceTasks: [makeTask({ id: 'task-1' }), makeTask({ id: 'task-3' })],
+            insertAt: 1,
+        }));
+        expect(result.get('task-1')).toEqual({ orderInDay: 0 });
+        expect(result.get('task-2')).toEqual({ orderInDay: 1 });
+        expect(result.get('task-3')).toEqual({ orderInDay: 2 });
+    });
+    it('moving scheduled task to backlog clears scheduled fields', () => {
+        const activeTask = makeTask({ id: 'task-2', scheduledDate: '2026-04-14', scheduledWeekKey: '2026-W16' });
+        const result = toMap(buildBacklogDropUpdates({
+            activeTask,
+            sourceColumnId: 'mon',
+            targetTasks: [makeTask({ id: 'task-1' })],
+            sourceTasks: [],
+            insertAt: 1,
+        }));
+        expect(result.get('task-2')).toEqual({
+            scheduledDate: null,
+            scheduledWeekKey: null,
+            orderInDay: 1,
+        });
+    });
+    it('moving task into a scheduled day sets scheduled fields and reindexes source column', () => {
+        const activeTask = makeTask({ id: 'task-3' });
+        const result = toMap(buildScheduledDayDropUpdates({
+            activeTask,
+            sourceColumnId: 'backlog',
+            targetColumnId: 'mon',
+            targetTasks: [makeTask({ id: 'task-1' })],
+            sourceTasks: [makeTask({ id: 'task-2' })],
+            insertAt: 1,
+            scheduledDate: '2026-04-14',
+            scheduledWeekKey: '2026-W16',
+        }));
+        expect(result.get('task-3')).toEqual({
+            scheduledDate: '2026-04-14',
+            scheduledWeekKey: '2026-W16',
+            orderInDay: 1,
+        });
+        expect(result.get('task-2')).toEqual({ orderInDay: 0 });
+    });
+    it('blocks non-terminal tasks from being scheduled into the past', () => {
+        const result = buildScheduleDropResult({
+            activeTask: makeTask({ id: 'task-3', status: 'task' }),
+            sourceColumnId: 'backlog',
+            targetColumnId: 'mon',
+            targetTasks: [],
+            sourceTasks: [],
+            overTaskId: null,
+            isBelowOverItem: false,
+            scheduleDates: {
+                mon: '2026-04-13',
+                tue: '2026-04-14',
+                wed: '2026-04-15',
+                thu: '2026-04-16',
+                fri: '2026-04-17',
+                sat: '2026-04-18',
+                sun: '2026-04-19',
+            },
+            parseToIsoWeekKey: () => '2026-W16',
+            todayDate: '2026-04-14',
+        });
+        expect(result).toEqual({ kind: 'blocked', reason: 'Only completed work can be scheduled in the past.' });
+    });
+    it('preserves cancelled grouping as a no-op for completed column drops', () => {
+        const task = makeTask({ id: 'task-cancelled', status: 'cancelled', completedAt: '2026-04-01T00:00:00.000Z' });
+        expect(buildStatusTransitionUpdates(task, 'completed', '2026-04-14T07:00:00.000Z')).toBeNull();
+    });
+    it('stamps completedAt when moving into completed', () => {
+        const nowIso = '2026-04-14T07:00:00.000Z';
+        const result = buildStatusTransitionUpdates(makeTask({ id: 'task-done' }), 'completed', nowIso);
+        expect(result).toEqual({
+            status: 'done',
+            inProgress: false,
+            readyForReview: false,
+            completed: true,
+            cancelled: false,
+            completedAt: nowIso,
+        });
+    });
+    it('resets review and progress flags when moving back to reviewable workflow states', () => {
+        const nowIso = '2026-04-14T07:00:00.000Z';
+        const result = buildStatusTransitionUpdates(makeTask({ id: 'task-review', status: 'done', inProgress: true, readyForReview: true, completed: true }), 'review', nowIso);
+        expect(result).toEqual({
+            status: 'review',
+            inProgress: false,
+            readyForReview: true,
+            completed: false,
+            cancelled: false,
+            completedAt: null,
+        });
+    });
+});

package/dist/components/ui/Modal.d.ts

@@ -5,7 +5,7 @@ interface ModalProps {
     title: React.ReactNode;
     children: React.ReactNode;
     footer?: React.ReactNode;
-    size?: 'sm' | 'md' | 'lg' | 'xl' | 'full';
+    size?: 'sm' | 'md' | 'mdWide' | 'lg' | 'xl' | 'full';
     theme?: 'light' | 'dawn' | 'dark' | 'midnight';
     className?: string;
     headerActions?: React.ReactNode;

package/dist/components/ui/Modal.js

@@ -36,6 +36,7 @@ export function Modal({ isOpen, onClose, title, children, footer, size = 'md', t
     const sizeClassMap = {
         sm: styles.modalSizeSm,
         md: styles.modalSizeMd,
+        mdWide: styles.modalSizeMdWide,
         lg: styles.modalSizeLg,
         xl: styles.modalSizeXl,
         full: styles.modalSizeFull

package/dist/components/views/AppShellHeader.js

@@ -7,6 +7,10 @@ import favicon from '../../assets/favicon/favicon.svg';
 import { DEFAULT_TASKFORCE_THEME, isLightThemeFamily } from '../../utils/theme';
 export function AppShellHeader({ projectName, currentWorkspaceId, brandLabel = 'TaskForce', runtimeMode = 'local', theme = DEFAULT_TASKFORCE_THEME, meta, actions }) {
     const logo = isLightThemeFamily(theme) ? logoDark : logoLight;
+    const normalizedProjectName = String(projectName || '').trim();
+    const normalizedWorkspaceId = String(currentWorkspaceId || '').trim().toLowerCase();
+    const showProjectName = Boolean(normalizedProjectName
+        && (runtimeMode !== 'cloud' || (normalizedWorkspaceId && normalizedWorkspaceId !== 'default')));
     return (_jsxs("div", { className: `${styles.header} ${shellStyles.standaloneHeader}`, children: [_jsxs("div", { className: `${styles.headerTitle} ${shellStyles.standaloneTitle}`, children: [_jsx("img", { src: logo, alt: "Taskforce Logo", className: styles.brandIcon, onError: (event) => {
                             const target = event.currentTarget;
                             if (target.src !== favicon) {
@@ -15,5 +19,5 @@ export function AppShellHeader({ projectName, currentWorkspaceId, brandLabel = '
                             else {
                                 target.style.display = 'none';
                             }
-                        } }), _jsx("span", { children: brandLabel }), runtimeMode === 'cloud' && (_jsx("span", { className: styles.brandCloudSuffix, children: "HQ" })), projectName && (_jsxs(_Fragment, { children: [_jsx("span", { className: styles.projectSlash, children: "/" }), _jsx("span", { className: styles.projectName, title: currentWorkspaceId ? `Workspace ID: ${currentWorkspaceId}` : undefined, children: projectName })] })), meta] }), _jsx("div", { className: styles.headerActions, style: { gap: '16px' }, children: actions })] }));
+                        } }), _jsx("span", { children: brandLabel }), runtimeMode === 'cloud' && (_jsx("span", { className: styles.brandCloudSuffix, children: "HQ" })), showProjectName && (_jsxs(_Fragment, { children: [_jsx("span", { className: styles.projectSlash, children: "/" }), _jsx("span", { className: styles.projectName, title: currentWorkspaceId ? `Workspace ID: ${currentWorkspaceId}` : undefined, children: normalizedProjectName })] })), meta] }), _jsx("div", { className: styles.headerActions, style: { gap: '16px' }, children: actions })] }));
 }

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

@@ -18,4 +18,8 @@ describe('AppShellHeader', () => {
         render(_jsx(AppShellHeader, { runtimeMode: "local", theme: "dawn" }));
         expect(screen.getByAltText('Taskforce Logo')).toHaveAttribute('src', logoDark);
     });
+    it('hides a stale project label while cloud runtime is still on the default workspace', () => {
+        render(_jsx(AppShellHeader, { runtimeMode: "cloud", projectName: "Old Workspace", currentWorkspaceId: "default" }));
+        expect(screen.queryByText('Old Workspace')).not.toBeInTheDocument();
+    });
 });

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

@@ -58,16 +58,17 @@ interface PlanComparisonPageProps {
     canManageCurrentPlan?: boolean;
     pricingEndpoint?: string;
     statusBanner?: {
-        type: 'success' | 'error';
+        type: 'success' | 'error' | 'info';
         message: string;
     } | null;
     onBack: () => void;
     backLabel: string;
+    backDisabled?: boolean;
     topActions?: React.ReactNode;
     shellOwnsScroll?: boolean;
     showPageBackButton?: boolean;
     fallbackPricingSource?: PricingSourceDetails | null;
     onSelectPlan: (intent: PlanSelectionIntent) => void | Promise<void>;
 }
-export declare function PlanComparisonPage({ heading, subtitle, variant, chrome, footer, isAuthenticated, authSessionResolved, currentPlanId, currentPlanVersionId, currentEntitlementState, canManageCurrentPlan, pricingEndpoint, statusBanner, onBack, backLabel, topActions, shellOwnsScroll, showPageBackButton, fallbackPricingSource, onSelectPlan }: PlanComparisonPageProps): import("react/jsx-runtime").JSX.Element;
+export declare function PlanComparisonPage({ heading, subtitle, variant, chrome, footer, isAuthenticated, authSessionResolved, currentPlanId, currentPlanVersionId, currentEntitlementState, canManageCurrentPlan, pricingEndpoint, statusBanner, onBack, backLabel, backDisabled, topActions, shellOwnsScroll, showPageBackButton, fallbackPricingSource, onSelectPlan }: PlanComparisonPageProps): import("react/jsx-runtime").JSX.Element;
 export {};

package/dist/components/views/PlanComparisonPage.js

@@ -64,7 +64,7 @@ function isActiveEntitlementState(raw) {
     const value = String(raw || '').trim().toLowerCase();
     return value === 'active' || value === 'trialing' || value === 'grace';
 }
-export function PlanComparisonPage({ heading, subtitle, variant = 'app', chrome, footer, isAuthenticated, authSessionResolved = true, currentPlanId, currentPlanVersionId, currentEntitlementState, canManageCurrentPlan = true, pricingEndpoint, statusBanner, onBack, backLabel, topActions, shellOwnsScroll = false, showPageBackButton = true, fallbackPricingSource = null, onSelectPlan }) {
+export function PlanComparisonPage({ heading, subtitle, variant = 'app', chrome, footer, isAuthenticated, authSessionResolved = true, currentPlanId, currentPlanVersionId, currentEntitlementState, canManageCurrentPlan = true, pricingEndpoint, statusBanner, onBack, backLabel, backDisabled = false, topActions, shellOwnsScroll = false, showPageBackButton = true, fallbackPricingSource = null, onSelectPlan }) {
     const [plans, setPlans] = useState([]);
     const [pricingSource, setPricingSource] = useState(null);
     const [loading, setLoading] = useState(true);
@@ -130,7 +130,9 @@ export function PlanComparisonPage({ heading, subtitle, variant = 'app', chrome,
     if (error) {
         return wrapPage(_jsx(_Fragment, { children: _jsx("div", { className: contentClassName, children: _jsx("div", { className: styles.contentFrame, children: _jsxs("div", { className: styles.emptyState, children: [_jsx("h2", { children: "Connecting to plan pricing..." }), _jsx("p", { children: error }), _jsx("button", { className: styles.backBtn, onClick: () => setRetryNonce((value) => value + 1), children: "Retry" })] }) }) }) }));
     }
-    return wrapPage(_jsx(_Fragment, { children: _jsx("div", { className: contentClassName, children: _jsxs("div", { className: styles.contentFrame, children: [_jsxs("div", { className: styles.header, children: [!chrome && (showPageBackButton || topActions) && (_jsxs("div", { className: styles.headerBar, children: [_jsx("div", { children: showPageBackButton ? (_jsx("button", { className: styles.backBtn, onClick: onBack, children: backLabel })) : null }), _jsx("div", { className: styles.headerActions, children: topActions })] })), _jsx("h1", { className: styles.title, children: heading }), subtitle && _jsx("p", { className: styles.subtitle, children: subtitle }), isDebugModeEnabled() && pricingSourceLabel ? (_jsxs("p", { className: styles.debugMeta, children: ["Pricing source: ", pricingSourceLabel] })) : null, statusBanner && (_jsx("div", { className: `${styles.statusBanner} ${statusBanner.type === 'success' ? styles.successBanner : styles.errorBanner}`, children: statusBanner.message }))] }), sortedPlans.length === 0 ? (_jsxs("div", { className: `${styles.emptyState} ${styles.marketingEmptyState}`, children: [_jsx("span", { className: styles.emptyBadge, children: "Coming Soon" }), _jsx("h2", { children: "Paid plans are getting their final polish." }), _jsx("p", { children: "Taskforce pricing is on the way with flexible options for solo operators, teams, and larger rollouts. Check back soon for launch tiers, feature bundles, and early access details." }), _jsxs("div", { className: styles.emptyHighlights, "aria-label": "Upcoming pricing highlights", children: [_jsx("span", { children: "Launch-ready tiers" }), _jsx("span", { children: "Team billing controls" }), _jsx("span", { children: "Feature-based packaging" })] })] })) : (_jsx("div", { className: styles.grid, children: sortedPlans.map((plan) => {
+    return wrapPage(_jsx(_Fragment, { children: _jsx("div", { className: contentClassName, children: _jsxs("div", { className: styles.contentFrame, children: [_jsxs("div", { className: styles.header, children: [!chrome && (showPageBackButton || topActions) && (_jsxs("div", { className: styles.headerBar, children: [_jsx("div", { children: showPageBackButton ? (_jsx("button", { className: styles.backBtn, onClick: onBack, disabled: backDisabled, children: backLabel })) : null }), _jsx("div", { className: styles.headerActions, children: topActions })] })), _jsx("h1", { className: styles.title, children: heading }), subtitle && _jsx("p", { className: styles.subtitle, children: subtitle }), isDebugModeEnabled() && pricingSourceLabel ? (_jsxs("p", { className: styles.debugMeta, children: ["Pricing source: ", pricingSourceLabel] })) : null, statusBanner && (_jsx("div", { className: `${styles.statusBanner} ${statusBanner.type === 'success'
+                                    ? styles.successBanner
+                                    : (statusBanner.type === 'info' ? styles.infoBanner : styles.errorBanner)}`, children: statusBanner.message }))] }), sortedPlans.length === 0 ? (_jsxs("div", { className: `${styles.emptyState} ${styles.marketingEmptyState}`, children: [_jsx("span", { className: styles.emptyBadge, children: "Coming Soon" }), _jsx("h2", { children: "Paid plans are getting their final polish." }), _jsx("p", { children: "Taskforce pricing is on the way with flexible options for solo operators, teams, and larger rollouts. Check back soon for launch tiers, feature bundles, and early access details." }), _jsxs("div", { className: styles.emptyHighlights, "aria-label": "Upcoming pricing highlights", children: [_jsx("span", { children: "Launch-ready tiers" }), _jsx("span", { children: "Team billing controls" }), _jsx("span", { children: "Feature-based packaging" })] })] })) : (_jsx("div", { className: styles.grid, children: sortedPlans.map((plan) => {
                             const monthPrice = plan.pricing.month;
                             const yearPrice = plan.pricing.year;
                             const hasMonth = isSelectablePrice(monthPrice);

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

@@ -97,6 +97,10 @@ describe('PlanComparisonPage', () => {
         expect(await screen.findByRole('heading', { name: 'Subscription Plans' })).toBeInTheDocument();
         expect(screen.queryByText('Current Plan')).not.toBeInTheDocument();
     });
+    it('can disable the page back button while onboarding remains blocked', async () => {
+        render(_jsx(PlanComparisonPage, { heading: "Subscription Plans", isAuthenticated: true, onBack: () => { }, backLabel: "Back to App", backDisabled: true, onSelectPlan: () => { } }));
+        expect(await screen.findByRole('button', { name: 'Back to App' })).toBeDisabled();
+    });
     it('selects the whole plan card using the default available interval', async () => {
         const onSelectPlan = vi.fn();
         render(_jsx(PlanComparisonPage, { heading: "Subscription Plans", isAuthenticated: false, onBack: () => { }, backLabel: "Back", onSelectPlan: onSelectPlan }));

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

@@ -1,5 +1,7 @@
+import { type AccountProfileSummary } from '../../utils/accountProfileSummaryCache';
 interface PlansPageProps {
     isAuthenticated: boolean;
+    authUserId?: string | null;
     runtimeMode: string;
     authSessionResolved: boolean;
     currentTheme?: import('../../types').TaskforceTheme;
@@ -7,8 +9,12 @@ interface PlansPageProps {
     currentWorkspaceId?: string | null;
     apiBaseUrl?: string | null;
     connectedEnvironmentSource?: string | null;
+    resolveCloudAuthUrl?: (path: string) => string;
     embedded?: boolean;
     shellOwnsScroll?: boolean;
+    onAccountProfileSummaryChange?: (summary: AccountProfileSummary | null) => void;
+    onContinueToTaskforce?: () => void | Promise<void>;
+    continueBusy?: 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, onAccountProfileSummaryChange, onContinueToTaskforce, continueBusy }: 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, onAccountProfileSummaryChange, onContinueToTaskforce, continueBusy = 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,30 +135,56 @@ 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);
+            onAccountProfileSummaryChange?.(payload);
+            return payload;
         }
         catch {
             // best effort only
+            return null;
         }
-    }, [buildApiUrl, isAuthenticated]);
+    }, [authUserId, buildCloudBillingUrl, isAuthenticated, onAccountProfileSummaryChange]);
+    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 resolveGateFeedbackType = useCallback((message) => {
+        const normalized = String(message || '').trim();
+        if (normalized === GATE_MESSAGES.planSelectionRequired
+            || normalized === GATE_MESSAGES.checkoutPending) {
+            return 'info';
+        }
+        return 'error';
+    }, []);
     const startCheckout = useCallback(async (planVersionId, interval) => {
         if (!planVersionId) {
             setFeedback({ type: 'error', message: 'Selected plan is missing a default plan version.' });
             return;
         }
+        const hadActiveEntitlement = hasResolvedActiveEntitlement;
         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 +198,28 @@ 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 });
+                const summary = await loadAccountProfileSummary({ force: true });
+                const summaryState = String(summary?.entitlementState || '').trim().toLowerCase();
+                if (!hadActiveEntitlement && ACTIVE_ENTITLEMENT_STATES.has(summaryState)) {
+                    await onContinueToTaskforce?.();
+                }
                 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 });
+                const summary = await loadAccountProfileSummary({ force: true });
+                const summaryState = String(summary?.entitlementState || '').trim().toLowerCase();
+                if (!hadActiveEntitlement && ACTIVE_ENTITLEMENT_STATES.has(summaryState)) {
+                    await onContinueToTaskforce?.();
+                }
                 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 +253,16 @@ export function PlansPage({ isAuthenticated, runtimeMode, authSessionResolved, c
         finally {
             setActionBusy(false);
         }
-    }, [buildApiUrl, loadBillingStatus]);
+    }, [authUserId, buildCloudBillingUrl, hasResolvedActiveEntitlement, loadAccountProfileSummary, onContinueToTaskforce, 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 +270,26 @@ 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.')
+                };
+            }
+            invalidateAccountProfileSummaryCache(buildCloudBillingUrl(ACCOUNT_PROFILE_SUMMARY_PATH), { identityKey: authUserId });
+            const summary = await loadAccountProfileSummary({ force: true });
+            const summaryState = String(summary?.entitlementState || '').trim().toLowerCase();
+            if (ACTIVE_ENTITLEMENT_STATES.has(summaryState)) {
+                await onContinueToTaskforce?.();
             }
-            invalidateBillingStatusCache(buildApiUrl('/api/taskforce/billing/status'));
-            await loadBillingStatus();
-            return true;
+            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, onContinueToTaskforce]);
     const openBillingPortal = useCallback(async () => {
         if (!isAuthenticated) {
             navigate(`/login?mode=login&next=${encodeURIComponent(buildEmbeddedPlansPath())}`);
@@ -233,7 +298,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 +320,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 +341,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 +359,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) {
@@ -298,7 +375,7 @@ export function PlansPage({ isAuthenticated, runtimeMode, authSessionResolved, c
             return;
         }
         if (gateMessage) {
-            setFeedback({ type: 'error', message: gateMessage });
+            setFeedback({ type: resolveGateFeedbackType(gateMessage), message: gateMessage });
             return;
         }
         setFeedback((current) => {
@@ -310,9 +387,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, resolveGateFeedbackType, resolveRecoveryMessage, scheduleTransientQueryClear, startCheckout]);
     const handleSelectPlan = useCallback(async (intent) => {
         if (!isAuthenticated) {
             const nextCheckoutState = intent.pricingType === 'free' ? 'free' : 'start';
@@ -326,7 +407,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;
             }
@@ -340,6 +421,10 @@ export function PlansPage({ isAuthenticated, runtimeMode, authSessionResolved, c
         await startCheckout(intent.planVersionId, intent.interval);
     }, [isAuthenticated, navigate, openBillingPortal, startCheckout]);
     const handleBack = useCallback(() => {
+        if (hasResolvedActiveEntitlement && onContinueToTaskforce) {
+            void onContinueToTaskforce();
+            return;
+        }
         if (embedded) {
             closeEmbeddedPlansScreen();
             return;
@@ -349,8 +434,9 @@ export function PlansPage({ isAuthenticated, runtimeMode, authSessionResolved, c
             return;
         }
         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"] }))] }));
+    }, [closeEmbeddedPlansScreen, embedded, hasResolvedActiveEntitlement, navigate, onContinueToTaskforce]);
+    const continueAction = hasResolvedActiveEntitlement && onContinueToTaskforce ? (_jsx("button", { className: styles.navAction, onClick: () => { void onContinueToTaskforce(); }, disabled: continueBusy || actionBusy, children: "Take Me to Taskforce" })) : null;
+    const topActions = embedded ? (_jsxs(_Fragment, { children: [continueAction, 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, disabled: continueBusy || (isAuthenticated && !hasResolvedActiveEntitlement), children: hasResolvedActiveEntitlement ? 'Take Me to Taskforce' : '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: hasResolvedActiveEntitlement ? 'Take Me to Taskforce' : (embedded ? 'Back to Board' : 'Back to App'), backDisabled: continueBusy || (isAuthenticated && !hasResolvedActiveEntitlement), topActions: embedded ? topActions : null, shellOwnsScroll: shellOwnsScroll, showPageBackButton: !embedded, fallbackPricingSource: fallbackPricingSource, onSelectPlan: handleSelectPlan }));
 }

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

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