From 68cf381b50a98fdc4c465a26678c8817bd2cb774 Mon Sep 17 00:00:00 2001
From: Will Miao <willmiao.dev@gmail.com>
Date: Sun, 1 Feb 2026 22:09:21 +0800
Subject: [PATCH] feat(autocomplete): improve tag search to use last token for
 multi-word prompts

- Modify custom words search to extract last space-separated token from search term
- Add `_getLastSpaceToken` helper method for token extraction
- Update selection replacement logic to only replace last token in multi-word prompts
- Enables searching "hello 1gi" to find "1girl" and replace only "1gi" with "1girl"
- Maintains full command replacement for command mode (e.g., "/char miku")
---
 web/comfyui/autocomplete.js | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/web/comfyui/autocomplete.js b/web/comfyui/autocomplete.js
index 3e96db86..b3892a2b 100644
--- a/web/comfyui/autocomplete.js
+++ b/web/comfyui/autocomplete.js
@@ -529,7 +529,10 @@ class AutoComplete {
                     this.showingCommands = false;
                     this.activeCommand = null;
                     endpoint = '/lm/custom-words/search?enriched=true';
-                    searchTerm = rawSearchTerm;
+                    // Extract last space-separated token for search
+                    // Tag names don't contain spaces, so we only need the last token
+                    // This allows "hello 1gi" to search for "1gi" and find "1girl"
+                    searchTerm = this._getLastSpaceToken(rawSearchTerm);
                     this.searchType = 'custom_words';
                 } else {
                     // No command and setting disabled - no autocomplete for direct typing
@@ -565,6 +568,17 @@ class AutoComplete {
         return lastSegment.trim();
     }
 
+    /**
+     * Extract the last space-separated token from a search term
+     * Tag names don't contain spaces, so for tag autocomplete we only need the last token
+     * @param {string} term - The full search term (e.g., "hello 1gi")
+     * @returns {string} - The last token (e.g., "1gi"), or the original term if no spaces
+     */
+    _getLastSpaceToken(term) {
+        const tokens = term.trim().split(/\s+/);
+        return tokens[tokens.length - 1] || term;
+    }
+
     async search(term = '', endpoint = null) {
         try {
             this.currentSearchTerm = term;
@@ -1152,7 +1166,16 @@ class AutoComplete {
 
         // Use getSearchTerm to get the current search term before cursor
         const beforeCursor = currentValue.substring(0, caretPos);
-        const searchTerm = this.getSearchTerm(beforeCursor);
+        const fullSearchTerm = this.getSearchTerm(beforeCursor);
+
+        // For regular tag autocomplete (no command), only replace the last space-separated token
+        // This allows "hello 1gi" + selecting "1girl" to become "hello 1girl, "
+        // Command mode (e.g., "/char miku") should replace the entire command+search
+        let searchTerm = fullSearchTerm;
+        if (this.modelType === 'prompt' && this.searchType === 'custom_words' && !this.activeCommand) {
+            searchTerm = this._getLastSpaceToken(fullSearchTerm);
+        }
+
         const searchStartPos = caretPos - searchTerm.length;
 
         // Only replace the search term, not everything after the last comma