@xapps-platform/marketplace-ui 0.1.5 → 0.1.6

package/dist/index.js

@@ -1,5 +1,5 @@
 // src/MarketplaceContext.tsx
-import { createContext as createContext2, useContext as useContext2 } from "react";
+import { createContext as createContext2, useContext as useContext2, useEffect } from "react";
 
 // ../platform-i18n/src/index.tsx
 import { createContext, useContext, useMemo } from "react";
@@ -235,11 +235,13 @@ var MARKETPLACE_CATALOGS = {
     "activity.show_details": "Show details",
     "activity.hide_details": "Hide details",
     "activity.response_title": "Response",
+    "activity.payment_pending": "Payment Pending",
     "activity.payment_required": "Payment Required",
     "activity.complete_payment": "Complete Payment",
     "activity.confirm_payment": "Confirm Payment",
     "activity.confirming_payment": "Confirming...",
     "activity.refresh_status": "Refresh Status",
+    "activity.waiting_for_payment": "Waiting for payment confirmation\u2026",
     "activity.waiting_for_response": "Waiting for response\u2026",
     "activity.execution_timeline": "Execution Timeline",
     "activity.artifacts_title": "Artifacts",
@@ -490,11 +492,13 @@ var MARKETPLACE_CATALOGS = {
     "activity.show_details": "Arat\u0103 detalii",
     "activity.hide_details": "Ascunde detalii",
     "activity.response_title": "R\u0103spuns",
+    "activity.payment_pending": "Plat\u0103 \xEEn a\u0219teptare",
     "activity.payment_required": "Plata este necesar\u0103",
     "activity.complete_payment": "Finalizeaz\u0103 plata",
     "activity.confirm_payment": "Confirm\u0103 plata",
     "activity.confirming_payment": "Se confirm\u0103...",
     "activity.refresh_status": "Re\xEEmprosp\u0103teaz\u0103 starea",
+    "activity.waiting_for_payment": "\xCEn a\u0219teptarea confirm\u0103rii pl\u0103\u021Bii\u2026",
     "activity.waiting_for_response": "\xCEn a\u0219teptarea r\u0103spunsului\u2026",
     "activity.execution_timeline": "Cronologia execu\u021Biei",
     "activity.artifacts_title": "Artefacte",
@@ -662,10 +666,73 @@ function resolveMarketplaceText(value, locale) {
 }
 
 // src/MarketplaceContext.tsx
-import { jsx as jsx3 } from "react/jsx-runtime";
+import { Fragment, jsx as jsx3 } from "react/jsx-runtime";
 var Ctx = createContext2(null);
+function applyMarketplaceThemeToDocument(theme) {
+  if (!theme || typeof document === "undefined") return;
+  const root = document.documentElement;
+  const map = [
+    ["primary", ["--cx-primary", "--mx-primary"]],
+    ["primaryDark", ["--cx-primary-dark", "--mx-primary-hover"]],
+    ["bg", ["--cx-bg", "--mx-bg"]],
+    ["bgSubtle", ["--cx-bg-subtle", "--mx-bg-subtle"]],
+    ["card", ["--cx-card", "--mx-card-bg"]],
+    ["border", ["--cx-border", "--mx-border"]],
+    ["text", ["--cx-text", "--mx-text-main"]],
+    ["muted", ["--cx-muted", "--mx-text-muted"]],
+    ["shadowSm", ["--cx-shadow-sm", "--mx-shadow-sm"]],
+    ["shadow", ["--cx-shadow", "--mx-shadow"]],
+    ["shadowLg", ["--cx-shadow-lg", "--mx-shadow-lg"]],
+    ["radiusSm", ["--cx-radius-sm", "--mx-radius-sm"]],
+    ["radiusMd", ["--cx-radius-md", "--mx-radius-md"]],
+    ["radius", ["--cx-radius", "--cx-radius-lg", "--mx-radius-md", "--mx-radius-lg"]],
+    ["radiusLg", ["--cx-radius-lg", "--mx-radius-lg"]],
+    ["fontFamily", ["--mx-font-family"]]
+  ];
+  for (const [key, cssVars] of map) {
+    const rawValue = theme[key];
+    const value = typeof rawValue === "string" ? rawValue.trim() : "";
+    if (!value) continue;
+    for (const cssVar of cssVars) root.style.setProperty(cssVar, value);
+  }
+  if (typeof theme.radius === "string" && theme.radius.trim() && !(typeof theme.radiusSm === "string" && theme.radiusSm.trim())) {
+    root.style.setProperty("--cx-radius-sm", theme.radius.trim());
+    root.style.setProperty("--mx-radius-sm", theme.radius.trim());
+  }
+  if (typeof theme.bg === "string" && theme.bg.trim() && !theme.bgSubtle) {
+    root.style.setProperty("--cx-bg-subtle", theme.bg.trim());
+    root.style.setProperty("--mx-bg-subtle", theme.bg.trim());
+  }
+  const directTokens = theme.tokens && typeof theme.tokens === "object" && !Array.isArray(theme.tokens) ? theme.tokens : null;
+  if (directTokens) {
+    for (const [cssVar, rawValue] of Object.entries(directTokens)) {
+      const value = typeof rawValue === "string" ? rawValue.trim() : "";
+      if (!value) continue;
+      if (!cssVar.startsWith("--mx-") && !cssVar.startsWith("--cx-") && !cssVar.startsWith("--xapps-")) {
+        continue;
+      }
+      root.style.setProperty(cssVar, value);
+    }
+  }
+  const themeMode = typeof theme.mode === "string" ? theme.mode.trim().toLowerCase() : typeof theme.themeMode === "string" ? theme.themeMode.trim().toLowerCase() : "";
+  if (themeMode === "dark" || themeMode === "light") {
+    root.dataset.xappsThemeMode = themeMode;
+  }
+}
+function MarketplaceRuntimeBridge(props) {
+  useEffect(() => {
+    const locale = String(props.env?.locale || props.host.locale || "").trim();
+    if (locale && typeof document !== "undefined") {
+      document.documentElement.lang = locale;
+    }
+  }, [props.env?.locale, props.host.locale]);
+  useEffect(() => {
+    applyMarketplaceThemeToDocument(props.host.theme || null);
+  }, [props.host.theme]);
+  return /* @__PURE__ */ jsx3(Fragment, { children: props.children });
+}
 function MarketplaceProvider(props) {
-  return /* @__PURE__ */ jsx3(MarketplaceI18nProvider, { locale: props.env?.locale, children: /* @__PURE__ */ jsx3(Ctx.Provider, { value: { client: props.client, host: props.host, env: props.env }, children: props.children }) });
+  return /* @__PURE__ */ jsx3(MarketplaceI18nProvider, { locale: props.env?.locale, children: /* @__PURE__ */ jsx3(MarketplaceRuntimeBridge, { host: props.host, env: props.env, children: /* @__PURE__ */ jsx3(Ctx.Provider, { value: { client: props.client, host: props.host, env: props.env }, children: props.children }) }) });
 }
 function useMarketplace() {
   const v = useContext2(Ctx);
@@ -677,11 +744,11 @@ function useMarketplace() {
 import { Route, Routes } from "react-router-dom";
 
 // src/pages/CatalogPage.tsx
-import { useEffect as useEffect2, useMemo as useMemo2, useState } from "react";
+import { useEffect as useEffect3, useMemo as useMemo2, useState } from "react";
 import { Link as Link2, useLocation, useNavigate } from "react-router-dom";
 
 // src/components/ConfirmActionModal.tsx
-import { useEffect } from "react";
+import { useEffect as useEffect2 } from "react";
 import { jsx as jsx4, jsxs } from "react/jsx-runtime";
 function ConfirmActionModal(props) {
   const { t } = useMarketplaceI18n();
@@ -694,7 +761,7 @@ function ConfirmActionModal(props) {
     onConfirm,
     onCancel
   } = props;
-  useEffect(() => {
+  useEffect2(() => {
     if (!open || typeof window === "undefined") return;
     const handleKeyDown = (event) => {
       if (event.key === "Escape") {
@@ -859,7 +926,7 @@ function normalizeExpandStage(value, expanded) {
 }
 
 // src/pages/CatalogPage.tsx
-import { Fragment, jsx as jsx6, jsxs as jsxs3 } from "react/jsx-runtime";
+import { Fragment as Fragment2, jsx as jsx6, jsxs as jsxs3 } from "react/jsx-runtime";
 function useQueryToken() {
   const loc = useLocation();
   const qs = new URLSearchParams(loc.search);
@@ -961,22 +1028,22 @@ function CatalogPage() {
       setBusy(false);
     }
   }
-  useEffect2(() => {
+  useEffect3(() => {
     void refresh();
     host.refreshInstallations();
   }, []);
-  useEffect2(() => {
+  useEffect3(() => {
     const stored = readStoredCatalogFilters(storageKey);
     setInstalledOnly(Boolean(stored?.addedOnly));
     setSelectedTag(typeof stored?.selectedTag === "string" ? stored.selectedTag : defaultTag);
   }, [defaultTag, storageKey]);
-  useEffect2(() => {
+  useEffect3(() => {
     const restrictedTags = env?.tags ?? [];
     if (selectedTag && restrictedTags.length > 0 && !restrictedTags.includes(selectedTag)) {
       setSelectedTag(defaultTag);
     }
   }, [defaultTag, env?.tags, selectedTag]);
-  useEffect2(() => {
+  useEffect3(() => {
     writeStoredCatalogFilters(storageKey, {
       addedOnly: installedOnly,
       selectedTag: selectedTag || ""
@@ -1115,7 +1182,7 @@ function CatalogPage() {
         /* @__PURE__ */ jsx6("div", { className: "mx-skeleton-line mx-skeleton-line-full" }),
         /* @__PURE__ */ jsx6("div", { className: "mx-skeleton-line mx-skeleton-line-short" })
       ] })
-    ] }, i)) }) : /* @__PURE__ */ jsxs3(Fragment, { children: [
+    ] }, i)) }) : /* @__PURE__ */ jsxs3(Fragment2, { children: [
       !busy && /* @__PURE__ */ jsx6("div", { className: "mx-results-bar", children: /* @__PURE__ */ jsx6("div", { className: "mx-results-count", children: filtered.length === items.length ? t(
         "catalog.results_all",
         {
@@ -1280,7 +1347,7 @@ function CatalogPage() {
 }
 
 // src/pages/InvoicesPage.tsx
-import { useEffect as useEffect3, useMemo as useMemo3, useState as useState2 } from "react";
+import { useEffect as useEffect4, useMemo as useMemo3, useState as useState2 } from "react";
 import { Link as Link4, useLocation as useLocation2 } from "react-router-dom";
 
 // src/components/MarketplaceActivityTabs.tsx
@@ -1333,7 +1400,7 @@ function MarketplaceActivityTabs(props) {
 }
 
 // src/pages/InvoicesPage.tsx
-import { Fragment as Fragment2, jsx as jsx8, jsxs as jsxs4 } from "react/jsx-runtime";
+import { Fragment as Fragment3, jsx as jsx8, jsxs as jsxs4 } from "react/jsx-runtime";
 function useQueryToken2() {
   const loc = useLocation2();
   const qs = new URLSearchParams(loc.search);
@@ -1408,7 +1475,7 @@ function InvoicesPage() {
       setBusy(false);
     }
   }
-  useEffect3(() => {
+  useEffect4(() => {
     void refresh(pageParam);
     host.notifyNavigation?.({
       path: typeof window !== "undefined" ? window.location.pathname : "",
@@ -1416,7 +1483,7 @@ function InvoicesPage() {
       params: { xappId: xappIdFilter || null }
     });
   }, [installationIdFilter, pageParam, paymentSessionIdFilter, xappIdFilter]);
-  useEffect3(() => {
+  useEffect4(() => {
     if (!focusedInvoiceId || !client.getMyInvoiceHistory) {
       setFocusedInvoice(null);
       setFocusedHistory([]);
@@ -1445,7 +1512,7 @@ function InvoicesPage() {
       cancelled = true;
     };
   }, [client, focusedInvoiceId]);
-  useEffect3(() => {
+  useEffect4(() => {
     if (!xappIdFilter) {
       setXappTitle("");
       return;
@@ -1493,7 +1560,7 @@ function InvoicesPage() {
   return /* @__PURE__ */ jsxs4("div", { className: `mx-catalog-container ${isEmbedded ? "is-embedded" : ""}`, children: [
     /* @__PURE__ */ jsxs4("div", { className: "mx-breadcrumb", children: [
       /* @__PURE__ */ jsx8(Link4, { to: isEmbedded ? "/" : "/marketplace", children: t("common.marketplace", void 0, "Marketplace") }),
-      xappLink && /* @__PURE__ */ jsxs4(Fragment2, { children: [
+      xappLink && /* @__PURE__ */ jsxs4(Fragment3, { children: [
         /* @__PURE__ */ jsx8("span", { className: "mx-breadcrumb-sep", children: "/" }),
         /* @__PURE__ */ jsx8(Link4, { to: xappLink, children: xappTitle || xappIdFilter })
       ] }),
@@ -1571,7 +1638,7 @@ function InvoicesPage() {
         ] }),
         /* @__PURE__ */ jsx8(Link4, { to: listHref, className: "mx-btn mx-btn-ghost", children: t("activity.back_to_invoice_list", void 0, "Back to invoice list") })
       ] }),
-      focusedError ? /* @__PURE__ */ jsx8("div", { className: "mx-alert mx-alert-error mx-alert-panel", children: focusedError }) : focusedInvoice ? /* @__PURE__ */ jsxs4(Fragment2, { children: [
+      focusedError ? /* @__PURE__ */ jsx8("div", { className: "mx-alert mx-alert-error mx-alert-panel", children: focusedError }) : focusedInvoice ? /* @__PURE__ */ jsxs4(Fragment3, { children: [
         /* @__PURE__ */ jsxs4("div", { className: "mx-record-grid", children: [
           /* @__PURE__ */ jsxs4("div", { className: "mx-record-field", children: [
             /* @__PURE__ */ jsx8("div", { className: "mx-record-label", children: t("common.status", void 0, "Status") }),
@@ -1766,9 +1833,9 @@ function InvoicesPage() {
 }
 
 // src/pages/NotificationsPage.tsx
-import { useEffect as useEffect4, useMemo as useMemo4, useState as useState3 } from "react";
+import { useEffect as useEffect5, useMemo as useMemo4, useState as useState3 } from "react";
 import { Link as Link5, useLocation as useLocation3 } from "react-router-dom";
-import { Fragment as Fragment3, jsx as jsx9, jsxs as jsxs5 } from "react/jsx-runtime";
+import { Fragment as Fragment4, jsx as jsx9, jsxs as jsxs5 } from "react/jsx-runtime";
 function useQueryToken3() {
   const loc = useLocation3();
   const qs = new URLSearchParams(loc.search);
@@ -1882,7 +1949,7 @@ function NotificationsPage() {
       setError(readFirstString(asRecord(e).message) || String(e));
     }
   }
-  useEffect4(() => {
+  useEffect5(() => {
     void refresh();
     host.notifyNavigation?.({
       path: typeof window !== "undefined" ? window.location.pathname : "",
@@ -1890,7 +1957,7 @@ function NotificationsPage() {
       params: { xappId: xappIdFilter || null }
     });
   }, [focusedNotificationId, installationIdFilter, xappIdFilter]);
-  useEffect4(() => {
+  useEffect5(() => {
     if (!focusedNotificationId) {
       setFocusedNotification(null);
       setFocusedError(null);
@@ -1919,7 +1986,7 @@ function NotificationsPage() {
       cancelled = true;
     };
   }, [client, focusedNotificationId, installationIdFilter, xappIdFilter]);
-  useEffect4(() => {
+  useEffect5(() => {
     if (!xappIdFilter) {
       setXappTitle("");
       return;
@@ -1966,7 +2033,7 @@ function NotificationsPage() {
   return /* @__PURE__ */ jsxs5("div", { className: `mx-catalog-container ${isEmbedded ? "is-embedded" : ""}`, children: [
     /* @__PURE__ */ jsxs5("div", { className: "mx-breadcrumb", children: [
       /* @__PURE__ */ jsx9(Link5, { to: isEmbedded ? "/" : "/marketplace", children: t("common.marketplace", void 0, "Marketplace") }),
-      xappLink && /* @__PURE__ */ jsxs5(Fragment3, { children: [
+      xappLink && /* @__PURE__ */ jsxs5(Fragment4, { children: [
         /* @__PURE__ */ jsx9("span", { className: "mx-breadcrumb-sep", children: "/" }),
         /* @__PURE__ */ jsx9(Link5, { to: xappLink, children: xappTitle || xappIdFilter })
       ] }),
@@ -2189,9 +2256,9 @@ function NotificationsPage() {
 }
 
 // src/pages/PaymentsPage.tsx
-import { useEffect as useEffect5, useMemo as useMemo5, useState as useState4 } from "react";
+import { useEffect as useEffect6, useMemo as useMemo5, useState as useState4 } from "react";
 import { Link as Link6, useLocation as useLocation4 } from "react-router-dom";
-import { Fragment as Fragment4, jsx as jsx10, jsxs as jsxs6 } from "react/jsx-runtime";
+import { Fragment as Fragment5, jsx as jsx10, jsxs as jsxs6 } from "react/jsx-runtime";
 function useQueryToken4() {
   const loc = useLocation4();
   const qs = new URLSearchParams(loc.search);
@@ -2251,7 +2318,7 @@ function PaymentsPage() {
       setBusy(false);
     }
   }
-  useEffect5(() => {
+  useEffect6(() => {
     void refresh();
     host.notifyNavigation?.({
       path: typeof window !== "undefined" ? window.location.pathname : "",
@@ -2259,7 +2326,7 @@ function PaymentsPage() {
       params: { xappId: xappIdFilter || null }
     });
   }, [focusedPaymentSessionId, installationIdFilter, xappIdFilter]);
-  useEffect5(() => {
+  useEffect6(() => {
     if (!focusedPaymentSessionId || !client.getMyPaymentSession) {
       setFocusedSession(null);
       setFocusedError(null);
@@ -2283,7 +2350,7 @@ function PaymentsPage() {
       cancelled = true;
     };
   }, [client, focusedPaymentSessionId]);
-  useEffect5(() => {
+  useEffect6(() => {
     if (!xappIdFilter) {
       setXappTitle("");
       return;
@@ -2330,7 +2397,7 @@ function PaymentsPage() {
   return /* @__PURE__ */ jsxs6("div", { className: `mx-catalog-container ${isEmbedded ? "is-embedded" : ""}`, children: [
     /* @__PURE__ */ jsxs6("div", { className: "mx-breadcrumb", children: [
       /* @__PURE__ */ jsx10(Link6, { to: isEmbedded ? "/" : "/marketplace", children: t("common.marketplace", void 0, "Marketplace") }),
-      xappLink && /* @__PURE__ */ jsxs6(Fragment4, { children: [
+      xappLink && /* @__PURE__ */ jsxs6(Fragment5, { children: [
         /* @__PURE__ */ jsx10("span", { className: "mx-breadcrumb-sep", children: "/" }),
         /* @__PURE__ */ jsx10(Link6, { to: xappLink, children: xappTitle || xappIdFilter })
       ] }),
@@ -2548,7 +2615,7 @@ function PaymentsPage() {
 }
 
 // src/pages/RequestDetailPage.tsx
-import { useEffect as useEffect6, useMemo as useMemo6, useState as useState5 } from "react";
+import { useEffect as useEffect7, useMemo as useMemo6, useState as useState5 } from "react";
 import { Link as Link7, useLocation as useLocation5, useNavigate as useNavigate2, useParams } from "react-router-dom";
 
 // src/components/SchemaOutputView.tsx
@@ -2636,6 +2703,10 @@ function normalizeActionKind(raw) {
 function resolveText(t, key, fallback) {
   return typeof t === "function" ? t(key, fallback) : fallback;
 }
+function isSettledPaymentStatus(value) {
+  const normalized = readString3(value).toLowerCase();
+  return normalized === "paid" || normalized === "settled" || normalized === "succeeded" || normalized === "completed";
+}
 function resolveCtaLabel(actionKind, t) {
   if (actionKind === "complete_payment") {
     return resolveText(t, "payment_lock.complete_payment", "Complete Payment");
@@ -2734,7 +2805,11 @@ function resolvePaymentLockStateFromGuardSummary(summaryInput, options) {
   })();
   const isPaymentKind = actionKind === "complete_payment" || actionKind === "payment_required";
   const isPaymentReason = reason === "payment_required" || reason === "payment_evidence_missing" || reason === "payment_receipt_already_used";
-  const isLocked = isPaymentKind || isPaymentReason;
+  const requestStatus = readString3(options?.requestStatus).toUpperCase();
+  const paymentSettled = isSettledPaymentStatus(options?.paymentStatus);
+  const isHeldForPayment = requestStatus === "PAYMENT_PENDING";
+  const isResolvedPastHold = paymentSettled && requestStatus !== "" && !isHeldForPayment;
+  const isLocked = !isResolvedPastHold && (isPaymentKind || isPaymentReason);
   return {
     isLocked,
     reason,
@@ -2749,8 +2824,137 @@ function resolvePaymentLockStateFromGuardSummary(summaryInput, options) {
   };
 }
 
+// src/utils/operationalSurfaces.ts
+function readPathEmbedded() {
+  return typeof window !== "undefined" && window.location.pathname.startsWith("/embed");
+}
+function getOperationalSurfaces(detail) {
+  const value = detail?.operational_surfaces;
+  if (!value || typeof value !== "object") return null;
+  return value;
+}
+function readOperationalSurfaceMode(input) {
+  const policy = input.env?.operationalSurfacesVisibility;
+  return input.isEmbedded ? policy?.embed ?? "contract" : policy?.portal ?? "contract";
+}
+function isOperationalSurfaceVisible(detail, surface, options) {
+  const surfaces = getOperationalSurfaces(detail);
+  const descriptor = surfaces?.[surface];
+  if (!descriptor?.enabled) return false;
+  const isEmbedded = options?.isEmbedded ?? readPathEmbedded();
+  return isEmbedded ? descriptor.visibility.embed : descriptor.visibility.portal;
+}
+function surfaceClientAvailable(client, surface) {
+  if (surface === "requests") return typeof client.listMyRequests === "function";
+  if (surface === "payments") return typeof client.listMyPaymentSessions === "function";
+  if (surface === "invoices") return typeof client.listMyInvoices === "function";
+  if (surface === "notifications") return typeof client.listMyNotifications === "function";
+  return false;
+}
+function buildOperationalSurfaceHref(input) {
+  const isEmbedded = input.isEmbedded ?? readPathEmbedded();
+  const params = new URLSearchParams({
+    xappId: input.xappId,
+    ...input.installationId ? { installationId: input.installationId } : {},
+    ...input.paymentSessionId ? { paymentSessionId: input.paymentSessionId } : {},
+    ...input.invoiceId ? { invoiceId: input.invoiceId } : {},
+    ...input.notificationId ? { notificationId: input.notificationId } : {},
+    ...input.token ? { token: input.token } : {}
+  });
+  const base = isEmbedded ? `/${input.surface}` : `/marketplace/${input.surface}`;
+  const detailSegment = input.surface === "requests" && input.requestId ? `/${encodeURIComponent(input.requestId)}` : "";
+  return `${base}${detailSegment}?${params.toString()}`;
+}
+function getVisibleOperationalSurfaces(input) {
+  const isEmbedded = input.isEmbedded ?? readPathEmbedded();
+  const mode = readOperationalSurfaceMode({
+    env: input.env,
+    isEmbedded
+  });
+  const allSurfaces = [
+    "requests",
+    "payments",
+    "invoices",
+    "notifications"
+  ];
+  if (mode === "testing_all") {
+    return allSurfaces.filter((surface) => {
+      if (surface === "requests" && input.env?.requestsEnabled === false) return false;
+      return surfaceClientAvailable(input.client, surface);
+    });
+  }
+  const surfaces = getOperationalSurfaces(input.detail);
+  if (!surfaces) return [];
+  return allSurfaces.filter(
+    (surface) => surfaceClientAvailable(input.client, surface) && isOperationalSurfaceVisible(input.detail, surface, { isEmbedded })
+  );
+}
+function getOperationalSurfaceLabel(surface) {
+  if (surface === "requests") return "Requests";
+  if (surface === "payments") return "Payments";
+  if (surface === "invoices") return "Invoices";
+  return "Notifications";
+}
+function resolveOperationalSurfacePlacement(input) {
+  const isEmbedded = input.isEmbedded ?? readPathEmbedded();
+  const policy = input.env?.operationalSurfacePlacement;
+  const scopePolicy = isEmbedded ? policy?.embed : policy?.portal;
+  const bySurface = scopePolicy?.bySurface?.[input.surface];
+  if (bySurface) return bySurface;
+  return scopePolicy?.default ?? "in_router";
+}
+async function discoverOperationalSurfaceData(input) {
+  const xappId = String(input.xappId || "").trim();
+  const installationId = String(input.installationId || "").trim();
+  if (!xappId) return [];
+  const queryBase = {
+    xappId,
+    ...installationId ? { installationId } : {}
+  };
+  const checks = await Promise.all([
+    (async () => {
+      if (typeof input.client.listMyPaymentSessions !== "function") return null;
+      try {
+        const res = await input.client.listMyPaymentSessions({
+          ...queryBase,
+          limit: 1
+        });
+        return Array.isArray(res?.items) && res.items.length > 0 ? "payments" : null;
+      } catch {
+        return null;
+      }
+    })(),
+    (async () => {
+      if (typeof input.client.listMyInvoices !== "function") return null;
+      try {
+        const res = await input.client.listMyInvoices({
+          ...queryBase,
+          page: 1,
+          pageSize: 1
+        });
+        return Array.isArray(res?.items) && res.items.length > 0 ? "invoices" : null;
+      } catch {
+        return null;
+      }
+    })(),
+    (async () => {
+      if (typeof input.client.listMyNotifications !== "function") return null;
+      try {
+        const res = await input.client.listMyNotifications({
+          ...queryBase,
+          limit: 1
+        });
+        return Array.isArray(res?.items) && res.items.length > 0 || Number(res?.unread_count || 0) > 0 ? "notifications" : null;
+      } catch {
+        return null;
+      }
+    })()
+  ]);
+  return checks.filter((surface) => Boolean(surface));
+}
+
 // src/pages/RequestDetailPage.tsx
-import { Fragment as Fragment5, jsx as jsx12, jsxs as jsxs8 } from "react/jsx-runtime";
+import { Fragment as Fragment6, jsx as jsx12, jsxs as jsxs8 } from "react/jsx-runtime";
 function useQueryToken5() {
   const loc = useLocation5();
   const qs = new URLSearchParams(loc.search);
@@ -2760,6 +2964,18 @@ function useQuery4() {
   const loc = useLocation5();
   return useMemo6(() => new URLSearchParams(loc.search), [loc.search]);
 }
+function navigateToExternalOrHost(url) {
+  const next = String(url || "").trim();
+  if (!next || typeof window === "undefined") return;
+  try {
+    if (window.parent && window.parent !== window) {
+      window.parent.postMessage({ type: "XAPPS_UI_NAVIGATE", data: { path: next } }, "*");
+      return;
+    }
+  } catch {
+  }
+  window.location.href = next;
+}
 function RequestDetailPage() {
   const { client, host, env } = useMarketplace();
   const { t, locale } = useMarketplaceI18n();
@@ -2780,6 +2996,8 @@ function RequestDetailPage() {
   const requestRecord = asRecord(dataRecord.request);
   const toolRecord = asRecord(dataRecord.tool);
   const manifestRecord = asRecord(dataRecord.manifest);
+  const requestPayment = asRecord(requestRecord.payment);
+  const requestPaymentSummary = asRecord(requestRecord.payment_summary);
   const status = readFirstString(requestRecord.status) || void 0;
   const isTerminal = status === "COMPLETED" || status === "FAILED";
   const effectiveXappId = readFirstString(requestRecord.xapp_id, xappIdFilter);
@@ -2812,6 +3030,8 @@ function RequestDetailPage() {
       if (!resolvePaymentLockStateFromGuardSummary(
         asRecord(asRecord(res).request).guard_summary ?? null,
         {
+          requestStatus: readFirstString(asRecord(asRecord(res).request).status),
+          paymentStatus: readFirstString(asRecord(asRecord(res).request).payment_status),
           t: (key, fallback) => t(key, void 0, fallback)
         }
       ).isLocked) {
@@ -2823,31 +3043,7 @@ function RequestDetailPage() {
       setBusy(false);
     }
   }
-  async function reconcilePaymentFinality() {
-    if (!id || reconcileBusy || !client.reconcileMyRequestPayment) return;
-    setReconcileError(null);
-    setReconcileState("confirming_payment");
-    setReconcileBusy(true);
-    try {
-      const res = await client.reconcileMyRequestPayment({
-        requestId: String(id),
-        paymentSessionId: requestPaymentLock.paymentSessionId
-      });
-      setReconcileState(res?.finality_state || "none");
-      const redirectUrl = String(res?.redirect_url || "").trim();
-      if (redirectUrl) {
-        window.location.href = redirectUrl;
-        return;
-      }
-      await refreshOnce();
-    } catch (e) {
-      setReconcileError(readFirstString(asRecord(e).message) || String(e));
-      setReconcileState("failed");
-    } finally {
-      setReconcileBusy(false);
-    }
-  }
-  useEffect6(() => {
+  useEffect7(() => {
     if (!id) return;
     let alive = true;
     let timer = null;
@@ -2940,11 +3136,62 @@ function RequestDetailPage() {
   }, [toolRecord]);
   const requestPaymentLock = useMemo6(
     () => resolvePaymentLockStateFromGuardSummary(requestRecord.guard_summary ?? null, {
+      requestStatus: readFirstString(requestRecord.status),
+      paymentStatus: readFirstString(requestRecord.payment_status),
       reconcileState,
       t: (key, fallback) => t(key, void 0, fallback)
     }),
     [requestRecord.guard_summary, reconcileState, t]
   );
+  const isPaymentPending = String(status || "").trim().toUpperCase() === "PAYMENT_PENDING";
+  const showPaymentWaitState = requestPaymentLock.isLocked || isPaymentPending;
+  const eventPaymentSessionId = useMemo6(() => {
+    const events = Array.isArray(dataRecord.events) ? dataRecord.events : [];
+    for (let index = events.length - 1; index >= 0; index -= 1) {
+      const candidate = readPaymentSessionIdFromUnknown(getEventPayload(events[index]));
+      if (candidate) return candidate;
+    }
+    return "";
+  }, [dataRecord.events]);
+  const effectivePaymentSessionId = readFirstString(
+    requestPaymentLock.paymentSessionId,
+    requestRecord.payment_session_id,
+    requestRecord.paymentSessionId,
+    requestPayment.payment_session_id,
+    requestPayment.paymentSessionId,
+    requestPaymentSummary.payment_session_id,
+    requestPaymentSummary.paymentSessionId,
+    eventPaymentSessionId
+  ) || "";
+  const directPaymentUrl = readFirstString(
+    requestRecord.payment_resume_url,
+    requestRecord.paymentResumeUrl,
+    requestPayment.resume_url,
+    requestPayment.resumeUrl,
+    requestPaymentSummary.payment_resume_url,
+    requestPaymentSummary.paymentResumeUrl,
+    requestPaymentLock.actionUrl
+  ) || "";
+  const paymentSurfaceHref = (() => {
+    if (!effectivePaymentSessionId) return "";
+    const installationId = readFirstString(requestRecord.installation_id) || void 0;
+    if (effectiveXappId) {
+      return buildOperationalSurfaceHref({
+        surface: "payments",
+        xappId: effectiveXappId,
+        installationId,
+        paymentSessionId: effectivePaymentSessionId,
+        token: token || void 0,
+        isEmbedded
+      });
+    }
+    const params = new URLSearchParams({
+      paymentSessionId: effectivePaymentSessionId,
+      ...installationId ? { installationId } : {},
+      ...token ? { token } : {}
+    });
+    return `${isEmbedded ? "/payments" : "/marketplace/payments"}?${params.toString()}`;
+  })();
   function getEventPayload(ev) {
     const eventRecord = asRecord(ev);
     if (!Object.keys(eventRecord).length) return null;
@@ -2961,6 +3208,39 @@ function RequestDetailPage() {
     }
     return null;
   }
+  function readPaymentSessionIdFromUnknown(value) {
+    const record = asRecord(value);
+    const direct = readFirstString(
+      record.payment_session_id,
+      record.paymentSessionId,
+      asRecord(record.action).payment_session_id,
+      asRecord(record.action).paymentSessionId,
+      asRecord(record.guard).payment_session_id,
+      asRecord(asRecord(record.guard).action).payment_session_id,
+      asRecord(asRecord(record.guard).action).paymentSessionId
+    );
+    if (direct) return direct;
+    const url = readFirstString(
+      record.url,
+      record.payment_url,
+      record.paymentUrl,
+      asRecord(record.action).url,
+      asRecord(asRecord(record.guard).action).url
+    );
+    if (!url) return "";
+    try {
+      const parsed = new URL(
+        url,
+        typeof window !== "undefined" ? window.location.href : "http://localhost"
+      );
+      return readFirstString(
+        parsed.searchParams.get("payment_session_id"),
+        parsed.searchParams.get("paymentSessionId")
+      ) || "";
+    } catch {
+      return "";
+    }
+  }
   function extractGuardSummary(payload) {
     const p = asRecord(payload);
     const guard = asRecord(p.guard);
@@ -3038,7 +3318,7 @@ function RequestDetailPage() {
     if (raw == null) return null;
     const enriched = attachArtifactLinks(raw, artifacts);
     const isOpen = expandedPayloads[idx] ?? false;
-    return /* @__PURE__ */ jsxs8(Fragment5, { children: [
+    return /* @__PURE__ */ jsxs8(Fragment6, { children: [
       /* @__PURE__ */ jsxs8(
         "button",
         {
@@ -3067,14 +3347,56 @@ function RequestDetailPage() {
   }
   function StatusBadge4({ status: status2 }) {
     const s = String(status2 || "");
+    const normalized = s.trim().toUpperCase();
     const className = s === "COMPLETED" ? "mx-badge-success" : s === "FAILED" ? "mx-badge-danger" : "mx-badge-warning";
-    return /* @__PURE__ */ jsx12("span", { className: `mx-badge ${className}`, children: s || "\u2014" });
+    const label = normalized === "PAYMENT_PENDING" ? t("activity.payment_pending", void 0, "Payment Pending") : s || "\u2014";
+    return /* @__PURE__ */ jsx12("span", { className: `mx-badge ${className}`, children: label });
+  }
+  async function continuePayment() {
+    if (client.reconcileMyRequestPayment && isPaymentPending) {
+      setReconcileError(null);
+      setReconcileState("confirming_payment");
+      setReconcileBusy(true);
+      try {
+        const hostReturnUrl = readHostReturnUrl(loc.search);
+        const currentReturnUrl = String(
+          hostReturnUrl || (typeof window !== "undefined" ? window.location.href : "") || ""
+        ).trim();
+        const res = await client.reconcileMyRequestPayment({
+          requestId: String(id),
+          paymentSessionId: effectivePaymentSessionId || void 0,
+          returnUrl: currentReturnUrl || void 0,
+          cancelUrl: currentReturnUrl || void 0
+        });
+        setReconcileState(res?.finality_state || "none");
+        const redirectUrl = String(res?.redirect_url || "").trim();
+        if (redirectUrl) {
+          navigateToExternalOrHost(redirectUrl);
+          return;
+        }
+        await refreshOnce();
+        return;
+      } catch (e) {
+        setReconcileError(readFirstString(asRecord(e).message) || String(e));
+        setReconcileState("failed");
+        return;
+      } finally {
+        setReconcileBusy(false);
+      }
+    }
+    if (directPaymentUrl) {
+      navigateToExternalOrHost(directPaymentUrl);
+      return;
+    }
+    if (paymentSurfaceHref) {
+      void navigate(paymentSurfaceHref);
+    }
   }
   return /* @__PURE__ */ jsxs8("div", { className: `mx-catalog-container ${isEmbedded ? "is-embedded" : ""}`, children: [
     /* @__PURE__ */ jsxs8("div", { className: "mx-breadcrumb", children: [
       !env?.singleXappMode && /* @__PURE__ */ jsx12(Link7, { to: marketplaceTo, children: t("common.marketplace", void 0, "Marketplace") }),
       env?.singleXappMode && !env?.embedMode && /* @__PURE__ */ jsx12(Link7, { to: marketplaceTo, children: t("common.marketplace", void 0, "Marketplace") }),
-      xappTo && /* @__PURE__ */ jsxs8(Fragment5, { children: [
+      xappTo && /* @__PURE__ */ jsxs8(Fragment6, { children: [
         (!env?.singleXappMode || env?.singleXappMode && !env?.embedMode) && /* @__PURE__ */ jsx12("span", { className: "mx-breadcrumb-sep", children: "/" }),
         /* @__PURE__ */ jsx12(Link7, { to: xappTo, children: xappCrumbLabel })
       ] }),
@@ -3143,7 +3465,7 @@ function RequestDetailPage() {
               /* @__PURE__ */ jsx12("h2", { className: "mx-title mx-request-section-title", children: title }),
               /* @__PURE__ */ jsxs8("div", { className: "mx-request-meta-row", children: [
                 /* @__PURE__ */ jsx12("span", { children: effectiveXappTitle || "\u2014" }),
-                readString(requestRecord.xapp_version) && /* @__PURE__ */ jsxs8(Fragment5, { children: [
+                readString(requestRecord.xapp_version) && /* @__PURE__ */ jsxs8(Fragment6, { children: [
                   /* @__PURE__ */ jsx12("span", { children: "\xB7" }),
                   /* @__PURE__ */ jsxs8("span", { children: [
                     "v",
@@ -3175,34 +3497,32 @@ function RequestDetailPage() {
         ] }),
         /* @__PURE__ */ jsxs8("section", { className: "mx-table-container mx-request-section", children: [
           /* @__PURE__ */ jsx12("h3", { className: "mx-section-title mx-section-title-md", children: t("activity.response_title", void 0, "Response") }),
-          requestPaymentLock.isLocked && requestPaymentLock.actionUrl ? /* @__PURE__ */ jsxs8("div", { className: "mx-payment-lock-banner", children: [
-            /* @__PURE__ */ jsx12("div", { className: "mx-payment-lock-title", children: t("activity.payment_required", void 0, "Payment Required") }),
-            /* @__PURE__ */ jsx12("div", { className: "mx-payment-lock-message", children: requestPaymentLock.message }),
+          showPaymentWaitState ? /* @__PURE__ */ jsxs8("div", { className: "mx-payment-lock-banner", children: [
+            /* @__PURE__ */ jsx12("div", { className: "mx-payment-lock-title", children: isPaymentPending ? t("activity.payment_pending", void 0, "Payment Pending") : t("activity.payment_required", void 0, "Payment Required") }),
+            /* @__PURE__ */ jsx12("div", { className: "mx-payment-lock-message", children: requestPaymentLock.isLocked ? requestPaymentLock.message : t(
+              "activity.waiting_for_payment",
+              void 0,
+              "Waiting for payment confirmation\u2026"
+            ) }),
             /* @__PURE__ */ jsxs8("div", { className: "mx-payment-lock-actions", children: [
-              /* @__PURE__ */ jsx12(
+              isPaymentPending || effectivePaymentSessionId || directPaymentUrl || paymentSurfaceHref ? /* @__PURE__ */ jsx12(
                 "button",
                 {
                   className: "mx-btn mx-btn-primary",
-                  onClick: () => {
-                    window.location.href = requestPaymentLock.actionUrl;
-                  },
-                  children: requestPaymentLock.ctaLabel || t("activity.complete_payment", void 0, "Complete Payment")
-                }
-              ),
-              client.reconcileMyRequestPayment && requestPaymentLock.paymentSessionId ? /* @__PURE__ */ jsx12(
-                "button",
-                {
-                  className: "mx-btn mx-btn-secondary",
-                  onClick: () => void reconcilePaymentFinality(),
-                  disabled: reconcileBusy || requestPaymentLock.reconcileState === "confirmed_paid",
-                  children: reconcileBusy ? t("activity.confirming_payment", void 0, "Confirming...") : t("activity.confirm_payment", void 0, "Confirm Payment")
+                  onClick: () => void continuePayment(),
+                  disabled: reconcileBusy,
+                  children: t("activity.complete_payment", void 0, "Complete Payment")
                 }
               ) : null,
               /* @__PURE__ */ jsx12("button", { className: "mx-btn mx-btn-secondary", onClick: () => void refreshOnce(), children: t("activity.refresh_status", void 0, "Refresh Status") })
             ] }),
             reconcileError ? /* @__PURE__ */ jsx12("div", { className: "mx-payment-lock-error", children: reconcileError }) : null
           ] }) : null,
-          !isTerminal ? /* @__PURE__ */ jsx12("div", { className: "mx-waiting-state", children: t("activity.waiting_for_response", void 0, "Waiting for response\u2026") }) : /* @__PURE__ */ jsx12(SchemaOutputView, { schema: outputSchema, value: responsePayload })
+          !isTerminal ? showPaymentWaitState ? /* @__PURE__ */ jsx12("div", { className: "mx-waiting-state", children: t(
+            "activity.waiting_for_payment",
+            void 0,
+            "Waiting for payment confirmation\u2026"
+          ) }) : /* @__PURE__ */ jsx12("div", { className: "mx-waiting-state", children: t("activity.waiting_for_response", void 0, "Waiting for response\u2026") }) : /* @__PURE__ */ jsx12(SchemaOutputView, { schema: outputSchema, value: responsePayload })
         ] }),
         Array.isArray(dataRecord.events) && dataRecord.events.length > 0 && (() => {
           const evts = dataRecord.events;
@@ -3500,9 +3820,9 @@ function RequestDetailPage() {
 }
 
 // src/pages/RequestsPage.tsx
-import { useEffect as useEffect7, useMemo as useMemo7, useState as useState6 } from "react";
+import { useEffect as useEffect8, useMemo as useMemo7, useState as useState6 } from "react";
 import { Link as Link8, useLocation as useLocation6 } from "react-router-dom";
-import { Fragment as Fragment6, jsx as jsx13, jsxs as jsxs9 } from "react/jsx-runtime";
+import { Fragment as Fragment7, jsx as jsx13, jsxs as jsxs9 } from "react/jsx-runtime";
 function useQueryToken6() {
   const loc = useLocation6();
   const qs = new URLSearchParams(loc.search);
@@ -3515,10 +3835,9 @@ function useQuery5() {
 function renderGuardActionHint(summary) {
   const action = asRecord(summary.action);
   const kind = readString(action.kind);
-  const url = readString(action.url);
-  if (kind === "upgrade_subscription") return `Upgrade subscription${url ? ` (${url})` : ""}`;
-  if (kind === "complete_payment") return `Complete payment${url ? ` (${url})` : ""}`;
-  if (kind === "step_up_auth") return `Complete step-up authentication${url ? ` (${url})` : ""}`;
+  if (kind === "upgrade_subscription") return "Upgrade subscription";
+  if (kind === "complete_payment") return "Complete payment";
+  if (kind === "step_up_auth") return "Complete step-up authentication";
   if (kind === "confirm_action") {
     const msg = readString(action.message);
     return msg ? `Confirm action (${msg})` : "Confirm action";
@@ -3561,7 +3880,7 @@ function RequestsPage() {
       setBusy(false);
     }
   }
-  useEffect7(() => {
+  useEffect8(() => {
     void refresh(pageParam);
     host.notifyNavigation?.({
       path: window.location.pathname,
@@ -3569,7 +3888,7 @@ function RequestsPage() {
       params: { xappId: xappIdFilter }
     });
   }, [xappIdFilter, pageParam]);
-  useEffect7(() => {
+  useEffect8(() => {
     if (!xappIdFilter) {
       setXappTitle("");
       return;
@@ -3607,8 +3926,10 @@ function RequestsPage() {
   };
   function StatusBadge4({ status }) {
     const s = String(status || "");
+    const normalized = s.trim().toUpperCase();
     const className = s === "COMPLETED" ? "mx-badge-success" : s === "FAILED" ? "mx-badge-danger" : "mx-badge-warning";
-    return /* @__PURE__ */ jsx13("span", { className: `mx-badge ${className}`, children: s || "\u2014" });
+    const label = normalized === "PAYMENT_PENDING" ? t("activity.payment_pending", void 0, "Payment Pending") : s || "\u2014";
+    return /* @__PURE__ */ jsx13("span", { className: `mx-badge ${className}`, children: label });
   }
   if (env?.requestsEnabled === false) {
     return /* @__PURE__ */ jsx13("div", { className: `mx-catalog-container ${isEmbedded ? "is-embedded" : ""}`, children: /* @__PURE__ */ jsxs9("div", { className: "mx-table-container mx-unavailable", children: [
@@ -3628,7 +3949,7 @@ function RequestsPage() {
     /* @__PURE__ */ jsxs9("div", { className: "mx-breadcrumb", children: [
       !env?.singleXappMode && /* @__PURE__ */ jsx13(Link8, { to: isEmbedded ? "/" : "/marketplace", children: t("common.marketplace", void 0, "Marketplace") }),
       env?.singleXappMode && !isEmbedded && /* @__PURE__ */ jsx13(Link8, { to: isEmbedded ? "/" : "/marketplace", children: t("common.marketplace", void 0, "Marketplace") }),
-      xappIdFilter && xappLink && /* @__PURE__ */ jsxs9(Fragment6, { children: [
+      xappIdFilter && xappLink && /* @__PURE__ */ jsxs9(Fragment7, { children: [
         (!env?.singleXappMode || env?.singleXappMode && !isEmbedded) && /* @__PURE__ */ jsx13("span", { className: "mx-breadcrumb-sep", children: "/" }),
         /* @__PURE__ */ jsx13(Link8, { to: xappLink, children: xappTitle || xappIdFilter })
       ] }),
@@ -3813,140 +4134,9 @@ function RequestsPage() {
 }
 
 // src/pages/XappDetailPage.tsx
-import { useEffect as useEffect8, useMemo as useMemo8, useRef, useState as useState7 } from "react";
+import { useEffect as useEffect9, useMemo as useMemo8, useRef, useState as useState7 } from "react";
 import { Link as Link9, useLocation as useLocation7, useNavigate as useNavigate3, useParams as useParams2 } from "react-router-dom";
-
-// src/utils/operationalSurfaces.ts
-function readPathEmbedded() {
-  return typeof window !== "undefined" && window.location.pathname.startsWith("/embed");
-}
-function getOperationalSurfaces(detail) {
-  const value = detail?.operational_surfaces;
-  if (!value || typeof value !== "object") return null;
-  return value;
-}
-function readOperationalSurfaceMode(input) {
-  const policy = input.env?.operationalSurfacesVisibility;
-  return input.isEmbedded ? policy?.embed ?? "contract" : policy?.portal ?? "contract";
-}
-function isOperationalSurfaceVisible(detail, surface, options) {
-  const surfaces = getOperationalSurfaces(detail);
-  const descriptor = surfaces?.[surface];
-  if (!descriptor?.enabled) return false;
-  const isEmbedded = options?.isEmbedded ?? readPathEmbedded();
-  return isEmbedded ? descriptor.visibility.embed : descriptor.visibility.portal;
-}
-function surfaceClientAvailable(client, surface) {
-  if (surface === "requests") return typeof client.listMyRequests === "function";
-  if (surface === "payments") return typeof client.listMyPaymentSessions === "function";
-  if (surface === "invoices") return typeof client.listMyInvoices === "function";
-  if (surface === "notifications") return typeof client.listMyNotifications === "function";
-  return false;
-}
-function buildOperationalSurfaceHref(input) {
-  const isEmbedded = input.isEmbedded ?? readPathEmbedded();
-  const params = new URLSearchParams({
-    xappId: input.xappId,
-    ...input.installationId ? { installationId: input.installationId } : {},
-    ...input.paymentSessionId ? { paymentSessionId: input.paymentSessionId } : {},
-    ...input.invoiceId ? { invoiceId: input.invoiceId } : {},
-    ...input.notificationId ? { notificationId: input.notificationId } : {},
-    ...input.token ? { token: input.token } : {}
-  });
-  const base = isEmbedded ? `/${input.surface}` : `/marketplace/${input.surface}`;
-  const detailSegment = input.surface === "requests" && input.requestId ? `/${encodeURIComponent(input.requestId)}` : "";
-  return `${base}${detailSegment}?${params.toString()}`;
-}
-function getVisibleOperationalSurfaces(input) {
-  const isEmbedded = input.isEmbedded ?? readPathEmbedded();
-  const mode = readOperationalSurfaceMode({
-    env: input.env,
-    isEmbedded
-  });
-  const allSurfaces = [
-    "requests",
-    "payments",
-    "invoices",
-    "notifications"
-  ];
-  if (mode === "testing_all") {
-    return allSurfaces.filter((surface) => {
-      if (surface === "requests" && input.env?.requestsEnabled === false) return false;
-      return surfaceClientAvailable(input.client, surface);
-    });
-  }
-  const surfaces = getOperationalSurfaces(input.detail);
-  if (!surfaces) return [];
-  return allSurfaces.filter(
-    (surface) => surfaceClientAvailable(input.client, surface) && isOperationalSurfaceVisible(input.detail, surface, { isEmbedded })
-  );
-}
-function getOperationalSurfaceLabel(surface) {
-  if (surface === "requests") return "Requests";
-  if (surface === "payments") return "Payments";
-  if (surface === "invoices") return "Invoices";
-  return "Notifications";
-}
-function resolveOperationalSurfacePlacement(input) {
-  const isEmbedded = input.isEmbedded ?? readPathEmbedded();
-  const policy = input.env?.operationalSurfacePlacement;
-  const scopePolicy = isEmbedded ? policy?.embed : policy?.portal;
-  const bySurface = scopePolicy?.bySurface?.[input.surface];
-  if (bySurface) return bySurface;
-  return scopePolicy?.default ?? "in_router";
-}
-async function discoverOperationalSurfaceData(input) {
-  const xappId = String(input.xappId || "").trim();
-  const installationId = String(input.installationId || "").trim();
-  if (!xappId) return [];
-  const queryBase = {
-    xappId,
-    ...installationId ? { installationId } : {}
-  };
-  const checks = await Promise.all([
-    (async () => {
-      if (typeof input.client.listMyPaymentSessions !== "function") return null;
-      try {
-        const res = await input.client.listMyPaymentSessions({
-          ...queryBase,
-          limit: 1
-        });
-        return Array.isArray(res?.items) && res.items.length > 0 ? "payments" : null;
-      } catch {
-        return null;
-      }
-    })(),
-    (async () => {
-      if (typeof input.client.listMyInvoices !== "function") return null;
-      try {
-        const res = await input.client.listMyInvoices({
-          ...queryBase,
-          page: 1,
-          pageSize: 1
-        });
-        return Array.isArray(res?.items) && res.items.length > 0 ? "invoices" : null;
-      } catch {
-        return null;
-      }
-    })(),
-    (async () => {
-      if (typeof input.client.listMyNotifications !== "function") return null;
-      try {
-        const res = await input.client.listMyNotifications({
-          ...queryBase,
-          limit: 1
-        });
-        return Array.isArray(res?.items) && res.items.length > 0 || Number(res?.unread_count || 0) > 0 ? "notifications" : null;
-      } catch {
-        return null;
-      }
-    })()
-  ]);
-  return checks.filter((surface) => Boolean(surface));
-}
-
-// src/pages/XappDetailPage.tsx
-import { Fragment as Fragment7, jsx as jsx14, jsxs as jsxs10 } from "react/jsx-runtime";
+import { Fragment as Fragment8, jsx as jsx14, jsxs as jsxs10 } from "react/jsx-runtime";
 function useQueryToken7() {
   const loc = useLocation7();
   const qs = new URLSearchParams(loc.search);
@@ -4107,7 +4297,7 @@ function XappDetailPage() {
       setBusy(false);
     }
   }
-  useEffect8(() => {
+  useEffect9(() => {
     void refresh();
     host.refreshInstallations();
     host.notifyNavigation?.({
@@ -4116,7 +4306,7 @@ function XappDetailPage() {
       params: { xappId }
     });
   }, [client, installation?.installationId, xappId]);
-  useEffect8(() => {
+  useEffect9(() => {
     const currentXappId = String(xappId ?? "").trim();
     if (!currentXappId) {
       setDiscoveredOperationalSurfaces([]);
@@ -4164,7 +4354,7 @@ function XappDetailPage() {
   const termsUrl = readString4(terms?.url);
   const hasTermsContent = Boolean(termsText || termsUrl);
   const requiresTerms = Boolean(terms || action === "install" || action === "update");
-  useEffect8(() => {
+  useEffect9(() => {
     if (action === "install") {
       setTermsAccepted(false);
       setTermsAction("install");
@@ -4177,7 +4367,7 @@ function XappDetailPage() {
       setTermsOpen(true);
     }
   }, [action, installation]);
-  useEffect8(() => {
+  useEffect9(() => {
     if (action !== "open-widget") return;
     if (env?.embedMode) return;
     if (!installation || !widgetsEnabled) return;
@@ -4319,7 +4509,7 @@ function XappDetailPage() {
       ) })
     ] }),
     error && /* @__PURE__ */ jsx14("div", { className: "mx-detail-error", children: error }),
-    busy && !data ? /* @__PURE__ */ jsxs10(Fragment7, { children: [
+    busy && !data ? /* @__PURE__ */ jsxs10(Fragment8, { children: [
       /* @__PURE__ */ jsxs10("div", { className: "mx-detail-skeleton-header", "aria-busy": "true", children: [
         /* @__PURE__ */ jsx14("div", { className: "mx-detail-skeleton-icon" }),
         /* @__PURE__ */ jsxs10("div", { className: "mx-detail-skeleton-info", children: [
@@ -4353,7 +4543,7 @@ function XappDetailPage() {
           /* @__PURE__ */ jsx14("div", { className: "mx-skeleton-line mx-skeleton-line-short" })
         ] }) })
       ] })
-    ] }) : /* @__PURE__ */ jsxs10(Fragment7, { children: [
+    ] }) : /* @__PURE__ */ jsxs10(Fragment8, { children: [
       /* @__PURE__ */ jsxs10("header", { className: "mx-detail-header", children: [
         /* @__PURE__ */ jsx14("img", { src: imageUrl, alt: title, className: "mx-detail-icon" }),
         /* @__PURE__ */ jsxs10("div", { className: "mx-detail-info", children: [
@@ -4373,7 +4563,7 @@ function XappDetailPage() {
             updateAvailable ? /* @__PURE__ */ jsx14("div", { className: "mx-detail-update-pill", children: t("xapp.update_available", void 0, "Update available") }) : null
           ] })
         ] }),
-        /* @__PURE__ */ jsx14("div", { className: "mx-detail-actions", children: canMutate ? /* @__PURE__ */ jsxs10(Fragment7, { children: [
+        /* @__PURE__ */ jsx14("div", { className: "mx-detail-actions", children: canMutate ? /* @__PURE__ */ jsxs10(Fragment8, { children: [
           installation && updateAvailable && host.requestUpdate ? /* @__PURE__ */ jsx14(
             "button",
             {
@@ -5058,9 +5248,9 @@ function XappDetailPage() {
 }
 
 // src/pages/WidgetView.tsx
-import { useEffect as useEffect9, useRef as useRef2, useState as useState8 } from "react";
+import { useEffect as useEffect10, useRef as useRef2, useState as useState8 } from "react";
 import { Link as Link10, useLocation as useLocation8, useNavigate as useNavigate4, useParams as useParams3 } from "react-router-dom";
-import { Fragment as Fragment8, jsx as jsx15, jsxs as jsxs11 } from "react/jsx-runtime";
+import { Fragment as Fragment9, jsx as jsx15, jsxs as jsxs11 } from "react/jsx-runtime";
 function useQueryToken8() {
   const loc = useLocation8();
   const qs = new URLSearchParams(loc.search);
@@ -5161,7 +5351,7 @@ function WidgetView() {
       page: "portal-home"
     });
   };
-  useEffect9(() => {
+  useEffect10(() => {
     if (!installationId) return;
     let alive = true;
     void (async () => {
@@ -5190,7 +5380,7 @@ function WidgetView() {
       alive = false;
     };
   }, [installationId, client, host, locale]);
-  useEffect9(() => {
+  useEffect10(() => {
     if (!xappId) {
       setDiscoveredOperationalSurfaces([]);
       return;
@@ -5210,7 +5400,7 @@ function WidgetView() {
       cancelled = true;
     };
   }, [client, installationId, xappId]);
-  useEffect9(() => {
+  useEffect10(() => {
     if (!installationId || !widgetId || !host.notifyNavigation) return;
     host.notifyNavigation({
       path: window.location.pathname,
@@ -5218,7 +5408,7 @@ function WidgetView() {
       params: { installationId, widgetId }
     });
   }, [installationId, widgetId, host]);
-  useEffect9(() => {
+  useEffect10(() => {
     if (!installationId || !widgetId) return;
     let alive = true;
     void (async () => {
@@ -5252,7 +5442,7 @@ function WidgetView() {
       expires_in: Number.isFinite(Number(refreshed?.expires_in)) && Number(refreshed?.expires_in) > 0 ? Number(refreshed?.expires_in) : void 0
     };
   }
-  useEffect9(() => {
+  useEffect10(() => {
     return () => {
       for (const [, pending] of nestedExpandPendingRef.current) {
         window.clearTimeout(pending.timeoutId);
@@ -5262,7 +5452,7 @@ function WidgetView() {
       nestedExpandPendingRef.current.clear();
     };
   }, []);
-  useEffect9(() => {
+  useEffect10(() => {
     const shell = shellRef.current;
     const rootEl = shell?.parentElement ?? null;
     const htmlEl = document.documentElement;
@@ -5295,7 +5485,7 @@ function WidgetView() {
       }
     };
   }, [env?.embedMode, hostNestedExpandStage]);
-  useEffect9(() => {
+  useEffect10(() => {
     if (!env?.embedMode) return;
     const handler = (e) => {
       if (e.source !== window.parent) return;
@@ -5311,7 +5501,7 @@ function WidgetView() {
     window.addEventListener("message", handler);
     return () => window.removeEventListener("message", handler);
   }, [env?.embedMode]);
-  useEffect9(() => {
+  useEffect10(() => {
     const handler = (e) => {
       const msg = asRecord(e.data);
       const msgType = readString(msg.type);
@@ -5345,7 +5535,7 @@ function WidgetView() {
     window.addEventListener("message", handler);
     return () => window.removeEventListener("message", handler);
   }, []);
-  useEffect9(() => {
+  useEffect10(() => {
     if (!widgetToken) return;
     const postExpandResultToWidget = (target, result) => {
       if (!target || typeof target.postMessage !== "function") return;
@@ -5620,7 +5810,7 @@ function WidgetView() {
     xappId,
     t
   ]);
-  useEffect9(() => {
+  useEffect10(() => {
     if (!widgetToken || !env?.locale) return;
     try {
       iframeRef.current?.contentWindow?.postMessage(
@@ -5638,6 +5828,11 @@ function WidgetView() {
     const params = new URLSearchParams({ token: widgetToken });
     const hostReturnUrl = readHostReturnUrl(loc.search);
     if (hostReturnUrl) params.set("xapps_host_return_url", hostReturnUrl);
+    if (env?.embedMode && hostNestedExpandStage !== "inline") {
+      params.set("xapps_host_overlay", "1");
+    } else {
+      params.delete("xapps_host_overlay");
+    }
     const paymentParams = readPaymentEvidenceParams(loc.search);
     for (const [k, v] of paymentParams.entries()) {
       params.set(k, v);
@@ -5648,7 +5843,7 @@ function WidgetView() {
     return /* @__PURE__ */ jsxs11("div", { className: `mx-catalog-container ${isEmbedded ? "is-embedded" : ""}`, children: [
       /* @__PURE__ */ jsxs11("div", { className: "mx-breadcrumb", children: [
         /* @__PURE__ */ jsx15("button", { className: "mx-breadcrumb-link-btn", onClick: onBackToPortal, children: t("common.portal", void 0, "Portal") }),
-        !env?.singleXappMode && /* @__PURE__ */ jsxs11(Fragment8, { children: [
+        !env?.singleXappMode && /* @__PURE__ */ jsxs11(Fragment9, { children: [
           /* @__PURE__ */ jsx15("span", { className: "mx-breadcrumb-sep", children: "/" }),
           /* @__PURE__ */ jsx15(Link10, { to: marketplaceTo, children: t("common.marketplace", void 0, "Marketplace") })
         ] }),
@@ -5669,7 +5864,7 @@ function WidgetView() {
     return /* @__PURE__ */ jsxs11("div", { className: `mx-catalog-container ${isEmbedded ? "is-embedded" : ""}`, children: [
       /* @__PURE__ */ jsxs11("div", { className: "mx-breadcrumb", children: [
         /* @__PURE__ */ jsx15("button", { className: "mx-breadcrumb-link-btn", onClick: onBackToPortal, children: t("common.portal", void 0, "Portal") }),
-        !env?.singleXappMode && /* @__PURE__ */ jsxs11(Fragment8, { children: [
+        !env?.singleXappMode && /* @__PURE__ */ jsxs11(Fragment9, { children: [
           /* @__PURE__ */ jsx15("span", { className: "mx-breadcrumb-sep", children: "/" }),
           /* @__PURE__ */ jsx15(Link10, { to: marketplaceTo, children: t("common.marketplace", void 0, "Marketplace") })
         ] }),
@@ -5690,7 +5885,7 @@ function WidgetView() {
     return /* @__PURE__ */ jsxs11("div", { className: `mx-catalog-container ${isEmbedded ? "is-embedded" : ""}`, children: [
       /* @__PURE__ */ jsxs11("div", { className: "mx-breadcrumb", children: [
         /* @__PURE__ */ jsx15("button", { className: "mx-breadcrumb-link-btn", onClick: onBackToPortal, children: t("common.portal", void 0, "Portal") }),
-        !env?.singleXappMode && /* @__PURE__ */ jsxs11(Fragment8, { children: [
+        !env?.singleXappMode && /* @__PURE__ */ jsxs11(Fragment9, { children: [
           /* @__PURE__ */ jsx15("span", { className: "mx-breadcrumb-sep", children: "/" }),
           /* @__PURE__ */ jsx15(Link10, { to: marketplaceTo, children: t("common.marketplace", void 0, "Marketplace") })
         ] }),
@@ -5723,11 +5918,11 @@ function WidgetView() {
       children: [
         env?.embedMode && hostNestedExpandStage === "inline" && /* @__PURE__ */ jsxs11("div", { className: "mx-breadcrumb mx-breadcrumb-top", children: [
           /* @__PURE__ */ jsx15("button", { className: "mx-breadcrumb-link-btn", onClick: onBackToPortal, children: t("common.portal", void 0, "Portal") }),
-          !env?.singleXappMode && /* @__PURE__ */ jsxs11(Fragment8, { children: [
+          !env?.singleXappMode && /* @__PURE__ */ jsxs11(Fragment9, { children: [
             /* @__PURE__ */ jsx15("span", { className: "mx-breadcrumb-sep", children: "/" }),
             /* @__PURE__ */ jsx15(Link10, { to: marketplaceTo, children: t("common.marketplace", void 0, "Marketplace") })
           ] }),
-          xappTo && /* @__PURE__ */ jsxs11(Fragment8, { children: [
+          xappTo && /* @__PURE__ */ jsxs11(Fragment9, { children: [
             /* @__PURE__ */ jsx15("span", { className: "mx-breadcrumb-sep", children: "/" }),
             /* @__PURE__ */ jsx15(Link10, { to: xappTo, children: xappTitle || t("common.app", void 0, "App") })
           ] }),
@@ -5736,7 +5931,7 @@ function WidgetView() {
         ] }),
         !env?.embedMode && hostNestedExpandStage === "inline" && /* @__PURE__ */ jsxs11("div", { className: "mx-breadcrumb", children: [
           /* @__PURE__ */ jsx15(Link10, { to: marketplaceTo, children: t("common.marketplace", void 0, "Marketplace") }),
-          xappTo && /* @__PURE__ */ jsxs11(Fragment8, { children: [
+          xappTo && /* @__PURE__ */ jsxs11(Fragment9, { children: [
             /* @__PURE__ */ jsx15("span", { className: "mx-breadcrumb-sep", children: "/" }),
             /* @__PURE__ */ jsx15(Link10, { to: xappTo, children: xappTitle || t("common.app", void 0, "App") })
           ] }),
@@ -5787,9 +5982,9 @@ function WidgetView() {
 }
 
 // src/pages/PublishersPage.tsx
-import { useEffect as useEffect10, useMemo as useMemo9, useState as useState9 } from "react";
+import { useEffect as useEffect11, useMemo as useMemo9, useState as useState9 } from "react";
 import { Link as Link11, useLocation as useLocation9 } from "react-router-dom";
-import { Fragment as Fragment9, jsx as jsx16, jsxs as jsxs12 } from "react/jsx-runtime";
+import { Fragment as Fragment10, jsx as jsx16, jsxs as jsxs12 } from "react/jsx-runtime";
 function useQueryToken9() {
   const loc = useLocation9();
   const qs = new URLSearchParams(loc.search);
@@ -5847,7 +6042,7 @@ function PublishersPage() {
     }
     setItems(Array.from(grouped.values()).sort((a, b) => a.name.localeCompare(b.name)));
   }
-  useEffect10(() => {
+  useEffect11(() => {
     void (async () => {
       setBusy(true);
       setError(null);
@@ -5965,7 +6160,7 @@ function PublishersPage() {
         /* @__PURE__ */ jsx16("div", { className: "mx-skeleton-line mx-skeleton-line-title" }),
         /* @__PURE__ */ jsx16("div", { className: "mx-skeleton-line mx-skeleton-line-short" })
       ] })
-    ] }) }) }, i)) }) : /* @__PURE__ */ jsxs12(Fragment9, { children: [
+    ] }) }) }, i)) }) : /* @__PURE__ */ jsxs12(Fragment10, { children: [
       !busy && /* @__PURE__ */ jsx16("div", { className: "mx-results-bar", children: /* @__PURE__ */ jsx16("div", { className: "mx-results-count", children: t(
         "publisher.results_count",
         { count: ordered.length, suffix: ordered.length === 1 ? "" : "s" },
@@ -6042,9 +6237,9 @@ function PublishersPage() {
 }
 
 // src/pages/PublisherDetailPage.tsx
-import { useEffect as useEffect11, useMemo as useMemo10, useState as useState10 } from "react";
+import { useEffect as useEffect12, useMemo as useMemo10, useState as useState10 } from "react";
 import { Link as Link12, useLocation as useLocation10, useParams as useParams4 } from "react-router-dom";
-import { Fragment as Fragment10, jsx as jsx17, jsxs as jsxs13 } from "react/jsx-runtime";
+import { Fragment as Fragment11, jsx as jsx17, jsxs as jsxs13 } from "react/jsx-runtime";
 function useQueryToken10() {
   const loc = useLocation10();
   const qs = new URLSearchParams(loc.search);
@@ -6083,7 +6278,7 @@ function PublisherDetailPage() {
       setBusy(false);
     }
   }
-  useEffect11(() => {
+  useEffect12(() => {
     void refresh();
   }, [publisherSlug]);
   const publisherName = useMemo10(() => {
@@ -6174,7 +6369,7 @@ function PublisherDetailPage() {
         /* @__PURE__ */ jsx17("div", { className: "mx-skeleton-line mx-skeleton-line-full" }),
         /* @__PURE__ */ jsx17("div", { className: "mx-skeleton-line mx-skeleton-line-short" })
       ] })
-    ] }, i)) }) : /* @__PURE__ */ jsxs13(Fragment10, { children: [
+    ] }, i)) }) : /* @__PURE__ */ jsxs13(Fragment11, { children: [
       !busy && /* @__PURE__ */ jsx17("div", { className: "mx-results-bar", children: /* @__PURE__ */ jsx17("div", { className: "mx-results-count", children: filteredItems.length === items.length ? `${filteredItems.length} xapp${filteredItems.length === 1 ? "" : "s"}` : `${filteredItems.length} of ${items.length} xapp${items.length === 1 ? "" : "s"}` }) }),
       /* @__PURE__ */ jsx17("div", { className: "mx-grid", children: filteredItems.length === 0 && !busy ? /* @__PURE__ */ jsxs13("div", { className: "mx-empty-catalog", children: [
         /* @__PURE__ */ jsx17("div", { className: "mx-empty-catalog-icon", children: "\u2315" }),