Multi-Agent Collaboration for Team and Friends
TypeScript agent-automationagent-orchestrationagent-workflowai-agentsai-collaborationai-memoryai-workforceautonomous-agentsclaude-codeclaude-code-skillscodexcoding-agentmulti-agentmultiple-agentone-person-businessone-person-companyone-person-teamopencodesolopreneur
feat: add week view for calendar
Gusf55b6e64913f
diff --git a/src/cli/daemon/execenv/context.ts b/src/cli/daemon/execenv/context.tsindex 4b9c203d4..4a5433c33 100644--- a/src/cli/daemon/execenv/context.ts+++ b/src/cli/daemon/execenv/context.ts@@ -117,6 +117,8 @@ Schedule future tasks for yourself. At the scheduled time, a new task is dispatc!USE Calendar when you think the tasks are recurring or it should be conducted in the future.---+Keep the event title informative and concise, less than 20 words.+Place the event details in description.Create a one-off event:- Run 'npx @alook/cli calendar set --agent_id ${task.agentId} --event_title "<TASK_TITLE>" --description "<TASK_BODY>" --datetime <YYYY-MM-DDTHH:MM>'- '--datetime' is LOCAL time, format 'YYYY-MM-DDTHH:MM' (e.g. '2026-04-17T09:30'). Do NOT pass UTC / ISO strings with 'Z'.@@ -126,7 +128,7 @@ Create a repeating event:- Add '--repeat <interval>' where interval is like '1day', '2hour', '1week', '1month'.- Optionally add '--repeat_stop_date <YYYY-MM-DD>' to stop the recurrence (local date).- Example: 'npx @alook/cli calendar set --agent_id ${task.agentId} --event_title "<REPEAT_TASK_TITLE>" --description "<REPEAT_TASK_BODY>" --datetime 2026-04-18T09:00 --repeat 1day --repeat_stop_date 2026-05-18'-+---List upcoming events:- Run 'npx @alook/cli calendar list --agent_id ${task.agentId}' (defaults: next 30 days, past 0 days).- Tune the window with '--future_days <N>' and '--past_days <N>'. Add '--json' for machine-readable output.diff --git a/src/web/src/app/(app)/w/[slug]/calendar/page.tsx b/src/web/src/app/(app)/w/[slug]/calendar/page.tsxindex 124dd939a..bfb688e39 100644--- a/src/web/src/app/(app)/w/[slug]/calendar/page.tsx+++ b/src/web/src/app/(app)/w/[slug]/calendar/page.tsx@@ -3,6 +3,7 @@import { useCallback, useEffect, useMemo, useRef, useState } from "react";import { useRouter, useSearchParams, usePathname } from "next/navigation";import { toast } from "sonner";+import { cn } from "@/lib/utils";import { useAgentContext } from "@/contexts/agent-context";import { useWorkspace } from "@/contexts/workspace-context";import { Button } from "@/components/ui/button";@@ -20,6 +21,7 @@ import {stepDate,} from "@/components/calendar/calendar-month-grid";import { CalendarAgenda } from "@/components/calendar/calendar-agenda";+import { CalendarWeekGrid } from "@/components/calendar/calendar-week-grid";import {CalendarViewSwitcher,parseCalendarView,@@ -27,6 +29,7 @@ import {} from "@/components/calendar/calendar-view-switcher";import { CalendarAgentFilter } from "@/components/calendar/calendar-agent-filter";import { CalendarEventSheet } from "@/components/calendar/calendar-event-sheet";+import { getWeekStart, weekRangeIso } from "@/components/calendar/calendar-week-utils";import type { CalendarEvent, UpdateCalendarEventRequest } from "@alook/shared";import { isTypingTarget } from "@/components/calendar/keyboard";@@ -90,6 +93,13 @@ export default function CalendarPage() {if (t.getFullYear() === initialYear && t.getMonth() === initialMonth) return t;return new Date(initialYear, initialMonth, 1);});+ const [weekAnchor, setWeekAnchor] = useState<Date>(() => {+ if (initialView === "week" && searchParams.has("d")) {+ const d = Number(searchParams.get("d"));+ return getWeekStart(new Date(initialYear, initialMonth, d));+ }+ return getWeekStart(new Date());+ });const [openPopoverKey, setOpenPopoverKey] = useState<string | null>(null);const [events, setEvents] = useState<CalendarEvent[]>([]);@@ -107,20 +117,27 @@ export default function CalendarPage() {nextYear: number,nextMonth: number,agentSet: Set<string>,- nextView: CalendarView+ nextView: CalendarView,+ weekAnchorDate?: Date | null) => {const params = new URLSearchParams();params.set("y", String(nextYear));params.set("m", String(nextMonth));if (agentSet.size > 0) params.set("agents", [...agentSet].join(","));if (nextView !== "month") params.set("view", nextView);+ if (nextView === "week" && weekAnchorDate) {+ params.set("d", String(weekAnchorDate.getDate()));+ }router.replace(`${pathname}?${params.toString()}`, { scroll: false });},[pathname, router]);const fetchEvents = useCallback(async () => {- const { from, to } = gridRangeIso(year, month);+ const { from, to } =+ view === "week"+ ? weekRangeIso(weekAnchor)+ : gridRangeIso(year, month);setLoading(true);try {const list = await listCalendarEvents(workspaceId, { from, to });@@ -130,7 +147,7 @@ export default function CalendarPage() {} finally {setLoading(false);}- }, [workspaceId, year, month]);+ }, [workspaceId, year, month, view, weekAnchor]);useEffect(() => {fetchEvents();@@ -159,12 +176,28 @@ export default function CalendarPage() {syncUrl(ny, nm, selectedAgents, view);}, [month, year, selectedAgents, view, syncUrl]);+ const handlePrevWeek = useCallback(() => {+ const prev = new Date(weekAnchor);+ prev.setDate(prev.getDate() - 7);+ setWeekAnchor(prev);+ setFocusedDate(prev);+ syncUrl(prev.getFullYear(), prev.getMonth(), selectedAgents, "week", prev);+ }, [weekAnchor, selectedAgents, syncUrl]);++ const handleNextWeek = useCallback(() => {+ const next = new Date(weekAnchor);+ next.setDate(next.getDate() + 7);+ setWeekAnchor(next);+ setFocusedDate(next);+ syncUrl(next.getFullYear(), next.getMonth(), selectedAgents, "week", next);+ }, [weekAnchor, selectedAgents, syncUrl]);+const handleToggleAgent = (agentId: string) => {const next = new Set(selectedAgents);if (next.has(agentId)) next.delete(agentId);else next.add(agentId);setSelectedAgents(next);- syncUrl(year, month, next, view);+ syncUrl(year, month, next, view, view === "week" ? weekAnchor : null);};const handleSelectDay = (date: Date) => {@@ -185,21 +218,47 @@ export default function CalendarPage() {setYear(ny);setMonth(nm);setFocusedDate(date);- syncUrl(ny, nm, selectedAgents, view);+ if (view === "week") {+ const anchor = getWeekStart(date);+ setWeekAnchor(anchor);+ syncUrl(ny, nm, selectedAgents, view, anchor);+ } else {+ syncUrl(ny, nm, selectedAgents, view);+ }},[selectedAgents, view, syncUrl]);const handleJumpToToday = useCallback(() => {- jumpToDate(new Date());- }, [jumpToDate]);+ const today = new Date();+ if (view === "week") {+ const anchor = getWeekStart(today);+ setWeekAnchor(anchor);+ setFocusedDate(today);+ syncUrl(anchor.getFullYear(), anchor.getMonth(), selectedAgents, "week", anchor);+ } else {+ jumpToDate(today);+ }+ }, [jumpToDate, view, selectedAgents, syncUrl]);const handleViewChange = useCallback((v: CalendarView) => {setView(v);- syncUrl(year, month, selectedAgents, v);+ if (v === "week") {+ const anchor = getWeekStart(focusedDate);+ setWeekAnchor(anchor);+ syncUrl(year, month, selectedAgents, v, anchor);+ } else if (view === "week") {+ const ny = weekAnchor.getFullYear();+ const nm = weekAnchor.getMonth();+ setYear(ny);+ setMonth(nm);+ syncUrl(ny, nm, selectedAgents, v);+ } else {+ syncUrl(year, month, selectedAgents, v);+ }},- [year, month, selectedAgents, syncUrl]+ [year, month, selectedAgents, syncUrl, focusedDate, view, weekAnchor]);const handleCreate = async (values: {@@ -213,11 +272,10 @@ export default function CalendarPage() {setSubmitting(true);try {const created = await createCalendarEvent(values, workspaceId);- // Only surface the new event in local state if it falls inside the- // currently-fetched grid window (the 42-cell span may reach into- // adjacent months). Otherwise let the next navigation refetch pick it- // up so out-of-range events don't leak into the agenda.- const { from, to } = gridRangeIso(year, month);+ const { from, to } =+ view === "week"+ ? weekRangeIso(weekAnchor)+ : gridRangeIso(year, month);const createdAt = new Date(created.scheduled_at).getTime();if (createdAt >= new Date(from).getTime() &&@@ -317,7 +375,12 @@ export default function CalendarPage() {if (e.key === "t") {e.preventDefault();const today = new Date();- if (today.getFullYear() !== year || today.getMonth() !== month) {+ if (view === "week") {+ const anchor = getWeekStart(today);+ setWeekAnchor(anchor);+ setFocusedDate(today);+ syncUrl(anchor.getFullYear(), anchor.getMonth(), selectedAgents, "week", anchor);+ } else if (today.getFullYear() !== year || today.getMonth() !== month) {jumpToDate(today);} else {setFocusedDate(today);@@ -333,8 +396,50 @@ export default function CalendarPage() {return;}- // Arrow / Enter / Page / Home / End are month-view-only.- if (view !== "month") return;+ // Arrow / Enter / Page / Home / End are for month and week views only.+ if (view !== "month" && view !== "week") return;++ if (view === "week") {+ if (e.key === "ArrowLeft") {+ e.preventDefault();+ const next = new Date(focusedDate);+ next.setDate(next.getDate() - 1);+ setFocusedDate(next);+ const anchor = getWeekStart(next);+ if (anchor.getTime() !== weekAnchor.getTime()) {+ setWeekAnchor(anchor);+ syncUrl(anchor.getFullYear(), anchor.getMonth(), selectedAgents, "week", anchor);+ }+ return;+ }+ if (e.key === "ArrowRight") {+ e.preventDefault();+ const next = new Date(focusedDate);+ next.setDate(next.getDate() + 1);+ setFocusedDate(next);+ const anchor = getWeekStart(next);+ if (anchor.getTime() !== weekAnchor.getTime()) {+ setWeekAnchor(anchor);+ syncUrl(anchor.getFullYear(), anchor.getMonth(), selectedAgents, "week", anchor);+ }+ return;+ }+ if (e.key === "ArrowUp") {+ e.preventDefault();+ const next = new Date(focusedDate);+ next.setHours(next.getHours() - 1);+ setFocusedDate(next);+ return;+ }+ if (e.key === "ArrowDown") {+ e.preventDefault();+ const next = new Date(focusedDate);+ next.setHours(next.getHours() + 1);+ setFocusedDate(next);+ return;+ }+ return;+ }const focusInGrid =document.activeElement?.getAttribute("role") === "gridcell";@@ -370,7 +475,7 @@ export default function CalendarPage() {};window.addEventListener("keydown", onKey);return () => window.removeEventListener("keydown", onKey);- }, [view, year, month, focusedDate, jumpToDate, hiddenCountForDate]);+ }, [view, year, month, focusedDate, jumpToDate, hiddenCountForDate, weekAnchor, selectedAgents, syncUrl]);// When focusedDate changes, move DOM focus onto that cell — but only if// focus is already inside the grid (don't steal focus on page load).@@ -409,14 +514,17 @@ export default function CalendarPage() {</div></div>- <div className="flex flex-1 flex-col gap-4 overflow-y-auto px-5 py-5">+ <div className={cn(+ "flex flex-1 flex-col gap-4 px-5 py-5",+ view === "week" ? "min-h-0 overflow-hidden" : "overflow-y-auto"+ )}><CalendarAgentFilteragents={agents}selected={selectedAgents}onToggle={handleToggleAgent}/>- {view === "month" ? (+ {view === "month" && (<CalendarMonthGridyear={year}month={month}@@ -433,7 +541,29 @@ export default function CalendarPage() {onSelectDay={handleSelectDay}onSelectEvent={handleSelectEvent}/>- ) : (+ )}++ {view === "week" && (+ <CalendarWeekGrid+ weekStart={weekAnchor}+ events={visibleEvents}+ agents={agents}+ loading={loading}+ focusedDate={focusedDate}+ onPrevWeek={handlePrevWeek}+ onNextWeek={handleNextWeek}+ onJumpToToday={handleJumpToToday}+ onJumpToDate={jumpToDate}+ onSelectSlot={(date, hour) => {+ const target = new Date(date.getFullYear(), date.getMonth(), date.getDate(), hour);+ setCreateDefault(target);+ setCreateOpen(true);+ }}+ onSelectEvent={handleSelectEvent}+ />+ )}++ {view === "agenda" && (<CalendarAgendaevents={visibleEvents}agents={agents}@@ -442,7 +572,7 @@ export default function CalendarPage() {/>)}- {view === "month" &&+ {(view === "month" || view === "week") &&!loading &&events.length > 0 &&visibleEvents.length === 0 && (diff --git a/src/web/src/components/calendar/calendar-agenda.tsx b/src/web/src/components/calendar/calendar-agenda.tsxindex d1936c282..7545676c4 100644--- a/src/web/src/components/calendar/calendar-agenda.tsx+++ b/src/web/src/components/calendar/calendar-agenda.tsx@@ -3,7 +3,8 @@import { cn } from "@/lib/utils";import type { CalendarEvent, Agent } from "@alook/shared";import { Skeleton } from "@/components/ui/skeleton";-import { agentColor, dateKey } from "./calendar-month-grid";+import { agentColor } from "./calendar-colors";+import { dateKey } from "./calendar-month-grid";import { formatRepeatDisplay } from "./repeat-interval-utils";export interface CalendarAgendaProps {diff --git a/src/web/src/components/calendar/calendar-colors.ts b/src/web/src/components/calendar/calendar-colors.tsnew file mode 100644index 000000000..e0e0a7099--- /dev/null+++ b/src/web/src/components/calendar/calendar-colors.ts@@ -0,0 +1,41 @@+export function agentColor(agentId: string): string {+ const palette = [+ "bg-[oklch(0.78_0.08_60)] text-[oklch(0.25_0.05_60)]",+ "bg-[oklch(0.80_0.07_120)] text-[oklch(0.25_0.05_120)]",+ "bg-[oklch(0.80_0.06_220)] text-[oklch(0.25_0.05_220)]",+ "bg-[oklch(0.80_0.07_30)] text-[oklch(0.25_0.05_30)]",+ "bg-[oklch(0.80_0.06_280)] text-[oklch(0.25_0.05_280)]",+ "bg-[oklch(0.80_0.07_160)] text-[oklch(0.25_0.05_160)]",+ ];+ let h = 0;+ for (let i = 0; i < agentId.length; i++) h = (h * 31 + agentId.charCodeAt(i)) | 0;+ return palette[Math.abs(h) % palette.length]!;+}++export function agentDot(agentId: string): string {+ const palette = [+ "bg-[oklch(0.62_0.13_60)] dark:bg-[oklch(0.72_0.11_60)]",+ "bg-[oklch(0.62_0.12_120)] dark:bg-[oklch(0.72_0.10_120)]",+ "bg-[oklch(0.62_0.12_220)] dark:bg-[oklch(0.72_0.10_220)]",+ "bg-[oklch(0.62_0.13_30)] dark:bg-[oklch(0.72_0.11_30)]",+ "bg-[oklch(0.62_0.12_280)] dark:bg-[oklch(0.72_0.10_280)]",+ "bg-[oklch(0.62_0.12_160)] dark:bg-[oklch(0.72_0.10_160)]",+ ];+ let h = 0;+ for (let i = 0; i < agentId.length; i++) h = (h * 31 + agentId.charCodeAt(i)) | 0;+ return palette[Math.abs(h) % palette.length]!;+}++export function agentInk(agentId: string): string {+ const palette = [+ "text-[oklch(0.52_0.14_60)] dark:text-[oklch(0.78_0.11_60)]",+ "text-[oklch(0.52_0.13_120)] dark:text-[oklch(0.78_0.10_120)]",+ "text-[oklch(0.52_0.13_220)] dark:text-[oklch(0.78_0.10_220)]",+ "text-[oklch(0.52_0.14_30)] dark:text-[oklch(0.78_0.11_30)]",+ "text-[oklch(0.52_0.13_280)] dark:text-[oklch(0.78_0.10_280)]",+ "text-[oklch(0.52_0.13_160)] dark:text-[oklch(0.78_0.10_160)]",+ ];+ let h = 0;+ for (let i = 0; i < agentId.length; i++) h = (h * 31 + agentId.charCodeAt(i)) | 0;+ return palette[Math.abs(h) % palette.length]!;+}diff --git a/src/web/src/components/calendar/calendar-month-grid.tsx b/src/web/src/components/calendar/calendar-month-grid.tsxindex e86aa84bc..8a618310a 100644--- a/src/web/src/components/calendar/calendar-month-grid.tsx+++ b/src/web/src/components/calendar/calendar-month-grid.tsx@@ -6,51 +6,7 @@ import { ChevronLeft, ChevronRight, Repeat } from "lucide-react";import { Button } from "@/components/ui/button";import { CalendarDayPopover } from "./calendar-day-popover";import { CalendarDatePicker } from "./calendar-date-picker";--function agentColor(agentId: string): string {- // Deterministic warm palette derived from the agent id.- const palette = [- "bg-[oklch(0.78_0.08_60)] text-[oklch(0.25_0.05_60)]",- "bg-[oklch(0.80_0.07_120)] text-[oklch(0.25_0.05_120)]",- "bg-[oklch(0.80_0.06_220)] text-[oklch(0.25_0.05_220)]",- "bg-[oklch(0.80_0.07_30)] text-[oklch(0.25_0.05_30)]",- "bg-[oklch(0.80_0.06_280)] text-[oklch(0.25_0.05_280)]",- "bg-[oklch(0.80_0.07_160)] text-[oklch(0.25_0.05_160)]",- ];- let h = 0;- for (let i = 0; i < agentId.length; i++) h = (h * 31 + agentId.charCodeAt(i)) | 0;- return palette[Math.abs(h) % palette.length]!;-}--// Tailwind v4 JIT only picks up classes that appear literally in source —-// so each palette entry must be a fully-enumerated class string.-function agentDot(agentId: string): string {- const palette = [- "bg-[oklch(0.62_0.13_60)] dark:bg-[oklch(0.72_0.11_60)]",- "bg-[oklch(0.62_0.12_120)] dark:bg-[oklch(0.72_0.10_120)]",- "bg-[oklch(0.62_0.12_220)] dark:bg-[oklch(0.72_0.10_220)]",- "bg-[oklch(0.62_0.13_30)] dark:bg-[oklch(0.72_0.11_30)]",- "bg-[oklch(0.62_0.12_280)] dark:bg-[oklch(0.72_0.10_280)]",- "bg-[oklch(0.62_0.12_160)] dark:bg-[oklch(0.72_0.10_160)]",- ];- let h = 0;- for (let i = 0; i < agentId.length; i++) h = (h * 31 + agentId.charCodeAt(i)) | 0;- return palette[Math.abs(h) % palette.length]!;-}--function agentInk(agentId: string): string {- const palette = [- "text-[oklch(0.52_0.14_60)] dark:text-[oklch(0.78_0.11_60)]",- "text-[oklch(0.52_0.13_120)] dark:text-[oklch(0.78_0.10_120)]",- "text-[oklch(0.52_0.13_220)] dark:text-[oklch(0.78_0.10_220)]",- "text-[oklch(0.52_0.14_30)] dark:text-[oklch(0.78_0.11_30)]",- "text-[oklch(0.52_0.13_280)] dark:text-[oklch(0.78_0.10_280)]",- "text-[oklch(0.52_0.13_160)] dark:text-[oklch(0.78_0.10_160)]",- ];- let h = 0;- for (let i = 0; i < agentId.length; i++) h = (h * 31 + agentId.charCodeAt(i)) | 0;- return palette[Math.abs(h) % palette.length]!;-}+import { agentColor, agentDot, agentInk } from "./calendar-colors";export function buildMonthCells(year: number, month: number): { date: Date; inMonth: boolean }[] {const first = new Date(year, month, 1);diff --git a/src/web/src/components/calendar/calendar-view-switcher.test.ts b/src/web/src/components/calendar/calendar-view-switcher.test.tsindex a97b7c463..d561a28e1 100644--- a/src/web/src/components/calendar/calendar-view-switcher.test.ts+++ b/src/web/src/components/calendar/calendar-view-switcher.test.ts@@ -12,9 +12,13 @@ describe("parseCalendarView", () => {expect(parseCalendarView("agenda")).toBe("agenda");});+ it("returns 'week' when explicitly set", () => {+ expect(parseCalendarView("week")).toBe("week");+ });+it("clamps unknown values to 'month'", () => {- expect(parseCalendarView("week")).toBe("month");expect(parseCalendarView("bogus")).toBe("month");expect(parseCalendarView("MONTH")).toBe("month");+ expect(parseCalendarView("WEEK")).toBe("month");});});diff --git a/src/web/src/components/calendar/calendar-view-switcher.tsx b/src/web/src/components/calendar/calendar-view-switcher.tsxindex 1d5e94317..be14b2e49 100644--- a/src/web/src/components/calendar/calendar-view-switcher.tsx+++ b/src/web/src/components/calendar/calendar-view-switcher.tsx@@ -2,10 +2,12 @@import { cn } from "@/lib/utils";-export type CalendarView = "month" | "agenda";+export type CalendarView = "month" | "week" | "agenda";export function parseCalendarView(raw: string | null | undefined): CalendarView {- return raw === "agenda" ? "agenda" : "month";+ if (raw === "week") return "week";+ if (raw === "agenda") return "agenda";+ return "month";}export interface CalendarViewSwitcherProps {@@ -20,7 +22,7 @@ export function CalendarViewSwitcher({ view, onChange }: CalendarViewSwitcherProaria-label="Calendar view"className="inline-flex items-center rounded-md border border-border bg-background p-0.5">- {(["month", "agenda"] as const).map((v) => {+ {(["month", "week", "agenda"] as const).map((v) => {const active = view === v;return (<buttondiff --git a/src/web/src/components/calendar/calendar-week-grid.tsx b/src/web/src/components/calendar/calendar-week-grid.tsxnew file mode 100644index 000000000..c51c3cb70--- /dev/null+++ b/src/web/src/components/calendar/calendar-week-grid.tsx@@ -0,0 +1,381 @@+"use client";++import { useEffect, useRef, useMemo } from "react";+import { cn } from "@/lib/utils";+import type { CalendarEvent, Agent } from "@alook/shared";+import { ChevronLeft, ChevronRight } from "lucide-react";+import { Button } from "@/components/ui/button";+import { Skeleton } from "@/components/ui/skeleton";+import { CalendarDatePicker } from "./calendar-date-picker";+import { agentColor } from "./calendar-colors";+import {+ getWeekLabel,+ getLocalFractionalHour,+ computeEventLayout,+ type LayoutEvent,+} from "./calendar-week-utils";+import { dateKey, sameDay } from "./calendar-month-grid";++const HOUR_HEIGHT = 48;+const EVENT_HEIGHT = 24;+const HOURS = Array.from({ length: 24 }, (_, i) => i);++function formatHourLabel(hour: number, compact: boolean): string {+ if (compact) {+ if (hour === 0) return "12a";+ if (hour < 12) return `${hour}a`;+ if (hour === 12) return "12p";+ return `${hour - 12}p`;+ }+ return `${String(hour).padStart(2, "0")}:00`;+}++function formatDayHeader(date: Date, compact: boolean): string {+ if (compact) {+ return ["S", "M", "T", "W", "T", "F", "S"][date.getDay()]!;+ }+ const weekday = date.toLocaleDateString("en-US", { weekday: "short" });+ return `${weekday} ${date.getDate()}`;+}++export interface CalendarWeekGridProps {+ weekStart: Date;+ events: CalendarEvent[];+ agents: Agent[];+ loading: boolean;+ focusedDate: Date;+ onPrevWeek: () => void;+ onNextWeek: () => void;+ onJumpToToday: () => void;+ onJumpToDate: (date: Date) => void;+ onSelectSlot: (date: Date, hour: number) => void;+ onSelectEvent: (event: CalendarEvent) => void;+ headerExtras?: React.ReactNode;+}++export function CalendarWeekGrid({+ weekStart,+ events,+ agents,+ loading,+ focusedDate,+ onPrevWeek,+ onNextWeek,+ onJumpToToday,+ onJumpToDate,+ onSelectSlot,+ onSelectEvent,+ headerExtras,+}: CalendarWeekGridProps) {+ const scrollRef = useRef<HTMLDivElement>(null);+ const didAutoScroll = useRef(false);++ const today = new Date();+ const weekEnd = new Date(weekStart);+ weekEnd.setDate(weekEnd.getDate() + 6);++ const weekLabel = getWeekLabel(weekStart, weekEnd);+ const isCurrentWeek =+ today >= weekStart &&+ today <=+ new Date(+ weekEnd.getFullYear(),+ weekEnd.getMonth(),+ weekEnd.getDate(),+ 23,+ 59,+ 59,+ 999+ );++ const days = useMemo(() => {+ const arr: Date[] = [];+ for (let i = 0; i < 7; i++) {+ const d = new Date(weekStart);+ d.setDate(weekStart.getDate() + i);+ arr.push(d);+ }+ return arr;+ }, [weekStart.getTime()]);++ const eventsByDay = useMemo(() => {+ const map = new Map<string, CalendarEvent[]>();+ for (const ev of events) {+ const key = dateKey(new Date(ev.scheduled_at));+ if (!map.has(key)) map.set(key, []);+ map.get(key)!.push(ev);+ }+ return map;+ }, [events]);++ const layoutByDay = useMemo(() => {+ const map = new Map<string, LayoutEvent[]>();+ for (const [key, dayEvents] of eventsByDay) {+ map.set(key, computeEventLayout(dayEvents));+ }+ return map;+ }, [eventsByDay]);++ const agentNameById = useMemo(() => {+ const map = new Map<string, string>();+ for (const a of agents) map.set(a.id, a.name);+ return map;+ }, [agents]);++ useEffect(() => {+ if (didAutoScroll.current) return;+ if (!scrollRef.current) return;+ const now = new Date();+ const scrollTo = Math.max(0, (now.getHours() - 1) * HOUR_HEIGHT);+ scrollRef.current.scrollTop = scrollTo;+ didAutoScroll.current = true;+ }, []);++ const currentFractionalHour = useMemo(() => {+ const now = new Date();+ return now.getHours() + now.getMinutes() / 60;+ }, []);++ if (loading && events.length === 0) {+ return (+ <div className="flex flex-1 flex-col gap-3 min-h-0">+ <div className="flex items-center justify-between flex-wrap gap-2 shrink-0">+ <Skeleton className="h-5 w-48" />+ <Skeleton className="h-7 w-32" />+ </div>+ <div className="flex-1 min-h-0 flex flex-col rounded-lg border border-border/50 overflow-hidden">+ <div className="grid grid-cols-[3.5rem_repeat(7,1fr)] border-b border-border/30 shrink-0">+ <div className="h-8" />+ {Array.from({ length: 7 }).map((_, i) => (+ <Skeleton key={i} className="h-5 mx-2 my-1.5" />+ ))}+ </div>+ <div className="flex-1 min-h-0 overflow-hidden">+ {Array.from({ length: 12 }).map((_, i) => (+ <div+ key={i}+ className="grid grid-cols-[3.5rem_repeat(7,1fr)] border-b border-border/10"+ style={{ height: HOUR_HEIGHT }}+ >+ <Skeleton className="h-3 w-8 mx-1 my-2" />+ {Array.from({ length: 7 }).map((_, j) => (+ <div key={j} className="relative">+ {i % 4 === j % 3 && (+ <Skeleton+ className="absolute left-1 right-1 top-2 rounded-sm"+ style={{ height: EVENT_HEIGHT }}+ />+ )}+ </div>+ ))}+ </div>+ ))}+ </div>+ </div>+ </div>+ );+ }++ return (+ <div className="flex flex-1 flex-col gap-3 min-h-0">+ <div className="flex items-center justify-between flex-wrap gap-2 shrink-0">+ <h2 className="text-sm font-medium tabular-nums">{weekLabel}</h2>+ <div className="flex items-center gap-2">+ {headerExtras}+ <div className="flex items-center gap-1">+ <button+ type="button"+ aria-label="Previous week"+ onClick={onPrevWeek}+ className="flex size-7 items-center justify-center rounded-md text-muted-foreground hover:bg-accent hover:text-foreground transition-colors"+ >+ <ChevronLeft className="size-4" />+ </button>+ <Button+ variant="outline"+ size="sm"+ onClick={onJumpToToday}+ disabled={isCurrentWeek}+ className="h-7 px-2.5 text-xs"+ >+ Today+ </Button>+ <button+ type="button"+ aria-label="Next week"+ onClick={onNextWeek}+ className="flex size-7 items-center justify-center rounded-md text-muted-foreground hover:bg-accent hover:text-foreground transition-colors"+ >+ <ChevronRight className="size-4" />+ </button>+ </div>+ <CalendarDatePicker+ value={focusedDate}+ onChange={onJumpToDate}+ ariaLabel="Jump to date"+ />+ </div>+ </div>++ <div className="relative flex-1 min-h-0 flex flex-col rounded-lg border border-border/50 overflow-hidden">+ {loading && (+ <div+ aria-hidden+ className="pointer-events-none absolute inset-x-0 top-0 z-20 h-0.5 overflow-hidden rounded-t-lg"+ >+ <div className="h-full w-1/3 animate-[calendar-progress_1.2s_ease-in-out_infinite] bg-foreground/40" />+ </div>+ )}++ <div+ role="grid"+ aria-label={`Week of ${weekLabel}`}+ aria-busy={loading || undefined}+ className={cn(+ "flex flex-1 flex-col min-h-0 transition-opacity",+ loading && "opacity-70"+ )}+ >+ {/* Sticky day headers */}+ <div+ role="row"+ className="sticky top-0 z-10 grid grid-cols-[3.5rem_repeat(7,1fr)] border-b border-border/30 bg-background"+ >+ <div role="columnheader" className="h-8" />+ {days.map((day) => {+ const isToday = sameDay(day, today);+ const compact = false; // TODO: responsive via media query hook if needed+ return (+ <div+ key={dateKey(day)}+ role="columnheader"+ aria-current={isToday ? "date" : undefined}+ className={cn(+ "flex items-center justify-center h-8 text-xs font-medium",+ isToday+ ? "text-foreground"+ : "text-muted-foreground"+ )}+ >+ <span+ className={cn(+ "px-1.5 py-0.5 rounded-md",+ isToday && "bg-foreground text-background"+ )}+ >+ {formatDayHeader(day, compact)}+ </span>+ </div>+ );+ })}+ </div>++ {/* Scrollable time grid */}+ <div+ ref={scrollRef}+ className="flex-1 min-h-0 overflow-y-auto thin-scrollbar"+ >+ <div className="relative grid grid-cols-[3.5rem_repeat(7,1fr)]">+ {/* Time gutter */}+ <div role="rowheader" className="relative">+ {HOURS.map((hour) => (+ <div+ key={hour}+ className="flex items-start justify-end pr-2 text-[10px] text-muted-foreground tabular-nums"+ style={{ height: HOUR_HEIGHT }}+ >+ <span className="-mt-1.5">+ {hour === 0 ? "" : formatHourLabel(hour, false)}+ </span>+ </div>+ ))}+ </div>++ {/* Day columns */}+ {days.map((day) => {+ const key = dateKey(day);+ const isToday = sameDay(day, today);+ const layoutEvents = layoutByDay.get(key) ?? [];++ return (+ <div+ key={key}+ className="relative border-l border-border/20"+ style={{ height: HOUR_HEIGHT * 24 }}+ >+ {/* Hour slots */}+ {HOURS.map((hour) => (+ <div+ key={hour}+ className="absolute inset-x-0 border-t border-border/15 cursor-pointer hover:bg-accent/30 transition-colors"+ style={{ top: hour * HOUR_HEIGHT, height: HOUR_HEIGHT }}+ onClick={() => onSelectSlot(day, hour)}+ />+ ))}++ {/* Current time indicator */}+ {isToday && (+ <div+ className="absolute inset-x-0 z-10 pointer-events-none"+ style={{ top: currentFractionalHour * HOUR_HEIGHT }}+ >+ <div className="h-px bg-foreground/40" />+ <div className="absolute -left-0.5 -top-[3px] size-[7px] rounded-full bg-foreground/40" />+ </div>+ )}++ {/* Events */}+ {layoutEvents.map(({ event, columnIndex, columnCount }) => {+ const fracHour = getLocalFractionalHour(+ event.scheduled_at+ );+ const top = fracHour * HOUR_HEIGHT;+ const widthPercent = 100 / columnCount;+ const leftPercent = columnIndex * widthPercent;+ const agentName = agentNameById.get(event.agent_id);+ const timeStr = new Date(+ event.scheduled_at+ ).toLocaleTimeString(undefined, {+ hour: "2-digit",+ minute: "2-digit",+ hour12: false,+ });++ return (+ <button+ key={`${event.id}@${event.occurrence_at}`}+ type="button"+ role="button"+ aria-label={`${event.title} at ${timeStr}${agentName ? ` \u2014 ${agentName}` : ""}`}+ onClick={(e) => {+ e.stopPropagation();+ onSelectEvent(event);+ }}+ className={cn(+ "absolute rounded-sm px-1.5 text-[10px] font-medium truncate text-left transition-colors hover:opacity-80 cursor-pointer",+ agentColor(event.agent_id)+ )}+ style={{+ top,+ height: EVENT_HEIGHT,+ left: `${leftPercent}%`,+ width: `calc(${widthPercent}% - 2px)`,+ marginLeft: 1,+ lineHeight: `${EVENT_HEIGHT}px`,+ }}+ title={`${event.title}${agentName ? ` \u2014 ${agentName}` : ""}`}+ >+ {event.title}+ </button>+ );+ })}+ </div>+ );+ })}+ </div>+ </div>+ </div>+ </div>+ </div>+ );+}diff --git a/src/web/src/components/calendar/calendar-week-utils.test.ts b/src/web/src/components/calendar/calendar-week-utils.test.tsnew file mode 100644index 000000000..8c94ea2db--- /dev/null+++ b/src/web/src/components/calendar/calendar-week-utils.test.ts@@ -0,0 +1,210 @@+import { describe, it, expect } from "vitest";+import {+ getWeekStart,+ getWeekEnd,+ getWeekLabel,+ getLocalFractionalHour,+ computeEventLayout,+ weekRangeIso,+} from "./calendar-week-utils";+import type { CalendarEvent } from "@alook/shared";++function makeEvent(scheduled_at: string, id = "ev_1"): CalendarEvent {+ return {+ id,+ workspace_id: "ws_1",+ agent_id: "ag_1",+ title: "Test",+ description: null,+ scheduled_at,+ repeat_interval: null,+ repeat_stop_date: null,+ occurrence_at: scheduled_at,+ created_at: scheduled_at,+ updated_at: scheduled_at,+ } as CalendarEvent;+}++describe("getWeekStart", () => {+ it("returns Sunday for any input date (Thu Apr 23 → Sun Apr 19)", () => {+ const result = getWeekStart(new Date(2026, 3, 23));+ expect(result.getDay()).toBe(0);+ expect(result.getFullYear()).toBe(2026);+ expect(result.getMonth()).toBe(3);+ expect(result.getDate()).toBe(19);+ });++ it("returns the same day if already Sunday", () => {+ const sunday = new Date(2026, 3, 19);+ const result = getWeekStart(sunday);+ expect(result.getDay()).toBe(0);+ expect(result.getDate()).toBe(19);+ });++ it("handles month boundaries (Wed Apr 1 → Sun Mar 29)", () => {+ const result = getWeekStart(new Date(2026, 3, 1));+ expect(result.getDay()).toBe(0);+ expect(result.getMonth()).toBe(2); // March+ expect(result.getDate()).toBe(29);+ });++ it("handles year boundaries (Thu Jan 1, 2026 → Sunday Dec 28, 2025)", () => {+ const result = getWeekStart(new Date(2026, 0, 1));+ expect(result.getDay()).toBe(0);+ expect(result.getFullYear()).toBe(2025);+ expect(result.getMonth()).toBe(11); // December+ expect(result.getDate()).toBe(28);+ });++ it("sets time to 00:00:00.000", () => {+ const result = getWeekStart(new Date(2026, 3, 23, 15, 30, 45));+ expect(result.getHours()).toBe(0);+ expect(result.getMinutes()).toBe(0);+ expect(result.getSeconds()).toBe(0);+ expect(result.getMilliseconds()).toBe(0);+ });+});++describe("getWeekEnd", () => {+ it("returns Saturday 23:59:59.999 for any input", () => {+ const result = getWeekEnd(new Date(2026, 3, 23));+ expect(result.getDay()).toBe(6); // Saturday+ expect(result.getHours()).toBe(23);+ expect(result.getMinutes()).toBe(59);+ expect(result.getSeconds()).toBe(59);+ expect(result.getMilliseconds()).toBe(999);+ });++ it("handles month boundaries", () => {+ // Week containing Mar 30, 2026 (Sunday): ends Apr 4 (Saturday)+ const result = getWeekEnd(new Date(2026, 2, 30));+ expect(result.getDay()).toBe(6);+ expect(result.getMonth()).toBe(3); // April+ expect(result.getDate()).toBe(4);+ });+});++describe("getWeekLabel", () => {+ it("formats same-month weeks", () => {+ const start = new Date(2026, 3, 20); // Apr 20+ const end = new Date(2026, 3, 26); // Apr 26+ expect(getWeekLabel(start, end)).toBe("Apr 20\u201326, 2026");+ });++ it("formats cross-month weeks", () => {+ const start = new Date(2026, 2, 30); // Mar 30+ const end = new Date(2026, 3, 5); // Apr 5+ expect(getWeekLabel(start, end)).toBe("Mar 30\u2013Apr 5, 2026");+ });++ it("formats cross-year weeks", () => {+ const start = new Date(2025, 11, 28); // Dec 28, 2025+ const end = new Date(2026, 0, 3); // Jan 3, 2026+ expect(getWeekLabel(start, end)).toBe("Dec 28, 2025\u2013Jan 3, 2026");+ });+});++describe("getLocalFractionalHour", () => {+ it("returns correct fractional hour for full hour", () => {+ const d = new Date(2026, 3, 20, 10, 0, 0);+ expect(getLocalFractionalHour(d.toISOString())).toBe(10);+ });++ it("returns correct fractional hour for half-hour", () => {+ const d = new Date(2026, 3, 20, 10, 30, 0);+ expect(getLocalFractionalHour(d.toISOString())).toBe(10.5);+ });++ it("returns correct fractional hour for midnight", () => {+ const d = new Date(2026, 3, 20, 0, 0, 0);+ expect(getLocalFractionalHour(d.toISOString())).toBe(0);+ });++ it("returns correct fractional hour for 23:45", () => {+ const d = new Date(2026, 3, 20, 23, 45, 0);+ expect(getLocalFractionalHour(d.toISOString())).toBe(23.75);+ });+});++describe("computeEventLayout", () => {+ it("returns empty array for empty input", () => {+ expect(computeEventLayout([])).toEqual([]);+ });++ it("single event gets columnIndex=0, columnCount=1", () => {+ const events = [makeEvent("2026-04-20T10:00:00.000Z")];+ const result = computeEventLayout(events);+ expect(result).toHaveLength(1);+ expect(result[0]!.columnIndex).toBe(0);+ expect(result[0]!.columnCount).toBe(1);+ });++ it("non-overlapping events each get columnCount=1", () => {+ const events = [+ makeEvent("2026-04-20T10:00:00.000Z", "ev_1"),+ makeEvent("2026-04-20T14:00:00.000Z", "ev_2"),+ ];+ const result = computeEventLayout(events);+ expect(result).toHaveLength(2);+ expect(result[0]!.columnCount).toBe(1);+ expect(result[1]!.columnCount).toBe(1);+ });++ it("2 overlapping events get columnCount=2, indices 0 and 1", () => {+ const events = [+ makeEvent("2026-04-20T10:00:00.000Z", "ev_1"),+ makeEvent("2026-04-20T10:15:00.000Z", "ev_2"),+ ];+ const result = computeEventLayout(events);+ expect(result).toHaveLength(2);+ expect(result[0]!.columnCount).toBe(2);+ expect(result[1]!.columnCount).toBe(2);+ expect(result[0]!.columnIndex).toBe(0);+ expect(result[1]!.columnIndex).toBe(1);+ });++ it("3 events where only 2 overlap: correct grouping", () => {+ const events = [+ makeEvent("2026-04-20T10:00:00.000Z", "ev_1"),+ makeEvent("2026-04-20T10:15:00.000Z", "ev_2"),+ makeEvent("2026-04-20T14:00:00.000Z", "ev_3"),+ ];+ const result = computeEventLayout(events);+ expect(result).toHaveLength(3);+ // First two overlap+ const group1 = result.filter((r) => r.event.id === "ev_1" || r.event.id === "ev_2");+ expect(group1[0]!.columnCount).toBe(2);+ expect(group1[1]!.columnCount).toBe(2);+ // Third is separate+ const group2 = result.find((r) => r.event.id === "ev_3")!;+ expect(group2.columnCount).toBe(1);+ expect(group2.columnIndex).toBe(0);+ });+});++describe("weekRangeIso", () => {+ it("returns correct ISO range for a given Sunday anchor", () => {+ const anchor = new Date(2026, 3, 19); // Sunday Apr 19+ const { from, to } = weekRangeIso(anchor);+ const fromDate = new Date(from);+ const toDate = new Date(to);+ expect(fromDate.getDay()).toBe(0); // Sunday+ expect(toDate.getDay()).toBe(6); // Saturday+ expect(toDate.getHours()).toBe(23);+ expect(toDate.getMinutes()).toBe(59);+ });++ it("handles month/year boundaries", () => {+ // Thursday Jan 1, 2026 → week starts Dec 28, 2025+ const anchor = new Date(2026, 0, 1);+ const { from, to } = weekRangeIso(anchor);+ const fromDate = new Date(from);+ expect(fromDate.getFullYear()).toBe(2025);+ expect(fromDate.getMonth()).toBe(11);+ expect(fromDate.getDate()).toBe(28);+ const toDate = new Date(to);+ expect(toDate.getFullYear()).toBe(2026);+ expect(toDate.getMonth()).toBe(0);+ expect(toDate.getDate()).toBe(3);+ });+});diff --git a/src/web/src/components/calendar/calendar-week-utils.ts b/src/web/src/components/calendar/calendar-week-utils.tsnew file mode 100644index 000000000..98eb2595a--- /dev/null+++ b/src/web/src/components/calendar/calendar-week-utils.ts@@ -0,0 +1,90 @@+import type { CalendarEvent } from "@alook/shared";++export function getWeekStart(date: Date): Date {+ const d = new Date(date.getFullYear(), date.getMonth(), date.getDate());+ d.setDate(d.getDate() - d.getDay());+ return d;+}++export function getWeekEnd(date: Date): Date {+ const start = getWeekStart(date);+ const end = new Date(start);+ end.setDate(end.getDate() + 6);+ end.setHours(23, 59, 59, 999);+ return end;+}++export function getWeekLabel(start: Date, end: Date): string {+ const startMonth = start.toLocaleDateString("en-US", { month: "short" });+ const endMonth = end.toLocaleDateString("en-US", { month: "short" });+ const startYear = start.getFullYear();+ const endYear = end.getFullYear();++ if (startYear !== endYear) {+ return `${startMonth} ${start.getDate()}, ${startYear}\u2013${endMonth} ${end.getDate()}, ${endYear}`;+ }+ if (startMonth !== endMonth) {+ return `${startMonth} ${start.getDate()}\u2013${endMonth} ${end.getDate()}, ${endYear}`;+ }+ return `${startMonth} ${start.getDate()}\u2013${end.getDate()}, ${startYear}`;+}++export function getLocalFractionalHour(iso: string): number {+ const d = new Date(iso);+ return d.getHours() + d.getMinutes() / 60;+}++export interface LayoutEvent {+ event: CalendarEvent;+ columnIndex: number;+ columnCount: number;+}++export function computeEventLayout(events: CalendarEvent[]): LayoutEvent[] {+ if (events.length === 0) return [];++ const sorted = [...events].sort(+ (a, b) =>+ new Date(a.scheduled_at).getTime() - new Date(b.scheduled_at).getTime()+ );++ const OVERLAP_THRESHOLD_MS = 30 * 60 * 1000;++ const groups: CalendarEvent[][] = [];+ let currentGroup: CalendarEvent[] = [sorted[0]!];+ let groupEnd = new Date(sorted[0]!.scheduled_at).getTime() + OVERLAP_THRESHOLD_MS;++ for (let i = 1; i < sorted.length; i++) {+ const evTime = new Date(sorted[i]!.scheduled_at).getTime();+ if (evTime < groupEnd) {+ currentGroup.push(sorted[i]!);+ const newEnd = evTime + OVERLAP_THRESHOLD_MS;+ if (newEnd > groupEnd) groupEnd = newEnd;+ } else {+ groups.push(currentGroup);+ currentGroup = [sorted[i]!];+ groupEnd = evTime + OVERLAP_THRESHOLD_MS;+ }+ }+ groups.push(currentGroup);++ const result: LayoutEvent[] = [];+ for (const group of groups) {+ const count = group.length;+ for (let idx = 0; idx < group.length; idx++) {+ result.push({+ event: group[idx]!,+ columnIndex: idx,+ columnCount: count,+ });+ }+ }++ return result;+}++export function weekRangeIso(anchor: Date): { from: string; to: string } {+ const start = getWeekStart(anchor);+ const end = getWeekEnd(anchor);+ return { from: start.toISOString(), to: end.toISOString() };+}