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 calendar loop v1
Gus8514ff44c610
diff --git a/AGENTS.md b/AGENTS.mdindex 3cfa4f2b9..de294c860 100644--- a/AGENTS.md+++ b/AGENTS.md@@ -10,7 +10,7 @@ Alook's main purpose is to make the cli agent always on, and give it a email add- `src/ws-do`: WebSocket Durable Object worker## MUST-- run `pnpm typecheck`, `pnpm test`, `pnpm test:e2e` as the final check when you think the code is ready.+- run `pnpm typecheck`, `pnpm test` as the final check when you think the code is ready.- service must be STATELESS! All the state must be in DB or local, never put important states in memory.- scope the queries before, not check the ownership after. don't query data then check if the data belongs to a workspace, use workspace id ahead to query the data.diff --git a/src/cli/commands/calendar.test.ts b/src/cli/commands/calendar.test.tsnew file mode 100644index 000000000..bb8a5f9e3--- /dev/null+++ b/src/cli/commands/calendar.test.ts@@ -0,0 +1,99 @@+import { describe, it, expect } from "vitest";+import { calendarCommand } from "./calendar";++describe("calendarCommand", () => {+ const cmd = calendarCommand();++ it("registers set, list, show, update, and delete subcommands", () => {+ const names = cmd.commands.map((c) => c.name());+ expect(names).toContain("set");+ expect(names).toContain("list");+ expect(names).toContain("show");+ expect(names).toContain("update");+ expect(names).toContain("delete");+ });++ it("calendar set requires --agent_id, --event_title, --datetime", () => {+ const set = cmd.commands.find((c) => c.name() === "set")!;+ const opts = (set as unknown as { options: { long: string; mandatory?: boolean }[] }).options;+ const mandatory = opts.filter((o) => o.mandatory).map((o) => o.long);+ expect(mandatory).toContain("--agent_id");+ expect(mandatory).toContain("--event_title");+ expect(mandatory).toContain("--datetime");+ // not mandatory+ expect(mandatory).not.toContain("--repeat");+ expect(mandatory).not.toContain("--repeat_stop_date");+ });++ it("calendar set accepts --repeat and --repeat_stop_date as optional", () => {+ const set = cmd.commands.find((c) => c.name() === "set")!;+ const opts = (set as unknown as { options: { long: string }[] }).options;+ const longs = opts.map((o) => o.long);+ expect(longs).toContain("--repeat");+ expect(longs).toContain("--repeat_stop_date");+ });++ it("calendar set accepts --description as optional", () => {+ const set = cmd.commands.find((c) => c.name() === "set")!;+ const opts = (set as unknown as { options: { long: string; mandatory?: boolean }[] }).options;+ const descOpt = opts.find((o) => o.long === "--description");+ expect(descOpt).toBeDefined();+ expect(descOpt?.mandatory).not.toBe(true);+ });++ it("calendar list requires --agent_id; supports --future_days and --past_days", () => {+ const list = cmd.commands.find((c) => c.name() === "list")!;+ const opts = (list as unknown as { options: { long: string; mandatory?: boolean }[] }).options;+ const mandatory = opts.filter((o) => o.mandatory).map((o) => o.long);+ expect(mandatory).toContain("--agent_id");+ const longs = opts.map((o) => o.long);+ expect(longs).toContain("--future_days");+ expect(longs).toContain("--past_days");+ });++ it("calendar show requires --agent_id and --event_id", () => {+ const show = cmd.commands.find((c) => c.name() === "show")!;+ const opts = (show as unknown as { options: { long: string; mandatory?: boolean }[] }).options;+ const mandatory = opts.filter((o) => o.mandatory).map((o) => o.long);+ expect(mandatory).toContain("--agent_id");+ expect(mandatory).toContain("--event_id");+ });++ it("calendar update requires --agent_id and --event_id and accepts mutating flags as optional", () => {+ const update = cmd.commands.find((c) => c.name() === "update")!;+ const opts = (update as unknown as { options: { long: string; mandatory?: boolean }[] }).options;+ const mandatory = opts.filter((o) => o.mandatory).map((o) => o.long);+ expect(mandatory).toContain("--agent_id");+ expect(mandatory).toContain("--event_id");+ const longs = opts.map((o) => o.long);+ for (const flag of [+ "--event_title",+ "--description",+ "--clear_description",+ "--datetime",+ "--repeat",+ "--clear_repeat",+ "--repeat_stop_date",+ "--clear_repeat_stop_date",+ ]) {+ expect(longs).toContain(flag);+ expect(mandatory).not.toContain(flag);+ }+ });++ it("calendar delete requires --agent_id and --event_id", () => {+ const del = cmd.commands.find((c) => c.name() === "delete")!;+ const opts = (del as unknown as { options: { long: string; mandatory?: boolean }[] }).options;+ const mandatory = opts.filter((o) => o.mandatory).map((o) => o.long);+ expect(mandatory).toContain("--agent_id");+ expect(mandatory).toContain("--event_id");+ });++ it("no subcommand accepts --workspace (agent-scoped only)", () => {+ for (const sub of cmd.commands) {+ const opts = (sub as unknown as { options: { long: string }[] }).options;+ const longs = opts.map((o) => o.long);+ expect(longs).not.toContain("--workspace");+ }+ });+});diff --git a/src/cli/commands/calendar.ts b/src/cli/commands/calendar.tsnew file mode 100644index 000000000..878c74de0--- /dev/null+++ b/src/cli/commands/calendar.ts@@ -0,0 +1,371 @@+import { Command } from "commander";+import { APIClient } from "../lib/client.js";+import { loadCLIConfigForProfile } from "../lib/config.js";+import { printJSON } from "../lib/output.js";+import { cmdPrefix } from "../lib/env.js";++interface CalendarEventResponse {+ id: string;+ agent_id: string;+ workspace_id: string;+ title: string;+ description: string | null;+ scheduled_at: string;+ repeat_interval: string | null;+ repeat_stop_at: string | null;+ last_triggered_at: string | null;+ created_at: string;+ updated_at: string;+}++function resolveClientOpts(command: Command, agentId: string) {+ const parentOpts = command.parent?.parent?.opts() || {};+ const profile: string | undefined = parentOpts.profile;+ const cfg = loadCLIConfigForProfile(profile);+ const serverUrl = parentOpts.server || cfg.server_url;+ const workspaces = cfg.watched_workspaces || [];++ const ws = workspaces.find((w) => w.agent_ids?.includes(agentId));+ if (!ws || !ws.token) {+ console.error(+ `Error: no registered workspace contains agent ${agentId}. Run '${cmdPrefix()} register --token <token>' first.`+ );+ process.exit(1);+ }+ return { serverUrl, token: ws.token, workspaceId: ws.id };+}++function parseLocalDatetime(input: string): string {+ // Accepts YYYY-MM-DDTHH:MM and interprets as local time.+ const match = /^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2})(?::(\d{2}))?$/.exec(+ input+ );+ if (!match) {+ throw new Error(+ `invalid --datetime "${input}" — expected YYYY-MM-DDTHH:MM`+ );+ }+ const [, y, mo, d, h, mi, s] = match;+ const date = new Date(+ Number(y),+ Number(mo) - 1,+ Number(d),+ Number(h),+ Number(mi),+ s ? Number(s) : 0+ );+ return date.toISOString();+}++function formatLocalDatetime(iso: string): string {+ const d = new Date(iso);+ const pad = (n: number) => String(n).padStart(2, "0");+ return `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(+ d.getDate()+ )} ${pad(d.getHours())}:${pad(d.getMinutes())}`;+}++function printEventDetail(ev: CalendarEventResponse): void {+ console.log(`id: ${ev.id}`);+ console.log(`agent_id: ${ev.agent_id}`);+ console.log(`title: ${ev.title}`);+ console.log(`scheduled_at: ${formatLocalDatetime(ev.scheduled_at)}`);+ if (ev.repeat_interval) {+ const until = ev.repeat_stop_at+ ? ` until ${formatLocalDatetime(ev.repeat_stop_at)}`+ : "";+ console.log(`repeat: every ${ev.repeat_interval}${until}`);+ } else {+ console.log(`repeat: (none)`);+ }+ console.log(+ `last_fired_at: ${+ ev.last_triggered_at ? formatLocalDatetime(ev.last_triggered_at) : "(never)"+ }`+ );+ console.log("description:");+ console.log(ev.description ?? "(no description)");+}++export function calendarCommand(): Command {+ const cmd = new Command("calendar").description(+ "Manage scheduled agent events"+ );++ cmd+ .command("set")+ .description("Create a calendar event")+ .requiredOption("--agent_id <id>", "Agent ID")+ .requiredOption("--event_title <title>", "Event title (used as the task prompt)")+ .requiredOption(+ "--datetime <iso>",+ "Scheduled datetime (YYYY-MM-DDTHH:MM, local time)"+ )+ .option("--description <text>", "Optional longer-form notes for the event")+ .option("--repeat <interval>", "Repeat interval, e.g. 1day, 2hour, 1month")+ .option(+ "--repeat_stop_date <date>",+ "Stop repeating on or after this date (YYYY-MM-DD, local time)"+ )+ .option("--json", "Output as JSON")+ .action(async (opts, command) => {+ const { serverUrl, token, workspaceId } = resolveClientOpts(+ command,+ opts.agent_id+ );+ const client = new APIClient(serverUrl, token, workspaceId);++ let scheduledAt: string;+ try {+ scheduledAt = parseLocalDatetime(opts.datetime);+ } catch (err) {+ console.error(+ `Error: ${err instanceof Error ? err.message : String(err)}`+ );+ process.exit(1);+ }++ if (opts.repeat_stop_date && !opts.repeat) {+ console.error("Error: --repeat_stop_date requires --repeat");+ process.exit(1);+ }+ if (opts.repeat_stop_date && !/^\d{4}-\d{2}-\d{2}$/.test(opts.repeat_stop_date)) {+ console.error("Error: --repeat_stop_date must be YYYY-MM-DD");+ process.exit(1);+ }++ const body: Record<string, unknown> = {+ agent_id: opts.agent_id,+ title: opts.event_title,+ scheduled_at: scheduledAt,+ };+ if (opts.description) body.description = opts.description;+ if (opts.repeat) body.repeat_interval = opts.repeat;+ if (opts.repeat_stop_date) body.repeat_stop_date = opts.repeat_stop_date;++ try {+ const created = await client.postJSON<CalendarEventResponse>(+ "/api/calendar",+ body+ );+ if (opts.json) {+ printJSON(created);+ return;+ }+ console.log(+ `Created ${created.id} — ${created.title} @ ${formatLocalDatetime(+ created.scheduled_at+ )}${created.repeat_interval ? ` (every ${created.repeat_interval})` : ""}`+ );+ } catch (err) {+ console.error(`Error: ${err instanceof Error ? err.message : err}`);+ process.exit(1);+ }+ });++ cmd+ .command("list")+ .description("List calendar events for an agent")+ .requiredOption("--agent_id <id>", "Agent ID")+ .option("--future_days <n>", "Include events scheduled in the next N days", "30")+ .option("--past_days <n>", "Include events scheduled in the past N days", "0")+ .option("--json", "Output as JSON")+ .action(async (opts, command) => {+ const { serverUrl, token, workspaceId } = resolveClientOpts(+ command,+ opts.agent_id+ );+ const client = new APIClient(serverUrl, token, workspaceId);++ const now = Date.now();+ const from = new Date(+ now - Number(opts.past_days) * 86_400_000+ ).toISOString();+ const to = new Date(+ now + Number(opts.future_days) * 86_400_000+ ).toISOString();++ try {+ const events = await client.getJSON<CalendarEventResponse[]>(+ `/api/calendar?agentId=${encodeURIComponent(opts.agent_id)}&from=${encodeURIComponent(from)}&to=${encodeURIComponent(to)}`+ );+ if (opts.json) {+ printJSON(events);+ return;+ }+ if (events.length === 0) {+ console.log("No calendar events.");+ return;+ }+ for (const ev of events) {+ const repeatBadge = ev.repeat_interval+ ? ` [every ${ev.repeat_interval}${ev.repeat_stop_at ? ` until ${formatLocalDatetime(ev.repeat_stop_at)}` : ""}]`+ : "";+ const descBadge = ev.description ? " [has description]" : "";+ console.log(+ `${ev.id} ${formatLocalDatetime(ev.scheduled_at)} ${ev.title}${repeatBadge}${descBadge}`+ );+ }+ } catch (err) {+ console.error(`Error: ${err instanceof Error ? err.message : err}`);+ process.exit(1);+ }+ });++ cmd+ .command("show")+ .description("Show the full detail of a single calendar event")+ .requiredOption("--agent_id <id>", "Agent ID")+ .requiredOption("--event_id <id>", "Event ID")+ .option("--json", "Output as JSON")+ .action(async (opts, command) => {+ const { serverUrl, token, workspaceId } = resolveClientOpts(+ command,+ opts.agent_id+ );+ const client = new APIClient(serverUrl, token, workspaceId);++ try {+ const ev = await client.getJSON<CalendarEventResponse>(+ `/api/calendar/${opts.event_id}`+ );+ if (ev.agent_id !== opts.agent_id) {+ console.error(+ `Error: event ${ev.id} does not belong to agent ${opts.agent_id}`+ );+ process.exit(1);+ }+ if (opts.json) {+ printJSON(ev);+ return;+ }+ printEventDetail(ev);+ } catch (err) {+ console.error(`Error: ${err instanceof Error ? err.message : err}`);+ process.exit(1);+ }+ });++ cmd+ .command("update")+ .description("Update fields on an existing calendar event")+ .requiredOption("--agent_id <id>", "Agent ID")+ .requiredOption("--event_id <id>", "Event ID")+ .option("--event_title <title>", "New event title (task prompt)")+ .option("--description <text>", "New description text")+ .option("--clear_description", "Remove the description (sets to null)")+ .option(+ "--datetime <iso>",+ "New scheduled datetime (YYYY-MM-DDTHH:MM, local time)"+ )+ .option("--repeat <interval>", "New repeat interval, e.g. 1day, 2hour")+ .option("--clear_repeat", "Convert a repeating event into a one-off")+ .option(+ "--repeat_stop_date <date>",+ "New stop date (YYYY-MM-DD, local time)"+ )+ .option("--clear_repeat_stop_date", "Remove the repeat stop date")+ .option("--json", "Output as JSON")+ .action(async (opts, command) => {+ if (opts.description && opts.clear_description) {+ console.error(+ "Error: --description and --clear_description are mutually exclusive"+ );+ process.exit(1);+ }+ if (opts.repeat && opts.clear_repeat) {+ console.error(+ "Error: --repeat and --clear_repeat are mutually exclusive"+ );+ process.exit(1);+ }+ if (opts.repeat_stop_date && opts.clear_repeat_stop_date) {+ console.error(+ "Error: --repeat_stop_date and --clear_repeat_stop_date are mutually exclusive"+ );+ process.exit(1);+ }++ const body: Record<string, unknown> = {};+ if (opts.event_title) body.title = opts.event_title;+ if (opts.description) body.description = opts.description;+ if (opts.clear_description) body.description = null;+ if (opts.datetime) {+ try {+ body.scheduled_at = parseLocalDatetime(opts.datetime);+ } catch (err) {+ console.error(+ `Error: ${err instanceof Error ? err.message : String(err)}`+ );+ process.exit(1);+ }+ }+ if (opts.repeat) body.repeat_interval = opts.repeat;+ if (opts.clear_repeat) body.repeat_interval = null;+ if (opts.repeat_stop_date) {+ if (!/^\d{4}-\d{2}-\d{2}$/.test(opts.repeat_stop_date)) {+ console.error("Error: --repeat_stop_date must be YYYY-MM-DD");+ process.exit(1);+ }+ body.repeat_stop_date = opts.repeat_stop_date;+ }+ if (opts.clear_repeat_stop_date) body.repeat_stop_date = null;++ if (Object.keys(body).length === 0) {+ console.error(+ "Error: no fields to update — pass at least one of --event_title, --description, --clear_description, --datetime, --repeat, --clear_repeat, --repeat_stop_date, --clear_repeat_stop_date"+ );+ process.exit(1);+ }++ const { serverUrl, token, workspaceId } = resolveClientOpts(+ command,+ opts.agent_id+ );+ const client = new APIClient(serverUrl, token, workspaceId);++ try {+ const updated = await client.patchJSON<CalendarEventResponse>(+ `/api/calendar/${opts.event_id}`,+ body+ );+ if (updated.agent_id !== opts.agent_id) {+ console.error(+ `Error: event ${updated.id} does not belong to agent ${opts.agent_id}`+ );+ process.exit(1);+ }+ if (opts.json) {+ printJSON(updated);+ return;+ }+ printEventDetail(updated);+ } catch (err) {+ console.error(`Error: ${err instanceof Error ? err.message : err}`);+ process.exit(1);+ }+ });++ cmd+ .command("delete")+ .description("Delete a calendar event")+ .requiredOption("--agent_id <id>", "Agent ID")+ .requiredOption("--event_id <id>", "Event ID")+ .action(async (opts, command) => {+ const { serverUrl, token, workspaceId } = resolveClientOpts(+ command,+ opts.agent_id+ );+ const client = new APIClient(serverUrl, token, workspaceId);++ try {+ await client.deleteJSON(`/api/calendar/${opts.event_id}`);+ console.log(`Deleted ${opts.event_id}`);+ } catch (err) {+ console.error(`Error: ${err instanceof Error ? err.message : err}`);+ process.exit(1);+ }+ });++ return cmd;+}diff --git a/src/cli/daemon/execenv/__tests__/timeline.test.ts b/src/cli/daemon/execenv/__tests__/timeline.test.tsindex 033145094..95502f6cb 100644--- a/src/cli/daemon/execenv/__tests__/timeline.test.ts+++ b/src/cli/daemon/execenv/__tests__/timeline.test.ts@@ -8,6 +8,7 @@ vi.mock("../../../lib/logger.js", () => ({log: { debug: vi.fn(), info: vi.fn(), warn: vi.fn(), error: vi.fn() },}));+import { TASK_TYPES } from "@alook/shared";import {initEntry,updateEntry,@@ -43,7 +44,7 @@ describe("timeline", () => {}it("initEntry creates file if it doesn't exist and appends valid JSON line", () => {- const entry = createTimelineEntry("t_abc", "do something");+ const entry = createTimelineEntry("t_abc", "do something", TASK_TYPES.USER_DM_MESSAGE);initEntry(dir, entry);const entries = readEntries();@@ -59,7 +60,7 @@ describe("timeline", () => {});it("createTimelineEntry stores sessionId and pid when provided", () => {- const entry = createTimelineEntry("t_xyz", "test", "sess_1", 99999);+ const entry = createTimelineEntry("t_xyz", "test", TASK_TYPES.USER_DM_MESSAGE, "sess_1", 99999);initEntry(dir, entry);const entries = readEntries();@@ -68,7 +69,7 @@ describe("timeline", () => {});it("updateEntry finds entry by task_id and updates steps", () => {- const entry = createTimelineEntry("t_abc", "do something");+ const entry = createTimelineEntry("t_abc", "do something", TASK_TYPES.USER_DM_MESSAGE);initEntry(dir, entry);updateEntry(dir, "t_abc", (e) => {@@ -80,7 +81,7 @@ describe("timeline", () => {});it("updateEntry sets completion fields correctly", () => {- const entry = createTimelineEntry("t_abc", "do something");+ const entry = createTimelineEntry("t_abc", "do something", TASK_TYPES.USER_DM_MESSAGE);initEntry(dir, entry);updateEntry(dir, "t_abc", (e) => {@@ -97,7 +98,7 @@ describe("timeline", () => {});it("updateEntry sets failure fields correctly", () => {- const entry = createTimelineEntry("t_fail", "will fail");+ const entry = createTimelineEntry("t_fail", "will fail", TASK_TYPES.USER_DM_MESSAGE);initEntry(dir, entry);updateEntry(dir, "t_fail", (e) => {@@ -113,9 +114,9 @@ describe("timeline", () => {});it("multiple entries for different task_ids coexist in same file", () => {- initEntry(dir, createTimelineEntry("t_1", "first task"));- initEntry(dir, createTimelineEntry("t_2", "second task"));- initEntry(dir, createTimelineEntry("t_3", "third task"));+ initEntry(dir, createTimelineEntry("t_1", "first task", TASK_TYPES.USER_DM_MESSAGE));+ initEntry(dir, createTimelineEntry("t_2", "second task", TASK_TYPES.USER_DM_MESSAGE));+ initEntry(dir, createTimelineEntry("t_3", "third task", TASK_TYPES.USER_DM_MESSAGE));const entries = readEntries();expect(entries).toHaveLength(3);@@ -123,8 +124,8 @@ describe("timeline", () => {});it("updateEntry only modifies the matching task_id", () => {- initEntry(dir, createTimelineEntry("t_1", "first task"));- initEntry(dir, createTimelineEntry("t_2", "second task"));+ initEntry(dir, createTimelineEntry("t_1", "first task", TASK_TYPES.USER_DM_MESSAGE));+ initEntry(dir, createTimelineEntry("t_2", "second task", TASK_TYPES.USER_DM_MESSAGE));updateEntry(dir, "t_2", (e) => {e.agent_responses.push("Working on second task");@@ -141,7 +142,7 @@ describe("timeline", () => {});it("updateEntry is a no-op when task_id not found", () => {- initEntry(dir, createTimelineEntry("t_1", "task"));+ initEntry(dir, createTimelineEntry("t_1", "task", TASK_TYPES.USER_DM_MESSAGE));updateEntry(dir, "t_nonexistent", (e) => {e.agent_responses.push("should not happen");@@ -185,7 +186,7 @@ describe("timeline", () => {const yesterday = new Date();yesterday.setDate(yesterday.getDate() - 1);const filename = _filenameForDate(yesterday);- const entry = createTimelineEntry("t_old", "old task");+ const entry = createTimelineEntry("t_old", "old task", TASK_TYPES.USER_DM_MESSAGE);const filePath = join(dir, filename);writeFileSync(filePath, JSON.stringify(entry) + "\n");@@ -206,8 +207,8 @@ describe("timeline", () => {const todayFile = join(dir, _todayFilename());const yesterdayFile = join(dir, _filenameForDate(yesterday));- const entryToday = createTimelineEntry("t_dup", "today version");- const entryYesterday = createTimelineEntry("t_dup", "yesterday version");+ const entryToday = createTimelineEntry("t_dup", "today version", TASK_TYPES.USER_DM_MESSAGE);+ const entryYesterday = createTimelineEntry("t_dup", "yesterday version", TASK_TYPES.USER_DM_MESSAGE);writeFileSync(todayFile, JSON.stringify(entryToday) + "\n");writeFileSync(yesterdayFile, JSON.stringify(entryYesterday) + "\n");@@ -228,8 +229,8 @@ describe("timeline", () => {// Write entries for today and yesterday with different task_idsconst yesterday = new Date();yesterday.setDate(yesterday.getDate() - 1);- writeFileSync(join(dir, _todayFilename()), JSON.stringify(createTimelineEntry("t_a", "a")) + "\n");- writeFileSync(join(dir, _filenameForDate(yesterday)), JSON.stringify(createTimelineEntry("t_b", "b")) + "\n");+ writeFileSync(join(dir, _todayFilename()), JSON.stringify(createTimelineEntry("t_a", "a", TASK_TYPES.USER_DM_MESSAGE)) + "\n");+ writeFileSync(join(dir, _filenameForDate(yesterday)), JSON.stringify(createTimelineEntry("t_b", "b", TASK_TYPES.USER_DM_MESSAGE)) + "\n");// Should not throw, just silently no-opupdateEntry(dir, "t_nonexistent", (e) => {diff --git a/src/cli/daemon/execenv/context.ts b/src/cli/daemon/execenv/context.tsindex 909ddbcc1..d1d5668b1 100644--- a/src/cli/daemon/execenv/context.ts+++ b/src/cli/daemon/execenv/context.ts@@ -44,7 +44,7 @@ Each line of a timeline JSONL is a JSON object with these fields:- "pid" — daemon process ID (present while running, null when done)- "status" — "running", "completed", or "failed"- "datetime" — when the task started (local timezone)-- "type" — always "user_dm_message"+- "type" — source of the task: "user_dm_message", "email_notification", or "calendar_event"- "prompt" — what the user asked- "agent_responses" — assistant text outputs during execution- "errmsg" — error message (null unless status is "failed")@@ -73,11 +73,13 @@ ${task.agent.instructions}`;}- if (task.agent?.emailHandle) {- content += `\n## Alook CLI Tools+ content += `\n## Alook CLI ToolsYou can communicate with the world through Alook CLI.Your alook agent id is '${task.agentId}'. remember this, most of alook cli will requires you input your agent id.-Your email address is '${toAlookAddress(task.agent.emailHandle)}'.+`;++ if (task.agent?.emailHandle) {+ content += `Your email address is '${toAlookAddress(task.agent.emailHandle)}'.${task.agent.userEmail ? `Your owner's email address is '${task.agent.userEmail}'.` : ""}### Emails@@ -95,6 +97,44 @@ Before starting to process an email, mark it as read:`;}+ content += `\n### Calendar+Schedule future tasks for yourself. At the scheduled time, a new task is dispatched to you with the event as the prompt (task type 'calendar_event').+---+Create a one-off event:+- Run 'npx @alook/cli calendar set --agent_id ${task.agentId} --event_title "<PROMPT_TEXT>" --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'.+ - '--event_title' becomes the task prompt when the event fires — write it as the instruction you want future-you to receive.+ - Optional '--description "<text>"' — longer notes/context shown alongside the event in the web UI. Use it for anything that wouldn't fit cleanly in the title.++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 "daily standup summary" --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.+- 'list' shows a '[has description]' badge instead of the full description — use 'show' (below) to read it.++Show full detail of one event (use this to read the description):+- Run 'npx @alook/cli calendar show --agent_id ${task.agentId} --event_id <EVENT_ID>'+- Add '--json' for machine-readable output.++Edit an existing event (preserves event id and recurring state):+- Run 'npx @alook/cli calendar update --agent_id ${task.agentId} --event_id <EVENT_ID> [flags]'+- Supply only the fields you want to change. Available flags:+ - '--event_title "<t>"' — rename the event / change the fire-time prompt+ - '--description "<d>"' to set, or '--clear_description' to remove+ - '--datetime <YYYY-MM-DDTHH:MM>' — reschedule (local time)+ - '--repeat <interval>' to set, or '--clear_repeat' to convert into a one-off+ - '--repeat_stop_date <YYYY-MM-DD>' to set, or '--clear_repeat_stop_date' to remove+- Passing no mutating flag is an error. Do NOT use 'delete' + 'set' to edit — that loses the event id and the recurring 'last fired' state.++Delete an event:+- Run 'npx @alook/cli calendar delete --agent_id ${task.agentId} --event_id <EVENT_ID>'+---+`;+return content;}diff --git a/src/cli/daemon/execenv/timeline.ts b/src/cli/daemon/execenv/timeline.tsindex a3f1866ab..6b41ba846 100644--- a/src/cli/daemon/execenv/timeline.ts+++ b/src/cli/daemon/execenv/timeline.ts@@ -190,6 +190,7 @@ export function updateEntry(export function createTimelineEntry(taskId: string,prompt: string,+ type: string,sessionId?: string,pid?: number,): ContextTimelineEntry {@@ -199,7 +200,7 @@ export function createTimelineEntry(pid: pid ?? null,status: "running",datetime: localISOString(),- type: "user_dm_message",+ type,prompt,agent_responses: [],errmsg: null,diff --git a/src/cli/daemon/session-runner.test.ts b/src/cli/daemon/session-runner.test.tsindex 3afb73a42..3a9c38477 100644--- a/src/cli/daemon/session-runner.test.ts+++ b/src/cli/daemon/session-runner.test.ts@@ -31,13 +31,19 @@ vi.mock("./execenv/index.js", () => ({const mockInitEntryAsync = vi.fn(async () => {});const mockUpdateEntry = vi.fn();const mockCreateTimelineEntry = vi.fn(- (taskId: string, prompt: string, sessionId?: string, pid?: number) => ({+ (+ taskId: string,+ prompt: string,+ type: string,+ sessionId?: string,+ pid?: number,+ ) => ({task_id: taskId,session_id: sessionId || null,pid: pid ?? null,status: "running",datetime: "2026-04-16T10:00:00-05:00",- type: "user_dm_message",+ type,prompt,agent_responses: [],errmsg: null,@@ -201,6 +207,7 @@ describe("session-runner runSession", () => {expect(mockCreateTimelineEntry).toHaveBeenCalledWith("t1","do the thing",+ "user_dm_message","sess-1",process.pid,);@@ -313,7 +320,7 @@ describe("session-runner runSession", () => {expect(totalReported).toBe(25);});- it("uses findResumableSessionId and passes to backend", async () => {+ it("uses findResumableSessionId and passes to backend for user_dm_message tasks", async () => {mockFindResumableSessionId.mockReturnValueOnce("prev-session-123");setupBackend([], {@@ -336,6 +343,70 @@ describe("session-runner runSession", () => {);});+ it("skips findResumableSessionId entirely for calendar_event tasks (always fresh session)", async () => {+ setupBackend([], {+ status: "completed",+ output: "Done",+ error: "",+ durationMs: 100,+ sessionId: "sess-2",+ });++ await runSession(+ makeInput({+ task: {+ id: "t2",+ agentId: "a1",+ runtimeId: "rt1",+ conversationId: "c2",+ workspaceId: "ws1",+ prompt: "Run daily standup",+ status: "dispatched",+ priority: 0,+ type: "calendar_event",+ createdAt: "2026-04-17T09:00:00Z",+ },+ }),+ );++ expect(mockFindResumableSessionId).not.toHaveBeenCalled();+ expect(mockBackendExecute).toHaveBeenCalledWith(+ expect.any(String),+ expect.objectContaining({ resumeSessionId: undefined }),+ );+ });++ it("writes timeline entries with task.type (calendar_event) for calendar tasks", async () => {+ setupBackend([], {+ status: "completed",+ output: "Done",+ error: "",+ durationMs: 100,+ sessionId: "sess-3",+ });++ await runSession(+ makeInput({+ task: {+ id: "t3",+ agentId: "a1",+ runtimeId: "rt1",+ conversationId: "c3",+ workspaceId: "ws1",+ prompt: "scheduled work",+ status: "dispatched",+ priority: 0,+ type: "calendar_event",+ createdAt: "2026-04-17T09:00:00Z",+ },+ }),+ );++ // The 3rd positional arg to createTimelineEntry is the type.+ const typeArg = mockCreateTimelineEntry.mock.calls[0]![2];+ expect(typeArg).toBe("calendar_event");+ });+it("passes branchName through to completeTask (forward-compat)", async () => {// branchName is currently always undefined in AgentResultsetupBackend([], {diff --git a/src/cli/daemon/session-runner.ts b/src/cli/daemon/session-runner.tsindex 191309716..74ba72f00 100644--- a/src/cli/daemon/session-runner.ts+++ b/src/cli/daemon/session-runner.ts@@ -20,6 +20,7 @@ import {import { buildPrompt } from "./prompt.js";import { log } from "../lib/logger.js";import type { SessionRunnerInput } from "./types.js";+import { TASK_TYPES } from "@alook/shared";export async function runSession(input: SessionRunnerInput): Promise<void> {const { task, provider, cliPath, model, serverURL, token, workspacesRoot, agentTimeout } = input;@@ -33,7 +34,10 @@ export async function runSession(input: SessionRunnerInput): Promise<void> {task,);- const resumeSessionId = findResumableSessionId(timelineDir, task.type) ?? undefined;+ const resumeSessionId =+ task.type === TASK_TYPES.USER_DM_MESSAGE+ ? findResumableSessionId(timelineDir, task.type) ?? undefined+ : undefined;if (resumeSessionId) {log.info(`Task ${task.id} resuming session ${resumeSessionId}`);}@@ -53,7 +57,7 @@ export async function runSession(input: SessionRunnerInput): Promise<void> {const earlySessionId = await session.sessionId;await initEntryAsync(timelineDir,- createTimelineEntry(task.id, task.prompt, earlySessionId, process.pid),+ createTimelineEntry(task.id, task.prompt, task.type, earlySessionId, process.pid),);// Message batchingdiff --git a/src/cli/src/index.ts b/src/cli/src/index.tsindex e2c61b02a..3f734f0ff 100644--- a/src/cli/src/index.ts+++ b/src/cli/src/index.ts@@ -5,6 +5,7 @@ import { statusCommand } from "../commands/status.js";import { daemonCommand } from "../commands/daemon.js";import { configCommand } from "../commands/config.js";import { emailCommand } from "../commands/email.js";+import { calendarCommand } from "../commands/calendar.js";import { versionCommand } from "../commands/version.js";const program = new Command();@@ -19,6 +20,7 @@ program.addCommand(registerCommand());program.addCommand(statusCommand());program.addCommand(daemonCommand());program.addCommand(emailCommand());+program.addCommand(calendarCommand());program.addCommand(configCommand());program.addCommand(versionCommand());diff --git a/src/shared/constants.ts b/src/shared/constants.tsindex 38bd8e9d0..303126b24 100644--- a/src/shared/constants.ts+++ b/src/shared/constants.ts@@ -26,6 +26,14 @@ export const TaskStatus = {export type TaskStatusType = (typeof TaskStatus)[keyof typeof TaskStatus];+export const TASK_TYPES = {+ USER_DM_MESSAGE: "user_dm_message",+ EMAIL_NOTIFICATION: "email_notification",+ CALENDAR_EVENT: "calendar_event",+} as const;++export type TaskType = (typeof TASK_TYPES)[keyof typeof TASK_TYPES];+export const MessageRole = {USER: "user",ASSISTANT: "assistant",diff --git a/src/shared/schemas.ts b/src/shared/schemas.tsindex bb3f3859f..d5bd907cd 100644--- a/src/shared/schemas.ts+++ b/src/shared/schemas.ts@@ -1,4 +1,5 @@import { z } from "zod";+import { TASK_TYPES } from "./constants";// ---------------------------------------------------------------------------// Task status@@ -28,7 +29,7 @@ export const ClaimedTaskRowSchema = z.object({priority: z.coerce.number(),result: z.unknown().nullable(),context: z.unknown().nullable(),- type: z.string().default("user_dm_message"),+ type: z.string().default(TASK_TYPES.USER_DM_MESSAGE),sessionId: z.string().nullable(),createdAt: z.coerce.date(),dispatchedAt: z.coerce.date().nullable(),diff --git a/src/shared/src/api-types.ts b/src/shared/src/api-types.tsindex a4d44f1ce..e6cf8b432 100644--- a/src/shared/src/api-types.ts+++ b/src/shared/src/api-types.ts@@ -7,6 +7,7 @@ import type {Message,TaskMessage,MachineToken,+ CalendarEvent,} from "./types";import type { TaskApi } from "./schemas";@@ -46,6 +47,30 @@ export type ListTaskMessagesResponse = ApiListResponse<TaskMessage>;export type ListMachineTokensResponse = ApiListResponse<MachineToken>;+export type ListCalendarEventsResponse = ApiListResponse<CalendarEvent>;+export type GetCalendarEventResponse = ApiResponse<CalendarEvent>;++export interface CreateCalendarEventRequest {+ agent_id: string;+ title: string;+ description?: string;+ scheduled_at: string;+ repeat_interval?: string;+ repeat_stop_date?: string;+}++export interface UpdateCalendarEventRequest {+ title?: string;+ description?: string | null;+ agent_id?: string;+ scheduled_at?: string;+ repeat_interval?: string | null;+ repeat_stop_date?: string | null;+ scope?: "this" | "following";+ /** ISO of the occurrence being edited; only meaningful for scope="this". */+ occurrence_at?: string;+}+export interface CreateWorkspaceRequest {name: string;}diff --git a/src/shared/src/constants.ts b/src/shared/src/constants.tsindex 19cc88f38..4e47eb2d7 100644--- a/src/shared/src/constants.ts+++ b/src/shared/src/constants.ts@@ -26,6 +26,14 @@ export const TaskStatus = {export type TaskStatusType = (typeof TaskStatus)[keyof typeof TaskStatus];+export const TASK_TYPES = {+ USER_DM_MESSAGE: "user_dm_message",+ EMAIL_NOTIFICATION: "email_notification",+ CALENDAR_EVENT: "calendar_event",+} as const;++export type TaskType = (typeof TASK_TYPES)[keyof typeof TASK_TYPES];+export const MessageRole = {USER: "user",ASSISTANT: "assistant",diff --git a/src/shared/src/db/queries-index.ts b/src/shared/src/db/queries-index.tsindex c488b7d18..61de12764 100644--- a/src/shared/src/db/queries-index.ts+++ b/src/shared/src/db/queries-index.ts@@ -12,3 +12,4 @@ export * as machineToken from "./queries/machine-token";export * as whitelist from "./queries/whitelist";export * as email from "./queries/email";export * as session from "./queries/session";+export * as calendarEvent from "./queries/calendar-event";diff --git a/src/shared/src/db/queries/calendar-event.ts b/src/shared/src/db/queries/calendar-event.tsnew file mode 100644index 000000000..14f918e83--- /dev/null+++ b/src/shared/src/db/queries/calendar-event.ts@@ -0,0 +1,305 @@+import { eq, and, asc, gte, lte, or, isNull, isNotNull, lt } from "drizzle-orm";+import { calendarEvent } from "../schema";+import type { Database } from "../index";++export async function createCalendarEvent(+ db: Database,+ data: {+ agentId: string;+ workspaceId: string;+ title: string;+ description?: string | null;+ scheduledAt: string;+ repeatInterval?: string | null;+ repeatStopAt?: string | null;+ exceptions?: string[];+ }+) {+ const now = new Date().toISOString();+ const rows = await db+ .insert(calendarEvent)+ .values({+ agentId: data.agentId,+ workspaceId: data.workspaceId,+ title: data.title,+ description: data.description ?? null,+ scheduledAt: data.scheduledAt,+ repeatInterval: data.repeatInterval ?? null,+ repeatStopAt: data.repeatStopAt ?? null,+ exceptions: data.exceptions ?? [],+ createdAt: now,+ updatedAt: now,+ })+ .returning();+ return rows[0]!;+}++export async function updateCalendarEvent(+ db: Database,+ id: string,+ workspaceId: string,+ patch: {+ title?: string;+ description?: string | null;+ agentId?: string;+ scheduledAt?: string;+ repeatInterval?: string | null;+ repeatStopAt?: string | null;+ exceptions?: string[];+ }+) {+ const rows = await db+ .update(calendarEvent)+ .set({ ...patch, updatedAt: new Date().toISOString() })+ .where(+ and(eq(calendarEvent.id, id), eq(calendarEvent.workspaceId, workspaceId))+ )+ .returning();+ return rows[0] ?? null;+}++export async function getCalendarEvent(+ db: Database,+ id: string,+ workspaceId: string+) {+ const rows = await db+ .select()+ .from(calendarEvent)+ .where(+ and(eq(calendarEvent.id, id), eq(calendarEvent.workspaceId, workspaceId))+ );+ return rows[0] ?? null;+}++export async function listCalendarEvents(+ db: Database,+ workspaceId: string,+ opts: { agentId?: string; from?: string; to?: string } = {}+) {+ const conditions = [eq(calendarEvent.workspaceId, workspaceId)];+ if (opts.agentId) conditions.push(eq(calendarEvent.agentId, opts.agentId));+ if (opts.from && opts.to) {+ // Non-recurring rows are bounded strictly by [from, to] on scheduled_at.+ // Recurring rows may have scheduled_at before `from` (next fire is+ // earlier) but still produce visible occurrences inside the window; they+ // qualify when (a) scheduled_at <= to, and (b) repeat_stop_at is null+ // or >= from. Expansion happens in the caller.+ conditions.push(+ or(+ and(+ isNull(calendarEvent.repeatInterval),+ gte(calendarEvent.scheduledAt, opts.from),+ lte(calendarEvent.scheduledAt, opts.to)+ ),+ and(+ isNotNull(calendarEvent.repeatInterval),+ lte(calendarEvent.scheduledAt, opts.to),+ or(+ isNull(calendarEvent.repeatStopAt),+ gte(calendarEvent.repeatStopAt, opts.from)+ )+ )+ )!+ );+ } else {+ if (opts.from) conditions.push(gte(calendarEvent.scheduledAt, opts.from));+ if (opts.to) conditions.push(lte(calendarEvent.scheduledAt, opts.to));+ }+ return db+ .select()+ .from(calendarEvent)+ .where(and(...conditions))+ .orderBy(asc(calendarEvent.scheduledAt));+}++export async function deleteCalendarEvent(+ db: Database,+ id: string,+ workspaceId: string+) {+ const rows = await db+ .delete(calendarEvent)+ .where(+ and(eq(calendarEvent.id, id), eq(calendarEvent.workspaceId, workspaceId))+ )+ .returning();+ return rows[0] ?? null;+}++/**+ * Return candidate due events for a workspace. Does not write — callers must+ * issue the guarded claim UPDATE to promote an event to a task.+ */+export async function listDueCalendarEvents(+ db: Database,+ workspaceId: string,+ now: string+) {+ return db+ .select()+ .from(calendarEvent)+ .where(+ and(+ eq(calendarEvent.workspaceId, workspaceId),+ lte(calendarEvent.scheduledAt, now),+ or(+ isNull(calendarEvent.lastTriggeredAt),+ lt(calendarEvent.lastTriggeredAt, calendarEvent.scheduledAt)+ )+ )+ )+ .orderBy(asc(calendarEvent.scheduledAt));+}++/**+ * Exact-occurrence guarded claim. Returns the number of rows affected (0 or 1).+ * Only one concurrent caller can transition `last_triggered_at` past the+ * observed `scheduled_at`; every other caller sees 0.+ */+export async function claimCalendarEvent(+ db: Database,+ id: string,+ observedScheduledAt: string,+ now: string+) {+ const rows = await db+ .update(calendarEvent)+ .set({ lastTriggeredAt: now, updatedAt: now })+ .where(+ and(+ eq(calendarEvent.id, id),+ eq(calendarEvent.scheduledAt, observedScheduledAt),+ or(+ isNull(calendarEvent.lastTriggeredAt),+ lt(calendarEvent.lastTriggeredAt, calendarEvent.scheduledAt)+ )+ )+ )+ .returning();+ return rows[0] ?? null;+}++/** Revert `last_triggered_at` to its pre-claim value after a post-claim failure. */+export async function revertCalendarEventClaim(+ db: Database,+ id: string,+ previousLastTriggeredAt: string | null+) {+ await db+ .update(calendarEvent)+ .set({+ lastTriggeredAt: previousLastTriggeredAt,+ updatedAt: new Date().toISOString(),+ })+ .where(eq(calendarEvent.id, id));+}++/**+ * Advance `scheduled_at` to the next future occurrence, or null when the event+ * has stopped. Used by the promotion helper after a successful claim.+ */+export async function updateCalendarEventSchedule(+ db: Database,+ id: string,+ nextScheduledAt: string+) {+ await db+ .update(calendarEvent)+ .set({ scheduledAt: nextScheduledAt, updatedAt: new Date().toISOString() })+ .where(eq(calendarEvent.id, id));+}++/**+ * Repeat-interval grammar: `<positive_integer><min|hour|day|week|month>`.+ *+ * Monthly overflow clamp: Jan 31 + 1 month = Feb 28 (or 29 in leap years).+ * Week is treated as 7 days.+ */+export function addRepeatInterval(base: Date, interval: string): Date {+ const match = /^(\d+)(min|hour|day|week|month)$/.exec(interval);+ if (!match) throw new Error(`invalid repeat_interval: ${interval}`);+ const amount = parseInt(match[1]!, 10);+ const unit = match[2]!;++ if (unit === "min") return new Date(base.getTime() + amount * 60_000);+ if (unit === "hour") return new Date(base.getTime() + amount * 3_600_000);+ if (unit === "day") return new Date(base.getTime() + amount * 86_400_000);+ if (unit === "week") return new Date(base.getTime() + amount * 7 * 86_400_000);+ // month — clamp overflow+ const y = base.getUTCFullYear();+ const m = base.getUTCMonth() + amount;+ const targetYear = y + Math.floor(m / 12);+ const targetMonth = ((m % 12) + 12) % 12;+ const day = base.getUTCDate();+ const lastDayOfTarget = new Date(Date.UTC(targetYear, targetMonth + 1, 0)).getUTCDate();+ const clampedDay = Math.min(day, lastDayOfTarget);+ return new Date(+ Date.UTC(+ targetYear,+ targetMonth,+ clampedDay,+ base.getUTCHours(),+ base.getUTCMinutes(),+ base.getUTCSeconds(),+ base.getUTCMilliseconds()+ )+ );+}++/**+ * Loop-advance the schedule past `now`. Returns the next `scheduled_at` as an+ * ISO string, or null if the next occurrence would exceed `repeatStopAt` (in+ * which case the event becomes inert).+ */+/**+ * Expand a recurring calendar-event row into the list of occurrence ISOs+ * within `[from, to]`, skipping `exceptions`. Starts at `scheduledAt` and+ * steps forward by `repeatInterval`. Capped at 1000 iterations to guard+ * against pathological inputs.+ */+export function expandOccurrences(+ scheduledAt: string,+ repeatInterval: string,+ repeatStopAt: string | null,+ exceptions: string[],+ from: string,+ to: string+): string[] {+ const out: string[] = [];+ const fromD = new Date(from);+ const toD = new Date(to);+ const stopD = repeatStopAt ? new Date(repeatStopAt) : null;+ const excepted = new Set(exceptions);+ let current = new Date(scheduledAt);+ for (let i = 0; i < 1000; i++) {+ if (current > toD) break;+ if (stopD && current > stopD) break;+ const iso = current.toISOString();+ if (current >= fromD && !excepted.has(iso)) out.push(iso);+ current = addRepeatInterval(current, repeatInterval);+ }+ return out;+}++export function computeNextScheduledAt(+ currentScheduledAt: string,+ repeatInterval: string,+ repeatStopAt: string | null,+ now: string,+ exceptions: string[] = []+): string | null {+ const excepted = new Set(exceptions);+ let next = addRepeatInterval(new Date(currentScheduledAt), repeatInterval);+ const nowDate = new Date(now);+ const stopDate = repeatStopAt ? new Date(repeatStopAt) : null;+ // Cap iterations to prevent runaway loops on pathological inputs.+ for (let i = 0; i < 2000; i++) {+ if (stopDate && next > stopDate) return null;+ if (next > nowDate && !excepted.has(next.toISOString())) {+ return next.toISOString();+ }+ next = addRepeatInterval(next, repeatInterval);+ }+ return null;+}diff --git a/src/shared/src/db/queries/conversation.ts b/src/shared/src/db/queries/conversation.tsindex 5d0180bb7..bf4dcd056 100644--- a/src/shared/src/db/queries/conversation.ts+++ b/src/shared/src/db/queries/conversation.ts@@ -1,6 +1,7 @@import { eq, and, desc, count } from "drizzle-orm";import { conversation, message } from "../schema";import type { Database } from "../index";+import { TASK_TYPES, type TaskType } from "../../constants";export async function createConversation(db: Database,@@ -9,6 +10,7 @@ export async function createConversation(agentId: string;userId: string;title: string;+ type?: TaskType;}) {const rows = await db@@ -18,6 +20,7 @@ export async function createConversation(agentId: data.agentId,userId: data.userId,title: data.title,+ type: data.type ?? TASK_TYPES.USER_DM_MESSAGE,}).returning();return rows[0]!;@@ -96,7 +99,9 @@ export async function getOrCreateAgentConversation(userId: string,agentId: string) {- // Find the most recent conversation for this user+agent+workspace+ // Find the most recent user-DM conversation for this user+agent+workspace.+ // Email- and calendar-originated conversations share the same table but must+ // not surface as the agent's default chat — they have their own entry points.const rows = await db.select().from(conversation)@@ -104,7 +109,8 @@ export async function getOrCreateAgentConversation(and(eq(conversation.workspaceId, workspaceId),eq(conversation.userId, userId),- eq(conversation.agentId, agentId)+ eq(conversation.agentId, agentId),+ eq(conversation.type, TASK_TYPES.USER_DM_MESSAGE))).orderBy(desc(conversation.createdAt))@@ -122,6 +128,7 @@ export async function getOrCreateAgentConversation(agentId,userId,title: "",+ type: TASK_TYPES.USER_DM_MESSAGE,}).returning();return created[0]!;diff --git a/src/shared/src/db/queries/task.ts b/src/shared/src/db/queries/task.tsindex 6f99cf098..777d69f1c 100644--- a/src/shared/src/db/queries/task.ts+++ b/src/shared/src/db/queries/task.ts@@ -2,6 +2,7 @@ import { eq, and, desc, asc, inArray, notInArray, count, lt } from "drizzle-orm"import { agentTaskQueue } from "../schema";import type { Database } from "../index";import { ClaimedTaskRowSchema } from "../../schemas";+import { TASK_TYPES } from "../../constants";export async function createTask(db: Database,@@ -23,7 +24,7 @@ export async function createTask(workspaceId: data.workspaceId,conversationId: data.conversationId,prompt: data.prompt,- type: data.type ?? "user_dm_message",+ type: data.type ?? TASK_TYPES.USER_DM_MESSAGE,priority: data.priority ?? 0,}).returning();diff --git a/src/shared/src/db/schema.ts b/src/shared/src/db/schema.tsindex fcf2a72e7..a6efb00b1 100644--- a/src/shared/src/db/schema.ts+++ b/src/shared/src/db/schema.ts@@ -9,6 +9,7 @@ import {} from "drizzle-orm/sqlite-core";import { sql } from "drizzle-orm";import { nanoid } from "nanoid";+import { TASK_TYPES } from "../constants";// ---------------------------------------------------------------------------// Better Auth tables@@ -190,6 +191,7 @@ export const conversation = sqliteTable(.notNull().references(() => user.id, { onDelete: "cascade" }),title: text("title").notNull().default(""),+ type: text("type").notNull().default(TASK_TYPES.USER_DM_MESSAGE),createdAt: text("created_at").notNull().$defaultFn(() => new Date().toISOString()),},(t) => [@@ -226,7 +228,7 @@ export const agentTaskQueue = sqliteTable(.notNull().references(() => conversation.id),prompt: text("prompt").notNull(),- type: text("type").notNull().default("user_dm_message"),+ type: text("type").notNull().default(TASK_TYPES.USER_DM_MESSAGE),status: text("status").notNull().default("queued"),priority: integer("priority").notNull().default(0),result: text("result", { mode: "json" }),@@ -293,6 +295,35 @@ export const emails = sqliteTable(]);+export const calendarEvent = sqliteTable(+ "calendar_event",+ {+ id: text("id").primaryKey().$defaultFn(() => "ce_" + nanoid()),+ agentId: text("agent_id").notNull(),+ workspaceId: text("workspace_id").notNull(),+ title: text("title").notNull(),+ description: text("description"),+ scheduledAt: text("scheduled_at").notNull(),+ repeatInterval: text("repeat_interval"),+ repeatStopAt: text("repeat_stop_at"),+ lastTriggeredAt: text("last_triggered_at"),+ exceptions: text("exceptions", { mode: "json" })+ .$type<string[]>()+ .notNull()+ .default(sql`'[]'`),+ createdAt: text("created_at").notNull().$defaultFn(() => new Date().toISOString()),+ updatedAt: text("updated_at").notNull().$defaultFn(() => new Date().toISOString()),+ },+ (t) => [+ index("idx_calendar_event_agent_ws").on(t.agentId, t.workspaceId),+ index("idx_calendar_event_ws_scheduled").on(t.workspaceId, t.scheduledAt),+ foreignKey({+ columns: [t.agentId, t.workspaceId],+ foreignColumns: [agent.id, agent.workspaceId],+ }).onDelete("cascade"),+ ]+);+export const machineToken = sqliteTable("machine_token",{diff --git a/src/shared/src/index.ts b/src/shared/src/index.tsindex d55c0af74..14d1295de 100644--- a/src/shared/src/index.ts+++ b/src/shared/src/index.ts@@ -13,6 +13,7 @@ export type {EmailAttachment,LoginResponse,CreateAgentRequest,+ CalendarEvent,WsMessage,} from "./types";@@ -35,6 +36,10 @@ export type {GetTaskResponse,ListTaskMessagesResponse,ListMachineTokensResponse,+ ListCalendarEventsResponse,+ GetCalendarEventResponse,+ CreateCalendarEventRequest,+ UpdateCalendarEventRequest,CreateWorkspaceRequest,UpdateAgentRequest,SendMessageRequest,@@ -47,6 +52,7 @@ export {AgentStatus,RuntimeStatus,TaskStatus,+ TASK_TYPES,MessageRole,POLL_INTERVAL_MS,OFFLINE_THRESHOLD_MS,@@ -61,6 +67,7 @@ export type {AgentStatusType,RuntimeStatusType,TaskStatusType,+ TaskType,MessageRoleType,} from "./constants";@@ -83,6 +90,10 @@ export {FailTaskRequestSchema,MessageItemSchema,ReportMessagesRequestSchema,+ RepeatIntervalSchema,+ CreateCalendarEventRequestSchema,+ UpdateCalendarEventRequestSchema,+ CalendarEventApiSchema,} from "./schemas";export type {@@ -102,6 +113,9 @@ export type {FailTaskRequest,MessageItem,ReportMessagesRequest,+ CreateCalendarEventRequestInput,+ UpdateCalendarEventRequestInput,+ CalendarEventApi,} from "./schemas";// Database@@ -114,6 +128,14 @@ export * as queries from "./db/queries-index";export { Logger, createLogger } from "./logger"export type { LogLevel, LoggerOptions } from "./logger"+// Lib+export { isEmptyHtml } from "./lib/html";+export {+ addRepeatInterval,+ computeNextScheduledAt,+ expandOccurrences,+} from "./db/queries/calendar-event";+// Utilsexport { parseEmailHandle, toAlookAddress, isValidHandle } from "./utils/email";export { isValidToken, isValidEmail } from "./utils/validation";diff --git a/src/shared/src/lib/html.ts b/src/shared/src/lib/html.tsnew file mode 100644index 000000000..a2f1e12e7--- /dev/null+++ b/src/shared/src/lib/html.ts@@ -0,0 +1,20 @@+/**+ * Treat editor output as empty when the HTML string, stripped of whitespace+ * and single-paragraph-with-br scaffolding, has no visible content.+ *+ * Matches ProseMirror/tiptap's "empty editor" output: `""`, `<p></p>`,+ * `<p><br></p>`, `<p>\n</p>`, and surrounding whitespace variants.+ */+export function isEmptyHtml(html: string | null | undefined): boolean {+ if (html == null) return true;+ const trimmed = html.trim();+ if (trimmed === "") return true;+ // Strip a single outer <p>...</p> wrapper and inspect its interior.+ const match = /^<p>([\s\S]*?)<\/p>$/i.exec(trimmed);+ if (!match) return false;+ const inner = match[1]!+ .replace(/<br\s*\/?\s*>/gi, "")+ .replace(/ /gi, " ")+ .trim();+ return inner === "";+}diff --git a/src/shared/src/schemas.ts b/src/shared/src/schemas.tsindex 57f937d5f..27b168ab8 100644--- a/src/shared/src/schemas.ts+++ b/src/shared/src/schemas.ts@@ -1,4 +1,5 @@import { z } from "zod";+import { TASK_TYPES } from "./constants";// ---------------------------------------------------------------------------// Task status@@ -28,7 +29,7 @@ export const ClaimedTaskRowSchema = z.object({priority: z.coerce.number(),result: z.unknown().nullable(),context: z.unknown().nullable(),- type: z.string().default("user_dm_message"),+ type: z.string().default(TASK_TYPES.USER_DM_MESSAGE),sessionId: z.string().nullable(),createdAt: z.coerce.date(),dispatchedAt: z.coerce.date().nullable(),@@ -177,3 +178,100 @@ export const ReportMessagesRequestSchema = z.object({messages: z.array(MessageItemSchema),});export type ReportMessagesRequest = z.infer<typeof ReportMessagesRequestSchema>;++// ---------------------------------------------------------------------------+// Calendar event schemas+// ---------------------------------------------------------------------------++export const RepeatIntervalSchema = z+ .string()+ .regex(/^\d+(min|hour|day|week|month)$/, {+ message:+ "repeat_interval must match <positive_integer><min|hour|day|week|month>",+ });++export const CreateCalendarEventRequestSchema = z+ .object({+ agent_id: z.string().min(1),+ title: z.string().min(1),+ description: z.string().max(20_000).optional(),+ scheduled_at: z+ .string()+ .min(1)+ .refine((s) => !Number.isNaN(Date.parse(s)), {+ message: "scheduled_at must be a valid ISO datetime",+ }),+ repeat_interval: RepeatIntervalSchema.optional(),+ repeat_stop_date: z+ .string()+ .regex(/^\d{4}-\d{2}-\d{2}$/)+ .optional(),+ })+ .refine(+ (data) =>+ !data.repeat_stop_date || !!data.repeat_interval,+ {+ message: "repeat_stop_date requires repeat_interval",+ path: ["repeat_stop_date"],+ }+ );+export type CreateCalendarEventRequestInput = z.infer<+ typeof CreateCalendarEventRequestSchema+>;++export const UpdateCalendarEventRequestSchema = z+ .object({+ title: z.string().min(1).optional(),+ description: z.string().max(20_000).nullable().optional(),+ agent_id: z.string().min(1).optional(),+ scheduled_at: z+ .string()+ .min(1)+ .refine((s) => !Number.isNaN(Date.parse(s)), {+ message: "scheduled_at must be a valid ISO datetime",+ })+ .optional(),+ repeat_interval: RepeatIntervalSchema.nullable().optional(),+ repeat_stop_date: z+ .string()+ .regex(/^\d{4}-\d{2}-\d{2}$/)+ .nullable()+ .optional(),+ scope: z.enum(["this", "following"]).optional(),+ occurrence_at: z+ .string()+ .min(1)+ .refine((s) => !Number.isNaN(Date.parse(s)), {+ message: "occurrence_at must be a valid ISO datetime",+ })+ .optional(),+ })+ .refine(+ (v) =>+ v.title !== undefined ||+ v.description !== undefined ||+ v.agent_id !== undefined ||+ v.scheduled_at !== undefined ||+ v.repeat_interval !== undefined ||+ v.repeat_stop_date !== undefined,+ { message: "at least one field is required" }+ );+export type UpdateCalendarEventRequestInput = z.infer<+ typeof UpdateCalendarEventRequestSchema+>;++export const CalendarEventApiSchema = z.object({+ id: z.string(),+ agent_id: z.string(),+ workspace_id: z.string(),+ title: z.string(),+ description: z.string().nullable(),+ scheduled_at: z.string(),+ occurrence_at: z.string(),+ repeat_interval: z.string().nullable(),+ repeat_stop_at: z.string().nullable(),+ last_triggered_at: z.string().nullable(),+ created_at: z.string(),+ updated_at: z.string(),+});+export type CalendarEventApi = z.infer<typeof CalendarEventApiSchema>;diff --git a/src/shared/src/types.ts b/src/shared/src/types.tsindex c2abe32b5..b81763360 100644--- a/src/shared/src/types.ts+++ b/src/shared/src/types.ts@@ -50,10 +50,31 @@ export interface Conversation {id: string;agent_id: string;title: string;+ type: string;created_at: string;message_count?: number;}+export interface CalendarEvent {+ id: string;+ agent_id: string;+ workspace_id: string;+ title: string;+ description: string | null;+ scheduled_at: string;+ /**+ * For non-recurring events, equal to `scheduled_at`. For recurring events+ * expanded by the server, this is the ISO of the specific occurrence the+ * row represents.+ */+ occurrence_at: string;+ repeat_interval: string | null;+ repeat_stop_at: string | null;+ last_triggered_at: string | null;+ created_at: string;+ updated_at: string;+}+export interface Message {id: string;conversation_id: string;diff --git a/src/shared/test/calendar-schemas.test.ts b/src/shared/test/calendar-schemas.test.tsnew file mode 100644index 000000000..06f9eddaf--- /dev/null+++ b/src/shared/test/calendar-schemas.test.ts@@ -0,0 +1,262 @@+import { describe, it, expect } from "vitest";+import {+ RepeatIntervalSchema,+ CreateCalendarEventRequestSchema,+ UpdateCalendarEventRequestSchema,+ CalendarEventApiSchema,+} from "../src/schemas";++describe("RepeatIntervalSchema", () => {+ it("accepts valid intervals", () => {+ for (const v of ["30min", "1hour", "1day", "7day", "1week", "1month"]) {+ expect(RepeatIntervalSchema.parse(v)).toBe(v);+ }+ });++ it("rejects invalid intervals", () => {+ for (const v of ["0", "1year", "day1", "1DAY", "", "1.5day"]) {+ expect(() => RepeatIntervalSchema.parse(v)).toThrow();+ }+ });+});++describe("CreateCalendarEventRequestSchema", () => {+ const base = {+ agent_id: "ag_1",+ title: "Run standup",+ scheduled_at: "2026-04-17T09:00:00.000Z",+ };++ it("accepts minimum valid payload", () => {+ expect(CreateCalendarEventRequestSchema.parse(base)).toMatchObject(base);+ });++ it("accepts repeat_interval and repeat_stop_date together", () => {+ const payload = {+ ...base,+ repeat_interval: "1day",+ repeat_stop_date: "2026-05-17",+ };+ expect(CreateCalendarEventRequestSchema.parse(payload)).toMatchObject(payload);+ });++ it("rejects repeat_stop_date without repeat_interval", () => {+ expect(() =>+ CreateCalendarEventRequestSchema.parse({+ ...base,+ repeat_stop_date: "2026-05-17",+ })+ ).toThrow();+ });++ it("rejects malformed repeat_interval", () => {+ expect(() =>+ CreateCalendarEventRequestSchema.parse({+ ...base,+ repeat_interval: "weekly",+ })+ ).toThrow();+ });++ it("rejects malformed repeat_stop_date", () => {+ expect(() =>+ CreateCalendarEventRequestSchema.parse({+ ...base,+ repeat_interval: "1day",+ repeat_stop_date: "May 17",+ })+ ).toThrow();+ });++ it("rejects invalid scheduled_at", () => {+ expect(() =>+ CreateCalendarEventRequestSchema.parse({+ ...base,+ scheduled_at: "not a date",+ })+ ).toThrow();+ });++ it("rejects empty agent_id / title", () => {+ expect(() =>+ CreateCalendarEventRequestSchema.parse({ ...base, agent_id: "" })+ ).toThrow();+ expect(() =>+ CreateCalendarEventRequestSchema.parse({ ...base, title: "" })+ ).toThrow();+ });+});++describe("CreateCalendarEventRequestSchema — description", () => {+ const base = {+ agent_id: "ag_1",+ title: "Run standup",+ scheduled_at: "2026-04-17T09:00:00.000Z",+ };++ it("accepts description as a short string", () => {+ const payload = { ...base, description: "<p>hi</p>" };+ expect(CreateCalendarEventRequestSchema.parse(payload)).toMatchObject(payload);+ });++ it("accepts empty-string description", () => {+ const payload = { ...base, description: "" };+ expect(CreateCalendarEventRequestSchema.parse(payload)).toMatchObject(payload);+ });++ it("accepts payloads without description", () => {+ expect(CreateCalendarEventRequestSchema.parse(base)).toMatchObject(base);+ });++ it("rejects description longer than 20k chars", () => {+ const payload = { ...base, description: "x".repeat(20_001) };+ expect(() => CreateCalendarEventRequestSchema.parse(payload)).toThrow();+ });+});++describe("UpdateCalendarEventRequestSchema", () => {+ it("accepts { title } alone", () => {+ expect(+ UpdateCalendarEventRequestSchema.parse({ title: "new title" })+ ).toMatchObject({ title: "new title" });+ });++ it("accepts { description } alone", () => {+ expect(+ UpdateCalendarEventRequestSchema.parse({ description: "<p>x</p>" })+ ).toMatchObject({ description: "<p>x</p>" });+ });++ it("accepts both fields together", () => {+ const payload = { title: "t", description: "<p>d</p>" };+ expect(UpdateCalendarEventRequestSchema.parse(payload)).toMatchObject(payload);+ });++ it("accepts description: null for clearing", () => {+ expect(+ UpdateCalendarEventRequestSchema.parse({ description: null })+ ).toMatchObject({ description: null });+ });++ it("accepts description: \"\" (server normalizes to null)", () => {+ expect(+ UpdateCalendarEventRequestSchema.parse({ description: "" })+ ).toMatchObject({ description: "" });+ });++ it("rejects an empty object", () => {+ expect(() => UpdateCalendarEventRequestSchema.parse({})).toThrow();+ });++ it("rejects empty title string", () => {+ expect(() =>+ UpdateCalendarEventRequestSchema.parse({ title: "" })+ ).toThrow();+ });++ it("accepts agent_id / scheduled_at / repeat_interval / repeat_stop_date / scope", () => {+ const payload = {+ agent_id: "ag_2",+ scheduled_at: "2026-05-01T12:00:00.000Z",+ repeat_interval: "1week",+ repeat_stop_date: "2026-07-01",+ scope: "this" as const,+ };+ expect(UpdateCalendarEventRequestSchema.parse(payload)).toMatchObject(payload);+ });++ it("accepts repeat_interval: null (clear repeat)", () => {+ expect(+ UpdateCalendarEventRequestSchema.parse({ repeat_interval: null })+ ).toMatchObject({ repeat_interval: null });+ });++ it("accepts repeat_stop_date: null (clear stop)", () => {+ expect(+ UpdateCalendarEventRequestSchema.parse({ repeat_stop_date: null })+ ).toMatchObject({ repeat_stop_date: null });+ });++ it("rejects body with only scope (no actual edit)", () => {+ expect(() =>+ UpdateCalendarEventRequestSchema.parse({ scope: "this" })+ ).toThrow();+ });++ it("rejects malformed scheduled_at", () => {+ expect(() =>+ UpdateCalendarEventRequestSchema.parse({ scheduled_at: "not a date" })+ ).toThrow();+ });++ it("rejects malformed repeat_interval", () => {+ expect(() =>+ UpdateCalendarEventRequestSchema.parse({ repeat_interval: "weekly" })+ ).toThrow();+ });++ it("rejects malformed scope", () => {+ expect(() =>+ UpdateCalendarEventRequestSchema.parse({+ title: "t",+ scope: "oops" as unknown,+ })+ ).toThrow();+ });++ it("accepts occurrence_at as a valid ISO datetime", () => {+ expect(+ UpdateCalendarEventRequestSchema.parse({+ title: "t",+ occurrence_at: "2026-04-20T09:00:00.000Z",+ })+ ).toMatchObject({ occurrence_at: "2026-04-20T09:00:00.000Z" });+ });++ it("rejects a malformed occurrence_at", () => {+ expect(() =>+ UpdateCalendarEventRequestSchema.parse({+ title: "t",+ occurrence_at: "not a date",+ })+ ).toThrow();+ });+});++describe("CalendarEventApiSchema", () => {+ it("parses a full wire-format response", () => {+ const row = {+ id: "ce_1",+ agent_id: "ag_1",+ workspace_id: "ws_1",+ title: "Run standup",+ description: null,+ scheduled_at: "2026-04-17T09:00:00Z",+ occurrence_at: "2026-04-17T09:00:00Z",+ repeat_interval: null,+ repeat_stop_at: null,+ last_triggered_at: null,+ created_at: "2026-04-10T00:00:00Z",+ updated_at: "2026-04-10T00:00:00Z",+ };+ expect(CalendarEventApiSchema.parse(row)).toEqual(row);+ });++ it("accepts description as a string", () => {+ const row = {+ id: "ce_1",+ agent_id: "ag_1",+ workspace_id: "ws_1",+ title: "Run standup",+ description: "<p>hello</p>",+ scheduled_at: "2026-04-17T09:00:00Z",+ occurrence_at: "2026-04-17T09:00:00Z",+ repeat_interval: null,+ repeat_stop_at: null,+ last_triggered_at: null,+ created_at: "2026-04-10T00:00:00Z",+ updated_at: "2026-04-10T00:00:00Z",+ };+ expect(CalendarEventApiSchema.parse(row)).toEqual(row);+ });+});diff --git a/src/shared/test/lib/html.test.ts b/src/shared/test/lib/html.test.tsnew file mode 100644index 000000000..726923eba--- /dev/null+++ b/src/shared/test/lib/html.test.ts@@ -0,0 +1,35 @@+import { describe, it, expect } from "vitest";+import { isEmptyHtml } from "../../src/lib/html";++describe("isEmptyHtml", () => {+ it("returns true for blank / placeholder-editor shapes", () => {+ for (const v of [+ "",+ "<p></p>",+ "<p><br></p>",+ " <p> </p> ",+ "<p>\n</p>",+ "<p><br/></p>",+ "<p><br /></p>",+ "<p> </p>",+ ]) {+ expect(isEmptyHtml(v)).toBe(true);+ }+ });++ it("returns true for null / undefined", () => {+ expect(isEmptyHtml(null)).toBe(true);+ expect(isEmptyHtml(undefined)).toBe(true);+ });++ it("returns false for real content", () => {+ for (const v of [+ "<p>hi</p>",+ "<p> a </p>",+ "<h1>t</h1>",+ "<ul><li>x</li></ul>",+ ]) {+ expect(isEmptyHtml(v)).toBe(false);+ }+ });+});diff --git a/src/shared/test/queries/calendar-event.test.ts b/src/shared/test/queries/calendar-event.test.tsnew file mode 100644index 000000000..5a58bb5fd--- /dev/null+++ b/src/shared/test/queries/calendar-event.test.ts@@ -0,0 +1,286 @@+import { describe, it, expect } from "vitest";+import * as calendarQueries from "../../src/db/queries/calendar-event";++describe("calendar-event query module exports", () => {+ it("exports createCalendarEvent", () => {+ expect(typeof calendarQueries.createCalendarEvent).toBe("function");+ });+ it("exports listCalendarEvents", () => {+ expect(typeof calendarQueries.listCalendarEvents).toBe("function");+ });+ it("exports getCalendarEvent", () => {+ expect(typeof calendarQueries.getCalendarEvent).toBe("function");+ });+ it("exports deleteCalendarEvent", () => {+ expect(typeof calendarQueries.deleteCalendarEvent).toBe("function");+ });+ it("exports updateCalendarEvent", () => {+ expect(typeof calendarQueries.updateCalendarEvent).toBe("function");+ });++ // Compile-time guard: patch accepts optional title and nullable description.+ // Kept inside an `if (false)` block so the runtime path is never exercised,+ // but the TypeScript compiler still checks the call signature.+ it("has a patch-shaped signature (type-level)", () => {+ if (false) {+ const db = {} as Parameters<typeof calendarQueries.updateCalendarEvent>[0];+ void calendarQueries.updateCalendarEvent(db, "ce_1", "ws_1", {+ title: "t",+ description: null,+ });+ void calendarQueries.updateCalendarEvent(db, "ce_1", "ws_1", {+ title: "t",+ });+ void calendarQueries.updateCalendarEvent(db, "ce_1", "ws_1", {+ description: "x",+ });+ void calendarQueries.updateCalendarEvent(db, "ce_1", "ws_1", {+ description: undefined,+ });+ void calendarQueries.updateCalendarEvent(db, "ce_1", "ws_1", {+ agentId: "ag_2",+ scheduledAt: "2026-05-01T12:00:00.000Z",+ repeatInterval: null,+ repeatStopAt: null,+ });+ }+ expect(true).toBe(true);+ });+ it("exports listDueCalendarEvents", () => {+ expect(typeof calendarQueries.listDueCalendarEvents).toBe("function");+ });+ it("exports claimCalendarEvent", () => {+ expect(typeof calendarQueries.claimCalendarEvent).toBe("function");+ });+ it("exports revertCalendarEventClaim", () => {+ expect(typeof calendarQueries.revertCalendarEventClaim).toBe("function");+ });+ it("exports updateCalendarEventSchedule", () => {+ expect(typeof calendarQueries.updateCalendarEventSchedule).toBe("function");+ });+ it("exports addRepeatInterval", () => {+ expect(typeof calendarQueries.addRepeatInterval).toBe("function");+ });+ it("exports computeNextScheduledAt", () => {+ expect(typeof calendarQueries.computeNextScheduledAt).toBe("function");+ });+});++describe("addRepeatInterval", () => {+ const base = new Date("2026-01-15T10:00:00.000Z");++ it("advances by minutes", () => {+ const out = calendarQueries.addRepeatInterval(base, "30min");+ expect(out.toISOString()).toBe("2026-01-15T10:30:00.000Z");+ });++ it("advances by hours", () => {+ const out = calendarQueries.addRepeatInterval(base, "2hour");+ expect(out.toISOString()).toBe("2026-01-15T12:00:00.000Z");+ });++ it("advances by days", () => {+ const out = calendarQueries.addRepeatInterval(base, "1day");+ expect(out.toISOString()).toBe("2026-01-16T10:00:00.000Z");+ });++ it("advances by weeks (7 days)", () => {+ const out = calendarQueries.addRepeatInterval(base, "1week");+ expect(out.toISOString()).toBe("2026-01-22T10:00:00.000Z");+ });++ it("advances by months", () => {+ const out = calendarQueries.addRepeatInterval(base, "1month");+ expect(out.toISOString()).toBe("2026-02-15T10:00:00.000Z");+ });++ it("clamps month overflow: Jan 31 + 1 month = Feb 28", () => {+ const jan31 = new Date("2026-01-31T09:00:00.000Z");+ const out = calendarQueries.addRepeatInterval(jan31, "1month");+ // 2026 is not a leap year → Feb has 28 days+ expect(out.getUTCFullYear()).toBe(2026);+ expect(out.getUTCMonth()).toBe(1); // Feb+ expect(out.getUTCDate()).toBe(28);+ });++ it("clamps month overflow: Jan 31 + 1 month in a leap year = Feb 29", () => {+ const jan31 = new Date("2028-01-31T09:00:00.000Z");+ const out = calendarQueries.addRepeatInterval(jan31, "1month");+ expect(out.getUTCFullYear()).toBe(2028);+ expect(out.getUTCMonth()).toBe(1); // Feb+ expect(out.getUTCDate()).toBe(29);+ });++ it("advances across year boundary", () => {+ const dec = new Date("2026-12-15T10:00:00.000Z");+ const out = calendarQueries.addRepeatInterval(dec, "1month");+ expect(out.getUTCFullYear()).toBe(2027);+ expect(out.getUTCMonth()).toBe(0);+ });++ it("throws on invalid format", () => {+ expect(() =>+ calendarQueries.addRepeatInterval(base, "nope")+ ).toThrow();+ expect(() =>+ calendarQueries.addRepeatInterval(base, "1year")+ ).toThrow();+ });+});++describe("computeNextScheduledAt", () => {+ it("returns the next occurrence when the next future occurrence is after now", () => {+ const out = calendarQueries.computeNextScheduledAt(+ "2026-01-01T09:00:00.000Z",+ "1day",+ null,+ "2026-01-01T09:30:00.000Z"+ );+ expect(out).toBe("2026-01-02T09:00:00.000Z");+ });++ it("loop-advances past now when daemon downtime missed multiple occurrences", () => {+ const out = calendarQueries.computeNextScheduledAt(+ "2026-01-01T09:00:00.000Z",+ "1day",+ null,+ "2026-01-05T09:30:00.000Z"+ );+ // Next must be > now; after four days of downtime, the next tick is Jan 6.+ expect(out).toBe("2026-01-06T09:00:00.000Z");+ });++ it("returns null when the next occurrence would exceed repeat_stop_at", () => {+ const out = calendarQueries.computeNextScheduledAt(+ "2026-01-01T09:00:00.000Z",+ "1day",+ "2026-01-01T23:59:59.999Z",+ "2026-01-01T09:30:00.000Z"+ );+ expect(out).toBeNull();+ });++ it("returns null when downtime pushes next past repeat_stop_at (event becomes inert)", () => {+ const out = calendarQueries.computeNextScheduledAt(+ "2026-01-01T09:00:00.000Z",+ "1day",+ "2026-01-03T23:59:59.999Z",+ "2026-01-10T09:30:00.000Z"+ );+ expect(out).toBeNull();+ });++ it("fires at the repeat_stop boundary when the next computed occurrence is still <= stop", () => {+ const out = calendarQueries.computeNextScheduledAt(+ "2026-01-01T09:00:00.000Z",+ "1day",+ "2026-01-02T23:59:59.999Z",+ "2026-01-01T09:30:00.000Z"+ );+ // Jan 2 at 09:00 is still <= stop+ expect(out).toBe("2026-01-02T09:00:00.000Z");+ });++ it("skips excepted occurrences", () => {+ const out = calendarQueries.computeNextScheduledAt(+ "2026-01-01T09:00:00.000Z",+ "1day",+ null,+ "2026-01-01T09:30:00.000Z",+ ["2026-01-02T09:00:00.000Z"]+ );+ expect(out).toBe("2026-01-03T09:00:00.000Z");+ });++ it("skips multiple consecutive exceptions", () => {+ const out = calendarQueries.computeNextScheduledAt(+ "2026-01-01T09:00:00.000Z",+ "1day",+ null,+ "2026-01-01T09:30:00.000Z",+ [+ "2026-01-02T09:00:00.000Z",+ "2026-01-03T09:00:00.000Z",+ "2026-01-04T09:00:00.000Z",+ ]+ );+ expect(out).toBe("2026-01-05T09:00:00.000Z");+ });++ it("returns null when all remaining occurrences until stop are excepted", () => {+ const out = calendarQueries.computeNextScheduledAt(+ "2026-01-01T09:00:00.000Z",+ "1day",+ "2026-01-02T23:59:59.999Z",+ "2026-01-01T09:30:00.000Z",+ ["2026-01-02T09:00:00.000Z"]+ );+ expect(out).toBeNull();+ });+});++describe("expandOccurrences", () => {+ it("returns one entry per occurrence within [from, to] for a daily event", () => {+ const out = calendarQueries.expandOccurrences(+ "2026-04-17T09:00:00.000Z",+ "1day",+ null,+ [],+ "2026-04-15T00:00:00.000Z",+ "2026-04-20T23:59:59.999Z"+ );+ expect(out).toEqual([+ "2026-04-17T09:00:00.000Z",+ "2026-04-18T09:00:00.000Z",+ "2026-04-19T09:00:00.000Z",+ "2026-04-20T09:00:00.000Z",+ ]);+ });++ it("skips exceptions", () => {+ const out = calendarQueries.expandOccurrences(+ "2026-04-17T09:00:00.000Z",+ "1day",+ null,+ ["2026-04-19T09:00:00.000Z"],+ "2026-04-15T00:00:00.000Z",+ "2026-04-20T23:59:59.999Z"+ );+ expect(out).toEqual([+ "2026-04-17T09:00:00.000Z",+ "2026-04-18T09:00:00.000Z",+ "2026-04-20T09:00:00.000Z",+ ]);+ });++ it("stops at repeat_stop_at", () => {+ const out = calendarQueries.expandOccurrences(+ "2026-04-17T09:00:00.000Z",+ "1day",+ "2026-04-18T23:59:59.999Z",+ [],+ "2026-04-15T00:00:00.000Z",+ "2026-04-30T23:59:59.999Z"+ );+ expect(out).toEqual([+ "2026-04-17T09:00:00.000Z",+ "2026-04-18T09:00:00.000Z",+ ]);+ });++ it("excludes occurrences before `from`", () => {+ const out = calendarQueries.expandOccurrences(+ "2026-04-10T09:00:00.000Z",+ "1day",+ null,+ [],+ "2026-04-12T00:00:00.000Z",+ "2026-04-14T23:59:59.999Z"+ );+ expect(out).toEqual([+ "2026-04-12T09:00:00.000Z",+ "2026-04-13T09:00:00.000Z",+ "2026-04-14T09:00:00.000Z",+ ]);+ });+});diff --git a/src/web/migrations/0002_calendar_event.sql b/src/web/migrations/0002_calendar_event.sqlnew file mode 100644index 000000000..391ba34d1--- /dev/null+++ b/src/web/migrations/0002_calendar_event.sql@@ -0,0 +1,21 @@+-- Calendar event table + conversation.type column+-- Matches src/shared/src/db/schema.ts++ALTER TABLE conversation ADD COLUMN type TEXT NOT NULL DEFAULT 'user_dm_message';++CREATE TABLE IF NOT EXISTS calendar_event (+ id TEXT PRIMARY KEY,+ agent_id TEXT NOT NULL,+ workspace_id TEXT NOT NULL,+ title TEXT NOT NULL,+ scheduled_at TEXT NOT NULL,+ repeat_interval TEXT,+ repeat_stop_at TEXT,+ last_triggered_at TEXT,+ created_at TEXT NOT NULL DEFAULT (datetime('now')),+ updated_at TEXT NOT NULL DEFAULT (datetime('now')),+ FOREIGN KEY (agent_id, workspace_id) REFERENCES agent(id, workspace_id) ON DELETE CASCADE+);++CREATE INDEX IF NOT EXISTS idx_calendar_event_agent_ws ON calendar_event (agent_id, workspace_id);+CREATE INDEX IF NOT EXISTS idx_calendar_event_ws_scheduled ON calendar_event (workspace_id, scheduled_at);diff --git a/src/web/migrations/0003_calendar_event_description.sql b/src/web/migrations/0003_calendar_event_description.sqlnew file mode 100644index 000000000..0debe4840--- /dev/null+++ b/src/web/migrations/0003_calendar_event_description.sql@@ -0,0 +1,4 @@+-- Add optional description column to calendar_event.+-- Matches src/shared/src/db/schema.ts++ALTER TABLE calendar_event ADD COLUMN description TEXT;diff --git a/src/web/migrations/0004_calendar_event_exceptions.sql b/src/web/migrations/0004_calendar_event_exceptions.sqlnew file mode 100644index 000000000..6713ac8c3--- /dev/null+++ b/src/web/migrations/0004_calendar_event_exceptions.sql@@ -0,0 +1,4 @@+-- Add per-occurrence exceptions list to calendar_event.+-- Matches src/shared/src/db/schema.ts++ALTER TABLE calendar_event ADD COLUMN exceptions TEXT NOT NULL DEFAULT '[]';diff --git a/src/web/src/app/(app)/w/[slug]/agents/[id]/chat/page.tsx b/src/web/src/app/(app)/w/[slug]/agents/[id]/chat/page.tsxindex fbb625a76..b8eada1b3 100644--- a/src/web/src/app/(app)/w/[slug]/agents/[id]/chat/page.tsx+++ b/src/web/src/app/(app)/w/[slug]/agents/[id]/chat/page.tsx@@ -1,424 +1,7 @@"use client";-import React, { useEffect, useState, useRef, useCallback } from "react";-import { useParams } from "next/navigation";-import { useWorkspace } from "@/contexts/workspace-context";-import { Button } from "@/components/ui/button";-import { TaskStream } from "@/components/task-stream";-import {- getOrCreateAgentConversation,- listMessages,- sendMessage,- getTask,- getTaskMessages,-} from "@/lib/api";-import type { Conversation, Message, TaskApi as Task, TaskMessage } from "@alook/shared";-import { toast } from "sonner";-import { cn } from "@/lib/utils";-import { Skeleton } from "@/components/ui/skeleton";-import { ArrowUp, Loader2 } from "lucide-react";-import { Streamdown } from "streamdown";--const MESSAGE_LIMIT = 10;--/** Sort messages by (created_at, id) ascending — guarantees chronological order. */-export function sortMessages(msgs: Message[]): Message[] {- return msgs.slice().sort((a, b) => {- const cmp = a.created_at.localeCompare(b.created_at);- if (cmp !== 0) return cmp;- return a.id.localeCompare(b.id);- });-}--/** Merge two message arrays by ID (latest wins), then sort chronologically. */-export function mergeMessages(existing: Message[], incoming: Message[]): Message[] {- const merged = new Map<string, Message>();- for (const m of existing) merged.set(m.id, m);- for (const m of incoming) merged.set(m.id, m);- return sortMessages([...merged.values()]);-}+import { AgentChatView } from "@/components/agent-chat/agent-chat-view";export default function AgentChatPage() {- const params = useParams();- const { workspaceId } = useWorkspace();- const agentId = params.id as string;-- const [conversation, setConversation] = useState<Conversation | null>(null);- const [messages, setMessages] = useState<Message[]>([]);- const [input, setInput] = useState("");- const [sending, setSending] = useState(false);- const [activeTask, setActiveTask] = useState<Task | null>(null);- const [taskMessages, setTaskMessages] = useState<TaskMessage[]>([]);- const [loading, setLoading] = useState(true);- const [connectionLost, setConnectionLost] = useState(false);- const [hasMore, setHasMore] = useState(false);- const [loadingMore, setLoadingMore] = useState(false);-- const scrollRef = useRef<HTMLDivElement>(null);- const pollRef = useRef<ReturnType<typeof setInterval> | null>(null);- const lastSeqRef = useRef(0);- const pollFailures = useRef(0);- const initialScrollDone = useRef(false);- const loadingMoreRef = useRef(false);-- const scrollToBottom = useCallback(() => {- setTimeout(() => {- scrollRef.current?.scrollTo({- top: scrollRef.current.scrollHeight,- behavior: "smooth",- });- }, 50);- }, []);-- // Resolve conversation (get or create) then load messages- useEffect(() => {- async function load() {- try {- const conv = await getOrCreateAgentConversation(agentId, workspaceId);- setConversation(conv);- const msgs = await listMessages(conv.id, workspaceId, { limit: MESSAGE_LIMIT });- setMessages(msgs);- setHasMore(msgs.length >= MESSAGE_LIMIT);- } catch {- toast.error("Failed to load conversation");- } finally {- setLoading(false);- }- }- load();- }, [agentId, workspaceId]);-- // Scroll to bottom on initial load- useEffect(() => {- if (!loading && messages.length > 0 && !initialScrollDone.current) {- initialScrollDone.current = true;- setTimeout(() => {- scrollRef.current?.scrollTo({ top: scrollRef.current.scrollHeight });- }, 50);- }- }, [loading, messages.length]);-- const loadOlderMessages = useCallback(async () => {- if (!conversation || loadingMoreRef.current || !hasMore) return;- const oldest = messages[0];- if (!oldest) return;-- loadingMoreRef.current = true;- setLoadingMore(true);- const el = scrollRef.current;- const prevScrollHeight = el?.scrollHeight ?? 0;-- try {- const older = await listMessages(conversation.id, workspaceId, {- limit: MESSAGE_LIMIT,- before: oldest.created_at,- beforeId: oldest.id,- });- if (older.length === 0) {- setHasMore(false);- return;- }- setHasMore(older.length >= MESSAGE_LIMIT);- setMessages((prev) => {- const existingIds = new Set(prev.map((m) => m.id));- const unique = older.filter((m) => !existingIds.has(m.id));- return [...unique, ...prev];- });-- // Restore scroll position so content doesn't jump- requestAnimationFrame(() => {- if (el) {- const newScrollHeight = el.scrollHeight;- el.scrollTop = newScrollHeight - prevScrollHeight;- }- });- } catch {- toast.error("Failed to load older messages");- } finally {- loadingMoreRef.current = false;- setLoadingMore(false);- }- }, [conversation, workspaceId, messages, hasMore]);-- // Detect scroll to top for loading more- const handleScroll = useCallback(() => {- const el = scrollRef.current;- if (!el || loadingMore || !hasMore) return;- if (el.scrollTop < 80) {- loadOlderMessages();- }- }, [loadOlderMessages, loadingMore, hasMore]);-- const startPolling = useCallback(- (taskId: string, conversationId: string) => {- if (pollRef.current) clearInterval(pollRef.current);- lastSeqRef.current = 0;- pollFailures.current = 0;- setConnectionLost(false);-- pollRef.current = setInterval(async () => {- try {- const [task, tmsgs] = await Promise.all([- getTask(taskId, workspaceId),- getTaskMessages(taskId, workspaceId, lastSeqRef.current || undefined),- ]);-- pollFailures.current = 0;- setConnectionLost(false);- setActiveTask(task);-- if (tmsgs.length > 0) {- setTaskMessages((prev) => [...prev, ...tmsgs]);- lastSeqRef.current = Math.max(- ...tmsgs.map((m) => m.seq),- lastSeqRef.current- );- }-- if (task.status === "completed" || task.status === "failed") {- if (pollRef.current) clearInterval(pollRef.current);- pollRef.current = null;-- try {- // Fetch latest messages and merge with any older pagination-loaded messages- const latest = await listMessages(conversationId, workspaceId);- setMessages((prev) => mergeMessages(prev, latest));- setTaskMessages([]);- scrollToBottom();- } catch {- toast.error("Failed to refresh messages");- }- setActiveTask(task);- }- } catch {- pollFailures.current += 1;- if (pollFailures.current >= 3) {- setConnectionLost(true);- }- if (pollFailures.current >= 10) {- if (pollRef.current) clearInterval(pollRef.current);- pollRef.current = null;- toast.error("Lost connection to agent");- }- }- }, 1000);- },- [workspaceId, scrollToBottom]- );-- useEffect(() => {- return () => {- if (pollRef.current) clearInterval(pollRef.current);- };- }, []);-- const handleSend = async () => {- const content = input.trim();- if (!content || sending || !conversation) return;-- setInput("");- setSending(true);-- const optimistic: Message = {- id: `temp-${Date.now()}`,- conversation_id: conversation.id,- role: "user",- content,- task_id: null,- created_at: new Date().toISOString(),- };- setMessages((prev) => [...prev, optimistic]);- scrollToBottom();-- try {- const { message, task } = await sendMessage(conversation.id, content, workspaceId);- setMessages((prev) =>- prev.map((m) => (m.id === optimistic.id ? message : m))- );- setActiveTask(task);- setTaskMessages([]);- startPolling(task.id, conversation.id);- } catch (err) {- setMessages((prev) => prev.filter((m) => m.id !== optimistic.id));- setInput(content);- toast.error(- err instanceof Error ? err.message : "Failed to send message"- );- } finally {- setSending(false);- }- };-- const handleKeyDown = (e: React.KeyboardEvent) => {- if (e.key === "Enter" && !e.shiftKey) {- e.preventDefault();- handleSend();- }- };-- if (loading) {- return (- <>- <div className="flex-1 overflow-y-auto px-5">- <div className="mx-auto max-w-2xl py-6 space-y-4">- {/* Skeleton user message */}- <div className="flex justify-end">- <Skeleton className="h-10 w-48 rounded-lg" />- </div>- {/* Skeleton assistant message */}- <div className="flex justify-start">- <div className="space-y-2 px-1 py-1">- <Skeleton className="h-4 w-72" />- <Skeleton className="h-4 w-56" />- <Skeleton className="h-4 w-64" />- </div>- </div>- {/* Another pair */}- <div className="flex justify-end">- <Skeleton className="h-10 w-36 rounded-lg" />- </div>- <div className="flex justify-start">- <div className="space-y-2 px-1 py-1">- <Skeleton className="h-4 w-64" />- <Skeleton className="h-4 w-48" />- </div>- </div>- </div>- </div>- {/* Skeleton input area */}- <div className="px-5 py-3">- <div className="mx-auto max-w-2xl">- <Skeleton className="h-[72px] w-full rounded-xl" />- </div>- </div>- </>- );- }-- if (!conversation) {- return (- <div className="flex flex-1 items-center justify-center text-sm text-muted-foreground">- Failed to load conversation- </div>- );- }-- return (- <>- {/* Messages */}- <div- className="flex-1 overflow-y-auto px-5 thin-scrollbar"- ref={scrollRef}- onScroll={handleScroll}- onClick={(e) => {- const btn = (e.target as HTMLElement).closest(- '[data-streamdown="code-block-actions"] button'- );- if (btn) toast.success("Copied to clipboard");- }}- >- <div className="mx-auto max-w-2xl py-6 space-y-4">- {/* Load more indicator */}- {loadingMore && (- <div className="flex justify-center py-2">- <Loader2 className="size-4 animate-spin text-muted-foreground" />- </div>- )}-- {messages.length === 0 && !activeTask && (- <p className="text-center text-muted-foreground py-20 text-sm">- Send a message to start chatting with the agent.- </p>- )}-- {messages.map((msg) => {- const hasTaskStream =- activeTask &&- msg.role === "assistant" &&- msg.task_id === activeTask.id &&- taskMessages.length > 0;-- return (- <React.Fragment key={msg.id}>- {/* Show full trace (including text) for completed tasks */}- {hasTaskStream && (- <TaskStream- task={activeTask}- messages={taskMessages}- connectionLost={connectionLost}- />- )}- {msg.role === "user" ? (- <div className="flex justify-end">- <div className="max-w-[80%] rounded-lg px-4 py-2 bg-primary text-primary-foreground text-base whitespace-pre-wrap">- {msg.content}- </div>- </div>- ) : !hasTaskStream ? (- <div className="flex justify-start">- <div className="markdown max-w-full px-1 py-1 text-base text-foreground">- <Streamdown controls={{ code: { copy: true, download: false }, table: { copy: true, download: false, fullscreen: true } }} linkSafety={{ enabled: false }}>{msg.content}</Streamdown>- </div>- </div>- ) : null}- </React.Fragment>- );- })}-- {/* Show trace while task is in progress (no assistant message yet) */}- {activeTask && activeTask.status !== "completed" && activeTask.status !== "failed" && (- <TaskStream- task={activeTask}- messages={taskMessages}- connectionLost={connectionLost}- />- )}- </div>- </div>-- {/* Input */}- <div className="px-5 py-3">- <div className="mx-auto max-w-2xl">- <div- className={cn(- "relative flex flex-col rounded-xl border bg-background/60 transition-colors duration-200",- "focus-within:border-ring focus-within:ring-3 focus-within:ring-ring/50",- (sending || (!!activeTask && activeTask.status !== "completed" && activeTask.status !== "failed")) && "opacity-50"- )}- >- <textarea- value={input}- onChange={(e) => setInput(e.target.value)}- onKeyDown={handleKeyDown}- placeholder="Type a message..."- rows={1}- disabled={sending || (!!activeTask && activeTask.status !== "completed" && activeTask.status !== "failed")}- className={cn(- "field-sizing-content w-full resize-none bg-transparent px-3.5 pt-2.5 text-base outline-none",- "placeholder:text-muted-foreground disabled:cursor-not-allowed",- "min-h-[38px] max-h-[200px]"- )}- />- <div className="flex items-center justify-end px-2 pb-2 pt-0.5">- <Button- size="icon-sm"- onClick={handleSend}- disabled={!input.trim() || sending || (!!activeTask && activeTask.status !== "completed" && activeTask.status !== "failed")}- className={cn(- "rounded-lg transition-opacity duration-200",- !input.trim() && "opacity-40"- )}- >- {sending ? (- <Loader2 className="size-3.5 animate-spin" />- ) : (- <ArrowUp className="size-3.5" />- )}- </Button>- </div>- </div>- </div>- </div>- </>- );+ return <AgentChatView />;}diff --git a/src/web/src/app/(app)/w/[slug]/agents/[id]/layout.tsx b/src/web/src/app/(app)/w/[slug]/agents/[id]/layout.tsxindex 104a5413b..b2f9880c9 100644--- a/src/web/src/app/(app)/w/[slug]/agents/[id]/layout.tsx+++ b/src/web/src/app/(app)/w/[slug]/agents/[id]/layout.tsx@@ -10,7 +10,7 @@ import { ConfirmDialog } from "@/components/ui/confirm-dialog";import { AgentEditForm } from "@/components/agent-edit-form";import { Skeleton } from "@/components/ui/skeleton";import { cn } from "@/lib/utils";-import { Mail, MessageSquare, Pencil, Trash2, X } from "lucide-react";+import { CalendarDays, Mail, MessageSquare, Pencil, Trash2, X } from "lucide-react";export default function AgentDetailLayout({ children }: { children: ReactNode }) {const params = useParams();@@ -18,7 +18,7 @@ export default function AgentDetailLayout({ children }: { children: ReactNode })const pathname = usePathname();const { slug } = useWorkspace();const agentId = params.id as string;- const isOnChat = pathname.includes(`/agents/${agentId}/chat`);+ const isOnEmail = pathname.includes(`/agents/${agentId}/email`);const { agents, runtimes, handleDeleteAgent, handleUpdateAgent } = useAgentContext();const agent = agents.find((a) => a.id === agentId);@@ -52,7 +52,7 @@ export default function AgentDetailLayout({ children }: { children: ReactNode }))}{agent ? (<Link- href={`/w/${slug}/agents/${agentId}/chat`}+ href={`/w/${slug}/agents/${agentId}`}onClick={() => setEditing(false)}className="text-sm font-medium truncate hover:text-foreground/80 transition-colors">@@ -64,7 +64,7 @@ export default function AgentDetailLayout({ children }: { children: ReactNode })<Skeleton className="h-3.5 w-24" />)}<span className="text-xs text-muted-foreground">- / {editing ? "Settings" : isOnChat ? "Chat" : "Email"}+ / {editing ? "Settings" : isOnEmail ? "Email" : "Chat"}</span></div>{agent ? (@@ -81,23 +81,30 @@ export default function AgentDetailLayout({ children }: { children: ReactNode })</Button>) : (<>- {isOnChat ? (+ {isOnEmail ? (<Link- href={`/w/${slug}/agents/${agentId}/email`}+ href={`/w/${slug}/agents/${agentId}`}className="inline-flex items-center rounded-lg text-xs text-muted-foreground h-7 gap-1 px-2 hover:bg-muted hover:text-foreground transition-all">- <Mail className="size-3" />+ <MessageSquare className="size-3" />+ Chat</Link>) : (<Link- href={`/w/${slug}/agents/${agentId}/chat`}+ href={`/w/${slug}/agents/${agentId}/email`}className="inline-flex items-center rounded-lg text-xs text-muted-foreground h-7 gap-1 px-2 hover:bg-muted hover:text-foreground transition-all">- <MessageSquare className="size-3" />- Chat+ <Mail className="size-3" /></Link>)}+ <Link+ href={`/w/${slug}/calendar?agents=${agentId}`}+ className="inline-flex items-center rounded-lg text-xs text-muted-foreground h-7 gap-1 px-2 hover:bg-muted hover:text-foreground transition-all"+ >+ <CalendarDays className="size-3" />+ Calendar+ </Link><Buttonvariant="ghost"size="sm"diff --git a/src/web/src/app/(app)/w/[slug]/agents/[id]/page.tsx b/src/web/src/app/(app)/w/[slug]/agents/[id]/page.tsxindex b1f4a9d65..3d5062d54 100644--- a/src/web/src/app/(app)/w/[slug]/agents/[id]/page.tsx+++ b/src/web/src/app/(app)/w/[slug]/agents/[id]/page.tsx@@ -1,10 +1,7 @@-import { redirect } from "next/navigation";+"use client";-export default async function AgentDetailPage({- params,-}: {- params: Promise<{ slug: string; id: string }>;-}) {- const { slug, id } = await params;- redirect(`/w/${slug}/agents/${id}/chat`);+import { AgentChatView } from "@/components/agent-chat/agent-chat-view";++export default function AgentDetailPage() {+ return <AgentChatView />;}diff --git a/src/web/src/app/(app)/w/[slug]/calendar/page.tsx b/src/web/src/app/(app)/w/[slug]/calendar/page.tsxnew file mode 100644index 000000000..02a1b5ffb--- /dev/null+++ b/src/web/src/app/(app)/w/[slug]/calendar/page.tsx@@ -0,0 +1,436 @@+"use client";++import { useCallback, useEffect, useMemo, useRef, useState } from "react";+import { useRouter, useSearchParams, usePathname } from "next/navigation";+import { toast } from "sonner";+import { useAgentContext } from "@/contexts/agent-context";+import { useWorkspace } from "@/contexts/workspace-context";+import { Button } from "@/components/ui/button";+import { Plus } from "lucide-react";+import {+ listCalendarEvents,+ createCalendarEvent,+ updateCalendarEvent,+ deleteCalendarEvent,+} from "@/lib/api";+import {+ CalendarMonthGrid,+ dateKey,+ stepDate,+} from "@/components/calendar/calendar-month-grid";+import { CalendarAgenda } from "@/components/calendar/calendar-agenda";+import {+ CalendarViewSwitcher,+ parseCalendarView,+ type CalendarView,+} from "@/components/calendar/calendar-view-switcher";+import { CalendarAgentFilter } from "@/components/calendar/calendar-agent-filter";+import { CalendarEventSheet } from "@/components/calendar/calendar-event-sheet";+import type { CalendarEvent, UpdateCalendarEventRequest } from "@alook/shared";+import { isTypingTarget } from "@/components/calendar/keyboard";++function monthRangeIso(year: number, month: number) {+ const from = new Date(year, month, 1, 0, 0, 0, 0);+ const to = new Date(year, month + 1, 0, 23, 59, 59, 999);+ return { from: from.toISOString(), to: to.toISOString() };+}++export default function CalendarPage() {+ const { workspaceId } = useWorkspace();+ const { agents } = useAgentContext();+ const router = useRouter();+ const pathname = usePathname();+ const searchParams = useSearchParams();++ const now = new Date();+ const initialYear = Number(searchParams.get("y")) || now.getFullYear();+ const initialMonth = searchParams.has("m")+ ? Number(searchParams.get("m"))+ : now.getMonth();+ const initialView = parseCalendarView(searchParams.get("view"));++ const [year, setYear] = useState(initialYear);+ const [month, setMonth] = useState(initialMonth);+ const [view, setView] = useState<CalendarView>(initialView);+ const [selectedAgents, setSelectedAgents] = useState<Set<string>>(() => {+ const param = searchParams.get("agents");+ if (!param) return new Set();+ return new Set(param.split(",").filter(Boolean));+ });+ // Default focus to today when the current view contains today, otherwise the+ // 1st of the viewed month — keeps at least one day cell in the tab order.+ const [focusedDate, setFocusedDate] = useState<Date>(() => {+ const t = new Date();+ if (t.getFullYear() === initialYear && t.getMonth() === initialMonth) return t;+ return new Date(initialYear, initialMonth, 1);+ });+ const [openPopoverKey, setOpenPopoverKey] = useState<string | null>(null);++ const [events, setEvents] = useState<CalendarEvent[]>([]);+ const [loading, setLoading] = useState(true);+ const [createOpen, setCreateOpen] = useState(false);+ const [createDefault, setCreateDefault] = useState<Date | undefined>();+ const [detail, setDetail] = useState<CalendarEvent | null>(null);+ const [detailOpen, setDetailOpen] = useState(false);+ const [submitting, setSubmitting] = useState(false);+ const [submittingEdit, setSubmittingEdit] = useState(false);+ const [deletingId, setDeletingId] = useState<string | null>(null);++ const syncUrl = useCallback(+ (+ nextYear: number,+ nextMonth: number,+ agentSet: Set<string>,+ nextView: CalendarView+ ) => {+ 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);+ router.replace(`${pathname}?${params.toString()}`, { scroll: false });+ },+ [pathname, router]+ );++ const fetchEvents = useCallback(async () => {+ const { from, to } = monthRangeIso(year, month);+ setLoading(true);+ try {+ const list = await listCalendarEvents(workspaceId, { from, to });+ setEvents(list);+ } catch (err) {+ toast.error(err instanceof Error ? err.message : "Failed to load events");+ } finally {+ setLoading(false);+ }+ }, [workspaceId, year, month]);++ useEffect(() => {+ fetchEvents();+ }, [fetchEvents]);++ const visibleEvents = useMemo(() => {+ if (selectedAgents.size === 0) return events;+ return events.filter((ev) => selectedAgents.has(ev.agent_id));+ }, [events, selectedAgents]);++ const handlePrev = useCallback(() => {+ const nm = month === 0 ? 11 : month - 1;+ const ny = month === 0 ? year - 1 : year;+ setMonth(nm);+ setYear(ny);+ setFocusedDate(new Date(ny, nm, 1));+ syncUrl(ny, nm, selectedAgents, view);+ }, [month, year, selectedAgents, view, syncUrl]);++ const handleNext = useCallback(() => {+ const nm = month === 11 ? 0 : month + 1;+ const ny = month === 11 ? year + 1 : year;+ setMonth(nm);+ setYear(ny);+ setFocusedDate(new Date(ny, nm, 1));+ syncUrl(ny, nm, selectedAgents, view);+ }, [month, year, selectedAgents, view, 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);+ };++ const handleSelectDay = (date: Date) => {+ setCreateDefault(date);+ setCreateOpen(true);+ setFocusedDate(date);+ };++ const handleSelectEvent = (ev: CalendarEvent) => {+ setDetail(ev);+ setDetailOpen(true);+ };++ const jumpToDate = useCallback(+ (date: Date) => {+ const ny = date.getFullYear();+ const nm = date.getMonth();+ setYear(ny);+ setMonth(nm);+ setFocusedDate(date);+ syncUrl(ny, nm, selectedAgents, view);+ },+ [selectedAgents, view, syncUrl]+ );++ const handleJumpToToday = useCallback(() => {+ jumpToDate(new Date());+ }, [jumpToDate]);++ const handleViewChange = useCallback(+ (v: CalendarView) => {+ setView(v);+ syncUrl(year, month, selectedAgents, v);+ },+ [year, month, selectedAgents, syncUrl]+ );++ const handleCreate = async (values: {+ agent_id: string;+ title: string;+ description?: string;+ scheduled_at: string;+ repeat_interval?: string;+ repeat_stop_date?: string;+ }) => {+ setSubmitting(true);+ try {+ const created = await createCalendarEvent(values, workspaceId);+ // Only surface the new event in local state if it falls inside the+ // currently-fetched month window. Otherwise let the next month+ // navigation refetch pick it up (avoids leaking out-of-range events+ // into agenda view).+ const d = new Date(created.scheduled_at);+ if (d.getFullYear() === year && d.getMonth() === month) {+ setEvents((prev) => [...prev, created]);+ }+ setCreateOpen(false);+ toast.success("Event created");+ } catch (err) {+ toast.error(+ err instanceof Error ? err.message : "Failed to create event"+ );+ } finally {+ setSubmitting(false);+ }+ };++ const handleUpdate = async (+ event: CalendarEvent,+ patch: UpdateCalendarEventRequest+ ) => {+ setSubmittingEdit(true);+ try {+ await updateCalendarEvent(event.id, patch, workspaceId);+ // Recurring split may have created a detached row and advanced the+ // parent — simplest to re-fetch the visible range rather than merge.+ await fetchEvents();+ setDetailOpen(false);+ setDetail(null);+ toast.success("Event updated");+ } catch (err) {+ toast.error(+ err instanceof Error ? err.message : "Failed to update event"+ );+ } finally {+ setSubmittingEdit(false);+ }+ };++ const handleDelete = async (event: CalendarEvent) => {+ setDeletingId(event.id);+ try {+ await deleteCalendarEvent(event.id, workspaceId);+ setEvents((prev) => prev.filter((e) => e.id !== event.id));+ setDetailOpen(false);+ setDetail(null);+ toast.success("Event deleted");+ } catch (err) {+ toast.error(+ err instanceof Error ? err.message : "Failed to delete event"+ );+ } finally {+ setDeletingId(null);+ }+ };++ // Global keyboard handler — month view only. Page-level so `n`/`t` fire even+ // when the grid isn't focused. Arrow keys only move focus if it's already in+ // the grid.+ const createOpenRef = useRef(createOpen);+ const detailOpenRef = useRef(detailOpen);+ createOpenRef.current = createOpen;+ detailOpenRef.current = detailOpen;++ // Memoize events-per-day for quick lookup in the keyboard handler.+ const hiddenCountForDate = useCallback(+ (d: Date) => {+ const key = `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, "0")}-${String(d.getDate()).padStart(2, "0")}`;+ let count = 0;+ for (const ev of visibleEvents) {+ const ed = new Date(ev.scheduled_at);+ const k = `${ed.getFullYear()}-${String(ed.getMonth() + 1).padStart(2, "0")}-${String(ed.getDate()).padStart(2, "0")}`;+ if (k === key) count++;+ }+ return Math.max(0, count - 3);+ },+ [visibleEvents]+ );++ useEffect(() => {+ const onKey = (e: KeyboardEvent) => {+ if (createOpenRef.current || detailOpenRef.current) return;+ if (isTypingTarget(e.target)) return;++ // `t` and `n` fire in every view.+ if (e.key === "t") {+ e.preventDefault();+ const today = new Date();+ if (today.getFullYear() !== year || today.getMonth() !== month) {+ jumpToDate(today);+ } else {+ setFocusedDate(today);+ }+ return;+ }++ if (e.key === "n") {+ e.preventDefault();+ const target = focusedDate;+ setCreateDefault(target);+ setCreateOpen(true);+ return;+ }++ // Arrow / Enter / Page / Home / End are month-view-only.+ if (view !== "month") return;++ const focusInGrid =+ document.activeElement?.getAttribute("role") === "gridcell";++ if (e.key === "Enter") {+ if (!focusInGrid) return;+ e.preventDefault();+ const hidden = hiddenCountForDate(focusedDate);+ if (hidden > 0) {+ const key = `${focusedDate.getFullYear()}-${String(focusedDate.getMonth() + 1).padStart(2, "0")}-${String(focusedDate.getDate()).padStart(2, "0")}`;+ setOpenPopoverKey(key);+ } else {+ setCreateDefault(focusedDate);+ setCreateOpen(true);+ }+ return;+ }++ // Escape is handled by base-ui popover / dialog primitives internally.++ if (!focusInGrid) return;++ const stepped = stepDate(focusedDate, e.key);+ if (!stepped) return;+ e.preventDefault();+ const inView =+ stepped.getFullYear() === year && stepped.getMonth() === month;+ if (inView) {+ setFocusedDate(stepped);+ } else {+ jumpToDate(stepped);+ }+ };+ window.addEventListener("keydown", onKey);+ return () => window.removeEventListener("keydown", onKey);+ }, [view, year, month, focusedDate, jumpToDate, hiddenCountForDate]);++ // 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).+ useEffect(() => {+ if (view !== "month") return;+ const active = document.activeElement;+ if (!active || active.getAttribute("role") !== "gridcell") return;+ const sel = `[data-date="${dateKey(focusedDate)}"]`;+ const el = document.querySelector<HTMLElement>(sel);+ el?.focus();+ }, [focusedDate, view, year, month]);++ return (+ <>+ <div className="flex items-center justify-between border-b border-border/50 px-5 py-2.5 gap-3">+ <div className="flex items-center gap-3 min-w-0">+ <h1 className="text-sm font-medium">Calendar</h1>+ <p className="text-xs text-muted-foreground hidden md:block">+ Schedule recurring and one-time tasks for your agents.+ </p>+ </div>+ <div className="flex items-center gap-2">+ <CalendarViewSwitcher view={view} onChange={handleViewChange} />+ <Button+ size="sm"+ variant="outline"+ onClick={() => {+ setCreateDefault(undefined);+ setCreateOpen(true);+ }}+ disabled={agents.length === 0}+ >+ <Plus className="size-3.5" />+ New event+ </Button>+ </div>+ </div>++ <div className="flex flex-1 flex-col gap-4 overflow-y-auto px-5 py-5">+ <CalendarAgentFilter+ agents={agents}+ selected={selectedAgents}+ onToggle={handleToggleAgent}+ />++ {view === "month" ? (+ <CalendarMonthGrid+ year={year}+ month={month}+ events={visibleEvents}+ agents={agents}+ loading={loading}+ focusedDate={focusedDate}+ openPopoverKey={openPopoverKey}+ onPopoverChange={setOpenPopoverKey}+ onPrev={handlePrev}+ onNext={handleNext}+ onJumpToToday={handleJumpToToday}+ onJumpToDate={jumpToDate}+ onSelectDay={handleSelectDay}+ onSelectEvent={handleSelectEvent}+ />+ ) : (+ <CalendarAgenda+ events={visibleEvents}+ agents={agents}+ loading={loading}+ onSelectEvent={handleSelectEvent}+ />+ )}++ {view === "month" &&+ !loading &&+ events.length > 0 &&+ visibleEvents.length === 0 && (+ <p className="text-center text-xs text-muted-foreground py-4">+ No events for selected agents.+ </p>+ )}+ </div>++ <CalendarEventSheet+ open={createOpen}+ onOpenChange={setCreateOpen}+ agents={agents}+ defaultDate={createDefault}+ submitting={submitting}+ onCreate={handleCreate}+ />++ <CalendarEventSheet+ event={detail}+ agents={agents}+ open={detailOpen}+ onOpenChange={setDetailOpen}+ onDelete={handleDelete}+ onUpdate={handleUpdate}+ deleting={deletingId === detail?.id}+ saving={submittingEdit}+ />+ </>+ );+}diff --git a/src/web/src/app/api/calendar/[id]/route.test.ts b/src/web/src/app/api/calendar/[id]/route.test.tsnew file mode 100644index 000000000..003f9a3ca--- /dev/null+++ b/src/web/src/app/api/calendar/[id]/route.test.ts@@ -0,0 +1,426 @@+import { describe, it, expect, vi, beforeEach } from "vitest";+import { NextRequest } from "next/server";++const mockDelete = vi.fn();+const mockUpdate = vi.fn();+const mockGet = vi.fn();+const mockCreate = vi.fn();+const mockGetAgent = vi.fn();++vi.mock("@opennextjs/cloudflare", () => ({+ getCloudflareContext: vi.fn(() => ({ env: { DB: {} } })),+}));++vi.mock("@alook/shared", async () => {+ const actual = await vi.importActual<typeof import("@alook/shared")>("@alook/shared");+ return {+ ...actual,+ createDb: vi.fn(() => ({})),+ queries: {+ calendarEvent: {+ getCalendarEvent: (...a: unknown[]) => mockGet(...a),+ deleteCalendarEvent: (...a: unknown[]) => mockDelete(...a),+ updateCalendarEvent: (...a: unknown[]) => mockUpdate(...a),+ createCalendarEvent: (...a: unknown[]) => mockCreate(...a),+ },+ agent: {+ getAgent: (...a: unknown[]) => mockGetAgent(...a),+ },+ },+ };+});++vi.mock("@/lib/middleware/auth", () => ({+ withAuth: (handler: any) => async (req: any, ctx?: any) => {+ const params = ctx?.params instanceof Promise ? await ctx.params : ctx?.params;+ return handler(req, { userId: "u1", email: "[email protected]", params });+ },+}));++vi.mock("@/lib/middleware/workspace", () => ({+ withWorkspaceMember: vi.fn(async () => ({ workspaceId: "ws1" })),+}));++vi.mock("@/lib/api/responses", () => ({+ calendarEventToResponse: (e: any) => ({ id: e.id, ...e }),+}));++import { DELETE, PATCH, GET } from "./route";++function req(id: string | undefined, body: unknown) {+ const r = new NextRequest(`http://localhost/api/calendar/${id ?? ""}`, {+ method: "PATCH",+ body: JSON.stringify(body),+ headers: { "Content-Type": "application/json" },+ });+ return PATCH(r, { params: { id } } as any);+}++describe("GET /api/calendar/[id]", () => {+ beforeEach(() => vi.clearAllMocks());++ it("returns 200 + the event body when it exists in the workspace", async () => {+ mockGet.mockResolvedValue({+ id: "ce_1",+ agentId: "ag_1",+ workspaceId: "ws1",+ title: "standup",+ });+ const r = new NextRequest("http://localhost/api/calendar/ce_1", {+ method: "GET",+ });+ const res = await GET(r, { params: { id: "ce_1" } } as any);+ expect(res.status).toBe(200);+ expect((await res.json()).id).toBe("ce_1");+ expect(mockGet).toHaveBeenCalledWith({}, "ce_1", "ws1");+ });++ it("returns 404 when the event is not in the caller's workspace", async () => {+ mockGet.mockResolvedValue(null);+ const r = new NextRequest("http://localhost/api/calendar/ce_missing", {+ method: "GET",+ });+ const res = await GET(r, { params: { id: "ce_missing" } } as any);+ expect(res.status).toBe(404);+ });++ it("returns 400 when id is missing", async () => {+ const r = new NextRequest("http://localhost/api/calendar/", {+ method: "GET",+ });+ const res = await GET(r, { params: {} } as any);+ expect(res.status).toBe(400);+ });+});++describe("DELETE /api/calendar/[id]", () => {+ beforeEach(() => vi.clearAllMocks());++ it("404s when the event does not exist in the workspace", async () => {+ mockDelete.mockResolvedValue(null);+ const r = new NextRequest("http://localhost/api/calendar/ce_missing", {+ method: "DELETE",+ });+ const res = await DELETE(r, { params: { id: "ce_missing" } } as any);+ expect(res.status).toBe(404);+ expect(mockDelete).toHaveBeenCalledWith({}, "ce_missing", "ws1");+ });++ it("returns the deleted event when successful", async () => {+ mockDelete.mockResolvedValue({ id: "ce_1" });+ const r = new NextRequest("http://localhost/api/calendar/ce_1", {+ method: "DELETE",+ });+ const res = await DELETE(r, { params: { id: "ce_1" } } as any);+ expect(res.status).toBe(200);+ expect((await res.json()).id).toBe("ce_1");+ });++ it("400s when id is missing", async () => {+ const r = new NextRequest("http://localhost/api/calendar/", {+ method: "DELETE",+ });+ const res = await DELETE(r, { params: {} } as any);+ expect(res.status).toBe(400);+ });+});++function sourceNonRepeating(overrides: Record<string, unknown> = {}) {+ return {+ id: "ce_1",+ agentId: "ag_1",+ workspaceId: "ws1",+ title: "standup",+ description: null,+ scheduledAt: "2026-04-17T09:00:00.000Z",+ repeatInterval: null,+ repeatStopAt: null,+ lastTriggeredAt: null,+ ...overrides,+ };+}++function sourceDaily(overrides: Record<string, unknown> = {}) {+ return {+ ...sourceNonRepeating(),+ repeatInterval: "1day",+ repeatStopAt: null,+ ...overrides,+ };+}++describe("PATCH /api/calendar/[id] — basics", () => {+ beforeEach(() => vi.clearAllMocks());++ it("404s when the event does not exist in the workspace", async () => {+ mockGet.mockResolvedValue(null);+ const res = await req("ce_missing", { title: "new" });+ expect(res.status).toBe(404);+ });++ it("400s on an empty patch body", async () => {+ const res = await req("ce_1", {});+ expect(res.status).toBe(400);+ expect(mockUpdate).not.toHaveBeenCalled();+ });++ it("400s when the title is an empty string", async () => {+ mockGet.mockResolvedValue(sourceNonRepeating());+ const res = await req("ce_1", { title: "" });+ expect(res.status).toBe(400);+ });++ it("400s when id is missing", async () => {+ const res = await req(undefined, { title: "t" });+ expect(res.status).toBe(400);+ });++ it("200s + returns the updated body on a successful title+description update", async () => {+ mockGet.mockResolvedValue(sourceNonRepeating());+ mockUpdate.mockResolvedValue({+ id: "ce_1",+ title: "new",+ description: "<p>desc</p>",+ });+ const res = await req("ce_1", { title: "new", description: "<p>desc</p>" });+ expect(res.status).toBe(200);+ expect(mockUpdate).toHaveBeenCalledWith({}, "ce_1", "ws1", {+ title: "new",+ description: "<p>desc</p>",+ });+ });++ it("normalizes empty-HTML description to null before reaching the query", async () => {+ mockGet.mockResolvedValue(sourceNonRepeating());+ mockUpdate.mockResolvedValue({ id: "ce_1", description: null });+ await req("ce_1", { description: "<p></p>" });+ expect(mockUpdate.mock.calls[0][3]).toEqual({ description: null });+ });++ it("passes description: null through as a clearing op", async () => {+ mockGet.mockResolvedValue(sourceNonRepeating());+ mockUpdate.mockResolvedValue({ id: "ce_1", description: null });+ await req("ce_1", { description: null });+ expect(mockUpdate.mock.calls[0][3]).toEqual({ description: null });+ });+});++describe("PATCH /api/calendar/[id] — full fields", () => {+ beforeEach(() => vi.clearAllMocks());++ it("404s when agent_id is not in the workspace", async () => {+ mockGet.mockResolvedValue(sourceNonRepeating());+ mockGetAgent.mockResolvedValue(null);+ const res = await req("ce_1", { agent_id: "ag_missing" });+ expect(res.status).toBe(404);+ expect(mockUpdate).not.toHaveBeenCalled();+ });++ it("updates agent + scheduled_at in place on a non-repeating event", async () => {+ mockGet.mockResolvedValue(sourceNonRepeating());+ mockGetAgent.mockResolvedValue({ id: "ag_2" });+ mockUpdate.mockResolvedValue({ id: "ce_1" });+ const res = await req("ce_1", {+ agent_id: "ag_2",+ scheduled_at: "2026-04-18T10:00:00.000Z",+ });+ expect(res.status).toBe(200);+ expect(mockUpdate).toHaveBeenCalledWith({}, "ce_1", "ws1", {+ agentId: "ag_2",+ scheduledAt: "2026-04-18T10:00:00.000Z",+ });+ });++ it("converts repeat_stop_date → repeat_stop_at (ISO end-of-day)", async () => {+ mockGet.mockResolvedValue(sourceDaily());+ mockUpdate.mockResolvedValue({ id: "ce_1" });+ await req("ce_1", { repeat_stop_date: "2026-05-01" });+ const patch = mockUpdate.mock.calls[0][3];+ expect(patch.repeatStopAt).toMatch(/2026-05-0[12]T/);+ });++ it("passes repeat_interval: null and repeat_stop_date: null through as clears", async () => {+ mockGet.mockResolvedValue(sourceDaily());+ mockUpdate.mockResolvedValue({ id: "ce_1" });+ await req("ce_1", { repeat_interval: null, repeat_stop_date: null });+ expect(mockUpdate.mock.calls[0][3]).toEqual({+ repeatInterval: null,+ repeatStopAt: null,+ });+ });++ it("scope=this on a non-repeating event is treated as in-place", async () => {+ mockGet.mockResolvedValue(sourceNonRepeating());+ mockUpdate.mockResolvedValue({ id: "ce_1" });+ await req("ce_1", { title: "new", scope: "this" });+ expect(mockUpdate).toHaveBeenCalledTimes(1);+ expect(mockCreate).not.toHaveBeenCalled();+ expect(mockDelete).not.toHaveBeenCalled();+ });++ it("scope=following on a repeating event is in-place", async () => {+ mockGet.mockResolvedValue(sourceDaily());+ mockUpdate.mockResolvedValue({ id: "ce_1" });+ await req("ce_1", { title: "renamed", scope: "following" });+ expect(mockUpdate).toHaveBeenCalledTimes(1);+ expect(mockUpdate.mock.calls[0][3]).toEqual({ title: "renamed" });+ expect(mockCreate).not.toHaveBeenCalled();+ });+});++describe("PATCH /api/calendar/[id] — scope=this split", () => {+ beforeEach(() => vi.clearAllMocks());++ it("advances the parent's scheduled_at and inserts a detached one-off", async () => {+ mockGet.mockResolvedValue(sourceDaily());+ mockUpdate.mockResolvedValue({ id: "ce_1" });+ mockCreate.mockImplementation((_db, data) => ({+ id: "ce_2",+ ...data,+ }));+ const res = await req("ce_1", {+ title: "just this one",+ scope: "this",+ });+ expect(res.status).toBe(200);++ // Parent advanced by 1 day+ expect(mockUpdate).toHaveBeenCalledWith({}, "ce_1", "ws1", {+ scheduledAt: "2026-04-18T09:00:00.000Z",+ });+ // Detached one-off created with patch applied and no repeat+ expect(mockCreate).toHaveBeenCalledTimes(1);+ const detached = mockCreate.mock.calls[0][1];+ expect(detached.workspaceId).toBe("ws1");+ expect(detached.agentId).toBe("ag_1");+ expect(detached.title).toBe("just this one");+ expect(detached.scheduledAt).toBe("2026-04-17T09:00:00.000Z");+ expect(detached.repeatInterval).toBeNull();+ expect(detached.repeatStopAt).toBeNull();++ // Returns the detached event+ const body = await res.json();+ expect(body.id).toBe("ce_2");+ expect(mockDelete).not.toHaveBeenCalled();+ });++ it("applies the edited scheduled_at to the detached event (not the parent)", async () => {+ mockGet.mockResolvedValue(sourceDaily());+ mockUpdate.mockResolvedValue({ id: "ce_1" });+ mockCreate.mockImplementation((_db, data) => ({ id: "ce_2", ...data }));+ await req("ce_1", {+ scheduled_at: "2026-04-17T11:30:00.000Z",+ scope: "this",+ });+ // Parent still advances to next occurrence of the ORIGINAL schedule+ expect(mockUpdate.mock.calls[0][3]).toEqual({+ scheduledAt: "2026-04-18T09:00:00.000Z",+ });+ // Detached uses the user-supplied time+ expect(mockCreate.mock.calls[0][1].scheduledAt).toBe(+ "2026-04-17T11:30:00.000Z"+ );+ });++ it("deletes the parent when the series ends at this occurrence", async () => {+ mockGet.mockResolvedValue(+ sourceDaily({+ scheduledAt: "2026-04-17T09:00:00.000Z",+ repeatStopAt: "2026-04-17T23:59:59.999Z",+ })+ );+ mockCreate.mockImplementation((_db, data) => ({ id: "ce_2", ...data }));+ const res = await req("ce_1", { title: "final", scope: "this" });+ expect(res.status).toBe(200);+ expect(mockDelete).toHaveBeenCalledWith({}, "ce_1", "ws1");+ expect(mockUpdate).not.toHaveBeenCalled();+ expect(mockCreate).toHaveBeenCalledTimes(1);+ expect(mockCreate.mock.calls[0][1].title).toBe("final");+ });++ it("validates agent_id in the workspace even on the split path", async () => {+ mockGet.mockResolvedValue(sourceDaily());+ mockGetAgent.mockResolvedValue(null);+ const res = await req("ce_1", { agent_id: "ag_nope", scope: "this" });+ expect(res.status).toBe(404);+ expect(mockUpdate).not.toHaveBeenCalled();+ expect(mockCreate).not.toHaveBeenCalled();+ });+});++describe("PATCH /api/calendar/[id] — scope=this on a future occurrence", () => {+ beforeEach(() => vi.clearAllMocks());++ it("adds occurrence_at to the parent's exceptions; does NOT advance parent", async () => {+ mockGet.mockResolvedValue(+ sourceDaily({ exceptions: [] })+ );+ mockUpdate.mockResolvedValue({ id: "ce_1" });+ mockCreate.mockImplementation((_db, data) => ({ id: "ce_2", ...data }));++ const res = await req("ce_1", {+ title: "renamed future",+ scope: "this",+ occurrence_at: "2026-04-20T09:00:00.000Z",+ });+ expect(res.status).toBe(200);++ // Parent updated with exceptions, NOT scheduledAt+ expect(mockUpdate).toHaveBeenCalledWith({}, "ce_1", "ws1", {+ exceptions: ["2026-04-20T09:00:00.000Z"],+ });+ // Detached one-off uses the occurrence_at as scheduledAt+ expect(mockCreate.mock.calls[0][1].scheduledAt).toBe(+ "2026-04-20T09:00:00.000Z"+ );+ expect(mockCreate.mock.calls[0][1].title).toBe("renamed future");+ });++ it("does not duplicate the exception when it's already recorded", async () => {+ mockGet.mockResolvedValue(+ sourceDaily({ exceptions: ["2026-04-20T09:00:00.000Z"] })+ );+ mockUpdate.mockResolvedValue({ id: "ce_1" });+ mockCreate.mockImplementation((_db, data) => ({ id: "ce_2", ...data }));+ await req("ce_1", {+ title: "x",+ scope: "this",+ occurrence_at: "2026-04-20T09:00:00.000Z",+ });+ expect(mockUpdate.mock.calls[0][3].exceptions).toEqual([+ "2026-04-20T09:00:00.000Z",+ ]);+ });++ it("uses the edited scheduled_at on the detached event when provided", async () => {+ mockGet.mockResolvedValue(sourceDaily());+ mockUpdate.mockResolvedValue({ id: "ce_1" });+ mockCreate.mockImplementation((_db, data) => ({ id: "ce_2", ...data }));+ await req("ce_1", {+ scheduled_at: "2026-04-20T10:30:00.000Z",+ scope: "this",+ occurrence_at: "2026-04-20T09:00:00.000Z",+ });+ expect(mockCreate.mock.calls[0][1].scheduledAt).toBe(+ "2026-04-20T10:30:00.000Z"+ );+ });+});++describe("GET /api/calendar/[id]", () => {+ beforeEach(() => vi.clearAllMocks());++ it("404s when the event does not exist", async () => {+ mockGet.mockResolvedValue(null);+ const r = new NextRequest("http://localhost/api/calendar/ce_x");+ const res = await GET(r, { params: { id: "ce_x" } } as any);+ expect(res.status).toBe(404);+ });++ it("returns the event when found", async () => {+ mockGet.mockResolvedValue(sourceNonRepeating());+ const r = new NextRequest("http://localhost/api/calendar/ce_1");+ const res = await GET(r, { params: { id: "ce_1" } } as any);+ expect(res.status).toBe(200);+ });+});diff --git a/src/web/src/app/api/calendar/[id]/route.ts b/src/web/src/app/api/calendar/[id]/route.tsnew file mode 100644index 000000000..da1704c3b--- /dev/null+++ b/src/web/src/app/api/calendar/[id]/route.ts@@ -0,0 +1,180 @@+import { getCloudflareContext } from "@opennextjs/cloudflare";+import {+ createDb,+ queries,+ UpdateCalendarEventRequestSchema,+ isEmptyHtml,+ computeNextScheduledAt,+} from "@alook/shared";+import { withAuth } from "@/lib/middleware/auth";+import { withWorkspaceMember } from "@/lib/middleware/workspace";+import { writeJSON, writeError, parseBody } from "@/lib/middleware/helpers";+import { calendarEventToResponse } from "@/lib/api/responses";+import { repeatStopDateToStopAt } from "@/lib/services/calendar";++export const GET = withAuth(async (req, ctx) => {+ const ws = await withWorkspaceMember(req, ctx);+ if (ws instanceof Response) return ws;++ const { env } = getCloudflareContext();+ const db = createDb((env as Env).DB);++ const id = ctx.params?.id;+ if (!id) return writeError("calendar event id is required", 400);++ const event = await queries.calendarEvent.getCalendarEvent(+ db,+ id,+ ws.workspaceId+ );+ if (!event) return writeError("calendar event not found", 404);+ return writeJSON(calendarEventToResponse(event));+});++export const PATCH = withAuth(async (req, ctx) => {+ const ws = await withWorkspaceMember(req, ctx);+ if (ws instanceof Response) return ws;++ const { env } = getCloudflareContext();+ const db = createDb((env as Env).DB);++ const id = ctx.params?.id;+ if (!id) return writeError("calendar event id is required", 400);++ const [body, err] = await parseBody(req, UpdateCalendarEventRequestSchema);+ if (err) return err;++ const source = await queries.calendarEvent.getCalendarEvent(+ db,+ id,+ ws.workspaceId+ );+ if (!source) return writeError("calendar event not found", 404);++ if (body.agent_id !== undefined) {+ const agent = await queries.agent.getAgent(+ db,+ body.agent_id,+ ws.workspaceId+ );+ if (!agent) return writeError("agent not found in workspace", 404);+ }++ const patch: {+ title?: string;+ description?: string | null;+ agentId?: string;+ scheduledAt?: string;+ repeatInterval?: string | null;+ repeatStopAt?: string | null;+ } = {};++ if (body.title !== undefined) patch.title = body.title;+ if (body.description !== undefined) {+ patch.description =+ body.description && !isEmptyHtml(body.description) ? body.description : null;+ }+ if (body.agent_id !== undefined) patch.agentId = body.agent_id;+ if (body.scheduled_at !== undefined) {+ patch.scheduledAt = new Date(body.scheduled_at).toISOString();+ }+ if (body.repeat_interval !== undefined) {+ patch.repeatInterval = body.repeat_interval;+ }+ if (body.repeat_stop_date !== undefined) {+ patch.repeatStopAt =+ body.repeat_stop_date === null+ ? null+ : repeatStopDateToStopAt(body.repeat_stop_date);+ }++ const wantSplit =+ body.scope === "this" &&+ source.repeatInterval !== null &&+ source.repeatInterval !== undefined;++ if (!wantSplit) {+ const updated = await queries.calendarEvent.updateCalendarEvent(+ db,+ id,+ ws.workspaceId,+ patch+ );+ if (!updated) return writeError("calendar event not found", 404);+ return writeJSON(calendarEventToResponse(updated));+ }++ // Split path: detach a specific occurrence. Anchor on occurrence_at+ // (default = source.scheduledAt — the next fire).+ const occurrenceAt = body.occurrence_at+ ? new Date(body.occurrence_at).toISOString()+ : source.scheduledAt;+ const existingExceptions = source.exceptions ?? [];++ if (occurrenceAt === source.scheduledAt) {+ // Editing the next fire — advance the parent past this occurrence.+ const next = computeNextScheduledAt(+ source.scheduledAt,+ source.repeatInterval!,+ source.repeatStopAt ?? null,+ source.scheduledAt,+ existingExceptions+ );+ if (next === null) {+ await queries.calendarEvent.deleteCalendarEvent(db, id, ws.workspaceId);+ } else {+ const advanced = await queries.calendarEvent.updateCalendarEvent(+ db,+ id,+ ws.workspaceId,+ { scheduledAt: next }+ );+ if (!advanced) return writeError("calendar event not found", 404);+ }+ } else {+ // Editing a future occurrence — record it as an exception on the parent.+ const nextExceptions = existingExceptions.includes(occurrenceAt)+ ? existingExceptions+ : [...existingExceptions, occurrenceAt];+ const updated = await queries.calendarEvent.updateCalendarEvent(+ db,+ id,+ ws.workspaceId,+ { exceptions: nextExceptions }+ );+ if (!updated) return writeError("calendar event not found", 404);+ }++ const detached = await queries.calendarEvent.createCalendarEvent(db, {+ agentId: patch.agentId ?? source.agentId,+ workspaceId: ws.workspaceId,+ title: patch.title ?? source.title,+ description:+ patch.description !== undefined ? patch.description : source.description ?? null,+ scheduledAt: patch.scheduledAt ?? occurrenceAt,+ repeatInterval: null,+ repeatStopAt: null,+ exceptions: [],+ });++ return writeJSON(calendarEventToResponse(detached));+});++export const DELETE = withAuth(async (req, ctx) => {+ const ws = await withWorkspaceMember(req, ctx);+ if (ws instanceof Response) return ws;++ const { env } = getCloudflareContext();+ const db = createDb((env as Env).DB);++ const id = ctx.params?.id;+ if (!id) return writeError("calendar event id is required", 400);++ const deleted = await queries.calendarEvent.deleteCalendarEvent(+ db,+ id,+ ws.workspaceId+ );+ if (!deleted) return writeError("calendar event not found", 404);+ return writeJSON(calendarEventToResponse(deleted));+});diff --git a/src/web/src/app/api/calendar/route.test.ts b/src/web/src/app/api/calendar/route.test.tsnew file mode 100644index 000000000..304cd52ac--- /dev/null+++ b/src/web/src/app/api/calendar/route.test.ts@@ -0,0 +1,274 @@+import { describe, it, expect, vi, beforeEach } from "vitest";+import { NextRequest } from "next/server";++const mockGetAgent = vi.fn();+const mockList = vi.fn();+const mockCreate = vi.fn();++vi.mock("@opennextjs/cloudflare", () => ({+ getCloudflareContext: vi.fn(() => ({ env: { DB: {} } })),+}));++vi.mock("@alook/shared", async () => {+ const actual = await vi.importActual<typeof import("@alook/shared")>("@alook/shared");+ return {+ ...actual,+ createDb: vi.fn(() => ({})),+ queries: {+ agent: { getAgent: (...a: unknown[]) => mockGetAgent(...a) },+ calendarEvent: {+ listCalendarEvents: (...a: unknown[]) => mockList(...a),+ createCalendarEvent: (...a: unknown[]) => mockCreate(...a),+ },+ },+ };+});++vi.mock("@/lib/middleware/auth", () => ({+ withAuth: (handler: any) => async (req: any, ctx?: any) => {+ const params = ctx?.params instanceof Promise ? await ctx.params : ctx?.params;+ return handler(req, { userId: "u1", email: "[email protected]", params });+ },+}));++vi.mock("@/lib/middleware/workspace", () => ({+ withWorkspaceMember: vi.fn(async () => ({ workspaceId: "ws1" })),+}));++vi.mock("@/lib/api/responses", () => ({+ calendarEventToResponse: (e: any) => ({+ id: e.id,+ title: e.title,+ scheduled_at: e.scheduledAt,+ occurrence_at: e.occurrenceAt ?? e.scheduledAt,+ }),+}));++import { GET, POST } from "./route";++describe("GET /api/calendar", () => {+ beforeEach(() => vi.clearAllMocks());++ it("lists events scoped to workspace, optionally filtered by agent/date range", async () => {+ mockList.mockResolvedValue([+ {+ id: "ce_1",+ title: "standup",+ scheduledAt: "2026-04-17T09:00:00.000Z",+ repeatInterval: null,+ repeatStopAt: null,+ exceptions: [],+ },+ ]);+ const req = new NextRequest(+ "http://localhost/api/calendar?agentId=ag_1&from=2026-04-01T00:00:00.000Z&to=2026-04-30T23:59:59.999Z"+ );+ mockGetAgent.mockResolvedValue({ id: "ag_1" });+ const res = await GET(req, {} as any);+ const body = await res.json();+ expect(res.status).toBe(200);+ expect(body).toHaveLength(1);+ expect(body[0].id).toBe("ce_1");+ expect(mockList).toHaveBeenCalledWith({}, "ws1", {+ agentId: "ag_1",+ from: "2026-04-01T00:00:00.000Z",+ to: "2026-04-30T23:59:59.999Z",+ });+ });++ it("returns 404 when filter agent is not in the workspace", async () => {+ mockGetAgent.mockResolvedValue(null);+ const req = new NextRequest("http://localhost/api/calendar?agentId=ag_nope");+ const res = await GET(req, {} as any);+ expect(res.status).toBe(404);+ });++ it("expands daily recurring events into one row per occurrence", async () => {+ mockList.mockResolvedValue([+ {+ id: "ce_1",+ title: "daily",+ scheduledAt: "2026-04-17T09:00:00.000Z",+ repeatInterval: "1day",+ repeatStopAt: null,+ exceptions: [],+ },+ ]);+ const req = new NextRequest(+ "http://localhost/api/calendar?from=2026-04-17T00:00:00.000Z&to=2026-04-20T23:59:59.999Z"+ );+ const res = await GET(req, {} as any);+ const body = await res.json();+ expect(body).toHaveLength(4);+ expect(body.map((b: { occurrence_at: string }) => b.occurrence_at)).toEqual([+ "2026-04-17T09:00:00.000Z",+ "2026-04-18T09:00:00.000Z",+ "2026-04-19T09:00:00.000Z",+ "2026-04-20T09:00:00.000Z",+ ]);+ });++ it("skips occurrences in the parent's exceptions list", async () => {+ mockList.mockResolvedValue([+ {+ id: "ce_1",+ title: "daily",+ scheduledAt: "2026-04-17T09:00:00.000Z",+ repeatInterval: "1day",+ repeatStopAt: null,+ exceptions: ["2026-04-19T09:00:00.000Z"],+ },+ ]);+ const req = new NextRequest(+ "http://localhost/api/calendar?from=2026-04-17T00:00:00.000Z&to=2026-04-20T23:59:59.999Z"+ );+ const res = await GET(req, {} as any);+ const body = await res.json();+ expect(body.map((b: { occurrence_at: string }) => b.occurrence_at)).toEqual([+ "2026-04-17T09:00:00.000Z",+ "2026-04-18T09:00:00.000Z",+ "2026-04-20T09:00:00.000Z",+ ]);+ });++ it("does not expand non-recurring rows", async () => {+ mockList.mockResolvedValue([+ {+ id: "ce_1",+ title: "one-off",+ scheduledAt: "2026-04-17T09:00:00.000Z",+ repeatInterval: null,+ repeatStopAt: null,+ exceptions: [],+ },+ ]);+ const req = new NextRequest(+ "http://localhost/api/calendar?from=2026-04-01T00:00:00.000Z&to=2026-04-30T23:59:59.999Z"+ );+ const res = await GET(req, {} as any);+ const body = await res.json();+ expect(body).toHaveLength(1);+ });+});++describe("POST /api/calendar", () => {+ beforeEach(() => vi.clearAllMocks());++ async function post(body: unknown) {+ const req = new NextRequest("http://localhost/api/calendar", {+ method: "POST",+ body: JSON.stringify(body),+ headers: { "Content-Type": "application/json" },+ });+ return POST(req, {} as any);+ }++ it("rejects malformed repeat_interval", async () => {+ mockGetAgent.mockResolvedValue({ id: "ag_1" });+ const res = await post({+ agent_id: "ag_1",+ title: "test",+ scheduled_at: "2026-04-17T09:00:00.000Z",+ repeat_interval: "weekly",+ });+ expect(res.status).toBe(400);+ });++ it("rejects repeat_stop_date without repeat_interval", async () => {+ mockGetAgent.mockResolvedValue({ id: "ag_1" });+ const res = await post({+ agent_id: "ag_1",+ title: "test",+ scheduled_at: "2026-04-17T09:00:00.000Z",+ repeat_stop_date: "2026-05-17",+ });+ expect(res.status).toBe(400);+ });++ it("rejects repeat_stop_date earlier than the first scheduled occurrence", async () => {+ mockGetAgent.mockResolvedValue({ id: "ag_1" });+ const res = await post({+ agent_id: "ag_1",+ title: "test",+ scheduled_at: "2026-04-17T09:00:00.000Z",+ repeat_interval: "1day",+ repeat_stop_date: "2026-04-16",+ });+ expect(res.status).toBe(400);+ });++ it("404s when the agent does not belong to the workspace", async () => {+ mockGetAgent.mockResolvedValue(null);+ const res = await post({+ agent_id: "ag_missing",+ title: "test",+ scheduled_at: "2026-04-17T09:00:00.000Z",+ });+ expect(res.status).toBe(404);+ });++ it("creates the event with repeat_stop_at derived from repeat_stop_date", async () => {+ mockGetAgent.mockResolvedValue({ id: "ag_1" });+ mockCreate.mockImplementation((_db, data) => ({+ id: "ce_1",+ ...data,+ }));+ const res = await post({+ agent_id: "ag_1",+ title: "standup",+ scheduled_at: "2026-04-17T09:00:00.000Z",+ repeat_interval: "1day",+ repeat_stop_date: "2026-05-17",+ });+ expect(res.status).toBe(201);+ expect(mockCreate).toHaveBeenCalledTimes(1);+ const payload = mockCreate.mock.calls[0][1];+ expect(payload.agentId).toBe("ag_1");+ expect(payload.workspaceId).toBe("ws1");+ expect(payload.repeatInterval).toBe("1day");+ expect(payload.repeatStopAt).toMatch(/2026-05-1[78]T/);+ });++ it("passes description through to create and echoes it in the response", async () => {+ mockGetAgent.mockResolvedValue({ id: "ag_1" });+ mockCreate.mockImplementation((_db, data) => ({+ id: "ce_1",+ title: data.title,+ description: data.description,+ }));+ const res = await post({+ agent_id: "ag_1",+ title: "standup",+ description: "<p>hello</p>",+ scheduled_at: "2026-04-17T09:00:00.000Z",+ });+ expect(res.status).toBe(201);+ const payload = mockCreate.mock.calls[0][1];+ expect(payload.description).toBe("<p>hello</p>");+ });++ it("sets description to null when omitted", async () => {+ mockGetAgent.mockResolvedValue({ id: "ag_1" });+ mockCreate.mockImplementation((_db, data) => ({ id: "ce_1", ...data }));+ const res = await post({+ agent_id: "ag_1",+ title: "standup",+ scheduled_at: "2026-04-17T09:00:00.000Z",+ });+ expect(res.status).toBe(201);+ expect(mockCreate.mock.calls[0][1].description).toBeNull();+ });++ it("normalizes empty-HTML description to null", async () => {+ mockGetAgent.mockResolvedValue({ id: "ag_1" });+ mockCreate.mockImplementation((_db, data) => ({ id: "ce_1", ...data }));+ const res = await post({+ agent_id: "ag_1",+ title: "standup",+ description: "<p></p>",+ scheduled_at: "2026-04-17T09:00:00.000Z",+ });+ expect(res.status).toBe(201);+ expect(mockCreate.mock.calls[0][1].description).toBeNull();+ });+});diff --git a/src/web/src/app/api/calendar/route.ts b/src/web/src/app/api/calendar/route.tsnew file mode 100644index 000000000..0d7e3dad3--- /dev/null+++ b/src/web/src/app/api/calendar/route.ts@@ -0,0 +1,115 @@+import { NextRequest } from "next/server";+import { getCloudflareContext } from "@opennextjs/cloudflare";+import {+ createDb,+ queries,+ CreateCalendarEventRequestSchema,+ expandOccurrences,+ isEmptyHtml,+} from "@alook/shared";+import { withAuth } from "@/lib/middleware/auth";+import { withWorkspaceMember } from "@/lib/middleware/workspace";+import { writeJSON, writeError, parseBody } from "@/lib/middleware/helpers";+import { calendarEventToResponse } from "@/lib/api/responses";+import { repeatStopDateToStopAt } from "@/lib/services/calendar";++export const GET = withAuth(async (req: NextRequest, ctx) => {+ const ws = await withWorkspaceMember(req, ctx);+ if (ws instanceof Response) return ws;++ const { env } = getCloudflareContext();+ const db = createDb((env as Env).DB);++ const agentId = req.nextUrl.searchParams.get("agentId") ?? undefined;+ const from = req.nextUrl.searchParams.get("from") ?? undefined;+ const to = req.nextUrl.searchParams.get("to") ?? undefined;++ if (agentId) {+ const agent = await queries.agent.getAgent(db, agentId, ws.workspaceId);+ if (!agent) return writeError("agent not found in workspace", 404);+ }++ const rows = await queries.calendarEvent.listCalendarEvents(+ db,+ ws.workspaceId,+ { agentId, from, to }+ );++ // Expand recurring rows into per-occurrence virtual rows within [from, to].+ // Non-recurring rows pass through with occurrence_at = scheduled_at.+ const out: ReturnType<typeof calendarEventToResponse>[] = [];+ for (const row of rows) {+ if (!row.repeatInterval || !from || !to) {+ out.push(calendarEventToResponse(row));+ continue;+ }+ const occurrences = expandOccurrences(+ row.scheduledAt,+ row.repeatInterval,+ row.repeatStopAt ?? null,+ row.exceptions ?? [],+ from,+ to+ );+ for (const occIso of occurrences) {+ out.push(+ calendarEventToResponse({+ ...row,+ scheduledAt: occIso,+ occurrenceAt: occIso,+ })+ );+ }+ }++ return writeJSON(out);+});++export const POST = withAuth(async (req: NextRequest, ctx) => {+ const ws = await withWorkspaceMember(req, ctx);+ if (ws instanceof Response) return ws;++ const { env } = getCloudflareContext();+ const db = createDb((env as Env).DB);++ const [body, err] = await parseBody(req, CreateCalendarEventRequestSchema);+ if (err) return err;++ const agent = await queries.agent.getAgent(+ db,+ body.agent_id,+ ws.workspaceId+ );+ if (!agent) return writeError("agent not found in workspace", 404);++ const scheduledAtDate = new Date(body.scheduled_at);+ const scheduledAtIso = scheduledAtDate.toISOString();++ let repeatStopAtIso: string | null = null;+ if (body.repeat_stop_date) {+ repeatStopAtIso = repeatStopDateToStopAt(body.repeat_stop_date);+ if (new Date(repeatStopAtIso) < scheduledAtDate) {+ return writeError(+ "repeat_stop_date must be on or after the first scheduled occurrence",+ 400+ );+ }+ }++ const description =+ body.description && !isEmptyHtml(body.description)+ ? body.description+ : null;++ const created = await queries.calendarEvent.createCalendarEvent(db, {+ agentId: body.agent_id,+ workspaceId: ws.workspaceId,+ title: body.title,+ description,+ scheduledAt: scheduledAtIso,+ repeatInterval: body.repeat_interval ?? null,+ repeatStopAt: repeatStopAtIso,+ });++ return writeJSON(calendarEventToResponse(created), 201);+});diff --git a/src/web/src/app/api/daemon/routes.test.ts b/src/web/src/app/api/daemon/routes.test.tsindex b7d639881..0a6a5685e 100644--- a/src/web/src/app/api/daemon/routes.test.ts+++ b/src/web/src/app/api/daemon/routes.test.ts@@ -269,6 +269,9 @@ describe("daemon route body validation", () => {vi.doMock("@/lib/services/sweep", () => ({sweepStaleState: vi.fn().mockResolvedValue(undefined),}));+ vi.doMock("@/lib/services/calendar", () => ({+ promoteDueCalendarEventsForWorkspace: vi.fn().mockResolvedValue(0),+ }));vi.doMock("@/lib/broadcast", () => ({broadcastToUser: vi.fn().mockResolvedValue(undefined),}));diff --git a/src/web/src/app/api/daemon/tasks/poll/route.test.ts b/src/web/src/app/api/daemon/tasks/poll/route.test.tsindex 8b3ac36ce..c5a8f1c4d 100644--- a/src/web/src/app/api/daemon/tasks/poll/route.test.ts+++ b/src/web/src/app/api/daemon/tasks/poll/route.test.ts@@ -52,6 +52,11 @@ vi.mock("@/lib/services/sweep", () => ({sweepStaleState: (...args: unknown[]) => mockSweepStaleState(...args),}));+const mockPromoteDue = vi.fn(async () => 0);+vi.mock("@/lib/services/calendar", () => ({+ promoteDueCalendarEventsForWorkspace: (...args: unknown[]) => mockPromoteDue(...args),+}));+vi.mock("@/lib/broadcast", () => ({broadcastToUser: (...args: unknown[]) => mockBroadcastToUser(...args),}));@@ -203,4 +208,36 @@ describe("POST /api/daemon/tasks/poll", () => {expect(mockClaimTasksForRuntimes).toHaveBeenCalledWith(["r1"], 1, "w1");});++ it("invokes calendar promotion between sweep and task claim", async () => {+ mockUpsertMachine.mockResolvedValue({});+ mockGetRuntimeIdsByDaemon.mockResolvedValue(["r1"]);+ mockSweepStaleState.mockResolvedValue(undefined);+ mockBroadcastToUser.mockResolvedValue(undefined);+ mockClaimTasksForRuntimes.mockResolvedValue([]);+ mockPromoteDue.mockResolvedValue(2);++ await POST(postReq({ daemon_id: "d1" }));++ expect(mockPromoteDue).toHaveBeenCalledWith({}, "w1");+ // Calendar promotion is scoped per-call to the authenticated workspace.+ const promoteOrder = mockPromoteDue.mock.invocationCallOrder[0]!;+ const sweepOrder = mockSweepStaleState.mock.invocationCallOrder[0]!;+ const claimOrder = mockClaimTasksForRuntimes.mock.invocationCallOrder[0]!;+ expect(sweepOrder).toBeLessThan(promoteOrder);+ expect(promoteOrder).toBeLessThan(claimOrder);+ });++ it("does not fail the poll when calendar promotion throws", async () => {+ mockUpsertMachine.mockResolvedValue({});+ mockGetRuntimeIdsByDaemon.mockResolvedValue(["r1"]);+ mockSweepStaleState.mockResolvedValue(undefined);+ mockBroadcastToUser.mockResolvedValue(undefined);+ mockClaimTasksForRuntimes.mockResolvedValue([]);+ mockPromoteDue.mockRejectedValue(new Error("D1 write failed"));++ const res = await POST(postReq({ daemon_id: "d1" }));+ expect(res.status).toBe(200);+ expect(mockClaimTasksForRuntimes).toHaveBeenCalled();+ });});diff --git a/src/web/src/app/api/daemon/tasks/poll/route.ts b/src/web/src/app/api/daemon/tasks/poll/route.tsindex 8552aa61f..b641adcca 100644--- a/src/web/src/app/api/daemon/tasks/poll/route.ts+++ b/src/web/src/app/api/daemon/tasks/poll/route.ts@@ -6,7 +6,9 @@ import { writeJSON, writeError, parseBody } from "@/lib/middleware/helpers";import { taskToResponse } from "@/lib/api/responses";import { TaskService } from "@/lib/services/task";import { sweepStaleState } from "@/lib/services/sweep";+import { promoteDueCalendarEventsForWorkspace } from "@/lib/services/calendar";import { broadcastToUser } from "@/lib/broadcast";+import { log } from "@/lib/logger";export const POST = withAuth(async (req: NextRequest, ctx) => {const { env } = getCloudflareContext();@@ -47,6 +49,23 @@ export const POST = withAuth(async (req: NextRequest, ctx) => {// 3. Housekeeping: sweep stale stateawait sweepStaleState(db, ctx.workspaceId);+ // 3b. Promote due calendar events into queued tasks before task claiming so+ // they are eligible in the same poll response.+ try {+ const enqueued = await promoteDueCalendarEventsForWorkspace(+ db,+ ctx.workspaceId,+ );+ if (enqueued > 0) {+ log.info("calendar: enqueued", { workspaceId: ctx.workspaceId, enqueued });+ }+ } catch (err) {+ log.warn("calendar: promote failed", {+ workspaceId: ctx.workspaceId,+ err: String(err),+ });+ }+// 4. Task claimingconst taskService = new TaskService(db);const claimed = await taskService.claimTasksForRuntimes(diff --git a/src/web/src/app/api/email/notify/route.ts b/src/web/src/app/api/email/notify/route.tsindex 87b889b16..6b3d27c31 100644--- a/src/web/src/app/api/email/notify/route.ts+++ b/src/web/src/app/api/email/notify/route.ts@@ -1,6 +1,6 @@import { NextRequest } from "next/server"import { getCloudflareContext } from "@opennextjs/cloudflare"-import { createDb, queries } from "@alook/shared"+import { createDb, queries, TASK_TYPES } from "@alook/shared"import { writeJSON, writeError } from "@/lib/middleware/helpers"import { TaskService } from "@/lib/services/task"import { broadcastToUser } from "@/lib/broadcast"@@ -31,9 +31,10 @@ export async function POST(req: NextRequest) {agentId: agent.id,userId: agent.ownerId!,title: `Email: ${body.subject}`.slice(0, 50),+ type: TASK_TYPES.EMAIL_NOTIFICATION,})const taskService = new TaskService(db)- await taskService.enqueueTask(agent.id, conv.id, agent.workspaceId, `New email from ${body.from}: ${body.subject}`, "email_notification")+ await taskService.enqueueTask(agent.id, conv.id, agent.workspaceId, `New email from ${body.from}: ${body.subject}`, TASK_TYPES.EMAIL_NOTIFICATION)}// Notify UI for all emails (whitelisted or not)diff --git a/src/web/src/app/globals.css b/src/web/src/app/globals.cssindex 4bbff3854..ac05a8511 100644--- a/src/web/src/app/globals.css+++ b/src/web/src/app/globals.css@@ -682,6 +682,15 @@}}+@keyframes calendar-progress {+ 0% {+ transform: translateX(-100%);+ }+ 100% {+ transform: translateX(400%);+ }+}+/* ── Utility: hide scrollbar ── */.scrollbar-none {-ms-overflow-style: none;diff --git a/src/web/src/app/(app)/w/[slug]/agents/[id]/chat/page.test.ts b/src/web/src/components/agent-chat/agent-chat-view.test.tssimilarity index 99%rename from src/web/src/app/(app)/w/[slug]/agents/[id]/chat/page.test.tsrename to src/web/src/components/agent-chat/agent-chat-view.test.tsindex cfe573006..2ebc821d5 100644--- a/src/web/src/app/(app)/w/[slug]/agents/[id]/chat/page.test.ts+++ b/src/web/src/components/agent-chat/agent-chat-view.test.ts@@ -1,6 +1,6 @@import { describe, it, expect } from "vitest";import type { Message } from "@alook/shared";-import { sortMessages, mergeMessages } from "./page";+import { sortMessages, mergeMessages } from "./agent-chat-view";function msg(id: string, created_at: string, role: "user" | "assistant" = "user", content = ""): Message {return { id, conversation_id: "conv1", role, content, task_id: null, created_at };diff --git a/src/web/src/components/agent-chat/agent-chat-view.tsx b/src/web/src/components/agent-chat/agent-chat-view.tsxnew file mode 100644index 000000000..aa5e6ad39--- /dev/null+++ b/src/web/src/components/agent-chat/agent-chat-view.tsx@@ -0,0 +1,424 @@+"use client";++import React, { useEffect, useState, useRef, useCallback } from "react";+import { useParams } from "next/navigation";+import { useWorkspace } from "@/contexts/workspace-context";+import { Button } from "@/components/ui/button";+import { TaskStream } from "@/components/task-stream";+import {+ getOrCreateAgentConversation,+ listMessages,+ sendMessage,+ getTask,+ getTaskMessages,+} from "@/lib/api";+import type { Conversation, Message, TaskApi as Task, TaskMessage } from "@alook/shared";+import { toast } from "sonner";+import { cn } from "@/lib/utils";+import { Skeleton } from "@/components/ui/skeleton";+import { ArrowUp, Loader2 } from "lucide-react";+import { Streamdown } from "streamdown";++const MESSAGE_LIMIT = 10;++/** Sort messages by (created_at, id) ascending — guarantees chronological order. */+export function sortMessages(msgs: Message[]): Message[] {+ return msgs.slice().sort((a, b) => {+ const cmp = a.created_at.localeCompare(b.created_at);+ if (cmp !== 0) return cmp;+ return a.id.localeCompare(b.id);+ });+}++/** Merge two message arrays by ID (latest wins), then sort chronologically. */+export function mergeMessages(existing: Message[], incoming: Message[]): Message[] {+ const merged = new Map<string, Message>();+ for (const m of existing) merged.set(m.id, m);+ for (const m of incoming) merged.set(m.id, m);+ return sortMessages([...merged.values()]);+}++export function AgentChatView() {+ const params = useParams();+ const { workspaceId } = useWorkspace();+ const agentId = params.id as string;++ const [conversation, setConversation] = useState<Conversation | null>(null);+ const [messages, setMessages] = useState<Message[]>([]);+ const [input, setInput] = useState("");+ const [sending, setSending] = useState(false);+ const [activeTask, setActiveTask] = useState<Task | null>(null);+ const [taskMessages, setTaskMessages] = useState<TaskMessage[]>([]);+ const [loading, setLoading] = useState(true);+ const [connectionLost, setConnectionLost] = useState(false);+ const [hasMore, setHasMore] = useState(false);+ const [loadingMore, setLoadingMore] = useState(false);++ const scrollRef = useRef<HTMLDivElement>(null);+ const pollRef = useRef<ReturnType<typeof setInterval> | null>(null);+ const lastSeqRef = useRef(0);+ const pollFailures = useRef(0);+ const initialScrollDone = useRef(false);+ const loadingMoreRef = useRef(false);++ const scrollToBottom = useCallback(() => {+ setTimeout(() => {+ scrollRef.current?.scrollTo({+ top: scrollRef.current.scrollHeight,+ behavior: "smooth",+ });+ }, 50);+ }, []);++ // Resolve conversation (get or create) then load messages+ useEffect(() => {+ async function load() {+ try {+ const conv = await getOrCreateAgentConversation(agentId, workspaceId);+ setConversation(conv);+ const msgs = await listMessages(conv.id, workspaceId, { limit: MESSAGE_LIMIT });+ setMessages(msgs);+ setHasMore(msgs.length >= MESSAGE_LIMIT);+ } catch {+ toast.error("Failed to load conversation");+ } finally {+ setLoading(false);+ }+ }+ load();+ }, [agentId, workspaceId]);++ // Scroll to bottom on initial load+ useEffect(() => {+ if (!loading && messages.length > 0 && !initialScrollDone.current) {+ initialScrollDone.current = true;+ setTimeout(() => {+ scrollRef.current?.scrollTo({ top: scrollRef.current.scrollHeight });+ }, 50);+ }+ }, [loading, messages.length]);++ const loadOlderMessages = useCallback(async () => {+ if (!conversation || loadingMoreRef.current || !hasMore) return;+ const oldest = messages[0];+ if (!oldest) return;++ loadingMoreRef.current = true;+ setLoadingMore(true);+ const el = scrollRef.current;+ const prevScrollHeight = el?.scrollHeight ?? 0;++ try {+ const older = await listMessages(conversation.id, workspaceId, {+ limit: MESSAGE_LIMIT,+ before: oldest.created_at,+ beforeId: oldest.id,+ });+ if (older.length === 0) {+ setHasMore(false);+ return;+ }+ setHasMore(older.length >= MESSAGE_LIMIT);+ setMessages((prev) => {+ const existingIds = new Set(prev.map((m) => m.id));+ const unique = older.filter((m) => !existingIds.has(m.id));+ return [...unique, ...prev];+ });++ // Restore scroll position so content doesn't jump+ requestAnimationFrame(() => {+ if (el) {+ const newScrollHeight = el.scrollHeight;+ el.scrollTop = newScrollHeight - prevScrollHeight;+ }+ });+ } catch {+ toast.error("Failed to load older messages");+ } finally {+ loadingMoreRef.current = false;+ setLoadingMore(false);+ }+ }, [conversation, workspaceId, messages, hasMore]);++ // Detect scroll to top for loading more+ const handleScroll = useCallback(() => {+ const el = scrollRef.current;+ if (!el || loadingMore || !hasMore) return;+ if (el.scrollTop < 80) {+ loadOlderMessages();+ }+ }, [loadOlderMessages, loadingMore, hasMore]);++ const startPolling = useCallback(+ (taskId: string, conversationId: string) => {+ if (pollRef.current) clearInterval(pollRef.current);+ lastSeqRef.current = 0;+ pollFailures.current = 0;+ setConnectionLost(false);++ pollRef.current = setInterval(async () => {+ try {+ const [task, tmsgs] = await Promise.all([+ getTask(taskId, workspaceId),+ getTaskMessages(taskId, workspaceId, lastSeqRef.current || undefined),+ ]);++ pollFailures.current = 0;+ setConnectionLost(false);+ setActiveTask(task);++ if (tmsgs.length > 0) {+ setTaskMessages((prev) => [...prev, ...tmsgs]);+ lastSeqRef.current = Math.max(+ ...tmsgs.map((m) => m.seq),+ lastSeqRef.current+ );+ }++ if (task.status === "completed" || task.status === "failed") {+ if (pollRef.current) clearInterval(pollRef.current);+ pollRef.current = null;++ try {+ // Fetch latest messages and merge with any older pagination-loaded messages.+ // Keep taskMessages so the trace stays visible under the completed assistant reply.+ const latest = await listMessages(conversationId, workspaceId);+ setMessages((prev) => mergeMessages(prev, latest));+ scrollToBottom();+ } catch {+ toast.error("Failed to refresh messages");+ }+ setActiveTask(task);+ }+ } catch {+ pollFailures.current += 1;+ if (pollFailures.current >= 3) {+ setConnectionLost(true);+ }+ if (pollFailures.current >= 10) {+ if (pollRef.current) clearInterval(pollRef.current);+ pollRef.current = null;+ toast.error("Lost connection to agent");+ }+ }+ }, 1000);+ },+ [workspaceId, scrollToBottom]+ );++ useEffect(() => {+ return () => {+ if (pollRef.current) clearInterval(pollRef.current);+ };+ }, []);++ const handleSend = async () => {+ const content = input.trim();+ if (!content || sending || !conversation) return;++ setInput("");+ setSending(true);++ const optimistic: Message = {+ id: `temp-${Date.now()}`,+ conversation_id: conversation.id,+ role: "user",+ content,+ task_id: null,+ created_at: new Date().toISOString(),+ };+ setMessages((prev) => [...prev, optimistic]);+ scrollToBottom();++ try {+ const { message, task } = await sendMessage(conversation.id, content, workspaceId);+ setMessages((prev) =>+ prev.map((m) => (m.id === optimistic.id ? message : m))+ );+ setActiveTask(task);+ setTaskMessages([]);+ startPolling(task.id, conversation.id);+ } catch (err) {+ setMessages((prev) => prev.filter((m) => m.id !== optimistic.id));+ setInput(content);+ toast.error(+ err instanceof Error ? err.message : "Failed to send message"+ );+ } finally {+ setSending(false);+ }+ };++ const handleKeyDown = (e: React.KeyboardEvent) => {+ if (e.key === "Enter" && !e.shiftKey) {+ e.preventDefault();+ handleSend();+ }+ };++ if (loading) {+ return (+ <>+ <div className="flex-1 overflow-y-auto px-5">+ <div className="mx-auto max-w-2xl py-6 space-y-4">+ {/* Skeleton user message */}+ <div className="flex justify-end">+ <Skeleton className="h-10 w-48 rounded-lg" />+ </div>+ {/* Skeleton assistant message */}+ <div className="flex justify-start">+ <div className="space-y-2 px-1 py-1">+ <Skeleton className="h-4 w-72" />+ <Skeleton className="h-4 w-56" />+ <Skeleton className="h-4 w-64" />+ </div>+ </div>+ {/* Another pair */}+ <div className="flex justify-end">+ <Skeleton className="h-10 w-36 rounded-lg" />+ </div>+ <div className="flex justify-start">+ <div className="space-y-2 px-1 py-1">+ <Skeleton className="h-4 w-64" />+ <Skeleton className="h-4 w-48" />+ </div>+ </div>+ </div>+ </div>+ {/* Skeleton input area */}+ <div className="px-5 py-3">+ <div className="mx-auto max-w-2xl">+ <Skeleton className="h-[72px] w-full rounded-xl" />+ </div>+ </div>+ </>+ );+ }++ if (!conversation) {+ return (+ <div className="flex flex-1 items-center justify-center text-sm text-muted-foreground">+ Failed to load conversation+ </div>+ );+ }++ return (+ <>+ {/* Messages */}+ <div+ className="flex-1 overflow-y-auto px-5 thin-scrollbar"+ ref={scrollRef}+ onScroll={handleScroll}+ onClick={(e) => {+ const btn = (e.target as HTMLElement).closest(+ '[data-streamdown="code-block-actions"] button'+ );+ if (btn) toast.success("Copied to clipboard");+ }}+ >+ <div className="mx-auto max-w-2xl py-6 space-y-4">+ {/* Load more indicator */}+ {loadingMore && (+ <div className="flex justify-center py-2">+ <Loader2 className="size-4 animate-spin text-muted-foreground" />+ </div>+ )}++ {messages.length === 0 && !activeTask && (+ <p className="text-center text-muted-foreground py-20 text-sm">+ Send a message to start chatting with the agent.+ </p>+ )}++ {messages.map((msg) => {+ const hasTaskStream =+ activeTask &&+ msg.role === "assistant" &&+ msg.task_id === activeTask.id &&+ taskMessages.length > 0;++ return (+ <React.Fragment key={msg.id}>+ {/* Show full trace (including text) for completed tasks */}+ {hasTaskStream && (+ <TaskStream+ task={activeTask}+ messages={taskMessages}+ connectionLost={connectionLost}+ />+ )}+ {msg.role === "user" ? (+ <div className="flex justify-end">+ <div className="max-w-[80%] rounded-lg px-4 py-2 bg-primary text-primary-foreground text-base whitespace-pre-wrap">+ {msg.content}+ </div>+ </div>+ ) : !hasTaskStream ? (+ <div className="flex justify-start">+ <div className="markdown max-w-full px-1 py-1 text-base text-foreground">+ <Streamdown controls={{ code: { copy: true, download: false }, table: { copy: true, download: false, fullscreen: true } }} linkSafety={{ enabled: false }}>{msg.content}</Streamdown>+ </div>+ </div>+ ) : null}+ </React.Fragment>+ );+ })}++ {/* Show trace while task is in progress (no assistant message yet) */}+ {activeTask && activeTask.status !== "completed" && activeTask.status !== "failed" && (+ <TaskStream+ task={activeTask}+ messages={taskMessages}+ connectionLost={connectionLost}+ />+ )}+ </div>+ </div>++ {/* Input */}+ <div className="px-5 py-3">+ <div className="mx-auto max-w-2xl">+ <div+ className={cn(+ "relative flex flex-col rounded-xl border bg-background/60 transition-colors duration-200",+ "focus-within:border-ring focus-within:ring-3 focus-within:ring-ring/50",+ (sending || (!!activeTask && activeTask.status !== "completed" && activeTask.status !== "failed")) && "opacity-50"+ )}+ >+ <textarea+ value={input}+ onChange={(e) => setInput(e.target.value)}+ onKeyDown={handleKeyDown}+ placeholder="Type a message..."+ rows={1}+ disabled={sending || (!!activeTask && activeTask.status !== "completed" && activeTask.status !== "failed")}+ className={cn(+ "field-sizing-content w-full resize-none bg-transparent px-3.5 pt-2.5 text-base outline-none",+ "placeholder:text-muted-foreground disabled:cursor-not-allowed",+ "min-h-[38px] max-h-[200px]"+ )}+ />+ <div className="flex items-center justify-end px-2 pb-2 pt-0.5">+ <Button+ size="icon-sm"+ onClick={handleSend}+ disabled={!input.trim() || sending || (!!activeTask && activeTask.status !== "completed" && activeTask.status !== "failed")}+ className={cn(+ "rounded-lg transition-opacity duration-200",+ !input.trim() && "opacity-40"+ )}+ >+ {sending ? (+ <Loader2 className="size-3.5 animate-spin" />+ ) : (+ <ArrowUp className="size-3.5" />+ )}+ </Button>+ </div>+ </div>+ </div>+ </div>+ </>+ );+}diff --git a/src/web/src/components/app-sidebar.tsx b/src/web/src/components/app-sidebar.tsxindex 2c8f3c953..fbfb5fb83 100644--- a/src/web/src/components/app-sidebar.tsx+++ b/src/web/src/components/app-sidebar.tsx@@ -5,7 +5,7 @@ import { useAgentContext } from "@/contexts/agent-context";import { useWorkspace } from "@/contexts/workspace-context";import { Logo } from "@/components/logo";import { cn } from "@/lib/utils";-import { Monitor, SunMoon, Plus, LayoutGrid } from "lucide-react";+import { Monitor, SunMoon, Plus, LayoutGrid, CalendarDays } from "lucide-react";import { Skeleton } from "@/components/ui/skeleton";import { useTheme } from "next-themes";import { NavUser } from "@/components/nav-user";@@ -22,6 +22,7 @@ export function AppSidebar() {const prefix = `/w/${slug}`;const isRuntimes = pathname === `${prefix}/runtimes`;+ const isCalendar = pathname === `${prefix}/calendar`;const isCreateAgent = pathname === `${prefix}/agents/new`;// Detect active agent from ?agent= param or /w/[slug]/agents/[id] route@@ -109,6 +110,19 @@ export function AppSidebar() {<Monitor className="size-4" /></button>+ <button+ type="button"+ title="Calendar"+ onClick={() => router.push(`${prefix}/calendar`)}+ className={cn(+ "flex items-center justify-center size-10 rounded-xl transition-colors duration-200 cursor-pointer",+ "text-muted-foreground hover:text-foreground hover:bg-accent",+ isCalendar && "bg-accent text-foreground"+ )}+ >+ <CalendarDays className="size-4" />+ </button>+<buttontype="button"title="Toggle theme"diff --git a/src/web/src/components/calendar/calendar-agenda.test.ts b/src/web/src/components/calendar/calendar-agenda.test.tsnew file mode 100644index 000000000..b383bb47f--- /dev/null+++ b/src/web/src/components/calendar/calendar-agenda.test.ts@@ -0,0 +1,68 @@+import { describe, it, expect } from "vitest";+import { groupByDay } from "./calendar-agenda";+import type { CalendarEvent } from "@alook/shared";++function mkEvent(over: Partial<CalendarEvent> & { scheduled_at: string }): CalendarEvent {+ return {+ id: over.id ?? Math.random().toString(36).slice(2),+ agent_id: over.agent_id ?? "ag_1",+ workspace_id: over.workspace_id ?? "ws_1",+ title: over.title ?? "test",+ repeat_interval: over.repeat_interval ?? null,+ repeat_stop_at: over.repeat_stop_at ?? null,+ last_triggered_at: over.last_triggered_at ?? null,+ created_at: over.created_at ?? "2026-04-01T00:00:00Z",+ updated_at: over.updated_at ?? "2026-04-01T00:00:00Z",+ ...over,+ };+}++describe("groupByDay", () => {+ it("returns an empty array for no events", () => {+ expect(groupByDay([])).toEqual([]);+ });++ it("groups events falling on the same local day", () => {+ const events = [+ mkEvent({ id: "e1", scheduled_at: "2026-04-17T09:00:00.000Z" }),+ mkEvent({ id: "e2", scheduled_at: "2026-04-17T15:30:00.000Z" }),+ mkEvent({ id: "e3", scheduled_at: "2026-04-18T09:00:00.000Z" }),+ ];+ const g = groupByDay(events);+ expect(g).toHaveLength(2);+ expect(g[0]!.items.map((e) => e.id)).toEqual(["e1", "e2"]);+ expect(g[1]!.items.map((e) => e.id)).toEqual(["e3"]);+ });++ it("orders groups chronologically", () => {+ const events = [+ mkEvent({ id: "late", scheduled_at: "2026-04-20T09:00:00.000Z" }),+ mkEvent({ id: "early", scheduled_at: "2026-04-17T09:00:00.000Z" }),+ mkEvent({ id: "mid", scheduled_at: "2026-04-18T09:00:00.000Z" }),+ ];+ const g = groupByDay(events);+ const dates = g.map((x) => x.day.getDate());+ expect(dates).toEqual([17, 18, 20]);+ });++ it("sorts items within a group by time", () => {+ const events = [+ mkEvent({ id: "pm", scheduled_at: "2026-04-17T15:30:00.000Z" }),+ mkEvent({ id: "am", scheduled_at: "2026-04-17T09:00:00.000Z" }),+ mkEvent({ id: "noon", scheduled_at: "2026-04-17T12:00:00.000Z" }),+ ];+ const g = groupByDay(events);+ expect(g).toHaveLength(1);+ expect(g[0]!.items.map((e) => e.id)).toEqual(["am", "noon", "pm"]);+ });++ it("omits days that have no events", () => {+ const events = [+ mkEvent({ id: "e1", scheduled_at: "2026-04-17T09:00:00.000Z" }),+ mkEvent({ id: "e2", scheduled_at: "2026-04-20T09:00:00.000Z" }),+ ];+ const g = groupByDay(events);+ expect(g).toHaveLength(2);+ expect(g.map((x) => x.day.getDate())).toEqual([17, 20]);+ });+});diff --git a/src/web/src/components/calendar/calendar-agenda.tsx b/src/web/src/components/calendar/calendar-agenda.tsxnew file mode 100644index 000000000..fe3fad372--- /dev/null+++ b/src/web/src/components/calendar/calendar-agenda.tsx@@ -0,0 +1,152 @@+"use client";++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";++export interface CalendarAgendaProps {+ events: CalendarEvent[];+ agents: Agent[];+ loading: boolean;+ onSelectEvent: (event: CalendarEvent) => void;+}++export function groupByDay(+ events: CalendarEvent[]+): { day: Date; items: CalendarEvent[] }[] {+ const groups = new Map<string, { day: Date; items: CalendarEvent[] }>();+ for (const ev of events) {+ const d = new Date(ev.scheduled_at);+ const key = dateKey(d);+ if (!groups.has(key)) {+ const base = new Date(d.getFullYear(), d.getMonth(), d.getDate());+ groups.set(key, { day: base, items: [] });+ }+ groups.get(key)!.items.push(ev);+ }+ const sorted = [...groups.values()].sort(+ (a, b) => a.day.getTime() - b.day.getTime()+ );+ for (const g of sorted) {+ g.items.sort(+ (a, b) =>+ new Date(a.scheduled_at).getTime() -+ new Date(b.scheduled_at).getTime()+ );+ }+ return sorted;+}++function formatDay(d: Date): string {+ return d.toLocaleDateString(undefined, {+ weekday: "short",+ month: "short",+ day: "numeric",+ });+}++function formatTime(iso: string): string {+ return new Date(iso).toLocaleTimeString(undefined, {+ hour: "2-digit",+ minute: "2-digit",+ hour12: false,+ });+}++export function CalendarAgenda({+ events,+ agents,+ loading,+ onSelectEvent,+}: CalendarAgendaProps) {+ const groups = groupByDay(events);+ const agentNameById = new Map<string, string>();+ for (const a of agents) agentNameById.set(a.id, a.name);+ const today = new Date();++ if (loading && events.length === 0) {+ return (+ <div className="flex flex-col gap-4">+ {Array.from({ length: 4 }).map((_, g) => (+ <div key={g} className="flex flex-col gap-2">+ <Skeleton className="h-3 w-24" />+ {Array.from({ length: 2 }).map((_, r) => (+ <Skeleton key={r} className="h-8 w-full rounded-md" />+ ))}+ </div>+ ))}+ </div>+ );+ }++ if (groups.length === 0) {+ return (+ <div className="flex flex-1 items-center justify-center py-12">+ <div className="text-center">+ <p className="text-sm text-muted-foreground">No events in view.</p>+ <p className="mt-2 text-xs text-muted-foreground">+ Switch to month view or create a new event above.+ </p>+ </div>+ </div>+ );+ }++ return (+ <div className="flex flex-col gap-4" data-testid="calendar-agenda">+ {groups.map((g) => {+ const isToday =+ today.getFullYear() === g.day.getFullYear() &&+ today.getMonth() === g.day.getMonth() &&+ today.getDate() === g.day.getDate();+ return (+ <div key={dateKey(g.day)} className="flex flex-col gap-1.5">+ <h3+ className={cn(+ "sticky top-0 z-10 py-1 text-[11px] font-medium text-muted-foreground",+ isToday && "text-foreground"+ )}+ >+ {formatDay(g.day)}+ {isToday && (+ <span className="ml-2 rounded-full bg-foreground text-background px-1.5 py-0.5 text-[10px]">+ Today+ </span>+ )}+ </h3>+ <ul className="flex flex-col gap-1">+ {g.items.map((ev) => (+ <li key={`${ev.id}@${ev.occurrence_at}`}>+ <button+ type="button"+ onClick={() => onSelectEvent(ev)}+ className="flex w-full items-center gap-3 rounded-md border border-border/50 bg-background px-3 py-2 text-left transition-colors hover:bg-accent"+ >+ <span className="shrink-0 text-xs text-muted-foreground tabular-nums w-16">+ {formatTime(ev.scheduled_at)}+ </span>+ <span+ className={cn(+ "shrink-0 rounded-sm px-1.5 py-0.5 text-[10px] font-medium",+ agentColor(ev.agent_id)+ )}+ >+ {agentNameById.get(ev.agent_id) ?? ev.agent_id}+ </span>+ <span className="flex-1 truncate text-sm">{ev.title}</span>+ {ev.repeat_interval && (+ <span className="shrink-0 text-[10px] text-muted-foreground">+ every {ev.repeat_interval}+ </span>+ )}+ </button>+ </li>+ ))}+ </ul>+ </div>+ );+ })}+ </div>+ );+}diff --git a/src/web/src/components/calendar/calendar-agent-filter.tsx b/src/web/src/components/calendar/calendar-agent-filter.tsxnew file mode 100644index 000000000..0712ac8e1--- /dev/null+++ b/src/web/src/components/calendar/calendar-agent-filter.tsx@@ -0,0 +1,57 @@+"use client";++import { cn } from "@/lib/utils";+import type { Agent } from "@alook/shared";+import { Skeleton } from "@/components/ui/skeleton";+import { agentColor } from "./calendar-month-grid";++export interface CalendarAgentFilterProps {+ agents: Agent[];+ selected: Set<string>;+ onToggle: (agentId: string) => void;+}++/**+ * Chip row height is pinned (`h-6` + flex container) so the filter reserves the+ * same vertical space whether loading, empty, or populated — avoids layout+ * drift that would push the calendar grid down on load.+ */+export function CalendarAgentFilter({+ agents,+ selected,+ onToggle,+}: CalendarAgentFilterProps) {+ return (+ <div className="flex min-h-6 flex-wrap items-center gap-1.5">+ {agents.length === 0 ? (+ <>+ <Skeleton className="h-6 w-20 rounded-full" />+ <Skeleton className="h-6 w-24 rounded-full" />+ <Skeleton className="h-6 w-16 rounded-full" />+ </>+ ) : (+ agents.map((a) => {+ const on = selected.has(a.id);+ return (+ <button+ type="button"+ key={a.id}+ onClick={() => onToggle(a.id)}+ className={cn(+ "flex h-6 items-center gap-1.5 rounded-full px-2.5 text-[11px] font-medium transition-colors",+ on+ ? "bg-foreground text-background"+ : "bg-transparent text-muted-foreground border border-border hover:bg-accent"+ )}+ >+ <span+ className={cn("size-2 rounded-full", agentColor(a.id).split(" ")[0])}+ />+ {a.name}+ </button>+ );+ })+ )}+ </div>+ );+}diff --git a/src/web/src/components/calendar/calendar-date-picker.tsx b/src/web/src/components/calendar/calendar-date-picker.tsxnew file mode 100644index 000000000..52dcd9771--- /dev/null+++ b/src/web/src/components/calendar/calendar-date-picker.tsx@@ -0,0 +1,175 @@+"use client";++import { useState } from "react";+import {+ Popover,+ PopoverTrigger,+ PopoverContent,+} from "@/components/ui/popover";+import { cn } from "@/lib/utils";+import { CalendarDays, ChevronLeft, ChevronRight } from "lucide-react";+import { buildMonthCells, sameDay } from "./calendar-month-grid";++export interface CalendarDatePickerProps {+ value: Date | null;+ onChange: (date: Date) => void;+ placeholder?: string;+ min?: Date;+ className?: string;+ ariaLabel?: string;+ /** Suppress the built-in CalendarDays icon in the trigger. */+ hideIcon?: boolean;+}++function formatDisplay(d: Date): string {+ return d.toLocaleDateString(undefined, {+ month: "short",+ day: "numeric",+ year: "numeric",+ });+}++function monthYearLabel(y: number, m: number): string {+ return new Date(y, m, 1).toLocaleDateString(undefined, {+ month: "long",+ year: "numeric",+ });+}++export function CalendarDatePicker({+ value,+ onChange,+ placeholder = "Jump to date",+ min,+ className,+ ariaLabel = "Pick a date",+ hideIcon = false,+}: CalendarDatePickerProps) {+ const [open, setOpen] = useState(false);+ const initial = value ?? new Date();+ const [viewYear, setViewYear] = useState(initial.getFullYear());+ const [viewMonth, setViewMonth] = useState(initial.getMonth());++ const cells = buildMonthCells(viewYear, viewMonth);+ const today = new Date();++ const handleSelect = (d: Date) => {+ if (min && d < stripTime(min)) return;+ onChange(d);+ setOpen(false);+ };++ const label = value ? formatDisplay(value) : placeholder;++ return (+ <Popover+ open={open}+ onOpenChange={(o) => {+ setOpen(o);+ if (o) {+ const anchor = value ?? new Date();+ setViewYear(anchor.getFullYear());+ setViewMonth(anchor.getMonth());+ }+ }}+ >+ <PopoverTrigger+ aria-label={ariaLabel}+ className={cn(+ "flex h-7 items-center gap-1.5 rounded-md border border-input bg-transparent px-2 text-xs outline-none transition-colors",+ "hover:bg-accent hover:text-foreground",+ "focus-visible:border-ring focus-visible:ring-3 focus-visible:ring-ring/50",+ value ? "text-foreground" : "text-muted-foreground",+ className+ )}+ >+ {!hideIcon && <CalendarDays className="size-3.5 opacity-70" />}+ <span className="tabular-nums">{label}</span>+ </PopoverTrigger>+ <PopoverContent align="end" className="w-64 p-3">+ <div className="flex items-center justify-between pb-2">+ <button+ type="button"+ aria-label="Previous month"+ onClick={() => {+ setViewMonth((m) => (m === 0 ? 11 : m - 1));+ if (viewMonth === 0) setViewYear((y) => y - 1);+ }}+ className="flex size-6 items-center justify-center rounded text-muted-foreground hover:bg-accent hover:text-foreground"+ >+ <ChevronLeft className="size-3.5" />+ </button>+ <span className="text-xs font-medium tabular-nums">+ {monthYearLabel(viewYear, viewMonth)}+ </span>+ <button+ type="button"+ aria-label="Next month"+ onClick={() => {+ setViewMonth((m) => (m === 11 ? 0 : m + 1));+ if (viewMonth === 11) setViewYear((y) => y + 1);+ }}+ className="flex size-6 items-center justify-center rounded text-muted-foreground hover:bg-accent hover:text-foreground"+ >+ <ChevronRight className="size-3.5" />+ </button>+ </div>++ <div className="grid grid-cols-7 pb-1 text-[10px] text-muted-foreground">+ {["S", "M", "T", "W", "T", "F", "S"].map((d, i) => (+ <div+ key={i}+ className="flex h-6 items-center justify-center font-medium"+ >+ {d}+ </div>+ ))}+ </div>++ <div className="grid grid-cols-7 gap-0.5">+ {cells.map((cell, i) => {+ const isToday = sameDay(today, cell.date);+ const isSelected = value ? sameDay(value, cell.date) : false;+ const isDisabled = !!min && cell.date < stripTime(min);+ return (+ <button+ key={i}+ type="button"+ disabled={isDisabled}+ onClick={() => handleSelect(cell.date)}+ aria-pressed={isSelected}+ className={cn(+ "flex h-7 w-full items-center justify-center rounded text-[11px] tabular-nums transition-colors outline-none",+ "focus-visible:ring-2 focus-visible:ring-ring/60",+ !cell.inMonth && "text-muted-foreground/50",+ cell.inMonth && !isSelected && "hover:bg-accent",+ isToday && !isSelected &&+ "text-foreground font-medium ring-1 ring-inset ring-border",+ isSelected &&+ "bg-foreground text-background font-medium",+ isDisabled && "opacity-30 cursor-not-allowed hover:bg-transparent"+ )}+ >+ {cell.date.getDate()}+ </button>+ );+ })}+ </div>++ <div className="flex items-center justify-end pt-2 mt-1 border-t border-border/50">+ <button+ type="button"+ onClick={() => handleSelect(new Date())}+ className="text-[11px] text-muted-foreground hover:text-foreground transition-colors"+ >+ Today+ </button>+ </div>+ </PopoverContent>+ </Popover>+ );+}++function stripTime(d: Date): Date {+ return new Date(d.getFullYear(), d.getMonth(), d.getDate());+}diff --git a/src/web/src/components/calendar/calendar-day-popover.tsx b/src/web/src/components/calendar/calendar-day-popover.tsxnew file mode 100644index 000000000..fa4e01746--- /dev/null+++ b/src/web/src/components/calendar/calendar-day-popover.tsx@@ -0,0 +1,93 @@+"use client";++import { Popover, PopoverTrigger, PopoverContent } from "@/components/ui/popover";+import { cn } from "@/lib/utils";+import type { CalendarEvent, Agent } from "@alook/shared";+import { agentChipOutline } from "./calendar-month-grid";++export interface CalendarDayPopoverProps {+ events: CalendarEvent[];+ agents: Agent[];+ date: Date;+ hiddenCount: number;+ open: boolean;+ onOpenChange: (open: boolean) => void;+ onSelectEvent: (event: CalendarEvent) => void;+}++function timeLabel(iso: string) {+ return new Date(iso).toLocaleTimeString(undefined, {+ hour: "2-digit",+ minute: "2-digit",+ hour12: false,+ });+}++export function CalendarDayPopover({+ events,+ agents,+ date,+ hiddenCount,+ open,+ onOpenChange,+ onSelectEvent,+}: CalendarDayPopoverProps) {+ const agentNameById = new Map<string, string>();+ for (const a of agents) agentNameById.set(a.id, a.name);++ const sorted = [...events].sort(+ (a, b) =>+ new Date(a.scheduled_at).getTime() - new Date(b.scheduled_at).getTime()+ );++ const dateLabel = date.toLocaleDateString(undefined, {+ weekday: "short",+ month: "short",+ day: "numeric",+ });++ return (+ <Popover open={open} onOpenChange={onOpenChange}>+ <PopoverTrigger+ aria-label={`${hiddenCount} more event${hiddenCount === 1 ? "" : "s"}`}+ onClick={(e) => e.stopPropagation()}+ className="w-full truncate rounded-sm px-1.5 py-0.5 text-left text-[10px] text-muted-foreground hover:bg-accent hover:text-foreground transition-colors"+ >+ +{hiddenCount} more+ </PopoverTrigger>+ <PopoverContent className="w-64" align="start">+ <div className="flex flex-col gap-1.5">+ <p className="px-1 pb-1 text-[11px] font-medium text-muted-foreground">+ {dateLabel}+ </p>+ <div className="flex flex-col gap-1">+ {sorted.map((ev) => (+ <button+ key={`${ev.id}@${ev.occurrence_at}`}+ type="button"+ onClick={() => {+ onOpenChange(false);+ onSelectEvent(ev);+ }}+ className={cn(+ "border flex items-center gap-2 rounded-sm px-1.5 py-1 text-left text-[11px] font-medium transition-colors",+ agentChipOutline(ev.agent_id)+ )}+ title={`${ev.title}${+ agentNameById.get(ev.agent_id)+ ? ` — ${agentNameById.get(ev.agent_id)}`+ : ""+ }`}+ >+ <span className="shrink-0 text-[10px] opacity-70 tabular-nums">+ {timeLabel(ev.scheduled_at)}+ </span>+ <span className="truncate">{ev.title}</span>+ </button>+ ))}+ </div>+ </div>+ </PopoverContent>+ </Popover>+ );+}diff --git a/src/web/src/components/calendar/calendar-event-sheet.tsx b/src/web/src/components/calendar/calendar-event-sheet.tsxnew file mode 100644index 000000000..1efa266d9--- /dev/null+++ b/src/web/src/components/calendar/calendar-event-sheet.tsx@@ -0,0 +1,580 @@+"use client";++import { useEffect, useMemo, useState } from "react";+import { toast } from "sonner";+import {+ Sheet,+ SheetContent,+ SheetTitle,+ SheetBody,+ SheetFooter,+} from "@/components/ui/sheet";+import {+ Dialog,+ DialogContent,+ DialogDescription,+ DialogFooter,+ DialogHeader,+ DialogTitle,+} from "@/components/ui/dialog";+import { Button } from "@/components/ui/button";+import { Input } from "@/components/ui/input";+import { MarkdownEditor, isEmptyHtml } from "@/components/ui/markdown-editor";+import {+ CalendarDays,+ CalendarOff,+ Clock,+ Repeat as RepeatIcon,+ User,+} from "lucide-react";+import { cn } from "@/lib/utils";+import type {+ Agent,+ CalendarEvent,+ UpdateCalendarEventRequest,+} from "@alook/shared";+import { CalendarDatePicker } from "./calendar-date-picker";+import { CalendarTimePicker } from "./calendar-time-picker";++const REPEAT_OPTIONS = [+ { value: "", label: "Does not repeat" },+ { value: "1hour", label: "Every hour" },+ { value: "1day", label: "Every day" },+ { value: "1week", label: "Every week" },+ { value: "1month", label: "Every month" },+];++export interface CreateFormValues {+ agent_id: string;+ title: string;+ description?: string;+ scheduled_at: string;+ repeat_interval?: string;+ repeat_stop_date?: string;+}++export interface CalendarEventSheetProps {+ open: boolean;+ onOpenChange: (open: boolean) => void;+ agents: Agent[];+ /** When provided, the sheet is in edit mode. */+ event?: CalendarEvent | null;+ defaultDate?: Date;+ defaultAgentId?: string;+ submitting?: boolean;+ saving?: boolean;+ deleting?: boolean;+ onCreate?: (values: CreateFormValues) => Promise<void> | void;+ onUpdate?: (+ event: CalendarEvent,+ patch: UpdateCalendarEventRequest+ ) => Promise<void>;+ onDelete?: (event: CalendarEvent) => void;+}++function pad(n: number) {+ return String(n).padStart(2, "0");+}++function nextSlotTime(d: Date, stepMin = 30): string {+ const total = d.getHours() * 60 + d.getMinutes();+ const next = Math.ceil((total + 1) / stepMin) * stepMin;+ const h = Math.floor(next / 60) % 24;+ const m = next % 60;+ return `${pad(h)}:${pad(m)}`;+}++function combineDateTime(date: Date, time: string): Date {+ const match = /^(\d{2}):(\d{2})$/.exec(time);+ const h = match ? Number(match[1]) : date.getHours();+ const m = match ? Number(match[2]) : date.getMinutes();+ const out = new Date(date);+ out.setHours(h, m, 0, 0);+ return out;+}++function toYYYYMMDD(d: Date): string {+ return `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())}`;+}++function parseTime(d: Date): string {+ return `${pad(d.getHours())}:${pad(d.getMinutes())}`;+}++function normalizedDescription(html: string | null | undefined): string {+ if (!html) return "";+ return isEmptyHtml(html) ? "" : html;+}++const GHOST_CONTROL =+ "h-7 border-0 bg-transparent px-1.5 text-sm text-foreground hover:bg-accent transition-colors -ml-1.5";++const GHOST_SELECT = cn(+ GHOST_CONTROL,+ "rounded-md outline-none focus-visible:bg-accent focus-visible:ring-0 appearance-none pr-6"+);++const TIME_INPUT =+ "h-7 w-12 border-0 bg-transparent px-0.5 text-sm tabular-nums text-foreground rounded-md outline-none focus-visible:ring-0";++interface PropertyRowProps {+ icon?: React.ReactNode;+ children: React.ReactNode;+}++function PropertyRow({ icon, children }: PropertyRowProps) {+ return (+ <div className="group flex items-center gap-2">+ <span className="inline-flex size-6 shrink-0 items-center justify-center text-muted-foreground">+ {icon}+ </span>+ <div className="flex min-w-0 flex-wrap items-center gap-1">{children}</div>+ </div>+ );+}++interface RecurringScopeDialogProps {+ open: boolean;+ onOpenChange: (o: boolean) => void;+ onConfirm: (scope: "this" | "following") => void;+ loading?: boolean;+}++function RecurringScopeDialog({+ open,+ onOpenChange,+ onConfirm,+ loading,+}: RecurringScopeDialogProps) {+ const [scope, setScope] = useState<"this" | "following">("this");+ useEffect(() => {+ if (open) setScope("this");+ }, [open]);++ return (+ <Dialog open={open} onOpenChange={onOpenChange}>+ <DialogContent showCloseButton={false}>+ <DialogHeader>+ <DialogTitle>Update recurring event</DialogTitle>+ <DialogDescription>+ How should this change apply?+ </DialogDescription>+ </DialogHeader>+ <div className="flex flex-col gap-1.5 py-1">+ {(+ [+ { value: "this", label: "This event only" },+ { value: "following", label: "This and following events" },+ ] as const+ ).map((opt) => {+ const selected = scope === opt.value;+ return (+ <button+ key={opt.value}+ type="button"+ onClick={() => setScope(opt.value)}+ className={cn(+ "flex items-center gap-2 rounded-md border px-3 py-2 text-left text-sm transition-colors",+ selected+ ? "border-ring bg-accent/40"+ : "border-border/60 hover:bg-accent/30"+ )}+ >+ <span+ className={cn(+ "inline-flex size-4 items-center justify-center rounded-full border",+ selected ? "border-foreground" : "border-border"+ )}+ aria-hidden+ >+ {selected && <span className="size-2 rounded-full bg-foreground" />}+ </span>+ <span>{opt.label}</span>+ </button>+ );+ })}+ </div>+ <DialogFooter>+ <Button+ variant="outline"+ size="sm"+ onClick={() => onOpenChange(false)}+ disabled={loading}+ >+ Cancel+ </Button>+ <Button+ size="sm"+ onClick={() => onConfirm(scope)}+ disabled={loading}+ >+ {loading ? "Saving..." : "Update"}+ </Button>+ </DialogFooter>+ </DialogContent>+ </Dialog>+ );+}++export function CalendarEventSheet({+ open,+ onOpenChange,+ agents,+ event,+ defaultDate,+ defaultAgentId,+ submitting,+ saving,+ deleting,+ onCreate,+ onUpdate,+ onDelete,+}: CalendarEventSheetProps) {+ const mode = event ? "edit" : "create";++ const [agentId, setAgentId] = useState("");+ const [title, setTitle] = useState("");+ const [description, setDescription] = useState("");+ const [dateValue, setDateValue] = useState<Date>(new Date());+ const [timeValue, setTimeValue] = useState<string>("09:00");+ const [repeat, setRepeat] = useState("");+ const [stopDate, setStopDate] = useState<Date | null>(null);+ const [scopeOpen, setScopeOpen] = useState(false);++ useEffect(() => {+ if (!open) return;+ if (event) {+ const scheduled = new Date(event.scheduled_at);+ setAgentId(event.agent_id);+ setTitle(event.title);+ setDescription(event.description ?? "");+ setDateValue(scheduled);+ setTimeValue(parseTime(scheduled));+ setRepeat(event.repeat_interval ?? "");+ setStopDate(+ event.repeat_stop_at ? new Date(event.repeat_stop_at) : null+ );+ } else {+ setAgentId(defaultAgentId || agents[0]?.id || "");+ setTitle("");+ setDescription("");+ setDateValue(defaultDate ?? new Date());+ setTimeValue(nextSlotTime(new Date()));+ setRepeat("");+ setStopDate(null);+ }+ // Seed only on open transition / event id change.+ // eslint-disable-next-line react-hooks/exhaustive-deps+ }, [open, event?.id]);++ const dirty = useMemo(() => {+ if (!event) return true;+ const scheduled = new Date(event.scheduled_at);+ return (+ title.trim() !== event.title ||+ normalizedDescription(description) !==+ normalizedDescription(event.description) ||+ agentId !== event.agent_id ||+ dateValue.getFullYear() !== scheduled.getFullYear() ||+ dateValue.getMonth() !== scheduled.getMonth() ||+ dateValue.getDate() !== scheduled.getDate() ||+ timeValue !== parseTime(scheduled) ||+ repeat !== (event.repeat_interval ?? "") ||+ (stopDate ? toYYYYMMDD(stopDate) : null) !==+ (event.repeat_stop_at ? toYYYYMMDD(new Date(event.repeat_stop_at)) : null)+ );+ }, [agentId, title, description, dateValue, timeValue, repeat, stopDate, event]);++ function validate(): string | null {+ if (!agentId) return "Select an agent";+ if (!title.trim()) return "Title is required";+ if (!/^([01]\d|2[0-3]):[0-5]\d$/.test(timeValue)) {+ return "Time must be HH:MM in 24-hour format";+ }+ if (stopDate && !repeat) {+ return "Stop date requires a repeat interval";+ }+ const scheduled = combineDateTime(dateValue, timeValue);+ if (stopDate) {+ const stopEnd = new Date(stopDate);+ stopEnd.setHours(23, 59, 59, 999);+ if (stopEnd < scheduled) {+ return "Stop date must be on or after the first occurrence";+ }+ }+ return null;+ }++ const handleCreateSubmit = async (e: React.FormEvent) => {+ e.preventDefault();+ const err = validate();+ if (err) return toast.error(err);+ const scheduled = combineDateTime(dateValue, timeValue);+ const descHtml = isEmptyHtml(description) ? undefined : description;+ await onCreate?.({+ agent_id: agentId,+ title: title.trim(),+ description: descHtml,+ scheduled_at: scheduled.toISOString(),+ repeat_interval: repeat || undefined,+ repeat_stop_date: stopDate ? toYYYYMMDD(stopDate) : undefined,+ });+ };++ function buildEditPatch(): UpdateCalendarEventRequest | null {+ if (!event) return null;+ const patch: UpdateCalendarEventRequest = {};+ const scheduled = combineDateTime(dateValue, timeValue);+ const scheduledIso = scheduled.toISOString();+ const nextTitle = title.trim();+ if (nextTitle !== event.title) patch.title = nextTitle;+ const nextDesc = normalizedDescription(description);+ const prevDesc = normalizedDescription(event.description);+ if (nextDesc !== prevDesc) patch.description = nextDesc === "" ? null : nextDesc;+ if (agentId !== event.agent_id) patch.agent_id = agentId;+ if (+ scheduledIso !== new Date(event.scheduled_at).toISOString()+ ) {+ patch.scheduled_at = scheduledIso;+ }+ const prevRepeat = event.repeat_interval ?? "";+ if (repeat !== prevRepeat) {+ patch.repeat_interval = repeat === "" ? null : repeat;+ }+ const nextStop = stopDate ? toYYYYMMDD(stopDate) : null;+ const prevStop = event.repeat_stop_at+ ? toYYYYMMDD(new Date(event.repeat_stop_at))+ : null;+ if (nextStop !== prevStop) {+ patch.repeat_stop_date = nextStop;+ }+ if (+ patch.title === undefined &&+ patch.description === undefined &&+ patch.agent_id === undefined &&+ patch.scheduled_at === undefined &&+ patch.repeat_interval === undefined &&+ patch.repeat_stop_date === undefined+ ) {+ return null;+ }+ return patch;+ }++ const commitEdit = async (patch: UpdateCalendarEventRequest) => {+ if (!event) return;+ await onUpdate?.(event, patch);+ };++ const handleEditSave = async () => {+ if (!event) return;+ const err = validate();+ if (err) return toast.error(err);+ const patch = buildEditPatch();+ if (!patch) return;+ if (event.repeat_interval) {+ setScopeOpen(true);+ return;+ }+ await commitEdit(patch);+ };++ const handleScopeConfirm = async (scope: "this" | "following") => {+ const patch = buildEditPatch();+ if (!patch) {+ setScopeOpen(false);+ return;+ }+ patch.scope = scope;+ if (scope === "this" && event?.occurrence_at) {+ patch.occurrence_at = event.occurrence_at;+ }+ await commitEdit(patch);+ setScopeOpen(false);+ };++ const a11yTitle = mode === "edit"+ ? title.trim() || "Untitled event"+ : title.trim() || "New calendar event";++ const titleInput = (+ <Input+ aria-label="Event title"+ value={title}+ onChange={(e) => setTitle(e.target.value)}+ placeholder={mode === "edit" ? "Untitled event" : "New event"}+ autoFocus={mode === "create"}+ className={cn(+ "h-auto border-0 bg-transparent px-0 py-0 font-display text-3xl font-semibold leading-tight",+ "shadow-none focus-visible:border-0 focus-visible:ring-0 focus-visible:ring-offset-0",+ "placeholder:text-muted-foreground/40"+ )}+ />+ );++ const properties = (+ <div className="flex flex-col gap-1.5">+ <PropertyRow icon={<User className="size-3.5" />}>+ <select+ aria-label="Agent"+ value={agentId}+ onChange={(e) => setAgentId(e.target.value)}+ className={GHOST_SELECT}+ >+ {agents.length === 0 && <option value="">No agents</option>}+ {agents.map((a) => (+ <option key={a.id} value={a.id}>+ {a.name}+ </option>+ ))}+ </select>+ </PropertyRow>++ <PropertyRow icon={<CalendarDays className="size-3.5" />}>+ <CalendarDatePicker+ value={dateValue}+ onChange={(d) => setDateValue(d)}+ ariaLabel="Event date"+ hideIcon+ className={GHOST_CONTROL}+ />+ </PropertyRow>++ <PropertyRow+ icon={+ <CalendarTimePicker+ value={timeValue}+ onChange={setTimeValue}+ iconOnly+ ariaLabel="Pick time slot"+ className="inline-flex size-6 items-center justify-center rounded-md border-0 bg-transparent p-0 text-muted-foreground transition-colors hover:bg-accent hover:text-foreground group-hover:bg-accent group-hover:text-foreground"+ />+ }+ >+ <input+ type="text"+ inputMode="numeric"+ pattern="([01]\d|2[0-3]):[0-5]\d"+ maxLength={5}+ value={timeValue}+ onChange={(e) => setTimeValue(e.target.value)}+ placeholder="HH:MM"+ aria-label="Event time (24-hour)"+ className={TIME_INPUT}+ />+ </PropertyRow>++ <PropertyRow icon={<RepeatIcon className="size-3.5" />}>+ <select+ aria-label="Repeat"+ value={repeat}+ onChange={(e) => setRepeat(e.target.value)}+ className={GHOST_SELECT}+ >+ {REPEAT_OPTIONS.map((o) => (+ <option key={o.value} value={o.value}>+ {o.label}+ </option>+ ))}+ </select>+ </PropertyRow>++ {repeat && (+ <PropertyRow icon={<CalendarOff className="size-3.5" />}>+ <CalendarDatePicker+ value={stopDate}+ onChange={(d) => setStopDate(d)}+ placeholder="No end date"+ min={dateValue}+ ariaLabel="Stop date"+ hideIcon+ className={GHOST_CONTROL}+ />+ </PropertyRow>+ )}+ </div>+ );++ const descriptionEditor = (+ <div>+ <MarkdownEditor+ key={event?.id ?? "new"}+ value={description}+ onChange={setDescription}+ placeholder="Add a description…"+ className="markdown"+ minHeight={mode === "edit" ? "10rem" : "8rem"}+ variant="seamless"+ />+ </div>+ );++ return (+ <>+ <Sheet open={open} onOpenChange={onOpenChange}>+ <SheetContent className="data-[side=right]:inset-y-2 data-[side=right]:right-2 data-[side=right]:h-auto data-[side=right]:rounded-xl data-[side=right]:border data-[side=right]:border-l">+ <SheetTitle className="sr-only">{a11yTitle}</SheetTitle>+ {mode === "create" ? (+ <form onSubmit={handleCreateSubmit} className="flex flex-1 flex-col min-h-0">+ <SheetBody className="flex flex-col gap-6 px-8 pt-10 pb-6">+ {titleInput}+ {properties}+ {descriptionEditor}+ </SheetBody>+ <SheetFooter>+ <Button+ type="button"+ variant="outline"+ onClick={() => onOpenChange(false)}+ >+ Cancel+ </Button>+ <Button type="submit" disabled={submitting || !agents.length}>+ {submitting ? "Creating..." : "Create event"}+ </Button>+ </SheetFooter>+ </form>+ ) : (+ <>+ <SheetBody className="flex flex-col gap-6 px-8 pt-10 pb-6">+ {titleInput}+ {properties}+ {descriptionEditor}+ </SheetBody>+ <SheetFooter className="sm:justify-between">+ <Button+ variant="destructive"+ onClick={() => event && onDelete?.(event)}+ disabled={deleting || saving}+ >+ {deleting ? "Deleting..." : "Delete"}+ </Button>+ <div className="flex items-center gap-2 sm:justify-end">+ <Button+ variant="outline"+ onClick={() => onOpenChange(false)}+ disabled={saving}+ >+ Cancel+ </Button>+ <Button+ onClick={handleEditSave}+ disabled={saving || !dirty}+ >+ {saving ? "Saving..." : "Save"}+ </Button>+ </div>+ </SheetFooter>+ </>+ )}+ </SheetContent>+ </Sheet>+ <RecurringScopeDialog+ open={scopeOpen}+ onOpenChange={setScopeOpen}+ onConfirm={handleScopeConfirm}+ loading={saving}+ />+ </>+ );+}diff --git a/src/web/src/components/calendar/calendar-month-grid.test.ts b/src/web/src/components/calendar/calendar-month-grid.test.tsnew file mode 100644index 000000000..6b957b7fd--- /dev/null+++ b/src/web/src/components/calendar/calendar-month-grid.test.ts@@ -0,0 +1,177 @@+import { describe, it, expect } from "vitest";+import {+ buildMonthCells,+ agentColor,+ agentChipOutline,+ dateKey,+ sameDay,+ isTodayMonth,+ stepDate,+} from "./calendar-month-grid";++describe("buildMonthCells", () => {+ it("always returns 42 cells (six-week grid)", () => {+ for (const [y, m] of [+ [2026, 0],+ [2026, 1],+ [2026, 3],+ [2026, 11],+ [2028, 1], // leap year February+ ] as const) {+ const cells = buildMonthCells(y, m);+ expect(cells).toHaveLength(42);+ }+ });++ it("starts on Sunday of the week containing the 1st of the month", () => {+ // April 2026: April 1 is a Wednesday, so the grid should start Sunday March 29.+ const cells = buildMonthCells(2026, 3);+ expect(cells[0]!.date.getDay()).toBe(0);+ expect(cells[0]!.inMonth).toBe(false);+ // First in-month cell should be April 1 at position 3 (Sun, Mon, Tue, Wed).+ expect(cells[3]!.inMonth).toBe(true);+ expect(cells[3]!.date.getDate()).toBe(1);+ expect(cells[3]!.date.getMonth()).toBe(3);+ });++ it("marks trailing days as out-of-month", () => {+ const cells = buildMonthCells(2026, 3); // April 2026 (30 days)+ const trailing = cells.filter((c) => !c.inMonth);+ expect(trailing.length).toBeGreaterThan(0);+ // Last cell is always after the 30th in April+ const last = cells[41]!;+ expect(last.inMonth).toBe(false);+ });++ it("handles February in a leap year", () => {+ const cells = buildMonthCells(2028, 1); // Feb 2028 is a leap year+ const inMonth = cells.filter((c) => c.inMonth);+ expect(inMonth).toHaveLength(29);+ });++ it("handles February in a non-leap year", () => {+ const cells = buildMonthCells(2026, 1); // Feb 2026+ const inMonth = cells.filter((c) => c.inMonth);+ expect(inMonth).toHaveLength(28);+ });+});++describe("agentColor", () => {+ it("returns a stable class string for the same agent id", () => {+ const a = agentColor("ag_1");+ const b = agentColor("ag_1");+ expect(a).toBe(b);+ });++ it("returns different classes for sufficiently different ids", () => {+ const classes = new Set([+ agentColor("ag_a"),+ agentColor("ag_bbb"),+ agentColor("ag_zzz"),+ agentColor("ag_1234567"),+ ]);+ expect(classes.size).toBeGreaterThan(1);+ });++ it("first space-separated token is a bg- class (agent filter dot regression)", () => {+ expect(agentColor("ag_1").split(" ")[0]).toMatch(/^bg-/);+ });+});++describe("agentChipOutline", () => {+ it("is deterministic for the same id", () => {+ expect(agentChipOutline("ag_1")).toBe(agentChipOutline("ag_1"));+ });++ it("cycles through the palette", () => {+ const set = new Set([+ agentChipOutline("ag_a"),+ agentChipOutline("ag_bbb"),+ agentChipOutline("ag_zzz"),+ agentChipOutline("ag_1234567"),+ ]);+ expect(set.size).toBeGreaterThan(1);+ });++ it("returns a class string containing border-, bg-transparent, and hover:bg-", () => {+ const cls = agentChipOutline("ag_1");+ expect(cls).toMatch(/border-/);+ expect(cls).toContain("bg-transparent");+ expect(cls).toMatch(/hover:bg-/);+ });+});++describe("dateKey", () => {+ it("formats to YYYY-MM-DD with zero-padding", () => {+ expect(dateKey(new Date(2026, 0, 5))).toBe("2026-01-05");+ expect(dateKey(new Date(2026, 11, 31))).toBe("2026-12-31");+ });+});++describe("sameDay", () => {+ it("ignores time-of-day", () => {+ const a = new Date(2026, 3, 17, 9, 0);+ const b = new Date(2026, 3, 17, 23, 59);+ expect(sameDay(a, b)).toBe(true);+ });+ it("false for different days", () => {+ expect(+ sameDay(new Date(2026, 3, 17), new Date(2026, 3, 18))+ ).toBe(false);+ });+});++describe("isTodayMonth", () => {+ it("true when year+month match the reference", () => {+ const ref = new Date(2026, 3, 17);+ expect(isTodayMonth(2026, 3, ref)).toBe(true);+ });+ it("false when year or month differ", () => {+ const ref = new Date(2026, 3, 17);+ expect(isTodayMonth(2026, 4, ref)).toBe(false);+ expect(isTodayMonth(2025, 3, ref)).toBe(false);+ });+});++describe("stepDate", () => {+ const base = new Date(2026, 3, 17); // Fri Apr 17 2026++ it("ArrowRight → +1 day", () => {+ expect(dateKey(stepDate(base, "ArrowRight")!)).toBe("2026-04-18");+ });+ it("ArrowLeft → -1 day", () => {+ expect(dateKey(stepDate(base, "ArrowLeft")!)).toBe("2026-04-16");+ });+ it("ArrowDown → +7 days", () => {+ expect(dateKey(stepDate(base, "ArrowDown")!)).toBe("2026-04-24");+ });+ it("ArrowUp → -7 days", () => {+ expect(dateKey(stepDate(base, "ArrowUp")!)).toBe("2026-04-10");+ });+ it("Home snaps to Sunday of the same week", () => {+ // Fri Apr 17 2026 → Sun Apr 12+ expect(dateKey(stepDate(base, "Home")!)).toBe("2026-04-12");+ });+ it("End snaps to Saturday of the same week", () => {+ expect(dateKey(stepDate(base, "End")!)).toBe("2026-04-18");+ });+ it("PageDown → next month, clamps day", () => {+ // Jan 31 + PageDown → Feb 28 (2026 not leap)+ const jan31 = new Date(2026, 0, 31);+ expect(dateKey(stepDate(jan31, "PageDown")!)).toBe("2026-02-28");+ });+ it("PageUp → previous month, clamps day", () => {+ // Mar 31 - PageUp → Feb 28+ const mar31 = new Date(2026, 2, 31);+ expect(dateKey(stepDate(mar31, "PageUp")!)).toBe("2026-02-28");+ });+ it("returns null for unrecognized keys", () => {+ expect(stepDate(base, "x")).toBeNull();+ expect(stepDate(base, "Escape")).toBeNull();+ expect(stepDate(base, " ")).toBeNull();+ });+ it("crosses month boundary: Apr 30 + ArrowRight → May 1", () => {+ const apr30 = new Date(2026, 3, 30);+ expect(dateKey(stepDate(apr30, "ArrowRight")!)).toBe("2026-05-01");+ });+});diff --git a/src/web/src/components/calendar/calendar-month-grid.tsx b/src/web/src/components/calendar/calendar-month-grid.tsxnew file mode 100644index 000000000..bcb9b1b97--- /dev/null+++ b/src/web/src/components/calendar/calendar-month-grid.tsx@@ -0,0 +1,332 @@+"use client";++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 { 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 agentChipOutline(agentId: string): string {+ const palette = [+ "border-[oklch(0.55_0.12_60)] text-[oklch(0.35_0.09_60)] bg-transparent hover:bg-[oklch(0.95_0.03_60)] dark:text-[oklch(0.82_0.08_60)] dark:hover:bg-[oklch(0.25_0.03_60)]",+ "border-[oklch(0.55_0.11_120)] text-[oklch(0.35_0.09_120)] bg-transparent hover:bg-[oklch(0.95_0.03_120)] dark:text-[oklch(0.82_0.08_120)] dark:hover:bg-[oklch(0.25_0.03_120)]",+ "border-[oklch(0.55_0.11_220)] text-[oklch(0.35_0.09_220)] bg-transparent hover:bg-[oklch(0.95_0.03_220)] dark:text-[oklch(0.82_0.08_220)] dark:hover:bg-[oklch(0.25_0.03_220)]",+ "border-[oklch(0.55_0.12_30)] text-[oklch(0.35_0.09_30)] bg-transparent hover:bg-[oklch(0.95_0.03_30)] dark:text-[oklch(0.82_0.08_30)] dark:hover:bg-[oklch(0.25_0.03_30)]",+ "border-[oklch(0.55_0.11_280)] text-[oklch(0.35_0.09_280)] bg-transparent hover:bg-[oklch(0.95_0.03_280)] dark:text-[oklch(0.82_0.08_280)] dark:hover:bg-[oklch(0.25_0.03_280)]",+ "border-[oklch(0.55_0.11_160)] text-[oklch(0.35_0.09_160)] bg-transparent hover:bg-[oklch(0.95_0.03_160)] dark:text-[oklch(0.82_0.08_160)] dark:hover:bg-[oklch(0.25_0.03_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 buildMonthCells(year: number, month: number): { date: Date; inMonth: boolean }[] {+ const first = new Date(year, month, 1);+ const startDow = first.getDay();+ const cells: { date: Date; inMonth: boolean }[] = [];+ for (let i = 0; i < 42; i++) {+ const d = new Date(year, month, 1 - startDow + i);+ cells.push({ date: d, inMonth: d.getMonth() === month });+ }+ return cells;+}++export function dateKey(d: Date): string {+ const y = d.getFullYear();+ const m = String(d.getMonth() + 1).padStart(2, "0");+ const day = String(d.getDate()).padStart(2, "0");+ return `${y}-${m}-${day}`;+}++export function sameDay(a: Date, b: Date): boolean {+ return (+ a.getFullYear() === b.getFullYear() &&+ a.getMonth() === b.getMonth() &&+ a.getDate() === b.getDate()+ );+}++export function isTodayMonth(year: number, month: number, ref: Date = new Date()): boolean {+ return ref.getFullYear() === year && ref.getMonth() === month;+}++/** Returns the new focused date when the given keyboard key is pressed. */+export function stepDate(+ date: Date,+ key: string+): Date | null {+ const d = new Date(date.getFullYear(), date.getMonth(), date.getDate());+ switch (key) {+ case "ArrowLeft":+ d.setDate(d.getDate() - 1);+ return d;+ case "ArrowRight":+ d.setDate(d.getDate() + 1);+ return d;+ case "ArrowUp":+ d.setDate(d.getDate() - 7);+ return d;+ case "ArrowDown":+ d.setDate(d.getDate() + 7);+ return d;+ case "Home":+ d.setDate(d.getDate() - d.getDay()); // snap to Sunday+ return d;+ case "End":+ d.setDate(d.getDate() + (6 - d.getDay())); // snap to Saturday+ return d;+ case "PageUp": {+ const targetYear = d.getMonth() === 0 ? d.getFullYear() - 1 : d.getFullYear();+ const targetMonth = (d.getMonth() - 1 + 12) % 12;+ const lastDay = new Date(targetYear, targetMonth + 1, 0).getDate();+ d.setFullYear(targetYear, targetMonth, Math.min(d.getDate(), lastDay));+ return d;+ }+ case "PageDown": {+ const targetYear = d.getMonth() === 11 ? d.getFullYear() + 1 : d.getFullYear();+ const targetMonth = (d.getMonth() + 1) % 12;+ const lastDay = new Date(targetYear, targetMonth + 1, 0).getDate();+ d.setFullYear(targetYear, targetMonth, Math.min(d.getDate(), lastDay));+ return d;+ }+ default:+ return null;+ }+}++export interface CalendarMonthGridProps {+ year: number;+ month: number; // 0-indexed+ events: CalendarEvent[];+ agents: Agent[];+ loading: boolean;+ focusedDate: Date;+ openPopoverKey: string | null;+ onPopoverChange: (key: string | null) => void;+ onPrev: () => void;+ onNext: () => void;+ onJumpToToday: () => void;+ onJumpToDate: (date: Date) => void;+ onSelectDay: (date: Date) => void;+ onSelectEvent: (event: CalendarEvent) => void;+ headerExtras?: React.ReactNode;+}++export function CalendarMonthGrid({+ year,+ month,+ events,+ agents,+ loading,+ focusedDate,+ openPopoverKey,+ onPopoverChange,+ onPrev,+ onNext,+ onJumpToToday,+ onJumpToDate,+ onSelectDay,+ onSelectEvent,+ headerExtras,+}: CalendarMonthGridProps) {+ const cells = buildMonthCells(year, month);+ const monthLabel = new Date(year, month, 1).toLocaleDateString(undefined, {+ month: "long",+ year: "numeric",+ });++ const eventsByDay = new Map<string, CalendarEvent[]>();+ for (const ev of events) {+ const key = dateKey(new Date(ev.scheduled_at));+ if (!eventsByDay.has(key)) eventsByDay.set(key, []);+ eventsByDay.get(key)!.push(ev);+ }++ const agentNameById = new Map<string, string>();+ for (const a of agents) agentNameById.set(a.id, a.name);++ const today = new Date();+ const todayDisabled = isTodayMonth(year, month, today);++ return (+ <div className="flex flex-col gap-3">+ <div className="flex items-center justify-between flex-wrap gap-2">+ <div className="flex items-center gap-2">+ <h2 className="text-sm font-medium tabular-nums">{monthLabel}</h2>+ </div>+ <div className="flex items-center gap-2">+ {headerExtras}+ <div className="flex items-center gap-1">+ <button+ type="button"+ aria-label="Previous month"+ onClick={onPrev}+ 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={todayDisabled}+ className="h-7 px-2.5 text-xs"+ >+ Today+ </Button>+ <button+ type="button"+ aria-label="Next month"+ onClick={onNext}+ 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="grid grid-cols-7 text-[11px] text-muted-foreground">+ {["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"].map((d) => (+ <div key={d} className="px-2 py-1 font-medium">+ {d}+ </div>+ ))}+ </div>++ <div className="relative">+ {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={`Calendar ${monthLabel}`}+ aria-busy={loading || undefined}+ className={cn(+ "grid grid-cols-7 gap-px rounded-lg border border-border/50 bg-border/40 overflow-hidden transition-opacity",+ loading && "opacity-70"+ )}+ data-testid="calendar-month-grid"+ >+ {cells.map((cell, i) => {+ const key = dateKey(cell.date);+ const dayEvents = eventsByDay.get(key) ?? [];+ const isToday = sameDay(today, cell.date);+ const isFocused = sameDay(focusedDate, cell.date);+ const hiddenCount = Math.max(0, dayEvents.length - 3);++ return (+ <div+ role="gridcell"+ key={i}+ data-date={key}+ data-focused={isFocused ? "true" : undefined}+ aria-current={isToday ? "date" : undefined}+ tabIndex={isFocused ? 0 : -1}+ onClick={() => onSelectDay(cell.date)}+ onKeyDown={(e) => {+ // Enter/Space on the cell opens the create dialog when no+ // popover trigger is present; the overflow popover owns Enter+ // if the day has hidden events (handled by the trigger itself).+ if ((e.key === "Enter" || e.key === " ") && e.target === e.currentTarget) {+ e.preventDefault();+ onSelectDay(cell.date);+ }+ }}+ className={cn(+ "group flex min-h-24 flex-col gap-1 p-2 text-left transition-colors bg-background outline-none cursor-pointer",+ !cell.inMonth && "bg-muted/40 text-muted-foreground",+ isFocused &&+ "ring-2 ring-inset ring-ring/60 relative z-10"+ )}+ >+ <div className="flex items-center justify-between">+ <span+ className={cn(+ "text-[11px] tabular-nums",+ isToday &&+ "flex size-5 items-center justify-center rounded-full bg-foreground text-background font-medium"+ )}+ >+ {cell.date.getDate()}+ </span>+ </div>+ <div className="flex flex-col gap-1">+ {dayEvents.slice(0, 3).map((ev) => (+ <span+ key={`${ev.id}@${ev.occurrence_at}`}+ role="button"+ tabIndex={-1}+ onClick={(e) => {+ e.stopPropagation();+ onSelectEvent(ev);+ }}+ onKeyDown={(e) => {+ if (e.key === "Enter" || e.key === " ") {+ e.stopPropagation();+ onSelectEvent(ev);+ }+ }}+ className={cn(+ "border truncate rounded-sm px-1.5 py-0.5 text-[10px] font-medium transition-colors",+ agentChipOutline(ev.agent_id)+ )}+ title={`${ev.title}${+ agentNameById.get(ev.agent_id)+ ? ` — ${agentNameById.get(ev.agent_id)}`+ : ""+ }`}+ >+ {ev.title}+ </span>+ ))}+ {hiddenCount > 0 && (+ <CalendarDayPopover+ date={cell.date}+ hiddenCount={hiddenCount}+ events={dayEvents}+ agents={agents}+ open={openPopoverKey === key}+ onOpenChange={(o) => onPopoverChange(o ? key : null)}+ onSelectEvent={onSelectEvent}+ />+ )}+ </div>+ </div>+ );+ })}+ </div>+ </div>+ </div>+ );+}++export { agentColor, agentChipOutline };diff --git a/src/web/src/components/calendar/calendar-time-picker.tsx b/src/web/src/components/calendar/calendar-time-picker.tsxnew file mode 100644index 000000000..d9f1794b5--- /dev/null+++ b/src/web/src/components/calendar/calendar-time-picker.tsx@@ -0,0 +1,118 @@+"use client";++import { useEffect, useRef, useState } from "react";+import { Clock } from "lucide-react";+import {+ Popover,+ PopoverTrigger,+ PopoverContent,+} from "@/components/ui/popover";+import { cn } from "@/lib/utils";++export interface CalendarTimePickerProps {+ /** Value as "HH:MM" (24h). */+ value: string;+ onChange: (value: string) => void;+ className?: string;+ ariaLabel?: string;+ /** Minute step for the scrollable list. Default 30. */+ step?: number;+ /** Render only the clock icon as the trigger (no time label). */+ iconOnly?: boolean;+}++function pad(n: number) {+ return String(n).padStart(2, "0");+}++/** Return the time as 24-hour "HH:MM". */+function formatTimeDisplay(hhmm: string): string {+ const match = /^(\d{2}):(\d{2})$/.exec(hhmm);+ if (!match) return hhmm;+ return `${match[1]}:${match[2]}`;+}++function buildSlots(step: number): string[] {+ const slots: string[] = [];+ for (let mins = 0; mins < 24 * 60; mins += step) {+ slots.push(`${pad(Math.floor(mins / 60))}:${pad(mins % 60)}`);+ }+ return slots;+}++export function CalendarTimePicker({+ value,+ onChange,+ className,+ ariaLabel = "Pick a time",+ step = 30,+ iconOnly = false,+}: CalendarTimePickerProps) {+ const [open, setOpen] = useState(false);+ const listRef = useRef<HTMLDivElement | null>(null);+ const slots = buildSlots(step);++ // Scroll the selected slot into view when the popover opens.+ useEffect(() => {+ if (!open) return;+ const id = setTimeout(() => {+ const el = listRef.current?.querySelector<HTMLElement>(+ `[data-selected="true"]`+ );+ el?.scrollIntoView({ block: "center" });+ }, 0);+ return () => clearTimeout(id);+ }, [open]);++ return (+ <Popover open={open} onOpenChange={setOpen}>+ <PopoverTrigger+ aria-label={ariaLabel}+ className={cn(+ iconOnly+ ? "inline-flex size-8 shrink-0 items-center justify-center rounded-lg border border-input bg-transparent text-muted-foreground outline-none transition-colors hover:bg-accent hover:text-foreground focus-visible:border-ring focus-visible:ring-3 focus-visible:ring-ring/50"+ : "flex h-7 items-center gap-1.5 rounded-md border border-input bg-transparent px-2 text-xs text-foreground outline-none transition-colors hover:bg-accent hover:text-foreground focus-visible:border-ring focus-visible:ring-3 focus-visible:ring-ring/50",+ className+ )}+ >+ <Clock className={iconOnly ? "size-3.5" : "size-3.5 opacity-70"} />+ {!iconOnly && (+ <span className="tabular-nums">{formatTimeDisplay(value)}</span>+ )}+ </PopoverTrigger>+ <PopoverContent align="start" className="w-36 p-1">+ <div+ ref={listRef}+ className="flex max-h-60 flex-col overflow-y-auto scrollbar-none"+ role="listbox"+ >+ {slots.map((slot) => {+ const selected = slot === value;+ return (+ <button+ key={slot}+ type="button"+ role="option"+ aria-selected={selected}+ data-selected={selected}+ onClick={() => {+ onChange(slot);+ setOpen(false);+ }}+ className={cn(+ "flex h-7 shrink-0 items-center rounded px-2 text-[11px] tabular-nums transition-colors outline-none",+ "focus-visible:bg-accent",+ selected+ ? "bg-foreground text-background font-medium"+ : "text-foreground hover:bg-accent"+ )}+ >+ {formatTimeDisplay(slot)}+ </button>+ );+ })}+ </div>+ </PopoverContent>+ </Popover>+ );+}diff --git a/src/web/src/components/calendar/calendar-view-switcher.test.ts b/src/web/src/components/calendar/calendar-view-switcher.test.tsnew file mode 100644index 000000000..a97b7c463--- /dev/null+++ b/src/web/src/components/calendar/calendar-view-switcher.test.ts@@ -0,0 +1,20 @@+import { describe, it, expect } from "vitest";+import { parseCalendarView } from "./calendar-view-switcher";++describe("parseCalendarView", () => {+ it("returns 'month' for null/undefined/empty", () => {+ expect(parseCalendarView(null)).toBe("month");+ expect(parseCalendarView(undefined)).toBe("month");+ expect(parseCalendarView("")).toBe("month");+ });++ it("returns 'agenda' when explicitly set", () => {+ expect(parseCalendarView("agenda")).toBe("agenda");+ });++ it("clamps unknown values to 'month'", () => {+ expect(parseCalendarView("week")).toBe("month");+ expect(parseCalendarView("bogus")).toBe("month");+ expect(parseCalendarView("MONTH")).toBe("month");+ });+});diff --git a/src/web/src/components/calendar/calendar-view-switcher.tsx b/src/web/src/components/calendar/calendar-view-switcher.tsxnew file mode 100644index 000000000..1d5e94317--- /dev/null+++ b/src/web/src/components/calendar/calendar-view-switcher.tsx@@ -0,0 +1,45 @@+"use client";++import { cn } from "@/lib/utils";++export type CalendarView = "month" | "agenda";++export function parseCalendarView(raw: string | null | undefined): CalendarView {+ return raw === "agenda" ? "agenda" : "month";+}++export interface CalendarViewSwitcherProps {+ view: CalendarView;+ onChange: (view: CalendarView) => void;+}++export function CalendarViewSwitcher({ view, onChange }: CalendarViewSwitcherProps) {+ return (+ <div+ role="radiogroup"+ aria-label="Calendar view"+ className="inline-flex items-center rounded-md border border-border bg-background p-0.5"+ >+ {(["month", "agenda"] as const).map((v) => {+ const active = view === v;+ return (+ <button+ key={v}+ type="button"+ role="radio"+ aria-checked={active}+ onClick={() => onChange(v)}+ className={cn(+ "h-6 px-2.5 rounded text-xs font-medium transition-colors capitalize",+ active+ ? "bg-foreground text-background"+ : "text-muted-foreground hover:text-foreground"+ )}+ >+ {v}+ </button>+ );+ })}+ </div>+ );+}diff --git a/src/web/src/components/calendar/keyboard.test.ts b/src/web/src/components/calendar/keyboard.test.tsnew file mode 100644index 000000000..1b7e5ee75--- /dev/null+++ b/src/web/src/components/calendar/keyboard.test.ts@@ -0,0 +1,32 @@+import { describe, it, expect } from "vitest";+import { isTypingTarget } from "./keyboard";++function mkEl(tag: string, contentEditable = false): HTMLElement {+ return {+ tagName: tag.toUpperCase(),+ isContentEditable: contentEditable,+ } as unknown as HTMLElement;+}++describe("isTypingTarget", () => {+ it("true for INPUT / TEXTAREA / SELECT", () => {+ expect(isTypingTarget(mkEl("input"))).toBe(true);+ expect(isTypingTarget(mkEl("textarea"))).toBe(true);+ expect(isTypingTarget(mkEl("select"))).toBe(true);+ });++ it("true for contenteditable elements", () => {+ expect(isTypingTarget(mkEl("div", true))).toBe(true);+ });++ it("false for buttons, divs, spans without contenteditable", () => {+ expect(isTypingTarget(mkEl("button"))).toBe(false);+ expect(isTypingTarget(mkEl("div"))).toBe(false);+ expect(isTypingTarget(mkEl("span"))).toBe(false);+ });++ it("false for null / missing target", () => {+ expect(isTypingTarget(null)).toBe(false);+ expect(isTypingTarget({} as unknown as EventTarget)).toBe(false);+ });+});diff --git a/src/web/src/components/calendar/keyboard.ts b/src/web/src/components/calendar/keyboard.tsnew file mode 100644index 000000000..d05e92fe1--- /dev/null+++ b/src/web/src/components/calendar/keyboard.ts@@ -0,0 +1,9 @@+/** Inputs/textareas/contenteditable should not trigger page-level shortcuts. */+export function isTypingTarget(target: EventTarget | null): boolean {+ if (!target || typeof (target as Element).tagName !== "string") return false;+ const el = target as HTMLElement;+ const tag = el.tagName;+ if (tag === "INPUT" || tag === "TEXTAREA" || tag === "SELECT") return true;+ if (el.isContentEditable) return true;+ return false;+}diff --git a/src/web/src/components/ui/markdown-editor.tsx b/src/web/src/components/ui/markdown-editor.tsxnew file mode 100644index 000000000..2fc9784bb--- /dev/null+++ b/src/web/src/components/ui/markdown-editor.tsx@@ -0,0 +1,84 @@+"use client";++import { useEffect } from "react";+import { useEditor, EditorContent } from "@tiptap/react";+import StarterKit from "@tiptap/starter-kit";+import Placeholder from "@tiptap/extension-placeholder";+import { cn } from "@/lib/utils";+import { isEmptyHtml } from "@alook/shared";++export { isEmptyHtml };++export interface MarkdownEditorProps {+ value: string;+ onChange: (html: string) => void;+ placeholder?: string;+ className?: string;+ minHeight?: number | string;+ autoFocus?: boolean;+ /** `default` is framed (border + focus ring); `seamless` blends with the parent. */+ variant?: "default" | "seamless";+}++function normalize(html: string | null | undefined): string {+ if (!html) return "";+ return isEmptyHtml(html) ? "" : html.trim();+}++export function MarkdownEditor({+ value,+ onChange,+ placeholder,+ className,+ minHeight = "9rem",+ autoFocus,+ variant = "default",+}: MarkdownEditorProps) {+ const minHeightStyle =+ typeof minHeight === "number" ? `${minHeight}px` : minHeight;++ const innerClass =+ variant === "seamless"+ ? "markdown text-sm max-w-none focus:outline-none px-0 py-1"+ : "markdown text-sm max-w-none focus:outline-none px-3 py-2";++ const editor = useEditor({+ immediatelyRender: false,+ content: value || undefined,+ extensions: [+ StarterKit,+ Placeholder.configure({ placeholder: placeholder ?? "" }),+ ],+ editorProps: {+ attributes: {+ class: innerClass,+ style: `min-height: ${minHeightStyle}`,+ },+ },+ autofocus: autoFocus ? "end" : false,+ onUpdate: ({ editor }) => {+ onChange(editor.getHTML());+ },+ });++ useEffect(() => {+ if (!editor) return;+ const incoming = normalize(value);+ const current = normalize(editor.getHTML());+ if (incoming === current) return;+ editor.commands.setContent(value || "", { emitUpdate: false });+ // Only react to value changes, not editor identity.+ // eslint-disable-next-line react-hooks/exhaustive-deps+ }, [value, editor]);++ const containerClass =+ variant === "seamless"+ ? "w-full bg-transparent text-sm"+ : "w-full rounded-md border border-input bg-transparent text-sm transition-[color,box-shadow] focus-within:border-ring focus-within:ring-3 focus-within:ring-ring/50";++ return (+ <div className={cn(containerClass, className)}>+ <EditorContent editor={editor} />+ </div>+ );+}diff --git a/src/web/src/components/ui/popover.tsx b/src/web/src/components/ui/popover.tsxnew file mode 100644index 000000000..8e99c6576--- /dev/null+++ b/src/web/src/components/ui/popover.tsx@@ -0,0 +1,56 @@+"use client"++import * as React from "react"+import { Popover as PopoverPrimitive } from "@base-ui/react/popover"++import { cn } from "@/lib/utils"++function Popover({ ...props }: PopoverPrimitive.Root.Props) {+ return <PopoverPrimitive.Root data-slot="popover" {...props} />+}++function PopoverTrigger({ ...props }: PopoverPrimitive.Trigger.Props) {+ return <PopoverPrimitive.Trigger data-slot="popover-trigger" {...props} />+}++function PopoverContent({+ className,+ children,+ sideOffset = 6,+ align = "start",+ ...props+}: PopoverPrimitive.Popup.Props & {+ sideOffset?: number+ align?: "start" | "center" | "end"+}) {+ // Always portal to document.body so popovers escape parent portals+ // (e.g. Sheet/Dialog). Without this, base-ui's FloatingPortal falls back to+ // the nearest parentPortalNode, which inherits the Sheet's width constraint+ // and causes the popover to render inline inside the Sheet.+ const container =+ typeof document !== "undefined" ? document.body : null+ return (+ <PopoverPrimitive.Portal container={container}>+ <PopoverPrimitive.Positioner+ sideOffset={sideOffset}+ align={align}+ style={{ zIndex: 60 }}+ >+ <PopoverPrimitive.Popup+ data-slot="popover-content"+ className={cn(+ "w-72 origin-[var(--transform-origin)] rounded-lg border bg-popover p-2 text-popover-foreground shadow-md outline-none",+ "data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95",+ "data-closed:animate-out data-closed:fade-out-0 data-closed:zoom-out-95",+ className+ )}+ {...props}+ >+ {children}+ </PopoverPrimitive.Popup>+ </PopoverPrimitive.Positioner>+ </PopoverPrimitive.Portal>+ )+}++export { Popover, PopoverTrigger, PopoverContent }diff --git a/src/web/src/lib/api.ts b/src/web/src/lib/api.tsindex 76bd5490c..d4513591d 100644--- a/src/web/src/lib/api.ts+++ b/src/web/src/lib/api.ts@@ -1,8 +1,11 @@import type {Agent,AgentRuntime,+ CalendarEvent,Conversation,CreateAgentRequest,+ CreateCalendarEventRequest,+ UpdateCalendarEventRequest,UpdateAgentRequest,Email,LoginResponse,@@ -236,6 +239,42 @@ export const sendEmail = (body: JSON.stringify({ agentId, to, subject, htmlBody, attachments }),});+// Calendar events+export const listCalendarEvents = (+ workspaceId: string,+ opts?: { agentId?: string; from?: string; to?: string }+) => {+ const extra: Record<string, string> = {};+ if (opts?.agentId) extra.agentId = opts.agentId;+ if (opts?.from) extra.from = opts.from;+ if (opts?.to) extra.to = opts.to;+ return apiFetch<CalendarEvent[]>(`/api/calendar${wsQuery(workspaceId, extra)}`);+};++export const createCalendarEvent = (+ req: CreateCalendarEventRequest,+ workspaceId: string+) =>+ apiFetch<CalendarEvent>(`/api/calendar${wsQuery(workspaceId)}`, {+ method: "POST",+ body: JSON.stringify(req),+ });++export const updateCalendarEvent = (+ id: string,+ patch: UpdateCalendarEventRequest,+ workspaceId: string+) =>+ apiFetch<CalendarEvent>(`/api/calendar/${id}${wsQuery(workspaceId)}`, {+ method: "PATCH",+ body: JSON.stringify(patch),+ });++export const deleteCalendarEvent = (id: string, workspaceId: string) =>+ apiFetch<CalendarEvent>(`/api/calendar/${id}${wsQuery(workspaceId)}`, {+ method: "DELETE",+ });+// Auth (Better Auth — redirect helpers only, actual auth via Better Auth client)export const signOut = async () => {if (typeof window !== "undefined") {diff --git a/src/web/src/lib/api/responses.test.ts b/src/web/src/lib/api/responses.test.tsindex d7ea4514a..9054ed20a 100644--- a/src/web/src/lib/api/responses.test.ts+++ b/src/web/src/lib/api/responses.test.ts@@ -9,6 +9,7 @@ import {runtimeToResponse,machineTokenToResponse,emailToResponse,+ calendarEventToResponse,} from "./responses";const ts = new Date("2024-06-01T12:00:00.456Z");@@ -337,9 +338,21 @@ describe("AgentResponse shape", () => {});describe("ConversationResponse shape", () => {- it("has expected keys: id, agent_id, title, created_at", () => {+ it("has expected keys: id, agent_id, title, type, created_at", () => {+ const res = conversationToResponse({ id: "c1", agentId: "a1", title: "Chat", type: "user_dm_message", createdAt: ts });+ expect(Object.keys(res).sort()).toEqual(["agent_id", "created_at", "id", "title", "type"]);+ });++ it("defaults type to user_dm_message when the column is absent", () => {const res = conversationToResponse({ id: "c1", agentId: "a1", title: "Chat", createdAt: ts });- expect(Object.keys(res).sort()).toEqual(["agent_id", "created_at", "id", "title"]);+ expect((res as { type: string }).type).toBe("user_dm_message");+ });++ it("surfaces email_notification and calendar_event types", () => {+ const r1 = conversationToResponse({ id: "c1", agentId: "a1", title: "", type: "email_notification", createdAt: ts });+ const r2 = conversationToResponse({ id: "c2", agentId: "a1", title: "", type: "calendar_event", createdAt: ts });+ expect((r1 as { type: string }).type).toBe("email_notification");+ expect((r2 as { type: string }).type).toBe("calendar_event");});});@@ -420,6 +433,36 @@ describe("all response mappers strip milliseconds from timestamps", () => {});});+describe("calendarEventToResponse", () => {+ const base = {+ id: "ce_1",+ agentId: "ag_1",+ workspaceId: "ws_1",+ title: "standup",+ scheduledAt: ts,+ repeatInterval: null,+ repeatStopAt: null,+ lastTriggeredAt: null,+ createdAt: ts,+ updatedAt: ts,+ };++ it("maps description when present", () => {+ const res = calendarEventToResponse({ ...base, description: "<p>hi</p>" });+ expect(res.description).toBe("<p>hi</p>");+ });++ it("defaults description to null when the column is null", () => {+ const res = calendarEventToResponse({ ...base, description: null });+ expect(res.description).toBeNull();+ });++ it("defaults description to null when the column is absent", () => {+ const res = calendarEventToResponse(base);+ expect(res.description).toBeNull();+ });+});+describe("emailToResponse", () => {it("maps DB fields to API response format", () => {const res = emailToResponse({diff --git a/src/web/src/lib/api/responses.ts b/src/web/src/lib/api/responses.tsindex a52e128f7..c6b62c6e9 100644--- a/src/web/src/lib/api/responses.ts+++ b/src/web/src/lib/api/responses.ts@@ -2,7 +2,7 @@ import {formatTimestamp,formatTimestampNullable,} from "@/lib/middleware/helpers";-import { TaskApiBaseSchema, isOnline } from "@alook/shared";+import { TaskApiBaseSchema, isOnline, TASK_TYPES } from "@alook/shared";/* eslint-disable @typescript-eslint/no-explicit-any */@@ -88,7 +88,7 @@ export function taskToResponse(t: {conversation_id: t.conversationId,workspace_id: t.workspaceId,prompt: t.prompt,- type: t.type ?? "user_dm_message",+ type: t.type ?? TASK_TYPES.USER_DM_MESSAGE,status: t.status,priority: t.priority,dispatched_at: formatTimestampNullable(t.dispatchedAt),@@ -105,6 +105,7 @@ export function conversationToResponse(c: any) {id: c.id,agent_id: c.agentId,title: c.title,+ type: c.type ?? TASK_TYPES.USER_DM_MESSAGE,created_at: formatTimestamp(c.createdAt),};if (c.messageCount !== undefined) {@@ -170,3 +171,22 @@ export function machineTokenToResponse(mt: any) {created_at: formatTimestamp(mt.createdAt),};}++export function calendarEventToResponse(e: any) {+ const scheduled = formatTimestamp(e.scheduledAt);+ const occurrence = e.occurrenceAt ? formatTimestamp(e.occurrenceAt) : scheduled;+ return {+ id: e.id,+ agent_id: e.agentId,+ workspace_id: e.workspaceId,+ title: e.title,+ description: e.description ?? null,+ scheduled_at: scheduled,+ occurrence_at: occurrence,+ repeat_interval: e.repeatInterval ?? null,+ repeat_stop_at: formatTimestampNullable(e.repeatStopAt),+ last_triggered_at: formatTimestampNullable(e.lastTriggeredAt),+ created_at: formatTimestamp(e.createdAt),+ updated_at: formatTimestamp(e.updatedAt),+ };+}diff --git a/src/web/src/lib/services/calendar.test.ts b/src/web/src/lib/services/calendar.test.tsnew file mode 100644index 000000000..c58bed723--- /dev/null+++ b/src/web/src/lib/services/calendar.test.ts@@ -0,0 +1,297 @@+import { describe, it, expect, vi, beforeEach } from "vitest";++vi.mock("@/lib/logger", () => ({+ log: {+ info: vi.fn(),+ warn: vi.fn(),+ error: vi.fn(),+ debug: vi.fn(),+ },+}));++const mockListDue = vi.fn();+const mockClaim = vi.fn();+const mockRevert = vi.fn();+const mockUpdateSchedule = vi.fn();+const mockGetAgent = vi.fn();+const mockCreateConv = vi.fn();+const mockCreateTask = vi.fn();++vi.mock("@alook/shared", async () => {+ const actual = await vi.importActual<typeof import("@alook/shared")>("@alook/shared");+ return {+ ...actual,+ queries: {+ agent: { getAgent: (...args: unknown[]) => mockGetAgent(...args) },+ conversation: {+ createConversation: (...args: unknown[]) => mockCreateConv(...args),+ },+ task: { createTask: (...args: unknown[]) => mockCreateTask(...args) },+ calendarEvent: {+ listDueCalendarEvents: (...args: unknown[]) => mockListDue(...args),+ claimCalendarEvent: (...args: unknown[]) => mockClaim(...args),+ revertCalendarEventClaim: (...args: unknown[]) => mockRevert(...args),+ updateCalendarEventSchedule: (...args: unknown[]) =>+ mockUpdateSchedule(...args),+ computeNextScheduledAt: actual.queries.calendarEvent+ .computeNextScheduledAt,+ },+ },+ };+});++import {+ promoteDueCalendarEventsForWorkspace,+ repeatStopDateToStopAt,+} from "./calendar";++const fakeDb = {} as never;++function mkEvent(over?: Partial<Record<string, unknown>>) {+ return {+ id: "ce_1",+ agentId: "ag_1",+ workspaceId: "ws_1",+ title: "Run standup",+ scheduledAt: "2026-04-17T09:00:00.000Z",+ repeatInterval: null,+ repeatStopAt: null,+ lastTriggeredAt: null,+ createdAt: "2026-04-10T00:00:00.000Z",+ updatedAt: "2026-04-10T00:00:00.000Z",+ ...over,+ };+}++beforeEach(() => {+ vi.clearAllMocks();+});++describe("promoteDueCalendarEventsForWorkspace", () => {+ it("promotes a due event: claim succeeds → conversation + task created", async () => {+ mockListDue.mockResolvedValue([mkEvent()]);+ mockGetAgent.mockResolvedValue({+ id: "ag_1",+ workspaceId: "ws_1",+ runtimeId: "rt_1",+ ownerId: "u_1",+ });+ mockClaim.mockResolvedValue({ id: "ce_1" });+ mockCreateConv.mockResolvedValue({ id: "cv_1" });+ mockCreateTask.mockResolvedValue({ id: "t_1" });++ const enqueued = await promoteDueCalendarEventsForWorkspace(+ fakeDb,+ "ws_1",+ "2026-04-17T09:05:00.000Z"+ );++ expect(enqueued).toBe(1);+ expect(mockCreateConv).toHaveBeenCalledTimes(1);+ expect(mockCreateConv.mock.calls[0][1]).toMatchObject({+ workspaceId: "ws_1",+ agentId: "ag_1",+ userId: "u_1",+ type: "calendar_event",+ });+ expect(mockCreateTask).toHaveBeenCalledTimes(1);+ expect(mockCreateTask.mock.calls[0][1]).toMatchObject({+ agentId: "ag_1",+ runtimeId: "rt_1",+ workspaceId: "ws_1",+ conversationId: "cv_1",+ prompt: "Run standup",+ type: "calendar_event",+ });+ expect(mockUpdateSchedule).not.toHaveBeenCalled();+ expect(mockRevert).not.toHaveBeenCalled();+ });++ it("skips events without a runtime — no writes issued (stays eligible)", async () => {+ mockListDue.mockResolvedValue([mkEvent()]);+ mockGetAgent.mockResolvedValue({+ id: "ag_1",+ workspaceId: "ws_1",+ runtimeId: null,+ ownerId: "u_1",+ });++ const enqueued = await promoteDueCalendarEventsForWorkspace(+ fakeDb,+ "ws_1",+ "2026-04-17T09:05:00.000Z"+ );+ expect(enqueued).toBe(0);+ expect(mockClaim).not.toHaveBeenCalled();+ expect(mockCreateConv).not.toHaveBeenCalled();+ expect(mockCreateTask).not.toHaveBeenCalled();+ });++ it("skips events without an owner — no writes issued", async () => {+ mockListDue.mockResolvedValue([mkEvent()]);+ mockGetAgent.mockResolvedValue({+ id: "ag_1",+ workspaceId: "ws_1",+ runtimeId: "rt_1",+ ownerId: null,+ });++ const enqueued = await promoteDueCalendarEventsForWorkspace(+ fakeDb,+ "ws_1",+ "2026-04-17T09:05:00.000Z"+ );+ expect(enqueued).toBe(0);+ expect(mockClaim).not.toHaveBeenCalled();+ });++ it("concurrent callers: only one enqueues because the guarded UPDATE fails the second time", async () => {+ // Both callers see the same candidate list, but the second claim fails.+ mockListDue.mockResolvedValue([mkEvent()]);+ mockGetAgent.mockResolvedValue({+ id: "ag_1",+ workspaceId: "ws_1",+ runtimeId: "rt_1",+ ownerId: "u_1",+ });+ mockClaim+ .mockResolvedValueOnce({ id: "ce_1" })+ .mockResolvedValueOnce(null);+ mockCreateConv.mockResolvedValue({ id: "cv_1" });+ mockCreateTask.mockResolvedValue({ id: "t_1" });++ const [a, b] = await Promise.all([+ promoteDueCalendarEventsForWorkspace(fakeDb, "ws_1", "2026-04-17T09:05:00.000Z"),+ promoteDueCalendarEventsForWorkspace(fakeDb, "ws_1", "2026-04-17T09:05:00.000Z"),+ ]);++ expect(a + b).toBe(1);+ expect(mockCreateTask).toHaveBeenCalledTimes(1);+ expect(mockCreateConv).toHaveBeenCalledTimes(1);+ });++ it("reverts last_triggered_at when task insert fails after claim", async () => {+ mockListDue.mockResolvedValue([mkEvent({ lastTriggeredAt: null })]);+ mockGetAgent.mockResolvedValue({+ id: "ag_1",+ workspaceId: "ws_1",+ runtimeId: "rt_1",+ ownerId: "u_1",+ });+ mockClaim.mockResolvedValue({ id: "ce_1" });+ mockCreateConv.mockResolvedValue({ id: "cv_1" });+ mockCreateTask.mockRejectedValue(new Error("D1 write failed"));++ const enqueued = await promoteDueCalendarEventsForWorkspace(+ fakeDb,+ "ws_1",+ "2026-04-17T09:05:00.000Z"+ );++ expect(enqueued).toBe(0);+ expect(mockRevert).toHaveBeenCalledTimes(1);+ expect(mockRevert.mock.calls[0]).toMatchObject({ "1": "ce_1", "2": null });+ });++ it("reverts to the previous last_triggered_at value (not null)", async () => {+ mockListDue.mockResolvedValue([+ mkEvent({+ scheduledAt: "2026-04-17T09:00:00.000Z",+ lastTriggeredAt: "2026-04-16T09:00:00.000Z",+ }),+ ]);+ mockGetAgent.mockResolvedValue({+ id: "ag_1",+ workspaceId: "ws_1",+ runtimeId: "rt_1",+ ownerId: "u_1",+ });+ mockClaim.mockResolvedValue({ id: "ce_1" });+ mockCreateConv.mockRejectedValue(new Error("fail"));++ await promoteDueCalendarEventsForWorkspace(+ fakeDb,+ "ws_1",+ "2026-04-17T09:05:00.000Z"+ );++ expect(mockRevert).toHaveBeenCalledWith(+ fakeDb,+ "ce_1",+ "2026-04-16T09:00:00.000Z"+ );+ });++ it("advances the schedule for repeating events after a successful enqueue", async () => {+ mockListDue.mockResolvedValue([+ mkEvent({+ scheduledAt: "2026-04-17T09:00:00.000Z",+ repeatInterval: "1day",+ }),+ ]);+ mockGetAgent.mockResolvedValue({+ id: "ag_1",+ workspaceId: "ws_1",+ runtimeId: "rt_1",+ ownerId: "u_1",+ });+ mockClaim.mockResolvedValue({ id: "ce_1" });+ mockCreateConv.mockResolvedValue({ id: "cv_1" });+ mockCreateTask.mockResolvedValue({ id: "t_1" });++ await promoteDueCalendarEventsForWorkspace(+ fakeDb,+ "ws_1",+ "2026-04-17T09:30:00.000Z"+ );++ expect(mockUpdateSchedule).toHaveBeenCalledWith(+ fakeDb,+ "ce_1",+ "2026-04-18T09:00:00.000Z"+ );+ });++ it("does not advance the schedule when the next occurrence would exceed repeat_stop_at", async () => {+ mockListDue.mockResolvedValue([+ mkEvent({+ scheduledAt: "2026-04-17T09:00:00.000Z",+ repeatInterval: "1day",+ repeatStopAt: "2026-04-17T23:59:59.999Z",+ }),+ ]);+ mockGetAgent.mockResolvedValue({+ id: "ag_1",+ workspaceId: "ws_1",+ runtimeId: "rt_1",+ ownerId: "u_1",+ });+ mockClaim.mockResolvedValue({ id: "ce_1" });+ mockCreateConv.mockResolvedValue({ id: "cv_1" });+ mockCreateTask.mockResolvedValue({ id: "t_1" });++ await promoteDueCalendarEventsForWorkspace(+ fakeDb,+ "ws_1",+ "2026-04-17T09:30:00.000Z"+ );++ expect(mockUpdateSchedule).not.toHaveBeenCalled();+ });+});++describe("repeatStopDateToStopAt", () => {+ it("converts YYYY-MM-DD to end-of-day ISO", () => {+ const out = repeatStopDateToStopAt("2026-05-17");+ const parsed = new Date(out);+ expect(parsed.getFullYear()).toBe(2026);+ expect(parsed.getMonth()).toBe(4); // May+ expect(parsed.getDate()).toBe(17);+ expect(parsed.getHours()).toBe(23);+ expect(parsed.getMinutes()).toBe(59);+ });++ it("throws on bad input", () => {+ expect(() => repeatStopDateToStopAt("not-a-date")).toThrow();+ });+});diff --git a/src/web/src/lib/services/calendar.ts b/src/web/src/lib/services/calendar.tsnew file mode 100644index 000000000..422f388dd--- /dev/null+++ b/src/web/src/lib/services/calendar.ts@@ -0,0 +1,123 @@+import type { Database } from "@alook/shared";+import { queries, TASK_TYPES } from "@alook/shared";+import { log } from "@/lib/logger";++const {+ listDueCalendarEvents,+ claimCalendarEvent,+ revertCalendarEventClaim,+ updateCalendarEventSchedule,+ computeNextScheduledAt,+} = queries.calendarEvent;++/**+ * Convert a user-provided local calendar date (YYYY-MM-DD) into an inclusive+ * UTC end-of-day ISO string in the caller's local timezone. Used to store the+ * repeat stop boundary.+ */+export function repeatStopDateToStopAt(repeatStopDate: string): string {+ const [y, m, d] = repeatStopDate.split("-").map(Number);+ if (!y || !m || !d) {+ throw new Error(`invalid repeat_stop_date: ${repeatStopDate}`);+ }+ const date = new Date(y, m - 1, d, 23, 59, 59, 999);+ return date.toISOString();+}++/**+ * Promote due calendar events in the given workspace into queued tasks.+ *+ * The only concurrency primitive is the exact-occurrence guarded UPDATE in+ * `claimCalendarEvent` — every step after claim is best-effort, with a+ * compensating revert on failure. Runtime/owner pre-checks are done before the+ * claim so a non-runnable event stays eligible for a later poll.+ *+ * Returns the number of events enqueued as tasks.+ */+export async function promoteDueCalendarEventsForWorkspace(+ db: Database,+ workspaceId: string,+ nowIso: string = new Date().toISOString(),+): Promise<number> {+ const candidates = await listDueCalendarEvents(db, workspaceId, nowIso);+ let enqueued = 0;++ for (const ev of candidates) {+ // Pre-claim checks — skip without writing so the event remains eligible+ // for a later poll once the agent has a runtime/owner.+ const agent = await queries.agent.getAgent(db, ev.agentId, ev.workspaceId);+ if (!agent) {+ log.warn("calendar: agent missing, skipping", { id: ev.id });+ continue;+ }+ if (!agent.runtimeId) {+ log.warn("calendar: agent has no runtime, skipping", { id: ev.id });+ continue;+ }+ if (!agent.ownerId) {+ log.warn("calendar: agent has no owner, skipping", { id: ev.id });+ continue;+ }++ const previousLastTriggeredAt = ev.lastTriggeredAt ?? null;+ const claimed = await claimCalendarEvent(db, ev.id, ev.scheduledAt, nowIso);+ if (!claimed) {+ // Another caller won the guarded UPDATE; skip.+ continue;+ }++ try {+ const conv = await queries.conversation.createConversation(db, {+ workspaceId: ev.workspaceId,+ agentId: ev.agentId,+ userId: agent.ownerId,+ title: `[Calendar] ${ev.title}`.slice(0, 120),+ type: TASK_TYPES.CALENDAR_EVENT,+ });++ await queries.task.createTask(db, {+ agentId: ev.agentId,+ runtimeId: agent.runtimeId,+ workspaceId: ev.workspaceId,+ conversationId: conv.id,+ prompt: ev.title,+ type: TASK_TYPES.CALENDAR_EVENT,+ priority: 0,+ });++ if (ev.repeatInterval) {+ const next = computeNextScheduledAt(+ ev.scheduledAt,+ ev.repeatInterval,+ ev.repeatStopAt ?? null,+ nowIso,+ ev.exceptions ?? [],+ );+ if (next) {+ await updateCalendarEventSchedule(db, ev.id, next);+ }+ }++ enqueued++;+ } catch (err) {+ log.warn("calendar: post-claim write failed, reverting", {+ id: ev.id,+ err: String(err),+ });+ // Compensating revert — event becomes eligible again on the next poll.+ try {+ await revertCalendarEventClaim(db, ev.id, previousLastTriggeredAt);+ } catch (revertErr) {+ log.error("calendar: compensating revert failed", {+ id: ev.id,+ err: String(revertErr),+ });+ }+ }+ }++ if (enqueued > 0) {+ log.info("calendar: promoted due events", { workspaceId, enqueued });+ }+ return enqueued;+}diff --git a/src/web/src/lib/services/task.test.ts b/src/web/src/lib/services/task.test.tsindex 23b11170c..00ac9b74d 100644--- a/src/web/src/lib/services/task.test.ts+++ b/src/web/src/lib/services/task.test.ts@@ -1,6 +1,11 @@import { describe, it, expect, vi, beforeEach } from "vitest";vi.mock("@alook/shared", () => ({+ TASK_TYPES: {+ USER_DM_MESSAGE: "user_dm_message",+ EMAIL_NOTIFICATION: "email_notification",+ CALENDAR_EVENT: "calendar_event",+ },queries: {task: {createTask: vi.fn(),diff --git a/src/web/src/lib/services/task.ts b/src/web/src/lib/services/task.tsindex 5483cbe50..ff917c7eb 100644--- a/src/web/src/lib/services/task.ts+++ b/src/web/src/lib/services/task.ts@@ -1,5 +1,5 @@import type { Database } from "@alook/shared";-import { queries } from "@alook/shared";+import { queries, TASK_TYPES } from "@alook/shared";import { log } from "@/lib/logger";const taskQueries = queries.task;@@ -14,7 +14,7 @@ export class TaskService {conversationId: string,workspaceId: string,prompt: string,- type: string = "user_dm_message",+ type: string = TASK_TYPES.USER_DM_MESSAGE,) {const agent = await agentQueries.getAgent(this.db, agentId, workspaceId);if (!agent) {