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

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

@@ -54,13 +54,15 @@ function tabIdFromGrant(grant) {
 function sessionIdFromGrant(grant) {
     if (!grant)
         return null;
-    const raw = grant.metadata?.sessionId;
+    const raw = grant.metadata
+        ?.sessionId;
     return typeof raw === "string" && raw.length > 0 ? raw : null;
 }
 function companionIdFromGrant(grant) {
     if (!grant)
         return null;
-    const raw = grant.metadata?.companionId;
+    const raw = grant.metadata
+        ?.companionId;
     return typeof raw === "string" && raw.length > 0 ? raw : null;
 }
 function companionKey(args) {
@@ -79,10 +81,14 @@ function sortCompanionsByRecency(companions) {
     return [...companions].sort((left, right) => {
         const leftMs = Date.parse(left.lastSeenAt ?? "");
         const rightMs = Date.parse(right.lastSeenAt ?? "");
-        if (Number.isFinite(leftMs) && Number.isFinite(rightMs) && leftMs !== rightMs) {
+        if (Number.isFinite(leftMs) &&
+            Number.isFinite(rightMs) &&
+            leftMs !== rightMs) {
             return rightMs - leftMs;
         }
-        if (left.lastSeenAt && right.lastSeenAt && left.lastSeenAt !== right.lastSeenAt) {
+        if (left.lastSeenAt &&
+            right.lastSeenAt &&
+            left.lastSeenAt !== right.lastSeenAt) {
             return right.lastSeenAt.localeCompare(left.lastSeenAt);
         }
         return left.id.localeCompare(right.id);
@@ -100,7 +106,9 @@ function pickNewestDiscordTab(tabs) {
         }
         const leftMs = Date.parse(left.lastFocusedAt ?? left.lastSeenAt);
         const rightMs = Date.parse(right.lastFocusedAt ?? right.lastSeenAt);
-        if (Number.isFinite(leftMs) && Number.isFinite(rightMs) && leftMs !== rightMs) {
+        if (Number.isFinite(leftMs) &&
+            Number.isFinite(rightMs) &&
+            leftMs !== rightMs) {
             return rightMs - leftMs;
         }
         return right.lastSeenAt.localeCompare(left.lastSeenAt);
@@ -112,8 +120,7 @@ function parseSessionProbe(session) {
     const result = asRecord(session.result);
     if (!result)
         return null;
-    const actionResults = asRecord(result.actionResults) ??
-        result;
+    const actionResults = asRecord(result.actionResults) ?? result;
     let pageUrl = null;
     let pageTitle = null;
     let mainText = null;
@@ -137,7 +144,9 @@ function parseSessionProbe(session) {
         }
         else if (action.kind === "read_page") {
             pageUrl =
-                typeof entry.url === "string" && entry.url.length > 0 ? entry.url : pageUrl;
+                typeof entry.url === "string" && entry.url.length > 0
+                    ? entry.url
+                    : pageUrl;
             pageTitle =
                 typeof entry.title === "string" && entry.title.length > 0
                     ? entry.title
@@ -176,7 +185,133 @@ function sessionError(session) {
         return null;
     const result = asRecord(session.result);
     const error = result?.error;
-    return typeof error === "string" && error.trim().length > 0 ? error.trim() : null;
+    return typeof error === "string" && error.trim().length > 0
+        ? error.trim()
+        : null;
+}
+function siteAccessAllowsDiscord(companion, hasDiscordPage) {
+    if (!companion) {
+        return null;
+    }
+    if (hasDiscordPage) {
+        return true;
+    }
+    if (companion.permissions.allOrigins) {
+        return true;
+    }
+    return companion.permissions.grantedOrigins.some((origin) => origin.includes("discord.com"));
+}
+function browserAuthStateFromProbe(probe) {
+    if (probe?.loggedIn === true) {
+        return "logged_in";
+    }
+    if (probe?.loggedIn === false &&
+        Boolean(probe.url?.includes("discord.com"))) {
+        return "logged_out";
+    }
+    return "unknown";
+}
+function browserTabState(args) {
+    if (args.probe?.dmInbox.visible) {
+        return "dm_inbox_visible";
+    }
+    if (args.probe?.url?.includes("discord.com")) {
+        return "discord_open";
+    }
+    if (args.hasDiscordTab) {
+        return "background_discord";
+    }
+    return "missing";
+}
+function lifeOpsBrowserAccessStatus(args) {
+    const authState = browserAuthStateFromProbe(args.probe);
+    const tabState = browserTabState({
+        probe: args.probe,
+        hasDiscordTab: args.hasDiscordTab,
+    });
+    let nextAction = "none";
+    if (!args.settingsEnabled || !args.trackingEnabled || args.paused) {
+        nextAction = "enable_browser_access";
+    }
+    else if (!args.hasAnyCompanion) {
+        nextAction = "connect_browser";
+    }
+    else if (!args.hasConnectedCompanion) {
+        nextAction = "open_extension_popup";
+    }
+    else if (authState === "logged_out") {
+        nextAction = "log_in";
+    }
+    else if (!args.canControl && tabState === "missing") {
+        nextAction = "enable_browser_control";
+    }
+    else if (!args.canControl && tabState !== "dm_inbox_visible") {
+        nextAction = "focus_dm_inbox_manually";
+    }
+    else if (tabState === "missing") {
+        nextAction = "open_discord";
+    }
+    else if (authState === "logged_in" && tabState !== "dm_inbox_visible") {
+        nextAction = "open_dm_inbox";
+    }
+    if (args.siteAccessOk === false && nextAction === "none") {
+        nextAction = "open_discord";
+    }
+    return {
+        source: "lifeops_browser",
+        active: args.active,
+        available: args.settingsEnabled &&
+            args.trackingEnabled &&
+            !args.paused &&
+            args.hasConnectedCompanion,
+        browser: args.companion?.browser ?? null,
+        profileId: args.companion?.profileId ?? null,
+        profileLabel: args.companion?.profileLabel ?? null,
+        companionId: args.companion?.id ?? null,
+        companionLabel: args.companion?.label ?? null,
+        canControl: args.canControl,
+        siteAccessOk: args.siteAccessOk,
+        currentUrl: args.probe?.url ?? null,
+        tabState,
+        authState,
+        nextAction,
+    };
+}
+function desktopBrowserAccessStatus(args) {
+    const authState = browserAuthStateFromProbe(args.probe);
+    const tabState = browserTabState({
+        probe: args.probe,
+        hasDiscordTab: args.hasTab,
+    });
+    let nextAction = "none";
+    if (!args.available) {
+        nextAction = "open_desktop_browser";
+    }
+    else if (authState === "logged_out") {
+        nextAction = "log_in";
+    }
+    else if (tabState === "missing") {
+        nextAction = "open_discord";
+    }
+    else if (authState === "logged_in" && tabState !== "dm_inbox_visible") {
+        nextAction = "open_dm_inbox";
+    }
+    return {
+        source: "desktop_browser",
+        active: args.active,
+        available: args.available,
+        browser: null,
+        profileId: null,
+        profileLabel: null,
+        companionId: null,
+        companionLabel: null,
+        canControl: args.available,
+        siteAccessOk: args.available ? true : null,
+        currentUrl: args.probe?.url ?? null,
+        tabState,
+        authState,
+        nextAction,
+    };
 }
 /** @internal */
 export function withDiscord(Base) {
@@ -204,17 +339,18 @@ export function withDiscord(Base) {
         }
         async lifeOpsDiscordGetOwnerBrowserDiscordState(grant) {
             const settings = await this.getBrowserSettings();
-            const connectedCompanions = sortCompanionsByRecency((await this.listBrowserCompanions()).filter((companion) => companion.connectionState === "connected"));
-            const available = settings.enabled &&
-                settings.trackingMode !== "off" &&
-                !this.isBrowserPaused(settings) &&
+            const allCompanions = sortCompanionsByRecency(await this.listBrowserCompanions());
+            const connectedCompanions = allCompanions.filter((companion) => companion.connectionState === "connected");
+            const paused = this.isBrowserPaused(settings);
+            const trackingEnabled = settings.trackingMode !== "off";
+            const settingsEnabled = settings.enabled;
+            const available = settingsEnabled &&
+                trackingEnabled &&
+                !paused &&
                 connectedCompanions.length > 0;
-            if (!available) {
-                return null;
-            }
             const tabs = await this.listBrowserTabs();
             const currentPage = await this.getCurrentBrowserPage();
-            const currentPageProbe = currentPage && currentPage.url.includes("discord.com")
+            const currentPageProbe = currentPage?.url.includes("discord.com")
                 ? probeDiscordCapturedPage(currentPage)
                 : null;
             const discordTab = pickNewestDiscordTab(tabs);
@@ -240,9 +376,13 @@ export function withDiscord(Base) {
                         profileId: discordTab.profileId,
                     }))) ??
                 (companionIdFromGrant(grant)
-                    ? connectedCompanions.find((companion) => companion.id === companionIdFromGrant(grant)) ?? null
+                    ? (connectedCompanions.find((companion) => companion.id === companionIdFromGrant(grant)) ?? null)
                     : null) ??
                 connectedCompanions[0] ??
+                (companionIdFromGrant(grant)
+                    ? (allCompanions.find((companion) => companion.id === companionIdFromGrant(grant)) ?? null)
+                    : null) ??
+                allCompanions[0] ??
                 null;
             const reason = browserReasonFor({
                 available,
@@ -257,9 +397,15 @@ export function withDiscord(Base) {
             });
             return {
                 available,
+                settingsEnabled,
+                trackingEnabled,
+                paused,
                 canControl: settings.allowBrowserControl,
                 selectedCompanion,
+                hasAnyCompanion: allCompanions.length > 0,
+                hasConnectedCompanion: connectedCompanions.length > 0,
                 discordTab,
+                currentPageUrl: currentPage?.url ?? null,
                 probe,
                 session,
                 lastError: sessionError(session),
@@ -271,6 +417,14 @@ export function withDiscord(Base) {
             const tabId = tabIdFromGrant(grant);
             const probe = available ? await this.lifeOpsDiscordProbeTab(tabId) : null;
             const loggedIn = probe?.loggedIn === true;
+            const browserAccess = [
+                desktopBrowserAccessStatus({
+                    active: available,
+                    available,
+                    probe,
+                    hasTab: Boolean(tabId),
+                }),
+            ];
             const capabilities = loggedIn || probe?.dmInbox.visible
                 ? capabilitiesForSide(LIFEOPS_DISCORD_CAPABILITIES, normalizedSide)
                 : (grant?.capabilities ?? []).filter((candidate) => candidate === "discord.read" || candidate === "discord.send");
@@ -290,6 +444,7 @@ export function withDiscord(Base) {
                 grantedCapabilities: capabilities,
                 lastError: null,
                 tabId,
+                browserAccess,
                 grant,
             };
         }
@@ -298,9 +453,37 @@ export function withDiscord(Base) {
             const grant = await this.repository.getConnectorGrant(this.agentId(), "discord", "local", normalizedSide);
             if (normalizedSide === "owner") {
                 const browserState = await this.lifeOpsDiscordGetOwnerBrowserDiscordState(grant);
-                if (browserState) {
-                    const probe = browserState.probe;
-                    const connected = probe?.loggedIn === true;
+                const workspaceAvailable = discordBrowserWorkspaceAvailable();
+                const workspaceTabId = tabIdFromGrant(grant);
+                const workspaceProbe = workspaceAvailable
+                    ? await this.lifeOpsDiscordProbeTab(workspaceTabId)
+                    : null;
+                const probe = browserState.probe;
+                const connected = probe?.loggedIn === true;
+                const onDiscordPage = Boolean(browserState.currentPageUrl?.includes("discord.com")) ||
+                    Boolean(browserState.discordTab);
+                const browserAccess = [
+                    lifeOpsBrowserAccessStatus({
+                        active: browserState.available,
+                        settingsEnabled: browserState.settingsEnabled,
+                        trackingEnabled: browserState.trackingEnabled,
+                        paused: browserState.paused,
+                        canControl: browserState.canControl,
+                        companion: browserState.selectedCompanion,
+                        hasAnyCompanion: browserState.hasAnyCompanion,
+                        hasConnectedCompanion: browserState.hasConnectedCompanion,
+                        probe,
+                        hasDiscordTab: onDiscordPage,
+                        siteAccessOk: siteAccessAllowsDiscord(browserState.selectedCompanion, onDiscordPage || Boolean(browserState.discordTab)),
+                    }),
+                    desktopBrowserAccessStatus({
+                        active: !browserState.available && workspaceAvailable,
+                        available: workspaceAvailable,
+                        probe: workspaceProbe,
+                        hasTab: Boolean(workspaceTabId),
+                    }),
+                ];
+                if (browserState.available) {
                     return {
                         provider: "discord",
                         side: normalizedSide,
@@ -314,9 +497,15 @@ export function withDiscord(Base) {
                             : [],
                         lastError: browserState.lastError,
                         tabId: tabIdFromGrant(grant),
+                        browserAccess,
                         grant,
                     };
                 }
+                const workspaceStatus = await this.lifeOpsDiscordBuildWorkspaceStatus(normalizedSide, grant);
+                return {
+                    ...workspaceStatus,
+                    browserAccess,
+                };
             }
             return this.lifeOpsDiscordBuildWorkspaceStatus(normalizedSide, grant);
         }
@@ -330,16 +519,22 @@ export function withDiscord(Base) {
             const existing = await this.repository.getConnectorGrant(this.agentId(), "discord", "local", normalizedSide);
             if (normalizedSide === "owner") {
                 const browserState = await this.lifeOpsDiscordGetOwnerBrowserDiscordState(existing);
-                if (browserState) {
+                const hasConnectedBrowserPath = browserState.hasConnectedCompanion ||
+                    Boolean(browserState.currentPageUrl?.includes("discord.com")) ||
+                    Boolean(browserState.discordTab) ||
+                    Boolean(browserState.probe);
+                if (hasConnectedBrowserPath) {
                     const probe = browserState.probe;
                     const connected = probe?.loggedIn === true;
                     const dmInboxVisible = probe?.dmInbox.visible === true;
                     const identity = identityFromProbe(probe, existing?.identity ?? null) ?? {};
-                    const onDiscordPage = Boolean(probe?.url && probe.url.includes("discord.com"));
-                    const onDiscordDmPage = Boolean(probe?.url && probe.url.includes("/channels/@me"));
+                    const onDiscordPage = Boolean(probe?.url?.includes("discord.com"));
+                    const onDiscordDmPage = Boolean(probe?.url?.includes("/channels/@me"));
                     const needsDiscordOpen = !connected && !onDiscordPage;
                     const needsDmInspection = connected && !dmInboxVisible;
-                    if (!browserState.canControl && !browserState.discordTab && !onDiscordPage) {
+                    if (!browserState.canControl &&
+                        !browserState.discordTab &&
+                        !onDiscordPage) {
                         fail(409, "LifeOps Browser can see your browser, but browser control is disabled. Enable browser control or open Discord manually, then try again.");
                     }
                     let sessionId = sessionIdFromGrant(existing);
@@ -487,7 +682,7 @@ export function withDiscord(Base) {
                 }
             }
             if (!discordBrowserWorkspaceAvailable()) {
-                fail(503, "Discord connector requires either a connected LifeOps Browser companion or the Milady desktop app browser workspace.");
+                fail(503, "Discord connector requires either Your Browser connected through LifeOps Browser or Milady Desktop Browser.");
             }
             const { tabId } = await ensureDiscordTab({
                 agentId: this.agentId(),
@@ -581,22 +776,7 @@ export function withDiscord(Base) {
             }
             await this.repository.deleteConnectorGrant(this.agentId(), "discord", "local", normalizedSide);
             await this.recordConnectorAudit(`discord:${normalizedSide}`, "discord browser connector disconnected", { side: normalizedSide }, {});
-            return {
-                provider: "discord",
-                side: normalizedSide,
-                available: normalizedSide === "owner"
-                    ? Boolean(await this.lifeOpsDiscordGetOwnerBrowserDiscordState(null)) ||
-                        discordBrowserWorkspaceAvailable()
-                    : discordBrowserWorkspaceAvailable(),
-                connected: false,
-                reason: "disconnected",
-                identity: null,
-                dmInbox: emptyDiscordDmInboxProbe(),
-                grantedCapabilities: [],
-                lastError: null,
-                tabId: null,
-                grant: null,
-            };
+            return this.getDiscordConnectorStatus(normalizedSide);
         }
     }
     return LifeOpsDiscordServiceMixin;

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

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=service-mixin-subscriptions.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"service-mixin-subscriptions.d.ts","sourceRoot":"","sources":["../../../../../../../apps/app-lifeops/src/lifeops/service-mixin-subscriptions.ts"],"names":[],"mappings":""}