From 6423357597f7946f6175f8efdc74e8c2aea13845 Mon Sep 17 00:00:00 2001
From: fffonion <fffonion@gmail.com>
Date: Tue, 21 Jul 2026 05:40:47 +0800
Subject: [PATCH] fix(vm): refresh compatible publish lock

---
 scripts/publish_crates.py      | 54 ++++++++++++++++++++++++++++++++++
 scripts/test_publish_crates.py | 38 +++++++++++++++++++++---
 2 files changed, 88 insertions(+), 4 deletions(-)

diff --git a/scripts/publish_crates.py b/scripts/publish_crates.py
index 49be21a6..562421aa 100644
--- a/scripts/publish_crates.py
+++ b/scripts/publish_crates.py
@@ -27,6 +27,59 @@ def publish_plan(release_version: str, host_version: str) -> list[tuple[str, str
     return [(package, versions[package]) for package in PACKAGE_ORDER]
 
 
+def _compatibility_line(version: str) -> tuple[int, ...]:
+    match = re.fullmatch(r"(\d+)\.(\d+)\.(\d+)", version)
+    if not match:
+        raise ValueError(f"unsupported package version: {version}")
+    major, minor, _patch = map(int, match.groups())
+    return (major,) if major else (major, minor)
+
+
+def compatible_registry_lock_versions(
+    lock_path: Path,
+    package: str,
+    target_version: str,
+) -> list[str]:
+    if not lock_path.exists():
+        return []
+    target_line = _compatibility_line(target_version)
+    lock = tomllib.loads(lock_path.read_text())
+    versions = {
+        entry["version"]
+        for entry in lock.get("package", [])
+        if entry.get("name") == package
+        and str(entry.get("source", "")).startswith("registry+")
+        and entry.get("version") != target_version
+        and _compatibility_line(entry["version"]) == target_line
+    }
+    return sorted(versions, key=lambda version: tuple(map(int, version.split("."))))
+
+
+def refresh_compatible_registry_lock(
+    root: Path,
+    package: str,
+    target_version: str,
+) -> None:
+    lock_path = root / "Cargo.lock"
+    while stale_versions := compatible_registry_lock_versions(
+        lock_path,
+        package,
+        target_version,
+    ):
+        subprocess.run(
+            [
+                "cargo",
+                "update",
+                "-p",
+                f"{package}@{stale_versions[0]}",
+                "--precise",
+                target_version,
+            ],
+            cwd=root,
+            check=True,
+        )
+
+
 def yank_command(package: str, version: str) -> list[str]:
     return ["cargo", "yank", "--vers", version, package]
 
@@ -156,6 +209,7 @@ def main() -> None:
 
     root = args.root.resolve()
     rewrite_manifests(root, args.version, args.host_version)
+    refresh_compatible_registry_lock(root, "pd-host-function", args.host_version)
     plan = publish_plan(args.version, args.host_version)
     print(json.dumps({"publish_plan": plan}))
     if args.prepare_only:
diff --git a/scripts/test_publish_crates.py b/scripts/test_publish_crates.py
index a155f1a7..bb69f138 100644
--- a/scripts/test_publish_crates.py
+++ b/scripts/test_publish_crates.py
@@ -16,10 +16,40 @@ def test_workflow_supports_unyank_and_explicit_recovery_publish_tags(self) -> No
         self.assertIn("'publish-crates-*-host-*'", workflow)
         self.assertIn('publish_spec="${GITHUB_REF_NAME#publish-crates-}"', workflow)
 
-    def test_publish_script_does_not_force_registry_lock_versions(self) -> None:
-        source = (Path(__file__).parent / "publish_crates.py").read_text()
-        self.assertNotIn("refresh_registry_lock", source)
-        self.assertNotIn("refresh_publish_lock.py", source)
+    def test_compatible_registry_lock_versions_only_selects_same_compatibility_line(
+        self,
+    ) -> None:
+        with tempfile.TemporaryDirectory() as directory:
+            lock_path = Path(directory) / "Cargo.lock"
+            lock_path.write_text(
+                """version = 4
+
+[[package]]
+name = "pd-host-function"
+version = "0.22.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "old"
+
+[[package]]
+name = "pd-host-function"
+version = "0.21.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "older-line"
+
+[[package]]
+name = "pd-host-function"
+version = "0.22.7"
+"""
+            )
+
+            self.assertEqual(
+                publish_crates.compatible_registry_lock_versions(
+                    lock_path,
+                    "pd-host-function",
+                    "0.22.7",
+                ),
+                ["0.22.2"],
+            )
 
     def test_package_versions_keep_host_macro_on_compatible_line(self) -> None:
         self.assertEqual(