chore: release v1.7.74-alpha

CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## v1.7.74-alpha (2026-05-19)
+
+- App-session right panels now re-focus the iframe after load and when the frame area is activated, so wheel/touch scrolling works immediately after switching tabs or selecting an app on shorter screens.
+- NetBird now launches through a unified local origin on port `8087` that proxies the dashboard plus `/oauth2`, `/api`, relay, WebSocket, and gRPC routes to `netbird-server`, fixing the embedded login flow that previously ended in `Unauthenticated` or `404 page not found` after logout.
+- Existing NetBird installs are repaired on adopt/start by rewriting `config.yaml`, `dashboard.env`, and the local nginx proxy config, then creating the missing `netbird-dashboard` and `netbird` proxy containers when needed while preserving NetBird data.
+- Saleor is still pending and is not included in this release; its registry/installer work remains local until it can be validated separately.
+- Validation passed with catalog JSON checks, `npm run type-check`, `cargo fmt --all --check --manifest-path core/Cargo.toml`, and `cargo check -p archipelago --manifest-path core/Cargo.toml`.
+
+## v1.7.73-alpha (2026-05-19)
+
+- Mobile app launches for iframe-blocked apps now open the direct app URL in a new browser tab immediately instead of landing in a broken in-shell webview that requires a second tap.
+- Mobile My Apps/Websites tabs now react to route query changes, App Store pages label the mobile view as Discover, mobile filters have safe bottom spacing, and App Store search ignores the current category so searches cover all available apps.
+- My Apps search now surfaces matching App Store entries when the app is not installed, making it possible to jump directly from a failed My Apps search to the installable app details.
+- NetBird self-host installs now prefer a `100.x` tailnet/CGNAT address for dashboard, management, relay, STUN, and auth redirect origins when one is present; live repair on `100.89.209.89` updated the existing stack from LAN origins to `100.89.209.89` and restored `netbird-server`.
+- App-session iframe frames now focus automatically and wrap the iframe in a scroll host so wheel/touch scrolling works in the active right frame without requiring an initial click.
+
 ## v1.7.72-alpha (2026-05-19)
 
 - Settings What's New now includes the missing release notes for `v1.7.68-alpha` through `v1.7.71-alpha`, so the modal reflects the current OTA history instead of stopping at `v1.7.67-alpha`.

core/Cargo.lock

@@ -80,7 +80,7 @@ checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61"
 
 [[package]]
 name = "archipelago"
-version = "1.7.72-alpha"
+version = "1.7.74-alpha"
 dependencies = [
  "anyhow",
  "archipelago-container",

core/archipelago/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "archipelago"
-version = "1.7.72-alpha"
+version = "1.7.74-alpha"
 edition = "2021"
 description = "Archipelago Bitcoin Node OS - Native backend"
 authors = ["Archipelago Team"]

core/archipelago/src/api/rpc/package/config.rs

@@ -495,7 +495,11 @@ pub(super) fn all_container_names(package_id: &str) -> Vec<String> {
             "indeedhub-ffmpeg".into(),
             "indeedhub".into(),
         ],
-        "netbird" => vec!["netbird".into(), "netbird-server".into()],
+        "netbird" => vec![
+            "netbird".into(),
+            "netbird-dashboard".into(),
+            "netbird-server".into(),
+        ],
         "nostr-vpn" => vec![
             "nostr-vpn".into(),
             "archy-nostr-vpn".into(),

core/archipelago/src/api/rpc/package/dependencies.rs

@@ -288,7 +288,7 @@ pub(super) fn startup_order(package_id: &str) -> &'static [&'static str] {
         "btcpay-server" | "btcpayserver" | "btcpay" => {
             &["archy-btcpay-db", "archy-nbxplorer", "btcpay-server"]
         }
-        "netbird" => &["netbird-server", "netbird"],
+        "netbird" => &["netbird-server", "netbird-dashboard", "netbird"],
         "penpot" | "penpot-frontend" => &[
             "penpot-postgres",
             "penpot-valkey",
@@ -392,7 +392,10 @@ mod tests {
 
     #[test]
     fn netbird_start_order_starts_server_before_dashboard() {
-        assert_eq!(startup_order("netbird"), &["netbird-server", "netbird"]);
+        assert_eq!(
+            startup_order("netbird"),
+            &["netbird-server", "netbird-dashboard", "netbird"]
+        );
     }
 
     #[test]

core/archipelago/src/api/rpc/package/stacks.rs

@@ -98,6 +98,7 @@ async fn repair_stack_before_adopt(stack_name: &str) {
             }
         }
         "indeedhub" => repair_indeedhub_network_aliases().await,
+        "netbird" => repair_netbird_unified_origin().await,
         _ => {}
     }
 }
@@ -144,6 +145,73 @@ pub(in crate::api::rpc::package) async fn repair_indeedhub_network_aliases() {
     }
 }
 
+async fn repair_netbird_unified_origin() {
+    let host_ip = detect_netbird_public_host_ip()
+        .await
+        .unwrap_or_else(|| "127.0.0.1".to_string());
+    let _ = write_netbird_config_files(&host_ip).await;
+
+    let names = tokio::process::Command::new("podman")
+        .args(["ps", "-a", "--format", "{{.Names}}"])
+        .output()
+        .await
+        .ok()
+        .map(|o| String::from_utf8_lossy(&o.stdout).to_string())
+        .unwrap_or_default();
+
+    let has_proxy = names.lines().any(|n| n.trim() == "netbird");
+    let has_dashboard = names.lines().any(|n| n.trim() == "netbird-dashboard");
+    if has_proxy && has_dashboard {
+        return;
+    }
+
+    if has_proxy && !has_dashboard {
+        let _ = tokio::process::Command::new("podman")
+            .args(["rm", "-f", "netbird"])
+            .output()
+            .await;
+    }
+
+    let _ = tokio::process::Command::new("podman")
+        .args(["network", "create", "netbird-net"])
+        .output()
+        .await;
+
+    let _ = tokio::process::Command::new("podman")
+        .args([
+            "run",
+            "-d",
+            "--name",
+            "netbird-dashboard",
+            "--network",
+            "netbird-net",
+            "--restart=unless-stopped",
+            "--env-file",
+            "/var/lib/archipelago/netbird/dashboard.env",
+            NETBIRD_DASHBOARD_IMAGE,
+        ])
+        .output()
+        .await;
+
+    let _ = tokio::process::Command::new("podman")
+        .args([
+            "run",
+            "-d",
+            "--name",
+            "netbird",
+            "--network",
+            "netbird-net",
+            "--restart=unless-stopped",
+            "-p",
+            "8087:80",
+            "-v",
+            "/var/lib/archipelago/netbird/nginx.conf:/etc/nginx/conf.d/default.conf:ro",
+            NETBIRD_PROXY_IMAGE,
+        ])
+        .output()
+        .await;
+}
+
 async fn run_required_stack_command(
     stack_name: &str,
     label: &str,
@@ -313,6 +381,7 @@ const REGISTRY: &str = "146.59.87.168:3000/lfg2025";
 
 const NETBIRD_DASHBOARD_IMAGE: &str = "docker.io/netbirdio/dashboard:v2.38.0";
 const NETBIRD_SERVER_IMAGE: &str = "docker.io/netbirdio/netbird-server:0.71.2";
+const NETBIRD_PROXY_IMAGE: &str = "docker.io/library/nginx:1.27-alpine";
 
 /// Pull an image with retry and exponential backoff (3 attempts).
 async fn pull_image_with_retry(image: &str) -> Result<()> {
@@ -1364,8 +1433,12 @@ impl RpcHandler {
 
     /// Install self-hosted NetBird (dashboard + combined management/signal/relay server).
     pub(super) async fn install_netbird_stack(&self) -> Result<serde_json::Value> {
-        if let Some(adopted) =
-            adopt_stack_if_exists("netbird", "netbird", &["netbird", "netbird-server"]).await?
+        if let Some(adopted) = adopt_stack_if_exists(
+            "netbird",
+            "netbird",
+            &["netbird-server", "netbird-dashboard", "netbird"],
+        )
+        .await?
         {
             return Ok(adopted);
         }
@@ -1375,18 +1448,22 @@ impl RpcHandler {
 
         self.set_install_phase("netbird", InstallPhase::PullingImage)
             .await;
-        for (i, image) in [NETBIRD_DASHBOARD_IMAGE, NETBIRD_SERVER_IMAGE]
-            .iter()
-            .enumerate()
+        for (i, image) in [
+            NETBIRD_DASHBOARD_IMAGE,
+            NETBIRD_SERVER_IMAGE,
+            NETBIRD_PROXY_IMAGE,
+        ]
+        .iter()
+        .enumerate()
         {
-            self.set_install_progress("netbird", i as u64, 2).await;
+            self.set_install_progress("netbird", i as u64, 3).await;
             pull_image_with_retry(image)
                 .await
                 .with_context(|| format!("Failed to pull NetBird image: {}", image))?;
         }
-        self.set_install_progress("netbird", 2, 2).await;
+        self.set_install_progress("netbird", 3, 3).await;
 
-        for name in ["netbird", "netbird-server"] {
+        for name in ["netbird", "netbird-dashboard", "netbird-server"] {
             let _ = tokio::process::Command::new("podman")
                 .args(["rm", "-f", name])
                 .status()
@@ -1404,59 +1481,10 @@ impl RpcHandler {
             .await
             .context("Failed to create NetBird data directory")?;
 
-        let host_ip = self.config.host_ip.clone();
-        let dashboard_origin = format!("http://{}:8087", host_ip);
-        let mgmt_origin = format!("http://{}:8086", host_ip);
-        let relay_secret = read_or_generate_b64_secret("netbird-relay-auth-secret").await;
-        let encryption_key = read_or_generate_b64_secret("netbird-store-encryption-key").await;
-        let config = format!(
-            r#"server:
-  listenAddress: ":80"
-  exposedAddress: "{mgmt_origin}"
-  stunPorts:
-    - 3478
-  metricsPort: 9090
-  healthcheckAddress: ":9000"
-  logLevel: "info"
-  logFile: "console"
-  authSecret: "{relay_secret}"
-  dataDir: "/var/lib/netbird"
-  auth:
-    issuer: "{mgmt_origin}/oauth2"
-    localAuthDisabled: false
-    signKeyRefreshEnabled: true
-    dashboardRedirectURIs:
-      - "{dashboard_origin}/nb-auth"
-      - "{dashboard_origin}/nb-silent-auth"
-    cliRedirectURIs:
-      - "http://localhost:53000/"
-  store:
-    engine: "sqlite"
-    encryptionKey: "{encryption_key}"
-"#
-        );
-        tokio::fs::write("/var/lib/archipelago/netbird/config.yaml", config)
+        let host_ip = detect_netbird_public_host_ip()
             .await
-            .context("Failed to write NetBird config.yaml")?;
-
-        let dashboard_env = format!(
-            r#"NETBIRD_MGMT_API_ENDPOINT={mgmt_origin}
-NETBIRD_MGMT_GRPC_API_ENDPOINT={mgmt_origin}
-AUTH_AUDIENCE=netbird-dashboard
-AUTH_CLIENT_ID=netbird-dashboard
-AUTH_CLIENT_SECRET=
-AUTH_AUTHORITY={mgmt_origin}/oauth2
-USE_AUTH0=false
-AUTH_SUPPORTED_SCOPES=openid profile email groups
-AUTH_REDIRECT_URI=/nb-auth
-AUTH_SILENT_REDIRECT_URI=/nb-silent-auth
-NGINX_SSL_PORT=443
-LETSENCRYPT_DOMAIN=none
-"#
-        );
-        tokio::fs::write("/var/lib/archipelago/netbird/dashboard.env", dashboard_env)
-            .await
-            .context("Failed to write NetBird dashboard.env")?;
+            .unwrap_or_else(|| self.config.host_ip.clone());
+        write_netbird_config_files(&host_ip).await?;
 
         let _ = tokio::process::Command::new("podman")
             .args(["network", "create", "netbird-net"])
@@ -1497,19 +1525,39 @@ LETSENCRYPT_DOMAIN=none
             "run",
             "-d",
             "--name",
-            "netbird",
+            "netbird-dashboard",
             "--network",
             "netbird-net",
             "--restart=unless-stopped",
-            "-p",
-            "8087:80",
             "--env-file",
             "/var/lib/archipelago/netbird/dashboard.env",
             NETBIRD_DASHBOARD_IMAGE,
         ]);
         run_required_stack_command("netbird", "create dashboard", &mut dashboard_cmd).await?;
 
-        wait_for_stack_containers("netbird", &["netbird-server", "netbird"], 60).await?;
+        let mut proxy_cmd = tokio::process::Command::new("podman");
+        proxy_cmd.args([
+            "run",
+            "-d",
+            "--name",
+            "netbird",
+            "--network",
+            "netbird-net",
+            "--restart=unless-stopped",
+            "-p",
+            "8087:80",
+            "-v",
+            "/var/lib/archipelago/netbird/nginx.conf:/etc/nginx/conf.d/default.conf:ro",
+            NETBIRD_PROXY_IMAGE,
+        ]);
+        run_required_stack_command("netbird", "create unified proxy", &mut proxy_cmd).await?;
+
+        wait_for_stack_containers(
+            "netbird",
+            &["netbird-server", "netbird-dashboard", "netbird"],
+            60,
+        )
+        .await?;
 
         self.set_install_phase("netbird", InstallPhase::WaitingHealthy)
             .await;
@@ -1544,6 +1592,117 @@ async fn read_or_generate_b64_secret(name: &str) -> String {
     secret
 }
 
+async fn write_netbird_config_files(host_ip: &str) -> Result<()> {
+    let public_origin = format!("http://{}:8087", host_ip);
+    let server_origin = format!("http://{}:8086", host_ip);
+    let relay_secret = read_or_generate_b64_secret("netbird-relay-auth-secret").await;
+    let encryption_key = read_or_generate_b64_secret("netbird-store-encryption-key").await;
+    let config = format!(
+        r#"server:
+  listenAddress: ":80"
+  exposedAddress: "{public_origin}"
+  stunPorts:
+    - 3478
+  metricsPort: 9090
+  healthcheckAddress: ":9000"
+  logLevel: "info"
+  logFile: "console"
+  authSecret: "{relay_secret}"
+  dataDir: "/var/lib/netbird"
+  auth:
+    issuer: "{public_origin}/oauth2"
+    localAuthDisabled: false
+    signKeyRefreshEnabled: true
+    dashboardRedirectURIs:
+      - "{public_origin}/nb-auth"
+      - "{public_origin}/nb-silent-auth"
+    cliRedirectURIs:
+      - "http://localhost:53000/"
+  store:
+    engine: "sqlite"
+    encryptionKey: "{encryption_key}"
+"#
+    );
+    tokio::fs::write("/var/lib/archipelago/netbird/config.yaml", config)
+        .await
+        .context("Failed to write NetBird config.yaml")?;
+
+    let dashboard_env = format!(
+        r#"NETBIRD_MGMT_API_ENDPOINT={public_origin}
+NETBIRD_MGMT_GRPC_API_ENDPOINT={public_origin}
+AUTH_AUDIENCE=netbird-dashboard
+AUTH_CLIENT_ID=netbird-dashboard
+AUTH_CLIENT_SECRET=
+AUTH_AUTHORITY={public_origin}/oauth2
+USE_AUTH0=false
+AUTH_SUPPORTED_SCOPES=openid profile email groups
+AUTH_REDIRECT_URI=/nb-auth
+AUTH_SILENT_REDIRECT_URI=/nb-silent-auth
+NETBIRD_TOKEN_SOURCE=accessToken
+NGINX_SSL_PORT=443
+LETSENCRYPT_DOMAIN=none
+"#
+    );
+    tokio::fs::write("/var/lib/archipelago/netbird/dashboard.env", dashboard_env)
+        .await
+        .context("Failed to write NetBird dashboard.env")?;
+
+    let nginx_conf = format!(
+        r#"server {{
+    listen 80;
+    server_name _;
+
+    proxy_set_header Host $host;
+    proxy_set_header X-Real-IP $remote_addr;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header X-Forwarded-Proto $scheme;
+    proxy_http_version 1.1;
+
+    location ~ ^/(relay|ws-proxy/) {{
+        proxy_pass http://netbird-server:80;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
+        proxy_read_timeout 1d;
+    }}
+
+    location ~ ^/(api|oauth2)/ {{
+        proxy_pass http://netbird-server:80;
+    }}
+
+    location ~ ^/(signalexchange\.SignalExchange|management\.ManagementService)/ {{
+        grpc_pass grpc://netbird-server:80;
+        grpc_read_timeout 1d;
+        grpc_send_timeout 1d;
+    }}
+
+    location / {{
+        proxy_pass http://netbird-dashboard:80;
+    }}
+}}
+
+# Direct server remains available for diagnostics at {server_origin}.
+"#
+    );
+    tokio::fs::write("/var/lib/archipelago/netbird/nginx.conf", nginx_conf)
+        .await
+        .context("Failed to write NetBird nginx.conf")?;
+
+    Ok(())
+}
+
+async fn detect_netbird_public_host_ip() -> Option<String> {
+    let output = tokio::process::Command::new("hostname")
+        .args(["-I"])
+        .output()
+        .await
+        .ok()?;
+    let stdout = String::from_utf8_lossy(&output.stdout);
+    stdout
+        .split_whitespace()
+        .find(|ip| ip.starts_with("100.") && ip.contains('.'))
+        .map(str::to_string)
+}
+
 #[cfg(test)]
 mod tests {
     use super::{btcpay_stack_app_ids, mempool_stack_app_ids};

core/archipelago/src/container/docker_packages.rs

@@ -62,6 +62,7 @@ impl DockerPackageScanner {
             "indeedhub-build_relay_1",
             "indeedhub-build_ffmpeg-worker_1",
             "netbird-server",
+            "netbird-dashboard",
             "buildx_buildkit_default",
         ];
 

core/archipelago/src/container/image_versions.rs

@@ -169,6 +169,7 @@ fn image_var_for_app(app_id: &str) -> Option<&'static str> {
         "portainer" => Some("PORTAINER_IMAGE"),
         "tailscale" => Some("TAILSCALE_IMAGE"),
         "netbird" => Some("NETBIRD_DASHBOARD_IMAGE"),
+        "netbird-dashboard" => Some("NETBIRD_DASHBOARD_IMAGE"),
         "netbird-server" => Some("NETBIRD_SERVER_IMAGE"),
 
         // Fedimint
@@ -302,7 +303,8 @@ pub fn containers_for_stack(app_id: &str) -> Vec<(&'static str, &'static str)> {
             ("penpot-frontend", "PENPOT_FRONTEND_IMAGE"),
         ],
         "netbird" => vec![
-            ("netbird", "NETBIRD_DASHBOARD_IMAGE"),
+            ("netbird", "NETBIRD_PROXY_IMAGE"),
+            ("netbird-dashboard", "NETBIRD_DASHBOARD_IMAGE"),
             ("netbird-server", "NETBIRD_SERVER_IMAGE"),
         ],
         _ => vec![],

neode-ui/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "neode-ui",
-  "version": "1.7.72-alpha",
+  "version": "1.7.74-alpha",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "neode-ui",
-      "version": "1.7.72-alpha",
+      "version": "1.7.74-alpha",
       "dependencies": {
         "@types/dompurify": "^3.0.5",
         "@vue-leaflet/vue-leaflet": "^0.10.1",

neode-ui/package.json

@@ -1,7 +1,7 @@
 {
   "name": "neode-ui",
   "private": true,
-  "version": "1.7.72-alpha",
+  "version": "1.7.74-alpha",
   "type": "module",
   "scripts": {
     "start": "./start-dev.sh",

neode-ui/src/style.css

@@ -1659,6 +1659,15 @@ html:has(body.video-background-active)::before {
   filter: drop-shadow(0 10px 25px rgba(0, 0, 0, 0.5));
 }
 
+.mobile-filter-btn {
+  bottom: calc(var(--mobile-tab-bar-height, 72px) + var(--safe-area-bottom, env(safe-area-inset-bottom, 0px)) + 12px);
+  filter: drop-shadow(0 10px 25px rgba(0, 0, 0, 0.5));
+}
+
+.mobile-filter-sheet {
+  padding-bottom: calc(var(--safe-area-bottom, env(safe-area-inset-bottom, 0px)) + 1.5rem);
+}
+
 /* ── Cloud Audio Player (mini bar) ──── */
 
 .cloud-audio-player {

neode-ui/src/views/AppSession.vue

@@ -341,9 +341,8 @@ watch(displayMode, (mode) => {
 })
 
 onMounted(() => {
-  // Desktop apps that block iframes open externally. Mobile keeps the user in
-  // Archipelago and shows the explicit fallback instead of leaving the shell.
-  if (!isMobile && mustOpenNewTab.value && appUrl.value) {
+  // Apps that block iframes open externally instead of landing in a broken webview.
+  if (mustOpenNewTab.value && appUrl.value) {
     window.open(appUrl.value, '_blank', 'noopener,noreferrer')
     if (isInlinePanel.value) emit('close')
     else closeRouteSession()
@@ -532,6 +531,12 @@ onBeforeUnmount(() => {
   opacity: 0;
 }
 
+.app-session-frame-scroll-host {
+  overflow: auto;
+  overscroll-behavior: contain;
+  -webkit-overflow-scrolling: touch;
+}
+
 /* Mobile: full-bleed app sessions — no border, no radius, no shadow */
 @media (max-width: 767px) {
   .app-session-root {

neode-ui/src/views/Apps.vue

@@ -106,10 +106,34 @@
     </div>
 
     <!-- No Results -->
-    <div v-if="filteredPackageEntries.length === 0 && searchQuery" class="text-center py-12">
+    <div v-if="filteredPackageEntries.length === 0 && marketplaceMatches.length === 0 && searchQuery" class="text-center py-12">
       <p class="text-white/70">{{ t('apps.noResults', { query: searchQuery }) }}</p>
     </div>
 
+    <div v-if="marketplaceMatches.length > 0" class="mb-5">
+      <div class="flex items-center gap-3 mb-3">
+        <span class="discover-terminal-tag">app store</span>
+        <h2 class="text-lg font-bold text-white">Available in Discover</h2>
+        <div class="flex-1 h-px bg-white/10"></div>
+      </div>
+      <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4">
+        <button
+          v-for="app in marketplaceMatches"
+          :key="app.id"
+          type="button"
+          class="glass-card p-4 text-left flex items-center gap-3 hover:bg-orange-500/5 hover:border-orange-500/15 transition-colors"
+          @click="openMarketplaceResult(app)"
+        >
+          <img v-if="app.icon" :src="app.icon" :alt="app.title" class="w-12 h-12 rounded-xl object-cover bg-white/10" />
+          <div v-else class="w-12 h-12 rounded-xl bg-white/10 flex-shrink-0"></div>
+          <div class="min-w-0 flex-1">
+            <p class="font-semibold text-white truncate">{{ app.title }}</p>
+            <p class="text-xs text-white/50 truncate">Available in App Store</p>
+          </div>
+        </button>
+      </div>
+    </div>
+
     <!-- Mobile: iPhone-style icon grid -->
     <div class="md:hidden">
       <AppIconGrid
@@ -236,10 +260,12 @@ import AppCard from './apps/AppCard.vue'
 import AppIconGrid from './apps/AppIconGrid.vue'
 import AppsUninstallModal from './apps/AppsUninstallModal.vue'
 import { useAppsActions } from './apps/useAppsActions'
+import { useMarketplaceApp } from '@/composables/useMarketplaceApp'
 import {
   type AppsTab, filterEntriesForTab, isWebOnlyApp, isWebsitePackage, opensInTab, resolveRuntimeLaunchUrl,
   WEB_ONLY_APPS, WEB_ONLY_APP_URLS, buildAllCategories, useCategoriesWithApps,
 } from './apps/appsConfig'
+import { getCuratedAppList, INSTALLED_ALIASES, type MarketplaceApp } from './marketplace/marketplaceData'
 
 const { t } = useI18n()
 const router = useRouter()
@@ -247,6 +273,7 @@ const route = useRoute()
 const store = useAppStore()
 const serverStore = useServerStore()
 const actions = useAppsActions()
+const { setCurrentApp } = useMarketplaceApp()
 const showSideload = ref(false)
 const sideloading = ref(false)
 const sideloadError = ref('')
@@ -266,6 +293,10 @@ const activeTab = ref<AppsTab>(
   route.query.tab === 'websites' || route.query.tab === 'services' ? 'websites' : 'apps'
 )
 
+watch(() => route.query.tab, (tab) => {
+  activeTab.value = tab === 'websites' || tab === 'services' ? 'websites' : 'apps'
+})
+
 // Search (debounced)
 const searchQuery = ref('')
 const debouncedSearchQuery = ref('')
@@ -309,6 +340,19 @@ const packages = computed(() => {
 
 const categoriesWithApps = useCategoriesWithApps(packages, ALL_CATEGORIES)
 
+const curatedApps = getCuratedAppList()
+const marketplaceMatches = computed(() => {
+  const q = debouncedSearchQuery.value.trim().toLowerCase()
+  if (!q || activeTab.value !== 'apps') return [] as MarketplaceApp[]
+  return curatedApps.filter(app => {
+    if (isInstalledInMyApps(app.id)) return false
+    return app.title?.toLowerCase().includes(q) ||
+      app.id.toLowerCase().includes(q) ||
+      app.author?.toLowerCase().includes(q) ||
+      (typeof app.description === 'string' && app.description.toLowerCase().includes(q))
+  }).slice(0, 6)
+})
+
 const isLoadingApps = computed(() => !store.hasLoadedInitialData && !connectionError.value)
 
 // Connection error state
@@ -352,6 +396,17 @@ const filteredPackageEntries = computed(() => {
   )
 })
 
+function isInstalledInMyApps(appId: string): boolean {
+  if (appId in packages.value) return true
+  const aliases = INSTALLED_ALIASES[appId]
+  return aliases ? aliases.some(alias => alias in packages.value) : false
+}
+
+function openMarketplaceResult(app: MarketplaceApp) {
+  setCurrentApp(app)
+  router.push({ name: 'marketplace-app-detail', params: { id: app.id }, query: { from: 'apps' } }).catch(() => {})
+}
+
 // Uninstall modal
 const uninstallModal = ref({ show: false, appId: '', appTitle: '' })
 

neode-ui/src/views/Discover.vue

@@ -35,6 +35,10 @@
 
       <!-- Mobile: search -->
       <div class="md:hidden mb-4">
+        <div class="flex items-center gap-2 mb-3">
+          <span class="discover-terminal-tag">discover</span>
+          <h1 class="text-lg font-bold text-white">App Store</h1>
+        </div>
         <input
           v-model="searchQuery"
           type="text"
@@ -312,6 +316,9 @@ const categoriesWithApps = computed(() => {
 
 const filteredApps = computed(() => {
   let apps = allApps.value
+  if (selectedCategory.value && selectedCategory.value !== 'all' && !searchQuery.value) {
+    apps = apps.filter(app => app.category === selectedCategory.value)
+  }
   if (searchQuery.value) {
     const query = searchQuery.value.toLowerCase()
     apps = apps.filter(app =>

neode-ui/src/views/Marketplace.vue

@@ -37,6 +37,10 @@
 
       <!-- Mobile: search (tabs handled by Dashboard.vue header) -->
       <div class="md:hidden mb-4">
+        <div class="flex items-center gap-2 mb-3">
+          <span class="discover-terminal-tag">discover</span>
+          <h1 class="text-lg font-bold text-white">App Store</h1>
+        </div>
         <input
           v-model="searchQuery"
           type="text"
@@ -258,7 +262,7 @@ const categoriesWithApps = computed(() => {
 const filteredApps = computed(() => {
   let apps = allApps.value
 
-  if (selectedCategory.value && selectedCategory.value !== 'all') {
+  if (selectedCategory.value && selectedCategory.value !== 'all' && !searchQuery.value) {
     apps = apps.filter(app => app.category === selectedCategory.value)
   }
 

neode-ui/src/views/appSession/AppSessionFrame.vue

@@ -9,16 +9,24 @@
       </div>
     </Transition>
 
-    <iframe
+    <div
       v-if="appUrl && !iframeBlocked"
-      ref="iframeRef"
-      :key="refreshKey"
-      :src="appUrl"
-      class="absolute inset-0 w-full h-full border-0 iframe-scrollbar-hide"
-      title="App content"
-      @load="$emit('iframeLoad')"
-      @error="$emit('iframeError')"
-    />
+      class="absolute inset-0 app-session-frame-scroll-host"
+      tabindex="-1"
+      @pointerdown="focusIframe"
+      @focusin="focusIframe"
+    >
+      <iframe
+        ref="iframeRef"
+        :key="refreshKey"
+        :src="appUrl"
+        class="w-full h-full border-0 iframe-scrollbar-hide"
+        title="App content"
+        tabindex="0"
+        @load="handleIframeLoad"
+        @error="$emit('iframeError')"
+      />
+    </div>
 
     <!-- Iframe blocked fallback -->
     <Transition name="content-fade">
@@ -69,9 +77,9 @@
 </template>
 
 <script setup lang="ts">
-import { ref } from 'vue'
+import { nextTick, ref, watch } from 'vue'
 
-defineProps<{
+const props = defineProps<{
   appUrl: string
   appId: string
   appTitle: string
@@ -82,7 +90,7 @@ defineProps<{
   refreshKey: number
 }>()
 
-defineEmits<{
+const emit = defineEmits<{
   iframeLoad: []
   iframeError: []
   refresh: []
@@ -91,5 +99,21 @@ defineEmits<{
 
 const iframeRef = ref<HTMLIFrameElement | null>(null)
 
+function focusIframe() {
+  iframeRef.value?.focus({ preventScroll: true })
+}
+
+async function handleIframeLoad() {
+  emit('iframeLoad')
+  await nextTick()
+  requestAnimationFrame(focusIframe)
+}
+
+watch(() => [props.appUrl, props.refreshKey, props.iframeBlocked], async () => {
+  if (!props.appUrl || props.iframeBlocked) return
+  await nextTick()
+  requestAnimationFrame(focusIframe)
+}, { immediate: true })
+
 defineExpose({ iframeRef })
 </script>

neode-ui/src/views/apps/__tests__/AppIconGrid.test.ts

@@ -61,7 +61,7 @@ describe('AppIconGrid', () => {
     expect(useAppLauncherStore().panelAppId).toBe('lnd')
   })
 
-  it('opens desktop new-tab apps through app session on mobile', async () => {
+  it('routes desktop new-tab apps through app session on mobile', async () => {
     Object.defineProperty(window, 'innerWidth', {
       value: 390,
       writable: true,
@@ -78,5 +78,6 @@ describe('AppIconGrid', () => {
     await wrapper.get('.app-icon-item').trigger('click')
 
     expect(mockWindowOpen).not.toHaveBeenCalled()
+    expect(useAppLauncherStore().panelAppId).toBeNull()
   })
 })

neode-ui/src/views/dashboard/DashboardMobileNav.vue

@@ -22,6 +22,7 @@
         to="/dashboard/apps?tab=websites"
         class="mode-switcher-btn"
         :class="{ 'mode-switcher-btn-active': route.query.tab === 'services' || route.query.tab === 'websites' }"
+        @click.prevent="router.push({ path: '/dashboard/apps', query: { tab: 'websites' } })"
       >Websites</RouterLink>
     </div>
   </div>

neode-ui/src/views/discover/FilterModal.vue

@@ -4,8 +4,7 @@
     <Teleport to="body">
       <button
         @click="showFilter = true"
-        class="md:hidden fixed right-4 z-40 w-14 h-14 rounded-full glass-button flex items-center justify-center shadow-2xl mobile-back-btn"
-        style="left: auto;"
+        class="md:hidden fixed right-4 z-[2400] w-14 h-14 rounded-full glass-button flex items-center justify-center shadow-2xl mobile-filter-btn"
       >
         <svg class="w-6 h-6" fill="none" stroke="currentColor" viewBox="0 0 24 24">
           <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M3 4a1 1 0 011-1h16a1 1 0 011 1v2.586a1 1 0 01-.293.707l-6.414 6.414a1 1 0 00-.293.707V17l-4 4v-6.586a1 1 0 00-.293-.707L3.293 7.293A1 1 0 013 6.586V4z" />
@@ -17,10 +16,10 @@
     <Transition name="modal">
       <div
         v-if="showFilter"
-        class="fixed inset-0 z-50 flex items-end justify-center md:hidden bg-black/10 backdrop-blur-md"
+        class="fixed inset-0 z-[3000] flex items-end justify-center md:hidden bg-black/10 backdrop-blur-md"
         @click.self="closeFilter"
       >
-        <div ref="filterModalRef" class="glass-card p-6 w-full rounded-t-3xl max-h-[80vh] overflow-y-auto">
+        <div ref="filterModalRef" class="glass-card p-6 w-full rounded-t-3xl max-h-[80vh] overflow-y-auto mobile-filter-sheet">
           <div class="flex items-center justify-between mb-6">
             <h2 class="text-2xl font-bold text-white">Filter</h2>
             <button @click="closeFilter" class="text-white/60 hover:text-white transition-colors">

neode-ui/src/views/marketplace/MarketplaceFilterModal.vue

@@ -3,8 +3,7 @@
   <Teleport to="body">
     <button
       @click="showModal = true"
-      class="md:hidden fixed right-4 z-40 w-14 h-14 rounded-full glass-button flex items-center justify-center shadow-2xl mobile-back-btn"
-      style="left: auto;"
+      class="md:hidden fixed right-4 z-[2400] w-14 h-14 rounded-full glass-button flex items-center justify-center shadow-2xl mobile-filter-btn"
     >
       <svg class="w-6 h-6" fill="none" stroke="currentColor" viewBox="0 0 24 24">
         <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M3 4a1 1 0 011-1h16a1 1 0 011 1v2.586a1 1 0 01-.293.707l-6.414 6.414a1 1 0 00-.293.707V17l-4 4v-6.586a1 1 0 00-.293-.707L3.293 7.293A1 1 0 013 6.586V4z" />
@@ -16,10 +15,10 @@
   <Transition name="modal">
     <div
       v-if="showModal"
-      class="fixed inset-0 z-50 flex items-end justify-center md:hidden bg-black/10 backdrop-blur-md"
+      class="fixed inset-0 z-[3000] flex items-end justify-center md:hidden bg-black/10 backdrop-blur-md"
       @click.self="close()"
     >
-      <div ref="modalRef" class="glass-card p-6 w-full rounded-t-3xl max-h-[80vh] overflow-y-auto">
+      <div ref="modalRef" class="glass-card p-6 w-full rounded-t-3xl max-h-[80vh] overflow-y-auto mobile-filter-sheet">
         <!-- Header -->
         <div class="flex items-center justify-between mb-6">
           <h2 class="text-2xl font-bold text-white">{{ t('marketplace.filterByCategory') }}</h2>

neode-ui/src/views/settings/AccountInfoSection.vue

@@ -180,6 +180,31 @@ init()
               </button>
             </div>
             <div class="overflow-y-auto flex-1 min-h-0 space-y-6 pr-1">
+              <!-- v1.7.74-alpha -->
+              <div>
+                <div class="flex items-center gap-2 mb-3">
+                  <span class="text-xs font-mono px-2 py-0.5 rounded bg-orange-500/20 text-orange-300">v1.7.74-alpha</span>
+                  <span class="text-xs text-white/40">May 19, 2026</span>
+                </div>
+                <div class="space-y-3 text-sm text-white/80 pl-3 border-l border-white/10">
+                  <p>App-session right panels now re-focus the iframe after load and when the frame area is activated, so scrolling works immediately after selecting an app or switching tabs on shorter screens.</p>
+                  <p>NetBird now uses a unified local launch origin on port 8087 that serves the dashboard and proxies auth/API routes to the server, fixing the Unauthenticated and 404 logout/login loop.</p>
+                  <p>Existing NetBird installs are repaired during adopt/start by rewriting the config files and creating the missing dashboard/proxy containers while preserving data.</p>
+                  <p>Saleor is not in this release yet; it remains pending for separate validation.</p>
+                </div>
+              </div>
+              <!-- v1.7.73-alpha -->
+              <div>
+                <div class="flex items-center gap-2 mb-3">
+                  <span class="text-xs font-mono px-2 py-0.5 rounded bg-orange-500/20 text-orange-300">v1.7.73-alpha</span>
+                  <span class="text-xs text-white/40">May 19, 2026</span>
+                </div>
+                <div class="space-y-3 text-sm text-white/80 pl-3 border-l border-white/10">
+                  <p>Mobile apps that block iframe embedding now open directly in a browser tab instead of first landing in a broken in-shell webview.</p>
+                  <p>App Store search covers all apps while searching, My Apps search can surface matching installable App Store entries, and mobile My Apps/Websites tab switching updates the view reliably.</p>
+                  <p>NetBird installs prefer a 100.x tailnet address when available, and app sessions gained iframe auto-focus plus a scroll host for right-frame scrolling.</p>
+                </div>
+              </div>
               <!-- v1.7.72-alpha -->
               <div>
                 <div class="flex items-center gap-2 mb-3">

release-manifest.json

@@ -1,27 +1,29 @@
 {
-  "version": "1.7.72-alpha",
+  "version": "1.7.74-alpha",
   "release_date": "2026-05-19",
   "changelog": [
-    "Settings What's New now includes the missing release notes for `v1.7.68-alpha` through `v1.7.71-alpha`, so the modal reflects the current OTA history instead of stopping at `v1.7.67-alpha`.",
-    "The follow-up release carries the NetBird install fix, Gitea icon polish, mobile app-session fallback updates, and rounder app icon masks from `v1.7.71-alpha` with the Settings modal notes included.",
-    "The local Cargo lockfile version metadata is kept in sync with the release bump after the previous release build updated it."
+    "App-session right panels now re-focus the iframe after load and when the frame area is activated, so wheel/touch scrolling works immediately after switching tabs or selecting an app on shorter screens.",
+    "NetBird now launches through a unified local origin on port `8087` that proxies the dashboard plus `/oauth2`, `/api`, relay, WebSocket, and gRPC routes to `netbird-server`, fixing the embedded login flow that previously ended in `Unauthenticated` or `404 page not found` after logout.",
+    "Existing NetBird installs are repaired on adopt/start by rewriting `config.yaml`, `dashboard.env`, and the local nginx proxy config, then creating the missing `netbird-dashboard` and `netbird` proxy containers when needed while preserving NetBird data.",
+    "Saleor is still pending and is not included in this release; its registry/installer work remains local until it can be validated separately.",
+    "Validation passed with catalog JSON checks, `npm run type-check`, `cargo fmt --all --check --manifest-path core/Cargo.toml`, and `cargo check -p archipelago --manifest-path core/Cargo.toml`."
   ],
   "components": [
     {
       "name": "archipelago",
-      "current_version": "1.7.72-alpha",
-      "new_version": "1.7.72-alpha",
-      "download_url": "http://146.59.87.168:3000/lfg2025/archy/releases/download/v1.7.72-alpha/archipelago",
-      "sha256": "f0feae864d58b0204077e9559217f51c07e270f31c45c6ee05d7bf3086477c7e",
-      "size_bytes": 42990584
+      "current_version": "1.7.74-alpha",
+      "new_version": "1.7.74-alpha",
+      "download_url": "http://146.59.87.168:3000/lfg2025/archy/releases/download/v1.7.74-alpha/archipelago",
+      "sha256": "959a1d932585ad16147480f69991c3b2402cb68e2205aa3c865ec9b1167a46d7",
+      "size_bytes": 43008960
     },
     {
-      "name": "archipelago-frontend-1.7.72-alpha.tar.gz",
-      "current_version": "1.7.72-alpha",
-      "new_version": "1.7.72-alpha",
-      "download_url": "http://146.59.87.168:3000/lfg2025/archy/releases/download/v1.7.72-alpha/archipelago-frontend-1.7.72-alpha.tar.gz",
-      "sha256": "26e26be4f804685694e5885cf4434ae0ecf0d24c4a5cebd32a81239be1517789",
-      "size_bytes": 166481709
+      "name": "archipelago-frontend-1.7.74-alpha.tar.gz",
+      "current_version": "1.7.74-alpha",
+      "new_version": "1.7.74-alpha",
+      "download_url": "http://146.59.87.168:3000/lfg2025/archy/releases/download/v1.7.74-alpha/archipelago-frontend-1.7.74-alpha.tar.gz",
+      "sha256": "3391964df4d0ca0d798f28559f90e4f050e7e39aa8d8581343bb3c9af1f9437c",
+      "size_bytes": 166485358
     }
   ]
 }

releases/manifest.json

@@ -1,27 +1,29 @@
 {
-  "version": "1.7.72-alpha",
+  "version": "1.7.74-alpha",
   "release_date": "2026-05-19",
   "changelog": [
-    "Settings What's New now includes the missing release notes for `v1.7.68-alpha` through `v1.7.71-alpha`, so the modal reflects the current OTA history instead of stopping at `v1.7.67-alpha`.",
-    "The follow-up release carries the NetBird install fix, Gitea icon polish, mobile app-session fallback updates, and rounder app icon masks from `v1.7.71-alpha` with the Settings modal notes included.",
-    "The local Cargo lockfile version metadata is kept in sync with the release bump after the previous release build updated it."
+    "App-session right panels now re-focus the iframe after load and when the frame area is activated, so wheel/touch scrolling works immediately after switching tabs or selecting an app on shorter screens.",
+    "NetBird now launches through a unified local origin on port `8087` that proxies the dashboard plus `/oauth2`, `/api`, relay, WebSocket, and gRPC routes to `netbird-server`, fixing the embedded login flow that previously ended in `Unauthenticated` or `404 page not found` after logout.",
+    "Existing NetBird installs are repaired on adopt/start by rewriting `config.yaml`, `dashboard.env`, and the local nginx proxy config, then creating the missing `netbird-dashboard` and `netbird` proxy containers when needed while preserving NetBird data.",
+    "Saleor is still pending and is not included in this release; its registry/installer work remains local until it can be validated separately.",
+    "Validation passed with catalog JSON checks, `npm run type-check`, `cargo fmt --all --check --manifest-path core/Cargo.toml`, and `cargo check -p archipelago --manifest-path core/Cargo.toml`."
   ],
   "components": [
     {
       "name": "archipelago",
-      "current_version": "1.7.72-alpha",
-      "new_version": "1.7.72-alpha",
-      "download_url": "http://146.59.87.168:3000/lfg2025/archy/releases/download/v1.7.72-alpha/archipelago",
-      "sha256": "f0feae864d58b0204077e9559217f51c07e270f31c45c6ee05d7bf3086477c7e",
-      "size_bytes": 42990584
+      "current_version": "1.7.74-alpha",
+      "new_version": "1.7.74-alpha",
+      "download_url": "http://146.59.87.168:3000/lfg2025/archy/releases/download/v1.7.74-alpha/archipelago",
+      "sha256": "959a1d932585ad16147480f69991c3b2402cb68e2205aa3c865ec9b1167a46d7",
+      "size_bytes": 43008960
     },
     {
-      "name": "archipelago-frontend-1.7.72-alpha.tar.gz",
-      "current_version": "1.7.72-alpha",
-      "new_version": "1.7.72-alpha",
-      "download_url": "http://146.59.87.168:3000/lfg2025/archy/releases/download/v1.7.72-alpha/archipelago-frontend-1.7.72-alpha.tar.gz",
-      "sha256": "26e26be4f804685694e5885cf4434ae0ecf0d24c4a5cebd32a81239be1517789",
-      "size_bytes": 166481709
+      "name": "archipelago-frontend-1.7.74-alpha.tar.gz",
+      "current_version": "1.7.74-alpha",
+      "new_version": "1.7.74-alpha",
+      "download_url": "http://146.59.87.168:3000/lfg2025/archy/releases/download/v1.7.74-alpha/archipelago-frontend-1.7.74-alpha.tar.gz",
+      "sha256": "3391964df4d0ca0d798f28559f90e4f050e7e39aa8d8581343bb3c9af1f9437c",
+      "size_bytes": 166485358
     }
   ]
 }

scripts/image-versions.sh

@@ -50,6 +50,7 @@ PORTAINER_IMAGE="$ARCHY_REGISTRY/portainer:latest"
 TAILSCALE_IMAGE="$ARCHY_REGISTRY/tailscale:stable"
 NETBIRD_DASHBOARD_IMAGE="docker.io/netbirdio/dashboard:v2.38.0"
 NETBIRD_SERVER_IMAGE="docker.io/netbirdio/netbird-server:0.71.2"
+NETBIRD_PROXY_IMAGE="docker.io/library/nginx:1.27-alpine"
 ALPINE_TOR_IMAGE="$ARCHY_REGISTRY/alpine-tor:0.4.8.13"
 ADGUARDHOME_IMAGE="$ARCHY_REGISTRY/adguardhome:v0.107.55"