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

package/apps/app-lifeops/src/lifeops/google-managed-client.js

@@ -162,12 +162,20 @@ export class GoogleManagedClient {
         });
         return readJsonResponse(response);
     }
-    async getStatus(side) {
+    async getStatus(side, grantId) {
         const query = new URLSearchParams({ side });
-        return this.request(`eliza/google/status?${query.toString()}`, {
+        if (grantId)
+            query.set("grantId", grantId);
+        return this.request(`milady/google/status?${query.toString()}`, {
             method: "GET",
         });
     }
+    async listAccounts(side) {
+        const query = new URLSearchParams();
+        if (side)
+            query.set("side", side);
+        return this.request(`milady/google/accounts?${query.toString()}`, { method: "GET" });
+    }
     async startConnector(args) {
         const redirectUri = args.redirectUrl ??
             new URL("/auth/success?platform=google", `${this.requireConfig().siteUrl.replace(/\/+$/, "")}/`).toString();
@@ -178,6 +186,7 @@ export class GoogleManagedClient {
                 redirectUrl: redirectUri,
                 scopes: managedGoogleCapabilitiesToScopes(requestedCapabilities),
                 connectionRole: args.side,
+                ...(args.grantId ? { grantId: args.grantId } : {}),
             }),
         });
         return {
@@ -190,7 +199,7 @@ export class GoogleManagedClient {
         };
     }
     async disconnectConnector(connectionId, side) {
-        await this.request("eliza/google/disconnect", {
+        await this.request("milady/google/disconnect", {
             method: "POST",
             body: JSON.stringify({
                 connectionId: connectionId ?? null,
@@ -206,7 +215,9 @@ export class GoogleManagedClient {
             timeMax: args.timeMax,
             timeZone: args.timeZone,
         });
-        return this.request(`eliza/google/calendar/feed?${query.toString()}`, {
+        if (args.grantId)
+            query.set("grantId", args.grantId);
+        return this.request(`milady/google/calendar/feed?${query.toString()}`, {
             method: "GET",
         });
     }
@@ -216,7 +227,7 @@ export class GoogleManagedClient {
             startAt: normalizeManagedCalendarDateTime(request.startAt ?? "", request.timeZone),
             endAt: normalizeManagedCalendarDateTime(request.endAt ?? "", request.timeZone),
         };
-        return this.request("eliza/google/calendar/events", {
+        return this.request("milady/google/calendar/events", {
             method: "POST",
             body: JSON.stringify(normalizedRequest),
         });
@@ -224,6 +235,7 @@ export class GoogleManagedClient {
     async updateCalendarEvent(request) {
         const normalizedRequest = {
             side: request.side,
+            ...(request.grantId ? { grantId: request.grantId } : {}),
             calendarId: request.calendarId ?? undefined,
             title: request.title,
             description: request.description,
@@ -237,7 +249,7 @@ export class GoogleManagedClient {
             timeZone: request.timeZone,
             attendees: request.attendees ?? undefined,
         };
-        return this.request(`eliza/google/calendar/events/${encodeURIComponent(request.eventId)}`, {
+        return this.request(`milady/google/calendar/events/${encodeURIComponent(request.eventId)}`, {
             method: "PATCH",
             body: JSON.stringify(normalizedRequest),
         });
@@ -247,7 +259,9 @@ export class GoogleManagedClient {
             side: request.side,
             ...(request.calendarId ? { calendarId: request.calendarId } : {}),
         });
-        return this.request(`eliza/google/calendar/events/${encodeURIComponent(request.eventId)}?${query.toString()}`, {
+        if (request.grantId)
+            query.set("grantId", request.grantId);
+        return this.request(`milady/google/calendar/events/${encodeURIComponent(request.eventId)}?${query.toString()}`, {
             method: "DELETE",
         });
     }
@@ -256,7 +270,9 @@ export class GoogleManagedClient {
             side: args.side,
             maxResults: String(args.maxResults),
         });
-        return this.request(`eliza/google/gmail/triage?${query.toString()}`, {
+        if (args.grantId)
+            query.set("grantId", args.grantId);
+        return this.request(`milady/google/gmail/triage?${query.toString()}`, {
             method: "GET",
         });
     }
@@ -266,7 +282,9 @@ export class GoogleManagedClient {
             query: args.query,
             maxResults: String(args.maxResults),
         });
-        return this.request(`eliza/google/gmail/search?${query.toString()}`, {
+        if (args.grantId)
+            query.set("grantId", args.grantId);
+        return this.request(`milady/google/gmail/search?${query.toString()}`, {
             method: "GET",
         });
     }
@@ -275,18 +293,20 @@ export class GoogleManagedClient {
             side: args.side,
             messageId: args.messageId,
         });
-        return this.request(`eliza/google/gmail/read?${query.toString()}`, {
+        if (args.grantId)
+            query.set("grantId", args.grantId);
+        return this.request(`milady/google/gmail/read?${query.toString()}`, {
             method: "GET",
         });
     }
     async sendGmailReply(request) {
-        return this.request("eliza/google/gmail/reply-send", {
+        return this.request("milady/google/gmail/reply-send", {
             method: "POST",
             body: JSON.stringify(request),
         });
     }
     async sendGmailMessage(request) {
-        return this.request("eliza/google/gmail/message-send", {
+        return this.request("milady/google/gmail/message-send", {
             method: "POST",
             body: JSON.stringify(request),
         });

package/apps/app-lifeops/src/lifeops/google-oauth.d.ts

@@ -32,6 +32,8 @@ export interface GoogleConnectorCallbackResult {
     agentId: string;
     side: LifeOpsConnectorSide;
     mode: LifeOpsConnectorMode;
+    /** Set when re-authenticating an existing account. */
+    grantId?: string;
     tokenRef: string;
     identity: Record<string, unknown>;
     grantedCapabilities: LifeOpsGoogleCapability[];
@@ -51,6 +53,8 @@ export declare function startGoogleConnectorOAuth(args: {
     mode?: LifeOpsConnectorMode;
     requestedCapabilities?: readonly LifeOpsGoogleCapability[];
     existingCapabilities?: readonly LifeOpsGoogleCapability[];
+    /** When re-authenticating an existing account, pass its grant ID. */
+    grantId?: string;
     env?: NodeJS.ProcessEnv;
 }): StartLifeOpsGoogleConnectorResponse;
 export declare function completeGoogleConnectorOAuth(args: {

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

@@ -1 +1 @@
-{"version":3,"file":"google-oauth.d.ts","sourceRoot":"","sources":["../../../../../../../apps/app-lifeops/src/lifeops/google-oauth.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"google-oauth.d.ts","sourceRoot":"","sources":["../../../../../../../apps/app-lifeops/src/lifeops/google-oauth.ts"],"names":[],"mappings":"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"}

package/apps/app-lifeops/src/lifeops/google-oauth.js

@@ -3,6 +3,7 @@ import fs from "node:fs";
 import path from "node:path";
 import { resolveOAuthDir } from "@elizaos/agent/config/paths";
 import { googleCapabilitiesToScopes, googleScopesToCapabilities, normalizeGoogleCapabilities, unionGoogleCapabilities, } from "./google-scopes.js";
+import { rewriteGoogleUrlForMock } from "./google-fetch.js";
 const GOOGLE_AUTHORIZATION_ENDPOINT = "https://accounts.google.com/o/oauth2/v2/auth";
 const GOOGLE_TOKEN_ENDPOINT = "https://oauth2.googleapis.com/token";
 const GOOGLE_USERINFO_ENDPOINT = "https://openidconnect.googleapis.com/v1/userinfo";
@@ -135,19 +136,96 @@ function createCodeChallenge(codeVerifier) {
 function createState() {
     return crypto.randomBytes(32).toString("hex");
 }
-function cleanupExpiredGoogleOAuthSessions(now = Date.now()) {
+function pendingGoogleOAuthSessionDir(env = process.env) {
+    return path.join(resolveOAuthDir(env), "lifeops", "google", "pending-sessions");
+}
+function pendingGoogleOAuthSessionPath(state, env = process.env) {
+    return path.join(pendingGoogleOAuthSessionDir(env), `${sanitizePathSegment(state)}.json`);
+}
+function writePendingGoogleOAuthSession(session, env = process.env) {
+    const filePath = pendingGoogleOAuthSessionPath(session.state, env);
+    ensureTokenStorageDir(path.dirname(filePath));
+    fs.writeFileSync(filePath, JSON.stringify(session, null, 2), {
+        encoding: "utf8",
+        mode: 0o600,
+    });
+}
+function readPendingGoogleOAuthSession(state, env = process.env) {
+    const filePath = pendingGoogleOAuthSessionPath(state, env);
+    if (!fs.existsSync(filePath)) {
+        return null;
+    }
+    try {
+        const parsed = JSON.parse(fs.readFileSync(filePath, "utf8"));
+        if (parsed &&
+            typeof parsed === "object" &&
+            parsed.state === state &&
+            typeof parsed.agentId === "string" &&
+            typeof parsed.clientId === "string" &&
+            typeof parsed.redirectUri === "string" &&
+            typeof parsed.codeVerifier === "string" &&
+            typeof parsed.createdAt === "number") {
+            return parsed;
+        }
+    }
+    catch {
+        // Invalid pending-session state is treated as absent and will be overwritten
+        // by a fresh auth flow.
+    }
+    fs.rmSync(filePath, { force: true });
+    return null;
+}
+function deletePendingGoogleOAuthSession(state, env = process.env) {
+    fs.rmSync(pendingGoogleOAuthSessionPath(state, env), { force: true });
+}
+function cleanupExpiredGoogleOAuthSessions(now = Date.now(), env = process.env) {
     for (const [state, session] of pendingGoogleOAuthSessions.entries()) {
         if (now - session.createdAt > GOOGLE_OAUTH_SESSION_TTL_MS) {
             pendingGoogleOAuthSessions.delete(state);
         }
     }
+    const dir = pendingGoogleOAuthSessionDir(env);
+    if (!fs.existsSync(dir)) {
+        return;
+    }
+    for (const entry of fs.readdirSync(dir)) {
+        const filePath = path.join(dir, entry);
+        try {
+            const raw = JSON.parse(fs.readFileSync(filePath, "utf8"));
+            if (typeof raw.state !== "string" ||
+                typeof raw.createdAt !== "number" ||
+                now - raw.createdAt > GOOGLE_OAUTH_SESSION_TTL_MS) {
+                fs.rmSync(filePath, { force: true });
+            }
+        }
+        catch {
+            fs.rmSync(filePath, { force: true });
+        }
+    }
 }
-function clearPendingSessionsForAgent(agentId, side, mode) {
+function clearPendingSessionsForAgent(agentId, side, mode, env = process.env) {
     for (const [state, session] of pendingGoogleOAuthSessions.entries()) {
         if (session.agentId === agentId &&
             session.side === side &&
             session.mode === mode) {
             pendingGoogleOAuthSessions.delete(state);
+            deletePendingGoogleOAuthSession(state, env);
+        }
+    }
+    const dir = pendingGoogleOAuthSessionDir(env);
+    if (!fs.existsSync(dir)) {
+        return;
+    }
+    for (const entry of fs.readdirSync(dir)) {
+        const filePath = path.join(dir, entry);
+        try {
+            const raw = JSON.parse(fs.readFileSync(filePath, "utf8"));
+            if (raw.agentId === agentId && raw.side === side && raw.mode === mode) {
+                fs.rmSync(filePath, { force: true });
+            }
+        }
+        catch {
+            fs.rmSync(filePath, { force: true });
         }
     }
 }
@@ -185,8 +263,9 @@ function sanitizePathSegment(value) {
 function ensureTokenStorageDir(dir) {
     fs.mkdirSync(dir, { recursive: true, mode: 0o700 });
 }
-function buildGoogleTokenRef(agentId, side, mode) {
-    return path.join(sanitizePathSegment(agentId), sanitizePathSegment(side), `${mode}.json`);
+function buildGoogleTokenRef(agentId, side, mode, grantId) {
+    const filename = grantId ? `${mode}_${grantId}.json` : `${mode}.json`;
+    return path.join(sanitizePathSegment(agentId), sanitizePathSegment(side), filename);
 }
 function resolveTokenPath(tokenRef, env = process.env) {
     return path.join(tokenStorageRoot(env), tokenRef);
@@ -259,7 +338,7 @@ function parseIdTokenClaims(idToken) {
     }
 }
 async function fetchGoogleUserInfo(accessToken) {
-    const response = await fetch(GOOGLE_USERINFO_ENDPOINT, {
+    const response = await fetch(rewriteGoogleUrlForMock(GOOGLE_USERINFO_ENDPOINT), {
         headers: {
             Authorization: `Bearer ${accessToken}`,
         },
@@ -273,7 +352,7 @@ async function fetchGoogleUserInfo(accessToken) {
         : {};
 }
 async function exchangeGoogleToken(params) {
-    const response = await fetch(GOOGLE_TOKEN_ENDPOINT, {
+    const response = await fetch(rewriteGoogleUrlForMock(GOOGLE_TOKEN_ENDPOINT), {
         method: "POST",
         headers: {
             "Content-Type": "application/x-www-form-urlencoded",
@@ -313,11 +392,11 @@ function buildStoredGoogleToken(session, token, grantedScopes, existing) {
     };
 }
 export function startGoogleConnectorOAuth(args) {
-    cleanupExpiredGoogleOAuthSessions();
+    cleanupExpiredGoogleOAuthSessions(Date.now(), args.env);
     const config = resolveGoogleOAuthConfig(args.requestUrl, args.mode, args.env);
     requireGoogleOAuthConfig(config, args.requestUrl);
     const side = args.side ?? "owner";
-    clearPendingSessionsForAgent(args.agentId, side, config.mode);
+    clearPendingSessionsForAgent(args.agentId, side, config.mode, args.env);
     const requestedCapabilities = unionGoogleCapabilities(args.existingCapabilities, args.requestedCapabilities
         ? normalizeGoogleCapabilities(args.requestedCapabilities)
         : undefined);
@@ -325,7 +404,7 @@ export function startGoogleConnectorOAuth(args) {
     const state = createState();
     const codeVerifier = createCodeVerifier();
     const codeChallenge = createCodeChallenge(codeVerifier);
-    pendingGoogleOAuthSessions.set(state, {
+    const pendingSession = {
         state,
         agentId: args.agentId,
         side,
@@ -336,7 +415,10 @@ export function startGoogleConnectorOAuth(args) {
         requestedCapabilities,
         codeVerifier,
         createdAt: Date.now(),
-    });
+        grantId: args.grantId,
+    };
+    pendingGoogleOAuthSessions.set(state, pendingSession);
+    writePendingGoogleOAuthSession(pendingSession, args.env);
     const params = new URLSearchParams({
         client_id: config.clientId,
         redirect_uri: config.redirectUri,
@@ -359,16 +441,19 @@ export function startGoogleConnectorOAuth(args) {
     };
 }
 export async function completeGoogleConnectorOAuth(args) {
-    cleanupExpiredGoogleOAuthSessions();
+    cleanupExpiredGoogleOAuthSessions(Date.now(), args.env);
     const state = args.callbackUrl.searchParams.get("state")?.trim();
     if (!state) {
         throw new GoogleOAuthError(400, "Google callback is missing state.");
     }
-    const session = pendingGoogleOAuthSessions.get(state);
+    const session = pendingGoogleOAuthSessions.get(state) ??
+        readPendingGoogleOAuthSession(state, args.env);
     if (!session) {
         throw new GoogleOAuthError(400, "Google callback does not match an active login session.");
     }
+    pendingGoogleOAuthSessions.set(state, session);
     pendingGoogleOAuthSessions.delete(state);
+    deletePendingGoogleOAuthSession(state, args.env);
     if (Date.now() - session.createdAt > GOOGLE_OAUTH_SESSION_TTL_MS) {
         throw new GoogleOAuthError(410, "Google login session expired. Start the connection flow again.");
     }
@@ -404,7 +489,7 @@ export async function completeGoogleConnectorOAuth(args) {
     if (Object.keys(identity).length === 0) {
         identity = await fetchGoogleUserInfo(token.access_token);
     }
-    const tokenRef = buildGoogleTokenRef(session.agentId, session.side, session.mode);
+    const tokenRef = buildGoogleTokenRef(session.agentId, session.side, session.mode, session.grantId);
     const existing = readStoredGoogleTokenFile(tokenRef, args.env);
     const storedToken = buildStoredGoogleToken(session, token, normalizedScopes, existing);
     writeStoredGoogleTokenFile(tokenRef, storedToken, args.env);
@@ -412,6 +497,7 @@ export async function completeGoogleConnectorOAuth(args) {
         agentId: session.agentId,
         side: session.side,
         mode: session.mode,
+        grantId: session.grantId,
         tokenRef,
         identity,
         grantedCapabilities,

package/apps/app-lifeops/src/lifeops/health-bridge.d.ts

@@ -0,0 +1,57 @@
+/**
+ * Health / fitness bridge for LifeOps.
+ *
+ * Provides a uniform read-only surface over:
+ *   - HealthKit (macOS) via an external native helper binary invoked through
+ *     `execFile`. The helper is expected to emit JSON. The helper is not
+ *     shipped in this repo; until it is installed the bridge reports
+ *     `backend: "none"` for detection, but `getDailySummary` without any
+ *     configured backend throws `HealthBridgeError("no health backend
+ *     available", "none")` so the caller can surface a clear status.
+ *   - Google Fit REST API as a cross-platform fallback, authenticated via an
+ *     OAuth access token supplied through config or `ELIZA_GOOGLE_FIT_ACCESS_TOKEN`.
+ *
+ * Never log raw health values in plaintext.
+ */
+export type HealthBackend = "healthkit" | "google-fit" | "fixture" | "none";
+export interface HealthDataPoint {
+    metric: "steps" | "active_minutes" | "sleep_hours" | "heart_rate" | "calories" | "distance_meters";
+    value: number;
+    unit: string;
+    /** ISO-8601 timestamp. */
+    startAt: string;
+    /** ISO-8601 timestamp. */
+    endAt: string;
+    source: HealthBackend;
+}
+export interface HealthDailySummary {
+    /** Local day key, YYYY-MM-DD. */
+    date: string;
+    steps: number;
+    activeMinutes: number;
+    sleepHours: number;
+    heartRateAvg?: number;
+    calories?: number;
+    distanceMeters?: number;
+    source: HealthBackend;
+}
+export interface HealthBridgeConfig {
+    preferredBackend?: HealthBackend;
+    /** Path to a native HealthKit helper binary that emits JSON on stdout. */
+    healthKitCliPath?: string;
+    /** OAuth2 access token for Google Fit. */
+    googleFitAccessToken?: string;
+}
+export declare class HealthBridgeError extends Error {
+    readonly backend: HealthBackend;
+    constructor(message: string, backend: HealthBackend);
+}
+export declare function detectHealthBackend(config?: HealthBridgeConfig): Promise<HealthBackend>;
+export declare function getDailySummary(date: string, config?: HealthBridgeConfig): Promise<HealthDailySummary>;
+export declare function getDataPoints(opts: {
+    metric: HealthDataPoint["metric"];
+    startAt: string;
+    endAt: string;
+}, config?: HealthBridgeConfig): Promise<HealthDataPoint[]>;
+export declare function getRecentSummaries(days: number, config?: HealthBridgeConfig): Promise<HealthDailySummary[]>;
+//# sourceMappingURL=health-bridge.d.ts.map

package/apps/app-lifeops/src/lifeops/health-bridge.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"health-bridge.d.ts","sourceRoot":"","sources":["../../../../../../../apps/app-lifeops/src/lifeops/health-bridge.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAUH,MAAM,MAAM,aAAa,GAAG,WAAW,GAAG,YAAY,GAAG,SAAS,GAAG,MAAM,CAAC;AAE5E,MAAM,WAAW,eAAe;IAC9B,MAAM,EACF,OAAO,GACP,gBAAgB,GAChB,aAAa,GACb,YAAY,GACZ,UAAU,GACV,iBAAiB,CAAC;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,0BAA0B;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,0BAA0B;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,aAAa,CAAC;CACvB;AAED,MAAM,WAAW,kBAAkB;IACjC,iCAAiC;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,MAAM,EAAE,aAAa,CAAC;CACvB;AAED,MAAM,WAAW,kBAAkB;IACjC,gBAAgB,CAAC,EAAE,aAAa,CAAC;IACjC,0EAA0E;IAC1E,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,0CAA0C;IAC1C,oBAAoB,CAAC,EAAE,MAAM,CAAC;CAC/B;AAED,qBAAa,iBAAkB,SAAQ,KAAK;aAGxB,OAAO,EAAE,aAAa;gBADtC,OAAO,EAAE,MAAM,EACC,OAAO,EAAE,aAAa;CAKzC;AA0MD,wBAAsB,mBAAmB,CACvC,MAAM,CAAC,EAAE,kBAAkB,GAC1B,OAAO,CAAC,aAAa,CAAC,CAgCxB;AA6VD,wBAAsB,eAAe,CACnC,IAAI,EAAE,MAAM,EACZ,MAAM,CAAC,EAAE,kBAAkB,GAC1B,OAAO,CAAC,kBAAkB,CAAC,CA0B7B;AAED,wBAAsB,aAAa,CACjC,IAAI,EAAE;IAAE,MAAM,EAAE,eAAe,CAAC,QAAQ,CAAC,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,EAC3E,MAAM,CAAC,EAAE,kBAAkB,GAC1B,OAAO,CAAC,eAAe,EAAE,CAAC,CAwB5B;AAED,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,MAAM,EACZ,MAAM,CAAC,EAAE,kBAAkB,GAC1B,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAc/B"}