fix(calendar): respect configured timezone

templates/calendar/actions/get-settings.ts

@@ -3,24 +3,20 @@ import { getRequestUserEmail } from "@agent-native/core/server";
 import { getUserSetting } from "@agent-native/core/settings";
 import { z } from "zod";
 
+import { getDefaultSettings } from "../server/lib/calendar-settings.js";
 import type { Settings } from "../shared/api.js";
 
-const DEFAULT_SETTINGS: Settings = {
-  timezone: "America/New_York",
-  bookingPageTitle: "Book a Meeting",
-  bookingPageDescription: "Select a time that works for you.",
-  defaultEventDuration: 30,
-};
-
 export default defineAction({
   description: "Get calendar settings",
   schema: z.object({}),
   http: { method: "GET" },
   run: async () => {
     const email = getRequestUserEmail();
     if (!email) throw new Error("no authenticated user");
-    const settings =
-      (await getUserSetting(email, "calendar-settings")) || DEFAULT_SETTINGS;
-    return settings;
+    const settings = (await getUserSetting(
+      email,
+      "calendar-settings",
+    )) as Settings | null;
+    return settings || getDefaultSettings();
   },
 });

templates/calendar/actions/list-events.test.ts

@@ -1,4 +1,4 @@
-import { beforeEach, describe, expect, it, vi } from "vitest";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 
 const getRequestTimezoneMock = vi.hoisted(() => vi.fn());
 const getRequestUserEmailMock = vi.hoisted(() => vi.fn());
@@ -252,6 +252,10 @@ describe("list-events inventory contract", () => {
     verifyShortLivedTokenMock.mockReturnValue({ ok: true });
   });
 
+  afterEach(() => {
+    vi.useRealTimers();
+  });
+
   it("keeps legacy callers on CalendarEvent arrays", async () => {
     const result = await (listEventsAction as any).run(
       { from: "2026-06-17", to: "2026-06-18" },
@@ -704,6 +708,62 @@ describe("list-events inventory contract", () => {
     expect(listGoogleEventsMock).not.toHaveBeenCalled();
   });
 
+  it("uses the saved timezone for omitted-range inventory cursors", async () => {
+    vi.useFakeTimers();
+    vi.setSystemTime(new Date("2026-06-17T12:00:00.000Z"));
+    getRequestTimezoneMock.mockReturnValue("UTC");
+    getUserSettingMock.mockResolvedValue({ timezone: "America/New_York" });
+    listGoogleEventsMock.mockResolvedValue({
+      events: [
+        {
+          id: "google-event-1",
+          googleEventId: "event-1",
+          title: "First",
+          description: "",
+          start: "2026-06-17T16:00:00.000Z",
+          end: "2026-06-17T16:30:00.000Z",
+          location: "",
+          allDay: false,
+          source: "google",
+          accountEmail: "steve@example.com",
+          createdAt: "2026-06-12T10:13:39.746Z",
+          updatedAt: "2026-06-12T10:13:39.746Z",
+        },
+        {
+          id: "google-event-2",
+          googleEventId: "event-2",
+          title: "Second",
+          description: "",
+          start: "2026-06-17T17:00:00.000Z",
+          end: "2026-06-17T17:30:00.000Z",
+          location: "",
+          allDay: false,
+          source: "google",
+          accountEmail: "steve@example.com",
+          createdAt: "2026-06-12T10:13:39.746Z",
+          updatedAt: "2026-06-12T10:13:39.746Z",
+        },
+      ],
+      errors: [],
+    });
+
+    const first = await (listEventsAction as any).run(
+      { format: "inventory", pageSize: 1, sources: ["google"] },
+      { caller: "mcp" },
+    );
+    const second = await (listEventsAction as any).run(
+      {
+        format: "inventory",
+        pageSize: 1,
+        sources: ["google"],
+        cursor: first.page.nextCursor,
+      },
+      { caller: "mcp" },
+    );
+
+    expect(second.items.map((item: any) => item.id)).toEqual(["event-2"]);
+  });
+
   it("rejects a malformed inventory cursor before provider reads", async () => {
     await expect(
       (listEventsAction as any).run(

templates/calendar/actions/list-events.ts

@@ -13,6 +13,7 @@ import { and, gte, inArray, lte, ne } from "drizzle-orm";
 import { z } from "zod";
 
 import { getDb, schema } from "../server/db/index.js";
+import { getCalendarTimezone } from "../server/lib/calendar-settings.js";
 import * as googleCalendar from "../server/lib/google-calendar.js";
 import { fetchICalEvents } from "../server/lib/ical-fetcher.js";
 import type { CalendarEvent, ExternalCalendar } from "../shared/api.js";
@@ -74,6 +75,7 @@ interface ListCalendarEventsArgs {
 interface ListCalendarEventsOptions {
   ownedAccounts?: string[];
   range?: CalendarEventRange;
+  timezone?: string;
 }
 
 type CalendarInventorySource = "google" | "bookings" | "ics" | "overlays";
@@ -578,11 +580,13 @@ export async function listCalendarEvents(
 ): Promise<CalendarEventsResult> {
   const email = getRequestUserEmail();
   if (!email) throw new Error("no authenticated user");
+  const timezone = options.timezone ?? (await getCalendarTimezone(email));
   const range =
     options.range ??
     resolveCalendarEventRange({
       from: args.from,
       to: args.to,
+      timezone,
     });
 
   const sources = resolveInventorySources(args.sources);
@@ -829,6 +833,9 @@ export default defineAction({
       args.format === "inventory" || (ctx?.caller === "mcp" && !args.format);
     const owner = inventory ? getRequestUserEmail() : undefined;
     if (inventory && !owner) throw new Error("no authenticated user");
+    const calendarTimezone = inventory
+      ? await getCalendarTimezone(owner!)
+      : undefined;
 
     // Reject invalid, expired, owner-bound, and query-bound cursors before any
     // provider call. Omitted account filters require the cheap owned-account
@@ -842,6 +849,7 @@ export default defineAction({
       preparedRange = resolveCalendarEventRange({
         from: args.from,
         to: args.to,
+        timezone: calendarTimezone,
       });
       preparedOwnedAccounts = args.accountEmails
         ? undefined
@@ -868,6 +876,7 @@ export default defineAction({
       {
         ownedAccounts: preparedOwnedAccounts,
         range: preparedRange,
+        timezone: calendarTimezone,
       },
     );
 

templates/calendar/actions/update-settings.ts

@@ -3,12 +3,20 @@ import { getRequestUserEmail } from "@agent-native/core/server";
 import { putUserSetting, putSetting } from "@agent-native/core/settings";
 import { z } from "zod";
 
+import { isCalendarTimezone } from "../server/lib/calendar-settings.js";
 import type { Settings } from "../shared/api.js";
 
 export default defineAction({
   description: "Update calendar settings",
   schema: z.object({
-    timezone: z.string().optional().describe("Timezone"),
+    timezone: z
+      .string()
+      .trim()
+      .refine(isCalendarTimezone, {
+        message: "Timezone must be a valid IANA timezone.",
+      })
+      .optional()
+      .describe("IANA timezone, e.g. Europe/Warsaw"),
     bookingPageTitle: z.string().optional().describe("Booking page title"),
     bookingPageDescription: z
       .string()

templates/calendar/actions/view-screen.ts

@@ -2,10 +2,13 @@ import { defineAction } from "@agent-native/core";
 import { readAppState } from "@agent-native/core/application-state";
 import { getRequestUserEmail } from "@agent-native/core/server";
 import { accessFilter } from "@agent-native/core/sharing";
+import { addDays, parseISO, startOfWeek } from "date-fns";
+import { fromZonedTime, toZonedTime } from "date-fns-tz";
 import { z } from "zod";
 
 import { getDb, schema } from "../server/db/index.js";
 import { rowToBookingLink } from "../server/lib/booking-link-utils.js";
+import { getCalendarTimezone } from "../server/lib/calendar-settings.js";
 import type { CalendarEvent, CalendarEventDraft } from "../shared/api.js";
 import {
   CALENDAR_VIEW_PREFERENCES_KEY,
@@ -67,18 +70,18 @@ export default defineAction({
     const nav = navigation as any;
 
     if (nav?.view === "calendar" || !nav?.view) {
-      const now = new Date();
-      const viewDate = nav?.date ? new Date(nav.date) : now;
-
-      const from = new Date(viewDate);
-      from.setDate(from.getDate() - from.getDay());
-      from.setHours(0, 0, 0, 0);
-      const to = new Date(from);
-      to.setDate(to.getDate() + 7);
+      const email = getRequestUserEmail();
+      if (!email) throw new Error("no authenticated user");
+      const timezone = await getCalendarTimezone(email);
+      const viewDate = nav?.date
+        ? parseISO(nav.date)
+        : toZonedTime(new Date(), timezone);
+      const from = startOfWeek(viewDate);
+      const to = addDays(from, 7);
 
       const eventResult = await fetchEventsForRange(
-        from.toISOString(),
-        to.toISOString(),
+        fromZonedTime(from, timezone).toISOString(),
+        fromZonedTime(to, timezone).toISOString(),
       );
       const { events } = eventResult;
 

templates/calendar/app/components/calendar/CommandPalette.tsx

@@ -13,6 +13,7 @@ import {
 } from "@tabler/icons-react";
 import * as chrono from "chrono-node";
 import { format, parseISO, parse, isValid } from "date-fns";
+import { toZonedTime } from "date-fns-tz";
 
 import { cn } from "@/lib/utils";
 
@@ -28,6 +29,7 @@ interface CommandPaletteProps {
   open: boolean;
   onClose: () => void;
   events: CalendarEvent[];
+  timezone?: string;
   onGoToDate: (date: Date) => void;
   onEventClick: (event: CalendarEvent) => void;
   onCreateEvent: () => void;
@@ -80,6 +82,7 @@ export function CommandPalette({
   open,
   onClose,
   events,
+  timezone,
   onGoToDate,
   onEventClick,
   onCreateEvent,
@@ -192,7 +195,12 @@ export function CommandPalette({
                 />
                 <span className="flex-1 truncate">{event.title}</span>
                 <span className="ml-2 text-xs text-muted-foreground">
-                  {format(parseISO(event.start), "MMM d")}
+                  {format(
+                    event.allDay || !timezone
+                      ? parseISO(event.start)
+                      : toZonedTime(event.start, timezone),
+                    "MMM d",
+                  )}
                 </span>
               </CommandMenu.Item>
             ))}