@elizaos/agent 2.0.0-alpha.173 → 2.0.0-alpha.192

package/apps/app-lifeops/src/actions/calendar.js

@@ -1,23 +1,20 @@
 import { ModelType, parseJSONObjectFromText, parseKeyValueXml, } from "@elizaos/core";
-import { getValidationKeywordTerms, textIncludesKeywordTerm, } from "@elizaos/shared/validation-keywords";
 import { resolveDefaultTimeZone } from "../lifeops/defaults.js";
 import { LifeOpsService, LifeOpsServiceError } from "../lifeops/service.js";
 import { addDaysToLocalDate, buildUtcDateFromLocalParts, getWeekdayForLocalDate, getZonedDateParts, } from "../lifeops/time.js";
-import { collectKeywordTermMatchesForKey, hasContextSignalSyncForKey, } from "@elizaos/agent/actions/context-signal";
 import { renderGroundedActionReply } from "@elizaos/agent/actions/grounded-action-reply";
 import { calendarReadUnavailableMessage, calendarWriteUnavailableMessage, detailArray, detailBoolean, detailNumber, detailString, formatCalendarEventDateTime, formatCalendarFeed, formatNextEventContext, getGoogleCapabilityStatus, hasLifeOpsAccess, INTERNAL_URL, messageText, toActionData, } from "./lifeops-google-helpers.js";
+const CALENDAR_SUBACTION_VALUES = [
+    "feed",
+    "next_event",
+    "search_events",
+    "create_event",
+    "update_event",
+    "delete_event",
+    "trip_window",
+];
 const MIN_CREATE_EVENT_DURATION_MINUTES = 15;
-const CALENDAR_VALIDATION_CONTEXT_LIMIT = 12;
 const PARAMETER_DOC_NOISE_PATTERN = /\b(?:actions?|params?|parameters?|query\?:string|subaction\?:string|details\?:object|required parameter|supported keys include|may include:|match against titles|structured calendar arguments|structured data when needed|boolean when)\b|\b\w+\?:\w+\b/i;
-const CAL_I18N_OPTS = { includeAllLocales: true };
-const CAL_AFFIRMATIVE_TERMS = getValidationKeywordTerms("contextSignal.affirmative.strong", CAL_I18N_OPTS);
-const CAL_TEMPORAL_FOLLOWUP_TERMS = getValidationKeywordTerms("contextSignal.temporal_followup.strong", CAL_I18N_OPTS);
-const CAL_LIFEOPS_STRONG_TERMS = getValidationKeywordTerms("contextSignal.lifeops.strong", CAL_I18N_OPTS);
-const CAL_CALENDAR_STRONG_TERMS = getValidationKeywordTerms("contextSignal.calendar.strong", CAL_I18N_OPTS);
-const CAL_CALENDAR_WEAK_TERMS = getValidationKeywordTerms("contextSignal.calendar.weak", CAL_I18N_OPTS);
-function textMatchesAnyCal(text, terms) {
-    return terms.some((term) => textIncludesKeywordTerm(text, term));
-}
 const I18N_LOCALES = ["en", "zh-CN", "ko", "es", "pt", "vi", "tl"];
 function buildIntlMonthMap() {
     const map = {};
@@ -100,6 +97,86 @@ function normalizeCalendarSubaction(value) {
             return null;
     }
 }
+function buildCalendarPlanFromParsed(parsed) {
+    const shouldAct = normalizeShouldAct(parsed.shouldAct);
+    if (shouldAct === null) {
+        return null;
+    }
+    const subaction = normalizeCalendarSubaction(parsed.subaction);
+    if (shouldAct && subaction === null) {
+        return null;
+    }
+    const tripLocation = typeof parsed.tripLocation === "string" &&
+        parsed.tripLocation.trim().length > 0
+        ? parsed.tripLocation.trim()
+        : undefined;
+    const rawQueries = [];
+    if (typeof parsed.queries === "string" && parsed.queries.trim().length > 0) {
+        for (const q of parsed.queries.split(/\s*\|\|\s*/)) {
+            if (q.trim().length > 0)
+                rawQueries.push(q.trim());
+        }
+    }
+    else if (Array.isArray(parsed.queries)) {
+        for (const value of parsed.queries) {
+            if (typeof value === "string")
+                rawQueries.push(value);
+        }
+    }
+    if (typeof parsed.query === "string")
+        rawQueries.push(parsed.query);
+    if (typeof parsed.query1 === "string")
+        rawQueries.push(parsed.query1);
+    if (typeof parsed.query2 === "string")
+        rawQueries.push(parsed.query2);
+    if (typeof parsed.query3 === "string")
+        rawQueries.push(parsed.query3);
+    if (tripLocation)
+        rawQueries.push(tripLocation);
+    return {
+        subaction,
+        queries: dedupeCalendarQueries(rawQueries),
+        response: normalizePlannerResponse(parsed.response),
+        shouldAct,
+        title: typeof parsed.title === "string" && parsed.title.trim().length > 0
+            ? parsed.title.trim()
+            : undefined,
+        tripLocation,
+        timeMin: normalizeIsoDateTime(parsed.timeMin),
+        timeMax: normalizeIsoDateTime(parsed.timeMax),
+        windowLabel: normalizeWindowLabel(parsed.windowLabel ?? parsed.label),
+    };
+}
+function buildCalendarPlanRepairPrompt(args) {
+    return [
+        "Your last reply for the calendar planner was invalid or used the wrong schema.",
+        "Return ONLY valid JSON with exactly these fields:",
+        "  subaction: one of the allowed subactions below, or null when this should be reply-only/no-op",
+        "  shouldAct: boolean",
+        "  response: short natural-language reply when shouldAct is false, otherwise empty or null",
+        "  queries: array or ||-delimited string of up to 3 search queries",
+        "  title: optional event title",
+        "  tripLocation: optional trip location",
+        "  timeMin: optional ISO 8601 datetime",
+        "  timeMax: optional ISO 8601 datetime",
+        "  windowLabel: optional natural-language window label",
+        "",
+        "Use ONLY these exact subaction literals:",
+        `  ${CALENDAR_SUBACTION_VALUES.join(", ")}, or null`,
+        "Never invent synonyms such as edit_event, modify_event, reschedule_event, move_event, cancel_event, remove_event, agenda, or itinerary_window.",
+        "Map rename/reschedule/move/edit requests for an existing event to update_event.",
+        "Map delete/remove/cancel requests for an existing event to delete_event.",
+        "The user may speak in any language.",
+        "",
+        `Current timezone: ${args.timeZone}`,
+        `Current local datetime: ${args.localNow}`,
+        `Current ISO datetime: ${args.nowIso}`,
+        `Current request: ${JSON.stringify(args.currentMessage)}`,
+        `Resolved intent: ${JSON.stringify(args.intent)}`,
+        `Recent conversation: ${JSON.stringify(args.recentConversation)}`,
+        `Previous invalid output: ${JSON.stringify(args.rawResponse)}`,
+    ].join("\n");
+}
 function normalizeShouldAct(value) {
     if (typeof value === "boolean") {
         return value;
@@ -140,18 +217,6 @@ function buildCalendarReplyOnlyFallback(subaction) {
             return "What do you want to do on your calendar — check your schedule, find an event, or create one?";
     }
 }
-function looksLikeLifeReminderRequestForCalendarAction(text) {
-    const normalized = normalizeText(text);
-    if (!normalized) {
-        return false;
-    }
-    if (collectKeywordTermMatchesForKey([normalized], "calendar", {
-        includeAllLocales: true,
-    }).size > 0) {
-        return false;
-    }
-    return textMatchesAnyCal(normalized, CAL_LIFEOPS_STRONG_TERMS);
-}
 function buildCalendarServiceErrorFallback(error, intent) {
     const normalized = normalizeText(error.message);
     if (normalized.includes("utc 'z' suffix") ||
@@ -189,27 +254,6 @@ function buildCalendarEventDisambiguationFallback(args) {
         `Tell me which one to ${args.action} by giving the title and date/time.${suffix}`,
     ].join("\n");
 }
-function shouldDeleteAllMatchingCalendarEvents(args) {
-    const normalizedIntent = normalizeText(args.intent);
-    const normalizedTitleHint = normalizeText(args.titleHint ?? "");
-    const titleStartsWithQuantifier = /^(all|both|every|each)\b/.test(normalizedTitleHint);
-    if (/\b(?:remove|delete|cancel|kill|drop)\b\s+(?:the\s+)?(?:duplicates?|copies)\b/.test(normalizedIntent)) {
-        return true;
-    }
-    const quantifierMatch = normalizedIntent.match(/\b(?:remove|delete|cancel|kill|drop)\b\s+(both|all|every|each)\b/);
-    if (!quantifierMatch) {
-        return false;
-    }
-    if (titleStartsWithQuantifier) {
-        return false;
-    }
-    const quantifier = quantifierMatch[1];
-    if (quantifier === "both" && args.candidateCount !== 2) {
-        return false;
-    }
-    const trailingIntent = normalizedIntent.slice((quantifierMatch.index ?? 0) + quantifierMatch[0].length);
-    return /\b(?:matching|events?|meetings?|appointments?|invites?|entries|duplicates?|copies)\b/.test(trailingIntent);
-}
 async function renderCalendarActionReply(args) {
     const { runtime, message, state, intent, scenario, fallback, context } = args;
     return renderGroundedActionReply({
@@ -237,21 +281,6 @@ function normalizeText(value) {
 function normalizeLookupKey(value) {
     return value.toLowerCase().replace(/[^a-z0-9]/g, "");
 }
-function hasCalendarTextSignal(text) {
-    if (!text.trim()) {
-        return false;
-    }
-    if (collectKeywordTermMatchesForKey([text], "calendar", {
-        includeAllLocales: true,
-        strength: "strong",
-    }).size > 0) {
-        return true;
-    }
-    return (collectKeywordTermMatchesForKey([text], "calendar", {
-        includeAllLocales: true,
-        strength: "weak",
-    }).size >= 2);
-}
 function wordCount(value) {
     const normalized = normalizeText(value);
     if (!normalized) {
@@ -296,12 +325,6 @@ function normalizeCalendarSearchQueryValue(value) {
     const cleaned = normalizeText(value)
         .replace(/\b(?:actions?|params?|parameters?)\b[:;]*/g, "")
         .replace(/\b\w+\?:\w+(?:\s+\[[^\]]+\])?\s*-\s*/g, " ")
-        .replace(/\b(?:search|find|look(?:ing)? for|show me|check)\s+(?:my\s+)?(?:calendar|schedule)\s+for\b/g, "")
-        .replace(/\b(?:search|find|look(?:ing)? for|show me|check)\b/g, "")
-        .replace(/\b(?:on|in) my calendar\b/g, "")
-        .replace(/\b(?:today|tomorrow|tonight|this week(?:end)?|next week(?:end)?|week after(?: next)?|this month|next month|this year|next year)\b/g, "")
-        .replace(/\b(?:scheduled|coming up|happening|for me)\b/g, "")
-        .replace(/\b(?:events?|appointments?|meetings?)\b$/g, "")
         .replace(/\bsupported keys include\b.*$/g, "")
         .replace(/\bmatch against titles\b.*$/g, "")
         .replace(/\bstructured calendar arguments\b.*$/g, "")
@@ -310,7 +333,7 @@ function normalizeCalendarSearchQueryValue(value) {
         .trim();
     if (!cleaned ||
         ["calendar", "schedule", "event", "events"].includes(cleaned) ||
-        textMatchesAnyCal(cleaned, CAL_TEMPORAL_FOLLOWUP_TERMS) ||
+        cleaned.length > 160 ||
         PARAMETER_DOC_NOISE_PATTERN.test(cleaned)) {
         return undefined;
     }
@@ -349,57 +372,30 @@ function parseStateLine(line) {
     const trimmed = line.trim();
     const timestampedMatch = trimmed.match(/^\d{1,2}:\d{2}\s+\([^)]+\)\s+\[[^\]]+\]\s+(\S+)\s*:\s*(.*)/);
     if (timestampedMatch) {
+        const role = timestampedMatch[1];
+        const text = timestampedMatch[2];
+        if (!role || text === undefined) {
+            return { role: "", text: trimmed };
+        }
         return {
-            role: timestampedMatch[1].toLowerCase(),
-            text: timestampedMatch[2].trim(),
+            role: role.toLowerCase(),
+            text: text.trim(),
         };
     }
     const simpleMatch = trimmed.match(/^(user|assistant|system|owner|admin|\S+)\s*:\s*(.*)/i);
     if (simpleMatch) {
+        const role = simpleMatch[1];
+        const text = simpleMatch[2];
+        if (!role || text === undefined) {
+            return { role: "", text: trimmed };
+        }
         return {
-            role: simpleMatch[1].toLowerCase(),
-            text: simpleMatch[2].trim(),
+            role: role.toLowerCase(),
+            text: text.trim(),
         };
     }
     return { role: "", text: trimmed };
 }
-const SYSTEM_ROLE_NAMES = new Set(["assistant", "system"]);
-function splitStateTextCandidates(value) {
-    return value
-        .split(/\n+/)
-        .map((line) => parseStateLine(line).text)
-        .filter((text) => text.length > 0);
-}
-function userIntentsFromState(state) {
-    if (!state || typeof state !== "object") {
-        return [];
-    }
-    const stateRecord = state;
-    const values = stateRecord.values && typeof stateRecord.values === "object"
-        ? stateRecord.values
-        : undefined;
-    const raw = typeof values?.recentMessages === "string"
-        ? values.recentMessages
-        : typeof stateRecord.text === "string"
-            ? stateRecord.text
-            : "";
-    if (!raw) {
-        return [];
-    }
-    const agentName = typeof values?.agentName === "string" ? values.agentName.toLowerCase() : "";
-    const excludedRoles = new Set(SYSTEM_ROLE_NAMES);
-    if (agentName) {
-        excludedRoles.add(agentName);
-    }
-    return raw
-        .split(/\n+/)
-        .filter((line) => {
-        const { role } = parseStateLine(line);
-        return role.length > 0 && !excludedRoles.has(role);
-    })
-        .map((line) => parseStateLine(line).text)
-        .filter((text) => text.length > 0);
-}
 function planningConversationLines(state) {
     if (!state || typeof state !== "object") {
         return [];
@@ -422,243 +418,36 @@ function planningConversationLines(state) {
         .filter((line) => line.role.length > 0 && line.text.length > 0)
         .map((line) => `${line.role}: ${line.text}`);
 }
-function hasCalendarContextSignal(message, state) {
-    return hasContextSignalSyncForKey(message, state, "calendar", {
-        contextLimit: CALENDAR_VALIDATION_CONTEXT_LIMIT,
-    });
-}
-function stateTextCandidates(state) {
-    if (!state || typeof state !== "object") {
-        return [];
-    }
-    const stateRecord = state;
-    const values = stateRecord.values && typeof stateRecord.values === "object"
-        ? stateRecord.values
-        : undefined;
-    const candidates = [];
-    const pushText = (value) => {
-        if (typeof value === "string" && value.trim().length > 0) {
-            candidates.push(...splitStateTextCandidates(value));
-        }
-    };
-    pushText(values?.recentMessages);
-    pushText(stateRecord.text);
-    const recentMessagesData = stateRecord.recentMessagesData ?? stateRecord.recentMessages;
-    if (Array.isArray(recentMessagesData)) {
-        for (const item of recentMessagesData) {
-            if (!item || typeof item !== "object") {
-                continue;
-            }
-            const content = item.content;
-            if (!content || typeof content !== "object") {
-                continue;
-            }
-            pushText(content.text);
-        }
-    }
-    return [...new Set(candidates)];
+function resolveCalendarIntentInput(paramsIntent, message) {
+    return paramsIntent?.trim() || messageText(message).trim();
 }
-function scoreIntentCandidate(value) {
-    const normalized = normalizeText(value);
-    if (!normalized) {
-        return Number.NEGATIVE_INFINITY;
-    }
-    let score = Math.min(normalized.length, 160) / 16;
-    if (textMatchesAnyCal(normalized, CAL_AFFIRMATIVE_TERMS)) {
-        score -= 200;
-    }
-    if (PARAMETER_DOC_NOISE_PATTERN.test(normalized)) {
-        score -= 500;
-    }
-    if (hasCalendarTextSignal(value)) {
-        score += 10;
-    }
-    if (textMatchesAnyCal(normalized, CAL_CALENDAR_STRONG_TERMS)) {
-        score += 14;
-    }
-    if (textMatchesAnyCal(normalized, CAL_CALENDAR_WEAK_TERMS)) {
-        score += 10;
-    }
-    if (textMatchesAnyCal(normalized, CAL_CALENDAR_STRONG_TERMS)) {
-        score += 8;
-    }
-    return score;
-}
-function looksLikeNarrativeCalendarQuery(value) {
-    const normalized = normalizeText(value);
-    if (!normalized) {
-        return false;
-    }
-    return (/\b(?:tell me if|let me know if|whether|can you|could you|would you|do i have|are there|what(?:'s| is) on|what(?: event| events)? do i have|when do i|try to find)\b/.test(normalized) &&
-        /\b(?:calendar|schedule|event|events|flight|flights|travel|trip|appointment|meeting|hotel|stay|return)\b/.test(normalized));
-}
-function looksLikeLiteralRequestEcho(query, intent) {
-    const normalizedQuery = normalizeText(query);
-    const normalizedIntent = normalizeText(intent);
-    const questionLike = /[?¿]/.test(query);
-    if (!normalizedQuery || !normalizedIntent) {
-        return false;
-    }
-    if (normalizedQuery === normalizedIntent) {
-        return (questionLike ||
-            wordCount(normalizedQuery) >= 10 ||
-            normalizedQuery.length >= 80);
-    }
-    return ((normalizedQuery.includes(normalizedIntent) ||
-        normalizedIntent.includes(normalizedQuery)) &&
-        (questionLike || normalizedQuery.length >= 96));
-}
-function resolveCalendarIntent(paramsIntent, message, state) {
-    const normalizeFollowUpConstraint = (value) => {
-        const cleaned = value
-            .trim()
-            .replace(/^(?:yes|yeah|yep|yup|ok|okay|sure|please|please do|do it|go ahead|sounds good)\b[\s,.-]*/i, "")
-            .replace(/^(?:and\s+|also\s+)/i, "")
-            .replace(/^(?:what about|how about|and the|also the|or the|only the|just the)\s+/i, "")
-            .trim();
-        if (/^(?:try\s+(?:it|again|that)|retry|do\s+(?:it\s+)?again|one\s+more\s+time|proceed|go for it)$/i.test(cleaned)) {
-            return "";
-        }
-        return cleaned;
-    };
-    const currentMessageText = messageText(message).trim();
-    const normalizedCurrentMessage = normalizeText(currentMessageText);
-    const currentMessageHasCalendarSignal = hasCalendarTextSignal(currentMessageText);
-    const isRefinement = /^(?:what about|how about|and the|also the|or the|only the|just the)\b/i.test(normalizedCurrentMessage);
-    if (currentMessageText && currentMessageHasCalendarSignal && !isRefinement) {
-        return currentMessageText;
-    }
-    if (currentMessageText &&
-        (textMatchesAnyCal(normalizedCurrentMessage, CAL_AFFIRMATIVE_TERMS) ||
-            textMatchesAnyCal(normalizedCurrentMessage, CAL_TEMPORAL_FOLLOWUP_TERMS) ||
-            isRefinement ||
-            hasCalendarContextSignal(message, state))) {
-        const followUpCandidates = userIntentsFromState(state).filter((candidate) => hasCalendarTextSignal(candidate) &&
-            normalizeText(candidate) !== normalizedCurrentMessage);
-        const recentRelevantIntent = followUpCandidates.length > 0
-            ? followUpCandidates.reduce((best, current) => scoreIntentCandidate(current) >= scoreIntentCandidate(best)
-                ? current
-                : best)
-            : undefined;
-        if (recentRelevantIntent) {
-            const followUpConstraint = normalizeFollowUpConstraint(currentMessageText);
-            return followUpConstraint
-                ? `${recentRelevantIntent} ${followUpConstraint}`.trim()
-                : recentRelevantIntent;
+function resolveStructuredCalendarSubaction(params, details) {
+    if (detailString(details, "eventId")) {
+        if (detailString(details, "newTitle") ||
+            detailString(details, "title") ||
+            detailString(details, "startAt") ||
+            detailString(details, "endAt") ||
+            detailString(details, "description") ||
+            detailString(details, "location")) {
+            return "update_event";
         }
-    }
-    const candidates = [
-        {
-            text: paramsIntent?.trim(),
-            source: "params",
-        },
-        {
-            text: messageText(message).trim(),
-            source: "message",
-        },
-        ...stateTextCandidates(state).map((text) => ({
-            text,
-            source: "state",
-        })),
-    ].filter((candidate) => Boolean(candidate.text && candidate.text.trim().length > 0));
-    if (candidates.length === 0) {
-        return "";
-    }
-    return [...candidates]
-        .sort((left, right) => {
-        const leftBonus = left.source === "message" && hasCalendarTextSignal(left.text) ? 20 : 0;
-        const rightBonus = right.source === "message" && hasCalendarTextSignal(right.text)
-            ? 20
-            : 0;
-        return (scoreIntentCandidate(right.text) +
-            rightBonus -
-            (scoreIntentCandidate(left.text) + leftBonus));
-    })
-        .map((candidate) => candidate.text)[0];
-}
-function inferCalendarSubaction(intent, details, query) {
-    // Delete intent is checked first because phrases like "delete the duplicate
-    // event" otherwise get swept up by the search_events branch via "duplicate"
-    // → "look for". Only the verb decides the subaction here.
-    if (/\b(delete|remove|cancel|drop|get rid of|trash|kill)\b.*\b(event|meeting|appointment|calendar|reminder|invite)\b/.test(intent) ||
-        /\b(uncancel|unbook|unschedule)\b/.test(intent)) {
         return "delete_event";
     }
-    // Update intent — same eager-match treatment so "rename", "move", "reschedule"
-    // don't get pulled into search_events.
-    if (/\b(rename|reschedule|move|push|change|update|edit|modify)\b.*\b(event|meeting|appointment|calendar|invite)\b/.test(intent)) {
-        return "update_event";
-    }
-    if (query ||
-        detailString(details, "query") ||
-        /\b(find|search|look for|matching|related to|flight|flights|fly|travel|trip|return)\b/.test(intent)) {
-        return "search_events";
-    }
     if (detailString(details, "startAt") ||
+        detailString(details, "endAt") ||
+        detailString(details, "windowPreset") ||
         detailNumber(details, "durationMinutes") ||
-        /\b(create|add|book)\b/.test(intent) ||
-        /\bschedule\s+(?:a|an|this|that|the)?\s*(?:calendar\s+)?(?:meeting|event|appointment|call)\b/.test(intent) ||
-        /\bput\b.*\b(calendar|meeting|event)\b/.test(intent) ||
-        /\bmake an event\b/.test(intent)) {
+        params.title ||
+        detailString(details, "title")) {
         return "create_event";
     }
-    if (/\b(next|upcoming|soon|about to|coming up)\b/.test(intent) &&
-        /\b(event|meeting|appointment|call|calendar item|thing)\b/.test(intent)) {
-        return "next_event";
-    }
-    return "feed";
-}
-function shouldTrustExplicitCalendarSubaction(subaction, params, details) {
-    if (!subaction) {
-        return false;
-    }
-    switch (subaction) {
-        case "create_event":
-            return Boolean(params.title ||
-                detailString(details, "title") ||
-                detailString(details, "startAt") ||
-                detailString(details, "windowPreset") ||
-                detailNumber(details, "durationMinutes"));
-        case "update_event":
-            return Boolean(detailString(details, "eventId") ||
-                detailString(details, "title") ||
-                detailString(details, "newTitle") ||
-                detailString(details, "startAt") ||
-                detailString(details, "endAt"));
-        case "delete_event":
-            return Boolean(detailString(details, "eventId") ||
-                params.title ||
-                detailString(details, "title"));
-        case "search_events":
-            return Boolean(params.query ||
-                detailString(details, "query") ||
-                (params.queries?.length ?? 0) > 0 ||
-                (detailArray(details, "queries")?.length ?? 0) > 0);
-        default:
-            return false;
-    }
-}
-function cleanTripLocation(value) {
-    const cleaned = value
-        .trim()
-        .replace(/\b(?:today|tomorrow|tonight|this week(?:end)?|next week(?:end)?|this month|next month|for me|coming up|upcoming|on my calendar|on the calendar|on my schedule|on the schedule)\b.*$/i, "")
-        .replace(/^[^a-z0-9]+|[^a-z0-9]+$/gi, "")
-        .trim();
-    return cleaned.length > 0 ? cleaned : undefined;
-}
-function inferTripWindowIntent(intent) {
-    const patterns = [
-        /\bwhile\s+(?:i(?:'m| am)|im)\s+in\s+(.+?)(?=$|[?.!,])/i,
-        /\bwhen\s+(?:i(?:'m| am)|im)\s+in\s+(.+?)(?=$|[?.!,])/i,
-        /\bduring\s+(?:my\s+)?(?:trip|stay|visit)\s+(?:to|in)\s+(.+?)(?=$|[?.!,])/i,
-        /\bonce\s+(?:i(?:'m| am)|im)\s+in\s+(.+?)(?=$|[?.!,])/i,
-    ];
-    for (const pattern of patterns) {
-        const match = intent.match(pattern);
-        const location = cleanTripLocation(match?.[1] ?? "");
-        if (location) {
-            return { location };
-        }
+    if (params.query ||
+        detailString(details, "query") ||
+        (params.queries?.length ?? 0) > 0 ||
+        (detailArray(details, "queries")?.length ?? 0) > 0 ||
+        detailString(details, "timeMin") ||
+        detailString(details, "timeMax")) {
+        return "search_events";
     }
     return null;
 }
@@ -675,9 +464,17 @@ function parseExplicitLocalDate(value, timeZone) {
     }
     const monthNameMatch = normalized.match(MONTH_NAME_PATTERN);
     if (monthNameMatch) {
+        const monthName = monthNameMatch[1];
+        if (!monthName) {
+            return null;
+        }
+        const month = MONTH_MAP[normalizeLookupKey(monthName)];
+        if (month === undefined) {
+            return null;
+        }
         return {
             year: monthNameMatch[3] ? Number(monthNameMatch[3]) : localToday.year,
-            month: MONTH_MAP[normalizeLookupKey(monthNameMatch[1])],
+            month,
             day: Number(monthNameMatch[2]),
         };
     }
@@ -726,14 +523,6 @@ function getLocalTodayDate(timeZone) {
         day: localNow.day,
     };
 }
-function addMonthsToLocalDate(dateOnly, monthDelta) {
-    const utcDate = new Date(Date.UTC(dateOnly.year, dateOnly.month - 1 + monthDelta, dateOnly.day, 12, 0, 0));
-    return {
-        year: utcDate.getUTCFullYear(),
-        month: utcDate.getUTCMonth() + 1,
-        day: utcDate.getUTCDate(),
-    };
-}
 function buildLocalDateRange(timeZone, startDate, endDateExclusive, options) {
     return {
         timeMin: buildUtcDateFromLocalParts(timeZone, {
@@ -817,14 +606,11 @@ function formatCreateEventCalendarContext(context) {
     }
     return lines.join("\n");
 }
-function isPersonalCreateEvent(intent, title) {
-    return /\b(hug|wife|husband|partner|girlfriend|boyfriend|family|mom|dad|date|dinner|lunch|coffee|check in|check-in|call|text|birthday|anniversary|pick up|pickup|drop off|drop-off)\b/i.test(`${intent} ${title}`);
-}
-function resolveSuggestedCreateEventDurationMinutes(intent, title) {
-    if (isShortPreparationEvent(intent, title)) {
-        return MIN_CREATE_EVENT_DURATION_MINUTES;
-    }
-    return isPersonalCreateEvent(intent, title) ? 15 : 60;
+// Fallback default duration when neither the user nor the LLM supplies one.
+// Specialization (personal vs work vs prep) is now handled by the LLM during
+// inferCreateEventDetails — never by English keyword regex.
+function resolveSuggestedCreateEventDurationMinutes() {
+    return 60;
 }
 function roundUpToStep(value, step) {
     return Math.ceil(value / step) * step;
@@ -857,14 +643,12 @@ function busyWindowsForLocalDate(events, targetDate, timeZone) {
     }
     return windows.sort((left, right) => left.startMinute - right.startMinute);
 }
-function resolvePreferredCreateEventMinutes(intent, title, targetDate) {
+// Preferred slot ordering for tentative event scheduling. Locale-agnostic:
+// weekdays prefer mid-morning through evening, weekends prefer late morning
+// and afternoon. Specific category preferences (personal vs work) are now
+// supplied by the LLM via inferCreateEventDetails — not by English regex.
+function resolvePreferredCreateEventMinutes(targetDate) {
     const weekday = getWeekdayForLocalDate(targetDate);
-    if (isPersonalCreateEvent(intent, title)) {
-        return [19 * 60, 20 * 60, 18 * 60 + 30, 17 * 60 + 30];
-    }
-    if (/\b(dentist|doctor|therapy|appointment|meeting|interview|review|sync)\b/i.test(`${intent} ${title}`)) {
-        return [9 * 60, 10 * 60, 11 * 60, 14 * 60, 15 * 60];
-    }
     return weekday === 0 || weekday === 6
         ? [10 * 60, 13 * 60, 18 * 60]
         : [9 * 60, 11 * 60, 14 * 60, 16 * 60, 19 * 60];
@@ -897,11 +681,11 @@ function suggestCreateEventStartAt(args) {
     if (!targetDate) {
         return null;
     }
-    const durationMinutes = resolveSuggestedCreateEventDurationMinutes(args.intent, args.title);
+    const durationMinutes = resolveSuggestedCreateEventDurationMinutes();
     const busyWindows = busyWindowsForLocalDate(args.calendarContext.feed.events, targetDate, args.calendarContext.calendarTimeZone);
     const startMinute = chooseSuggestedCreateEventMinute({
         busyWindows,
-        preferredMinutes: resolvePreferredCreateEventMinutes(args.intent, args.title, targetDate),
+        preferredMinutes: resolvePreferredCreateEventMinutes(targetDate),
         durationMinutes,
     });
     if (startMinute === null) {
@@ -927,6 +711,7 @@ async function loadCreateEventCalendarContext(service, details, hasCalendarRead)
     const feed = await service.getCalendarFeed(INTERNAL_URL, {
         mode: detailString(details, "mode"),
         side: detailString(details, "side"),
+        grantId: detailString(details, "grantId"),
         calendarId: detailString(details, "calendarId"),
         timeZone: requestTimeZone,
         forceSync: detailBoolean(details, "forceSync"),
@@ -974,56 +759,6 @@ function resolveCalendarLlmWindow(llmPlan) {
         label: normalizeWindowLabel(llmPlan?.windowLabel) ?? "for the requested window",
     };
 }
-function resolveWeekendWindow(timeZone, modifier) {
-    const localToday = getLocalTodayDate(timeZone);
-    const currentWeekday = getWeekdayForLocalDate(localToday);
-    let startOffsetDays = (6 - currentWeekday + 7) % 7;
-    let endOffsetFromToday = startOffsetDays + 2;
-    if (modifier === "this" && (currentWeekday === 6 || currentWeekday === 0)) {
-        startOffsetDays = 0;
-        endOffsetFromToday = currentWeekday === 6 ? 2 : 1;
-    }
-    if (modifier === "next") {
-        startOffsetDays += 7;
-        endOffsetFromToday += 7;
-    }
-    const startDay = addDaysToLocalDate(localToday, startOffsetDays);
-    const endDay = addDaysToLocalDate(localToday, endOffsetFromToday);
-    return buildLocalDateRange(timeZone, startDay, endDay);
-}
-function resolveMonthWindow(timeZone, modifier) {
-    const localToday = getLocalTodayDate(timeZone);
-    if (modifier === "this") {
-        const endOfWindow = addMonthsToLocalDate({
-            year: localToday.year,
-            month: localToday.month,
-            day: 1,
-        }, 1);
-        return buildLocalDateRange(timeZone, localToday, endOfWindow);
-    }
-    const startOfNextMonth = addMonthsToLocalDate({
-        year: localToday.year,
-        month: localToday.month,
-        day: 1,
-    }, 1);
-    const startOfFollowingMonth = addMonthsToLocalDate(startOfNextMonth, 1);
-    return buildLocalDateRange(timeZone, startOfNextMonth, startOfFollowingMonth);
-}
-function resolveTonightWindow(timeZone) {
-    const localNow = getZonedDateParts(new Date(), timeZone);
-    const startHour = Math.max(localNow.hour, 17);
-    const startMinute = localNow.hour >= 17 ? localNow.minute : 0;
-    const startDay = {
-        year: localNow.year,
-        month: localNow.month,
-        day: localNow.day,
-    };
-    const endDay = addDaysToLocalDate(startDay, 1);
-    return buildLocalDateRange(timeZone, startDay, endDay, {
-        startHour,
-        startMinute,
-    });
-}
 // Wide window used by update_event / delete_event lookups when the user
 // gave no time hint. Reaches 1 year back and 5 years forward — far enough
 // to find a future birthday or a recent past meeting without scanning the
@@ -1031,7 +766,7 @@ function resolveTonightWindow(timeZone) {
 function buildWideLookupRange(timeZone) {
     return buildLocalDayRange(timeZone, -365, 365 * 5);
 }
-function resolveCalendarWindow(intent, details, forSearch, llmPlan) {
+function resolveCalendarWindow(_intent, details, forSearch, llmPlan) {
     const timeMin = detailString(details, "timeMin");
     const timeMax = detailString(details, "timeMax");
     const calendarId = detailString(details, "calendarId");
@@ -1062,149 +797,6 @@ function resolveCalendarWindow(intent, details, forSearch, llmPlan) {
             label: llmWindow.label,
         };
     }
-    const normalizedIntent = normalizeText(intent);
-    const explicitDate = parseExplicitLocalDate(normalizedIntent, timeZone);
-    if (explicitDate) {
-        const nextDate = addDaysToLocalDate(explicitDate, 1);
-        const explicitDateLabel = (normalizedIntent.match(/(?:on|for)\s+(.+)$/i)?.[1] ?? normalizedIntent)
-            .replace(/^(?:on|for)\s+/i, "")
-            .trim();
-        return {
-            request: {
-                calendarId,
-                timeZone,
-                forceSync,
-                timeMin: buildUtcDateFromLocalParts(timeZone, {
-                    year: explicitDate.year,
-                    month: explicitDate.month,
-                    day: explicitDate.day,
-                    hour: 0,
-                    minute: 0,
-                    second: 0,
-                }).toISOString(),
-                timeMax: buildUtcDateFromLocalParts(timeZone, {
-                    year: nextDate.year,
-                    month: nextDate.month,
-                    day: nextDate.day,
-                    hour: 0,
-                    minute: 0,
-                    second: 0,
-                }).toISOString(),
-            },
-            label: `on ${explicitDateLabel}`,
-        };
-    }
-    if (/\btonight\b/.test(normalizedIntent)) {
-        return {
-            request: {
-                calendarId,
-                timeZone,
-                forceSync,
-                ...resolveTonightWindow(timeZone),
-            },
-            label: "tonight",
-        };
-    }
-    if (/\bnext week\b/.test(normalizedIntent) &&
-        /\b(?:week after next|the week after)\b/.test(normalizedIntent)) {
-        return {
-            request: {
-                calendarId,
-                timeZone,
-                forceSync,
-                ...buildLocalDayRange(timeZone, 7, 21),
-            },
-            label: "next week or the week after",
-        };
-    }
-    if (/\btomorrow\b/.test(normalizedIntent)) {
-        return {
-            request: {
-                calendarId,
-                timeZone,
-                forceSync,
-                ...buildLocalDayRange(timeZone, 1, 2),
-            },
-            label: "tomorrow",
-        };
-    }
-    if (/\bnext weekend\b/.test(normalizedIntent)) {
-        return {
-            request: {
-                calendarId,
-                timeZone,
-                forceSync,
-                ...resolveWeekendWindow(timeZone, "next"),
-            },
-            label: "next weekend",
-        };
-    }
-    if (/\b(?:this weekend|weekend)\b/.test(normalizedIntent)) {
-        return {
-            request: {
-                calendarId,
-                timeZone,
-                forceSync,
-                ...resolveWeekendWindow(timeZone, "this"),
-            },
-            label: "this weekend",
-        };
-    }
-    if (/\b(?:week after next|the week after)\b/.test(normalizedIntent)) {
-        return {
-            request: {
-                calendarId,
-                timeZone,
-                forceSync,
-                ...buildLocalDayRange(timeZone, 14, 21),
-            },
-            label: "the week after next",
-        };
-    }
-    if (/\bnext week\b/.test(normalizedIntent)) {
-        return {
-            request: {
-                calendarId,
-                timeZone,
-                forceSync,
-                ...buildLocalDayRange(timeZone, 7, 14),
-            },
-            label: "next week",
-        };
-    }
-    if (/\b(this week|week)\b/.test(normalizedIntent)) {
-        return {
-            request: {
-                calendarId,
-                timeZone,
-                forceSync,
-                ...buildLocalDayRange(timeZone, 0, 7),
-            },
-            label: "this week",
-        };
-    }
-    if (/\bnext month\b/.test(normalizedIntent)) {
-        return {
-            request: {
-                calendarId,
-                timeZone,
-                forceSync,
-                ...resolveMonthWindow(timeZone, "next"),
-            },
-            label: "next month",
-        };
-    }
-    if (/\bthis month\b/.test(normalizedIntent)) {
-        return {
-            request: {
-                calendarId,
-                timeZone,
-                forceSync,
-                ...resolveMonthWindow(timeZone, "this"),
-            },
-            label: "this month",
-        };
-    }
     const windowDays = detailNumber(details, "windowDays");
     if (forSearch) {
         const days = windowDays && windowDays > 0 ? Math.min(windowDays, 90) : 30;
@@ -1262,135 +854,6 @@ function resolveTripWindowRequest(details, llmPlan) {
         ...buildLocalDayRange(timeZone, 0, days),
     };
 }
-function inferCalendarSearchQuery(intent) {
-    const normalizedIntent = normalizeText(intent);
-    if (/\b(flight|flights|fly|flying|travel|trip)\b/.test(normalizedIntent)) {
-        const locationMatch = normalizedIntent.match(/\b(?:from|to)\s+(.+?)(?=\b(?:today|tomorrow|tonight|this week(?:end)?|next week(?:end)?|week after(?: next)?|this month|next month|this year|next year|or|and|please|idk|i dk|i don't know)\b|[?.!,]|$)/i);
-        const parts = ["flight"];
-        if (/\b(return|back|home)\b/.test(normalizedIntent)) {
-            parts.push("return");
-        }
-        const location = normalizeCalendarSearchQueryValue(locationMatch?.[1] ?? "");
-        if (location) {
-            parts.push(location);
-        }
-        return normalizeCalendarSearchQueryValue(parts.join(" ")) ?? "flight";
-    }
-    const dateMatch = normalizedIntent.match(/\b(?:on|for)\s+((?:jan(?:uary)?|feb(?:ruary)?|mar(?:ch)?|apr(?:il)?|may|jun(?:e)?|jul(?:y)?|aug(?:ust)?|sep(?:t(?:ember)?)?|oct(?:ober)?|nov(?:ember)?|dec(?:ember)?)\.?\s+\d{1,2}(?:st|nd|rd|th)?(?:,?\s+\d{4})?|\d{1,2}[/-]\d{1,2}(?:[/-]\d{2,4})?|\d{4}-\d{1,2}-\d{1,2})\b/i);
-    const normalizedDate = normalizeCalendarSearchQueryValue(dateMatch?.[1]);
-    if (normalizedDate) {
-        return normalizedDate;
-    }
-    const patterns = [
-        /^(?:please\s+)?(?:find|search(?: for)?|look(?:ing)? for|show me)\s+(.+)$/i,
-        /^(?:please\s+)?(?:do i have|are there)\s+(?:any\s+)?(.+?)(?:\?|$)/i,
-        /^(?:please\s+)?(?:check|look|see)\s+(?:my\s+)?calendar\s+for\s+(.+?)(?:\?|$)/i,
-        /^what\s+(?:event|events)\s+do\s+i\s+have\s+(?:on|for)\s+(.+?)(?:\?|$)/i,
-        /^(?:please\s+)?any\s+(.+?)(?:\?|$)/i,
-    ];
-    for (const pattern of patterns) {
-        const match = normalizedIntent.match(pattern);
-        const value = normalizeCalendarSearchQueryValue(match?.[1] ?? "");
-        if (value) {
-            return value;
-        }
-    }
-    return undefined;
-}
-function inferCalendarSearchQueries(intent) {
-    const normalizedIntent = normalizeText(intent);
-    const queries = new Set();
-    const push = (value) => {
-        const normalized = normalizeCalendarSearchQueryValue(value);
-        if (normalized) {
-            queries.add(normalized);
-        }
-    };
-    push(inferCalendarSearchQuery(intent));
-    if (/\b(return|back|home)\b/.test(normalizedIntent)) {
-        const locationMatch = normalizedIntent.match(/\b(?:from|to)\s+(.+?)(?=\b(?:today|tomorrow|tonight|this week(?:end)?|next week(?:end)?|week after(?: next)?|this month|next month|this year|next year|or|and|please|idk|i dk|i don't know)\b|[?.!,]|$)/i);
-        const location = normalizeCalendarSearchQueryValue(locationMatch?.[1] ?? "");
-        push(`return flight${location ? ` ${location}` : ""}`);
-        if (location) {
-            push(`flight back ${location}`);
-            push(`${location} return flight`);
-        }
-    }
-    return [...queries];
-}
-function sanitizeCalendarQuery(query, intent) {
-    if (!query) {
-        return undefined;
-    }
-    const raw = normalizeText(query);
-    if (PARAMETER_DOC_NOISE_PATTERN.test(raw) ||
-        raw.includes("supported keys include") ||
-        raw.includes("match against titles") ||
-        raw.includes("structured calendar arguments")) {
-        return undefined;
-    }
-    const cleaned = normalizeCalendarSearchQueryValue(query);
-    if (!cleaned ||
-        PARAMETER_DOC_NOISE_PATTERN.test(cleaned) ||
-        textMatchesAnyCal(cleaned, CAL_TEMPORAL_FOLLOWUP_TERMS) ||
-        looksLikeLiteralRequestEcho(cleaned, intent) ||
-        cleaned.length > 160) {
-        return undefined;
-    }
-    const inferred = inferCalendarSearchQuery(intent);
-    if (inferred &&
-        looksLikeNarrativeCalendarQuery(cleaned) &&
-        normalizeText(inferred) !== normalizeText(cleaned)) {
-        return undefined;
-    }
-    return cleaned;
-}
-function scoreCalendarQueryCandidate(query, intent) {
-    const normalized = normalizeText(query);
-    if (!normalized) {
-        return Number.NEGATIVE_INFINITY;
-    }
-    let score = 0;
-    if (PARAMETER_DOC_NOISE_PATTERN.test(normalized)) {
-        score -= 500;
-    }
-    if (looksLikeNarrativeCalendarQuery(normalized)) {
-        score -= 120;
-    }
-    if (looksLikeLiteralRequestEcho(query, intent)) {
-        score -= 120;
-    }
-    if (textMatchesAnyCal(normalized, CAL_TEMPORAL_FOLLOWUP_TERMS)) {
-        score -= 120;
-    }
-    const tokens = tokenizeForSearch(normalized);
-    if (tokens.length <= 4) {
-        score += 12;
-    }
-    else if (tokens.length >= 8) {
-        score -= 15;
-    }
-    const inferredQueries = inferCalendarSearchQueries(intent).map((value) => normalizeText(value));
-    if (inferredQueries.includes(normalized)) {
-        score += 60;
-    }
-    for (const inferredQuery of inferredQueries) {
-        if (!inferredQuery) {
-            continue;
-        }
-        if (normalized.includes(inferredQuery) ||
-            inferredQuery.includes(normalized)) {
-            score += 18;
-        }
-        const inferredTokens = new Set(tokenizeForSearch(inferredQuery));
-        score += tokens.filter((token) => inferredTokens.has(token)).length * 8;
-    }
-    if (/\b(flight|flights|travel|trip|return|back|home)\b/.test(normalizeText(intent)) &&
-        /\b(flight|flights|travel|trip|return|back|home)\b/.test(normalized)) {
-        score += 12;
-    }
-    return score;
-}
 function eventDateSearchTerms(event) {
     const formatter = (options) => new Intl.DateTimeFormat("en-US", {
         timeZone: event.timezone || undefined,
@@ -1421,9 +884,6 @@ function eventDateSearchTerms(event) {
         weekdayShort,
     ].map((term) => normalizeText(term)));
 }
-async function extractCalendarSearchQueriesWithLlm(runtime, message, state, intent, timeZone) {
-    return (await extractCalendarPlanWithLlm(runtime, message, state, intent, timeZone)).queries;
-}
 export async function extractCalendarPlanWithLlm(runtime, message, state, intent, timeZone = resolveDefaultTimeZone()) {
     const recentConversation = formatCreateEventRecentConversation(state);
     const currentMessage = messageText(message).trim();
@@ -1462,16 +922,20 @@ export async function extractCalendarPlanWithLlm(runtime, message, state, intent
         "  update_event — rename, reschedule, move, or edit an existing event (e.g. 'rename my meeting to standup', 'reschedule the dentist to Friday', 'move the call to 3pm')",
         "  delete_event — remove or cancel an existing event (e.g. 'delete the team meeting', 'cancel my appointment', 'remove the duplicate event')",
         "  trip_window — query what's happening during a trip or stay in a specific place (e.g. 'what's happening while I'm in Denver', 'my Tokyo itinerary')",
+        "Use only the exact subaction literals listed above.",
+        "Do not invent aliases like edit_event, modify_event, reschedule_event, move_event, cancel_event, remove_event, agenda, or itinerary_window.",
         "",
-        "For feed, search_events, or trip_window, infer an exact timeMin/timeMax window when the request names or implies a date or date range.",
+        "For feed, search_events, trip_window, update_event, or delete_event, infer an exact timeMin/timeMax window when the request names or implies a date or date range.",
         "timeMin and timeMax must be ISO 8601 datetimes that the API can use directly.",
         "windowLabel should be a short natural-language label like on monday, this weekend, next month, or tonight.",
-        "For search_events or trip_window, extract up to 3 short search queries.",
+        "For search_events, update_event, delete_event, or trip_window, extract up to 3 short search queries.",
         "Preserve names, places, and keywords in their original language or script when useful.",
         "Convert time constraints into concise searchable dates or windows even if the user phrases them in another language.",
         "Focus on people, places, flights, itinerary, appointments, and explicit dates.",
         "If the request is about a date, include a date query like april 12 or 2026-04-12.",
         "If the request asks what is happening while the user is in a place, use trip_window and include tripLocation.",
+        "For update_event or delete_event, use queries to identify the existing target event and title for the new title only when the user is renaming it.",
+        "For requests like all events, full schedule, everything on my calendar, or a broad itinerary sweep, return a broad timeMin/timeMax window instead of relying on downstream heuristics.",
         "",
         "Examples:",
         '  "what\'s on my calendar tomorrow" → {"subaction":"feed","shouldAct":true,"response":null}',
@@ -1479,6 +943,7 @@ export async function extractCalendarPlanWithLlm(runtime, message, state, intent
         '  "find my return flight" → {"subaction":"search_events","shouldAct":true,"response":null,"queries":["return flight"]}',
         '  "what do I have while I\'m in Tokyo" → {"subaction":"trip_window","shouldAct":true,"response":null,"queries":["tokyo"],"tripLocation":"Tokyo"}',
         '  "rename my meeting to standup" → {"subaction":"update_event","shouldAct":true,"response":null,"queries":["meeting"],"title":"standup"}',
+        '  "Cambia la cita del dentista al viernes" → {"subaction":"update_event","shouldAct":true,"response":null,"queries":["cita del dentista"],"windowLabel":"el viernes"}',
         '  "delete the team meeting tomorrow" → {"subaction":"delete_event","shouldAct":true,"response":null,"queries":["team meeting"]}',
         '  "can you help me with my calendar?" → {"subaction":null,"shouldAct":false,"response":"What do you want to do on your calendar — check your schedule, find an event, or create one?","queries":[]}',
         "",
@@ -1502,6 +967,11 @@ export async function extractCalendarPlanWithLlm(runtime, message, state, intent
         "</recent_conversation>",
     ].join("\n");
     let rawResponse = "";
+    const parseResponse = (raw) => {
+        const parsed = parseKeyValueXml(raw) ??
+            parseJSONObjectFromText(raw);
+        return parsed ? buildCalendarPlanFromParsed(parsed) : null;
+    };
     try {
         const result = await runtime.useModel(ModelType.TEXT_LARGE, {
             prompt,
@@ -1519,98 +989,62 @@ export async function extractCalendarPlanWithLlm(runtime, message, state, intent
             shouldAct: null,
         };
     }
-    const parsed = parseKeyValueXml(rawResponse) ??
-        parseJSONObjectFromText(rawResponse);
-    if (!parsed) {
+    const parsedPlan = parseResponse(rawResponse);
+    if (parsedPlan) {
+        return parsedPlan;
+    }
+    try {
+        const repairResult = await runtime.useModel(ModelType.TEXT_LARGE, {
+            prompt: buildCalendarPlanRepairPrompt({
+                currentMessage,
+                intent,
+                recentConversation,
+                rawResponse,
+                timeZone,
+                nowIso,
+                localNow,
+            }),
+        });
+        const repairedRaw = typeof repairResult === "string" ? repairResult : "";
+        return (parseResponse(repairedRaw) ?? {
+            subaction: null,
+            queries: [],
+            shouldAct: null,
+        });
+    }
+    catch (error) {
+        runtime.logger?.warn?.({
+            src: "action:calendar",
+            error: error instanceof Error ? error.message : String(error),
+        }, "Calendar action repair model call failed");
         return {
             subaction: null,
             queries: [],
             shouldAct: null,
         };
     }
-    const tripLocation = typeof parsed.tripLocation === "string" &&
-        parsed.tripLocation.trim().length > 0
-        ? parsed.tripLocation.trim()
-        : undefined;
-    // Extract queries from multiple possible shapes:
-    // - TOON string: "flight || dentist" (split on ||)
-    // - TOON single: "return flight" (no delimiter)
-    // - JSON array: ["flight", "dentist"]
-    // - Numbered fallbacks: query1, query2, query3
-    const rawQueries = [];
-    if (typeof parsed.queries === "string" && parsed.queries.trim().length > 0) {
-        for (const q of parsed.queries.split(/\s*\|\|\s*/)) {
-            if (q.trim().length > 0)
-                rawQueries.push(q.trim());
-        }
-    }
-    else if (Array.isArray(parsed.queries)) {
-        for (const value of parsed.queries) {
-            if (typeof value === "string")
-                rawQueries.push(value);
-        }
-    }
-    if (typeof parsed.query === "string")
-        rawQueries.push(parsed.query);
-    if (typeof parsed.query1 === "string")
-        rawQueries.push(parsed.query1);
-    if (typeof parsed.query2 === "string")
-        rawQueries.push(parsed.query2);
-    if (typeof parsed.query3 === "string")
-        rawQueries.push(parsed.query3);
-    if (tripLocation)
-        rawQueries.push(tripLocation);
-    return {
-        subaction: normalizeCalendarSubaction(parsed.subaction),
-        queries: dedupeCalendarQueries(rawQueries),
-        response: normalizePlannerResponse(parsed.response),
-        shouldAct: normalizeShouldAct(parsed.shouldAct),
-        title: typeof parsed.title === "string" && parsed.title.trim().length > 0
-            ? parsed.title.trim()
-            : undefined,
-        tripLocation,
-        timeMin: normalizeIsoDateTime(parsed.timeMin),
-        timeMax: normalizeIsoDateTime(parsed.timeMax),
-        windowLabel: normalizeWindowLabel(parsed.windowLabel ?? parsed.label),
-    };
 }
-async function resolveCalendarSearchQueries(runtime, message, state, explicitQueries, intent, llmPlan, timeZone) {
-    const providedQueries = dedupeCalendarQueries(explicitQueries.map((query) => sanitizeCalendarQuery(query, intent)));
-    const heuristicQueries = inferCalendarSearchQueries(intent);
-    const llmQueries = llmPlan && llmPlan.queries.length > 0
-        ? llmPlan.queries
-        : await extractCalendarSearchQueriesWithLlm(runtime, message, state, intent, timeZone);
-    const stateQueries = userIntentsFromState(state)
-        .reverse()
-        .flatMap((candidate) => inferCalendarSearchQueries(candidate));
-    const candidates = dedupeCalendarQueries([
-        ...providedQueries,
-        ...llmQueries,
-        ...heuristicQueries,
-        ...stateQueries,
-    ].map((query) => sanitizeCalendarQuery(query, intent)));
-    return [...candidates].sort((left, right) => scoreCalendarQueryCandidate(right, intent) -
-        scoreCalendarQueryCandidate(left, intent));
-}
-function inferCreateEventTitle(intent) {
-    const patterns = [
-        /\b(?:create|add|schedule|book|put)\s+(?:a|an|the)?\s*(.+?)(?=\b(?:for|on|at|tomorrow|today|tonight|next|this|from)\b|[?.!,]|$)/i,
-        /\b(?:meeting|appointment|call|event)\s+(?:with|for)\s+(.+?)(?=\b(?:for|on|at|tomorrow|today|tonight|next|this|from)\b|[?.!,]|$)/i,
-    ];
-    for (const pattern of patterns) {
-        const match = intent.match(pattern);
-        const value = match?.[1]?.trim();
-        if (value && !/^(calendar|event|meeting|appointment|call)$/i.test(value)) {
-            return value.replace(/\s+/g, " ").trim();
-        }
-    }
-    return undefined;
+function resolveCalendarSearchQueries(args) {
+    return dedupeCalendarQueries([
+        ...args.explicitQueries,
+        ...(args.llmPlan?.queries ?? []),
+        ...(args.fallbackQueries ?? []),
+    ]);
 }
-function isShortPreparationEvent(intent, title) {
-    return /\b(get ready|ready for|prep|prepare|packing|pack|leave for|head to|airport|flight|reminder|remind me)\b/i.test(`${intent} ${title}`);
+function normalizeIsShortPreparationFlag(value) {
+    if (typeof value === "boolean")
+        return value;
+    if (typeof value === "string") {
+        const normalized = value.trim().toLowerCase();
+        if (normalized === "true")
+            return true;
+        if (normalized === "false")
+            return false;
+    }
+    return false;
 }
 function resolveCreateEventDurationMinutes(args) {
-    const { explicitDuration, extractedDuration, intent, title, hasExplicitEndAt, hasExplicitWindowPreset, hasExplicitStartAt, } = args;
+    const { explicitDuration, extractedDuration, isShortPreparation, hasExplicitEndAt, hasExplicitWindowPreset, hasExplicitStartAt, } = args;
     if (typeof explicitDuration === "number" &&
         Number.isFinite(explicitDuration)) {
         return explicitDuration > 0 ? explicitDuration : undefined;
@@ -1620,14 +1054,14 @@ function resolveCreateEventDurationMinutes(args) {
         if (extractedDuration > 0) {
             return extractedDuration;
         }
-        if (isShortPreparationEvent(intent, title) &&
+        if (isShortPreparation &&
             (hasExplicitStartAt || hasExplicitWindowPreset)) {
             return MIN_CREATE_EVENT_DURATION_MINUTES;
         }
         return undefined;
     }
     if (!hasExplicitEndAt &&
-        isShortPreparationEvent(intent, title) &&
+        isShortPreparation &&
         (hasExplicitStartAt || hasExplicitWindowPreset)) {
         return MIN_CREATE_EVENT_DURATION_MINUTES;
     }
@@ -1703,8 +1137,7 @@ function buildCreateEventRequest(args) {
     const durationMinutes = resolveCreateEventDurationMinutes({
         explicitDuration: explicitDuration,
         extractedDuration,
-        intent: args.intent,
-        title: title ?? args.fallbackRequest?.title ?? "",
+        isShortPreparation: normalizeIsShortPreparationFlag(args.extractedDetails.isShortPreparation),
         hasExplicitEndAt: Boolean(rawEndAt),
         hasExplicitWindowPreset: Boolean(resolvedWindowPreset),
         hasExplicitStartAt: Boolean(resolvedStartAt),
@@ -1719,6 +1152,7 @@ function buildCreateEventRequest(args) {
         request: {
             mode: detailString(args.details, "mode") ?? args.fallbackRequest?.mode,
             side: (detailString(args.details, "side") ?? args.fallbackRequest?.side),
+            grantId: detailString(args.details, "grantId"),
             calendarId: detailString(args.details, "calendarId") ??
                 args.fallbackRequest?.calendarId,
             title: title ?? "",
@@ -1750,6 +1184,7 @@ function createEventRequestFingerprint(request) {
         calendarId: request.calendarId ?? null,
         side: request.side ?? null,
         mode: request.mode ?? null,
+        grantId: request.grantId ?? null,
     });
 }
 function formatCreateEventRecentConversation(state) {
@@ -1819,6 +1254,7 @@ async function inferCreateEventDetails(runtime, message, state, intent, calendar
         "Return XML only. No prose. Leave fields empty when unknown.",
         "If a start time or window is implied but duration is not explicit, infer a reasonable positive duration.",
         "For short prep or reminder blocks, use at least 15 minutes instead of 0.",
+        "Set isShortPreparation=true when the event is a brief prep/reminder/leave-for/get-ready block (any language) where 15 minutes is the right default.",
         "When the user gives a concrete day or date without an exact time-of-day, use the calendar context to infer a plausible open startAt in the calendar timezone. Avoid obvious overlaps with nearby events. If the calendar context is unavailable or the timing is ambiguous, leave startAt empty.",
         "Only use windowPreset for explicit 'tomorrow morning|afternoon|evening' phrasing — never as a fallback for arbitrary dates.",
         "",
@@ -1831,6 +1267,7 @@ async function inferCreateEventDetails(runtime, message, state, intent, calendar
         "  <durationMinutes>number if implied</durationMinutes>",
         "  <windowPreset>tomorrow_morning|tomorrow_afternoon|tomorrow_evening</windowPreset>",
         "  <timeZone>IANA timezone if stated</timeZone>",
+        "  <isShortPreparation>true|false</isShortPreparation>",
         "</response>",
         "",
         `Current timezone: ${timeZone}`,
@@ -2037,14 +1474,12 @@ function scoreCalendarEvent(event, query) {
         score +=
             queryTokens.filter((token) => attendeeTokenSet.has(token)).length * 8;
     }
-    if (/\b(return|back|home)\b/.test(normalizedQuery)) {
-        if (/\b(return|back|home)\b/.test(`${title} ${description}`)) {
-            score += 24;
-        }
-        else if (/\b(flight|travel|trip)\b/.test(`${title} ${description} ${location}`)) {
-            score -= 36;
-        }
-    }
+    // (Earlier revisions added an English-only "return/back/home" boost and a
+    // counter-penalty against generic flight/travel/trip events. Token matching
+    // above already covers any language; the boost was multilingual-hostile and
+    // produced wrong results when the user said the equivalent in another
+    // language. The grounded LLM disambiguation step picks the right match
+    // when token scores are tied.)
     const dateTerms = eventDateSearchTerms(event);
     if ([...dateTerms].some((term) => term === normalizedQuery ||
         normalizedQuery.includes(term) ||
@@ -2165,9 +1600,6 @@ async function groundCalendarSearchMatchesWithLlm(runtime, state, intent, querie
         return null;
     }
 }
-function isTravelEvent(event) {
-    return /\b(flight|fly|travel|trip|hotel|stay|lodging|airbnb|check[- ]?in|check[- ]?out|return|home)\b/i.test(`${event.title} ${event.description} ${event.location}`);
-}
 function eventStartMs(event) {
     return Date.parse(event.startAt);
 }
@@ -2179,10 +1611,14 @@ function eventEndMs(event) {
     return eventStartMs(event);
 }
 function resolveTripWindowEvents(events, location) {
+    // Trip-window anchoring is driven entirely by location-token matching via
+    // scoreCalendarEvent. The previous English-only "travel keyword" boost
+    // (flight/hotel/airbnb/...) was multilingual-hostile; the LLM trip_window
+    // planner already supplies a location, so location matching alone is enough.
     const anchors = events
         .map((event) => ({
         event,
-        score: scoreCalendarEvent(event, location) + (isTravelEvent(event) ? 12 : 0),
+        score: scoreCalendarEvent(event, location),
     }))
         .filter((candidate) => candidate.score > 0)
         .sort((left, right) => eventStartMs(left.event) - eventStartMs(right.event));
@@ -2215,17 +1651,20 @@ function formatTripWindowResults(events, location) {
     }
     return lines.join("\n");
 }
-function formatCalendarSearchResults(events, query, label, intent) {
+function formatCalendarSearchResults(events, query, label) {
     if (events.length === 0) {
         return `No calendar events matched "${query}" ${label}.`;
     }
     if (events.length === 1) {
-        const event = events[0];
-        const normalizedIntent = normalizeText(intent);
-        const matchingSubject = /\b(flight|flights|fly|travel|trip|return|back|home)\b/.test(`${normalizedIntent} ${query}`)
-            ? "flight"
-            : "calendar event";
-        return `Your matching ${matchingSubject} is **${event.title}** (${formatCalendarMoment(event)}).`;
+        const event = events.at(0);
+        if (!event) {
+            return `No calendar events matched "${query}" ${label}.`;
+        }
+        // The fallback wording is intentionally generic ("calendar event") so it
+        // is correct in any language. The grounded LLM reply renderer is what
+        // gives this string its final natural phrasing — no English keyword
+        // regex picks the noun anymore.
+        return `Your matching calendar event is **${event.title}** (${formatCalendarMoment(event)}).`;
     }
     const lines = [
         `Found ${events.length} calendar event${events.length === 1 ? "" : "s"} for "${query}" ${label}:`,
@@ -2284,6 +1723,11 @@ export const calendarAction = {
     similes: [
         "CALENDAR",
         "CHECK_CALENDAR",
+        "SHOW_CALENDAR_TODAY",
+        "TODAY_SCHEDULE",
+        "WEEK_AHEAD",
+        "WEEK_VIEW",
+        "WHATS_MY_NEXT_MEETING",
         "SCHEDULE_EVENT",
         "CREATE_CALENDAR_EVENT",
         "SEARCH_CALENDAR",
@@ -2291,20 +1735,33 @@ export const calendarAction = {
         "ITINERARY",
         "TRAVEL_SCHEDULE",
         "CHECK_SCHEDULE",
+        "BOOK_TIME_BLOCK",
+        "RECURRING_TIME_BLOCK",
+        "REBOOK_TRAVEL",
+    ],
+    tags: [
+        "always-include",
+        "calendar",
+        "schedule",
+        "meeting",
+        "event",
+        "recurring block",
+        "time block",
+        "travel itinerary",
     ],
     description: "Interact with Google Calendar through LifeOps. " +
         "USE this action for: viewing today's or this week's schedule; checking the next upcoming event; " +
         "searching events by title, attendee, location, or date range; creating new calendar events; " +
-        "querying travel itineraries, flights, hotel stays, and trip windows. " +
+        "requests like 'what's my next meeting?', 'show me my calendar for today', 'what does my week look like?', or 'schedule a dentist appointment next Tuesday at 3pm'; " +
+        "querying travel itineraries, flights, hotel stays, trip windows, reserving recurring time blocks, and rebooking or moving calendar-backed commitments. " +
+        "These are live calendar reads and writes, so do not answer them from provider context alone and do not fall back to NONE or REPLY when this action is available. " +
         "DO NOT use this action for email inbox work, drafting or sending emails — use GMAIL_ACTION instead. " +
         "DO NOT use this action for personal habits, goals, routines, or reminders — use LIFE instead. " +
         "This action provides the final grounded reply; do not pair it with a speculative REPLY action.",
+    descriptionCompressed: "Google Calendar via LifeOps: view schedule, search events, create events, query travel. Not for email or habits.",
     suppressPostActionContinuation: true,
-    validate: async (runtime, message, state) => {
-        if (!(await hasLifeOpsAccess(runtime, message))) {
-            return false;
-        }
-        return hasCalendarContextSignal(message, state);
+    validate: async (runtime, message) => {
+        return hasLifeOpsAccess(runtime, message);
     },
     handler: async (runtime, message, state, options, callback) => {
         if (!(await hasLifeOpsAccess(runtime, message))) {
@@ -2317,30 +1774,32 @@ export const calendarAction = {
         }
         const rawParams = options?.parameters;
         const params = rawParams ?? {};
-        const intent = resolveCalendarIntent(params.intent, message, state);
+        const intent = resolveCalendarIntentInput(params.intent, message);
         const details = normalizeCalendarDetails(params.details);
         const planningTimeZone = resolveCalendarTimeZone(details);
         const llmPlan = await extractCalendarPlanWithLlm(runtime, message, state, intent, planningTimeZone);
-        const heuristicQuery = inferCalendarSearchQuery(intent);
-        const inferredQuery = sanitizeCalendarQuery(params.query ?? detailString(details, "query"), intent);
-        const inferredQueries = dedupeCalendarQueries([
-            inferredQuery,
-            ...llmPlan.queries,
-            ...(params.queries ?? []),
-            ...(detailArray(details, "queries")?.map((value) => typeof value === "string" ? value : undefined) ?? []),
-        ]);
+        const explicitSubaction = normalizeCalendarSubaction(params.subaction);
         const explicitTitle = (typeof params.title === "string" && params.title.trim().length > 0
             ? params.title.trim()
             : undefined) ??
             detailString(details, "title") ??
             llmPlan.title;
-        const inferredTitle = explicitTitle ?? llmPlan.title ?? inferCreateEventTitle(intent);
+        const inferredTitle = explicitTitle ?? llmPlan.title;
         const tripWindowIntent = llmPlan.tripLocation && llmPlan.tripLocation.trim().length > 0
             ? { location: llmPlan.tripLocation.trim() }
-            : inferTripWindowIntent(intent);
-        const explicitSubaction = params.subaction;
-        const preferExplicitSubaction = shouldTrustExplicitCalendarSubaction(explicitSubaction, params, details);
-        const hasExplicitCalendarExecutionInput = Boolean(params.subaction ||
+            : null;
+        const searchQueries = resolveCalendarSearchQueries({
+            explicitQueries: [
+                params.query,
+                detailString(details, "query"),
+                ...(params.queries ?? []),
+                ...(detailArray(details, "queries")?.map((value) => typeof value === "string" ? value : undefined) ?? []),
+            ],
+            llmPlan,
+            fallbackQueries: [tripWindowIntent?.location],
+        });
+        const structuredSubaction = resolveStructuredCalendarSubaction(params, details);
+        const hasExplicitCalendarExecutionInput = Boolean(explicitSubaction ||
             params.title ||
             params.query ||
             (params.queries?.length ?? 0) > 0 ||
@@ -2352,46 +1811,13 @@ export const calendarAction = {
             detailString(details, "location") ||
             detailString(details, "windowPreset") ||
             detailNumber(details, "windowDays"));
-        const forcedSubaction = (() => {
-            const text = normalizeText(messageText(message));
-            if (/\b(?:rename|change|move|reschedule|push back)\b[^.?!]+\bto\b/.test(text) ||
-                /\b(rename|reschedule|update|edit|modify|change|move)\b.*\b(event|meeting|appointment|calendar|invite)\b/.test(text)) {
-                return "update_event";
-            }
-            if (/\b(delete|remove|cancel|drop|get rid of|trash|kill)\b.*\b(event|meeting|appointment|calendar|invite)\b/.test(text) ||
-                /\b(delete|remove|cancel)\b.+\b(today|tomorrow|tonight|this week|next week)\b/.test(text)) {
-                return "delete_event";
-            }
-            if (/\b(create|add|book|schedule|make|put)\b[^.?!]*\b(event|meeting|appointment|invite|calendar)\b/.test(text)) {
-                return "create_event";
-            }
-            if (/\b(show|list|tell|give|read)\b[^.?!]*\b(all|every|everything|entire|full|whole)\b[^.?!]*\b(event|events|calendar|schedule|meeting|meetings|appointment|appointments|entry|entries|agenda)\b/.test(text) ||
-                /\b(all|every|everything)\b\s+(?:my\s+)?(?:calendar|events?|meetings?|appointments?)\b/.test(text)) {
-                return "feed";
-            }
-            return null;
-        })();
-        let subaction;
-        if (tripWindowIntent) {
-            subaction = "trip_window";
-        }
-        else if (forcedSubaction) {
-            subaction = forcedSubaction;
-        }
-        else if (llmPlan.subaction && !preferExplicitSubaction) {
-            subaction = llmPlan.subaction;
-        }
-        else if (params.subaction) {
-            subaction = params.subaction;
-        }
-        else {
-            runtime.logger?.warn?.({ src: "action:calendar", intent }, "Calendar LLM plan returned no subaction; falling back to regex inference");
-            subaction = inferCalendarSubaction(normalizeText(intent), details, inferredQuery ?? heuristicQuery);
-        }
+        const subaction = explicitSubaction ??
+            llmPlan.subaction ??
+            (tripWindowIntent ? "trip_window" : null) ??
+            structuredSubaction;
         runtime.logger?.debug?.({
             src: "action:calendar",
             subaction,
-            forcedSubaction,
             rawMessage: messageText(message).slice(0, 200),
             resolvedIntent: intent.slice(0, 200),
             params: {
@@ -2419,26 +1845,25 @@ export const calendarAction = {
             fallback,
             context,
         });
-        if (!hasExplicitCalendarExecutionInput &&
-            !forcedSubaction &&
-            !tripWindowIntent &&
-            looksLikeLifeReminderRequestForCalendarAction(messageText(message))) {
-            const fallback = "That sounds like a reminder or todo rather than a calendar event. Tell me the reminder and when it should happen.";
+        if (llmPlan.shouldAct === false &&
+            !hasExplicitCalendarExecutionInput &&
+            !explicitSubaction) {
+            const fallback = llmPlan.response ?? buildCalendarReplyOnlyFallback(llmPlan.subaction);
             return respond({
                 success: true,
-                text: await renderReply("out_of_domain", fallback, {
-                    requestedDomain: "lifeops",
+                text: await renderReply("reply_only", fallback, {
+                    llmPlan,
+                    suggestedSubaction: llmPlan.subaction,
                 }),
                 data: {
                     noop: true,
-                    suggestedSubaction: null,
+                    ...(llmPlan.subaction
+                        ? { suggestedSubaction: llmPlan.subaction }
+                        : {}),
                 },
             });
         }
-        if (llmPlan.shouldAct === false &&
-            !hasExplicitCalendarExecutionInput &&
-            !forcedSubaction &&
-            !tripWindowIntent) {
+        if (!subaction) {
             const fallback = llmPlan.response ?? buildCalendarReplyOnlyFallback(llmPlan.subaction);
             return respond({
                 success: true,
@@ -2598,47 +2023,37 @@ export const calendarAction = {
                         text: calendarWriteUnavailableMessage(google),
                     });
                 }
-                // Parse "rename X to Y" / "change X to Y" patterns directly from
-                // the user message. The chat LLM tends to put only the NEW title in
-                // params.title, but we need the OLD title to find the event we're
-                // patching. Pull both halves from the literal phrase if it's there.
-                // We try the raw message first because resolveCalendarIntent may
-                // have replaced the user's text with the LLM's rewritten version,
-                // which often drops "rename" entirely.
-                const rawMessageText = messageText(message);
-                const renamePattern = /\b(?:rename|change|update|edit)\b\s+["“]?([^"”]+?)["”]?\s+(?:to|into|as)\s+["“]?([^"”]+?)["”]?(?:[.!?]|$)/i;
-                const renameMatch = rawMessageText.match(renamePattern) ?? intent.match(renamePattern);
-                const oldTitleFromIntent = renameMatch?.[1]?.trim();
-                const newTitleFromIntent = renameMatch?.[2]?.trim();
                 const explicitEventId = detailString(details, "eventId");
                 let resolvedEventId = explicitEventId;
                 let resolvedCalendarId = detailString(details, "calendarId");
                 let targetEvent = null;
-                // Same lookup-by-title fallback as delete_event so the user can say
-                // "rename my dentist appointment to dentist follow-up" without first
-                // copying an opaque google id.
                 if (!resolvedEventId) {
-                    // Use a wide lookup window — events can be far in the future
-                    // (e.g. a birthday in 2027). The default narrow window would
-                    // miss anything beyond the current day.
-                    // forceSync: true is critical here — without it the feed query
-                    // returns the local cache (life_calendar_events), which may not
-                    // contain far-future events that have never been synced before
-                    // (or any events at all if the cache was wiped). Forcing the
-                    // sync makes the bot pull a fresh window from Google so the
-                    // title-based lookup actually has events to filter against.
-                    const wideLookup = buildWideLookupRange(resolveCalendarTimeZone(details));
+                    const titleHint = searchQueries[0];
+                    if (!titleHint) {
+                        return respond({
+                            success: false,
+                            text: await renderReply("clarify_update_event_target", "Tell me which calendar event you want to change by title, person, place, or date.", {
+                                missing: ["target event"],
+                            }),
+                        });
+                    }
+                    const feedRequest = detailString(details, "timeMin") ||
+                        detailString(details, "timeMax") ||
+                        llmPlan.timeMin ||
+                        llmPlan.timeMax
+                        ? resolveCalendarWindow(intent, details, true, llmPlan).request
+                        : {
+                            calendarId: detailString(details, "calendarId"),
+                            timeZone: resolveCalendarTimeZone(details),
+                            ...buildWideLookupRange(resolveCalendarTimeZone(details)),
+                        };
                     const feed = await service.getCalendarFeed(INTERNAL_URL, {
                         mode: detailString(details, "mode"),
                         side: detailString(details, "side"),
-                        calendarId: detailString(details, "calendarId"),
-                        timeZone: resolveCalendarTimeZone(details),
+                        grantId: detailString(details, "grantId"),
                         forceSync: true,
-                        ...wideLookup,
+                        ...feedRequest,
                     });
-                    // Prefer the OLD title parsed from "rename X to Y" — explicit
-                    // title from the chat LLM almost always carries the NEW name.
-                    const titleHint = oldTitleFromIntent ?? explicitTitle ?? inferredTitle;
                     const candidates = titleHint
                         ? feed.events.filter((e) => normalizeText(e.title).includes(normalizeText(titleHint)))
                         : feed.events;
@@ -2668,47 +2083,22 @@ export const calendarAction = {
                             }),
                         });
                     }
-                    targetEvent = candidates[0];
+                    targetEvent = candidates.at(0) ?? null;
+                    if (!targetEvent) {
+                        return respond({
+                            success: false,
+                            text: await renderReply("update_event_not_found", "i couldn't find a unique event to update.", { titleHint }),
+                        });
+                    }
                     resolvedEventId = targetEvent.externalId;
                     resolvedCalendarId = targetEvent.calendarId;
                 }
-                const newTitle = newTitleFromIntent ??
-                    detailString(details, "newTitle") ??
-                    explicitTitle;
-                // Reuse the same LLM extractor that create_event uses to pull
-                // startAt / endAt / location / description out of the user's intent
-                // text. The chat LLM rarely populates `details.startAt` directly for
-                // an update — it just rewrites the intent and lets the action figure
-                // out the time. Without this we'd PATCH with no fields and the
-                // event wouldn't actually move.
-                //
-                // CRITICAL: only run the extractor when the user actually mentioned
-                // a time. For pure rename intents like "rename X to Y" the LLM will
-                // happily hallucinate a startAt from the year in the new title
-                // ("rename my party 2027 to ..." → startAt 2027-01-01), and a
-                // PATCH with start.dateTime but no matching end.dateTime triggers
-                // Google's "Bad Request" rejection. Detect time keywords in the
-                // raw message before invoking the extractor.
+                const newTitle = detailString(details, "newTitle") ?? explicitTitle;
                 const explicitStartAtForUpdate = detailString(details, "startAt");
                 const explicitEndAtForUpdate = detailString(details, "endAt");
-                const rawForUpdate = normalizeText(messageText(message));
-                const hasTimeAnchor = /\b(at|on|by|from|until)\s+\d/.test(rawForUpdate) ||
-                    /\b(today|tomorrow|tonight|monday|tuesday|wednesday|thursday|friday|saturday|sunday|january|february|march|april|may|june|july|august|september|october|november|december)\b/.test(rawForUpdate) ||
-                    /\b\d{1,2}(?::\d{2})?\s*(?:am|pm)\b/.test(rawForUpdate) ||
-                    /\b\d{1,2}\/\d{1,2}(?:\/\d{2,4})?\b/.test(rawForUpdate);
-                const hasRelativeShiftCue = /\b(?:later|earlier|push back|push it back|bring forward|move forward|move back|delay|postpone|advance)\b/.test(rawForUpdate);
-                const needsTimeExtraction = (hasTimeAnchor || hasRelativeShiftCue) &&
-                    !(explicitStartAtForUpdate ||
-                        explicitEndAtForUpdate ||
-                        detailNumber(details, "durationMinutes"));
-                const shouldInferUpdateDetails = Boolean(targetEvent) &&
-                    (needsTimeExtraction ||
-                        /\b(?:rename|change|move|reschedule|update|edit|location|description|notes)\b/.test(rawForUpdate));
-                const extractedForUpdate = shouldInferUpdateDetails
+                const extractedForUpdate = targetEvent
                     ? await inferUpdateEventDetails(runtime, message, state, intent, targetEvent, targetEvent?.timezone ?? planningTimeZone)
-                    : needsTimeExtraction
-                        ? await inferCreateEventDetails(runtime, message, state, intent, null, targetEvent?.timezone ?? planningTimeZone)
-                        : {};
+                    : {};
                 const extractedStartAt = typeof extractedForUpdate.startAt === "string"
                     ? extractedForUpdate.startAt.trim()
                     : undefined;
@@ -2727,6 +2117,7 @@ export const calendarAction = {
                 const event = await service.updateCalendarEvent(INTERNAL_URL, {
                     mode: detailString(details, "mode"),
                     side: detailString(details, "side"),
+                    grantId: detailString(details, "grantId"),
                     calendarId: resolvedCalendarId,
                     eventId: resolvedEventId ?? "",
                     title: newTitle,
@@ -2760,22 +2151,24 @@ export const calendarAction = {
                 }
                 const explicitEventId = detailString(details, "eventId");
                 const calendarIdForDelete = detailString(details, "calendarId");
-                // The LLM may not know the event id directly. Fall back to a feed
-                // lookup so phrases like "delete the duplicate test event tomorrow"
-                // can resolve to a concrete event without forcing the user to copy
-                // an opaque google id from the bot's previous reply.
                 const resolvedEventId = explicitEventId;
                 let resolvedEventTitle;
                 const resolvedCalendarId = calendarIdForDelete;
                 if (!resolvedEventId) {
-                    // For delete-by-title we honor an explicit time window if the
-                    // user gave one ("delete the test event tomorrow"); otherwise we
-                    // search wide so far-future events are still findable.
-                    // forceSync: true ensures the lookup actually queries Google
-                    // instead of returning a stale (or empty) local cache.
-                    const hasExplicitWindow = /\b(today|tomorrow|tonight|this week|next week|the week after|this weekend|next weekend|weekend|this month|next month|monday|tuesday|wednesday|thursday|friday|saturday|sunday)\b/i.test(intent);
-                    const feedRequest = hasExplicitWindow
-                        ? resolveCalendarWindow(intent, details, false, llmPlan).request
+                    const titleHint = searchQueries[0];
+                    if (!titleHint) {
+                        return respond({
+                            success: false,
+                            text: await renderReply("clarify_delete_event_target", "Tell me which calendar event you want to delete by title, person, place, or date.", {
+                                missing: ["target event"],
+                            }),
+                        });
+                    }
+                    const feedRequest = detailString(details, "timeMin") ||
+                        detailString(details, "timeMax") ||
+                        llmPlan.timeMin ||
+                        llmPlan.timeMax
+                        ? resolveCalendarWindow(intent, details, true, llmPlan).request
                         : {
                             calendarId: detailString(details, "calendarId"),
                             timeZone: resolveCalendarTimeZone(details),
@@ -2784,10 +2177,10 @@ export const calendarAction = {
                     const feed = await service.getCalendarFeed(INTERNAL_URL, {
                         mode: detailString(details, "mode"),
                         side: detailString(details, "side"),
+                        grantId: detailString(details, "grantId"),
                         forceSync: true,
                         ...feedRequest,
                     });
-                    const titleHint = explicitTitle ?? inferredTitle;
                     const candidates = titleHint
                         ? feed.events.filter((e) => normalizeText(e.title).includes(normalizeText(titleHint)))
                         : feed.events;
@@ -2802,14 +2195,7 @@ export const calendarAction = {
                             }),
                         });
                     }
-                    // Detect "delete all / delete both / delete N" phrasing — when the
-                    // user explicitly opts in to multi-delete, sweep every match.
-                    const deleteAllMatch = shouldDeleteAllMatchingCalendarEvents({
-                        intent,
-                        titleHint,
-                        candidateCount: candidates.length,
-                    });
-                    if (candidates.length > 1 && !deleteAllMatch) {
+                    if (candidates.length > 1) {
                         const fallback = buildCalendarEventDisambiguationFallback({
                             action: "delete",
                             candidates,
@@ -2824,13 +2210,14 @@ export const calendarAction = {
                             }),
                         });
                     }
-                    const targets = deleteAllMatch ? candidates : [candidates[0]];
+                    const targets = candidates.slice(0, 1);
                     const deleteResults = [];
                     for (const target of targets) {
                         try {
                             await service.deleteCalendarEvent(INTERNAL_URL, {
                                 mode: detailString(details, "mode"),
                                 side: detailString(details, "side"),
+                                grantId: detailString(details, "grantId"),
                                 calendarId: target.calendarId,
                                 eventId: target.externalId,
                             });
@@ -2850,9 +2237,12 @@ export const calendarAction = {
                         title: result.title,
                         ok: result.ok,
                     }));
+                    const firstDeleteResult = deleteResults.at(0);
                     const summary = failCount === 0
                         ? targets.length === 1
-                            ? `deleted "${deleteResults[0].title}".`
+                            ? firstDeleteResult
+                                ? `deleted "${firstDeleteResult.title}".`
+                                : "deleted that event."
                             : `deleted ${okCount} matching events.`
                         : okCount === 0
                             ? `I couldn't delete those ${deleteResults.length} matching events. Try again in a bit or tell me which one to remove.`
@@ -2878,6 +2268,7 @@ export const calendarAction = {
                 await service.deleteCalendarEvent(INTERNAL_URL, {
                     mode: detailString(details, "mode"),
                     side: detailString(details, "side"),
+                    grantId: detailString(details, "grantId"),
                     calendarId: resolvedCalendarId,
                     eventId: resolvedEventId,
                 });
@@ -2901,6 +2292,7 @@ export const calendarAction = {
                 const feed = await service.getCalendarFeed(INTERNAL_URL, {
                     mode: detailString(details, "mode"),
                     side: detailString(details, "side"),
+                    grantId: detailString(details, "grantId"),
                     ...resolveTripWindowRequest(details, llmPlan),
                 });
                 const itineraryEvents = resolveTripWindowEvents(feed.events, tripWindowIntent.location);
@@ -2939,30 +2331,16 @@ export const calendarAction = {
             // events" returns "no events today" even when the calendar has
             // dozens of upcoming items. We apply this regardless of whether the
             // chat LLM picked feed or search_events because both subactions go
-            // through this code path.
-            const rawMessageNorm = normalizeText(messageText(message));
-            const wantsWideWindow = /\b(all|every|everything|entire|full|whole)\b[^.?!]*\b(event|events|calendar|schedule|meeting|meetings|appointment|appointments|entry|entries|agenda)\b/.test(rawMessageNorm) ||
-                /\b(next|past|last)\s+\d+\s*(year|years|month|months|weeks?)\b/.test(rawMessageNorm) ||
-                /\b(today\s+(?:until|through|to)\s+next\s+(?:year|month))\b/.test(rawMessageNorm) ||
-                /\bevery\s+calendar\s+entry\b/.test(rawMessageNorm);
-            const baseResolved = resolveCalendarWindow(intent, details, subaction === "search_events" || wantsWideWindow, llmPlan);
-            const request = wantsWideWindow
-                ? {
-                    ...baseResolved.request,
-                    ...buildWideLookupRange(resolveCalendarTimeZone(details)),
-                }
-                : baseResolved.request;
-            const label = wantsWideWindow
-                ? "across the full window"
-                : baseResolved.label;
+            const baseResolved = resolveCalendarWindow(intent, details, subaction === "search_events", llmPlan);
+            const request = baseResolved.request;
+            const label = baseResolved.label;
             const feed = await service.getCalendarFeed(INTERNAL_URL, {
                 mode: detailString(details, "mode"),
                 side: detailString(details, "side"),
-                forceSync: wantsWideWindow,
+                grantId: detailString(details, "grantId"),
                 ...request,
             });
             if (subaction === "search_events") {
-                const searchQueries = await resolveCalendarSearchQueries(runtime, message, state, [...inferredQueries], intent, llmPlan, planningTimeZone);
                 const query = searchQueries[0];
                 if (!query || searchQueries.length === 0) {
                     return respond({
@@ -3009,7 +2387,7 @@ export const calendarAction = {
                             .map((candidate) => candidate.event);
                     }
                 }
-                const fallback = formatCalendarSearchResults(filteredEvents, query, label, intent);
+                const fallback = formatCalendarSearchResults(filteredEvents, query, label);
                 return respond({
                     success: true,
                     text: await renderReply("search_results", fallback, {
@@ -3127,6 +2505,18 @@ export const calendarAction = {
                 },
             },
         ],
+        [
+            {
+                name: "{{name1}}",
+                content: { text: "What does my week look like?" },
+            },
+            {
+                name: "{{agentName}}",
+                content: {
+                    text: "This week's calendar includes 4 events, starting with a dentist appointment on Tuesday at 3:00 PM.",
+                },
+            },
+        ],
         [
             {
                 name: "{{name1}}",
@@ -3139,5 +2529,47 @@ export const calendarAction = {
                 },
             },
         ],
+        [
+            {
+                name: "{{name1}}",
+                content: {
+                    text: "Put a 1:1 with Alex on my calendar Thursday at 10am for 30 minutes.",
+                },
+            },
+            {
+                name: "{{agentName}}",
+                content: {
+                    text: 'Created calendar event "1:1 with Alex" for Thursday at 10:00 AM for 30 minutes.',
+                },
+            },
+        ],
+        [
+            {
+                name: "{{name1}}",
+                content: {
+                    text: "Need to book 1 hour per day for time with Jill. Any time is fine, ideally before sleep.",
+                },
+            },
+            {
+                name: "{{agentName}}",
+                content: {
+                    text: "I'll create a recurring daily one-hour block with Jill, placed before your sleep window when possible.",
+                },
+            },
+        ],
+        [
+            {
+                name: "{{name1}}",
+                content: {
+                    text: "Flag the conflict before my flight later and, if needed, help rebook the other thing.",
+                },
+            },
+            {
+                name: "{{agentName}}",
+                content: {
+                    text: "I'll check the flight against your calendar, flag the conflict, and help move the other commitment if it collides.",
+                },
+            },
+        ],
     ],
 };