@taskforcehq/taskforce 0.3.304 → 0.3.306

package/dist/TaskforceCore.test.js

@@ -7,6 +7,28 @@ import { TaskforceCore } from './TaskforceCore';
 import fs from 'fs';
 import path from 'path';
 import modalStyles from './components/ui/Modal.module.css';
+vi.mock('react-avatar-editor', async () => {
+    const React = await import('react');
+    return {
+        default: React.forwardRef((_props, ref) => {
+            React.useImperativeHandle(ref, () => ({
+                getImageScaledToCanvas: () => ({
+                    width: 1024,
+                    height: 1024,
+                    getContext: () => ({
+                        drawImage: () => undefined
+                    }),
+                    toBlob: (callback, type) => {
+                        callback(new Blob([new Uint8Array([1, 2, 3, 4])], { type: type || 'image/webp' }));
+                    }
+                }),
+                getImage: () => document.createElement('canvas'),
+                getCroppingRect: () => ({ x: 0, y: 0, width: 1, height: 1 })
+            }));
+            return _jsx("div", { "data-testid": "avatar-editor" });
+        })
+    };
+});
 const mockTasks = [
     {
         id: 'task-20260130-abc123',
@@ -830,6 +852,9 @@ describe('TaskforceCore Integration', () => {
     });
     it('shows full-page login when cloud auth is required and user is unauthenticated', async () => {
         const fetchMock = vi.fn((url) => {
+            if (url.includes('/api/taskforce/auth/runtime-config')) {
+                return Promise.resolve({ ok: true, json: () => Promise.resolve({ config: { runtimeMode: 'local', workspaceMode: 'single-local', authSource: 'cloud' } }) });
+            }
             if (url.includes('/api/taskforce/auth/session')) {
                 return Promise.resolve({
                     ok: true,
@@ -929,8 +954,8 @@ describe('TaskforceCore Integration', () => {
                     json: () => Promise.resolve({
                         plans: [
                             {
-                                planId: 'pro',
-                                displayName: 'Pro Plan test mode',
+                                planId: 'basic',
+                                displayName: 'Basic Plan test mode',
                                 status: 'active',
                                 features: [],
                                 pricing: { month: null, year: null },
@@ -946,7 +971,7 @@ describe('TaskforceCore Integration', () => {
         render(_jsx(MemoryRouter, { initialEntries: ['/pricing'], children: _jsx(TaskforceCore, {}) }));
         await waitFor(() => {
             expect(screen.queryByPlaceholderText('Email')).not.toBeInTheDocument();
-            expect(screen.getByText('Pro Plan test mode')).toBeInTheDocument();
+            expect(screen.getByText('Basic Plan test mode')).toBeInTheDocument();
             expect(screen.getByRole('heading', { name: 'Subscription Plans' })).toBeInTheDocument();
         });
     });
@@ -1019,8 +1044,8 @@ describe('TaskforceCore Integration', () => {
                     json: () => Promise.resolve({
                         plans: [
                             {
-                                planId: 'starter',
-                                displayName: 'Starter',
+                                planId: 'free',
+                                displayName: 'Free',
                                 status: 'active',
                                 features: [],
                                 pricing: {
@@ -1028,7 +1053,7 @@ describe('TaskforceCore Integration', () => {
                                     year: null
                                 },
                                 defaultVersion: {
-                                    planVersionId: 'starter-v1',
+                                    planVersionId: 'free-v1',
                                     versionNumber: 1,
                                     seatLimit: null,
                                     metadata: {}
@@ -1042,8 +1067,8 @@ describe('TaskforceCore Integration', () => {
                 return Promise.resolve({
                     ok: true,
                     json: () => Promise.resolve({
-                        planId: 'starter',
-                        planName: 'Starter',
+                        planId: 'free',
+                        planName: 'Free',
                         entitlementState: 'active'
                     })
                 });
@@ -1052,8 +1077,8 @@ describe('TaskforceCore Integration', () => {
                 return Promise.resolve({
                     ok: true,
                     json: () => Promise.resolve({
-                        planId: 'starter',
-                        planName: 'Starter',
+                        planId: 'free',
+                        planName: 'Free',
                         entitlementState: 'active'
                     })
                 });
@@ -1082,7 +1107,6 @@ describe('TaskforceCore Integration', () => {
         render(_jsx(MemoryRouter, { initialEntries: ['/'], children: _jsx(TaskforceCore, {}) }));
         await waitFor(() => {
             expect(screen.getByRole('heading', { name: 'Subscription Plans' })).toBeInTheDocument();
-            expect(screen.getByText('Choose a plan to continue.')).toBeInTheDocument();
         });
     });
     it('redirects authenticated users with a blocking account access gate to the plans page', async () => {
@@ -1154,8 +1178,8 @@ describe('TaskforceCore Integration', () => {
                     json: () => Promise.resolve({
                         plans: [
                             {
-                                planId: 'starter',
-                                displayName: 'Starter',
+                                planId: 'free',
+                                displayName: 'Free',
                                 status: 'active',
                                 features: [],
                                 pricing: {
@@ -1163,7 +1187,7 @@ describe('TaskforceCore Integration', () => {
                                     year: null
                                 },
                                 defaultVersion: {
-                                    planVersionId: 'starter-v1',
+                                    planVersionId: 'free-v1',
                                     versionNumber: 1,
                                     seatLimit: null,
                                     metadata: {}
@@ -1269,8 +1293,8 @@ describe('TaskforceCore Integration', () => {
                     json: () => Promise.resolve({
                         plans: [
                             {
-                                planId: 'starter',
-                                displayName: 'Starter',
+                                planId: 'free',
+                                displayName: 'Free',
                                 status: 'active',
                                 features: [],
                                 pricing: {
@@ -1278,7 +1302,7 @@ describe('TaskforceCore Integration', () => {
                                     year: null
                                 },
                                 defaultVersion: {
-                                    planVersionId: 'starter-v1',
+                                    planVersionId: 'free-v1',
                                     versionNumber: 1,
                                     seatLimit: null,
                                     metadata: {}
@@ -1292,9 +1316,9 @@ describe('TaskforceCore Integration', () => {
                 return Promise.resolve({
                     ok: true,
                     json: () => Promise.resolve({
-                        planId: 'starter',
-                        planName: 'Starter',
-                        planVersionId: 'starter-v1',
+                        planId: 'free',
+                        planName: 'Free',
+                        planVersionId: 'free-v1',
                         entitlementState: 'active'
                     })
                 });
@@ -1323,7 +1347,7 @@ describe('TaskforceCore Integration', () => {
         render(_jsx(MemoryRouter, { initialEntries: ['/?screen=plans&gate=missing_entitlement'], children: _jsx(TaskforceCore, {}) }));
         await waitFor(() => {
             expect(screen.getByRole('heading', { name: 'Subscription Plans' })).toBeInTheDocument();
-            expect(screen.getByText('Starter')).toBeInTheDocument();
+            expect(screen.getByText('Free')).toBeInTheDocument();
         });
         await waitFor(() => {
             expect(screen.queryByText('No entitlement is linked to this account.')).not.toBeInTheDocument();
@@ -1393,8 +1417,8 @@ describe('TaskforceCore Integration', () => {
                 return Promise.resolve({
                     ok: true,
                     json: () => Promise.resolve({
-                        planId: 'starter',
-                        planName: 'Starter',
+                        planId: 'free',
+                        planName: 'Free',
                         entitlementState: 'active'
                     })
                 });
@@ -1450,14 +1474,14 @@ describe('TaskforceCore Integration', () => {
         });
         await waitFor(() => {
             expect(screen.getByText('Subscription')).toBeInTheDocument();
-            expect(screen.getByText('Starter')).toBeInTheDocument();
+            expect(screen.getByText('Free')).toBeInTheDocument();
             expect(screen.getByText('Runtime')).toBeInTheDocument();
             expect(screen.getByText('LOCAL')).toBeInTheDocument();
             expect(screen.getByText('Environment')).toBeInTheDocument();
             expect(screen.getByText('CLOUD.EXAMPLE.COM')).toBeInTheDocument();
             expect(screen.queryByText(/Current Plan:/i)).not.toBeInTheDocument();
         });
-        await user.click(screen.getByRole('button', { name: /Subscription Starter/i }));
+        await user.click(screen.getByRole('button', { name: /Subscription Free/i }));
         await waitFor(() => {
             expect(screen.getByRole('heading', { name: 'Subscription Plans' })).toBeInTheDocument();
         });
@@ -1512,8 +1536,8 @@ describe('TaskforceCore Integration', () => {
                 return Promise.resolve({
                     ok: true,
                     json: () => Promise.resolve({
-                        planId: 'starter',
-                        planName: 'Starter',
+                        planId: 'free',
+                        planName: 'Free',
                         entitlementState: 'active'
                     })
                 });
@@ -1563,7 +1587,7 @@ describe('TaskforceCore Integration', () => {
         }
         await waitFor(() => {
             expect(screen.getByText('Subscription')).toBeInTheDocument();
-            expect(screen.getByText('Starter')).toBeInTheDocument();
+            expect(screen.getByText('Free')).toBeInTheDocument();
             expect(screen.getByText('Runtime')).toBeInTheDocument();
             expect(screen.getByText('LOCAL')).toBeInTheDocument();
             expect(screen.getByText('Environment')).toBeInTheDocument();
@@ -1590,9 +1614,9 @@ describe('TaskforceCore Integration', () => {
                 userId: 'user-new',
                 displayName: 'New User',
                 workspaceId: 'workspace-local-active',
-                planId: 'starter',
-                planVersionId: 'starter-v1',
-                planName: 'Starter',
+                planId: 'free',
+                planVersionId: 'free-v1',
+                planName: 'Free',
                 teamManagementAllowed: false,
                 teamPlanMode: 'personal',
                 workspaceRole: 'member'
@@ -1690,11 +1714,11 @@ describe('TaskforceCore Integration', () => {
                 return jsonResponse({
                     plans: [
                         {
-                            planId: 'starter',
-                            displayName: 'Starter',
+                            planId: 'free',
+                            displayName: 'Free',
                             status: 'active',
                             defaultVersion: {
-                                planVersionId: 'starter-v1',
+                                planVersionId: 'free-v1',
                                 versionNumber: 1,
                                 seatLimit: null,
                                 metadata: {}
@@ -1786,11 +1810,12 @@ describe('TaskforceCore Integration', () => {
             if (url.includes('/api/taskforce/workspace/assignee-options')) {
                 return jsonResponse({ assignees: [] });
             }
-            if (url.includes('/api/taskforce/initiatives')) {
-                return jsonResponse([]);
-            }
-            if (url.includes('/api/taskforce/workstreams')) {
-                return jsonResponse([]);
+            if (url.includes('/api/taskforce/planning/bootstrap')) {
+                return jsonResponse({
+                    initiatives: [],
+                    workstreams: [],
+                    workstreamTaskSummaries: [],
+                });
             }
             return jsonResponse({});
         });
@@ -1817,7 +1842,8 @@ describe('TaskforceCore Integration', () => {
         await user.click(screen.getByRole('button', { name: 'Register' }));
         await user.type(await screen.findByPlaceholderText('Email'), accounts.newcomer.email);
         await user.type(screen.getByPlaceholderText('Display name'), accounts.newcomer.displayName);
-        await user.type(screen.getByPlaceholderText('Password'), 'Password123!');
+        await user.type(screen.getByPlaceholderText('Password'), 'GoodPassphrase123!');
+        await user.type(screen.getByPlaceholderText('Confirm password'), 'GoodPassphrase123!');
         await user.click(screen.getByRole('button', { name: 'Create Account' }));
         await waitFor(() => {
             expect(screen.getByTitle(/Account/i)).toBeInTheDocument();
@@ -1825,7 +1851,7 @@ describe('TaskforceCore Integration', () => {
         await user.click(screen.getByTitle(/Account/i));
         await waitFor(() => {
             expect(screen.getByText(accounts.newcomer.email)).toBeInTheDocument();
-            expect(screen.getByText('Starter')).toBeInTheDocument();
+            expect(screen.getByText('Free')).toBeInTheDocument();
         });
         await user.click(screen.getByRole('menuitem', { name: 'Sign Out' }));
         await waitFor(() => {
@@ -1846,7 +1872,7 @@ describe('TaskforceCore Integration', () => {
         await waitFor(() => {
             expect(screen.getByText(accounts.ross.email)).toBeInTheDocument();
             expect(screen.getByText('Team 5')).toBeInTheDocument();
-            expect(screen.queryByText('Starter')).not.toBeInTheDocument();
+            expect(screen.queryByText('Free')).not.toBeInTheDocument();
             expect(screen.getByRole('menuitem', { name: 'Team Management' })).toBeInTheDocument();
         });
         await user.click(screen.getByRole('button', { name: /Subscription Team 5/i }));
@@ -1899,6 +1925,7 @@ describe('TaskforceCore Integration', () => {
             expect(screen.getByText('Create your Taskforce account.')).toBeInTheDocument();
             expect(screen.getByLabelText('Email')).toBeInTheDocument();
             expect(screen.getByLabelText('Display name')).toBeInTheDocument();
+            expect(screen.getByLabelText('Confirm password')).toBeInTheDocument();
             expect(screen.getByPlaceholderText('Email')).toBeInTheDocument();
             expect(screen.getByPlaceholderText('Display name')).toBeInTheDocument();
             expect(screen.getByRole('button', { name: 'Create Account' })).toBeInTheDocument();
@@ -1910,6 +1937,56 @@ describe('TaskforceCore Integration', () => {
         });
         expect(container.querySelector('[aria-pressed]')).not.toBeInTheDocument();
     });
+    it('blocks registration when the confirmation does not match', async () => {
+        const user = userEvent.setup();
+        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=register&next=%2F'], children: _jsx(TaskforceCore, {}) }));
+        await user.type(await screen.findByPlaceholderText('Email'), 'mismatch@example.com');
+        await user.type(screen.getByPlaceholderText('Display name'), 'Mismatch User');
+        await user.type(screen.getByPlaceholderText('Password'), 'GoodPassphrase123!');
+        await user.type(screen.getByPlaceholderText('Confirm password'), 'DifferentPassphrase123!');
+        await user.click(screen.getByRole('button', { name: 'Create Account' }));
+        await waitFor(() => {
+            expect(screen.getByText('Passwords do not match.')).toBeInTheDocument();
+        });
+        expect(fetchMock.mock.calls.some((call) => String(call[0]).includes('/api/taskforce/auth/register'))).toBe(false);
+    });
     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')) {
@@ -2034,6 +2111,69 @@ describe('TaskforceCore Integration', () => {
         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('shows neutral verification copy when resend succeeds without attempting delivery', async () => {
+        const user = userEvent.setup();
+        const fetchMock = vi.fn((input) => {
+            const url = String(input);
+            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/auth/verify-email/request')) {
+                return Promise.resolve({
+                    ok: true,
+                    json: () => Promise.resolve({
+                        success: true,
+                        emailSent: false,
+                        deliveryAttempted: false,
+                        verificationToken: null
+                    })
+                });
+            }
+            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.getByText('If that account exists and still needs verification, we sent an email.')).toBeInTheDocument();
+        });
+    });
     it('does not switch to verify mode after registration when verification is not required', async () => {
         const user = userEvent.setup();
         let authenticated = false;
@@ -2138,7 +2278,8 @@ describe('TaskforceCore Integration', () => {
         render(_jsx(MemoryRouter, { initialEntries: ['/login?mode=register&next=%2Fplans'], children: _jsx(TaskforceCore, {}) }));
         await user.type(await screen.findByPlaceholderText('Email'), 'local@example.com');
         await user.type(screen.getByPlaceholderText('Display name'), 'Local User');
-        await user.type(screen.getByPlaceholderText('Password'), 'Password123!');
+        await user.type(screen.getByPlaceholderText('Password'), 'GoodPassphrase123!');
+        await user.type(screen.getByPlaceholderText('Confirm password'), 'GoodPassphrase123!');
         await user.click(screen.getByRole('button', { name: 'Create Account' }));
         await waitFor(() => {
             expect(screen.getByText('Configure your new workspace.')).toBeInTheDocument();
@@ -2228,11 +2369,11 @@ describe('TaskforceCore Integration', () => {
             if (url.includes('/api/taskforce/public/pricing')) {
                 return jsonResponse({
                     plans: [{
-                            planId: 'starter',
-                            displayName: 'Starter',
+                            planId: 'free',
+                            displayName: 'Free',
                             status: 'active',
                             defaultVersion: {
-                                planVersionId: 'starter-v1',
+                                planVersionId: 'free-v1',
                                 versionNumber: 1,
                                 seatLimit: null,
                                 metadata: {}
@@ -2240,10 +2381,10 @@ describe('TaskforceCore Integration', () => {
                             features: [],
                             pricing: {
                                 month: {
-                                    planVersionId: 'starter-v1',
+                                    planVersionId: 'free-v1',
                                     interval: 'month',
                                     pricingType: 'free',
-                                    stripePriceId: 'free:starter-v1:month',
+                                    stripePriceId: 'free:free-v1:month',
                                     displayAmount: '$0.00',
                                     unitAmount: 0,
                                     currency: 'usd'
@@ -2296,11 +2437,11 @@ describe('TaskforceCore Integration', () => {
         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.type(screen.getByPlaceholderText('Password'), 'GoodPassphrase123!');
+        await user.type(screen.getByPlaceholderText('Confirm password'), 'GoodPassphrase123!');
         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);
     });
@@ -2412,11 +2553,148 @@ describe('TaskforceCore Integration', () => {
         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.type(screen.getByPlaceholderText('Password'), 'GoodPassphrase123!');
+        await user.type(screen.getByPlaceholderText('Confirm password'), 'GoodPassphrase123!');
         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('keeps registration on plan selection while the post-auth cloud session is still resolving for a commercially gated user with no workspace', 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-gated-pending' : 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: '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'), 'gated-pending@example.com');
+        await user.type(screen.getByPlaceholderText('Display name'), 'Gated Pending');
+        await user.type(screen.getByPlaceholderText('Password'), 'GoodPassphrase123!');
+        await user.type(screen.getByPlaceholderText('Confirm password'), 'GoodPassphrase123!');
+        await user.click(screen.getByRole('button', { name: 'Create Account' }));
+        await act(async () => {
+            await Promise.resolve();
+        });
+        await waitFor(() => {
+            expect(screen.getByRole('heading', { name: 'Subscription Plans' })).toBeInTheDocument();
+        });
+        expect(screen.queryByText('Configure your new workspace.')).not.toBeInTheDocument();
+        await act(async () => {
+            releaseInitialSession?.();
+            await Promise.resolve();
+        });
+        await waitFor(() => {
+            expect(screen.getByRole('heading', { name: 'Subscription Plans' })).toBeInTheDocument();
         });
         expect(screen.queryByText('Configure your new workspace.')).not.toBeInTheDocument();
     });
@@ -2493,9 +2771,9 @@ describe('TaskforceCore Integration', () => {
             }
             if (url.includes('/api/taskforce/account/profile-summary')) {
                 return jsonResponse({
-                    planId: 'pro',
-                    planName: 'Pro',
-                    planVersionId: 'pro-v1',
+                    planId: 'basic',
+                    planName: 'Basic',
+                    planVersionId: 'basic-v1',
                     entitlementState: 'checkout_pending',
                     gate: 'checkout_pending',
                     message: 'Complete checkout to continue.',
@@ -2505,11 +2783,11 @@ describe('TaskforceCore Integration', () => {
             if (url.includes('/api/taskforce/public/pricing')) {
                 return jsonResponse({
                     plans: [{
-                            planId: 'pro',
-                            displayName: 'Pro',
+                            planId: 'basic',
+                            displayName: 'Basic',
                             status: 'active',
                             defaultVersion: {
-                                planVersionId: 'pro-v1',
+                                planVersionId: 'basic-v1',
                                 versionNumber: 1,
                                 seatLimit: null,
                                 metadata: {}
@@ -2517,19 +2795,19 @@ describe('TaskforceCore Integration', () => {
                             features: [],
                             pricing: {
                                 month: {
-                                    planVersionId: 'pro-v1',
+                                    planVersionId: 'basic-v1',
                                     interval: 'month',
                                     pricingType: 'stripe',
-                                    stripePriceId: 'price_pro_month',
+                                    stripePriceId: 'price_basic_month',
                                     displayAmount: '$19.00',
                                     unitAmount: 1900,
                                     currency: 'usd'
                                 },
                                 year: {
-                                    planVersionId: 'pro-v1',
+                                    planVersionId: 'basic-v1',
                                     interval: 'year',
                                     pricingType: 'stripe',
-                                    stripePriceId: 'price_pro_year',
+                                    stripePriceId: 'price_basic_year',
                                     displayAmount: '$190.00',
                                     unitAmount: 19000,
                                     currency: 'usd'
@@ -2584,10 +2862,11 @@ describe('TaskforceCore Integration', () => {
             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, {}) }));
+        render(_jsx(MemoryRouter, { initialEntries: ['/login?mode=register&planId=basic&planVersionId=basic-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.type(screen.getByPlaceholderText('Password'), 'GoodPassphrase123!');
+        await user.type(screen.getByPlaceholderText('Confirm password'), 'GoodPassphrase123!');
         await user.click(screen.getByRole('button', { name: 'Create Account' }));
         await waitFor(() => {
             expect(screen.getByRole('heading', { name: 'Subscription Plans' })).toBeInTheDocument();
@@ -2720,7 +2999,8 @@ describe('TaskforceCore Integration', () => {
         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.type(screen.getByPlaceholderText('Password'), 'GoodPassphrase123!');
+        await user.type(screen.getByPlaceholderText('Confirm password'), 'GoodPassphrase123!');
         await user.click(screen.getByRole('button', { name: 'Create Account' }));
         await act(async () => {
             await Promise.resolve();
@@ -2846,7 +3126,8 @@ describe('TaskforceCore Integration', () => {
         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.type(screen.getByPlaceholderText('Password'), 'GoodPassphrase123!');
+        await user.type(screen.getByPlaceholderText('Confirm password'), 'GoodPassphrase123!');
         await user.click(screen.getByRole('button', { name: 'Create Account' }));
         await act(async () => {
             await Promise.resolve();
@@ -2916,7 +3197,8 @@ describe('TaskforceCore Integration', () => {
         render(_jsx(MemoryRouter, { initialEntries: ['/login?mode=register&next=%2Fplans'], children: _jsx(TaskforceCore, {}) }));
         await user.type(await screen.findByPlaceholderText('Email'), 'local@example.com');
         await user.type(screen.getByPlaceholderText('Display name'), 'Local User');
-        await user.type(screen.getByPlaceholderText('Password'), 'Password123!');
+        await user.type(screen.getByPlaceholderText('Password'), 'GoodPassphrase123!');
+        await user.type(screen.getByPlaceholderText('Confirm password'), 'GoodPassphrase123!');
         await user.click(screen.getByRole('button', { name: 'Create Account' }));
         await waitFor(() => {
             expect(screen.getByPlaceholderText('Verification token')).toBeInTheDocument();
@@ -2924,6 +3206,156 @@ describe('TaskforceCore Integration', () => {
         expect(screen.queryByRole('button', { name: 'Create Account' })).not.toBeInTheDocument();
         expect(screen.queryByText('Subscription Plans')).not.toBeInTheDocument();
     });
+    it('keeps verified registration on plan selection when commercial onboarding is still blocked', 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-verify' : null,
+                    workspaceId: authenticated ? 'default' : null,
+                    betaAccess: true
+                });
+            }
+            if (url.includes('/api/taskforce/config')) {
+                return jsonResponse({
+                    ...mockConfig,
+                    runtimeMode: 'cloud',
+                    authRequiredForApi: true,
+                    workspaceSwitchingEnabled: true,
+                    setupState: {
+                        globalSetupState: 'present',
+                        workspaceSetupState: authenticated ? 'missing' : 'present',
+                        runtimeMode: 'cloud',
+                        workspaceId: 'default',
+                        mode: 'core',
+                        forceSetup: false,
+                        forceGlobalSetup: false,
+                        forceWorkspaceSetup: false
+                    }
+                });
+            }
+            if (url.includes('/api/taskforce/workspaces')) {
+                return jsonResponse({
+                    success: true,
+                    workspaces: [],
+                    currentWorkspaceId: null
+                });
+            }
+            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: [{
+                            planId: 'free',
+                            displayName: 'Free',
+                            status: 'active',
+                            defaultVersion: {
+                                planVersionId: 'free-v1',
+                                versionNumber: 1,
+                                seatLimit: null,
+                                metadata: {}
+                            },
+                            features: [],
+                            pricing: {
+                                month: {
+                                    planVersionId: 'free-v1',
+                                    interval: 'month',
+                                    pricingType: 'free',
+                                    stripePriceId: 'free:free-v1:month',
+                                    displayAmount: '$0.00',
+                                    unitAmount: 0,
+                                    currency: 'usd'
+                                },
+                                year: null
+                            }
+                        }]
+                });
+            }
+            if (url.includes('/api/taskforce/auth/register')) {
+                return jsonResponse({
+                    success: true,
+                    workspaceSetupRequired: true,
+                    verificationRequired: true,
+                    verificationToken: 'verify-token',
+                    emailSent: true,
+                    planSelectionRequired: true,
+                    commercialState: 'pending_plan_selection'
+                });
+            }
+            if (url.includes('/api/taskforce/auth/verify-email/confirm')) {
+                authenticated = true;
+                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: ['/login?mode=register&next=%2F'], children: _jsx(TaskforceCore, {}) }));
+        await user.type(await screen.findByPlaceholderText('Email'), 'verify-gated@example.com');
+        await user.type(screen.getByPlaceholderText('Display name'), 'Verify Gated User');
+        await user.type(screen.getByPlaceholderText('Password'), 'GoodPassphrase123!');
+        await user.type(screen.getByPlaceholderText('Confirm password'), 'GoodPassphrase123!');
+        await user.click(screen.getByRole('button', { name: 'Create Account' }));
+        await waitFor(() => {
+            expect(screen.getByPlaceholderText('Verification token')).toHaveValue('verify-token');
+        });
+        await user.click(screen.getByRole('button', { name: 'Verify Email' }));
+        await waitFor(() => {
+            expect(screen.getByRole('heading', { name: 'Subscription Plans' })).toBeInTheDocument();
+        });
+        expect(screen.queryByText('Configure your new workspace.')).not.toBeInTheDocument();
+    });
     it('allows returning to sign-in/register from forgot mode in local runtime', async () => {
         const user = userEvent.setup();
         const fetchMock = vi.fn((url) => {
@@ -2977,6 +3409,162 @@ describe('TaskforceCore Integration', () => {
             expect(screen.getByRole('button', { name: 'Register' })).toBeInTheDocument();
         });
     });
+    it('shows neutral password reset copy when reset delivery was not attempted', async () => {
+        const user = userEvent.setup();
+        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({
+                        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 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/auth/password-reset/request')) {
+                return Promise.resolve({
+                    ok: true,
+                    json: () => Promise.resolve({
+                        success: true,
+                        emailSent: false,
+                        deliveryAttempted: false,
+                        resetToken: null
+                    })
+                });
+            }
+            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=forgot&next=%2F'], children: _jsx(TaskforceCore, {}) }));
+        await user.type(await screen.findByPlaceholderText('Email'), 'nobody@example.com');
+        await user.click(screen.getByRole('button', { name: 'Send Reset Link' }));
+        await waitFor(() => {
+            expect(screen.getByText('If that account exists, we sent password reset instructions.')).toBeInTheDocument();
+        });
+    });
+    it('keeps forgot-password users on the request form when reset delivery fails', async () => {
+        const user = userEvent.setup();
+        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({
+                        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 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/auth/password-reset/request')) {
+                return Promise.resolve({
+                    ok: true,
+                    json: () => Promise.resolve({
+                        success: true,
+                        emailSent: false,
+                        deliveryAttempted: true,
+                        emailError: 'SMTP temporary failure',
+                        resetToken: null
+                    })
+                });
+            }
+            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=forgot&next=%2F'], children: _jsx(TaskforceCore, {}) }));
+        await user.type(await screen.findByPlaceholderText('Email'), 'owner@example.com');
+        await user.click(screen.getByRole('button', { name: 'Send Reset Link' }));
+        await waitFor(() => {
+            expect(screen.getByText('Password reset email failed to send. SMTP temporary failure')).toBeInTheDocument();
+        });
+        expect(screen.getByText('Request a password reset link.')).toBeInTheDocument();
+        expect(screen.queryByText('Enter the password reset token and choose a new password.')).not.toBeInTheDocument();
+        expect(screen.getByRole('button', { name: 'Send Reset Link' })).toBeInTheDocument();
+    });
     it('redirects register users to plans when signup plan configuration blocks account creation', async () => {
         const user = userEvent.setup();
         const fetchMock = vi.fn((input) => {
@@ -3069,7 +3657,8 @@ describe('TaskforceCore Integration', () => {
         render(_jsx(MemoryRouter, { initialEntries: ['/login?mode=register&next=%2F'], children: _jsx(TaskforceCore, {}) }));
         await user.type(await screen.findByPlaceholderText('Email'), 'local@example.com');
         await user.type(screen.getByPlaceholderText('Display name'), 'Local User');
-        await user.type(screen.getByPlaceholderText('Password'), 'Password123!');
+        await user.type(screen.getByPlaceholderText('Password'), 'GoodPassphrase123!');
+        await user.type(screen.getByPlaceholderText('Confirm password'), 'GoodPassphrase123!');
         await user.click(screen.getByRole('button', { name: 'Create Account' }));
         await waitFor(() => {
             expect(screen.getByText('Choose a plan to continue.')).toBeInTheDocument();
@@ -3088,39 +3677,295 @@ describe('TaskforceCore Integration', () => {
                     })
                 });
             }
-            if (url.includes('/api/taskforce/config')) {
+            if (url.includes('/api/taskforce/config')) {
+                return Promise.resolve({
+                    ok: true,
+                    json: () => Promise.resolve({
+                        ...mockConfig,
+                        runtimeMode: 'cloud',
+                        authRequiredForApi: true,
+                        setupState: {
+                            globalSetupState: 'present',
+                            workspaceSetupState: 'present',
+                            runtimeMode: 'cloud',
+                            workspaceId: 'workspace-1',
+                            mode: 'core',
+                            forceSetup: false,
+                            forceGlobalSetup: false,
+                            forceWorkspaceSetup: false
+                        }
+                    })
+                });
+            }
+            if (url.includes('/api/taskforce/auth/invite/inspect')) {
+                return Promise.resolve({
+                    ok: true,
+                    json: () => Promise.resolve({
+                        success: true,
+                        state: 'valid',
+                        email: 'existing@example.com',
+                        workspaceId: 'workspace-1',
+                        inviteeKind: 'existing_user',
+                        passwordRequired: 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=invite&token=invite-token&next=%2F'], children: _jsx(TaskforceCore, {}) }));
+        await waitFor(() => {
+            expect(screen.getByText('Sign in to join this workspace.')).toBeInTheDocument();
+            expect(screen.getByDisplayValue('existing@example.com')).toBeInTheDocument();
+            expect(screen.getByPlaceholderText('Password')).toBeInTheDocument();
+            expect(screen.getByRole('button', { name: 'Sign In to Continue' })).toBeInTheDocument();
+        });
+    });
+    it('uses invite join after invite-mode sign-in even if invite reinspection has not refreshed yet', async () => {
+        let authenticated = false;
+        let inviteInspectCalls = 0;
+        const fetchMock = vi.fn((url) => {
+            if (url.includes('/api/taskforce/auth/session')) {
+                return Promise.resolve({
+                    ok: true,
+                    json: () => Promise.resolve({
+                        authenticated,
+                        runtimeMode: 'cloud',
+                        authRequiredForApi: true,
+                        userId: authenticated ? 'user-existing' : 'anonymous',
+                        workspaceId: authenticated ? 'workspace-home' : 'default',
+                        email: authenticated ? 'existing@example.com' : null
+                    })
+                });
+            }
+            if (url.includes('/api/taskforce/config')) {
+                return Promise.resolve({
+                    ok: true,
+                    json: () => Promise.resolve({
+                        ...mockConfig,
+                        runtimeMode: 'cloud',
+                        authRequiredForApi: true,
+                        setupState: {
+                            globalSetupState: 'present',
+                            workspaceSetupState: 'present',
+                            runtimeMode: 'cloud',
+                            workspaceId: authenticated ? 'workspace-home' : 'default',
+                            mode: 'core',
+                            forceSetup: false,
+                            forceGlobalSetup: false,
+                            forceWorkspaceSetup: false
+                        }
+                    })
+                });
+            }
+            if (url.includes('/api/taskforce/auth/invite/inspect')) {
+                inviteInspectCalls += 1;
+                if (authenticated && inviteInspectCalls > 1) {
+                    return new Promise(() => undefined);
+                }
+                return Promise.resolve({
+                    ok: true,
+                    json: () => Promise.resolve({
+                        success: true,
+                        state: 'valid',
+                        email: 'existing@example.com',
+                        workspaceId: 'workspace-1',
+                        inviteeKind: 'existing_user',
+                        passwordRequired: false
+                    })
+                });
+            }
+            if (url.includes('/api/taskforce/auth/login')) {
+                authenticated = true;
+                return Promise.resolve({
+                    ok: true,
+                    json: () => Promise.resolve({ success: true })
+                });
+            }
+            if (url.includes('/api/taskforce/auth/invite/join')) {
+                return Promise.resolve({
+                    ok: true,
+                    json: () => Promise.resolve({ success: true, workspaceId: 'workspace-1' })
+                });
+            }
+            if (url.includes('/api/taskforce/workspaces')) {
+                return Promise.resolve({
+                    ok: true,
+                    json: () => Promise.resolve({
+                        currentWorkspaceId: authenticated ? 'workspace-home' : null,
+                        workspaces: authenticated
+                            ? [{ id: 'workspace-home', name: 'Home workspace', role: 'owner' }]
+                            : []
+                    })
+                });
+            }
+            if (url.includes('/api/taskforce/tasks')) {
+                return Promise.resolve({ ok: true, json: () => Promise.resolve({ tasks: [], config: {} }) });
+            }
+            if (url.includes('/api/taskforce/account/access-status')) {
+                return Promise.resolve({
+                    ok: true,
+                    json: () => Promise.resolve({
+                        success: true,
+                        authenticated,
+                        commercialState: 'active',
+                        planSelectionRequired: false,
+                        checkoutPending: false
+                    })
+                });
+            }
+            if (url.includes('/api/taskforce/account/profile-summary')) {
+                return Promise.resolve({
+                    ok: true,
+                    json: () => Promise.resolve({
+                        success: true,
+                        currentWorkspaceId: authenticated ? 'workspace-home' : null,
+                        workspaces: authenticated ? [{ id: 'workspace-home', name: 'Home workspace' }] : []
+                    })
+                });
+            }
+            if (url.includes('/api/taskforce/session/workspace')) {
+                return Promise.resolve({ ok: true, json: () => Promise.resolve({ success: true, workspaceId: 'workspace-1' }) });
+            }
+            if (url.includes('/api/taskforce/ui-state?key=workspace-sync')) {
+                return Promise.resolve({ ok: true, json: () => Promise.resolve({ success: true, state: null }) });
+            }
+            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=invite&token=invite-token&next=%2F'], children: _jsx(TaskforceCore, {}) }));
+        await waitFor(() => {
+            expect(screen.getByRole('button', { name: 'Sign In to Continue' })).toBeInTheDocument();
+        });
+        await userEvent.type(screen.getByPlaceholderText('Password'), 'ExistingUserPass123!');
+        await userEvent.click(screen.getByTestId('auth-submit-button'));
+        await waitFor(() => {
+            expect(screen.getByText('Signed in. Review the invite details to continue.')).toBeInTheDocument();
+            expect(screen.getByRole('button', { name: 'Join Workspace' })).toBeInTheDocument();
+        });
+        await userEvent.click(screen.getByTestId('auth-submit-button'));
+        await waitFor(() => {
+            expect(fetchMock.mock.calls.some((call) => String(call[0]).includes('/api/taskforce/auth/invite/join'))).toBe(true);
+        });
+        expect(fetchMock.mock.calls.filter((call) => String(call[0]).includes('/api/taskforce/auth/login'))).toHaveLength(1);
+    });
+    it('keeps existing-user invites recoverable when the wrong account signs in first', async () => {
+        let authenticated = false;
+        let sessionEmail = null;
+        const fetchMock = vi.fn((url, init) => {
+            if (url.includes('/api/taskforce/auth/session')) {
+                return Promise.resolve({
+                    ok: true,
+                    json: () => Promise.resolve({
+                        authenticated,
+                        runtimeMode: 'cloud',
+                        authRequiredForApi: true,
+                        userId: authenticated ? 'user-other' : 'anonymous',
+                        workspaceId: authenticated ? 'workspace-home' : 'default',
+                        email: sessionEmail
+                    })
+                });
+            }
+            if (url.includes('/api/taskforce/config')) {
+                return Promise.resolve({
+                    ok: true,
+                    json: () => Promise.resolve({
+                        ...mockConfig,
+                        runtimeMode: 'cloud',
+                        authRequiredForApi: true,
+                        setupState: {
+                            globalSetupState: 'present',
+                            workspaceSetupState: 'present',
+                            runtimeMode: 'cloud',
+                            workspaceId: authenticated ? 'workspace-home' : 'default',
+                            mode: 'core',
+                            forceSetup: false,
+                            forceGlobalSetup: false,
+                            forceWorkspaceSetup: false
+                        }
+                    })
+                });
+            }
+            if (url.includes('/api/taskforce/auth/invite/inspect')) {
+                return Promise.resolve({
+                    ok: true,
+                    json: () => Promise.resolve({
+                        success: true,
+                        state: 'valid',
+                        email: 'existing@example.com',
+                        workspaceId: 'workspace-1',
+                        inviteeKind: 'existing_user',
+                        passwordRequired: false
+                    })
+                });
+            }
+            if (url.includes('/api/taskforce/auth/login')) {
+                const body = typeof init?.body === 'string' ? JSON.parse(init.body) : {};
+                authenticated = true;
+                sessionEmail = String(body?.email || '').trim().toLowerCase() || null;
+                return Promise.resolve({
+                    ok: true,
+                    json: () => Promise.resolve({ success: true })
+                });
+            }
+            if (url.includes('/api/taskforce/auth/invite/join')) {
+                return Promise.resolve({
+                    ok: false,
+                    json: () => Promise.resolve({
+                        success: false,
+                        code: 'INVITE_ACCOUNT_MISMATCH',
+                        error: 'Sign in with the invited account to join this workspace.'
+                    })
+                });
+            }
+            if (url.includes('/api/taskforce/workspaces')) {
+                return Promise.resolve({
+                    ok: true,
+                    json: () => Promise.resolve({
+                        currentWorkspaceId: authenticated ? 'workspace-home' : null,
+                        workspaces: authenticated
+                            ? [{ id: 'workspace-home', name: 'Home workspace', role: 'owner' }]
+                            : []
+                    })
+                });
+            }
+            if (url.includes('/api/taskforce/tasks')) {
+                return Promise.resolve({ ok: true, json: () => Promise.resolve({ tasks: [], config: {} }) });
+            }
+            if (url.includes('/api/taskforce/account/access-status')) {
                 return Promise.resolve({
                     ok: true,
                     json: () => Promise.resolve({
-                        ...mockConfig,
-                        runtimeMode: 'cloud',
-                        authRequiredForApi: true,
-                        setupState: {
-                            globalSetupState: 'present',
-                            workspaceSetupState: 'present',
-                            runtimeMode: 'cloud',
-                            workspaceId: 'workspace-1',
-                            mode: 'core',
-                            forceSetup: false,
-                            forceGlobalSetup: false,
-                            forceWorkspaceSetup: false
-                        }
+                        success: true,
+                        authenticated,
+                        commercialState: 'active',
+                        planSelectionRequired: false,
+                        checkoutPending: false
                     })
                 });
             }
-            if (url.includes('/api/taskforce/auth/invite/inspect')) {
+            if (url.includes('/api/taskforce/account/profile-summary')) {
                 return Promise.resolve({
                     ok: true,
                     json: () => Promise.resolve({
                         success: true,
-                        state: 'valid',
-                        email: 'existing@example.com',
-                        workspaceId: 'workspace-1',
-                        inviteeKind: 'existing_user',
-                        passwordRequired: false
+                        currentWorkspaceId: authenticated ? 'workspace-home' : null,
+                        workspaces: authenticated ? [{ id: 'workspace-home', name: 'Home workspace' }] : []
                     })
                 });
             }
+            if (url.includes('/api/taskforce/session/workspace')) {
+                return Promise.resolve({ ok: true, json: () => Promise.resolve({ success: true, workspaceId: 'workspace-home' }) });
+            }
+            if (url.includes('/api/taskforce/ui-state?key=workspace-sync')) {
+                return Promise.resolve({ ok: true, json: () => Promise.resolve({ success: true, state: null }) });
+            }
             if (url.includes('/api/taskforce/workflow-templates')) {
                 return Promise.resolve({ ok: true, json: () => Promise.resolve({ templates: [] }) });
             }
@@ -3129,11 +3974,20 @@ describe('TaskforceCore Integration', () => {
         vi.stubGlobal('fetch', fetchMock);
         render(_jsx(MemoryRouter, { initialEntries: ['/login?mode=invite&token=invite-token&next=%2F'], children: _jsx(TaskforceCore, {}) }));
         await waitFor(() => {
-            expect(screen.getByText('Sign in to join this workspace.')).toBeInTheDocument();
+            expect(screen.getByRole('button', { name: 'Sign In to Continue' })).toBeInTheDocument();
+        });
+        await userEvent.clear(screen.getByPlaceholderText('Email'));
+        await userEvent.type(screen.getByPlaceholderText('Email'), 'other@example.com');
+        await userEvent.type(screen.getByPlaceholderText('Password'), 'OtherUserPass123!');
+        await userEvent.click(screen.getByTestId('auth-submit-button'));
+        await waitFor(() => {
+            expect(screen.getByText('Sign in with the invited account to join this workspace.')).toBeInTheDocument();
             expect(screen.getByDisplayValue('existing@example.com')).toBeInTheDocument();
             expect(screen.getByPlaceholderText('Password')).toBeInTheDocument();
-            expect(screen.getByRole('button', { name: 'Sign In to Continue' })).toBeInTheDocument();
+            expect(screen.queryByRole('button', { name: 'Join Workspace' })).not.toBeInTheDocument();
         });
+        expect(fetchMock.mock.calls.filter((call) => String(call[0]).includes('/api/taskforce/auth/login'))).toHaveLength(1);
+        expect(fetchMock.mock.calls.some((call) => String(call[0]).includes('/api/taskforce/auth/invite/join'))).toBe(false);
     });
     it('shows password creation for new-user invites', async () => {
         const fetchMock = vi.fn((url) => {
@@ -3190,6 +4044,7 @@ describe('TaskforceCore Integration', () => {
         await waitFor(() => {
             expect(screen.getByText('Create your account to join this workspace.')).toBeInTheDocument();
             expect(screen.getByPlaceholderText('Create password')).toBeInTheDocument();
+            expect(screen.getByPlaceholderText('Confirm password')).toBeInTheDocument();
             expect(screen.getByRole('button', { name: 'Create Account and Join' })).toBeInTheDocument();
         });
     });
@@ -3887,9 +4742,229 @@ describe('TaskforceCore Integration', () => {
         expect(workspaceSyncStateBody.stateKey).toBe('workspace-sync');
         expect(workspaceSyncStateBody.patch?.enabled).toBe(true);
         expect(workspaceSyncStateBody.patch?.phase).toBe('attach-cloud');
+        expect(workspaceSyncStateBody.patch?.setupIntent).toBe('attach-cloud-import');
         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('keeps attach-cloud import blocking after refresh when setup intent is persisted', async () => {
+        const fetchMock = vi.fn((url) => {
+            if (url.includes('/api/taskforce/auth/runtime-config')) {
+                return Promise.resolve({ ok: true, json: () => Promise.resolve({ config: { runtimeMode: 'local', workspaceMode: 'single-local', authSource: 'cloud' } }) });
+            }
+            if (url.includes('/api/taskforce/auth/session')) {
+                return Promise.resolve({
+                    ok: true,
+                    json: () => Promise.resolve({
+                        authenticated: true,
+                        runtimeMode: 'local',
+                        authRequiredForApi: false
+                    })
+                });
+            }
+            if (url.includes('/api/taskforce/config')) {
+                return Promise.resolve({
+                    ok: true,
+                    json: () => Promise.resolve({
+                        ...mockConfig,
+                        runtimeMode: 'local',
+                        authRequiredForApi: false,
+                        workspaceId: 'workspace-cloud-123',
+                        setupState: {
+                            globalSetupState: 'present',
+                            workspaceSetupState: 'missing',
+                            runtimeMode: 'local',
+                            workspaceId: 'workspace-cloud-123',
+                            mode: 'core',
+                            forceSetup: false,
+                            forceGlobalSetup: false,
+                            forceWorkspaceSetup: true,
+                            workspace: null,
+                            suggestedWorkspaceName: 'Cloud Project 123'
+                        },
+                        runtimeCapabilities: {
+                            runtimeMode: 'local',
+                            supportsCloudAuth: true,
+                            supportsAdminManagedSetupOverrides: false,
+                            supportsPackageScriptSetupOverrides: true
+                        }
+                    })
+                });
+            }
+            if (url.includes('/api/taskforce/ui-state?key=workspace-sync')) {
+                return Promise.resolve({
+                    ok: true,
+                    json: () => Promise.resolve({
+                        success: true,
+                        state: {
+                            version: 2,
+                            enabled: true,
+                            phase: 'attach-cloud',
+                            setupIntent: 'attach-cloud-import',
+                            pullCursor: null,
+                            lastPullAt: null,
+                            lastPushAt: null,
+                            lastSyncedAt: null
+                        }
+                    })
+                });
+            }
+            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'
+                            }
+                        ]
+                    })
+                });
+            }
+            if (url.includes('/api/taskforce/ui-state?key=app')) {
+                return Promise.resolve({ ok: true, json: () => Promise.resolve({ success: true, state: {} }) });
+            }
+            if (url.includes('/api/taskforce/tasks')) {
+                return Promise.resolve({ ok: true, json: () => Promise.resolve({ tasks: mockTasks }) });
+            }
+            if (url.includes('/api/taskforce/archive')) {
+                return Promise.resolve({ ok: true, json: () => Promise.resolve({ archived: [] }) });
+            }
+            if (url.includes('/api/taskforce/categories')) {
+                return Promise.resolve({ ok: true, json: () => Promise.resolve(mockCategories) });
+            }
+            if (url.includes('/api/taskforce/global-settings')) {
+                return Promise.resolve({ ok: true, json: () => Promise.resolve({}) });
+            }
+            if (url.includes('/api/taskforce/data-version')) {
+                return Promise.resolve({ ok: true, json: () => Promise.resolve({ dataVersion: 1 }) });
+            }
+            if (url.includes('/api/taskforce/types'))
+                return Promise.resolve({ ok: true, json: () => Promise.resolve({ types: [] }) });
+            if (url.includes('/api/taskforce/priorities'))
+                return Promise.resolve({ ok: true, json: () => Promise.resolve({ priorities: [] }) });
+            if (url.includes('/api/taskforce/approaches'))
+                return Promise.resolve({ ok: true, json: () => Promise.resolve({ approaches: [] }) });
+            if (url.includes('/api/taskforce/specialists'))
+                return Promise.resolve({ ok: true, json: () => Promise.resolve({ specialists: [] }) });
+            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: ['/'], children: _jsx(TaskforceCore, { config: { cloudAuthBaseUrl: 'https://cloud.example.com' } }) }));
+        await waitFor(() => {
+            expect(screen.getByText('Configure your new workspace.')).toBeInTheDocument();
+        });
+        await waitFor(() => {
+            expect(screen.getByText('Importing "Cloud Project 123" from cloud into local.')).toBeInTheDocument();
+        });
+    });
+    it('clears persisted attach-cloud import intent after the first successful import', async () => {
+        const uiStatePosts = [];
+        const fetchMock = vi.fn((url, init) => {
+            if (url.includes('/api/taskforce/auth/runtime-config')) {
+                return Promise.resolve({ ok: true, json: () => Promise.resolve({ config: { runtimeMode: 'local', workspaceMode: 'single-local', authSource: 'cloud' } }) });
+            }
+            if (url.includes('/api/taskforce/auth/session')) {
+                return Promise.resolve({
+                    ok: true,
+                    json: () => Promise.resolve({
+                        authenticated: true,
+                        runtimeMode: 'local',
+                        authRequiredForApi: false
+                    })
+                });
+            }
+            if (url.includes('/api/taskforce/config')) {
+                return Promise.resolve({
+                    ok: true,
+                    json: () => Promise.resolve({
+                        ...mockConfig,
+                        runtimeMode: 'local',
+                        authRequiredForApi: false,
+                        workspaceId: 'workspace-cloud-123'
+                    })
+                });
+            }
+            if (url.includes('/api/taskforce/ui-state?key=workspace-sync')) {
+                return Promise.resolve({
+                    ok: true,
+                    json: () => Promise.resolve({
+                        success: true,
+                        state: {
+                            version: 2,
+                            enabled: true,
+                            phase: 'active',
+                            setupIntent: 'attach-cloud-import',
+                            pullCursor: 'cursor-1',
+                            lastPullAt: '2026-04-15T12:00:00.000Z',
+                            lastPushAt: null,
+                            lastSyncedAt: '2026-04-15T12:00:00.000Z'
+                        }
+                    })
+                });
+            }
+            if (url.includes('/api/taskforce/ui-state') && String(init?.method || '').toUpperCase() === 'POST') {
+                uiStatePosts.push(JSON.parse(String(init?.body || '{}')));
+                return Promise.resolve({ ok: true, json: () => Promise.resolve({ success: 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'
+                            }
+                        ]
+                    })
+                });
+            }
+            if (url.includes('/api/taskforce/ui-state?key=app')) {
+                return Promise.resolve({ ok: true, json: () => Promise.resolve({ success: true, state: {} }) });
+            }
+            if (url.includes('/api/taskforce/tasks')) {
+                return Promise.resolve({ ok: true, json: () => Promise.resolve({ tasks: mockTasks }) });
+            }
+            if (url.includes('/api/taskforce/archive')) {
+                return Promise.resolve({ ok: true, json: () => Promise.resolve({ archived: [] }) });
+            }
+            if (url.includes('/api/taskforce/categories')) {
+                return Promise.resolve({ ok: true, json: () => Promise.resolve(mockCategories) });
+            }
+            if (url.includes('/api/taskforce/global-settings')) {
+                return Promise.resolve({ ok: true, json: () => Promise.resolve({}) });
+            }
+            if (url.includes('/api/taskforce/data-version')) {
+                return Promise.resolve({ ok: true, json: () => Promise.resolve({ dataVersion: 1 }) });
+            }
+            if (url.includes('/api/taskforce/types'))
+                return Promise.resolve({ ok: true, json: () => Promise.resolve({ types: [] }) });
+            if (url.includes('/api/taskforce/priorities'))
+                return Promise.resolve({ ok: true, json: () => Promise.resolve({ priorities: [] }) });
+            if (url.includes('/api/taskforce/approaches'))
+                return Promise.resolve({ ok: true, json: () => Promise.resolve({ approaches: [] }) });
+            if (url.includes('/api/taskforce/specialists'))
+                return Promise.resolve({ ok: true, json: () => Promise.resolve({ specialists: [] }) });
+            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: ['/setup?step=workspace&source=cloud'], children: _jsx(TaskforceCore, { config: { cloudAuthBaseUrl: 'https://cloud.example.com' } }) }));
+        await waitFor(() => {
+            expect(screen.getByText('Test Project')).toBeInTheDocument();
+        });
+        await waitFor(() => {
+            expect(uiStatePosts.some((entry) => entry?.stateKey === 'workspace-sync' && entry?.patch?.setupIntent === null)).toBe(true);
+        });
+    });
     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')) {
@@ -4214,10 +5289,11 @@ describe('TaskforceCore Integration', () => {
             expect(screen.getByRole('checkbox', { name: /sync to cloud after setup/i })).toBeInTheDocument();
         });
         await user.click(screen.getByRole('checkbox', { name: /sync to cloud after setup/i }));
-        const nameInput = screen.getByPlaceholderText('Project name');
+        const nameInput = screen.getByPlaceholderText('Workspace name');
         await user.clear(nameInput);
         await user.type(nameInput, 'Local Project');
-        await user.click(screen.getByRole('button', { name: 'Save Project Setup' }));
+        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();
         });
@@ -4231,10 +5307,11 @@ describe('TaskforceCore Integration', () => {
             return body?.stateKey === 'workspace-sync';
         });
         const workspaceSyncStateBody = JSON.parse(String(workspaceSyncStateCall?.[1]?.body || '{}'));
-        expect(workspaceSyncStateBody.patch?.cloudSyncEnabled).toBe(true);
-        expect(workspaceSyncStateBody.patch?.sourceOfTruth).toBe('local');
-        // I6: onboarding now starts as false; the orchestrator marks it true after first pull.
-        expect(workspaceSyncStateBody.patch?.onboardingCompleted).toBe(false);
+        expect(workspaceSyncStateBody.patch?.version).toBe(2);
+        expect(workspaceSyncStateBody.patch?.enabled).toBe(true);
+        expect(workspaceSyncStateBody.patch?.phase).toBe('provision-local');
+        expect(workspaceSyncStateBody.patch?.setupIntent).toBeNull();
+        expect(workspaceSyncStateBody.patch?.pullCursor).toBeNull();
     });
     it('creates a new cloud workspace only after guided setup submit', async () => {
         const user = userEvent.setup();
@@ -4708,6 +5785,15 @@ describe('TaskforceCore Integration', () => {
         expect(useTaskforceSource).toContain("|| path.startsWith('/api/taskforce/account/')");
         expect(useTaskforceSource).toContain("|| path.startsWith('/api/taskforce/billing/')");
     });
+    it('keeps plans on a dedicated surface while preserving the faster exit flow', () => {
+        const standaloneLayoutPath = path.join(process.cwd(), 'src/components/views/StandaloneLayout.tsx');
+        const standaloneLayoutSource = fs.readFileSync(standaloneLayoutPath, 'utf8');
+        expect(standaloneLayoutSource).toContain('{!isPlansScreen && <WorkspaceHeaderActions actions={universalFilterActions} />}');
+        expect(standaloneLayoutSource).toContain('{!isPlansScreen && showFilters && workspaceFilterBar}');
+        expect(standaloneLayoutSource).not.toMatch(/\{isPlansScreen \? \([\s\S]*\{workspaceToolRail\}[\s\S]*<PlansPage/);
+        expect(standaloneLayoutSource).toContain('closePlansScreen();');
+        expect(standaloneLayoutSource).toContain('void (async () => {');
+    });
     it('uses shared /login flow for local sign in instead of a duplicate modal', async () => {
         const standaloneLayoutPath = path.join(process.cwd(), 'src/components/views/StandaloneLayout.tsx');
         const standaloneLayoutSource = fs.readFileSync(standaloneLayoutPath, 'utf8');
@@ -4892,11 +5978,12 @@ describe('TaskforceCore Integration', () => {
             if (url.includes('/api/taskforce/workflow-templates')) {
                 return jsonResponse({ templates: [] });
             }
-            if (url.includes('/api/taskforce/initiatives')) {
-                return jsonResponse([]);
-            }
-            if (url.includes('/api/taskforce/workstreams')) {
-                return jsonResponse([]);
+            if (url.includes('/api/taskforce/planning/bootstrap')) {
+                return jsonResponse({
+                    initiatives: [],
+                    workstreams: [],
+                    workstreamTaskSummaries: [],
+                });
             }
             return jsonResponse({});
         });
@@ -5238,9 +6325,9 @@ describe('TaskforceCore Integration', () => {
                                 occurredAt: '2026-03-15T14:28:17.000Z',
                                 eventType: 'apply',
                                 status: 'error',
-                                errorMessage: 'Detected asset reference number mismatch during normal sync.',
+                                errorMessage: 'Detected task reference number mismatch during normal sync.',
                                 details: {
-                                    path: 'workspaces/workspace-local-active/assets/images/hero.png',
+                                    taskId: 'task-1',
                                     existingReferenceNumber: 12,
                                     incomingReferenceNumber: 18
                                 }
@@ -6474,6 +7561,7 @@ describe('TaskforceCore Integration', () => {
         const user = userEvent.setup();
         let savedDisplayName = 'Original Name';
         let savedAvatarUrl = '';
+        const cloudAuthBaseUrl = 'https://performance-app.taskforcehq.ai';
         const fetchMock = vi.fn((input, init) => {
             const url = String(input);
             if (url.includes('/api/taskforce/auth/runtime-config')) {
@@ -6513,6 +7601,9 @@ describe('TaskforceCore Integration', () => {
                     ...mockConfig,
                     runtimeMode: 'local',
                     authRequiredForApi: false,
+                    apiBaseUrl: cloudAuthBaseUrl,
+                    cloudAuthBaseUrl,
+                    cloudAuthViaLocalProxy: true,
                     workspaceId: 'workspace-local-active',
                     setupState: {
                         globalSetupState: 'present',
@@ -6548,13 +7639,12 @@ describe('TaskforceCore Integration', () => {
                 return jsonResponse({
                     success: true,
                     draftId: 'avatar-draft-1',
-                    uploadUrl: 'https://upload.example.com/avatar-draft-1',
                     relativePath: 'users/user-1/profile/avatar/avatar-draft-1-avatar.png',
                     path: '/api/taskforce/context/users%2Fuser-1%2Fprofile%2Favatar%2Favatar-draft-1-avatar.png'
                 });
             }
-            if (url.includes('https://upload.example.com/avatar-draft-1')) {
-                return Promise.resolve({ ok: true, status: 200, json: async () => ({}) });
+            if (url.includes('/api/taskforce/auth/profile/avatar/upload')) {
+                return jsonResponse({ success: true, draftId: 'avatar-draft-1' });
             }
             if (url.includes('/api/taskforce/auth/profile/avatar/finalize')) {
                 return jsonResponse({
@@ -6595,8 +7685,21 @@ describe('TaskforceCore Integration', () => {
         const displayNameInput = within(modal).getByPlaceholderText('Display name');
         await user.clear(displayNameInput);
         await user.type(displayNameInput, 'Updated Name');
-        const avatarInput = within(modal).getByLabelText('Upload profile photo');
+        const getContextSpy = vi.spyOn(HTMLCanvasElement.prototype, 'getContext').mockReturnValue({
+            drawImage: () => undefined
+        });
+        const toBlobSpy = vi.spyOn(HTMLCanvasElement.prototype, 'toBlob').mockImplementation(function toBlob(callback, type) {
+            callback(new Blob([new Uint8Array([1, 2, 3, 4])], { type: type || 'image/webp' }));
+        });
+        await user.click(within(modal).getByLabelText('Edit profile photo'));
+        const avatarManager = await screen.findByText('Edit Profile Photo');
+        const avatarManagerModal = avatarManager.closest(`.${modalStyles.modal}`);
+        const avatarInput = within(avatarManagerModal).getByLabelText('Choose profile photo');
         await user.upload(avatarInput, new File(['avatar'], 'avatar.png', { type: 'image/png' }));
+        await user.click(within(avatarManagerModal).getByRole('button', { name: 'Apply Photo' }));
+        await waitFor(() => {
+            expect(screen.queryByText('Edit Profile Photo')).not.toBeInTheDocument();
+        });
         await user.click(within(modal).getByRole('button', { name: 'Save Profile' }));
         await waitFor(() => {
             const profileCall = fetchMock.mock.calls.find((call) => {
@@ -6608,6 +7711,17 @@ describe('TaskforceCore Integration', () => {
             expect(payload.displayName).toBe('Updated Name');
             expect(payload.avatarDraftId).toBe('avatar-draft-1');
         });
+        expect(fetchMock).toHaveBeenCalledWith('/api/taskforce/auth/profile/avatar/init', expect.objectContaining({ method: 'POST' }));
+        const avatarUploadCall = fetchMock.mock.calls.find((call) => String(call[0]) === '/api/taskforce/auth/profile/avatar/upload');
+        expect(avatarUploadCall).toBeTruthy();
+        expect(avatarUploadCall?.[1]).toEqual(expect.objectContaining({ method: 'POST' }));
+        const avatarUploadHeaders = new Headers(avatarUploadCall?.[1]?.headers);
+        expect(avatarUploadHeaders.get('Content-Type')).toBe('image/webp');
+        expect(avatarUploadHeaders.get('x-taskforce-avatar-draft-id')).toBe('avatar-draft-1');
+        expect(fetchMock).toHaveBeenCalledWith('/api/taskforce/auth/profile/avatar/finalize', expect.objectContaining({ method: 'POST' }));
+        expect(fetchMock.mock.calls.some((call) => String(call[0]).startsWith(`${cloudAuthBaseUrl}/api/taskforce/auth/profile/avatar/`))).toBe(false);
+        getContextSpy.mockRestore();
+        toBlobSpy.mockRestore();
         await waitFor(() => {
             expect(screen.queryByText('Edit Profile')).not.toBeInTheDocument();
         });