Skip to content

fix(runtime): honor Node prerelease version precedence #6006

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
huangruiteng merged 1 commit into from
Oct 9, 2026
Merged

fix(runtime): honor Node prerelease version precedence #6006

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions loopx/control_plane/runtime/node_probe.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"local runtime access; do not enable optional capabilities, replace "
"authority or spend until the guard succeeds"
)
_VERSION_RE = re.compile(r"^v?(\d+)\.(\d+)\.(\d+)(?:[-+].*)?$")
_VERSION_RE = re.compile(r"^v?(\d+)\.(\d+)\.(\d+)(?:-(.*?))?(?:\+.*)?$")


class NodeProbeOutcome(StrEnum):
Expand Down Expand Up @@ -125,6 +125,13 @@ def probe_node(*, timeout: float = STARTUP_READY_TIMEOUT_SECONDS) -> NodeProbe:
match = _VERSION_RE.fullmatch(completed.stdout.strip())
if match is None:
return NodeProbe(NodeProbeOutcome.INVALID_VERSION, executable)
version = tuple(int(part) for part in match.groups())
outcome = NodeProbeOutcome.UNSUPPORTED if version < MINIMUM_NODE_VERSION else NodeProbeOutcome.READY
return NodeProbe(outcome, executable, ".".join(str(part) for part in version))
version = tuple(int(part) for part in match.groups()[:3])
prerelease = match.group(4)
below_minimum = version < MINIMUM_NODE_VERSION or (
version == MINIMUM_NODE_VERSION and prerelease is not None
)
outcome = NodeProbeOutcome.UNSUPPORTED if below_minimum else NodeProbeOutcome.READY
version_text = ".".join(str(part) for part in version)
if prerelease is not None:
version_text += f"-{prerelease}"
return NodeProbe(outcome, executable, version_text)
22 changes: 22 additions & 0 deletions tests/control_plane/test_effect_runtime_node_probe.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,28 @@ def run(*_args, **kwargs):
assert observed == [effect_runtime.STARTUP_READY_TIMEOUT_SECONDS]


@pytest.mark.parametrize(
("reported_version", "expected_outcome", "expected_version"),
[
("v22.22.3-rc.1", node_probe.NodeProbeOutcome.UNSUPPORTED, "22.22.3-rc.1"),
("v22.22.4-rc.1", node_probe.NodeProbeOutcome.READY, "22.22.4-rc.1"),
("v22.22.3+build.1", node_probe.NodeProbeOutcome.READY, "22.22.3"),
],
)
def test_node_probe_uses_prerelease_precedence_at_minimum_version(
monkeypatch, reported_version, expected_outcome, expected_version,
):
monkeypatch.setattr(node_probe.shutil, "which", lambda _: "node")
monkeypatch.setattr(node_probe.subprocess, "run", lambda *_args, **_kwargs: SimpleNamespace(
returncode=0, stdout=f"{reported_version}\n",
))

probe = node_probe.probe_node()

assert probe.outcome is expected_outcome
assert probe.version == expected_version


@pytest.mark.parametrize("failure", [
subprocess.TimeoutExpired("node", 15),
SimpleNamespace(returncode=1, stdout=""),
Expand Down
Loading