@taskforcehq/taskforce 0.3.302 → 0.3.304

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/AccountHubModal.d.ts

@@ -1,11 +1,16 @@
 import type { ModalRuntimeMode, ModalThemeName } from './types';
-interface BillingStatusLike {
+interface AccountProfileSummaryLike {
     planId?: string | null;
+    planName?: string | null;
     entitlementState?: string | null;
     stripeStatus?: string | null;
     effectiveUntil?: string | null;
     stripeSubscriptionId?: string | null;
     stripeCustomerId?: string | null;
+    gate?: string | null;
+    message?: string | null;
+    billingConflictCode?: 'CHECKOUT_SESSION_EXPIRED' | 'CHECKOUT_SESSION_SUPERSEDED' | null;
+    planSelectionRequired?: boolean;
 }
 interface AccountHubModalProps {
     isOpen: boolean;
@@ -21,7 +26,7 @@ interface AccountHubModalProps {
     billingNotice: string | null;
     billingActionBusy: boolean;
     billingIntervalChoice: 'month' | 'year';
-    billingStatus: BillingStatusLike | null;
+    accountProfileSummary: AccountProfileSummaryLike | null;
     currentWorkspaceId: string;
     canOpenTeamManagement: boolean;
     canManageWorkspaceSync: boolean;
@@ -39,5 +44,5 @@ interface AccountHubModalProps {
     onToggleWorkspaceSync: (enabled: boolean) => void;
     onOpenHelp: () => void;
 }
-export declare function AccountHubModal({ isOpen, theme, runtimeMode, authRequiredForApi, isAuthenticated, hasAuthIdentity, authIdentityLabel, billingLoading, billingError, billingActionError, billingNotice, billingActionBusy, billingIntervalChoice, billingStatus, currentWorkspaceId, canOpenTeamManagement, canManageWorkspaceSync, workspaceCloudSyncEnabled, syncStatusLabel, workspaceSyncError, syncControlBusy, onClose, onOpenWorkspaceAudit, onBillingIntervalChange, onRefreshBilling, onUpdateInterval, onManageBilling, onStartCheckout, onToggleWorkspaceSync, onOpenHelp, }: AccountHubModalProps): import("react/jsx-runtime").JSX.Element;
+export declare function AccountHubModal({ isOpen, theme, runtimeMode, authRequiredForApi, isAuthenticated, hasAuthIdentity, authIdentityLabel, billingLoading, billingError, billingActionError, billingNotice, billingActionBusy, billingIntervalChoice, accountProfileSummary, currentWorkspaceId, canOpenTeamManagement, canManageWorkspaceSync, workspaceCloudSyncEnabled, syncStatusLabel, workspaceSyncError, syncControlBusy, onClose, onOpenWorkspaceAudit, onBillingIntervalChange, onRefreshBilling, onUpdateInterval, onManageBilling, onStartCheckout, onToggleWorkspaceSync, onOpenHelp, }: AccountHubModalProps): import("react/jsx-runtime").JSX.Element;
 export {};

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

@@ -5,7 +5,21 @@ import accountStyles from '../../StandaloneAccount.module.css';
 import authStyles from '../../AuthShell.module.css';
 import managementStyles from '../../StandaloneManagement.module.css';
 import styles from '../../../../Taskforce.module.css';
-export function AccountHubModal({ isOpen, theme, runtimeMode, authRequiredForApi, isAuthenticated, hasAuthIdentity, authIdentityLabel, billingLoading, billingError, billingActionError, billingNotice, billingActionBusy, billingIntervalChoice, billingStatus, currentWorkspaceId, canOpenTeamManagement, canManageWorkspaceSync, workspaceCloudSyncEnabled, syncStatusLabel, workspaceSyncError, syncControlBusy, onClose, onOpenWorkspaceAudit, onBillingIntervalChange, onRefreshBilling, onUpdateInterval, onManageBilling, onStartCheckout, onToggleWorkspaceSync, onOpenHelp, }) {
+export function AccountHubModal({ isOpen, theme, runtimeMode, authRequiredForApi, isAuthenticated, hasAuthIdentity, authIdentityLabel, billingLoading, billingError, billingActionError, billingNotice, billingActionBusy, billingIntervalChoice, accountProfileSummary, currentWorkspaceId, canOpenTeamManagement, canManageWorkspaceSync, workspaceCloudSyncEnabled, syncStatusLabel, workspaceSyncError, syncControlBusy, onClose, onOpenWorkspaceAudit, onBillingIntervalChange, onRefreshBilling, onUpdateInterval, onManageBilling, onStartCheckout, onToggleWorkspaceSync, onOpenHelp, }) {
+    const billingGate = String(accountProfileSummary?.gate || '').trim().toLowerCase();
+    const billingConflictCode = String(accountProfileSummary?.billingConflictCode || '').trim().toUpperCase();
+    const billingRecoveryMessage = String(accountProfileSummary?.message || '').trim()
+        || (billingConflictCode === 'CHECKOUT_SESSION_EXPIRED'
+            ? 'Your latest checkout expired. Choose a plan to continue.'
+            : (billingConflictCode === 'CHECKOUT_SESSION_SUPERSEDED'
+                ? 'A newer checkout is already in progress for this account. Open plans to continue.'
+                : ''));
+    const startCheckoutLabel = billingConflictCode === 'CHECKOUT_SESSION_EXPIRED'
+        || accountProfileSummary?.planSelectionRequired === true
+        || billingGate === 'plan_selection_required'
+        ? 'Choose Plan'
+        : (billingGate === 'checkout_pending' ? 'Open Plans' : 'Start Checkout');
+    const resolvedPlanLabel = String(accountProfileSummary?.planName || accountProfileSummary?.planId || 'n/a').trim() || 'n/a';
     return (_jsx(Modal, { isOpen: isOpen, onClose: onClose, title: "Account Hub", size: "md", theme: theme, draggable: true, children: _jsxs("div", { className: `${modalStyles.form} ${managementStyles.modalBody}`, children: [_jsx("p", { className: managementStyles.mutedText, children: "Manage sign in, profile, and workspace controls from one place." }), _jsxs("div", { className: accountStyles.accountHubCard, children: [_jsx("strong", { children: "Authentication" }), _jsx("p", { className: managementStyles.sectionText, children: runtimeMode === 'cloud'
                                 ? (authRequiredForApi
                                     ? (isAuthenticated ? 'Signed in. API access is enabled.' : 'Cloud mode requires sign in before app usage.')
@@ -14,7 +28,7 @@ export function AccountHubModal({ isOpen, theme, runtimeMode, authRequiredForApi
                                 ? (hasAuthIdentity
                                     ? _jsxs(_Fragment, { children: ["Signed in as ", _jsx("span", { className: accountStyles.accountIdentityEmail, children: authIdentityLabel })] })
                                     : 'Signed in')
-                                : 'Signed in as: not signed in' }), runtimeMode === 'cloud' && authRequiredForApi && !isAuthenticated && (_jsx("p", { className: managementStyles.sectionTextTop, children: "Use the `/login` screen to sign in." }))] }), _jsxs("div", { className: accountStyles.accountHubCard, children: [_jsx("strong", { children: "Profile & Account" }), _jsx("p", { className: managementStyles.sectionText, children: "Profile editing and account preferences will live here." })] }), _jsxs("div", { className: accountStyles.accountHubCard, children: [_jsx("strong", { children: "Billing" }), !isAuthenticated ? (_jsx("p", { className: managementStyles.sectionText, children: "Sign in to manage subscription billing." })) : runtimeMode !== 'cloud' ? (_jsx("p", { className: managementStyles.sectionText, children: "Billing remains cloud-backed in local runtime and uses your connected cloud account." })) : (_jsxs(_Fragment, { children: [billingLoading && (_jsx("p", { className: managementStyles.sectionTextSpaced, children: "Loading billing status..." })), billingError && (_jsx("p", { className: `${authStyles.loginError} ${managementStyles.errorText}`, children: billingError })), billingActionError && (_jsx("p", { className: `${authStyles.loginError} ${managementStyles.errorText}`, children: billingActionError })), billingNotice && (_jsx("p", { className: managementStyles.errorText, children: billingNotice })), _jsxs("p", { className: managementStyles.sectionTextSpaced, children: ["Plan: ", _jsx("code", { children: String(billingStatus?.planId || 'n/a') }), ' · ', "Entitlement: ", _jsx("code", { children: String(billingStatus?.entitlementState || 'n/a') })] }), _jsxs("p", { className: managementStyles.sectionText, children: ["Stripe status: ", _jsx("code", { children: String(billingStatus?.stripeStatus || 'n/a') }), billingStatus?.effectiveUntil ? ` · Effective until ${new Date(billingStatus.effectiveUntil).toLocaleString()}` : ''] }), _jsx("div", { className: managementStyles.wrapRow, children: _jsxs("label", { className: `${accountStyles.accountMenuMeta} ${managementStyles.inlineFieldLabel}`, children: ["Interval", _jsxs("select", { className: styles.input, value: billingIntervalChoice, onChange: (event) => onBillingIntervalChange(event.target.value === 'year' ? 'year' : 'month'), disabled: billingActionBusy, children: [_jsx("option", { value: "month", children: "Monthly" }), _jsx("option", { value: "year", children: "Yearly" })] })] }) }), _jsxs("div", { className: managementStyles.actionRowEnd, children: [_jsx("button", { className: styles.cancelBtn, onClick: onRefreshBilling, disabled: billingActionBusy || billingLoading, children: "Refresh Billing" }), _jsx("button", { className: styles.cancelBtn, onClick: onUpdateInterval, disabled: billingActionBusy || !billingStatus?.stripeSubscriptionId, children: "Update Interval" }), _jsx("button", { className: styles.cancelBtn, onClick: onManageBilling, disabled: billingActionBusy || !billingStatus?.stripeCustomerId, children: "Manage Billing" }), _jsx("button", { className: styles.submitBtn, onClick: onStartCheckout, disabled: billingActionBusy, children: billingActionBusy ? 'Working...' : 'Start Checkout' })] })] }))] }), _jsxs("div", { className: accountStyles.accountHubCard, children: [_jsx("strong", { children: "Workspace Audit Log" }), _jsx("p", { className: managementStyles.sectionText, children: "Audit entries are workspace-scoped for the active workspace, not global account history." }), _jsxs("p", { className: managementStyles.sectionText, children: ["Active workspace: ", _jsx("code", { children: currentWorkspaceId })] }), _jsx("div", { className: managementStyles.actionRowEnd, children: _jsx("button", { className: styles.cancelBtn, onClick: onOpenWorkspaceAudit, disabled: !canOpenTeamManagement, children: "Open Workspace Audit" }) })] }), _jsxs("div", { className: accountStyles.accountHubCard, children: [_jsx("strong", { children: "Workspace Cloud Sync" }), _jsx("p", { className: managementStyles.sectionText, children: canManageWorkspaceSync
+                                : 'Signed in as: not signed in' }), runtimeMode === 'cloud' && authRequiredForApi && !isAuthenticated && (_jsx("p", { className: managementStyles.sectionTextTop, children: "Use the `/login` screen to sign in." }))] }), _jsxs("div", { className: accountStyles.accountHubCard, children: [_jsx("strong", { children: "Profile & Account" }), _jsx("p", { className: managementStyles.sectionText, children: "Profile editing and account preferences will live here." })] }), _jsxs("div", { className: accountStyles.accountHubCard, children: [_jsx("strong", { children: "Billing" }), !isAuthenticated ? (_jsx("p", { className: managementStyles.sectionText, children: "Sign in to manage subscription billing." })) : runtimeMode !== 'cloud' ? (_jsx("p", { className: managementStyles.sectionText, children: "Billing remains cloud-backed in local runtime and uses your connected cloud account." })) : (_jsxs(_Fragment, { children: [billingLoading && (_jsx("p", { className: managementStyles.sectionTextSpaced, children: "Loading billing status..." })), billingError && (_jsx("p", { className: `${authStyles.loginError} ${managementStyles.errorText}`, children: billingError })), billingActionError && (_jsx("p", { className: `${authStyles.loginError} ${managementStyles.errorText}`, children: billingActionError })), billingNotice && (_jsx("p", { className: managementStyles.errorText, children: billingNotice })), billingRecoveryMessage && (_jsx("p", { className: managementStyles.sectionText, children: billingRecoveryMessage })), _jsxs("p", { className: managementStyles.sectionTextSpaced, children: ["Plan: ", _jsx("code", { children: resolvedPlanLabel }), ' · ', "Entitlement: ", _jsx("code", { children: String(accountProfileSummary?.entitlementState || 'n/a') })] }), _jsxs("p", { className: managementStyles.sectionText, children: ["Stripe status: ", _jsx("code", { children: String(accountProfileSummary?.stripeStatus || 'n/a') }), accountProfileSummary?.effectiveUntil ? ` · Effective until ${new Date(accountProfileSummary.effectiveUntil).toLocaleString()}` : ''] }), _jsx("div", { className: managementStyles.wrapRow, children: _jsxs("label", { className: `${accountStyles.accountMenuMeta} ${managementStyles.inlineFieldLabel}`, children: ["Interval", _jsxs("select", { className: styles.input, value: billingIntervalChoice, onChange: (event) => onBillingIntervalChange(event.target.value === 'year' ? 'year' : 'month'), disabled: billingActionBusy, children: [_jsx("option", { value: "month", children: "Monthly" }), _jsx("option", { value: "year", children: "Yearly" })] })] }) }), _jsxs("div", { className: managementStyles.actionRowEnd, children: [_jsx("button", { className: styles.cancelBtn, onClick: onRefreshBilling, disabled: billingActionBusy || billingLoading, children: "Refresh Billing" }), _jsx("button", { className: styles.cancelBtn, onClick: onUpdateInterval, disabled: billingActionBusy || !accountProfileSummary?.stripeSubscriptionId, children: "Update Interval" }), _jsx("button", { className: styles.cancelBtn, onClick: onManageBilling, disabled: billingActionBusy || !accountProfileSummary?.stripeCustomerId, children: "Manage Billing" }), _jsx("button", { className: styles.submitBtn, onClick: onStartCheckout, disabled: billingActionBusy, children: billingActionBusy ? 'Working...' : startCheckoutLabel })] })] }))] }), _jsxs("div", { className: accountStyles.accountHubCard, children: [_jsx("strong", { children: "Workspace Audit Log" }), _jsx("p", { className: managementStyles.sectionText, children: "Audit entries are workspace-scoped for the active workspace, not global account history." }), _jsxs("p", { className: managementStyles.sectionText, children: ["Active workspace: ", _jsx("code", { children: currentWorkspaceId })] }), _jsx("div", { className: managementStyles.actionRowEnd, children: _jsx("button", { className: styles.cancelBtn, onClick: onOpenWorkspaceAudit, disabled: !canOpenTeamManagement, children: "Open Workspace Audit" }) })] }), _jsxs("div", { className: accountStyles.accountHubCard, children: [_jsx("strong", { children: "Workspace Cloud Sync" }), _jsx("p", { className: managementStyles.sectionText, children: canManageWorkspaceSync
                                 ? (workspaceCloudSyncEnabled
                                     ? `Enabled · ${syncStatusLabel}`
                                     : 'Disabled')

package/dist/components/views/standalone/modals/AccountHubModal.test.d.ts

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

package/dist/components/views/standalone/modals/AccountHubModal.test.js

@@ -0,0 +1,26 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { fireEvent, render, screen } from '@testing-library/react';
+import { describe, expect, it, vi } from 'vitest';
+import { AccountHubModal } from './AccountHubModal';
+vi.mock('../../../ui/Modal', () => ({
+    Modal: ({ isOpen, children, title }) => (isOpen ? _jsxs("div", { children: [_jsx("h1", { children: title }), children] }) : null)
+}));
+describe('AccountHubModal', () => {
+    it('shows checkout recovery guidance and a plan-selection CTA for expired checkout attempts', () => {
+        const onStartCheckout = vi.fn();
+        render(_jsx(AccountHubModal, { isOpen: true, theme: "dark", runtimeMode: "cloud", authRequiredForApi: true, isAuthenticated: true, hasAuthIdentity: true, authIdentityLabel: "owner@example.com", billingLoading: false, billingError: null, billingActionError: null, billingNotice: null, billingActionBusy: false, billingIntervalChoice: "month", accountProfileSummary: {
+                planId: 'pro',
+                planName: 'Pro Plan',
+                entitlementState: 'pending_plan_selection',
+                gate: 'plan_selection_required',
+                message: 'Your latest checkout expired. Choose a plan to continue.',
+                billingConflictCode: 'CHECKOUT_SESSION_EXPIRED',
+                planSelectionRequired: true
+            }, currentWorkspaceId: "workspace-1", canOpenTeamManagement: false, canManageWorkspaceSync: false, workspaceCloudSyncEnabled: false, syncStatusLabel: "Disabled", workspaceSyncError: null, syncControlBusy: false, onClose: () => { }, onOpenWorkspaceAudit: () => { }, onBillingIntervalChange: () => { }, onRefreshBilling: () => { }, onUpdateInterval: () => { }, onManageBilling: () => { }, onStartCheckout: onStartCheckout, onToggleWorkspaceSync: () => { }, onOpenHelp: () => { } }));
+        expect(screen.getByText('Your latest checkout expired. Choose a plan to continue.')).toBeInTheDocument();
+        expect(screen.getByText('Pro Plan')).toBeInTheDocument();
+        const cta = screen.getByRole('button', { name: 'Choose Plan' });
+        fireEvent.click(cta);
+        expect(onStartCheckout).toHaveBeenCalledTimes(1);
+    });
+});

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/EntitlementsPolicy.test.js

@@ -171,8 +171,8 @@ describe('Taskforce entitlements policy engine', () => {
                     email: 'member3@example.com',
                     role: 'member'
                 });
-            }).toThrowError(TaskforceRuleError);
-            expect(() => core.assertSeatAvailable('workspace-cap')).toThrowError(TaskforceRuleError);
+            }).toThrowError(/Seat limit reached/);
+            expect(() => core.assertSeatAvailable('workspace-cap')).toThrowError(/Seat limit reached/);
         }
         finally {
             core.close();

package/dist/core/GlobalSettingsService.js

@@ -11,6 +11,9 @@ function splitGlobalSettingsPayload(settings) {
     if (settings.site && typeof settings.site === 'object') {
         system.site = { ...settings.site };
     }
+    if (settings.billing && typeof settings.billing === 'object') {
+        system.billing = { ...settings.billing };
+    }
     if (settings.setup && typeof settings.setup === 'object') {
         system.setup = { ...settings.setup };
     }
@@ -98,6 +101,17 @@ export function getGlobalSettingsService(deps) {
     const global = readGlobalConfigService(deps);
     const sourcePrefs = global.schedulePreferences || {};
     const sourceCapacity = sourcePrefs.dailyCapacity || {};
+    const billingOnboardingPolicy = global.billing?.onboardingPolicy && typeof global.billing.onboardingPolicy === 'object'
+        && (global.billing.onboardingPolicy.mode === 'require_plan_selection'
+            || global.billing.onboardingPolicy.mode === 'auto_grant_free'
+            || global.billing.onboardingPolicy.mode === 'auto_start_trial')
+        ? {
+            mode: global.billing.onboardingPolicy.mode,
+            planVersionId: typeof global.billing.onboardingPolicy.planVersionId === 'string'
+                ? (global.billing.onboardingPolicy.planVersionId.trim() || null)
+                : null
+        }
+        : null;
     const schedulePreferences = {
         ...(typeof sourcePrefs.showWeekends === 'boolean' ? { showWeekends: sourcePrefs.showWeekends } : {}),
         ...(typeof sourcePrefs.isCalendarSidebarOpen === 'boolean' ? { isCalendarSidebarOpen: sourcePrefs.isCalendarSidebarOpen } : {}),
@@ -163,14 +177,6 @@ export function getGlobalSettingsService(deps) {
                     ...(typeof global.auth.authRateLimitWindowMs === 'number' && Number.isFinite(global.auth.authRateLimitWindowMs)
                         ? { authRateLimitWindowMs: Math.max(1000, Math.floor(global.auth.authRateLimitWindowMs)) }
                         : {}),
-                    ...((global.auth.signupMonetizationStrategy === 'auto_assign_default' || global.auth.signupMonetizationStrategy === 'plan_selection_required')
-                        ? { signupMonetizationStrategy: global.auth.signupMonetizationStrategy }
-                        : {}),
-                    ...(typeof global.auth.defaultSignupPlanVersionId === 'string'
-                        ? { defaultSignupPlanVersionId: global.auth.defaultSignupPlanVersionId.trim() || null }
-                        : global.auth.defaultSignupPlanVersionId === null
-                            ? { defaultSignupPlanVersionId: null }
-                            : {})
                 }
             }
             : {}),
@@ -186,6 +192,13 @@ export function getGlobalSettingsService(deps) {
                 }
             }
             : {}),
+        ...(billingOnboardingPolicy
+            ? {
+                billing: {
+                    onboardingPolicy: billingOnboardingPolicy
+                }
+            }
+            : {}),
         ...(global.setup && typeof global.setup === 'object'
             ? {
                 setup: {
@@ -289,7 +302,24 @@ export function updateGlobalSettingsService(deps, settings) {
         const currentAuth = next.auth && typeof next.auth === 'object' ? next.auth : {};
         const incoming = settings.auth;
         next.auth = {
-            ...currentAuth,
+            ...(typeof currentAuth.allowSelfRegistration === 'boolean'
+                ? { allowSelfRegistration: currentAuth.allowSelfRegistration }
+                : {}),
+            ...(typeof currentAuth.requireVerifiedEmail === 'boolean'
+                ? { requireVerifiedEmail: currentAuth.requireVerifiedEmail }
+                : {}),
+            ...(typeof currentAuth.defaultNewUserBetaAccess === 'boolean'
+                ? { defaultNewUserBetaAccess: currentAuth.defaultNewUserBetaAccess }
+                : {}),
+            ...(typeof currentAuth.authRateLimitEnabled === 'boolean'
+                ? { authRateLimitEnabled: currentAuth.authRateLimitEnabled }
+                : {}),
+            ...(typeof currentAuth.authRateLimitMaxRequests === 'number' && Number.isFinite(currentAuth.authRateLimitMaxRequests)
+                ? { authRateLimitMaxRequests: Math.max(1, Math.floor(currentAuth.authRateLimitMaxRequests)) }
+                : {}),
+            ...(typeof currentAuth.authRateLimitWindowMs === 'number' && Number.isFinite(currentAuth.authRateLimitWindowMs)
+                ? { authRateLimitWindowMs: Math.max(1000, Math.floor(currentAuth.authRateLimitWindowMs)) }
+                : {}),
             ...(typeof incoming.allowSelfRegistration === 'boolean'
                 ? { allowSelfRegistration: incoming.allowSelfRegistration }
                 : {}),
@@ -307,15 +337,7 @@ export function updateGlobalSettingsService(deps, settings) {
                 : {}),
             ...(typeof incoming.authRateLimitWindowMs === 'number' && Number.isFinite(incoming.authRateLimitWindowMs)
                 ? { authRateLimitWindowMs: Math.max(1000, Math.floor(incoming.authRateLimitWindowMs)) }
-                : {}),
-            ...((incoming.signupMonetizationStrategy === 'auto_assign_default' || incoming.signupMonetizationStrategy === 'plan_selection_required')
-                ? { signupMonetizationStrategy: incoming.signupMonetizationStrategy }
-                : {}),
-            ...(typeof incoming.defaultSignupPlanVersionId === 'string'
-                ? { defaultSignupPlanVersionId: incoming.defaultSignupPlanVersionId.trim() || null }
-                : incoming.defaultSignupPlanVersionId === null
-                    ? { defaultSignupPlanVersionId: null }
-                    : {})
+                : {})
         };
     }
     if (settings.site && typeof settings.site === 'object') {
@@ -331,6 +353,44 @@ export function updateGlobalSettingsService(deps, settings) {
                 : {})
         };
     }
+    if (settings.billing && typeof settings.billing === 'object') {
+        const currentBilling = next.billing && typeof next.billing === 'object' ? next.billing : {};
+        const incoming = settings.billing;
+        const currentOnboardingPolicy = currentBilling.onboardingPolicy && typeof currentBilling.onboardingPolicy === 'object'
+            && (currentBilling.onboardingPolicy.mode === 'require_plan_selection'
+                || currentBilling.onboardingPolicy.mode === 'auto_grant_free'
+                || currentBilling.onboardingPolicy.mode === 'auto_start_trial')
+            ? {
+                mode: currentBilling.onboardingPolicy.mode,
+                planVersionId: typeof currentBilling.onboardingPolicy.planVersionId === 'string'
+                    ? (currentBilling.onboardingPolicy.planVersionId.trim() || null)
+                    : null
+            }
+            : null;
+        const incomingOnboardingPolicy = incoming.onboardingPolicy && typeof incoming.onboardingPolicy === 'object'
+            && (incoming.onboardingPolicy.mode === 'require_plan_selection'
+                || incoming.onboardingPolicy.mode === 'auto_grant_free'
+                || incoming.onboardingPolicy.mode === 'auto_start_trial')
+            ? {
+                mode: incoming.onboardingPolicy.mode,
+                planVersionId: typeof incoming.onboardingPolicy.planVersionId === 'string'
+                    ? (incoming.onboardingPolicy.planVersionId.trim() || null)
+                    : null
+            }
+            : null;
+        next.billing = {
+            ...(currentOnboardingPolicy
+                ? {
+                    onboardingPolicy: currentOnboardingPolicy
+                }
+                : {}),
+            ...(incomingOnboardingPolicy
+                ? {
+                    onboardingPolicy: incomingOnboardingPolicy
+                }
+                : {})
+        };
+    }
     if (settings.setup && typeof settings.setup === 'object') {
         const currentSetup = next.setup && typeof next.setup === 'object' ? next.setup : {};
         const incoming = settings.setup;

package/dist/core/PlanEntitlementService.d.ts

@@ -1,10 +1,11 @@
 import type { DatabaseAdapter } from '../storage/databaseAdapter.js';
-import type { EntitlementState, PlanFeatureAccess, PlanFeatureSnapshot, PlanFeatureCatalogItem, PlanVersionSnapshot, PlanCatalogSnapshot, AccountEntitlementSnapshot, SeatUsageSnapshot, FeatureEvaluationResult, AccountAccessStatus, GlobalTaskforceSettings, SignupMonetizationSettings, SignupMonetizationValidationResult } from './types.js';
+import type { EntitlementState, PlanFeatureAccess, PlanFeatureSnapshot, PlanFeatureCatalogItem, PlanVersionSnapshot, PlanCatalogSnapshot, AccountEntitlementSnapshot, SeatUsageSnapshot, FeatureEvaluationResult, AccountAccessStatus, GlobalTaskforceSettings, OnboardingPolicy, OnboardingPolicyValidationResult } from './types.js';
 export interface PlanEntitlementServiceDeps {
     getWorkspaceOwnerUserId: (workspaceId: string) => string | null;
     readGlobalConfig: () => GlobalTaskforceSettings;
     writeGlobalConfig: (config: GlobalTaskforceSettings) => void;
 }
+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.
@@ -24,9 +25,15 @@ export declare class PlanEntitlementService {
     private applyPlanVersionTrialDaysMetadata;
     private sanitizePlanFeatureConfig;
     private isEntitlementStateAllowed;
+    private isIsoTimestampExpired;
+    private readAccountEntitlementRow;
+    private normalizeExpiredCheckoutPendingRow;
+    private isBillingConfirmedTransitionSource;
+    private resolveCanonicalTransitionSource;
+    private resolvePendingPlanVersionId;
+    private buildBlockedAccessStatus;
     private repairPlanDefaultVersionIfNeeded;
     repairPlanCatalogDefaultsIfNeeded(): void;
-    repairSignupMonetizationSettingsIfNeeded(): void;
     normalizeLegacyPlanDataIfNeeded(): void;
     private removeLegacyPlanFeatureRows;
     private migrateLegacySeatLimitFeatureConfigToVersionSeatLimit;
@@ -34,6 +41,18 @@ export declare class PlanEntitlementService {
     backfillAccountEntitlements(): void;
     private getRequiredDefaultPlanVersion;
     private resolveCanonicalEntitlementStateFromBilling;
+    transitionCanonicalCommercialState(input: {
+        accountId: string;
+        planVersionId?: string | null;
+        state: EntitlementState;
+        effectiveAt?: string | null;
+        effectiveUntil?: string | null;
+        billingMirrorPlanId?: string | null;
+        source: CommercialStateTransitionSource;
+        updatedBy: string;
+        createdAt?: string | null;
+        updatedAt?: string | null;
+    }): AccountEntitlementSnapshot;
     upsertCanonicalEntitlementRecord(input: {
         accountId: string;
         planVersionId: string;
@@ -55,18 +74,26 @@ export declare class PlanEntitlementService {
         feature: PlanFeatureSnapshot | null;
     };
     private planHasAnyActivePricing;
+    private planVersionHasActiveFreePricing;
+    private planVersionIsTrialEligible;
     private tryGetDefaultPlanVersionByPlanId;
     private getActiveDefaultPlanVersions;
     private getDefaultPlanVersionByMode;
     private tryGetDefaultPlanVersionByMode;
-    resolveRegistrationPlanAssignment(selectedPlanVersionIdRaw?: string): {
+    private tryGetImplicitFreeOnboardingPlanVersion;
+    getOnboardingPolicy(): OnboardingPolicy;
+    validateOnboardingPolicy(input?: Partial<OnboardingPolicy>): OnboardingPolicyValidationResult;
+    resolveRegistrationOnboardingOutcome(selectedPlanVersionIdRaw?: string): {
         requiresPlanSelection: boolean;
+        checkoutPending: boolean;
+        commercialState: EntitlementState;
         planVersionId: string | null;
         planId: string | null;
     };
     createUserBillingRecord(userId: string, options?: {
         entitlementState?: string;
         planId?: string | null;
+        effectiveUntil?: string | null;
     }): void;
     getUserEntitlement(userId: string): {
         entitlementState: string;
@@ -98,8 +125,6 @@ export declare class PlanEntitlementService {
         planId: string;
         entitlementState: EntitlementState;
     };
-    getSignupMonetizationSettings(): SignupMonetizationSettings;
-    validateSignupMonetizationSettings(input?: Partial<SignupMonetizationSettings>): SignupMonetizationValidationResult;
     private isValidEntitlementTransition;
     addEntitlementAuditLog(input: {
         actorUserId: string;
@@ -199,3 +224,4 @@ export declare class PlanEntitlementService {
         }>;
     };
 }
+export {};