ensure correct locale on 035 update

container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts

@@ -494,7 +494,7 @@ export class SystemForEmbassy implements System {
       const host = new MultiHost({ effects, id })
       const internalPorts = new Set(
         Object.values(interfaceValue["tor-config"]?.["port-mapping"] ?? {})
-          .map((v) => parseInt(v))
+          .map(Number.parseInt)
           .concat(
             ...Object.values(interfaceValue["lan-config"] ?? {}).map(
               (c) => c.internal,

core/src/db/model/public.rs

@@ -125,10 +125,10 @@ impl Public {
                 },
                 status_info: ServerStatus {
                     backup_progress: None,
+                    updated: false,
                     update_progress: None,
                     shutting_down: false,
                     restarting: false,
-                    restart: None,
                 },
                 unread_notification_count: 0,
                 password_hash: account.password.clone(),
@@ -220,16 +220,6 @@ pub struct ServerInfo {
     pub keyboard: Option<KeyboardOptions>,
 }
 
-#[derive(Debug, Clone, PartialEq, Eq, Deserialize, Serialize, TS)]
-#[serde(rename_all = "lowercase")]
-#[ts(export)]
-pub enum RestartReason {
-    Mdns,
-    Language,
-    Kiosk,
-    Update,
-}
-
 #[derive(Debug, Default, Deserialize, Serialize, HasModel, TS)]
 #[serde(rename_all = "camelCase")]
 #[model = "Model<Self>"]
@@ -374,13 +364,12 @@ pub struct BackupProgress {
 #[ts(export)]
 pub struct ServerStatus {
     pub backup_progress: Option<BTreeMap<PackageId, BackupProgress>>,
+    pub updated: bool,
     pub update_progress: Option<FullProgress>,
     #[serde(default)]
     pub shutting_down: bool,
     #[serde(default)]
     pub restarting: bool,
-    #[serde(default)]
-    pub restart: Option<RestartReason>,
 }
 
 #[derive(Debug, Default, Deserialize, Serialize, HasModel, TS)]

core/src/disk/main.rs

@@ -344,17 +344,12 @@ pub async fn mount_fs<P: AsRef<Path>>(
             .arg(&blockdev_path)
             .invoke(ErrorKind::DiskManagement)
             .await?;
-        // Delete ext2_saved subvolume and defragment after conversion
+        // Defragment after conversion for optimal performance
         let tmp_mount = datadir.as_ref().join(format!("{name}.convert-tmp"));
         tokio::fs::create_dir_all(&tmp_mount).await?;
         BlockDev::new(&blockdev_path)
             .mount(&tmp_mount, ReadWrite)
             .await?;
-        Command::new("btrfs")
-            .args(["subvolume", "delete"])
-            .arg(tmp_mount.join("ext2_saved"))
-            .invoke(ErrorKind::DiskManagement)
-            .await?;
         Command::new("btrfs")
             .args(["filesystem", "defragment", "-r"])
             .arg(&tmp_mount)

core/src/disk/mod.rs

@@ -103,7 +103,7 @@ impl OsPartitionInfo {
     }
 }
 
-const BIOS_BOOT_TYPE_GUID: &str = "21686148-6449-6E6F-744E-656564454649";
+const BIOS_BOOT_TYPE_GUID: &str = "21686148-6449-6e6f-744e-656564726548";
 
 /// Find the BIOS boot partition on the same disk as `known_part`.
 async fn find_bios_boot_partition(known_part: &Path) -> Result<Option<PathBuf>, Error> {

core/src/hostname.rs

@@ -7,7 +7,7 @@ use tracing::instrument;
 use ts_rs::TS;
 
 use crate::context::RpcContext;
-use crate::db::model::public::{RestartReason, ServerInfo};
+use crate::db::model::public::ServerInfo;
 use crate::prelude::*;
 use crate::util::Invoke;
 
@@ -272,7 +272,6 @@ pub async fn set_hostname_rpc(
             }
             if let Some(hostname) = &hostname {
                 hostname.save(server_info)?;
-                server_info.as_status_info_mut().as_restart_mut().ser(&Some(RestartReason::Mdns))?;
             }
             ServerHostnameInfo::load(server_info)
         })

core/src/init.rs

@@ -371,11 +371,11 @@ pub async fn init(
     let ram = get_mem_info().await?.total.0 as u64 * 1024 * 1024;
     let devices = lshw().await?;
     let status_info = ServerStatus {
+        updated: false,
         update_progress: None,
         backup_progress: None,
         shutting_down: false,
         restarting: false,
-        restart: None,
     };
     db.mutate(|v| {
         let server_info = v.as_public_mut().as_server_info_mut();

core/src/net/gateway.rs

@@ -765,7 +765,6 @@ async fn watcher(
                             }
                             changed
                         });
-                        gc_policy_routing(&ifaces).await;
                         for result in futures::future::join_all(jobs).await {
                             result.log_err();
                         }
@@ -807,43 +806,15 @@ async fn get_wan_ipv4(iface: &str, base_url: &Url) -> Result<Option<Ipv4Addr>, E
     Ok(Some(trimmed.parse()?))
 }
 
-struct PolicyRoutingGuard {
+struct PolicyRoutingCleanup {
     table_id: u32,
+    iface: String,
 }
-
+impl Drop for PolicyRoutingCleanup {
-/// Remove stale per-interface policy-routing state (fwmark rules, routing
+    fn drop(&mut self) {
-/// tables, iptables CONNMARK rules) for interfaces that no longer exist.
+        let table_str = self.table_id.to_string();
-async fn gc_policy_routing(active_ifaces: &BTreeSet<GatewayId>) {
+        let iface = std::mem::take(&mut self.iface);
-    let active_tables: BTreeSet<u32> = active_ifaces
+        tokio::spawn(async move {
-        .iter()
-        .filter_map(|iface| if_nametoindex(iface.as_str()).ok().map(|idx| 1000 + idx))
-        .collect();
-
-    // GC fwmark ip rules at priority 50 and their routing tables.
-    if let Ok(rules) = Command::new("ip")
-        .arg("rule")
-        .arg("show")
-        .invoke(ErrorKind::Network)
-        .await
-        .and_then(|b| String::from_utf8(b).with_kind(ErrorKind::Utf8))
-    {
-        for line in rules.lines() {
-            let line = line.trim();
-            if !line.starts_with("50:") {
-                continue;
-            }
-            let Some(pos) = line.find("lookup ") else {
-                continue;
-            };
-            let token = line[pos + 7..].split_whitespace().next().unwrap_or("");
-            let Ok(table_id) = token.parse::<u32>() else {
-                continue;
-            };
-            if table_id < 1000 || active_tables.contains(&table_id) {
-                continue;
-            }
-            let table_str = table_id.to_string();
-            tracing::debug!("gc_policy_routing: removing stale table {table_id}");
             Command::new("ip")
                 .arg("rule")
                 .arg("del")
@@ -864,46 +835,25 @@ async fn gc_policy_routing(active_ifaces: &BTreeSet<GatewayId>) {
                 .invoke(ErrorKind::Network)
                 .await
                 .ok();
-        }
+            Command::new("iptables")
-    }
+                .arg("-t")
-
+                .arg("mangle")
-    // GC iptables CONNMARK set-mark rules for defunct interfaces.
+                .arg("-D")
-    if let Ok(rules) = Command::new("iptables")
+                .arg("PREROUTING")
-        .arg("-t")
+                .arg("-i")
-        .arg("mangle")
+                .arg(&iface)
-        .arg("-S")
+                .arg("-m")
-        .arg("PREROUTING")
+                .arg("conntrack")
-        .invoke(ErrorKind::Network)
+                .arg("--ctstate")
-        .await
+                .arg("NEW")
-        .and_then(|b| String::from_utf8(b).with_kind(ErrorKind::Utf8))
+                .arg("-j")
-    {
+                .arg("CONNMARK")
-        // Rules look like:
+                .arg("--set-mark")
-        //   -A PREROUTING -i wg0 -m conntrack --ctstate NEW -j CONNMARK --set-mark 1005
+                .arg(&table_str)
-        for line in rules.lines() {
+                .invoke(ErrorKind::Network)
-            let parts: Vec<&str> = line.split_whitespace().collect();
+                .await
-            if parts.first() != Some(&"-A") {
+                .ok();
-                continue;
+        });
-            }
-            if !parts.contains(&"--set-mark") {
-                continue;
-            }
-            let Some(iface_idx) = parts.iter().position(|&p| p == "-i") else {
-                continue;
-            };
-            let Some(&iface) = parts.get(iface_idx + 1) else {
-                continue;
-            };
-            if active_ifaces.contains(&GatewayId::from(InternedString::intern(iface))) {
-                continue;
-            }
-            tracing::debug!("gc_policy_routing: removing stale iptables rule for {iface}");
-            let mut cmd = Command::new("iptables");
-            cmd.arg("-t").arg("mangle").arg("-D");
-            for &arg in &parts[1..] {
-                cmd.arg(arg);
-            }
-            cmd.invoke(ErrorKind::Network).await.ok();
-        }
     }
 }
 
@@ -1035,8 +985,11 @@ async fn watch_ip(
                             } else {
                                 None
                             };
-                            let policy_guard: Option<PolicyRoutingGuard> =
+                            let policy_guard: Option<PolicyRoutingCleanup> =
-                                policy_table_id.map(|t| PolicyRoutingGuard { table_id: t });
+                                policy_table_id.map(|t| PolicyRoutingCleanup {
+                                    table_id: t,
+                                    iface: iface.as_str().to_owned(),
+                                });
 
                             loop {
                                 until
@@ -1063,7 +1016,7 @@ async fn watch_ip(
 }
 
 async fn apply_policy_routing(
-    guard: &PolicyRoutingGuard,
+    guard: &PolicyRoutingCleanup,
     iface: &GatewayId,
     lan_ip: &OrdSet<IpAddr>,
 ) -> Result<(), Error> {
@@ -1297,7 +1250,7 @@ async fn poll_ip_info(
     ip4_proxy: &Ip4ConfigProxy<'_>,
     ip6_proxy: &Ip6ConfigProxy<'_>,
     dhcp4_proxy: &Option<Dhcp4ConfigProxy<'_>>,
-    policy_guard: &Option<PolicyRoutingGuard>,
+    policy_guard: &Option<PolicyRoutingCleanup>,
     iface: &GatewayId,
     echoip_ratelimit_state: &mut BTreeMap<Url, Instant>,
     db: Option<&TypedPatchDb<Database>>,
@@ -1346,49 +1299,6 @@ async fn poll_ip_info(
         apply_policy_routing(guard, iface, &lan_ip).await?;
     }
 
-    // Write IP info to the watch immediately so the gateway appears in the
-    // DB without waiting for the (slow) WAN IP fetch.  The echoip HTTP
-    // request has a 5-second timeout per URL and is easily cancelled by
-    // D-Bus signals via the Until mechanism, which would prevent the
-    // gateway from ever appearing if we waited.
-    let mut ip_info = IpInfo {
-        name: name.clone(),
-        scope_id,
-        device_type,
-        subnets: subnets.clone(),
-        lan_ip,
-        wan_ip: None,
-        ntp_servers,
-        dns_servers,
-    };
-
-    write_to.send_if_modified(|m: &mut OrdMap<GatewayId, NetworkInterfaceInfo>| {
-        let (name, secure, gateway_type, prev_wan_ip) =
-            m.get(iface).map_or((None, None, None, None), |i| {
-                (
-                    i.name.clone(),
-                    i.secure,
-                    i.gateway_type,
-                    i.ip_info.as_ref().and_then(|i| i.wan_ip),
-                )
-            });
-        ip_info.wan_ip = prev_wan_ip;
-        let ip_info = Arc::new(ip_info);
-        m.insert(
-            iface.clone(),
-            NetworkInterfaceInfo {
-                name,
-                secure,
-                ip_info: Some(ip_info.clone()),
-                gateway_type,
-            },
-        )
-        .filter(|old| &old.ip_info == &Some(ip_info))
-        .is_none()
-    });
-
-    // Now fetch the WAN IP in a second pass.  Even if this is slow or
-    // gets cancelled, the gateway already has valid ip_info above.
     let echoip_urls = if let Some(db) = db {
         db.peek()
             .await
@@ -1439,25 +1349,41 @@ async fn poll_ip_info(
         );
         tracing::debug!("{e:?}");
     }
+    let mut ip_info = IpInfo {
+        name: name.clone(),
+        scope_id,
+        device_type,
+        subnets,
+        lan_ip,
+        wan_ip,
+        ntp_servers,
+        dns_servers,
+    };
 
-    // Update with WAN IP if we obtained one
+    write_to.send_if_modified(|m: &mut OrdMap<GatewayId, NetworkInterfaceInfo>| {
-    if wan_ip.is_some() {
+        let (name, secure, gateway_type, prev_wan_ip) =
-        write_to.send_if_modified(|m: &mut OrdMap<GatewayId, NetworkInterfaceInfo>| {
+            m.get(iface).map_or((None, None, None, None), |i| {
-            let Some(entry) = m.get_mut(iface) else {
+                (
-                return false;
+                    i.name.clone(),
-            };
+                    i.secure,
-            let Some(ref existing_ip) = entry.ip_info else {
+                    i.gateway_type,
-                return false;
+                    i.ip_info.as_ref().and_then(|i| i.wan_ip),
-            };
+                )
-            if existing_ip.wan_ip == wan_ip {
+            });
-                return false;
+        ip_info.wan_ip = ip_info.wan_ip.or(prev_wan_ip);
-            }
+        let ip_info = Arc::new(ip_info);
-            let mut updated = (**existing_ip).clone();
+        m.insert(
-            updated.wan_ip = wan_ip;
+            iface.clone(),
-            entry.ip_info = Some(Arc::new(updated));
+            NetworkInterfaceInfo {
-            true
+                name,
-        });
+                secure,
-    }
+                ip_info: Some(ip_info.clone()),
+                gateway_type,
+            },
+        )
+        .filter(|old| &old.ip_info == &Some(ip_info))
+        .is_none()
+    });
 
     Ok(())
 }

core/src/registry/package/get.rs

@@ -615,7 +615,6 @@ fn check_matching_info_short() {
             sdk_version: None,
             hardware_acceleration: false,
             plugins: BTreeSet::new(),
-            satisfies: BTreeSet::new(),
         },
         icon: DataUrl::from_vec("image/png", vec![]),
         dependency_metadata: BTreeMap::new(),

core/src/registry/package/index.rs

@@ -110,8 +110,6 @@ pub struct PackageMetadata {
     pub hardware_acceleration: bool,
     #[serde(default)]
     pub plugins: BTreeSet<PluginId>,
-    #[serde(default)]
-    pub satisfies: BTreeSet<VersionString>,
 }
 
 #[derive(Debug, Deserialize, Serialize, HasModel, TS)]

core/src/s9pk/v2/compat.rs

@@ -197,6 +197,7 @@ impl TryFrom<ManifestV1> for Manifest {
         Ok(Self {
             id: value.id,
             version: version.into(),
+            satisfies: BTreeSet::new(),
             can_migrate_from: VersionRange::any(),
             can_migrate_to: VersionRange::none(),
             metadata: PackageMetadata {
@@ -218,7 +219,6 @@ impl TryFrom<ManifestV1> for Manifest {
                     PackageProcedure::Script(_) => false,
                 },
                 plugins: BTreeSet::new(),
-                satisfies: BTreeSet::new(),
             },
             images: BTreeMap::new(),
             volumes: value

core/src/s9pk/v2/manifest.rs

@@ -32,6 +32,7 @@ pub(crate) fn current_version() -> Version {
 pub struct Manifest {
     pub id: PackageId,
     pub version: VersionString,
+    pub satisfies: BTreeSet<VersionString>,
     #[ts(type = "string")]
     pub can_migrate_to: VersionRange,
     #[ts(type = "string")]

core/src/service/effects/dependency.rs

@@ -358,7 +358,7 @@ pub async fn check_dependencies(
         };
         let manifest = package.as_state_info().as_manifest(ManifestPreference::New);
         let installed_version = manifest.as_version().de()?.into_version();
-        let satisfies = manifest.as_metadata().as_satisfies().de()?;
+        let satisfies = manifest.as_satisfies().de()?;
         let installed_version = Some(installed_version.clone().into());
         let is_running = package
             .as_status_info()

core/src/service/effects/net/interface.rs

@@ -134,7 +134,8 @@ pub async fn list_service_interfaces(
         .expect("valid json pointer");
     let mut watch = context.seed.ctx.db.watch(ptr).await;
 
-    let res = from_value(watch.peek_and_mark_seen()?)?;
+    let res = imbl_value::from_value(watch.peek_and_mark_seen()?)
+        .unwrap_or_default();
 
     if let Some(callback) = callback {
         let callback = callback.register(&context.seed.persistent_container);
@@ -173,7 +174,9 @@ pub async fn clear_service_interfaces(
                 .as_idx_mut(&package_id)
                 .or_not_found(&package_id)?
                 .as_service_interfaces_mut()
-                .mutate(|s| Ok(s.retain(|id, _| except.contains(id))))
+                .mutate(|s| {
+                    Ok(s.retain(|id, _| except.contains(id)))
+                })
         })
         .await
         .result?;

core/src/system/mod.rs

@@ -16,7 +16,6 @@ use ts_rs::TS;
 
 use crate::bins::set_locale;
 use crate::context::{CliContext, RpcContext};
-use crate::db::model::public::RestartReason;
 use crate::disk::util::{get_available, get_used};
 use crate::logs::{LogSource, LogsParams, SYSTEM_UNIT};
 use crate::prelude::*;
@@ -352,9 +351,10 @@ pub fn kiosk<C: Context>() -> ParentHandler<C> {
             from_fn_async(|ctx: RpcContext| async move {
                 ctx.db
                     .mutate(|db| {
-                        let server_info = db.as_public_mut().as_server_info_mut();
+                        db.as_public_mut()
-                        server_info.as_kiosk_mut().ser(&Some(true))?;
+                            .as_server_info_mut()
-                        server_info.as_status_info_mut().as_restart_mut().ser(&Some(RestartReason::Kiosk))
+                            .as_kiosk_mut()
+                            .ser(&Some(true))
                     })
                     .await
                     .result?;
@@ -369,9 +369,10 @@ pub fn kiosk<C: Context>() -> ParentHandler<C> {
             from_fn_async(|ctx: RpcContext| async move {
                 ctx.db
                     .mutate(|db| {
-                        let server_info = db.as_public_mut().as_server_info_mut();
+                        db.as_public_mut()
-                        server_info.as_kiosk_mut().ser(&Some(false))?;
+                            .as_server_info_mut()
-                        server_info.as_status_info_mut().as_restart_mut().ser(&Some(RestartReason::Kiosk))
+                            .as_kiosk_mut()
+                            .ser(&Some(false))
                     })
                     .await
                     .result?;
@@ -1366,11 +1367,10 @@ pub async fn set_language(
     save_language(&*language).await?;
     ctx.db
         .mutate(|db| {
-            let server_info = db.as_public_mut().as_server_info_mut();
+            db.as_public_mut()
-            server_info
+                .as_server_info_mut()
                 .as_language_mut()
-                .ser(&Some(language.clone()))?;
+                .ser(&Some(language.clone()))
-            server_info.as_status_info_mut().as_restart_mut().ser(&Some(RestartReason::Language))
         })
         .await
         .result?;

core/src/update/mod.rs

@@ -19,7 +19,6 @@ use ts_rs::TS;
 
 use crate::PLATFORM;
 use crate::context::{CliContext, RpcContext};
-use crate::db::model::public::RestartReason;
 use crate::notifications::{NotificationLevel, notify};
 use crate::prelude::*;
 use crate::progress::{
@@ -82,9 +81,8 @@ pub async fn update_system(
         .into_public()
         .into_server_info()
         .into_status_info()
-        .into_restart()
+        .into_updated()
         .de()?
-        == Some(RestartReason::Update)
     {
         return Err(Error::new(
             eyre!("{}", t!("update.already-updated-restart-required")),
@@ -283,18 +281,10 @@ async fn maybe_do_update(
 
     let start_progress = progress.snapshot();
 
-    ctx.db
+    let status = ctx
+        .db
         .mutate(|db| {
-            let server_info = db.as_public_mut().as_server_info_mut();
+            let mut status = peeked.as_public().as_server_info().as_status_info().de()?;
-
-            if server_info.as_status_info().as_restart().de()?.is_some() {
-                return Err(Error::new(
-                    eyre!("{}", t!("update.already-updated-restart-required")),
-                    crate::ErrorKind::InvalidRequest,
-                ));
-            }
-
-            let mut status = server_info.as_status_info().de()?;
             if status.update_progress.is_some() {
                 return Err(Error::new(
                     eyre!("{}", t!("update.already-updating")),
@@ -303,12 +293,22 @@ async fn maybe_do_update(
             }
 
             status.update_progress = Some(start_progress);
-            server_info.as_status_info_mut().ser(&status)?;
+            db.as_public_mut()
-            Ok(())
+                .as_server_info_mut()
+                .as_status_info_mut()
+                .ser(&status)?;
+            Ok(status)
         })
         .await
         .result?;
 
+    if status.updated {
+        return Err(Error::new(
+            eyre!("{}", t!("update.already-updated-restart-required")),
+            crate::ErrorKind::InvalidRequest,
+        ));
+    }
+
     let progress_task = NonDetachingJoinHandle::from(tokio::spawn(progress.clone().sync_to_db(
         ctx.db.clone(),
         |db| {
@@ -338,15 +338,10 @@ async fn maybe_do_update(
             Ok(()) => {
                 ctx.db
                     .mutate(|db| {
-                        let server_info = db.as_public_mut().as_server_info_mut();
+                        let status_info =
-                        server_info
+                            db.as_public_mut().as_server_info_mut().as_status_info_mut();
-                            .as_status_info_mut()
+                        status_info.as_update_progress_mut().ser(&None)?;
-                            .as_update_progress_mut()
+                        status_info.as_updated_mut().ser(&true)
-                            .ser(&None)?;
-                        server_info
-                            .as_status_info_mut()
-                            .as_restart_mut()
-                            .ser(&Some(RestartReason::Update))
                     })
                     .await
                     .result?;

core/src/version/v0_4_0_alpha_23.rs

@@ -28,14 +28,7 @@ impl VersionT for Version {
         &V0_3_0_COMPAT
     }
     #[instrument(skip_all)]
-    fn up(self, db: &mut Value, _: Self::PreUpRes) -> Result<Value, Error> {
+    fn up(self, _db: &mut Value, _: Self::PreUpRes) -> Result<Value, Error> {
-        let status_info = db["public"]["serverInfo"]["statusInfo"]
-            .as_object_mut();
-        if let Some(m) = status_info {
-            m.remove("updated");
-            m.insert("restart".into(), Value::Null);
-        }
-
         Ok(Value::Null)
     }
     fn down(self, _db: &mut Value) -> Result<(), Error> {

sdk/base/lib/osBindings/Manifest.ts

@@ -15,6 +15,7 @@ import type { VolumeId } from './VolumeId'
 export type Manifest = {
   id: PackageId
   version: Version
+  satisfies: Array<Version>
   canMigrateTo: string
   canMigrateFrom: string
   images: { [key: ImageId]: ImageConfig }
@@ -36,5 +37,4 @@ export type Manifest = {
   sdkVersion: string | null
   hardwareAcceleration: boolean
   plugins: Array<PluginId>
-  satisfies: Array<Version>
 }

sdk/base/lib/osBindings/PackageVersionInfo.ts

@@ -10,7 +10,6 @@ import type { MerkleArchiveCommitment } from './MerkleArchiveCommitment'
 import type { PackageId } from './PackageId'
 import type { PluginId } from './PluginId'
 import type { RegistryAsset } from './RegistryAsset'
-import type { Version } from './Version'
 
 export type PackageVersionInfo = {
   icon: DataUrl
@@ -32,5 +31,4 @@ export type PackageVersionInfo = {
   sdkVersion: string | null
   hardwareAcceleration: boolean
   plugins: Array<PluginId>
-  satisfies: Array<Version>
 }

sdk/base/lib/osBindings/RestartReason.ts

@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type RestartReason = 'mdns' | 'language' | 'kiosk' | 'update'

sdk/base/lib/osBindings/ServerStatus.ts

@@ -2,12 +2,11 @@
 import type { BackupProgress } from './BackupProgress'
 import type { FullProgress } from './FullProgress'
 import type { PackageId } from './PackageId'
-import type { RestartReason } from './RestartReason'
 
 export type ServerStatus = {
   backupProgress: { [key: PackageId]: BackupProgress } | null
+  updated: boolean
   updateProgress: FullProgress | null
   shuttingDown: boolean
   restarting: boolean
-  restart: RestartReason | null
 }

sdk/base/lib/osBindings/index.ts

@@ -236,7 +236,6 @@ export { RenameGatewayParams } from './RenameGatewayParams'
 export { ReplayId } from './ReplayId'
 export { RequestCommitment } from './RequestCommitment'
 export { ResetPasswordParams } from './ResetPasswordParams'
-export { RestartReason } from './RestartReason'
 export { RestorePackageParams } from './RestorePackageParams'
 export { RunActionParams } from './RunActionParams'
 export { Security } from './Security'

sdk/base/lib/util/deepEqual.ts

@@ -1,10 +1,7 @@
 /**
  * Performs a deep structural equality check across all provided arguments.
  * Returns true only if every argument is deeply equal to every other argument.
- * Handles primitives, arrays, and plain objects (JSON-like) recursively.
+ * Handles primitives, arrays, and plain objects recursively.
- *
- * Non-plain objects (Set, Map, Date, etc.) are compared by reference only,
- * since Object.keys() does not enumerate their contents.
  *
  * @param args - Two or more values to compare for deep equality
  * @returns True if all arguments are deeply equal
@@ -26,18 +23,6 @@ export function deepEqual(...args: unknown[]) {
   }
   if (objects.length !== args.length) return false
   if (objects.some(Array.isArray) && !objects.every(Array.isArray)) return false
-  if (
-    objects.some(
-      (x) => !Array.isArray(x) && Object.getPrototypeOf(x) !== Object.prototype,
-    )
-  ) {
-    return (
-      objects.reduce<object | null>(
-        (a, b) => (a === b ? a : null),
-        objects[0],
-      ) !== null
-    )
-  }
   const allKeys = new Set(objects.flatMap((x) => Object.keys(x)))
   for (const key of allKeys) {
     for (const x of objects) {

web/projects/shared/src/i18n/dictionaries/de.ts

@@ -485,6 +485,7 @@ export default {
   512: 'Der Kiosk-Modus ist auf diesem Gerät nicht verfügbar',
   513: 'Aktivieren',
   514: 'Deaktivieren',
+  515: 'Diese Änderung wird nach dem nächsten Neustart wirksam',
   516: 'Empfohlen',
   517: 'Möchten Sie diese Aufgabe wirklich verwerfen?',
   518: 'Verwerfen',
@@ -716,12 +717,11 @@ export default {
   799: 'Nach Klick auf "Enroll MOK":',
   800: 'Geben Sie bei Aufforderung Ihr StartOS-Passwort ein',
   801: 'Ihr System hat Secure Boot aktiviert, was erfordert, dass alle Kernel-Module mit einem vertrauenswürdigen Schlüssel signiert sind. Einige Hardware-Treiber \u2014 wie die für NVIDIA-GPUs \u2014 sind nicht mit dem Standard-Distributionsschlüssel signiert. Die Registrierung des StartOS-Signaturschlüssels ermöglicht es Ihrer Firmware, diesen Modulen zu vertrauen, damit Ihre Hardware vollständig genutzt werden kann.',
+  802: 'Die Übersetzungen auf Betriebssystemebene sind bereits aktiv. Ein Neustart ist erforderlich, damit die Übersetzungen auf Dienstebene wirksam werden.',
   803: 'Dieses Laufwerk verwendet ext4 und wird automatisch in btrfs konvertiert. Ein Backup wird dringend empfohlen, bevor Sie fortfahren.',
   804: 'Ich habe ein Backup meiner Daten',
   805: 'Öffentliche Domain hinzufügen',
   806: 'Ergebnis',
-  807: 'Download abgeschlossen. Neustart zum Anwenden.',
+  807: 'Nach dem Öffnen der neuen Adresse werden Sie zum Neustart aufgefordert.',
-  808: 'Hostname geändert, Neustart damit installierte Dienste die neue Adresse verwenden',
+  808: 'Ein Neustart ist erforderlich, damit die Dienstschnittstellen den neuen Hostnamen verwenden.',
-  809: 'Sprache geändert, Neustart damit installierte Dienste die neue Sprache verwenden',
-  810: 'Kioskmodus geändert, Neustart zum Anwenden',
 } satisfies i18n

web/projects/shared/src/i18n/dictionaries/en.ts

@@ -484,6 +484,7 @@ export const ENGLISH: Record<string, number> = {
   'Kiosk Mode is unavailable on this device': 512,
   'Enable': 513,
   'Disable': 514,
+  'This change will take effect after the next boot': 515,
   'Recommended': 516, // as in, we recommend this
   'Are you sure you want to dismiss this task?': 517,
   'Dismiss': 518, // as in, dismiss or delete a task
@@ -717,12 +718,11 @@ export const ENGLISH: Record<string, number> = {
   'After clicking "Enroll MOK":': 799,
   'When prompted, enter your StartOS password': 800,
   'Your system has Secure Boot enabled, which requires all kernel modules to be signed with a trusted key. Some hardware drivers \u2014 such as those for NVIDIA GPUs \u2014 are not signed by the default distribution key. Enrolling the StartOS signing key allows your firmware to trust these modules so your hardware can be fully utilized.': 801,
+  'OS-level translations are already in effect. A restart is required for service-level translations to take effect.': 802,
   'This drive uses ext4 and will be automatically converted to btrfs. A backup is strongly recommended before proceeding.': 803,
   'I have a backup of my data': 804,
   'Add Public Domain': 805,
   'Result': 806,
-  'Download complete. Restart to apply.': 807,
+  'After opening the new address, you will be prompted to restart.': 807,
-  'Hostname changed, restart for installed services to use the new address': 808,
+  'A restart is required for service interfaces to use the new hostname.': 808,
-  'Language changed, restart for installed services to use the new language': 809,
-  'Kiosk mode changed, restart to apply': 810,
 }

web/projects/shared/src/i18n/dictionaries/es.ts

@@ -485,6 +485,7 @@ export default {
   512: 'El modo quiosco no está disponible en este dispositivo',
   513: 'Activar',
   514: 'Desactivar',
+  515: 'Este cambio tendrá efecto después del próximo inicio',
   516: 'Recomendado',
   517: '¿Estás seguro de que deseas descartar esta tarea?',
   518: 'Descartar',
@@ -716,12 +717,11 @@ export default {
   799: 'Después de hacer clic en "Enroll MOK":',
   800: 'Cuando se le solicite, ingrese su contraseña de StartOS',
   801: 'Su sistema tiene Secure Boot habilitado, lo que requiere que todos los módulos del kernel estén firmados con una clave de confianza. Algunos controladores de hardware \u2014 como los de las GPU NVIDIA \u2014 no están firmados con la clave de distribución predeterminada. Registrar la clave de firma de StartOS permite que su firmware confíe en estos módulos para que su hardware pueda utilizarse completamente.',
+  802: 'Las traducciones a nivel del sistema operativo ya están en vigor. Se requiere un reinicio para que las traducciones a nivel de servicio surtan efecto.',
   803: 'Esta unidad usa ext4 y se convertirá automáticamente a btrfs. Se recomienda encarecidamente hacer una copia de seguridad antes de continuar.',
   804: 'Tengo una copia de seguridad de mis datos',
   805: 'Agregar dominio público',
   806: 'Resultado',
-  807: 'Descarga completa. Reiniciar para aplicar.',
+  807: 'Después de abrir la nueva dirección, se le pedirá que reinicie.',
-  808: 'Nombre de host cambiado, reiniciar para que los servicios instalados usen la nueva dirección',
+  808: 'Se requiere un reinicio para que las interfaces de servicio utilicen el nuevo nombre de host.',
-  809: 'Idioma cambiado, reiniciar para que los servicios instalados usen el nuevo idioma',
-  810: 'Modo kiosco cambiado, reiniciar para aplicar',
 } satisfies i18n

web/projects/shared/src/i18n/dictionaries/fr.ts

@@ -485,6 +485,7 @@ export default {
   512: 'Le mode kiosque n’est pas disponible sur cet appareil',
   513: 'Activer',
   514: 'Désactiver',
+  515: 'Ce changement va prendre effet après le prochain démarrage',
   516: 'Recommandé',
   517: 'Êtes-vous sûr de vouloir ignorer cette tâche ?',
   518: 'Ignorer',
@@ -716,12 +717,11 @@ export default {
   799: 'Après avoir cliqué sur "Enroll MOK" :',
   800: 'Lorsque vous y êtes invité, entrez votre mot de passe StartOS',
   801: "Votre système a Secure Boot activé, ce qui exige que tous les modules du noyau soient signés avec une clé de confiance. Certains pilotes matériels \u2014 comme ceux des GPU NVIDIA \u2014 ne sont pas signés par la clé de distribution par défaut. L'enregistrement de la clé de signature StartOS permet à votre firmware de faire confiance à ces modules afin que votre matériel puisse être pleinement utilisé.",
+  802: "Les traductions au niveau du système d'exploitation sont déjà en vigueur. Un redémarrage est nécessaire pour que les traductions au niveau des services prennent effet.",
   803: 'Ce disque utilise ext4 et sera automatiquement converti en btrfs. Il est fortement recommandé de faire une sauvegarde avant de continuer.',
   804: "J'ai une sauvegarde de mes données",
   805: 'Ajouter un domaine public',
   806: 'Résultat',
-  807: 'Téléchargement terminé. Redémarrer pour appliquer.',
+  807: 'Après avoir ouvert la nouvelle adresse, vous serez invité à redémarrer.',
-  808: "Nom d'hôte modifié, redémarrer pour que les services installés utilisent la nouvelle adresse",
+  808: "Un redémarrage est nécessaire pour que les interfaces de service utilisent le nouveau nom d'hôte.",
-  809: 'Langue modifiée, redémarrer pour que les services installés utilisent la nouvelle langue',
-  810: 'Mode kiosque modifié, redémarrer pour appliquer',
 } satisfies i18n

web/projects/shared/src/i18n/dictionaries/pl.ts

@@ -485,6 +485,7 @@ export default {
   512: 'Tryb kiosku jest niedostępny na tym urządzeniu',
   513: 'Włącz',
   514: 'Wyłącz',
+  515: 'Ta zmiana zacznie obowiązywać po następnym uruchomieniu',
   516: 'Zalecane',
   517: 'Czy na pewno chcesz odrzucić to zadanie?',
   518: 'Odrzuć',
@@ -716,12 +717,11 @@ export default {
   799: 'Po kliknięciu "Enroll MOK":',
   800: 'Po wyświetleniu monitu wprowadź swoje hasło StartOS',
   801: 'Twój system ma włączony Secure Boot, co wymaga, aby wszystkie moduły jądra były podpisane zaufanym kluczem. Niektóre sterowniki sprzętowe \u2014 takie jak te dla GPU NVIDIA \u2014 nie są podpisane domyślnym kluczem dystrybucji. Zarejestrowanie klucza podpisu StartOS pozwala firmware ufać tym modułom, aby sprzęt mógł być w pełni wykorzystany.',
+  802: 'Tłumaczenia na poziomie systemu operacyjnego są już aktywne. Wymagane jest ponowne uruchomienie, aby tłumaczenia na poziomie usług zaczęły obowiązywać.',
   803: 'Ten dysk używa ext4 i zostanie automatycznie skonwertowany na btrfs. Zdecydowanie zaleca się wykonanie kopii zapasowej przed kontynuowaniem.',
   804: 'Mam kopię zapasową moich danych',
   805: 'Dodaj domenę publiczną',
   806: 'Wynik',
-  807: 'Pobieranie zakończone. Uruchom ponownie, aby zastosować.',
+  807: 'Po otwarciu nowego adresu zostaniesz poproszony o ponowne uruchomienie.',
-  808: 'Nazwa hosta zmieniona, uruchom ponownie, aby zainstalowane usługi używały nowego adresu',
+  808: 'Ponowne uruchomienie jest wymagane, aby interfejsy usług używały nowej nazwy hosta.',
-  809: 'Język zmieniony, uruchom ponownie, aby zainstalowane usługi używały nowego języka',
-  810: 'Tryb kiosku zmieniony, uruchom ponownie, aby zastosować',
 } satisfies i18n

web/projects/start-tunnel/src/app/routes/home/routes/settings/index.ts

@@ -50,32 +50,45 @@ import { CHANGE_PASSWORD } from './change-password'
           </button>
         }
       </div>
-    </div>
+      <div tuiCell>
-    <div tuiCardLarge [style.align-items]="'start'">
+        <span tuiTitle>
-      <button tuiButton size="s" (click)="onChangePassword()">
+          <strong>Change password</strong>
-        Change password
+        </span>
-      </button>
+        <button tuiButton size="s" (click)="onChangePassword()">Change</button>
-      <button
+      </div>
-        tuiButton
+      <div tuiCell>
-        size="s"
+        <span tuiTitle>
-        iconStart="@tui.rotate-cw"
+          <strong>Restart</strong>
-        [loading]="restarting()"
+          <span tuiSubtitle>Restart the VPS</span>
-        (click)="onRestart()"
+        </span>
-      >
+        <button
-        Reboot VPS
+          tuiButton
-      </button>
+          size="s"
-      <button tuiButton size="s" iconStart="@tui.log-out" (click)="onLogout()">
+          appearance="secondary"
-        Logout
+          iconStart="@tui.rotate-cw"
-      </button>
+          [loading]="restarting()"
+          (click)="onRestart()"
+        >
+          Restart
+        </button>
+      </div>
+      <div tuiCell>
+        <span tuiTitle>
+          <strong>Logout</strong>
+        </span>
+        <button
+          tuiButton
+          size="s"
+          appearance="secondary-destructive"
+          iconStart="@tui.log-out"
+          (click)="onLogout()"
+        >
+          Logout
+        </button>
+      </div>
     </div>
   `,
   styles: `
-    :host {
-      display: flex;
-      flex-direction: column;
-      gap: 1rem;
-    }
-
     [tuiCardLarge] {
       background: var(--tui-background-neutral-1);
 
@@ -135,9 +148,9 @@ export default class Settings {
       await this.api.restart()
       this.dialogs
         .open(
-          'The VPS is rebooting. Please wait 1\u20132 minutes, then refresh the page.',
+          'The VPS is restarting. Please wait 1\u20132 minutes, then refresh the page.',
           {
-            label: 'Rebooting',
+            label: 'Restarting',
           },
         )
         .subscribe()

web/projects/start-tunnel/src/styles.scss

@@ -14,7 +14,7 @@ body {
   isolation: isolate;
   overflow-x: hidden;
   background:
-    linear-gradient(var(--tui-background-base, #171717), var(--tui-background-base, #171717)),
+    conic-gradient(var(--tui-background-base)),
     radial-gradient(circle at top right, #5240a8, transparent 40%),
     radial-gradient(circle at bottom right, #9236c9, transparent),
     radial-gradient(circle at 25% 100%, #5b65d5, transparent 30%),

web/projects/ui/src/app/routes/portal/portal.component.ts

@@ -6,7 +6,7 @@ import {
 } from '@angular/core'
 import { toSignal } from '@angular/core/rxjs-interop'
 import { RouterOutlet } from '@angular/router'
-import { ErrorService, i18nPipe } from '@start9labs/shared'
+import { ErrorService } from '@start9labs/shared'
 import {
   TuiButton,
   TuiCell,
@@ -39,7 +39,10 @@ import { HeaderComponent } from './components/header/header.component'
     @if (update(); as update) {
       <tui-action-bar *tuiPopup="bar()">
         <span tuiCell="m">
-          @if (
+          @if (update === true) {
+            <tui-icon icon="@tui.check" class="g-positive" />
+            Download complete, restart to apply changes
+          } @else if (
             update.overall && update.overall !== true && update.overall.total
           ) {
             <tui-progress-circle
@@ -55,36 +58,9 @@ import { HeaderComponent } from './components/header/header.component'
             Calculating download size
           }
         </span>
-      </tui-action-bar>
+        @if (update === true) {
-    }
+          <button tuiButton size="s" (click)="restart()">Restart</button>
-    @if (restartReason(); as reason) {
+        }
-      <tui-action-bar *tuiPopup="bar()">
-        <span tuiCell="m">
-          <tui-icon icon="@tui.refresh-cw" />
-          @switch (reason) {
-            @case ('update') {
-              {{ 'Download complete. Restart to apply.' | i18n }}
-            }
-            @case ('mdns') {
-              {{
-                'Hostname changed, restart for installed services to use the new address'
-                  | i18n
-              }}
-            }
-            @case ('language') {
-              {{
-                'Language changed, restart for installed services to use the new language'
-                  | i18n
-              }}
-            }
-            @case ('kiosk') {
-              {{ 'Kiosk mode changed, restart to apply' | i18n }}
-            }
-          }
-        </span>
-        <button tuiButton size="s" appearance="primary" (click)="restart()">
-          {{ 'Restart' | i18n }}
-        </button>
       </tui-action-bar>
     }
   `,
@@ -138,7 +114,6 @@ import { HeaderComponent } from './components/header/header.component'
     TuiButton,
     TuiPopup,
     TuiCell,
-    i18nPipe,
   ],
 })
 export class PortalComponent {
@@ -149,9 +124,6 @@ export class PortalComponent {
 
   readonly name = toSignal(this.patch.watch$('serverInfo', 'name'))
   readonly update = toSignal(inject(OSService).updating$)
-  readonly restartReason = toSignal(
-    this.patch.watch$('serverInfo', 'statusInfo', 'restart'),
-  )
   readonly bar = signal(true)
 
   getProgress(size: number, downloaded: number): number {

web/projects/ui/src/app/routes/portal/routes/marketplace/components/controls.component.ts

@@ -31,7 +31,7 @@ import { hasCurrentDeps } from 'src/app/utils/has-deps'
 
 import { MarketplaceAlertsService } from '../services/alerts.service'
 
-type KEYS = 'id' | 'version' | 'alerts' | 'flavor' | 'satisfies'
+type KEYS = 'id' | 'version' | 'alerts' | 'flavor'
 
 @Component({
   selector: 'marketplace-controls',
@@ -185,13 +185,9 @@ export class MarketplaceControlsComponent {
   }
 
   private async dryInstall(url: string | null) {
-    const { id, version, satisfies } = this.pkg()
+    const { id, version } = this.pkg()
     const packages = await getAllPackages(this.patch)
-    const breakages = dryUpdate(
+    const breakages = dryUpdate({ id, version }, packages, this.exver)
-      { id, version, satisfies: satisfies || [] },
-      packages,
-      this.exver,
-    )
 
     if (!breakages.length || (await this.alerts.alertBreakages(breakages))) {
       this.installOrUpload(url)

web/projects/ui/src/app/routes/portal/routes/services/modals/action-input.component.ts

@@ -14,6 +14,7 @@ import {
   TuiNotification,
 } from '@taiga-ui/core'
 import { injectContext } from '@taiga-ui/polymorpheus'
+import * as json from 'fast-json-patch'
 import { compare } from 'fast-json-patch'
 import { PatchDB } from 'patch-db-client'
 import { catchError, EMPTY, endWith, firstValueFrom, from, map } from 'rxjs'
@@ -190,7 +191,9 @@ export class ActionInputModal {
               task.actionId === this.actionId &&
               task.when?.condition === 'input-not-matches' &&
               task.input &&
-              conflicts(task.input.value, input),
+              json
+                .compare(input, task.input.value)
+                .some(op => op.op === 'add' || op.op === 'replace'),
           ),
       )
       .map(id => id)
@@ -211,26 +214,3 @@ export class ActionInputModal {
     )
   }
 }
-
-// Mirrors the Rust backend's `conflicts()` function in core/src/service/action.rs.
-// A key in the partial that is missing from the full input is NOT a conflict.
-function conflicts(left: unknown, right: unknown): boolean {
-  if (
-    typeof left === 'object' &&
-    left !== null &&
-    !Array.isArray(left) &&
-    typeof right === 'object' &&
-    right !== null &&
-    !Array.isArray(right)
-  ) {
-    const l = left as Record<string, unknown>
-    const r = right as Record<string, unknown>
-    return Object.keys(l).some(k => (k in r ? conflicts(l[k], r[k]) : false))
-  }
-
-  if (Array.isArray(left) && Array.isArray(right)) {
-    return left.some(v => right.every(vr => conflicts(v, vr)))
-  }
-
-  return left !== right
-}

web/projects/ui/src/app/routes/portal/routes/system/routes/general/general.component.ts

@@ -4,10 +4,11 @@ import {
   Component,
   inject,
   INJECTOR,
+  OnInit,
 } from '@angular/core'
 import { toSignal } from '@angular/core/rxjs-interop'
 import { FormsModule } from '@angular/forms'
-import { RouterLink } from '@angular/router'
+import { ActivatedRoute, Router, RouterLink } from '@angular/router'
 import { WA_WINDOW } from '@ng-web-apis/common'
 import {
   DialogService,
@@ -47,7 +48,6 @@ import { PatchDB } from 'patch-db-client'
 import { filter } from 'rxjs'
 import { ABOUT } from 'src/app/routes/portal/components/header/about.component'
 import { ApiService } from 'src/app/services/api/embassy-api.service'
-import { ConfigService } from 'src/app/services/config.service'
 import { OSService } from 'src/app/services/os.service'
 import { DataModel } from 'src/app/services/patch-db/data-model'
 import { TitleDirective } from 'src/app/services/title.service'
@@ -96,10 +96,14 @@ import { UPDATE } from './update.component'
           [disabled]="os.updatingOrBackingUp$ | async"
           (click)="onUpdate()"
         >
-          @if (os.showUpdate$ | async) {
+          @if (server.statusInfo.updated) {
-            {{ 'Update' | i18n }}
+            {{ 'Restart to apply' | i18n }}
           } @else {
-            {{ 'Check for updates' | i18n }}
+            @if (os.showUpdate$ | async) {
+              {{ 'Update' | i18n }}
+            } @else {
+              {{ 'Check for updates' | i18n }}
+            }
           }
         </button>
       </div>
@@ -274,7 +278,7 @@ import { UPDATE } from './update.component'
     TuiAnimated,
   ],
 })
-export default class SystemGeneralComponent {
+export default class SystemGeneralComponent implements OnInit {
   private readonly dialogs = inject(TuiResponsiveDialogService)
   private readonly loader = inject(TuiNotificationMiddleService)
   private readonly errorService = inject(ErrorService)
@@ -284,7 +288,20 @@ export default class SystemGeneralComponent {
   private readonly i18n = inject(i18nPipe)
   private readonly injector = inject(INJECTOR)
   private readonly win = inject(WA_WINDOW)
-  private readonly config = inject(ConfigService)
+  private readonly route = inject(ActivatedRoute)
+  private readonly router = inject(Router)
+
+  ngOnInit() {
+    this.route.queryParams
+      .pipe(filter(params => params['restart'] === 'hostname'))
+      .subscribe(async () => {
+        await this.router.navigate([], {
+          relativeTo: this.route,
+          queryParams: {},
+        })
+        this.promptHostnameRestart()
+      })
+  }
 
   count = 0
 
@@ -304,6 +321,7 @@ export default class SystemGeneralComponent {
 
   onLanguageChange(language: Language) {
     this.i18nService.setLang(language.name)
+    this.promptLanguageRestart()
   }
 
   // Expose shared utilities for template use
@@ -353,7 +371,9 @@ export default class SystemGeneralComponent {
   }
 
   onUpdate() {
-    if (this.os.updateAvailable$.value) {
+    if (this.server()?.statusInfo.updated) {
+      this.restart()
+    } else if (this.os.updateAvailable$.value) {
       this.update()
     } else {
       this.check()
@@ -380,7 +400,7 @@ export default class SystemGeneralComponent {
         ),
       )
       .subscribe(result => {
-        if (this.config.accessType === 'mdns') {
+        if (this.win.location.hostname.endsWith('.local')) {
           this.confirmNameChange(result)
         } else {
           this.saveName(result)
@@ -413,18 +433,24 @@ export default class SystemGeneralComponent {
       await this.api.setHostname({ name, hostname })
 
       if (wasLocal) {
+        const { protocol, port } = this.win.location
+        const portSuffix = port ? ':' + port : ''
+        const newUrl = `${protocol}//${hostname}.local${portSuffix}/system/general?restart=hostname`
+
         this.dialog
           .openConfirm({
             label: 'Hostname Changed',
             data: {
               content:
-                `${this.i18n.transform('Your server is now reachable at')} ${hostname}.local` as i18nKey,
+                `${this.i18n.transform('Your server is now reachable at')} ${hostname}.local. ${this.i18n.transform('After opening the new address, you will be prompted to restart.')}` as i18nKey,
               yes: 'Open new address',
               no: 'Dismiss',
             },
           })
           .pipe(filter(Boolean))
-          .subscribe(() => this.win.open(`https://${hostname}.local`, '_blank'))
+          .subscribe(() => this.win.open(newUrl, '_blank'))
+      } else {
+        this.promptHostnameRestart()
       }
     } catch (e: any) {
       this.errorService.handleError(e)
@@ -500,6 +526,7 @@ export default class SystemGeneralComponent {
 
     try {
       await this.api.toggleKiosk(true)
+      this.promptRestart()
     } catch (e: any) {
       this.errorService.handleError(e)
     } finally {
@@ -519,6 +546,7 @@ export default class SystemGeneralComponent {
         options: [],
       })
       await this.api.toggleKiosk(true)
+      this.promptRestart()
     } catch (e: any) {
       this.errorService.handleError(e)
     } finally {
@@ -531,6 +559,7 @@ export default class SystemGeneralComponent {
 
     try {
       await this.api.toggleKiosk(false)
+      this.promptRestart()
     } catch (e: any) {
       this.errorService.handleError(e)
     } finally {
@@ -538,6 +567,50 @@ export default class SystemGeneralComponent {
     }
   }
 
+  private promptRestart() {
+    this.dialog
+      .openConfirm({
+        label: 'Restart to apply',
+        data: {
+          content: 'This change will take effect after the next boot',
+          yes: 'Restart now',
+          no: 'Later',
+        },
+      })
+      .pipe(filter(Boolean))
+      .subscribe(() => this.restart())
+  }
+
+  private promptHostnameRestart() {
+    this.dialog
+      .openConfirm({
+        label: 'Restart to apply',
+        data: {
+          content:
+            'A restart is required for service interfaces to use the new hostname.',
+          yes: 'Restart now',
+          no: 'Later',
+        },
+      })
+      .pipe(filter(Boolean))
+      .subscribe(() => this.restart())
+  }
+
+  private promptLanguageRestart() {
+    this.dialog
+      .openConfirm({
+        label: 'Restart to apply',
+        data: {
+          content:
+            'OS-level translations are already in effect. A restart is required for service-level translations to take effect.',
+          yes: 'Restart now',
+          no: 'Later',
+        },
+      })
+      .pipe(filter(Boolean))
+      .subscribe(() => this.restart())
+  }
+
   private update() {
     this.dialogs
       .open(UPDATE, {

web/projects/ui/src/app/services/api/api.fixures.ts

@@ -24,9 +24,9 @@ export namespace Mock {
   export const ServerUpdated: T.ServerStatus = {
     backupProgress: null,
     updateProgress: null,
+    updated: true,
     restarting: false,
     shuttingDown: false,
-    restart: null,
   }
 
   export const RegistryOSUpdate: T.OsVersionInfoMap = {
@@ -459,7 +459,6 @@ export namespace Mock {
             gitHash: 'fakehash',
             icon: BTC_ICON,
             sourceVersion: null,
-            satisfies: [],
             dependencyMetadata: {},
             donationUrl: null,
             alerts: {
@@ -502,7 +501,6 @@ export namespace Mock {
             gitHash: 'fakehash',
             icon: BTC_ICON,
             sourceVersion: null,
-            satisfies: [],
             dependencyMetadata: {},
             donationUrl: null,
             alerts: {
@@ -555,7 +553,6 @@ export namespace Mock {
             gitHash: 'fakehash',
             icon: BTC_ICON,
             sourceVersion: null,
-            satisfies: [],
             dependencyMetadata: {},
             donationUrl: null,
             alerts: {
@@ -598,7 +595,6 @@ export namespace Mock {
             gitHash: 'fakehash',
             icon: BTC_ICON,
             sourceVersion: null,
-            satisfies: [],
             dependencyMetadata: {},
             donationUrl: null,
             alerts: {
@@ -653,7 +649,6 @@ export namespace Mock {
             gitHash: 'fakehash',
             icon: LND_ICON,
             sourceVersion: null,
-            satisfies: [],
             dependencyMetadata: {
               bitcoind: BitcoinDep,
               'btc-rpc-proxy': ProxyDep,
@@ -709,7 +704,6 @@ export namespace Mock {
             gitHash: 'fakehash',
             icon: LND_ICON,
             sourceVersion: null,
-            satisfies: [],
             dependencyMetadata: {
               bitcoind: BitcoinDep,
               'btc-rpc-proxy': ProxyDep,
@@ -769,7 +763,6 @@ export namespace Mock {
           gitHash: 'fakehash',
           icon: BTC_ICON,
           sourceVersion: null,
-          satisfies: [],
           dependencyMetadata: {},
           donationUrl: null,
           alerts: {
@@ -812,7 +805,6 @@ export namespace Mock {
           gitHash: 'fakehash',
           icon: BTC_ICON,
           sourceVersion: null,
-          satisfies: [],
           dependencyMetadata: {},
           donationUrl: null,
           alerts: {
@@ -865,7 +857,6 @@ export namespace Mock {
           gitHash: 'fakehash',
           icon: LND_ICON,
           sourceVersion: null,
-          satisfies: [],
           dependencyMetadata: {
             bitcoind: BitcoinDep,
             'btc-rpc-proxy': ProxyDep,
@@ -921,7 +912,6 @@ export namespace Mock {
           gitHash: 'fakehash',
           icon: PROXY_ICON,
           sourceVersion: null,
-          satisfies: [],
           dependencyMetadata: {
             bitcoind: BitcoinDep,
           },

web/projects/ui/src/app/services/api/embassy-mock-api.service.ts

@@ -435,20 +435,14 @@ export class MockApiService extends ApiService {
   async toggleKiosk(enable: boolean): Promise<null> {
     await pauseFor(2000)
 
-    this.mockRevision([
+    const patch = [
       {
         op: PatchOp.REPLACE,
         path: '/serverInfo/kiosk',
         value: enable,
       },
-    ])
+    ]
-    this.mockRevision([
+    this.mockRevision(patch)
-      {
-        op: PatchOp.REPLACE,
-        path: '/serverInfo/statusInfo/restart',
-        value: 'kiosk',
-      },
-    ])
 
     return null
   }
@@ -456,7 +450,7 @@ export class MockApiService extends ApiService {
   async setHostname(params: T.SetServerHostnameParams): Promise<null> {
     await pauseFor(1000)
 
-    this.mockRevision([
+    const patch = [
       {
         op: PatchOp.REPLACE,
         path: '/serverInfo/name',
@@ -467,14 +461,8 @@ export class MockApiService extends ApiService {
         path: '/serverInfo/hostname',
         value: params.hostname,
       },
-    ])
+    ]
-    this.mockRevision([
+    this.mockRevision(patch)
-      {
-        op: PatchOp.REPLACE,
-        path: '/serverInfo/statusInfo/restart',
-        value: 'mdns',
-      },
-    ])
 
     return null
   }
@@ -497,20 +485,14 @@ export class MockApiService extends ApiService {
   async setLanguage(params: SetLanguageParams): Promise<null> {
     await pauseFor(1000)
 
-    this.mockRevision([
+    const patch = [
       {
         op: PatchOp.REPLACE,
         path: '/serverInfo/language',
         value: params.language,
       },
-    ])
+    ]
-    this.mockRevision([
+    this.mockRevision(patch)
-      {
-        op: PatchOp.REPLACE,
-        path: '/serverInfo/statusInfo/restart',
-        value: 'language',
-      },
-    ])
 
     return null
   }
@@ -1849,11 +1831,11 @@ export class MockApiService extends ApiService {
     this.mockRevision(patch2)
 
     setTimeout(async () => {
-      const patch3: Operation<string>[] = [
+      const patch3: Operation<boolean>[] = [
         {
           op: PatchOp.REPLACE,
-          path: '/serverInfo/statusInfo/restart',
+          path: '/serverInfo/statusInfo/updated',
-          value: 'update',
+          value: true,
         },
         {
           op: PatchOp.REMOVE,

web/projects/ui/src/app/services/api/mock-patch.ts

@@ -227,11 +227,11 @@ export const mockPatchData: DataModel = {
     postInitMigrationTodos: {},
     statusInfo: {
       // currentBackup: null,
+      updated: false,
       updateProgress: null,
       restarting: false,
       shuttingDown: false,
       backupProgress: null,
-      restart: null,
     },
     name: 'Random Words',
     hostname: 'random-words',

web/projects/ui/src/app/services/os.service.ts

@@ -28,7 +28,7 @@ export class OSService {
     .pipe(shareReplay({ bufferSize: 1, refCount: true }))
 
   readonly updating$ = this.statusInfo$.pipe(
-    map(status => status.updateProgress ?? false),
+    map(status => status.updateProgress ?? status.updated),
     distinctUntilChanged(),
   )
 

web/projects/ui/src/app/utils/dry-update.ts

@@ -3,11 +3,7 @@ import { DataModel } from '../services/patch-db/data-model'
 import { getManifest } from './get-package-data'
 
 export function dryUpdate(
-  {
+  { id, version }: { id: string; version: string },
-    id,
-    version,
-    satisfies,
-  }: { id: string; version: string; satisfies: string[] },
   pkgs: DataModel['packageData'],
   exver: Exver,
 ): string[] {
@@ -17,24 +13,10 @@ export function dryUpdate(
         Object.keys(pkg.currentDependencies || {}).some(
           pkgId => pkgId === id,
         ) &&
-        !versionSatisfies(
+        !exver.satisfies(
           version,
-          satisfies,
           pkg.currentDependencies[id]?.versionRange || '',
-          exver,
         ),
     )
     .map(pkg => getManifest(pkg).title)
 }
-
-function versionSatisfies(
-  version: string,
-  satisfies: string[],
-  range: string,
-  exver: Exver,
-): boolean {
-  return (
-    exver.satisfies(version, range) ||
-    satisfies.some(v => exver.satisfies(v, range))
-  )
-}