@elizaos/agent 2.0.0-alpha.441 → 2.0.0-alpha.501

package/apps/app-lifeops/src/lifeops/service-mixin-gmail.js

@@ -20,6 +20,44 @@ const DEFAULT_GMAIL_SEARCH_CACHE_SCAN_LIMIT = 200;
 function managedGoogleGrantId(grant) {
     return grant.cloudConnectionId ?? grant.id;
 }
+function googleGrantAccountEmail(grant) {
+    return (normalizeOptionalString(grant.identityEmail) ??
+        (typeof grant.identity.email === "string"
+            ? grant.identity.email.trim().toLowerCase()
+            : null));
+}
+function metadataString(metadata, key) {
+    const value = metadata[key];
+    return typeof value === "string" && value.trim().length > 0
+        ? value.trim()
+        : null;
+}
+function emailLikeMessageFromGmailSummary(message) {
+    const headers = {};
+    const listUnsubscribe = metadataString(message.metadata, "listUnsubscribe");
+    if (listUnsubscribe)
+        headers["List-Unsubscribe"] = listUnsubscribe;
+    const listId = metadataString(message.metadata, "listId");
+    if (listId)
+        headers["List-Id"] = listId;
+    const precedence = metadataString(message.metadata, "precedence");
+    if (precedence)
+        headers.Precedence = precedence;
+    const autoSubmitted = metadataString(message.metadata, "autoSubmitted");
+    if (autoSubmitted)
+        headers["Auto-Submitted"] = autoSubmitted;
+    return {
+        id: message.id,
+        externalId: message.externalId,
+        subject: message.subject,
+        from: message.from,
+        fromEmail: message.fromEmail,
+        snippet: message.snippet,
+        labels: message.labels,
+        headers: Object.keys(headers).length > 0 ? headers : null,
+        bodyText: metadataString(message.metadata, "bodyText"),
+    };
+}
 export function withGmail(Base) {
     return class extends Base {
         /**
@@ -40,15 +78,7 @@ export function withGmail(Base) {
                 this.runtime.getSetting?.("lifeops.bills.autoExtract") !== false;
             for (const message of args.messages) {
                 try {
-                    const candidate = {
-                        id: message.id,
-                        externalId: message.externalId,
-                        subject: message.subject,
-                        from: message.from,
-                        fromEmail: message.fromEmail,
-                        snippet: message.snippet,
-                        labels: message.labels,
-                    };
+                    const candidate = emailLikeMessageFromGmailSummary(message);
                     const classification = await classifyEmail(this.runtime, candidate);
                     if (classification.category !== "bill" ||
                         classification.confidence < 0.6) {
@@ -136,16 +166,16 @@ export function withGmail(Base) {
                             : null,
                         maxResults: args.maxResults,
                     });
-                const persistedMessages = messages.map((message) => ({
-                    id: createGmailMessageId(this.agentId(), "google", grant.side, message.externalId),
+                const accountEmail = googleGrantAccountEmail(grant);
+                const persistedMessages = messages.map((message) => materializeGmailMessageSummary({
                     agentId: this.agentId(),
-                    provider: "google",
                     side: grant.side,
-                    ...message,
+                    grantId: grant.id,
+                    accountEmail,
+                    message,
                     syncedAt,
-                    updatedAt: syncedAt,
                 }));
-                await this.repository.pruneGmailMessages(this.agentId(), "google", messages.map((message) => message.externalId), grant.side);
+                await this.repository.pruneGmailMessages(this.agentId(), "google", messages.map((message) => message.externalId), grant.side, grant.id);
                 for (const message of persistedMessages) {
                     await this.repository.upsertGmailMessage(message, grant.side);
                 }
@@ -154,6 +184,7 @@ export function withGmail(Base) {
                     provider: "google",
                     side: grant.side,
                     mailbox: GOOGLE_GMAIL_MAILBOX,
+                    grantId: grant.id,
                     maxResults: args.maxResults,
                     syncedAt,
                 }));
@@ -202,7 +233,7 @@ export function withGmail(Base) {
             }
             const grant = await this.requireGoogleGmailGrant(requestUrl, mode, side, grantId);
             const effectiveSide = grant.side;
-            const syncState = await this.repository.getGmailSyncState(this.agentId(), "google", GOOGLE_GMAIL_MAILBOX, effectiveSide);
+            const syncState = await this.repository.getGmailSyncState(this.agentId(), "google", GOOGLE_GMAIL_MAILBOX, effectiveSide, grant.id);
             if (!forceSync &&
                 syncState &&
                 isGmailSyncStateFresh({
@@ -213,6 +244,7 @@ export function withGmail(Base) {
                 })) {
                 const messages = await this.repository.listGmailMessages(this.agentId(), "google", {
                     maxResults,
+                    grantId: grant.id,
                 }, effectiveSide);
                 return {
                     messages,
@@ -258,7 +290,7 @@ export function withGmail(Base) {
                     allMessages.push({
                         ...message,
                         grantId: grant.id,
-                        accountEmail: grant.identityEmail ?? undefined,
+                        accountEmail: googleGrantAccountEmail(grant) ?? undefined,
                     });
                 }
             }
@@ -290,6 +322,7 @@ export function withGmail(Base) {
                 const preservedCachedMessages = forceSync
                     ? await this.repository.listGmailMessages(this.agentId(), "google", {
                         maxResults: DEFAULT_GMAIL_SEARCH_CACHE_SCAN_LIMIT,
+                        grantId: grant.id,
                     }, effectiveSide)
                     : null;
                 const triage = await this.getGmailTriage(requestUrl, {
@@ -308,6 +341,7 @@ export function withGmail(Base) {
                     const cachedMessages = preservedCachedMessages ??
                         (await this.repository.listGmailMessages(this.agentId(), "google", {
                             maxResults: DEFAULT_GMAIL_SEARCH_CACHE_SCAN_LIMIT,
+                            grantId: grant.id,
                         }, effectiveSide));
                     messages = filterGmailMessagesBySearch({
                         messages: cachedMessages,
@@ -337,6 +371,8 @@ export function withGmail(Base) {
                         messages: managedSearch.messages.map((message) => materializeGmailMessageSummary({
                             agentId: this.agentId(),
                             side: effectiveSide,
+                            grantId: grant.id,
+                            accountEmail: googleGrantAccountEmail(grant),
                             message,
                             syncedAt: managedSearch.syncedAt,
                         })),
@@ -351,6 +387,7 @@ export function withGmail(Base) {
                         provider: "google",
                         side: effectiveSide,
                         mailbox: GOOGLE_GMAIL_MAILBOX,
+                        grantId: grant.id,
                         maxResults,
                         syncedAt: managedSearch.syncedAt,
                     }));
@@ -403,6 +440,8 @@ export function withGmail(Base) {
                 messages: syncedMessages.map((message) => materializeGmailMessageSummary({
                     agentId: this.agentId(),
                     side: effectiveSide,
+                    grantId: grant.id,
+                    accountEmail: googleGrantAccountEmail(grant),
                     message,
                     syncedAt,
                 })),
@@ -417,6 +456,7 @@ export function withGmail(Base) {
                 provider: "google",
                 side: effectiveSide,
                 mailbox: GOOGLE_GMAIL_MAILBOX,
+                grantId: grant.id,
                 maxResults,
                 syncedAt,
             }));
@@ -450,7 +490,7 @@ export function withGmail(Base) {
                 fail(409, "This Google connection only has Gmail metadata access. Reconnect Google to grant Gmail read access so Eliza can read email bodies.");
             }
             let selectedMessage = messageId
-                ? await this.repository.getGmailMessage(this.agentId(), "google", messageId, grant.side)
+                ? await this.repository.getGmailMessage(this.agentId(), "google", messageId, grant.side, grant.id)
                 : null;
             if (!selectedMessage && query) {
                 const search = await this.getGmailSearch(requestUrl, {
@@ -500,6 +540,8 @@ export function withGmail(Base) {
             const message = materializeGmailMessageSummary({
                 agentId: this.agentId(),
                 side: grant.side,
+                grantId: grant.id,
+                accountEmail: googleGrantAccountEmail(grant),
                 message: detail.message,
                 syncedAt,
             });
@@ -644,7 +686,7 @@ export function withGmail(Base) {
                 now,
             })).map((thread) => ({
                 threadId: thread.threadId,
-                messageId: createGmailMessageId(this.agentId(), "google", grant.side, thread.externalMessageId),
+                messageId: createGmailMessageId(this.agentId(), "google", grant.side, grant.id, thread.externalMessageId),
                 subject: thread.subject,
                 to: thread.to,
                 cc: thread.cc,
@@ -655,7 +697,7 @@ export function withGmail(Base) {
                 labels: thread.labels,
                 htmlLink: thread.htmlLink,
                 grantId: grant.id,
-                accountEmail: grant.identityEmail ?? undefined,
+                accountEmail: googleGrantAccountEmail(grant) ?? undefined,
             }));
             await this.clearGoogleGrantAuthFailure(grant);
             return {
@@ -674,7 +716,7 @@ export function withGmail(Base) {
                     ? args.grant.identity.email.trim().toLowerCase()
                     : null;
                 for (const messageId of args.messageIds) {
-                    let message = await this.repository.getGmailMessage(this.agentId(), "google", messageId, args.grant.side);
+                    let message = await this.repository.getGmailMessage(this.agentId(), "google", messageId, args.grant.side, args.grant.id);
                     if (!message) {
                         const fetched = await fetchGoogleGmailMessage({
                             accessToken,
@@ -685,6 +727,8 @@ export function withGmail(Base) {
                             ? materializeGmailMessageSummary({
                                 agentId: this.agentId(),
                                 side: args.grant.side,
+                                grantId: args.grant.id,
+                                accountEmail: googleGrantAccountEmail(args.grant),
                                 message: fetched,
                                 syncedAt: new Date().toISOString(),
                             })
@@ -764,6 +808,7 @@ export function withGmail(Base) {
                 operation,
                 labelIds,
                 side: grant.side,
+                grantId: grant.id,
             });
             await this.clearGoogleGrantAuthFailure(grant);
             await this.recordGmailAudit("gmail_messages_managed", `google:${grant.mode}:gmail`, "gmail messages managed", {
@@ -784,12 +829,12 @@ export function withGmail(Base) {
                 labelIds,
                 destructive,
                 grantId: grant.id,
-                accountEmail: grant.identityEmail ?? undefined,
+                accountEmail: googleGrantAccountEmail(grant) ?? undefined,
             };
         }
         async updateCachedGmailMessagesAfterManage(args) {
             if (args.operation === "delete") {
-                await this.repository.deleteGmailMessages(this.agentId(), "google", args.messages.map((message) => message.id), args.side);
+                await this.repository.deleteGmailMessages(this.agentId(), "google", args.messages.map((message) => message.id), args.side, args.grantId);
                 return;
             }
             for (const message of args.messages) {
@@ -859,6 +904,8 @@ export function withGmail(Base) {
             const messageSummary = materializeGmailMessageSummary({
                 agentId: this.agentId(),
                 side: grant.side,
+                grantId: grant.id,
+                accountEmail: googleGrantAccountEmail(grant),
                 message: fetched,
                 syncedAt,
             });
@@ -867,7 +914,7 @@ export function withGmail(Base) {
                 await this.repository.upsertGmailSpamReviewItem(buildGmailSpamReviewItem({
                     message: messageSummary,
                     grantId: grant.id,
-                    accountEmail: grant.identityEmail ?? null,
+                    accountEmail: googleGrantAccountEmail(grant),
                     now: syncedAt,
                 }));
             }
@@ -900,7 +947,7 @@ export function withGmail(Base) {
                     likelyReplyNeeded: messageSummary.likelyReplyNeeded,
                     triageScore: messageSummary.triageScore,
                     grantId: grant.id,
-                    accountEmail: grant.identityEmail ?? null,
+                    accountEmail: googleGrantAccountEmail(grant),
                     htmlLink: messageSummary.htmlLink,
                 },
             };
@@ -977,6 +1024,8 @@ export function withGmail(Base) {
                         ? materializeGmailMessageSummary({
                             agentId: this.agentId(),
                             side: grant.side,
+                            grantId: grant.id,
+                            accountEmail: googleGrantAccountEmail(grant),
                             message: fetched,
                             syncedAt: new Date().toISOString(),
                         })
@@ -1189,7 +1238,7 @@ export function withGmail(Base) {
             const intent = normalizeOptionalString(request.intent);
             const includeQuotedOriginal = normalizeOptionalBoolean(request.includeQuotedOriginal, "includeQuotedOriginal") ?? false;
             const grant = await this.requireGoogleGmailGrant(requestUrl, mode, side, grantId);
-            let message = await this.repository.getGmailMessage(this.agentId(), "google", messageId, grant.side);
+            let message = await this.repository.getGmailMessage(this.agentId(), "google", messageId, grant.side, grant.id);
             if (!message) {
                 const accessToken = resolveGoogleExecutionTarget(grant) === "cloud"
                     ? null
@@ -1199,7 +1248,7 @@ export function withGmail(Base) {
                     const triage = await this.getGmailTriage(requestUrl, {
                         mode,
                         side: grant.side,
-                        grantId,
+                        grantId: grant.id,
                         maxResults: DEFAULT_GMAIL_TRIAGE_MAX_RESULTS,
                     }, new Date());
                     message =
@@ -1219,6 +1268,8 @@ export function withGmail(Base) {
                         ? materializeGmailMessageSummary({
                             agentId: this.agentId(),
                             side: grant.side,
+                            grantId: grant.id,
+                            accountEmail: googleGrantAccountEmail(grant),
                             message: fetched,
                             syncedAt: new Date().toISOString(),
                         })
@@ -1316,13 +1367,13 @@ export function withGmail(Base) {
                 fail(409, "Gmail send requires explicit confirmation.");
             }
             const grant = await this.requireGoogleGmailSendGrant(requestUrl, mode, side, grantId);
-            let message = await this.repository.getGmailMessage(this.agentId(), "google", messageId, grant.side);
+            let message = await this.repository.getGmailMessage(this.agentId(), "google", messageId, grant.side, grant.id);
             if (!message) {
                 if (resolveGoogleExecutionTarget(grant) === "cloud") {
                     const triage = await this.getGmailTriage(requestUrl, {
                         mode,
                         side: grant.side,
-                        grantId,
+                        grantId: grant.id,
                         maxResults: DEFAULT_GMAIL_TRIAGE_MAX_RESULTS,
                     }, new Date());
                     message =
@@ -1342,6 +1393,8 @@ export function withGmail(Base) {
                         ? materializeGmailMessageSummary({
                             agentId: this.agentId(),
                             side: grant.side,
+                            grantId: grant.id,
+                            accountEmail: googleGrantAccountEmail(grant),
                             message: fetched,
                             syncedAt: new Date().toISOString(),
                         })
@@ -1453,13 +1506,13 @@ export function withGmail(Base) {
             for (const [index, item] of items.entries()) {
                 const messageId = requireNonEmptyString(item.messageId, `items[${index}].messageId`);
                 const bodyText = normalizeGmailReplyBody(item.bodyText);
-                let message = await this.repository.getGmailMessage(this.agentId(), "google", messageId, grant.side);
+                let message = await this.repository.getGmailMessage(this.agentId(), "google", messageId, grant.side, grant.id);
                 if (!message) {
                     if (resolveGoogleExecutionTarget(grant) === "cloud") {
                         const triage = await this.getGmailTriage(requestUrl, {
                             mode,
                             side: grant.side,
-                            grantId,
+                            grantId: grant.id,
                             maxResults: DEFAULT_GMAIL_TRIAGE_MAX_RESULTS,
                         }, new Date());
                         message =
@@ -1479,6 +1532,8 @@ export function withGmail(Base) {
                             ? materializeGmailMessageSummary({
                                 agentId: this.agentId(),
                                 side: grant.side,
+                                grantId: grant.id,
+                                accountEmail: googleGrantAccountEmail(grant),
                                 message: fetched,
                                 syncedAt: new Date().toISOString(),
                             })

package/apps/app-lifeops/src/lifeops/service-mixin-goals.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"service-mixin-goals.d.ts","sourceRoot":"","sources":["../../../../../../../apps/app-lifeops/src/lifeops/service-mixin-goals.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,wBAAwB,EACxB,oBAAoB,EAEpB,yBAAyB,EAGzB,iBAAiB,EACjB,iBAAiB,EAEjB,4BAA4B,EAE5B,eAAe,EAMf,uBAAuB,EACvB,wBAAwB,EACzB,MAAM,uBAAuB,CAAC;AAkD/B,OAAO,KAAK,EACV,WAAW,EACX,kBAAkB,EAClB,UAAU,EACX,MAAM,yBAAyB,CAAC;AAEjC,MAAM,WAAW,kBAAkB;IACjC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1C,SAAS,IAAI,OAAO,CAAC,iBAAiB,EAAE,CAAC,CAAC;IAC1C,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;IACpD,UAAU,CAAC,OAAO,EAAE,wBAAwB,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAC1E,UAAU,CACR,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,wBAAwB,GAChC,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAC9B,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,IAAI,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;IACnE,iBAAiB,CACf,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,4BAA4B,CAAC,CAAC;IACzC,WAAW,CAAC,GAAG,CAAC,EAAE,IAAI,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;IAClD,mBAAmB,IAAI,OAAO,CAAC,oBAAoB,EAAE,CAAC,CAAC;IACvD,uBAAuB,CACrB,SAAS,EAAE;QACT,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QACvB,KAAK,EAAE,MAAM,CAAC;QACd,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QAC5B,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;KAClD,EACD,GAAG,CAAC,EAAE,IAAI,GACT,OAAO,CAAC,yBAAyB,CAAC,CAAC;IACtC,kBAAkB,CAAC,GAAG,CAAC,EAAE,IAAI,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAC;CAClE;AAyCD,wBAAgB,SAAS,CAAC,KAAK,SAAS,WAAW,CAAC,kBAAkB,CAAC,EACrE,IAAI,EAAE,KAAK,GACV,UAAU,CAAC,KAAK,EAAE,kBAAkB,CAAC,CA+rCvC"}
+{"version":3,"file":"service-mixin-goals.d.ts","sourceRoot":"","sources":["../../../../../../../apps/app-lifeops/src/lifeops/service-mixin-goals.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,wBAAwB,EACxB,oBAAoB,EAEpB,yBAAyB,EAGzB,iBAAiB,EACjB,iBAAiB,EAEjB,4BAA4B,EAE5B,eAAe,EAMf,uBAAuB,EACvB,wBAAwB,EACzB,MAAM,uBAAuB,CAAC;AAqC/B,OAAO,KAAK,EACV,WAAW,EACX,kBAAkB,EAClB,UAAU,EACX,MAAM,yBAAyB,CAAC;AAUjC,MAAM,WAAW,kBAAkB;IACjC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1C,SAAS,IAAI,OAAO,CAAC,iBAAiB,EAAE,CAAC,CAAC;IAC1C,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;IACpD,UAAU,CAAC,OAAO,EAAE,wBAAwB,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAC1E,UAAU,CACR,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,wBAAwB,GAChC,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAC9B,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,IAAI,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;IACnE,iBAAiB,CACf,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,4BAA4B,CAAC,CAAC;IACzC,WAAW,CAAC,GAAG,CAAC,EAAE,IAAI,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;IAClD,mBAAmB,IAAI,OAAO,CAAC,oBAAoB,EAAE,CAAC,CAAC;IACvD,uBAAuB,CACrB,SAAS,EAAE;QACT,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QACvB,KAAK,EAAE,MAAM,CAAC;QACd,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QAC5B,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;KAClD,EACD,GAAG,CAAC,EAAE,IAAI,GACT,OAAO,CAAC,yBAAyB,CAAC,CAAC;IACtC,kBAAkB,CAAC,GAAG,CAAC,EAAE,IAAI,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAC;CAClE;AAyCD,wBAAgB,SAAS,CAAC,KAAK,SAAS,WAAW,CAAC,kBAAkB,CAAC,EACrE,IAAI,EAAE,KAAK,GACV,UAAU,CAAC,KAAK,EAAE,kBAAkB,CAAC,CAiuCvC"}

package/apps/app-lifeops/src/lifeops/service-mixin-goals.js

@@ -1,15 +1,14 @@
 import { LIFEOPS_GOAL_STATUSES, LIFEOPS_GOAL_SUGGESTION_KINDS, LIFEOPS_REVIEW_STATES, } from "../contracts/index.js";
-import { createLifeOpsAuditEvent, createLifeOpsGoalDefinition, } from "./repository.js";
-import { fail, normalizeEnumValue, normalizeOptionalString, normalizeReminderUrgency, requireNonEmptyString, } from "./service-normalize.js";
-import { isRecord, mergeMetadata, normalizeNullableRecord, normalizeOptionalRecord, requireRecord, buildActiveReminders, buildActiveCalendarEventReminders, selectOverviewOccurrences, priorityToUrgency, } from "./service-helpers-misc.js";
-import { shouldDeliverReminderForIntensity, } from "./service-helpers-reminder.js";
-import { summarizeOverviewSection, } from "./service-helpers-occurrence.js";
+import { resolveDefaultTimeZone } from "./defaults.js";
 import { mergeGoalSemanticReviewMetadata, readGoalGroundingMetadata, readGoalSemanticReviewMetadata, } from "./goal-grounding.js";
 import { evaluateGoalProgressWithLlm } from "./goal-semantic-evaluator.js";
-import { resolveDefaultTimeZone } from "./defaults.js";
-import { addMinutes } from "./time.js";
-import { getZonedDateParts } from "./time.js";
+import { createLifeOpsAuditEvent, createLifeOpsGoalDefinition, } from "./repository.js";
 import { GOAL_REVIEW_LOOKBACK_DAYS, GOAL_SEMANTIC_REVIEW_CACHE_TTL_MS, MAX_OVERVIEW_REMINDERS, OVERVIEW_HORIZON_MINUTES, } from "./service-constants.js";
+import { buildActiveCalendarEventReminders, buildActiveReminders, isRecord, mergeMetadata, normalizeNullableRecord, normalizeOptionalRecord, priorityToUrgency, requireRecord, selectOverviewOccurrences, } from "./service-helpers-misc.js";
+import { summarizeOverviewSection } from "./service-helpers-occurrence.js";
+import { shouldDeliverReminderForIntensity } from "./service-helpers-reminder.js";
+import { fail, normalizeEnumValue, normalizeOptionalString, normalizeReminderUrgency, requireNonEmptyString, } from "./service-normalize.js";
+import { addMinutes, getZonedDateParts } from "./time.js";
 const GOAL_SIMILARITY_STOP_WORDS = new Set([
     "and",
     "the",
@@ -75,16 +74,14 @@ export function withGoals(Base) {
                     return cadence ?? null;
                 })(),
                 supportStrategy: (() => {
-                    const strategy = normalizeOptionalRecord(request.supportStrategy, "supportStrategy") ??
-                        {};
+                    const strategy = normalizeOptionalRecord(request.supportStrategy, "supportStrategy") ?? {};
                     if (Array.isArray(strategy)) {
                         fail(400, "supportStrategy must be an object, not an array");
                     }
                     return strategy;
                 })(),
                 successCriteria: (() => {
-                    const criteria = normalizeOptionalRecord(request.successCriteria, "successCriteria") ??
-                        {};
+                    const criteria = normalizeOptionalRecord(request.successCriteria, "successCriteria") ?? {};
                     if (Array.isArray(criteria)) {
                         fail(400, "successCriteria must be an object, not an array");
                     }
@@ -488,7 +485,8 @@ export function withGoals(Base) {
             if (!Number.isFinite(reviewedAtMs)) {
                 return null;
             }
-            if (args.now.getTime() - reviewedAtMs > GOAL_SEMANTIC_REVIEW_CACHE_TTL_MS) {
+            if (args.now.getTime() - reviewedAtMs >
+                GOAL_SEMANTIC_REVIEW_CACHE_TTL_MS) {
                 return null;
             }
             return cached;
@@ -853,8 +851,9 @@ export function withGoals(Base) {
             }
             const goals = await this.refreshGoalReviewStates(now);
             const allReminders = [
-                ...buildActiveReminders(overviewOccurrences, plansByDefinitionId, now).filter((reminder) => shouldDeliverReminderForIntensity(definitionPreferencesById.get(reminder.definitionId ?? "")?.effective
-                    ?.intensity ?? globalReminderPreference.effective.intensity, occurrenceUrgencies.get(reminder.ownerId) ?? "medium")),
+                ...buildActiveReminders(overviewOccurrences, plansByDefinitionId, now).filter((reminder) => shouldDeliverReminderForIntensity(definitionPreferencesById.get(reminder.definitionId ?? "")
+                    ?.effective?.intensity ??
+                    globalReminderPreference.effective.intensity, occurrenceUrgencies.get(reminder.ownerId) ?? "medium")),
                 ...buildActiveCalendarEventReminders(calendarEvents, plansByEventId, this.ownerEntityId(), now).filter((reminder) => shouldDeliverReminderForIntensity(globalReminderPreference.effective.intensity, eventUrgencies.get(reminder.ownerId) ?? "medium")),
             ].sort((left, right) => new Date(left.scheduledFor).getTime() -
                 new Date(right.scheduledFor).getTime());

package/apps/app-lifeops/src/lifeops/service-mixin-google.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"service-mixin-google.d.ts","sourceRoot":"","sources":["../../../../../../../apps/app-lifeops/src/lifeops/service-mixin-google.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,uCAAuC,EAEvC,oBAAoB,EACpB,oBAAoB,EACpB,4BAA4B,EAC5B,kCAAkC,EAClC,mCAAmC,EACpC,MAAM,uBAAuB,CAAC;AAkC/B,MAAM,WAAW,oBAAoB;IACnC,wBAAwB,CACtB,UAAU,EAAE,GAAG,EACf,aAAa,CAAC,EAAE,oBAAoB,EACpC,aAAa,CAAC,EAAE,oBAAoB,EACpC,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,4BAA4B,CAAC,CAAC;IACzC,0BAA0B,CACxB,UAAU,EAAE,GAAG,EACf,aAAa,CAAC,EAAE,oBAAoB,GACnC,OAAO,CAAC,4BAA4B,EAAE,CAAC,CAAC;IAC3C,yBAAyB,CACvB,UAAU,EAAE,GAAG,EACf,kBAAkB,EAAE,oBAAoB,GAAG,SAAS,EACpD,aAAa,CAAC,EAAE,oBAAoB,GACnC,OAAO,CAAC,4BAA4B,CAAC,CAAC;IACzC,oBAAoB,CAClB,OAAO,EAAE,kCAAkC,EAC3C,UAAU,EAAE,GAAG,GACd,OAAO,CAAC,mCAAmC,CAAC,CAAC;IAChD,+BAA+B,CAC7B,WAAW,EAAE,GAAG,GACf,OAAO,CAAC,4BAA4B,CAAC,CAAC;IACzC,yBAAyB,CACvB,OAAO,EAAE,uCAAuC,EAChD,UAAU,EAAE,GAAG,GACd,OAAO,CAAC,4BAA4B,CAAC,CAAC;CAC1C"}
+{"version":3,"file":"service-mixin-google.d.ts","sourceRoot":"","sources":["../../../../../../../apps/app-lifeops/src/lifeops/service-mixin-google.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,uCAAuC,EAEvC,oBAAoB,EACpB,oBAAoB,EACpB,4BAA4B,EAC5B,kCAAkC,EAClC,mCAAmC,EACpC,MAAM,uBAAuB,CAAC;AAkC/B,MAAM,WAAW,oBAAoB;IACnC,wBAAwB,CACtB,UAAU,EAAE,GAAG,EACf,aAAa,CAAC,EAAE,oBAAoB,EACpC,aAAa,CAAC,EAAE,oBAAoB,EACpC,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,4BAA4B,CAAC,CAAC;IACzC,0BAA0B,CACxB,UAAU,EAAE,GAAG,EACf,aAAa,CAAC,EAAE,oBAAoB,GACnC,OAAO,CAAC,4BAA4B,EAAE,CAAC,CAAC;IAC3C,yBAAyB,CACvB,UAAU,EAAE,GAAG,EACf,kBAAkB,EAAE,oBAAoB,GAAG,SAAS,EACpD,aAAa,CAAC,EAAE,oBAAoB,GACnC,OAAO,CAAC,4BAA4B,CAAC,CAAC;IACzC,oBAAoB,CAClB,OAAO,EAAE,kCAAkC,EAC3C,UAAU,EAAE,GAAG,GACd,OAAO,CAAC,mCAAmC,CAAC,CAAC;IAChD,+BAA+B,CAC7B,WAAW,EAAE,GAAG,GACf,OAAO,CAAC,4BAA4B,CAAC,CAAC;IACzC,yBAAyB,CACvB,OAAO,EAAE,uCAAuC,EAChD,UAAU,EAAE,GAAG,GACd,OAAO,CAAC,4BAA4B,CAAC,CAAC;CAC1C"}

package/apps/app-lifeops/src/lifeops/service-mixin-google.js

@@ -1,9 +1,10 @@
+import crypto from "node:crypto";
 import { GoogleApiError, googleErrorLooksLikeAdminPolicyBlock, googleErrorRequiresReauth, } from "./google-api-error.js";
 import { resolveGoogleAvailableModes, resolveGoogleExecutionTarget, resolveGoogleGrants, resolveGoogleSourceOfTruth, resolvePreferredGoogleGrant, } from "./google-connector-gateway.js";
 import { ManagedGoogleClientError, resolveManagedGoogleCloudConfig, } from "./google-managed-client.js";
 import { completeGoogleConnectorOAuth, deleteStoredGoogleToken, GoogleOAuthError, readStoredGoogleToken, resolveGoogleOAuthConfig, startGoogleConnectorOAuth, } from "./google-oauth.js";
 import { createLifeOpsConnectorGrant } from "./repository.js";
-import { fail } from "./service-normalize.js";
+import { fail, normalizeOptionalString } from "./service-normalize.js";
 import { normalizeGoogleCapabilityRequest, normalizeGrantCapabilities, normalizeOptionalConnectorMode, normalizeOptionalConnectorSide, } from "./service-normalize-connector.js";
 // ---------------------------------------------------------------------------
 // Local helpers
@@ -92,6 +93,11 @@ export function withGoogle(Base) {
             await this.repository.deleteGmailSpamReviewItemsForProvider(this.agentId(), "google", side);
             await this.repository.deleteGmailSyncState(this.agentId(), "google", undefined, side);
         }
+        async clearGoogleGrantData(grant) {
+            await this.repository.deleteGmailMessagesForProvider(this.agentId(), "google", grant.side, grant.id);
+            await this.repository.deleteGmailSpamReviewItemsForProvider(this.agentId(), "google", grant.side, grant.id);
+            await this.repository.deleteGmailSyncState(this.agentId(), "google", undefined, grant.side, grant.id);
+        }
         /**
          * Delete reminder plans for a set of calendar events.
          * This is a helper used by clearGoogleConnectorData. Subclasses that
@@ -385,7 +391,7 @@ export function withGoogle(Base) {
                     if (error instanceof ManagedGoogleClientError) {
                         if (error.status === 404) {
                             if (resolvedGrant?.mode === "cloud_managed") {
-                                await this.repository.deleteConnectorGrant(this.agentId(), "google", "cloud_managed", side);
+                                await this.repository.deleteConnectorGrant(this.agentId(), "google", "cloud_managed", side, resolvedGrant.id);
                                 if (!grants.some((candidate) => candidate.provider === "google" &&
                                     candidate.side === side &&
                                     candidate.mode !== "cloud_managed")) {
@@ -675,6 +681,8 @@ export function withGoogle(Base) {
             const existingGrant = request.grantId
                 ? ((await this.repository.listConnectorGrants(this.agentId())).find((g) => g.id === request.grantId) ?? null)
                 : await this.repository.getConnectorGrant(this.agentId(), "google", resolvedConfig.mode, requestedSide);
+            const pendingGrantId = request.grantId ??
+                (request.createNewGrant ? crypto.randomUUID() : undefined);
             try {
                 return startGoogleConnectorOAuth({
                     agentId: this.agentId(),
@@ -682,10 +690,10 @@ export function withGoogle(Base) {
                     requestUrl,
                     mode: resolvedConfig.mode,
                     requestedCapabilities,
-                    existingCapabilities: existingGrant
+                    existingCapabilities: existingGrant && !request.createNewGrant
                         ? normalizeGrantCapabilities(existingGrant.capabilities)
                         : undefined,
-                    grantId: request.grantId,
+                    grantId: pendingGrantId,
                 });
             }
             catch (error) {
@@ -722,11 +730,17 @@ export function withGoogle(Base) {
             if (result.agentId !== this.agentId()) {
                 fail(409, "Google callback does not belong to the active agent.");
             }
+            const currentGoogleGrants = (await this.repository.listConnectorGrants(this.agentId())).filter((candidate) => candidate.provider === "google");
             const existingGrant = result.grantId
-                ? ((await this.repository.listConnectorGrants(this.agentId())).find((g) => g.id === result.grantId) ?? null)
+                ? (currentGoogleGrants.find((g) => g.id === result.grantId) ?? null)
                 : await this.repository.getConnectorGrant(this.agentId(), "google", result.mode, result.side);
+            const previousPreferredGrant = resolvePreferredGoogleGrant({
+                grants: currentGoogleGrants,
+                defaultMode: result.mode,
+            });
             const nowIso = new Date().toISOString();
             const clearedMetadata = clearGoogleGrantAuthFailureMetadata(existingGrant?.metadata ?? {});
+            const preferredByAgent = existingGrant?.preferredByAgent ?? previousPreferredGrant === null;
             const grant = existingGrant
                 ? {
                     ...existingGrant,
@@ -737,6 +751,7 @@ export function withGoogle(Base) {
                     executionTarget: "local",
                     sourceOfTruth: "local_storage",
                     cloudConnectionId: null,
+                    preferredByAgent,
                     metadata: {
                         ...clearedMetadata,
                         expiresAt: result.expiresAt,
@@ -745,31 +760,32 @@ export function withGoogle(Base) {
                     lastRefreshAt: nowIso,
                     updatedAt: nowIso,
                 }
-                : createLifeOpsConnectorGrant({
-                    agentId: this.agentId(),
-                    provider: "google",
-                    side: result.side,
-                    identity: { ...result.identity },
-                    grantedScopes: [...result.grantedScopes],
-                    capabilities: [...result.grantedCapabilities],
-                    tokenRef: result.tokenRef,
-                    mode: result.mode,
-                    executionTarget: "local",
-                    sourceOfTruth: "local_storage",
-                    preferredByAgent: true,
-                    cloudConnectionId: null,
-                    metadata: {
-                        expiresAt: result.expiresAt,
-                        hasRefreshToken: result.hasRefreshToken,
-                    },
-                    lastRefreshAt: nowIso,
-                });
+                : {
+                    ...createLifeOpsConnectorGrant({
+                        agentId: this.agentId(),
+                        provider: "google",
+                        side: result.side,
+                        identity: { ...result.identity },
+                        grantedScopes: [...result.grantedScopes],
+                        capabilities: [...result.grantedCapabilities],
+                        tokenRef: result.tokenRef,
+                        mode: result.mode,
+                        executionTarget: "local",
+                        sourceOfTruth: "local_storage",
+                        preferredByAgent,
+                        cloudConnectionId: null,
+                        metadata: {
+                            expiresAt: result.expiresAt,
+                            hasRefreshToken: result.hasRefreshToken,
+                        },
+                        lastRefreshAt: nowIso,
+                    }),
+                    ...(result.grantId ? { id: result.grantId } : {}),
+                };
             await this.repository.upsertConnectorGrant(grant);
-            const previousPreferredGrant = resolvePreferredGoogleGrant({
-                grants: (await this.repository.listConnectorGrants(this.agentId())).filter((candidate) => candidate.provider === "google"),
-                defaultMode: result.mode,
-            });
-            const nextPreferredGrant = await this.setPreferredGoogleConnectorMode(result.mode, result.side);
+            const nextPreferredGrant = preferredByAgent || !previousPreferredGrant
+                ? await this.setPreferredGoogleConnectorMode(result.mode, result.side)
+                : previousPreferredGrant;
             if (previousPreferredGrant?.id !== nextPreferredGrant?.id) {
                 await this.clearGoogleConnectorData();
             }
@@ -781,9 +797,10 @@ export function withGoogle(Base) {
                 tokenRef: result.tokenRef,
                 expiresAt: result.expiresAt,
             });
-            return this.getGoogleConnectorStatus(callbackUrl, result.mode, result.side);
+            return this.getGoogleConnectorStatus(callbackUrl, result.mode, result.side, grant.id);
         }
         async disconnectGoogleConnector(request, requestUrl) {
+            const requestedGrantId = normalizeOptionalString(request.grantId);
             const requestedMode = normalizeOptionalConnectorMode(request.mode, "mode");
             const requestedSide = normalizeOptionalConnectorSide(request.side, "side");
             const grants = (await this.repository.listConnectorGrants(this.agentId())).filter((grant) => grant.provider === "google");
@@ -793,26 +810,26 @@ export function withGoogle(Base) {
                     .configured,
                 grants,
             });
-            const mode = requestedMode ??
-                resolvePreferredGoogleGrant({
-                    grants,
-                    requestedMode,
-                    requestedSide,
-                    defaultMode: modeAvailability.defaultMode,
-                })?.mode ??
-                modeAvailability.defaultMode;
-            const side = requestedSide ??
-                resolvePreferredGoogleGrant({
-                    grants,
-                    requestedMode,
-                    requestedSide,
-                    defaultMode: modeAvailability.defaultMode,
-                })?.side ??
-                "owner";
-            const grant = await this.repository.getConnectorGrant(this.agentId(), "google", mode, side);
+            const preferredGrant = resolvePreferredGoogleGrant({
+                grants,
+                requestedMode,
+                requestedSide,
+                defaultMode: modeAvailability.defaultMode,
+            });
+            const fallbackMode = requestedMode ?? preferredGrant?.mode ?? modeAvailability.defaultMode;
+            const fallbackSide = requestedSide ?? preferredGrant?.side ?? "owner";
+            const grant = requestedGrantId
+                ? (grants.find((candidate) => candidate.id === requestedGrantId) ??
+                    null)
+                : await this.repository.getConnectorGrant(this.agentId(), "google", fallbackMode, fallbackSide);
             if (!grant) {
-                return this.getGoogleConnectorStatus(requestUrl, mode, side);
+                if (requestedGrantId) {
+                    fail(404, "Google connector grant not found.");
+                }
+                return this.getGoogleConnectorStatus(requestUrl, fallbackMode, fallbackSide);
             }
+            const mode = grant.mode;
+            const side = grant.side;
             if (mode === "cloud_managed" && grant.cloudConnectionId) {
                 try {
                     await this.googleManagedClient.disconnectConnector(grant.cloudConnectionId, grant.side);
@@ -836,9 +853,12 @@ export function withGoogle(Base) {
                 grants,
                 defaultMode: modeAvailability.defaultMode,
             });
-            await this.repository.deleteConnectorGrant(this.agentId(), "google", mode, side);
-            const nextPreferredGrant = await this.setPreferredGoogleConnectorMode(null);
-            if (previousPreferredGrant?.id === grant.id || !nextPreferredGrant) {
+            await this.repository.deleteConnectorGrant(this.agentId(), "google", mode, side, grant.id);
+            const nextPreferredGrant = previousPreferredGrant?.id === grant.id || !previousPreferredGrant
+                ? await this.setPreferredGoogleConnectorMode(null)
+                : previousPreferredGrant;
+            await this.clearGoogleGrantData(grant);
+            if (!nextPreferredGrant) {
                 await this.clearGoogleConnectorData();
             }
             await this.recordConnectorAudit(`google:${mode}`, "google connector disconnected", {