From 70f8de964a18d7b6c6a943b9a1c91770b211acbc Mon Sep 17 00:00:00 2001
From: duguwanglong <duguwanglong@163.com>
Date: Tue, 31 Mar 2026 11:17:16 +0800
Subject: [PATCH] fix(windows): preserve nested node_modules during upgrade to
 avoid locked-file errors

On Windows, `shutil.rmtree(webui)` fails with [WinError 5] because
`esbuild.exe` inside `webui/node_modules/` is locked by a running
process. The `_PRESERVE_NAMES` check only applied at the top level of
install_root, so `webui/node_modules` was not protected.

- Make `_replace_install_dir` recursively merge directories that contain
  preserved entries (e.g. `node_modules`) instead of rmtree + copytree
- Add `_safe_rmtree` with an `onerror` handler on Windows that retries
  after clearing read-only flags, and skips truly locked files gracefully

Made-with: Cursor
---
 flocks/updater/updater.py | 44 +++++++++++++++++++++++++++++++++++++--
 1 file changed, 42 insertions(+), 2 deletions(-)

diff --git a/flocks/updater/updater.py b/flocks/updater/updater.py
index 210379472..d1db4ee84 100644
--- a/flocks/updater/updater.py
+++ b/flocks/updater/updater.py
@@ -561,13 +561,43 @@ def _extract_archive(archive_path: Path, dest_dir: Path) -> Path:
     return _detect_archive_root(dest_dir)
 
 
+def _rmtree_onerror(func, path, exc_info):  # noqa: ANN001
+    """Handle rmtree errors on Windows (read-only / locked files)."""
+    import stat
+    import time
+
+    try:
+        os.chmod(path, stat.S_IWRITE | stat.S_IREAD)
+        time.sleep(0.05)
+        func(path)
+    except OSError:
+        log.warning("updater.rmtree.skip_locked", {"path": str(path)})
+
+
+def _safe_rmtree(target: Path) -> None:
+    """rmtree with Windows permission-error fallback."""
+    if sys.platform == "win32":
+        shutil.rmtree(target, onerror=_rmtree_onerror)
+    else:
+        shutil.rmtree(target)
+
+
+def _has_preserved_children(directory: Path) -> bool:
+    """Check if *directory* directly contains any ``_PRESERVE_NAMES`` entries."""
+    try:
+        return any(child.name in _PRESERVE_NAMES for child in directory.iterdir())
+    except OSError:
+        return False
+
+
 def _replace_install_dir(
     source_dir: Path,
     install_root: Path,
 ) -> None:
     """
     Overwrite *install_root* with the contents of *source_dir*, while
-    preserving user/runtime directories listed in ``_PRESERVE_NAMES``.
+    preserving user/runtime directories listed in ``_PRESERVE_NAMES``
+    at **any** directory depth (not only the top level).
     """
     for item in source_dir.iterdir():
         if item.name in _PRESERVE_NAMES:
@@ -575,7 +605,17 @@ def _replace_install_dir(
         target = install_root / item.name
         if target.exists() or target.is_symlink():
             if target.is_dir() and not target.is_symlink():
-                shutil.rmtree(target)
+                if item.is_dir() and _has_preserved_children(target):
+                    _replace_install_dir(item, target)
+                    source_names = {c.name for c in item.iterdir()}
+                    for child in target.iterdir():
+                        if child.name not in source_names and child.name not in _PRESERVE_NAMES:
+                            if child.is_dir() and not child.is_symlink():
+                                _safe_rmtree(child)
+                            else:
+                                child.unlink()
+                    continue
+                _safe_rmtree(target)
             else:
                 target.unlink()
         if item.is_dir():