From 7dfb57ab2a12f881e44a0c106b95d0d9e842da6b Mon Sep 17 00:00:00 2001
From: IlyaZar <zarubin@wiso.uni-koeln.de>
Date: Thu, 27 Aug 2026 16:44:31 +0200
Subject: [PATCH 1/6] fix: reconcile persistent service state

- keep runtime and startup choices independent
- surface silent service enablement drift
---
 Panel.qml                       |   9 ++-
 Service.qml                     |  32 ++++++++
 config/settings.toml            |   4 +
 core/InstallationController.qml |  55 ++++++++++++-
 core/SettingsController.qml     |  35 ++++++++-
 models/ServiceStateModel.js     |  93 ++++++++++++++++++++++
 models/SettingsModel.js         |  40 ++++++----
 scripts/syncthing-install.sh    |   7 ++
 scripts/syncthing-settings.sh   | 109 ++++++++++++++++++++++----
 tests-service-state.qml         |  69 +++++++++++++++++
 tests/run.qml                   | 132 +++++++++++++++++++++++++++++++-
 tests/scripts.test.sh           |  77 +++++++++++++++++++
 tests/service-state.test.sh     |  56 ++++++++++++++
 ui/ServiceStateDialog.qml       | 124 ++++++++++++++++++++++++++++++
 ui/SyncthingPanelPopup.qml      |  41 +++++++++-
 15 files changed, 840 insertions(+), 43 deletions(-)
 create mode 100644 models/ServiceStateModel.js
 create mode 100644 tests-service-state.qml
 create mode 100755 tests/service-state.test.sh
 create mode 100644 ui/ServiceStateDialog.qml

diff --git a/Panel.qml b/Panel.qml
index d3989ff..03e8642 100644
--- a/Panel.qml
+++ b/Panel.qml
@@ -101,7 +101,9 @@ Panel {
   readonly property string visibleNotice: syncthing
     ? syncthing.folderMutationNotice || syncthing.settingsNotice : ""
   readonly property string visibleWarning: syncthing
-    ? syncthing.recoveryWarning : ""
+    ? syncthing.recoveryWarning || syncthing.serviceStateWarning : ""
+  readonly property bool serviceStateDialogOpen: syncthing
+    && syncthing.serviceStateDrift
   readonly property string visibleSyncActivity: syncthing
     ? syncthing.syncActivity : ""
   readonly property string visibleSyncDots: syncthing
@@ -136,6 +138,10 @@ Panel {
     copyToClipboard(folderId, "Folder ID copied")
   }
 
+  function chooseServiceStateAction(index) {
+    if (syncthing) syncthing.chooseServiceStateAction(index)
+  }
+
   function configureService() {
     if (!syncthing) return
     syncthing.setRefreshInterval(setting("refreshIntervalSec", 60))
@@ -533,6 +539,7 @@ Panel {
         root.addSubmissionPending = false
       }
     }
+
   }
 
   Process {
diff --git a/Service.qml b/Service.qml
index e580ad6..747e4f1 100644
--- a/Service.qml
+++ b/Service.qml
@@ -2,6 +2,7 @@ import QtQuick
 import Quickshell
 import Quickshell.Io
 import "core"
+import "models/ServiceStateModel.js" as ServiceStateModel
 
 QtObject {
   id: root
@@ -55,6 +56,26 @@ QtObject {
   readonly property bool settingsBusy: settings.busy
   readonly property string settingsError: settings.error
   readonly property string settingsNotice: settings.notice
+  readonly property bool settingsReady: settings.settingsReady
+  readonly property string configuredServiceState: settings.serviceState
+  readonly property string serviceActiveState: installation.serviceActiveState
+  readonly property string serviceUnitFileState: installation.unitFileState
+  readonly property var serviceStateDecision: ServiceStateModel.decision(
+    configuredServiceState, serviceUnitFileState, serviceActiveState)
+  readonly property bool serviceStateDrift: settingsReady && serviceAvailable
+    && serviceStateDecision.status === "drift"
+  readonly property bool serviceStateActionRunning:
+    settings.serviceStateActionRunning || installation.unitFileActionRunning
+  readonly property string serviceStateMessage: serviceStateDrift
+    ? serviceStateDecision.message : ""
+  readonly property string serviceStatePrimaryLabel: serviceStateDrift
+    ? serviceStateDecision.first.label : ""
+  readonly property string serviceStateSecondaryLabel: serviceStateDrift
+    ? serviceStateDecision.second.label : ""
+  readonly property string serviceStateWarning: settingsReady && serviceAvailable
+    && serviceStateDecision.status === "unsupported"
+    && serviceUnitFileState !== "not-found"
+    ? serviceStateDecision.reason : ""
 
   property string _apiKey: ""
   property bool _useTls: false
@@ -220,6 +241,17 @@ QtObject {
     settings.clearNotice()
   }
 
+  function chooseServiceStateAction(index) {
+    if (!serviceStateDrift || serviceStateActionRunning) return false
+    var action = index === 0
+      ? serviceStateDecision.first : serviceStateDecision.second
+    if (action.side === "config") return settings.setServiceState(action.value)
+    if (action.side === "system") {
+      return installation.setUnitFileState(action.value)
+    }
+    return false
+  }
+
   function requestSelfRemoval(deletePluginSettings) {
     settings.requestSelfRemoval(deletePluginSettings)
   }
diff --git a/config/settings.toml b/config/settings.toml
index 195cb27..02d84d9 100644
--- a/config/settings.toml
+++ b/config/settings.toml
@@ -5,3 +5,7 @@ version = 1
 icon_style = "branded"
 # "default" vs. "omarchy": Syncthing styling vs. following the active Omarchy theme
 web_ui_theme = "omarchy"
+
+[service]
+# Persistent Syncthing user-service state, independent of the runtime toggle
+service_state = "enabled"
diff --git a/core/InstallationController.qml b/core/InstallationController.qml
index 53f5ba8..58e53db 100644
--- a/core/InstallationController.qml
+++ b/core/InstallationController.qml
@@ -1,6 +1,7 @@
 import QtQuick
 import Quickshell
 import Quickshell.Io
+import "../models/ServiceStateModel.js" as ServiceStateModel
 
 QtObject {
   id: root
@@ -12,6 +13,8 @@ QtObject {
   property string executablePath: ""
   property bool serviceAvailable: false
   property bool serviceRunning: false
+  property string serviceActiveState: "inactive"
+  property string unitFileState: "not-found"
   property bool operationRunning: false
   property bool refreshing: false
   property bool packageActionRunning: false
@@ -19,7 +22,10 @@ QtObject {
   property string packageError: ""
   property string controlError: ""
   property int _desiredServiceState: -1
+  property string _desiredUnitFileState: ""
+  property string _controlKind: ""
   property bool _operationSeen: false
+  property bool _statusRefreshPending: false
   property string _statusOutput: ""
   property string _statusErrorOutput: ""
   property string _controlErrorOutput: ""
@@ -27,6 +33,8 @@ QtObject {
   readonly property bool serviceActive: _desiredServiceState === -1
     ? serviceRunning : _desiredServiceState === 1
   readonly property bool serviceActionRunning: controlProcess.running
+  readonly property bool unitFileActionRunning:
+    _controlKind === "unit-file" || _desiredUnitFileState !== ""
   readonly property bool canUseRuntime: state === "existing"
     && executablePath !== ""
   readonly property bool canControlService: canUseRuntime && serviceAvailable
@@ -41,7 +49,10 @@ QtObject {
   signal serviceStarted
 
   function updateStatus() {
-    if (statusProcess.running) return
+    if (statusProcess.running) {
+      _statusRefreshPending = true
+      return
+    }
     refreshing = true
     packageError = ""
     _statusOutput = ""
@@ -67,8 +78,13 @@ QtObject {
     executablePath = String(data.executable || "")
     serviceAvailable = data.serviceAvailable === true
     serviceRunning = data.serviceRunning === true
+    serviceActiveState = String(data.serviceActiveState || "")
+    unitFileState = String(data.unitFileState || "")
     operationRunning = data.operationRunning === true
-    reconcileDesiredServiceState()
+    if (!_statusRefreshPending) {
+      reconcileDesiredServiceState()
+      reconcileDesiredUnitFileState()
+    }
     reconcilePackageOperation()
     if (!canUseRuntime) runtimeUnavailable(state)
     else if (serviceAvailable && !serviceActive) runtimeUnavailable("stopped")
@@ -88,6 +104,19 @@ QtObject {
     }
   }
 
+  function reconcileDesiredUnitFileState() {
+    if (_desiredUnitFileState === "") return
+    if (unitFileState === _desiredUnitFileState) {
+      _desiredUnitFileState = ""
+    } else if (!controlProcess.running) {
+      var desired = _desiredUnitFileState
+      _desiredUnitFileState = ""
+      controlError = desired === "enabled"
+        ? "Syncthing service was not enabled"
+        : "Syncthing service was not disabled"
+    }
+  }
+
   function reconcilePackageOperation() {
     if (packageActionRunning && operationRunning) _operationSeen = true
     if (!packageActionRunning || !_operationSeen || operationRunning) return
@@ -113,6 +142,7 @@ QtObject {
     if (!canControlService || controlProcess.running || folderMutationBusy) return
     var start = !serviceActive
     _desiredServiceState = start ? 1 : 0
+    _controlKind = "runtime"
     controlError = ""
     _controlErrorOutput = ""
     controlProcess.command = [
@@ -123,6 +153,19 @@ QtObject {
     controlProcess.running = true
   }
 
+  function setUnitFileState(state) {
+    var command = ServiceStateModel.persistenceCommand(String(state || ""))
+    if (!canControlService || controlProcess.running || folderMutationBusy
+        || command.length === 0) return false
+    _desiredUnitFileState = String(state)
+    _controlKind = "unit-file"
+    controlError = ""
+    _controlErrorOutput = ""
+    controlProcess.command = command
+    controlProcess.running = true
+    return true
+  }
+
   property Timer statusTimer: Timer {
     interval: 15000
     repeat: true
@@ -165,6 +208,7 @@ QtObject {
       onStreamFinished: root._statusErrorOutput = text
     }
     onExited: function(exitCode) {
+      var rerun = root._statusRefreshPending
       root.refreshing = false
       if (exitCode === 0) {
         root.applyStatus(root._statusOutput)
@@ -172,6 +216,8 @@ QtObject {
         root.packageError = String(root._statusErrorOutput
           || "Could not check Syncthing installation").trim()
       }
+      root._statusRefreshPending = false
+      if (rerun) Qt.callLater(root.updateStatus)
     }
   }
 
@@ -183,13 +229,16 @@ QtObject {
       onStreamFinished: root._controlErrorOutput = text
     }
     onExited: function(exitCode) {
+      var kind = root._controlKind
       if (exitCode !== 0) {
         root.controlError = String(root._controlErrorOutput
           || "Could not change Syncthing service state").trim()
         root._desiredServiceState = -1
-      } else if (root.serviceActive) {
+        root._desiredUnitFileState = ""
+      } else if (kind === "runtime" && root._desiredServiceState === 1) {
         root.serviceStarted()
       }
+      root._controlKind = ""
       root.updateStatus()
     }
   }
diff --git a/core/SettingsController.qml b/core/SettingsController.qml
index fa65e4d..0998ae8 100644
--- a/core/SettingsController.qml
+++ b/core/SettingsController.qml
@@ -28,6 +28,7 @@ QtObject {
   property bool settingsExists: false
   property string iconStyle: SettingsModel.DefaultIconStyle
   property string webUiTheme: SettingsModel.DefaultWebUiTheme
+  property string serviceState: SettingsModel.DefaultServiceState
   property string currentWebUiTheme: ""
   property string guiAssetsPath: ""
   property string error: ""
@@ -39,8 +40,13 @@ QtObject {
   property bool _reconcileAgain: false
   property string _themeBeforeGeneration: ""
   property bool _openAfterEnsure: false
+  property string _settingsAction: ""
   property bool _deleteSettingsAfterRemoval: false
 
+  readonly property bool settingsReady: _settingsLoaded && _settingsValid
+  readonly property bool serviceStateActionRunning:
+    settingsProcess.running && _settingsAction === "service-state"
+
   function localPath(url) {
     var value = String(url || "")
     if (value.indexOf("file://") === 0) value = value.slice(7)
@@ -59,6 +65,7 @@ QtObject {
     _settingsValid = true
     iconStyle = parsed.iconStyle
     webUiTheme = parsed.webUiTheme
+    serviceState = parsed.serviceState
     error = ""
     scheduleReconcile()
   }
@@ -70,6 +77,7 @@ QtObject {
     _settingsValid = true
     iconStyle = values.iconStyle
     webUiTheme = values.webUiTheme
+    serviceState = values.serviceState
     error = ""
     scheduleReconcile()
   }
@@ -88,6 +96,7 @@ QtObject {
     }
     if (settingsProcess.running) return
     _openAfterEnsure = true
+    _settingsAction = "ensure"
     busy = true
     settingsProcess.command = [
       "bash", settingsHelperPath, "ensure", settingsTemplatePath,
@@ -96,6 +105,21 @@ QtObject {
     settingsProcess.running = true
   }
 
+  function setServiceState(state) {
+    var desired = String(state || "")
+    if (["enabled", "disabled"].indexOf(desired) < 0
+        || !settingsReady || busy || settingsProcess.running) return false
+    _settingsAction = "service-state"
+    busy = true
+    error = ""
+    settingsProcess.command = [
+      "bash", settingsHelperPath, "set-service-state", settingsTemplatePath,
+      settingsPath, iconStyle, desired
+    ]
+    settingsProcess.running = true
+    return true
+  }
+
   function clearNotice() {
     notice = ""
   }
@@ -258,6 +282,7 @@ QtObject {
     id: settingsProcess
     command: []
     onExited: function(exitCode) {
+      var action = root._settingsAction
       root.busy = false
       if (exitCode === 0) {
         settingsFile.reload()
@@ -266,8 +291,16 @@ QtObject {
             "omarchy", "launch", "config-editor", root.settingsPath
           ])
         }
-      } else root.error = "Could not create Syncthing plugin settings"
+        if (action === "service-state") {
+          root.notice = "Syncthing service preference updated"
+        }
+      } else {
+        root.error = action === "service-state"
+          ? "Could not update Syncthing service preference"
+          : "Could not create Syncthing plugin settings"
+      }
       root._openAfterEnsure = false
+      root._settingsAction = ""
     }
   }
 
diff --git a/models/ServiceStateModel.js b/models/ServiceStateModel.js
new file mode 100644
index 0000000..abc7425
--- /dev/null
+++ b/models/ServiceStateModel.js
@@ -0,0 +1,93 @@
+.pragma library
+
+function configuredStateSupported(state) {
+  return state === "enabled" || state === "disabled"
+}
+
+function unitFileStateSupported(state) {
+  return state === "enabled" || state === "disabled"
+}
+
+function activeStateSupported(state) {
+  return state === "active" || state === "inactive"
+}
+
+function systemAction(state) {
+  return {
+    side: "system",
+    value: state,
+    label: state === "enabled"
+      ? "Enable systemd autostart" : "Disable systemd autostart"
+  }
+}
+
+function configAction(state) {
+  return {
+    side: "config",
+    value: state,
+    label: "Set Syncthing config to " + state
+  }
+}
+
+function markPreferred(action, preferredState) {
+  return {
+    side: action.side,
+    value: action.value,
+    preferred: action.value === preferredState,
+    label: action.label + (action.value === preferredState
+      ? " (preferred)" : "")
+  }
+}
+
+function decision(configState, unitFileState, activeState) {
+  var config = String(configState || "")
+  var unit = String(unitFileState || "")
+  var active = String(activeState || "")
+  var key = active + "|" + config + "|" + unit
+
+  if (!configuredStateSupported(config)) {
+    return {
+      status: "unsupported",
+      key: key,
+      reason: "Configured service state is unsupported: " + (config || "empty")
+    }
+  }
+  if (!unitFileStateSupported(unit)) {
+    return {
+      status: "unsupported",
+      key: key,
+      reason: "Systemd unit-file state is unsupported: " + (unit || "empty")
+    }
+  }
+  if (config === unit) return { status: "aligned", key: key }
+  if (!activeStateSupported(active)) {
+    return {
+      status: "unsupported",
+      key: key,
+      reason: "Systemd runtime state is not settled: " + (active || "empty")
+    }
+  }
+
+  var preferredState = active === "active" ? "enabled" : "disabled"
+  var enforceConfig = markPreferred(systemAction(config), preferredState)
+  var adoptSystem = markPreferred(configAction(unit), preferredState)
+  var first = enforceConfig.preferred ? enforceConfig : adoptSystem
+  var second = enforceConfig.preferred ? adoptSystem : enforceConfig
+  return {
+    status: "drift",
+    key: key,
+    message: "Syncthing config (" + config
+      + ") differs from its systemd autostart setting (" + unit
+      + ").\n\nPlease choose:",
+    first: first,
+    second: second
+  }
+}
+
+function persistenceCommand(state) {
+  if (!configuredStateSupported(state)) return []
+  return [
+    "systemctl", "--user", state === "enabled" ? "enable" : "disable",
+    "syncthing.service"
+  ]
+}
diff --git a/models/SettingsModel.js b/models/SettingsModel.js
index 0cba84d..5825c9f 100644
--- a/models/SettingsModel.js
+++ b/models/SettingsModel.js
@@ -2,6 +2,7 @@
 
 var DefaultIconStyle = "branded"
 var DefaultWebUiTheme = "omarchy"
+var DefaultServiceState = "enabled"
 var SupportedVersion = 1
 
 function stripComment(line) {
@@ -35,8 +36,8 @@ function parse(raw) {
   var lines = String(raw || "").split("\n")
   var section = ""
   var version = null
-  var structured = false
   var styleSectionSeen = false
+  var serviceSectionSeen = false
   var rootStyleSetting = false
 
   for (var i = 0; i < lines.length; i++) {
@@ -44,16 +45,18 @@ function parse(raw) {
     if (!line) continue
     var header = line.match(/^\[([A-Za-z_][A-Za-z0-9_-]*)\]$/)
     if (header) {
-      structured = true
       section = header[1]
-      if (section !== "style") {
+      if (section !== "style" && section !== "service") {
         return { error: "Unknown settings section " + section
           + " on line " + (i + 1) }
       }
-      if (styleSectionSeen) {
-        return { error: "Duplicate settings section style on line " + (i + 1) }
+      if ((section === "style" && styleSectionSeen)
+          || (section === "service" && serviceSectionSeen)) {
+        return { error: "Duplicate settings section " + section
+          + " on line " + (i + 1) }
       }
-      styleSectionSeen = true
+      if (section === "style") styleSectionSeen = true
+      else serviceSectionSeen = true
       continue
     }
     var assignment = line.match(/^([A-Za-z_][A-Za-z0-9_-]*)\s*=\s*(.+)$/)
@@ -62,7 +65,6 @@ function parse(raw) {
     }
     var key = assignment[1]
     if (key === "version" && !section) {
-      structured = true
       if (version !== null) {
         return { error: "Duplicate setting version on line " + (i + 1) }
       }
@@ -72,13 +74,14 @@ function parse(raw) {
       }
       continue
     }
-    if (key !== "icon_style" && key !== "web_ui_theme") {
+    var styleSetting = key === "icon_style" || key === "web_ui_theme"
+    var serviceSetting = key === "service_state"
+    if ((section === "service" && !serviceSetting)
+        || (section !== "service" && !styleSetting)) {
       return { error: "Unknown setting " + (section ? section + "." : "")
         + key + " on line " + (i + 1) }
     }
-    if (!section) {
-      rootStyleSetting = true
-    }
+    if (!section && styleSetting) rootStyleSetting = true
     if (values[key] !== undefined) {
       return { error: "Duplicate setting " + key + " on line " + (i + 1) }
     }
@@ -89,7 +92,7 @@ function parse(raw) {
     values[key] = value
   }
 
-  if (structured) {
+  if (version !== null || styleSectionSeen) {
     if (version === null) return { error: "Missing setting version" }
     if (version !== SupportedVersion) {
       return { error: "Unsupported settings version " + version }
@@ -112,17 +115,24 @@ function parse(raw) {
   if (["default", "omarchy"].indexOf(values.web_ui_theme) < 0) {
     return { error: "web_ui_theme must be default or omarchy" }
   }
-
+  if (values.service_state === undefined) {
+    values.service_state = DefaultServiceState
+  }
+  if (["enabled", "disabled"].indexOf(values.service_state) < 0) {
+    return { error: "service_state must be enabled or disabled" }
+  }
   return {
     error: "",
     iconStyle: values.icon_style,
-    webUiTheme: values.web_ui_theme
+    webUiTheme: values.web_ui_theme,
+    serviceState: values.service_state
   }
 }
 
 function defaults(legacyThemedIcon) {
   return {
     iconStyle: legacyThemedIcon === true ? "themed" : DefaultIconStyle,
-    webUiTheme: DefaultWebUiTheme
+    webUiTheme: DefaultWebUiTheme,
+    serviceState: DefaultServiceState
   }
 }
diff --git a/scripts/syncthing-install.sh b/scripts/syncthing-install.sh
index 3eaf2a5..fd3ba71 100755
--- a/scripts/syncthing-install.sh
+++ b/scripts/syncthing-install.sh
@@ -37,6 +37,7 @@ operation_running() {
 detect_status() {
   local active_state="inactive" executable="" executable_path=""
   local label="Not installed" load_state="not-found" state="missing"
+  local unit_file_state="not-found"
 
   executable="$(command -v syncthing 2>/dev/null || true)"
   if [[ -n $executable ]]; then
@@ -46,8 +47,10 @@ detect_status() {
 
   load_state="$(service_property LoadState)"
   active_state="$(service_property ActiveState)"
+  unit_file_state="$(service_property UnitFileState)"
   [[ -n $load_state ]] || load_state="not-found"
   [[ -n $active_state ]] || active_state="inactive"
+  [[ -n $unit_file_state ]] || unit_file_state="not-found"
 
   if [[ -n $executable_path ]]; then
     state="existing"
@@ -63,6 +66,8 @@ detect_status() {
     --arg state "$state" \
     --arg label "$label" \
     --arg executable "$executable_path" \
+    --arg serviceActiveState "$active_state" \
+    --arg unitFileState "$unit_file_state" \
     --argjson serviceAvailable \
       "$([[ $load_state != not-found ]] && echo true || echo false)" \
     --argjson serviceRunning \
@@ -75,6 +80,8 @@ detect_status() {
       executable: $executable,
       serviceAvailable: $serviceAvailable,
       serviceRunning: $serviceRunning,
+      serviceActiveState: $serviceActiveState,
+      unitFileState: $unitFileState,
       operationRunning: $operationRunning
     }'
 }
diff --git a/scripts/syncthing-settings.sh b/scripts/syncthing-settings.sh
index a23ae00..d1176bb 100755
--- a/scripts/syncthing-settings.sh
+++ b/scripts/syncthing-settings.sh
@@ -1,24 +1,33 @@
 #!/bin/bash
 set -euo pipefail
 
+temporary=""
+
+cleanup() {
+  [[ -z $temporary ]] || rm -f -- "$temporary"
+}
+
+trap cleanup EXIT
+
 usage() {
-  printf 'Usage: syncthing-settings.sh ensure <template> <target> <branded|themed>\n' >&2
+  printf '%s\n' \
+    'Usage: syncthing-settings.sh ensure <template> <target> <branded|themed>' \
+    '       syncthing-settings.sh set-service-state <template> <target> <branded|themed> <enabled|disabled>' \
+    >&2
   exit 2
 }
 
-[[ ${1:-} == "ensure" && $# == 4 ]] || usage
+seed_settings() {
+  local template=$1 target=$2 icon_style=$3
+  local target_dir
 
-template=$2
-target=$3
-icon_style=$4
+  [[ -f $template ]] || {
+    printf 'Settings template is missing: %s\n' "$template" >&2
+    return 1
+  }
+  [[ $icon_style == "branded" || $icon_style == "themed" ]] || usage
+  [[ ! -e $target ]] || return 0
 
-[[ -f $template ]] || {
-  printf 'Settings template is missing: %s\n' "$template" >&2
-  exit 1
-}
-[[ $icon_style == "branded" || $icon_style == "themed" ]] || usage
-
-if [[ ! -e $target ]]; then
   target_dir=$(dirname -- "$target")
   if [[ ! -d $target_dir ]]; then
     mkdir -p -- "$target_dir"
@@ -26,12 +35,82 @@ if [[ ! -e $target ]]; then
   fi
 
   temporary=$(mktemp --tmpdir="$target_dir" .settings.toml.XXXXXX)
-  trap 'rm -f -- "$temporary"' EXIT
   sed -E "s/^(icon_style[[:space:]]*=[[:space:]]*)\"branded\"/\1\"$icon_style\"/" \
     "$template" >"$temporary"
   chmod 600 -- "$temporary"
   mv -- "$temporary" "$target"
-  trap - EXIT
-fi
+  temporary=""
+}
+
+write_service_state() {
+  local target=$1 service_state=$2
+  local target_dir
+
+  [[ $service_state == "enabled" || $service_state == "disabled" ]] || usage
+  target_dir=$(dirname -- "$target")
+  temporary=$(mktemp --tmpdir="$target_dir" .settings.toml.XXXXXX)
+  awk -v service_state="$service_state" '
+    function write_state() {
+      print "service_state = \"" service_state "\""
+      state_seen = 1
+    }
+    function service_header(line) {
+      return line ~ /^[[:space:]]*\[service\][[:space:]]*(#.*)?$/
+    }
+    function any_header(line) {
+      return line ~ /^[[:space:]]*\[[^]]+\][[:space:]]*(#.*)?$/
+    }
+    {
+      if (any_header($0)) {
+        if (in_service && !state_seen) write_state()
+        in_service = service_header($0)
+        if (in_service) {
+          if (service_seen) duplicate_service = 1
+          service_seen = 1
+        }
+        print
+        next
+      }
+      if (in_service &&
+          $0 ~ /^[[:space:]]*service_state[[:space:]]*=/) {
+        if (state_seen) duplicate_state = 1
+        else write_state()
+        next
+      }
+      print
+    }
+    END {
+      if (duplicate_service || duplicate_state) exit 3
+      if (!service_seen) {
+        if (NR > 0) print ""
+        print "[service]"
+        write_state()
+      } else if (in_service && !state_seen) {
+        write_state()
+      }
+    }
+  ' "$target" >"$temporary" || {
+    printf 'Could not update service settings safely\n' >&2
+    return 1
+  }
+  chmod --reference="$target" "$temporary"
+  mv -- "$temporary" "$target"
+  temporary=""
+}
+
+case "${1:-}" in
+  ensure)
+    [[ $# == 4 ]] || usage
+    seed_settings "$2" "$3" "$4"
+    target=$3
+    ;;
+  set-service-state)
+    [[ $# == 5 ]] || usage
+    seed_settings "$2" "$3" "$4"
+    write_service_state "$3" "$5"
+    target=$3
+    ;;
+  *) usage ;;
+esac
 
 printf '%s\n' "$target"
diff --git a/tests-service-state.qml b/tests-service-state.qml
new file mode 100644
index 0000000..ffdaf5b
--- /dev/null
+++ b/tests-service-state.qml
@@ -0,0 +1,69 @@
+import QtQuick
+import Quickshell
+import "core"
+
+ShellRoot {
+  id: root
+
+  property bool actionStarted: false
+  property int ticks: 0
+  readonly property bool expectFailure:
+    Quickshell.env("SYNCSHELL_EXPECT_SYSTEMCTL_FAILURE") === "1"
+
+  function fail(message) {
+    console.error(message)
+    Qt.exit(1)
+  }
+
+  function complete() {
+    console.log("service state controller test passed")
+    Qt.exit(0)
+  }
+
+  property InstallationController controller: InstallationController {
+    helperPath: Quickshell.env("SYNCSHELL_INSTALL_HELPER")
+  }
+
+  property Timer pollTimer: Timer {
+    interval: 20
+    repeat: true
+    running: true
+    onTriggered: {
+      root.ticks++
+      if (root.ticks > 500) root.fail("service state controller test timed out")
+      if (!root.actionStarted) {
+        if (root.controller.refreshing
+            || root.controller.state === "checking") return
+        if (root.controller.unitFileState !== "disabled") {
+          root.fail("initial disabled unit-file state was not observed")
+        }
+        if (!root.controller.setUnitFileState("enabled")) {
+          root.fail("enable action was rejected")
+        }
+        root.actionStarted = true
+        return
+      }
+      if (root.controller.refreshing
+          || root.controller.unitFileActionRunning) return
+      if (root.expectFailure) {
+        if (root.controller.controlError.indexOf("permission denied") < 0) {
+          root.fail("systemctl failure was not surfaced")
+        }
+        if (root.controller.unitFileState !== "disabled") {
+          root.fail("failed enable changed the observed unit-file state")
+        }
+        root.complete()
+      } else if (root.controller.unitFileState === "enabled") {
+        if (root.controller.controlError !== "") {
+          root.fail("successful enable retained a control error")
+        }
+        root.complete()
+      }
+    }
+  }
+
+  Component.onCompleted: {
+    controller.statusTimer.stop()
+    controller.updateStatus()
+  }
+}
diff --git a/tests/run.qml b/tests/run.qml
index 7dcd576..217db95 100644
--- a/tests/run.qml
+++ b/tests/run.qml
@@ -2,6 +2,7 @@ import QtQuick
 import "../core"
 import "../models/FolderModel.js" as FolderModel
 import "../models/PanelModel.js" as PanelModel
+import "../models/ServiceStateModel.js" as ServiceStateModel
 import "../models/SettingsModel.js" as SettingsModel
 
 QtObject {
@@ -178,7 +179,8 @@ QtObject {
     compare(parsed, {
       error: "",
       iconStyle: "themed",
-      webUiTheme: "default"
+      webUiTheme: "default",
+      serviceState: "enabled"
     }, "versioned settings")
     compare(SettingsModel.parse([
       "icon_style = \"branded\"",
@@ -186,16 +188,46 @@ QtObject {
     ].join("\n")), {
       error: "",
       iconStyle: "branded",
-      webUiTheme: "omarchy"
+      webUiTheme: "omarchy",
+      serviceState: "enabled"
     }, "legacy flat settings")
     compare(SettingsModel.defaults(true), {
       iconStyle: "themed",
-      webUiTheme: "omarchy"
+      webUiTheme: "omarchy",
+      serviceState: "enabled"
     }, "legacy themed icon migration")
     compare(SettingsModel.defaults(false), {
       iconStyle: "branded",
-      webUiTheme: "omarchy"
+      webUiTheme: "omarchy",
+      serviceState: "enabled"
     }, "implicit defaults")
+    compare(SettingsModel.parse([
+      "version = 1",
+      "",
+      "[style]",
+      "icon_style = \"branded\"",
+      "web_ui_theme = \"omarchy\"",
+      "",
+      "[service]",
+      "service_state = \"disabled\""
+    ].join("\n")), {
+      error: "",
+      iconStyle: "branded",
+      webUiTheme: "omarchy",
+      serviceState: "disabled"
+    }, "service settings")
+    compare(SettingsModel.parse([
+      "icon_style = \"themed\"",
+      "web_ui_theme = \"default\"",
+      "",
+      "[service]",
+      "service_state = \"disabled\""
+    ].join("\n")), {
+      error: "",
+      iconStyle: "themed",
+      webUiTheme: "default",
+      serviceState: "disabled"
+    }, "legacy settings with service section")
     compare(SettingsModel.parse([
       "icon_style = \"branded\"",
       "web_ui_theme = \"unknown\""
@@ -223,6 +255,97 @@ QtObject {
       "web_ui_theme = \"omarchy\""
     ].join("\n")).error,
       "Style settings must be inside [style]", "unscoped style setting")
+    compare(SettingsModel.parse([
+      "icon_style = \"branded\"",
+      "web_ui_theme = \"omarchy\"",
+      "[service]",
+      "service_state = \"automatic\""
+    ].join("\n")).error,
+      "service_state must be enabled or disabled", "invalid service state")
+  }
+
+  function actionSummary(action) {
+    return {
+      side: action.side,
+      value: action.value,
+      preferred: action.preferred,
+      label: action.label
+    }
+  }
+
+  function testServiceStateModel() {
+    var runtimeStates = ["active", "inactive"]
+    var configuredStates = ["enabled", "disabled"]
+    for (var runtimeIndex = 0; runtimeIndex < runtimeStates.length;
+        runtimeIndex++) {
+      for (var configIndex = 0; configIndex < configuredStates.length;
+          configIndex++) {
+        var aligned = ServiceStateModel.decision(
+          configuredStates[configIndex], configuredStates[configIndex],
+          runtimeStates[runtimeIndex])
+        compare(aligned.status, "aligned", "aligned service state")
+      }
+    }
+
+    var cases = [{
+      runtime: "active", config: "enabled", unit: "disabled",
+      message: "Syncthing config (enabled) differs from its systemd "
+        + "autostart setting (disabled).\n\nPlease choose:",
+      first: ["system", "enabled",
+        "Enable systemd autostart (preferred)"],
+      second: ["config", "disabled", "Set Syncthing config to disabled"]
+    }, {
+      runtime: "active", config: "disabled", unit: "enabled",
+      message: "Syncthing config (disabled) differs from its systemd "
+        + "autostart setting (enabled).\n\nPlease choose:",
+      first: ["config", "enabled",
+        "Set Syncthing config to enabled (preferred)"],
+      second: ["system", "disabled", "Disable systemd autostart"]
+    }, {
+      runtime: "inactive", config: "disabled", unit: "enabled",
+      message: "Syncthing config (disabled) differs from its systemd "
+        + "autostart setting (enabled).\n\nPlease choose:",
+      first: ["system", "disabled",
+        "Disable systemd autostart (preferred)"],
+      second: ["config", "enabled", "Set Syncthing config to enabled"]
+    }, {
+      runtime: "inactive", config: "enabled", unit: "disabled",
+      message: "Syncthing config (enabled) differs from its systemd "
+        + "autostart setting (disabled).\n\nPlease choose:",
+      first: ["config", "disabled",
+        "Set Syncthing config to disabled (preferred)"],
+      second: ["system", "enabled", "Enable systemd autostart"]
+    }]
+    for (var i = 0; i < cases.length; i++) {
+      var current = cases[i]
+      var decision = ServiceStateModel.decision(
+        current.config, current.unit, current.runtime)
+      compare(decision.status, "drift", "divergent service state")
+      compare(decision.message, current.message, "service state message")
+      compare(actionSummary(decision.first), {
+        side: current.first[0], value: current.first[1], preferred: true,
+        label: current.first[2]
+      }, "preferred service action")
+      compare(actionSummary(decision.second), {
+        side: current.second[0], value: current.second[1], preferred: false,
+        label: current.second[2]
+      }, "alternate service action")
+    }
+
+    compare(ServiceStateModel.decision(
+      "enabled", "masked", "inactive").status,
+      "unsupported", "masked unit state")
+    compare(ServiceStateModel.decision(
+      "enabled", "disabled", "activating").status,
+      "unsupported", "transitional runtime state")
+    compare(ServiceStateModel.persistenceCommand("enabled"), [
+      "systemctl", "--user", "enable", "syncthing.service"
+    ], "enable persistence command")
+    compare(ServiceStateModel.persistenceCommand("disabled"), [
+      "systemctl", "--user", "disable", "syncthing.service"
+    ], "disable persistence command")
+    compare(ServiceStateModel.persistenceCommand("masked"), [],
+      "unsupported persistence command")
   }
 
   Component.onCompleted: {
@@ -232,6 +355,7 @@ QtObject {
       testModels()
       testPendingFolderOffers()
       testSettings()
+      testServiceStateModel()
       console.log("all tests passed")
       Qt.exit(0)
     } catch (error) {
diff --git a/tests/scripts.test.sh b/tests/scripts.test.sh
index bfe1b03..94d768f 100755
--- a/tests/scripts.test.sh
+++ b/tests/scripts.test.sh
@@ -20,6 +20,50 @@ test_settings() {
     || fail "style section was not seeded"
   grep -Eq '^icon_style[[:space:]]*=[[:space:]]*"themed"' "$target" \
     || fail "legacy icon choice was not seeded"
+  grep -Eq '^service_state[[:space:]]*=[[:space:]]*"enabled"' "$target" \
+    || fail "service state was not seeded"
+
+  bash "$root/scripts/syncthing-settings.sh" set-service-state \
+    "$root/config/settings.toml" "$target" themed disabled >/dev/null
+  grep -Eq '^service_state[[:space:]]*=[[:space:]]*"disabled"' "$target" \
+    || fail "service state was not updated"
+  [[ $(grep -c '^service_state[[:space:]]*=' "$target") == 1 ]] \
+    || fail "service state update created a duplicate"
+  grep -Eq '^icon_style[[:space:]]*=[[:space:]]*"themed"' "$target" \
+    || fail "service state update changed icon style"
+
+  local legacy="$test_root/settings/config/legacy.toml"
+  printf '%s\n' \
+    'icon_style = "branded"' \
+    'web_ui_theme = "default"' \
+    >"$legacy"
+  bash "$root/scripts/syncthing-settings.sh" set-service-state \
+    "$root/config/settings.toml" "$legacy" branded disabled >/dev/null
+  grep -Fxq '[service]' "$legacy" \
+    || fail "legacy settings did not receive a service section"
+  grep -Eq '^service_state[[:space:]]*=[[:space:]]*"disabled"' "$legacy" \
+    || fail "legacy settings did not receive the service state"
+  grep -Fxq 'web_ui_theme = "default"' "$legacy" \
+    || fail "legacy settings were not preserved"
+
+  local invalid="$test_root/settings/config/invalid.toml"
+  local invalid_before
+  printf '%s\n' \
+    'icon_style = "branded"' \
+    'web_ui_theme = "default"' \
+    '[service]' \
+    'service_state = "enabled"' \
+    'service_state = "disabled"' \
+    >"$invalid"
+  invalid_before=$(<"$invalid")
+  if bash "$root/scripts/syncthing-settings.sh" set-service-state \
+      "$root/config/settings.toml" "$invalid" branded enabled \
+      >/dev/null 2>&1; then
+    fail "invalid service settings update succeeded"
+  fi
+  [[ $(<"$invalid") == "$invalid_before" ]] \
+    || fail "failed service settings update changed the file"
+
   printf '%s\n' '# user-owned' >"$target"
   bash "$root/scripts/syncthing-settings.sh" ensure \
     "$root/config/settings.toml" "$target" branded >/dev/null
@@ -27,6 +71,38 @@ test_settings() {
     || fail "existing settings were overwritten"
 }
 
+test_installation_status() {
+  local sandbox="$test_root/installation-status"
+  local fake_bin="$sandbox/bin"
+  local output
+  mkdir -p -- "$fake_bin" "$sandbox/home" "$sandbox/runtime"
+  printf '%s\n' '#!/bin/bash' 'exit 0' >"$fake_bin/syncthing"
+  printf '%s\n' \
+    '#!/bin/bash' \
+    'set -euo pipefail' \
+    'case " $* " in' \
+    '  *" --property=LoadState "*) printf '\''loaded\n'\'' ;;' \
+    '  *" --property=ActiveState "*) printf '\''inactive\n'\'' ;;' \
+    '  *" --property=UnitFileState "*) printf '\''disabled\n'\'' ;;' \
+    '  *) exit 1 ;;' \
+    'esac' \
+    >"$fake_bin/systemctl"
+  chmod 700 -- "$fake_bin/syncthing" "$fake_bin/systemctl"
+
+  output=$(HOME="$sandbox/home" \
+    XDG_RUNTIME_DIR="$sandbox/runtime" \
+    PATH="$fake_bin:$PATH" \
+    bash "$root/scripts/syncthing-install.sh" status)
+  jq -e '
+    .state == "existing"
+    and .serviceAvailable == true
+    and .serviceRunning == false
+    and .serviceActiveState == "inactive"
+    and .unitFileState == "disabled"
+  ' <<<"$output" >/dev/null \
+    || fail "installation status omitted systemd service state"
+}
+
 test_themes() {
   local theme colors version
   local themes_root="$HOME/.local/share/omarchy/themes"
@@ -178,6 +254,7 @@ test_removal_mode() {
 }
 
 test_settings
+test_installation_status
 test_themes
 test_removal_mode preserve link
 test_removal_mode purge link
diff --git a/tests/service-state.test.sh b/tests/service-state.test.sh
new file mode 100755
index 0000000..523b928
--- /dev/null
+++ b/tests/service-state.test.sh
@@ -0,0 +1,56 @@
+#!/bin/bash
+set -euo pipefail
+
+root=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")/.." && pwd)
+test_root=$(mktemp -d /tmp/syncshell-service-state.XXXXXX)
+trap 'find "$test_root" -depth -delete' EXIT
+fake_bin="$test_root/bin"
+state_file="$test_root/unit-file-state"
+mkdir -p -- "$fake_bin" "$test_root/home" "$test_root/runtime"
+printf 'disabled\n' >"$state_file"
+
+printf '%s\n' '#!/bin/bash' 'exit 0' >"$fake_bin/syncthing"
+# Fake variables expand only when the generated command runs.
+# shellcheck disable=SC2016
+printf '%s\n' \
+  '#!/bin/bash' \
+  'set -euo pipefail' \
+  'action=""' \
+  'property=""' \
+  'for argument in "$@"; do' \
+  '  case "$argument" in' \
+  '    show|enable|disable) action=$argument ;;' \
+  '    --property=*) property=${argument#--property=} ;;' \
+  '  esac' \
+  'done' \
+  'case "$action:$property" in' \
+  '  show:LoadState) printf '\''loaded\n'\'' ;;' \
+  '  show:ActiveState) printf '\''inactive\n'\'' ;;' \
+  '  show:UnitFileState) cat -- "$SYNCSHELL_SYSTEMCTL_STATE" ;;' \
+  '  enable:)' \
+  '    if [[ ${SYNCSHELL_EXPECT_SYSTEMCTL_FAILURE:-0} == 1 ]]; then' \
+  '      printf '\''permission denied\n'\'' >&2' \
+  '      exit 5' \
+  '    fi' \
+  '    printf '\''enabled\n'\'' >"$SYNCSHELL_SYSTEMCTL_STATE"' \
+  '    ;;' \
+  '  disable:) printf '\''disabled\n'\'' >"$SYNCSHELL_SYSTEMCTL_STATE" ;;' \
+  '  *) exit 1 ;;' \
+  'esac' \
+  >"$fake_bin/systemctl"
+chmod 700 -- "$fake_bin/syncthing" "$fake_bin/systemctl"
+
+run_case() {
+  local expect_failure=$1
+  printf 'disabled\n' >"$state_file"
+  HOME="$test_root/home" \
+    PATH="$fake_bin:$PATH" \
+    SYNCSHELL_EXPECT_SYSTEMCTL_FAILURE="$expect_failure" \
+    SYNCSHELL_INSTALL_HELPER="$root/scripts/syncthing-install.sh" \
+    SYNCSHELL_SYSTEMCTL_STATE="$state_file" \
+    qs --no-color -p "$root/tests-service-state.qml"
+}
+
+run_case 0
+run_case 1
+printf 'all service state controller tests passed\n'
diff --git a/ui/ServiceStateDialog.qml b/ui/ServiceStateDialog.qml
new file mode 100644
index 0000000..4add7a0
--- /dev/null
+++ b/ui/ServiceStateDialog.qml
@@ -0,0 +1,124 @@
+import QtQuick
+import qs.Commons
+
+FocusScope {
+  id: root
+
+  property bool opened: false
+  property bool busy: false
+  property int selectedChoice: 0
+  property string message: ""
+  property string primaryText: ""
+  property string secondaryText: ""
+  property string fontFamily: Style.font.family
+
+  signal actionRequested(int index)
+
+  function choose() {
+    if (!busy) actionRequested(selectedChoice)
+  }
+
+  visible: opened
+  onOpenedChanged: if (opened) selectedChoice = 0
+
+  Rectangle {
+    anchors.fill: parent
+    color: Util.alpha(Color.menu.background, 0.88)
+
+    MouseArea {
+      anchors.fill: parent
+    }
+
+    Rectangle {
+      width: Math.min(parent.width - Style.spacing.panelPadding * 2,
+        Style.space(480))
+      height: content.implicitHeight + Style.spacing.panelPadding * 2
+      anchors.centerIn: parent
+      radius: Style.cornerRadius
+      color: Color.menu.background
+      border.width: Math.max(1, Style.space(1))
+      border.color: Util.alpha(Color.menu.text, 0.18)
+
+      MouseArea {
+        anchors.fill: parent
+        onClicked: {}
+      }
+
+      Column {
+        id: content
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.top: parent.top
+        anchors.margins: Style.spacing.panelPadding
+        spacing: Style.space(6)
+
+        Text {
+          width: parent.width
+          bottomPadding: Style.spacing.sm
+          text: root.message
+          textFormat: Text.PlainText
+          color: Color.menu.text
+          font.family: root.fontFamily
+          font.pixelSize: Style.font.body
+          wrapMode: Text.WordWrap
+        }
+
+        Repeater {
+          model: [root.primaryText, root.secondaryText]
+
+          delegate: Rectangle {
+            id: choiceRow
+            required property int index
+            required property string modelData
+
+            width: content.width
+            height: Math.max(Style.space(40), choiceText.implicitHeight
+              + Style.spacing.md * 2)
+            radius: Style.cornerRadius
+            color: root.selectedChoice === index
+              ? Color.menu.selectedBackground : "transparent"
+            border.width: Math.max(1, Style.space(1))
+            border.color: root.selectedChoice === index
+              ? Color.menu.selectedText : Util.alpha(Color.menu.text, 0.18)
+
+            Text {
+              id: choiceText
+              anchors.left: parent.left
+              anchors.right: parent.right
+              anchors.verticalCenter: parent.verticalCenter
+              anchors.margins: Style.spacing.md
+              text: choiceRow.modelData
+              textFormat: Text.PlainText
+              color: root.selectedChoice === choiceRow.index
+                ? Color.menu.selectedText : Color.menu.text
+              font.family: root.fontFamily
+              font.pixelSize: Style.font.caption
+              wrapMode: Text.WordWrap
+            }
+
+            MouseArea {
+              anchors.fill: parent
+              enabled: !root.busy
+              hoverEnabled: true
+              cursorShape: Qt.PointingHandCursor
+              onEntered: root.selectedChoice = index
+              onClicked: root.actionRequested(index)
+            }
+          }
+        }
+
+        Text {
+          visible: root.busy
+          width: parent.width
+          topPadding: Style.spacing.sm
+          text: "Applying Syncthing setting..."
+          textFormat: Text.PlainText
+          color: Util.alpha(Color.menu.text, 0.66)
+          font.family: root.fontFamily
+          font.pixelSize: Style.font.caption
+          horizontalAlignment: Text.AlignRight
+        }
+      }
+    }
+  }
+}
diff --git a/ui/SyncthingPanelPopup.qml b/ui/SyncthingPanelPopup.qml
index 815703e..45a7834 100644
--- a/ui/SyncthingPanelPopup.qml
+++ b/ui/SyncthingPanelPopup.qml
@@ -43,7 +43,9 @@ KeyboardPanel {
         anchors.fill: parent
         blocked: root.controller.addOpen || moreDetails.folderPopupOpen || moreDetails.pendingPopupOpen
         onCloseRequested: {
-            if (root.controller.removalConfirmOpen) {
+            if (root.controller.serviceStateDialogOpen) {
+                root.controller.close();
+            } else if (root.controller.removalConfirmOpen) {
                 root.controller.removalConfirmOpen = false;
             } else if (root.controller.settingsMenuOpen) {
                 root.controller.closeSettingsMenu();
@@ -56,7 +58,9 @@ KeyboardPanel {
                 root.controller.close();
         }
         onTabRequested: function (direction) {
-            if (root.controller.removalConfirmOpen) {
+            if (root.controller.serviceStateDialogOpen) {
+                serviceStateDialog.selectedChoice = serviceStateDialog.selectedChoice === 0 ? 1 : 0;
+            } else if (root.controller.removalConfirmOpen) {
                 removalDialog.selectedChoice = (removalDialog.selectedChoice + (direction > 0 ? 1 : 2)) % 3;
             } else if (root.controller.settingsMenuOpen) {
                 root.controller.moveSettingsSelection(direction);
@@ -64,7 +68,9 @@ KeyboardPanel {
                 root.controller.switchPanel(direction);
         }
         onMoveRequested: function (dx, dy) {
-            if (root.controller.removalConfirmOpen && dy !== 0) {
+            if (root.controller.serviceStateDialogOpen && (dx !== 0 || dy !== 0)) {
+                serviceStateDialog.selectedChoice = serviceStateDialog.selectedChoice === 0 ? 1 : 0;
+            } else if (root.controller.removalConfirmOpen && dy !== 0) {
                 removalDialog.selectedChoice = (removalDialog.selectedChoice + (dy > 0 ? 1 : 2)) % 3;
             } else if (root.controller.settingsMenuOpen && dy !== 0) {
                 root.controller.moveSettingsSelection(dy);
@@ -75,7 +81,9 @@ KeyboardPanel {
             }
         }
         onActivateRequested: {
-            if (root.controller.removalConfirmOpen) {
+            if (root.controller.serviceStateDialogOpen) {
+                serviceStateDialog.choose();
+            } else if (root.controller.removalConfirmOpen) {
                 removalDialog.choose();
             } else if (root.controller.settingsMenuOpen) {
                 root.controller.activateSettingsSelection();
@@ -89,6 +97,11 @@ KeyboardPanel {
         }
         onTextKey: function (text) {
             var key = text.toLowerCase();
+            if (root.controller.serviceStateDialogOpen) {
+                if (key === "q")
+                    root.controller.close();
+                return;
+            }
             if (root.controller.removalConfirmOpen) {
                 if (key === "q")
                     root.controller.removalConfirmOpen = false;
@@ -296,6 +309,26 @@ KeyboardPanel {
         font.letterSpacing: 0.8
     }
 
+    ServiceStateDialog {
+        id: serviceStateDialog
+        parent: keyCatcher
+        anchors.fill: parent
+        opened: root.controller.serviceStateDialogOpen
+        busy: root.controller.syncthing
+            ? root.controller.syncthing.serviceStateActionRunning : false
+        message: root.controller.syncthing
+            ? root.controller.syncthing.serviceStateMessage : ""
+        primaryText: root.controller.syncthing
+            ? root.controller.syncthing.serviceStatePrimaryLabel : ""
+        secondaryText: root.controller.syncthing
+            ? root.controller.syncthing.serviceStateSecondaryLabel : ""
+        fontFamily: root.controller.fontFamily
+        z: 12
+        onActionRequested: function (index) {
+            root.controller.chooseServiceStateAction(index);
+        }
+    }
+
     CompactConfirmDialog {
         id: forgetDialog
         parent: keyCatcher

From 743318a771675a3a2d7150d46dee1a86e04df29e Mon Sep 17 00:00:00 2001
From: IlyaZar <zarubin@wiso.uni-koeln.de>
Date: Thu, 27 Aug 2026 16:45:30 +0200
Subject: [PATCH 2/6] feat: configure service probe interval

- keep external systemd checks tunable
- reject unsafe polling intervals
---
 Service.qml                     |  2 ++
 config/settings.toml            |  2 ++
 core/InstallationController.qml |  3 ++-
 core/SettingsController.qml     |  4 ++++
 models/SettingsModel.js         | 37 +++++++++++++++++++++++++++------
 scripts/syncthing-settings.sh   |  1 +
 tests-service-state.qml         |  1 +
 tests/run.qml                   | 29 +++++++++++++++++++-------
 tests/scripts.test.sh           |  2 ++
 9 files changed, 67 insertions(+), 14 deletions(-)

diff --git a/Service.qml b/Service.qml
index 747e4f1..92845c1 100644
--- a/Service.qml
+++ b/Service.qml
@@ -58,6 +58,7 @@ QtObject {
   readonly property string settingsNotice: settings.notice
   readonly property bool settingsReady: settings.settingsReady
   readonly property string configuredServiceState: settings.serviceState
+  readonly property int probeIntervalSeconds: settings.probeIntervalSeconds
   readonly property string serviceActiveState: installation.serviceActiveState
   readonly property string serviceUnitFileState: installation.unitFileState
   readonly property var serviceStateDecision: ServiceStateModel.decision(
@@ -126,6 +127,7 @@ QtObject {
   property InstallationController installation: InstallationController {
     helperPath: root.helperPath
     folderMutationBusy: root.folderMutationBusy
+    probeIntervalSeconds: root.probeIntervalSeconds
     onRuntimeUnavailable: function(nextPhase) { root.stopApi(nextPhase) }
     onRuntimeAvailable: {
       if (!root._apiKey && !apiKeyProcess.running) root.refreshApi()
diff --git a/config/settings.toml b/config/settings.toml
index 02d84d9..94ee65e 100644
--- a/config/settings.toml
+++ b/config/settings.toml
@@ -9,3 +9,5 @@ web_ui_theme = "omarchy"
 [service]
 # Persistent Syncthing user-service state, independent of the runtime toggle
 service_state = "enabled"
+# Seconds between probes for external systemd state changes
+probe_interval_seconds = 15
diff --git a/core/InstallationController.qml b/core/InstallationController.qml
index 58e53db..131ba91 100644
--- a/core/InstallationController.qml
+++ b/core/InstallationController.qml
@@ -15,6 +15,7 @@ QtObject {
   property bool serviceRunning: false
   property string serviceActiveState: "inactive"
   property string unitFileState: "not-found"
+  property int probeIntervalSeconds: 15
   property bool operationRunning: false
   property bool refreshing: false
   property bool packageActionRunning: false
@@ -167,7 +168,7 @@ QtObject {
   }
 
   property Timer statusTimer: Timer {
-    interval: 15000
+    interval: Math.max(1, root.probeIntervalSeconds) * 1000
     repeat: true
     running: true
     triggeredOnStart: true
diff --git a/core/SettingsController.qml b/core/SettingsController.qml
index 0998ae8..0d7b5db 100644
--- a/core/SettingsController.qml
+++ b/core/SettingsController.qml
@@ -29,6 +29,8 @@ QtObject {
   property string iconStyle: SettingsModel.DefaultIconStyle
   property string webUiTheme: SettingsModel.DefaultWebUiTheme
   property string serviceState: SettingsModel.DefaultServiceState
+  property int probeIntervalSeconds:
+    SettingsModel.DefaultProbeIntervalSeconds
   property string currentWebUiTheme: ""
   property string guiAssetsPath: ""
   property string error: ""
@@ -66,6 +68,7 @@ QtObject {
     iconStyle = parsed.iconStyle
     webUiTheme = parsed.webUiTheme
     serviceState = parsed.serviceState
+    probeIntervalSeconds = parsed.probeIntervalSeconds
     error = ""
     scheduleReconcile()
   }
@@ -78,6 +81,7 @@ QtObject {
     iconStyle = values.iconStyle
     webUiTheme = values.webUiTheme
     serviceState = values.serviceState
+    probeIntervalSeconds = values.probeIntervalSeconds
     error = ""
     scheduleReconcile()
   }
diff --git a/models/SettingsModel.js b/models/SettingsModel.js
index 5825c9f..9bb5068 100644
--- a/models/SettingsModel.js
+++ b/models/SettingsModel.js
@@ -3,6 +3,9 @@
 var DefaultIconStyle = "branded"
 var DefaultWebUiTheme = "omarchy"
 var DefaultServiceState = "enabled"
+var DefaultProbeIntervalSeconds = 15
+var MinimumProbeIntervalSeconds = 1
+var MaximumProbeIntervalSeconds = 3600
 var SupportedVersion = 1
 
 function stripComment(line) {
@@ -31,6 +34,11 @@ function parseVersion(raw) {
   return /^(0|[1-9][0-9]*)$/.test(value) ? Number(value) : null
 }
 
+function parseInteger(raw) {
+  var value = String(raw || "").trim()
+  return /^(0|[1-9][0-9]*)$/.test(value) ? Number(value) : null
+}
+
 function parse(raw) {
   var values = ({})
   var lines = String(raw || "").split("\n")
@@ -76,6 +84,7 @@ function parse(raw) {
     }
     var styleSetting = key === "icon_style" || key === "web_ui_theme"
     var serviceSetting = key === "service_state"
+      || key === "probe_interval_seconds"
     if ((section === "service" && !serviceSetting)
         || (section !== "service" && !styleSetting)) {
       return { error: "Unknown setting " + (section ? section + "." : "")
@@ -85,11 +94,21 @@ function parse(raw) {
     if (values[key] !== undefined) {
       return { error: "Duplicate setting " + key + " on line " + (i + 1) }
     }
-    var value = parseValue(assignment[2])
-    if (value === null) {
-      return { error: key + " must use a quoted value" }
+    if (key === "probe_interval_seconds") {
+      var interval = parseInteger(assignment[2])
+      if (interval === null || interval < MinimumProbeIntervalSeconds
+          || interval > MaximumProbeIntervalSeconds) {
+        return { error: "probe_interval_seconds must be an integer between "
+          + MinimumProbeIntervalSeconds + " and " + MaximumProbeIntervalSeconds }
+      }
+      values[key] = interval
+    } else {
+      var value = parseValue(assignment[2])
+      if (value === null) {
+        return { error: key + " must use a quoted value" }
+      }
+      values[key] = value
     }
-    values[key] = value
   }
 
   if (version !== null || styleSectionSeen) {
@@ -121,11 +140,16 @@ function parse(raw) {
   if (["enabled", "disabled"].indexOf(values.service_state) < 0) {
     return { error: "service_state must be enabled or disabled" }
   }
+  if (values.probe_interval_seconds === undefined) {
+    values.probe_interval_seconds = DefaultProbeIntervalSeconds
+  }
+
   return {
     error: "",
     iconStyle: values.icon_style,
     webUiTheme: values.web_ui_theme,
-    serviceState: values.service_state
+    serviceState: values.service_state,
+    probeIntervalSeconds: values.probe_interval_seconds
   }
 }
 
@@ -133,6 +157,7 @@ function defaults(legacyThemedIcon) {
   return {
     iconStyle: legacyThemedIcon === true ? "themed" : DefaultIconStyle,
     webUiTheme: DefaultWebUiTheme,
-    serviceState: DefaultServiceState
+    serviceState: DefaultServiceState,
+    probeIntervalSeconds: DefaultProbeIntervalSeconds
   }
 }
diff --git a/scripts/syncthing-settings.sh b/scripts/syncthing-settings.sh
index d1176bb..0f89250 100755
--- a/scripts/syncthing-settings.sh
+++ b/scripts/syncthing-settings.sh
@@ -85,6 +85,7 @@ write_service_state() {
         if (NR > 0) print ""
         print "[service]"
         write_state()
+        print "probe_interval_seconds = 15"
       } else if (in_service && !state_seen) {
         write_state()
       }
diff --git a/tests-service-state.qml b/tests-service-state.qml
index ffdaf5b..6b611c7 100644
--- a/tests-service-state.qml
+++ b/tests-service-state.qml
@@ -22,6 +22,7 @@ ShellRoot {
 
   property InstallationController controller: InstallationController {
     helperPath: Quickshell.env("SYNCSHELL_INSTALL_HELPER")
+    probeIntervalSeconds: 3600
   }
 
   property Timer pollTimer: Timer {
diff --git a/tests/run.qml b/tests/run.qml
index 217db95..6aa6844 100644
--- a/tests/run.qml
+++ b/tests/run.qml
@@ -180,7 +180,8 @@ QtObject {
       error: "",
       iconStyle: "themed",
       webUiTheme: "default",
-      serviceState: "enabled"
+      serviceState: "enabled",
+      probeIntervalSeconds: 15
     }, "versioned settings")
     compare(SettingsModel.parse([
       "icon_style = \"branded\"",
@@ -189,17 +190,20 @@ QtObject {
       error: "",
       iconStyle: "branded",
       webUiTheme: "omarchy",
-      serviceState: "enabled"
+      serviceState: "enabled",
+      probeIntervalSeconds: 15
     }, "legacy flat settings")
     compare(SettingsModel.defaults(true), {
       iconStyle: "themed",
       webUiTheme: "omarchy",
-      serviceState: "enabled"
+      serviceState: "enabled",
+      probeIntervalSeconds: 15
     }, "legacy themed icon migration")
     compare(SettingsModel.defaults(false), {
       iconStyle: "branded",
       webUiTheme: "omarchy",
-      serviceState: "enabled"
+      serviceState: "enabled",
+      probeIntervalSeconds: 15
     }, "implicit defaults")
     compare(SettingsModel.parse([
       "version = 1",
@@ -209,12 +213,14 @@ QtObject {
       "web_ui_theme = \"omarchy\"",
       "",
       "[service]",
-      "service_state = \"disabled\""
+      "service_state = \"disabled\"",
+      "probe_interval_seconds = 27"
     ].join("\n")), {
       error: "",
       iconStyle: "branded",
       webUiTheme: "omarchy",
-      serviceState: "disabled"
+      serviceState: "disabled",
+      probeIntervalSeconds: 27
     }, "service settings")
     compare(SettingsModel.parse([
       "icon_style = \"themed\"",
@@ -226,7 +232,8 @@ QtObject {
       error: "",
       iconStyle: "themed",
       webUiTheme: "default",
-      serviceState: "disabled"
+      serviceState: "disabled",
+      probeIntervalSeconds: 15
     }, "legacy settings with service section")
     compare(SettingsModel.parse([
       "icon_style = \"branded\"",
@@ -262,6 +269,14 @@ QtObject {
       "service_state = \"automatic\""
     ].join("\n")).error,
       "service_state must be enabled or disabled", "invalid service state")
+    compare(SettingsModel.parse([
+      "icon_style = \"branded\"",
+      "web_ui_theme = \"omarchy\"",
+      "[service]",
+      "probe_interval_seconds = 0"
+    ].join("\n")).error,
+      "probe_interval_seconds must be an integer between 1 and 3600",
+      "invalid probe interval")
   }
 
   function actionSummary(action) {
diff --git a/tests/scripts.test.sh b/tests/scripts.test.sh
index 94d768f..b114c7e 100755
--- a/tests/scripts.test.sh
+++ b/tests/scripts.test.sh
@@ -22,6 +22,8 @@ test_settings() {
     || fail "legacy icon choice was not seeded"
   grep -Eq '^service_state[[:space:]]*=[[:space:]]*"enabled"' "$target" \
     || fail "service state was not seeded"
+  grep -Eq '^probe_interval_seconds[[:space:]]*=[[:space:]]*15$' "$target" \
+    || fail "service probe interval was not seeded"
 
   bash "$root/scripts/syncthing-settings.sh" set-service-state \
     "$root/config/settings.toml" "$target" themed disabled >/dev/null

From abe94d3e1e409d15ec27280287b9aff7e786fc77 Mon Sep 17 00:00:00 2001
From: IlyaZar <zarubin@wiso.uni-koeln.de>
Date: Thu, 27 Aug 2026 14:57:24 +0200
Subject: [PATCH 3/6] feat: add folder rescan controls

- make one folder or every folder rescannable
- keep the local host identity available while stopped
- tighten the top level service controls
---
 Panel.qml                   |  4 +-
 Service.qml                 | 47 +++++++++++++++++++++++
 core/FolderController.qml   | 33 +++++++++++++++++
 models/PanelModel.js        |  2 +
 tests-folder-rescan.qml     | 74 +++++++++++++++++++++++++++++++++++++
 tests/folder-rescan.test.sh |  5 +++
 tests/run.qml               |  5 +++
 ui/FolderCard.qml           | 26 ++++++++-----
 ui/FolderOverview.qml       |  2 +
 ui/PanelStatus.qml          | 51 +++++++++++++++++++------
 ui/SyncthingPanelPopup.qml  | 29 ++++++++++-----
 11 files changed, 246 insertions(+), 32 deletions(-)
 create mode 100644 tests-folder-rescan.qml
 create mode 100755 tests/folder-rescan.test.sh

diff --git a/Panel.qml b/Panel.qml
index 03e8642..6966915 100644
--- a/Panel.qml
+++ b/Panel.qml
@@ -130,8 +130,8 @@ Panel {
   }
 
   function copyLocalDeviceId() {
-    copyToClipboard(syncthing ? syncthing.localDeviceId : "",
-      "Device ID copied")
+    copyToClipboard(syncthing ? syncthing.displayDeviceId : "",
+      "Host ID copied")
   }
 
   function copyFolderId(folderId) {
diff --git a/Service.qml b/Service.qml
index 92845c1..c52bdb6 100644
--- a/Service.qml
+++ b/Service.qml
@@ -23,6 +23,14 @@ QtObject {
   property var pendingFolders: ({})
   property var folderStatuses: ({})
   property string localDeviceId: ""
+  readonly property string lastKnownLocalDeviceId:
+    identityState.localDeviceId
+  readonly property string lastKnownLocalDeviceName:
+    identityState.localDeviceName
+  readonly property string displayDeviceId: localDeviceId
+    || lastKnownLocalDeviceId
+  readonly property string displayDeviceName: currentLocalDeviceName()
+    || lastKnownLocalDeviceName
   readonly property var syncingFiles: activityTracker.syncingFiles
 
   readonly property bool folderMutationBusy: folderController.mutationBusy
@@ -92,6 +100,12 @@ QtObject {
   property var _requests: []
   property string _keyOutput: ""
 
+  property PersistentProperties identityState: PersistentProperties {
+    reloadableId: "syncshell-local-device-identity"
+    property string localDeviceId: ""
+    property string localDeviceName: ""
+  }
+
   readonly property bool online: phase === "ready"
   readonly property bool serviceActive: installation.serviceActive
   readonly property bool serviceActionRunning: installation.serviceActionRunning
@@ -105,6 +119,9 @@ QtObject {
   readonly property int syncingFolderCount: countSyncingFolders()
   readonly property string summaryText: summary()
 
+  onLocalDeviceIdChanged: rememberLocalIdentity()
+  onDevicesChanged: rememberLocalIdentity()
+
   property ActivityTracker activityTracker: ActivityTracker {
     enabled: root._apiKey !== "" && root.canUseRuntime
       && (!root.serviceAvailable || root.serviceActive)
@@ -186,6 +203,28 @@ QtObject {
     return count
   }
 
+  function currentLocalDeviceName() {
+    if (!localDeviceId) return ""
+    for (var i = 0; i < devices.length; i++) {
+      var device = devices[i] || ({})
+      if (String(device.deviceID || "") === localDeviceId && device.name) {
+        return String(device.name)
+      }
+    }
+    return ""
+  }
+
+  function rememberLocalIdentity() {
+    var id = String(localDeviceId || "")
+    if (!id) return
+    if (id !== identityState.localDeviceId) {
+      identityState.localDeviceId = id
+      identityState.localDeviceName = ""
+    }
+    var name = currentLocalDeviceName()
+    if (name) identityState.localDeviceName = name
+  }
+
   function countFolderProblems() {
     var count = 0
     var ids = Object.keys(folderStatuses)
@@ -370,6 +409,14 @@ QtObject {
     return folderController.setLinked(folderId, linked)
   }
 
+  function rescanFolder(folderId) {
+    return folderController.rescan(folderId)
+  }
+
+  function rescanAllFolders() {
+    return folderController.rescanAll()
+  }
+
   function forgetFolder(folderId) {
     return folderController.forget(folderId)
   }
diff --git a/core/FolderController.qml b/core/FolderController.qml
index 3d74979..56752ab 100644
--- a/core/FolderController.qml
+++ b/core/FolderController.qml
@@ -231,6 +231,39 @@ QtObject {
     }, linked ? "Could not link the folder" : "Could not unlink the folder")
   }
 
+  function rescan(folderId) {
+    var folder = configuredFolder(folderId)
+    if (!folder) {
+      mutationError = "The selected folder is no longer configured"
+      return false
+    }
+    if (folder.paused) {
+      mutationError = "Link the folder before rescanning it"
+      return false
+    }
+    if (!begin("rescan", folder.id)) return false
+    requestMutation("scanFolder", {
+      method: "POST", query: { folder: folder.id }
+    }, function() {
+      root.finish("Rescan requested for " + String(folder.label || folder.id))
+    }, "Could not rescan the folder")
+    return true
+  }
+
+  function rescanAll() {
+    if (folders.length === 0) {
+      mutationError = "No directories are configured"
+      return false
+    }
+    if (!begin("rescan-all", "")) return false
+    requestMutation("scanFolder", {
+      method: "POST"
+    }, function() {
+      root.finish("Rescan complete for all directories")
+    }, "Could not rescan all directories")
+    return true
+  }
+
   function forget(folderId) {
     var folder = configuredFolder(folderId)
     if (!folder) {
diff --git a/models/PanelModel.js b/models/PanelModel.js
index b786678..c4ee140 100644
--- a/models/PanelModel.js
+++ b/models/PanelModel.js
@@ -164,6 +164,8 @@ function deviceName(devices, deviceId) {
 }
 
 function localDeviceName(syncthing, fallback) {
+  var displayName = String(syncthing && syncthing.displayDeviceName || "")
+  if (displayName) return displayName
   var id = String(syncthing && syncthing.localDeviceId || "")
   var devices = syncthing && syncthing.devices ? syncthing.devices : []
   for (var i = 0; i < devices.length; i++) {
diff --git a/tests-folder-rescan.qml b/tests-folder-rescan.qml
new file mode 100644
index 0000000..42375b9
--- /dev/null
+++ b/tests-folder-rescan.qml
@@ -0,0 +1,74 @@
+import QtQuick
+import Quickshell
+import "core"
+
+ShellRoot {
+  id: root
+
+  property var requests: []
+
+  FolderController {
+    id: folderController
+    apiReady: true
+    online: true
+    requestApi: function(name, options) {
+      var next = root.requests.slice()
+      next.push({ name: name, options: options })
+      root.requests = next
+      return { abort: function() {} }
+    }
+  }
+
+  function compare(actual, expected, name) {
+    if (JSON.stringify(actual) !== JSON.stringify(expected)) {
+      throw new Error(name + ": expected " + JSON.stringify(expected)
+        + ", got " + JSON.stringify(actual))
+    }
+  }
+
+  function runTests() {
+    folderController.folders = [{
+      id: "active", label: "Active", paused: false
+    }, {
+      id: "paused", label: "Paused", paused: true
+    }]
+    compare(folderController.rescan("paused"), false,
+      "paused folder rescan rejected")
+    compare(folderController.mutationError,
+      "Link the folder before rescanning it", "paused folder rescan error")
+
+    compare(folderController.rescan("active"), true,
+      "active folder rescan accepted")
+    compare(requests[0], {
+      name: "scanFolder",
+      options: { method: "POST", query: { folder: "active" } }
+    }, "folder rescan request")
+    folderController.cancel("")
+
+    compare(folderController.rescanAll(), true, "all folder rescan accepted")
+    compare(requests[1], {
+      name: "scanFolder", options: { method: "POST" }
+    }, "all folder rescan request")
+    folderController.cancel("")
+
+    folderController.folders = []
+    compare(folderController.rescanAll(), false, "empty folder rescan rejected")
+    compare(folderController.mutationError, "No directories are configured",
+      "empty folder rescan error")
+  }
+
+  Timer {
+    interval: 1
+    running: true
+    onTriggered: {
+      try {
+        root.runTests()
+        console.log("folder rescan tests passed")
+        Qt.exit(0)
+      } catch (error) {
+        console.error(error)
+        Qt.exit(1)
+      }
+    }
+  }
+}
diff --git a/tests/folder-rescan.test.sh b/tests/folder-rescan.test.sh
new file mode 100755
index 0000000..645583a
--- /dev/null
+++ b/tests/folder-rescan.test.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+root=$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)
+qs --no-color -p "$root/tests-folder-rescan.qml"
diff --git a/tests/run.qml b/tests/run.qml
index 6aa6844..c052538 100644
--- a/tests/run.qml
+++ b/tests/run.qml
@@ -128,6 +128,11 @@ QtObject {
       localDeviceId: "local",
       devices: [{ deviceID: "local", name: "optiplex" }]
     }, "fallback"), "optiplex", "configured local device name")
+    compare(PanelModel.localDeviceName({
+      displayDeviceName: "optiplex-sff",
+      localDeviceId: "",
+      devices: []
+    }, "fallback"), "optiplex-sff", "remembered local device name")
     compare(PanelModel.localDeviceName(null, "optiplex-sff"),
       "optiplex-sff", "host name fallback")
   }
diff --git a/ui/FolderCard.qml b/ui/FolderCard.qml
index a791cd1..cefdf12 100644
--- a/ui/FolderCard.qml
+++ b/ui/FolderCard.qml
@@ -7,6 +7,7 @@ BorderSurface {
 
   property var folder: ({})
   property bool selected: false
+  property bool online: false
   property bool mutationBusy: false
   property string stateLabel: "UNKNOWN"
   property color stateColor: foreground
@@ -30,6 +31,7 @@ BorderSurface {
 
   signal openRequested
   signal forgetRequested
+  signal rescanRequested
   signal copyIdRequested(string folderId)
 
   implicitHeight: nameActions.implicitHeight + details.implicitHeight
@@ -112,8 +114,7 @@ BorderSurface {
     anchors.right: parent.right
     anchors.top: nameActions.bottom
     anchors.leftMargin: Style.space(8)
-    anchors.rightMargin: root.folder.paused
-      ? forgetButton.width + Style.space(14) : Style.space(8)
+    anchors.rightMargin: folderActionButton.width + Style.space(14)
     anchors.topMargin: Style.space(6)
     spacing: Style.space(1)
 
@@ -151,24 +152,29 @@ BorderSurface {
   }
 
   Button {
-    id: forgetButton
+    id: folderActionButton
     z: 1
-    visible: root.folder && root.folder.paused
+    visible: root.folder
     anchors.right: parent.right
     anchors.bottom: parent.bottom
     width: implicitWidth
     height: openFolderButton.height
-    iconText: "󰅙"
-    text: "FORGET"
-    tooltipText: "Remove only this unlinked Syncthing configuration"
+    iconText: root.folder.paused ? "󰅙" : "󰑐"
+    text: root.folder.paused ? "FORGET" : "RESCAN"
+    tooltipText: root.folder.paused
+      ? "Remove only this unlinked Syncthing configuration"
+      : "Rescan this folder for local changes"
     bordered: true
-    foreground: root.urgent
+    foreground: root.folder.paused ? root.urgent : root.foreground
     fontFamily: root.fontFamily
     fontSize: Style.font.body
     iconSize: Style.font.body
     horizontalPadding: Style.space(6)
     verticalPadding: Style.space(2)
-    enabled: !root.mutationBusy
-    onClicked: root.forgetRequested()
+    enabled: root.online && !root.mutationBusy
+    onClicked: {
+      if (root.folder.paused) root.forgetRequested()
+      else root.rescanRequested()
+    }
   }
 }
diff --git a/ui/FolderOverview.qml b/ui/FolderOverview.qml
index 68d9189..d85026d 100644
--- a/ui/FolderOverview.qml
+++ b/ui/FolderOverview.qml
@@ -41,6 +41,7 @@ Column {
         folder: modelData
         selected: String(modelData.id || "")
           === root.controller.displayedFolderId
+        online: root.syncthing ? root.syncthing.online : false
         mutationBusy: root.syncthing
           ? root.syncthing.folderMutationBusy : false
         stateLabel: root.controller.folderState(modelData)
@@ -58,6 +59,7 @@ Column {
         fontFamily: root.fontFamily
         onOpenRequested: root.controller.openFolder(modelData)
         onForgetRequested: root.controller.requestForget(modelData)
+        onRescanRequested: root.syncthing.rescanFolder(modelData.id)
         onCopyIdRequested: function(folderId) {
           root.controller.copyFolderId(folderId)
         }
diff --git a/ui/PanelStatus.qml b/ui/PanelStatus.qml
index 41d4cf4..bc9fb19 100644
--- a/ui/PanelStatus.qml
+++ b/ui/PanelStatus.qml
@@ -35,7 +35,7 @@ Column {
       width: parent.width
       title: "Syncthing"
       meta: root.controller.localDeviceName
-        + (root.syncthing && root.syncthing.localDeviceId ? "  󰆏" : "")
+      metaOpacity: 0
       foreground: root.foreground
       fontFamily: root.fontFamily
       iconOpacity: root.syncthing && root.syncthing.serviceActive
@@ -57,6 +57,8 @@ Column {
           visible: header.serviceAvailable
           checked: header.serviceActive
           busy: header.serviceBusy
+          trackHeight: Style.space(16)
+          cursorPad: Style.space(4)
           foreground: hero.foreground
           onToggled: root.controller.toggleSyncing()
 
@@ -69,23 +71,50 @@ Column {
       }
     }
 
-    MouseArea {
-      id: copyDeviceId
+    Item {
+      id: deviceMetaRow
       anchors.left: hero.left
       anchors.leftMargin: hero.iconSize + Style.space(14)
       anchors.right: hero.right
       anchors.rightMargin: hero.trailingInset
       anchors.bottom: hero.bottom
-      height: Style.space(18)
-      enabled: root.syncthing && root.syncthing.localDeviceId !== ""
-      hoverEnabled: enabled
-      cursorShape: enabled ? Qt.PointingHandCursor : Qt.ArrowCursor
-      onClicked: root.controller.copyLocalDeviceId()
+      height: Math.max(deviceNameText.implicitHeight,
+        copyHostIdButton.height)
 
-      PanelToolTip {
-        visible: copyDeviceId.containsMouse
-        text: "Copy Syncthing device ID"
+      Text {
+        id: deviceNameText
+        anchors.left: parent.left
+        anchors.verticalCenter: parent.verticalCenter
+        width: Math.min(implicitWidth, Math.max(0,
+          deviceMetaRow.width - (copyHostIdButton.visible
+            ? copyHostIdButton.width + Style.space(4) : 0)))
+        text: root.controller.localDeviceName.toUpperCase()
+        color: Qt.darker(root.foreground, 1.4)
+        font.family: root.fontFamily
+        font.pixelSize: Style.font.caption
+        font.bold: true
+        font.letterSpacing: 1.2
+        elide: Text.ElideRight
+      }
+
+      Button {
+        id: copyHostIdButton
+        anchors.left: deviceNameText.right
+        anchors.leftMargin: Style.space(4)
+        anchors.verticalCenter: parent.verticalCenter
+        visible: root.syncthing && root.syncthing.displayDeviceId !== ""
+        height: Math.round(deviceNameText.implicitHeight)
+        text: "host ID"
+        iconText: "󰆏"
+        tooltipText: "Copy host ID"
+        bordered: true
+        foreground: root.foreground
         fontFamily: root.fontFamily
+        fontSize: Math.max(Style.space(8), Style.font.caption - 1)
+        iconSize: Math.max(Style.space(7), Style.font.caption - 3)
+        horizontalPadding: Style.space(4)
+        verticalPadding: 0
+        onClicked: root.controller.copyLocalDeviceId()
       }
     }
   }
diff --git a/ui/SyncthingPanelPopup.qml b/ui/SyncthingPanelPopup.qml
index 45a7834..468d4e8 100644
--- a/ui/SyncthingPanelPopup.qml
+++ b/ui/SyncthingPanelPopup.qml
@@ -114,8 +114,8 @@ KeyboardPanel {
             }
             if (root.controller.forgetConfirmOpen)
                 return;
-            if (key === "r" && root.controller.syncthing) {
-                root.controller.syncthing.refresh();
+            if (key === "r" && rescanAllButton.enabled) {
+                root.controller.syncthing.rescanAllFolders();
             } else if (key === "w")
                 root.controller.openWebUi();
             else if (key === "p")
@@ -262,13 +262,22 @@ KeyboardPanel {
             spacing: Style.space(8)
 
             Button {
-                id: refreshButton
-                text: root.controller.syncthing && root.controller.syncthing.refreshing ? "Refreshing…" : "Refresh"
+                id: rescanAllButton
+                iconText: "󰑐"
+                text: root.controller.syncthing
+                    && root.controller.syncthing.folderMutationAction
+                        === "rescan-all"
+                    ? "Rescanning…" : "Rescan all directories"
                 bordered: true
                 foreground: root.controller.foreground
                 fontFamily: root.controller.fontFamily
-                enabled: root.controller.syncthing && !root.controller.syncthing.refreshing && !root.controller.syncthing.folderMutationBusy
-                onClicked: root.controller.syncthing.refresh()
+                iconSize: Style.font.body
+                enabled: root.controller.syncthing
+                    && root.controller.syncthing.online
+                    && root.controller.syncthing.folderCount > 0
+                    && !root.controller.syncthing.refreshing
+                    && !root.controller.syncthing.folderMutationBusy
+                onClicked: root.controller.syncthing.rescanAllFolders()
             }
 
             Button {
@@ -281,8 +290,8 @@ KeyboardPanel {
             }
 
             Button {
-                width: refreshButton.height
-                height: refreshButton.height
+                width: rescanAllButton.height
+                height: rescanAllButton.height
                 iconText: "\uf013"
                 iconSize: Style.font.body
                 tooltipText: "Settings"
@@ -301,7 +310,9 @@ KeyboardPanel {
         z: root.controller.removalConfirmOpen ? 12 : 0
         anchors.horizontalCenter: parent.horizontalCenter
         anchors.bottom: parent.bottom
-        text: root.controller.settingsMenuOpen ? "MOVE (j/k or Up/Down)  SELECT (Enter)  BACK (q/Esc)" : "[r]efresh  [w]eb UI  [p]ause/continue  [s]ettings"
+        text: root.controller.settingsMenuOpen
+            ? "MOVE (j/k or Up/Down)  SELECT (Enter)  BACK (q/Esc)"
+            : "[r]escan all  [w]eb UI  [p]ause/continue  [s]ettings"
         color: root.controller.dim
         font.family: root.controller.fontFamily
         font.pixelSize: Style.font.caption

From 2682dbbe0b6a4b904b0ba4e143e76ac5f19ada9d Mon Sep 17 00:00:00 2001
From: IlyaZar <zarubin@wiso.uni-koeln.de>
Date: Sun, 30 Aug 2026 23:19:19 +0200
Subject: [PATCH 4/6] fix: render plugin text as plain text

- prevent remote values from becoming rich text
- satisfy marketplace security review
---
 ui/ActivityText.qml         | 4 ++++
 ui/AddFolderForm.qml        | 7 +++++++
 ui/CompactConfirmDialog.qml | 2 ++
 ui/FolderCard.qml           | 3 +++
 ui/FolderOverview.qml       | 1 +
 ui/InfoPair.qml             | 1 +
 ui/MoreDetails.qml          | 2 ++
 ui/PanelStatus.qml          | 4 ++++
 ui/SettingsMenu.qml         | 1 +
 ui/SyncthingPanelPopup.qml  | 1 +
 10 files changed, 26 insertions(+)

diff --git a/ui/ActivityText.qml b/ui/ActivityText.qml
index b4e0104..d844654 100644
--- a/ui/ActivityText.qml
+++ b/ui/ActivityText.qml
@@ -27,6 +27,7 @@ Row {
   Text {
     id: activityLabel
     text: root.active ? "File syncing" : " "
+    textFormat: Text.PlainText
     color: root.syncColor
     font.family: root.fontFamily
     font.pixelSize: root.fontSize
@@ -39,6 +40,7 @@ Row {
 
     Text {
       text: root.active ? root.dots : ""
+      textFormat: Text.PlainText
       color: root.syncColor
       font.family: root.fontFamily
       font.pixelSize: root.fontSize
@@ -48,6 +50,7 @@ Row {
       id: dotsProbe
       visible: false
       text: "..."
+      textFormat: Text.PlainText
       font.family: root.fontFamily
       font.pixelSize: root.fontSize
     }
@@ -57,6 +60,7 @@ Row {
     width: Math.max(0, root.width - activityLabel.implicitWidth
       - dotsSlot.width)
     text: root.active ? " " + root.detail : ""
+    textFormat: Text.PlainText
     color: root.actionColor()
     font.family: root.fontFamily
     font.pixelSize: root.fontSize
diff --git a/ui/AddFolderForm.qml b/ui/AddFolderForm.qml
index 8247c84..bfa0029 100644
--- a/ui/AddFolderForm.qml
+++ b/ui/AddFolderForm.qml
@@ -102,6 +102,7 @@ BorderSurface {
       text: encryptedCount + " encrypted folder offer"
         + (encryptedCount === 1 ? " requires" : "s require")
         + " the Syncthing Web UI."
+      textFormat: Text.PlainText
       color: root.warning
       font.family: root.fontFamily
       font.pixelSize: Style.font.caption
@@ -110,6 +111,7 @@ BorderSurface {
 
     Text {
       text: "Existing directory"
+      textFormat: Text.PlainText
       color: root.dim
       font.family: root.fontFamily
       font.pixelSize: Style.font.caption
@@ -143,6 +145,7 @@ BorderSurface {
 
     Text {
       text: "Label"
+      textFormat: Text.PlainText
       color: root.dim
       font.family: root.fontFamily
       font.pixelSize: Style.font.caption
@@ -160,6 +163,7 @@ BorderSurface {
 
     Text {
       text: "Folder ID"
+      textFormat: Text.PlainText
       color: root.dim
       font.family: root.fontFamily
       font.pixelSize: Style.font.caption
@@ -204,6 +208,7 @@ BorderSurface {
       width: parent.width
       text: "Reuse the exact ID to rejoin an existing remote folder. "
         + "A new ID creates a different folder identity."
+      textFormat: Text.PlainText
       color: root.dim
       font.family: root.fontFamily
       font.pixelSize: Style.font.caption
@@ -279,6 +284,7 @@ BorderSurface {
       text: devicePicker.values.length === 0
         ? "Local only: this folder will not synchronize with another device."
         : "Selected devices receive a share offer and may need to accept it."
+      textFormat: Text.PlainText
       color: devicePicker.values.length === 0 ? root.warning : root.dim
       font.family: root.fontFamily
       font.pixelSize: Style.font.caption
@@ -290,6 +296,7 @@ BorderSurface {
         && root.syncthing.folderPreparationError !== ""
       width: parent.width
       text: root.syncthing ? root.syncthing.folderPreparationError : ""
+      textFormat: Text.PlainText
       color: root.urgent
       font.family: root.fontFamily
       font.pixelSize: Style.font.caption
diff --git a/ui/CompactConfirmDialog.qml b/ui/CompactConfirmDialog.qml
index eb338d2..7e79db3 100644
--- a/ui/CompactConfirmDialog.qml
+++ b/ui/CompactConfirmDialog.qml
@@ -60,6 +60,7 @@ Item {
           anchors.right: parent.right
           anchors.top: parent.top
           text: root.message
+          textFormat: Text.PlainText
           color: root.foreground
           font.family: root.fontFamily
           font.pixelSize: Style.font.body
@@ -99,6 +100,7 @@ Item {
               Text {
                 anchors.centerIn: parent
                 text: modelData
+                textFormat: Text.PlainText
                 color: destructive
                   ? (selected ? Color.urgent : root.foreground)
                   : (selected ? root.selectedText : root.foreground)
diff --git a/ui/FolderCard.qml b/ui/FolderCard.qml
index cefdf12..8094e88 100644
--- a/ui/FolderCard.qml
+++ b/ui/FolderCard.qml
@@ -100,6 +100,7 @@ BorderSurface {
       id: stateText
       anchors.centerIn: parent
       text: root.stateLabel
+      textFormat: Text.PlainText
       color: root.stateColor
       font.family: root.fontFamily
       font.pixelSize: Style.font.caption
@@ -134,6 +135,7 @@ BorderSurface {
     Text {
       width: parent.width
       text: root.meta
+      textFormat: Text.PlainText
       color: root.problem ? root.urgent : root.dim
       font.family: root.fontFamily
       font.pixelSize: Style.font.caption
@@ -144,6 +146,7 @@ BorderSurface {
       visible: root.canOpen
       width: parent.width
       text: String(root.folder.path || "")
+      textFormat: Text.PlainText
       color: root.dim
       font.family: root.fontFamily
       font.pixelSize: Style.font.caption
diff --git a/ui/FolderOverview.qml b/ui/FolderOverview.qml
index d85026d..026499f 100644
--- a/ui/FolderOverview.qml
+++ b/ui/FolderOverview.qml
@@ -22,6 +22,7 @@ Column {
     width: parent.width
     text: root.syncthing && root.syncthing.online
       ? "No folders configured." : "Folder status is unavailable."
+    textFormat: Text.PlainText
     color: root.dim
     font.family: root.fontFamily
     font.pixelSize: Style.font.body
diff --git a/ui/InfoPair.qml b/ui/InfoPair.qml
index b8de326..19d8b87 100644
--- a/ui/InfoPair.qml
+++ b/ui/InfoPair.qml
@@ -17,6 +17,7 @@ RowLayout {
 
   Text {
     text: root.label
+    textFormat: Text.PlainText
     color: root.foreground
     opacity: 0.6
     font.family: root.fontFamily
diff --git a/ui/MoreDetails.qml b/ui/MoreDetails.qml
index e53afc1..79d1608 100644
--- a/ui/MoreDetails.qml
+++ b/ui/MoreDetails.qml
@@ -205,6 +205,7 @@ Column {
       }
       return "Checking installation."
     }
+    textFormat: Text.PlainText
     color: root.dim
     font.family: root.fontFamily
     font.pixelSize: Style.font.bodySmall
@@ -216,6 +217,7 @@ Column {
     visible: root.syncthing && root.syncthing.packageStatus !== ""
     width: parent.width
     text: root.syncthing ? root.syncthing.packageStatus : ""
+    textFormat: Text.PlainText
     color: root.dim
     font.family: root.fontFamily
     font.pixelSize: Style.font.bodySmall
diff --git a/ui/PanelStatus.qml b/ui/PanelStatus.qml
index bc9fb19..42cc04a 100644
--- a/ui/PanelStatus.qml
+++ b/ui/PanelStatus.qml
@@ -89,6 +89,7 @@ Column {
           deviceMetaRow.width - (copyHostIdButton.visible
             ? copyHostIdButton.width + Style.space(4) : 0)))
         text: root.controller.localDeviceName.toUpperCase()
+        textFormat: Text.PlainText
         color: Qt.darker(root.foreground, 1.4)
         font.family: root.fontFamily
         font.pixelSize: Style.font.caption
@@ -123,6 +124,7 @@ Column {
     visible: root.controller.visibleWarning !== ""
     width: parent.width
     text: root.controller.visibleWarning
+    textFormat: Text.PlainText
     color: root.warning
     font.family: root.fontFamily
     font.pixelSize: Style.font.bodySmall
@@ -133,6 +135,7 @@ Column {
     visible: root.controller.visibleError !== ""
     width: parent.width
     text: root.controller.visibleError
+    textFormat: Text.PlainText
     color: root.urgent
     font.family: root.fontFamily
     font.pixelSize: Style.font.bodySmall
@@ -143,6 +146,7 @@ Column {
     visible: root.controller.displayedNotice !== ""
     width: parent.width
     text: root.controller.displayedNotice
+    textFormat: Text.PlainText
     opacity: root.controller.noticeShown ? 1 : 0
     color: root.success
     font.family: root.fontFamily
diff --git a/ui/SettingsMenu.qml b/ui/SettingsMenu.qml
index 2164f35..9b7bef9 100644
--- a/ui/SettingsMenu.qml
+++ b/ui/SettingsMenu.qml
@@ -41,6 +41,7 @@ Item {
             width: parent.width
             bottomPadding: Style.spacing.sm
             text: "SETTINGS"
+            textFormat: Text.PlainText
             color: Color.menu.text
             font.family: root.fontFamily
             font.pixelSize: Style.font.caption
diff --git a/ui/SyncthingPanelPopup.qml b/ui/SyncthingPanelPopup.qml
index 468d4e8..e8fc4f8 100644
--- a/ui/SyncthingPanelPopup.qml
+++ b/ui/SyncthingPanelPopup.qml
@@ -313,6 +313,7 @@ KeyboardPanel {
         text: root.controller.settingsMenuOpen
             ? "MOVE (j/k or Up/Down)  SELECT (Enter)  BACK (q/Esc)"
             : "[r]escan all  [w]eb UI  [p]ause/continue  [s]ettings"
+        textFormat: Text.PlainText
         color: root.controller.dim
         font.family: root.controller.fontFamily
         font.pixelSize: Style.font.caption

From ce25da310e224faa64c23783e1893ede9fd72b07 Mon Sep 17 00:00:00 2001
From: IlyaZar <zarubin@wiso.uni-koeln.de>
Date: Sun, 30 Aug 2026 23:19:31 +0200
Subject: [PATCH 5/6] build: release 0.1.7

- publish service state and rescan fixes
- keep release documentation lean
---
 CHANGELOG.md         |  8 ++++++++
 DEVELOPMENT.md       | 42 ------------------------------------------
 README.md            |  6 ++++--
 config/settings.toml |  2 +-
 manifest.json        |  6 +++---
 5 files changed, 16 insertions(+), 48 deletions(-)
 delete mode 100644 DEVELOPMENT.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 04c4082..c197e2f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,14 @@ Notable changes to Syncthing for Omarchy are documented here.
 
 ## Unreleased
 
+## 0.1.7 - 2026-08-31
+
+- reconcile configured and systemd user-service startup states without changing
+  the independent runtime start and stop controls (thanks @renews for reporting)
+- add a configurable interval for detecting external systemd state changes
+- add per-folder and all-folder rescans, a clearer host ID copy control, and
+  remembered local host identity while Syncthing is stopped
+
 ## 0.1.6 - 2026-08-22
 
 - Make live and indexed file activity accurate for additions, deletions,
diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
deleted file mode 100644
index 56fbb1b..0000000
--- a/DEVELOPMENT.md
+++ /dev/null
@@ -1,42 +0,0 @@
-# Development
-
-Runtime code is grouped by responsibility:
-
-- Root `Panel.qml` and `Service.qml` are the runtime entry points.
-- `core/` contains stateful controllers and local API orchestration.
-- `ui/` contains panel views and dialogs.
-- `models/` contains pure JavaScript transformations.
-- `config/` and `webui/` contain shipped settings and theme templates.
-- `scripts/` contains bounded helpers for lifecycle and system integration.
-- `tests/` covers pure models plus helper behavior.
-
-Split a file when it owns unrelated behavior, not to meet an arbitrary line
-count.
-
-## Checks
-
-Run the complete local suite from the repository root:
-
-```bash
-git diff --check
-jq empty manifest.json
-omarchy plugin validate .
-qmllint Panel.qml Service.qml core/*.qml models/*.js ui/*.qml \
-  tests/run.qml scripts/folder-picker.qml
-bash -n scripts/*.sh tests/*.sh
-mise exec aqua:koalaman/shellcheck@0.11.0 -- shellcheck scripts/*.sh tests/*.sh
-qml6 --apptype core -f tests/run.qml
-bash tests/scripts.test.sh
-```
-
-## Syncthing state contract
-
-Display only state reported by Syncthing:
-
-- Classify an indexed file with `/rest/db/file` and `local.deleted`.
-- Treat `RemoteDownloadProgress` as an upload from the local device.
-- Rescan an indexed directory so files newly placed inside it are classified.
-- Do not infer a rename or move from hashes, timing, or adjacent events.
-
-Tests should cover these user-visible contracts or a concrete model invariant.
-Avoid assertions that only mirror implementation details.
diff --git a/README.md b/README.md
index 32f6dca..476f822 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ any Linux quickshell build.
 - select the switch/toggle in the top right to start or stop the user service
 - select a folder card to open its directory
 - select **+** to configure an existing local directory
-- select **Refresh** to request an immediate health update
+- select **RESCAN** on a folder or **Rescan all directories** for every folder
 - select **Open Web UI** for device setup and advanced folder options
 - select the gear or press `s` for appearance settings and clean removal
 
@@ -34,7 +34,7 @@ As shown in the footer at the bottom of the main plugin menu
 
 | Key   | Action                    |
 | ----- | ------------------------- |
-| `r`   | refresh status            |
+| `r`   | rescan all folders        |
 | `w`   | open the Web UI           |
 | `p`   | start or stop the service |
 | `s`   | open plugin settings      |
@@ -186,6 +186,8 @@ Planned work stays at the top. Shipped entries come from
 | ------- | ------- | ---------- | ------------------------------------------------------- |
 | Next    | planned | TBD        | improve and expand Syncthing Web UI customization       |
 |         |         |            | prepare broader Quickshell compatibility                |
+| 0.1.7   | shipped | 2026-08-31 | fix persistent service-state reconciliation             |
+|         |         |            | UI/UX: clear semantics on buttons, harmonize font size  |
 | 0.1.6   | shipped | 2026-08-22 | make live and indexed file activity accurate            |
 |         |         |            | refine folder lifecycle controls and pending offers     |
 |         |         |            | add versioned icon and live Web UI theme settings       |
diff --git a/config/settings.toml b/config/settings.toml
index 94ee65e..f7a8f86 100644
--- a/config/settings.toml
+++ b/config/settings.toml
@@ -1,7 +1,7 @@
 version = 1
 
 [style]
-# "branded" vs. "themed": classic Syncthing icons vs.Omarchy-colored icons
+# "branded" vs. "themed": classic Syncthing icons vs. Omarchy-colored icons
 icon_style = "branded"
 # "default" vs. "omarchy": Syncthing styling vs. following the active Omarchy theme
 web_ui_theme = "omarchy"
diff --git a/manifest.json b/manifest.json
index 2bdf69e..654d742 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,10 +2,10 @@
   "schemaVersion": 1,
   "id": "io.github.ilyazar.syncthing",
   "name": "Syncthing",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "author": "ilyaZar",
   "license": "MIT AND MPL-2.0",
-  "description": "See sync health, safely manage folders, control the service, and install Syncthing from the Omarchy bar.",
+  "description": "See sync health, safely manage folders, control the service, and install Syncthing from the Omarchy bar. Includes a Web UI theme that follows the Omarchy system theme.",
   "kinds": ["service", "bar-widget"],
   "keepLoaded": true,
   "entryPoints": {
@@ -14,7 +14,7 @@
   },
   "barWidget": {
     "displayName": "Syncthing",
-    "description": "See sync health, safely manage folders, control the service, and install Syncthing.",
+    "description": "See sync health, safely manage folders, control the service, and install Syncthing from the Omarchy bar. Includes a Web UI theme that follows the Omarchy system theme.",
     "category": "Files",
     "allowMultiple": false,
     "defaultSection": "right",

From a662e5b152c1f803f84d4b1be4a7bc465a723a4e Mon Sep 17 00:00:00 2001
From: IlyaZar <zarubin@wiso.uni-koeln.de>
Date: Mon, 31 Aug 2026 01:49:29 +0200
Subject: [PATCH 6/6] docs: schedule 0.1.8 roadmap

- assign future web ui work to the next release
- keep broader shell compatibility out of 0.1.7
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 476f822..fbc4b25 100644
--- a/README.md
+++ b/README.md
@@ -184,7 +184,7 @@ Planned work stays at the top. Shipped entries come from
 
 | Release | State   | Date       | What changed                                            |
 | ------- | ------- | ---------- | ------------------------------------------------------- |
-| Next    | planned | TBD        | improve and expand Syncthing Web UI customization       |
+| 0.1.8   | planned | TBD        | improve and expand Syncthing Web UI customization       |
 |         |         |            | prepare broader Quickshell compatibility                |
 | 0.1.7   | shipped | 2026-08-31 | fix persistent service-state reconciliation             |
 |         |         |            | UI/UX: clear semantics on buttons, harmonize font size  |