chore: preserve cloud route worktree

Author: Shaw

apps/app-lifeops/src/api/client-lifeops.ts

@@ -716,9 +716,7 @@ declare module "@elizaos/app-core/api/client-base" {
     sendWhatsAppConnectorMessage(
       data: SendLifeOpsWhatsAppMessageRequest,
     ): Promise<{ ok: true; messageId: string }>;
-    getWhatsAppConnectorMessages(options?: {
-      limit?: number;
-    }): Promise<{
+    getWhatsAppConnectorMessages(options?: { limit?: number }): Promise<{
       count: number;
       messages: Array<{
         id: string;

apps/app-lifeops/src/components/EventEditorDrawer.test.tsx

@@ -182,7 +182,9 @@ const calendars: LifeOpsCalendarSummary[] = [
   },
 ];
 
-function event(overrides: Partial<LifeOpsCalendarEvent> = {}): LifeOpsCalendarEvent {
+function event(
+  overrides: Partial<LifeOpsCalendarEvent> = {},
+): LifeOpsCalendarEvent {
   return {
     id: "event-1",
     externalId: "google-event-1",
@@ -232,12 +234,7 @@ describe("EventEditorDrawer", () => {
     clientMock.updateLifeOpsCalendarEvent.mockResolvedValue({ event: updated });
 
     render(
-      <EventEditorDrawer
-        open
-        mode="edit"
-        event={event()}
-        onClose={vi.fn()}
-      />,
+      <EventEditorDrawer open mode="edit" event={event()} onClose={vi.fn()} />,
     );
 
     expect(screen.queryByText("Repeat")).toBeNull();
@@ -263,12 +260,12 @@ describe("EventEditorDrawer", () => {
         attendees: [],
       }),
     );
-    expect(clientMock.updateLifeOpsCalendarEvent.mock.calls[0]?.[1]).not.toHaveProperty(
-      "recurrence",
-    );
-    expect(clientMock.updateLifeOpsCalendarEvent.mock.calls[0]?.[1]).not.toHaveProperty(
-      "reminders",
-    );
+    expect(
+      clientMock.updateLifeOpsCalendarEvent.mock.calls[0]?.[1],
+    ).not.toHaveProperty("recurrence");
+    expect(
+      clientMock.updateLifeOpsCalendarEvent.mock.calls[0]?.[1],
+    ).not.toHaveProperty("reminders");
   });
 
   it("uses grantId plus calendarId when selecting among duplicate primary calendars", async () => {

apps/app-lifeops/src/components/EventEditorDrawer.tsx

@@ -220,6 +220,9 @@ export function EventEditorDrawer({
   const [error, setError] = useState<string | null>(null);
 
   const isCreate = mode === "create";
+  const calendarRequestSide = isCreate
+    ? (createDefaults?.side ?? "owner")
+    : (event?.side ?? "owner");
 
   // Seed form when the event changes (edit) or drawer opens in create mode.
   useEffect(() => {
@@ -241,7 +244,7 @@ export function EventEditorDrawer({
     setCalendarsLoading(true);
     setCalendarsError(null);
     void client
-      .getLifeOpsCalendars({ side: "owner" })
+      .getLifeOpsCalendars({ side: calendarRequestSide })
       .then((response) => {
         if (cancelled) return;
         setCalendars(response.calendars);
@@ -286,7 +289,7 @@ export function EventEditorDrawer({
     return () => {
       cancelled = true;
     };
-  }, [open]);
+  }, [open, calendarRequestSide]);
 
   const calendarOptions = useMemo(() => {
     if (calendars.length > 0) return calendars;
@@ -316,12 +319,12 @@ export function EventEditorDrawer({
     ] satisfies LifeOpsCalendarSummary[];
   }, [calendars, form.calendarId, form.grantId, form.side]);
 
-  const updateForm = useCallback(<K extends keyof FormState>(
-    key: K,
-    value: FormState[K],
-  ) => {
-    setForm((prev) => ({ ...prev, [key]: value }));
-  }, []);
+  const updateForm = useCallback(
+    <K extends keyof FormState>(key: K, value: FormState[K]) => {
+      setForm((prev) => ({ ...prev, [key]: value }));
+    },
+    [],
+  );
 
   const handleSave = useCallback(
     async (options: { keepOpen?: boolean } = {}) => {

apps/app-lifeops/src/components/LifeOpsSettingsSection.tsx

@@ -1,8 +1,4 @@
-import {
-  Button,
-  SegmentedControl,
-  useApp,
-} from "@elizaos/app-core";
+import { Button, SegmentedControl, useApp } from "@elizaos/app-core";
 import { client } from "@elizaos/app-core/api";
 import type { ModelOption } from "@elizaos/shared/contracts/onboarding";
 import type {
@@ -562,7 +558,8 @@ function GoogleConnectorSideCard({
 
   const toggleCalendar = useCallback(
     async (calendar: LifeOpsCalendarSummary) => {
-      setCalendarPendingId(calendar.calendarId);
+      const pendingId = `${calendar.side}:${calendar.grantId}:${calendar.calendarId}`;
+      setCalendarPendingId(pendingId);
       setCalendarError(null);
       try {
         const response = await client.setLifeOpsCalendarIncluded({
@@ -822,12 +819,12 @@ function GoogleConnectorSideCard({
             ) : calendars.length > 0 ? (
               <div className="grid gap-2">
                 {calendars.map((calendar) => {
+                  const calendarIdentity = `${calendar.side}:${calendar.grantId}:${calendar.calendarId}`;
                   const disabled =
-                    controlDisabled ||
-                    calendarPendingId === calendar.calendarId;
+                    controlDisabled || calendarPendingId === calendarIdentity;
                   return (
                     <label
-                      key={`${calendar.grantId}:${calendar.calendarId}`}
+                      key={calendarIdentity}
                       className="flex cursor-pointer items-start gap-3 rounded-xl bg-card/18 px-3 py-2 text-xs"
                     >
                       <input
@@ -885,13 +882,15 @@ function GoogleConnectorSideCard({
 }
 
 function flattenModelOptions(
-  models: {
-    nano?: ModelOption[];
-    small?: ModelOption[];
-    medium?: ModelOption[];
-    large?: ModelOption[];
-    mega?: ModelOption[];
-  } | undefined,
+  models:
+    | {
+        nano?: ModelOption[];
+        small?: ModelOption[];
+        medium?: ModelOption[];
+        large?: ModelOption[];
+        mega?: ModelOption[];
+      }
+    | undefined,
 ): ModelOption[] {
   if (!models) return [];
   const seen = new Set<string>();

apps/app-lifeops/src/hooks/useGoogleLifeOpsConnector.test.ts

@@ -178,6 +178,7 @@ describe("useGoogleLifeOpsConnector - pendingAuthUrl state", () => {
       clientMock.startGoogleLifeOpsConnector.mock.calls[0] ?? [];
     expect(request?.capabilities).toContain("google.gmail.triage");
     expect(request?.capabilities).not.toContain("google.gmail.manage");
+    expect(request?.createNewGrant).toBe(true);
   });
 
   it("connectAdditional() requests inbox tracking without Gmail manage scopes", async () => {

apps/app-lifeops/src/hooks/useGoogleLifeOpsConnector.ts

@@ -4,7 +4,6 @@ import { APP_RESUME_EVENT } from "@elizaos/app-core/events";
 import { useApp } from "@elizaos/app-core/state";
 import { openExternalUrl } from "@elizaos/app-core/utils";
 import type {
-  DisconnectLifeOpsGoogleConnectorRequest,
   LifeOpsConnectorMode,
   LifeOpsConnectorSide,
   LifeOpsGoogleCapability,
@@ -574,7 +573,7 @@ export function useGoogleLifeOpsConnector(
           side,
           mode: selectedModeRef.current ?? status?.mode,
           grantId,
-        } as DisconnectLifeOpsGoogleConnectorRequest & { grantId: string });
+        });
         await refresh({ mode: selectedModeRef.current });
         dispatchLifeOpsGoogleConnectorRefresh({
           origin: instanceIdRef.current,
@@ -606,9 +605,10 @@ export function useGoogleLifeOpsConnector(
           connectMode === "cloud_managed"
             ? resolveSuccessRedirectUrl(side)
             : undefined,
-        side,
-        mode: connectMode,
-      });
+          side,
+          mode: connectMode,
+          createNewGrant: true,
+        });
       await openExternalUrl(result.authUrl);
       setError(null);
     } catch (cause) {

apps/app-lifeops/src/lifeops/google-calendar.test.ts

@@ -29,15 +29,11 @@ describe("fetchGoogleCalendarEvents", () => {
         JSON.stringify(
           pageToken === "page-2"
             ? {
-                items: [
-                  googleEvent("event-2", "2026-04-23T16:00:00.000Z"),
-                ],
+                items: [googleEvent("event-2", "2026-04-23T16:00:00.000Z")],
               }
             : {
                 nextPageToken: "page-2",
-                items: [
-                  googleEvent("event-1", "2026-04-23T15:00:00.000Z"),
-                ],
+                items: [googleEvent("event-1", "2026-04-23T15:00:00.000Z")],
               },
         ),
         {

apps/app-lifeops/src/lifeops/google-calendar.ts

@@ -119,11 +119,10 @@ interface GoogleCalendarCreateRequestBody {
   }>;
 }
 
-export interface SyncedGoogleCalendarEvent
-  extends Omit<
-    LifeOpsCalendarEvent,
-    "id" | "agentId" | "provider" | "side" | "syncedAt" | "updatedAt"
-  > {}
+export interface SyncedGoogleCalendarEvent extends Omit<
+  LifeOpsCalendarEvent,
+  "id" | "agentId" | "provider" | "side" | "syncedAt" | "updatedAt"
+> {}
 
 function readGoogleEventInstant(
   value: GoogleCalendarEventDate | undefined,
@@ -340,9 +339,8 @@ export async function listGoogleCalendars(args: {
     if (item.deleted || item.hidden) continue;
     const calendarId = item.id?.trim();
     if (!calendarId) continue;
-    const summary = (item.summaryOverride?.trim() ||
-      item.summary?.trim() ||
-      calendarId);
+    const summary =
+      item.summaryOverride?.trim() || item.summary?.trim() || calendarId;
     entries.push({
       calendarId,
       summary,