feat(someday): add Someday sections and keep Someday projects as rows (#1090)

Author: dongdongbh

apps/cloud/src/server-config.test.ts

@@ -38,25 +38,6 @@ describe('area name length limit', () => {
 
 const sorted = (values: Iterable<string>): string[] => Array.from(values).sort();
 
-// Frozen snapshot of the pre-refactor hand-written literals (2026-07-20 generative-schema
-// refactor). CLOUD_TASK_CREATION_ALLOWED_PROP_KEYS and CLOUD_TASK_PATCH_ALLOWED_PROP_KEYS are
-// now derived from TASK_SYNC_FIELD_SCHEMA's cloudWrite flag instead of hand-maintained Sets;
-// this proves the derived output is unchanged. Do not update this list to match a schema
-// change — grow the schema and leave this alone, the same as the schema tests in
-// packages/core/src/task-sync-schema.test.ts.
-const PRE_REFACTOR_CLOUD_TASK_CREATION_ALLOWED_PROP_KEYS = [
-    'status', 'priority', 'taskMode', 'startTime', 'relativeStartOffset', 'dueDate', 'recurrence',
-    'showFutureRecurrence', 'pushCount', 'tags', 'contexts', 'checklist', 'description',
-    'textDirection', 'attachments', 'location', 'projectId', 'sectionId', 'areaId',
-    'isFocusedToday', 'energyLevel', 'assignedTo', 'timeEstimate', 'timeSpentMinutes', 'reviewAt',
-    'suppressMindwtrReminders', 'repeatReminderMinutes',
-];
-
-const PRE_REFACTOR_CLOUD_TASK_PATCH_ALLOWED_PROP_KEYS = [
-    'title', 'order', 'orderNum', 'boardOrder', 'focusOrder',
-    ...PRE_REFACTOR_CLOUD_TASK_CREATION_ALLOWED_PROP_KEYS,
-];
-
 describe('cloud Task schema contract', () => {
     it('keeps creation validation aligned with schema write semantics', () => {
         const expected = TASK_SYNC_FIELD_SCHEMA
@@ -73,21 +54,13 @@ describe('cloud Task schema contract', () => {
 
         expect(sorted(CLOUD_TASK_PATCH_ALLOWED_PROP_KEYS)).toEqual(sorted(expected));
     });
-
-    it('derives CLOUD_TASK_CREATION_ALLOWED_PROP_KEYS identical to the pre-refactor literal', () => {
-        expect(sorted(CLOUD_TASK_CREATION_ALLOWED_PROP_KEYS)).toEqual(sorted(PRE_REFACTOR_CLOUD_TASK_CREATION_ALLOWED_PROP_KEYS));
-    });
-
-    it('derives CLOUD_TASK_PATCH_ALLOWED_PROP_KEYS identical to the pre-refactor literal', () => {
-        expect(sorted(CLOUD_TASK_PATCH_ALLOWED_PROP_KEYS)).toEqual(sorted(PRE_REFACTOR_CLOUD_TASK_PATCH_ALLOWED_PROP_KEYS));
-    });
 });
 
 // Frozen snapshot of the pre-refactor hand-written literals (parity-entities follow-up to the
 // 2026-07-20 generative-schema refactor). CLOUD_PROJECT_*/CLOUD_SECTION_* allowlists are now
 // derived from PROJECT_SYNC_FIELD_SCHEMA / SECTION_SYNC_FIELD_SCHEMA's cloudWrite flag instead
 // of hand-maintained Sets. Do not update these lists to match a schema change — grow the
-// schema and leave this alone, the same as PRE_REFACTOR_CLOUD_TASK_* above.
+// schema and leave this alone; these snapshots cover the unchanged entity descriptors only.
 const PRE_REFACTOR_CLOUD_PROJECT_CREATION_ALLOWED_PROP_KEYS = [
     'status', 'color', 'order', 'tagIds', 'isSequential', 'taskSortBy', 'isFocused',
     'supportNotes', 'attachments', 'dueDate', 'reviewAt', 'areaId', 'areaTitle',

apps/cloud/src/server-validation.ts

@@ -97,11 +97,22 @@ function validateTaskRecurrence(value: Record<string, unknown>): string | null {
     return null;
 }
 
+function validateTaskViewSectionIds(value: Record<string, unknown>): string | null {
+    if (!hasOwnField(value, 'viewSectionIds')) return null;
+    const ids = value.viewSectionIds;
+    if (ids === undefined || ids === null) return null;
+    if (!isRecord(ids)) return 'Invalid task viewSectionIds';
+    return Object.values(ids).every((sectionId) => typeof sectionId === 'string')
+        ? null
+        : 'Invalid task viewSectionIds';
+}
+
 function validateTaskPropValues(value: Record<string, unknown>): string | null {
     return validateTaskRepeatReminderMinutes(value)
         ?? validateTaskTimeSpentMinutes(value)
         ?? validateTaskRelativeStartOffset(value)
-        ?? validateTaskRecurrence(value);
+        ?? validateTaskRecurrence(value)
+        ?? validateTaskViewSectionIds(value);
 }
 
 function validateProjectPropValues(value: Record<string, unknown>): string | null {

apps/cloud/src/server.test.ts

@@ -727,6 +727,47 @@ describe('cloud server utils', () => {
         expect(invalidRecurrence.error).toContain('recurrence');
     });
 
+    test('accepts Task.viewSectionIds on the deployed open task shape', () => {
+        const baseTask = makeTestTask({ id: 'view-section-task', title: 'Task' });
+        const result = validateAppData({
+            tasks: [{
+                ...baseTask,
+                viewSectionIds: {
+                    someday: 'books',
+                },
+            }],
+            projects: [],
+            settings: {
+                gtd: {
+                    viewSections: {
+                        someday: [{ id: 'books', title: 'Books to read', order: 0 }],
+                    },
+                },
+            },
+        });
+        expect(result.ok).toBe(true);
+    });
+
+    test('validates forward-compatible viewSectionIds values without allowlisting scope keys', () => {
+        const baseTask = makeTestTask({ id: 'view-section-task', title: 'Task' });
+        const futureScope = validateAppData({
+            tasks: [{
+                ...baseTask,
+                viewSectionIds: { futureScopeAddedByNewerClient: 'future-heading' },
+            }],
+            projects: [],
+        });
+        expect(futureScope.ok).toBe(true);
+
+        const invalid = validateAppData({
+            tasks: [{ ...baseTask, viewSectionIds: { someday: 42 } }],
+            projects: [],
+        });
+        expect(invalid.ok).toBe(false);
+        if (invalid.ok) throw new Error('Expected invalid viewSectionIds');
+        expect(invalid.error).toContain('viewSectionIds');
+    });
+
     test('validates settings.attachments.pendingRemoteDeletes structure', () => {
         const iso = '2024-01-01T00:00:00.000Z';
         const base = {

apps/desktop/src-tauri/src/macos_cloudkit_bridge.m

@@ -166,6 +166,7 @@ typedef NS_ENUM(NSInteger, MWFieldKind) {
     {"location",       "location",        MWFieldKindString},
     {"projectId",      "projectId",       MWFieldKindString},
     {"sectionId",      "sectionId",       MWFieldKindString},
+    {"viewSectionIds", "viewSectionIds",  MWFieldKindJsonString},
     {"areaId",         "areaId",          MWFieldKindString},
     {"isFocusedToday", "isFocusedToday",  MWFieldKindBool},
     {"timeEstimate",   "timeEstimate",    MWFieldKindString},

apps/desktop/src-tauri/src/storage.rs

@@ -37,7 +37,7 @@ const SNAPSHOT_RETENTION_RECENT_COUNT: usize = 2;
 const SQLITE_BUSY_TIMEOUT_MS: u64 = 5_000;
 const STORAGE_RETRY_ATTEMPTS: usize = 4;
 const STORAGE_RETRY_BASE_DELAY_MS: u64 = 120;
-const STORAGE_SCHEMA_VERSION: i64 = 5;
+const STORAGE_SCHEMA_VERSION: i64 = 6;
 const STORAGE_SCHEMA_STATE_TABLE: &str = "storage_schema_state";
 // Version 4 adds assignedTo to the desktop-native FTS schema and forces one
 // content rebuild after the corrected triggers are installed.
@@ -85,6 +85,7 @@ CREATE TABLE IF NOT EXISTS tasks (
   location TEXT,
   projectId TEXT REFERENCES projects(id) ON DELETE SET NULL,
   sectionId TEXT REFERENCES sections(id) ON DELETE SET NULL,
+  viewSectionIds TEXT,
   areaId TEXT REFERENCES areas(id) ON DELETE SET NULL,
   orderNum INTEGER,
   boardOrder INTEGER,
@@ -518,6 +519,7 @@ fn initialize_sqlite_schema(conn: &mut Connection) -> Result<i64, String> {
         ensure_column(&transaction, "tasks", "focusOrder", "INTEGER")?;
         ensure_tasks_area_column(&transaction)?;
         ensure_tasks_section_column(&transaction)?;
+        ensure_column(&transaction, "tasks", "viewSectionIds", "TEXT")?;
         ensure_tasks_organization_indexes(&transaction)?;
         ensure_projects_order_column(&transaction)?;
         ensure_column(&transaction, "projects", "sequentialScope", "TEXT")?;
@@ -1676,10 +1678,11 @@ fn replace_task_row(conn: &Connection, task: &Value) -> Result<(), String> {
     let recurrence_json = json_str(task.get("recurrence"));
     let checklist_json = json_str(task.get("checklist"));
     let attachments_json = json_str(task.get("attachments"));
+    let view_section_ids_json = json_str(task.get("viewSectionIds"));
     let normalized_rev = normalized_revision_for_storage(task.get("rev"));
     let normalized_rev_by = normalized_rev_by(task.get("revBy"));
     conn.execute(
-        "INSERT OR REPLACE INTO tasks (id, title, status, priority, energyLevel, assignedTo, taskMode, startTime, relativeStartOffset, dueDate, recurrence, showFutureRecurrence, pushCount, tags, contexts, checklist, description, textDirection, attachments, location, projectId, sectionId, areaId, orderNum, boardOrder, focusOrder, isFocusedToday, timeEstimate, suppressMindwtrReminders, repeatReminderMinutes, reviewAt, completedAt, statusBeforeProjectArchive, completedAtBeforeProjectArchive, isFocusedTodayBeforeProjectArchive, projectArchivedAt, rev, revBy, createdAt, updatedAt, deletedAt, purgedAt, timeSpentMinutes) VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, ?11, ?12, ?13, ?14, ?15, ?16, ?17, ?18, ?19, ?20, ?21, ?22, ?23, ?24, ?25, ?26, ?27, ?28, ?29, ?30, ?31, ?32, ?33, ?34, ?35, ?36, ?37, ?38, ?39, ?40, ?41, ?42, ?43)",
+        "INSERT OR REPLACE INTO tasks (id, title, status, priority, energyLevel, assignedTo, taskMode, startTime, relativeStartOffset, dueDate, recurrence, showFutureRecurrence, pushCount, tags, contexts, checklist, description, textDirection, attachments, location, projectId, sectionId, viewSectionIds, areaId, orderNum, boardOrder, focusOrder, isFocusedToday, timeEstimate, suppressMindwtrReminders, repeatReminderMinutes, reviewAt, completedAt, statusBeforeProjectArchive, completedAtBeforeProjectArchive, isFocusedTodayBeforeProjectArchive, projectArchivedAt, rev, revBy, createdAt, updatedAt, deletedAt, purgedAt, timeSpentMinutes) VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, ?11, ?12, ?13, ?14, ?15, ?16, ?17, ?18, ?19, ?20, ?21, ?22, ?23, ?24, ?25, ?26, ?27, ?28, ?29, ?30, ?31, ?32, ?33, ?34, ?35, ?36, ?37, ?38, ?39, ?40, ?41, ?42, ?43, ?44)",
         params![
             task.get("id").and_then(|v| v.as_str()).unwrap_or_default(),
             task.get("title").and_then(|v| v.as_str()).unwrap_or_default(),
@@ -1703,6 +1706,7 @@ fn replace_task_row(conn: &Connection, task: &Value) -> Result<(), String> {
             task.get("location").and_then(|v| v.as_str()),
             task.get("projectId").and_then(|v| v.as_str()),
             task.get("sectionId").and_then(|v| v.as_str()),
+            view_section_ids_json,
             task.get("areaId").and_then(|v| v.as_str()),
             task.get("order")
                 .and_then(|v| v.as_f64())
@@ -1879,6 +1883,11 @@ fn row_to_task_value(row: &rusqlite::Row<'_>) -> Result<Value, rusqlite::Error>
             map.insert("sectionId".to_string(), Value::String(v));
         }
     }
+    let view_section_ids_raw: Option<String> = row.get("viewSectionIds")?;
+    let view_section_ids_val = parse_json_value(view_section_ids_raw);
+    if !view_section_ids_val.is_null() {
+        map.insert("viewSectionIds".to_string(), view_section_ids_val);
+    }
     if let Ok(val) = row.get::<_, Option<String>>("areaId") {
         if let Some(v) = val {
             map.insert("areaId".to_string(), Value::String(v));
@@ -3171,8 +3180,9 @@ fn replace_data_in_transaction(conn: &Connection, mut data: Value) -> Result<Val
         let recurrence_json = json_str(task.get("recurrence"));
         let checklist_json = json_str(task.get("checklist"));
         let attachments_json = json_str(task.get("attachments"));
+        let view_section_ids_json = json_str(task.get("viewSectionIds"));
         conn.execute(
-            "INSERT OR REPLACE INTO tasks (id, title, status, priority, energyLevel, assignedTo, taskMode, startTime, relativeStartOffset, dueDate, recurrence, showFutureRecurrence, pushCount, tags, contexts, checklist, description, textDirection, attachments, location, projectId, sectionId, areaId, orderNum, boardOrder, focusOrder, isFocusedToday, timeEstimate, suppressMindwtrReminders, repeatReminderMinutes, reviewAt, completedAt, statusBeforeProjectArchive, completedAtBeforeProjectArchive, isFocusedTodayBeforeProjectArchive, projectArchivedAt, rev, revBy, createdAt, updatedAt, deletedAt, purgedAt, timeSpentMinutes) VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, ?11, ?12, ?13, ?14, ?15, ?16, ?17, ?18, ?19, ?20, ?21, ?22, ?23, ?24, ?25, ?26, ?27, ?28, ?29, ?30, ?31, ?32, ?33, ?34, ?35, ?36, ?37, ?38, ?39, ?40, ?41, ?42, ?43)",
+            "INSERT OR REPLACE INTO tasks (id, title, status, priority, energyLevel, assignedTo, taskMode, startTime, relativeStartOffset, dueDate, recurrence, showFutureRecurrence, pushCount, tags, contexts, checklist, description, textDirection, attachments, location, projectId, sectionId, viewSectionIds, areaId, orderNum, boardOrder, focusOrder, isFocusedToday, timeEstimate, suppressMindwtrReminders, repeatReminderMinutes, reviewAt, completedAt, statusBeforeProjectArchive, completedAtBeforeProjectArchive, isFocusedTodayBeforeProjectArchive, projectArchivedAt, rev, revBy, createdAt, updatedAt, deletedAt, purgedAt, timeSpentMinutes) VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, ?11, ?12, ?13, ?14, ?15, ?16, ?17, ?18, ?19, ?20, ?21, ?22, ?23, ?24, ?25, ?26, ?27, ?28, ?29, ?30, ?31, ?32, ?33, ?34, ?35, ?36, ?37, ?38, ?39, ?40, ?41, ?42, ?43, ?44)",
             params![
                 task.get("id").and_then(|v| v.as_str()).unwrap_or_default(),
                 task.get("title").and_then(|v| v.as_str()).unwrap_or_default(),
@@ -3196,6 +3206,7 @@ fn replace_data_in_transaction(conn: &Connection, mut data: Value) -> Result<Val
                 task.get("location").and_then(|v| v.as_str()),
                 task.get("projectId").and_then(|v| v.as_str()),
                 task.get("sectionId").and_then(|v| v.as_str()),
+                view_section_ids_json,
                 task.get("areaId").and_then(|v| v.as_str()),
                 task.get("order")
                     .and_then(|v| v.as_f64())
@@ -5693,6 +5704,10 @@ mod tests {
             "location": "Office",
             "projectId": "project-full",
             "sectionId": "section-1",
+            "viewSectionIds": {
+                "someday": "someday-books",
+                "future-scope": "future-heading"
+            },
             "areaId": "area-1",
             "order": 17,
             "boardOrder": 4,
@@ -5809,6 +5824,7 @@ mod tests {
             "location",
             "projectId",
             "sectionId",
+            "viewSectionIds",
             "areaId",
             "order",
             "boardOrder",

apps/desktop/src/components/InboxProcessingQuickPanel.tsx

@@ -1,6 +1,6 @@
 import { useEffect, useRef, type KeyboardEvent } from 'react';
 import { ArrowRight, BookOpen, CheckCircle, ClipboardList, Clock, Hourglass, Trash2, User, X } from 'lucide-react';
-import { DEFAULT_PROJECT_COLOR, filterProjectsBySelectedArea, formatTimeEstimateLabel, safeFormatDate, safeParseDate, tFallback, type Project, type Task, type TaskDraft, type TaskDraftSetter, type TaskPriority, type TimeEstimate,
+import { DEFAULT_PROJECT_COLOR, filterProjectsBySelectedArea, formatTimeEstimateLabel, resolveTaskViewSection, safeFormatDate, safeParseDate, setTaskViewSectionId, sortViewSectionDefinitions, tFallback, type AppData, type Project, type Task, type TaskDraft, type TaskDraftSetter, type TaskPriority, type TimeEstimate,
     numericTextCollator,
 } from '@mindwtr/core';
 
@@ -38,6 +38,7 @@ export type InboxProcessingQuickPanelProps = {
     setField: TaskDraftSetter;
     visibility: InboxProcessingVisibility;
     options: InboxProcessingOptionLists;
+    settings?: AppData['settings'];
     processingMode: 'guided' | 'quick';
     onModeChange: (mode: 'guided' | 'quick') => void;
     onSkip: () => void;
@@ -108,6 +109,7 @@ export function InboxProcessingQuickPanel({
     setField,
     visibility,
     options,
+    settings,
     processingMode,
     onModeChange,
     onSkip,
@@ -186,6 +188,29 @@ export function InboxProcessingQuickPanel({
     const setSelectedTimeEstimate = (value: TimeEstimate | undefined) => setField('timeEstimate', value ?? '');
     const setSelectedProjectId = (value: string | null) => setField('projectId', value ?? '');
     const setSelectedAreaId = (value: string | null) => setField('areaId', value ?? '');
+    const somedaySections = sortViewSectionDefinitions(settings?.gtd?.viewSections?.someday ?? []);
+    const selectedSomedaySection = resolveTaskViewSection(draft, 'someday', somedaySections);
+    const somedaySectionField = somedaySections.length > 0 ? (
+        <div className="space-y-1">
+            <label className="text-[11px] text-muted-foreground font-medium">
+                {tFallback(t, 'viewSections.somedaySection', 'Someday section')}
+            </label>
+            <select
+                aria-label={tFallback(t, 'viewSections.somedaySection', 'Someday section')}
+                value={selectedSomedaySection?.id ?? ''}
+                onChange={(event) => setField(
+                    'viewSectionIds',
+                    setTaskViewSectionId(draft.viewSectionIds, 'someday', event.target.value || undefined),
+                )}
+                className="w-full rounded-lg border border-border bg-card px-3 py-2 text-sm focus:outline-none focus:ring-2 focus:ring-primary/40"
+            >
+                <option value="">{tFallback(t, 'viewSections.noSection', 'No section')}</option>
+                {somedaySections.map((section) => (
+                    <option key={section.id} value={section.id}>{section.title}</option>
+                ))}
+            </select>
+        </div>
+    ) : null;
 
     const showActionFields = actionabilityChoice === 'actionable';
     const showLaterFields = actionabilityChoice === 'later';
@@ -589,9 +614,12 @@ export function InboxProcessingQuickPanel({
                     </div>
                 ) : null}
 
-                {showDeferredOrganizationFields && organizationContainerFields ? (
+                {showDeferredOrganizationFields && (organizationContainerFields || somedaySectionField) ? (
                     <div className="rounded-lg border border-status-someday/20 bg-status-someday/5 p-3">
-                        {organizationContainerFields}
+                        <div className="space-y-3">
+                            {organizationContainerFields}
+                            {somedaySectionField}
+                        </div>
                     </div>
                 ) : null}