From ace4faa81c4f723c608d10ba41a67755c496d492 Mon Sep 17 00:00:00 2001
From: "maximilian.lotz" <maximilian.lotz@innogames.com>
Date: Fri, 27 Feb 2026 13:17:00 +0100
Subject: [PATCH 01/10] Create history obj in servershell

---
 .../js/servershell/autocomplete/history.js    | 59 +++++++++++++++++++
 .../static/js/servershell/history.js          | 42 +++++++++++++
 2 files changed, 101 insertions(+)
 create mode 100644 serveradmin/servershell/static/js/servershell/autocomplete/history.js
 create mode 100644 serveradmin/servershell/static/js/servershell/history.js

diff --git a/serveradmin/servershell/static/js/servershell/autocomplete/history.js b/serveradmin/servershell/static/js/servershell/autocomplete/history.js
new file mode 100644
index 00000000..09621196
--- /dev/null
+++ b/serveradmin/servershell/static/js/servershell/autocomplete/history.js
@@ -0,0 +1,59 @@
+/*
+ * Autocomplete History - Copyright (c) 2026 InnoGames GmbH
+ *
+ * This module ads auto complete while searching the query history
+ */
+
+servershell.autocomplete_history_enabled = false;
+
+servershell.close_history_autocomplete = function () {
+    const autocomplete_search_input = $('#term');
+    autocomplete_search_input.autocomplete('destroy');
+    servershell.autocomplete_history_enabled = false;
+    servershell.enable_search_autocomplete();
+    $('#history-toggle').removeClass('active');
+}
+
+servershell.open_history_autocomplete = function () {
+    const autocomplete_search_input = $('#term');
+    autocomplete_search_input.autocomplete('destroy');
+    autocomplete_search_input.autocomplete({
+        source: function (request, response) {
+            const displayLimit = 20;
+            const search = request.term;
+
+            const history = servershell.history.get()
+            const possibleChoices = history.filter((entry) => entry.search.toLowerCase().includes(search.toLowerCase()))
+                .map((entry) => entry.search);
+            response(possibleChoices.slice(0, Math.min(displayLimit, possibleChoices.length)));
+        },
+
+        select: function (_, ui) {
+            autocomplete_search_input.trigger('change', ui.item.value);
+            servershell.close_history_autocomplete()
+        }
+    });
+    autocomplete_search_input.autocomplete('enable');
+    autocomplete_search_input.autocomplete('option', 'autoFocus', $('#autoselect')[0].checked);
+    autocomplete_search_input.autocomplete('option', 'minLength', 0);
+    autocomplete_search_input.autocomplete('option', 'delay', 50); // Searching local storage is fast
+    autocomplete_search_input.autocomplete('search', "");
+    autocomplete_search_input.focus();
+    servershell.autocomplete_history_enabled = true;
+    $('#history-toggle').addClass('active');
+}
+
+$(document).ready(function () {
+    $(document).keydown(function (event) {
+        if (event.shiftKey && event.ctrlKey) {
+            if (event.key !== 'F') {
+                return;
+            }
+            if (servershell.autocomplete_history_enabled) {
+                servershell.close_history_autocomplete();
+                return;
+            }
+            servershell.open_history_autocomplete();
+        }
+    });
+});
\ No newline at end of file
diff --git a/serveradmin/servershell/static/js/servershell/history.js b/serveradmin/servershell/static/js/servershell/history.js
new file mode 100644
index 00000000..20022ab3
--- /dev/null
+++ b/serveradmin/servershell/static/js/servershell/history.js
@@ -0,0 +1,42 @@
+const storageKey = "servershell_history"
+
+servershell.history = {
+    /**
+     * @returns {[]}
+     */
+    get: function () {
+        const history = localStorage.getItem(storageKey);
+        if (!history) {
+            return []
+        }
+
+        return JSON.parse(history);
+    },
+
+    storeEntry: function (entry) {
+        const history = servershell.history.get();
+
+        const matching = servershell.history.findMatchingEntry(entry)
+        if (matching !== -1) {
+            history.splice(matching, 1);
+        }
+
+        // TODO: Dynamic max length
+        while (history.length >= 20) {
+            history.pop();
+        }
+
+        history.unshift(entry);
+
+        localStorage.setItem(storageKey, JSON.stringify(history))
+    },
+
+    clear: function () {
+        localStorage.setItem(storageKey, "[]");
+    },
+
+    findMatchingEntry: function (entry) {
+        const history = servershell.history.get();
+        return history.findIndex((i) => entry.search === i.search);
+    }
+}
\ No newline at end of file

From 3a780a77ff9737da8452bd0918c24ebae39b8877 Mon Sep 17 00:00:00 2001
From: "maximilian.lotz" <maximilian.lotz@innogames.com>
Date: Fri, 27 Feb 2026 16:12:30 +0100
Subject: [PATCH 02/10] Create history button

---
 .../servershell/static/css/servershell.css    | 22 +++++++++++++++++++
 .../templates/servershell/index.html          | 11 +++++++++-
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/serveradmin/servershell/static/css/servershell.css b/serveradmin/servershell/static/css/servershell.css
index e3b2d984..293b7ce1 100644
--- a/serveradmin/servershell/static/css/servershell.css
+++ b/serveradmin/servershell/static/css/servershell.css
@@ -37,6 +37,28 @@ th:hover .attr-headericons {
     height: 29px;
 }
 
+#history-toggle img {
+    width: 16px;
+    height: 16px;
+}
+
+#history-toggle {
+    background-color: #fff;
+    background-clip: padding-box;
+    border: 1px solid #ced4da;
+}
+
+#history-toggle {
+    background-color: #fff;
+    background-clip: padding-box;
+    border: 1px solid #ced4da;
+}
+
+#history-toggle.active {
+    background: var(--background-primary);
+}
+
+
 .input-controls > div:last-of-type {
     padding-left: 0;
 }
diff --git a/serveradmin/servershell/templates/servershell/index.html b/serveradmin/servershell/templates/servershell/index.html
index 2752c328..a87f76a2 100644
--- a/serveradmin/servershell/templates/servershell/index.html
+++ b/serveradmin/servershell/templates/servershell/index.html
@@ -30,7 +30,14 @@
         <div class="col-sm-8">
             <form method="post" action="{% url 'servershell_results' %}" id="search_form" autocomplete="off">
                 {% csrf_token %}
-                <input tabindex="1" class="form-control form-control-sm autocomplete" type="text" id="term" data-servershell-property-bind="term" data-servershell-autocomplete-url="{% url 'servershell_autocomplete' %}" />
+                <div class="input-group input-group-sm">
+                    <input tabindex="1" class="form-control form-control-sm autocomplete" type="text" id="term" data-servershell-property-bind="term" data-servershell-autocomplete-url="{% url 'servershell_autocomplete' %}" />
+                    <div class="input-group-append">
+                        <button id="history-toggle" class="btn btn-sm" type="button" title="Search history (Ctrl+Shift+F)" onclick="servershell.autocomplete_history_enabled ? servershell.close_history_autocomplete() : servershell.open_history_autocomplete()">
+                            <img src="{{ STATIC_URL }}icons/clock-history.svg" alt="Search history"/>
+                        </button>
+                    </div>
+                </div>
             </form>
         </div>
         <div class="col-sm-3">
@@ -193,9 +200,11 @@
 <script src="{{ STATIC_URL }}js/servershell/result.js"></script>
 <script src="{{ STATIC_URL }}js/servershell/command.js"></script>
 <script src="{{ STATIC_URL }}js/servershell/validate.js"></script>
+<script src="{{ STATIC_URL }}js/servershell/history.js"></script>
 <script src="{{ STATIC_URL }}{{ choose_ip_address.js }}"></script>
 <script src="{{ STATIC_URL }}js/servershell/autocomplete/search.js"></script>
 <script src="{{ STATIC_URL }}js/servershell/autocomplete/command.js"></script>
+<script src="{{ STATIC_URL }}js/servershell/autocomplete/history.js"></script>
 <script>
     $(document).ready(function() {
         // We want to allow the user to abort some queries such as search

From dc02e9901619db80a5db3d8e61b22d024a00ed69 Mon Sep 17 00:00:00 2001
From: "maximilian.lotz" <maximilian.lotz@innogames.com>
Date: Fri, 27 Feb 2026 16:14:56 +0100
Subject: [PATCH 03/10] Move search auto complete into function

---
 .../static/js/servershell/autocomplete/search.js           | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/serveradmin/servershell/static/js/servershell/autocomplete/search.js b/serveradmin/servershell/static/js/servershell/autocomplete/search.js
index eabcf3d0..7f72469f 100644
--- a/serveradmin/servershell/static/js/servershell/autocomplete/search.js
+++ b/serveradmin/servershell/static/js/servershell/autocomplete/search.js
@@ -5,7 +5,8 @@
  * autocomplete for hostnames, attributes, attribute values and filters by
  * now.
  */
-$(document).ready(function () {
+
+servershell.enable_search_autocomplete = function () {
     let _build_value = function (full_term, cur_term, attribute, value) {
         let cur_term_index = full_term.lastIndexOf(cur_term);
         let result = full_term.substring(0, cur_term_index) + attribute;
@@ -117,4 +118,8 @@ $(document).ready(function () {
     autocomplete_search_input.autocomplete($('#autocomplete')[0].checked ? 'enable' : 'disable');
     autocomplete_search_input.autocomplete('option', 'autoFocus', $('#autoselect')[0].checked);
     autocomplete_search_input.autocomplete('option', 'delay', $('#autocomplete_delay_search')[0].value);
+}
+
+$(document).ready(function () {
+    servershell.enable_search_autocomplete();
 });

From 5d287df82216d77b57c6340b3a3558d00e43165a Mon Sep 17 00:00:00 2001
From: "maximilian.lotz" <maximilian.lotz@innogames.com>
Date: Fri, 27 Feb 2026 16:34:42 +0100
Subject: [PATCH 04/10] Add history svg

---
 serveradmin/common/static/icons/clock-history.svg | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 serveradmin/common/static/icons/clock-history.svg

diff --git a/serveradmin/common/static/icons/clock-history.svg b/serveradmin/common/static/icons/clock-history.svg
new file mode 100644
index 00000000..f685e10a
--- /dev/null
+++ b/serveradmin/common/static/icons/clock-history.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-clock-history" viewBox="0 0 16 16">
+  <path d="M8.515 1.019A7 7 0 0 0 8 1V0a8 8 0 0 1 .589.022zm2.004.45a7 7 0 0 0-.985-.299l.219-.976q.576.129 1.126.342zm1.37.71a7 7 0 0 0-.439-.27l.493-.87a8 8 0 0 1 .979.654l-.615.789a7 7 0 0 0-.418-.302zm1.834 1.79a7 7 0 0 0-.653-.796l.724-.69q.406.429.747.91zm.744 1.352a7 7 0 0 0-.214-.468l.893-.45a8 8 0 0 1 .45 1.088l-.95.313a7 7 0 0 0-.179-.483m.53 2.507a7 7 0 0 0-.1-1.025l.985-.17q.1.58.116 1.17zm-.131 1.538q.05-.254.081-.51l.993.123a8 8 0 0 1-.23 1.155l-.964-.267q.069-.247.12-.501m-.952 2.379q.276-.436.486-.908l.914.405q-.24.54-.555 1.038zm-.964 1.205q.183-.183.35-.378l.758.653a8 8 0 0 1-.401.432z"/>
+  <path d="M8 1a7 7 0 1 0 4.95 11.95l.707.707A8.001 8.001 0 1 1 8 0z"/>
+  <path d="M7.5 3a.5.5 0 0 1 .5.5v5.21l3.248 1.856a.5.5 0 0 1-.496.868l-3.5-2A.5.5 0 0 1 7 9V3.5a.5.5 0 0 1 .5-.5"/>
+</svg>
\ No newline at end of file

From 25fc5c8f86df951c6083272c7e38c33bcc7d57b6 Mon Sep 17 00:00:00 2001
From: "maximilian.lotz" <maximilian.lotz@innogames.com>
Date: Fri, 27 Feb 2026 17:25:55 +0100
Subject: [PATCH 05/10] Close history on focus los

---
 .../static/js/servershell/autocomplete/history.js          | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/serveradmin/servershell/static/js/servershell/autocomplete/history.js b/serveradmin/servershell/static/js/servershell/autocomplete/history.js
index 09621196..9d4b5f92 100644
--- a/serveradmin/servershell/static/js/servershell/autocomplete/history.js
+++ b/serveradmin/servershell/static/js/servershell/autocomplete/history.js
@@ -56,4 +56,11 @@ $(document).ready(function () {
             servershell.open_history_autocomplete();
         }
     });
+
+    $('#term').on('focusout', () => {
+        // If the user clicks away from the search box we want to return to normal mode
+        if (servershell.autocomplete_history_enabled) {
+            servershell.close_history_autocomplete();
+        }
+    })
 });
\ No newline at end of file

From 68f17a7446f5f4f3115a0325836ccfb98ab8593a Mon Sep 17 00:00:00 2001
From: "maximilian.lotz" <maximilian.lotz@innogames.com>
Date: Fri, 27 Feb 2026 17:26:39 +0100
Subject: [PATCH 06/10] Rename search to term

---
 .../static/js/servershell/autocomplete/history.js           | 4 ++--
 serveradmin/servershell/static/js/servershell/history.js    | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/serveradmin/servershell/static/js/servershell/autocomplete/history.js b/serveradmin/servershell/static/js/servershell/autocomplete/history.js
index 9d4b5f92..69cfa28f 100644
--- a/serveradmin/servershell/static/js/servershell/autocomplete/history.js
+++ b/serveradmin/servershell/static/js/servershell/autocomplete/history.js
@@ -23,8 +23,8 @@ servershell.open_history_autocomplete = function () {
             const search = request.term;
 
             const history = servershell.history.get()
-            const possibleChoices = history.filter((entry) => entry.search.toLowerCase().includes(search.toLowerCase()))
-                .map((entry) => entry.search);
+            const possibleChoices = history.filter((entry) => entry.term.toLowerCase().includes(search.toLowerCase()))
+                .map((entry) => entry.term);
             response(possibleChoices.slice(0, Math.min(displayLimit, possibleChoices.length)));
         },
 
diff --git a/serveradmin/servershell/static/js/servershell/history.js b/serveradmin/servershell/static/js/servershell/history.js
index 20022ab3..c423be8d 100644
--- a/serveradmin/servershell/static/js/servershell/history.js
+++ b/serveradmin/servershell/static/js/servershell/history.js
@@ -16,7 +16,7 @@ servershell.history = {
     storeEntry: function (entry) {
         const history = servershell.history.get();
 
-        const matching = servershell.history.findMatchingEntry(entry)
+        const matching = servershell.history.findMatchingEntry(entry.term)
         if (matching !== -1) {
             history.splice(matching, 1);
         }
@@ -35,8 +35,8 @@ servershell.history = {
         localStorage.setItem(storageKey, "[]");
     },
 
-    findMatchingEntry: function (entry) {
+    findMatchingEntry: function (term) {
         const history = servershell.history.get();
-        return history.findIndex((i) => entry.search === i.search);
+        return history.findIndex((i) => term === i.term);
     }
 }
\ No newline at end of file

From 4455ed1dcb663d57605ca8960c524b172df6119a Mon Sep 17 00:00:00 2001
From: "maximilian.lotz" <maximilian.lotz@innogames.com>
Date: Fri, 27 Feb 2026 17:33:06 +0100
Subject: [PATCH 07/10] Store queried entries

---
 .../static/js/servershell/autocomplete/history.js          | 5 ++++-
 serveradmin/servershell/static/js/servershell/history.js   | 5 +++--
 serveradmin/servershell/static/js/servershell/search.js    | 7 +++++++
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/serveradmin/servershell/static/js/servershell/autocomplete/history.js b/serveradmin/servershell/static/js/servershell/autocomplete/history.js
index 69cfa28f..b063d7a3 100644
--- a/serveradmin/servershell/static/js/servershell/autocomplete/history.js
+++ b/serveradmin/servershell/static/js/servershell/autocomplete/history.js
@@ -29,7 +29,10 @@ servershell.open_history_autocomplete = function () {
         },
 
         select: function (_, ui) {
-            autocomplete_search_input.trigger('change', ui.item.value);
+            const term = ui.item.value
+            const [, entry] = servershell.history.findMatchingEntry(term)
+            servershell.shown_attributes = entry.shown_attributes
+            autocomplete_search_input.trigger('change', term);
             servershell.close_history_autocomplete()
         }
     });
diff --git a/serveradmin/servershell/static/js/servershell/history.js b/serveradmin/servershell/static/js/servershell/history.js
index c423be8d..f93e7032 100644
--- a/serveradmin/servershell/static/js/servershell/history.js
+++ b/serveradmin/servershell/static/js/servershell/history.js
@@ -16,7 +16,7 @@ servershell.history = {
     storeEntry: function (entry) {
         const history = servershell.history.get();
 
-        const matching = servershell.history.findMatchingEntry(entry.term)
+        const [matching] = servershell.history.findMatchingEntry(entry.term)
         if (matching !== -1) {
             history.splice(matching, 1);
         }
@@ -37,6 +37,7 @@ servershell.history = {
 
     findMatchingEntry: function (term) {
         const history = servershell.history.get();
-        return history.findIndex((i) => term === i.term);
+        const index = history.findIndex((i) => term === i.term)
+        return [index, history[index]];
     }
 }
\ No newline at end of file
diff --git a/serveradmin/servershell/static/js/servershell/search.js b/serveradmin/servershell/static/js/servershell/search.js
index 54e7c053..180186b7 100644
--- a/serveradmin/servershell/static/js/servershell/search.js
+++ b/serveradmin/servershell/static/js/servershell/search.js
@@ -100,6 +100,13 @@ servershell.submit_search = function(focus_command_input = false) {
                 servershell.num_servers = data.num_servers;
                 servershell.status = data.status;
                 servershell.understood = data.understood;
+
+                if (servershell.term) {
+                    servershell.history.storeEntry({
+                        term: servershell.term,
+                        shown_attributes: servershell.shown_attributes,
+                    });
+                }
             }
         })
         .catch(function(xhr) {

From 4d990e4c122d346c73b467651b4e4f9076797b4b Mon Sep 17 00:00:00 2001
From: "maximilian.lotz" <maximilian.lotz@innogames.com>
Date: Sun, 1 Mar 2026 11:45:51 +0100
Subject: [PATCH 08/10] Implement additional settings

---
 .../servershell/static/css/servershell.css    |  6 -----
 .../js/servershell/autocomplete/history.js    | 22 ++++++++++---------
 .../static/js/servershell/history.js          | 16 +++++++++-----
 .../static/js/servershell/search.js           |  8 +++++++
 .../templates/servershell/index.html          | 20 ++++++++++++++++-
 serveradmin/servershell/views.py              |  3 +++
 6 files changed, 52 insertions(+), 23 deletions(-)

diff --git a/serveradmin/servershell/static/css/servershell.css b/serveradmin/servershell/static/css/servershell.css
index 293b7ce1..55376a26 100644
--- a/serveradmin/servershell/static/css/servershell.css
+++ b/serveradmin/servershell/static/css/servershell.css
@@ -48,12 +48,6 @@ th:hover .attr-headericons {
     border: 1px solid #ced4da;
 }
 
-#history-toggle {
-    background-color: #fff;
-    background-clip: padding-box;
-    border: 1px solid #ced4da;
-}
-
 #history-toggle.active {
     background: var(--background-primary);
 }
diff --git a/serveradmin/servershell/static/js/servershell/autocomplete/history.js b/serveradmin/servershell/static/js/servershell/autocomplete/history.js
index b063d7a3..24839412 100644
--- a/serveradmin/servershell/static/js/servershell/autocomplete/history.js
+++ b/serveradmin/servershell/static/js/servershell/autocomplete/history.js
@@ -31,15 +31,24 @@ servershell.open_history_autocomplete = function () {
         select: function (_, ui) {
             const term = ui.item.value
             const [, entry] = servershell.history.findMatchingEntry(term)
-            servershell.shown_attributes = entry.shown_attributes
-            autocomplete_search_input.trigger('change', term);
+
+            servershell.term = term;
+
+            const manageAttributes = $('#history_attributes')[0].checked
+            if (manageAttributes && entry) {
+                servershell.shown_attributes = entry.shown_attributes
+            } else {
+                servershell.submit_search()
+            }
             servershell.close_history_autocomplete()
         }
     });
     autocomplete_search_input.autocomplete('enable');
     autocomplete_search_input.autocomplete('option', 'autoFocus', $('#autoselect')[0].checked);
     autocomplete_search_input.autocomplete('option', 'minLength', 0);
-    autocomplete_search_input.autocomplete('option', 'delay', 50); // Searching local storage is fast
+    autocomplete_search_input.autocomplete('option', 'delay', 50);
+
+    // When history is opened show all item, regardless of the current input text
     autocomplete_search_input.autocomplete('search', "");
     autocomplete_search_input.focus();
     servershell.autocomplete_history_enabled = true;
@@ -59,11 +68,4 @@ $(document).ready(function () {
             servershell.open_history_autocomplete();
         }
     });
-
-    $('#term').on('focusout', () => {
-        // If the user clicks away from the search box we want to return to normal mode
-        if (servershell.autocomplete_history_enabled) {
-            servershell.close_history_autocomplete();
-        }
-    })
 });
\ No newline at end of file
diff --git a/serveradmin/servershell/static/js/servershell/history.js b/serveradmin/servershell/static/js/servershell/history.js
index f93e7032..88760337 100644
--- a/serveradmin/servershell/static/js/servershell/history.js
+++ b/serveradmin/servershell/static/js/servershell/history.js
@@ -1,11 +1,11 @@
-const storageKey = "servershell_history"
+const historyStorageKey = "servershell_history"
 
 servershell.history = {
     /**
      * @returns {[]}
      */
     get: function () {
-        const history = localStorage.getItem(storageKey);
+        const history = localStorage.getItem(historyStorageKey);
         if (!history) {
             return []
         }
@@ -21,23 +21,27 @@ servershell.history = {
             history.splice(matching, 1);
         }
 
-        // TODO: Dynamic max length
-        while (history.length >= 20) {
+        const maxSize = parseInt($('#history_size').val())
+        while (history.length >= maxSize) {
             history.pop();
         }
 
         history.unshift(entry);
 
-        localStorage.setItem(storageKey, JSON.stringify(history))
+        localStorage.setItem(historyStorageKey, JSON.stringify(history))
     },
 
     clear: function () {
-        localStorage.setItem(storageKey, "[]");
+        localStorage.setItem(historyStorageKey, "[]");
     },
 
     findMatchingEntry: function (term) {
         const history = servershell.history.get();
         const index = history.findIndex((i) => term === i.term)
+        if (index === -1) {
+            return [-1, undefined]
+        }
+
         return [index, history[index]];
     }
 }
\ No newline at end of file
diff --git a/serveradmin/servershell/static/js/servershell/search.js b/serveradmin/servershell/static/js/servershell/search.js
index 180186b7..d477a986 100644
--- a/serveradmin/servershell/static/js/servershell/search.js
+++ b/serveradmin/servershell/static/js/servershell/search.js
@@ -102,6 +102,11 @@ servershell.submit_search = function(focus_command_input = false) {
                 servershell.understood = data.understood;
 
                 if (servershell.term) {
+                    const storeEmpty = $('#history_store_empty')[0].checked
+                    if (!storeEmpty && data.servers.length === 0) {
+                        return
+                    }
+
                     servershell.history.storeEntry({
                         term: servershell.term,
                         shown_attributes: servershell.shown_attributes,
@@ -173,6 +178,9 @@ $(document).ready(function() {
             'autocomplete_delay_commands': $('#autocomplete_delay_commands').val(),
             'autoselect': $('#autoselect')[0].checked,
             'save_attributes': $('#save_attributes')[0].checked,
+            'history_attributes': $('#history_attributes')[0].checked,
+            'history_size': $('#history_size').val(),
+            'history_store_empty': $('#history_store_empty')[0].checked,
             'timeout': 5000,
         }).done(function(data) {
             servershell.search_settings = data;
diff --git a/serveradmin/servershell/templates/servershell/index.html b/serveradmin/servershell/templates/servershell/index.html
index a87f76a2..aef3f74d 100644
--- a/serveradmin/servershell/templates/servershell/index.html
+++ b/serveradmin/servershell/templates/servershell/index.html
@@ -54,7 +54,7 @@
             <!-- Advanced search options (hidden by default) -->
             <div class="collapse" id="search-options">
                 <div class="card card-body">
-                    <b>Your search settings are bound to your user and persistent.</b>
+                    <b>Your settings are bound to your user and persistent.</b>
                     <div class="form-check">
                         <input type="checkbox" class="form-check-input" id="autocomplete" {% if search_settings.autocomplete %}checked="checked"{% endif %} onchange="this.checked ? $('.autocomplete').autocomplete('enable') : $('.autocomplete').autocomplete('disable');">
                         <label class="form-check-label" for="autocomplete">Autocomplete for Search & Command</label>
@@ -76,6 +76,23 @@
                         <label class="form-input-label" for="autocomplete_delay_commands">Delay in milliseconds before auto completion for commands kicks in.</label>
                     </div>
                     <hr>
+                    <b>Search History</b>
+                    <div class="form-check">
+                        <input type="checkbox" class="form-check-input" id="history_attributes" {% if search_settings.history_attributes %}checked="checked"{% endif %}>
+                        <label class="form-check-label" for="history_attributes">When selecting a history entry also change displayed attributes</label>
+                    </div>
+                    <div class="form-check">
+                        <input type="checkbox" class="form-check-input" id="history_store_empty" {% if search_settings.history_store_empty %}checked="checked"{% endif %}>
+                        <label class="form-check-label" for="history_store_empty">Whether searches that yield no results should be stored</label>
+                    </div>
+                    <div class="form-check">
+                        <input type="number" class="form-input" id="history_size" value="{{ search_settings.history_size }}" min="20">
+                        <label class="form-input-label" for="history_size">The maximum size of your history</label>
+                    </div>
+                    <div>
+                        <input value="Clear History" type="button" onclick="servershell.history.clear()">
+                    </div>
+                    <hr>
                     <b>Keyboard Shortcuts</b>
                     <ul>
                         <li><kbd>TAB</kbd> Goto next input</li>
@@ -85,6 +102,7 @@
                         <li><kbd>CTRL + &#8592;</kbd> Jump a word backward</li>
                         <li><kbd>CTRL + &#8594;</kbd> Jump a word forward</li>
                         <li><kbd>ALT + BACKSPACE</kbd> Delete one word (reverse)</li>
+                        <li><kbd>CTRL + SHIFT + F</kbd> Toggle search history</li>
                     </ul>
                 </div>
             </div>
diff --git a/serveradmin/servershell/views.py b/serveradmin/servershell/views.py
index a035a87d..7362a66d 100644
--- a/serveradmin/servershell/views.py
+++ b/serveradmin/servershell/views.py
@@ -56,6 +56,9 @@
     'autocomplete_delay_commands': 10,
     'autoselect': True,
     'save_attributes': False,
+    'history_attributes': True,
+    'history_size': 20,
+    'history_store_empty': True,
 }
 
 

From ca3f937d58485b7763bb1a4a72d265b69a00890e Mon Sep 17 00:00:00 2001
From: "maximilian.lotz" <maximilian.lotz@innogames.com>
Date: Sun, 1 Mar 2026 19:15:25 +0100
Subject: [PATCH 09/10] Add disclaimer to history.js

---
 .../js/servershell/autocomplete/history.js      | 12 ++++++------
 .../static/js/servershell/history.js            | 17 ++++++++++-------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/serveradmin/servershell/static/js/servershell/autocomplete/history.js b/serveradmin/servershell/static/js/servershell/autocomplete/history.js
index 24839412..12156f56 100644
--- a/serveradmin/servershell/static/js/servershell/autocomplete/history.js
+++ b/serveradmin/servershell/static/js/servershell/autocomplete/history.js
@@ -29,18 +29,18 @@ servershell.open_history_autocomplete = function () {
         },
 
         select: function (_, ui) {
-            const term = ui.item.value
-            const [, entry] = servershell.history.findMatchingEntry(term)
+            const term = ui.item.value;
+            const [, entry] = servershell.history.findMatchingEntry(term);
 
             servershell.term = term;
 
-            const manageAttributes = $('#history_attributes')[0].checked
+            const manageAttributes = $('#history_attributes')[0].checked;
             if (manageAttributes && entry) {
-                servershell.shown_attributes = entry.shown_attributes
+                servershell.shown_attributes = entry.shown_attributes;
             } else {
-                servershell.submit_search()
+                servershell.submit_search();
             }
-            servershell.close_history_autocomplete()
+            servershell.close_history_autocomplete();
         }
     });
     autocomplete_search_input.autocomplete('enable');
diff --git a/serveradmin/servershell/static/js/servershell/history.js b/serveradmin/servershell/static/js/servershell/history.js
index 88760337..64bf0285 100644
--- a/serveradmin/servershell/static/js/servershell/history.js
+++ b/serveradmin/servershell/static/js/servershell/history.js
@@ -1,13 +1,16 @@
+/*
+ * History - Copyright (c) 2026 InnoGames GmbH
+ *
+ * This module implements interactions with localstorage to serve the history array.
+ */
+
 const historyStorageKey = "servershell_history"
 
 servershell.history = {
-    /**
-     * @returns {[]}
-     */
     get: function () {
         const history = localStorage.getItem(historyStorageKey);
         if (!history) {
-            return []
+            return [];
         }
 
         return JSON.parse(history);
@@ -16,19 +19,19 @@ servershell.history = {
     storeEntry: function (entry) {
         const history = servershell.history.get();
 
-        const [matching] = servershell.history.findMatchingEntry(entry.term)
+        const [matching] = servershell.history.findMatchingEntry(entry.term);
         if (matching !== -1) {
             history.splice(matching, 1);
         }
 
-        const maxSize = parseInt($('#history_size').val())
+        const maxSize = parseInt($('#history_size').val());
         while (history.length >= maxSize) {
             history.pop();
         }
 
         history.unshift(entry);
 
-        localStorage.setItem(historyStorageKey, JSON.stringify(history))
+        localStorage.setItem(historyStorageKey, JSON.stringify(history));
     },
 
     clear: function () {

From feba596a35c7ec0ddbbdbbdaba2d8a1d14cc3c8e Mon Sep 17 00:00:00 2001
From: "maximilian.lotz" <maximilian.lotz@innogames.com>
Date: Mon, 9 Mar 2026 08:45:18 +0100
Subject: [PATCH 10/10] Apply PR suggestions

---
 .../servershell/static/js/servershell/autocomplete/history.js   | 2 +-
 serveradmin/servershell/templates/servershell/index.html        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/serveradmin/servershell/static/js/servershell/autocomplete/history.js b/serveradmin/servershell/static/js/servershell/autocomplete/history.js
index 12156f56..4890612e 100644
--- a/serveradmin/servershell/static/js/servershell/autocomplete/history.js
+++ b/serveradmin/servershell/static/js/servershell/autocomplete/history.js
@@ -46,7 +46,7 @@ servershell.open_history_autocomplete = function () {
     autocomplete_search_input.autocomplete('enable');
     autocomplete_search_input.autocomplete('option', 'autoFocus', $('#autoselect')[0].checked);
     autocomplete_search_input.autocomplete('option', 'minLength', 0);
-    autocomplete_search_input.autocomplete('option', 'delay', 50);
+    autocomplete_search_input.autocomplete('option', 'delay', $('#autocomplete_delay_search')[0].value);
 
     // When history is opened show all item, regardless of the current input text
     autocomplete_search_input.autocomplete('search', "");
diff --git a/serveradmin/servershell/templates/servershell/index.html b/serveradmin/servershell/templates/servershell/index.html
index aef3f74d..2e807758 100644
--- a/serveradmin/servershell/templates/servershell/index.html
+++ b/serveradmin/servershell/templates/servershell/index.html
@@ -90,7 +90,7 @@
                         <label class="form-input-label" for="history_size">The maximum size of your history</label>
                     </div>
                     <div>
-                        <input value="Clear History" type="button" onclick="servershell.history.clear()">
+                        <input value="Clear History" type="button" onclick="servershell.history.clear()" class="btn btn-sm btn-danger" style="margin-top: 5px;">
                     </div>
                     <hr>
                     <b>Keyboard Shortcuts</b>