From 81aaade827982e3d65aeb3d41903bfff36aa88b1 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Thu, 7 May 2026 12:09:30 +0200
Subject: [PATCH] Make sub matches show which commands are available under it

---
 bin/omarchy              | 23 +++++++++++++++++++++++
 test/omarchy-cli-test.sh |  4 ++++
 2 files changed, 27 insertions(+)

diff --git a/bin/omarchy b/bin/omarchy
index 29b7cfb4..16aa9502 100755
--- a/bin/omarchy
+++ b/bin/omarchy
@@ -788,6 +788,25 @@ show_group_help() {
   fi
 }
 
+show_prefix_help() {
+  local prefix="$1"
+  local prefix_with_space="$prefix "
+  local key=""
+  local rows=""
+
+  while IFS= read -r key; do
+    [[ -n $key ]] || continue
+    if [[ ${COMMAND_USAGE[$key]} == $prefix_with_space* ]]; then
+      rows+="${COMMAND_USAGE[$key]}"$'\t'$'\t'"${COMMAND_SUMMARY[$key]}"$'\n'
+    fi
+  done < <(sorted_keys false)
+
+  [[ -n $rows ]] || return 1
+
+  echo "${prefix#omarchy } commands:"
+  print_command_table "$rows"
+}
+
 show_related_commands() {
   local key="$1"
   local group="${COMMAND_GROUP[$key]}"
@@ -1005,6 +1024,10 @@ dispatch_or_help() {
     return 0
   fi
 
+  if show_prefix_help "omarchy ${args[*]}"; then
+    return 0
+  fi
+
   echo "Unknown Omarchy command: omarchy ${args[*]}" >&2
   suggestion=$(suggest_command "${args[0]}")
   if [[ -n $suggestion ]]; then
diff --git a/test/omarchy-cli-test.sh b/test/omarchy-cli-test.sh
index 5763920a..9b9a8dfb 100644
--- a/test/omarchy-cli-test.sh
+++ b/test/omarchy-cli-test.sh
@@ -100,6 +100,10 @@ output=$("$CLI" hw --help)
 assert_output_contains "hardware group help renders" "$output" "omarchy hw asus rog"
 assert_output_contains "hardware group includes touchpad" "$output" "omarchy hw touchpad"
 
+output=$("$CLI" hw asus)
+assert_output_contains "partial hardware prefix renders matching commands" "$output" "omarchy hw asus rog"
+assert_output_contains "partial hardware prefix includes nested match" "$output" "omarchy hw asus zenbook ux5406aa"
+
 output=$("$CLI" menu --help)
 assert_output_contains "menu group includes share fallback route" "$output" "omarchy menu share"