feat: add robust GPTel integration and improve sidebar toggle handling

- Add context-navigator--reinit-after-reload to reinstall hooks and resubscribe
  after reload, ensuring UI shows correct project state immediately.
- Improve context-navigator-gptel-bridge:
  * Soft-require GPTel on demand and prefer authoritative context sources
    for robust retrieval of GPTel context entries.
  * Add fallback raw-items construction when conversion yields no items but raw
    GPTel data exists, supporting better presence detection.
  * Implement detection and fallback reset in apply function when pull is empty
    but raw GPTel context is non-empty.
  * Add idempotent advice and variable watchers to publish :gptel-change events,
    keeping UI indicators up-to-date.
  * Harden enabling/disabling items and context synchronization, ignoring disabled
    items on adds and doing full reset when buffers are involved in diffs.
- Enhance sidebar toggle-enabled command:
  * Rename from toggle-gptel for clarity; toggle model item enabled state and,
    if auto-push enabled, apply changes immediately to GPTel.
  * Immediately refresh cached GPTel keys snapshot to update sidebar indicators
    and display transient messages about new enabled state.
- Refine rendering of sidebar items:
  * Always show green/gray indicator bullets reflecting actual GPTel presence,
    even when keys snapshot is absent (gray), and apply subdued face for disabled
    item names.
- Add extensive tests covering:
  * GPTel apply fallback reset when pull is empty but raw data present.
  * Conversion of basic GPTel entries including files and buffer regions.
  * Sidebar toggle-enabled command functionality with push on and off scenarios.
  * Rendering disabled items with appropriate face.
  * Rendering of indicators when GPTel keys snapshot is missing.
- Minor refactors and enhanced logging for debugging and tracing GPTel state and UI sync.

This work improves robustness and user experience of the Context Navigator plugin
when integrating with GPTel contexts and manages toggle operations consistently
across model and GPTel state.

Author: 11111000000

context-navigator-core.el

@@ -1066,5 +1066,44 @@ Strategy:
                                     (buffer-list))))
           (and buf-any (context-navigator-project-current-root buf-any))))))
 
+(defun context-navigator--reinit-after-reload ()
+  "Reinstall hooks/subscriptions when file is reloaded and mode is ON.
+Also triggers an immediate project switch so header shows actual project."
+  (when (bound-and-true-p context-navigator-mode)
+    ;; Reset event bus to avoid duplicated subscribers from older definitions.
+    (ignore-errors (context-navigator-events-reset))
+    (setq context-navigator--event-tokens nil)
+    ;; Ensure project hooks installed
+    (ignore-errors (context-navigator-project-setup-hooks))
+    ;; Re-subscribe
+    (push (context-navigator-events-subscribe :project-switch #'context-navigator--on-project-switch)
+          context-navigator--event-tokens)
+    (push (context-navigator-events-subscribe
+           :model-refreshed
+           (lambda (_state)
+             ;; Debounced autosave (latest state at execution time)
+             (when context-navigator-autosave
+               (context-navigator-events-debounce
+                :autosave
+                (or context-navigator-autosave-debounce 0.5)
+                (lambda ()
+                  (let ((st (context-navigator--state-get)))
+                    (when (and context-navigator-autosave
+                               (context-navigator-state-p st)
+                               (not (context-navigator-state-inhibit-autosave st)))
+                      (let ((root (context-navigator-state-last-project-root st))
+                            (slug (context-navigator-state-current-group-slug st))
+                            (items (context-navigator-state-items st)))
+                        (when (and (stringp slug) (not (string-empty-p slug)))
+                          (ignore-errors (context-navigator-persist-save items root slug)))))))))))
+          context-navigator--event-tokens)
+    ;; Trigger initial project switch so UI/header reflect actual project
+    (when context-navigator--auto-project-switch
+      (let ((root (ignore-errors (context-navigator--pick-root-for-autoproject))))
+        (context-navigator-events-publish :project-switch root)))))
+
+;; Auto-reinit after reload (eval-buffer/byte-compile)
+(context-navigator--reinit-after-reload)
+
 (provide 'context-navigator-core)
 ;;; context-navigator-core.el ends here

context-navigator-gptel-bridge.el

@@ -15,6 +15,7 @@
 (require 'cl-lib)
 (require 'subr-x)
 (require 'context-navigator-model)
+(require 'context-navigator-log)
 
 (defgroup context-navigator-render nil
   "Rendering settings for context-navigator."
@@ -37,6 +38,11 @@
   :type '(choice (const auto) (const icons) (const text) (const off))
   :group 'context-navigator-render)
 
+(defface context-navigator-disabled-face
+  '((t :foreground "gray55"))
+  "Face used to render disabled items in the sidebar."
+  :group 'context-navigator-render)
+
 (defvar-local context-navigator-render--last-hash nil)
 (defvar context-navigator-render--gptel-keys nil
   "Optional list of stable keys of items currently present in gptel.
@@ -113,25 +119,36 @@ indicator sits centered and appears moderately large relative to item text."
   "Format a single ITEM into a propertized line string, using ICON-FN if non-nil.
 When LEFT-WIDTH is non-nil, align the left column to that width.
 
-Binary indicator (when gptel keys list is provided):
-- green  ● : item present in gptel
-- gray   ○ : item absent in gptel."
+Binary indicator:
+- green  ● : item present in gptel (when keys snapshot says so)
+- gray   ○ : item absent in gptel or when the keys snapshot is unknown.
+Disabled items are rendered with a subdued face (only the name). Indicator reflects actual gptel presence (green when present, gray otherwise)."
   (let* ((key (context-navigator-model-item-key item))
          (name (context-navigator-render--truncate
                 (or (context-navigator-item-name item) "")
                 context-navigator-render-truncate-name))
          (path (or (context-navigator-item-path item) ""))
-         ;; Show indicators only when we have a non-empty keys snapshot.
-         ;; When gptel keys are absent (nil), hide indicators.
-         (have-keys (consp context-navigator-render--gptel-keys))
-         (present (and have-keys (member key context-navigator-render--gptel-keys)))
-         (state-icon (and have-keys
-                          (context-navigator-render--indicator present)))
+         (enabled (not (null (context-navigator-item-enabled item))))
+         (keys-list context-navigator-render--gptel-keys)
+         ;; Reflect actual presence in gptel regardless of enabled flag.
+         (present (and keys-list (member key keys-list)))
+         ;; Always render an indicator; when PRESENT is nil it will be gray
+         (state-icon (context-navigator-render--indicator present))
+         ;; Trace why indicator is green/gray in this render row
+         (ignore-errors
+           (context-navigator-debug :trace :render
+                                    "indicator key=%s enabled=%s present=%s keys=%d"
+                                    key enabled (and present t)
+                                    (length (or keys-list '()))))
          (icon (and (functionp icon-fn) (or (funcall icon-fn item) "")))
+         ;; Dim only the name for disabled items; do not touch indicator/icon.
+         (name-prop (if enabled
+                        name
+                      (propertize name 'face 'context-navigator-disabled-face)))
          (left (context-navigator-render--left-column
                 state-icon
                 (and (stringp icon) icon)
-                name))
+                name-prop))
          (right (context-navigator-render--right-column path))
          ;; Add a small left padding to each item line
          (line (context-navigator-render--compose-line (concat " " left) right left-width)))

context-navigator-render.el

@@ -22,6 +22,7 @@
 (require 'context-navigator-icons)
 (require 'context-navigator-persist)
 (require 'context-navigator-i18n)
+(require 'context-navigator-log)
 
 (defcustom context-navigator-auto-open-groups-on-error t
   "When non-nil, automatically switch the sidebar to the groups list if a group fails to load."
@@ -1102,15 +1103,56 @@ Wraps to the bottom when no previous element is found before point."
                "0.2.1")
 
 (defun context-navigator-sidebar-toggle-enabled ()
-  "Toggle enabled/disabled for the item at point, apply to gptel.
+  "Toggle inclusion of the item at point in gptel sync (model :enabled).
 
-Deprecated for 't' binding: use `context-navigator-sidebar-toggle-gptel' to toggle gptel membership."
+Toggles the item's enabled flag and, when push→gptel is ON, applies the
+updated set to gptel immediately. The new state is persisted via the
+existing debounced autosave."
   (interactive)
   (when-let* ((item (context-navigator-sidebar--at-item)))
-    (let* ((key (context-navigator-model-item-key item)))
-      (message "Deprecated: toggling model only for %s" (or (context-navigator-item-name item) key))
-      (let* ((st (ignore-errors (context-navigator-toggle-item key))))
-        (ignore-errors st))
+    (let* ((key (context-navigator-model-item-key item))
+           (name (or (context-navigator-item-name item) key)))
+      ;; Toggle model
+      (ignore-errors (context-navigator-toggle-item key))
+      ;; Apply to gptel immediately when auto-push is ON and refresh indicators snapshot
+      (when (and (boundp 'context-navigator--push-to-gptel)
+                 context-navigator--push-to-gptel)
+        (let* ((st (ignore-errors (context-navigator--state-get)))
+               (items (and st (context-navigator-state-items st))))
+          (let ((res (ignore-errors (context-navigator-gptel-apply (or items '())))))
+            (ignore-errors
+              (context-navigator-debug :debug :ui "toggle:t apply -> %S" res)))
+          ;; Immediately refresh cached keys so lamps reflect actual presence now.
+          (let* ((lst (ignore-errors (context-navigator-gptel-pull)))
+                 (pulled-keys (and (listp lst)
+                                   (mapcar #'context-navigator-model-item-key lst)))
+                 (raw-keys (and (or (null pulled-keys) (= (length pulled-keys) 0))
+                                (fboundp 'context-navigator-gptel--raw-keys)
+                                (ignore-errors (context-navigator-gptel--raw-keys))))
+                 (fallback-keys
+                  (when (and (or (null pulled-keys) (= (length pulled-keys) 0))
+                             (or (null raw-keys) (= (length raw-keys) 0)))
+                    (and (listp items)
+                         (mapcar #'context-navigator-model-item-key
+                                 (cl-remove-if-not #'context-navigator-item-enabled items)))))
+                 (keys (or pulled-keys raw-keys fallback-keys '())))
+            (let ((h (sxhash-equal keys)))
+              (setq context-navigator-sidebar--gptel-keys keys
+                    context-navigator-sidebar--gptel-keys-hash h)
+              (ignore-errors
+                (context-navigator-debug :debug :ui
+                                         "toggle:t immediate pull -> keys=%d hash=%s%s"
+                                         (length keys) h
+                                         (if (and (or (null pulled-keys) (= (length pulled-keys) 0))
+                                                  (or (null raw-keys) (= (length raw-keys) 0)))
+                                             " (fallback)" "")))))))
+      ;; Report new state briefly
+      (let* ((st2 (ignore-errors (context-navigator--state-get)))
+             (idx (and st2 (context-navigator-state-index st2)))
+             (it2 (and idx (gethash key idx)))
+             (en (and it2 (context-navigator-item-enabled it2))))
+        (message (if en "Enabled: %s" "Disabled: %s") name))
+      ;; Refresh UI and advance to the next item
       (context-navigator-sidebar--schedule-render)
       (context-navigator-sidebar--render-if-visible)
       (context-navigator-sidebar-next-item))))
@@ -1233,20 +1275,54 @@ Order of operations:
          :gptel-change
          (lambda (&rest _)
            (let* ((lst (ignore-errors (context-navigator-gptel-pull)))
-                  (keys (and (listp lst)
-                             (mapcar #'context-navigator-model-item-key lst))))
+                  (pulled-keys (and (listp lst)
+                                    (mapcar #'context-navigator-model-item-key lst)))
+                  (raw-keys (and (or (null pulled-keys) (= (length pulled-keys) 0))
+                                 (fboundp 'context-navigator-gptel--raw-keys)
+                                 (ignore-errors (context-navigator-gptel--raw-keys))))
+                  ;; Last-resort fallback: enabled items in model only if both pulled and raw are empty
+                  (fallback-keys
+                   (when (and (or (null pulled-keys) (= (length pulled-keys) 0))
+                              (or (null raw-keys) (= (length raw-keys) 0)))
+                     (let* ((st (ignore-errors (context-navigator--state-get)))
+                            (items (and st (context-navigator-state-items st))))
+                       (and (listp items)
+                            (mapcar #'context-navigator-model-item-key
+                                    (cl-remove-if-not #'context-navigator-item-enabled items))))))
+                  (keys (or pulled-keys raw-keys fallback-keys '()))
+                  (h (sxhash-equal keys))
+                  (n (length keys))
+                  (use-fallback (and (or (null pulled-keys) (= (length pulled-keys) 0))
+                                     (or (null raw-keys) (= (length raw-keys) 0))))
+                  (sample (mapconcat (lambda (s) s)
+                                     (cl-subseq keys 0 (min 5 n))
+                                     ", ")))
              (setq context-navigator-sidebar--gptel-keys keys
-                   context-navigator-sidebar--gptel-keys-hash (sxhash-equal keys)))
+                   context-navigator-sidebar--gptel-keys-hash h)
+             (ignore-errors
+               (context-navigator-debug :debug :ui
+                                        "gptel-change: pulled %d keys, hash=%s, sample=[%s]%s"
+                                        n h sample
+                                        (if use-fallback " (fallback)" ""))))
            (context-navigator-sidebar--schedule-render)))
         context-navigator-sidebar--subs))
 
 (defun context-navigator-sidebar--init-gptel-cache ()
   "Initialize cached gptel keys once."
   (let* ((lst (ignore-errors (context-navigator-gptel-pull)))
-         (keys (and (listp lst)
-                    (mapcar #'context-navigator-model-item-key lst))))
+         (pulled (and (listp lst)
+                      (mapcar #'context-navigator-model-item-key lst)))
+         (raw (and (or (null pulled) (= (length pulled) 0))
+                   (fboundp 'context-navigator-gptel--raw-keys)
+                   (ignore-errors (context-navigator-gptel--raw-keys))))
+         (keys (or pulled raw '()))
+         (h (sxhash-equal keys)))
     (setq context-navigator-sidebar--gptel-keys keys
-          context-navigator-sidebar--gptel-keys-hash (sxhash-equal keys))))
+          context-navigator-sidebar--gptel-keys-hash h)
+    (ignore-errors
+      (context-navigator-debug :debug :ui
+                               "gptel-init: pulled %d keys, hash=%s"
+                               (length (or keys '())) h))))
 
 (defun context-navigator-sidebar--close-hijacked-windows ()
   "Close any windows previously marked as sidebar that now show a foreign buffer.
@@ -1324,12 +1400,31 @@ render."
                                (with-current-buffer buf
                                  (when (get-buffer-window buf t)
                                    (let* ((lst (ignore-errors (context-navigator-gptel-pull)))
-                                          (keys (and (listp lst)
-                                                     (mapcar #'context-navigator-model-item-key lst)))
-                                          (h (sxhash-equal keys)))
+                                          (pulled-keys (and (listp lst)
+                                                            (mapcar #'context-navigator-model-item-key lst)))
+                                          (raw-keys (and (or (null pulled-keys) (= (length pulled-keys) 0))
+                                                         (fboundp 'context-navigator-gptel--raw-keys)
+                                                         (ignore-errors (context-navigator-gptel--raw-keys))))
+                                          (fallback-keys
+                                           (when (and (or (null pulled-keys) (= (length pulled-keys) 0))
+                                                      (or (null raw-keys) (= (length raw-keys) 0)))
+                                             (let* ((st (ignore-errors (context-navigator--state-get)))
+                                                    (items (and st (context-navigator-state-items st))))
+                                               (and (listp items)
+                                                    (mapcar #'context-navigator-model-item-key
+                                                            (cl-remove-if-not #'context-navigator-item-enabled items))))))
+                                          (keys (or pulled-keys raw-keys fallback-keys '()))
+                                          (h (sxhash-equal keys))
+                                          (use-fallback (and (or (null pulled-keys) (= (length pulled-keys) 0))
+                                                             (or (null raw-keys) (= (length raw-keys) 0)))))
                                      (unless (equal h context-navigator-sidebar--gptel-keys-hash)
                                        (setq context-navigator-sidebar--gptel-keys keys
                                              context-navigator-sidebar--gptel-keys-hash h)
+                                       (ignore-errors
+                                         (context-navigator-debug :debug :ui
+                                                                  "gptel-poll: updated keys=%d hash=%s%s"
+                                                                  (length keys) h
+                                                                  (if use-fallback " (fallback)" "")))
                                        (context-navigator-sidebar--schedule-render)))))))))))))
 
 (defun context-navigator-sidebar--install-subs ()
@@ -1401,7 +1496,7 @@ MAP is a keymap to search for COMMAND bindings."
                     (context-navigator-sidebar-previous-item     . :help-previous-item)
                     (context-navigator-sidebar-activate          . :help-activate)
                     (context-navigator-sidebar-preview           . :help-preview)
-                    (context-navigator-sidebar-toggle-gptel      . :help-toggle-gptel)
+                    (context-navigator-sidebar-toggle-enabled     . :help-toggle-gptel)
                     (context-navigator-sidebar-delete-dispatch   . :help-delete)
                     (context-navigator-sidebar-refresh-dispatch  . :help-refresh)
                     (context-navigator-sidebar-go-up             . :help-go-up)
@@ -1501,7 +1596,7 @@ MAP is a keymap to search for COMMAND bindings."
     (define-key m (kbd "j")   #'context-navigator-sidebar-next-item)
     (define-key m (kbd "k")   #'context-navigator-sidebar-previous-item)
     (define-key m (kbd "l")   #'context-navigator-sidebar-activate)
-    (define-key m (kbd "t")   #'context-navigator-sidebar-toggle-gptel)
+    (define-key m (kbd "t")   #'context-navigator-sidebar-toggle-enabled)
 
     ;; TAB navigation between interactive elements
     ;; Bind several TAB event representations to be robust across terminals/minor-modes.
@@ -1548,7 +1643,7 @@ MAP is a keymap to search for COMMAND bindings."
 ;; Ensure bindings are updated after reloads (defvar won't reinitialize an existing keymap).
 (when (keymapp context-navigator-sidebar-mode-map)
   ;; Keep legacy binding in sync
-  (define-key context-navigator-sidebar-mode-map (kbd "t") #'context-navigator-sidebar-toggle-gptel)
+  (define-key context-navigator-sidebar-mode-map (kbd "t") #'context-navigator-sidebar-toggle-enabled)
   ;; Make TAB robust across reloads/terminals/minor-modes
   (define-key context-navigator-sidebar-mode-map (kbd "TAB")       #'context-navigator-sidebar-tab-next)
   (define-key context-navigator-sidebar-mode-map (kbd "<tab>")     #'context-navigator-sidebar-tab-next)
@@ -1660,6 +1755,18 @@ Do not highlight header/separator lines."
   "Toggle push-to-gptel session flag and refresh header immediately."
   (interactive)
   (ignore-errors (context-navigator-toggle-push-to-gptel))
+  ;; Immediately refresh cached keys from gptel so indicators reflect actual presence,
+  ;; regardless of push flag.
+  (let* ((lst (ignore-errors (context-navigator-gptel-pull)))
+         (keys (and (listp lst)
+                    (mapcar #'context-navigator-model-item-key lst)))
+         (h (sxhash-equal keys)))
+    (setq context-navigator-sidebar--gptel-keys keys
+          context-navigator-sidebar--gptel-keys-hash h)
+    (ignore-errors
+      (context-navigator-debug :debug :ui
+                               "toggle:push -> keys=%d hash=%s"
+                               (length (or keys '())) h)))
   ;; Force immediate redraw for visible sidebar
   (let ((buf (get-buffer context-navigator-sidebar--buffer-name)))
     (when (buffer-live-p buf)