@taskforcehq/taskforce 0.3.303 → 0.3.304

package/dist/components/views/StandaloneLayout.js

@@ -37,7 +37,7 @@ import { ACCOUNT_PROFILE_SUMMARY_PATH, invalidateAccountProfileSummaryCache, loa
 import { fetchTaskforceApi } from '../../utils/taskforceApiClient';
 import { AppShellHeader } from './AppShellHeader';
 import { getTaskforceCloudEnvironmentConfig, parseTaskforceCloudEnvironment, resolveTaskforceCloudEnvironmentFromBaseUrl } from '../../config/cloudEnvironment';
-import { logBootstrapDebug } from '../../hooks/workspace/workspaceLocalState';
+import { logBootstrapDebug, persistRemoteUiState } from '../../hooks/workspace/workspaceLocalState';
 import { FilterToolbar } from './panels/FilterToolbar';
 import { DocumentFilterToolbar } from './panels/DocumentFilterToolbar';
 import { PlanningDrawer, getPlanningDrawerWidthPx, } from './panels/PlanningDrawer';
@@ -56,6 +56,7 @@ const WorkflowsModule = React.lazy(() => import('../features/WorkflowsModule').t
 const AgentsModule = React.lazy(() => import('../features/AgentsModule').then(m => ({ default: m.AgentsModule })));
 const InitiativesModule = React.lazy(() => import('../features/InitiativesModule').then(m => ({ default: m.InitiativesModule })));
 const PlansPage = React.lazy(() => import('./PlansPage').then(m => ({ default: m.PlansPage })));
+const ACTIVE_COMMERCIAL_STATES = new Set(['active', 'trialing', 'grace']);
 const PROFILE_AVATAR_ACCEPT = 'image/png,image/jpeg,image/webp,image/gif';
 const PROFILE_AVATAR_MAX_BYTES = 5 * 1024 * 1024;
 const resolveSameOriginTaskforcePath = (path) => path;
@@ -192,9 +193,6 @@ export function StandaloneLayout(props) {
         const nextQuery = params.toString();
         navigate(`${location.pathname === '/' ? '/' : location.pathname}${nextQuery ? `?${nextQuery}` : ''}${location.hash || ''}`);
     }, [location.hash, location.pathname, location.search, navigate]);
-    const handlePlansBack = useCallback(() => {
-        closePlansScreen();
-    }, [closePlansScreen]);
     const { 
     // State
     activeTab, setActiveTab, activeCategories, groupBy, setGroupBy, activeWorkspaceModule, setActiveWorkspaceModule, emptyColumnMode, setEmptyColumnMode, zenMode, setZenMode, filterStatus, setFilterStatus, 
@@ -504,34 +502,31 @@ export function StandaloneLayout(props) {
             return;
         const timeoutId = window.setTimeout(async () => {
             try {
-                await fetch('/api/taskforce/ui-state', {
-                    method: 'POST',
-                    headers: { 'Content-Type': 'application/json', ...workspaceUiStateHeaders },
-                    credentials: 'include',
-                    body: JSON.stringify({
-                        stateKey: 'layout',
-                        patch: {
-                            scheduleShowWeekends,
-                            scheduleShowBacklog,
-                            scheduleOnlyExpired,
-                            scheduleSidebarOpen,
-                            scheduleSelectedDate,
-                            scheduleCalendarMonth,
-                            scheduleScrollLeft,
-                            showFilters,
-                            documentTypeFilters,
-                            documentAttachmentFilters,
-                            planningDrawerOpen,
-                            planningTreeCollapsed,
-                            planningPrimaryCollapsed,
-                            planningSecondaryCollapsed,
-                            planningExpandedInitiativeIds: Array.from(expandedPlanningInitiativeIds),
-                            planningDrawerDetail,
-                            planningNestedWorkstreamDetailId,
-                            annotatedTarget: requestedAnnotatedTarget,
-                            annotatedSessionId: requestedAnnotatedSessionId
-                        }
-                    })
+                await persistRemoteUiState({
+                    stateKey: 'layout',
+                    workspaceId: currentWorkspaceId,
+                    headers: workspaceUiStateHeaders,
+                    patch: {
+                        scheduleShowWeekends,
+                        scheduleShowBacklog,
+                        scheduleOnlyExpired,
+                        scheduleSidebarOpen,
+                        scheduleSelectedDate,
+                        scheduleCalendarMonth,
+                        scheduleScrollLeft,
+                        showFilters,
+                        documentTypeFilters,
+                        documentAttachmentFilters,
+                        planningDrawerOpen,
+                        planningTreeCollapsed,
+                        planningPrimaryCollapsed,
+                        planningSecondaryCollapsed,
+                        planningExpandedInitiativeIds: Array.from(expandedPlanningInitiativeIds),
+                        planningDrawerDetail,
+                        planningNestedWorkstreamDetailId,
+                        annotatedTarget: requestedAnnotatedTarget,
+                        annotatedSessionId: requestedAnnotatedSessionId
+                    }
                 });
             }
             catch {
@@ -828,8 +823,13 @@ export function StandaloneLayout(props) {
         assigneeOptions.forEach((option) => {
             map.set(String(option.value), option.label);
         });
+        const normalizedAuthUserId = String(authUserId || '').trim();
+        const normalizedAuthIdentityLabel = String(authUserDisplayName || authUserEmail || '').trim();
+        if (normalizedAuthUserId && normalizedAuthIdentityLabel) {
+            map.set(normalizedAuthUserId, normalizedAuthIdentityLabel);
+        }
         return map;
-    }, [assigneeOptions]);
+    }, [assigneeOptions, authUserDisplayName, authUserEmail, authUserId]);
     const planningStructure = useMemo(() => {
         const planningScopedTasks = taskScope === 'archived'
             ? archivedScopeAllTasks
@@ -1229,6 +1229,7 @@ export function StandaloneLayout(props) {
     const [billingError, setBillingError] = useState(null);
     const [billingActionBusy, setBillingActionBusy] = useState(false);
     const [billingActionError, setBillingActionError] = useState(null);
+    const [plansNavigationBusy, setPlansNavigationBusy] = useState(false);
     const [billingNotice, setBillingNotice] = useState(null);
     const [billingIntervalChoice, setBillingIntervalChoice] = useState('month');
     const [profileDisplayNameDraft, setProfileDisplayNameDraft] = useState('');
@@ -1543,7 +1544,7 @@ export function StandaloneLayout(props) {
         });
         accountSurfaceOpenStartedAtRef.current = null;
     }, [accountProfileSummary?.planId, canOpenTeamManagement, showAccountHub, showAccountMenu]);
-    const loadAccountProfileSummary = useCallback(async () => {
+    const loadAccountProfileSummary = useCallback(async (options) => {
         const accountProfileSummaryUrl = resolveCloudAuthUrl(ACCOUNT_PROFILE_SUMMARY_PATH);
         if (!isAuthenticated) {
             setAccountProfileSummary(null);
@@ -1563,7 +1564,10 @@ export function StandaloneLayout(props) {
         setTeamManagementAccessLoading(canAccessCloudTeamManagement);
         setTeamManagementAccessError(null);
         try {
-            const payload = await loadAccountProfileSummaryCached(accountProfileSummaryUrl, { identityKey: authUserId });
+            const payload = await loadAccountProfileSummaryCached(accountProfileSummaryUrl, {
+                identityKey: authUserId,
+                force: options?.force === true
+            });
             const nextRole = payload?.workspaceRole === 'owner'
                 || payload?.workspaceRole === 'admin'
                 || payload?.workspaceRole === 'member'
@@ -1611,6 +1615,24 @@ export function StandaloneLayout(props) {
             markAccountSurfaceLoadSettled('teamManagement');
         }
     }, [authUserId, canAccessCloudTeamManagement, isAuthenticated, markAccountSurfaceLoadSettled, resolveCloudAuthUrl]);
+    const applyPlansAccountProfileSummary = useCallback((payload) => {
+        setAccountProfileSummary(payload);
+        const nextRole = payload?.workspaceRole === 'owner'
+            || payload?.workspaceRole === 'admin'
+            || payload?.workspaceRole === 'member'
+            || payload?.workspaceRole === 'read-only'
+            ? payload.workspaceRole
+            : null;
+        const nextMode = payload?.teamPlanMode === 'team' || payload?.teamPlanMode === 'personal'
+            ? payload.teamPlanMode
+            : 'unknown';
+        setTeamWorkspaceRole(nextRole);
+        setTeamPlanMode(nextMode);
+    }, []);
+    const hasActiveCommercialEntitlement = useMemo(() => {
+        const entitlementState = String(accountProfileSummary?.entitlementState || '').trim().toLowerCase();
+        return ACTIVE_COMMERCIAL_STATES.has(entitlementState);
+    }, [accountProfileSummary?.entitlementState]);
     const handleStartCheckout = useCallback(async () => {
         const params = new URLSearchParams();
         params.set('screen', 'plans');
@@ -1798,6 +1820,47 @@ export function StandaloneLayout(props) {
         }
         navigate(`/setup?${params.toString()}`, { replace: true });
     }, [navigate]);
+    const handlePlansBack = useCallback(async () => {
+        if (plansNavigationBusy)
+            return;
+        if (!isAuthenticated) {
+            closePlansScreen();
+            return;
+        }
+        const summary = await loadAccountProfileSummary({ force: true });
+        const entitlementState = String(summary?.entitlementState || '').trim().toLowerCase();
+        if (!ACTIVE_COMMERCIAL_STATES.has(entitlementState)) {
+            return;
+        }
+        setPlansNavigationBusy(true);
+        try {
+            const result = await props.continueAfterCommercialOnboarding();
+            if (!result.success) {
+                pushNotice(result.error || 'Unable to finish onboarding.', 'error');
+                if (result.destination === 'login') {
+                    navigate('/login', { replace: true });
+                }
+                return;
+            }
+            if (result.destination === 'setup') {
+                openWorkspaceSetup();
+                return;
+            }
+            closePlansScreen();
+        }
+        finally {
+            setPlansNavigationBusy(false);
+        }
+    }, [
+        closePlansScreen,
+        isAuthenticated,
+        loadAccountProfileSummary,
+        navigate,
+        openWorkspaceSetup,
+        plansNavigationBusy,
+        props,
+        pushNotice
+    ]);
     const handleSwitchWorkspace = useCallback(async (workspaceId) => {
         if (!workspaceId || workspaceActionBusy)
             return;
@@ -2545,6 +2608,9 @@ export function StandaloneLayout(props) {
                         }, role: "menuitem", children: [_jsx(User, { size: 15 }), "Sign In / Register"] })), isAuthenticated && (_jsxs("button", { className: accountStyles.accountMenuItem, onClick: async () => {
                             setShowAccountMenu(false);
                             await logout();
+                            if (runtimeMode === 'cloud') {
+                                navigate('/login', { replace: true });
+                            }
                         }, role: "menuitem", children: [_jsx(LogOut, { size: 15 }), "Sign Out"] }))] }))] }));
     const cycleEmptyColumnVisibility = useCallback(() => {
         setEmptyColumnMode((prev) => {
@@ -3180,7 +3246,7 @@ export function StandaloneLayout(props) {
                                 display: 'inline-flex',
                                 alignItems: 'center',
                                 justifyContent: 'center'
-                            }, children: syncStatusMeta.icon === 'off' ? (_jsx(CloudOff, { size: 16 })) : (_jsx(Cloud, { size: 16 })) }))] })), actions: (_jsxs(_Fragment, { children: [isPlansScreen && (_jsx("button", { className: "tf-control-icon", onClick: handlePlansBack, title: "Back", children: "Back" })), !isPlansScreen && (_jsxs(_Fragment, { children: [workspaceHeaderSections, workspacePrimaryAction] })), !isPlansScreen && _jsx(WorkspaceHeaderActions, { actions: universalDisplayActions }), !isPlansScreen && _jsx(WorkspaceHeaderActions, { actions: universalFilterActions }), accountMenuControl] })) }), _jsx(TopNoticeLayer, { notice: uiNotice, onDismiss: clearNotice }), authBlocked && (_jsx("div", { className: authStyles.authBlockedBanner, children: "Authentication required for this environment. Use the Account menu to sign in." })), !isPlansScreen && showFilters && workspaceFilterBar, isPlansScreen ? (_jsx("div", { className: `${shellStyles.standalonePage} ${shellStyles.standaloneContent} ${styles.appScrollbar} tf-scrollbar`, style: { position: 'relative', display: 'flex', flex: 1, minHeight: 0, overflowY: 'auto', overflowX: 'hidden', scrollbarGutter: 'stable' }, children: _jsx(Suspense, { fallback: _jsx("div", { style: { display: 'flex', alignItems: 'center', justifyContent: 'center', flex: 1 }, children: _jsx(Loader2, { size: 20, className: styles.spinner }) }), children: _jsx(PlansPage, { ...props, currentTheme: currentTheme, projectName: projectName, currentWorkspaceId: currentWorkspaceId, authUserId: authUserId, apiBaseUrl: apiBaseUrl, connectedEnvironmentSource: props.config?.cloudAuthBaseUrl || props.config?.apiBaseUrl || '', resolveCloudAuthUrl: resolveCloudAuthUrl, embedded: true, shellOwnsScroll: true }) }) })) : resolvedWorkspaceModule === 'docs' && documentsWorkspaceEnabled ? (_jsxs("div", { className: `${shellStyles.standalonePage} ${shellStyles.standaloneContent}`, style: { position: 'relative', display: 'flex', flex: 1, minHeight: 0, overflow: 'hidden', paddingLeft: `${WORKSPACE_TOOL_RAIL_WIDTH}px` }, children: [workspaceToolRail, _jsx(Suspense, { fallback: _jsx("div", { style: { display: 'flex', alignItems: 'center', justifyContent: 'center', flex: 1 }, children: _jsx(Loader2, { size: 20, className: styles.spinner }) }), children: _jsx(DocumentWorkspaceShell, { tasks: tasks, runtimeMode: runtimeMode, apiBaseUrl: props.config?.apiBaseUrl || '', cloudAuthBaseUrl: props.config?.cloudAuthBaseUrl || '', typeFilters: documentTypeFilters, attachmentFilters: documentAttachmentFilters, onTypeFiltersChange: setDocumentTypeFilters, onAttachmentFiltersChange: setDocumentAttachmentFilters, requestedDocPath: requestedDocPath, requestedDocAssetId: requestedDocAssetId, onRequestedDocHandled: () => {
+                            }, children: syncStatusMeta.icon === 'off' ? (_jsx(CloudOff, { size: 16 })) : (_jsx(Cloud, { size: 16 })) }))] })), actions: (_jsxs(_Fragment, { children: [isPlansScreen && (_jsx("button", { className: "tf-control-icon", onClick: () => { void handlePlansBack(); }, title: isAuthenticated && !hasActiveCommercialEntitlement ? 'Choose a plan to continue.' : 'Continue to Taskforce', disabled: plansNavigationBusy || (isAuthenticated && !hasActiveCommercialEntitlement), children: hasActiveCommercialEntitlement ? 'Take Me to Taskforce' : 'Back' })), !isPlansScreen && (_jsxs(_Fragment, { children: [workspaceHeaderSections, workspacePrimaryAction] })), !isPlansScreen && _jsx(WorkspaceHeaderActions, { actions: universalDisplayActions }), !isPlansScreen && _jsx(WorkspaceHeaderActions, { actions: universalFilterActions }), accountMenuControl] })) }), _jsx(TopNoticeLayer, { notice: uiNotice, onDismiss: clearNotice }), authBlocked && (_jsx("div", { className: authStyles.authBlockedBanner, children: "Authentication required for this environment. Use the Account menu to sign in." })), !isPlansScreen && showFilters && workspaceFilterBar, isPlansScreen ? (_jsx("div", { className: `${shellStyles.standalonePage} ${shellStyles.standaloneContent} ${styles.appScrollbar} tf-scrollbar`, style: { position: 'relative', display: 'flex', flex: 1, minHeight: 0, overflowY: 'auto', overflowX: 'hidden', scrollbarGutter: 'stable' }, children: _jsx(Suspense, { fallback: _jsx("div", { style: { display: 'flex', alignItems: 'center', justifyContent: 'center', flex: 1 }, children: _jsx(Loader2, { size: 20, className: styles.spinner }) }), children: _jsx(PlansPage, { ...props, currentTheme: currentTheme, projectName: projectName, currentWorkspaceId: currentWorkspaceId, authUserId: authUserId, apiBaseUrl: apiBaseUrl, connectedEnvironmentSource: props.config?.cloudAuthBaseUrl || props.config?.apiBaseUrl || '', resolveCloudAuthUrl: resolveCloudAuthUrl, embedded: true, shellOwnsScroll: true, onAccountProfileSummaryChange: applyPlansAccountProfileSummary, onContinueToTaskforce: handlePlansBack, continueBusy: plansNavigationBusy }) }) })) : resolvedWorkspaceModule === 'docs' && documentsWorkspaceEnabled ? (_jsxs("div", { className: `${shellStyles.standalonePage} ${shellStyles.standaloneContent}`, style: { position: 'relative', display: 'flex', flex: 1, minHeight: 0, overflow: 'hidden', paddingLeft: `${WORKSPACE_TOOL_RAIL_WIDTH}px` }, children: [workspaceToolRail, _jsx(Suspense, { fallback: _jsx("div", { style: { display: 'flex', alignItems: 'center', justifyContent: 'center', flex: 1 }, children: _jsx(Loader2, { size: 20, className: styles.spinner }) }), children: _jsx(DocumentWorkspaceShell, { tasks: tasks, runtimeMode: runtimeMode, apiBaseUrl: props.config?.apiBaseUrl || '', cloudAuthBaseUrl: props.config?.cloudAuthBaseUrl || '', typeFilters: documentTypeFilters, attachmentFilters: documentAttachmentFilters, onTypeFiltersChange: setDocumentTypeFilters, onAttachmentFiltersChange: setDocumentAttachmentFilters, requestedDocPath: requestedDocPath, requestedDocAssetId: requestedDocAssetId, onRequestedDocHandled: () => {
                                 setRequestedDocPath(null);
                                 setRequestedDocAssetId(null);
                             }, enableTaskGeneration: true }) })] })) : resolvedWorkspaceModule === 'annotate' && annotatedAttachmentsWorkspaceEnabled ? (_jsxs("div", { className: `${shellStyles.standalonePage} ${shellStyles.standaloneContent}`, style: { position: 'relative', display: 'flex', flex: 1, minHeight: 0, overflow: 'hidden', paddingLeft: `${WORKSPACE_TOOL_RAIL_WIDTH}px` }, children: [workspaceToolRail, _jsx(Suspense, { fallback: _jsx("div", { style: { display: 'flex', alignItems: 'center', justifyContent: 'center', flex: 1 }, children: _jsx(Loader2, { size: 20, className: styles.spinner }) }), children: _jsx(AnnotatedAttachmentWorkspaceShell, { runtimeMode: runtimeMode, apiBaseUrl: props.config?.apiBaseUrl || '', cloudAuthBaseUrl: props.config?.cloudAuthBaseUrl || '', workspaceId: currentWorkspaceId, sessionLoadReady: annotatedWorkspaceReady, requestedTarget: requestedAnnotatedTarget, requestedSessionId: requestedAnnotatedSessionId, requestedOpenVersion: requestedAnnotatedOpenVersion, resolveTaskReferenceLabel: resolveAnnotatedTaskReferenceLabel, resolveImageReferenceLabel: resolveAnnotatedImageReferenceLabel, onOpenTarget: handleAnnotatedAttachmentOpenTarget, onContextChange: handleAnnotatedAttachmentContextChange, onBackToTask: handleBackToTaskFromAnnotatedAttachment }) })] })) : resolvedWorkspaceModule === 'workflows' ? (_jsxs("div", { className: `${shellStyles.standalonePage} ${shellStyles.standaloneContent}`, style: { position: 'relative', display: 'flex', flex: 1, minHeight: 0, overflow: 'hidden', paddingLeft: `${WORKSPACE_TOOL_RAIL_WIDTH}px` }, children: [workspaceToolRail, _jsx(Suspense, { fallback: _jsx("div", { style: { display: 'flex', alignItems: 'center', justifyContent: 'center', flex: 1 }, children: _jsx(Loader2, { size: 20, className: styles.spinner }) }), children: _jsx(WorkflowsModule, { availableWorkflows: availableWorkflows, availableEnvironments: availableEnvironments, exportEnvironment: exportEnvironment, exportWorkflowsPath: props.exportWorkflowsPath, exportingResource: exportingResource, exportResult: exportResult, onExportEnvironmentChange: props.setExportEnvironment, onExportWorkflows: onExportWorkflows, onRefreshWorkflows: fetchWorkflows, onFetchWorkflowTemplate: props.fetchWorkflowTemplate, onFetchWorkflowOverrideNames: props.fetchWorkflowOverrideNames, onSaveWorkflowTemplateDraft: props.saveWorkflowTemplateDraft, onResetWorkflowTemplateDraft: props.resetWorkflowTemplateDraft }) })] })) : resolvedWorkspaceModule === 'agents' ? (_jsxs("div", { className: `${shellStyles.standalonePage} ${shellStyles.standaloneContent}`, style: { position: 'relative', display: 'flex', flex: 1, minHeight: 0, overflow: 'hidden', paddingLeft: `${WORKSPACE_TOOL_RAIL_WIDTH}px` }, children: [workspaceToolRail, _jsx(Suspense, { fallback: _jsx("div", { style: { display: 'flex', alignItems: 'center', justifyContent: 'center', flex: 1 }, children: _jsx(Loader2, { size: 20, className: styles.spinner }) }), children: _jsx(AgentsModule, { workspaceId: currentWorkspaceId }) })] })) : (_jsxs("div", { className: `${shellStyles.standalonePage} ${shellStyles.standaloneContent} `, style: {
@@ -3240,7 +3306,16 @@ export function StandaloneLayout(props) {
                                     top: '10px',
                                     right: '10px',
                                     zIndex: 20,
-                                }, children: _jsx(ChevronLeft, { size: 16 }) }))] }), groupBy === 'schedule' && (_jsx(ScheduleSidebar, { open: scheduleSidebarOpen, onClose: () => setScheduleSidebarOpen(false), scheduleSelectedDate: scheduleSelectedDate, setScheduleSelectedDate: setScheduleSelectedDate, scheduleCalendarMonth: scheduleCalendarMonth, setScheduleCalendarMonth: setScheduleCalendarMonth, scheduleShowWeekends: scheduleShowWeekends, setScheduleShowWeekends: setScheduleShowWeekends, scheduleShowBacklog: scheduleShowBacklog, setScheduleShowBacklog: setScheduleShowBacklog, scheduleOnlyExpired: scheduleOnlyExpired, setScheduleOnlyExpired: setScheduleOnlyExpired, expiredScheduledCount: expiredScheduledCount, overdueDueCount: overdueDueCount, expiredLeafCandidates: expiredLeafCandidates, expiredRecoveryCandidates: expiredRecoveryCandidates, onMoveExpiredToSelectedWeek: handleMoveExpiredToSelectedWeek, onMoveExpiredToBacklog: handleMoveExpiredToBacklog, scheduleBulkBusy: scheduleBulkBusy, globalWeekStartsOn: globalWeekStartsOn, resolvedLocale: resolvedLocale, todayDateOnly: todayDateOnly, scheduleBaseTasks: scheduleBaseTasks, scheduleWeekStart: scheduleWeekStart, scheduleWeekLabel: scheduleWeekLabel }))] })), _jsxs(Modal, { isOpen: activeTab === 'add', onClose: handleCloseModal, title: editingTaskId ? (currentTask?.isDeleted ? 'Deleted Task' : 'Edit Task') : 'New Task', size: taskModalFullscreen ? 'full' : 'xl', theme: currentTheme, headerActions: (_jsx("button", { className: "tf-control-icon", onClick: () => setTaskModalFullscreen((value) => !value), title: taskModalFullscreen ? 'Exit full screen' : 'Enter full screen', "aria-label": taskModalFullscreen ? 'Exit full screen' : 'Enter full screen', children: taskModalFullscreen ? _jsx(Minimize2, { size: 18 }) : _jsx(Maximize2, { size: 18 }) })), draggable: !taskModalFullscreen, closeOnOverlayClick: false, children: [_jsx(TaskActionHeader, { editingTaskId: editingTaskId, loading: loading, autoSaveState: autoSaveState, title: title, currentTask: currentTask, currentTaskWorkstream: currentTaskWorkstream, currentTaskInitiative: currentTaskInitiative, workstreamInput: workstreamInput, onWorkstreamInputChange: setWorkstreamInput, onSetWorkstreamForCurrentTask: handleSetWorkstreamForCurrentTask, handleSubmit: handleSubmit, resetForm: resetForm, handleCopyId: handleCopyId, copiedId: copiedId, tasks: tasks, handleToggleInProgress: handleToggleInProgress, handleToggleReview: handleToggleReview, handleToggleComplete: handleToggleComplete, handleToggleCancel: handleToggleCancel, handleSetStatus: handleSetStatus, handleArchiveTask: handleArchiveTask, handleRestoreDeletedTask: currentTask?.deletedRecordId
+                                }, children: _jsx(ChevronLeft, { size: 16 }) }))] }), groupBy === 'schedule' && (_jsx(ScheduleSidebar, { open: scheduleSidebarOpen, onClose: () => setScheduleSidebarOpen(false), scheduleSelectedDate: scheduleSelectedDate, setScheduleSelectedDate: setScheduleSelectedDate, scheduleCalendarMonth: scheduleCalendarMonth, setScheduleCalendarMonth: setScheduleCalendarMonth, scheduleShowWeekends: scheduleShowWeekends, setScheduleShowWeekends: setScheduleShowWeekends, scheduleShowBacklog: scheduleShowBacklog, setScheduleShowBacklog: setScheduleShowBacklog, scheduleOnlyExpired: scheduleOnlyExpired, setScheduleOnlyExpired: setScheduleOnlyExpired, expiredScheduledCount: expiredScheduledCount, overdueDueCount: overdueDueCount, expiredLeafCandidates: expiredLeafCandidates, expiredRecoveryCandidates: expiredRecoveryCandidates, onMoveExpiredToSelectedWeek: handleMoveExpiredToSelectedWeek, onMoveExpiredToBacklog: handleMoveExpiredToBacklog, scheduleBulkBusy: scheduleBulkBusy, globalWeekStartsOn: globalWeekStartsOn, resolvedLocale: resolvedLocale, todayDateOnly: todayDateOnly, scheduleBaseTasks: scheduleBaseTasks, scheduleWeekStart: scheduleWeekStart, scheduleWeekLabel: scheduleWeekLabel }))] })), _jsxs(Modal, { isOpen: activeTab === 'add', onClose: handleCloseModal, title: editingTaskId ? (currentTask?.isDeleted ? 'Deleted Task' : 'Edit Task') : 'New Task', size: taskModalFullscreen ? 'full' : 'xl', theme: currentTheme, headerActions: (_jsx("button", { className: "tf-control-icon", onClick: () => setTaskModalFullscreen((value) => !value), title: taskModalFullscreen ? 'Exit full screen' : 'Enter full screen', "aria-label": taskModalFullscreen ? 'Exit full screen' : 'Enter full screen', children: taskModalFullscreen ? _jsx(Minimize2, { size: 18 }) : _jsx(Maximize2, { size: 18 }) })), draggable: !taskModalFullscreen, closeOnOverlayClick: false, children: [_jsx(TaskActionHeader, { editingTaskId: editingTaskId, loading: loading, autoSaveState: autoSaveState, title: title, currentTask: currentTask, currentTaskWorkstream: currentTaskWorkstream, currentTaskInitiative: currentTaskInitiative, workstreamInput: workstreamInput, onWorkstreamInputChange: setWorkstreamInput, onSetWorkstreamForCurrentTask: handleSetWorkstreamForCurrentTask, handleSubmit: handleSubmit, resetForm: resetForm, handleCopyId: handleCopyId, copiedId: copiedId, tasks: tasks, handleToggleInProgress: handleToggleInProgress, handleToggleReview: handleToggleReview, handleToggleComplete: handleToggleComplete, handleToggleCancel: handleToggleCancel, handleSetStatus: handleSetStatus, handleArchiveTask: handleArchiveTask, handleUnarchiveTask: (taskId) => {
+                            if (currentTask?.isDeleted) {
+                                const deletedRecord = deletedTaskRecordByTaskId.get(taskId);
+                                if (!deletedRecord)
+                                    return;
+                                void handleRestoreDeletedTask(deletedRecord.id);
+                                return;
+                            }
+                            void handleUnarchive(taskId);
+                        }, handleRestoreDeletedTask: currentTask?.deletedRecordId
                             ? (deletedRecordId) => {
                                 void handleRestoreDeletedTask(deletedRecordId);
                             }
@@ -3253,7 +3328,7 @@ export function StandaloneLayout(props) {
                                 resetForm();
                                 setActiveTab('tasks');
                             }
-                            : undefined }), _jsx(TaskForm, { editingTaskId: editingTaskId, error: error, title: title, description: description, checklistItems: checklistItems, category: category, type: type, priority: priority, complexity: complexity, manualComplexityEnabled: manualComplexityEnabled, approach: approach, assignee: assignee, scheduledDate: scheduledDate, dueDate: dueDate, workstreamInput: workstreamInput, formTaxonomies: formTaxonomies, onTaxonomyChange: (id, val) => setFormTaxonomies(prev => ({ ...prev, [id]: val })), taxonomies: taxonomies, comments: comments, newCommentText: newCommentText, contextFiles: attachments, currentWorkspaceId: currentWorkspaceId, apiBaseUrl: apiBaseUrl, descriptionFocused: descriptionFocused, showMarkdownHelp: showMarkdownHelp, showChecklist: showChecklist, checklistEnabled: checklistDropdownEnabled, showComments: showComments, categories: activeCategories, types: activeTypes, priorities: priorities, taxonomyDisplayLabels: taxonomyDisplayLabels, assigneeOptions: assigneeOptions, workstreams: props.workstreams, copiedId: copiedId, onTitleChange: setTitle, onDescriptionChange: setDescription, onChecklistItemsChange: setChecklistItems, onCategoryChange: setCategory, onTypeChange: setType, onPriorityChange: setPriority, onComplexityChange: setComplexity, onApproachChange: (val) => { setApproach(val); setFormTaxonomies(prev => ({ ...prev, approach: val })); }, onAssigneeChange: setAssignee, onScheduledDateChange: setScheduledDate, onDueDateChange: setDueDate, onWorkstreamInputChange: setWorkstreamInput, onNewCommentTextChange: setNewCommentText, onDescriptionFocusedChange: setDescriptionFocused, onShowMarkdownHelpChange: setShowMarkdownHelp, onShowChecklistChange: setShowChecklist, onShowCommentsChange: setShowComments, onOpenSettings: (section) => {
+                            : undefined }), _jsx(TaskForm, { editingTaskId: editingTaskId, error: error, title: title, description: description, checklistItems: checklistItems, category: category, type: type, priority: priority, complexity: complexity, manualComplexityEnabled: manualComplexityEnabled, approach: approach, assignee: assignee, scheduledDate: scheduledDate, dueDate: dueDate, workstreamInput: workstreamInput, formTaxonomies: formTaxonomies, onTaxonomyChange: (id, val) => setFormTaxonomies(prev => ({ ...prev, [id]: val })), taxonomies: taxonomies, comments: comments, newCommentText: newCommentText, contextFiles: attachments, currentWorkspaceId: currentWorkspaceId, apiBaseUrl: apiBaseUrl, descriptionFocused: descriptionFocused, showMarkdownHelp: showMarkdownHelp, showChecklist: showChecklist, checklistEnabled: checklistDropdownEnabled, showComments: showComments, categories: activeCategories, types: activeTypes, priorities: priorities, taxonomyDisplayLabels: taxonomyDisplayLabels, assigneeOptions: assigneeOptions, workstreams: props.workstreams, initiatives: props.initiatives, copiedId: copiedId, onTitleChange: setTitle, onDescriptionChange: setDescription, onChecklistItemsChange: setChecklistItems, onCategoryChange: setCategory, onTypeChange: setType, onPriorityChange: setPriority, onComplexityChange: setComplexity, onApproachChange: (val) => { setApproach(val); setFormTaxonomies(prev => ({ ...prev, approach: val })); }, onAssigneeChange: setAssignee, onScheduledDateChange: setScheduledDate, onDueDateChange: setDueDate, onWorkstreamInputChange: setWorkstreamInput, onNewCommentTextChange: setNewCommentText, onDescriptionFocusedChange: setDescriptionFocused, onShowMarkdownHelpChange: setShowMarkdownHelp, onShowChecklistChange: setShowChecklist, onShowCommentsChange: setShowComments, onOpenSettings: (section) => {
                             setSettingsSection(section);
                             setActiveTab('settings');
                         }, onSubmit: handleSubmit, commentsEndRef: commentsEndRef, onAddComment: () => handleAddComment(newCommentText), onOpenTaskById: handleOpenTaskById, onAddContextFile: (file) => {

package/dist/components/views/WidgetView.js

@@ -270,7 +270,16 @@ export function WidgetView(props) {
                                             handleNavigation(() => {
                                                 setActiveTab('settings');
                                             });
-                                        }, title: "Settings", children: _jsx(Settings, { size: 18 }) }), _jsx("button", { className: "tf-control-icon", onClick: handleXClick, title: activeTab === 'tasks' ? "Close" : "Back to Tasks", children: activeTab === 'tasks' ? _jsx(X, { size: 20 }) : _jsx(ArrowLeft, { size: 20 }) })] })] }), _jsx(TopNoticeLayer, { notice: uiNotice, onDismiss: clearNotice }), activeTab === 'add' && (_jsx(TaskActionHeader, { editingTaskId: editingTaskId, loading: loading, autoSaveState: autoSaveState, title: title, currentTask: currentTask, currentTaskWorkstream: currentTaskWorkstream, currentTaskInitiative: currentTaskInitiative, workstreamInput: workstreamInput, onWorkstreamInputChange: setWorkstreamInput, onSetWorkstreamForCurrentTask: handleSetWorkstreamForCurrentTask, handleSubmit: handleSubmit, resetForm: resetForm, handleCopyId: handleCopyId, copiedId: copiedId, tasks: tasks, handleToggleInProgress: handleToggleInProgress, handleToggleReview: handleToggleReview, handleToggleComplete: handleToggleComplete, handleToggleCancel: handleToggleCancel, handleArchiveTask: handleArchiveTask, handleRestoreDeletedTask: (deletedRecordId) => {
+                                        }, title: "Settings", children: _jsx(Settings, { size: 18 }) }), _jsx("button", { className: "tf-control-icon", onClick: handleXClick, title: activeTab === 'tasks' ? "Close" : "Back to Tasks", children: activeTab === 'tasks' ? _jsx(X, { size: 20 }) : _jsx(ArrowLeft, { size: 20 }) })] })] }), _jsx(TopNoticeLayer, { notice: uiNotice, onDismiss: clearNotice }), activeTab === 'add' && (_jsx(TaskActionHeader, { editingTaskId: editingTaskId, loading: loading, autoSaveState: autoSaveState, title: title, currentTask: currentTask, currentTaskWorkstream: currentTaskWorkstream, currentTaskInitiative: currentTaskInitiative, workstreamInput: workstreamInput, onWorkstreamInputChange: setWorkstreamInput, onSetWorkstreamForCurrentTask: handleSetWorkstreamForCurrentTask, handleSubmit: handleSubmit, resetForm: resetForm, handleCopyId: handleCopyId, copiedId: copiedId, tasks: tasks, handleToggleInProgress: handleToggleInProgress, handleToggleReview: handleToggleReview, handleToggleComplete: handleToggleComplete, handleToggleCancel: handleToggleCancel, handleArchiveTask: handleArchiveTask, handleUnarchiveTask: (taskId) => {
+                            if (currentTask?.isDeleted) {
+                                const deletedRecord = deletedRecordByTaskId.get(taskId);
+                                if (deletedRecord) {
+                                    void handleRestoreDeletedTask(deletedRecord.id);
+                                }
+                                return;
+                            }
+                            handleUnarchive(taskId);
+                        }, handleRestoreDeletedTask: (deletedRecordId) => {
                             void handleRestoreDeletedTask(deletedRecordId);
                         }, handlePermanentlyDeleteDeletedTask: (deletedRecordId) => {
                             void handlePermanentlyDeleteDeletedTask(deletedRecordId);
@@ -290,7 +299,7 @@ export function WidgetView(props) {
                             void handleDelete(taskId);
                         }, onDeleteAllDeleted: () => {
                             void handleEmptyDeletedTasks();
-                        }, onFetchArchive: fetchArchive, onAddTaskToCategory: handleAddTaskToCategory, supplementalTasks: deletedScopeTasks })), activeTab === 'add' && (_jsx(TaskForm, { editingTaskId: editingTaskId, error: error, title: title, description: description, checklistItems: checklistItems, category: category, type: type, priority: priority, complexity: complexity, manualComplexityEnabled: manualComplexityEnabled, approach: approach, assignee: assignee, scheduledDate: scheduledDate, dueDate: dueDate, workstreamInput: workstreamInput, formTaxonomies: formTaxonomies, onTaxonomyChange: onTaxonomyChange, taxonomies: taxonomies, comments: comments, newCommentText: newCommentText, contextFiles: attachments, currentWorkspaceId: currentWorkspaceId, apiBaseUrl: "", descriptionFocused: descriptionFocused, showMarkdownHelp: showMarkdownHelp, showChecklist: showChecklist, checklistEnabled: checklistDropdownEnabled, showComments: showComments, categories: activeCategories, types: activeTypes, priorities: priorities, taxonomyDisplayLabels: taxonomyDisplayLabels, assigneeOptions: assigneeOptions, workstreams: props.workstreams, copiedId: copiedId, onTitleChange: setTitle, onDescriptionChange: setDescription, onChecklistItemsChange: setChecklistItems, onCategoryChange: setCategory, onTypeChange: setType, onPriorityChange: setPriority, onComplexityChange: setComplexity, onApproachChange: (val) => { setApproach(val); setFormTaxonomies(prev => ({ ...prev, approach: val })); }, onAssigneeChange: setAssignee, onScheduledDateChange: setScheduledDate, onDueDateChange: setDueDate, onWorkstreamInputChange: setWorkstreamInput, onNewCommentTextChange: setNewCommentText, onDescriptionFocusedChange: setDescriptionFocused, onShowMarkdownHelpChange: setShowMarkdownHelp, onShowChecklistChange: setShowChecklist, onShowCommentsChange: setShowComments, onOpenSettings: (section) => {
+                        }, onFetchArchive: fetchArchive, onAddTaskToCategory: handleAddTaskToCategory, supplementalTasks: deletedScopeTasks })), activeTab === 'add' && (_jsx(TaskForm, { editingTaskId: editingTaskId, error: error, title: title, description: description, checklistItems: checklistItems, category: category, type: type, priority: priority, complexity: complexity, manualComplexityEnabled: manualComplexityEnabled, approach: approach, assignee: assignee, scheduledDate: scheduledDate, dueDate: dueDate, workstreamInput: workstreamInput, formTaxonomies: formTaxonomies, onTaxonomyChange: onTaxonomyChange, taxonomies: taxonomies, comments: comments, newCommentText: newCommentText, contextFiles: attachments, currentWorkspaceId: currentWorkspaceId, apiBaseUrl: "", descriptionFocused: descriptionFocused, showMarkdownHelp: showMarkdownHelp, showChecklist: showChecklist, checklistEnabled: checklistDropdownEnabled, showComments: showComments, categories: activeCategories, types: activeTypes, priorities: priorities, taxonomyDisplayLabels: taxonomyDisplayLabels, assigneeOptions: assigneeOptions, workstreams: props.workstreams, initiatives: props.initiatives, copiedId: copiedId, onTitleChange: setTitle, onDescriptionChange: setDescription, onChecklistItemsChange: setChecklistItems, onCategoryChange: setCategory, onTypeChange: setType, onPriorityChange: setPriority, onComplexityChange: setComplexity, onApproachChange: (val) => { setApproach(val); setFormTaxonomies(prev => ({ ...prev, approach: val })); }, onAssigneeChange: setAssignee, onScheduledDateChange: setScheduledDate, onDueDateChange: setDueDate, onWorkstreamInputChange: setWorkstreamInput, onNewCommentTextChange: setNewCommentText, onDescriptionFocusedChange: setDescriptionFocused, onShowMarkdownHelpChange: setShowMarkdownHelp, onShowChecklistChange: setShowChecklist, onShowCommentsChange: setShowComments, onOpenSettings: (section) => {
                             handleNavigation(() => {
                                 setSettingsSection(section);
                                 setActiveTab('settings');

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

@@ -5,7 +5,7 @@ import modalStyles from '../../../ui/Modal.module.css';
 import syncStatusStyles from '../../SyncStatusModal.module.css';
 import styles from '../../../../Taskforce.module.css';
 export function SyncStatusModal({ isOpen, theme, currentWorkspaceLabel, syncStatusMeta, workspaceCloudSyncEnabled, syncControlBusy, canManageWorkspaceSync, workspaceSyncSummary, workspaceSyncRepairBusy, referenceMismatchCount, syncStageLabel, workspaceSyncPendingChanges, formattedLastSyncTime, formattedLastPullTime, formattedLastPushTime, syncLastError, workspaceSyncDiagnostics, activeReferenceMismatchSummaries, syncDiagnosticsSummary, syncEventRows, syncEventsListRef, workspaceSyncRepairQueued, workspaceSyncBusy, workspaceSyncCopied, runtimeMode, isAuthenticated, onClose, onToggleWorkspaceSync, onRepairSync, onCopyReport, onOpenLogin, onRetrySync, }) {
-    return (_jsx(Modal, { isOpen: isOpen, onClose: onClose, title: "Sync Manager", size: "md", theme: theme, draggable: true, children: _jsxs("div", { className: `${modalStyles.form} ${syncStatusStyles.syncStatusModal}`, style: { gap: '10px' }, children: [_jsxs("div", { className: syncStatusStyles.syncStatusTop, children: [_jsx("div", { className: syncStatusStyles.syncStatusHeaderInfo, children: _jsxs("div", { className: syncStatusStyles.syncStatusMetaHeader, children: [_jsx("div", { className: syncStatusStyles.syncStatusBadge, style: {
+    return (_jsx(Modal, { isOpen: isOpen, onClose: onClose, title: "Sync Manager", size: "mdWide", theme: theme, draggable: true, children: _jsxs("div", { className: `${modalStyles.form} ${syncStatusStyles.syncStatusModal}`, style: { gap: '10px' }, children: [_jsxs("div", { className: syncStatusStyles.syncStatusTop, children: [_jsx("div", { className: syncStatusStyles.syncStatusHeaderInfo, children: _jsxs("div", { className: syncStatusStyles.syncStatusMetaHeader, children: [_jsx("div", { className: syncStatusStyles.syncStatusBadge, style: {
                                             borderColor: syncStatusMeta.border,
                                             background: syncStatusMeta.background,
                                             color: syncStatusMeta.color

package/dist/core/DeletedTaskLifecycleService.d.ts

@@ -1,5 +1,6 @@
 import type { DatabaseAdapter } from '../storage/databaseAdapter.js';
-import type { DeletedTaskDetails, DeletedTaskRecord, DeletedTaskSource, TaskActor, TaskItem } from './Taskforce.js';
+import type { TaskActor } from '../shared/taskActor.js';
+import type { DeletedTaskDetails, DeletedTaskRecord, DeletedTaskSource, TaskItem } from './Taskforce.js';
 export interface DeletedTaskLifecycleServiceDeps {
     db: DatabaseAdapter;
     tenantId: string;

package/dist/core/PlanEntitlementService.d.ts

@@ -5,7 +5,7 @@ export interface PlanEntitlementServiceDeps {
     readGlobalConfig: () => GlobalTaskforceSettings;
     writeGlobalConfig: (config: GlobalTaskforceSettings) => void;
 }
-type CommercialStateTransitionSource = 'registration' | 'checkout-start' | 'checkout-confirm' | 'stripe-webhook' | 'backfill' | 'legacy-plan-mode' | 'admin' | 'system';
+type CommercialStateTransitionSource = 'registration' | 'invite-accept' | 'checkout-start' | 'checkout-confirm' | 'stripe-webhook' | 'backfill' | 'legacy-plan-mode' | 'admin' | 'system';
 /**
  * Handles all plan catalog, plan version, and account entitlement logic.
  * Extracted from Taskforce.ts to reduce monolith size.
@@ -80,6 +80,7 @@ export declare class PlanEntitlementService {
     private getActiveDefaultPlanVersions;
     private getDefaultPlanVersionByMode;
     private tryGetDefaultPlanVersionByMode;
+    private tryGetImplicitFreeOnboardingPlanVersion;
     getOnboardingPolicy(): OnboardingPolicy;
     validateOnboardingPolicy(input?: Partial<OnboardingPolicy>): OnboardingPolicyValidationResult;
     resolveRegistrationOnboardingOutcome(selectedPlanVersionIdRaw?: string): {
@@ -92,6 +93,7 @@ export declare class PlanEntitlementService {
     createUserBillingRecord(userId: string, options?: {
         entitlementState?: string;
         planId?: string | null;
+        effectiveUntil?: string | null;
     }): void;
     getUserEntitlement(userId: string): {
         entitlementState: string;

package/dist/core/PlanEntitlementService.js

@@ -152,7 +152,8 @@ export class PlanEntitlementService {
         `).run('pending_plan_selection', 'checkout-expired', now, this.tenantId, accountId);
         this.createUserBillingRecord(accountId, {
             entitlementState: 'pending_plan_selection',
-            planId: null
+            planId: null,
+            effectiveUntil: null
         });
         return this.readAccountEntitlementRow(accountId);
     }
@@ -442,7 +443,8 @@ export class PlanEntitlementService {
             entitlementState: nextState,
             planId: input.billingMirrorPlanId !== undefined
                 ? input.billingMirrorPlanId
-                : (nextState === 'pending_plan_selection' ? null : planVersion.planId)
+                : (nextState === 'pending_plan_selection' ? null : planVersion.planId),
+            effectiveUntil: input.effectiveUntil || null
         });
         return this.getAccountEntitlement(accountId);
     }
@@ -627,18 +629,58 @@ export class PlanEntitlementService {
             throw error;
         }
     }
+    tryGetImplicitFreeOnboardingPlanVersion() {
+        const rows = this.db.prepare(`
+            SELECT DISTINCT v.plan_version_id
+            FROM plan_versions v
+            JOIN plan_catalog p
+              ON p.tenant_id = v.tenant_id
+             AND p.plan_id = v.plan_id
+            JOIN billing_price_mappings bpm
+              ON bpm.tenant_id = v.tenant_id
+             AND bpm.plan_version_id = v.plan_version_id
+            WHERE v.tenant_id = ?
+              AND COALESCE(p.status, 'active') = 'active'
+              AND bpm.active = 1
+              AND bpm.pricing_type = 'free'
+            ORDER BY v.is_default DESC, p.updated_at DESC, p.created_at DESC, v.version_number DESC, v.created_at DESC
+        `).all(this.tenantId);
+        for (const row of rows) {
+            const planVersionId = String(row.plan_version_id || '').trim();
+            if (!planVersionId)
+                continue;
+            const version = this.getPlanVersionSnapshot(planVersionId);
+            if (!this.isTeamPlanVersion(version)) {
+                return version;
+            }
+        }
+        return null;
+    }
     getOnboardingPolicy() {
         const billing = this.deps.readGlobalConfig().billing || {};
         const policy = billing.onboardingPolicy && typeof billing.onboardingPolicy === 'object'
             ? billing.onboardingPolicy
             : null;
+        if (policy?.mode === 'require_plan_selection'
+            || policy?.mode === 'auto_grant_free'
+            || policy?.mode === 'auto_start_trial') {
+            return {
+                mode: policy.mode,
+                planVersionId: typeof policy.planVersionId === 'string'
+                    ? (policy.planVersionId.trim() || null)
+                    : null
+            };
+        }
+        const implicitFreeVersion = this.tryGetImplicitFreeOnboardingPlanVersion();
+        if (implicitFreeVersion) {
+            return {
+                mode: 'auto_grant_free',
+                planVersionId: implicitFreeVersion.planVersionId
+            };
+        }
         return {
-            mode: policy?.mode === 'auto_grant_free' || policy?.mode === 'auto_start_trial'
-                ? policy.mode
-                : 'require_plan_selection',
-            planVersionId: typeof policy?.planVersionId === 'string'
-                ? (policy.planVersionId.trim() || null)
-                : null
+            mode: 'require_plan_selection',
+            planVersionId: null
         };
     }
     validateOnboardingPolicy(input) {
@@ -761,14 +803,22 @@ export class PlanEntitlementService {
         const planId = typeof options?.planId === 'string'
             ? options.planId.trim().toLowerCase()
             : '';
+        const shouldUpdateEffectiveUntil = options ? Object.prototype.hasOwnProperty.call(options, 'effectiveUntil') : false;
+        const effectiveUntil = shouldUpdateEffectiveUntil
+            ? (typeof options?.effectiveUntil === 'string' ? options.effectiveUntil : null)
+            : null;
         this.db.prepare(`
-            INSERT INTO user_billing (user_id, tenant_id, entitlement_state, tier, created_at, updated_at)
-            VALUES (?, ?, ?, ?, ?, ?)
+            INSERT INTO user_billing (user_id, tenant_id, entitlement_state, tier, effective_until, created_at, updated_at)
+            VALUES (?, ?, ?, ?, ?, ?, ?)
             ON CONFLICT (user_id) DO UPDATE SET
                 entitlement_state = excluded.entitlement_state,
                 tier = excluded.tier,
+                effective_until = CASE
+                    WHEN ? THEN excluded.effective_until
+                    ELSE user_billing.effective_until
+                END,
                 updated_at = excluded.updated_at
-        `).run(userId, this.tenantId, entitlementState, planId, now, now);
+        `).run(userId, this.tenantId, entitlementState, planId, effectiveUntil, now, now, shouldUpdateEffectiveUntil ? 1 : 0);
     }
     getUserEntitlement(userId) {
         const account = this.getAccountEntitlement(userId);

package/dist/core/SignupMonetizationSettings.test.js

@@ -22,7 +22,12 @@ function openCore(projectRoot) {
         storagePath: path.join(projectRoot, '.taskforce'),
         tenantId: path.basename(projectRoot)
     });
-    core.upsertPlanCatalog({ planId: 'starter', displayName: 'Starter' });
+    core.upsertPlanCatalog({ planId: 'starter', displayName: 'Starter', status: 'active' });
+    core.updatePlanVersion({
+        planId: 'starter',
+        versionNumber: 1,
+        seatLimit: 1
+    });
     core.updatePlanVersionFeatures({
         planVersionId: 'starter-v1',
         features: [
@@ -33,9 +38,39 @@ function openCore(projectRoot) {
     return core;
 }
 describe('TaskforceCore onboarding policy', () => {
-    it('defaults to require_plan_selection with no plan version', () => {
+    it('defaults to auto_grant_free when a free personal plan version is available', () => {
         const projectRoot = makeProjectRoot();
         const core = openCore(projectRoot);
+        try {
+            expect(core.getOnboardingPolicy()).toEqual({
+                mode: 'auto_grant_free',
+                planVersionId: 'starter-v1'
+            });
+        }
+        finally {
+            core.close();
+            fs.rmSync(projectRoot, { recursive: true, force: true });
+        }
+    });
+    it('falls back to require_plan_selection when no free onboarding plan is available', () => {
+        const projectRoot = makeProjectRoot();
+        const core = new TaskforceCore({
+            projectRoot,
+            storagePath: path.join(projectRoot, '.taskforce'),
+            tenantId: path.basename(projectRoot)
+        });
+        core.upsertPlanCatalog({ planId: 'starter', displayName: 'Starter', status: 'active' });
+        core.updatePlanVersion({
+            planId: 'starter',
+            versionNumber: 1,
+            seatLimit: 1
+        });
+        core.updatePlanVersionFeatures({
+            planVersionId: 'starter-v1',
+            features: [
+                { featureKey: 'workspace.switching', access: 'enabled' }
+            ]
+        });
         try {
             expect(core.getOnboardingPolicy()).toEqual({
                 mode: 'require_plan_selection',

package/dist/core/TaskActivityService.d.ts

@@ -1,5 +1,6 @@
 import type { DatabaseAdapter } from '../storage/databaseAdapter.js';
-import type { Comment, TaskActivityItem, TaskActor, TaskEvent, TaskEventDetails } from './Taskforce.js';
+import type { TaskActor } from '../shared/taskActor.js';
+import type { Comment, TaskActivityItem, TaskEvent, TaskEventDetails } from './Taskforce.js';
 export interface TaskActivityServiceDeps {
     db: DatabaseAdapter;
     tenantId: string;
@@ -7,6 +8,7 @@ export interface TaskActivityServiceDeps {
     normalizeWorkspaceId: (workspaceId: string | undefined) => string;
     resolveWorkspaceActor: (workspaceId: string, actorRef: unknown) => TaskActor | null;
 }
+export declare function listWorkspaceTaskEventsService(deps: TaskActivityServiceDeps, workspaceId: string): TaskEvent[];
 export declare function replaceTaskCommentsService(deps: TaskActivityServiceDeps, taskId: string, workspaceId: string, comments: Comment[]): void;
 export declare function listTaskEventsInternalService(deps: TaskActivityServiceDeps, taskId: string, workspaceId: string): TaskEvent[];
 export declare function buildTaskActivityService(comments: Comment[], taskEvents: TaskEvent[]): TaskActivityItem[];
@@ -19,3 +21,4 @@ export declare function addTaskEventService(deps: TaskActivityServiceDeps, input
     details?: TaskEventDetails;
 }): void;
 export declare function replaceTaskEventsService(deps: TaskActivityServiceDeps, taskId: string, workspaceId: string, taskEvents: TaskEvent[]): void;
+export declare function upsertTaskEventForSyncService(deps: TaskActivityServiceDeps, event: TaskEvent): TaskEvent;

package/dist/core/TaskActivityService.js

@@ -39,6 +39,17 @@ function mapTaskEventRow(deps, row) {
         actorProfile: actor === 'system' ? null : deps.resolveWorkspaceActor(workspaceId, actor)
     };
 }
+export function listWorkspaceTaskEventsService(deps, workspaceId) {
+    const normalizedWorkspaceId = deps.normalizeWorkspaceId(workspaceId);
+    const rows = deps.db.prepare(`
+        SELECT id, task_id, workspace_id, action, actor, actor_type, details_json, created_at
+        FROM task_events
+        WHERE tenant_id = ?
+          AND workspace_id = ?
+        ORDER BY created_at ASC, id ASC
+    `).all(deps.tenantId, normalizedWorkspaceId);
+    return rows.map((row) => mapTaskEventRow(deps, row));
+}
 export function replaceTaskCommentsService(deps, taskId, workspaceId, comments) {
     const normalizedWorkspaceId = deps.normalizeWorkspaceId(workspaceId);
     deps.db.prepare('DELETE FROM comments WHERE tenant_id = ? AND workspace_id = ? AND task_id = ?')
@@ -128,3 +139,37 @@ export function replaceTaskEventsService(deps, taskId, workspaceId, taskEvents)
         insertTaskEvent.run(event.id, deps.tenantId, normalizedWorkspaceId, taskId, event.action, event.actor, event.actorType, JSON.stringify(normalizeTaskEventDetails(event.details)), event.createdAt);
     }
 }
+export function upsertTaskEventForSyncService(deps, event) {
+    const workspaceId = deps.normalizeWorkspaceId(event.workspaceId);
+    const normalizedEvent = {
+        id: String(event.id || '').trim(),
+        taskId: String(event.taskId || '').trim(),
+        workspaceId,
+        action: String(event.action || '').trim(),
+        actor: String(event.actor || 'system').trim() || 'system',
+        actorType: event.actorType === 'ai' || event.actorType === 'human' || event.actorType === 'system'
+            ? event.actorType
+            : 'system',
+        createdAt: String(event.createdAt || '').trim() || new Date().toISOString(),
+        details: normalizeTaskEventDetails(event.details)
+    };
+    deps.db.prepare(`
+        INSERT INTO task_events (
+            id, tenant_id, workspace_id, task_id, action, actor, actor_type, details_json, created_at
+        ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
+        ON CONFLICT (id) DO UPDATE SET
+            workspace_id = excluded.workspace_id,
+            task_id = excluded.task_id,
+            action = excluded.action,
+            actor = excluded.actor,
+            actor_type = excluded.actor_type,
+            details_json = excluded.details_json,
+            created_at = excluded.created_at
+    `).run(normalizedEvent.id, deps.tenantId, workspaceId, normalizedEvent.taskId, normalizedEvent.action, normalizedEvent.actor, normalizedEvent.actorType, JSON.stringify(normalizedEvent.details), normalizedEvent.createdAt);
+    return {
+        ...normalizedEvent,
+        actorProfile: normalizedEvent.actor === 'system'
+            ? null
+            : deps.resolveWorkspaceActor(workspaceId, normalizedEvent.actor)
+    };
+}