fix(web): auto-close popups after commit/cancel actions

Commit bar stayed visible showing "0 pending changes" after a
successful commit because the oob_save_ok template always included
the visible class. Now conditional on ChangeCount > 0.

Tool overlay confirm prompt stayed in the DOM after clicking Confirm
because only close/cancel had removal handlers. Added afterRequest
handler to remove the confirm overlay when the form completes.

Commit with conflicts returned a full page layout for HTMX requests,
breaking the diff modal. Now returns the modal fragment with the
conflict message so the user can see the error and cancel.

Author: thomas-mangin

internal/component/web/assets/cli.js

@@ -582,6 +582,13 @@
         if (overlay) overlay.remove();
       }
     });
+    document.addEventListener('htmx:afterRequest', function(e) {
+      if (e.target && e.target.classList &&
+          e.target.classList.contains('tool-overlay-confirm-form')) {
+        var overlay = e.target.closest('.tool-overlay');
+        if (overlay) overlay.remove();
+      }
+    });
   }
 
   // CLI page: SSH-style terminal with output viewport, message area, and input.

internal/component/web/handler_config.go

@@ -832,6 +832,22 @@ func handleCommitPost(w http.ResponseWriter, r *http.Request, mgr *EditorManager
 			fmt.Fprintf(&msg, "  %s: want %q, other (%s) has %q\n", c.Path, c.MyValue, c.OtherUser, c.OtherValue)
 		}
 
+		if r.Header.Get("HX-Request") == htmxRequestTrue {
+			type diffData struct {
+				Diff        string
+				ChangeCount int
+			}
+			w.Header().Set("Content-Type", "text/html; charset=utf-8")
+			modal := renderer.RenderFragment("diff_modal_open", diffData{
+				Diff:        msg.String(),
+				ChangeCount: mgr.ChangeCount(username),
+			})
+			if _, writeErr := w.Write([]byte(modal)); writeErr != nil {
+				return
+			}
+			return
+		}
+
 		layoutData := LayoutData{
 			Title:            "Commit Conflicts",
 			NotificationHTML: template.HTML("<pre>" + template.HTMLEscapeString(msg.String()) + "</pre>"), //nolint:gosec // escaped

internal/component/web/templates/component/oob_save.html

@@ -1,5 +1,5 @@
 {{define "oob_save_ok"}}
-<div id="commit-bar" class="commit-bar visible" hx-swap-oob="outerHTML">
+<div id="commit-bar" class="commit-bar{{if gt .ChangeCount 0}} visible{{end}}" hx-swap-oob="outerHTML">
   <span id="commit-count" class="commit-count">{{.ChangeCount}} pending change{{if ne .ChangeCount 1}}s{{end}}</span>
   <button class="commit-btn" id="commit-review-btn" hx-get="/config/diff" hx-target="#diff-modal" hx-swap="outerHTML">Review &amp; Commit</button>
   <button class="commit-discard-btn" id="commit-discard-btn" hx-post="/config/discard" hx-swap="none">Discard</button>