Align agent schema with mail and calendar fixes

Author: dokuczacz

backend/custom_bridge/__init__.py

@@ -482,6 +482,68 @@ def handle_gmail_list(user_id: str, payload: Dict[str, Any], access_token: str |
     }
 
 
+def handle_gmail_search(user_id: str, payload: Dict[str, Any], access_token: str | None = None) -> Dict[str, Any]:
+    result = handle_gmail_list(user_id, payload, access_token=access_token)
+    result["action"] = "gmail_search"
+    result["query"] = str(payload.get("q") or "").strip()
+    return result
+
+
+def _calendar_time_object(payload: Dict[str, Any], field_name: str) -> Dict[str, Any]:
+    value = payload.get(field_name)
+    if isinstance(value, dict):
+        out: Dict[str, Any] = {}
+        for key in ("dateTime", "date", "timeZone"):
+            item = value.get(key)
+            if item is not None and str(item).strip():
+                out[key] = str(item).strip()
+        return out
+
+    def _tz() -> str:
+        return str(
+            payload.get(f"{field_name}_timeZone")
+            or payload.get(f"{field_name}TimeZone")
+            or payload.get(f"{field_name}_timezone")
+            or payload.get("timeZone")
+            or payload.get("time_zone")
+            or ""
+        ).strip()
+
+    if isinstance(value, str) and value.strip():
+        out = {"dateTime": value.strip()}
+        tz = _tz()
+        if tz:
+            out["timeZone"] = tz
+        return out
+
+    for alias in (
+        f"{field_name}_dateTime",
+        f"{field_name}DateTime",
+        f"{field_name}_datetime",
+    ):
+        candidate = payload.get(alias)
+        if isinstance(candidate, str) and candidate.strip():
+            out = {"dateTime": candidate.strip()}
+            tz = _tz()
+            if tz:
+                out["timeZone"] = tz
+            return out
+
+    for alias in (
+        f"{field_name}_date",
+        f"{field_name}Date",
+    ):
+        candidate = payload.get(alias)
+        if isinstance(candidate, str) and candidate.strip():
+            out = {"date": candidate.strip()}
+            tz = _tz()
+            if tz:
+                out["timeZone"] = tz
+            return out
+
+    return {}
+
+
 def handle_gmail_get(user_id: str, payload: Dict[str, Any], access_token: str | None = None) -> Dict[str, Any]:
     message_id = payload.get("message_id")
     if not message_id:
@@ -567,9 +629,46 @@ def handle_calendar_list_events(user_id: str, payload: Dict[str, Any], access_to
         params["timeMin"] = payload["time_min"]
     if payload.get("time_max"):
         params["timeMax"] = payload["time_max"]
-    resp = gmail.calendar_request("get", "calendars/primary/events", params=params)
-    items = resp.json().get("items", [])
-    return {"action": "calendar_list_events", "status": "ok", "account_slot": account_slot, "events": items, "count": len(items)}
+    include_all_calendars = bool(payload.get("include_all_calendars", False))
+    calendar_ids = payload.get("calendar_ids")
+    if isinstance(calendar_ids, str):
+        calendar_ids = [item.strip() for item in calendar_ids.split(",")]
+    if not isinstance(calendar_ids, list):
+        calendar_ids = []
+    calendar_ids = [str(item).strip() for item in calendar_ids if str(item).strip()]
+
+    if include_all_calendars and not calendar_ids:
+        list_resp = gmail.calendar_request("get", "users/me/calendarList", params={"minAccessRole": "reader", "showHidden": True})
+        calendars = list_resp.json().get("items", [])
+        calendar_ids = [
+            str(item.get("id") or "").strip()
+            for item in calendars
+            if isinstance(item, dict) and str(item.get("id") or "").strip()
+        ]
+
+    if not calendar_ids:
+        calendar_ids = ["primary"]
+
+    events: list[dict] = []
+    for calendar_id in calendar_ids:
+        resp = gmail.calendar_request("get", f"calendars/{calendar_id}/events", params=params)
+        items = resp.json().get("items", [])
+        for item in items:
+            if isinstance(item, dict):
+                enriched = dict(item)
+                enriched.setdefault("calendarId", calendar_id)
+                events.append(enriched)
+
+    events.sort(key=lambda item: str((item or {}).get("start", {}).get("dateTime") or (item or {}).get("start", {}).get("date") or ""))
+    return {
+        "action": "calendar_list_events",
+        "status": "ok",
+        "account_slot": account_slot,
+        "calendar_ids": calendar_ids,
+        "events": events,
+        "count": len(events),
+        "include_all_calendars": include_all_calendars,
+    }
 
 
 def handle_calendar_get_event(user_id: str, payload: Dict[str, Any], access_token: str | None = None) -> Dict[str, Any]:
@@ -585,7 +684,13 @@ def handle_calendar_get_event(user_id: str, payload: Dict[str, Any], access_toke
 def handle_calendar_create_event(user_id: str, payload: Dict[str, Any], access_token: str | None = None) -> Dict[str, Any]:
     account_slot = str(payload.get("account_slot") or "primary").strip() or "primary"
     gmail = GmailClient(user_id, access_token=access_token, account_slot=account_slot)
-    event_body = {k: payload[k] for k in ("summary", "description", "start", "end", "attendees", "location", "recurrence") if k in payload}
+    event_body = {k: payload[k] for k in ("summary", "description", "attendees", "location", "recurrence") if k in payload}
+    start = _calendar_time_object(payload, "start")
+    end = _calendar_time_object(payload, "end")
+    if start:
+        event_body["start"] = start
+    if end:
+        event_body["end"] = end
     resp = gmail.calendar_request("post", "calendars/primary/events", json=event_body)
     created = resp.json()
     return {"action": "calendar_create_event", "status": "ok", "account_slot": account_slot, "event_id": created.get("id"), "event": created}
@@ -597,7 +702,13 @@ def handle_calendar_update_event(user_id: str, payload: Dict[str, Any], access_t
         raise ValueError("event_id is required for calendar_update_event")
     account_slot = str(payload.get("account_slot") or "primary").strip() or "primary"
     gmail = GmailClient(user_id, access_token=access_token, account_slot=account_slot)
-    patch_body = {k: payload[k] for k in ("summary", "description", "start", "end", "attendees", "location", "recurrence") if k in payload}
+    patch_body = {k: payload[k] for k in ("summary", "description", "attendees", "location", "recurrence") if k in payload}
+    start = _calendar_time_object(payload, "start")
+    end = _calendar_time_object(payload, "end")
+    if start:
+        patch_body["start"] = start
+    if end:
+        patch_body["end"] = end
     resp = gmail.calendar_request("patch", f"calendars/primary/events/{event_id}", json=patch_body)
     return {"action": "calendar_update_event", "status": "ok", "account_slot": account_slot, "event": resp.json()}
 
@@ -620,6 +731,7 @@ def handle_calendar_delete_event(user_id: str, payload: Dict[str, Any], access_t
     "gmail_send": handle_gmail_send,
     "gmail_reply": handle_gmail_reply,
     "gmail_list": handle_gmail_list,
+    "gmail_search": handle_gmail_search,
     "gmail_get": handle_gmail_get,
     "gmail_trash": handle_gmail_trash,
     "gmail_delete": handle_gmail_delete,

backend/custom_gpt_tools/actions_openapi.json

@@ -121,7 +121,7 @@
         "properties": {
           "action": {
             "type": "string",
-            "description": "One of oauth_authorize|oauth_exchange|oauth_status|ensure_authorized|gmail_send|gmail_list|gmail_get|gmail_trash|gmail_delete|gmail_attachment"
+            "description": "One of oauth_authorize|oauth_exchange|oauth_status|ensure_authorized|gmail_send|gmail_list|gmail_search|gmail_get|gmail_trash|gmail_delete|gmail_attachment|gmail_accounts_list|calendar_list_events|calendar_get_event|calendar_create_event|calendar_update_event|calendar_delete_event"
           },
           "user_id": { "type": "string" },
           "payload": { "type": "object", "additionalProperties": true }

backend/tool_call_handler/__init__.py

@@ -97,7 +97,9 @@ def get_json(self):
     RESPONSES_INSTRUCTIONS = (
         "You are OmniFlow PA. Use tools for any claim about user data.\n"
         "- If asked about tasks, read/update TM.json via tools. Do not claim writes without a write tool call.\n"
-        "- If asked about Gmail, prefer gmail_recent_metadata to fetch recent message metadata; do not ask for 50 if user requested 20.\n"
+        "- If asked about Gmail, use mail.search for query-based filtering and gmail_recent_metadata for lightweight recent metadata; do not ask for 50 if user requested 20.\n"
+        "- For calendar.events.create/update, send start and end as nested objects with dateTime and timeZone.\n"
+        "- For calendar.events.list, prefer include_all_calendars=true when the user asks for their calendar broadly, and use calendar_ids to narrow to specific calendars.\n"
         "- For gmail_action gmail_send, always provide JSON with payload.to, payload.subject, payload.body.\n"
         "- For gmail_action gmail_get/gmail_trash/gmail_delete, always provide payload.message_id.\n"
         "- If a Gmail tool returns NOT_AUTHORIZED, instruct user to Connect.\n"
@@ -5184,6 +5186,49 @@ def _resolve_account_slot(default: str = "primary") -> str:
             result["enriched_count"] = len([m for m in enriched if (m.get("subject") or m.get("from") or m.get("snippet"))])
             return _capability_response("success", capability, result=result), 200
 
+        if capability == "mail.search":
+            max_results = int(arguments.get("max_results", arguments.get("limit", 20)) or 20)
+            account_slot = _resolve_account_slot()
+            query = str(arguments.get("query") or arguments.get("q") or "").strip()
+            if not query:
+                return _capability_response("error", capability, error={"code": "INVALID_REQUEST", "message": "arguments.query is required"}), 400
+            payload = {
+                "max_results": max(1, min(50, max_results)),
+                "q": query,
+                "label_ids": _mail_normalize_list(arguments.get("label_ids") or arguments.get("labelIds")),
+                "exclude_label_ids": _mail_normalize_list(arguments.get("exclude_label_ids") or arguments.get("excludeLabelIds")),
+                "include_spam_trash": bool(arguments.get("include_spam_trash", arguments.get("includeSpamTrash", False))),
+                "page_token": arguments.get("page_token") or arguments.get("pageToken"),
+                "account_slot": account_slot,
+            }
+            result = _bridge_action("gmail_search", str(effective_user_id), payload)
+            messages = list(result.get("messages") or []) if isinstance(result, dict) else []
+            metadata_limit = int(arguments.get("metadata_limit", 20) or 20)
+            metadata_limit = max(1, min(20, metadata_limit))
+            enriched: list[dict] = []
+            for idx, raw_item in enumerate(messages):
+                if not isinstance(raw_item, dict):
+                    continue
+                mid = str(raw_item.get("id") or "").strip()
+                if not mid:
+                    continue
+                message_obj: Dict[str, Any] = {}
+                if idx < metadata_limit:
+                    try:
+                        got = _bridge_action(
+                            "gmail_get",
+                            str(effective_user_id),
+                            {"message_id": mid, "format": "metadata", "account_slot": account_slot},
+                        )
+                        message_obj = dict(got.get("message") or {}) if isinstance(got, dict) else {}
+                    except Exception:
+                        message_obj = {}
+                enriched.append(_mail_enriched_row(raw_item, message_obj))
+            result["messages"] = enriched
+            result["enriched_count"] = len([m for m in enriched if (m.get("subject") or m.get("from") or m.get("snippet"))])
+            result["query"] = query
+            return _capability_response("success", capability, result=result), 200
+
         if capability == "mail.read":
             message_id = str(arguments.get("message_id") or "").strip()
             if not message_id:
@@ -5310,6 +5355,8 @@ def _to_rfc3339(val: Any) -> Any:
                 "time_min": _to_rfc3339(arguments.get("time_min")),
                 "time_max": _to_rfc3339(arguments.get("time_max")),
                 "max_results": arguments.get("max_results"),
+                "calendar_ids": arguments.get("calendar_ids") or arguments.get("calendarIds"),
+                "include_all_calendars": bool(arguments.get("include_all_calendars", arguments.get("includeAllCalendars", True))),
             }
             result = _bridge_action("calendar_list_events", str(effective_user_id), payload)
             return _capability_response("success", capability, result=result), 200

docs/shared/custom_bridge_openapi.json

@@ -29,6 +29,7 @@
           "ensure_authorized",
           "gmail_send",
           "gmail_list",
+          "gmail_search",
           "gmail_get",
           "gmail_trash",
           "gmail_delete",
@@ -58,7 +59,8 @@
         "required": [
           "action",
           "user_id"
-        ]
+        ],
+        "additionalProperties": false
       },
       "GmailGetPayload": {
         "type": "object",
@@ -92,7 +94,7 @@
     "/api/custom_bridge": {
       "post": {
         "operationId": "custom_bridge",
-        "summary": "Unified GPT tool for Gmail actions.",
+        "summary": "Unified GPT tool for Gmail and Calendar actions.",
         "requestBody": {
           "required": true,
           "content": {
@@ -163,6 +165,20 @@
                     }
                   }
                 },
+                "gmail_search": {
+                  "summary": "gmail_search example",
+                  "value": {
+                    "action": "gmail_search",
+                    "user_id": "dokuczacz@gmail.com",
+                    "payload": {
+                      "q": "in:inbox category:primary -in:spam -in:trash newer_than:7d",
+                      "label_ids": ["INBOX"],
+                      "exclude_label_ids": ["PROMOTIONS"],
+                      "include_spam_trash": false,
+                      "max_results": 10
+                    }
+                  }
+                },
                 "gmail_get": {
                   "summary": "gmail_get example",
                   "value": {
@@ -203,6 +219,58 @@
                       "attachment_id": "ATTACHMENT_ID"
                     }
                   }
+                },
+                "calendar_list_events": {
+                  "summary": "calendar_list_events example",
+                  "value": {
+                    "action": "calendar_list_events",
+                    "user_id": "dokuczacz@gmail.com",
+                    "payload": {
+                      "account_slot": "primary",
+                      "include_all_calendars": true,
+                      "max_results": 10,
+                      "time_min": "2026-05-01T00:00:00Z",
+                      "time_max": "2026-05-31T23:59:59Z"
+                    }
+                  }
+                },
+                "calendar_create_event": {
+                  "summary": "calendar_create_event example",
+                  "value": {
+                    "action": "calendar_create_event",
+                    "user_id": "dokuczacz@gmail.com",
+                    "payload": {
+                      "summary": "TEST OmniFlow Calendar",
+                      "description": "Test event",
+                      "start": {
+                        "dateTime": "2026-05-01T10:00:00",
+                        "timeZone": "Europe/Zurich"
+                      },
+                      "end": {
+                        "dateTime": "2026-05-01T10:30:00",
+                        "timeZone": "Europe/Zurich"
+                      }
+                    }
+                  }
+                },
+                "calendar_update_event": {
+                  "summary": "calendar_update_event example",
+                  "value": {
+                    "action": "calendar_update_event",
+                    "user_id": "dokuczacz@gmail.com",
+                    "payload": {
+                      "event_id": "EVENT_ID",
+                      "summary": "Updated title",
+                      "start": {
+                        "dateTime": "2026-05-01T11:00:00",
+                        "timeZone": "Europe/Zurich"
+                      },
+                      "end": {
+                        "dateTime": "2026-05-01T11:30:00",
+                        "timeZone": "Europe/Zurich"
+                      }
+                    }
+                  }
                 }
               }
             }

docs/shared/tool_call_handler_openapi.json

@@ -32,6 +32,7 @@
           "mail.status",
           "mail.authorize",
           "mail.inbox.list",
+          "mail.search",
           "mail.read",
           "mail.summarize",
           "mail.reply",
@@ -68,7 +69,7 @@
           "arguments": {
             "type": "object",
             "additionalProperties": true,
-            "description": "Capability-specific payload. For memory.interaction.save provide either (user_message + assistant_response) or (role + content). Optional per-call user override can be passed as arguments.user_id. For mail/calendar capabilities you can pass arguments.account_slot = primary|secondary. For mail.inbox.list you can pass q/query, label_ids, exclude_label_ids, include_spam_trash, page_token, and max_results/limit. For mail.authorize pass arguments.force=true to force a new OAuth consent even if a token already exists (use when token is expired or revoked)."
+            "description": "Capability-specific payload. For memory.interaction.save provide either (user_message + assistant_response) or (role + content). Optional per-call user override can be passed as arguments.user_id. For mail/calendar capabilities you can pass arguments.account_slot = primary|secondary. For calendar.events.create and calendar.events.update, send start/end as objects like {dateTime, timeZone} (or use start_dateTime/start_timeZone and end_dateTime/end_timeZone aliases). For calendar.events.list you can pass include_all_calendars=true to aggregate all accessible calendars, or calendar_ids to narrow scope. For mail.inbox.list you can pass q/query, label_ids, exclude_label_ids, include_spam_trash, page_token, and max_results/limit. For mail.search pass query (or q) plus optional label_ids, exclude_label_ids, include_spam_trash, page_token, and max_results/limit. For mail.authorize pass arguments.force=true to force a new OAuth consent even if a token already exists (use when token is expired or revoked)."
           }
         },
         "required": [
@@ -295,6 +296,7 @@
                       "arguments": {
                         "account_slot": "primary",
                         "max_results": 10,
+                        "include_all_calendars": true,
                         "time_min": "2026-03-11T00:00:00Z",
                         "time_max": "2026-03-18T00:00:00Z"
                       }
@@ -314,10 +316,12 @@
                         "summary": "Project sync",
                         "description": "Weekly team sync",
                         "start": {
-                          "dateTime": "2026-03-12T09:00:00+01:00"
+                          "dateTime": "2026-03-12T09:00:00",
+                          "timeZone": "Europe/Zurich"
                         },
                         "end": {
-                          "dateTime": "2026-03-12T09:30:00+01:00"
+                          "dateTime": "2026-03-12T09:30:00",
+                          "timeZone": "Europe/Zurich"
                         },
                         "location": "Teams"
                       }