copa-cli 0.7.0__tar.gz → 0.7.1__tar.gz

{copa_cli-0.7.0 → copa_cli-0.7.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: copa-cli
-Version: 0.7.0
+Version: 0.7.1
 Summary: Command Palette — smart command tracking, ranking, and sharing for your shell
 Author: Mark Stanford
 License-Expression: MIT
@@ -285,8 +285,8 @@ $ git pu█sh origin main     ← grey ghost text
 |-----|-------------------|---------------|
 | Type chars | Insert char, re-fetch suggestion | Insert char, fetch suggestion |
 | Backspace | Delete char, **latch** (suppress suggestions) | Delete char normally |
-| **Tab** | `tab_accept=1`: accept full suggestion. `tab_accept=2` (default): first Tab highlights suggestion (cyan), second Tab accepts | If latched: unlatch + re-fetch suggestion. Else: normal tab completion |
-| **Down** | Highlight suggestion (enter confirming state) | History navigation |
+| **Tab** | `tab_accept=1`: accept full suggestion. `tab_accept=2` (default): open completion menu with suggestion highlighted at top, native completions below | If latched: unlatch + re-fetch suggestion. Else: normal tab completion |
+| **Down** | Open completion menu with suggestion highlighted at top | History navigation |
 | **Right arrow** | Accept one word, re-fetch | Move cursor right |
 | Enter | Clear suggestion, execute | Execute |
 | Esc | Dismiss suggestion | Normal Esc |

{copa_cli-0.7.0 → copa_cli-0.7.1}/README.md

@@ -255,8 +255,8 @@ $ git pu█sh origin main     ← grey ghost text
 |-----|-------------------|---------------|
 | Type chars | Insert char, re-fetch suggestion | Insert char, fetch suggestion |
 | Backspace | Delete char, **latch** (suppress suggestions) | Delete char normally |
-| **Tab** | `tab_accept=1`: accept full suggestion. `tab_accept=2` (default): first Tab highlights suggestion (cyan), second Tab accepts | If latched: unlatch + re-fetch suggestion. Else: normal tab completion |
-| **Down** | Highlight suggestion (enter confirming state) | History navigation |
+| **Tab** | `tab_accept=1`: accept full suggestion. `tab_accept=2` (default): open completion menu with suggestion highlighted at top, native completions below | If latched: unlatch + re-fetch suggestion. Else: normal tab completion |
+| **Down** | Open completion menu with suggestion highlighted at top | History navigation |
 | **Right arrow** | Accept one word, re-fetch | Move cursor right |
 | Enter | Clear suggestion, execute | Execute |
 | Esc | Dismiss suggestion | Normal Esc |

{copa_cli-0.7.0 → copa_cli-0.7.1}/copa/copa.zsh

@@ -290,19 +290,25 @@ eval "$(copa completion zsh)"
 #   never    — disable Copa tab completion entirely
 if [[ "$_COPA_COMPLETION_MODE" != 'never' ]]; then
 
-_copa_history_complete() {
-    # Hoist pending inline suggestion as a completion candidate
-    if [[ -n "$_COPA_SUGGEST_PENDING" ]]; then
-        local pending="$_COPA_SUGGEST_PENDING"
-        _COPA_SUGGEST_PENDING=""
-        local cur_word="${words[CURRENT]}"
-        local prefix_len=$(( ${#LBUFFER} - ${#cur_word} ))
-        local insert_text="${pending:$prefix_len}"
-        if [[ -n "$insert_text" ]]; then
-            compadd -U -Q -V 'copa-suggestion' -X 'SUGGESTED' -o nosort -- "$insert_text"
-        fi
-        compstate[list]='list force'
+# Suggestion completer: runs FIRST so menu-complete highlights the Copa
+# suggestion before native completions.  No-op when nothing is pending.
+# Always returns 1 so the chain continues to _complete and _copa_history_complete;
+# compadd matches persist across completers regardless of return value.
+_copa_suggestion_complete() {
+    [[ -z "$_COPA_SUGGEST_PENDING" ]] && return 1
+    local pending="$_COPA_SUGGEST_PENDING"
+    _COPA_SUGGEST_PENDING=""
+    local cur_word="${words[CURRENT]}"
+    local prefix_len=$(( ${#LBUFFER} - ${#cur_word} ))
+    local insert_text="${pending:$prefix_len}"
+    if [[ -n "$insert_text" ]]; then
+        compadd -U -Q -V 'copa-suggestion' -X 'SUGGESTED' -o nosort -- "$insert_text"
     fi
+    compstate[list]='list force'
+    return 1  # don't stop chain — let _complete and _copa_history_complete also run
+}
+
+_copa_history_complete() {
     # In fallback mode, only show when native completers found nothing
     if [[ "$_COPA_COMPLETION_MODE" == 'fallback' ]]; then
         (( compstate[nmatches] > 0 )) && return
@@ -327,12 +333,14 @@ _copa_history_complete() {
     fi
 }
 
-# Append to existing completers without clobbering user config
+# Append to existing completers without clobbering user config.
+# _copa_suggestion_complete runs first so menu-complete highlights
+# the Copa suggestion; _copa_history_complete runs last for history matches.
 () {
     local -a cur
     zstyle -g cur ':completion:*' completer 2>/dev/null
     if (( ! ${cur[(Ie)_copa_history_complete]} )); then
-        zstyle ':completion:*' completer ${cur:-_complete} _copa_history_complete
+        zstyle ':completion:*' completer _copa_suggestion_complete ${cur:-_complete} _copa_history_complete
     fi
     # Enable group separation so Copa results appear as a distinct section
     zstyle ':completion:*' group-name ''
@@ -412,8 +420,7 @@ _copa_suggest_backward_delete_char() {
 zle -N backward-delete-char _copa_suggest_backward_delete_char
 
 # Tab: accept suggestion or open completion menu.
-# Tab: accept suggestion or open completion menu.
-# Don't call _copa_suggest_fetch after expand-or-complete — menu-select
+# Don't call _copa_suggest_fetch after menu-complete — menu-select
 # runs asynchronously and fetch would overwrite the display with
 # ghost text.  The self-insert wrapper re-fetches on the next keystroke.
 _copa_suggest_expand_or_complete() {
@@ -424,14 +431,15 @@ _copa_suggest_expand_or_complete() {
       CURSOR=${#BUFFER}
       _copa_suggest_clear
     else
-      # tab_accept=2: open completion menu with suggestion highlighted
-      # Use .expand-or-complete (not menu-complete) so menu-select
-      # highlights the first item in group-order (copa-suggestion),
-      # rather than the first match from the first completer.
+      # tab_accept=2: open completion menu with suggestion highlighted.
+      # menu-complete enters menu-select mode reliably (unlike
+      # .expand-or-complete which bypasses menu-select).  With
+      # group-order copa-suggestion copa-history, menu-select cycles
+      # in display order, so the Copa suggestion is highlighted first.
       local pending="$_COPA_SUGGESTION"
       _copa_suggest_clear
       _COPA_SUGGEST_PENDING="$pending"
-      zle .expand-or-complete
+      zle menu-complete
     fi
     return
   fi
@@ -519,7 +527,7 @@ _copa_suggest_down_line_or_history() {
     local pending="$_COPA_SUGGESTION"
     _copa_suggest_clear
     _COPA_SUGGEST_PENDING="$pending"
-    zle .expand-or-complete
+    zle menu-complete
   else
     zle .down-line-or-history
   fi
@@ -537,7 +545,7 @@ _copa_suggest_down_line_or_search() {
     local pending="$_COPA_SUGGESTION"
     _copa_suggest_clear
     _COPA_SUGGEST_PENDING="$pending"
-    zle .expand-or-complete
+    zle menu-complete
   else
     zle .down-line-or-search
   fi

{copa_cli-0.7.0 → copa_cli-0.7.1}/copa_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: copa-cli
-Version: 0.7.0
+Version: 0.7.1
 Summary: Command Palette — smart command tracking, ranking, and sharing for your shell
 Author: Mark Stanford
 License-Expression: MIT
@@ -285,8 +285,8 @@ $ git pu█sh origin main     ← grey ghost text
 |-----|-------------------|---------------|
 | Type chars | Insert char, re-fetch suggestion | Insert char, fetch suggestion |
 | Backspace | Delete char, **latch** (suppress suggestions) | Delete char normally |
-| **Tab** | `tab_accept=1`: accept full suggestion. `tab_accept=2` (default): first Tab highlights suggestion (cyan), second Tab accepts | If latched: unlatch + re-fetch suggestion. Else: normal tab completion |
-| **Down** | Highlight suggestion (enter confirming state) | History navigation |
+| **Tab** | `tab_accept=1`: accept full suggestion. `tab_accept=2` (default): open completion menu with suggestion highlighted at top, native completions below | If latched: unlatch + re-fetch suggestion. Else: normal tab completion |
+| **Down** | Open completion menu with suggestion highlighted at top | History navigation |
 | **Right arrow** | Accept one word, re-fetch | Move cursor right |
 | Enter | Clear suggestion, execute | Execute |
 | Esc | Dismiss suggestion | Normal Esc |

{copa_cli-0.7.0 → copa_cli-0.7.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "copa-cli"
-version = "0.7.0"
+version = "0.7.1"
 description = "Command Palette — smart command tracking, ranking, and sharing for your shell"
 readme = "README.md"
 license = "MIT"

{copa_cli-0.7.0 → copa_cli-0.7.1}/tests/test_modal.py

@@ -819,7 +819,7 @@ class TestSuggestBackspaceLatch:
     def test_packaged_zsh_tab_unlatches(self):
         content = self._read_zsh("copa/copa.zsh")
         start = content.index("_copa_suggest_expand_or_complete()")
-        func_block = content[start : start + 800]
+        func_block = content[start : start + 1000]
         assert "_COPA_SUGGEST_LATCHED=0" in func_block
 
     def test_packaged_zsh_backward_kill_word_latches(self):
@@ -920,9 +920,7 @@ class TestTabAcceptZsh:
         # Tab widget checks tab_accept internally for mode 1 vs 2
         assert "_COPA_SUGGEST_TAB_ACCEPT" in func_block
         assert "_copa_suggest_clear" in func_block
-        # Mode 2 uses expand-or-complete so menu-select highlights by group-order
-        assert "zle .expand-or-complete" in func_block
-        # Non-suggestion fallback still uses menu-complete
+        # Mode 2 uses menu-complete to reliably enter menu-select mode
         assert "zle menu-complete" in func_block
         # Mode 2 sets pending and opens completion menu
         assert "_COPA_SUGGEST_PENDING" in func_block
@@ -935,7 +933,6 @@ class TestTabAcceptZsh:
         func_block = content[start : start + 1000]
         assert "_COPA_SUGGEST_TAB_ACCEPT" in func_block
         assert "_copa_suggest_clear" in func_block
-        assert "zle .expand-or-complete" in func_block
         assert "zle menu-complete" in func_block
         assert "_COPA_SUGGEST_PENDING" in func_block
         assert "bindkey '^I' _copa_suggest_expand_or_complete" in content
@@ -948,7 +945,7 @@ class TestTabAcceptZsh:
         assert ".down-line-or-history" in func_block
         # Down arrow with suggestion: hoists to completion menu
         assert "_COPA_SUGGEST_PENDING" in func_block
-        assert "zle .expand-or-complete" in func_block
+        assert "zle menu-complete" in func_block
 
     def test_root_zsh_down_opens_menu_or_history(self):
         content = self._read_zsh("copa.zsh")
@@ -957,7 +954,7 @@ class TestTabAcceptZsh:
         assert "_copa_suggest_clear" in func_block
         assert ".down-line-or-history" in func_block
         assert "_COPA_SUGGEST_PENDING" in func_block
-        assert "zle .expand-or-complete" in func_block
+        assert "zle menu-complete" in func_block
 
     def test_packaged_zsh_clear_resets_pending(self):
         content = self._read_zsh("copa/copa.zsh")
@@ -1014,33 +1011,31 @@ class TestTabAcceptZsh:
         after_latch = func_block[latch_idx:]
         assert "_copa_suggest_fetch" in after_latch
 
-    def test_packaged_zsh_history_complete_hoists_suggestion(self):
+    def test_packaged_zsh_suggestion_completer_exists(self):
         content = self._read_zsh("copa/copa.zsh")
-        start = content.index("_copa_history_complete()")
-        func_block = content[start : start + 800]
+        start = content.index("_copa_suggestion_complete()")
+        func_block = content[start : start + 500]
         assert "_COPA_SUGGEST_PENDING" in func_block
         assert "compadd -U -Q -V 'copa-suggestion'" in func_block
+        assert "compstate[list]='list force'" in func_block
 
-    def test_root_zsh_history_complete_hoists_suggestion(self):
+    def test_root_zsh_suggestion_completer_exists(self):
         content = self._read_zsh("copa.zsh")
-        start = content.index("_copa_history_complete()")
-        func_block = content[start : start + 800]
+        start = content.index("_copa_suggestion_complete()")
+        func_block = content[start : start + 500]
         assert "_COPA_SUGGEST_PENDING" in func_block
         assert "compadd -U -Q -V 'copa-suggestion'" in func_block
+        assert "compstate[list]='list force'" in func_block
 
-    def test_packaged_zsh_forces_completion_list(self):
-        """compstate[list] forces the completion list to display."""
+    def test_packaged_zsh_suggestion_completer_runs_first(self):
+        """_copa_suggestion_complete must be before _complete in completer chain."""
         content = self._read_zsh("copa/copa.zsh")
-        start = content.index("_copa_history_complete()")
-        func_block = content[start : start + 800]
-        assert "compstate[list]='list force'" in func_block
+        assert "_copa_suggestion_complete ${cur:-_complete} _copa_history_complete" in content
 
-    def test_root_zsh_forces_completion_list(self):
-        """compstate[list] forces the completion list to display."""
+    def test_root_zsh_suggestion_completer_runs_first(self):
+        """_copa_suggestion_complete must be before _complete in completer chain."""
         content = self._read_zsh("copa.zsh")
-        start = content.index("_copa_history_complete()")
-        func_block = content[start : start + 800]
-        assert "compstate[list]='list force'" in func_block
+        assert "_copa_suggestion_complete ${cur:-_complete} _copa_history_complete" in content
 
     def test_packaged_zsh_has_suggestion_branding(self):
         content = self._read_zsh("copa/copa.zsh")