@mriekki/project-forge 4.14.2 → 4.15.0

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

@@ -6,14 +6,18 @@
   "asset": "assets/bootstrap-migrations/wsl-setup/setup.sh",
   "source": {
     "component": "bootstrap",
-    "revision": "173203baaf36935d04eb81c89f1d016131a40442",
+    "revision": "1e656d533a259428bbfb21aada548429462ba190",
     "artifact": "templates/scripts/setup.sh.tpl"
   },
-  "targetGitBlob": "4e8c48a3d33c6a8ae4534ec860c2ee0205e417aa",
+  "targetGitBlob": "f2555c464709492941007b838b9cc86051a61277",
   "supportedPredecessorGitBlobs": [
-    "ec941c079da066785ac628d6bbb7dd6b668494f2"
+    "ec941c079da066785ac628d6bbb7dd6b668494f2",
+    "4e8c48a3d33c6a8ae4534ec860c2ee0205e417aa"
   ],
   "supportedBootstrapRevisions": [
-    "0c45eb332a815ad79ea061443f337500b9dc5712"
+    "0c45eb332a815ad79ea061443f337500b9dc5712",
+    "173203baaf36935d04eb81c89f1d016131a40442",
+    "9f0f7fd4e0e2220250f6fd5b035706a7d15834af",
+    "043b3b2a0e3ba03b8d18666bb3fef59c588bfa16"
   ]
 }

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

@@ -6,16 +6,18 @@
   "asset": "assets/bootstrap-migrations/wsl-setup/setup-wsl.py",
   "source": {
     "component": "bootstrap",
-    "revision": "9f0f7fd4e0e2220250f6fd5b035706a7d15834af",
+    "revision": "043b3b2a0e3ba03b8d18666bb3fef59c588bfa16",
     "artifact": "runtime/dev_environment_wsl.py"
   },
-  "targetGitBlob": "883f7bbadd2de4bc0dcb601ee2285f88a0085b52",
+  "targetGitBlob": "0b959b4e85508016f6e8c12d403a94b2eed46c1f",
   "supportedPredecessorGitBlobs": [
-    "6731910246fb99887c58b9f3a8a14fec1bf02c01"
+    "6731910246fb99887c58b9f3a8a14fec1bf02c01",
+    "883f7bbadd2de4bc0dcb601ee2285f88a0085b52"
   ],
   "supportedBootstrapRevisions": [
     "0c45eb332a815ad79ea061443f337500b9dc5712",
-    "173203baaf36935d04eb81c89f1d016131a40442"
+    "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
 
@@ -160,6 +161,90 @@ def ensure_fnm_node(version: str | None, check_only: bool) -> tuple[bool, str, s
     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]:
     tool_id = entry["id"]
     spec = read_json(CATALOG / f"{tool_id}.json")
@@ -169,6 +254,8 @@ def ensure_tool(entry: dict[str, Any], check_only: bool) -> tuple[bool, str, str
         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:
@@ -205,16 +292,6 @@ def ensure_tool(entry: dict[str, Any], check_only: bool) -> tuple[bool, str, str
         ok, detail = version_ok(spec, version)
         return ok, detail, "PASS" if ok else "FAILED"
 
-    if tool_id == "dotnet":
-        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)
-        return ok, detail, "PASS" if ok else "FAILED"
-
     if tool_id == "vscode":
         return False, (
             "VS Code's WSL command bridge is unavailable. Install VS Code on Windows and the "

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

@@ -11,9 +11,17 @@ if [[ "$(/usr/bin/uname -s)" == "Linux" ]]; then
     exit 2
   fi
 
+  CHECK_ONLY=0
+  for argument in "$@"; do
+    if [[ "$argument" == "--check" ]]; then
+      CHECK_ONLY=1
+      break
+    fi
+  done
+
   PYTHON_BIN="$(command -v python3 || true)"
   if [[ -z "$PYTHON_BIN" ]]; then
-    if [[ " ${*:-} " == *" --check "* ]]; then
+    if [[ "$CHECK_ONLY" -eq 1 ]]; then
       echo "ERROR: python3 is required to run the read-only Project Forge WSL2 setup check." >&2
       exit 2
     fi
@@ -27,6 +35,101 @@ if [[ "$(/usr/bin/uname -s)" == "Linux" ]]; then
     fi
   fi
 
+  RTK_DECLARED="$($PYTHON_BIN - "$ROOT/DEV_ENVIRONMENT.json" <<'PY'
+import json
+import sys
+from pathlib import Path
+
+config = json.loads(Path(sys.argv[1]).read_text(encoding="utf-8"))
+print("yes" if any(entry.get("id") == "rtk" for entry in config.get("tools", [])) else "no")
+PY
+)"
+
+  if [[ "$RTK_DECLARED" == "yes" ]]; then
+    RTK_VERSION="1.1.0"
+    RTK_INSTALL_DIR="$HOME/.local/bin"
+    export PATH="$RTK_INSTALL_DIR:$PATH"
+
+    rtk_is_token_killer() {
+      command -v rtk >/dev/null 2>&1 && rtk --version >/dev/null 2>&1 && rtk gain >/dev/null 2>&1
+    }
+
+    install_rtk_wsl() {
+      local arch asset expected archive actual extracted temp_dir
+      arch="$(/usr/bin/uname -m)"
+      case "$arch" in
+        x86_64|amd64)
+          asset="rtk-x86_64-unknown-linux-musl.tar.gz"
+          expected="9454ad1b9489daa57ab0a9f4ebe2faaf4dc82b8a0f26c9e5135151abd7c9378d"
+          ;;
+        aarch64|arm64)
+          asset="rtk-aarch64-unknown-linux-gnu.tar.gz"
+          expected="a5c00c3ab0129884bcb757d348afc1a650efa0f4f0769da97c341f28f89719ed"
+          ;;
+        *)
+          echo "ERROR: RTK ${RTK_VERSION} has no Project Forge-pinned WSL asset for architecture: $arch" >&2
+          return 2
+          ;;
+      esac
+
+      if ! command -v curl >/dev/null 2>&1; then
+        sudo apt-get update
+        sudo apt-get install -y curl
+      fi
+      if ! command -v tar >/dev/null 2>&1; then
+        sudo apt-get update
+        sudo apt-get install -y tar
+      fi
+
+      temp_dir="$(/usr/bin/mktemp -d "${TMPDIR:-/tmp}/project-forge-rtk.XXXXXX")"
+      archive="$temp_dir/$asset"
+      if ! curl -fsSL "https://github.com/rtk-ai/rtk/releases/download/v${RTK_VERSION}/${asset}" -o "$archive"; then
+        /bin/rm -rf "$temp_dir"
+        echo "ERROR: unable to download pinned RTK ${RTK_VERSION} release asset." >&2
+        return 2
+      fi
+
+      actual="$(/usr/bin/sha256sum "$archive" | /usr/bin/awk '{print $1}')"
+      if [[ "$actual" != "$expected" ]]; then
+        /bin/rm -rf "$temp_dir"
+        echo "ERROR: RTK ${RTK_VERSION} release checksum mismatch." >&2
+        echo "Expected $expected but got $actual." >&2
+        return 2
+      fi
+
+      if ! /bin/tar -xzf "$archive" -C "$temp_dir"; then
+        /bin/rm -rf "$temp_dir"
+        echo "ERROR: unable to extract pinned RTK ${RTK_VERSION} release asset." >&2
+        return 2
+      fi
+      extracted="$(/usr/bin/find "$temp_dir" -type f -name rtk -print -quit)"
+      if [[ -z "$extracted" ]]; then
+        /bin/rm -rf "$temp_dir"
+        echo "ERROR: pinned RTK ${RTK_VERSION} release asset did not contain the rtk binary." >&2
+        return 2
+      fi
+
+      /bin/mkdir -p "$RTK_INSTALL_DIR"
+      /usr/bin/install -m 0755 "$extracted" "$RTK_INSTALL_DIR/rtk"
+      /bin/rm -rf "$temp_dir"
+    }
+
+    if ! rtk_is_token_killer; then
+      if [[ "$CHECK_ONLY" -eq 0 ]]; then
+        echo "Project Forge: installing pinned RTK ${RTK_VERSION} for token-efficient AI shell output."
+        install_rtk_wsl
+      fi
+    fi
+
+    if rtk_is_token_killer && [[ "$CHECK_ONLY" -eq 0 ]]; then
+      echo "Project Forge: configuring RTK global GitHub Copilot command rewriting."
+      if ! RTK_TELEMETRY_DISABLED=1 rtk init -g --copilot --auto-patch --no-trust-filters; then
+        echo "ERROR: RTK is installed but GitHub Copilot integration could not be configured." >&2
+        exit 2
+      fi
+    fi
+  fi
+
   exec "$PYTHON_BIN" "$WSL_SETUP_ENGINE" "$@"
 fi
 

package/assets/components.json

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

package/assets/generated/ASSEMBLY.json

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

package/package.json

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