@mriekki/project-forge 4.14.1 → 4.14.3

package/assets/bootstrap-migrations/wsl-setup/setup-wsl.manifest.json

@@ -6,13 +6,18 @@
   "asset": "assets/bootstrap-migrations/wsl-setup/setup-wsl.py",
   "source": {
     "component": "bootstrap",
-    "revision": "173203baaf36935d04eb81c89f1d016131a40442",
+    "revision": "043b3b2a0e3ba03b8d18666bb3fef59c588bfa16",
     "artifact": "runtime/dev_environment_wsl.py"
   },
-  "targetGitBlob": "6731910246fb99887c58b9f3a8a14fec1bf02c01",
-  "supportedPredecessorGitBlobs": [],
+  "targetGitBlob": "0b959b4e85508016f6e8c12d403a94b2eed46c1f",
+  "supportedPredecessorGitBlobs": [
+    "6731910246fb99887c58b9f3a8a14fec1bf02c01",
+    "883f7bbadd2de4bc0dcb601ee2285f88a0085b52"
+  ],
   "supportedBootstrapRevisions": [
-    "0c45eb332a815ad79ea061443f337500b9dc5712"
+    "0c45eb332a815ad79ea061443f337500b9dc5712",
+    "173203baaf36935d04eb81c89f1d016131a40442",
+    "9f0f7fd4e0e2220250f6fd5b035706a7d15834af"
   ],
   "allowMissing": true
 }

package/assets/bootstrap-migrations/wsl-setup/setup-wsl.py

@@ -8,6 +8,7 @@ import re
 import shutil
 import subprocess
 import sys
+import tempfile
 from pathlib import Path
 from typing import Any
 
@@ -85,24 +86,163 @@ def ensure_apt_package(package: str) -> None:
         raise SetupError(f"Unable to install required Ubuntu package: {package}")
 
 
+def fnm_install_dir() -> Path:
+    xdg_data_home = os.environ.get("XDG_DATA_HOME")
+    base = Path(xdg_data_home).expanduser() if xdg_data_home else Path.home() / ".local" / "share"
+    return base / "fnm"
+
+
+def refresh_fnm_path() -> None:
+    install_dir = fnm_install_dir()
+    fnm_binary = install_dir / "fnm"
+    if not fnm_binary.is_file():
+        return
+    current = os.environ.get("PATH", "")
+    prefix = str(install_dir)
+    parts = current.split(os.pathsep) if current else []
+    if prefix not in parts:
+        os.environ["PATH"] = prefix + (os.pathsep + current if current else "")
+
+
+def ensure_fnm_available(check_only: bool) -> tuple[bool, str, str]:
+    refresh_fnm_path()
+    path = command_path("fnm")
+    if path:
+        result = run(["fnm", "--version"])
+        detail = "\n".join(filter(None, [(result.stdout or "").strip(), (result.stderr or "").strip()]))
+        return result.returncode == 0, detail or path, "PASS" if result.returncode == 0 else "FAILED"
+
+    if check_only:
+        return False, "fnm is missing in WSL", "MISSING"
+
+    ensure_apt_package("curl")
+    ensure_apt_package("unzip")
+    install = run(
+        ["bash", "-lc", "curl -fsSL https://fnm.vercel.app/install | bash"],
+        capture=False,
+    )
+    if install.returncode != 0:
+        return False, "fnm installer failed", "FAILED"
+
+    refresh_fnm_path()
+    path = command_path("fnm")
+    if not path:
+        return False, f"fnm installer completed but {fnm_install_dir() / 'fnm'} is unavailable", "FAILED"
+
+    verify = run(["fnm", "--version"])
+    detail = "\n".join(filter(None, [(verify.stdout or "").strip(), (verify.stderr or "").strip()]))
+    return verify.returncode == 0, detail or path, "PASS" if verify.returncode == 0 else "FAILED"
+
+
 def ensure_fnm_node(version: str | None, check_only: bool) -> tuple[bool, str, str]:
-    if not command_path("fnm"):
-        return False, "fnm is missing in WSL; install fnm inside the distro before rerunning /setup", "MISSING"
+    fnm_ok, fnm_detail, fnm_state = ensure_fnm_available(check_only)
+    if not fnm_ok:
+        return False, fnm_detail, fnm_state
     if not version:
-        return True, "fnm available", "PASS"
+        return True, fnm_detail or "fnm available", "PASS"
+
     result = run(["fnm", "exec", f"--using={version}", "--", "node", "--version"])
     detail = "\n".join(filter(None, [(result.stdout or "").strip(), (result.stderr or "").strip()]))
     if result.returncode == 0 and version in detail.lstrip("v"):
         return True, detail, "PASS"
     if check_only:
         return False, detail or f"Node {version} is not installed through fnm", "VERSION_MISMATCH"
+
     install = run(["fnm", "install", version], capture=False)
     if install.returncode != 0:
         return False, f"fnm failed to install Node {version}", "FAILED"
-    run(["fnm", "default", version], capture=False)
+    default = run(["fnm", "default", version], capture=False)
+    if default.returncode != 0:
+        return False, f"fnm installed Node {version} but failed to make it the default", "FAILED"
+
     verify = run(["fnm", "exec", f"--using={version}", "--", "node", "--version"])
     text = (verify.stdout or verify.stderr or "").strip()
-    return verify.returncode == 0 and version in text.lstrip("v"), text, "PASS" if verify.returncode == 0 else "FAILED"
+    ok = verify.returncode == 0 and version in text.lstrip("v")
+    return ok, text or f"Node {version} verification failed", "PASS" if ok else "FAILED"
+
+
+def global_dotnet_sdk_version() -> str | None:
+    global_json = ROOT / "global.json"
+    if not global_json.exists():
+        return None
+    sdk = read_json(global_json).get("sdk")
+    if not isinstance(sdk, dict):
+        return None
+    version = sdk.get("version")
+    return version if isinstance(version, str) else None
+
+
+def ensure_dotnet_sdk(
+    spec: dict[str, Any],
+    version: str | None,
+    check_only: bool,
+) -> tuple[bool, str, str]:
+    ok, detail = version_ok(spec, version)
+    if ok:
+        return True, detail, "PASS"
+    if check_only:
+        return False, detail, "MISSING" if detail == "missing" else "VERSION_MISMATCH"
+
+    if not version:
+        return False, ".NET SDK version is required for automatic WSL installation", "FAILED"
+    major = version.split(".", 1)[0]
+    if not re.fullmatch(r"\d+", major):
+        return False, f"Unsupported .NET SDK version: {version}", "FAILED"
+
+    ensure_apt_package(f"dotnet-sdk-{major}.0")
+    ok, detail = version_ok(spec, version)
+    if ok:
+        return True, detail, "PASS"
+
+    sdk_version = global_dotnet_sdk_version()
+    if not sdk_version:
+        return False, (
+            detail
+            or f".NET SDK {version} is installed, but the repository resolver still cannot select a compatible SDK"
+        ), "FAILED"
+    if not re.fullmatch(r"\d+\.\d+\.\d+", sdk_version):
+        return False, f"Unsupported global.json .NET SDK version: {sdk_version}", "FAILED"
+
+    declared_parts = version.split(".")
+    sdk_parts = sdk_version.split(".")
+    if sdk_parts[: len(declared_parts)] != declared_parts:
+        return False, (
+            f"global.json requires .NET SDK {sdk_version}, outside the declared setup family {version}"
+        ), "FAILED"
+
+    dotnet = command_path("dotnet")
+    if not dotnet:
+        return False, "dotnet remained unavailable after Ubuntu SDK installation", "FAILED"
+    install_root = Path(dotnet).resolve().parent
+
+    ensure_apt_package("curl")
+    with tempfile.TemporaryDirectory(prefix="project-forge-dotnet-") as temp_dir:
+        installer = Path(temp_dir) / "dotnet-install.sh"
+        download = run(
+            ["curl", "-fsSL", "https://dot.net/v1/dotnet-install.sh", "-o", str(installer)],
+            capture=False,
+        )
+        if download.returncode != 0:
+            return False, "Unable to download the official .NET install script", "FAILED"
+
+        install = run(
+            [
+                "sudo",
+                "bash",
+                str(installer),
+                "--version",
+                sdk_version,
+                "--install-dir",
+                str(install_root),
+                "--skip-non-versioned-files",
+            ],
+            capture=False,
+        )
+        if install.returncode != 0:
+            return False, f"Unable to install .NET SDK {sdk_version}", "FAILED"
+
+    ok, detail = version_ok(spec, version)
+    return ok, detail, "PASS" if ok else "FAILED"
 
 
 def ensure_tool(entry: dict[str, Any], check_only: bool) -> tuple[bool, str, str]:
@@ -110,8 +250,12 @@ def ensure_tool(entry: dict[str, Any], check_only: bool) -> tuple[bool, str, str
     spec = read_json(CATALOG / f"{tool_id}.json")
     version = entry.get("version")
 
+    if tool_id == "fnm":
+        return ensure_fnm_available(check_only)
     if tool_id == "node":
         return ensure_fnm_node(version, check_only)
+    if tool_id == "dotnet":
+        return ensure_dotnet_sdk(spec, version, check_only)
 
     ok, detail = version_ok(spec, version)
     if ok:
@@ -130,10 +274,15 @@ def ensure_tool(entry: dict[str, Any], check_only: bool) -> tuple[bool, str, str
     if check_only:
         return False, detail, "MISSING" if detail == "missing" else "VERSION_MISMATCH"
 
+    if tool_id == "python":
+        ensure_apt_package("python3")
+        ensure_apt_package("python-is-python3")
+        ok, detail = version_ok(spec, version)
+        return ok, detail, "PASS" if ok else "FAILED"
+
     apt_packages = {
         "git": "git",
         "github-cli": "gh",
-        "python": "python3",
         "sqlite": "sqlite3",
         "ssh": "openssh-client",
         "go": "golang-go",
@@ -153,16 +302,6 @@ def ensure_tool(entry: dict[str, Any], check_only: bool) -> tuple[bool, str, str
             "Docker is unavailable inside WSL. Install/start Docker Desktop on Windows and enable "
             "WSL integration for this distro; do not install Docker Engine inside WSL."
         ), "MISSING"
-    if tool_id == "fnm":
-        return False, (
-            "fnm is required inside WSL for Project-declared Node versions. Install fnm in this "
-            "distro, then rerun /setup."
-        ), "MISSING"
-    if tool_id == "dotnet":
-        return False, (
-            f".NET SDK {version or ''} is required inside WSL. Install the matching Microsoft .NET SDK "
-            "for Ubuntu in this distro, then rerun /setup."
-        ).strip(), "MISSING" if detail == "missing" else "VERSION_MISMATCH"
     if tool_id == "java":
         return False, (
             f"Java {version or ''} is required inside WSL. Install the matching JDK in this distro, "

package/assets/components.json

@@ -1,7 +1,7 @@
 {
   "schemaVersion": 2,
   "package": "@mriekki/project-forge",
-  "version": "4.14.1",
+  "version": "4.14.3",
   "defaultProfile": "greenfield-project",
   "profiles": {
     "greenfield-project": {

package/assets/generated/ASSEMBLY.json

@@ -1,7 +1,7 @@
 {
   "schemaVersion": 2,
   "package": "@mriekki/project-forge",
-  "version": "4.14.1",
+  "version": "4.14.3",
   "components": {
     "core": {
       "revision": "b51cb62bcc9630748168c9fd1900c6109cafb587",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mriekki/project-forge",
-  "version": "4.14.1",
+  "version": "4.14.3",
   "description": "Public consumer distribution and updater for Project Forge engineering assets.",
   "type": "module",
   "bin": {