@agent-native/core 0.98.8 → 0.98.9

package/corpus/templates/calendar/app/pages/CalendarView.tsx

@@ -74,6 +74,7 @@ import {
   useUpdateEvent,
   useDeleteEvent,
   useRsvpEvent,
+  findEventByCurrentOrReplacedId,
   prefetchEvents,
   shouldShowEventsSkeleton,
 } from "@/hooks/use-events";
@@ -778,12 +779,30 @@ export default function CalendarView() {
     ],
   );
 
+  useEffect(() => {
+    if (sidebarEvent) {
+      const rebound = findEventByCurrentOrReplacedId(events, sidebarEvent.id);
+      if (rebound && rebound.id !== sidebarEvent.id) setSidebarEvent(rebound);
+    }
+    if (focusedEvent) {
+      const rebound = findEventByCurrentOrReplacedId(events, focusedEvent.id);
+      if (rebound && rebound.id !== focusedEvent.id) setFocusedEvent(rebound);
+    }
+  }, [events, focusedEvent, setFocusedEvent, setSidebarEvent, sidebarEvent]);
+
   const selectedEvent = useMemo(() => {
     const candidate = sidebarEvent ?? focusedEvent;
     if (!candidate) return null;
-    return events.find((event) => event.id === candidate.id) ?? candidate;
+    return findEventByCurrentOrReplacedId(events, candidate.id) ?? candidate;
   }, [events, sidebarEvent, focusedEvent]);
 
+  const refreshedSidebarEvent = useMemo(() => {
+    if (!sidebarEvent) return null;
+    return (
+      findEventByCurrentOrReplacedId(events, sidebarEvent.id) ?? sidebarEvent
+    );
+  }, [events, sidebarEvent]);
+
   function handleNavigate(direction: "prev" | "next") {
     const fns =
       direction === "next"
@@ -1762,7 +1781,7 @@ export default function CalendarView() {
         {/* Event detail sidebar — full height, outside the calendar column */}
         {eventDetailSidebar && (
           <EventDetailPanel
-            event={sidebarEvent}
+            event={refreshedSidebarEvent}
             onClose={() => setSidebarEvent(null)}
             onDelete={handleDeleteEvent}
             onTitleSave={handleTitleSave}

package/corpus/templates/calendar/changelog/2026-07-07-working-locations-from-google-calendar-now-appear-as-native-.md

@@ -0,0 +1,6 @@
+---
+type: fixed
+date: 2026-07-07
+---
+
+Working locations now appear in a dedicated non-blocking lane and can be changed between Home, Office, and Other for one day or an entire recurring series.

package/corpus/templates/calendar/server/lib/calendar-availability.ts

@@ -5,6 +5,7 @@ type AvailabilityEvent = Pick<
   | "accountEmail"
   | "attendees"
   | "end"
+  | "eventType"
   | "responseStatus"
   | "start"
   | "status"
@@ -25,6 +26,7 @@ function findSelfAttendee(event: AvailabilityEvent) {
 export function eventBlocksAvailability(event: AvailabilityEvent): boolean {
   if (!event.start || !event.end) return false;
   if (event.status === "cancelled") return false;
+  if (event.eventType === "workingLocation") return false;
   if (event.transparency === "transparent") return false;
 
   const selfAttendee = findSelfAttendee(event);

package/corpus/templates/calendar/server/lib/google-api.ts

@@ -401,9 +401,14 @@ export function calendarUpdateEvent(
   calendarId: string,
   eventId: string,
   body: any,
+  params?: {
+    sendUpdates?: string;
+    conferenceDataVersion?: number;
+    supportsAttachments?: boolean;
+  },
 ) {
   return googleFetch(
-    `${CALENDAR_BASE}/calendars/${encodeURIComponent(calendarId)}/events/${encodeURIComponent(eventId)}`,
+    `${CALENDAR_BASE}/calendars/${encodeURIComponent(calendarId)}/events/${encodeURIComponent(eventId)}${qs(params ?? {})}`,
     accessToken,
     {
       method: "PUT",

package/corpus/templates/calendar/server/lib/google-calendar.ts

@@ -29,6 +29,7 @@ import {
   calendarInsertEvent,
   calendarDeleteEvent,
   calendarPatchEvent,
+  calendarUpdateEvent,
   peopleGetProfile,
 } from "./google-api.js";
 import {
@@ -1122,12 +1123,15 @@ export async function createEvent(
     throw new Error("Out of office and focus time events must be timed.");
   }
 
-  const body: any = {
-    summary: event.title,
-    description: event.description,
-    location: event.location,
-    ...buildDateRange(event),
-  };
+  const body: any =
+    event.eventType === "workingLocation"
+      ? buildDateRange(event)
+      : {
+          summary: event.title,
+          description: event.description,
+          location: event.location,
+          ...buildDateRange(event),
+        };
   applyEventOptions(body, event);
   if (event.attachments !== undefined) {
     body.attachments = event.attachments;
@@ -1218,7 +1222,10 @@ export async function updateEvent(
   if (eventPatch.title !== undefined) requestBody.summary = eventPatch.title;
   if (eventPatch.description !== undefined)
     requestBody.description = eventPatch.description;
-  if (eventPatch.location !== undefined)
+  if (
+    eventPatch.location !== undefined &&
+    eventPatch.workingLocationProperties === undefined
+  )
     requestBody.location = eventPatch.location;
   if (eventPatch.start !== undefined) {
     requestBody.start = eventPatch.allDay
@@ -1260,18 +1267,41 @@ export async function updateEvent(
     requestBody.conferenceData = createGoogleMeetRequest();
   }
 
-  const response = await calendarPatchEvent(
-    client.accessToken,
-    "primary",
-    targetEventId,
-    requestBody,
-    {
-      sendUpdates: options?.sendUpdates,
-      conferenceDataVersion: options?.addGoogleMeet ? 1 : undefined,
-      supportsAttachments:
-        eventPatch.attachments !== undefined ? true : undefined,
-    },
-  );
+  // Google validates status events as complete resources during updates. A
+  // partial PATCH can reject otherwise valid working-location changes because
+  // required eventType/start/end fields are absent from the request body.
+  const response = eventPatch.workingLocationProperties
+    ? await calendarUpdateEvent(
+        client.accessToken,
+        "primary",
+        targetEventId,
+        {
+          ...(await calendarGetEvent(
+            client.accessToken,
+            "primary",
+            targetEventId,
+          )),
+          ...requestBody,
+        },
+        {
+          sendUpdates: options?.sendUpdates,
+          conferenceDataVersion: options?.addGoogleMeet ? 1 : undefined,
+          supportsAttachments:
+            eventPatch.attachments !== undefined ? true : undefined,
+        },
+      )
+    : await calendarPatchEvent(
+        client.accessToken,
+        "primary",
+        targetEventId,
+        requestBody,
+        {
+          sendUpdates: options?.sendUpdates,
+          conferenceDataVersion: options?.addGoogleMeet ? 1 : undefined,
+          supportsAttachments:
+            eventPatch.attachments !== undefined ? true : undefined,
+        },
+      );
 
   return {
     htmlLink: response?.htmlLink || undefined,

package/corpus/templates/calendar/shared/api.ts

@@ -122,6 +122,8 @@ export interface CalendarEvent {
   updatedAt: string;
   /** Client-only: temp id preserved across optimistic→real swap to keep React keys stable */
   _tempId?: string;
+  /** Client-only: prior provider id retained while open UI state rebinds after replacement */
+  _replacedId?: string;
 }
 
 export interface CalendarEventDraft {

package/dist/mcp/build-server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"build-server.d.ts","sourceRoot":"","sources":["../../src/mcp/build-server.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"build-server.d.ts","sourceRoot":"","sources":["../../src/mcp/build-server.ts"],"names":[],"mappings":"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"}

package/dist/mcp/build-server.js

@@ -273,29 +273,78 @@ function routePathFromOpenUrl(value) {
  * `mcpApp.resource` (the resource path already strips them via
  * `mcpAppStructuredContent`).
  *
- * Depth-capped to avoid pathological / circular structures. Strings that
- * embed an `isEmbedStartUrl` substring (e.g. a longer message that includes
- * the URL) are replaced with `[hidden embed URL]`.
+ * Circular structures are replaced with a marker. Strings that embed an
+ * `isEmbedStartUrl` substring (e.g. a longer message that includes the URL)
+ * are replaced with `[hidden embed URL]`. Credential-like `ticket` fields are
+ * removed only inside an embed-signaled object/branch, so ordinary business
+ * fields from unrelated read actions remain faithful.
  */
-function purgeEmbedStartUrls(value, depth = 0) {
-    if (depth > 5)
-        return value;
+const EMBED_RESULT_SENSITIVE_KEYS = new Set([
+    "embedTargetPath",
+    "embedExpiresAt",
+    "embedTicket",
+]);
+function isEmbedCredentialKey(key) {
+    return key === "ticket" || /Ticket$/.test(key);
+}
+function containsEmbedRoutingSignal(value, seen = new WeakSet()) {
+    if (typeof value === "string")
+        return isEmbedStartUrl(value);
+    if (!value || typeof value !== "object")
+        return false;
+    if (seen.has(value))
+        return false;
+    seen.add(value);
+    if (Array.isArray(value)) {
+        const result = value.some((item) => containsEmbedRoutingSignal(item, seen));
+        seen.delete(value);
+        return result;
+    }
+    for (const [key, val] of Object.entries(value)) {
+        if (EMBED_RESULT_SENSITIVE_KEYS.has(key)) {
+            seen.delete(value);
+            return true;
+        }
+        if (containsEmbedRoutingSignal(val, seen)) {
+            seen.delete(value);
+            return true;
+        }
+    }
+    seen.delete(value);
+    return false;
+}
+function purgeEmbedStartUrls(value, seen = new WeakSet(), embedContext = false) {
     if (typeof value === "string") {
         return isEmbedStartUrl(value) ? "[hidden embed URL]" : value;
     }
     if (Array.isArray(value)) {
-        return value.map((item) => purgeEmbedStartUrls(item, depth + 1));
+        if (seen.has(value))
+            return "[circular result]";
+        seen.add(value);
+        const out = value.map((item) => purgeEmbedStartUrls(item, seen, embedContext || containsEmbedRoutingSignal(item)));
+        seen.delete(value);
+        return out;
     }
     if (value && typeof value === "object") {
+        if (seen.has(value))
+            return "[circular result]";
+        seen.add(value);
+        const entries = Object.entries(value);
+        const localEmbedContext = embedContext || containsEmbedRoutingSignal(value);
         const out = {};
-        for (const [key, val] of Object.entries(value)) {
+        for (const [key, val] of entries) {
+            if (EMBED_RESULT_SENSITIVE_KEYS.has(key) ||
+                (localEmbedContext && isEmbedCredentialKey(key))) {
+                continue;
+            }
             if (typeof val === "string" && isEmbedStartUrl(val)) {
                 // Drop the key entirely for object-typed inputs so a tool result like
                 // `{ embedStartUrl: "..." }` does not appear at all in the LLM text.
                 continue;
             }
-            out[key] = purgeEmbedStartUrls(val, depth + 1);
+            out[key] = purgeEmbedStartUrls(val, seen, localEmbedContext);
         }
+        seen.delete(value);
         return out;
     }
     return value;
@@ -816,10 +865,11 @@ function primitiveValue(value) {
         typeof value === "boolean");
 }
 function mcpAppStructuredContent(result, meta) {
-    const out = result && typeof result === "object" && !Array.isArray(result)
-        ? { ...result }
-        : primitiveValue(result)
-            ? { result }
+    const purged = purgeEmbedStartUrls(result);
+    const out = purged && typeof purged === "object" && !Array.isArray(purged)
+        ? { ...purged }
+        : primitiveValue(purged)
+            ? { result: purged }
             : {};
     for (const key of ["embedStartUrl", "startUrl"]) {
         const value = out[key];
@@ -834,18 +884,6 @@ function mcpAppStructuredContent(result, meta) {
     // LLM). `embedTargetPath` reveals the exact route + thread/draft id the user
     // is looking at; `embedExpiresAt` is an unintended timestamp; ticket-bearing
     // fields are single-use credentials. Drop all of them unconditionally.
-    for (const key of [
-        "embedTargetPath",
-        "embedExpiresAt",
-        "ticket",
-        "embedTicket",
-    ]) {
-        delete out[key];
-    }
-    for (const key of Object.keys(out)) {
-        if (/Ticket$/.test(key))
-            delete out[key];
-    }
     const openLink = meta?.["agent-native/openLink"];
     if (openLink && typeof openLink === "object" && !Array.isArray(openLink)) {
         const webUrl = openLink.webUrl;
@@ -894,7 +932,7 @@ function isSuccessOnlyResult(value) {
         return false;
     });
 }
-function conciseToolResultText(name, result) {
+function conciseToolResultText(name, result, options) {
     const purged = purgeEmbedStartUrls(result);
     if (typeof purged === "string")
         return truncateToolText(purged);
@@ -902,6 +940,15 @@ function conciseToolResultText(name, result) {
         return `${name} completed.`;
     if (purged && typeof purged === "object" && !Array.isArray(purged)) {
         const record = purged;
+        // Read-only actions are data reads, not mutations. Keep their object
+        // payload available to MCP clients in the text fallback too; the
+        // structuredContent branch below is the lossless path for clients that
+        // support it. Mutating/action-style results retain the concise status
+        // text so we do not unexpectedly dump write results into conversations.
+        if (options?.preserveObjectResult) {
+            const text = JSON.stringify(purged);
+            return text === undefined ? `${name} completed.` : truncateToolText(text);
+        }
         const message = record.message ?? record.summary;
         if (typeof message === "string" && message.trim()) {
             return truncateToolText(message.trim());
@@ -1261,10 +1308,17 @@ export async function createMCPServerForRequest(config, identity, requestMeta) {
                         typeof rawResult === "object" &&
                         !Array.isArray(rawResult)
                         ? rawResult
-                        : undefined;
+                        : entry.readOnly === true &&
+                            rawResult &&
+                            typeof rawResult === "object" &&
+                            !Array.isArray(rawResult)
+                            ? mcpAppStructuredContent(rawResultForClient, responseMeta)
+                            : undefined;
                 const text = mcpAppResource
                     ? conciseMcpAppToolText(name, resultForClient, structuredContent)
-                    : conciseToolResultText(name, resultForClient);
+                    : conciseToolResultText(name, resultForClient, {
+                        preserveObjectResult: entry.readOnly === true,
+                    });
                 const content = [{ type: "text", text }];
                 if (block)
                     content.push(block);