Release v1.6.4 yearly recurrence controls

Author: owenfar

TODO.md

@@ -4,18 +4,6 @@
 
 [ ] Check about indexing blog issues - ONGOING
 
-...
-
-Launch v1.6.0 is complete: app and public site are live, billing is enabled,
-and the agent releases are published. Evidence: `status/app-status.md` and
-`status/agent-status.md`; private operations retain deployment details.
-
-Remaining operational follow-ups:
-[ ] Confirm Dropbox broad-public production status in its owning App Console and the post-approval connection canary.
-[ ] Verify Search Console sitemap submission and indexing (retain the existing blog-indexing investigation above).
-[ ] Observe the first legitimate paid purchase and post-cutover hosted email; no extra synthetic charge/send is required.
-[ ] Finish external Google/Dropbox console removal of obsolete redirect URLs after Worker authority cleanup.
-
 [x] Actually validate the skill/MCP with our own OpenClaw - RE-TEST
     - Test one use-case where the agent creates a task, starts the timer, go work on the actual task, stop the timer when it finished
     - We might need to make this flow part of the skill for people that want to use tasktime pro for task & time management
@@ -31,19 +19,10 @@ Remaining operational follow-ups:
     [ ] Glama
     [ ] MCP.so
 
-[ ] Think about publishing an official supported chatGPT plugin
+[ ] Setup chatGPT work as we did for DebugBundle
+    [ ] Keep publishing blog posts related to tasktime pro with the real world, including usage with agents and all agents including ChatGPT/Codex, Claude/Claude Code, Gemini, Muse, Copilot, etc.
 
-[ ] Focus mode - think how we can do this best.
-    - Today we work on multiple projects or tasks at a time because a lot of the work is managed by AI. With this focus mode, when I enter it, I imagine a super clean overlay on top of everything, with the options to attached existing tasks, or create new ones directly inline (can be assigned to projects too)
-    - These are the tasks you plan to do today/next so they remain here until you check them off - once checked, they disappear from this space
-    - We can nicely separate them based on project - the ones on "top" have no project assigned
-    - This view might be the best view to contain pomodoro? Let me know
-We might bring some of this previous idea I had earlier into this too:
-[ ] Timed sessions with sound alerts - I want to work on this for 1hour
-    - We must think were this should be placed, as a setting, or a global option in a project for example, and we choose which task we want to work on
-    [ ] This can also be an alert reminder settings in account that when a time passes a certain amount, we ping with a sound, and when we have push notifications, also have that choice
-    - Pomodoro? Is this the same and does it apply here?
-I would perhaps just take the subtle sound effect for a ping option that can go on every 20, 30, 40, 60 minutes. As a gentle reminder that you're in focus mode and that a timer is ongoing
+[ ] Think about publishing an official supported chatGPT plugin
 
 [ ] Improve reports overview with some useful charts - see existing mocks in TaskTime folder
 
@@ -71,9 +50,21 @@ I would perhaps just take the subtle sound effect for a ping option that can go
 
 ## Ideas
 
+[ ] Focus mode - think how we can do this best.
+    - Today we work on multiple projects or tasks at a time because a lot of the work is managed by AI. With this focus mode, when I enter it, I imagine a super clean overlay on top of everything, with the options to attached existing tasks, or create new ones directly inline (can be assigned to projects too)
+    - These are the tasks you plan to do today/next so they remain here until you check them off - once checked, they disappear from this space
+    - We can nicely separate them based on project - the ones on "top" have no project assigned
+    - This view might be the best view to contain pomodoro? Let me know
+We might bring some of this previous idea I had earlier into this too:
+[ ] Timed sessions with sound alerts - I want to work on this for 1hour
+    - We must think were this should be placed, as a setting, or a global option in a project for example, and we choose which task we want to work on
+    [ ] This can also be an alert reminder settings in account that when a time passes a certain amount, we ping with a sound, and when we have push notifications, also have that choice
+    - Pomodoro? Is this the same and does it apply here?
+I would perhaps just take the subtle sound effect for a ping option that can go on every 20, 30, 40, 60 minutes. As a gentle reminder that you're in focus mode and that a timer is ongoing
+
 [ ] Global search
 
-[ ] Include theme color options in settings, default could be neutral
+[ ] Include theme color options in settings, default could be neutral and include a bit more this color throughout, for example in nav icons and maybe certain primary buttons
 
 [ ] Keep track of invoices that you downloaded - so perhaps have a "downloaded" check icon or something
 
@@ -82,4 +73,4 @@ I would perhaps just take the subtle sound effect for a ping option that can go
 [ ] Task Templates - Create “global” tasks which are assigned a category/tag and these can be assigned to all projects for that category by default (or at a click of a button → import default tasks for this project category)
     [ ] This would be a button under projects page “Create task templates”, then when creating a new project, we can choose a task template to be added
 
-[ ] When the tab is not focused and we're in the dashboard, let's fade the view and leave the To Do Today widget the area of attention
+[ ] When the tab is not focused and we're in the dashboard, let's fade the view and leave the To Do Today widget the area of attention

e2e/account-task-polish.smoke.spec.js

@@ -359,6 +359,39 @@ test('saving an open task editor preserves a newer pause and its active timer',
     });
 });
 
+test('creates a yearly task from quick create and retains its date after reload', async ({ page }) => {
+    await seed(page);
+    await page.getByRole('button', { name: 'Open quick create menu' }).click();
+    await page.getByRole('menuitem', { name: 'New Task' }).click();
+
+    const taskDialog = page.getByRole('dialog', { name: 'New Task' });
+    await taskDialog.getByLabel('Task Title').fill('Annual license review');
+    await taskDialog.getByRole('button', { name: 'Set repeat' }).click();
+
+    const repeatDialog = page.getByRole('dialog', { name: 'Repeat' });
+    await repeatDialog.getByRole('button', { name: 'Every Year' }).click();
+    await repeatDialog.getByRole('button', { name: 'May' }).click();
+    await repeatDialog.getByRole('spinbutton', { name: 'Yearly day' }).fill('12');
+    await repeatDialog.getByRole('button', { name: 'Apply' }).click();
+    await expect(taskDialog.getByRole('button', { name: 'Yearly (May 12)' })).toBeVisible();
+    await taskDialog.getByRole('button', { name: 'Create', exact: true }).click();
+
+    const readTask = () => page.evaluate(() => Array.from(
+        window.__TASKTIME_STORE__.tasks.values(), task => task.toJSON(),
+    ).find(task => task.title === 'Annual license review'));
+    await expect.poll(readTask).toMatchObject({
+        recurring: { type: 'yearly', yearlyDate: '2023-05-12' },
+        startDate: null,
+    });
+    await page.evaluate(() => window.__TASKTIME_STORE__.docManager.flushPersistence());
+    await page.reload();
+    await expect(page.getByTestId('dashboard-hours-chart')).toBeVisible();
+    await expect.poll(readTask).toMatchObject({
+        recurring: { type: 'yearly', yearlyDate: '2023-05-12' },
+        startDate: null,
+    });
+});
+
 test('uses separate category forms and displays their original color in both themes', async ({ page }) => {
     await seed(page);
     await page.goto('/expenses');

e2e/expenses.smoke.spec.js

@@ -3,6 +3,61 @@ import { expensesHeadingName, openExpensesPage } from './helpers/tasktime.js';
 
 test.describe('Expenses smoke', () => {
 
+    test('keeps yearly selection inside the repeat dialog and saves the expense', async ({ page }) => {
+        await page.addInitScript(() => localStorage.setItem('tasktime-dark-mode', 'true'));
+
+        for (const viewport of [{ width: 320, height: 700 }, { width: 667, height: 375 }, { width: 1440, height: 900 }]) {
+            await page.setViewportSize(viewport);
+            await openExpensesPage(page);
+            await page.getByRole('button', { name: 'New Expense', exact: true }).click();
+
+            const expenseDialog = page.getByRole('dialog', { name: 'New Expense' });
+            await expenseDialog.getByRole('combobox', { name: 'Expense type' }).click();
+            await page.getByRole('option', { name: 'Recurring', exact: true }).click();
+            await expenseDialog.getByRole('button', { name: 'Monthly (1st)' }).click();
+
+            const repeatDialog = page.getByRole('dialog', { name: 'Repeat' });
+            await repeatDialog.getByRole('button', { name: 'Every Year' }).click();
+            await expect(repeatDialog.getByRole('button', { name: 'January' })).toBeVisible();
+            await expect(repeatDialog.getByRole('button', { name: 'December' })).toBeVisible();
+            await expect(repeatDialog.getByRole('spinbutton', { name: 'Yearly day' })).toBeVisible();
+            await expect(repeatDialog.getByRole('listbox')).toHaveCount(0);
+            await repeatDialog.screenshot({ path: `test-results/yearly-repeat-${viewport.width}.png` });
+
+            const bounds = await repeatDialog.boundingBox();
+            expect(bounds.y).toBeGreaterThanOrEqual(0);
+            expect(bounds.y + bounds.height).toBeLessThanOrEqual(viewport.height + 1);
+            if (viewport.height < 400) {
+                expect(await repeatDialog.evaluate(element => element.scrollHeight > element.clientHeight)).toBe(true);
+            }
+
+            await repeatDialog.getByRole('button', { name: 'December' }).click();
+            await repeatDialog.getByRole('spinbutton', { name: 'Yearly day' }).fill('31');
+            await repeatDialog.getByRole('button', { name: 'Apply' }).click();
+            await expect(expenseDialog.getByRole('button', { name: 'Yearly (Dec 31)' })).toBeVisible();
+            if (viewport.width !== 1440) {
+                await expenseDialog.getByRole('button', { name: 'Cancel', exact: true }).click();
+                continue;
+            }
+
+            await expenseDialog.getByPlaceholder('Enter expense title').fill('Yearly renewal');
+            await expenseDialog.getByLabel(/Amount/i).fill('12.34');
+            await expenseDialog.getByRole('button', { name: 'Create Expense' }).click();
+            await expect(expenseDialog).not.toBeVisible();
+
+            const readRecurrence = () => page.evaluate(() => Array.from(
+                window.__TASKTIME_STORE__.expenseRecurrences.values(), recurrence => recurrence.toJSON(),
+            ).find(recurrence => recurrence.title === 'Yearly renewal'));
+            await expect.poll(readRecurrence).toMatchObject({ repeat: 'yearly' });
+            expect((await readRecurrence()).startDate).toMatch(/-12-31$/);
+            await page.evaluate(() => window.__TASKTIME_STORE__.docManager.flushPersistence());
+            await page.reload();
+            await expect(page.getByRole('heading', { name: expensesHeadingName })).toBeVisible();
+            await expect.poll(readRecurrence).toMatchObject({ repeat: 'yearly' });
+            expect((await readRecurrence()).startDate).toMatch(/-12-31$/);
+        }
+    });
+
     test('deletes a newly created expense and closes both dialogs without a false error', async ({ page }) => {
         const title = `Delete check ${Date.now()}`;
         await openExpensesPage(page);
@@ -145,3 +200,34 @@ test.describe('Expenses smoke', () => {
         await expect(reloadedPaidRow).toContainText('12.34');
     });
 });
+
+test.describe('Yearly expense in a western timezone', () => {
+    test.use({ timezoneId: 'America/Los_Angeles' });
+
+    test('keeps the selected local calendar day when saving a recurrence', async ({ page }) => {
+        await openExpensesPage(page);
+        await page.getByRole('button', { name: 'New Expense', exact: true }).click();
+
+        const expenseDialog = page.getByRole('dialog', { name: 'New Expense' });
+        await expenseDialog.getByRole('combobox', { name: 'Expense type' }).click();
+        await page.getByRole('option', { name: 'Recurring', exact: true }).click();
+        await expenseDialog.getByRole('button', { name: 'Monthly (1st)' }).click();
+
+        const repeatDialog = page.getByRole('dialog', { name: 'Repeat' });
+        await repeatDialog.getByRole('button', { name: 'Every Year' }).click();
+        await repeatDialog.getByRole('button', { name: 'December' }).click();
+        await repeatDialog.getByRole('spinbutton', { name: 'Yearly day' }).fill('31');
+        await repeatDialog.getByRole('button', { name: 'Apply' }).click();
+        await expect(expenseDialog.getByRole('button', { name: 'Yearly (Dec 31)' })).toBeVisible();
+
+        await expenseDialog.getByPlaceholder('Enter expense title').fill('Western timezone renewal');
+        await expenseDialog.getByLabel(/Amount/i).fill('12.34');
+        await expenseDialog.getByRole('button', { name: 'Create Expense' }).click();
+        await expect(expenseDialog).not.toBeVisible();
+
+        const recurrence = await page.evaluate(() => Array.from(
+            window.__TASKTIME_STORE__.expenseRecurrences.values(), value => value.toJSON(),
+        ).find(value => value.title === 'Western timezone renewal'));
+        expect(recurrence.startDate).toMatch(/-12-31$/);
+    });
+});

package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "tasktime",
   "private": true,
-  "version": "1.6.3",
+  "version": "1.6.4",
   "license": "AGPL-3.0-only",
   "type": "module",
   "bin": {

package.json

@@ -46,6 +46,12 @@
 
 - Users can manage clients, projects, tasks/subtasks, notes, planner attachments, and goals through the corresponding screens.
 - A subtask cannot be configured as recurring.
+- New and edited top-level tasks can repeat weekly, monthly, or yearly. A yearly
+  schedule chooses a month and day and reopens with that saved date selected.
+  Task and expense yearly dates stay selectable inside the Repeat dialog at
+  phone and desktop sizes, with dialog scrolling in short landscape viewports;
+  days outside the chosen month cannot be applied. An expense keeps the selected
+  local calendar day in western timezones when its yearly recurrence is saved.
 - Confirmed task/project/client deletion includes lazy yearly entries and archive
   documents, removes matching records from all supported placements, and retains
   unrelated work and protected financial records. Missing cloud history asks for

spec/acceptance.md

@@ -19,6 +19,10 @@ Minimize the distance from identifying work to tracking it accurately.
 
 ## Recurrence controls and project settings
 
+- The shared Repeat dialog offers weekly, monthly, and yearly schedules for
+  top-level tasks; recurring expenses retain monthly and yearly choices. Yearly
+  selection keeps month buttons and a validated day field inside the dialog,
+  including a scrollable dialog on short viewports.
 - Disable recurrence and Enable recurrence appear only in recurring-task
   three-dot menus used by task details and list views. Disable uses a calendar-off
   icon and Enable uses a calendar-check icon, with the same alignment and spacing

spec/designs/work-and-time.md

@@ -28,7 +28,7 @@ import { usePreferences } from '../../hooks/usePreferences.ts';
 import { usePaymentMethods } from '../../hooks/usePaymentMethods.ts';
 import { buildExpenseFromRecurrence } from '@/utils/expenseUtils';
 import { DEFAULT_CURRENCY } from '@/utils/currencyUtils.ts';
-import { toStorageDate } from '@/utils/dateUtils.ts';
+import { parseStoredDate, toStorageDate } from '@/utils/dateUtils.ts';
 import { parseOptionalNumberInput } from '@/utils/numberInputUtils.ts';
 import { getExpenseDeletionBlockReason } from '@/domain/expenses/expenseOperations';
 
@@ -900,8 +900,7 @@ const ExpenseModal = ({
     };
 
     const getNextMonthlyStartDate = (monthlyType, monthlyDay, todayValue) => {
-        const resolvedToday = todayValue ? new Date(todayValue) : new Date();
-        const todayDate = Number.isNaN(resolvedToday.getTime()) ? new Date() : resolvedToday;
+        const todayDate = parseStoredDate(todayValue) || new Date();
         const year = todayDate.getFullYear();
         const month = todayDate.getMonth();
 
@@ -915,10 +914,8 @@ const ExpenseModal = ({
     };
 
     const getNextYearlyStartDate = (yearlyDate, todayValue) => {
-        const resolvedToday = todayValue ? new Date(todayValue) : new Date();
-        const todayDate = Number.isNaN(resolvedToday.getTime()) ? new Date() : resolvedToday;
-        const baseDate = yearlyDate ? new Date(yearlyDate) : todayDate;
-        const baseValid = Number.isNaN(baseDate.getTime()) ? todayDate : baseDate;
+        const todayDate = parseStoredDate(todayValue) || new Date();
+        const baseValid = parseStoredDate(yearlyDate) || todayDate;
         const year = todayDate.getFullYear();
         const month = baseValid.getMonth();
         const day = baseValid.getDate();