@xapps-platform/marketplace-ui 0.1.9 → 0.1.11

package/dist/index.d.ts

@@ -11,5 +11,5 @@ export { CatalogPage } from "./pages/CatalogPage";
 export { default as XappDetailPage, XappPlansPage } from "./pages/XappDetailPage";
 export { WidgetView } from "./pages/WidgetView";
 export { resolvePaymentLockStateFromGuardSummary, type PaymentLockResolution, type PaymentReconcileState, } from "./utils/paymentLock";
-export type { CatalogXapp, CatalogXappDetail, InstallationInfo, MarketplaceClient, MarketplaceEnv, MarketplaceHostAdapter, OperationalSurfaceDescriptor, OperationalSurfacePlacement, OperationalSurfacesDescriptor, } from "./types";
+export type { CatalogXapp, CatalogXappDetail, InstallationInfo, MarketplaceClient, MarketplaceEnv, MarketplaceHostAdapter, MarketplaceInstallationPolicy, OperationalSurfaceDescriptor, OperationalSurfacePlacement, OperationalSurfacesDescriptor, } from "./types";
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,mBAAmB,CAAC;AAE3B,OAAO,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAC3E,OAAO,EAAE,kBAAkB,EAAE,sBAAsB,EAAE,MAAM,QAAQ,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAClF,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EACL,uCAAuC,EACvC,KAAK,qBAAqB,EAC1B,KAAK,qBAAqB,GAC3B,MAAM,qBAAqB,CAAC;AAE7B,YAAY,EACV,WAAW,EACX,iBAAiB,EACjB,gBAAgB,EAChB,iBAAiB,EACjB,cAAc,EACd,sBAAsB,EACtB,4BAA4B,EAC5B,2BAA2B,EAC3B,6BAA6B,GAC9B,MAAM,SAAS,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,mBAAmB,CAAC;AAE3B,OAAO,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAC3E,OAAO,EAAE,kBAAkB,EAAE,sBAAsB,EAAE,MAAM,QAAQ,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAClF,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EACL,uCAAuC,EACvC,KAAK,qBAAqB,EAC1B,KAAK,qBAAqB,GAC3B,MAAM,qBAAqB,CAAC;AAE7B,YAAY,EACV,WAAW,EACX,iBAAiB,EACjB,gBAAgB,EAChB,iBAAiB,EACjB,cAAc,EACd,sBAAsB,EACtB,6BAA6B,EAC7B,4BAA4B,EAC5B,2BAA2B,EAC3B,6BAA6B,GAC9B,MAAM,SAAS,CAAC"}

package/dist/index.js

@@ -978,6 +978,14 @@ function getDefaultWidgetId(x) {
   const pick = def || widgets[0];
   return readFirstString(asRecord(pick).id) || null;
 }
+function getDefaultWidgetName(x, locale) {
+  const rawWidgets = asRecord(x.manifest).widgets;
+  const widgets = Array.isArray(rawWidgets) ? rawWidgets : null;
+  if (!widgets || widgets.length === 0) return null;
+  const def = widgets.find((w) => asRecord(w).default === true);
+  const pick = asRecord(def || widgets[0]);
+  return resolveMarketplaceText(pick.title, locale) || readFirstString(pick.name, pick.id) || null;
+}
 function buildCatalogFilterStorageKey(input) {
   const mode = input.isEmbedded ? "embed" : "portal";
   const scope = input.singleXappMode && input.xappId ? `xapp:${input.xappId}` : "catalog";
@@ -1011,6 +1019,11 @@ function CatalogPage() {
   const canMutate = host.canMutate ? host.canMutate() : true;
   const addAppLabel = env?.copy?.addAppLabel || "Add app";
   const removeAppLabel = env?.copy?.removeAppLabel || "Remove app";
+  const openAppLabel = env?.copy?.openAppLabel || t("xapp.open_app", void 0, "Open app");
+  const installationPolicyResolved = env?.installationPolicyResolved !== false;
+  const mutationControlsReady = installationPolicyResolved || !host.subjectId || !canMutate;
+  const autoUpdateMode = mutationControlsReady && (env?.installationPolicy ?? host.installationPolicy)?.update_mode === "auto_update_compatible" && Boolean(host.subjectId);
+  const autoAvailableMode = mutationControlsReady && (env?.installationPolicy ?? host.installationPolicy)?.mode === "auto_available" && Boolean(host.subjectId);
   const loc = useLocation();
   const token = useQueryToken();
   const tokenSearch = buildTokenSearch(token, loc.search);
@@ -1075,6 +1088,14 @@ function CatalogPage() {
     setInstalledOnly(Boolean(stored?.addedOnly));
     setSelectedTag(typeof stored?.selectedTag === "string" ? stored.selectedTag : defaultTag);
   }, [defaultTag, storageKey]);
+  useEffect3(() => {
+    if (!autoAvailableMode || !installedOnly) return;
+    setInstalledOnly(false);
+    writeStoredCatalogFilters(storageKey, {
+      addedOnly: false,
+      selectedTag: selectedTag || ""
+    });
+  }, [autoAvailableMode, installedOnly, selectedTag, storageKey]);
   useEffect3(() => {
     const restrictedTags = env?.tags ?? [];
     if (selectedTag && restrictedTags.length > 0 && !restrictedTags.includes(selectedTag)) {
@@ -1192,7 +1213,7 @@ function CatalogPage() {
           }
         )
       ] }),
-      /* @__PURE__ */ jsxs3("label", { className: "mx-checkbox-label", children: [
+      mutationControlsReady && !autoAvailableMode ? /* @__PURE__ */ jsxs3("label", { className: "mx-checkbox-label", children: [
         /* @__PURE__ */ jsx6(
           "input",
           {
@@ -1210,7 +1231,7 @@ function CatalogPage() {
           }
         ),
         /* @__PURE__ */ jsx6("span", { className: "mx-label mx-label-inline", children: t("common.added_only", void 0, "Added only") })
-      ] })
+      ] }) : null
     ] }) }),
     busy && items.length === 0 ? /* @__PURE__ */ jsx6("div", { className: "mx-grid", "aria-busy": "true", children: Array.from({ length: 6 }).map((_, i) => /* @__PURE__ */ jsxs3("div", { className: "mx-skeleton-card", children: [
       /* @__PURE__ */ jsx6("div", { className: "mx-skeleton-card-image" }),
@@ -1240,7 +1261,7 @@ function CatalogPage() {
       /* @__PURE__ */ jsx6("div", { className: "mx-grid", children: filtered.length === 0 && !busy ? /* @__PURE__ */ jsxs3("div", { className: "mx-empty-catalog", children: [
         /* @__PURE__ */ jsx6("div", { className: "mx-empty-catalog-icon", children: "\u2315" }),
         /* @__PURE__ */ jsx6("div", { className: "mx-empty-catalog-title", children: t("catalog.no_apps_found", void 0, "No apps found") }),
-        /* @__PURE__ */ jsx6("div", { className: "mx-empty-catalog-desc", children: installedOnly && items.length > 0 ? t(
+        /* @__PURE__ */ jsx6("div", { className: "mx-empty-catalog-desc", children: !autoAvailableMode && installedOnly && items.length > 0 ? t(
           "catalog.empty_added_only",
           void 0,
           "No apps are installed for the current subject yet. Turn off Added only to browse the full catalog."
@@ -1260,7 +1281,9 @@ function CatalogPage() {
         const image = typeof manifest.image === "string" ? manifest.image : "https://picsum.photos/seed/" + x.slug + "/560/320";
         const inst = installationsByXappId[String(x.id)];
         const installed = Boolean(inst);
+        const updateAvailable = Boolean(inst?.updateAvailable);
         const defaultWidgetId = getDefaultWidgetId(x);
+        const defaultWidgetName = getDefaultWidgetName(x, locale) || t("common.widget", void 0, "Widget");
         const xTerms = asRecord(manifest.terms);
         const requiresTerms = Boolean(
           Object.keys(xTerms).length > 0 || typeof xTerms.text === "string" && xTerms.text.trim() || typeof xTerms.url === "string" && xTerms.url.trim()
@@ -1293,7 +1316,7 @@ function CatalogPage() {
                   )
                 ] }) : /* @__PURE__ */ jsx6("div", { className: "mx-card-publisher", children: t("common.catalog_app", void 0, "Catalog app") }),
                 /* @__PURE__ */ jsxs3("div", { className: "mx-card-badges", children: [
-                  installed && /* @__PURE__ */ jsxs3("span", { className: "mx-card-installed-badge", children: [
+                  !autoAvailableMode && installed && /* @__PURE__ */ jsxs3("span", { className: "mx-card-installed-badge", children: [
                     /* @__PURE__ */ jsx6("span", { className: "mx-card-installed-badge-dot" }),
                     t("common.added", void 0, "Added")
                   ] }),
@@ -1317,7 +1340,7 @@ function CatalogPage() {
                 children: t("catalog.view_details", void 0, "View details")
               }
             ),
-            canMutate && (!installed ? /* @__PURE__ */ jsx6(
+            canMutate && mutationControlsReady && (!installed ? /* @__PURE__ */ jsx6(
               "button",
               {
                 className: "mx-btn mx-btn-primary mx-btn-sm",
@@ -1331,12 +1354,50 @@ function CatalogPage() {
                   host.requestInstall({
                     xappId: String(x.id),
                     defaultWidgetId,
+                    xappTitle: title,
+                    widgetName: defaultWidgetName,
+                    openAfterInstall: autoAvailableMode && Boolean(defaultWidgetId),
                     subjectId: host.subjectId ?? null
                   });
                 },
-                children: addAppLabel
+                children: autoAvailableMode ? openAppLabel : addAppLabel
+              }
+            ) : autoAvailableMode ? /* @__PURE__ */ jsx6(
+              "button",
+              {
+                className: "mx-btn mx-btn-primary mx-btn-sm",
+                onClick: (e) => {
+                  e.preventDefault();
+                  e.stopPropagation();
+                  if (!defaultWidgetId || !inst?.installationId) {
+                    navigate(detailTo);
+                    return;
+                  }
+                  if (updateAvailable && host.requestUpdate && autoUpdateMode) {
+                    host.requestUpdate({
+                      installationId: inst.installationId,
+                      xappId: String(x.id),
+                      widgetId: defaultWidgetId,
+                      xappTitle: title,
+                      widgetName: defaultWidgetName
+                    });
+                    return;
+                  }
+                  if (updateAvailable) {
+                    navigate(detailTo);
+                    return;
+                  }
+                  host.openWidget({
+                    installationId: inst.installationId,
+                    widgetId: defaultWidgetId,
+                    xappId: String(x.id),
+                    xappTitle: title,
+                    widgetName: t("common.widget", void 0, "Widget")
+                  });
+                },
+                children: openAppLabel
               }
-            ) : /* @__PURE__ */ jsx6(
+            ) : !autoAvailableMode ? /* @__PURE__ */ jsx6(
               "button",
               {
                 className: "mx-btn mx-btn-outline mx-btn-sm mx-btn-danger-text",
@@ -1354,7 +1415,7 @@ function CatalogPage() {
                 },
                 children: removeAppLabel
               }
-            ))
+            ) : null)
           ] })
         ] }, x.id);
       }) })
@@ -4878,6 +4939,10 @@ function XappDetailPageContent(props) {
   const removeAppLabel = env?.copy?.removeAppLabel || t("xapp.remove_from_workspace", void 0, "Remove from workspace");
   const updateAppLabel = env?.copy?.updateAppLabel || t("xapp.update_app", void 0, "Update app");
   const openAppLabel = env?.copy?.openAppLabel || t("xapp.open_app", void 0, "Open app");
+  const hasSubject = Boolean(host.subjectId);
+  const installationPolicyResolved = env?.installationPolicyResolved !== false;
+  const mutationControlsReady = installationPolicyResolved || !hasSubject || !canMutate;
+  const installationPolicy = env?.installationPolicy ?? host.installationPolicy ?? null;
   const [data, setData] = useState7(null);
   const [monetization, setMonetization] = useState7(null);
   const [error, setError] = useState7(null);
@@ -4886,13 +4951,14 @@ function XappDetailPageContent(props) {
   const [termsOpen, setTermsOpen] = useState7(false);
   const [termsAccepted, setTermsAccepted] = useState7(false);
   const [termsAction, setTermsAction] = useState7("none");
+  const [termsWidgetId, setTermsWidgetId] = useState7(null);
+  const [termsWidgetName, setTermsWidgetName] = useState7(null);
   const [removeConfirmOpen, setRemoveConfirmOpen] = useState7(false);
   const [guardSummaryOpen, setGuardSummaryOpen] = useState7(false);
   const [checkoutBusyPackageSlug, setCheckoutBusyPackageSlug] = useState7("");
   const [checkoutError, setCheckoutError] = useState7(null);
   const [checkoutNotice, setCheckoutNotice] = useState7(null);
   const checkoutFinalizeKeyRef = useRef("");
-  const hasSubject = Boolean(host.subjectId);
   const installationsByXappId = hasSubject ? host.getInstallationsByXappId() : {};
   const routeInstallationId = String(routeQuery.get("installationId") || "").trim();
   const installation = xappId && installationsByXappId[String(xappId)] ? installationsByXappId[String(xappId)] : xappId && routeInstallationId ? {
@@ -4900,7 +4966,9 @@ function XappDetailPageContent(props) {
     xappId: String(xappId)
   } : null;
   const updateAvailable = Boolean(installation?.updateAvailable);
-  const widgetsEnabled = Boolean(installation) && !updateAvailable && hasSubject;
+  const autoAvailableMode = mutationControlsReady && installationPolicy?.mode === "auto_available" && Boolean(hasSubject) && canMutate;
+  const autoUpdateMode = mutationControlsReady && installationPolicy?.update_mode === "auto_update_compatible" && Boolean(hasSubject) && canMutate;
+  const widgetsEnabled = Boolean(hasSubject) && (Boolean(installation) || autoAvailableMode) && (!updateAvailable || autoUpdateMode);
   const isEmbedded = window.location.pathname.startsWith("/embed");
   const singleXappMode = env?.singleXappMode;
   async function refresh() {
@@ -5001,51 +5069,122 @@ function XappDetailPageContent(props) {
   const termsUrl = readString5(terms?.url);
   const hasTermsContent = Boolean(termsText || termsUrl);
   const requiresTerms = Boolean(terms || action === "install" || action === "update");
+  function requestInstallForWidget(widgetId, widgetName = null, acceptedTerms = false, openAfterInstall = false) {
+    host.requestInstall({
+      xappId: String(xappId ?? ""),
+      defaultWidgetId: widgetId,
+      xappTitle: String(title),
+      widgetName,
+      openAfterInstall,
+      subjectId: host.subjectId ?? null,
+      ...acceptedTerms ? { termsAccepted: true } : {}
+    });
+  }
+  function requestUpdateForWidget(widgetId, acceptedTerms = false) {
+    if (!installation?.installationId || !host.requestUpdate) return;
+    const activeWidget = widgetId && Array.isArray(widgets) ? widgets.find((entry) => readString5(entry.id) === widgetId) || null : null;
+    host.requestUpdate({
+      installationId: installation.installationId,
+      xappId: String(xappId ?? ""),
+      widgetId,
+      xappTitle: String(title),
+      widgetName: resolveMarketplaceText(activeWidget?.title, locale) || readString5(activeWidget?.name) || null,
+      ...acceptedTerms ? { termsAccepted: true } : {}
+    });
+  }
+  function openInstalledWidget(widgetId, widgetName, toolName) {
+    if (!installation) return;
+    if (env?.embedMode) {
+      navigate({
+        pathname: isEmbedded ? `/widget/${encodeURIComponent(installation.installationId)}/${encodeURIComponent(widgetId)}` : `/marketplace/widget/${encodeURIComponent(installation.installationId)}/${encodeURIComponent(widgetId)}`,
+        search: tokenSearch
+      });
+      return;
+    }
+    host.openWidget({
+      installationId: installation.installationId,
+      widgetId,
+      xappId: String(xappId ?? ""),
+      xappTitle: String(title),
+      widgetName,
+      toolName
+    });
+  }
+  function launchWidgetForSubject(widgetId, widgetName, toolName) {
+    if (!hasSubject || !widgetId) return;
+    if (!installation) {
+      if (requiresTerms) {
+        setTermsAccepted(false);
+        setTermsAction("install");
+        setTermsWidgetId(widgetId);
+        setTermsWidgetName(widgetName);
+        setTermsOpen(true);
+        return;
+      }
+      requestInstallForWidget(widgetId, widgetName, false, true);
+      return;
+    }
+    if (updateAvailable) {
+      if (autoUpdateMode && host.requestUpdate) {
+        if (requiresTerms) {
+          setTermsAccepted(false);
+          setTermsAction("update");
+          setTermsWidgetId(widgetId);
+          setTermsWidgetName(widgetName);
+          setTermsOpen(true);
+          return;
+        }
+        requestUpdateForWidget(widgetId);
+      }
+      return;
+    }
+    openInstalledWidget(widgetId, widgetName, toolName);
+  }
   useEffect9(() => {
     if (action === "install") {
       setTermsAccepted(false);
       setTermsAction("install");
+      setTermsWidgetId(readString5(defaultWidget?.id) || null);
+      setTermsWidgetName(resolveMarketplaceText(defaultWidget?.title, locale) || null);
       setTermsOpen(true);
       return;
     }
     if (action === "update" && installation) {
       setTermsAccepted(false);
       setTermsAction("update");
+      setTermsWidgetId(null);
+      setTermsWidgetName(null);
       setTermsOpen(true);
     }
-  }, [action, installation]);
+  }, [action, defaultWidget, installation, locale]);
   useEffect9(() => {
     if (action !== "open-widget") return;
     if (env?.embedMode) return;
-    if (!installation || !widgetsEnabled) return;
+    if (!requestedWidget || !widgetsEnabled) return;
     const widget = requestedWidget;
     const widgetId = readString5(widget?.id);
     if (!widgetId) return;
     const key = [
       String(xappId ?? ""),
-      installation.installationId,
+      installation?.installationId || "auto",
       widgetId,
       readString5(queryToolName)
     ].join(":");
     if (autoOpenedWidgetKeyRef.current === key) return;
     autoOpenedWidgetKeyRef.current = key;
-    host.openWidget({
-      installationId: installation.installationId,
+    launchWidgetForSubject(
       widgetId,
-      xappId: String(xappId ?? ""),
-      xappTitle: String(title),
-      widgetName: resolveMarketplaceText(widget?.title, locale) || readString5(widget?.widget_name) || readString5(widget?.name) || t("common.widget", void 0, "Widget"),
-      toolName: readString5(widget?.bind_tool_name)
-    });
+      resolveMarketplaceText(widget?.title, locale) || readString5(widget?.widget_name) || readString5(widget?.name) || t("common.widget", void 0, "Widget"),
+      readString5(widget?.bind_tool_name)
+    );
   }, [
     action,
     env?.embedMode,
-    host,
     installation,
+    launchWidgetForSubject,
     locale,
     queryToolName,
     requestedWidget,
-    title,
     widgetsEnabled,
     xappId
   ]);
@@ -5630,8 +5769,8 @@ function XappDetailPageContent(props) {
             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(Fragment8, { children: [
-          installation && updateAvailable && host.requestUpdate ? /* @__PURE__ */ jsx14(
+        /* @__PURE__ */ jsx14("div", { className: "mx-detail-actions", children: canMutate && mutationControlsReady ? /* @__PURE__ */ jsxs10(Fragment8, { children: [
+          installation && updateAvailable && host.requestUpdate && installationPolicy?.update_mode !== "auto_update_compatible" ? /* @__PURE__ */ jsx14(
             "button",
             {
               className: "mx-btn mx-btn-primary",
@@ -5640,14 +5779,13 @@ function XappDetailPageContent(props) {
                 if (requiresTerms) {
                   setTermsAccepted(false);
                   setTermsAction("update");
+                  setTermsWidgetId(null);
+                  setTermsWidgetName(null);
                   setTermsOpen(true);
                   return;
                 }
                 if (!installation.installationId) return;
-                host.requestUpdate?.({
-                  installationId: installation.installationId,
-                  xappId: String(xappId ?? "")
-                });
+                requestUpdateForWidget(null);
               },
               children: updateAppLabel
             }
@@ -5661,18 +5799,23 @@ function XappDetailPageContent(props) {
                 if (requiresTerms) {
                   setTermsAccepted(false);
                   setTermsAction("install");
+                  setTermsWidgetId(readString5(defaultWidget?.id) || null);
+                  setTermsWidgetName(
+                    resolveMarketplaceText(defaultWidget?.title, locale) || null
+                  );
                   setTermsOpen(true);
                   return;
                 }
-                host.requestInstall({
-                  xappId: String(xappId ?? ""),
-                  defaultWidgetId: readString5(defaultWidget?.id) || null,
-                  subjectId: host.subjectId ?? null
-                });
+                requestInstallForWidget(
+                  readString5(defaultWidget?.id) || null,
+                  resolveMarketplaceText(defaultWidget?.title, locale) || null,
+                  false,
+                  autoAvailableMode
+                );
               },
-              children: addAppLabel
+              children: autoAvailableMode ? openAppLabel : addAppLabel
             }
-          ) : /* @__PURE__ */ jsx14(
+          ) : !autoAvailableMode ? /* @__PURE__ */ jsx14(
             "button",
             {
               className: "mx-btn mx-btn-outline",
@@ -5684,7 +5827,7 @@ function XappDetailPageContent(props) {
               },
               children: removeAppLabel
             }
-          )
+          ) : null
         ] }) : null })
       ] }),
       /* @__PURE__ */ jsxs10("div", { className: "mx-detail-grid", children: [
@@ -5695,11 +5838,19 @@ function XappDetailPageContent(props) {
           ] }),
           /* @__PURE__ */ jsxs10("section", { className: "mx-detail-section mx-detail-section-widgets", children: [
             /* @__PURE__ */ jsx14("h2", { className: "mx-section-title", children: t("xapp.available_views_title", void 0, "Available Views") }),
-            !widgetsEnabled ? /* @__PURE__ */ jsx14("div", { className: "mx-sidebar-card mx-detail-empty", children: !installation ? t(
+            !widgetsEnabled ? /* @__PURE__ */ jsx14("div", { className: "mx-sidebar-card mx-detail-empty", children: !installation ? autoAvailableMode ? t(
+              "xapp.open_to_access_views",
+              void 0,
+              "Open this app to start and install it automatically for your workspace."
+            ) : t(
               "xapp.add_to_access_views",
               void 0,
               "Add this app to your workspace to access its available views."
-            ) : updateAvailable ? t(
+            ) : updateAvailable ? autoUpdateMode ? t(
+              "xapp.update_to_access_views_auto",
+              void 0,
+              "Open a view to update the app automatically for your workspace."
+            ) : t(
               "xapp.update_to_access_views",
               void 0,
               "An update is available. Please update the app to access its available views."
@@ -5722,24 +5873,10 @@ function XappDetailPageContent(props) {
                   disabled,
                   className: `mx-detail-widget-card ${disabled ? "is-disabled" : ""} ${isDefault ? "is-default" : ""}`,
                   onClick: () => {
-                    if (!installation || !widgetsEnabled) return;
+                    if (!widgetsEnabled) return;
                     const widgetId = readString5(w.id);
                     if (!widgetId) return;
-                    if (env?.embedMode && installation) {
-                      navigate({
-                        pathname: isEmbedded ? `/widget/${encodeURIComponent(installation.installationId)}/${encodeURIComponent(widgetId)}` : `/marketplace/widget/${encodeURIComponent(installation.installationId)}/${encodeURIComponent(widgetId)}`,
-                        search: tokenSearch
-                      });
-                      return;
-                    }
-                    host.openWidget({
-                      installationId: installation.installationId,
-                      widgetId,
-                      xappId: String(xappId ?? ""),
-                      xappTitle: String(title),
-                      widgetName: name,
-                      toolName: readString5(w.bind_tool_name)
-                    });
+                    launchWidgetForSubject(widgetId, name, readString5(w.bind_tool_name));
                   },
                   children: [
                     /* @__PURE__ */ jsx14("div", { className: "mx-detail-widget-icon", children: widgetType === "read" ? /* @__PURE__ */ jsxs10(
@@ -6059,26 +6196,18 @@ function XappDetailPageContent(props) {
             ] }) : null
           ] }) : null,
           plansCard,
-          installation && defaultWidget && hasSubject && /* @__PURE__ */ jsx14(
+          defaultWidget && hasSubject && (installation || autoAvailableMode) && /* @__PURE__ */ jsx14(
             "button",
             {
               className: "mx-btn mx-btn-primary mx-detail-primary-cta",
               onClick: () => {
-                if (env?.embedMode) {
-                  navigate({
-                    pathname: isEmbedded ? `/widget/${encodeURIComponent(installation.installationId)}/${encodeURIComponent(String(defaultWidget.id))}` : `/marketplace/widget/${encodeURIComponent(installation.installationId)}/${encodeURIComponent(String(defaultWidget.id))}`,
-                    search: tokenSearch
-                  });
-                  return;
-                }
-                host.openWidget({
-                  installationId: installation.installationId,
-                  widgetId: readString5(defaultWidget.id),
-                  xappId: String(xappId ?? ""),
-                  xappTitle: String(title),
-                  widgetName: resolveMarketplaceText(defaultWidget?.title, locale) || readString5(defaultWidget?.widget_name) || readString5(defaultWidget?.name) || t("common.widget", void 0, "Widget"),
-                  toolName: readString5(defaultWidget?.bind_tool_name)
-                });
+                const widgetId = readString5(defaultWidget.id);
+                if (!widgetId) return;
+                launchWidgetForSubject(
+                  widgetId,
+                  resolveMarketplaceText(defaultWidget?.title, locale) || readString5(defaultWidget?.widget_name) || readString5(defaultWidget?.name) || t("common.widget", void 0, "Widget"),
+                  readString5(defaultWidget?.bind_tool_name)
+                );
               },
               children: openAppLabel
             }
@@ -6259,21 +6388,35 @@ function XappDetailPageContent(props) {
           ] })
         ] }),
         /* @__PURE__ */ jsxs10("div", { className: "mx-detail-modal-actions", children: [
-          /* @__PURE__ */ jsx14("button", { className: "mx-btn mx-btn-outline", onClick: () => setTermsOpen(false), children: t("common.cancel", void 0, "Cancel") }),
+          /* @__PURE__ */ jsx14(
+            "button",
+            {
+              className: "mx-btn mx-btn-outline",
+              onClick: () => {
+                setTermsOpen(false);
+                setTermsAction("none");
+                setTermsWidgetId(null);
+                setTermsWidgetName(null);
+              },
+              children: t("common.cancel", void 0, "Cancel")
+            }
+          ),
           termsAction === "install" ? /* @__PURE__ */ jsx14(
             "button",
             {
               className: "mx-btn mx-btn-primary",
               disabled: !termsAccepted,
               onClick: () => {
-                host.requestInstall({
-                  xappId: String(xappId ?? ""),
-                  defaultWidgetId: readString5(defaultWidget?.id) || null,
-                  subjectId: host.subjectId ?? null,
-                  termsAccepted: true
-                });
+                requestInstallForWidget(
+                  termsWidgetId ?? readString5(defaultWidget?.id) ?? null,
+                  termsWidgetName || resolveMarketplaceText(defaultWidget?.title, locale) || null,
+                  true,
+                  autoAvailableMode
+                );
                 setTermsOpen(false);
                 setTermsAction("none");
+                setTermsWidgetId(null);
+                setTermsWidgetName(null);
               },
               children: t("xapp.accept_add_app", void 0, "Accept & Add app")
             }
@@ -6284,13 +6427,11 @@ function XappDetailPageContent(props) {
               disabled: !termsAccepted || !installation,
               onClick: () => {
                 if (!installation) return;
-                host.requestUpdate?.({
-                  installationId: installation.installationId,
-                  xappId: String(xappId ?? ""),
-                  termsAccepted: true
-                });
+                requestUpdateForWidget(termsWidgetId, true);
                 setTermsOpen(false);
                 setTermsAction("none");
+                setTermsWidgetId(null);
+                setTermsWidgetName(null);
               },
               children: t("xapp.accept_update", void 0, "Accept & Update")
             }
@@ -6490,7 +6631,19 @@ function WidgetView() {
     let alive = true;
     void (async () => {
       try {
-        const { token: wToken, context } = await client.getWidgetToken(installationId, widgetId);
+        const widgetTokenResponse = await client.getWidgetToken(installationId, widgetId);
+        const resolvedWidgetId = readString(asRecord(widgetTokenResponse).widgetId);
+        if (resolvedWidgetId && resolvedWidgetId !== widgetId) {
+          navigate(
+            {
+              pathname: isEmbedded ? `/widget/${encodeURIComponent(installationId)}/${encodeURIComponent(resolvedWidgetId)}` : `/marketplace/widget/${encodeURIComponent(installationId)}/${encodeURIComponent(resolvedWidgetId)}`,
+              search: tokenSearch
+            },
+            { replace: true }
+          );
+          return;
+        }
+        const { token: wToken, context } = widgetTokenResponse;
         if (!alive) return;
         setSessionExpired(null);
         setWidgetToken(wToken);
@@ -6504,7 +6657,7 @@ function WidgetView() {
     return () => {
       alive = false;
     };
-  }, [installationId, widgetId, client]);
+  }, [installationId, widgetId, client, isEmbedded, navigate, tokenSearch]);
   async function remintWidgetSession() {
     if (!installationId || !widgetId) {
       throw new Error("Missing installationId/widgetId for widget refresh");