From fbc6daea8bbf2b951945817f159e9e6924368d14 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Fri, 9 Oct 2026 16:49:00 +0200
Subject: [PATCH] Queue typing changes and wait for saved selections

---
 bin/omarchy-menu-select     |  5 +--
 shell/plugins/menu/Menu.qml | 66 +++++++++++++++++++++++++++----------
 2 files changed, 51 insertions(+), 20 deletions(-)

diff --git a/bin/omarchy-menu-select b/bin/omarchy-menu-select
index de4c4687..c359084c 100755
--- a/bin/omarchy-menu-select
+++ b/bin/omarchy-menu-select
@@ -3,7 +3,7 @@
 # omarchy:summary=Pick one or multiple options from a menu
 # omarchy:group=menu
 # omarchy:name=select
-# omarchy:args=prompt [option...] [-- --multiple --selected <value> --width <pixels> --maxheight <pixels>]
+# omarchy:args=prompt [option...] [-- --multiple --selected <value> --on-change <command-json> --width <pixels> --maxheight <pixels>]
 # omarchy:examples=omarchy menu select Format jpg png|omarchy-menu-select Resolution 4k 1080p 720p -- --width 400
 
 # An option may lead with an icon, as "<glyph><TAB><label>", and may trail a
@@ -14,7 +14,8 @@
 
 # With --multiple, clicking/Enter toggles rows and Apply returns a JSON array.
 # --on-change takes a JSON command array; each toggle runs it with the selection
-# JSON appended, applies immediately, and needs no Apply row.
+# JSON appended, applies immediately, and needs no Apply row. A successful
+# command may print a JSON array of actual selections to update the checkmarks.
 # --selected takes a returned value (label plus any subtext), and can be repeated.
 
 set -euo pipefail
diff --git a/shell/plugins/menu/Menu.qml b/shell/plugins/menu/Menu.qml
index eb633a32..ecfcc39e 100644
--- a/shell/plugins/menu/Menu.qml
+++ b/shell/plugins/menu/Menu.qml
@@ -797,14 +797,9 @@ Item {
           root.applyDmenuSelection(JSON.stringify(MenuModel.dmenuSelections(root.dmenuOptions, root.dmenuSelected)))
         } else {
           var value = MenuModel.dmenuValue(root.dmenuOptions[Number(picked.itemId.substring(6))])
-          var selected = MenuModel.toggleDmenuSelection(root.dmenuSelected, value)
+          var selected = MenuModel.toggleDmenuSelection(selectionProc.requestedSelection(), value)
           if (root.dmenuOnChange.length > 0) {
-            if (selectionProc.running) return
-            selectionProc.collected = ""
-            selectionProc.serial = root.requestSerial
-            selectionProc.selected = MenuModel.dmenuSelections(root.dmenuOptions, selected, true)
-            selectionProc.command = root.dmenuOnChange.concat([JSON.stringify(selectionProc.selected)])
-            selectionProc.running = true
+            selectionProc.enqueue(selected)
           } else {
             root.dmenuSelected = selected
             root.updateDmenuChecks()
@@ -994,19 +989,54 @@ Item {
     id: selectionProc
     property int serial: 0
     property var selected: []
+    property var queue: []
     property string collected: ""
-    stdout: StdioCollector { onStreamFinished: selectionProc.collected = text }
-    onExited: function(exitCode) {
-      if (serial !== root.requestSerial || !root.dmenuActive) return
-      if (exitCode === 0) {
-        var applied = selected
-        if (collected.trim()) {
-          try { applied = JSON.parse(collected) } catch (error) { return }
-          if (!Array.isArray(applied)) return
-        }
-        root.dmenuSelected = MenuModel.dmenuSelections(root.dmenuOptions, applied, true)
+
+    function requestedSelection() {
+      for (var i = queue.length - 1; i >= 0; i--) {
+        if (queue[i].serial === root.requestSerial) return queue[i].selected
       }
-      root.updateDmenuChecks()
+      if (running && serial === root.requestSerial) return selected
+      return root.dmenuSelected
+    }
+
+    function enqueue(values) {
+      var selected = MenuModel.dmenuSelections(root.dmenuOptions, values, true)
+      queue = queue.concat([{
+        serial: root.requestSerial, selected: selected,
+        command: root.dmenuOnChange.concat([JSON.stringify(selected)])
+      }])
+      if (!running) startNext()
+    }
+
+    function startNext() {
+      if (queue.length === 0) return
+      var change = queue[0]
+      queue = queue.slice(1)
+      serial = change.serial
+      selected = change.selected
+      collected = ""
+      command = change.command
+      running = true
+    }
+
+    stdout: StdioCollector {
+      waitForEnd: true
+      onStreamFinished: selectionProc.collected = text
+    }
+    onExited: function(exitCode) {
+      if (serial === root.requestSerial && root.dmenuActive) {
+        if (exitCode === 0) {
+          var applied = selected
+          if (collected.trim()) {
+            try { applied = JSON.parse(collected) } catch (error) { applied = root.dmenuSelected }
+          }
+          if (Array.isArray(applied))
+            root.dmenuSelected = MenuModel.dmenuSelections(root.dmenuOptions, applied, true)
+        }
+        root.updateDmenuChecks()
+      }
+      startNext()
     }
   }