@taskforcehq/taskforce 0.3.303 → 0.3.304

package/dist/TaskforceCore.test.js

@@ -1897,16 +1897,68 @@ describe('TaskforceCore Integration', () => {
         const { container } = render(_jsx(MemoryRouter, { initialEntries: ['/login?mode=register&next=%2F'], children: _jsx(TaskforceCore, {}) }));
         await waitFor(() => {
             expect(screen.getByText('Create your Taskforce account.')).toBeInTheDocument();
+            expect(screen.getByLabelText('Email')).toBeInTheDocument();
+            expect(screen.getByLabelText('Display name')).toBeInTheDocument();
             expect(screen.getByPlaceholderText('Email')).toBeInTheDocument();
             expect(screen.getByPlaceholderText('Display name')).toBeInTheDocument();
             expect(screen.getByRole('button', { name: 'Create Account' })).toBeInTheDocument();
             expect(screen.getByRole('button', { name: 'Sign In' })).toBeInTheDocument();
             expect(screen.queryByRole('button', { name: 'Register' })).not.toBeInTheDocument();
             expect(screen.getByRole('button', { name: 'Close sign in' })).toBeInTheDocument();
+            expect(screen.getByTestId('auth-submit-button')).toBeInTheDocument();
+            expect(document.title).toBe('Create Account | Taskforce');
         });
         expect(container.querySelector('[aria-pressed]')).not.toBeInTheDocument();
     });
-    it('does not switch to verify mode after registration when verification is not required', async () => {
+    it('keeps the verification screen focused on verification and lets the user request a fresh email token', async () => {
+        const fetchMock = vi.fn((url) => {
+            if (url.includes('/api/taskforce/auth/session')) {
+                return Promise.resolve({
+                    ok: true,
+                    json: () => Promise.resolve({
+                        authenticated: false,
+                        runtimeMode: 'cloud',
+                        authRequiredForApi: false
+                    })
+                });
+            }
+            if (url.includes('/api/taskforce/config')) {
+                return Promise.resolve({
+                    ok: true,
+                    json: () => Promise.resolve({
+                        ...mockConfig,
+                        runtimeMode: 'cloud',
+                        authRequiredForApi: false,
+                        setupState: {
+                            globalSetupState: 'present',
+                            workspaceSetupState: 'present',
+                            runtimeMode: 'cloud',
+                            workspaceId: 'workspace-local-active',
+                            mode: 'core',
+                            forceSetup: false,
+                            forceGlobalSetup: false,
+                            forceWorkspaceSetup: false
+                        }
+                    })
+                });
+            }
+            if (url.includes('/api/taskforce/workflow-templates')) {
+                return Promise.resolve({ ok: true, json: () => Promise.resolve({ templates: [] }) });
+            }
+            return Promise.resolve({ ok: true, json: () => Promise.resolve({}) });
+        });
+        vi.stubGlobal('fetch', fetchMock);
+        render(_jsx(MemoryRouter, { initialEntries: ['/login?mode=verify'], children: _jsx(TaskforceCore, {}) }));
+        await waitFor(() => {
+            expect(screen.getByText('Enter your verification token.')).toBeInTheDocument();
+            expect(screen.getByPlaceholderText('Email')).toBeInTheDocument();
+            expect(screen.getByRole('button', { name: 'Verify Email' })).toBeInTheDocument();
+            expect(screen.getByRole('button', { name: 'Back to Sign In' })).toBeInTheDocument();
+            expect(screen.queryByRole('button', { name: 'Register' })).not.toBeInTheDocument();
+            expect(screen.getByRole('button', { name: 'Resend Verification' })).toBeDisabled();
+        });
+    });
+    it('allows the verify screen to resend a verification email after the user re-enters their email', async () => {
         const user = userEvent.setup();
         const fetchMock = vi.fn((input) => {
             const url = String(input);
@@ -1940,6 +1992,126 @@ describe('TaskforceCore Integration', () => {
                     })
                 });
             }
+            if (url.includes('/api/taskforce/auth/register')) {
+                return Promise.resolve({
+                    ok: true,
+                    json: () => Promise.resolve({
+                        success: true,
+                        verificationRequired: true,
+                        workspaceSetupRequired: false,
+                        emailSent: true
+                    })
+                });
+            }
+            if (url.includes('/api/taskforce/auth/verify-email/request')) {
+                return Promise.resolve({
+                    ok: true,
+                    json: () => Promise.resolve({
+                        success: true,
+                        verificationToken: 'resent-token'
+                    })
+                });
+            }
+            if (url.includes('/api/taskforce/public/pricing')) {
+                return Promise.resolve({
+                    ok: true,
+                    json: () => Promise.resolve({
+                        plans: []
+                    })
+                });
+            }
+            return Promise.resolve({ ok: true, json: () => Promise.resolve({}) });
+        });
+        vi.stubGlobal('fetch', fetchMock);
+        render(_jsx(MemoryRouter, { initialEntries: ['/login?mode=verify'], children: _jsx(TaskforceCore, {}) }));
+        await user.type(await screen.findByPlaceholderText('Email'), 'verify@example.com');
+        await user.click(screen.getByRole('button', { name: 'Resend Verification' }));
+        await waitFor(() => {
+            expect(screen.getByRole('button', { name: /Resend Verification/ })).toBeInTheDocument();
+            expect(screen.getByDisplayValue('resent-token')).toBeInTheDocument();
+            expect(screen.getByText('Verification email resent.')).toBeInTheDocument();
+        });
+        expect(screen.getByRole('button', { name: /Resend Verification/ })).toBeDisabled();
+        expect(fetchMock.mock.calls.some(([url]) => String(url).includes('/api/taskforce/auth/verify-email/request'))).toBe(true);
+    });
+    it('does not switch to verify mode after registration when verification is not required', async () => {
+        const user = userEvent.setup();
+        let authenticated = false;
+        const fetchMock = vi.fn((input) => {
+            const url = String(input);
+            if (url.includes('/api/taskforce/auth/runtime-config')) {
+                return Promise.resolve({
+                    ok: true,
+                    json: () => Promise.resolve({
+                        config: {
+                            baseUrl: 'https://app.taskforce.example',
+                            apiBaseUrl: 'https://app.taskforce.example/api',
+                            cloudAuthBaseUrl: 'https://app.taskforce.example',
+                            runtimeMode: 'cloud',
+                            authSource: 'cloud',
+                            workspaceMode: 'multi-cloud',
+                            workspaceSwitchingEnabled: true,
+                            authRequiredForApi: true
+                        }
+                    })
+                });
+            }
+            if (url.includes('/api/taskforce/auth/session')) {
+                return Promise.resolve({
+                    ok: true,
+                    json: () => Promise.resolve({
+                        authenticated,
+                        runtimeMode: 'cloud',
+                        authRequiredForApi: true,
+                        userId: authenticated ? 'user-no-verify' : null,
+                        workspaceId: null,
+                        betaAccess: true
+                    })
+                });
+            }
+            if (url.includes('/api/taskforce/config')) {
+                return Promise.resolve({
+                    ok: true,
+                    json: () => Promise.resolve({
+                        ...mockConfig,
+                        runtimeMode: 'cloud',
+                        authRequiredForApi: true,
+                        workspaceSwitchingEnabled: true,
+                        setupState: {
+                            globalSetupState: 'present',
+                            workspaceSetupState: 'missing',
+                            runtimeMode: 'cloud',
+                            workspaceId: 'default',
+                            mode: 'core',
+                            forceSetup: true,
+                            forceGlobalSetup: false,
+                            forceWorkspaceSetup: true
+                        }
+                    })
+                });
+            }
+            if (url.includes('/api/taskforce/workspaces')) {
+                return Promise.resolve({
+                    ok: true,
+                    json: () => Promise.resolve({
+                        success: true,
+                        workspaces: [],
+                        currentWorkspaceId: 'default'
+                    })
+                });
+            }
+            if (url.includes('/api/taskforce/account/access-status')) {
+                return Promise.resolve({
+                    ok: true,
+                    json: () => Promise.resolve({
+                        gate: 'ok',
+                        hasEntitlement: true,
+                        canAccessApp: true,
+                        canAccessPlans: true,
+                        message: null
+                    })
+                });
+            }
             if (url.includes('/api/taskforce/public/pricing')) {
                 return Promise.resolve({
                     ok: true,
@@ -1949,12 +2121,14 @@ describe('TaskforceCore Integration', () => {
                 });
             }
             if (url.includes('/api/taskforce/auth/register')) {
+                authenticated = true;
                 return Promise.resolve({
                     ok: true,
                     json: () => Promise.resolve({
                         success: true,
-                        workspaceSetupRequired: false,
-                        verificationRequired: false
+                        workspaceSetupRequired: true,
+                        verificationRequired: false,
+                        commercialState: 'active'
                     })
                 });
             }
@@ -1967,7 +2141,7 @@ describe('TaskforceCore Integration', () => {
         await user.type(screen.getByPlaceholderText('Password'), 'Password123!');
         await user.click(screen.getByRole('button', { name: 'Create Account' }));
         await waitFor(() => {
-            expect(screen.getByText('Subscription Plans')).toBeInTheDocument();
+            expect(screen.getByText('Configure your new workspace.')).toBeInTheDocument();
         });
         expect(screen.queryByPlaceholderText('Verification token')).not.toBeInTheDocument();
         expect(screen.queryByRole('button', { name: 'Create Account' })).not.toBeInTheDocument();
@@ -2118,19 +2292,453 @@ describe('TaskforceCore Integration', () => {
             }
             return jsonResponse({});
         });
-        vi.stubGlobal('fetch', fetchMock);
-        render(_jsx(MemoryRouter, { initialEntries: ['/login?mode=register&next=%2F'], children: _jsx(TaskforceCore, {}) }));
-        await user.type(await screen.findByPlaceholderText('Email'), 'pending@example.com');
-        await user.type(screen.getByPlaceholderText('Display name'), 'Pending User');
-        await user.type(screen.getByPlaceholderText('Password'), 'Password123!');
-        await user.click(screen.getByRole('button', { name: 'Create Account' }));
+        vi.stubGlobal('fetch', fetchMock);
+        render(_jsx(MemoryRouter, { initialEntries: ['/login?mode=register&next=%2F'], children: _jsx(TaskforceCore, {}) }));
+        await user.type(await screen.findByPlaceholderText('Email'), 'pending@example.com');
+        await user.type(screen.getByPlaceholderText('Display name'), 'Pending User');
+        await user.type(screen.getByPlaceholderText('Password'), 'Password123!');
+        await user.click(screen.getByRole('button', { name: 'Create Account' }));
+        await waitFor(() => {
+            expect(screen.getByRole('heading', { name: 'Subscription Plans' })).toBeInTheDocument();
+            expect(screen.getByText('Choose a plan to continue.')).toBeInTheDocument();
+        });
+        expect(fetchMock.mock.calls.some(([url]) => String(url).includes('/api/taskforce/billing/checkout-session'))).toBe(false);
+    });
+    it('keeps registration on plan selection when commercial onboarding is blocked even if the new cloud user has no workspace yet', async () => {
+        const user = userEvent.setup();
+        let authenticated = false;
+        const fetchMock = vi.fn((input) => {
+            const url = String(input);
+            if (url.includes('/api/taskforce/auth/runtime-config')) {
+                return jsonResponse({
+                    config: {
+                        baseUrl: 'https://app.taskforce.example',
+                        apiBaseUrl: 'https://app.taskforce.example/api',
+                        cloudAuthBaseUrl: 'https://app.taskforce.example',
+                        runtimeMode: 'cloud',
+                        authSource: 'cloud',
+                        workspaceMode: 'multi-cloud',
+                        workspaceSwitchingEnabled: true,
+                        authRequiredForApi: true
+                    }
+                });
+            }
+            if (url.includes('/api/taskforce/auth/session')) {
+                return jsonResponse({
+                    authenticated,
+                    runtimeMode: 'cloud',
+                    authRequiredForApi: true,
+                    userId: authenticated ? 'user-new' : null,
+                    workspaceId: null,
+                    betaAccess: true
+                });
+            }
+            if (url.includes('/api/taskforce/config')) {
+                return jsonResponse({
+                    ...mockConfig,
+                    runtimeMode: 'cloud',
+                    authRequiredForApi: true,
+                    workspaceSwitchingEnabled: true,
+                    setupState: {
+                        globalSetupState: 'present',
+                        workspaceSetupState: 'missing',
+                        runtimeMode: 'cloud',
+                        workspaceId: 'default',
+                        mode: 'core',
+                        forceSetup: false,
+                        forceGlobalSetup: false,
+                        forceWorkspaceSetup: false
+                    }
+                });
+            }
+            if (url.includes('/api/taskforce/workspaces')) {
+                return jsonResponse({
+                    success: true,
+                    workspaces: [],
+                    currentWorkspaceId: 'default'
+                });
+            }
+            if (url.includes('/api/taskforce/account/access-status')) {
+                return jsonResponse({
+                    gate: 'plan_selection_required',
+                    hasEntitlement: true,
+                    canAccessApp: false,
+                    canAccessPlans: true,
+                    message: 'Choose a plan to continue.'
+                });
+            }
+            if (url.includes('/api/taskforce/account/profile-summary')) {
+                return jsonResponse({
+                    entitlementState: 'pending_plan_selection',
+                    gate: 'plan_selection_required',
+                    message: 'Choose a plan to continue.',
+                    workspaceId: null
+                });
+            }
+            if (url.includes('/api/taskforce/public/pricing')) {
+                return jsonResponse({ plans: [] });
+            }
+            if (url.includes('/api/taskforce/auth/register')) {
+                authenticated = true;
+                return jsonResponse({
+                    success: true,
+                    workspaceSetupRequired: true,
+                    verificationRequired: false,
+                    planSelectionRequired: true,
+                    commercialState: 'pending_plan_selection'
+                });
+            }
+            if (url.includes('/api/taskforce/categories'))
+                return jsonResponse(mockCategories);
+            if (url.includes('/api/taskforce/tasks'))
+                return jsonResponse({ tasks: mockTasks });
+            if (url.includes('/api/taskforce/archive'))
+                return jsonResponse({ archived: [] });
+            if (url.includes('/api/taskforce/data-version'))
+                return jsonResponse({ dataVersion: 1 });
+            if (url.includes('/api/taskforce/types'))
+                return jsonResponse({ types: [] });
+            if (url.includes('/api/taskforce/priorities'))
+                return jsonResponse({ priorities: [] });
+            if (url.includes('/api/taskforce/approaches'))
+                return jsonResponse({ approaches: [] });
+            if (url.includes('/api/taskforce/specialists'))
+                return jsonResponse({ specialists: [] });
+            if (url.includes('/api/taskforce/workflow-templates'))
+                return jsonResponse({ templates: [] });
+            return jsonResponse({});
+        });
+        vi.stubGlobal('fetch', fetchMock);
+        render(_jsx(MemoryRouter, { initialEntries: ['/login?mode=register&next=%2F'], children: _jsx(TaskforceCore, {}) }));
+        await user.type(await screen.findByPlaceholderText('Email'), 'brandnew@example.com');
+        await user.type(screen.getByPlaceholderText('Display name'), 'Brand New');
+        await user.type(screen.getByPlaceholderText('Password'), 'Password123!');
+        await user.click(screen.getByRole('button', { name: 'Create Account' }));
+        await waitFor(() => {
+            expect(screen.getByRole('heading', { name: 'Subscription Plans' })).toBeInTheDocument();
+            expect(screen.getByText('Choose a plan to continue.')).toBeInTheDocument();
+        });
+        expect(screen.queryByText('Configure your new workspace.')).not.toBeInTheDocument();
+    });
+    it('routes successful registration into checkout when onboarding leaves the account checkout-pending', async () => {
+        const user = userEvent.setup();
+        let authenticated = false;
+        const fetchMock = vi.fn((input) => {
+            const url = String(input);
+            if (url.includes('/api/taskforce/auth/runtime-config')) {
+                return jsonResponse({
+                    config: {
+                        baseUrl: 'https://app.taskforce.example',
+                        apiBaseUrl: 'https://app.taskforce.example/api',
+                        cloudAuthBaseUrl: 'https://app.taskforce.example',
+                        runtimeMode: 'cloud',
+                        authSource: 'cloud',
+                        workspaceMode: 'multi-cloud',
+                        workspaceSwitchingEnabled: true,
+                        authRequiredForApi: true
+                    }
+                });
+            }
+            if (url.includes('/api/taskforce/auth/session')) {
+                return jsonResponse({
+                    authenticated,
+                    runtimeMode: 'cloud',
+                    authRequiredForApi: true,
+                    userId: authenticated ? 'user-1' : null,
+                    workspaceId: authenticated ? 'workspace-1' : null,
+                    betaAccess: true
+                });
+            }
+            if (url.includes('/api/taskforce/config')) {
+                return jsonResponse({
+                    ...mockConfig,
+                    runtimeMode: 'cloud',
+                    authRequiredForApi: true,
+                    workspaceSwitchingEnabled: true,
+                    setupState: {
+                        globalSetupState: 'present',
+                        workspaceSetupState: 'present',
+                        runtimeMode: 'cloud',
+                        workspaceId: 'workspace-1',
+                        mode: 'core',
+                        forceSetup: false,
+                        forceGlobalSetup: false,
+                        forceWorkspaceSetup: false
+                    }
+                });
+            }
+            if (url.includes('/api/taskforce/workspaces')) {
+                return jsonResponse({
+                    success: true,
+                    workspaces: [{
+                            id: 'workspace-1',
+                            slug: 'workspace-1',
+                            name: 'Workspace 1',
+                            description: null,
+                            role: 'owner',
+                            status: 'active',
+                            betaAccess: true
+                        }],
+                    currentWorkspaceId: 'workspace-1'
+                });
+            }
+            if (url.includes('/api/taskforce/account/access-status')) {
+                return jsonResponse({
+                    gate: 'checkout_pending',
+                    hasEntitlement: true,
+                    canAccessApp: false,
+                    canAccessPlans: true,
+                    message: 'Complete checkout to continue.'
+                });
+            }
+            if (url.includes('/api/taskforce/account/profile-summary')) {
+                return jsonResponse({
+                    planId: 'pro',
+                    planName: 'Pro',
+                    planVersionId: 'pro-v1',
+                    entitlementState: 'checkout_pending',
+                    gate: 'checkout_pending',
+                    message: 'Complete checkout to continue.',
+                    workspaceId: 'workspace-1'
+                });
+            }
+            if (url.includes('/api/taskforce/public/pricing')) {
+                return jsonResponse({
+                    plans: [{
+                            planId: 'pro',
+                            displayName: 'Pro',
+                            status: 'active',
+                            defaultVersion: {
+                                planVersionId: 'pro-v1',
+                                versionNumber: 1,
+                                seatLimit: null,
+                                metadata: {}
+                            },
+                            features: [],
+                            pricing: {
+                                month: {
+                                    planVersionId: 'pro-v1',
+                                    interval: 'month',
+                                    pricingType: 'stripe',
+                                    stripePriceId: 'price_pro_month',
+                                    displayAmount: '$19.00',
+                                    unitAmount: 1900,
+                                    currency: 'usd'
+                                },
+                                year: {
+                                    planVersionId: 'pro-v1',
+                                    interval: 'year',
+                                    pricingType: 'stripe',
+                                    stripePriceId: 'price_pro_year',
+                                    displayAmount: '$190.00',
+                                    unitAmount: 19000,
+                                    currency: 'usd'
+                                }
+                            }
+                        }]
+                });
+            }
+            if (url.includes('/api/taskforce/auth/register')) {
+                authenticated = true;
+                return jsonResponse({
+                    success: true,
+                    workspaceSetupRequired: false,
+                    verificationRequired: false,
+                    checkoutPending: true,
+                    commercialState: 'checkout_pending'
+                });
+            }
+            if (url.includes('/api/taskforce/billing/checkout-session')) {
+                return jsonResponse({
+                    checkoutState: 'updated',
+                    message: 'Checkout started.'
+                });
+            }
+            if (url.includes('/api/taskforce/categories')) {
+                return jsonResponse(mockCategories);
+            }
+            if (url.includes('/api/taskforce/tasks')) {
+                return jsonResponse({ tasks: mockTasks });
+            }
+            if (url.includes('/api/taskforce/archive')) {
+                return jsonResponse({ archived: [] });
+            }
+            if (url.includes('/api/taskforce/data-version')) {
+                return jsonResponse({ dataVersion: 1 });
+            }
+            if (url.includes('/api/taskforce/types')) {
+                return jsonResponse({ types: [] });
+            }
+            if (url.includes('/api/taskforce/priorities')) {
+                return jsonResponse({ priorities: [] });
+            }
+            if (url.includes('/api/taskforce/approaches')) {
+                return jsonResponse({ approaches: [] });
+            }
+            if (url.includes('/api/taskforce/specialists')) {
+                return jsonResponse({ specialists: [] });
+            }
+            if (url.includes('/api/taskforce/workflow-templates')) {
+                return jsonResponse({ templates: [] });
+            }
+            return jsonResponse({});
+        });
+        vi.stubGlobal('fetch', fetchMock);
+        render(_jsx(MemoryRouter, { initialEntries: ['/login?mode=register&planId=pro&planVersionId=pro-v1&interval=year&next=%2F'], children: _jsx(TaskforceCore, {}) }));
+        await user.type(await screen.findByPlaceholderText('Email'), 'checkout@example.com');
+        await user.type(screen.getByPlaceholderText('Display name'), 'Checkout User');
+        await user.type(screen.getByPlaceholderText('Password'), 'Password123!');
+        await user.click(screen.getByRole('button', { name: 'Create Account' }));
+        await waitFor(() => {
+            expect(screen.getByRole('heading', { name: 'Subscription Plans' })).toBeInTheDocument();
+        });
+        await waitFor(() => {
+            expect(fetchMock.mock.calls.some(([url]) => String(url).includes('/api/taskforce/billing/checkout-session'))).toBe(true);
+        });
+    });
+    it('routes successful registration into workspace setup when onboarding auto-grants free, even if a stale pre-registration session check resolves later', async () => {
+        const user = userEvent.setup();
+        let authenticated = false;
+        let authSessionCallCount = 0;
+        let releaseInitialSession = null;
+        const initialSessionGate = new Promise((resolve) => {
+            releaseInitialSession = resolve;
+        });
+        const fetchMock = vi.fn((input) => {
+            const url = String(input);
+            if (url.includes('/api/taskforce/auth/runtime-config')) {
+                return jsonResponse({
+                    config: {
+                        baseUrl: 'https://app.taskforce.example',
+                        apiBaseUrl: 'https://app.taskforce.example/api',
+                        cloudAuthBaseUrl: 'https://app.taskforce.example',
+                        runtimeMode: 'cloud',
+                        authSource: 'cloud',
+                        workspaceMode: 'multi-cloud',
+                        workspaceSwitchingEnabled: true,
+                        authRequiredForApi: true
+                    }
+                });
+            }
+            if (url.includes('/api/taskforce/auth/session')) {
+                authSessionCallCount += 1;
+                const payload = () => ({
+                    authenticated,
+                    runtimeMode: 'cloud',
+                    authRequiredForApi: true,
+                    userId: authenticated ? 'user-free-1' : null,
+                    workspaceId: null,
+                    betaAccess: true
+                });
+                if (authSessionCallCount === 1) {
+                    return initialSessionGate.then(() => jsonResponse(payload()));
+                }
+                return jsonResponse(payload());
+            }
+            if (url.includes('/api/taskforce/config')) {
+                return jsonResponse({
+                    ...mockConfig,
+                    runtimeMode: 'cloud',
+                    authRequiredForApi: true,
+                    workspaceSwitchingEnabled: true,
+                    setupState: {
+                        globalSetupState: 'present',
+                        workspaceSetupState: 'missing',
+                        runtimeMode: 'cloud',
+                        workspaceId: 'default',
+                        mode: 'core',
+                        forceSetup: true,
+                        forceGlobalSetup: false,
+                        forceWorkspaceSetup: true
+                    }
+                });
+            }
+            if (url.includes('/api/taskforce/workspaces')) {
+                return jsonResponse({
+                    success: true,
+                    workspaces: [],
+                    currentWorkspaceId: 'default'
+                });
+            }
+            if (url.includes('/api/taskforce/account/access-status')) {
+                return jsonResponse({
+                    gate: 'ok',
+                    hasEntitlement: true,
+                    canAccessApp: true,
+                    canAccessPlans: true,
+                    message: null
+                });
+            }
+            if (url.includes('/api/taskforce/public/pricing')) {
+                return jsonResponse({ plans: [] });
+            }
+            if (url.includes('/api/taskforce/auth/register')) {
+                authenticated = true;
+                return jsonResponse({
+                    success: true,
+                    workspaceSetupRequired: true,
+                    verificationRequired: false,
+                    commercialState: 'active'
+                });
+            }
+            if (url.includes('/api/taskforce/categories'))
+                return jsonResponse(mockCategories);
+            if (url.includes('/api/taskforce/tasks'))
+                return jsonResponse({ tasks: mockTasks });
+            if (url.includes('/api/taskforce/archive'))
+                return jsonResponse({ archived: [] });
+            if (url.includes('/api/taskforce/data-version'))
+                return jsonResponse({ dataVersion: 1 });
+            if (url.includes('/api/taskforce/types'))
+                return jsonResponse({ types: [] });
+            if (url.includes('/api/taskforce/priorities'))
+                return jsonResponse({ priorities: [] });
+            if (url.includes('/api/taskforce/approaches'))
+                return jsonResponse({ approaches: [] });
+            if (url.includes('/api/taskforce/specialists'))
+                return jsonResponse({ specialists: [] });
+            if (url.includes('/api/taskforce/workflow-templates'))
+                return jsonResponse({ templates: [] });
+            if (url.includes('/api/taskforce/taxonomy-library')) {
+                return jsonResponse({
+                    packs: [{
+                            id: 'general',
+                            label: 'General',
+                            description: 'Starter',
+                            isDefaultStarter: true,
+                            sections: {
+                                categories: [{ value: 'general', label: 'General' }],
+                                taskTypes: [{ value: 'task', label: 'Task' }],
+                                priorities: [{ value: 1, label: 'Low' }]
+                            }
+                        }]
+                });
+            }
+            return jsonResponse({});
+        });
+        vi.stubGlobal('fetch', fetchMock);
+        render(_jsx(MemoryRouter, { initialEntries: ['/login?mode=register&next=%2F'], children: _jsx(TaskforceCore, {}) }));
+        await user.type(await screen.findByPlaceholderText('Email'), 'free-user@example.com');
+        await user.type(screen.getByPlaceholderText('Display name'), 'Free User');
+        await user.type(screen.getByPlaceholderText('Password'), 'Password123!');
+        await user.click(screen.getByRole('button', { name: 'Create Account' }));
+        await act(async () => {
+            await Promise.resolve();
+        });
+        await waitFor(() => {
+            expect(screen.getByText('Configure your new workspace.')).toBeInTheDocument();
+        });
+        expect(fetchMock.mock.calls.filter(([url]) => String(url).includes('/api/taskforce/auth/session')).length).toBeGreaterThanOrEqual(2);
+        await act(async () => {
+            releaseInitialSession?.();
+            await Promise.resolve();
+        });
         await waitFor(() => {
-            expect(screen.getByRole('heading', { name: 'Subscription Plans' })).toBeInTheDocument();
-            expect(screen.getByText('Choose a plan to continue.')).toBeInTheDocument();
+            expect(screen.getByText('Configure your new workspace.')).toBeInTheDocument();
         });
-        expect(fetchMock.mock.calls.some(([url]) => String(url).includes('/api/taskforce/billing/checkout-session'))).toBe(false);
+        expect(screen.queryByText('Sign in with your account credentials.')).not.toBeInTheDocument();
     });
-    it('routes successful registration into checkout when onboarding leaves the account checkout-pending', async () => {
+    it('routes successful registration directly into the app when onboarding auto-grants free and the new cloud user already has an accessible workspace', async () => {
         const user = userEvent.setup();
         let authenticated = false;
         const fetchMock = vi.fn((input) => {
@@ -2154,7 +2762,7 @@ describe('TaskforceCore Integration', () => {
                     authenticated,
                     runtimeMode: 'cloud',
                     authRequiredForApi: true,
-                    userId: authenticated ? 'user-1' : null,
+                    userId: authenticated ? 'user-free-2' : null,
                     workspaceId: authenticated ? 'workspace-1' : null,
                     betaAccess: true
                 });
@@ -2165,6 +2773,7 @@ describe('TaskforceCore Integration', () => {
                     runtimeMode: 'cloud',
                     authRequiredForApi: true,
                     workspaceSwitchingEnabled: true,
+                    workspaceId: 'workspace-1',
                     setupState: {
                         globalSetupState: 'present',
                         workspaceSetupState: 'present',
@@ -2194,59 +2803,15 @@ describe('TaskforceCore Integration', () => {
             }
             if (url.includes('/api/taskforce/account/access-status')) {
                 return jsonResponse({
-                    gate: 'checkout_pending',
+                    gate: 'ok',
                     hasEntitlement: true,
-                    canAccessApp: false,
+                    canAccessApp: true,
                     canAccessPlans: true,
-                    message: 'Complete checkout to continue.'
-                });
-            }
-            if (url.includes('/api/taskforce/account/profile-summary')) {
-                return jsonResponse({
-                    planId: 'pro',
-                    planName: 'Pro',
-                    planVersionId: 'pro-v1',
-                    entitlementState: 'checkout_pending',
-                    gate: 'checkout_pending',
-                    message: 'Complete checkout to continue.',
-                    workspaceId: 'workspace-1'
+                    message: null
                 });
             }
             if (url.includes('/api/taskforce/public/pricing')) {
-                return jsonResponse({
-                    plans: [{
-                            planId: 'pro',
-                            displayName: 'Pro',
-                            status: 'active',
-                            defaultVersion: {
-                                planVersionId: 'pro-v1',
-                                versionNumber: 1,
-                                seatLimit: null,
-                                metadata: {}
-                            },
-                            features: [],
-                            pricing: {
-                                month: {
-                                    planVersionId: 'pro-v1',
-                                    interval: 'month',
-                                    pricingType: 'stripe',
-                                    stripePriceId: 'price_pro_month',
-                                    displayAmount: '$19.00',
-                                    unitAmount: 1900,
-                                    currency: 'usd'
-                                },
-                                year: {
-                                    planVersionId: 'pro-v1',
-                                    interval: 'year',
-                                    pricingType: 'stripe',
-                                    stripePriceId: 'price_pro_year',
-                                    displayAmount: '$190.00',
-                                    unitAmount: 19000,
-                                    currency: 'usd'
-                                }
-                            }
-                        }]
-                });
+                return jsonResponse({ plans: [] });
             }
             if (url.includes('/api/taskforce/auth/register')) {
                 authenticated = true;
@@ -2254,57 +2819,43 @@ describe('TaskforceCore Integration', () => {
                     success: true,
                     workspaceSetupRequired: false,
                     verificationRequired: false,
-                    checkoutPending: true,
-                    commercialState: 'checkout_pending'
+                    commercialState: 'active'
                 });
             }
-            if (url.includes('/api/taskforce/billing/checkout-session')) {
-                return jsonResponse({
-                    checkoutState: 'updated',
-                    message: 'Checkout started.'
-                });
-            }
-            if (url.includes('/api/taskforce/categories')) {
+            if (url.includes('/api/taskforce/categories'))
                 return jsonResponse(mockCategories);
-            }
-            if (url.includes('/api/taskforce/tasks')) {
+            if (url.includes('/api/taskforce/tasks'))
                 return jsonResponse({ tasks: mockTasks });
-            }
-            if (url.includes('/api/taskforce/archive')) {
+            if (url.includes('/api/taskforce/archive'))
                 return jsonResponse({ archived: [] });
-            }
-            if (url.includes('/api/taskforce/data-version')) {
+            if (url.includes('/api/taskforce/data-version'))
                 return jsonResponse({ dataVersion: 1 });
-            }
-            if (url.includes('/api/taskforce/types')) {
+            if (url.includes('/api/taskforce/types'))
                 return jsonResponse({ types: [] });
-            }
-            if (url.includes('/api/taskforce/priorities')) {
+            if (url.includes('/api/taskforce/priorities'))
                 return jsonResponse({ priorities: [] });
-            }
-            if (url.includes('/api/taskforce/approaches')) {
+            if (url.includes('/api/taskforce/approaches'))
                 return jsonResponse({ approaches: [] });
-            }
-            if (url.includes('/api/taskforce/specialists')) {
+            if (url.includes('/api/taskforce/specialists'))
                 return jsonResponse({ specialists: [] });
-            }
-            if (url.includes('/api/taskforce/workflow-templates')) {
+            if (url.includes('/api/taskforce/workflow-templates'))
                 return jsonResponse({ templates: [] });
-            }
             return jsonResponse({});
         });
         vi.stubGlobal('fetch', fetchMock);
-        render(_jsx(MemoryRouter, { initialEntries: ['/login?mode=register&planId=pro&planVersionId=pro-v1&interval=year&next=%2F'], children: _jsx(TaskforceCore, {}) }));
-        await user.type(await screen.findByPlaceholderText('Email'), 'checkout@example.com');
-        await user.type(screen.getByPlaceholderText('Display name'), 'Checkout User');
+        render(_jsx(MemoryRouter, { initialEntries: ['/login?mode=register&next=%2F'], children: _jsx(TaskforceCore, {}) }));
+        await user.type(await screen.findByPlaceholderText('Email'), 'existing-workspace@example.com');
+        await user.type(screen.getByPlaceholderText('Display name'), 'Existing Workspace User');
         await user.type(screen.getByPlaceholderText('Password'), 'Password123!');
         await user.click(screen.getByRole('button', { name: 'Create Account' }));
-        await waitFor(() => {
-            expect(screen.getByRole('heading', { name: 'Subscription Plans' })).toBeInTheDocument();
+        await act(async () => {
+            await Promise.resolve();
         });
         await waitFor(() => {
-            expect(fetchMock.mock.calls.some(([url]) => String(url).includes('/api/taskforce/billing/checkout-session'))).toBe(true);
+            expect(screen.getByTitle(/Account/i)).toBeInTheDocument();
         });
+        expect(screen.queryByText('Configure your new workspace.')).not.toBeInTheDocument();
+        expect(screen.queryByRole('heading', { name: 'Subscription Plans' })).not.toBeInTheDocument();
     });
     it('shows verification before workspace setup when registration still requires email verification', async () => {
         const user = userEvent.setup();
@@ -2765,31 +3316,206 @@ describe('TaskforceCore Integration', () => {
             return Promise.resolve({ ok: true, json: () => Promise.resolve({}) });
         });
         vi.stubGlobal('fetch', fetchMock);
-        render(_jsx(MemoryRouter, { initialEntries: ['/'], children: _jsx(TaskforceCore, {}) }));
+        render(_jsx(MemoryRouter, { initialEntries: ['/'], children: _jsx(TaskforceCore, {}) }));
+        await waitFor(() => {
+            expect(screen.getByText('Configure your new workspace.')).toBeInTheDocument();
+        });
+        const nameInput = screen.getByPlaceholderText('Workspace name');
+        await user.clear(nameInput);
+        await user.type(nameInput, 'Delta Project');
+        await user.type(screen.getByPlaceholderText('Workspace description (optional)'), 'Workspace desc');
+        await user.click(screen.getByRole('button', { name: 'Continue' }));
+        await user.click(screen.getByRole('button', { name: 'Create Workspace' }));
+        await waitFor(() => {
+            expect(screen.getByTitle(/Account/i)).toBeInTheDocument();
+        });
+        expect(fetchMock).toHaveBeenCalledWith('/api/taskforce/workspace-profile', expect.objectContaining({ method: 'POST' }));
+        const workspaceSyncStateCall = fetchMock.mock.calls.find((call) => {
+            if (!String(call[0]).includes('/api/taskforce/ui-state'))
+                return false;
+            const init = call[1];
+            if (String(init?.method || '').toUpperCase() !== 'POST')
+                return false;
+            const body = JSON.parse(String(init?.body || '{}'));
+            return body?.stateKey === 'workspace-sync';
+        });
+        const workspaceSyncStateBody = JSON.parse(String(workspaceSyncStateCall?.[1]?.body || '{}'));
+        expect(workspaceSyncStateBody.stateKey).toBe('workspace-sync');
+        expect(workspaceSyncStateBody.patch?.enabled).toBe(false);
+    });
+    it('creates the first cloud workspace through the workspace creation flow during setup', async () => {
+        const user = userEvent.setup();
+        let workspaceCreated = false;
+        const fetchMock = vi.fn((input, init) => {
+            const url = String(input);
+            if (url.includes('/api/taskforce/auth/runtime-config')) {
+                return jsonResponse({
+                    success: true,
+                    config: {
+                        baseUrl: 'https://app.taskforce.example',
+                        apiBaseUrl: 'https://app.taskforce.example/api',
+                        cloudAuthBaseUrl: 'https://app.taskforce.example',
+                        runtimeMode: 'cloud',
+                        authSource: 'cloud',
+                        workspaceMode: 'multi-cloud',
+                        workspaceSwitchingEnabled: true,
+                        cloudAuthViaLocalProxy: false
+                    }
+                });
+            }
+            if (url.includes('/api/taskforce/auth/session')) {
+                return jsonResponse({
+                    authenticated: true,
+                    runtimeMode: 'cloud',
+                    authRequiredForApi: true,
+                    userId: 'user-cloud-1',
+                    workspaceId: workspaceCreated ? 'workspace-cloud-new' : 'default'
+                });
+            }
+            if (url.includes('/api/taskforce/account/access-status')) {
+                return jsonResponse({
+                    gate: 'ok',
+                    hasEntitlement: true,
+                    canAccessApp: true,
+                    canAccessPlans: true,
+                    message: null
+                });
+            }
+            if (url.includes('/api/taskforce/config')) {
+                return jsonResponse({
+                    ...mockConfig,
+                    runtimeMode: 'cloud',
+                    authRequiredForApi: true,
+                    userId: 'user-cloud-1',
+                    projectName: workspaceCreated ? 'Cloud Mission' : '',
+                    setupState: {
+                        globalSetupState: 'present',
+                        workspaceSetupState: workspaceCreated ? 'present' : 'missing',
+                        runtimeMode: 'cloud',
+                        workspaceId: workspaceCreated ? 'workspace-cloud-new' : 'default',
+                        mode: 'core',
+                        forceSetup: false,
+                        forceGlobalSetup: false,
+                        forceWorkspaceSetup: false,
+                        workspace: workspaceCreated
+                            ? { id: 'workspace-cloud-new', slug: 'workspace-cloud-new', name: 'Cloud Mission', description: 'Cloud workspace desc' }
+                            : null,
+                        suggestedWorkspaceName: ''
+                    },
+                    runtimeCapabilities: {
+                        runtimeMode: 'cloud',
+                        supportsCloudAuth: true,
+                        supportsAdminManagedSetupOverrides: true,
+                        supportsPackageScriptSetupOverrides: false
+                    }
+                });
+            }
+            if (url.includes('/api/taskforce/workspaces') && String(init?.method || 'GET').toUpperCase() === 'GET') {
+                return jsonResponse({
+                    success: true,
+                    workspaces: workspaceCreated
+                        ? [{
+                                id: 'workspace-cloud-new',
+                                slug: 'workspace-cloud-new',
+                                name: 'Cloud Mission',
+                                description: 'Cloud workspace desc',
+                                role: 'owner',
+                                status: 'active',
+                                betaAccess: true
+                            }]
+                        : [],
+                    currentWorkspaceId: workspaceCreated ? 'workspace-cloud-new' : 'default'
+                });
+            }
+            if (url.includes('/api/taskforce/workspaces') && String(init?.method || '').toUpperCase() === 'POST') {
+                workspaceCreated = true;
+                return jsonResponse({
+                    success: true,
+                    workspace: {
+                        id: 'workspace-cloud-new',
+                        slug: 'workspace-cloud-new',
+                        name: 'Cloud Mission',
+                        description: 'Cloud workspace desc',
+                        role: 'owner',
+                        status: 'active',
+                        betaAccess: true
+                    }
+                }, 201);
+            }
+            if (url.includes('/api/taskforce/session/workspace')) {
+                return jsonResponse({
+                    success: true,
+                    workspaceId: 'workspace-cloud-new',
+                    role: 'owner'
+                });
+            }
+            if (url.includes('/api/taskforce/ui-state?key=app')) {
+                return jsonResponse({ success: true, state: {} });
+            }
+            if (url.includes('/api/taskforce/ui-state?key=workspace-sync')) {
+                return jsonResponse({
+                    success: true,
+                    state: {
+                        version: 2,
+                        enabled: false,
+                        phase: 'idle',
+                        pullCursor: null,
+                        lastPullAt: null,
+                        lastPushAt: null,
+                        lastSyncedAt: null
+                    }
+                });
+            }
+            if (url.includes('/api/taskforce/ui-state')) {
+                return jsonResponse({ success: true });
+            }
+            if (url.includes('/api/taskforce/categories')) {
+                return jsonResponse(mockCategories);
+            }
+            if (url.includes('/api/taskforce/tasks')) {
+                return jsonResponse({ tasks: mockTasks });
+            }
+            if (url.includes('/api/taskforce/archive')) {
+                return jsonResponse({ archived: [] });
+            }
+            if (url.includes('/api/taskforce/data-version')) {
+                return jsonResponse({ dataVersion: 1 });
+            }
+            if (url.includes('/api/taskforce/types')) {
+                return jsonResponse({ types: [] });
+            }
+            if (url.includes('/api/taskforce/priorities')) {
+                return jsonResponse({ priorities: [] });
+            }
+            if (url.includes('/api/taskforce/approaches')) {
+                return jsonResponse({ approaches: [] });
+            }
+            if (url.includes('/api/taskforce/specialists')) {
+                return jsonResponse({ specialists: [] });
+            }
+            if (url.includes('/api/taskforce/workflow-templates')) {
+                return jsonResponse({ templates: [] });
+            }
+            return jsonResponse({});
+        });
+        vi.stubGlobal('fetch', fetchMock);
+        render(_jsx(MemoryRouter, { initialEntries: ['/setup?step=workspace'], children: _jsx(TaskforceCore, {}) }));
         await waitFor(() => {
-            expect(screen.getByText('Workspace Setup Required')).toBeInTheDocument();
+            expect(screen.getByText('Configure your new workspace.')).toBeInTheDocument();
         });
-        const nameInput = screen.getByPlaceholderText('Project name');
+        expect(screen.getByLabelText('Cloud runtime')).toBeInTheDocument();
+        const nameInput = screen.getByPlaceholderText('Workspace name');
         await user.clear(nameInput);
-        await user.type(nameInput, 'Delta Project');
-        await user.type(screen.getByPlaceholderText('Project description (optional)'), 'Workspace desc');
-        await user.click(screen.getByRole('button', { name: 'Save Project Setup' }));
+        await user.type(nameInput, 'Cloud Mission');
+        await user.type(screen.getByPlaceholderText('Workspace description (optional)'), 'Cloud workspace desc');
+        await user.click(screen.getByRole('button', { name: 'Continue' }));
+        await user.click(screen.getByRole('button', { name: 'Create Workspace' }));
         await waitFor(() => {
             expect(screen.getByTitle(/Account/i)).toBeInTheDocument();
         });
-        expect(fetchMock).toHaveBeenCalledWith('/api/taskforce/workspace-profile', expect.objectContaining({ method: 'POST' }));
-        const workspaceSyncStateCall = fetchMock.mock.calls.find((call) => {
-            if (!String(call[0]).includes('/api/taskforce/ui-state'))
-                return false;
-            const init = call[1];
-            if (String(init?.method || '').toUpperCase() !== 'POST')
-                return false;
-            const body = JSON.parse(String(init?.body || '{}'));
-            return body?.stateKey === 'workspace-sync';
-        });
-        const workspaceSyncStateBody = JSON.parse(String(workspaceSyncStateCall?.[1]?.body || '{}'));
-        expect(workspaceSyncStateBody.stateKey).toBe('workspace-sync');
-        expect(workspaceSyncStateBody.patch?.enabled).toBe(false);
+        expect(fetchMock.mock.calls.some((call) => (String(call[0]).includes('/api/taskforce/workspaces')
+            && String(call[1]?.method || '').toUpperCase() === 'POST'))).toBe(true);
+        expect(fetchMock.mock.calls.some((call) => String(call[0]).includes('/api/taskforce/workspace-profile'))).toBe(false);
     });
     it('applies the selected starter taxonomy pack during workspace setup', async () => {
         const user = userEvent.setup();
@@ -2897,10 +3623,22 @@ describe('TaskforceCore Integration', () => {
         vi.stubGlobal('fetch', fetchMock);
         render(_jsx(MemoryRouter, { initialEntries: ['/'], children: _jsx(TaskforceCore, {}) }));
         await waitFor(() => {
-            expect(screen.getByText('Workspace Setup Required')).toBeInTheDocument();
-        });
-        await user.click(screen.getByRole('radio', { name: /software development/i }));
-        await user.click(screen.getByRole('button', { name: 'Save Project Setup' }));
+            expect(screen.getByText('Configure your new workspace.')).toBeInTheDocument();
+        });
+        expect(screen.getByLabelText('Local runtime')).toBeInTheDocument();
+        await user.click(screen.getByRole('button', { name: 'Continue' }));
+        expect(screen.queryByRole('radio', { name: /create new local workspace/i })).not.toBeInTheDocument();
+        expect(screen.queryByRole('radio', { name: /sync existing cloud workspace/i })).not.toBeInTheDocument();
+        expect(screen.queryByText(/Includes \d+ categories?/i)).not.toBeInTheDocument();
+        expect(screen.getByRole('option', { name: 'General' })).toBeInTheDocument();
+        expect(screen.getByText('Task')).toBeInTheDocument();
+        expect(screen.getByText('Low')).toBeInTheDocument();
+        await user.selectOptions(screen.getByRole('combobox'), 'software-development');
+        expect(screen.getByText('Engineering')).toBeInTheDocument();
+        expect(screen.getByText('Feature, Bug')).toBeInTheDocument();
+        expect(screen.getByText('Low, Medium, High, Critical')).toBeInTheDocument();
+        await user.click(screen.getByRole('button', { name: 'Continue' }));
+        await user.click(screen.getByRole('button', { name: 'Create Workspace' }));
         await waitFor(() => {
             expect(screen.getByTitle(/Account/i)).toBeInTheDocument();
         });
@@ -2993,9 +3731,9 @@ describe('TaskforceCore Integration', () => {
             expect(configCalls).toBeGreaterThan(1);
         });
         expect(screen.getByRole('button', { name: /add task/i })).toBeInTheDocument();
-        expect(screen.queryByText('Workspace Setup Required')).not.toBeInTheDocument();
+        expect(screen.queryByText('Configure your new workspace.')).not.toBeInTheDocument();
     });
-    it('allows workspace setup to sync from selected cloud project into matching local workspace id', async () => {
+    it('keeps setup blocking while the selected cloud workspace is performing its first local import', async () => {
         const user = userEvent.setup();
         let workspaceSaved = false;
         const fetchMock = vi.fn((url, init) => {
@@ -3071,9 +3809,45 @@ describe('TaskforceCore Integration', () => {
             if (url.includes('/api/taskforce/session/workspace')) {
                 return Promise.resolve({ ok: true, json: () => Promise.resolve({ success: true }) });
             }
+            if (url.includes('/api/taskforce/ui-state?key=workspace-sync')) {
+                return Promise.resolve({
+                    ok: true,
+                    json: () => Promise.resolve({
+                        success: true,
+                        state: workspaceSaved
+                            ? {
+                                version: 2,
+                                enabled: true,
+                                phase: 'attach-cloud',
+                                pullCursor: null,
+                                lastPullAt: null,
+                                lastPushAt: null,
+                                lastSyncedAt: null
+                            }
+                            : {
+                                version: 2,
+                                enabled: false,
+                                phase: 'idle',
+                                pullCursor: null,
+                                lastPullAt: null,
+                                lastPushAt: null,
+                                lastSyncedAt: null
+                            }
+                    })
+                });
+            }
             if (url.includes('/api/taskforce/ui-state')) {
                 return Promise.resolve({ ok: true, json: () => Promise.resolve({ success: true }) });
             }
+            if (url.includes('https://cloud.example.com/api/taskforce/sync/workspace/handshake')) {
+                return Promise.resolve({ ok: true, json: () => Promise.resolve({ success: true }) });
+            }
+            if (url.includes('https://cloud.example.com/api/taskforce/sync/workspace/pull')) {
+                return new Promise(() => { });
+            }
+            if (url === '/api/taskforce/sync/workspace/apply-local') {
+                return Promise.resolve({ ok: true, json: () => Promise.resolve({ success: true }) });
+            }
             if (url.includes('/api/taskforce/tasks')) {
                 return Promise.resolve({ ok: true, json: () => Promise.resolve({ tasks: mockTasks }) });
             }
@@ -3085,17 +3859,18 @@ describe('TaskforceCore Integration', () => {
         vi.stubGlobal('fetch', fetchMock);
         render(_jsx(MemoryRouter, { initialEntries: ['/setup?step=workspace&source=cloud'], children: _jsx(TaskforceCore, { config: { cloudAuthBaseUrl: 'https://cloud.example.com' } }) }));
         await waitFor(() => {
-            expect(screen.getByText('Workspace Setup Required')).toBeInTheDocument();
+            expect(screen.getByText('Configure your new workspace.')).toBeInTheDocument();
         });
-        await user.click(screen.getByRole('radio', { name: /sync existing cloud project/i }));
         await waitFor(() => {
             expect(screen.getByRole('option', { name: /Cloud Project 123/ })).toBeInTheDocument();
         });
         await user.selectOptions(screen.getByRole('combobox'), 'workspace-cloud-123');
-        await user.click(screen.getByRole('button', { name: 'Save Project Setup' }));
+        await user.click(screen.getByRole('button', { name: 'Connect Workspace' }));
         await waitFor(() => {
-            expect(screen.getByTitle(/Account/i)).toBeInTheDocument();
+            expect(screen.getByText('Importing "Cloud Project 123" from cloud into local.')).toBeInTheDocument();
         });
+        expect(screen.getByText('Configure your new workspace.')).toBeInTheDocument();
+        expect(screen.getByRole('button', { name: 'Importing Workspace...' })).toBeInTheDocument();
         const workspaceProfileCall = fetchMock.mock.calls.find((call) => String(call[0]).includes('/api/taskforce/workspace-profile'));
         const workspaceProfileBody = JSON.parse(String(workspaceProfileCall?.[1]?.body || '{}'));
         expect(workspaceProfileBody.workspaceId).toBe('workspace-cloud-123');
@@ -3110,8 +3885,258 @@ describe('TaskforceCore Integration', () => {
         });
         const workspaceSyncStateBody = JSON.parse(String(workspaceSyncStateCall?.[1]?.body || '{}'));
         expect(workspaceSyncStateBody.stateKey).toBe('workspace-sync');
-        expect(workspaceSyncStateBody.patch?.cloudSyncEnabled).toBe(true);
+        expect(workspaceSyncStateBody.patch?.enabled).toBe(true);
+        expect(workspaceSyncStateBody.patch?.phase).toBe('attach-cloud');
         expect(fetchMock.mock.calls.some((call) => String(call[0]).includes('https://cloud.example.com/api/taskforce/workspaces'))).toBe(true);
+        expect(screen.queryByTitle(/Account/i)).not.toBeInTheDocument();
+    });
+    it('shows sign-in and register actions on signed-out cloud workspace setup and disables connect', async () => {
+        const fetchMock = vi.fn((url) => {
+            if (url.includes('/api/taskforce/auth/session')) {
+                return Promise.resolve({
+                    ok: true,
+                    json: () => Promise.resolve({
+                        authenticated: false,
+                        runtimeMode: 'local',
+                        authRequiredForApi: false
+                    })
+                });
+            }
+            if (url.includes('/api/taskforce/config')) {
+                return Promise.resolve({
+                    ok: true,
+                    json: () => Promise.resolve({
+                        ...mockConfig,
+                        runtimeMode: 'local',
+                        authRequiredForApi: false,
+                        setupState: {
+                            globalSetupState: 'present',
+                            workspaceSetupState: 'missing',
+                            runtimeMode: 'local',
+                            workspaceId: 'default',
+                            mode: 'core',
+                            forceSetup: false,
+                            forceGlobalSetup: false,
+                            forceWorkspaceSetup: true,
+                            workspace: null,
+                            suggestedWorkspaceName: 'Suggested Project'
+                        },
+                        runtimeCapabilities: {
+                            runtimeMode: 'local',
+                            supportsCloudAuth: true,
+                            supportsAdminManagedSetupOverrides: false,
+                            supportsPackageScriptSetupOverrides: true
+                        }
+                    })
+                });
+            }
+            return Promise.resolve({ ok: true, json: () => Promise.resolve({}) });
+        });
+        vi.stubGlobal('fetch', fetchMock);
+        render(_jsx(MemoryRouter, { initialEntries: ['/setup?step=workspace&source=cloud&postAuth=select-cloud-workspace'], children: _jsx(TaskforceCore, { config: { cloudAuthBaseUrl: 'https://cloud.example.com' } }) }));
+        await waitFor(() => {
+            expect(screen.getByText('Configure your new workspace.')).toBeInTheDocument();
+        });
+        expect(screen.getByRole('button', { name: 'Sign In' })).toBeInTheDocument();
+        expect(screen.getByRole('button', { name: 'Register' })).toBeInTheDocument();
+        expect(screen.getByRole('button', { name: 'Connect Workspace' })).toBeDisabled();
+    });
+    it('returns signed-in users to the cloud workspace picker after setup sign-in', async () => {
+        const user = userEvent.setup();
+        let authenticated = false;
+        const fetchMock = vi.fn((url, init) => {
+            if (url.includes('/api/taskforce/auth/session')) {
+                return Promise.resolve({
+                    ok: true,
+                    json: () => Promise.resolve({
+                        authenticated,
+                        runtimeMode: 'local',
+                        authRequiredForApi: false
+                    })
+                });
+            }
+            if (url.includes('/api/taskforce/config')) {
+                return Promise.resolve({
+                    ok: true,
+                    json: () => Promise.resolve({
+                        ...mockConfig,
+                        runtimeMode: 'local',
+                        authRequiredForApi: false,
+                        setupState: {
+                            globalSetupState: 'present',
+                            workspaceSetupState: 'missing',
+                            runtimeMode: 'local',
+                            workspaceId: 'default',
+                            mode: 'core',
+                            forceSetup: false,
+                            forceGlobalSetup: false,
+                            forceWorkspaceSetup: true,
+                            workspace: null,
+                            suggestedWorkspaceName: 'Suggested Project'
+                        },
+                        runtimeCapabilities: {
+                            runtimeMode: 'local',
+                            supportsCloudAuth: true,
+                            supportsAdminManagedSetupOverrides: false,
+                            supportsPackageScriptSetupOverrides: true
+                        }
+                    })
+                });
+            }
+            if (url.includes('/api/taskforce/auth/login') && String(init?.method || '').toUpperCase() === 'POST') {
+                authenticated = true;
+                return Promise.resolve({
+                    ok: true,
+                    json: () => Promise.resolve({
+                        success: true,
+                        workspaceSetupRequired: true
+                    })
+                });
+            }
+            if (url.includes('https://cloud.example.com/api/taskforce/workspaces')) {
+                return Promise.resolve({
+                    ok: true,
+                    json: () => Promise.resolve({
+                        success: true,
+                        workspaces: [
+                            {
+                                id: 'workspace-cloud-123',
+                                name: 'Cloud Project 123',
+                                description: 'Cloud desc'
+                            }
+                        ]
+                    })
+                });
+            }
+            return Promise.resolve({ ok: true, json: () => Promise.resolve({ success: true }) });
+        });
+        vi.stubGlobal('fetch', fetchMock);
+        render(_jsx(MemoryRouter, { initialEntries: ['/setup?step=workspace&source=cloud&postAuth=select-cloud-workspace'], children: _jsx(TaskforceCore, { config: { cloudAuthBaseUrl: 'https://cloud.example.com' } }) }));
+        await waitFor(() => {
+            expect(screen.getByRole('button', { name: 'Sign In' })).toBeInTheDocument();
+        });
+        await user.click(screen.getByRole('button', { name: 'Sign In' }));
+        await waitFor(() => {
+            expect(screen.getByTestId('auth-email-input')).toBeInTheDocument();
+        });
+        await user.type(screen.getByTestId('auth-email-input'), 'agent@example.com');
+        await user.type(screen.getByTestId('auth-password-input'), 'password123');
+        await user.click(screen.getByTestId('auth-submit-button'));
+        await waitFor(() => {
+            expect(screen.getByRole('option', { name: /Cloud Project 123/ })).toBeInTheDocument();
+        });
+        await waitFor(() => {
+            expect(screen.queryByRole('button', { name: 'Register' })).not.toBeInTheDocument();
+            expect(screen.getByRole('button', { name: 'Connect Workspace' })).toBeEnabled();
+        });
+    });
+    it('loads workspace setup after cloud sign-in when the user has no workspaces', async () => {
+        const user = userEvent.setup();
+        let authenticated = false;
+        const fetchMock = vi.fn((input, init) => {
+            const url = String(input);
+            if (url.includes('/api/taskforce/auth/runtime-config')) {
+                return jsonResponse({
+                    success: true,
+                    config: {
+                        baseUrl: 'https://app.taskforce.example',
+                        apiBaseUrl: 'https://app.taskforce.example/api',
+                        cloudAuthBaseUrl: 'https://app.taskforce.example',
+                        runtimeMode: 'cloud',
+                        authSource: 'cloud',
+                        workspaceMode: 'multi-cloud',
+                        workspaceSwitchingEnabled: true,
+                        cloudAuthViaLocalProxy: false
+                    }
+                });
+            }
+            if (url.includes('/api/taskforce/auth/session')) {
+                return jsonResponse({
+                    authenticated,
+                    runtimeMode: 'cloud',
+                    authRequiredForApi: true,
+                    userId: authenticated ? 'user-cloud-setup' : 'anonymous',
+                    workspaceId: 'default'
+                });
+            }
+            if (url.includes('/api/taskforce/auth/login')) {
+                authenticated = true;
+                return jsonResponse({ success: true });
+            }
+            if (url.includes('/api/taskforce/workspaces')) {
+                return jsonResponse({
+                    success: true,
+                    workspaces: [],
+                    currentWorkspaceId: 'default'
+                });
+            }
+            if (url.includes('/api/taskforce/account/access-status')) {
+                return jsonResponse({
+                    gate: 'ok',
+                    hasEntitlement: true,
+                    canAccessApp: true,
+                    canAccessPlans: true,
+                    message: null
+                });
+            }
+            if (url.includes('/api/taskforce/config')) {
+                return jsonResponse({
+                    ...mockConfig,
+                    runtimeMode: 'cloud',
+                    authRequiredForApi: true,
+                    userId: authenticated ? 'user-cloud-setup' : 'anonymous',
+                    setupState: {
+                        globalSetupState: 'present',
+                        workspaceSetupState: authenticated ? 'missing' : 'present',
+                        runtimeMode: 'cloud',
+                        workspaceId: 'default',
+                        mode: 'core',
+                        forceSetup: false,
+                        forceGlobalSetup: false,
+                        forceWorkspaceSetup: false,
+                        workspace: null,
+                        suggestedWorkspaceName: ''
+                    },
+                    runtimeCapabilities: {
+                        runtimeMode: 'cloud',
+                        supportsCloudAuth: true,
+                        supportsAdminManagedSetupOverrides: true,
+                        supportsPackageScriptSetupOverrides: false
+                    }
+                });
+            }
+            if (url.includes('/api/taskforce/ui-state?key=app')) {
+                return jsonResponse({ success: true, state: {} });
+            }
+            if (url.includes('/api/taskforce/ui-state?key=workspace-sync')) {
+                return jsonResponse({
+                    success: true,
+                    state: {
+                        version: 2,
+                        enabled: false,
+                        phase: 'idle',
+                        pullCursor: null,
+                        lastPullAt: null,
+                        lastPushAt: null,
+                        lastSyncedAt: null
+                    }
+                });
+            }
+            if (url.includes('/api/taskforce/workflow-templates')) {
+                return jsonResponse({ templates: [] });
+            }
+            return jsonResponse({});
+        });
+        vi.stubGlobal('fetch', fetchMock);
+        render(_jsx(MemoryRouter, { initialEntries: ['/login?mode=login&next=%2F'], children: _jsx(TaskforceCore, {}) }));
+        await user.type(await screen.findByPlaceholderText('Email'), 'setup@example.com');
+        await user.type(screen.getByPlaceholderText('Password'), 'Password123!');
+        await user.click(screen.getByRole('button', { name: 'Sign In' }));
+        await waitFor(() => {
+            expect(screen.getByText('Configure your new workspace.')).toBeInTheDocument();
+        });
+        expect(screen.queryByText('Resolving workspace access...')).not.toBeInTheDocument();
+        expect(fetchMock.mock.calls.some((call) => String(call[0]).includes('/api/taskforce/config'))).toBe(true);
     });
     it('enables workspace cloud sync from local setup when signed in and checkbox is selected', async () => {
         const user = userEvent.setup();
@@ -3183,7 +4208,7 @@ describe('TaskforceCore Integration', () => {
         vi.stubGlobal('fetch', fetchMock);
         render(_jsx(MemoryRouter, { initialEntries: ['/setup?step=workspace'], children: _jsx(TaskforceCore, { config: { cloudAuthBaseUrl: 'https://cloud.example.com' } }) }));
         await waitFor(() => {
-            expect(screen.getByText('Workspace Setup Required')).toBeInTheDocument();
+            expect(screen.getByText('Configure your new workspace.')).toBeInTheDocument();
         });
         await waitFor(() => {
             expect(screen.getByRole('checkbox', { name: /sync to cloud after setup/i })).toBeInTheDocument();
@@ -3621,7 +4646,7 @@ describe('TaskforceCore Integration', () => {
         vi.stubGlobal('fetch', fetchMock);
         const initialRender = render(_jsx(MemoryRouter, { initialEntries: ['/setup?step=workspace'], children: _jsx(TaskforceCore, { config: { cloudAuthBaseUrl: 'https://cloud.example.com' } }) }));
         await waitFor(() => {
-            expect(screen.getByText('Workspace Setup Required')).toBeInTheDocument();
+            expect(screen.getByText('Configure your new workspace.')).toBeInTheDocument();
         });
         await waitFor(() => {
             expect(screen.getByRole('checkbox', { name: /sync to cloud after setup/i })).toBeInTheDocument();
@@ -3637,7 +4662,7 @@ describe('TaskforceCore Integration', () => {
         initialRender.unmount();
         render(_jsx(MemoryRouter, { initialEntries: ['/'], children: _jsx(TaskforceCore, { config: { cloudAuthBaseUrl: 'https://cloud.example.com' } }) }));
         await waitFor(() => {
-            expect(screen.queryByText('Workspace Setup Required')).not.toBeInTheDocument();
+            expect(screen.queryByText('Configure your new workspace.')).not.toBeInTheDocument();
             expect(screen.getByRole('button', { name: /add task/i })).toBeInTheDocument();
         });
         expect(cloudWorkspaceCreated).toBe(false);
@@ -3878,18 +4903,31 @@ describe('TaskforceCore Integration', () => {
         vi.stubGlobal('fetch', fetchMock);
         render(_jsx(TaskforceCore, { config: { cloudAuthBaseUrl: 'https://cloud.example.com' } }));
         await waitFor(() => {
-            expect(screen.getByTitle('Open tasks matching current filters')).toHaveTextContent('1/1');
+            expect(screen.getByTitle(/Open tasks/)).toHaveTextContent(/1/);
             expect(screen.getByTitle(/Account/i)).toBeInTheDocument();
         });
         await user.click(screen.getByTitle(/Account/i));
         await user.click(await screen.findByRole('menuitem', { name: 'Sign Out' }));
         await waitFor(() => {
             expect(fetchMock.mock.calls.some((call) => String(call[0]).includes('https://cloud.example.com/api/taskforce/auth/logout'))).toBe(true);
-            expect(screen.getByTitle('Open tasks matching current filters')).toHaveTextContent('1/1');
+            expect(screen.getByTitle(/Open tasks/)).toHaveTextContent(/1/);
         });
         await user.click(screen.getByTitle(/Account/i));
         expect(await screen.findByText('Sign In / Register')).toBeInTheDocument();
     });
+    it('uses an explicit cloud sign-out redirect and broader cloud logout reset path', () => {
+        const standaloneLayoutSource = fs.readFileSync(path.join(__dirname, 'components/views/StandaloneLayout.tsx'), 'utf8');
+        const useTaskforceSource = fs.readFileSync(path.join(__dirname, 'hooks/useTaskforce.ts'), 'utf8');
+        expect(standaloneLayoutSource).toContain("await logout();");
+        expect(standaloneLayoutSource).toContain("if (runtimeMode === 'cloud') {");
+        expect(standaloneLayoutSource).toContain("navigate('/login', { replace: true });");
+        expect(useTaskforceSource).toContain('const resetCloudLogoutClientState = useCallback(() => {');
+        expect(useTaskforceSource).toContain('setArchivedTasks([]);');
+        expect(useTaskforceSource).toContain('setDeletedTasks([]);');
+        expect(useTaskforceSource).toContain('setAssigneeOptions(createDefaultAssigneeOptions());');
+        expect(useTaskforceSource).toContain('setUiStateReady(false);');
+        expect(useTaskforceSource).toContain('resetCloudLogoutClientState();');
+    });
     it('does not pull from cloud when workspace sync toggle is disabled', async () => {
         const fetchMock = vi.fn((url) => {
             if (url.includes('/api/taskforce/auth/session')) {
@@ -4758,9 +5796,10 @@ describe('TaskforceCore Integration', () => {
     it('keeps local workspace context authoritative over cloud auth session workspace id', async () => {
         const useTaskforcePath = path.join(process.cwd(), 'src/hooks/useTaskforce.ts');
         const useTaskforceSource = fs.readFileSync(useTaskforcePath, 'utf8');
-        expect(useTaskforceSource).toContain("const keepLocalWorkspaceContext = runtimeMode === 'local' || authOnlyCloudMode;");
-        expect(useTaskforceSource).toContain('Local runtime resolves workspace identity from local DB via /api/taskforce/config.');
-        expect(useTaskforceSource).toContain('Do not override it from cloud auth session payloads.');
+        expect(useTaskforceSource).toContain("const authOnlyCloudMode = !isCloudHost && Boolean(normalizedCloudAuthBaseUrl) && !normalizedApiBaseUrl;");
+        expect(useTaskforceSource).toContain('Local runtime workspace identity must be sourced from local DB (/api/taskforce/config),');
+        expect(useTaskforceSource).toContain('not from persisted browser context or cloud session payloads.');
+        expect(useTaskforceSource).toContain("if (initialRuntimeMode === 'local') return 'default';");
     });
     it.skip('blocks local cloud-sync pull/apply when workspaceId remains default', async () => {
         const fetchMock = vi.fn((url, init) => {