Make clamshell scale recovery idempotent

bin/omarchy-hyprland-monitor-clamshell

@@ -14,6 +14,18 @@ valid_scale() {
   [[ $1 =~ ^[0-9]+([.][0-9]+)?$ ]]
 }
 
+scales_match() {
+  local left="$1"
+  local right="$2"
+
+  valid_scale "$left" && valid_scale "$right" || return 1
+  awk -v left="$left" -v right="$right" 'BEGIN {
+    diff = left - right
+    if (diff < 0) diff = -diff
+    exit(diff < 0.001 ? 0 : 1)
+  }'
+}
+
 configured_monitor_scale() {
   local monitor_lua="$HOME/.config/hypr/monitors.lua"
   [[ -f $monitor_lua ]] || return 0
@@ -52,13 +64,6 @@ read_monitor_scale() {
     return
   fi
 
-  scale=$(current_internal_scale)
-  if valid_scale "$scale"; then
-    store_internal_scale "$scale"
-    echo "$scale"
-    return
-  fi
-
   if [[ -f $SCALE_STATE ]]; then
     scale=$(<"$SCALE_STATE")
     if valid_scale "$scale"; then
@@ -72,11 +77,23 @@ read_monitor_scale() {
 
 enable_internal_output() {
   [[ -n $INTERNAL ]] || return 0
-  local scale
-  scale=$(read_monitor_scale)
+  local scale="${1:-}"
+  [[ -n $scale ]] || scale=$(read_monitor_scale)
   hyprctl eval "hl.monitor({ output = \"$INTERNAL\", mode = \"preferred\", position = \"auto\", scale = $scale })" >/dev/null 2>&1 || true
 }
 
+sync_internal_scale() {
+  [[ -n $INTERNAL ]] || return 0
+  local desired_scale
+  local active_scale
+
+  desired_scale=$(read_monitor_scale)
+  active_scale=$(current_internal_scale)
+  scales_match "$active_scale" "$desired_scale" && return 0
+
+  enable_internal_output "$desired_scale"
+}
+
 dpms_internal() {
   local action="$1"
 
@@ -97,8 +114,7 @@ enable_internal() {
   fi
 
   [[ -f $MANUAL_DISABLE_FLAG ]] && omarchy-hyprland-monitor-external-active && return 0
-  remember_internal_scale
-  enable_internal_output
+  sync_internal_scale
   dpms_internal enable
 }
 

test/shell.d/monitor-clamshell-scale-test.sh

@@ -78,12 +78,17 @@ run_clamshell() {
 
 write_auto_monitor_config
 : >"$eval_log"
-OMARCHY_TEST_INTERNAL_SCALE=2 run_clamshell
-grep -F 'scale = 2' "$eval_log" >/dev/null || fail "clamshell recovery uses current internal scale instead of auto"
+OMARCHY_TEST_INTERNAL_SCALE=3 run_clamshell
+grep -F 'scale = 2' "$eval_log" >/dev/null || fail "clamshell recovery ignores transient auto scale"
 ! grep -F 'scale = "auto"' "$eval_log" >/dev/null || fail "clamshell recovery does not apply auto scale"
-[[ -f $scale_state ]] || fail "clamshell recovery remembers current internal scale"
-[[ $(<"$scale_state") == "2" ]] || fail "clamshell recovery remembers current internal scale value"
-pass "clamshell recovery uses current internal scale instead of auto"
+[[ ! -f $scale_state ]] || fail "clamshell recovery does not remember transient scale"
+pass "clamshell recovery ignores transient auto scale"
+
+write_auto_monitor_config
+: >"$eval_log"
+OMARCHY_TEST_INTERNAL_SCALE=2 run_clamshell
+! grep -F 'scale = ' "$eval_log" >/dev/null || fail "clamshell recovery does not reapply matching scale"
+pass "clamshell recovery avoids redundant scale apply"
 
 write_auto_monitor_config
 : >"$eval_log"