iris-chatbot 0.2.5 → 1.0.0

package/template/src/lib/tooling/tools/schedule.ts

@@ -14,6 +14,32 @@ type CalendarListInput = {
   from?: string;
   to?: string;
   limit?: number;
+  /** Omit or empty = primary calendar only (fast). "all" = all calendars (slower, longer timeout). Or a calendar name e.g. "Work". */
+  calendar?: string;
+};
+
+type CalendarUpdateInput = {
+  eventUid: string;
+  calendar?: string;
+  title?: string;
+  start?: string;
+  end?: string;
+  location?: string;
+  notes?: string;
+};
+
+type CalendarDeleteInput = {
+  eventUid: string;
+  calendar?: string;
+};
+
+type CalendarMoveInput = {
+  eventUid: string;
+  /** New start date/time (required for move). */
+  start: string;
+  /** New end date/time (optional; defaults to start + 1 hour). */
+  end?: string;
+  calendar?: string;
 };
 
 type ReminderCreateInput = {
@@ -109,6 +135,45 @@ function resolveRelativeDate(input: string, now: Date): Date | null {
     return base;
   }
 
+  // "next week" → Monday of next calendar week; "end of next week" → Sunday
+  const nextWeekMatch = lower.match(/\b(?:end\s+of\s+)?next\s+week\b/);
+  if (nextWeekMatch) {
+    const isEnd = /end\s+of\s+next\s+week/.test(lower);
+    const daysUntilMonday = (1 - base.getDay() + 7) % 7;
+    const nextMonday = new Date(base);
+    nextMonday.setDate(base.getDate() + (daysUntilMonday === 0 ? 7 : daysUntilMonday));
+    if (isEnd) {
+      nextMonday.setDate(nextMonday.getDate() + 6);
+    }
+    return nextMonday;
+  }
+
+  // "next month" → first day of next calendar month; "end of next month" → last day of next month
+  const nextMonthMatch = lower.match(/\b(?:end\s+of\s+)?next\s+month\b/);
+  if (nextMonthMatch) {
+    const isEnd = /end\s+of\s+next\s+month/.test(lower);
+    const d = new Date(base.getFullYear(), base.getMonth() + 1, 1); // first day of next month
+    if (isEnd) {
+      d.setMonth(d.getMonth() + 1);
+      d.setDate(0); // last day of previous (= last day of next month)
+      d.setHours(23, 59, 0, 0);
+    }
+    return d;
+  }
+
+  // "this month" → first day of current month; "end of this month" → last day of current month
+  const thisMonthMatch = lower.match(/\b(?:end\s+of\s+)?this\s+month\b/);
+  if (thisMonthMatch) {
+    const isEnd = /end\s+of\s+this\s+month/.test(lower);
+    const y = base.getFullYear();
+    const m = base.getMonth();
+    const d = isEnd ? new Date(y, m + 1, 0) : new Date(y, m, 1); // last day of current month vs first day
+    if (isEnd) {
+      d.setHours(23, 59, 0, 0);
+    }
+    return d;
+  }
+
   const weekdayMatch = lower.match(
     /\b(?:(this|next|upcoming)\s+)?(sunday|monday|tuesday|wednesday|thursday|friday|saturday)\b/,
   );
@@ -228,16 +293,310 @@ function addMinutes(parts: DateTimeParts, minutesToAdd: number): DateTimeParts {
   return toDueParts(value);
 }
 
-async function runAppleScript(script: string, args: string[] = [], signal?: AbortSignal) {
+/** Format date for AppleScript "date" coercion (local time). */
+function formatDateForAppleScript(parts: DateTimeParts): string {
+  return `${parts.year}-${String(parts.month).padStart(2, "0")}-${String(parts.day).padStart(2, "0")} ${String(parts.hour).padStart(2, "0")}:${String(parts.minute).padStart(2, "0")}:00`;
+}
+
+const WEEKDAY_NAMES = ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"];
+const MONTH_NAMES = [
+  "January", "February", "March", "April", "May", "June",
+  "July", "August", "September", "October", "November", "December",
+];
+
+/** Human-readable queried range so the assistant and UI show the exact day we checked. */
+function formatQueriedRange(fromParts: DateTimeParts, toParts: DateTimeParts): string {
+  const fromDate = new Date(fromParts.year, fromParts.month - 1, fromParts.day, fromParts.hour, fromParts.minute, 0, 0);
+  const toDate = new Date(toParts.year, toParts.month - 1, toParts.day, toParts.hour, toParts.minute, 0, 0);
+  const sameDay =
+    fromParts.year === toParts.year &&
+    fromParts.month === toParts.month &&
+    fromParts.day === toParts.day;
+  const weekday = WEEKDAY_NAMES[fromDate.getDay()];
+  const month = MONTH_NAMES[fromDate.getMonth()];
+  const day = fromDate.getDate();
+  const year = fromDate.getFullYear();
+  const fromTime = fromDate.toLocaleTimeString("en-US", { hour: "numeric", minute: "2-digit", hour12: true });
+  const toTime = toDate.toLocaleTimeString("en-US", { hour: "numeric", minute: "2-digit", hour12: true });
+  if (sameDay) {
+    return `${weekday}, ${month} ${day}, ${year}, ${fromTime} – ${toTime}`;
+  }
+  return `${weekday}, ${month} ${day}, ${year}, ${fromTime} – ${toDate.getDate()} ${MONTH_NAMES[toDate.getMonth()]} ${toDate.getFullYear()}, ${toTime}`;
+}
+
+/**
+ * Resolve calendar list range to explicit date parts. We pass components to
+ * AppleScript and build dates there—AppleScript's "date fromText" is
+ * locale-dependent and fails on ISO-style strings (e.g. "2026-02-09 00:00:00").
+ */
+function resolveCalendarRange(
+  fromInput: string,
+  toInput: string,
+  now: Date,
+): { fromParts: DateTimeParts; toParts: DateTimeParts; fromLabel: string; toLabel: string } {
+  const fromNorm = fromInput.trim().toLowerCase() || "today";
+  const toNorm = toInput.trim().toLowerCase() || "tomorrow";
+  const fromParts =
+    parseDateTimeParts(fromInput, { defaultHour: 0, defaultMinute: 0 }) ??
+    toDueParts(now);
+  if (fromNorm === "today") {
+    fromParts.hour = 0;
+    fromParts.minute = 0;
+  }
+  let toParts =
+    parseDateTimeParts(toInput, { defaultHour: 23, defaultMinute: 59 }) ?? (() => {
+      const end = new Date(now);
+      end.setDate(end.getDate() + 1);
+      const p = toDueParts(end);
+      p.hour = 23;
+      p.minute = 59;
+      return p;
+    })();
+  if (toNorm === "today") {
+    const p = toDueParts(now);
+    p.hour = 23;
+    p.minute = 59;
+    toParts = p;
+  } else if (toNorm === "tomorrow") {
+    const d = new Date(now);
+    d.setDate(d.getDate() + 1);
+    const p = toDueParts(d);
+    p.hour = 23;
+    p.minute = 59;
+    toParts = p;
+  } else {
+    toParts.hour = 23;
+    toParts.minute = 59;
+  }
+
+  const partsToTime = (p: DateTimeParts) =>
+    new Date(p.year, p.month - 1, p.day, p.hour, p.minute, 0, 0).getTime();
+  const fromTime = partsToTime(fromParts);
+  const toTime = partsToTime(toParts);
+  const startOfToday = new Date(now.getFullYear(), now.getMonth(), now.getDate(), 0, 0, 0, 0).getTime();
+
+  let finalFrom = fromParts;
+  let finalTo = toParts;
+  if (fromTime > toTime) {
+    [finalFrom, finalTo] = [toParts, fromParts];
+  }
+  if (partsToTime(finalTo) < startOfToday) {
+    finalFrom = toDueParts(now);
+    finalFrom.hour = 0;
+    finalFrom.minute = 0;
+    const tomorrow = new Date(now);
+    tomorrow.setDate(tomorrow.getDate() + 1);
+    finalTo = toDueParts(tomorrow);
+    finalTo.hour = 23;
+    finalTo.minute = 59;
+  }
+
+  const sameDay =
+    finalFrom.year === finalTo.year &&
+    finalFrom.month === finalTo.month &&
+    finalFrom.day === finalTo.day;
+  if (sameDay) {
+    finalFrom.hour = 0;
+    finalFrom.minute = 0;
+    finalTo.hour = 23;
+    finalTo.minute = 59;
+  }
+
+  return {
+    fromParts: finalFrom,
+    toParts: finalTo,
+    fromLabel: formatDateForAppleScript(finalFrom),
+    toLabel: formatDateForAppleScript(finalTo),
+  };
+}
+
+const CALENDAR_LIST_SINGLE_TIMEOUT_MS = 25_000;
+const CALENDAR_LIST_PARALLEL_TIMEOUT_MS = 35_000;
+const CALENDAR_LIST_FALLBACK_TIMEOUT_MS = 40_000;
+const GET_CALENDAR_NAMES_TIMEOUT_MS = 5_000;
+
+async function runAppleScript(
+  script: string,
+  args: string[] = [],
+  signal?: AbortSignal,
+  timeoutMs?: number,
+) {
   const { stdout } = await runCommandSafe({
     command: "osascript",
     args: ["-e", script, ...args],
     signal,
-    timeoutMs: APPLESCRIPT_TIMEOUT_MS,
+    timeoutMs: timeoutMs ?? APPLESCRIPT_TIMEOUT_MS,
   });
   return stdout;
 }
 
+/**
+ * List events from Apple Calendar. Does NOT use "whose start date" (that clause
+ * often returns empty with iCloud/Calendar). We get every event of each calendar,
+ * build fromDate/toDate in the script from argv, and filter with native date
+ * comparison (eventStart >= fromDate and eventStart <= toDate) so we avoid
+ * "month of eventStart as integer" which can throw when Calendar returns month
+ * as a constant. Stops after maxCount events, or after 8000 events per calendar,
+ * or after 600 consecutive events past toDate.
+ */
+const CALENDAR_LIST_EVENTS_SCRIPT =
+  'on run argv\n' +
+  'set calendarFilter to item 1 of argv\n' +
+  'set yr1 to (item 2 of argv) as integer\n' +
+  'set mo1 to (item 3 of argv) as integer\n' +
+  'set day1 to (item 4 of argv) as integer\n' +
+  'set hr1 to (item 5 of argv) as integer\n' +
+  'set min1 to (item 6 of argv) as integer\n' +
+  'set yr2 to (item 7 of argv) as integer\n' +
+  'set mo2 to (item 8 of argv) as integer\n' +
+  'set day2 to (item 9 of argv) as integer\n' +
+  'set hr2 to (item 10 of argv) as integer\n' +
+  'set min2 to (item 11 of argv) as integer\n' +
+  'set maxCount to (item 12 of argv) as integer\n' +
+  'set bStart to current date\n' +
+  'set year of bStart to yr1\n' +
+  'set month of bStart to mo1\n' +
+  'set day of bStart to day1\n' +
+  'set hours of bStart to hr1\n' +
+  'set minutes of bStart to min1\n' +
+  'set seconds of bStart to 0\n' +
+  'set b2 to current date\n' +
+  'set year of b2 to yr2\n' +
+  'set month of b2 to mo2\n' +
+  'set day of b2 to day2\n' +
+  'set hours of b2 to hr2\n' +
+  'set minutes of b2 to min2\n' +
+  'set seconds of b2 to 59\n' +
+  "set outText to \"\"\n" +
+  "set countItems to 0\n" +
+  'set maxScan to 5000\n' +
+  'set maxPast to 150\n' +
+  'tell application "Calendar"\n' +
+  'repeat with c in calendars\n' +
+  'if countItems is greater than or equal to maxCount then exit repeat\n' +
+  'set calName to (name of c as text)\n' +
+  'set useCal to false\n' +
+  'if calendarFilter is "" then\n' +
+  'set useCal to true\n' +
+  'else if calendarFilter is "all" then\n' +
+  'set useCal to true\n' +
+  'else\n' +
+  'ignoring case\n' +
+  'if calName is equal to calendarFilter then set useCal to true\n' +
+  'end ignoring\n' +
+  'end if\n' +
+  'if useCal then\n' +
+  'try\n' +
+  'set eventList to every event of c\n' +
+  'set scanned to 0\n' +
+  'set outsideRangeCount to 0\n' +
+  'repeat with e in eventList\n' +
+  'if countItems is greater than or equal to maxCount then exit repeat\n' +
+  'set scanned to scanned + 1\n' +
+  'if scanned is greater than maxScan then exit repeat\n' +
+  'try\n' +
+  'set evtStart to (get start date of e)\n' +
+  'if evtStart is greater than or equal to bStart and evtStart is less than or equal to b2 then\n' +
+  'set outsideRangeCount to 0\n' +
+  'set outText to outText & (summary of e as text) & tab & (evtStart as text) & tab & calName & tab & (uid of e as text) & linefeed\n' +
+  'set countItems to countItems + 1\n' +
+  'else\n' +
+  'set outsideRangeCount to outsideRangeCount + 1\n' +
+  'if outsideRangeCount is greater than maxPast then exit repeat\n' +
+  'end if\n' +
+  'end try\n' +
+  'end repeat\n' +
+  'end try\n' +
+  'if calendarFilter is "" then exit repeat\n' +
+  'end if\n' +
+  'end repeat\n' +
+  "end tell\n" +
+  "return outText\n" +
+  "end run";
+
+/**
+ * List events using "whose start date" filter. Fast when Calendar respects it;
+ * often returns empty with iCloud. Used as first attempt with short timeout;
+ * fall back to CALENDAR_LIST_EVENTS_SCRIPT on timeout or error.
+ */
+const CALENDAR_LIST_EVENTS_SCRIPT_WHOSE =
+  'on run argv\n' +
+  'set calendarFilter to item 1 of argv\n' +
+  'set yr1 to (item 2 of argv) as integer\n' +
+  'set mo1 to (item 3 of argv) as integer\n' +
+  'set day1 to (item 4 of argv) as integer\n' +
+  'set hr1 to (item 5 of argv) as integer\n' +
+  'set min1 to (item 6 of argv) as integer\n' +
+  'set yr2 to (item 7 of argv) as integer\n' +
+  'set mo2 to (item 8 of argv) as integer\n' +
+  'set day2 to (item 9 of argv) as integer\n' +
+  'set hr2 to (item 10 of argv) as integer\n' +
+  'set min2 to (item 11 of argv) as integer\n' +
+  'set maxCount to (item 12 of argv) as integer\n' +
+  'set bStart to current date\n' +
+  'set year of bStart to yr1\n' +
+  'set month of bStart to mo1\n' +
+  'set day of bStart to day1\n' +
+  'set hours of bStart to hr1\n' +
+  'set minutes of bStart to min1\n' +
+  'set seconds of bStart to 0\n' +
+  'set b2 to current date\n' +
+  'set year of b2 to yr2\n' +
+  'set month of b2 to mo2\n' +
+  'set day of b2 to day2\n' +
+  'set hours of b2 to hr2\n' +
+  'set minutes of b2 to min2\n' +
+  'set seconds of b2 to 59\n' +
+  "set outText to \"\"\n" +
+  "set countItems to 0\n" +
+  'tell application "Calendar"\n' +
+  'repeat with c in calendars\n' +
+  'if countItems is greater than or equal to maxCount then exit repeat\n' +
+  'set calName to (name of c as text)\n' +
+  'set useCal to false\n' +
+  'set skipCal to false\n' +
+  'if calendarFilter is "all" then\n' +
+  'if calName is "Birthdays" or calName is "Siri Suggestions" or calName is "US Holidays" or calName is "Scheduled Reminders" or calName is "Calendar" then set skipCal to true\n' +
+  'end if\n' +
+  'if not skipCal then\n' +
+  'if calendarFilter is "" then\n' +
+  'set useCal to true\n' +
+  'else if calendarFilter is "all" then\n' +
+  'set useCal to true\n' +
+  'else\n' +
+  'ignoring case\n' +
+  'if calName is equal to calendarFilter then set useCal to true\n' +
+  'end ignoring\n' +
+  'end if\n' +
+  'end if\n' +
+  'if useCal then\n' +
+  'try\n' +
+  'set eventList to (every event of c whose start date >= bStart and start date <= b2)\n' +
+  'repeat with e in eventList\n' +
+  'if countItems is greater than or equal to maxCount then exit repeat\n' +
+  'set outText to outText & (summary of e as text) & tab & (start date of e as text) & tab & calName & tab & (uid of e as text) & linefeed\n' +
+  'set countItems to countItems + 1\n' +
+  'end repeat\n' +
+  'end try\n' +
+  'if calendarFilter is "" then exit repeat\n' +
+  'end if\n' +
+  'end repeat\n' +
+  "end tell\n" +
+  "return outText\n" +
+  "end run";
+
+const CALENDAR_LIST_FILTERED_TIMEOUT_MS = 25_000;
+
+/** Returns tab-separated calendar names. Used only when listing all calendars in parallel. */
+const GET_CALENDAR_NAMES_SCRIPT =
+  'tell application "Calendar"\n' +
+  "set outText to \"\"\n" +
+  "repeat with cal in calendars\n" +
+  "set outText to outText & (name of cal as text) & tab\n" +
+  "end repeat\n" +
+  "return outText\n" +
+  "end tell";
+
 async function runCalendarCreateEvent(input: unknown, context: ToolExecutionContext) {
   ensureMacOS("Calendar automation");
   const payload = asObject(input) as CalendarCreateInput;
@@ -253,9 +612,9 @@ async function runCalendarCreateEvent(input: unknown, context: ToolExecutionCont
   }
   const endParts = endInput
     ? parseDateTimeParts(endInput, {
-        defaultHour: startParts.hour,
-        defaultMinute: startParts.minute,
-      })
+      defaultHour: startParts.hour,
+      defaultMinute: startParts.minute,
+    })
     : addMinutes(startParts, 60);
   if (!endParts) {
     throw new Error(`Invalid end date/time: ${endInput}`);
@@ -358,47 +717,397 @@ async function runCalendarCreateEvent(input: unknown, context: ToolExecutionCont
   };
 }
 
+function parseEventLine(line: string): { title: string; startAt: string; calendar: string; uid: string } {
+  const parts = line.split("\t");
+  if (parts.length < 4) {
+    return { title: parts[0] ?? "", startAt: "", calendar: "", uid: "" };
+  }
+  const uid = parts[parts.length - 1] ?? "";
+  const calendar = parts[parts.length - 2] ?? "";
+  const startAt = parts[parts.length - 3] ?? "";
+  const title = parts.slice(0, -3).join("\t").trim();
+  return { title, startAt, calendar, uid };
+}
+
 async function runCalendarListEvents(input: unknown, context: ToolExecutionContext) {
   ensureMacOS("Calendar automation");
   const payload = asObject(input) as CalendarListInput;
-  const from = typeof payload.from === "string" && payload.from.trim() ? payload.from.trim() : "today";
-  const to = typeof payload.to === "string" && payload.to.trim() ? payload.to.trim() : "tomorrow";
+  const fromRaw = typeof payload.from === "string" && payload.from.trim() ? payload.from.trim() : "today";
+  const toRaw = typeof payload.to === "string" && payload.to.trim() ? payload.to.trim() : "tomorrow";
   const limit =
     typeof payload.limit === "number" && Number.isFinite(payload.limit)
-      ? Math.max(1, Math.min(50, Math.floor(payload.limit)))
-      : 10;
+      ? Math.max(1, Math.min(100, Math.floor(payload.limit)))
+      : 50;
+  const calendarRaw =
+    typeof payload.calendar === "string" && payload.calendar.trim() ? payload.calendar.trim() : "";
+  const calendarFilter = calendarRaw.toLowerCase() === "all" ? "all" : calendarRaw || "";
+  const now = new Date();
+  const { fromParts, toParts, fromLabel, toLabel } = resolveCalendarRange(fromRaw, toRaw, now);
+
+  const dateArgs = [
+    String(fromParts.year),
+    String(fromParts.month),
+    String(fromParts.day),
+    String(fromParts.hour),
+    String(fromParts.minute),
+    String(toParts.year),
+    String(toParts.month),
+    String(toParts.day),
+    String(toParts.hour),
+    String(toParts.minute),
+    String(limit),
+  ];
+
+  const runOneList = async (filter: string, timeoutMs: number): Promise<string> => {
+    try {
+      const filtered = await runAppleScript(
+        CALENDAR_LIST_EVENTS_SCRIPT_WHOSE,
+        [filter, ...dateArgs],
+        context.signal,
+        CALENDAR_LIST_FILTERED_TIMEOUT_MS,
+      );
+      const hasLines = filtered.split("\n").some((l) => l.trim().length > 0);
+      if (hasLines) return filtered;
+    } catch {
+      /* timeout or error: fall through to full scan */
+    }
+    return await runAppleScript(
+      CALENDAR_LIST_EVENTS_SCRIPT,
+      [filter, ...dateArgs],
+      context.signal,
+      timeoutMs,
+    );
+  };
+
+  const parseOutputToEntries = (output: string) =>
+    output
+      .split("\n")
+      .map((line) => line.trim())
+      .filter(Boolean)
+      .map(parseEventLine);
+
+  const buildResult = (
+    entries: Array<{ title: string; startAt: string; calendar: string; uid: string }>,
+  ) => ({
+    from: fromRaw,
+    to: toRaw,
+    fromResolved: fromLabel,
+    toResolved: toLabel,
+    queriedRange: formatQueriedRange(fromParts, toParts),
+    count: entries.length,
+    entries,
+  });
+
+  if (calendarFilter !== "all") {
+    const output = await runOneList(calendarFilter, CALENDAR_LIST_SINGLE_TIMEOUT_MS);
+    const entries = parseOutputToEntries(output);
+    return buildResult(entries);
+  }
+
+  let calendarNames: string[] = [];
+  try {
+    const namesOutput = await runAppleScript(
+      GET_CALENDAR_NAMES_SCRIPT,
+      [],
+      context.signal,
+      GET_CALENDAR_NAMES_TIMEOUT_MS,
+    );
+    calendarNames = namesOutput.split("\t").map((n) => n.trim()).filter(Boolean);
+  } catch {
+    /* fallback to single-script "all" below */
+  }
+
+  if (calendarNames.length > 0) {
+    // Skip slow/system calendars for faster queries
+    const slowCalendars = new Set(["Birthdays", "Siri Suggestions", "US Holidays", "Scheduled Reminders", "Calendar"]);
+    const fastCalendars = calendarNames.filter(name => !slowCalendars.has(name));
+
+    const results = await Promise.allSettled(
+      fastCalendars.map((name) => runOneList(name, CALENDAR_LIST_PARALLEL_TIMEOUT_MS)),
+    );
+    const allLines: string[] = [];
+    for (const result of results) {
+      if (result.status === "fulfilled" && result.value) {
+        const lines = result.value.split("\n").map((l) => l.trim()).filter(Boolean);
+        allLines.push(...lines);
+      }
+    }
+    const entries = allLines
+      .map(parseEventLine)
+      .sort((a, b) => (a.startAt < b.startAt ? -1 : a.startAt > b.startAt ? 1 : 0))
+      .slice(0, limit);
+    return buildResult(entries);
+  }
+
+  const output = await runOneList("all", CALENDAR_LIST_FALLBACK_TIMEOUT_MS);
+  const entries = parseOutputToEntries(output);
+  return buildResult(entries);
+}
+
+async function runCalendarUpdateEvent(input: unknown, context: ToolExecutionContext) {
+  ensureMacOS("Calendar automation");
+  const payload = asObject(input) as CalendarUpdateInput;
+  const eventUid = asString(payload.eventUid, "eventUid");
+  const calendarName =
+    typeof payload.calendar === "string" && payload.calendar.trim()
+      ? payload.calendar.trim()
+      : "";
+  const title = typeof payload.title === "string" && payload.title.trim() ? payload.title.trim() : null;
+  const startInput = typeof payload.start === "string" && payload.start.trim() ? payload.start.trim() : null;
+  const endInput = typeof payload.end === "string" && payload.end.trim() ? payload.end.trim() : null;
+  const location = typeof payload.location === "string" ? payload.location.trim() : null;
+  const notes = typeof payload.notes === "string" ? payload.notes.trim() : null;
+
+  const startParts = startInput ? parseDateTimeParts(startInput, { defaultHour: 9, defaultMinute: 0 }) : null;
+  const endParts = endInput
+    ? parseDateTimeParts(endInput, {
+      defaultHour: startParts?.hour ?? 9,
+      defaultMinute: startParts?.minute ?? 0,
+    })
+    : startParts
+      ? addMinutes(startParts, 60)
+      : null;
+
+  if (context.localTools.dryRun) {
+    return {
+      dryRun: true,
+      action: "calendar_update_event",
+      eventUid,
+      calendar: calendarName || null,
+      title,
+      start: startInput,
+      end: endInput,
+      startParts: startParts ?? null,
+      endParts: endParts ?? null,
+      location,
+      notes,
+    };
+  }
 
   const script =
     'on run argv\n' +
-    'set fromText to item 1 of argv\n' +
-    'set toText to item 2 of argv\n' +
-    'set maxCount to (item 3 of argv) as integer\n' +
-    "set outText to \"\"\n" +
-    "set countItems to 0\n" +
+    'set eventUid to item 1 of argv\n' +
+    'set newTitle to item 2 of argv\n' +
+    'set startFlag to item 3 of argv\n' +
+    'set startYear to (item 4 of argv) as integer\n' +
+    'set startMonth to (item 5 of argv) as integer\n' +
+    'set startDay to (item 6 of argv) as integer\n' +
+    'set startHour to (item 7 of argv) as integer\n' +
+    'set startMinute to (item 8 of argv) as integer\n' +
+    'set endFlag to item 9 of argv\n' +
+    'set endYear to (item 10 of argv) as integer\n' +
+    'set endMonth to (item 11 of argv) as integer\n' +
+    'set endDay to (item 12 of argv) as integer\n' +
+    'set endHour to (item 13 of argv) as integer\n' +
+    'set endMinute to (item 14 of argv) as integer\n' +
+    'set newLocation to item 15 of argv\n' +
+    'set newNotes to item 16 of argv\n' +
     'tell application "Calendar"\n' +
-    "set fromDate to date fromText\n" +
-    "set toDate to date toText\n" +
-    "repeat with cal in calendars\n" +
-    "repeat with e in (every event of cal whose start date is greater than or equal to fromDate and start date is less than or equal to toDate)\n" +
-    'set outText to outText & (summary of e as text) & tab & ((start date of e) as text) & tab & (name of cal as text) & linefeed\n' +
-    "set countItems to countItems + 1\n" +
-    "if countItems is greater than or equal to maxCount then return outText\n" +
-    "end repeat\n" +
-    "end repeat\n" +
+    'set targetEvent to missing value\n' +
+    'repeat with cal in calendars\n' +
+    'try\n' +
+    'set targetEvent to (first event of cal whose uid is eventUid)\n' +
+    'if targetEvent is not missing value then exit repeat\n' +
+    'end try\n' +
+    'end repeat\n' +
+    'if targetEvent is missing value then error "Event not found with uid: " & eventUid\n' +
+    'if newTitle is not "" then set summary of targetEvent to newTitle\n' +
+    'if startFlag is "1" then\n' +
+    'set startDate to current date\n' +
+    'set year of startDate to startYear\n' +
+    'set month of startDate to startMonth\n' +
+    'set day of startDate to startDay\n' +
+    'set time of startDate to ((startHour * hours) + (startMinute * minutes))\n' +
+    'set start date of targetEvent to startDate\n' +
+    'end if\n' +
+    'if endFlag is "1" then\n' +
+    'set endDate to current date\n' +
+    'set year of endDate to endYear\n' +
+    'set month of endDate to endMonth\n' +
+    'set day of endDate to endDay\n' +
+    'set time of endDate to ((endHour * hours) + (endMinute * minutes))\n' +
+    'set end date of targetEvent to endDate\n' +
+    'end if\n' +
+    'if newLocation is not "" then set location of targetEvent to newLocation\n' +
+    'if newNotes is not "" then set description of targetEvent to newNotes\n' +
     "end tell\n" +
-    "return outText\n" +
+    'return "updated"\n' +
     "end run";
-  const output = await runAppleScript(script, [from, to, String(limit)], context.signal);
-  const entries = output
-    .split("\n")
-    .map((line) => line.trim())
-    .filter(Boolean)
-    .map((line) => {
-      const [title, startAt, calendar] = line.split("\t");
-      return { title, startAt, calendar };
-    });
+  const args = [
+    eventUid,
+    title ?? "",
+    startParts ? "1" : "0",
+    String(startParts?.year ?? 0),
+    String(startParts?.month ?? 0),
+    String(startParts?.day ?? 0),
+    String(startParts?.hour ?? 0),
+    String(startParts?.minute ?? 0),
+    endParts ? "1" : "0",
+    String(endParts?.year ?? 0),
+    String(endParts?.month ?? 0),
+    String(endParts?.day ?? 0),
+    String(endParts?.hour ?? 0),
+    String(endParts?.minute ?? 0),
+    location ?? "",
+    notes ?? "",
+  ];
+  await runAppleScript(script, args, context.signal);
+  return {
+    updated: true,
+    eventUid,
+    title: title ?? undefined,
+    start: startInput ?? undefined,
+    end: endInput ?? undefined,
+    location: location ?? undefined,
+    notes: notes ?? undefined,
+  };
+}
+
+async function runCalendarDeleteEvent(input: unknown, context: ToolExecutionContext) {
+  ensureMacOS("Calendar automation");
+  const payload = asObject(input) as CalendarDeleteInput;
+  const eventUid = asString(payload.eventUid, "eventUid");
+  const calendarName =
+    typeof payload.calendar === "string" && payload.calendar.trim()
+      ? payload.calendar.trim()
+      : "";
 
-  return { from, to, count: entries.length, entries };
+  if (context.localTools.dryRun) {
+    return { dryRun: true, action: "calendar_delete_event", eventUid, calendar: calendarName || null };
+  }
+
+  const script =
+    'on run argv\n' +
+    'set eventUid to item 1 of argv\n' +
+    'set calName to item 2 of argv\n' +
+    'tell application "Calendar"\n' +
+    'set targetEvent to missing value\n' +
+    'if calName is not "" then\n' +
+    'try\n' +
+    'set targetCal to calendar calName\n' +
+    'set targetEvent to (first event of targetCal whose uid is eventUid)\n' +
+    'end try\n' +
+    'end if\n' +
+    'if targetEvent is missing value then\n' +
+    'repeat with cal in calendars\n' +
+    'try\n' +
+    'set targetEvent to (first event of cal whose uid is eventUid)\n' +
+    'if targetEvent is not missing value then exit repeat\n' +
+    'end try\n' +
+    'end repeat\n' +
+    'end if\n' +
+    'if targetEvent is missing value then error "Event not found with uid: " & eventUid\n' +
+    'delete targetEvent\n' +
+    "end tell\n" +
+    'return "deleted"\n' +
+    "end run";
+  await runAppleScript(script, [eventUid, calendarName], context.signal);
+  return { deleted: true, eventUid };
+}
+
+async function runCalendarMoveEvent(input: unknown, context: ToolExecutionContext) {
+  ensureMacOS("Calendar automation");
+  const payload = asObject(input) as CalendarMoveInput;
+  const eventUid = asString(payload.eventUid, "eventUid");
+  const startInput = asString(payload.start, "start");
+  const endInput =
+    typeof payload.end === "string" && payload.end.trim() ? payload.end.trim() : "";
+  const startParts = parseDateTimeParts(startInput, { defaultHour: 9, defaultMinute: 0 });
+  if (!startParts) {
+    throw new Error(`Invalid start date/time: ${startInput}`);
+  }
+  const endParts = endInput
+    ? parseDateTimeParts(endInput, {
+      defaultHour: startParts.hour,
+      defaultMinute: startParts.minute,
+    })
+    : addMinutes(startParts, 60);
+  if (!endParts) {
+    throw new Error(`Invalid end date/time: ${endInput}`);
+  }
+
+  if (context.localTools.dryRun) {
+    return {
+      dryRun: true,
+      action: "calendar_move_event",
+      eventUid,
+      start: startInput,
+      end: endInput || undefined,
+      startParts,
+      endParts,
+    };
+  }
+
+  const script =
+    'on run argv\n' +
+    'set eventUid to item 1 of argv\n' +
+    'set startYear to (item 2 of argv) as integer\n' +
+    'set startMonth to (item 3 of argv) as integer\n' +
+    'set startDay to (item 4 of argv) as integer\n' +
+    'set startHour to (item 5 of argv) as integer\n' +
+    'set startMinute to (item 6 of argv) as integer\n' +
+    'set endYear to (item 7 of argv) as integer\n' +
+    'set endMonth to (item 8 of argv) as integer\n' +
+    'set endDay to (item 9 of argv) as integer\n' +
+    'set endHour to (item 10 of argv) as integer\n' +
+    'set endMinute to (item 11 of argv) as integer\n' +
+    'tell application "Calendar"\n' +
+    'set targetEvent to missing value\n' +
+    'set targetCal to missing value\n' +
+    'repeat with cal in calendars\n' +
+    'try\n' +
+    'set targetEvent to (first event of cal whose uid is eventUid)\n' +
+    'if targetEvent is not missing value then\n' +
+    'set targetCal to cal\n' +
+    'exit repeat\n' +
+    'end if\n' +
+    'end try\n' +
+    'end repeat\n' +
+    'if targetEvent is missing value then error "Event not found with uid: " & eventUid\n' +
+    'set eventSummary to (summary of targetEvent as text)\n' +
+    'set eventLocation to (location of targetEvent as text)\n' +
+    'set eventDesc to (description of targetEvent as text)\n' +
+    'set newStart to current date\n' +
+    'set year of newStart to startYear\n' +
+    'set month of newStart to startMonth\n' +
+    'set day of newStart to startDay\n' +
+    'set hours of newStart to startHour\n' +
+    'set minutes of newStart to startMinute\n' +
+    'set seconds of newStart to 0\n' +
+    'set newEnd to current date\n' +
+    'set year of newEnd to endYear\n' +
+    'set month of newEnd to endMonth\n' +
+    'set day of newEnd to endDay\n' +
+    'set hours of newEnd to endHour\n' +
+    'set minutes of newEnd to endMinute\n' +
+    'set seconds of newEnd to 0\n' +
+    'tell targetCal\n' +
+    'set newEvent to make new event with properties {summary:eventSummary, start date:newStart, end date:newEnd, location:eventLocation, description:eventDesc}\n' +
+    'end tell\n' +
+    'delete targetEvent\n' +
+    "end tell\n" +
+    'return "moved"\n' +
+    "end run";
+  const args = [
+    eventUid,
+    String(startParts.year),
+    String(startParts.month),
+    String(startParts.day),
+    String(startParts.hour),
+    String(startParts.minute),
+    String(endParts.year),
+    String(endParts.month),
+    String(endParts.day),
+    String(endParts.hour),
+    String(endParts.minute),
+  ];
+  await runAppleScript(script, args, context.signal);
+  return {
+    moved: true,
+    eventUid,
+    start: startInput,
+    end: endInput || undefined,
+  };
 }
 
 async function runReminderCreate(input: unknown, context: ToolExecutionContext) {
@@ -512,15 +1221,36 @@ async function runReminderList(input: unknown, context: ToolExecutionContext) {
 }
 
 export const scheduleTools: ToolDefinition[] = [
+  {
+    name: "calendar_list_events",
+    description:
+      "List events from the user's Apple Calendar (macOS Calendar app only). Call this first when the user wants to move, delete, or reschedule an event—you need the event's uid. For ranges use from/to: 'today', 'tomorrow', 'next week', 'end of next week', 'next month', 'end of next month', 'this month', 'end of this month', or YYYY-MM-DD. For 'upcoming events for next week/month' use e.g. from: 'today', to: 'end of next week' or to: 'end of next month'. When the user names a specific day (e.g. 'next Saturday', 'Feb 14'), pass explicit YYYY-MM-DD for both from and to. Pass calendar: 'all' to include every calendar in Apple Calendar. Returns title, startAt, calendar name, uid, and queriedRange. Report the exact queriedRange (or fromResolved–toResolved) from the result to the user.",
+    inputSchema: {
+      type: "object",
+      properties: {
+        from: { type: "string", description: "Start of range. YYYY-MM-DD, or 'today', 'tomorrow', 'next week', 'next month', 'this month', etc." },
+        to: { type: "string", description: "End of range. Same as from for one day, or 'end of next week', 'end of next month', 'end of this month', etc." },
+        limit: { type: "number", description: "Max events to return (default 50, max 100). Higher values may be slower." },
+        calendar: {
+          type: "string",
+          description:
+            "Optional. Omit for main calendar only (fast). Use 'all' to search all calendars (slower). Or a calendar name e.g. 'Work'.",
+        },
+      },
+      additionalProperties: false,
+    },
+    risk: "read",
+    execute: runCalendarListEvents,
+  },
   {
     name: "calendar_create_event",
-    description: "Create a Calendar event.",
+    description: "Create a Calendar event. Use explicit dates/times (e.g. YYYY-MM-DD or 'Friday at 2pm') so the event is created on the correct day.",
     inputSchema: {
       type: "object",
       required: ["title", "start"],
       properties: {
         title: { type: "string" },
-        start: { type: "string" },
+        start: { type: "string", description: "Start date/time: YYYY-MM-DD, YYYY-MM-DDTHH:mm, or natural like 'Friday at 2pm'" },
         end: { type: "string" },
         location: { type: "string" },
         notes: { type: "string" },
@@ -531,19 +1261,59 @@ export const scheduleTools: ToolDefinition[] = [
     execute: runCalendarCreateEvent,
   },
   {
-    name: "calendar_list_events",
-    description: "List calendar events in a time range.",
+    name: "calendar_update_event",
+    description:
+      "Update an existing calendar event in place (reschedule, rename, change location/notes). Prefer this for rescheduling to a new time on the same calendar—it preserves recurrence and metadata. Get the event's uid from calendar_list_events first. Use when the user says reschedule, change time, or update an event. Match the user's wording to the listed event title.",
     inputSchema: {
       type: "object",
+      required: ["eventUid"],
       properties: {
-        from: { type: "string" },
-        to: { type: "string" },
-        limit: { type: "number" },
+        eventUid: { type: "string", description: "Event uid from calendar_list_events" },
+        calendar: { type: "string", description: "Calendar name from list (optional; speeds up lookup)" },
+        title: { type: "string" },
+        start: { type: "string", description: "New start date/time" },
+        end: { type: "string", description: "New end date/time" },
+        location: { type: "string" },
+        notes: { type: "string" },
       },
       additionalProperties: false,
     },
-    risk: "read",
-    execute: runCalendarListEvents,
+    risk: "write",
+    execute: runCalendarUpdateEvent,
+  },
+  {
+    name: "calendar_move_event",
+    description:
+      "Move an event by deleting the old one and creating a new event at the new start/end (same title/location/notes). Use when the user explicitly wants to 'move' and calendar_update_event is not sufficient, or when moving to another calendar. For rescheduling on the same calendar, prefer calendar_update_event (updates in place, preserves recurrence). Get the event uid from calendar_list_events first.",
+    inputSchema: {
+      type: "object",
+      required: ["eventUid", "start"],
+      properties: {
+        eventUid: { type: "string", description: "Event uid from calendar_list_events" },
+        start: { type: "string", description: "New start date/time (e.g. YYYY-MM-DD, 'Friday at 2pm')" },
+        end: { type: "string", description: "New end date/time (optional)" },
+        calendar: { type: "string", description: "Unused; event is found by uid" },
+      },
+      additionalProperties: false,
+    },
+    risk: "write",
+    execute: runCalendarMoveEvent,
+  },
+  {
+    name: "calendar_delete_event",
+    description:
+      "Delete a calendar event. Get the event's uid from calendar_list_events first. Match the user's request to the listed event (e.g. 'the midterm' or 'exam thing' may match 'studying for midterm').",
+    inputSchema: {
+      type: "object",
+      required: ["eventUid"],
+      properties: {
+        eventUid: { type: "string", description: "Event uid from calendar_list_events" },
+        calendar: { type: "string", description: "Calendar name from list (optional)" },
+      },
+      additionalProperties: false,
+    },
+    risk: "write",
+    execute: runCalendarDeleteEvent,
   },
   {
     name: "reminder_create",