KiCad - the KiCad Bridge

@@ -333,6 +333,51 @@ if IS_WINDOWS:         return "  ".join(out).strip()  +    _SAVE_PROMPT_PATTERNS = ("save changes", "save the changes", "unsaved", "changes to", "before closing")++    def _win_find_save_prompt(kicad_info: dict) -> dict | None:+        """The 'Save changes?' box KiCad raises on WM_CLOSE of a dirty editor."""+        try:+            for w in _win_scan_kicad_dialogs(kicad_info):+                if not w.get("isDialog"):+                    continue+                text = f"{w.get('title', '')} {w.get('body', '')}".lower()+                if any(p in text for p in _SAVE_PROMPT_PATTERNS):+                    return {"hwnd": w["hwnd"], "title": w.get("title", ""), "body": w.get("body", "")}+        except Exception:  # pylint: disable=broad-except+            return None+        return None++    def _win_click_button(dialog_hwnd: int, labels: tuple) -> bool:+        """Press one named button on a dialog, time-boxed (see #83), no focus."""+        BM_CLICK, SMTO_ABORTIFHUNG = 0x00F5, 0x0002+        found = [0]+        try:+            WNDENUMPROC = ctypes.WINFUNCTYPE(ctypes.c_bool, ctypes.wintypes.HWND, ctypes.wintypes.LPARAM)+            def cb(child, _l):+                cls = ctypes.create_unicode_buffer(32)+                user32.GetClassNameW(child, cls, 32)+                if cls.value == "Button":+                    n = user32.GetWindowTextLengthW(child)+                    b = ctypes.create_unicode_buffer(n + 1)+                    user32.GetWindowTextW(child, b, n + 1)+                    label = b.value.replace("&", "").strip().lower()+                    if label in labels and user32.IsWindowVisible(child):+                        found[0] = child+                        return False+                return True+            c = WNDENUMPROC(cb)+            _callbacks.append(c)+            user32.EnumChildWindows(dialog_hwnd, c, 0)+            _callbacks.remove(c)+            if found[0]:+                res = ctypes.wintypes.DWORD(0)+                user32.SendMessageTimeoutW(found[0], BM_CLICK, 0, 0, SMTO_ABORTIFHUNG, 1500, ctypes.byref(res))+                return True+        except Exception:  # pylint: disable=broad-except+            return False+        return False+     def _win_close_and_wait(hwnd: int, title: str, timeout: float = 5.0) -> bool:         """Send WM_CLOSE and wait for the window to disappear."""         user32.PostMessageW(hwnd, WM_CLOSE, 0, 0)@@ -1111,12 +1156,73 @@ def handle_close_kicad(kicad_info: dict, args: dict) -> dict:         if not editors and not manager:             return {"success": True, "output": "KiCad is not running."} -        closed, failed = [], []+        # Issue #84 (winvm 2026-09-07): a board with unsaved edits answers WM_CLOSE+        # with KiCad's "Save changes?" box, the 5 s wait expired, and the handler+        # force-killed pcbnew while reporting success. A forced kill IS a discard,+        # just an unannounced one. Now: the save prompt is read; with+        # discardChanges:true its Discard button is pressed and the close stays+        # graceful; otherwise the window is left open and the reply says+        # unsavedChanges with the dialog text. force:true remains the only kill.+        discard = bool(args.get("discardChanges", False)) if args else False+        closed, failed, unsaved, discard_log = [], [], [], []+        def _close_one(hwnd, title):+            if _win_close_and_wait(hwnd, title, timeout=8.0):+                return True+            prompt = _win_find_save_prompt(kicad_info)+            if prompt:+                if discard:+                    # KiCad's "Save Changes?" is a TaskDialog on Windows: its buttons are not+                    # Win32 Button children, so press Discard through UIA (no focus, no cursor).+                    pressed, attempts = False, []+                    # Measured on arav-rog (0.9.346): the Win32 BM_CLICK lands on KiCad's+                    # Discard button; UIA finds the control but reports not_invokable.+                    pressed = _win_click_button(prompt["hwnd"], ("discard changes", "discard", "don't save", "do not save", "no"))+                    attempts.append({"win32Button": pressed})+                    if not pressed:+                        try:+                            from handlers.uia import uia_invoke+                            for label in ("Discard Changes", "Discard", "Don't Save"):+                                res = uia_invoke(prompt["hwnd"], contains=label) or {}+                                attempts.append({"label": label, "uia": res})+                                if res.get("ok") or res.get("success") or res.get("invoked"):+                                    pressed = True+                                    break+                        except Exception as exc:  # pylint: disable=broad-except+                            attempts.append({"error": str(exc)[:120]})+                    discard_log.append({"window": title, "dialog": prompt["title"], "attempts": attempts})+                    if _win_close_and_wait(hwnd, title, timeout=8.0):+                        closed.append(f"{title} (changes discarded)")+                        return None+                unsaved.append({"window": title, "dialog": prompt["title"], "body": prompt["body"]})+                return False+            return False         for hwnd, title in editors:-            (closed if _win_close_and_wait(hwnd, title) else failed).append(title)-        if manager:+            r = _close_one(hwnd, title)+            if r is True:+                closed.append(title)+            elif r is False:+                failed.append(title)+        if manager and not unsaved:             hwnd, title = manager-            (closed if _win_close_and_wait(hwnd, title) else failed).append(title)+            r = _close_one(hwnd, title)+            if r is True:+                closed.append(title)+            elif r is False:+                failed.append(title)++        if unsaved:+            return {+                "success": False,+                "errorCode": "unsaved_changes",+                "unsavedChanges": unsaved,+                "error": "KiCad is asking whether to save changes; nothing was killed: "+                         + "; ".join(f"{u['window']}: {u['body'][:80]}" for u in unsaved),+                "output": f"Closed: {', '.join(closed)}" if closed else "",+                "_hint": ("The user's unsaved work is still open. Ask them, then either save in KiCad "+                          "(Ctrl+S via desktop_press_key) and call kicad_close again, or call kicad_close "+                          "{\"discardChanges\": true} to press Discard on their behalf. force:true kills "+                          "the process, which discards silently."),+            }          force_killed = []         if failed:@@ -1134,11 +1240,14 @@ def handle_close_kicad(kicad_info: dict, args: dict) -> dict:                 "_hint": "Call close_kicad with {\"force\": true} to force-kill stuck windows.",             } -        return {+        out = {             "success": True,             "output": f"KiCad closed ({len(closed)} window{'s' if len(closed) != 1 else ''}).",             "data": {"forceKilled": force_killed} if force_killed else {},         }+        if discard_log:+            out["discard"] = discard_log+        return out      if IS_MACOS:         if force: