Merge pull request #13 from overcuriousity/claude/fix-setup-wizard-display-IroVi

Always prompt for GPG key selection for transparency

trace/gpg_wizard.py

@@ -76,27 +76,23 @@ def run_gpg_wizard():
     # Let user select a key
     selected_key = None
 
-    if len(keys) == 1:
+    while True:
-        print(f"Only one key found. Using: {keys[0][1]}")
+        try:
-        selected_key = keys[0][0]
+            choice = input(f"Select a key (1-{len(keys)}, or 0 to use default key): ").strip()
-    else:
+            choice_num = int(choice)
-        while True:
-            try:
-                choice = input(f"Select a key (1-{len(keys)}, or 0 to use default key): ").strip()
-                choice_num = int(choice)
 
-                if choice_num == 0:
+            if choice_num == 0:
-                    print("Using GPG default key (no specific key ID)")
+                print("Using GPG default key (no specific key ID)")
-                    selected_key = None
+                selected_key = None
-                    break
+                break
-                elif 1 <= choice_num <= len(keys):
+            elif 1 <= choice_num <= len(keys):
-                    selected_key = keys[choice_num - 1][0]
+                selected_key = keys[choice_num - 1][0]
-                    print(f"Selected: {keys[choice_num - 1][1]}")
+                print(f"Selected: {keys[choice_num - 1][1]}")
-                    break
+                break
-                else:
+            else:
-                    print(f"Please enter a number between 0 and {len(keys)}")
+                print(f"Please enter a number between 0 and {len(keys)}")
-            except ValueError:
+        except ValueError:
-                print("Please enter a valid number")
+            print("Please enter a valid number")
 
     print("\n✓ GPG signing enabled!")
     if selected_key:
@@ -115,10 +111,9 @@ def check_and_run_wizard():
     Returns True if wizard was run, False otherwise.
     """
     state_manager = StateManager()
-    settings = state_manager.get_settings()
 
-    # Check if wizard has already been run (presence of any GPG setting indicates setup was done)
+    # Check if settings file exists - if it does, wizard has already been run
-    if "pgp_enabled" in settings:
+    if state_manager.settings_file.exists():
         return False
 
     # First run - run wizard

trace/tui_app.py

@@ -753,11 +753,12 @@ class TUI:
 
         if not evidence_list:
             # Check if we have space to display the message
-            if y_pos + 2 < self.height - 2:
+            if y_pos + 1 < self.height - 2:
                 self.stdscr.attron(curses.color_pair(3))
-                self.stdscr.addstr(y_pos + 1, 4, "┌─ No evidence items")
+                self.stdscr.addstr(y_pos, 4, "┌─ No evidence items")
-                self.stdscr.addstr(y_pos + 2, 4, "└─ Press 'N' to add evidence")
+                self.stdscr.addstr(y_pos + 1, 4, "└─ Press 'N' to add evidence")
                 self.stdscr.attroff(curses.color_pair(3))
+                y_pos += 2  # Account for the 2 lines used by the message
         else:
             # Scrolling for evidence list
             # Calculate remaining space