@agent-native/dispatch 0.23.5 → 0.24.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agent-native/dispatch",
-  "version": "0.23.5",
+  "version": "0.24.0",
   "description": "Dispatch — workspace control plane for agent-native apps. Vault, integrations, destinations, scheduled jobs, and cross-app delegation, shipped as a single drop-in package.",
   "homepage": "https://github.com/BuilderIO/agent-native#readme",
   "bugs": {
@@ -84,7 +84,7 @@
     "tailwind-merge": "^3.5.0",
     "vaul": "^1.1.2",
     "zod": "^4.3.6",
-    "@agent-native/toolkit": "0.13.10"
+    "@agent-native/toolkit": "0.14.0"
   },
   "devDependencies": {
     "@react-router/dev": "^8.1.0",
@@ -98,7 +98,7 @@
     "typescript-7": "npm:typescript@^7.0.2",
     "vite": "8.1.0",
     "vitest": "^4.1.5",
-    "@agent-native/core": "0.151.0"
+    "@agent-native/core": "0.152.0"
   },
   "peerDependencies": {
     "@agent-native/core": ">=0.8.0",

package/src/actions/list-connected-agents.spec.ts

@@ -0,0 +1,73 @@
+import { describe, expect, it, vi } from "vitest";
+
+const mocks = vi.hoisted(() => ({
+  discoverAgents: vi.fn(),
+  getBuiltinAgents: vi.fn(),
+  getRequestUserEmail: vi.fn(() => "owner@example.test"),
+  resourceGet: vi.fn(),
+  resourceListAccessible: vi.fn(async () => []),
+}));
+
+vi.mock("@agent-native/core", () => ({
+  defineAction: (options: unknown) => options,
+}));
+
+vi.mock("@agent-native/core/resources/metadata", () => ({
+  parseRemoteAgentManifest: vi.fn(),
+  REMOTE_AGENT_RESOURCE_PREFIXES: [],
+}));
+
+vi.mock("@agent-native/core/resources/store", () => ({
+  resourceGet: (...args: unknown[]) => mocks.resourceGet(...args),
+  resourceListAccessible: (...args: unknown[]) =>
+    mocks.resourceListAccessible(...args),
+  SHARED_OWNER: "shared",
+}));
+
+vi.mock("@agent-native/core/server", () => ({
+  getRequestUserEmail: () => mocks.getRequestUserEmail(),
+}));
+
+vi.mock("@agent-native/core/server/agent-discovery", () => ({
+  discoverAgents: (...args: unknown[]) => mocks.discoverAgents(...args),
+  getBuiltinAgents: (...args: unknown[]) => mocks.getBuiltinAgents(...args),
+  normalizeAgentId: (id: string) => id.trim().toLowerCase(),
+  shouldIncludeRemoteAgentManifest: vi.fn(),
+}));
+
+vi.mock("../server/index.js", () => ({
+  getDispatchConfig: vi.fn(async () => ({ hiddenAgentIds: [] })),
+}));
+
+describe("list-connected-agents", () => {
+  it("keeps a built-in app home URL separate from its A2A endpoint", async () => {
+    mocks.getBuiltinAgents.mockReturnValue([
+      {
+        id: "clips",
+        name: "Clips",
+        description: "Record and share",
+        url: "https://clips.agent-native.com",
+        color: "#000000",
+      },
+    ]);
+    mocks.discoverAgents.mockResolvedValue([
+      {
+        id: "clips",
+        name: "Clips",
+        description: "Record and share",
+        url: "https://clips.agent-native.com/share/WrA8ZQ3oxa2T?ref=clip_share",
+        color: "#000000",
+      },
+    ]);
+
+    const { default: action } = await import("./list-connected-agents.js");
+    const [clips] = await action.run({});
+
+    expect(clips).toMatchObject({
+      id: "clips",
+      url: "https://clips.agent-native.com/share/WrA8ZQ3oxa2T?ref=clip_share",
+      homeUrl: "https://clips.agent-native.com",
+      source: "builtin",
+    });
+  });
+});

package/src/actions/list-connected-agents.ts

@@ -27,8 +27,10 @@ export default defineAction({
       (m) => m.getDispatchConfig(),
     );
     const discovered = await discoverAgents("dispatch");
-    const builtinIds = new Set(
-      getBuiltinAgents("dispatch").map((agent) => agent.id),
+    const builtins = getBuiltinAgents("dispatch");
+    const builtinIds = new Set(builtins.map((agent) => agent.id));
+    const builtinHomeUrls = new Map(
+      builtins.map((agent) => [agent.id, agent.url]),
     );
     const ownerEmail = getRequestUserEmail();
     if (!ownerEmail) throw new Error("no authenticated user");
@@ -78,8 +80,10 @@ export default defineAction({
     const connected = discovered.map((agent) => {
       const custom = customById.get(agent.id);
       const isBuiltin = builtinIds.has(agent.id);
+      const homeUrl = isBuiltin ? builtinHomeUrls.get(agent.id) : undefined;
       return {
         ...agent,
+        ...(homeUrl ? { homeUrl } : {}),
         source: isBuiltin ? "builtin" : custom ? "custom" : "workspace",
         resourceId: custom?.resourceId,
         path: custom?.path,

package/src/actions/list-dispatch-usage-metrics.ts

@@ -5,7 +5,7 @@ import { listDispatchUsageMetrics } from "../server/lib/usage-metrics-store.js";
 
 export default defineAction({
   description:
-    "Get workspace-level LLM usage, spend or Builder.io credit spend, users, app access, and recent activity metrics for Dispatch admins.",
+    "Get personal or workspace LLM usage, spend or Builder.io credit spend, app attribution, prompt previews, and recent activity metrics for Dispatch.",
   schema: z.object({
     sinceDays: z.coerce
       .number()
@@ -14,6 +14,16 @@ export default defineAction({
       .max(365)
       .default(30)
       .describe("Lookback window in days. Defaults to 30."),
+    scope: z
+      .enum(["me", "workspace"])
+      .default("workspace")
+      .describe("Whether to inspect your account or the whole workspace."),
+    userEmail: z
+      .string()
+      .trim()
+      .min(1)
+      .optional()
+      .describe("Optional workspace member email to filter all usage to."),
   }),
   http: { method: "GET" },
   run: async (args) => listDispatchUsageMetrics(args),

package/src/actions/remix-workspace-template.spec.ts

@@ -68,6 +68,35 @@ describe("remix-workspace-template action", () => {
     );
   });
 
+  it("normalizes a human-friendly app name before scaffolding", async () => {
+    vi.stubEnv("NODE_ENV", "test");
+    vi.stubEnv("NETLIFY", "");
+    mocks.scaffoldWorkspaceAppFromTemplate.mockResolvedValue({
+      appId: "customer-portal",
+      template: "mail",
+      output: "scaffolded",
+    });
+
+    await action.run({
+      templateId: "mail",
+      appId: "Customer Portal",
+    });
+
+    expect(mocks.scaffoldWorkspaceAppFromTemplate).toHaveBeenCalledWith({
+      template: "mail",
+      appId: "customer-portal",
+    });
+  });
+
+  it("rejects names that normalize to an empty app id", async () => {
+    await expect(
+      action.run({ templateId: "mail", appId: "---" }),
+    ).rejects.toThrow(
+      "Use a non-reserved app id with lowercase letters, numbers, and hyphens.",
+    );
+    expect(mocks.scaffoldWorkspaceAppFromTemplate).not.toHaveBeenCalled();
+  });
+
   it("starts a hosted private app without copying data or secrets", async () => {
     vi.stubEnv("NODE_ENV", "production");
     mocks.startWorkspaceAppCreation.mockResolvedValue({

package/src/actions/remix-workspace-template.ts

@@ -1,5 +1,8 @@
 import { defineAction } from "@agent-native/core";
-import { getWorkspaceAppIdValidationError } from "@agent-native/core/shared";
+import {
+  getWorkspaceAppIdValidationError,
+  normalizeWorkspaceAppId,
+} from "@agent-native/core/shared";
 import { z } from "zod";
 
 import {
@@ -42,14 +45,18 @@ export default defineAction({
     appId: z
       .string()
       .max(64)
+      .transform(normalizeWorkspaceAppId)
       .optional()
       .nullable()
-      .refine((appId) => !appId || !getWorkspaceAppIdValidationError(appId), {
-        message:
-          "Use a non-reserved app id with lowercase letters, numbers, and hyphens.",
-      })
+      .refine(
+        (appId) => appId == null || !getWorkspaceAppIdValidationError(appId),
+        {
+          message:
+            "Use a non-reserved app id with lowercase letters, numbers, and hyphens.",
+        },
+      )
       .describe(
-        "Optional target workspace app id. Defaults to <template>-remix so the source app remains independent.",
+        "Optional target workspace app id or human-friendly name. Names are converted to lowercase, hyphenated ids. Defaults to <template>-remix so the source app remains independent.",
       ),
     description: z
       .string()

package/src/actions/scaffold-workspace-app.ts

@@ -1,5 +1,8 @@
 import { defineAction } from "@agent-native/core";
-import { getWorkspaceAppIdValidationError } from "@agent-native/core/shared";
+import {
+  getWorkspaceAppIdValidationError,
+  normalizeWorkspaceAppId,
+} from "@agent-native/core/shared";
 import { z } from "zod";
 
 import { scaffoldWorkspaceAppFromTemplate } from "../server/lib/app-creation-store.js";
@@ -27,12 +30,16 @@ export default defineAction({
     appId: z
       .string()
       .max(64)
+      .transform(normalizeWorkspaceAppId)
       .optional()
       .nullable()
-      .refine((appId) => !appId || !getWorkspaceAppIdValidationError(appId), {
-        message:
-          "Use a non-reserved app id with lowercase letters, numbers, and hyphens.",
-      })
+      .refine(
+        (appId) => appId == null || !getWorkspaceAppIdValidationError(appId),
+        {
+          message:
+            "Use a non-reserved app id with lowercase letters, numbers, and hyphens.",
+        },
+      )
       .describe(
         "Optional override for the apps/<id>/ directory name; defaults to the template name",
       ),

package/src/actions/start-workspace-app-creation.ts

@@ -1,5 +1,8 @@
 import { defineAction } from "@agent-native/core";
-import { getWorkspaceAppIdValidationError } from "@agent-native/core/shared";
+import {
+  getWorkspaceAppIdValidationError,
+  normalizeWorkspaceAppId,
+} from "@agent-native/core/shared";
 import { z } from "zod";
 
 import { startWorkspaceAppCreation } from "../server/lib/app-creation-store.js";
@@ -12,13 +15,16 @@ export default defineAction({
     appId: z
       .string()
       .max(64)
+      .transform(normalizeWorkspaceAppId)
       .refine((appId) => !getWorkspaceAppIdValidationError(appId), {
         message:
           "Use a non-reserved app id with lowercase letters, numbers, and hyphens.",
       })
       .optional()
       .nullable()
-      .describe("Desired workspace app id/path"),
+      .describe(
+        "Desired workspace app id/path or human-friendly name. Names are converted to lowercase, hyphenated ids.",
+      ),
     template: z
       .string()
       .optional()

package/src/actions/view-screen.ts

@@ -155,9 +155,21 @@ export default defineAction({
     }
     if (navigation?.view === "metrics") {
       try {
-        const metrics = await listDispatchUsageMetrics({ sinceDays: 30 });
+        const usageScope =
+          navigation.usageScope === "workspace" ? "workspace" : "me";
+        const usageUserEmail =
+          typeof navigation.usageUserEmail === "string"
+            ? navigation.usageUserEmail
+            : undefined;
+        const metrics = await listDispatchUsageMetrics({
+          sinceDays: 30,
+          scope: usageScope,
+          userEmail: usageUserEmail,
+        });
         screen.usageMetrics = {
           billing: metrics.billing,
+          viewScope: metrics.viewScope,
+          selectedUserEmail: metrics.selectedUserEmail,
           totals: metrics.totals,
           byApp: metrics.byApp.slice(0, 8),
           byUser: metrics.byUser.slice(0, 8),

package/src/components/app-icon.spec.tsx

@@ -0,0 +1,34 @@
+// @vitest-environment happy-dom
+import React, { act } from "react";
+import { createRoot, type Root } from "react-dom/client";
+import { afterEach, beforeEach, describe, expect, it } from "vitest";
+
+import { AppIcon } from "./app-icon";
+
+describe("AppIcon", () => {
+  let container: HTMLDivElement;
+  let root: Root;
+
+  beforeEach(() => {
+    container = document.createElement("div");
+    document.body.appendChild(container);
+    root = createRoot(container);
+  });
+
+  afterEach(() => {
+    act(() => root.unmount());
+    container.remove();
+  });
+
+  it("gives Plan a colored generated accent instead of a neutral gray", () => {
+    act(() => {
+      root.render(<AppIcon id="plan" name="Plan" />);
+    });
+
+    const icon = container.firstElementChild as HTMLElement;
+    expect(icon.style.getPropertyValue("--dispatch-app-icon-color-rgb")).toBe(
+      "47 111 237",
+    );
+    expect(icon.style.color).toBe("rgb(var(--dispatch-app-icon-color-rgb))");
+  });
+});

package/src/components/app-icon.tsx

@@ -67,7 +67,7 @@ const APP_VISUALS_BY_ID: Record<
   forms: { icon: IconStack2, colorRgb: "6 182 212" },
   macros: { icon: IconCode, colorRgb: "113 113 122" },
   mail: { icon: IconMail, colorRgb: "59 130 246" },
-  plan: { icon: IconLayoutBoard, colorRgb: "82 82 91" },
+  plan: { icon: IconLayoutBoard, colorRgb: "47 111 237" },
   slides: { icon: IconPresentation, colorRgb: "236 72 153" },
   tasks: { icon: IconListCheck, colorRgb: "99 102 241" },
 };

package/src/components/connected-app-card.tsx

@@ -12,6 +12,8 @@ export function ConnectedAppCard({
   app: ConnectedAppSummary;
   className?: string;
 }) {
+  const launchUrl = app.homeUrl ?? app.url;
+
   return (
     <AppListRow className={className}>
       <AppIcon id={app.id} name={app.name} color={app.color} size="sm" />
@@ -25,7 +27,7 @@ export function ConnectedAppCard({
       </div>
       <AppOpenActions
         name={app.name}
-        href={withBuilderUtmTrackingParams(app.url, {
+        href={withBuilderUtmTrackingParams(launchUrl, {
           campaign: "product",
           content: "dispatch_app",
         })}

package/src/components/dispatch-control-plane.spec.tsx

@@ -231,7 +231,9 @@ describe("DispatchControlPlane", () => {
         id: "clips",
         name: "Clips",
         description: "Record and share",
-        url: "https://clips.agent-native.com",
+        url: "https://clips.agent-native.com/share/WrA8ZQ3oxa2T?ref=clip_share",
+        homeUrl: "https://clips.agent-native.com",
+        source: "builtin",
       },
       {
         id: "onboarding",
@@ -282,5 +284,10 @@ describe("DispatchControlPlane", () => {
         anchor.getAttribute("href")?.includes("onboarding"),
       ),
     ).toHaveLength(1);
+    const clipsHref = Array.from(container.querySelectorAll("a"))
+      .map((anchor) => anchor.getAttribute("href"))
+      .find((href) => href?.includes("clips.agent-native.com"));
+    expect(clipsHref).toContain("https://clips.agent-native.com");
+    expect(clipsHref).not.toContain("/share/");
   });
 });

package/src/components/layout/Layout.spec.tsx

@@ -302,6 +302,9 @@ describe("Dispatch NavContent", () => {
     );
     expect(sidebarLabel?.textContent?.trim()).toBe("Dispatch");
     expect(container.textContent).not.toContain("Agent-Native Dispatch");
+    expect(
+      sidebarLabel?.closest('a[data-dispatch-logo][href="/overview"]'),
+    ).not.toBeNull();
 
     const settingsLink = container.querySelector('a[href="/settings"]');
     const adminLink = container.querySelector('a[href="/admin"]');

package/src/components/layout/Layout.tsx

@@ -102,6 +102,7 @@ import {
 import { Link, useLocation, useNavigate } from "react-router";
 import { toast } from "sonner";
 
+import { isEmbedSessionExpiredMessage } from "../../lib/embed-session-recovery";
 import { cn } from "../../lib/utils";
 import {
   isDispatchWorkspaceAppId,
@@ -1193,7 +1194,7 @@ export function NavContent({
     <div
       className={cn("py-2", collapsed ? "flex justify-center px-1" : "px-3")}
     >
-      <OrgSwitcher compact={collapsed} reserveSpace />
+      <OrgSwitcher compact={collapsed} reserveSpace currentAppId="dispatch" />
     </div>
   );
   const sidebarFooterActions = (
@@ -1213,9 +1214,12 @@ export function NavContent({
           collapsed ? "justify-center px-0" : "px-4",
         )}
       >
-        <div
+        <Link
+          to={dispatchNavLinkTarget("/overview")}
+          aria-label={`${DISPATCH_SIDEBAR_LABEL} overview`}
+          data-dispatch-logo
           className={cn(
-            "flex items-center",
+            "flex items-center rounded-md focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-sidebar-ring",
             collapsed ? "justify-center" : "gap-2",
           )}
         >
@@ -1251,7 +1255,7 @@ export function NavContent({
               </div>
             </div>
           )}
-        </div>
+        </Link>
       </div>
 
       {chatFirstMode ? (
@@ -1586,11 +1590,9 @@ export function Layout({
 
     const handleEmbedSessionExpired = (event: MessageEvent) => {
       if (
-        event.data?.type !== "agentNative.embedSessionExpired" ||
-        event.source !== chatFirstAppFrameRef.current?.contentWindow
-      ) {
+        !isEmbedSessionExpiredMessage(event, chatFirstAppFrameRef.current, null)
+      )
         return;
-      }
       setChatFirstEmbedAttempt((attempt) => attempt + 1);
     };
 
@@ -2109,13 +2111,14 @@ export function Layout({
         chatOnly
         dynamicSuggestions={false}
         suggestions={[]}
+        suppressInlineOpenApp={chatFirstMode}
         emptyStateDisplay="hidden"
         composerPlaceholder={t(
           "dispatch.pages.chatFirstSessionMessagePlaceholder",
         )}
       />
     ),
-    [t],
+    [chatFirstMode, t],
   );
 
   const renderChatFirstSurfaceTab = useCallback(
@@ -2152,6 +2155,7 @@ export function Layout({
             onRetry={() => setChatFirstEmbedAttempt((value) => value + 1)}
             renderEmbed={({ url, title }: ChatFirstEmbedTarget) => (
               <iframe
+                key={`${url}:${chatFirstEmbedAttempt}`}
                 data-dispatch-chat-first-app-frame
                 src={url}
                 title={title ?? chatFirstCopy("appUnavailable")}

package/src/components/workspace-template-card.spec.tsx

@@ -130,7 +130,7 @@ describe("WorkspaceTemplateCard", () => {
       Object.getOwnPropertyDescriptor(
         HTMLInputElement.prototype,
         "value",
-      )?.set?.call(input, "sales-ops");
+      )?.set?.call(input, "Sales Ops");
       input.dispatchEvent(new Event("input", { bubbles: true }));
     });
 

package/src/components/workspace-template-card.tsx

@@ -1,4 +1,5 @@
 import { useActionMutation } from "@agent-native/core/client/hooks";
+import { normalizeWorkspaceAppId } from "@agent-native/core/shared";
 import {
   IconArrowUpRight,
   IconCircleCheck,
@@ -94,17 +95,6 @@ export interface WorkspaceTemplateCardProps {
   ) => void;
 }
 
-function slugifyAppId(value: string): string {
-  return (
-    value
-      .trim()
-      .toLowerCase()
-      .replace(/[^a-z0-9]+/g, "-")
-      .replace(/^-+|-+$/g, "")
-      .slice(0, 48) || "new-app"
-  );
-}
-
 function templateIdFor(template: CuratedWorkspaceTemplate): string {
   return template.templateId || template.id || template.appId || template.name;
 }
@@ -113,8 +103,9 @@ function defaultAppIdFor(
   template: CuratedWorkspaceTemplate,
   defaultAppId?: string,
 ): string {
-  if (defaultAppId) return slugifyAppId(defaultAppId);
-  const sourceId = slugifyAppId(template.appId || template.name);
+  if (defaultAppId) return normalizeWorkspaceAppId(defaultAppId) || "new-app";
+  const sourceId =
+    normalizeWorkspaceAppId(template.appId || template.name) || "new-app";
   return `${sourceId}-app`;
 }
 
@@ -173,15 +164,16 @@ export function WorkspaceTemplateCard({
   }, [defaultAppId, open, template]);
 
   function submitRemix() {
-    const trimmedAppId = appId.trim();
-    if (!trimmedAppId) {
+    const normalizedAppId = normalizeWorkspaceAppId(appId);
+    if (!normalizedAppId) {
       toast.error(labels.appIdRequired);
       return;
     }
+    setAppId(normalizedAppId);
 
     remix.mutate({
       templateId: templateIdFor(template),
-      appId: trimmedAppId,
+      appId: normalizedAppId,
     });
   }
 
@@ -280,6 +272,7 @@ export function WorkspaceTemplateCard({
                   value={appId}
                   autoComplete="off"
                   onChange={(event) => setAppId(event.target.value)}
+                  onBlur={() => setAppId(normalizeWorkspaceAppId(appId))}
                   disabled={remix.isPending}
                 />
               </div>

package/src/hooks/use-navigation-state.ts

@@ -32,6 +32,8 @@ export interface NavigationState {
   query?: string;
   runId?: string;
   threadId?: string;
+  usageScope?: "me" | "workspace";
+  usageUserEmail?: string;
 }
 
 export function useNavigationState(extensions?: DispatchExtensionConfig) {
@@ -177,6 +179,16 @@ export function buildDispatchNavigationState(
     if (selectedThreadId) state.threadId = selectedThreadId;
   }
 
+  if (state.view === "metrics") {
+    const params = new URLSearchParams(search);
+    const usageScope = params.get("scope");
+    const usageUserEmail = params.get("user");
+    if (usageScope === "me" || usageScope === "workspace") {
+      state.usageScope = usageScope;
+    }
+    if (usageUserEmail) state.usageUserEmail = usageUserEmail;
+  }
+
   return state;
 }
 

package/src/lib/embed-session-recovery.spec.ts

@@ -0,0 +1,63 @@
+import { describe, expect, it } from "vitest";
+
+import {
+  EMBED_SESSION_EXPIRED_MESSAGE,
+  isEmbedSessionExpiredMessage,
+} from "./embed-session-recovery";
+
+const frameWindow = {} as Window;
+const frame = {
+  contentWindow: frameWindow,
+  src: "https://mail.example.test/_agent-native/embed/start?ticket=one",
+} as HTMLIFrameElement;
+
+describe("isEmbedSessionExpiredMessage", () => {
+  it("accepts a message from the active app frame", () => {
+    expect(
+      isEmbedSessionExpiredMessage(
+        { data: { type: EMBED_SESSION_EXPIRED_MESSAGE }, source: frameWindow },
+        frame,
+      ),
+    ).toBe(true);
+  });
+
+  it("rejects messages from another frame", () => {
+    expect(
+      isEmbedSessionExpiredMessage(
+        { data: { type: EMBED_SESSION_EXPIRED_MESSAGE }, source: {} as Window },
+        frame,
+      ),
+    ).toBe(false);
+  });
+
+  it("accepts a matching start URL when the browser omits event.source", () => {
+    expect(
+      isEmbedSessionExpiredMessage(
+        {
+          data: {
+            type: EMBED_SESSION_EXPIRED_MESSAGE,
+            embedStartUrl: frame.src,
+          },
+          source: null,
+        },
+        frame,
+      ),
+    ).toBe(true);
+  });
+
+  it("can match the expected URL before the iframe ref is available", () => {
+    expect(
+      isEmbedSessionExpiredMessage(
+        {
+          data: {
+            type: EMBED_SESSION_EXPIRED_MESSAGE,
+            embedStartUrl: frame.src,
+          },
+          source: null,
+        },
+        null,
+        frame.src,
+      ),
+    ).toBe(true);
+  });
+});

package/src/lib/embed-session-recovery.ts

@@ -0,0 +1,26 @@
+export const EMBED_SESSION_EXPIRED_MESSAGE = "agentNative.embedSessionExpired";
+
+interface EmbedSessionExpiredMessage {
+  type?: unknown;
+  embedStartUrl?: unknown;
+}
+
+export function isEmbedSessionExpiredMessage(
+  event: Pick<MessageEvent, "data" | "source">,
+  frame: Pick<HTMLIFrameElement, "contentWindow" | "src"> | null,
+  expectedStartUrl?: string | null,
+): boolean {
+  const data =
+    event.data && typeof event.data === "object"
+      ? (event.data as EmbedSessionExpiredMessage)
+      : null;
+  if (data?.type !== EMBED_SESSION_EXPIRED_MESSAGE) return false;
+
+  const frameWindow = frame?.contentWindow;
+  if (frameWindow && event.source === frameWindow) return true;
+  if (event.source !== null) return false;
+  if (typeof data.embedStartUrl !== "string") return false;
+
+  const frameUrl = frame?.src || expectedStartUrl;
+  return Boolean(frameUrl && data.embedStartUrl === frameUrl);
+}