Really prepare 0.30.2 release (#1373)

For example, this fixes an issue where an empty module turns into ` \n`.

Closes https://github.com/apple/pkl/issues/1348

---------

Co-authored-by: Jen Basch <jbasch94@gmail.com>

.github/PklProject

@@ -2,9 +2,9 @@ amends "pkl:Project"
 
 dependencies {
   ["pkl.impl.ghactions"] {
-    uri = "package://pkg.pkl-lang.org/pkl-project-commons/pkl.impl.ghactions@1.3.5"
+    uri = "package://pkg.pkl-lang.org/pkl-project-commons/pkl.impl.ghactions@0.7.1"
   }
   ["gha"] {
-    uri = "package://pkg.pkl-lang.org/pkl-pantry/com.github.actions@1.2.0"
+    uri = "package://pkg.pkl-lang.org/github.com/stefma/pkl-gha/com.github.action@0.0.6"
   }
 }

.github/PklProject.deps.json

@@ -1,39 +1,18 @@
 {
   "schemaVersion": 1,
   "resolvedDependencies": {
-    "package://pkg.pkl-lang.org/pkl-pantry/com.github.actions@1": {
+    "package://pkg.pkl-lang.org/github.com/stefma/pkl-gha/com.github.action@0": {
       "type": "remote",
-      "uri": "projectpackage://pkg.pkl-lang.org/pkl-pantry/com.github.actions@1.3.1",
+      "uri": "projectpackage://pkg.pkl-lang.org/github.com/stefma/pkl-gha/com.github.action@0.0.6",
       "checksums": {
-        "sha256": "fd515da685ea126678c3ec684e84a4f992d43481cc1d75cb866cd55775f675f9"
+        "sha256": "84365239996740252a91abab084d443aa3a3438f375b667ac16cb765461c1555"
       }
     },
-    "package://pkg.pkl-lang.org/pkl-project-commons/pkl.impl.ghactions@1": {
+    "package://pkg.pkl-lang.org/pkl-project-commons/pkl.impl.ghactions@0": {
       "type": "remote",
-      "uri": "projectpackage://pkg.pkl-lang.org/pkl-project-commons/pkl.impl.ghactions@1.3.5",
+      "uri": "projectpackage://pkg.pkl-lang.org/pkl-project-commons/pkl.impl.ghactions@0.7.1",
       "checksums": {
-        "sha256": "2b26d02c3b244a28e7913457ba195cbf767a1d1079ab2ed469074c4da870de12"
+        "sha256": "f8efc4b174855a2fafdab8ed792de4b0cb89b0516d688c8540eea13af20e0f80"
-      }
-    },
-    "package://pkg.pkl-lang.org/pkl-pantry/pkl.experimental.deepToTyped@1": {
-      "type": "remote",
-      "uri": "projectpackage://pkg.pkl-lang.org/pkl-pantry/pkl.experimental.deepToTyped@1.2.0",
-      "checksums": {
-        "sha256": "84c7feb391f4ac273a99dc89b8fd51dbcd21dbda4ce640f6908527f83acdd4d6"
-      }
-    },
-    "package://pkg.pkl-lang.org/pkl-pantry/pkl.github.dependabotManagedActions@1": {
-      "type": "remote",
-      "uri": "projectpackage://pkg.pkl-lang.org/pkl-pantry/pkl.github.dependabotManagedActions@1.0.3",
-      "checksums": {
-        "sha256": "d368900942efb88ed51a98f9614748b06c74ba43423f045fcd6dedb5dbdc0bea"
-      }
-    },
-    "package://pkg.pkl-lang.org/pkl-pantry/com.github.dependabot@1": {
-      "type": "remote",
-      "uri": "projectpackage://pkg.pkl-lang.org/pkl-pantry/com.github.dependabot@1.0.0",
-      "checksums": {
-        "sha256": "02ef6f25bfca5b1d095db73ea15de79d2d2c6832ebcab61e6aba90554382abcb"
       }
     }
   }

.github/dependabot.yml

@@ -1,10 +0,0 @@
-version: 2
-updates:
-- package-ecosystem: github-actions
-  directory: /
-  ignore:
-  - dependency-name: '*'
-    update-types:
-    - version-update:semver-major
-  schedule:
-    interval: weekly

.github/index.pkl

@@ -21,8 +21,8 @@ testReports {
   }
   excludeJobs {
     "bench"
+    "deploy-release"
     "github-release"
-    Regex("deploy-.*")
   }
 }
 
@@ -196,3 +196,27 @@ release {
       }
     } |> toWorkflowJobs
 }
+
+output {
+  files {
+    [[true]] {
+      renderer {
+        converters {
+          ["jobs"] = (it: Mapping<String, Workflow.Job>) ->
+            it
+              .toMap()
+              .mapValues((name, job) ->
+                if (name.contains("linux") && !name.contains("alpine"))
+                  job
+                    .toMap()
+                    .put("container", new Dynamic {
+                      image = "redhat/ubi8:8.10"
+                    })
+                else
+                  job
+              )
+        }
+      }
+    }
+  }
+}

.github/jobs/BuildJavaExecutableJob.pkl

@@ -1,6 +1,7 @@
 extends "GradleJob.pkl"
 
-import "@gha/catalog.pkl"
+import "@gha/actions/Artifact.pkl"
+import "@gha/actions/Common.pkl"
 
 // Keep this in sync with projects that build java executables
 local projects: List<String> = List("pkl-doc", "pkl-cli", "pkl-codegen-java", "pkl-codegen-kotlin")
@@ -16,13 +17,13 @@ local command =
   }.join(" ")
 
 steps {
-  catalog.`actions/checkout@v6`
+  new Common.Checkout {}
   new {
     name = "gradle build java executables"
     shell = "bash"
     run = command
   }
-  (catalog.`actions/upload-artifact@v5`) {
+  new Artifact.Upload {
     name = "Upload executable artifacts"
     with {
       name = "executable-java"

.github/jobs/BuildNativeJob.pkl

@@ -1,7 +1,7 @@
 extends "GradleJob.pkl"
 
-import "@gha/catalog.pkl"
+import "@gha/actions/Artifact.pkl"
-import "@gha/context.pkl"
+import "@gha/Context.pkl"
 
 /// Whether to link to musl. Otherwise, links to glibc.
 musl: Boolean(implies(module.os == "linux")) = false
@@ -12,7 +12,7 @@ project: String
 extraGradleArgs {
   when (os == "macOS" && arch == "amd64") {
     "-Dpkl.targetArch=\(module.arch)"
-    "-Dpkl.native--native-compiler-path=\(context.github.workspace)/.github/scripts/cc_macos_amd64.sh"
+    "-Dpkl.native--native-compiler-path=\(Context.github.workspace)/.github/scripts/cc_macos_amd64.sh"
   }
   when (musl) {
     "-Dpkl.musl=true"
@@ -48,7 +48,7 @@ steps {
     shell = "bash"
     run = "./gradlew \(module.gradleArgs) \(project):buildNative"
   }
-  (catalog.`actions/upload-artifact@v5`) {
+  new Artifact.Upload {
     name = "Upload executable artifacts"
     with {
       name =
@@ -62,11 +62,3 @@ steps {
     }
   }
 }
-
-fixed job {
-  when (os == "linux" && !musl) {
-    container {
-      image = "redhat/ubi8:8.10"
-    }
-  }
-}

.github/jobs/DeployJob.pkl

@@ -1,6 +1,7 @@
 extends "GradleJob.pkl"
 
-import "@gha/catalog.pkl"
+import "@gha/actions/Artifact.pkl"
+import "@gha/actions/Common.pkl"
 import "@gha/Workflow.pkl"
 import "@pkl.impl.ghactions/helpers.pkl"
 
@@ -13,8 +14,8 @@ arch = "amd64"
 os = "linux"
 
 steps {
-  catalog.`actions/checkout@v6`
+  new Common.Checkout {}
-  (catalog.`actions/download-artifact@v6`) {
+  new Artifact.Download {
     with {
       pattern = "executable-**"
       `merge-multiple` = true

.github/jobs/GithubRelease.pkl

@@ -2,8 +2,8 @@ module GithubRelease
 
 extends "PklJob.pkl"
 
-import "@gha/catalog.pkl"
+import "@gha/actions/Artifact.pkl"
-import "@gha/context.pkl"
+import "@gha/Context.pkl"
 
 fixed job {
   `runs-on` = "ubuntu-latest"
@@ -12,7 +12,7 @@ fixed job {
   }
   needs = "deploy-release"
   steps {
-    (catalog.`actions/download-artifact@v6`) {
+    new Artifact.Download {
       with {
         pattern = "executable-**"
         `merge-multiple` = true
@@ -21,10 +21,10 @@ fixed job {
     new {
       name = "Publish release on GitHub"
       env {
-        ["GH_TOKEN"] = context.github.token
+        ["GH_TOKEN"] = Context.github.token
-        ["TAG_NAME"] = context.github.refName
+        ["TAG_NAME"] = Context.github.refName
-        ["GIT_SHA"] = context.github.sha
+        ["GIT_SHA"] = Context.github.sha
-        ["GH_REPO"] = context.github.repository
+        ["GH_REPO"] = Context.github.repository
       }
       // language=bash
       run =

.github/jobs/GradleJob.pkl

@@ -2,8 +2,9 @@ abstract module GradleJob
 
 extends "PklJob.pkl"
 
+import "@gha/actions/Common.pkl"
+import "@gha/actions/Setup.pkl"
 import "@gha/Workflow.pkl"
-import "@pkl.impl.ghactions/catalog.pkl"
 
 /// Whether this is a release build or not.
 isRelease: Boolean = false
@@ -20,9 +21,9 @@ nightlyMacOS: Boolean(implies(os == "macOS")) = false
 
 extraGradleArgs: Listing<String>
 
-steps: Listing<Workflow.Step>
+steps: Listing<*Workflow.Step | Workflow.TypedStep>
 
-preSteps: Listing<Workflow.Step>
+preSteps: Listing<*Workflow.Step | Workflow.TypedStep>
 
 /// The fetch depth to use when doing a git checkout.
 fetchDepth: Int?
@@ -72,17 +73,18 @@ fixed job {
   steps {
     ...preSteps
     // full checkout (needed for spotless)
-    (catalog.`actions/checkout@v6`) {
+    new Common.Checkout {
       when (fetchDepth != null) {
         with {
           `fetch-depth` = fetchDepth
         }
       }
     }
-    (catalog.`actions/setup-java@v5`) {
+    new Setup.Java {
       with {
         `java-version` = "21"
         distribution = "temurin"
+        cache = "gradle"
         architecture =
           if (arch == "amd64")
             "x64"
@@ -90,7 +92,6 @@ fixed job {
             "aarch64"
       }
     }
-    catalog.`gradle/actions/setup-gradle@v5`
     ...module.steps
   }
 }

.github/workflows/__lockfile__.yml

@@ -1,34 +0,0 @@
-#file: noinspection MandatoryParamsAbsent,UndefinedAction
-# This is a fake workflow that never runs.
-# It's used to pin actions to specific git SHAs when generating actual workflows.
-# It also gets updated by dependabot (see .github/dependabot.yml).
-# Generated from Workflow.pkl. DO NOT EDIT.
-name: __lockfile__
-'on':
-  push:
-    branches-ignore:
-    - '**'
-    tags-ignore:
-    - '**'
-permissions: {}
-jobs:
-  locks:
-    if: 'false'
-    runs-on: nothing
-    steps:
-    - name: EnricoMi/publish-unit-test-result-action@v2
-      uses: EnricoMi/publish-unit-test-result-action@c950f6fb443cb5af20a377fd0dfaa78838901040 # v2
-    - name: actions/checkout@v6
-      uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
-    - name: actions/create-github-app-token@v2
-      uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2
-    - name: actions/download-artifact@v6
-      uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6
-    - name: actions/setup-java@v5
-      uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
-    - name: actions/upload-artifact@v5
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
-    - name: dawidd6/action-download-artifact@v11
-      uses: dawidd6/action-download-artifact@ac66b43f0e6a346234dd65d4d0c8fbb31cb316e5 # v11
-    - name: gradle/actions/setup-gradle@v5
-      uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5

.github/workflows/build.yml

@@ -1,11 +1,12 @@
-# Generated from Workflow.pkl. DO NOT EDIT.
+# Do not modify!
+# This file was generated from a template using https://github.com/StefMa/pkl-gha
+
 name: Build
 'on':
   push:
     branches-ignore:
     - main
     - release/*
-    - dependabot/**
     tags-ignore:
     - '**'
 concurrency:
@@ -19,29 +20,27 @@ jobs:
     env:
       LANG: en_US.UTF-8
     steps:
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@v5
       with:
-        persist-credentials: false
         fetch-depth: 0
-    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
+    - uses: actions/setup-java@v5
       with:
         java-version: '21'
         distribution: temurin
         architecture: x64
-    - uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5
+        cache: gradle
-      with: {}
     - name: check
       shell: bash
       run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true check
     - name: Upload Test Result XML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-xml-gradle-check
         path: '**/build/test-results/**/*.xml'
     - name: Upload Test Result HTML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-html-gradle-check
         path: '**/build/reports/tests/**/*'
@@ -52,29 +51,27 @@ jobs:
       LANG: en_US.UTF-8
       JAVA_HOME: /jdk
     steps:
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@v5
       with:
-        persist-credentials: false
         fetch-depth: 0
-    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
+    - uses: actions/setup-java@v5
       with:
         java-version: '21'
         distribution: temurin
         architecture: x64
-    - uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5
+        cache: gradle
-      with: {}
     - name: check
       shell: bash
       run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true check
     - name: Upload Test Result XML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-xml-gradle-check-windows
         path: '**/build/test-results/**/*.xml'
     - name: Upload Test Result HTML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-html-gradle-check-windows
         path: '**/build/reports/tests/**/*'
@@ -84,16 +81,13 @@ jobs:
     env:
       LANG: en_US.UTF-8
     steps:
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@v5
-      with:
+    - uses: actions/setup-java@v5
-        persist-credentials: false
-    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
         java-version: '21'
         distribution: temurin
         architecture: x64
-    - uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5
+        cache: gradle
-      with: {}
     - name: bench:jmh
       shell: bash
       run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true bench:jmh
@@ -102,29 +96,27 @@ jobs:
     env:
       LANG: en_US.UTF-8
     steps:
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@v5
       with:
-        persist-credentials: false
         fetch-depth: 0
-    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
+    - uses: actions/setup-java@v5
       with:
         java-version: '21'
         distribution: temurin
         architecture: x64
-    - uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5
+        cache: gradle
-      with: {}
     - name: :pkl-gradle:build :pkl-gradle:compatibilityTestReleases
       shell: bash
       run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true :pkl-gradle:build :pkl-gradle:compatibilityTestReleases
     - name: Upload Test Result XML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-xml-gradle-compatibility
         path: '**/build/test-results/**/*.xml'
     - name: Upload Test Result HTML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-html-gradle-compatibility
         path: '**/build/reports/tests/**/*'
@@ -134,37 +126,33 @@ jobs:
     env:
       LANG: en_US.UTF-8
     steps:
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@v5
       with:
-        persist-credentials: false
         fetch-depth: 0
-    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
+    - uses: actions/setup-java@v5
       with:
         java-version: '21'
         distribution: temurin
         architecture: x64
-    - uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5
+        cache: gradle
-      with: {}
+    - uses: actions/checkout@v5
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
-      with:
-        persist-credentials: false
     - name: gradle build java executables
       shell: bash
       run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true pkl-doc:build pkl-cli:build pkl-codegen-java:build pkl-codegen-kotlin:build
     - name: Upload executable artifacts
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: executable-java
         path: '*/build/executable/**/*'
     - name: Upload Test Result XML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-xml-java-executables-snapshot
         path: '**/build/test-results/**/*.xml'
     - name: Upload Test Result HTML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-html-java-executables-snapshot
         path: '**/build/reports/tests/**/*'
@@ -177,33 +165,30 @@ jobs:
     env:
       LANG: en_US.UTF-8
     steps:
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@v5
-      with:
+    - uses: actions/setup-java@v5
-        persist-credentials: false
-    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
         java-version: '21'
         distribution: temurin
         architecture: x64
-    - uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5
+        cache: gradle
-      with: {}
     - name: gradle buildNative
       shell: bash
       run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true -Dpkl.targetArch=amd64 -Dpkl.native--native-compiler-path=${{ github.workspace }}/.github/scripts/cc_macos_amd64.sh pkl-cli:buildNative
     - name: Upload executable artifacts
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: executable-pkl-cli-macOS-amd64
         path: pkl-cli*/build/executable/**/*
     - name: Upload Test Result XML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-xml-pkl-cli-macOS-amd64-snapshot
         path: '**/build/test-results/**/*.xml'
     - name: Upload Test Result HTML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-html-pkl-cli-macOS-amd64-snapshot
         path: '**/build/reports/tests/**/*'
@@ -215,35 +200,32 @@ jobs:
     steps:
     - name: Install deps
       run: dnf install -y git binutils gcc glibc-devel zlib-devel libstdc++-static glibc-langpack-en
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@v5
-      with:
+    - uses: actions/setup-java@v5
-        persist-credentials: false
-    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
         java-version: '21'
         distribution: temurin
         architecture: x64
-    - uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5
+        cache: gradle
-      with: {}
     - name: Fix git ownership
       run: git status || git config --system --add safe.directory $GITHUB_WORKSPACE
     - name: gradle buildNative
       shell: bash
       run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true pkl-cli:buildNative
     - name: Upload executable artifacts
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: executable-pkl-cli-linux-amd64
         path: pkl-cli*/build/executable/**/*
     - name: Upload Test Result XML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-xml-pkl-cli-linux-amd64-snapshot
         path: '**/build/test-results/**/*.xml'
     - name: Upload Test Result HTML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-html-pkl-cli-linux-amd64-snapshot
         path: '**/build/reports/tests/**/*'
@@ -258,33 +240,30 @@ jobs:
     env:
       LANG: en_US.UTF-8
     steps:
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@v5
-      with:
+    - uses: actions/setup-java@v5
-        persist-credentials: false
-    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
         java-version: '21'
         distribution: temurin
         architecture: aarch64
-    - uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5
+        cache: gradle
-      with: {}
     - name: gradle buildNative
       shell: bash
       run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true pkl-cli:buildNative
     - name: Upload executable artifacts
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: executable-pkl-cli-macOS-aarch64
         path: pkl-cli*/build/executable/**/*
     - name: Upload Test Result XML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-xml-pkl-cli-macOS-aarch64-snapshot
         path: '**/build/test-results/**/*.xml'
     - name: Upload Test Result HTML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-html-pkl-cli-macOS-aarch64-snapshot
         path: '**/build/reports/tests/**/*'
@@ -296,35 +275,32 @@ jobs:
     steps:
     - name: Install deps
       run: dnf install -y git binutils gcc glibc-devel zlib-devel libstdc++-static glibc-langpack-en
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@v5
-      with:
+    - uses: actions/setup-java@v5
-        persist-credentials: false
-    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
         java-version: '21'
         distribution: temurin
         architecture: aarch64
-    - uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5
+        cache: gradle
-      with: {}
     - name: Fix git ownership
       run: git status || git config --system --add safe.directory $GITHUB_WORKSPACE
     - name: gradle buildNative
       shell: bash
       run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true pkl-cli:buildNative
     - name: Upload executable artifacts
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: executable-pkl-cli-linux-aarch64
         path: pkl-cli*/build/executable/**/*
     - name: Upload Test Result XML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-xml-pkl-cli-linux-aarch64-snapshot
         path: '**/build/test-results/**/*.xml'
     - name: Upload Test Result HTML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-html-pkl-cli-linux-aarch64-snapshot
         path: '**/build/reports/tests/**/*'
@@ -336,16 +312,13 @@ jobs:
     env:
       LANG: en_US.UTF-8
     steps:
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@v5
-      with:
+    - uses: actions/setup-java@v5
-        persist-credentials: false
-    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
         java-version: '21'
         distribution: temurin
         architecture: x64
-    - uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5
+        cache: gradle
-      with: {}
     - name: Install musl and zlib
       run: |
         set -e
@@ -423,19 +396,19 @@ jobs:
       shell: bash
       run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true -Dpkl.musl=true pkl-cli:buildNative
     - name: Upload executable artifacts
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: executable-pkl-cli-alpine-linux-amd64
         path: pkl-cli*/build/executable/**/*
     - name: Upload Test Result XML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-xml-pkl-cli-alpine-linux-amd64-snapshot
         path: '**/build/test-results/**/*.xml'
     - name: Upload Test Result HTML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-html-pkl-cli-alpine-linux-amd64-snapshot
         path: '**/build/reports/tests/**/*'
@@ -446,33 +419,30 @@ jobs:
       LANG: en_US.UTF-8
       JAVA_HOME: /jdk
     steps:
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@v5
-      with:
+    - uses: actions/setup-java@v5
-        persist-credentials: false
-    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
         java-version: '21'
         distribution: temurin
         architecture: x64
-    - uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5
+        cache: gradle
-      with: {}
     - name: gradle buildNative
       shell: bash
       run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true pkl-cli:buildNative
     - name: Upload executable artifacts
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: executable-pkl-cli-windows-amd64
         path: pkl-cli*/build/executable/**/*
     - name: Upload Test Result XML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-xml-pkl-cli-windows-amd64-snapshot
         path: '**/build/test-results/**/*.xml'
     - name: Upload Test Result HTML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-html-pkl-cli-windows-amd64-snapshot
         path: '**/build/reports/tests/**/*'
@@ -485,33 +455,30 @@ jobs:
     env:
       LANG: en_US.UTF-8
     steps:
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@v5
-      with:
+    - uses: actions/setup-java@v5
-        persist-credentials: false
-    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
         java-version: '21'
         distribution: temurin
         architecture: x64
-    - uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5
+        cache: gradle
-      with: {}
     - name: gradle buildNative
       shell: bash
       run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true -Dpkl.targetArch=amd64 -Dpkl.native--native-compiler-path=${{ github.workspace }}/.github/scripts/cc_macos_amd64.sh pkl-doc:buildNative
     - name: Upload executable artifacts
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: executable-pkl-doc-macOS-amd64
         path: pkl-doc*/build/executable/**/*
     - name: Upload Test Result XML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-xml-pkl-doc-macOS-amd64-snapshot
         path: '**/build/test-results/**/*.xml'
     - name: Upload Test Result HTML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-html-pkl-doc-macOS-amd64-snapshot
         path: '**/build/reports/tests/**/*'
@@ -523,35 +490,32 @@ jobs:
     steps:
     - name: Install deps
       run: dnf install -y git binutils gcc glibc-devel zlib-devel libstdc++-static glibc-langpack-en
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@v5
-      with:
+    - uses: actions/setup-java@v5
-        persist-credentials: false
-    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
         java-version: '21'
         distribution: temurin
         architecture: x64
-    - uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5
+        cache: gradle
-      with: {}
     - name: Fix git ownership
       run: git status || git config --system --add safe.directory $GITHUB_WORKSPACE
     - name: gradle buildNative
       shell: bash
       run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true pkl-doc:buildNative
     - name: Upload executable artifacts
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: executable-pkl-doc-linux-amd64
         path: pkl-doc*/build/executable/**/*
     - name: Upload Test Result XML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-xml-pkl-doc-linux-amd64-snapshot
         path: '**/build/test-results/**/*.xml'
     - name: Upload Test Result HTML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-html-pkl-doc-linux-amd64-snapshot
         path: '**/build/reports/tests/**/*'
@@ -566,33 +530,30 @@ jobs:
     env:
       LANG: en_US.UTF-8
     steps:
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@v5
-      with:
+    - uses: actions/setup-java@v5
-        persist-credentials: false
-    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
         java-version: '21'
         distribution: temurin
         architecture: aarch64
-    - uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5
+        cache: gradle
-      with: {}
     - name: gradle buildNative
       shell: bash
       run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true pkl-doc:buildNative
     - name: Upload executable artifacts
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: executable-pkl-doc-macOS-aarch64
         path: pkl-doc*/build/executable/**/*
     - name: Upload Test Result XML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-xml-pkl-doc-macOS-aarch64-snapshot
         path: '**/build/test-results/**/*.xml'
     - name: Upload Test Result HTML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-html-pkl-doc-macOS-aarch64-snapshot
         path: '**/build/reports/tests/**/*'
@@ -604,35 +565,32 @@ jobs:
     steps:
     - name: Install deps
       run: dnf install -y git binutils gcc glibc-devel zlib-devel libstdc++-static glibc-langpack-en
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@v5
-      with:
+    - uses: actions/setup-java@v5
-        persist-credentials: false
-    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
         java-version: '21'
         distribution: temurin
         architecture: aarch64
-    - uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5
+        cache: gradle
-      with: {}
     - name: Fix git ownership
       run: git status || git config --system --add safe.directory $GITHUB_WORKSPACE
     - name: gradle buildNative
       shell: bash
       run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true pkl-doc:buildNative
     - name: Upload executable artifacts
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: executable-pkl-doc-linux-aarch64
         path: pkl-doc*/build/executable/**/*
     - name: Upload Test Result XML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-xml-pkl-doc-linux-aarch64-snapshot
         path: '**/build/test-results/**/*.xml'
     - name: Upload Test Result HTML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-html-pkl-doc-linux-aarch64-snapshot
         path: '**/build/reports/tests/**/*'
@@ -644,16 +602,13 @@ jobs:
     env:
       LANG: en_US.UTF-8
     steps:
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@v5
-      with:
+    - uses: actions/setup-java@v5
-        persist-credentials: false
-    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
         java-version: '21'
         distribution: temurin
         architecture: x64
-    - uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5
+        cache: gradle
-      with: {}
     - name: Install musl and zlib
       run: |
         set -e
@@ -731,19 +686,19 @@ jobs:
       shell: bash
       run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true -Dpkl.musl=true pkl-doc:buildNative
     - name: Upload executable artifacts
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: executable-pkl-doc-alpine-linux-amd64
         path: pkl-doc*/build/executable/**/*
     - name: Upload Test Result XML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-xml-pkl-doc-alpine-linux-amd64-snapshot
         path: '**/build/test-results/**/*.xml'
     - name: Upload Test Result HTML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-html-pkl-doc-alpine-linux-amd64-snapshot
         path: '**/build/reports/tests/**/*'
@@ -754,39 +709,36 @@ jobs:
       LANG: en_US.UTF-8
       JAVA_HOME: /jdk
     steps:
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@v5
-      with:
+    - uses: actions/setup-java@v5
-        persist-credentials: false
-    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
         java-version: '21'
         distribution: temurin
         architecture: x64
-    - uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5
+        cache: gradle
-      with: {}
     - name: gradle buildNative
       shell: bash
       run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true pkl-doc:buildNative
     - name: Upload executable artifacts
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: executable-pkl-doc-windows-amd64
         path: pkl-doc*/build/executable/**/*
     - name: Upload Test Result XML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-xml-pkl-doc-windows-amd64-snapshot
         path: '**/build/test-results/**/*.xml'
     - name: Upload Test Result HTML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-html-pkl-doc-windows-amd64-snapshot
         path: '**/build/reports/tests/**/*'
         if-no-files-found: ignore
   publish-test-results:
-    if: '!cancelled()'
+    if: '!failure() && !cancelled()'
     needs:
     - gradle-check
     - gradle-check-windows
@@ -808,18 +760,18 @@ jobs:
       checks: write
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6
+    - uses: actions/download-artifact@v6
       with:
         pattern: test-results-xml-*
     - name: Publish test results
       if: '!cancelled()'
-      uses: EnricoMi/publish-unit-test-result-action@c950f6fb443cb5af20a377fd0dfaa78838901040 # v2
+      uses: EnricoMi/publish-unit-test-result-action@v2
       with:
         comment_mode: 'off'
         files: test-results-xml-*/**/*.xml
     - name: Upload Test Result HTML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-html-publish-test-results
         path: '**/build/reports/tests/**/*'

.github/workflows/main.yml

@@ -1,4 +1,6 @@
-# Generated from Workflow.pkl. DO NOT EDIT.
+# Do not modify!
+# This file was generated from a template using https://github.com/StefMa/pkl-gha
+
 name: Build (main)
 'on':
   push:
@@ -17,29 +19,27 @@ jobs:
     env:
       LANG: en_US.UTF-8
     steps:
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@v5
       with:
-        persist-credentials: false
         fetch-depth: 0
-    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
+    - uses: actions/setup-java@v5
       with:
         java-version: '21'
         distribution: temurin
         architecture: x64
-    - uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5
+        cache: gradle
-      with: {}
     - name: check
       shell: bash
       run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true check
     - name: Upload Test Result XML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-xml-gradle-check
         path: '**/build/test-results/**/*.xml'
     - name: Upload Test Result HTML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-html-gradle-check
         path: '**/build/reports/tests/**/*'
@@ -50,29 +50,27 @@ jobs:
       LANG: en_US.UTF-8
       JAVA_HOME: /jdk
     steps:
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@v5
       with:
-        persist-credentials: false
         fetch-depth: 0
-    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
+    - uses: actions/setup-java@v5
       with:
         java-version: '21'
         distribution: temurin
         architecture: x64
-    - uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5
+        cache: gradle
-      with: {}
     - name: check
       shell: bash
       run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true check
     - name: Upload Test Result XML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-xml-gradle-check-windows
         path: '**/build/test-results/**/*.xml'
     - name: Upload Test Result HTML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-html-gradle-check-windows
         path: '**/build/reports/tests/**/*'
@@ -82,16 +80,13 @@ jobs:
     env:
       LANG: en_US.UTF-8
     steps:
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@v5
-      with:
+    - uses: actions/setup-java@v5
-        persist-credentials: false
-    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
         java-version: '21'
         distribution: temurin
         architecture: x64
-    - uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5
+        cache: gradle
-      with: {}
     - name: bench:jmh
       shell: bash
       run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true bench:jmh
@@ -100,29 +95,27 @@ jobs:
     env:
       LANG: en_US.UTF-8
     steps:
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@v5
       with:
-        persist-credentials: false
         fetch-depth: 0
-    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
+    - uses: actions/setup-java@v5
       with:
         java-version: '21'
         distribution: temurin
         architecture: x64
-    - uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5
+        cache: gradle
-      with: {}
     - name: :pkl-gradle:build :pkl-gradle:compatibilityTestReleases
       shell: bash
       run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true :pkl-gradle:build :pkl-gradle:compatibilityTestReleases
     - name: Upload Test Result XML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-xml-gradle-compatibility
         path: '**/build/test-results/**/*.xml'
     - name: Upload Test Result HTML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-html-gradle-compatibility
         path: '**/build/reports/tests/**/*'
@@ -132,37 +125,33 @@ jobs:
     env:
       LANG: en_US.UTF-8
     steps:
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@v5
       with:
-        persist-credentials: false
         fetch-depth: 0
-    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
+    - uses: actions/setup-java@v5
       with:
         java-version: '21'
         distribution: temurin
         architecture: x64
-    - uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5
+        cache: gradle
-      with: {}
+    - uses: actions/checkout@v5
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
-      with:
-        persist-credentials: false
     - name: gradle build java executables
       shell: bash
       run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true pkl-doc:build pkl-cli:build pkl-codegen-java:build pkl-codegen-kotlin:build
     - name: Upload executable artifacts
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: executable-java
         path: '*/build/executable/**/*'
     - name: Upload Test Result XML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-xml-java-executables-snapshot
         path: '**/build/test-results/**/*.xml'
     - name: Upload Test Result HTML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-html-java-executables-snapshot
         path: '**/build/reports/tests/**/*'
@@ -175,33 +164,30 @@ jobs:
     env:
       LANG: en_US.UTF-8
     steps:
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@v5
-      with:
+    - uses: actions/setup-java@v5
-        persist-credentials: false
-    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
         java-version: '21'
         distribution: temurin
         architecture: x64
-    - uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5
+        cache: gradle
-      with: {}
     - name: gradle buildNative
       shell: bash
       run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true -Dpkl.targetArch=amd64 -Dpkl.native--native-compiler-path=${{ github.workspace }}/.github/scripts/cc_macos_amd64.sh pkl-cli:buildNative
     - name: Upload executable artifacts
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: executable-pkl-cli-macOS-amd64
         path: pkl-cli*/build/executable/**/*
     - name: Upload Test Result XML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-xml-pkl-cli-macOS-amd64-snapshot
         path: '**/build/test-results/**/*.xml'
     - name: Upload Test Result HTML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-html-pkl-cli-macOS-amd64-snapshot
         path: '**/build/reports/tests/**/*'
@@ -213,35 +199,32 @@ jobs:
     steps:
     - name: Install deps
       run: dnf install -y git binutils gcc glibc-devel zlib-devel libstdc++-static glibc-langpack-en
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@v5
-      with:
+    - uses: actions/setup-java@v5
-        persist-credentials: false
-    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
         java-version: '21'
         distribution: temurin
         architecture: x64
-    - uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5
+        cache: gradle
-      with: {}
     - name: Fix git ownership
       run: git status || git config --system --add safe.directory $GITHUB_WORKSPACE
     - name: gradle buildNative
       shell: bash
       run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true pkl-cli:buildNative
     - name: Upload executable artifacts
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: executable-pkl-cli-linux-amd64
         path: pkl-cli*/build/executable/**/*
     - name: Upload Test Result XML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-xml-pkl-cli-linux-amd64-snapshot
         path: '**/build/test-results/**/*.xml'
     - name: Upload Test Result HTML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-html-pkl-cli-linux-amd64-snapshot
         path: '**/build/reports/tests/**/*'
@@ -256,33 +239,30 @@ jobs:
     env:
       LANG: en_US.UTF-8
     steps:
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@v5
-      with:
+    - uses: actions/setup-java@v5
-        persist-credentials: false
-    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
         java-version: '21'
         distribution: temurin
         architecture: aarch64
-    - uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5
+        cache: gradle
-      with: {}
     - name: gradle buildNative
       shell: bash
       run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true pkl-cli:buildNative
     - name: Upload executable artifacts
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: executable-pkl-cli-macOS-aarch64
         path: pkl-cli*/build/executable/**/*
     - name: Upload Test Result XML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-xml-pkl-cli-macOS-aarch64-snapshot
         path: '**/build/test-results/**/*.xml'
     - name: Upload Test Result HTML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-html-pkl-cli-macOS-aarch64-snapshot
         path: '**/build/reports/tests/**/*'
@@ -294,35 +274,32 @@ jobs:
     steps:
     - name: Install deps
       run: dnf install -y git binutils gcc glibc-devel zlib-devel libstdc++-static glibc-langpack-en
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@v5
-      with:
+    - uses: actions/setup-java@v5
-        persist-credentials: false
-    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
         java-version: '21'
         distribution: temurin
         architecture: aarch64
-    - uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5
+        cache: gradle
-      with: {}
     - name: Fix git ownership
       run: git status || git config --system --add safe.directory $GITHUB_WORKSPACE
     - name: gradle buildNative
       shell: bash
       run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true pkl-cli:buildNative
     - name: Upload executable artifacts
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: executable-pkl-cli-linux-aarch64
         path: pkl-cli*/build/executable/**/*
     - name: Upload Test Result XML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-xml-pkl-cli-linux-aarch64-snapshot
         path: '**/build/test-results/**/*.xml'
     - name: Upload Test Result HTML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-html-pkl-cli-linux-aarch64-snapshot
         path: '**/build/reports/tests/**/*'
@@ -334,16 +311,13 @@ jobs:
     env:
       LANG: en_US.UTF-8
     steps:
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@v5
-      with:
+    - uses: actions/setup-java@v5
-        persist-credentials: false
-    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
         java-version: '21'
         distribution: temurin
         architecture: x64
-    - uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5
+        cache: gradle
-      with: {}
     - name: Install musl and zlib
       run: |
         set -e
@@ -421,19 +395,19 @@ jobs:
       shell: bash
       run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true -Dpkl.musl=true pkl-cli:buildNative
     - name: Upload executable artifacts
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: executable-pkl-cli-alpine-linux-amd64
         path: pkl-cli*/build/executable/**/*
     - name: Upload Test Result XML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-xml-pkl-cli-alpine-linux-amd64-snapshot
         path: '**/build/test-results/**/*.xml'
     - name: Upload Test Result HTML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-html-pkl-cli-alpine-linux-amd64-snapshot
         path: '**/build/reports/tests/**/*'
@@ -444,33 +418,30 @@ jobs:
       LANG: en_US.UTF-8
       JAVA_HOME: /jdk
     steps:
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@v5
-      with:
+    - uses: actions/setup-java@v5
-        persist-credentials: false
-    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
         java-version: '21'
         distribution: temurin
         architecture: x64
-    - uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5
+        cache: gradle
-      with: {}
     - name: gradle buildNative
       shell: bash
       run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true pkl-cli:buildNative
     - name: Upload executable artifacts
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: executable-pkl-cli-windows-amd64
         path: pkl-cli*/build/executable/**/*
     - name: Upload Test Result XML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-xml-pkl-cli-windows-amd64-snapshot
         path: '**/build/test-results/**/*.xml'
     - name: Upload Test Result HTML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-html-pkl-cli-windows-amd64-snapshot
         path: '**/build/reports/tests/**/*'
@@ -483,33 +454,30 @@ jobs:
     env:
       LANG: en_US.UTF-8
     steps:
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@v5
-      with:
+    - uses: actions/setup-java@v5
-        persist-credentials: false
-    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
         java-version: '21'
         distribution: temurin
         architecture: x64
-    - uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5
+        cache: gradle
-      with: {}
     - name: gradle buildNative
       shell: bash
       run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true -Dpkl.targetArch=amd64 -Dpkl.native--native-compiler-path=${{ github.workspace }}/.github/scripts/cc_macos_amd64.sh pkl-doc:buildNative
     - name: Upload executable artifacts
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: executable-pkl-doc-macOS-amd64
         path: pkl-doc*/build/executable/**/*
     - name: Upload Test Result XML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-xml-pkl-doc-macOS-amd64-snapshot
         path: '**/build/test-results/**/*.xml'
     - name: Upload Test Result HTML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-html-pkl-doc-macOS-amd64-snapshot
         path: '**/build/reports/tests/**/*'
@@ -521,35 +489,32 @@ jobs:
     steps:
     - name: Install deps
       run: dnf install -y git binutils gcc glibc-devel zlib-devel libstdc++-static glibc-langpack-en
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@v5
-      with:
+    - uses: actions/setup-java@v5
-        persist-credentials: false
-    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
         java-version: '21'
         distribution: temurin
         architecture: x64
-    - uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5
+        cache: gradle
-      with: {}
     - name: Fix git ownership
       run: git status || git config --system --add safe.directory $GITHUB_WORKSPACE
     - name: gradle buildNative
       shell: bash
       run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true pkl-doc:buildNative
     - name: Upload executable artifacts
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: executable-pkl-doc-linux-amd64
         path: pkl-doc*/build/executable/**/*
     - name: Upload Test Result XML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-xml-pkl-doc-linux-amd64-snapshot
         path: '**/build/test-results/**/*.xml'
     - name: Upload Test Result HTML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-html-pkl-doc-linux-amd64-snapshot
         path: '**/build/reports/tests/**/*'
@@ -564,33 +529,30 @@ jobs:
     env:
       LANG: en_US.UTF-8
     steps:
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@v5
-      with:
+    - uses: actions/setup-java@v5
-        persist-credentials: false
-    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
         java-version: '21'
         distribution: temurin
         architecture: aarch64
-    - uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5
+        cache: gradle
-      with: {}
     - name: gradle buildNative
       shell: bash
       run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true pkl-doc:buildNative
     - name: Upload executable artifacts
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: executable-pkl-doc-macOS-aarch64
         path: pkl-doc*/build/executable/**/*
     - name: Upload Test Result XML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-xml-pkl-doc-macOS-aarch64-snapshot
         path: '**/build/test-results/**/*.xml'
     - name: Upload Test Result HTML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-html-pkl-doc-macOS-aarch64-snapshot
         path: '**/build/reports/tests/**/*'
@@ -602,35 +564,32 @@ jobs:
     steps:
     - name: Install deps
       run: dnf install -y git binutils gcc glibc-devel zlib-devel libstdc++-static glibc-langpack-en
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@v5
-      with:
+    - uses: actions/setup-java@v5
-        persist-credentials: false
-    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
         java-version: '21'
         distribution: temurin
         architecture: aarch64
-    - uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5
+        cache: gradle
-      with: {}
     - name: Fix git ownership
       run: git status || git config --system --add safe.directory $GITHUB_WORKSPACE
     - name: gradle buildNative
       shell: bash
       run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true pkl-doc:buildNative
     - name: Upload executable artifacts
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: executable-pkl-doc-linux-aarch64
         path: pkl-doc*/build/executable/**/*
     - name: Upload Test Result XML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-xml-pkl-doc-linux-aarch64-snapshot
         path: '**/build/test-results/**/*.xml'
     - name: Upload Test Result HTML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-html-pkl-doc-linux-aarch64-snapshot
         path: '**/build/reports/tests/**/*'
@@ -642,16 +601,13 @@ jobs:
     env:
       LANG: en_US.UTF-8
     steps:
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@v5
-      with:
+    - uses: actions/setup-java@v5
-        persist-credentials: false
-    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
         java-version: '21'
         distribution: temurin
         architecture: x64
-    - uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5
+        cache: gradle
-      with: {}
     - name: Install musl and zlib
       run: |
         set -e
@@ -729,19 +685,19 @@ jobs:
       shell: bash
       run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true -Dpkl.musl=true pkl-doc:buildNative
     - name: Upload executable artifacts
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: executable-pkl-doc-alpine-linux-amd64
         path: pkl-doc*/build/executable/**/*
     - name: Upload Test Result XML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-xml-pkl-doc-alpine-linux-amd64-snapshot
         path: '**/build/test-results/**/*.xml'
     - name: Upload Test Result HTML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-html-pkl-doc-alpine-linux-amd64-snapshot
         path: '**/build/reports/tests/**/*'
@@ -752,33 +708,30 @@ jobs:
       LANG: en_US.UTF-8
       JAVA_HOME: /jdk
     steps:
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@v5
-      with:
+    - uses: actions/setup-java@v5
-        persist-credentials: false
-    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
         java-version: '21'
         distribution: temurin
         architecture: x64
-    - uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5
+        cache: gradle
-      with: {}
     - name: gradle buildNative
       shell: bash
       run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true pkl-doc:buildNative
     - name: Upload executable artifacts
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: executable-pkl-doc-windows-amd64
         path: pkl-doc*/build/executable/**/*
     - name: Upload Test Result XML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-xml-pkl-doc-windows-amd64-snapshot
         path: '**/build/test-results/**/*.xml'
     - name: Upload Test Result HTML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-html-pkl-doc-windows-amd64-snapshot
         path: '**/build/reports/tests/**/*'
@@ -807,20 +760,15 @@ jobs:
       LANG: en_US.UTF-8
     environment: maven-release
     steps:
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@v5
-      with:
+    - uses: actions/setup-java@v5
-        persist-credentials: false
-    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
         java-version: '21'
         distribution: temurin
         architecture: x64
-    - uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5
+        cache: gradle
-      with: {}
+    - uses: actions/checkout@v5
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/download-artifact@v6
-      with:
-        persist-credentials: false
-    - uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6
       with:
         pattern: executable-**
         merge-multiple: true
@@ -831,8 +779,21 @@ jobs:
         ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.ORG_GRADLE_PROJECT_SONATYPEPASSWORD }}
         ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.ORG_GRADLE_PROJECT_SONATYPEUSERNAME }}
       run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true --no-parallel publishToSonatype
-  publish-test-results:
+    - name: Upload Test Result XML
       if: '!cancelled()'
+      uses: actions/upload-artifact@v5
+      with:
+        name: test-results-xml-deploy-snapshot
+        path: '**/build/test-results/**/*.xml'
+    - name: Upload Test Result HTML
+      if: '!cancelled()'
+      uses: actions/upload-artifact@v5
+      with:
+        name: test-results-html-deploy-snapshot
+        path: '**/build/reports/tests/**/*'
+        if-no-files-found: ignore
+  publish-test-results:
+    if: '!failure() && !cancelled()'
     needs:
     - gradle-check
     - gradle-check-windows
@@ -850,22 +811,23 @@ jobs:
     - pkl-doc-linux-aarch64-snapshot
     - pkl-doc-alpine-linux-amd64-snapshot
     - pkl-doc-windows-amd64-snapshot
+    - deploy-snapshot
     permissions:
       checks: write
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6
+    - uses: actions/download-artifact@v6
       with:
         pattern: test-results-xml-*
     - name: Publish test results
       if: '!cancelled()'
-      uses: EnricoMi/publish-unit-test-result-action@c950f6fb443cb5af20a377fd0dfaa78838901040 # v2
+      uses: EnricoMi/publish-unit-test-result-action@v2
       with:
         comment_mode: 'off'
         files: test-results-xml-*/**/*.xml
     - name: Upload Test Result HTML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-html-publish-test-results
         path: '**/build/reports/tests/**/*'
@@ -896,7 +858,7 @@ jobs:
     steps:
     - name: Create app token
       id: app-token
-      uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2
+      uses: actions/create-github-app-token@v2
       with:
         app-id: ${{ secrets.PKL_CI_CLIENT_ID }}
         private-key: ${{ secrets.PKL_CI }}

.github/workflows/prb.yml

@@ -1,4 +1,6 @@
-# Generated from Workflow.pkl. DO NOT EDIT.
+# Do not modify!
+# This file was generated from a template using https://github.com/StefMa/pkl-gha
+
 name: Pull Request
 'on':
   pull_request: {}
@@ -13,30 +15,28 @@ jobs:
     env:
       LANG: en_US.UTF-8
     steps:
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@v5
       with:
-        persist-credentials: false
         fetch-depth: 0
-    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
+    - uses: actions/setup-java@v5
       with:
         java-version: '21'
         distribution: temurin
         architecture: x64
-    - uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5
+        cache: gradle
-      with: {}
     - name: check
       shell: bash
       run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true check
     - name: Upload Test Result XML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-xml-gradle-check
         path: '**/build/test-results/**/*.xml'
         if-no-files-found: ignore
     - name: Upload Test Result HTML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-html-gradle-check
         path: '**/build/reports/tests/**/*'
@@ -48,30 +48,28 @@ jobs:
       LANG: en_US.UTF-8
       JAVA_HOME: /jdk
     steps:
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@v5
       with:
-        persist-credentials: false
         fetch-depth: 0
-    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
+    - uses: actions/setup-java@v5
       with:
         java-version: '21'
         distribution: temurin
         architecture: x64
-    - uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5
+        cache: gradle
-      with: {}
     - name: check
       shell: bash
       run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true check
     - name: Upload Test Result XML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-xml-gradle-check-windows
         path: '**/build/test-results/**/*.xml'
         if-no-files-found: ignore
     - name: Upload Test Result HTML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-html-gradle-check-windows
         path: '**/build/reports/tests/**/*'
@@ -84,34 +82,31 @@ jobs:
     env:
       LANG: en_US.UTF-8
     steps:
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@v5
-      with:
+    - uses: actions/setup-java@v5
-        persist-credentials: false
-    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
         java-version: '21'
         distribution: temurin
         architecture: x64
-    - uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5
+        cache: gradle
-      with: {}
     - name: gradle buildNative
       shell: bash
       run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true -Dpkl.targetArch=amd64 -Dpkl.native--native-compiler-path=${{ github.workspace }}/.github/scripts/cc_macos_amd64.sh pkl-cli:buildNative
     - name: Upload executable artifacts
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: executable-pkl-cli-macOS-amd64
         path: pkl-cli*/build/executable/**/*
     - name: Upload Test Result XML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-xml-pkl-cli-macOS-amd64-snapshot
         path: '**/build/test-results/**/*.xml'
         if-no-files-found: ignore
     - name: Upload Test Result HTML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-html-pkl-cli-macOS-amd64-snapshot
         path: '**/build/reports/tests/**/*'
@@ -124,36 +119,33 @@ jobs:
     steps:
     - name: Install deps
       run: dnf install -y git binutils gcc glibc-devel zlib-devel libstdc++-static glibc-langpack-en
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@v5
-      with:
+    - uses: actions/setup-java@v5
-        persist-credentials: false
-    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
         java-version: '21'
         distribution: temurin
         architecture: x64
-    - uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5
+        cache: gradle
-      with: {}
     - name: Fix git ownership
       run: git status || git config --system --add safe.directory $GITHUB_WORKSPACE
     - name: gradle buildNative
       shell: bash
       run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true pkl-cli:buildNative
     - name: Upload executable artifacts
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: executable-pkl-cli-linux-amd64
         path: pkl-cli*/build/executable/**/*
     - name: Upload Test Result XML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-xml-pkl-cli-linux-amd64-snapshot
         path: '**/build/test-results/**/*.xml'
         if-no-files-found: ignore
     - name: Upload Test Result HTML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-html-pkl-cli-linux-amd64-snapshot
         path: '**/build/reports/tests/**/*'
@@ -168,34 +160,31 @@ jobs:
     env:
       LANG: en_US.UTF-8
     steps:
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@v5
-      with:
+    - uses: actions/setup-java@v5
-        persist-credentials: false
-    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
         java-version: '21'
         distribution: temurin
         architecture: aarch64
-    - uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5
+        cache: gradle
-      with: {}
     - name: gradle buildNative
       shell: bash
       run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true pkl-cli:buildNative
     - name: Upload executable artifacts
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: executable-pkl-cli-macOS-aarch64
         path: pkl-cli*/build/executable/**/*
     - name: Upload Test Result XML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-xml-pkl-cli-macOS-aarch64-snapshot
         path: '**/build/test-results/**/*.xml'
         if-no-files-found: ignore
     - name: Upload Test Result HTML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-html-pkl-cli-macOS-aarch64-snapshot
         path: '**/build/reports/tests/**/*'
@@ -208,36 +197,33 @@ jobs:
     steps:
     - name: Install deps
       run: dnf install -y git binutils gcc glibc-devel zlib-devel libstdc++-static glibc-langpack-en
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@v5
-      with:
+    - uses: actions/setup-java@v5
-        persist-credentials: false
-    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
         java-version: '21'
         distribution: temurin
         architecture: aarch64
-    - uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5
+        cache: gradle
-      with: {}
     - name: Fix git ownership
       run: git status || git config --system --add safe.directory $GITHUB_WORKSPACE
     - name: gradle buildNative
       shell: bash
       run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true pkl-cli:buildNative
     - name: Upload executable artifacts
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: executable-pkl-cli-linux-aarch64
         path: pkl-cli*/build/executable/**/*
     - name: Upload Test Result XML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-xml-pkl-cli-linux-aarch64-snapshot
         path: '**/build/test-results/**/*.xml'
         if-no-files-found: ignore
     - name: Upload Test Result HTML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-html-pkl-cli-linux-aarch64-snapshot
         path: '**/build/reports/tests/**/*'
@@ -250,16 +236,13 @@ jobs:
     env:
       LANG: en_US.UTF-8
     steps:
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@v5
-      with:
+    - uses: actions/setup-java@v5
-        persist-credentials: false
-    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
         java-version: '21'
         distribution: temurin
         architecture: x64
-    - uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5
+        cache: gradle
-      with: {}
     - name: Install musl and zlib
       run: |
         set -e
@@ -337,20 +320,20 @@ jobs:
       shell: bash
       run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true -Dpkl.musl=true pkl-cli:buildNative
     - name: Upload executable artifacts
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: executable-pkl-cli-alpine-linux-amd64
         path: pkl-cli*/build/executable/**/*
     - name: Upload Test Result XML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-xml-pkl-cli-alpine-linux-amd64-snapshot
         path: '**/build/test-results/**/*.xml'
         if-no-files-found: ignore
     - name: Upload Test Result HTML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-html-pkl-cli-alpine-linux-amd64-snapshot
         path: '**/build/reports/tests/**/*'
@@ -362,34 +345,31 @@ jobs:
       LANG: en_US.UTF-8
       JAVA_HOME: /jdk
     steps:
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@v5
-      with:
+    - uses: actions/setup-java@v5
-        persist-credentials: false
-    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
         java-version: '21'
         distribution: temurin
         architecture: x64
-    - uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5
+        cache: gradle
-      with: {}
     - name: gradle buildNative
       shell: bash
       run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true pkl-cli:buildNative
     - name: Upload executable artifacts
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: executable-pkl-cli-windows-amd64
         path: pkl-cli*/build/executable/**/*
     - name: Upload Test Result XML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-xml-pkl-cli-windows-amd64-snapshot
         path: '**/build/test-results/**/*.xml'
         if-no-files-found: ignore
     - name: Upload Test Result HTML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-html-pkl-cli-windows-amd64-snapshot
         path: '**/build/reports/tests/**/*'
@@ -402,34 +382,31 @@ jobs:
     env:
       LANG: en_US.UTF-8
     steps:
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@v5
-      with:
+    - uses: actions/setup-java@v5
-        persist-credentials: false
-    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
         java-version: '21'
         distribution: temurin
         architecture: x64
-    - uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5
+        cache: gradle
-      with: {}
     - name: gradle buildNative
       shell: bash
       run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true -Dpkl.targetArch=amd64 -Dpkl.native--native-compiler-path=${{ github.workspace }}/.github/scripts/cc_macos_amd64.sh pkl-doc:buildNative
     - name: Upload executable artifacts
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: executable-pkl-doc-macOS-amd64
         path: pkl-doc*/build/executable/**/*
     - name: Upload Test Result XML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-xml-pkl-doc-macOS-amd64-snapshot
         path: '**/build/test-results/**/*.xml'
         if-no-files-found: ignore
     - name: Upload Test Result HTML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-html-pkl-doc-macOS-amd64-snapshot
         path: '**/build/reports/tests/**/*'
@@ -442,36 +419,33 @@ jobs:
     steps:
     - name: Install deps
       run: dnf install -y git binutils gcc glibc-devel zlib-devel libstdc++-static glibc-langpack-en
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@v5
-      with:
+    - uses: actions/setup-java@v5
-        persist-credentials: false
-    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
         java-version: '21'
         distribution: temurin
         architecture: x64
-    - uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5
+        cache: gradle
-      with: {}
     - name: Fix git ownership
       run: git status || git config --system --add safe.directory $GITHUB_WORKSPACE
     - name: gradle buildNative
       shell: bash
       run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true pkl-doc:buildNative
     - name: Upload executable artifacts
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: executable-pkl-doc-linux-amd64
         path: pkl-doc*/build/executable/**/*
     - name: Upload Test Result XML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-xml-pkl-doc-linux-amd64-snapshot
         path: '**/build/test-results/**/*.xml'
         if-no-files-found: ignore
     - name: Upload Test Result HTML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-html-pkl-doc-linux-amd64-snapshot
         path: '**/build/reports/tests/**/*'
@@ -486,34 +460,31 @@ jobs:
     env:
       LANG: en_US.UTF-8
     steps:
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@v5
-      with:
+    - uses: actions/setup-java@v5
-        persist-credentials: false
-    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
         java-version: '21'
         distribution: temurin
         architecture: aarch64
-    - uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5
+        cache: gradle
-      with: {}
     - name: gradle buildNative
       shell: bash
       run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true pkl-doc:buildNative
     - name: Upload executable artifacts
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: executable-pkl-doc-macOS-aarch64
         path: pkl-doc*/build/executable/**/*
     - name: Upload Test Result XML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-xml-pkl-doc-macOS-aarch64-snapshot
         path: '**/build/test-results/**/*.xml'
         if-no-files-found: ignore
     - name: Upload Test Result HTML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-html-pkl-doc-macOS-aarch64-snapshot
         path: '**/build/reports/tests/**/*'
@@ -526,36 +497,33 @@ jobs:
     steps:
     - name: Install deps
       run: dnf install -y git binutils gcc glibc-devel zlib-devel libstdc++-static glibc-langpack-en
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@v5
-      with:
+    - uses: actions/setup-java@v5
-        persist-credentials: false
-    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
         java-version: '21'
         distribution: temurin
         architecture: aarch64
-    - uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5
+        cache: gradle
-      with: {}
     - name: Fix git ownership
       run: git status || git config --system --add safe.directory $GITHUB_WORKSPACE
     - name: gradle buildNative
       shell: bash
       run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true pkl-doc:buildNative
     - name: Upload executable artifacts
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: executable-pkl-doc-linux-aarch64
         path: pkl-doc*/build/executable/**/*
     - name: Upload Test Result XML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-xml-pkl-doc-linux-aarch64-snapshot
         path: '**/build/test-results/**/*.xml'
         if-no-files-found: ignore
     - name: Upload Test Result HTML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-html-pkl-doc-linux-aarch64-snapshot
         path: '**/build/reports/tests/**/*'
@@ -568,16 +536,13 @@ jobs:
     env:
       LANG: en_US.UTF-8
     steps:
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@v5
-      with:
+    - uses: actions/setup-java@v5
-        persist-credentials: false
-    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
         java-version: '21'
         distribution: temurin
         architecture: x64
-    - uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5
+        cache: gradle
-      with: {}
     - name: Install musl and zlib
       run: |
         set -e
@@ -655,20 +620,20 @@ jobs:
       shell: bash
       run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true -Dpkl.musl=true pkl-doc:buildNative
     - name: Upload executable artifacts
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: executable-pkl-doc-alpine-linux-amd64
         path: pkl-doc*/build/executable/**/*
     - name: Upload Test Result XML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-xml-pkl-doc-alpine-linux-amd64-snapshot
         path: '**/build/test-results/**/*.xml'
         if-no-files-found: ignore
     - name: Upload Test Result HTML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-html-pkl-doc-alpine-linux-amd64-snapshot
         path: '**/build/reports/tests/**/*'
@@ -680,34 +645,31 @@ jobs:
       LANG: en_US.UTF-8
       JAVA_HOME: /jdk
     steps:
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@v5
-      with:
+    - uses: actions/setup-java@v5
-        persist-credentials: false
-    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
         java-version: '21'
         distribution: temurin
         architecture: x64
-    - uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5
+        cache: gradle
-      with: {}
     - name: gradle buildNative
       shell: bash
       run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true pkl-doc:buildNative
     - name: Upload executable artifacts
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: executable-pkl-doc-windows-amd64
         path: pkl-doc*/build/executable/**/*
     - name: Upload Test Result XML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-xml-pkl-doc-windows-amd64-snapshot
         path: '**/build/test-results/**/*.xml'
         if-no-files-found: ignore
     - name: Upload Test Result HTML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-html-pkl-doc-windows-amd64-snapshot
         path: '**/build/reports/tests/**/*'
@@ -717,16 +679,14 @@ jobs:
     steps:
     - name: Upload event file
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-event-file
         path: ${{ github.event_path }}
   check-pkl-github-actions:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@v5
-      with:
-        persist-credentials: false
     - name: Setup Pkl
       id: setup-pkl
       env:
@@ -741,8 +701,6 @@ jobs:
         chmod +x $PKL_EXEC
         echo "$DIR" >> "$GITHUB_PATH"
         echo "pkl_exec=$PKL_EXEC" >> "$GITHUB_OUTPUT"
-    - shell: bash
-      run: rm -rf .github/**/[a-z]*.yml
     - shell: bash
       run: pkl eval -m .github/ --project-dir .github/ .github/index.pkl
     - name: check git status

.github/workflows/release-branch.yml

@@ -1,4 +1,6 @@
-# Generated from Workflow.pkl. DO NOT EDIT.
+# Do not modify!
+# This file was generated from a template using https://github.com/StefMa/pkl-gha
+
 name: Build (release branch)
 'on':
   push:
@@ -17,29 +19,27 @@ jobs:
     env:
       LANG: en_US.UTF-8
     steps:
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@v5
       with:
-        persist-credentials: false
         fetch-depth: 0
-    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
+    - uses: actions/setup-java@v5
       with:
         java-version: '21'
         distribution: temurin
         architecture: x64
-    - uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5
+        cache: gradle
-      with: {}
     - name: check
       shell: bash
       run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true check
     - name: Upload Test Result XML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-xml-gradle-check
         path: '**/build/test-results/**/*.xml'
     - name: Upload Test Result HTML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-html-gradle-check
         path: '**/build/reports/tests/**/*'
@@ -50,29 +50,27 @@ jobs:
       LANG: en_US.UTF-8
       JAVA_HOME: /jdk
     steps:
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@v5
       with:
-        persist-credentials: false
         fetch-depth: 0
-    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
+    - uses: actions/setup-java@v5
       with:
         java-version: '21'
         distribution: temurin
         architecture: x64
-    - uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5
+        cache: gradle
-      with: {}
     - name: check
       shell: bash
       run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true check
     - name: Upload Test Result XML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-xml-gradle-check-windows
         path: '**/build/test-results/**/*.xml'
     - name: Upload Test Result HTML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-html-gradle-check-windows
         path: '**/build/reports/tests/**/*'
@@ -82,16 +80,13 @@ jobs:
     env:
       LANG: en_US.UTF-8
     steps:
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@v5
-      with:
+    - uses: actions/setup-java@v5
-        persist-credentials: false
-    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
         java-version: '21'
         distribution: temurin
         architecture: x64
-    - uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5
+        cache: gradle
-      with: {}
     - name: bench:jmh
       shell: bash
       run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true bench:jmh
@@ -100,29 +95,27 @@ jobs:
     env:
       LANG: en_US.UTF-8
     steps:
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@v5
       with:
-        persist-credentials: false
         fetch-depth: 0
-    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
+    - uses: actions/setup-java@v5
       with:
         java-version: '21'
         distribution: temurin
         architecture: x64
-    - uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5
+        cache: gradle
-      with: {}
     - name: :pkl-gradle:build :pkl-gradle:compatibilityTestReleases
       shell: bash
       run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true :pkl-gradle:build :pkl-gradle:compatibilityTestReleases
     - name: Upload Test Result XML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-xml-gradle-compatibility
         path: '**/build/test-results/**/*.xml'
     - name: Upload Test Result HTML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-html-gradle-compatibility
         path: '**/build/reports/tests/**/*'
@@ -132,37 +125,33 @@ jobs:
     env:
       LANG: en_US.UTF-8
     steps:
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@v5
       with:
-        persist-credentials: false
         fetch-depth: 0
-    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
+    - uses: actions/setup-java@v5
       with:
         java-version: '21'
         distribution: temurin
         architecture: x64
-    - uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5
+        cache: gradle
-      with: {}
+    - uses: actions/checkout@v5
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
-      with:
-        persist-credentials: false
     - name: gradle build java executables
       shell: bash
       run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true pkl-doc:build pkl-cli:build pkl-codegen-java:build pkl-codegen-kotlin:build
     - name: Upload executable artifacts
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: executable-java
         path: '*/build/executable/**/*'
     - name: Upload Test Result XML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-xml-java-executables-snapshot
         path: '**/build/test-results/**/*.xml'
     - name: Upload Test Result HTML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-html-java-executables-snapshot
         path: '**/build/reports/tests/**/*'
@@ -175,33 +164,30 @@ jobs:
     env:
       LANG: en_US.UTF-8
     steps:
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@v5
-      with:
+    - uses: actions/setup-java@v5
-        persist-credentials: false
-    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
         java-version: '21'
         distribution: temurin
         architecture: x64
-    - uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5
+        cache: gradle
-      with: {}
     - name: gradle buildNative
       shell: bash
       run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true -Dpkl.targetArch=amd64 -Dpkl.native--native-compiler-path=${{ github.workspace }}/.github/scripts/cc_macos_amd64.sh pkl-cli:buildNative
     - name: Upload executable artifacts
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: executable-pkl-cli-macOS-amd64
         path: pkl-cli*/build/executable/**/*
     - name: Upload Test Result XML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-xml-pkl-cli-macOS-amd64-snapshot
         path: '**/build/test-results/**/*.xml'
     - name: Upload Test Result HTML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-html-pkl-cli-macOS-amd64-snapshot
         path: '**/build/reports/tests/**/*'
@@ -213,35 +199,32 @@ jobs:
     steps:
     - name: Install deps
       run: dnf install -y git binutils gcc glibc-devel zlib-devel libstdc++-static glibc-langpack-en
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@v5
-      with:
+    - uses: actions/setup-java@v5
-        persist-credentials: false
-    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
         java-version: '21'
         distribution: temurin
         architecture: x64
-    - uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5
+        cache: gradle
-      with: {}
     - name: Fix git ownership
       run: git status || git config --system --add safe.directory $GITHUB_WORKSPACE
     - name: gradle buildNative
       shell: bash
       run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true pkl-cli:buildNative
     - name: Upload executable artifacts
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: executable-pkl-cli-linux-amd64
         path: pkl-cli*/build/executable/**/*
     - name: Upload Test Result XML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-xml-pkl-cli-linux-amd64-snapshot
         path: '**/build/test-results/**/*.xml'
     - name: Upload Test Result HTML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-html-pkl-cli-linux-amd64-snapshot
         path: '**/build/reports/tests/**/*'
@@ -256,33 +239,30 @@ jobs:
     env:
       LANG: en_US.UTF-8
     steps:
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@v5
-      with:
+    - uses: actions/setup-java@v5
-        persist-credentials: false
-    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
         java-version: '21'
         distribution: temurin
         architecture: aarch64
-    - uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5
+        cache: gradle
-      with: {}
     - name: gradle buildNative
       shell: bash
       run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true pkl-cli:buildNative
     - name: Upload executable artifacts
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: executable-pkl-cli-macOS-aarch64
         path: pkl-cli*/build/executable/**/*
     - name: Upload Test Result XML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-xml-pkl-cli-macOS-aarch64-snapshot
         path: '**/build/test-results/**/*.xml'
     - name: Upload Test Result HTML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-html-pkl-cli-macOS-aarch64-snapshot
         path: '**/build/reports/tests/**/*'
@@ -294,35 +274,32 @@ jobs:
     steps:
     - name: Install deps
       run: dnf install -y git binutils gcc glibc-devel zlib-devel libstdc++-static glibc-langpack-en
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@v5
-      with:
+    - uses: actions/setup-java@v5
-        persist-credentials: false
-    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
         java-version: '21'
         distribution: temurin
         architecture: aarch64
-    - uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5
+        cache: gradle
-      with: {}
     - name: Fix git ownership
       run: git status || git config --system --add safe.directory $GITHUB_WORKSPACE
     - name: gradle buildNative
       shell: bash
       run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true pkl-cli:buildNative
     - name: Upload executable artifacts
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: executable-pkl-cli-linux-aarch64
         path: pkl-cli*/build/executable/**/*
     - name: Upload Test Result XML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-xml-pkl-cli-linux-aarch64-snapshot
         path: '**/build/test-results/**/*.xml'
     - name: Upload Test Result HTML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-html-pkl-cli-linux-aarch64-snapshot
         path: '**/build/reports/tests/**/*'
@@ -334,16 +311,13 @@ jobs:
     env:
       LANG: en_US.UTF-8
     steps:
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@v5
-      with:
+    - uses: actions/setup-java@v5
-        persist-credentials: false
-    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
         java-version: '21'
         distribution: temurin
         architecture: x64
-    - uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5
+        cache: gradle
-      with: {}
     - name: Install musl and zlib
       run: |
         set -e
@@ -421,19 +395,19 @@ jobs:
       shell: bash
       run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true -Dpkl.musl=true pkl-cli:buildNative
     - name: Upload executable artifacts
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: executable-pkl-cli-alpine-linux-amd64
         path: pkl-cli*/build/executable/**/*
     - name: Upload Test Result XML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-xml-pkl-cli-alpine-linux-amd64-snapshot
         path: '**/build/test-results/**/*.xml'
     - name: Upload Test Result HTML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-html-pkl-cli-alpine-linux-amd64-snapshot
         path: '**/build/reports/tests/**/*'
@@ -444,33 +418,30 @@ jobs:
       LANG: en_US.UTF-8
       JAVA_HOME: /jdk
     steps:
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@v5
-      with:
+    - uses: actions/setup-java@v5
-        persist-credentials: false
-    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
         java-version: '21'
         distribution: temurin
         architecture: x64
-    - uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5
+        cache: gradle
-      with: {}
     - name: gradle buildNative
       shell: bash
       run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true pkl-cli:buildNative
     - name: Upload executable artifacts
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: executable-pkl-cli-windows-amd64
         path: pkl-cli*/build/executable/**/*
     - name: Upload Test Result XML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-xml-pkl-cli-windows-amd64-snapshot
         path: '**/build/test-results/**/*.xml'
     - name: Upload Test Result HTML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-html-pkl-cli-windows-amd64-snapshot
         path: '**/build/reports/tests/**/*'
@@ -483,33 +454,30 @@ jobs:
     env:
       LANG: en_US.UTF-8
     steps:
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@v5
-      with:
+    - uses: actions/setup-java@v5
-        persist-credentials: false
-    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
         java-version: '21'
         distribution: temurin
         architecture: x64
-    - uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5
+        cache: gradle
-      with: {}
     - name: gradle buildNative
       shell: bash
       run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true -Dpkl.targetArch=amd64 -Dpkl.native--native-compiler-path=${{ github.workspace }}/.github/scripts/cc_macos_amd64.sh pkl-doc:buildNative
     - name: Upload executable artifacts
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: executable-pkl-doc-macOS-amd64
         path: pkl-doc*/build/executable/**/*
     - name: Upload Test Result XML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-xml-pkl-doc-macOS-amd64-snapshot
         path: '**/build/test-results/**/*.xml'
     - name: Upload Test Result HTML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-html-pkl-doc-macOS-amd64-snapshot
         path: '**/build/reports/tests/**/*'
@@ -521,35 +489,32 @@ jobs:
     steps:
     - name: Install deps
       run: dnf install -y git binutils gcc glibc-devel zlib-devel libstdc++-static glibc-langpack-en
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@v5
-      with:
+    - uses: actions/setup-java@v5
-        persist-credentials: false
-    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
         java-version: '21'
         distribution: temurin
         architecture: x64
-    - uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5
+        cache: gradle
-      with: {}
     - name: Fix git ownership
       run: git status || git config --system --add safe.directory $GITHUB_WORKSPACE
     - name: gradle buildNative
       shell: bash
       run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true pkl-doc:buildNative
     - name: Upload executable artifacts
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: executable-pkl-doc-linux-amd64
         path: pkl-doc*/build/executable/**/*
     - name: Upload Test Result XML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-xml-pkl-doc-linux-amd64-snapshot
         path: '**/build/test-results/**/*.xml'
     - name: Upload Test Result HTML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-html-pkl-doc-linux-amd64-snapshot
         path: '**/build/reports/tests/**/*'
@@ -564,33 +529,30 @@ jobs:
     env:
       LANG: en_US.UTF-8
     steps:
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@v5
-      with:
+    - uses: actions/setup-java@v5
-        persist-credentials: false
-    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
         java-version: '21'
         distribution: temurin
         architecture: aarch64
-    - uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5
+        cache: gradle
-      with: {}
     - name: gradle buildNative
       shell: bash
       run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true pkl-doc:buildNative
     - name: Upload executable artifacts
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: executable-pkl-doc-macOS-aarch64
         path: pkl-doc*/build/executable/**/*
     - name: Upload Test Result XML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-xml-pkl-doc-macOS-aarch64-snapshot
         path: '**/build/test-results/**/*.xml'
     - name: Upload Test Result HTML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-html-pkl-doc-macOS-aarch64-snapshot
         path: '**/build/reports/tests/**/*'
@@ -602,35 +564,32 @@ jobs:
     steps:
     - name: Install deps
       run: dnf install -y git binutils gcc glibc-devel zlib-devel libstdc++-static glibc-langpack-en
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@v5
-      with:
+    - uses: actions/setup-java@v5
-        persist-credentials: false
-    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
         java-version: '21'
         distribution: temurin
         architecture: aarch64
-    - uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5
+        cache: gradle
-      with: {}
     - name: Fix git ownership
       run: git status || git config --system --add safe.directory $GITHUB_WORKSPACE
     - name: gradle buildNative
       shell: bash
       run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true pkl-doc:buildNative
     - name: Upload executable artifacts
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: executable-pkl-doc-linux-aarch64
         path: pkl-doc*/build/executable/**/*
     - name: Upload Test Result XML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-xml-pkl-doc-linux-aarch64-snapshot
         path: '**/build/test-results/**/*.xml'
     - name: Upload Test Result HTML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-html-pkl-doc-linux-aarch64-snapshot
         path: '**/build/reports/tests/**/*'
@@ -642,16 +601,13 @@ jobs:
     env:
       LANG: en_US.UTF-8
     steps:
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@v5
-      with:
+    - uses: actions/setup-java@v5
-        persist-credentials: false
-    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
         java-version: '21'
         distribution: temurin
         architecture: x64
-    - uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5
+        cache: gradle
-      with: {}
     - name: Install musl and zlib
       run: |
         set -e
@@ -729,19 +685,19 @@ jobs:
       shell: bash
       run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true -Dpkl.musl=true pkl-doc:buildNative
     - name: Upload executable artifacts
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: executable-pkl-doc-alpine-linux-amd64
         path: pkl-doc*/build/executable/**/*
     - name: Upload Test Result XML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-xml-pkl-doc-alpine-linux-amd64-snapshot
         path: '**/build/test-results/**/*.xml'
     - name: Upload Test Result HTML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-html-pkl-doc-alpine-linux-amd64-snapshot
         path: '**/build/reports/tests/**/*'
@@ -752,39 +708,36 @@ jobs:
       LANG: en_US.UTF-8
       JAVA_HOME: /jdk
     steps:
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@v5
-      with:
+    - uses: actions/setup-java@v5
-        persist-credentials: false
-    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
         java-version: '21'
         distribution: temurin
         architecture: x64
-    - uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5
+        cache: gradle
-      with: {}
     - name: gradle buildNative
       shell: bash
       run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true pkl-doc:buildNative
     - name: Upload executable artifacts
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: executable-pkl-doc-windows-amd64
         path: pkl-doc*/build/executable/**/*
     - name: Upload Test Result XML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-xml-pkl-doc-windows-amd64-snapshot
         path: '**/build/test-results/**/*.xml'
     - name: Upload Test Result HTML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-html-pkl-doc-windows-amd64-snapshot
         path: '**/build/reports/tests/**/*'
         if-no-files-found: ignore
   publish-test-results:
-    if: '!cancelled()'
+    if: '!failure() && !cancelled()'
     needs:
     - gradle-check
     - gradle-check-windows
@@ -806,18 +759,18 @@ jobs:
       checks: write
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6
+    - uses: actions/download-artifact@v6
       with:
         pattern: test-results-xml-*
     - name: Publish test results
       if: '!cancelled()'
-      uses: EnricoMi/publish-unit-test-result-action@c950f6fb443cb5af20a377fd0dfaa78838901040 # v2
+      uses: EnricoMi/publish-unit-test-result-action@v2
       with:
         comment_mode: 'off'
         files: test-results-xml-*/**/*.xml
     - name: Upload Test Result HTML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-html-publish-test-results
         path: '**/build/reports/tests/**/*'
@@ -847,7 +800,7 @@ jobs:
     steps:
     - name: Create app token
       id: app-token
-      uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2
+      uses: actions/create-github-app-token@v2
       with:
         app-id: ${{ secrets.PKL_CI_CLIENT_ID }}
         private-key: ${{ secrets.PKL_CI }}

.github/workflows/release.yml

@@ -1,4 +1,6 @@
-# Generated from Workflow.pkl. DO NOT EDIT.
+# Do not modify!
+# This file was generated from a template using https://github.com/StefMa/pkl-gha
+
 name: Release
 'on':
   push:
@@ -17,29 +19,27 @@ jobs:
     env:
       LANG: en_US.UTF-8
     steps:
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@v5
       with:
-        persist-credentials: false
         fetch-depth: 0
-    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
+    - uses: actions/setup-java@v5
       with:
         java-version: '21'
         distribution: temurin
         architecture: x64
-    - uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5
+        cache: gradle
-      with: {}
     - name: check
       shell: bash
       run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true check
     - name: Upload Test Result XML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-xml-gradle-check
         path: '**/build/test-results/**/*.xml'
     - name: Upload Test Result HTML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-html-gradle-check
         path: '**/build/reports/tests/**/*'
@@ -50,29 +50,27 @@ jobs:
       LANG: en_US.UTF-8
       JAVA_HOME: /jdk
     steps:
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@v5
       with:
-        persist-credentials: false
         fetch-depth: 0
-    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
+    - uses: actions/setup-java@v5
       with:
         java-version: '21'
         distribution: temurin
         architecture: x64
-    - uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5
+        cache: gradle
-      with: {}
     - name: check
       shell: bash
       run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true check
     - name: Upload Test Result XML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-xml-gradle-check-windows
         path: '**/build/test-results/**/*.xml'
     - name: Upload Test Result HTML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-html-gradle-check-windows
         path: '**/build/reports/tests/**/*'
@@ -82,16 +80,13 @@ jobs:
     env:
       LANG: en_US.UTF-8
     steps:
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@v5
-      with:
+    - uses: actions/setup-java@v5
-        persist-credentials: false
-    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
         java-version: '21'
         distribution: temurin
         architecture: x64
-    - uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5
+        cache: gradle
-      with: {}
     - name: bench:jmh
       shell: bash
       run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true bench:jmh
@@ -100,29 +95,27 @@ jobs:
     env:
       LANG: en_US.UTF-8
     steps:
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@v5
       with:
-        persist-credentials: false
         fetch-depth: 0
-    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
+    - uses: actions/setup-java@v5
       with:
         java-version: '21'
         distribution: temurin
         architecture: x64
-    - uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5
+        cache: gradle
-      with: {}
     - name: :pkl-gradle:build :pkl-gradle:compatibilityTestReleases
       shell: bash
       run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true :pkl-gradle:build :pkl-gradle:compatibilityTestReleases
     - name: Upload Test Result XML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-xml-gradle-compatibility
         path: '**/build/test-results/**/*.xml'
     - name: Upload Test Result HTML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-html-gradle-compatibility
         path: '**/build/reports/tests/**/*'
@@ -132,37 +125,33 @@ jobs:
     env:
       LANG: en_US.UTF-8
     steps:
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@v5
       with:
-        persist-credentials: false
         fetch-depth: 0
-    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
+    - uses: actions/setup-java@v5
       with:
         java-version: '21'
         distribution: temurin
         architecture: x64
-    - uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5
+        cache: gradle
-      with: {}
+    - uses: actions/checkout@v5
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
-      with:
-        persist-credentials: false
     - name: gradle build java executables
       shell: bash
       run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true -DreleaseBuild=true pkl-doc:build pkl-cli:build pkl-codegen-java:build pkl-codegen-kotlin:build
     - name: Upload executable artifacts
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: executable-java
         path: '*/build/executable/**/*'
     - name: Upload Test Result XML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-xml-java-executables-release
         path: '**/build/test-results/**/*.xml'
     - name: Upload Test Result HTML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-html-java-executables-release
         path: '**/build/reports/tests/**/*'
@@ -175,33 +164,30 @@ jobs:
     env:
       LANG: en_US.UTF-8
     steps:
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@v5
-      with:
+    - uses: actions/setup-java@v5
-        persist-credentials: false
-    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
         java-version: '21'
         distribution: temurin
         architecture: x64
-    - uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5
+        cache: gradle
-      with: {}
     - name: gradle buildNative
       shell: bash
       run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true -DreleaseBuild=true -Dpkl.targetArch=amd64 -Dpkl.native--native-compiler-path=${{ github.workspace }}/.github/scripts/cc_macos_amd64.sh pkl-cli:buildNative
     - name: Upload executable artifacts
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: executable-pkl-cli-macOS-amd64
         path: pkl-cli*/build/executable/**/*
     - name: Upload Test Result XML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-xml-pkl-cli-macOS-amd64-release
         path: '**/build/test-results/**/*.xml'
     - name: Upload Test Result HTML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-html-pkl-cli-macOS-amd64-release
         path: '**/build/reports/tests/**/*'
@@ -213,35 +199,32 @@ jobs:
     steps:
     - name: Install deps
       run: dnf install -y git binutils gcc glibc-devel zlib-devel libstdc++-static glibc-langpack-en
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@v5
-      with:
+    - uses: actions/setup-java@v5
-        persist-credentials: false
-    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
         java-version: '21'
         distribution: temurin
         architecture: x64
-    - uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5
+        cache: gradle
-      with: {}
     - name: Fix git ownership
       run: git status || git config --system --add safe.directory $GITHUB_WORKSPACE
     - name: gradle buildNative
       shell: bash
       run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true -DreleaseBuild=true pkl-cli:buildNative
     - name: Upload executable artifacts
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: executable-pkl-cli-linux-amd64
         path: pkl-cli*/build/executable/**/*
     - name: Upload Test Result XML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-xml-pkl-cli-linux-amd64-release
         path: '**/build/test-results/**/*.xml'
     - name: Upload Test Result HTML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-html-pkl-cli-linux-amd64-release
         path: '**/build/reports/tests/**/*'
@@ -256,33 +239,30 @@ jobs:
     env:
       LANG: en_US.UTF-8
     steps:
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@v5
-      with:
+    - uses: actions/setup-java@v5
-        persist-credentials: false
-    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
         java-version: '21'
         distribution: temurin
         architecture: aarch64
-    - uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5
+        cache: gradle
-      with: {}
     - name: gradle buildNative
       shell: bash
       run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true -DreleaseBuild=true pkl-cli:buildNative
     - name: Upload executable artifacts
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: executable-pkl-cli-macOS-aarch64
         path: pkl-cli*/build/executable/**/*
     - name: Upload Test Result XML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-xml-pkl-cli-macOS-aarch64-release
         path: '**/build/test-results/**/*.xml'
     - name: Upload Test Result HTML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-html-pkl-cli-macOS-aarch64-release
         path: '**/build/reports/tests/**/*'
@@ -294,35 +274,32 @@ jobs:
     steps:
     - name: Install deps
       run: dnf install -y git binutils gcc glibc-devel zlib-devel libstdc++-static glibc-langpack-en
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@v5
-      with:
+    - uses: actions/setup-java@v5
-        persist-credentials: false
-    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
         java-version: '21'
         distribution: temurin
         architecture: aarch64
-    - uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5
+        cache: gradle
-      with: {}
     - name: Fix git ownership
       run: git status || git config --system --add safe.directory $GITHUB_WORKSPACE
     - name: gradle buildNative
       shell: bash
       run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true -DreleaseBuild=true pkl-cli:buildNative
     - name: Upload executable artifacts
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: executable-pkl-cli-linux-aarch64
         path: pkl-cli*/build/executable/**/*
     - name: Upload Test Result XML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-xml-pkl-cli-linux-aarch64-release
         path: '**/build/test-results/**/*.xml'
     - name: Upload Test Result HTML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-html-pkl-cli-linux-aarch64-release
         path: '**/build/reports/tests/**/*'
@@ -334,16 +311,13 @@ jobs:
     env:
       LANG: en_US.UTF-8
     steps:
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@v5
-      with:
+    - uses: actions/setup-java@v5
-        persist-credentials: false
-    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
         java-version: '21'
         distribution: temurin
         architecture: x64
-    - uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5
+        cache: gradle
-      with: {}
     - name: Install musl and zlib
       run: |
         set -e
@@ -421,19 +395,19 @@ jobs:
       shell: bash
       run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true -DreleaseBuild=true -Dpkl.musl=true pkl-cli:buildNative
     - name: Upload executable artifacts
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: executable-pkl-cli-alpine-linux-amd64
         path: pkl-cli*/build/executable/**/*
     - name: Upload Test Result XML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-xml-pkl-cli-alpine-linux-amd64-release
         path: '**/build/test-results/**/*.xml'
     - name: Upload Test Result HTML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-html-pkl-cli-alpine-linux-amd64-release
         path: '**/build/reports/tests/**/*'
@@ -444,33 +418,30 @@ jobs:
       LANG: en_US.UTF-8
       JAVA_HOME: /jdk
     steps:
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@v5
-      with:
+    - uses: actions/setup-java@v5
-        persist-credentials: false
-    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
         java-version: '21'
         distribution: temurin
         architecture: x64
-    - uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5
+        cache: gradle
-      with: {}
     - name: gradle buildNative
       shell: bash
       run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true -DreleaseBuild=true pkl-cli:buildNative
     - name: Upload executable artifacts
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: executable-pkl-cli-windows-amd64
         path: pkl-cli*/build/executable/**/*
     - name: Upload Test Result XML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-xml-pkl-cli-windows-amd64-release
         path: '**/build/test-results/**/*.xml'
     - name: Upload Test Result HTML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-html-pkl-cli-windows-amd64-release
         path: '**/build/reports/tests/**/*'
@@ -483,33 +454,30 @@ jobs:
     env:
       LANG: en_US.UTF-8
     steps:
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@v5
-      with:
+    - uses: actions/setup-java@v5
-        persist-credentials: false
-    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
         java-version: '21'
         distribution: temurin
         architecture: x64
-    - uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5
+        cache: gradle
-      with: {}
     - name: gradle buildNative
       shell: bash
       run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true -DreleaseBuild=true -Dpkl.targetArch=amd64 -Dpkl.native--native-compiler-path=${{ github.workspace }}/.github/scripts/cc_macos_amd64.sh pkl-doc:buildNative
     - name: Upload executable artifacts
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: executable-pkl-doc-macOS-amd64
         path: pkl-doc*/build/executable/**/*
     - name: Upload Test Result XML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-xml-pkl-doc-macOS-amd64-release
         path: '**/build/test-results/**/*.xml'
     - name: Upload Test Result HTML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-html-pkl-doc-macOS-amd64-release
         path: '**/build/reports/tests/**/*'
@@ -521,35 +489,32 @@ jobs:
     steps:
     - name: Install deps
       run: dnf install -y git binutils gcc glibc-devel zlib-devel libstdc++-static glibc-langpack-en
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@v5
-      with:
+    - uses: actions/setup-java@v5
-        persist-credentials: false
-    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
         java-version: '21'
         distribution: temurin
         architecture: x64
-    - uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5
+        cache: gradle
-      with: {}
     - name: Fix git ownership
       run: git status || git config --system --add safe.directory $GITHUB_WORKSPACE
     - name: gradle buildNative
       shell: bash
       run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true -DreleaseBuild=true pkl-doc:buildNative
     - name: Upload executable artifacts
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: executable-pkl-doc-linux-amd64
         path: pkl-doc*/build/executable/**/*
     - name: Upload Test Result XML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-xml-pkl-doc-linux-amd64-release
         path: '**/build/test-results/**/*.xml'
     - name: Upload Test Result HTML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-html-pkl-doc-linux-amd64-release
         path: '**/build/reports/tests/**/*'
@@ -564,33 +529,30 @@ jobs:
     env:
       LANG: en_US.UTF-8
     steps:
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@v5
-      with:
+    - uses: actions/setup-java@v5
-        persist-credentials: false
-    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
         java-version: '21'
         distribution: temurin
         architecture: aarch64
-    - uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5
+        cache: gradle
-      with: {}
     - name: gradle buildNative
       shell: bash
       run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true -DreleaseBuild=true pkl-doc:buildNative
     - name: Upload executable artifacts
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: executable-pkl-doc-macOS-aarch64
         path: pkl-doc*/build/executable/**/*
     - name: Upload Test Result XML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-xml-pkl-doc-macOS-aarch64-release
         path: '**/build/test-results/**/*.xml'
     - name: Upload Test Result HTML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-html-pkl-doc-macOS-aarch64-release
         path: '**/build/reports/tests/**/*'
@@ -602,35 +564,32 @@ jobs:
     steps:
     - name: Install deps
       run: dnf install -y git binutils gcc glibc-devel zlib-devel libstdc++-static glibc-langpack-en
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@v5
-      with:
+    - uses: actions/setup-java@v5
-        persist-credentials: false
-    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
         java-version: '21'
         distribution: temurin
         architecture: aarch64
-    - uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5
+        cache: gradle
-      with: {}
     - name: Fix git ownership
       run: git status || git config --system --add safe.directory $GITHUB_WORKSPACE
     - name: gradle buildNative
       shell: bash
       run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true -DreleaseBuild=true pkl-doc:buildNative
     - name: Upload executable artifacts
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: executable-pkl-doc-linux-aarch64
         path: pkl-doc*/build/executable/**/*
     - name: Upload Test Result XML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-xml-pkl-doc-linux-aarch64-release
         path: '**/build/test-results/**/*.xml'
     - name: Upload Test Result HTML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-html-pkl-doc-linux-aarch64-release
         path: '**/build/reports/tests/**/*'
@@ -642,16 +601,13 @@ jobs:
     env:
       LANG: en_US.UTF-8
     steps:
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@v5
-      with:
+    - uses: actions/setup-java@v5
-        persist-credentials: false
-    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
         java-version: '21'
         distribution: temurin
         architecture: x64
-    - uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5
+        cache: gradle
-      with: {}
     - name: Install musl and zlib
       run: |
         set -e
@@ -729,19 +685,19 @@ jobs:
       shell: bash
       run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true -DreleaseBuild=true -Dpkl.musl=true pkl-doc:buildNative
     - name: Upload executable artifacts
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: executable-pkl-doc-alpine-linux-amd64
         path: pkl-doc*/build/executable/**/*
     - name: Upload Test Result XML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-xml-pkl-doc-alpine-linux-amd64-release
         path: '**/build/test-results/**/*.xml'
     - name: Upload Test Result HTML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-html-pkl-doc-alpine-linux-amd64-release
         path: '**/build/reports/tests/**/*'
@@ -752,33 +708,30 @@ jobs:
       LANG: en_US.UTF-8
       JAVA_HOME: /jdk
     steps:
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@v5
-      with:
+    - uses: actions/setup-java@v5
-        persist-credentials: false
-    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
         java-version: '21'
         distribution: temurin
         architecture: x64
-    - uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5
+        cache: gradle
-      with: {}
     - name: gradle buildNative
       shell: bash
       run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true -DreleaseBuild=true pkl-doc:buildNative
     - name: Upload executable artifacts
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: executable-pkl-doc-windows-amd64
         path: pkl-doc*/build/executable/**/*
     - name: Upload Test Result XML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-xml-pkl-doc-windows-amd64-release
         path: '**/build/test-results/**/*.xml'
     - name: Upload Test Result HTML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-html-pkl-doc-windows-amd64-release
         path: '**/build/reports/tests/**/*'
@@ -807,20 +760,15 @@ jobs:
       LANG: en_US.UTF-8
     environment: maven-release
     steps:
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@v5
-      with:
+    - uses: actions/setup-java@v5
-        persist-credentials: false
-    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
         java-version: '21'
         distribution: temurin
         architecture: x64
-    - uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5
+        cache: gradle
-      with: {}
+    - uses: actions/checkout@v5
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/download-artifact@v6
-      with:
-        persist-credentials: false
-    - uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6
       with:
         pattern: executable-**
         merge-multiple: true
@@ -837,7 +785,7 @@ jobs:
       contents: write
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6
+    - uses: actions/download-artifact@v6
       with:
         pattern: executable-**
         merge-multiple: true
@@ -858,7 +806,7 @@ jobs:
           --notes "Release notes: https://pkl-lang.org/main/current/release-notes/changelog.html#release-${TAG_NAME}" \
           */build/executable/*
   publish-test-results:
-    if: '!cancelled()'
+    if: '!failure() && !cancelled()'
     needs:
     - gradle-check
     - gradle-check-windows
@@ -880,18 +828,18 @@ jobs:
       checks: write
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6
+    - uses: actions/download-artifact@v6
       with:
         pattern: test-results-xml-*
     - name: Publish test results
       if: '!cancelled()'
-      uses: EnricoMi/publish-unit-test-result-action@c950f6fb443cb5af20a377fd0dfaa78838901040 # v2
+      uses: EnricoMi/publish-unit-test-result-action@v2
       with:
         comment_mode: 'off'
         files: test-results-xml-*/**/*.xml
     - name: Upload Test Result HTML
       if: '!cancelled()'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      uses: actions/upload-artifact@v5
       with:
         name: test-results-html-publish-test-results
         path: '**/build/reports/tests/**/*'
@@ -923,7 +871,7 @@ jobs:
     steps:
     - name: Create app token
       id: app-token
-      uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2
+      uses: actions/create-github-app-token@v2
       with:
         app-id: ${{ secrets.PKL_CI_CLIENT_ID }}
         private-key: ${{ secrets.PKL_CI }}

.github/workflows/test_report.yml

@@ -1,4 +1,6 @@
-# Generated from Workflow.pkl. DO NOT EDIT.
+# Do not modify!
+# This file was generated from a template using https://github.com/StefMa/pkl-gha
+
 name: PR Test Reports
 'on':
   workflow_run:
@@ -18,14 +20,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Download artifacts
-      uses: dawidd6/action-download-artifact@ac66b43f0e6a346234dd65d4d0c8fbb31cb316e5 # v11
+      uses: dawidd6/action-download-artifact@v11
       with:
         path: artifacts
         name: test-results-.*
-        name_is_regexp: true
+        name_is_regex: true
         run_id: ${{ github.event.workflow_run.id }}
     - name: Publish test results
-      uses: EnricoMi/publish-unit-test-result-action@c950f6fb443cb5af20a377fd0dfaa78838901040 # v2
+      uses: EnricoMi/publish-unit-test-result-action@v2
       with:
         commit: ${{ github.event.workflow_run.head_sha }}
         comment_mode: 'off'

README.adoc

@@ -63,9 +63,6 @@ image:https://github.com/apple/pkl/actions/workflows/main.yml/badge.svg?style=sv
 |https://github.com/apple/pkl-go-examples[`apple/pkl-go-examples`]
 |Examples for using Pkl within Go applications
 
-|https://github.com/apple/highlightjs-pkl[`apple/highlightjs-pkl`]
-|Highlight.js syntax highlighting for Pkl
-
 |https://github.com/apple/pkl-intellij[`apple/pkl-intellij`]
 |JetBrains editor plugins providing Pkl language support
 
@@ -96,9 +93,6 @@ image:https://github.com/apple/pkl/actions/workflows/main.yml/badge.svg?style=sv
 |https://github.com/apple/pkl-project-commons[`apple/pkl-project-commons`]
 |Utility libraries for Pkl
 
-|https://github.com/apple/pkl-readers[`apple/pkl-readers`]
-|Shared Pkl https://pkl-lang.org/main/current/language-reference/index.html#external-readers[external reader] tools
-
 |https://github.com/apple/pkl-spring[`apple/pkl-spring`]
 |Spring Boot extension for configuring Boot apps with Pkl
 
@@ -114,9 +108,9 @@ image:https://github.com/apple/pkl/actions/workflows/main.yml/badge.svg?style=sv
 |https://github.com/apple/pkl.tmbundle[`apple/pkl.tmbundle`]
 |TextMate bundle for Pkl
 
-|https://github.com/apple/tree-sitter-pkl[`apple/tree-sitter-pkl`]
-|Tree-sitter parser for Pkl
-
 |https://github.com/apple/rules_pkl[`apple/rules_pkl`]
 | Bazel build rules for Pkl
+
+|https://github.com/apple/tree-sitter-pkl[`apple/tree-sitter-pkl`]
+|Tree-sitter parser for Pkl
 |===

build.gradle.kts

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 // https://youtrack.jetbrains.com/issue/KTIJ-19369
+@file:Suppress("DSL_SCOPE_VIOLATION")
+
 import org.jetbrains.gradle.ext.ActionDelegationConfig
 import org.jetbrains.gradle.ext.ActionDelegationConfig.TestRunner.PLATFORM
 import org.jetbrains.gradle.ext.ProjectSettings

buildSrc/src/main/kotlin/PklFormatterSpotless.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2025-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2025 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -47,11 +47,20 @@ class PklFormatterFunc(@Transient private val configuration: Configuration) :
 
   private val formatterClass by lazy { classLoader.loadClass("org.pkl.formatter.Formatter") }
 
-  private val formatMethod by lazy { formatterClass.getMethod("format", String::class.java) }
+  private val grammarVersionClass by lazy {
+    classLoader.loadClass("org.pkl.formatter.GrammarVersion")
+  }
+
+  private val grammarVersionLatestMethod by lazy { grammarVersionClass.getMethod("latest") }
+
+  private val formatMethod by lazy {
+    formatterClass.getMethod("format", String::class.java, grammarVersionClass)
+  }
 
   private val formatterInstance by lazy { formatterClass.getConstructor().newInstance() }
 
   override fun apply(input: String): String {
-    return formatMethod(formatterInstance, input) as String
+    val latestGrammarVersion = grammarVersionLatestMethod(null)
+    return formatMethod(formatterInstance, input, latestGrammarVersion) as String
   }
 }

buildSrc/src/main/kotlin/PklPublishing.kt

@@ -1,147 +0,0 @@
-/*
- * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import java.nio.charset.StandardCharsets
-import java.util.Base64
-import org.gradle.api.Project
-import org.gradle.api.publish.PublishingExtension
-import org.gradle.api.publish.maven.MavenPublication
-import org.gradle.api.publish.maven.tasks.AbstractPublishToMaven
-import org.gradle.api.publish.maven.tasks.GenerateMavenPom
-import org.gradle.kotlin.dsl.*
-import org.gradle.plugins.signing.SigningExtension
-
-/** Configures common POM metadata (licenses, developers, SCM, etc.) for all Pkl publications. */
-fun Project.configurePklPomMetadata() {
-  extensions.configure<PublishingExtension> {
-    publications.withType<MavenPublication>().configureEach {
-      pom {
-        name.set(artifactId)
-        licenses {
-          license {
-            name.set("The Apache Software License, Version 2.0")
-            url.set("https://github.com/apple/pkl/blob/main/LICENSE.txt")
-          }
-        }
-        developers {
-          developer {
-            id.set("pkl-authors")
-            name.set("The Pkl Authors")
-            email.set("pkl-oss@group.apple.com")
-          }
-        }
-        scm {
-          connection.set("scm:git:git://github.com/apple/pkl.git")
-          developerConnection.set("scm:git:ssh://github.com/apple/pkl.git")
-          val buildInfo = extensions.getByType<BuildInfo>()
-          url.set("https://github.com/apple/pkl/tree/${buildInfo.commitish}")
-        }
-        issueManagement {
-          system.set("GitHub Issues")
-          url.set("https://github.com/apple/pkl/issues")
-        }
-        ciManagement {
-          system.set("GitHub Actions")
-          url.set("https://github.com/apple/pkl/actions")
-        }
-      }
-    }
-  }
-}
-
-/** Configures POM validation task to check for unresolved versions and snapshots in releases. */
-fun Project.configurePomValidation() {
-  val validatePom by
-    tasks.registering {
-      if (tasks.findByName("generatePomFileForLibraryPublication") == null) {
-        return@registering
-      }
-      val generatePomFileForLibraryPublication by tasks.existing(GenerateMavenPom::class)
-      val outputFile =
-        layout.buildDirectory.file("validatePom") // dummy output to satisfy up-to-date check
-
-      dependsOn(generatePomFileForLibraryPublication)
-      inputs.file(generatePomFileForLibraryPublication.get().destination)
-      outputs.file(outputFile)
-
-      doLast {
-        outputFile.get().asFile.delete()
-
-        val pomFile = generatePomFileForLibraryPublication.get().destination
-        assert(pomFile.exists())
-
-        val text = pomFile.readText()
-
-        run {
-          val unresolvedVersion = Regex("<version>.*[+,()\\[\\]].*</version>")
-          val matches = unresolvedVersion.findAll(text).toList()
-          if (matches.isNotEmpty()) {
-            throw org.gradle.api.GradleException(
-              """
-        Found unresolved version selector(s) in generated POM:
-        ${matches.joinToString("\n") { it.groupValues[0] }}
-      """
-                .trimIndent()
-            )
-          }
-        }
-
-        val buildInfo = project.extensions.getByType<BuildInfo>()
-        if (buildInfo.isReleaseBuild) {
-          val snapshotVersion = Regex("<version>.*-SNAPSHOT</version>")
-          val matches = snapshotVersion.findAll(text).toList()
-          if (matches.isNotEmpty()) {
-            throw org.gradle.api.GradleException(
-              """
-        Found snapshot version(s) in generated POM of Pkl release version:
-        ${matches.joinToString("\n") { it.groupValues[0] }}
-      """
-                .trimIndent()
-            )
-          }
-        }
-
-        outputFile.get().asFile.writeText("OK")
-      }
-    }
-
-  tasks.named("publish") { dependsOn(validatePom) }
-}
-
-/** Configures signing for Pkl publications. */
-fun Project.configurePklSigning() {
-  // Workaround for maven publish plugin not setting up dependencies correctly.
-  // Taken from https://github.com/gradle/gradle/issues/26091#issuecomment-1798137734
-  val dependsOnTasks = mutableListOf<String>()
-
-  tasks.withType<AbstractPublishToMaven>().configureEach {
-    dependsOnTasks.add(name.replace("publish", "sign").replaceAfter("Publication", ""))
-    dependsOn(dependsOnTasks)
-  }
-
-  extensions.configure<SigningExtension> {
-    // provided as env vars `ORG_GRADLE_PROJECT_signingKey` and
-    // `ORG_GRADLE_PROJECT_signingPassword` in CI.
-    val signingKey =
-      (findProperty("signingKey") as String?)?.let {
-        Base64.getDecoder().decode(it).toString(StandardCharsets.US_ASCII)
-      }
-    val signingPassword = findProperty("signingPassword") as String?
-    if (signingKey != null && signingPassword != null) {
-      useInMemoryPgpKeys(signingKey, signingPassword)
-    }
-    extensions.getByType<PublishingExtension>().publications.findByName("library")?.let { sign(it) }
-  }
-}

buildSrc/src/main/kotlin/pklAllProjects.gradle.kts

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -142,17 +142,9 @@ private fun KotlinGradleExtension.configureFormatter() {
 }
 
 val originalRemoteName = System.getenv("PKL_ORIGINAL_REMOTE_NAME") ?: "origin"
-// if we're running against a release branch (or a PR targeted at one), use that branch for
-// ratcheting
-// these env vars are set by GitHub actions:
-// https://docs.github.com/en/actions/reference/workflows-and-actions/variables#default-environment-variables
-val ratchetBranchName =
-  (System.getenv("GITHUB_BASE_REF") ?: System.getenv("GITHUB_REF_NAME"))?.let {
-    if (it.startsWith("release/")) it else null
-  } ?: "main"
 
 spotless {
-  ratchetFrom = "$originalRemoteName/$ratchetBranchName"
+  ratchetFrom = "$originalRemoteName/main"
 
   // When building root project, format buildSrc files too.
   // We need this because buildSrc is not a subproject of the root project, so a top-level

buildSrc/src/main/kotlin/pklNativeLifecycle.gradle.kts

@@ -69,12 +69,13 @@ val assembleNative by
       buildInfo.os.isWindows && buildInfo.targetArch == "amd64" -> {
         wraps(assembleNativeWindowsAmd64)
       }
-      else -> {
+      buildInfo.musl -> {
-        doLast {
+        throw GradleException("Building musl on ${buildInfo.os} is not supported")
-          throw GradleException(
-            "Cannot build targeting ${buildInfo.os.name}/${buildInfo.targetArch} with musl=${buildInfo.musl}"
-          )
       }
+      else -> {
+        throw GradleException(
+          "Unsupported os/arch pair: ${buildInfo.os.name}/${buildInfo.targetArch}"
+        )
       }
     }
   }
@@ -82,7 +83,6 @@ val assembleNative by
 val testNative by
   tasks.registering {
     group = "verification"
-    dependsOn(assembleNative)
 
     if (!buildInfo.isCrossArchSupported && buildInfo.isCrossArch) {
       throw GradleException("Cross-arch builds are not supported on ${buildInfo.os.name}")
@@ -105,12 +105,13 @@ val testNative by
       buildInfo.os.isWindows && buildInfo.targetArch == "amd64" -> {
         dependsOn(testNativeWindowsAmd64)
       }
-      else -> {
+      buildInfo.musl -> {
-        doLast {
+        throw GradleException("Building musl on ${buildInfo.os} is not supported")
-          throw GradleException(
-            "Cannot build targeting ${buildInfo.os.name}/${buildInfo.targetArch} with musl=${buildInfo.musl}"
-          )
       }
+      else -> {
+        throw GradleException(
+          "Unsupported os/arch pair: ${buildInfo.os.name}/${buildInfo.targetArch}"
+        )
       }
     }
   }
@@ -124,5 +125,5 @@ val checkNative by
 val buildNative by
   tasks.registering {
     group = "build"
-    dependsOn(checkNative)
+    dependsOn(assembleNative, checkNative)
   }

buildSrc/src/main/kotlin/pklPublishLibrary.gradle.kts

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import java.nio.charset.StandardCharsets
+import java.util.Base64
+import org.gradle.api.publish.maven.tasks.GenerateMavenPom
+
 plugins {
   `maven-publish`
   signing
@@ -23,14 +27,119 @@ publishing {
     components.findByName("java")?.let { javaComponent ->
       create<MavenPublication>("library") { from(javaComponent) }
     }
+    withType<MavenPublication>().configureEach {
+      pom {
+        name.set(artifactId)
+        licenses {
+          license {
+            name.set("The Apache Software License, Version 2.0")
+            url.set("https://github.com/apple/pkl/blob/main/LICENSE.txt")
+          }
+        }
+        developers {
+          developer {
+            id.set("pkl-authors")
+            name.set("The Pkl Authors")
+            email.set("pkl-oss@group.apple.com")
+          }
+        }
+        scm {
+          connection.set("scm:git:git://github.com/apple/pkl.git")
+          developerConnection.set("scm:git:ssh://github.com/apple/pkl.git")
+          val buildInfo = project.extensions.getByType<BuildInfo>()
+          url.set("https://github.com/apple/pkl/tree/${buildInfo.commitish}")
+        }
+        issueManagement {
+          system.set("GitHub Issues")
+          url.set("https://github.com/apple/pkl/issues")
+        }
+        ciManagement {
+          system.set("GitHub Actions")
+          url.set("https://github.com/apple/pkl/actions")
+        }
+      }
+    }
   }
 }
 
-configurePklPomMetadata()
+val validatePom by
+  tasks.registering {
+    if (tasks.findByName("generatePomFileForLibraryPublication") == null) {
+      return@registering
+    }
+    val generatePomFileForLibraryPublication by tasks.existing(GenerateMavenPom::class)
+    val outputFile =
+      layout.buildDirectory.file("validatePom") // dummy output to satisfy up-to-date check
 
-configurePomValidation()
+    dependsOn(generatePomFileForLibraryPublication)
+    inputs.file(generatePomFileForLibraryPublication.get().destination)
+    outputs.file(outputFile)
 
-configurePklSigning()
+    doLast {
+      outputFile.get().asFile.delete()
+
+      val pomFile = generatePomFileForLibraryPublication.get().destination
+      assert(pomFile.exists())
+
+      val text = pomFile.readText()
+
+      run {
+        val unresolvedVersion = Regex("<version>.*[+,()\\[\\]].*</version>")
+        val matches = unresolvedVersion.findAll(text).toList()
+        if (matches.isNotEmpty()) {
+          throw GradleException(
+            """
+        Found unresolved version selector(s) in generated POM:
+        ${matches.joinToString("\n") { it.groupValues[0] }}
+      """
+              .trimIndent()
+          )
+        }
+      }
+
+      val buildInfo = project.extensions.getByType<BuildInfo>()
+      if (buildInfo.isReleaseBuild) {
+        val snapshotVersion = Regex("<version>.*-SNAPSHOT</version>")
+        val matches = snapshotVersion.findAll(text).toList()
+        if (matches.isNotEmpty()) {
+          throw GradleException(
+            """
+        Found snapshot version(s) in generated POM of Pkl release version:
+        ${matches.joinToString("\n") { it.groupValues[0] }}
+      """
+              .trimIndent()
+          )
+        }
+      }
+
+      outputFile.get().asFile.writeText("OK")
+    }
+  }
+
+tasks.publish { dependsOn(validatePom) }
+
+// Workaround for maven publish plugin not setting up dependencies correctly.
+// Taken from https://github.com/gradle/gradle/issues/26091#issuecomment-1798137734
+val dependsOnTasks = mutableListOf<String>()
+
+tasks.withType<AbstractPublishToMaven>().configureEach {
+  dependsOnTasks.add(name.replace("publish", "sign").replaceAfter("Publication", ""))
+  dependsOn(dependsOnTasks)
+}
+
+signing {
+  // provided as env vars `ORG_GRADLE_PROJECT_signingKey` and `ORG_GRADLE_PROJECT_signingPassword`
+  // in CI.
+  val signingKey =
+    (findProperty("signingKey") as String?)?.let {
+      Base64.getDecoder().decode(it).toString(StandardCharsets.US_ASCII)
+    }
+  val signingPassword = findProperty("signingPassword") as String?
+  if (signingKey != null && signingPassword != null) {
+    useInMemoryPgpKeys(signingKey, signingPassword)
+  }
+  publishing.publications.findByName("library")?.let { sign(it) }
+}
 
 artifacts {
   project.tasks.findByName("javadocJar")?.let { archives(it) }

docs/antora.yml

@@ -1,6 +1,6 @@
 name: main
 title: Main Project
-version: 0.31.0
+version: 0.30.2
 prerelease: false
 nav:
 - nav.adoc

docs/modules/ROOT/partials/component-attributes.adoc

@@ -3,7 +3,7 @@
 // the following attributes must be updated immediately before a release
 
 // pkl version corresponding to current git commit without -dev suffix or git hash
-:pkl-version-no-suffix: 0.31.0
+:pkl-version-no-suffix: 0.30.2
 // tells whether pkl version corresponding to current git commit
 // is a release version (:is-release-version: '') or dev version (:!is-release-version:)
 :is-release-version: ''
@@ -68,7 +68,6 @@ endif::[]
 :uri-pkldoc-example: {uri-pkl-examples-tree}/pkldoc
 
 :uri-stdlib-baseModule: {uri-pkl-stdlib-docs}/base
-:uri-stdlib-CommandModule: {uri-pkl-stdlib-docs}/Command
 :uri-stdlib-analyzeModule: {uri-pkl-stdlib-docs}/analyze
 :uri-stdlib-jsonnetModule: {uri-pkl-stdlib-docs}/jsonnet
 :uri-stdlib-reflectModule: {uri-pkl-stdlib-docs}/reflect
@@ -151,13 +150,6 @@ endif::[]
 :uri-stdlib-Resource: {uri-stdlib-baseModule}/Resource
 :uri-stdlib-outputFiles: {uri-stdlib-baseModule}/ModuleOutput#files
 :uri-stdlib-FileOutput: {uri-stdlib-baseModule}/FileOutput
-:uri-stdlib-Annotation: {uri-stdlib-baseModule}/Annotation
-:uri-stdlib-ConvertProperty: {uri-stdlib-baseModule}/ConvertProperty
-:uri-stdlib-Command-Flag: {uri-stdlib-CommandModule}/Flag
-:uri-stdlib-Command-BooleanFlag: {uri-stdlib-CommandModule}/BooleanFlag
-:uri-stdlib-Command-CountedFlag: {uri-stdlib-CommandModule}/CountedFlag
-:uri-stdlib-Command-Argument: {uri-stdlib-CommandModule}/Argument
-:uri-stdlib-Command-Import: {uri-stdlib-CommandModule}/Import
 
 :uri-messagepack: https://msgpack.org/index.html
 :uri-messagepack-spec: https://github.com/msgpack/msgpack/blob/master/spec.md

docs/modules/java-binding/examples/JavaConfigExample.java

@@ -4,7 +4,7 @@ import org.pkl.config.java.JavaType;
 import org.pkl.core.ModuleSource;
 import org.junit.jupiter.api.Test;
 
-@SuppressWarnings({"unused", "NewClassNamingConvention"})
+@SuppressWarnings("unused")
 // the pkl-jvm-examples repo has a similar example
 public class JavaConfigExample {
   @Test

docs/modules/language-reference/pages/index.adoc

@@ -2736,10 +2736,6 @@ output {
 
 For more on path-based converters, see {uri-stdlib-PcfRenderer-converters}[PcfRenderer.converters].
 
-Special <<annotations,Annotations>> may also be used to influence how class properties are rendered.
-The `ConvertProperty` annotation (and subclasses of it) are automatically applied during.
-For more on annotation-based converters, see link:{uri-stdlib-ConvertProperty}[ConvertProperty].
-
 Sometimes it is useful to directly compute the final module output, bypassing `output.value` and `output.converters`.
 To do so, set the link:{uri-stdlib-baseModule}/ModuleOutput#text[output.text] property to a String value:
 
@@ -3207,7 +3203,6 @@ This section discusses language features that are generally more relevant to tem
 <<module-keyword,`module` Keyword>> +
 <<glob-patterns,Glob Patterns>> +
 <<doc-comments,Doc Comments>> +
-<<annotations,Annotations>> +
 <<name-resolution,Name Resolution>> +
 <<reserved-keywords,Reserved Keywords>> +
 <<blank-identifiers,Blank Identifiers>> +
@@ -3961,7 +3956,6 @@ emailList: List<EmailAddress> // <2>
 <1> equivalent to `email: String(contains("@"))` for type checking purposes
 <2> equivalent to `emailList: List<String(contains("@"))>` for type checking purposes
 
-[[nullable-types]]
 ==== Nullable Types
 
 Class types such as `Bird` (see above) do not admit `null` values.
@@ -5338,7 +5332,7 @@ Module-level members can be prefixed with `module.` to resolve name conflicts:
 /// See [module.pigeon].
 ----
 
-To exclude a member from documentation and code completion, <<annotations,annotate>> it with `@Unlisted`:
+To exclude a member from documentation and code completion, annotate it with `@Unlisted`:
 
 [source%parsed,{pkl}]
 ----
@@ -5355,47 +5349,6 @@ The following member links are marked up as code but not rendered as links:footn
 
 Nevertheless, it is a good practice to use member links in the above cases.
 
-[[annotations]]
-=== Annotations
-
-Annotations are a mechanism to provides extra metadata about Pkl <<modules,modules>>, <<classes,classes>>, <<methods,methods>>, and <<properties,properties>>.
-They provide metadata about the type or member they annotate that can be via link:{uri-stdlib-reflectModule}[reflection] or Pkl's Java APIs.
-The most common use cases for annotations are to add metadata to influence behavior of xref:pkl-doc:index.adoc[Pkldoc], code generation tools, or <<module-output,module output>>.
-
-Annotations are regular Pkl objects whose class extends link:{uri-stdlib-Annotation}[`Annotation`].
-Annotation instances are defined similarly to regular <<classes, class instances>>, but instead of using the `new` keyword the class name is prefixed with `@`.
-The object body may be omitted if an annotation's class has no properties or the declared annotation does not override any of the class's default values
-Multiple annotations may be defined on a member.
-If the annotated member has a <<doc-comments,doc comment>>, the annotation is defined between the comment and the member.
-
-[source%tested,{pkl}]
-----
-/// Module doc comment
-@SomeAnnotation // <1>
-module myModule
-
-class SomeAnnotation extends Annotation { // <2>
-  description: String = "some annotation"
-}
-
-/// Module doc comment
-@SomeAnnotation // <3>
-class Bird {
-  @SomeAnnotation { description = "some property" } // <4>
-  name: String
-
-  @SomeAnnotation { description = "some method" } // <5>
-  @Unlisted // <6>
-  function greet(greeting: String): String = "\(greeting), \(name)!"
-}
-----
-<1> An annotation applied to a module. The annotation(s) must precede the `module` clause and follow the doc comment. The object body is omitted.
-<2> The definition of an annotation class.
-<3> An annotation appied to a class. The object body is omitted.
-<4> An annotation applied to a property. The object body is included because the `description` property is overridden.
-<5> An annotation applied to a method. The object body is included because the `description` property is overridden.
-<6> A second annotation applied to the same method.
-
 [[name-resolution]]
 === Name Resolution
 

docs/modules/pkl-cli/pages/index.adoc

@@ -454,16 +454,6 @@ output {
 ----
 ====
 
-[[power-assertions-eval]]
-.--power-assertions, --no-power-assertions
-[%collapsible]
-====
-Default: enabled +
-Enable or disable power assertions for detailed assertion failure messages.
-When enabled, type constraint failures will show intermediate values in the assertion expression.
-Use `--no-power-assertions` to disable this feature if you prefer simpler output or better performance.
-====
-
 This command also takes <<common-options, common options>>.
 
 [[command-server]]
@@ -489,9 +479,7 @@ If these are the only failures, the command exits with exit code 10.
 Otherwise, failures result in exit code 1.
 
 <modules>::
-The absolute or relative URIs of the modules to test.
+The absolute or relative URIs of the modules to test. Relative URIs are resolved against the working directory.
-The module must extend `pkl:test`.
-Relative URIs are resolved against the working directory.
 
 ==== Options
 
@@ -536,33 +524,6 @@ Force generation of expected examples. +
 The old expected files will be deleted if present.
 ====
 
-[[power-assertions-test]]
-.--power-assertions, --no-power-assertions
-[%collapsible]
-====
-Default: enabled +
-Enable or disable power assertions for detailed assertion failure messages.
-When enabled, test failures will show intermediate values in the assertion expression, making it easier to understand why a test failed.
-Use `--no-power-assertions` to disable this feature if you prefer simpler output.
-====
-
-This command also takes <<common-options, common options>>.
-
-[[command-run]]
-=== `pkl run`
-
-*Synopsis:* `pkl run [<options>] [<module>] [<command options>]`
-
-Evaluate a <<cli-tools,CLI command>> defined by `<module>`.
-
-<module>::
-The absolute or relative URIs of the command module to run.
-The module must extend `pkl:Command`.
-Relative URIs are resolved against the working directory.
-
-<command options>::
-Additional CLI options and arguments defined by `<module>`.
-
 This command also takes <<common-options, common options>>.
 
 [[command-repl]]
@@ -780,9 +741,9 @@ pkl shell-completion zsh
 This command formats or checks formatting of Pkl files. +
 Exit codes:
 
-* 0: No violations found or files were updated.
+* 0: No violations found.
 * 1: An unexpected error happened (ex.: IO error)
-* 11: Violations were found (when running without `--write`).
+* 11: Violations were found.
 
 If the path is a directory, recursively looks for files with a `.pkl` extension, or files named `PklProject`.
 
@@ -819,7 +780,7 @@ Write the path of files with formatting violations to stdout.
 [[common-options]]
 === Common options
 
-The <<command-eval>>, <<command-test>>, <<command-run>>, <<command-repl>>, <<command-project-resolve>>, <<command-project-package>>, <<command-download-package>>, and <<command-analyze-imports>> commands support the following common options:
+The <<command-eval>>, <<command-test>>, <<command-repl>>, <<command-project-resolve>>, <<command-project-package>>, <<command-download-package>>, and <<command-analyze-imports>> commands support the following common options:
 
 include::../../pkl-cli/partials/cli-common-options.adoc[]
 
@@ -920,310 +881,6 @@ If multiple module outputs are written to the same file, or to standard output,
 By default, module outputs are separated with `---`, as in a YAML stream.
 The separator can be customized using the `--module-output-separator` option.
 
-[[cli-tools]]
-== Implementing CLI Tools
-
-CLI tools can be implemented in Pkl by modules extending the `pkl:Command` module.
-With `pkl:Command`, you can define a script in Pkl that is executed by your shell, providing a better CLI experience.
-
-Regular evaluation requires use of xref:language-reference:index.adoc#resources[resources] like properties and evironment variables to provide parameters:
-[source,bash]
-----
-$ pkl eval script.pkl -p username=me -p password=password
-----
-
-Commands provide a native, familiar CLI experience:
-[source,bash]
-----
-$ pkl run script.pkl --username=admin --password=hunter2
-$ ./script.pkl --username=admin --password=hunter2
-----
-
-Pkl commands have a few properties that distinguish them from standard module evaluation:
-
-* Users provide input to commands using familiar command line idioms, providing a better experience than deriving inputs from xref:language-reference:index.adoc#resources[resources] like external properties or environment variables.
-* Commands can dynamically import modules when they are specified as command line options.
-* Commands may write to standard output (via `output.text` or `output.bytes`) and the filesystem (via `output.files`) in the same evaluation.
-* Command file output may write to any absolute path (not only relative to the `--multiple-file-output-path` option).
-** Relative output paths are written relative to the current working directory (or `--working-dir`, if specified).
-** Paths of output file are printed to the command's standard error.
-
-IMPORTANT: Users of `pkl run` must be aware of the security implications of this behavior.
-Using `pkl eval` prevents accidental overwrites by not allowing absolute paths, but `pkl run` does not offer this protection.
-Commands may write to any path the invoking user has permissions to modify.
-
-Commands are implemented as regular modules and declare their supported command line flags and positional arguments using a class with annotated properties.
-
-=== Defining Commands
-
-Commands are defined by creating a module that extends `pkl:Command`:
-
-[source,pkl%tested]
-.my-tool.pkl
-----
-/// This doc comment becomes part of the command's CLI help!
-/// Markdown formatting is **allowed!**
-extends "pkl:Command"
-
-options: Options // <1>
-
-class Options {
-  // Define CLI flags/arguments...
-}
-
-// Regular module code...
-----
-<1> Re-declaration of the `options` property's type.
-
-Like `pkl eval`, when a command completes without an evaluation error the process exits successfully (exit code 0).
-Commands can return a failure using `throw` (exit code 1), but otherwise may not control the exit code.
-
-Other than the differences listed above, commands behave like any other Pkl module.
-For example, there is no way to execute other programs or make arbitrary HTTP requests.
-If additional functionality is desired, xref:language-reference:index.adoc#external-readers[external readers] may be used to extends Pkl's capabilities.
-
-=== Command Options
-
-Each property of a command's options class becomes a command line option.
-Properties with the `local`, `hidden`, `fixed`, and/or `const` modifiers are not parsed as options
-A property's doc comment, if present, becomes the corresponding option's CLI help description.
-Doc comments are interpreted as Markdown text and formatted nicely when displayed to users.
-Properties must have xref:language-reference:index.adoc#type-annotations[type annotations] to determine how they are parsed.
-
-Properties may be xref:language-reference:index.adoc#annotations[annotated] to influence how they behave:
-
-* Properties annotated with link:{uri-stdlib-Command-Flag}[`@Flag`] become CLI flags named `--<property name>` that accept a value.
-* `Boolean` properties annotated with link:{uri-stdlib-Command-BooleanFlag}[`@BooleanFlag`] become CLI flags named `--<property name>` and `--no-<property name>` that result in `true` and `false` values, respectively.
-* `Int` (and type aliases of `Int`) properties annotated with link:{uri-stdlib-Command-CountedFlag}[`@CountedFlag`] become CLI flags named `--<property name>` that produce a value equal to the number of times they are present on the command line.
-* Properties annotated with link:{uri-stdlib-Command-Argument}[`@Argument`] become positional CLI arguments and are parsed in the order they appear in the class.
-* Properties with no annotation are treated the same as `@Flag` with no further customization.
-
-Flag options may set a `shortName` property to define a single-character abbreviation (`-<short name>`).
-Flag abbreviations may be combined (e.g. `-a -b -v -v -q some-value` is equivalent to `-abvvq some-value`).
-
-[CAUTION]
-====
-Flag names and short names may not conflict with <<common-options,common options>>.
-Future versions of Pkl may introduce additional common options and the names of these options will become forbidden for use in `pkl:Command`.
-Thus, any Pkl release that adds common options may introduce breaking changes for commands.
-
-While unfortunate, this behavior eliminates potentially dangerous or misleading ambiguities between Pkl-defined and user-defined options.
-====
-
-A `@Flag` or `@Argument` property's type annotation determines how it is converted from the raw string value:
-
-|===
-|Type |Behavior
-
-|`String`
-|Value is used verbatim.
-
-|`Char`
-|Value is used verbatim but must be exactly one character.
-
-|`Boolean`
-|True values: `true`, `t`, `1`, `yes`, `y`, `on`
-
-False values: `false`, `f`, `0`, `no`, `n`, `off`
-
-|`Number`
-|Value is parsed as an `Int` if possible, otherwise parsed as `Float`.
-
-|`Float`
-|Value is parsed as a `Float`.
-
-|`Int`
-|Value is parsed as a `Int`.
-
-|`Int8`, `Int16`, `Int32`, `UInt`, `UInt8`, `UInt16`, `UInt32`
-|Value is parsed as a `Int` and must be within the type's range.
-
-|xref:language-reference:index.adoc#union-types[Union] of xref:language-reference:index.adoc#string-literal-types[string literals]
-|Value is used verbatim but must match a member of the union.
-
-|`List<Element>`, `Listing<Element>`, `Set<Element>`
-|Each occurrence of the option becomes an element of the final value.
-
-`Element` values are parsed based on the above primitive types.
-
-|`Map<Key, Value>`, `Mapping<Key, Value>`
-|Each occurrence of the option becomes an entry of the final value.
-
-Values are split on the first `"="` character; the first part is parsed as `Key` and the second as `Value`, both based on the above primitive types.
-
-|`Pair<First, Second>`
-|Value is split on the first `"="` character; the first part is parsed as `First` and the second as `Second`, both based on the above primitive types.
-
-|===
-
-If a flag that accepts only a single value is provided multiple times, the last occurrence becomes the final value.
-
-Only a single positional argument accepting multiple values is permitted per command.
-
-A property with a xref:language-reference:index.adoc#nullable-types[nullable type] is optional and, if not specified on the command line, will have value `null`.
-Properties with default values are also optional.
-Type constraints are evaluated when the command is executed, so additional restrictions on option values are enforced at runtime.
-
-==== Custom Option Conversion and Aggregation
-
-A property may be annotated with any type if its `@Flag` or `@Argument` annotation sets the `convert` or `transformAll` properties.
-The `convert` property is a xref:language-reference:index.adoc#anonymous-functions[function] that overrides how _each_ raw option value is interpreted.
-The `transformAll` property is a function that overrides how _all_ parsed option values become the final property value.
-
-The `convert` and `transformAll` functions may return an pkldoc:Import[pkl:Command] value that is replaced during option parsing with the actual value of the module specified by its `uri` property.
-If `glob` is `true`, the replacement value is a `Mapping`; its keys are the _absolute_ URIs of the matched modules and its values are the actual module values.
-When specifying glob import options on the command line, it is often necessary to quote the value to avoid it being interpreted by the shell.
-If the return value of `convert` or `transformAll` is a `List`, `Set`, `Map`, or `Pair`, each contained value (elements and entry keys/values) that are `Import` values are also replaced.
-
-[IMPORTANT]
-====
-If an option has type `Mapping<String, «some module type»>` and should accept a single glob pattern value, the option's annotation must also set `multiple = false` to override the default behavior of `Mapping` options accepting multiple values.
-Example:
-[source%parsed,{pkl}]
-----
-@Flag {
-  convert = (it) -> new Import { uri = it; glob = true }
-  multiple = false
-}
-birds: Mapping<String, Bird>
-----
-
-If multiple glob patterns values should be accepted and merged, `transformAll` may be used to merge every glob-imported `Mapping`:
-[source%parsed,{pkl}]
-----
-@Flag {
-  convert = (it) -> new Import { uri = it; glob = true }
-  transformAll =
-    (values) -> values.fold(new Mapping {}, (result, element) ->
-      (result) { ...element }
-    )
-}
-birds: Mapping<String, Bird>
-----
-====
-
-=== Subcommands
-
-Like many other command line libraries, `pkl:Command` allows building commands into a hierarchy with a root command and subcommands:
-
-[source,pkl%tested]
-.my-tool.pkl
-----
-extends "pkl:Command"
-
-command {
-  subcommands {
-    import("subcommand1.pkl")
-    import("subcommand2.pkl")
-    for (_, subcommand in import*("./subcommands/*.pkl")) {
-      subcommand
-    }
-  }
-}
-----
-
-[source,pkl%tested]
-.subcommand1.pkl
-----
-extends "pkl:Command"
-
-import "my-tool.pkl"
-
-parent: `my-tool` // <1>
-
-// Regular module code...
-----
-<1> Optional; asserts that this is a subcommand of `my-tool` and simplifies accessing properties and options of the parent command
-
-Each element of `subcommands` must have a unique value for `command.name`.
-
-=== Testing Commands
-
-Command modules are normal Pkl modules, so they may be imported and used like any other module.
-This is particularly helpful when testing commands, as the command's `options` and `parent` properties can be populated by test code.
-
-Testing the above command and subcommand might look like this:
-
-[source,pkl%tested]
-----
-amends "pkl:test"
-
-import "my-tool.pkl"
-import "subcommand1.pkl"
-
-examples {
-  ["Test my-tool"] {
-    (`my-tool`) {
-      options {
-        // Set my-tool options here...
-      }
-    }.output.text
-  }
-  ["Test subcommand1"] {
-    (subcommand1) {
-      parent { // this amends `my-tool`
-        options {
-          // Set my-tool options here...
-        }
-      }
-      options {
-        // Set subcommand options here...
-      }
-    }.output.text
-  }
-}
-----
-
-[[commands-as-standalone-scripts]]
-=== Commands as standalone scripts
-
-On *nix platforms, Pkl commands can be configured to run as standalone tools that can be invoked without the `pkl run` command.
-To achieve this, the command file must be marked executable (i.e. `chmod +x my-tool.pkl`) and a link:https://en.wikipedia.org/wiki/Shebang_(Unix)[shebang comment] must be added on the first line of the file:
-
-[source,pkl%parsed]
-----
-#!/usr/bin/env -S pkl run
-----
-
-NOTE: The `-S` flag for `env` is required on Linux systems due to a limitation of shebang handling in the Linux kernel.
-While not required on other *nix platforms like macOS, but it should be included for compatibility.
-
-==== Shell Completion
-
-Like with Pkl's own CLI, <<command-shell-completion, shell completions>> can be generated for standalone scripts.
-
-[source,shell]
-----
-# Generate shell completion script for bash
-./my-tool.pkl shell-completion bash
-
-# Generate shell completion script for zsh
-./my-tool.pkl shell-completion zsh
-----
-
-==== Customizing Completion Candidates
-
-`@Flag` and `@Argument` annotations may specify the `completionCandidates` to improve generated shell completions.
-
-Valid values include:
-
-* A `Listing<String>` of literal string values to offer for completion.
-* The literal string `"path"`, which offers local file paths for completion.
-
-Options with a string literal union type implicitly offer the members of the union as completion candidates.
-
-=== Flag name ambiguities
-
-It is possible for commands to define flags with names or short names that collide with Pkl's own command line options.
-To avoid ambiguity in parsing these options, all flags for Pkl itself (e.g. `--root-dir`) must be placed before the root command module's URI.
-Command authors are encouraged to avoid overlapping with Pkl's built-in flags, but this may not always be feasible, especially for single-character abbreviated names.
-
-This imposes a limitation around <<commands-as-standalone-scripts,standalone commands>> that prevents users from customizing Pkl evaluator options when they are invoked.
-There are two recommended workarounds for this limitation:
-
-* Use a `PklProject` to define evaluator settings instead of doing so on the command line.
-* If the command line must be used, switch to invoking via `pkl run [<flags>] [<root command module>]`.
-
 [[repl]]
 == Working with the REPL
 

docs/modules/pkl-core/examples/CoreEvaluatorExample.java

@@ -7,7 +7,7 @@ import org.pkl.core.PObject;
 import org.junit.jupiter.api.Test;
 
 // the pkl-jvm-examples repo has a similar example
-@SuppressWarnings({"unchecked", "unused", "ConstantConditions", "NewClassNamingConvention"})
+@SuppressWarnings({"unchecked", "unused", "ConstantConditions"})
 public class CoreEvaluatorExample {
   @Test
   public void usage() {

docs/modules/pkl-gradle/pages/index.adoc

@@ -322,16 +322,6 @@ Default: `false` +
 Whether to ignore expected example files and generate them again.
 ====
 
-[[power-assertions-test]]
-.powerAssertions: Property<Boolean>
-[%collapsible]
-====
-Default: `true` (for test tasks) +
-Example: `powerAssertions = false` +
-Enable or disable power assertions for detailed assertion failure messages.
-When enabled, test failures will show intermediate values in the assertion expression, making it easier to understand why a test failed.
-====
-
 Common properties:
 
 include::../partials/gradle-modules-properties.adoc[]

docs/modules/pkl-gradle/partials/gradle-common-properties.adoc

@@ -118,13 +118,3 @@ The left-hand side describes the source prefix, and the right-hand describes the
 This option is commonly used to enable package mirroring.
 The above example will rewrite URL `\https://pkg.pkl-lang.org/pkl-k8s/k8s@1.0.0` to `\https://my.internal.mirror/pkl-k8s/k8s@1.0.0`.
 ====
-
-.powerAssertions: Property<Boolean>
-[%collapsible]
-====
-Default: `false` (except for test tasks, which default to `true`) +
-Example: `powerAssertions = true` +
-Enable power assertions for detailed assertion failure messages.
-When enabled, type constraint failures will show intermediate values in the assertion expression.
-This option has a performance impact when constraint failures occur.
-====

docs/modules/release-notes/pages/0.31.adoc

@@ -1,352 +0,0 @@
-= Pkl 0.31 Release Notes
-:version: 0.31
-:version-minor: 0.31.0
-:release-date: February 26th, 2026
-:version-next: 0.32
-:version-next-date: July 2026
-
-include::partial$intro.adoc[]
-
-== Highlights [small]#💖#
-
-[[power-assertions]]
-=== Power Assertions
-
-Pkl's test output and error output has been improved with power assertions (pr:https://github.com/apple/pkl/pull/1384[], pr:https://github.com/apple/pkl/pull/1419[])!
-
-Pkl has two places that are effectively assertions.
-These are:
-
-* Type constraint expressions
-* Test facts
-
-Currently, when these assertions fail, the error message prints the assertion's source section.
-However, this information can sometimes be lacking.
-It tells you what the mechanics of the assertion is, but doesn't tell you _why_ the assertion is failing.
-
-For example, here is the current error output of a failing typecheck.
-
-[source,text]
-----
-–– Pkl Error ––
-Type constraint `name.endsWith(lastName)` violated.
-Value: new Person { name = "Bub Johnson" }
-
-7 | passenger: Person(name.endsWith(lastName)) = new { name = "Bub Johnson" }
-----
-
-Just from this error message, we don't know what the last name is supposed to be.
-What is `name` supposed to end with?
-We just know it's some property called `lastName` but, we don't know what it _is_.
-
-In Pkl 0.31, the error output becomes:
-
-[source,text]
-----
-–– Pkl Error ––
-Type constraint `name.endsWith(lastName)` violated.
-Value: new Person { name = "Bub Johnson" }
-
-    name.endsWith(lastName)
-    │    │        │
-    │    false    "Smith"
-    "Bub Johnson"
-
-7 | passenger: Person(name.endsWith(lastName)) = new { name = "Bub Johnson" }
-----
-
-Now, we know what the expecation actually is.
-
-This type of diagram is also added to test facts.
-When tests fail, Pkl emits a diagram of the expression, and the values produced.
-
-For example, given the following test:
-
-.math.pkl
-[source,pkl]
-----
-amends "pkl:test"
-
-facts {
-  local function add(a: Int, b: Int) = a * b
-  local function divide(a: Int, b: Int) = a % b
-  ["math"] {
-    add(3, 4) == 7
-    divide(8, 2) == 4
-  }
-}
-----
-
-The error output now includes a power assertion diagram, which helps explain why the test failed.
-
-[source,text]
-----
-module math
-  facts
-    ✘ math
-       add(3, 4) == 7 (math.pkl:9)
-       │         │
-       12        false
-       divide(8, 2) == 4 (math.pkl:10)
-       │            │
-       0            false
-
-0.0% tests pass [1/1 failed], 0.0% asserts pass [2/2 failed]
-----
-
-To learn more about this feature, consult https://github.com/apple/pkl-evolution/blob/main/spices/SPICE-0026-power-assertions.adoc[SPICE-0026].
-
-[[cli-framework]]
-=== CLI Framework
-
-Pkl 0.31 introduces a new framework for implementing CLI tools in Pkl (pr:https://github.com/apple/pkl/pull/1367[], pr:https://github.com/apple/pkl/pull/1431[], pr:https://github.com/apple/pkl/pull/1432[], pr:https://github.com/apple/pkl/pull/1436[], pr:https://github.com/apple/pkl/pull/1440[], pr:https://github.com/apple/pkl/pull/1444[]).
-
-The framework provides a way to build command line tools with user experience idioms that will be immediately familiar to users.
-CLI tools implemented in Pkl have largely the same capabilities as normal Pkl evaluation (i.e. writing to standard output and files), but this may be extended using xref:language-reference:index.adoc#external-readers[external readers].
-
-Commands are defined by extending the pkldoc:#[pkl:Command] module:
-
-.bird-generator.pkl
-[source,pkl]
-----
-extends "pkl:Command"
-
-options: Options
-
-class Options {
-  /// Mapping of <bird>=<bird age> pairs defining the list of birds.
-  @Argument
-  birds: Mapping<String, Number>
-
-  /// Aggregation function to apply to all bird ages.
-  aggregate: *"sum" | "mean" | "count"
-}
-
-class Bird {
-  /// Name of the bird.
-  name: String
-
-  /// Age of the bird in years.
-  age: Number
-}
-
-birds: Listing<Bird> = new {
-  for (_name, _age in options.birds) {
-    new { name = _name; age = _age }
-  }
-}
-
-result: Number =
-  if (options.aggregate == "sum")
-    birds.toList().fold(0.0, (result, bird) -> result + bird.age)
-  else if (options.aggregate == "mean")
-    birds.toList().fold(0.0, (result, bird) -> result + bird.age) / birds.length
-  else
-    birds.length
-----
-
-Commands are executed using the `pkl run` CLI subcommand:
-
-[source,bash]
-----
-$ pkl run bird-generator.pkl pigeon --aggregate=mean Pigeon=1 Hawk=8 Eagle=3
-birds {
-  new {
-    name = "Pigeon"
-    age = 1
-  }
-  new {
-    name = "Hawk"
-    age = 8
-  }
-  new {
-    name = "Eagle"
-    age = 3
-  }
-}
-result = 4.0
-----
-
-Automatic CLI help is provided:
-
-[source,bash]
-----
-$ pkl run test.pkl -h
-Usage: test.pkl [<options>] [<birds>]... <command> [<args>]...
-
-Options:
-  --aggregate=<count, mean, sum>  Aggregation function to apply to all bird ages.
-  -h, --help                      Show this message and exit
-
-Arguments:
-  <birds>  Mapping of <bird>=<bird age> pairs defining the list of birds.
-----
-
-To learn more about this feature, consult xref:pkl-cli:index.adoc#cli-tools[the documentation] and https://github.com/apple/pkl-evolution/blob/main/spices/SPICE-0025-pkl-run-cli-framework.adoc[SPICE-0025].
-
-== Noteworthy [small]#🎶#
-
-=== Syntax Highlighting
-
-The Pkl CLI displays Pkl code in several locations: stack frames within errors messages, <<power-assertions,power assertions>>, and in the xref:pkl-cli:index.adoc#repl[REPL].
-This code is now syntax highlighted to improve readability (pr:https://github.com/apple/pkl/pull/1385[], pr:https://github.com/apple/pkl/pull/1409[]):
-
-image::syntax-highlight-error.png[syntax highlighted output]
-
-[[cli-dependency-notation]]
-=== CLI Support for Dependency Notation
-
-The Pkl CLI now supports specifying modules using xref:language-reference:index.adoc#project-dependencies[dependency notation] (pr:https://github.com/apple/pkl/pull/1434[], pr:https://github.com/apple/pkl/pull/1439[]).
-This is especially helpful for <<cli-framework,CLI commands>> defined in Packages:
-
-[source,bash]
-----
-$ pkl run @my-tool/cmd.pkl ...
-----
-
-This enhancement applies to the `pkl eval`, `pkl run`, `pkl test`, and `pkl analyze imports` commands.
-It also applies to the `pkldoc`, `pkl-codegen-java`, and `pkl-codegen-kotlin` tools.
-
-[NOTE]
-Dependency notation only works for remote package dependencies. xref:language-reference:index.adoc#local-dependencies[Local dependencies] are not supported.
-
-=== Property Converter Annotations
-
-Pkl provides the pkldoc:BaseValueRenderers#converters[] mechanism for transforming values during rendering.
-Converters are flexible, but their design makes some transformations awkward.
-In particular, modifying property names during rendering required a lot of extra code.
-
-The new pkldoc:ConvertProperty[] annotation adds a way to express parameterized per-property name and value transformations (pr:https://github.com/apple/pkl/pull/1333[]).
-
-To learn more about this feature, consult https://github.com/apple/pkl-evolution/blob/main/spices/SPICE-0024-annotation-converters.adoc[SPICE-0024].
-
-Additional new Pkl APIs for per-format property renaming will be added for many built-in renderers:
-
-.fmt.pkl
-[source,pkl]
-----
-import "pkl:json"
-import "pkl:yaml"
-
-@json.Property { name = "foo_bar" }
-@yaml.Property { name = "foo-bar" }
-fooBar: String = "hello world"
-----
-
-[source,terminaloutput]
-----
-$ pkl eval fmt.pkl -f json
-{
-  "foo_bar": "hello world"
-}
-
-$ pkl eval fmt.pkl -f yaml
-foo-bar: hello world
-----
-
-=== Java API changes
-
-==== New classes
-
-New classes are introduced to the Java API.
-
-* `org.pkl.core.CommandSpec`
-
-==== New methods
-
-New methods are introduced to the Java API.
-
-* `org.pkl.core.Evaluator.evaluateCommand`
-* `org.pkl.core.EvaluatorBuilder.setPowerAssertionsEnabled`
-* `org.pkl.core.EvaluatorBuilder.getPowerAssertionsEnabled`
-* `org.pkl.core.SecurityManager.resolveSecurePath`
-* `org.pkl.config.java.ConfigEvaluator.evaluateOutputValue`
-* `org.pkl.coznfig.java.ConfigEvaluator.evaluateExpression`
-
-=== Standard Library changes
-
-New properties have been added to the standard library (pr:https://github.com/apple/pkl/pull/1396[]).
-
-==== Additions to `pkl:base`
-
-* pkldoc:List#isNotEmpty[]
-* pkldoc:Map#isNotEmpty[]
-* pkldoc:Set#isNotEmpty[]
-* pkldoc:Listing#isNotEmpty[]
-* pkldoc:Mapping#isNotEmpty[]
-* pkldoc:String#isNotEmpty[]
-* pkldoc:String#isNotBlank[]
-* pkldoc:ConvertProperty[]
-* pkldoc:BaseValueRenderer#convertPropertyTransformers[]
-
-==== New module `pkl:Command`
-
-The pkldoc:#[pkl:Command] standard library module is added.
-
-==== Additions to `pkl:json`
-
-* pkldoc:Property[pkl:json]
-
-==== Additions to `pkl:jsonnet`
-
-* pkldoc:Property[pkl:jsonnet]
-
-==== Additions to `pkl:protobuf`
-
-* pkldoc:Property[pkl:protobuf]
-
-==== Additions to `pkl:xml`
-
-* pkldoc:Property[pkl:xml]
-
-==== Additions to `pkl:yaml`
-
-* pkldoc:Property[pkl:yaml]
-
-== Breaking Changes [small]#💔#
-
-Things to watch out for when upgrading.
-
-=== Removal of `@argfile` support
-
-Prior versions of Pkl had an undocumented feature allowing inclusion of CLI arguments from files using `@path/to/file`.
-In order to support <<cli-dependency-notation,dependency notation>> on the CLI, `@argfile` support has been removed from Pkl.
-
-=== Removal of `Collection#transpose()`
-
-Prior versions of Pkl defined a `transpose()` method on the `Collection` class.
-This method was never implemented and threw an error when called.
-As it was never functional, it has been removed entirely without a deprecation warning (pr:https://github.com/apple/pkl/pull/1437[]).
-
-== Miscellaneous [small]#🐸#
-
-* Improve formatting of imports to keep surrounding comments (pr:https://github.com/apple/pkl/pull/1424[]).
-* Add support for evaluating module output and expressions to `ConfigEvaluator` (pr:https://github.com/apple/pkl/pull/1297[]).
-* The `pkl format --write` command now exits successfully when formatting violations are found and updated (pr:https://github.com/apple/pkl/pull/1340[]).
-* Add `pkl-bom` module to aid in aligning Pkl Java dependencies (pr:https://github.com/apple/pkl/pull/1390[]).
-* Improve error message when writing `PklProject.deps.json` fails (pr:https://github.com/apple/pkl/pull/1405[]).
-* Add information about pkldoc:Annotation[]s to the language reference (pr:https://github.com/apple/pkl/pull/1427[]).
-* Improved usability for the `org.pkl.formatter.Formatter` Java API (pr:https://github.com/apple/pkl/pull/1428[]).
-
-== Bugs fixed [small]#🐜#
-
-The following bugs have been fixed.
-
-* `Function.toString()` returns incorrect result (pr:https://github.com/apple/pkl/pull/1411[]).
-* Failure when `--multiple-file-output-path` is a symlink (pr:https://github.com/apple/pkl/pull/1389[]).
-* The `module` type in a non-final module has default value of type `Dynamic` (pr:https://github.com/apple/pkl/pull/1392[]).
-* The `module` type is cached incorrectly in some cases (pr:https://github.com/apple/pkl/pull/1393[]).
-* A possible race condition involving symlinks could bypass `--root-dir` during module and resource reading (pr:https://github.com/apple/pkl/pull/1426[]).
-* `pkl format` produces internal stack traces when lexing fails (pr:https://github.com/apple/pkl/pull/1430[]).
-* `super` access expressions are parsed incorrectly inside the spread operator (pr:https://github.com/apple/pkl/pull/1364[]).
-* Modules and resources with `jar:file:` URIs were not properly sandboxed by `--root-dir` (pr:https://github.com/apple/pkl/pull/1442[]).
-
-== Contributors [small]#🙏#
-
-We would like to thank the contributors to this release (in alphabetical order):
-
-* https://github.com/bioball[@bioball]
-* https://github.com/eddie4941[@eddie4941]
-* https://github.com/HT154[@HT154]
-* https://github.com/stackoverflow[@stackoverflow]
-* https://github.com/StefMa[@StefMa]

docs/modules/release-notes/pages/changelog.adoc

@@ -1,12 +1,7 @@
 = Changelog
 include::ROOT:partial$component-attributes.adoc[]
 
-[[release-0.31.0]]
-== 0.31.0 (UNRELEASED)
-
-xref:0.31.adoc[Release Notes]
 [[release-0.30.2]]
-
 == 0.30.2 (2025-12-15)
 
 === Fixes

docs/modules/release-notes/pages/index.adoc

@@ -2,7 +2,6 @@
 
 The Pkl team aims to release a new version of Pkl in February, June, and October of each year.
 
-* xref:0.31.adoc[0.31 Release Notes]
 * xref:0.30.adoc[0.30 Release Notes]
 * xref:0.29.adoc[0.29 Release Notes]
 * xref:0.28.adoc[0.28 Release Notes]

docs/modules/release-notes/partials/intro.adoc

@@ -1,12 +0,0 @@
-include::ROOT:partial$component-attributes.adoc[]
-
-Pkl {version} was released on {release-date}. +
-[.small]#The latest bugfix release is {version-minor}. (xref:changelog.adoc[All Versions])#
-
-The next release ({version-next}) is scheduled for {version-next-date}.
-To see what's coming in the future, follow the {uri-pkl-roadmap}[Pkl Roadmap].
-
-Please send feedback and questions to https://github.com/apple/pkl/discussions[GitHub Discussions], or submit an issue on https://github.com/apple/pkl/issues/new[GitHub]. +
-
-[small]#Pkl is hosted on https://github.com/apple/pkl[GitHub].
-To get started, follow xref:pkl-cli:index.adoc#installation[Installation].#

docs/modules/release-notes/template.adoc

@@ -2,10 +2,20 @@
 :version: XXX (e.g., 0.9)
 :version-minor: XXX (e.g., 0.9.0)
 :release-date: XXX (e.g., July 11, 2018)
-:version-next: XXX (e.g., 0.10)
-:version-next-date: XXX (e.g., July 2018)
 
-include::partial$intro.adoc[]
+include::ROOT:partial$component-attributes.adoc[]
+
+Pkl {version} was released on {release-date}. +
+[.small]#The latest bugfix release is {version-minor}. (xref:changelog.adoc[All Versions])#
+
+XXX
+
+The next release (XXX) is scheduled for XXX (e.g., August 2, 2021).
+
+Please send feedback and questions to https://github.com/apple/pkl/discussions[GitHub Discussions], or submit an issue on https://github.com/apple/pkl/issues/new[GitHub]. +
+
+[small]#Pkl is hosted on https://github.com/apple/pkl[GitHub].
+To get started, follow xref:pkl-cli:index.adoc#installation[Installation].#
 
 == Highlights [small]#💖#
 

docs/nav.adoc

@@ -41,7 +41,6 @@
 * xref:ROOT:evolution-and-roadmap.adoc[Evolution and Roadmap]
 
 * xref:release-notes:index.adoc[Release Notes]
-** xref:release-notes:0.31.adoc[0.31 Release Notes]
 ** xref:release-notes:0.30.adoc[0.30 Release Notes]
 ** xref:release-notes:0.29.adoc[0.29 Release Notes]
 ** xref:release-notes:0.28.adoc[0.28 Release Notes]

gradle.properties

@@ -1,7 +1,7 @@
 # suppress inspection "UnusedProperty" for whole file
 
 group=org.pkl-lang
-version=0.31.0
+version=0.30.2
 
 # google-java-format requires jdk.compiler exports
 org.gradle.jvmargs= \

gradle/libs.versions.toml

@@ -9,18 +9,12 @@ googleJavaFormat = "1.25.2"
 # must not use `+` because used in download URL
 # 23.1.x requires JDK 20+
 graalVm = "25.0.0"
-#noinspection UnusedVersionCatalogEntry
 graalVmJdkVersion = "25.0.0"
 # slightly hacky but convenient place so we remember to update the checksum
-#noinspection UnusedVersionCatalogEntry
 graalVmSha256-macos-x64 = "04278cf867d040e29dc71dd7727793f0ea67eb72adce8a35d04b87b57906778d"
-#noinspection UnusedVersionCatalogEntry
 graalVmSha256-macos-aarch64 = "c446d5aaeda98660a4c14049d299e9fba72105a007df89f19d27cf3979d37158"
-#noinspection UnusedVersionCatalogEntry
 graalVmSha256-linux-x64 = "1862f2ce97387a303cae4c512cb21baf36fafd2457c3cbbc10d87db94b89d3dd"
-#noinspection UnusedVersionCatalogEntry
 graalVmSha256-linux-aarch64 = "6c3c8b7617006c5d174d9cf7d357ccfb4bae77a4df1294ee28084fcb6eea8921"
-#noinspection UnusedVersionCatalogEntry
 graalVmSha256-windows-x64 = "33ef1d186b5c1e95465fcc97e637bc26e72d5f2250a8615b9c5d667ed5c17fd0"
 ideaExtPlugin = "1.1.9"
 intellijPlugin = "2.10.1"
@@ -68,7 +62,6 @@ geantyref = { group = "io.leangen.geantyref", name = "geantyref", version.ref =
 graalCompiler = { group = "org.graalvm.compiler", name = "compiler", version.ref = "graalVm" }
 graalSdk = { group = "org.graalvm.sdk", name = "graal-sdk", version.ref = "graalVm" }
 graalJs = { group = "org.graalvm.js", name = "js", version.ref = "graalVm" }
-#noinspection UnusedVersionCatalogEntry
 intellij = { group = "com.jetbrains.intellij.idea", name = "ideaIC", version.ref = "intellij" }
 javaPoet = { group = "com.palantir.javapoet", name = "javapoet", version.ref = "javaPoet" }
 javaxInject = { group = "javax.inject", name = "javax.inject", version.ref = "javaxInject" }
@@ -82,6 +75,7 @@ junitApi = { group = "org.junit.jupiter", name = "junit-jupiter-api", version.re
 junitEngine = { group = "org.junit.jupiter", name = "junit-jupiter-engine", version.ref = "junit" }
 junitParams = { group = "org.junit.jupiter", name = "junit-jupiter-params", version.ref = "junit" }
 junitLauncher = { group = "org.junit.platform", name = "junit-platform-launcher", version.ref = "junitPlatform" }
+kotlinCompilerEmbeddable = { group = "org.jetbrains.kotlin", name = "kotlin-compiler-embeddable", version.ref = "kotlin" }
 kotlinPlugin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin" }
 kotlinPoet = { group = "com.squareup", name = "kotlinpoet", version.ref = "kotlinPoet" }
 kotlinReflect = { group = "org.jetbrains.kotlin", name = "kotlin-reflect", version.ref = "kotlin" }
@@ -90,10 +84,8 @@ kotlinStdLib = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib-jdk8", ve
 kotlinxHtml = { group = "org.jetbrains.kotlinx", name = "kotlinx-html-jvm", version.ref = "kotlinxHtml" }
 kotlinxSerializationJson = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "kotlinxSerialization" }
 kotlinxCoroutinesCore = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "kotlinxCoroutines" }
-#noinspection UnusedVersionCatalogEntry
 log4j12Api = { group = "org.apache.logging.log4j", name = "log4j-1.2-api", version.ref = "log4j" }
 msgpack = { group = "org.msgpack", name = "msgpack-core", version.ref = "msgpack" }
-#noinspection UnusedVersionCatalogEntry
 nuValidator = { group = "nu.validator", name = "validator", version.ref = "nuValidator" }
 # to be replaced with https://github.com/usethesource/capsule or https://github.com/lacuna/bifurcan
 paguro = { group = "org.organicdesign", name = "Paguro", version.ref = "paguro" }

jbang-catalog.json

@@ -2,15 +2,15 @@
   "catalogs": {},
   "aliases": {
     "pkl": {
-      "script-ref": "org.pkl-lang:pkl-cli-java:0.31.0",
+      "script-ref": "org.pkl-lang:pkl-cli-java:0.30.2",
       "java-agents": []
     },
     "pkl-codegen-java": {
-      "script-ref": "org.pkl-lang:pkl-codegen-java:0.31.0",
+      "script-ref": "org.pkl-lang:pkl-codegen-java:0.30.2",
       "java-agents": []
     },
     "pkl-codegen-kotlin": {
-      "script-ref": "org.pkl-lang:pkl-codegen-kotlin:0.31.0",
+      "script-ref": "org.pkl-lang:pkl-codegen-kotlin:0.30.2",
       "java-agents": []
     }
   },

pkl-bom/pkl-bom.gradle.kts

@@ -1,60 +0,0 @@
-/*
- * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-plugins {
-  pklAllProjects
-  `java-platform`
-  `maven-publish`
-  signing
-}
-
-description = "Pkl BOM that includes all modules"
-
-dependencies {
-  constraints {
-    api(projects.pklCli)
-    api(projects.pklCodegenJava)
-    api(projects.pklCodegenKotlin)
-    // Use explicit coordinates for pkl-config-java to avoid ambiguity with fatJar publication
-    api("${project.group}:pkl-config-java:${project.version}")
-    api("${project.group}:pkl-config-java-all:${project.version}")
-    api(projects.pklConfigKotlin)
-    api(projects.pklCore)
-    api(projects.pklDoc)
-    api(projects.pklExecutor)
-    api(projects.pklFormatter)
-    api(projects.pklGradle)
-    api(projects.pklParser)
-    api(projects.pklTools)
-  }
-}
-
-publishing {
-  publications {
-    create<MavenPublication>("library") {
-      from(components["javaPlatform"])
-      pom {
-        url.set("https://github.com/apple/pkl/tree/main/pkl-bom")
-        description.set("Bill of Materials for managing Pkl dependency versions")
-      }
-    }
-  }
-}
-
-configurePklPomMetadata()
-
-configurePomValidation()
-
-configurePklSigning()

pkl-cli/src/main/kotlin/org/pkl/cli/CliCommandRunner.kt

@@ -1,270 +0,0 @@
-/*
- * Copyright © 2025-2026 Apple Inc. and the Pkl project authors. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.pkl.cli
-
-import com.github.ajalt.clikt.completion.CompletionCandidates
-import com.github.ajalt.clikt.completion.CompletionCommand
-import com.github.ajalt.clikt.core.*
-import com.github.ajalt.clikt.parameters.arguments.*
-import com.github.ajalt.clikt.parameters.options.*
-import com.github.ajalt.clikt.parameters.types.int
-import java.io.OutputStream
-import java.net.URI
-import java.nio.file.Path
-import kotlin.io.path.createParentDirectories
-import kotlin.io.path.exists
-import kotlin.io.path.isDirectory
-import kotlin.io.path.writeBytes
-import org.pkl.commons.cli.CliBaseOptions
-import org.pkl.commons.cli.CliCommand
-import org.pkl.commons.cli.CliException
-import org.pkl.commons.cli.commands.installCommonOptions
-import org.pkl.commons.currentWorkingDir
-import org.pkl.core.Closeables
-import org.pkl.core.CommandSpec
-import org.pkl.core.EvaluatorBuilder
-import org.pkl.core.FileOutput
-import org.pkl.core.ModuleSource.uri
-import org.pkl.core.PklBugException
-import org.pkl.core.PklException
-import org.pkl.core.util.IoUtils
-
-class CliCommandRunner
-@JvmOverloads
-constructor(
-  private val options: CliBaseOptions,
-  private val reservedFlagNames: Set<String>,
-  private val reservedFlagShortNames: Set<String>,
-  private val args: List<String>,
-  private val outputStream: OutputStream = System.out,
-  private val errStream: OutputStream = System.err,
-) : CliCommand(options) {
-
-  override fun doRun() {
-    val builder = evaluatorBuilder()
-    try {
-      evalCmd(builder)
-    } finally {
-      Closeables.closeQuietly(builder.moduleKeyFactories)
-      Closeables.closeQuietly(builder.resourceReaders)
-    }
-  }
-
-  private fun evalCmd(builder: EvaluatorBuilder) {
-    val evaluator = builder.build()
-    evaluator.use {
-      evaluator.evaluateCommand(
-        uri(resolvedSourceModules.first()),
-        reservedFlagNames,
-        reservedFlagShortNames,
-      ) { spec ->
-        try {
-          val root = SynthesizedRunCommand(spec, this, options.sourceModules.first().toString())
-          root.installCommonOptions(includeVersion = false)
-          root.subcommands(
-            CompletionCommand(
-              name = "shell-completion",
-              help = "Generate a completion script for the given shell",
-            )
-          )
-          root.parse(args)
-        } catch (e: PklException) {
-          throw e
-        } catch (e: Exception) {
-          throw e.message?.let { PklException(it, e) } ?: PklException(e)
-        }
-      }
-    }
-  }
-
-  /** Renders the comand's `output.bytes`, writing it to the standard output stream. */
-  fun writeOutput(outputBytes: ByteArray) {
-    if (outputBytes.isEmpty()) return
-    outputStream.write(outputBytes)
-    outputStream.flush()
-  }
-
-  /**
-   * Renders the command's `output.files`, writing each entry as a file.
-   *
-   * File paths are written to the standard error stream.
-   *
-   * Unlike CliEvaluator, command outputs write relative to --working-dir and may write files
-   * anywhere in the filesystem. This is intentionally less sandboxed than `pkl eval` and directly
-   * targets the capabilities of CLI tools written in general purpose languages. Pkl commands should
-   * therefore be treated as untrusted code the way that any other CLI tool would be.
-   */
-  fun writeMultipleFileOutput(outputFiles: Map<String, FileOutput>) {
-    if (outputFiles.isEmpty()) return
-
-    val writtenFiles = mutableMapOf<Path, String>()
-    val outputDir = options.normalizedWorkingDir
-    if (outputDir.exists() && !outputDir.isDirectory()) {
-      throw CliException("Output path `$outputDir` exists and is not a directory.")
-    }
-    for ((pathSpec, fileOutput) in outputFiles) {
-      checkPathSpec(pathSpec)
-      val resolvedPath = outputDir.resolve(pathSpec).normalize()
-      val realPath = if (resolvedPath.exists()) resolvedPath.toRealPath() else resolvedPath
-      val previousOutput = writtenFiles[realPath]
-      if (previousOutput != null) {
-        throw CliException(
-          "Output file conflict: `output.files` entries `\"${previousOutput}\"` and `\"$pathSpec\"` resolve to the same file path `$realPath`."
-        )
-      }
-      if (realPath.isDirectory()) {
-        throw CliException(
-          "Output file conflict: `output.files` entry `\"$pathSpec\"` resolves to file path `$realPath`, which is a directory."
-        )
-      }
-      writtenFiles[realPath] = pathSpec
-      realPath.createParentDirectories()
-      realPath.writeBytes(fileOutput.bytes)
-      val displayPath =
-        if (Path.of(pathSpec).isAbsolute) pathSpec
-        else IoUtils.relativize(resolvedPath, currentWorkingDir).toString()
-      errStream.writeText(displayPath + IoUtils.getLineSeparator())
-      errStream.flush()
-    }
-  }
-
-  class SynthesizedRunCommand(
-    private val spec: CommandSpec,
-    private val runner: CliCommandRunner,
-    name: String? = null,
-  ) : CliktCommand(name = name ?: spec.name) {
-    init {
-      spec.options.forEach { opt ->
-        when (opt) {
-          is CommandSpec.Flag ->
-            registerOption(
-              option(
-                  names = opt.names,
-                  help = opt.helpText ?: "",
-                  metavar = opt.metavar,
-                  hidden = opt.hidden,
-                  completionCandidates = opt.completionCandidates?.toClikt(),
-                )
-                .convert {
-                  try {
-                    opt.transformEach.apply(it, workingDirUri)
-                  } catch (e: CommandSpec.Option.BadValue) {
-                    fail(e.message!!)
-                  } catch (_: CommandSpec.Option.MissingOption) {
-                    throw MissingOption(option)
-                  }
-                }
-                .transformAll(opt.defaultValue, opt.showAsRequired) {
-                  try {
-                    opt.transformAll.apply(it, workingDirUri)
-                  } catch (e: CommandSpec.Option.BadValue) {
-                    fail(e.message!!)
-                  } catch (_: CommandSpec.Option.MissingOption) {
-                    throw MissingOption(option)
-                  }
-                }
-            )
-          is CommandSpec.BooleanFlag ->
-            registerOption(
-              if (opt.defaultValue != null)
-                option(names = opt.names, help = opt.helpText ?: "", hidden = opt.hidden)
-                  .flag("--no-${opt.name}", default = opt.defaultValue!!)
-              else
-                option(names = opt.names, help = opt.helpText ?: "", hidden = opt.hidden)
-                  .nullableFlag("--no-${opt.name}")
-            )
-          is CommandSpec.CountedFlag ->
-            registerOption(
-              option(names = opt.names, help = opt.helpText ?: "", hidden = opt.hidden)
-                .int()
-                .transformValues(0..0) { it.lastOrNull() ?: 1 }
-                .transformAll { it.sum().toLong() }
-            )
-          is CommandSpec.Argument ->
-            registerArgument(
-              argument(
-                  opt.name,
-                  opt.helpText ?: "",
-                  completionCandidates = opt.completionCandidates?.toClikt(),
-                )
-                .convert {
-                  try {
-                    opt.transformEach.apply(it, workingDirUri)
-                  } catch (e: CommandSpec.Option.BadValue) {
-                    fail(e.message!!)
-                  } catch (_: CommandSpec.Option.MissingOption) {
-                    throw MissingArgument(argument)
-                  }
-                }
-                .transformAll(if (opt.repeated) -1 else 1, !opt.repeated) {
-                  try {
-                    opt.transformAll.apply(it, workingDirUri)
-                  } catch (e: CommandSpec.Option.BadValue) {
-                    fail(e.message!!)
-                  } catch (_: CommandSpec.Option.MissingOption) {
-                    throw MissingArgument(argument)
-                  }
-                }
-            )
-        }
-      }
-      spec.subcommands.forEach { subcommands(SynthesizedRunCommand(it, runner)) }
-    }
-
-    val workingDirUri: URI by lazy { runner.options.normalizedWorkingDir.toUri() }
-
-    override val invokeWithoutSubcommand = true
-
-    override val hiddenFromHelp: Boolean = spec.hidden
-
-    override fun help(context: Context): String = spec.helpText ?: ""
-
-    override fun run() {
-      if (currentContext.invokedSubcommand is CompletionCommand) return
-
-      val opts =
-        registeredOptions()
-          .mapNotNull {
-            val opt = it as? OptionWithValues<*, *, *> ?: return@mapNotNull null
-            return@mapNotNull if (it.names.contains("--help")) null
-            else it.names.last().trimStart('-') to opt.value
-          }
-          .toMap() +
-          registeredArguments()
-            .mapNotNull { it as? ArgumentDelegate<*> }
-            .associateBy({ it.name }, { it.value })
-
-      val state = spec.apply.apply(opts, currentContext.obj as CommandSpec.State?)
-      currentContext.obj = state
-
-      if (currentContext.invokedSubcommand != null) return
-      if (spec.subcommands.isNotEmpty() && spec.noOp) {
-        throw PrintHelpMessage(currentContext, true, 1)
-      }
-
-      val result = state.evaluate()
-      runner.writeOutput(result.outputBytes)
-      runner.writeMultipleFileOutput(result.outputFiles)
-    }
-  }
-}
-
-fun CommandSpec.CompletionCandidates.toClikt(): CompletionCandidates =
-  when (this) {
-    CommandSpec.CompletionCandidates.PATH -> CompletionCandidates.Path
-    is CommandSpec.CompletionCandidates.Fixed -> CompletionCandidates.Fixed(values)
-    else -> throw PklBugException.unreachableCode()
-  }

pkl-cli/src/main/kotlin/org/pkl/cli/CliEvaluator.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -111,11 +111,12 @@ constructor(
   }
 
   private fun resolveOutputPaths(pathStr: String): Map<URI, Path> {
+    val moduleUris = options.base.normalizedSourceModules
     val workingDir = options.base.normalizedWorkingDir
     // used just to resolve the `%{moduleName}` placeholder
     val moduleResolver = ModuleResolver(moduleKeyFactories(ModulePathResolver.empty()))
 
-    return resolvedSourceModules.associateWith { uri ->
+    return moduleUris.associateWith { uri ->
       val moduleDir: String? =
         IoUtils.toPath(uri)?.let {
           IoUtils.relativize(it.parent, workingDir).toString().ifEmpty { "." }
@@ -142,6 +143,17 @@ constructor(
     }
   }
 
+  private fun Evaluator.writeOutput(moduleSource: ModuleSource, writeTo: Path): Boolean {
+    if (options.expression == null) {
+      val bytes = evaluateOutputBytes(moduleSource)
+      writeTo.writeBytes(bytes)
+      return bytes.isNotEmpty()
+    }
+    val text = evaluateExpressionString(moduleSource, options.expression)
+    writeTo.writeString(text)
+    return text.isNotEmpty()
+  }
+
   private fun Evaluator.evalOutput(moduleSource: ModuleSource): ByteArray {
     if (options.expression == null) {
       return evaluateOutputBytes(moduleSource)
@@ -191,7 +203,7 @@ constructor(
         }
       } else {
         var outputWritten = false
-        for (moduleUri in resolvedSourceModules) {
+        for (moduleUri in options.base.normalizedSourceModules) {
           val moduleSource = toModuleSource(moduleUri, inputStream)
           if (options.expression != null) {
             val output = evaluator.evaluateExpressionString(moduleSource, options.expression)
@@ -215,6 +227,13 @@ constructor(
     }
   }
 
+  private fun OutputStream.writeText(text: String) = write(text.toByteArray())
+
+  private fun OutputStream.writeLine(text: String) {
+    writeText(text)
+    writeText("\n")
+  }
+
   private fun toModuleSource(uri: URI, reader: InputStream) =
     if (uri == VmUtils.REPL_TEXT_URI) {
       ModuleSource.create(uri, reader.readAllBytes().toString(StandardCharsets.UTF_8))
@@ -222,6 +241,14 @@ constructor(
       ModuleSource.uri(uri)
     }
 
+  private fun checkPathSpec(pathSpec: String) {
+    val illegal = pathSpec.indexOfFirst { IoUtils.isReservedFilenameChar(it) && it != '/' }
+    if (illegal == -1) {
+      return
+    }
+    throw CliException("Path spec `$pathSpec` contains illegal character `${pathSpec[illegal]}`.")
+  }
+
   /**
    * Renders each module's `output.files`, writing each entry as a file into the specified output
    * directory.
@@ -236,15 +263,13 @@ constructor(
       }
       val moduleSource = toModuleSource(moduleUri, inputStream)
       val output = evaluator.evaluateOutputFiles(moduleSource)
-      val realOutputDir = if (outputDir.exists()) outputDir.toRealPath() else outputDir
-
       for ((pathSpec, fileOutput) in output) {
         checkPathSpec(pathSpec)
-        val resolvedPath = realOutputDir.resolve(pathSpec).normalize()
+        val resolvedPath = outputDir.resolve(pathSpec).normalize()
         val realPath = if (resolvedPath.exists()) resolvedPath.toRealPath() else resolvedPath
-        if (!realPath.startsWith(realOutputDir)) {
+        if (!realPath.startsWith(outputDir)) {
           throw CliException(
-            "Output file conflict: `output.files` entry `\"$pathSpec\"` in module `$moduleUri` resolves to file path `$realPath`, which is outside output directory `$realOutputDir`."
+            "Output file conflict: `output.files` entry `\"$pathSpec\"` in module `$moduleUri` resolves to file path `$realPath`, which is outside output directory `$outputDir`."
           )
         }
         val previousOutput = writtenFiles[realPath]

pkl-cli/src/main/kotlin/org/pkl/cli/CliFormatterCommand.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2025-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2025 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,7 +33,6 @@ import org.pkl.core.util.IoUtils
 import org.pkl.formatter.Formatter
 import org.pkl.formatter.GrammarVersion
 import org.pkl.parser.GenericParserError
-import org.pkl.parser.ParserError
 
 class CliFormatterCommand
 @JvmOverloads
@@ -111,6 +110,7 @@ constructor(
 
         val formatted = format(contents)
         if (contents != formatted) {
+          status.update(FORMATTING_VIOLATION)
           if (diffNameOnly || overwrite) {
             // if `--diff-name-only` or `-w` is specified, only write file names
             writeLine(pathStr)
@@ -118,9 +118,6 @@ constructor(
 
           if (overwrite) {
             path.writeText(formatted, Charsets.UTF_8)
-          } else {
-            // only exit on violation for "check" operations, not when overwriting
-            status.update(FORMATTING_VIOLATION)
           }
         }
 
@@ -128,10 +125,7 @@ constructor(
           consoleWriter.write(formatted)
           consoleWriter.flush()
         }
-      } catch (pe: ParserError) { // thrown by the lexer
+      } catch (pe: GenericParserError) {
-        writeErrLine("Could not format `$pathStr`: $pe")
-        status.update(ERROR)
-      } catch (pe: GenericParserError) { // thrown by the generic parser
         writeErrLine("Could not format `$pathStr`: $pe")
         status.update(ERROR)
       } catch (e: IOException) {

pkl-cli/src/main/kotlin/org/pkl/cli/CliImportAnalyzer.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -66,7 +66,7 @@ constructor(
     try {
       return builder
         .apply {
-          for ((idx, sourceModule) in resolvedSourceModules.withIndex()) {
+          for ((idx, sourceModule) in options.base.normalizedSourceModules.withIndex()) {
             addExternalProperty("pkl.analyzeImports.$idx", sourceModule.toString())
           }
         }

pkl-cli/src/main/kotlin/org/pkl/cli/CliProjectResolver.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,11 +15,9 @@
  */
 package org.pkl.cli
 
-import java.io.IOException
 import java.io.Writer
 import java.nio.file.Path
 import org.pkl.commons.cli.CliBaseOptions
-import org.pkl.core.PklException
 import org.pkl.core.SecurityManagers
 import org.pkl.core.module.ProjectDependenciesManager
 import org.pkl.core.packages.PackageResolver
@@ -48,13 +46,9 @@ class CliProjectResolver(
       val dependencies = ProjectDependenciesResolver(project, packageResolver, errWriter).resolve()
       val depsFile =
         projectFile.parent.resolve(ProjectDependenciesManager.PKL_PROJECT_DEPS_FILENAME).toFile()
-      try {
       depsFile.outputStream().use { dependencies.writeTo(it) }
       consoleWriter.appendLine(depsFile.toString())
       consoleWriter.flush()
-      } catch (e: IOException) {
-        throw PklException("Failed to write to $depsFile: ${e.message}", e)
-      }
     }
   }
 }

pkl-cli/src/main/kotlin/org/pkl/cli/CliRepl.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -71,7 +71,7 @@ internal class CliRepl(private val options: CliEvaluatorOptions) : CliCommand(op
           options.base.color?.hasColor() ?: false,
           options.base.traceMode ?: TraceMode.COMPACT,
         )
-      Repl(options.base.normalizedWorkingDir, server, options.base.color?.hasColor() ?: false).run()
+      Repl(options.base.normalizedWorkingDir, server).run()
     }
   }
 }

pkl-cli/src/main/kotlin/org/pkl/cli/CliTestRunner.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@ import org.pkl.commons.cli.*
 import org.pkl.core.Closeables
 import org.pkl.core.EvaluatorBuilder
 import org.pkl.core.ModuleSource.uri
-import org.pkl.core.PklException
 import org.pkl.core.TestResults
 import org.pkl.core.stdlib.test.report.JUnitReport
 import org.pkl.core.stdlib.test.report.SimpleReport
@@ -47,7 +46,7 @@ constructor(
 
   private fun evalTest(builder: EvaluatorBuilder) {
     val sources =
-      resolvedSourceModules.ifEmpty { project?.tests?.map { it.toUri() } }
+      options.normalizedSourceModules.ifEmpty { project?.tests?.map { it.toUri() } }
         ?:
         // keep in sync with error message thrown by clikt
         throw CliException(
@@ -107,9 +106,6 @@ constructor(
         } catch (ex: Exception) {
           errWriter.appendLine("Error evaluating module ${moduleUri.path}:")
           errWriter.write(ex.message ?: "")
-          if (ex !is PklException) {
-            errWriter.write(ex.stackTraceToString())
-          }
           if (moduleUri != sources.last()) {
             errWriter.appendLine()
           }

pkl-cli/src/main/kotlin/org/pkl/cli/OutputUtils.kt

@@ -1,35 +0,0 @@
-/*
- * Copyright © 2025-2026 Apple Inc. and the Pkl project authors. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.pkl.cli
-
-import java.io.OutputStream
-import org.pkl.commons.cli.CliException
-import org.pkl.core.util.IoUtils
-
-fun checkPathSpec(pathSpec: String) {
-  val illegal = pathSpec.indexOfFirst { IoUtils.isReservedFilenameChar(it) && it != '/' }
-  if (illegal == -1) {
-    return
-  }
-  throw CliException("Path spec `$pathSpec` contains illegal character `${pathSpec[illegal]}`.")
-}
-
-fun OutputStream.writeText(text: String) = write(text.toByteArray())
-
-fun OutputStream.writeLine(text: String) {
-  writeText(text)
-  writeText("\n")
-}

pkl-cli/src/main/kotlin/org/pkl/cli/commands/AnalyzeCommand.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 package org.pkl.cli.commands
 
 import com.github.ajalt.clikt.core.Context
+import com.github.ajalt.clikt.core.NoOpCliktCommand
 import com.github.ajalt.clikt.core.subcommands
 import com.github.ajalt.clikt.parameters.options.option
 import com.github.ajalt.clikt.parameters.types.path
@@ -23,10 +24,9 @@ import java.nio.file.Path
 import org.pkl.cli.CliImportAnalyzer
 import org.pkl.cli.CliImportAnalyzerOptions
 import org.pkl.commons.cli.commands.ModulesCommand
-import org.pkl.commons.cli.commands.NoOpCommand
 import org.pkl.commons.cli.commands.single
 
-class AnalyzeCommand : NoOpCommand(name = "analyze") {
+class AnalyzeCommand : NoOpCliktCommand(name = "analyze") {
   override fun help(context: Context) = "Commands related to static analysis"
 
   override fun helpEpilog(context: Context) = "For more information, visit $helpLink"

pkl-cli/src/main/kotlin/org/pkl/cli/commands/EvalCommand.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -74,23 +74,10 @@ class EvalCommand : ModulesCommand(name = "eval", helpLink = helpLink) {
   private val testMode: Boolean by
     option(names = arrayOf("--test-mode"), help = "Internal test mode", hidden = true).flag()
 
-  private val powerAssertionsEnabled: Boolean by
-    option(
-        names = arrayOf("--power-assertions"),
-        help = "Enable power assertions for detailed assertion failure messages.",
-      )
-      .flag("--no-power-assertions", default = true, defaultForHelp = "enabled")
-
   override fun run() {
     val options =
       CliEvaluatorOptions(
-        base =
+        base = baseOptions.baseOptions(modules, projectOptions, testMode = testMode),
-          baseOptions.baseOptions(
-            modules,
-            projectOptions,
-            testMode = testMode,
-            powerAssertionsEnabled = powerAssertionsEnabled,
-          ),
         outputPath = outputPath,
         outputFormat = baseOptions.format,
         moduleOutputSeparator = moduleOutputSeparator,

pkl-cli/src/main/kotlin/org/pkl/cli/commands/ProjectCommand.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@ package org.pkl.cli.commands
 
 import com.github.ajalt.clikt.completion.CompletionCandidates
 import com.github.ajalt.clikt.core.Context
+import com.github.ajalt.clikt.core.NoOpCliktCommand
 import com.github.ajalt.clikt.core.subcommands
 import com.github.ajalt.clikt.parameters.arguments.argument
 import com.github.ajalt.clikt.parameters.arguments.multiple
@@ -29,11 +30,10 @@ import java.nio.file.Path
 import org.pkl.cli.CliProjectPackager
 import org.pkl.cli.CliProjectResolver
 import org.pkl.commons.cli.commands.BaseCommand
-import org.pkl.commons.cli.commands.NoOpCommand
 import org.pkl.commons.cli.commands.TestOptions
 import org.pkl.commons.cli.commands.single
 
-class ProjectCommand : NoOpCommand(name = "project") {
+class ProjectCommand : NoOpCliktCommand(name = "project") {
   override fun help(context: Context) = "Run commands related to projects"
 
   override fun helpEpilog(context: Context) = "For more information, visit $helpLink"

pkl-cli/src/main/kotlin/org/pkl/cli/commands/RootCommand.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,22 +17,21 @@ package org.pkl.cli.commands
 
 import com.github.ajalt.clikt.completion.CompletionCommand
 import com.github.ajalt.clikt.core.Context
+import com.github.ajalt.clikt.core.NoOpCliktCommand
 import com.github.ajalt.clikt.core.context
 import com.github.ajalt.clikt.core.subcommands
-import org.pkl.commons.cli.commands.NoOpCommand
 import org.pkl.commons.cli.commands.installCommonOptions
 import org.pkl.core.Release
 
 internal val helpLink = "${Release.current().documentation.homepage}pkl-cli/index.html#usage"
 
-class RootCommand : NoOpCommand(name = "pkl") {
+class RootCommand : NoOpCliktCommand(name = "pkl") {
   override val printHelpOnEmptyArgs = true
 
   override fun helpEpilog(context: Context) = "For more information, visit $helpLink"
 
   init {
     context {
-      readArgumentFile = null
       suggestTypoCorrection = { given, possible ->
         if (!given.startsWith("-")) {
           registeredSubcommands().map { it.commandName }
@@ -51,7 +50,6 @@ class RootCommand : NoOpCommand(name = "pkl") {
       DownloadPackageCommand(),
       AnalyzeCommand(),
       FormatterCommand(),
-      RunCommand(),
       CompletionCommand(
         name = "shell-completion",
         help = "Generate a completion script for the given shell",

pkl-cli/src/main/kotlin/org/pkl/cli/commands/RunCommand.kt

@@ -1,86 +0,0 @@
-/*
- * Copyright © 2025-2026 Apple Inc. and the Pkl project authors. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.pkl.cli.commands
-
-import com.github.ajalt.clikt.completion.CompletionCandidates
-import com.github.ajalt.clikt.core.MissingArgument
-import com.github.ajalt.clikt.core.PrintHelpMessage
-import com.github.ajalt.clikt.core.context
-import com.github.ajalt.clikt.parameters.arguments.argument
-import com.github.ajalt.clikt.parameters.arguments.convert
-import com.github.ajalt.clikt.parameters.arguments.multiple
-import com.github.ajalt.clikt.parameters.arguments.optional
-import com.github.ajalt.clikt.parameters.groups.provideDelegate
-import com.github.ajalt.clikt.parameters.options.flag
-import com.github.ajalt.clikt.parameters.options.option
-import java.net.URI
-import org.pkl.cli.CliCommandRunner
-import org.pkl.commons.cli.commands.BaseCommand
-import org.pkl.commons.cli.commands.BaseOptions
-import org.pkl.commons.cli.commands.ProjectOptions
-
-class RunCommand : BaseCommand(name = "run", helpLink = helpLink) {
-  override val helpString = "Run a Pkl pkl:Command CLI tool"
-  override val treatUnknownOptionsAsArgs = true
-
-  init {
-    context {
-      // override clikt's built-in help behavior
-      // the built-in --help is eager so any --help/-h would force printing of pkl run's help
-      // which is not desired when a command module (or any of its subcommands) are present
-      // since that would mean command-defined help is gated behind a non-obvious `-- --help`
-      helpOptionNames = emptySet()
-    }
-  }
-
-  private val showHelp by option("-h", "--help", help = "Show this message and exit").flag()
-
-  val module: URI? by
-    argument(
-        name = "module",
-        help = "Root pkl:Command module to invoke.",
-        completionCandidates = CompletionCandidates.Path,
-      )
-      .convert { BaseOptions.parseModuleName(it) }
-      .optional()
-
-  val args: List<String> by argument(name = "args").multiple()
-
-  private val projectOptions by ProjectOptions()
-
-  override fun run() {
-    // if no module is specified but --help is show help, otherwise error becuase module is missing
-    if (module == null)
-      if (showHelp) throw PrintHelpMessage(currentContext)
-      else throw MissingArgument(registeredArguments().find { it.name == "module" }!!)
-
-    val reservedFlagNames = mutableSetOf("help")
-    val reservedFlagShortNames = mutableSetOf("h")
-    registeredOptions().forEach { opt ->
-      (opt.names + opt.secondaryNames).forEach {
-        if (it.startsWith("--")) reservedFlagNames.add(it.trimStart('-'))
-        else reservedFlagShortNames.add(it.trimStart('-'))
-      }
-    }
-    CliCommandRunner(
-        baseOptions.baseOptions(listOf(module!!), projectOptions),
-        reservedFlagNames,
-        reservedFlagShortNames,
-        if (showHelp) args + listOf("--help") else args,
-      )
-      .run()
-  }
-}

pkl-cli/src/main/kotlin/org/pkl/cli/commands/TestCommand.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,8 +20,6 @@ import com.github.ajalt.clikt.parameters.arguments.argument
 import com.github.ajalt.clikt.parameters.arguments.convert
 import com.github.ajalt.clikt.parameters.arguments.multiple
 import com.github.ajalt.clikt.parameters.groups.provideDelegate
-import com.github.ajalt.clikt.parameters.options.flag
-import com.github.ajalt.clikt.parameters.options.option
 import java.net.URI
 import org.pkl.cli.CliTestRunner
 import org.pkl.commons.cli.commands.BaseCommand
@@ -45,21 +43,9 @@ class TestCommand : BaseCommand(name = "test", helpLink = helpLink) {
 
   private val testOptions by TestOptions()
 
-  private val powerAssertionsEnabled: Boolean by
-    option(
-        names = arrayOf("--power-assertions"),
-        help = "Enable power assertions for detailed assertion failure messages.",
-      )
-      .flag("--no-power-assertions", default = true, defaultForHelp = "enabled")
-
   override fun run() {
     CliTestRunner(
-        options =
+        options = baseOptions.baseOptions(modules, projectOptions),
-          baseOptions.baseOptions(
-            modules,
-            projectOptions,
-            powerAssertionsEnabled = powerAssertionsEnabled,
-          ),
         testOptions = testOptions.cliTestOptions,
       )
       .run()

pkl-cli/src/main/kotlin/org/pkl/cli/repl/Repl.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,40 +18,22 @@ package org.pkl.cli.repl
 import java.io.IOException
 import java.net.URI
 import java.nio.file.Path
-import java.util.regex.Pattern
 import kotlin.io.path.deleteIfExists
 import org.fusesource.jansi.Ansi
 import org.jline.reader.EndOfFileException
-import org.jline.reader.Highlighter
-import org.jline.reader.LineReader
 import org.jline.reader.LineReader.Option
 import org.jline.reader.LineReaderBuilder
 import org.jline.reader.UserInterruptException
 import org.jline.reader.impl.completer.AggregateCompleter
 import org.jline.reader.impl.history.DefaultHistory
 import org.jline.terminal.TerminalBuilder
-import org.jline.utils.AttributedString
 import org.jline.utils.InfoCmp
 import org.pkl.core.repl.ReplRequest
 import org.pkl.core.repl.ReplResponse
 import org.pkl.core.repl.ReplServer
-import org.pkl.core.util.AnsiStringBuilder
-import org.pkl.core.util.AnsiStringBuilder.AnsiCode
 import org.pkl.core.util.IoUtils
-import org.pkl.core.util.SyntaxHighlighter
 
-class PklHighlighter : Highlighter {
+internal class Repl(workingDir: Path, private val server: ReplServer) {
-  override fun highlight(reader: LineReader, buffer: String): AttributedString {
-    val ansi = AnsiStringBuilder(true).apply { SyntaxHighlighter.writeTo(this, buffer) }.toString()
-    return AttributedString.fromAnsi(ansi)
-  }
-
-  override fun setErrorPattern(pattern: Pattern) {}
-
-  override fun setErrorIndex(idx: Int) {}
-}
-
-internal class Repl(workingDir: Path, private val server: ReplServer, private val color: Boolean) {
   private val terminal = TerminalBuilder.builder().apply { jansi(true) }.build()
   private val history = DefaultHistory()
   private val reader =
@@ -59,12 +41,12 @@ internal class Repl(workingDir: Path, private val server: ReplServer, private va
       .apply {
         history(history)
         terminal(terminal)
-        if (color) {
-          highlighter(PklHighlighter())
-        }
         completer(AggregateCompleter(CommandCompleter, FileCompleter(workingDir)))
         option(Option.DISABLE_EVENT_EXPANSION, true)
-        variable(LineReader.HISTORY_FILE, (IoUtils.getPklHomeDir().resolve("repl-history")))
+        variable(
+          org.jline.reader.LineReader.HISTORY_FILE,
+          (IoUtils.getPklHomeDir().resolve("repl-history")),
+        )
       }
       .build()
 
@@ -73,12 +55,6 @@ internal class Repl(workingDir: Path, private val server: ReplServer, private va
   private var maybeQuit = false
   private var nextRequestId = 0
 
-  private fun String.faint(): String {
-    val sb = AnsiStringBuilder(color)
-    sb.append(AnsiCode.FAINT, this)
-    return sb.toString()
-  }
-
   fun run() {
     // JLine 2 history file is incompatible with JLine 3
     IoUtils.getPklHomeDir().resolve("repl-history.bin").deleteIfExists()
@@ -94,11 +70,11 @@ internal class Repl(workingDir: Path, private val server: ReplServer, private va
           try {
             if (continuation) {
               nextRequestId -= 1
-              reader.readLine(" ".repeat("pkl$nextRequestId> ".length).faint())
+              reader.readLine(" ".repeat("pkl$nextRequestId> ".length))
             } else {
-              reader.readLine("pkl$nextRequestId> ".faint())
+              reader.readLine("pkl$nextRequestId> ")
             }
-          } catch (_: UserInterruptException) {
+          } catch (e: UserInterruptException) {
             if (!continuation && reader.buffer.length() == 0) {
               if (maybeQuit) quit()
               else {
@@ -111,7 +87,7 @@ internal class Repl(workingDir: Path, private val server: ReplServer, private va
             inputBuffer = ""
             continuation = false
             continue
-          } catch (_: EndOfFileException) {
+          } catch (e: EndOfFileException) {
             ":quit"
           }
 
@@ -135,10 +111,10 @@ internal class Repl(workingDir: Path, private val server: ReplServer, private va
     } finally {
       try {
         history.save()
-      } catch (_: IOException) {}
+      } catch (ignored: IOException) {}
       try {
         terminal.close()
-      } catch (_: IOException) {}
+      } catch (ignored: IOException) {}
     }
   }
 
@@ -148,12 +124,10 @@ internal class Repl(workingDir: Path, private val server: ReplServer, private va
       candidates.isEmpty() -> {
         println("Unknown command: `${inputBuffer.drop(1)}`")
       }
-
       candidates.size > 1 -> {
         print("Which of the following did you mean?  ")
         println(candidates.joinToString(separator = "  ") { "`:${it.type}`" })
       }
-
       else -> {
         doExecuteCommand(candidates.single())
       }
@@ -219,20 +193,16 @@ internal class Repl(workingDir: Path, private val server: ReplServer, private va
         is ReplResponse.EvalSuccess -> {
           println(response.result)
         }
-
         is ReplResponse.EvalError -> {
           println(response.message)
         }
-
         is ReplResponse.InternalError -> {
           throw response.cause
         }
-
         is ReplResponse.IncompleteInput -> {
           assert(responses.size == 1)
           continuation = true
         }
-
         else -> throw IllegalStateException("Unexpected response: $response")
       }
     }

pkl-cli/src/test/kotlin/org/pkl/cli/CliEvaluatorTest.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -1634,95 +1634,6 @@ result = someLib.x
       )
   }
 
-  @Test
-  @DisabledOnOs(OS.WINDOWS)
-  fun `multiple file output works with symlinked output directory`() {
-    val realOutputDir = tempDir.resolve("real-output").createDirectories()
-
-    val symlinkOutputDir =
-      Files.createSymbolicLink(tempDir.resolve("symlink-output"), realOutputDir)
-
-    val sourceFile =
-      writePklFile(
-        "test.pkl",
-        """
-          pigeon {
-            name = "Pigeon"
-            diet = "Seeds"
-          }
-          parrot {
-            name = "Parrot"
-            diet = "Seeds"
-          }
-          output {
-            files {
-              ["pigeon.json"] {
-                value = pigeon
-                renderer = new JsonRenderer {}
-              }
-              ["birds/parrot.yaml"] {
-                value = parrot
-                renderer = new YamlRenderer {}
-              }
-            }
-          }
-        """
-          .trimIndent(),
-      )
-
-    val options =
-      CliEvaluatorOptions(
-        CliBaseOptions(sourceModules = listOf(sourceFile), workingDir = tempDir),
-        multipleFileOutputPath = symlinkOutputDir.toString(),
-      )
-
-    CliEvaluator(options).run()
-
-    checkOutputFile(
-      realOutputDir.resolve("pigeon.json"),
-      "pigeon.json",
-      """
-        {
-          "name": "Pigeon",
-          "diet": "Seeds"
-        }
-      """
-        .trimIndent(),
-    )
-
-    checkOutputFile(
-      realOutputDir.resolve("birds/parrot.yaml"),
-      "parrot.yaml",
-      """
-        name: Parrot
-        diet: Seeds
-      """
-        .trimIndent(),
-    )
-
-    checkOutputFile(
-      symlinkOutputDir.resolve("pigeon.json"),
-      "pigeon.json",
-      """
-        {
-          "name": "Pigeon",
-          "diet": "Seeds"
-        }
-      """
-        .trimIndent(),
-    )
-
-    checkOutputFile(
-      symlinkOutputDir.resolve("birds/parrot.yaml"),
-      "parrot.yaml",
-      """
-        name: Parrot
-        diet: Seeds
-      """
-        .trimIndent(),
-    )
-  }
-
   private fun evalModuleThatImportsPackage(certsFile: Path?, testPort: Int = -1) {
     val moduleUri =
       writePklFile(

pkl-cli/src/test/kotlin/org/pkl/cli/CliFormatterTest.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2025-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2025 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,9 +19,7 @@ import java.nio.file.Path
 import kotlin.io.path.writeText
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.assertThrows
 import org.junit.jupiter.api.io.TempDir
-import org.pkl.commons.cli.CliBugException
 import org.pkl.commons.cli.CliException
 import org.pkl.core.util.StringBuilderWriter
 import org.pkl.formatter.GrammarVersion
@@ -46,22 +44,4 @@ class CliFormatterTest {
     } catch (_: CliException) {}
     assertThat(sb.toString()).isEqualTo("foo = 1\n")
   }
-
-  @Test
-  fun `parse errors do not result in bug exceptions`(@TempDir tempDir: Path) {
-    val file = tempDir.resolve("foo.pkl").also { it.writeText("foo = \"/foo/\\\${BAR}/baz\"") }
-    val sb = StringBuilder()
-    val writer = StringBuilderWriter(sb)
-    val cmd =
-      CliFormatterCommand(
-        listOf(file),
-        GrammarVersion.latest(),
-        overwrite = false,
-        diffNameOnly = false,
-        silent = false,
-        consoleWriter = writer,
-      )
-    val exc = assertThrows<CliException> { cmd.run() }
-    assertThat(exc).isNotInstanceOf(CliBugException::class.java)
-  }
 }

pkl-cli/src/test/kotlin/org/pkl/cli/CliProjectResolverTest.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,9 +18,7 @@ package org.pkl.cli
 import java.io.File
 import java.io.StringWriter
 import java.nio.file.Path
-import kotlin.io.path.createDirectories
 import org.assertj.core.api.Assertions.assertThat
-import org.assertj.core.api.Assertions.assertThatCode
 import org.junit.jupiter.api.AfterAll
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.assertThrows
@@ -29,7 +27,6 @@ import org.pkl.commons.cli.CliBaseOptions
 import org.pkl.commons.cli.CliException
 import org.pkl.commons.test.FileTestUtils
 import org.pkl.commons.test.PackageServer
-import org.pkl.commons.writeString
 import org.pkl.core.util.IoUtils
 
 class CliProjectResolverTest {
@@ -460,40 +457,4 @@ class CliProjectResolverTest {
           .trimIndent()
       )
   }
-
-  @Test
-  fun `IOException when writing to PklProject-deps-json`(@TempDir tempDir: Path) {
-    val consoleOut = StringWriter()
-    val errOut = StringWriter()
-    tempDir
-      .resolve("PklProject")
-      .writeString(
-        """
-      amends "pkl:Project"
-
-      dependencies {
-        ["birds"] {
-          uri = "package://localhost:0/birds@0.5.0"
-        }
-      }
-    """
-          .trimIndent()
-      )
-    // coerce an IOException by making this a directory
-    val depsJsonFile = tempDir.resolve("PklProject.deps.json").also { it.createDirectories() }
-    assertThatCode {
-        CliProjectResolver(
-            CliBaseOptions(
-              caCertificates = listOf(FileTestUtils.selfSignedCertificate),
-              testPort = packageServer.port,
-              noCache = true,
-            ),
-            listOf(tempDir),
-            consoleWriter = consoleOut,
-            errWriter = errOut,
-          )
-          .run()
-      }
-      .hasMessageContaining("Failed to write to $depsJsonFile")
-  }
 }

pkl-cli/src/test/kotlin/org/pkl/cli/CliTestRunnerTest.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -52,12 +52,7 @@ class CliTestRunnerTest {
     val input = tempDir.resolve("test.pkl").writeString(code).toString()
     val out = StringWriter()
     val err = StringWriter()
-    val opts =
+    val opts = CliBaseOptions(sourceModules = listOf(input.toUri()), settings = URI("pkl:settings"))
-      CliBaseOptions(
-        sourceModules = listOf(input.toUri()),
-        settings = URI("pkl:settings"),
-        powerAssertionsEnabled = true,
-      )
     val testOpts = CliTestOptions()
     val runner = CliTestRunner(opts, testOpts, consoleWriter = out, errWriter = err)
     runner.run()
@@ -86,7 +81,7 @@ class CliTestRunnerTest {
       facts {
         ["fail"] {
           4 == 9
-          1 == 5
+          "foo" != "bar"
         }
       }
     """
@@ -94,12 +89,7 @@ class CliTestRunnerTest {
     val input = tempDir.resolve("test.pkl").writeString(code).toString()
     val out = StringWriter()
     val err = StringWriter()
-    val opts =
+    val opts = CliBaseOptions(sourceModules = listOf(input.toUri()), settings = URI("pkl:settings"))
-      CliBaseOptions(
-        sourceModules = listOf(input.toUri()),
-        settings = URI("pkl:settings"),
-        powerAssertionsEnabled = true,
-      )
     val testOpts = CliTestOptions()
     val runner = CliTestRunner(opts, testOpts, consoleWriter = out, errWriter = err)
     assertThatCode { runner.run() }.hasMessage("Tests failed.")
@@ -111,13 +101,8 @@ class CliTestRunnerTest {
           facts
             ✘ fail
                4 == 9 (/tempDir/test.pkl, line xx)
-                 │
-                 false
-               1 == 5 (/tempDir/test.pkl, line xx)
-                 │
-                 false
 
-        0.0% tests pass [1/1 failed], 0.0% asserts pass [2/2 failed]
+        0.0% tests pass [1/1 failed], 50.0% asserts pass [1/2 failed]
 
         """
           .trimIndent()
@@ -141,12 +126,7 @@ class CliTestRunnerTest {
     val input = tempDir.resolve("test.pkl").writeString(code).toString()
     val out = StringWriter()
     val err = StringWriter()
-    val opts =
+    val opts = CliBaseOptions(sourceModules = listOf(input.toUri()), settings = URI("pkl:settings"))
-      CliBaseOptions(
-        sourceModules = listOf(input.toUri()),
-        settings = URI("pkl:settings"),
-        powerAssertionsEnabled = true,
-      )
     val testOpts = CliTestOptions()
     val runner = CliTestRunner(opts, testOpts, consoleWriter = out, errWriter = err)
     assertThatCode { runner.run() }.hasMessage("Tests failed.")
@@ -188,12 +168,7 @@ class CliTestRunnerTest {
     val input = tempDir.resolve("test.pkl").writeString(code).toString()
     val out = StringWriter()
     val err = StringWriter()
-    val opts =
+    val opts = CliBaseOptions(sourceModules = listOf(input.toUri()), settings = URI("pkl:settings"))
-      CliBaseOptions(
-        sourceModules = listOf(input.toUri()),
-        settings = URI("pkl:settings"),
-        powerAssertionsEnabled = true,
-      )
     val testOpts = CliTestOptions()
     val runner = CliTestRunner(opts, testOpts, consoleWriter = out, errWriter = err)
     assertThatCode { runner.run() }.hasMessage("Tests failed.")
@@ -249,12 +224,7 @@ class CliTestRunnerTest {
       )
     val out = StringWriter()
     val err = StringWriter()
-    val opts =
+    val opts = CliBaseOptions(sourceModules = listOf(input.toUri()), settings = URI("pkl:settings"))
-      CliBaseOptions(
-        sourceModules = listOf(input.toUri()),
-        settings = URI("pkl:settings"),
-        powerAssertionsEnabled = true,
-      )
     val testOpts = CliTestOptions()
     val runner = CliTestRunner(opts, testOpts, consoleWriter = out, errWriter = err)
     assertThatCode { runner.run() }.hasMessage("Tests failed.")
@@ -300,12 +270,7 @@ class CliTestRunnerTest {
         .trimIndent()
     val input = tempDir.resolve("test.pkl").writeString(code).toString()
     val noopWriter = noopWriter()
-    val opts =
+    val opts = CliBaseOptions(sourceModules = listOf(input.toUri()), settings = URI("pkl:settings"))
-      CliBaseOptions(
-        sourceModules = listOf(input.toUri()),
-        settings = URI("pkl:settings"),
-        powerAssertionsEnabled = true,
-      )
     val testOpts = CliTestOptions(junitDir = tempDir)
     val runner = CliTestRunner(opts, testOpts, noopWriter, noopWriter)
     assertThatCode { runner.run() }.hasMessageContaining("failed")
@@ -318,9 +283,7 @@ class CliTestRunnerTest {
       <testsuite name="test" tests="2" failures="1">
           <testcase classname="test.facts" name="foo"></testcase>
           <testcase classname="test.facts" name="bar">
-              <failure message="Fact Failure">5 == 9 (/tempDir/test.pkl, line xx)
+              <failure message="Fact Failure">5 == 9 (/tempDir/test.pkl, line xx)</failure>
-        │
-        false</failure>
           </testcase>
           <system-err><![CDATA[9 = 9
       ]]></system-err>
@@ -350,12 +313,7 @@ class CliTestRunnerTest {
         .trimIndent()
     val input = tempDir.resolve("test.pkl").writeString(code).toString()
     val noopWriter = noopWriter()
-    val opts =
+    val opts = CliBaseOptions(sourceModules = listOf(input.toUri()), settings = URI("pkl:settings"))
-      CliBaseOptions(
-        sourceModules = listOf(input.toUri()),
-        settings = URI("pkl:settings"),
-        powerAssertionsEnabled = true,
-      )
     val testOpts = CliTestOptions(junitDir = tempDir)
     val runner = CliTestRunner(opts, testOpts, noopWriter, noopWriter)
     assertThatCode { runner.run() }.hasMessageContaining("failed")
@@ -509,7 +467,6 @@ class CliTestRunnerTest {
       CliBaseOptions(
         sourceModules = listOf(input1.toUri(), input2.toUri()),
         settings = URI("pkl:settings"),
-        powerAssertionsEnabled = true,
       )
     val testOpts = CliTestOptions(junitDir = tempDir, junitAggregateReports = true)
     val runner = CliTestRunner(opts, testOpts, noopWriter, noopWriter)
@@ -529,19 +486,15 @@ class CliTestRunnerTest {
           <testsuite name="test1" tests="2" failures="1">
               <testcase classname="test1.facts" name="foo"></testcase>
               <testcase classname="test1.facts" name="bar">
-                    <failure message="Fact Failure">5 == 9 (/tempDir/test1.pkl, line xx)
+                  <failure message="Fact Failure">5 == 9 (/tempDir/test1.pkl, line xx)</failure>
-          │
-          false</failure>
               </testcase>
           </testsuite>
           <testsuite name="test2" tests="3" failures="2">
               <testcase classname="test2.facts" name="xxx">
-                    <failure message="Fact Failure">false (/tempDir/test2.pkl, line xx)
+                  <failure message="Fact Failure">false (/tempDir/test2.pkl, line xx)</failure>
-        </failure>
               </testcase>
               <testcase classname="test2.facts" name="yyy">
-                    <failure message="Fact Failure">false (/tempDir/test2.pkl, line xx)
+                  <failure message="Fact Failure">false (/tempDir/test2.pkl, line xx)</failure>
-        </failure>
               </testcase>
               <testcase classname="test2.facts" name="zzz"></testcase>
           </testsuite>
@@ -637,12 +590,7 @@ class CliTestRunnerTest {
       )
     val out = StringWriter()
     val err = StringWriter()
-    val opts =
+    val opts = CliBaseOptions(sourceModules = listOf(input.toUri()), settings = URI("pkl:settings"))
-      CliBaseOptions(
-        sourceModules = listOf(input.toUri()),
-        settings = URI("pkl:settings"),
-        powerAssertionsEnabled = true,
-      )
     val testOpts = CliTestOptions()
     val runner = CliTestRunner(opts, testOpts, consoleWriter = out, errWriter = err)
     assertThatCode { runner.run() }.hasMessage("Tests failed.")
@@ -681,12 +629,7 @@ class CliTestRunnerTest {
     val input = tempDir.resolve("test.pkl").writeString(code).toString()
     val out = StringWriter()
     val err = StringWriter()
-    val opts =
+    val opts = CliBaseOptions(sourceModules = listOf(input.toUri()), settings = URI("pkl:settings"))
-      CliBaseOptions(
-        sourceModules = listOf(input.toUri()),
-        settings = URI("pkl:settings"),
-        powerAssertionsEnabled = true,
-      )
     val testOpts = CliTestOptions()
     val runner = CliTestRunner(opts, testOpts, consoleWriter = out, errWriter = err)
     val exception = assertThrows<CliException> { runner.run() }
@@ -726,11 +669,7 @@ class CliTestRunnerTest {
       val out = StringWriter()
       val err = StringWriter()
       val opts =
-        CliBaseOptions(
+        CliBaseOptions(sourceModules = listOf(input.toUri()), settings = URI("pkl:settings"))
-          sourceModules = listOf(input.toUri()),
-          settings = URI("pkl:settings"),
-          powerAssertionsEnabled = true,
-        )
       val testOpts = CliTestOptions()
       val runner = CliTestRunner(opts, testOpts, consoleWriter = out, errWriter = err)
       runner.run()

pkl-codegen-java/src/main/kotlin/org/pkl/codegen/java/CliJavaCodeGenerator.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,7 +31,7 @@ class CliJavaCodeGenerator(private val options: CliJavaCodeGeneratorOptions) :
     val builder = evaluatorBuilder()
     try {
       builder.build().use { evaluator ->
-        for (moduleUri in resolvedSourceModules) {
+        for (moduleUri in options.base.normalizedSourceModules) {
           val schema = evaluator.evaluateSchema(ModuleSource.uri(moduleUri))
           val codeGenerator = JavaCodeGenerator(schema, options.toJavaCodeGeneratorOptions())
           try {

pkl-codegen-java/src/main/kotlin/org/pkl/codegen/java/JavaCodeGenerator.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,8 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@file:Suppress("unused")
-
 package org.pkl.codegen.java
 
 import com.palantir.javapoet.*

pkl-codegen-java/src/test/kotlin/org/pkl/codegen/java/JavaCodeGeneratorTest.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -595,7 +595,10 @@ class JavaCodeGeneratorTest {
     assertAll(
       "toString() returns Pkl name",
       javaClass.enumConstants.zip(cases) { enumConstant, (pklName, _) ->
-        { assertThat(enumConstant.toString()).isEqualTo(pklName) }
+        {
+          assertThat(enumConstant.toString()).isEqualTo(pklName)
+          Unit
+        }
       },
     )
   }
@@ -2261,7 +2264,7 @@ class JavaCodeGeneratorTest {
   }
 
   private fun Map<String, String>.validateContents(
-    @Suppress("RemoveRedundantQualifierName") vararg assertions: kotlin.Pair<String, List<String>>
+    vararg assertions: kotlin.Pair<String, List<String>>
   ) {
     val files = toMutableMap()
 
@@ -2286,7 +2289,7 @@ class JavaCodeGeneratorTest {
   }
 
   private fun JavaCodeGeneratorOptions.generateFiles(
-    @Suppress("RemoveRedundantQualifierName") vararg pklModules: kotlin.Pair<String, String>
+    vararg pklModules: kotlin.Pair<String, String>
   ): Map<String, String> =
     generateFiles(*pklModules.map { (name, text) -> PklModule(name, text) }.toTypedArray())
 

pkl-codegen-kotlin/src/main/kotlin/org/pkl/codegen/kotlin/CliKotlinCodeGenerator.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,7 +32,7 @@ class CliKotlinCodeGenerator(private val options: CliKotlinCodeGeneratorOptions)
 
     try {
       builder.build().use { evaluator ->
-        for (moduleUri in resolvedSourceModules) {
+        for (moduleUri in options.base.normalizedSourceModules) {
           val schema = evaluator.evaluateSchema(ModuleSource.uri(moduleUri))
           val codeGenerator = KotlinCodeGenerator(schema, options.toKotlinCodeGeneratorOptions())
           try {

pkl-codegen-kotlin/src/main/kotlin/org/pkl/codegen/kotlin/KotlinCodeGenerator.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,8 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@file:Suppress("unused")
-
 package org.pkl.codegen.kotlin
 
 import com.squareup.kotlinpoet.*
@@ -68,7 +66,6 @@ class KotlinCodeGenerator(
     private val STRING = String::class.asClassName()
     private val ANY_NULL = ANY.copy(nullable = true)
     private val NOTHING = Nothing::class.asClassName()
-    @Suppress("RemoveRedundantQualifierName")
     private val KOTLIN_PAIR = kotlin.Pair::class.asClassName()
     private val COLLECTION = Collection::class.asClassName()
     private val LIST = List::class.asClassName()

pkl-codegen-kotlin/src/test/kotlin/org/pkl/codegen/kotlin/KotlinCodeGeneratorTest.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -2054,7 +2054,7 @@ class KotlinCodeGeneratorTest {
   }
 
   private fun Map<String, String>.validateContents(
-    @Suppress("RemoveRedundantQualifierName") vararg assertions: kotlin.Pair<String, List<String>>
+    vararg assertions: kotlin.Pair<String, List<String>>
   ) {
     val files = toMutableMap()
 
@@ -2079,7 +2079,7 @@ class KotlinCodeGeneratorTest {
   }
 
   private fun KotlinCodeGeneratorOptions.generateFiles(
-    @Suppress("RemoveRedundantQualifierName") vararg pklModules: kotlin.Pair<String, String>
+    vararg pklModules: kotlin.Pair<String, String>
   ): Map<String, String> =
     generateFiles(*pklModules.map { (name, text) -> PklModule(name, text) }.toTypedArray())
 

pkl-commons-cli/src/main/kotlin/org/pkl/commons/cli/CliBaseOptions.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,7 +29,7 @@ import org.pkl.core.util.IoUtils
 /** Base options shared between CLI commands. */
 data class CliBaseOptions(
   /** The source modules to evaluate. Relative URIs are resolved against [workingDir]. */
-  val sourceModules: List<URI> = listOf(),
+  private val sourceModules: List<URI> = listOf(),
 
   /**
    * The URI patterns that determine which modules can be loaded and evaluated. Patterns are matched
@@ -152,9 +152,6 @@ data class CliBaseOptions(
 
   /** Defines options for the formatting of calls to the trace() method. */
   val traceMode: TraceMode? = null,
-
-  /** Whether power assertions are enabled. */
-  val powerAssertionsEnabled: Boolean = false,
 ) {
 
   companion object {
@@ -175,19 +172,11 @@ data class CliBaseOptions(
   /** [rootDir] after normalization. */
   val normalizedRootDir: Path? = rootDir?.let(normalizedWorkingDir::resolve)
 
-  /** The effective project directory, if exists. */
-  val normalizedProjectFile: Path? by lazy {
-    projectDir?.resolve(ProjectDependenciesManager.PKL_PROJECT_FILENAME)
-      ?: normalizedWorkingDir.getProjectFile(rootDir)
-  }
-
   /** [sourceModules] after normalization. */
   val normalizedSourceModules: List<URI> =
     sourceModules
       .map { uri ->
-        if (uri.isAbsolute) uri
+        if (uri.isAbsolute) uri else IoUtils.resolve(normalizedWorkingDir.toUri(), uri)
-        else if (uri.path.startsWith("@") && !noProject && normalizedProjectFile != null) uri
-        else IoUtils.resolve(normalizedWorkingDir.toUri(), uri)
       }
       // sort modules to make cli output independent of source module order
       .sorted()
@@ -203,6 +192,12 @@ data class CliBaseOptions(
   /** [moduleCacheDir] after normalization. */
   val normalizedModuleCacheDir: Path? = moduleCacheDir?.let(normalizedWorkingDir::resolve)
 
+  /** The effective project directory, if exists. */
+  val normalizedProjectFile: Path? by lazy {
+    projectDir?.resolve(ProjectDependenciesManager.PKL_PROJECT_FILENAME)
+      ?: normalizedWorkingDir.getProjectFile(rootDir)
+  }
+
   /** [caCertificates] after normalization. */
   val normalizedCaCertificates: List<Path> = caCertificates.map(normalizedWorkingDir::resolve)
 }

pkl-commons-cli/src/main/kotlin/org/pkl/commons/cli/CliCommand.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,6 @@
  */
 package org.pkl.commons.cli
 
-import com.github.ajalt.clikt.core.CliktError
 import java.net.URI
 import java.nio.file.Files
 import java.nio.file.Path
@@ -47,7 +46,6 @@ abstract class CliCommand(protected val cliOptions: CliBaseOptions) {
       proxyAddress?.let(IoUtils::setSystemProxy)
       doRun()
     } catch (e: PklException) {
-      if (e.cause is CliktError) throw e.cause!!
       throw CliException(e.message!!)
     } catch (e: CliException) {
       throw e
@@ -86,36 +84,6 @@ abstract class CliCommand(protected val cliOptions: CliBaseOptions) {
     }
   }
 
-  protected fun resolveModuleUri(uri: URI): URI =
-    if (uri.isAbsolute) uri
-    else { // must be @dep/mod.pkl notation!!
-      if (!uri.path.startsWith('@'))
-        throw CliBugException(
-          RuntimeException("tried to resolve project URI `$uri` with no @ prefix")
-        )
-      if (project == null)
-        throw CliBugException(
-          RuntimeException("tried to resolve project URI `$uri` with no project present")
-        )
-      val dep = uri.path.substringBefore('/').drop(1)
-      val path = uri.path.dropWhile { it != '/' }
-      if (path.isEmpty()) throw CliException("Invalid project dependency URI `$uri`.")
-
-      val remoteDep =
-        project!!.dependencies.remoteDependencies()[dep]
-          ?: if (project!!.dependencies.localDependencies().containsKey(dep))
-            throw CliException(
-              "Only remote project dependencies may be referenced using @-notation. Dependency `@$dep` is a local dependency."
-            )
-          else throw CliException("Project does not contain dependency `@$dep`.")
-      remoteDep.packageUri.toPackageAssetUri(path).uri
-    }
-
-  protected val resolvedSourceModules: List<URI> by lazy {
-    if (project == null) cliOptions.normalizedSourceModules
-    else cliOptions.normalizedSourceModules.map(::resolveModuleUri)
-  }
-
   protected fun loadProject(projectFile: Path): Project {
     val securityManager =
       SecurityManagers.standard(
@@ -134,7 +102,6 @@ abstract class CliCommand(protected val cliOptions: CliBaseOptions) {
       cliOptions.timeout,
       stackFrameTransformer,
       envVars,
-      cliOptions.powerAssertionsEnabled,
     )
   }
 
@@ -341,6 +308,5 @@ abstract class CliCommand(protected val cliOptions: CliBaseOptions) {
       .setTimeout(cliOptions.timeout)
       .setModuleCacheDir(moduleCacheDir)
       .setTraceMode(traceMode)
-      .setPowerAssertionsEnabled(cliOptions.powerAssertionsEnabled)
   }
 }

pkl-commons-cli/src/main/kotlin/org/pkl/commons/cli/commands/BaseCommand.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,14 +17,9 @@ package org.pkl.commons.cli.commands
 
 import com.github.ajalt.clikt.core.CliktCommand
 import com.github.ajalt.clikt.core.Context
-import com.github.ajalt.clikt.core.context
 import com.github.ajalt.clikt.parameters.groups.provideDelegate
 
 abstract class BaseCommand(name: String, private val helpLink: String) : CliktCommand(name = name) {
-  init {
-    context { readArgumentFile = null }
-  }
-
   abstract val helpString: String
 
   override fun help(context: Context) = helpString

pkl-commons-cli/src/main/kotlin/org/pkl/commons/cli/commands/BaseOptions.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -98,17 +98,7 @@ class BaseOptions : OptionGroup() {
   private val defaults = CliBaseOptions()
 
   private val output =
-    arrayOf(
+    arrayOf("json", "jsonnet", "pcf", "properties", "plist", "textproto", "xml", "yaml")
-      "json",
-      "jsonnet",
-      "pcf",
-      "properties",
-      "plist",
-      "textproto",
-      "xml",
-      "yaml",
-      "pkl-binary",
-    )
 
   val allowedModules: List<Pattern> by
     option(
@@ -326,7 +316,6 @@ class BaseOptions : OptionGroup() {
     modules: List<URI>,
     projectOptions: ProjectOptions? = null,
     testMode: Boolean = false,
-    powerAssertionsEnabled: Boolean = false,
   ): CliBaseOptions {
     return CliBaseOptions(
       sourceModules = modules,
@@ -354,7 +343,6 @@ class BaseOptions : OptionGroup() {
       externalModuleReaders = externalModuleReaders,
       externalResourceReaders = externalResourceReaders,
       traceMode = traceMode,
-      powerAssertionsEnabled = powerAssertionsEnabled,
     )
   }
 }

pkl-commons-cli/src/main/kotlin/org/pkl/commons/cli/commands/NoOpCommand.kt

@@ -1,25 +0,0 @@
-/*
- * Copyright © 2026 Apple Inc. and the Pkl project authors. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.pkl.commons.cli.commands
-
-import com.github.ajalt.clikt.core.NoOpCliktCommand
-import com.github.ajalt.clikt.core.context
-
-open class NoOpCommand(name: String? = null) : NoOpCliktCommand(name) {
-  init {
-    context { readArgumentFile = null }
-  }
-}

pkl-commons-cli/src/main/kotlin/org/pkl/commons/cli/commands/extensions.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,16 +27,14 @@ import org.pkl.core.Release
 
 private val theme = Theme { styles["markdown.code.span"] = TextStyle(bold = true) }
 
-fun <T : BaseCliktCommand<T>> T.installCommonOptions(includeVersion: Boolean = true) {
+fun <T : BaseCliktCommand<T>> T.installCommonOptions() {
   installMordantMarkdown()
 
-  if (includeVersion) {
   versionOption(
     Release.current().versionInfo,
     names = setOf("-v", "--version"),
     message = { if (commandName == "pkl") it else it.replaceFirst("Pkl", commandName) },
   )
-  }
 
   context { terminal = Terminal(theme = theme) }
 }

pkl-commons-cli/src/test/kotlin/org/pkl/commons/cli/CliCommandTest.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2025-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2025 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,26 +16,18 @@
 package org.pkl.commons.cli
 
 import com.github.ajalt.clikt.core.parse
-import java.net.URI
-import java.nio.file.Path
-import kotlin.io.path.ExperimentalPathApi
-import kotlin.io.path.writeText
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.assertThrows
-import org.junit.jupiter.api.io.TempDir
 import org.pkl.commons.cli.commands.BaseCommand
 import org.pkl.core.SecurityManagers
 
-@OptIn(ExperimentalPathApi::class)
 class CliCommandTest {
 
-  class CliTest(options: CliBaseOptions) : CliCommand(options) {
+  class CliTest(private val options: CliBaseOptions) : CliCommand(options) {
     override fun doRun() = Unit
 
-    val myAllowedResources = allowedResources
+    val _allowedResources = allowedResources
-    val myAllowedModules = allowedModules
+    val _allowedModules = allowedModules
-    val myResolvedSourceModules = resolvedSourceModules
   }
 
   private val cmd =
@@ -63,125 +55,17 @@ class CliCommandTest {
         "scheme+ext=reader5 with args",
       )
     )
-    val opts = cmd.baseOptions.baseOptions(emptyList(), testMode = true)
+    val opts = cmd.baseOptions.baseOptions(emptyList(), null, true)
     val cliTest = CliTest(opts)
-    assertThat(cliTest.myAllowedModules.map { it.pattern() })
+    assertThat(cliTest._allowedModules.map { it.pattern() })
       .isEqualTo(
         SecurityManagers.defaultAllowedModules.map { it.pattern() } +
           listOf("\\Qscheme3:\\E", "\\Qscheme4:\\E", "\\Qscheme+ext:\\E")
       )
-    assertThat(cliTest.myAllowedResources.map { it.pattern() })
+    assertThat(cliTest._allowedResources.map { it.pattern() })
       .isEqualTo(
         SecurityManagers.defaultAllowedResources.map { it.pattern() } +
           listOf("\\Qscheme1:\\E", "\\Qscheme2:\\E", "\\Qscheme+ext:\\E")
       )
   }
-
-  @Test
-  fun `@-notation package URIs - treated as relative paths when no project present`(
-    @TempDir tempDir: Path
-  ) {
-    cmd.parse(arrayOf("--working-dir=$tempDir"))
-    val opts = cmd.baseOptions.baseOptions(listOf(URI("@foo/bar.pkl")), testMode = true)
-    val cliTest = CliTest(opts)
-    assertThat(cliTest.myResolvedSourceModules)
-      .isEqualTo(listOf(tempDir.toUri().resolve("@foo/bar.pkl")))
-  }
-
-  @Test
-  fun `@-notation package URIs - empty paths are rejected`(@TempDir tempDir: Path) {
-    tempDir
-      .resolve("PklProject")
-      .writeText(
-        """
-      amends "pkl:Project"
-    """
-          .trimIndent()
-      )
-    cmd.parse(arrayOf("--working-dir=$tempDir"))
-    val opts = cmd.baseOptions.baseOptions(listOf(URI("@no.slash")), testMode = true)
-    val exc = assertThrows<CliException> { CliTest(opts) }
-    assertThat(exc.message).isEqualTo("Invalid project dependency URI `@no.slash`.")
-  }
-
-  @Test
-  fun `@-notation package URIs - missing dependencies are rejected`(@TempDir tempDir: Path) {
-    tempDir
-      .resolve("PklProject")
-      .writeText(
-        """
-      amends "pkl:Project"
-    """
-          .trimIndent()
-      )
-    cmd.parse(arrayOf("--working-dir=$tempDir"))
-    val opts = cmd.baseOptions.baseOptions(listOf(URI("@foo/bar.pkl")), testMode = true)
-    val exc = assertThrows<CliException> { CliTest(opts) }
-    assertThat(exc.message).isEqualTo("Project does not contain dependency `@foo`.")
-  }
-
-  @Test
-  fun `@-notation package URIs - local dependencies are rejected`(
-    @TempDir tempDir: Path,
-    @TempDir depDir: Path,
-  ) {
-    depDir
-      .resolve("PklProject")
-      .writeText(
-        """
-      amends "pkl:Project"
-      
-      package {
-        name = "foo"
-        baseUri = "package://example.com/foo"
-        version = "0.0.1"
-        packageZipUrl = "https://example.com/foo@\(version).zip"
-      }
-    """
-          .trimIndent()
-      )
-
-    tempDir
-      .resolve("PklProject")
-      .writeText(
-        """
-      amends "pkl:Project"
-
-      dependencies {
-        ["foo"] = import("${depDir.toUri().resolve("PklProject")}")
-      }
-    """
-          .trimIndent()
-      )
-    cmd.parse(arrayOf("--working-dir=$tempDir"))
-    val opts = cmd.baseOptions.baseOptions(listOf(URI("@foo/bar.pkl")), testMode = true)
-    val exc = assertThrows<CliException> { CliTest(opts) }
-    assertThat(exc.message)
-      .isEqualTo(
-        "Only remote project dependencies may be referenced using @-notation. Dependency `@foo` is a local dependency."
-      )
-  }
-
-  @Test
-  fun `@-notation package URIs - remote dependencies are resolved`(@TempDir tempDir: Path) {
-    tempDir
-      .resolve("PklProject")
-      .writeText(
-        """
-      amends "pkl:Project"
-
-      dependencies {
-        ["foo"] {
-          uri = "package://example.com/foo@1.2.3"
-        }
-      }
-    """
-          .trimIndent()
-      )
-    cmd.parse(arrayOf("--working-dir=$tempDir"))
-    val opts = cmd.baseOptions.baseOptions(listOf(URI("@foo/bar.pkl")), testMode = true)
-    val cliTest = CliTest(opts)
-    assertThat(cliTest.myResolvedSourceModules)
-      .isEqualTo(listOf(tempDir.toUri().resolve("package://example.com/foo@1.2.3#/bar.pkl")))
-  }
 }

pkl-config-java/src/main/java/org/pkl/config/java/Config.java

@@ -110,7 +110,7 @@ public interface Config {
     return fromPklBinary(inputStream, ValueMapper.preconfigured());
   }
 
-  static Config makeConfig(Object decoded, ValueMapper mapper) {
+  private static Config makeConfig(Object decoded, ValueMapper mapper) {
     if (decoded instanceof Composite composite) {
       return new CompositeConfig("", mapper, composite);
     }

pkl-config-java/src/main/java/org/pkl/config/java/ConfigEvaluator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,12 +41,6 @@ public interface ConfigEvaluator extends AutoCloseable {
   /** Evaluates the given module source into a {@link Config} tree. */
   Config evaluate(ModuleSource moduleSource);
 
-  /** Evaluates the given module's {@code output.value} property into a {@link Config} tree. */
-  Config evaluateOutputValue(ModuleSource moduleSource);
-
-  /** Evaluates the Pkl expression represented as {@code expression} into a {@link Config} tree. */
-  Config evaluateExpression(ModuleSource moduleSource, String expression);
-
   /**
    * Releases all resources held by this evaluator. If an {@code evaluate} method is currently
    * executing, this method blocks until cancellation of that execution has completed.

pkl-config-java/src/main/java/org/pkl/config/java/ConfigEvaluatorImpl.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,18 +34,6 @@ final class ConfigEvaluatorImpl implements ConfigEvaluator {
     return new CompositeConfig("", mapper, module);
   }
 
-  @Override
-  public Config evaluateOutputValue(ModuleSource moduleSource) {
-    var value = evaluator.evaluateOutputValue(moduleSource);
-    return Config.makeConfig(value, mapper);
-  }
-
-  @Override
-  public Config evaluateExpression(ModuleSource moduleSource, String expression) {
-    var value = evaluator.evaluateExpression(moduleSource, expression);
-    return Config.makeConfig(value, mapper);
-  }
-
   @Override
   public ValueMapper getValueMapper() {
     return mapper;

pkl-config-java/src/test/java/org/pkl/config/java/ConfigTest.java

@@ -15,20 +15,16 @@
  */
 package org.pkl.config.java;
 
-import static org.assertj.core.api.Assertions.assertThat;
 import static org.pkl.core.ModuleSource.text;
 
-import org.junit.jupiter.api.Test;
-
 public class ConfigTest extends AbstractConfigTest {
   private static final ConfigEvaluator evaluator = ConfigEvaluator.preconfigured();
 
-  private static final String pigeonText =
-      "pigeon { age = 30; friends = List(\"john\", \"mary\"); address { street = \"Fuzzy St.\" } }";
-
   @Override
   protected Config getPigeonConfig() {
-    return evaluator.evaluate(text(pigeonText));
+    return evaluator.evaluate(
+        text(
+            "pigeon { age = 30; friends = List(\"john\", \"mary\"); address { street = \"Fuzzy St.\" } }"));
   }
 
   @Override
@@ -46,20 +42,4 @@ public class ConfigTest extends AbstractConfigTest {
   protected Config getMapConfig() {
     return evaluator.evaluate(text("x = Map(\"one\", 1, \"two\", 2)"));
   }
-
-  @Test
-  public void evaluateOutputValue() {
-    var valueConfig =
-        evaluator.evaluateOutputValue(
-            text(pigeonText + "\noutput { value = (outer) { pigeon { age = 99 } } }"));
-    var pigeon = valueConfig.get("pigeon").as(Person.class);
-    assertThat(pigeon.age).isEqualTo(99);
-  }
-
-  @Test
-  public void evaluateExpression() {
-    var addressConfig = evaluator.evaluateExpression(text(pigeonText), "pigeon.address");
-    var address = addressConfig.as(Address.class);
-    assertThat(address.street).isEqualTo("Fuzzy St.");
-  }
 }

pkl-config-java/src/test/java/org/pkl/config/java/JavaTypeTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -89,7 +89,6 @@ public class JavaTypeTest {
     assertThat(javaType.getType()).isEqualTo(Types.mapOf(String.class, Types.listOf(URI.class)));
   }
 
-  @SuppressWarnings({"EqualsWithItself", "AssertBetweenInconvertibleTypes"})
   @Test
   public void sameTypesConstructedInDifferentWaysAreEqual() {
     var type1 = JavaType.mapOf(JavaType.of(String.class), JavaType.listOf(URI.class));

pkl-config-java/src/test/java/org/pkl/config/java/mapper/ConversionsTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,51 +28,46 @@ import org.pkl.core.DurationUnit;
 public class ConversionsTest {
   @Test
   public void pStringToFile() {
-    var file =
+    var file = Conversions.pStringToFile.converter.convert("relative/path", null);
-        Conversions.pStringToFile.converter.convert("relative/path", ValueMapper.preconfigured());
     assertThat(file).isEqualTo(new File("relative/path"));
 
-    var file2 =
+    var file2 = Conversions.pStringToFile.converter.convert("/absolute/path", null);
-        Conversions.pStringToFile.converter.convert("/absolute/path", ValueMapper.preconfigured());
     assertThat(file2).isEqualTo(new File("/absolute/path"));
 
-    var file3 = Conversions.pStringToFile.converter.convert("", ValueMapper.preconfigured());
+    var file3 = Conversions.pStringToFile.converter.convert("", null);
     assertThat(file3).isEqualTo(new File(""));
   }
 
   @Test
   public void pStringToPath() {
-    var path =
+    var path = Conversions.pStringToPath.converter.convert("relative/path", null);
-        Conversions.pStringToPath.converter.convert("relative/path", ValueMapper.preconfigured());
     assertThat(path).isEqualTo(Path.of("relative/path"));
 
-    var path2 =
+    var path2 = Conversions.pStringToPath.converter.convert("/absolute/path", null);
-        Conversions.pStringToPath.converter.convert("/absolute/path", ValueMapper.preconfigured());
     assertThat(path2).isEqualTo(Path.of("/absolute/path"));
 
-    var path3 = Conversions.pStringToPath.converter.convert("", ValueMapper.preconfigured());
+    var path3 = Conversions.pStringToPath.converter.convert("", null);
     assertThat(path3).isEqualTo(Path.of(""));
   }
 
   @Test
   public void pStringToPattern() {
     var str = "(?i)\\w*";
-    var pattern = Conversions.pStringToPattern.converter.convert(str, ValueMapper.preconfigured());
+    var pattern = Conversions.pStringToPattern.converter.convert(str, null);
     assertThat(pattern.pattern()).isEqualTo(str);
   }
 
   @Test
   public void pRegexToString() {
     var regex = Pattern.compile("(?i)\\w*");
-    var str = Conversions.pRegexToString.converter.convert(regex, ValueMapper.preconfigured());
+    var str = Conversions.pRegexToString.converter.convert(regex, null);
     assertThat(str).isEqualTo("(?i)\\w*");
   }
 
   @Test
   public void pDurationToDuration() {
     var pDuration = new Duration(100, DurationUnit.MINUTES);
-    var duration =
+    var duration = Conversions.pDurationToDuration.converter.convert(pDuration, null);
-        Conversions.pDurationToDuration.converter.convert(pDuration, ValueMapper.preconfigured());
     assertThat(duration).isEqualTo(java.time.Duration.of(100, ChronoUnit.MINUTES));
   }
 }

pkl-config-java/src/test/java/org/pkl/config/java/mapper/PModuleToDataObjectTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,7 +31,7 @@ public class PModuleToDataObjectTest {
 
   private static final PModule module =
       evaluator.evaluate(modulePath("org/pkl/config/java/mapper/PModuleToDataObjectTest.pkl"));
-  private final PObjectToDataObjectTest.Person pigeon =
+  PObjectToDataObjectTest.Person pigeon =
       new PObjectToDataObjectTest.Person(
           "pigeon",
           40,

pkl-config-java/src/test/java/org/pkl/config/java/mapper/PNullToAnyTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,7 +24,6 @@ import org.pkl.core.PNull;
 public class PNullToAnyTest {
   private static final ValueMapper mapper = ValueMapperBuilder.preconfigured().build();
 
-  @SuppressWarnings("DataFlowIssue")
   @Test
   public void test() {
     // due to Conversions.identities

pkl-core/src/main/java/org/pkl/core/Analyzer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -120,8 +120,7 @@ public class Analyzer {
                       ? null
                       : new ProjectDependenciesManager(
                           projectDependencies, moduleResolver, securityManager),
-                  traceMode,
+                  traceMode));
-                  false));
         });
   }
 }

pkl-core/src/main/java/org/pkl/core/CommandSpec.java

@@ -1,158 +0,0 @@
-/*
- * Copyright © 2025-2026 Apple Inc. and the Pkl project authors. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.pkl.core;
-
-import java.net.URI;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.function.BiFunction;
-import java.util.function.Function;
-import org.pkl.core.util.Nullable;
-
-public record CommandSpec(
-    String name,
-    @Nullable String helpText,
-    boolean hidden,
-    boolean noOp,
-    Iterable<Option> options,
-    List<CommandSpec> subcommands,
-    ApplyFunction apply) {
-
-  public sealed interface Option {
-    String name();
-
-    String[] getNames();
-
-    class MissingOption extends RuntimeException {
-      public MissingOption() {}
-    }
-
-    class BadValue extends RuntimeException {
-      public BadValue(String message) {
-        super(message);
-      }
-
-      public static BadValue invalid(String value, String type) {
-        return new BadValue(String.format("%s is not a valid %s", value, type));
-      }
-
-      public static BadValue badKeyValue(String value) {
-        return new BadValue(String.format("%s is not a valid key=value pair", value));
-      }
-
-      public static BadValue invalidChoice(String value, List<String> choices) {
-        return new BadValue(
-            String.format(
-                "invalid choice: %s. (choose from %s)", value, String.join(", ", choices)));
-      }
-
-      public static BadValue invalidChoice(String value, String choice) {
-        return new BadValue(String.format("invalid choice: %s. (choose from %s)", value, choice));
-      }
-    }
-  }
-
-  public abstract static sealed class CompletionCandidates {
-    public static final CompletionCandidates PATH = new StaticCompletionCandidates();
-
-    public static final class Fixed extends CompletionCandidates {
-      private final Set<String> values;
-
-      public Fixed(Set<String> values) {
-        this.values = values;
-      }
-
-      public Set<String> getValues() {
-        return values;
-      }
-    }
-
-    private static final class StaticCompletionCandidates extends CompletionCandidates {}
-  }
-
-  public record Flag(
-      String name,
-      @Nullable String helpText,
-      boolean showAsRequired,
-      BiFunction<String, URI, Object> transformEach,
-      BiFunction<List<Object>, URI, Object> transformAll,
-      @Nullable CompletionCandidates completionCandidates,
-      @Nullable String shortName,
-      String metavar,
-      boolean hidden,
-      @Nullable String defaultValue)
-      implements Option {
-    @Override
-    public String[] getNames() {
-      return shortName == null
-          ? new String[] {"--" + name}
-          : new String[] {"-" + shortName, "--" + name};
-    }
-  }
-
-  public record BooleanFlag(
-      String name,
-      @Nullable String helpText,
-      @Nullable String shortName,
-      boolean hidden,
-      @Nullable Boolean defaultValue)
-      implements Option {
-    @Override
-    public String[] getNames() {
-      return shortName == null
-          ? new String[] {"--" + name}
-          : new String[] {"-" + shortName, "--" + name};
-    }
-  }
-
-  public record CountedFlag(
-      String name, @Nullable String helpText, @Nullable String shortName, boolean hidden)
-      implements Option {
-    @Override
-    public String[] getNames() {
-      return shortName == null
-          ? new String[] {"--" + name}
-          : new String[] {"-" + shortName, "--" + name};
-    }
-  }
-
-  public record Argument(
-      String name,
-      @Nullable String helpText,
-      BiFunction<String, URI, Object> transformEach,
-      BiFunction<List<Object>, URI, Object> transformAll,
-      @Nullable CompletionCandidates completionCandidates,
-      boolean repeated)
-      implements Option {
-    @Override
-    public String[] getNames() {
-      return new String[] {name};
-    }
-  }
-
-  public interface ApplyFunction {
-    State apply(Map<String, Object> options, @Nullable State parent);
-  }
-
-  public record State(Object contents, Function<Object, Result> reify) {
-    public Result evaluate() {
-      return reify.apply(contents);
-    }
-  }
-
-  public record Result(byte[] outputBytes, Map<String, FileOutput> outputFiles) {}
-}

pkl-core/src/main/java/org/pkl/core/Evaluator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
 package org.pkl.core;
 
 import java.util.Map;
-import java.util.Set;
-import java.util.function.Consumer;
 import org.pkl.core.runtime.VmEvalException;
 
 /**
@@ -226,24 +224,6 @@ public interface Evaluator extends AutoCloseable {
    */
   TestResults evaluateTest(ModuleSource moduleSource, boolean overwrite);
 
-  /**
-   * Parses the command module into a spec that describes the CLI options and subcommands.
-   *
-   * <p>This requires that the target module be a {@code "pkl:Command"} instance.
-   *
-   * <p>Unlike other evaluator methods, the resulting {@link CommandSpec} must be handled in a
-   * closure. This is because specs must be applied to parsed CLI options to produce command state
-   * that is eventually evaluated, which must happen in the active context of an evaluator.
-   *
-   * @throws PklException if an error occurs during evaluation
-   * @throws IllegalStateException if this evaluator has already been closed
-   */
-  void evaluateCommand(
-      ModuleSource moduleSource,
-      Set<String> reservedFlagNames,
-      Set<String> reservedFlagShortNames,
-      Consumer<CommandSpec> run);
-
   /**
    * Releases all resources held by this evaluator. If an {@code evaluate} method is currently
    * executing, this method blocks until cancellation of that execution has completed.

pkl-core/src/main/java/org/pkl/core/EvaluatorBuilder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -70,8 +70,6 @@ public final class EvaluatorBuilder {
 
   private TraceMode traceMode = TraceMode.COMPACT;
 
-  private boolean powerAssertionsEnabled = false;
-
   private EvaluatorBuilder() {}
 
   /**
@@ -470,17 +468,6 @@ public final class EvaluatorBuilder {
     return this.traceMode;
   }
 
-  /** Sets whether power assertions are enabled. */
-  public EvaluatorBuilder setPowerAssertionsEnabled(boolean powerAssertions) {
-    this.powerAssertionsEnabled = powerAssertions;
-    return this;
-  }
-
-  /** Returns whether power assertions are enabled. */
-  public boolean getPowerAssertionsEnabled() {
-    return powerAssertionsEnabled;
-  }
-
   /**
    * Given a project, sets its dependencies, and also applies any evaluator settings if set.
    *
@@ -591,7 +578,6 @@ public final class EvaluatorBuilder {
         moduleCacheDir,
         dependencies,
         outputFormat,
-        traceMode,
+        traceMode);
-        powerAssertionsEnabled);
   }
 }

pkl-core/src/main/java/org/pkl/core/EvaluatorImpl.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,16 +15,16 @@
  */
 package org.pkl.core;
 
+import com.oracle.truffle.api.TruffleStackTrace;
 import java.io.IOException;
 import java.nio.file.Path;
 import java.time.Duration;
 import java.util.Collection;
+import java.util.LinkedHashMap;
 import java.util.Map;
-import java.util.Set;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
-import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.Supplier;
 import org.graalvm.polyglot.Context;
@@ -40,7 +40,6 @@ import org.pkl.core.packages.PackageResolver;
 import org.pkl.core.project.DeclaredDependencies;
 import org.pkl.core.resource.ResourceReader;
 import org.pkl.core.runtime.BaseModule;
-import org.pkl.core.runtime.CommandSpecParser;
 import org.pkl.core.runtime.Identifier;
 import org.pkl.core.runtime.ModuleResolver;
 import org.pkl.core.runtime.ResourceManager;
@@ -49,6 +48,8 @@ import org.pkl.core.runtime.VmContext;
 import org.pkl.core.runtime.VmException;
 import org.pkl.core.runtime.VmExceptionBuilder;
 import org.pkl.core.runtime.VmLanguage;
+import org.pkl.core.runtime.VmMapping;
+import org.pkl.core.runtime.VmNull;
 import org.pkl.core.runtime.VmPklBinaryEncoder;
 import org.pkl.core.runtime.VmStackOverflowException;
 import org.pkl.core.runtime.VmTyped;
@@ -85,8 +86,7 @@ public final class EvaluatorImpl implements Evaluator {
       @Nullable Path moduleCacheDir,
       @Nullable DeclaredDependencies projectDependencies,
       @Nullable String outputFormat,
-      TraceMode traceMode,
+      TraceMode traceMode) {
-      boolean powerAssertions) {
 
     securityManager = manager;
     frameTransformer = transformer;
@@ -115,8 +115,7 @@ public final class EvaluatorImpl implements Evaluator {
                           ? null
                           : new ProjectDependenciesManager(
                               projectDependencies, moduleResolver, securityManager),
-                      traceMode,
+                      traceMode));
-                      powerAssertions));
             });
     this.timeout = timeout;
     // NOTE: would probably make sense to share executor between evaluators
@@ -147,7 +146,7 @@ public final class EvaluatorImpl implements Evaluator {
     return doEvaluate(
         moduleSource,
         (module) -> {
-          var output = VmUtils.readModuleOutput(module);
+          var output = readModuleOutput(module);
           return VmUtils.readTextProperty(output);
         });
   }
@@ -156,7 +155,7 @@ public final class EvaluatorImpl implements Evaluator {
     return doEvaluate(
         moduleSource,
         (module) -> {
-          var output = VmUtils.readModuleOutput(module);
+          var output = readModuleOutput(module);
           var vmBytes = VmUtils.readBytesProperty(output);
           return vmBytes.export();
         });
@@ -167,7 +166,7 @@ public final class EvaluatorImpl implements Evaluator {
     return doEvaluate(
         moduleSource,
         (module) -> {
-          var output = VmUtils.readModuleOutput(module);
+          var output = readModuleOutput(module);
           var value = VmUtils.readMember(output, Identifier.VALUE);
           if (value instanceof VmValue vmValue) {
             vmValue.force(false);
@@ -182,9 +181,20 @@ public final class EvaluatorImpl implements Evaluator {
     return doEvaluate(
         moduleSource,
         (module) -> {
-          var output = VmUtils.readModuleOutput(module);
+          var output = readModuleOutput(module);
-          return VmUtils.readFilesProperty(
+          var filesOrNull = VmUtils.readMember(output, Identifier.FILES);
-              output, (fileOutput) -> new FileOutputImpl(this, fileOutput));
+          if (filesOrNull instanceof VmNull) {
+            return Map.of();
+          }
+          var files = (VmMapping) filesOrNull;
+          var result = new LinkedHashMap<String, FileOutput>();
+          files.forceAndIterateMemberValues(
+              (key, member, value) -> {
+                assert member.isEntry();
+                result.put((String) key, new FileOutputImpl(this, (VmTyped) value));
+                return true;
+              });
+          return result;
         });
   }
 
@@ -227,10 +237,10 @@ public final class EvaluatorImpl implements Evaluator {
           var expressionResult =
               switch (expression) {
                 case "module" -> module;
-                case "output.text" -> VmUtils.readTextProperty(VmUtils.readModuleOutput(module));
+                case "output.text" -> VmUtils.readTextProperty(readModuleOutput(module));
                 case "output.value" ->
-                    VmUtils.readMember(VmUtils.readModuleOutput(module), Identifier.VALUE);
+                    VmUtils.readMember(readModuleOutput(module), Identifier.VALUE);
-                case "output.bytes" -> VmUtils.readBytesProperty(VmUtils.readModuleOutput(module));
+                case "output.bytes" -> VmUtils.readBytesProperty(readModuleOutput(module));
                 default ->
                     VmUtils.evaluateExpression(module, expression, securityManager, moduleResolver);
               };
@@ -277,35 +287,12 @@ public final class EvaluatorImpl implements Evaluator {
         });
   }
 
-  @Override
-  public void evaluateCommand(
-      ModuleSource moduleSource,
-      Set<String> reservedFlagNames,
-      Set<String> reservedFlagShortNames,
-      Consumer<CommandSpec> run) {
-    doEvaluate(
-        moduleSource,
-        (module) -> {
-          var commandRunner =
-              new CommandSpecParser(
-                  moduleResolver,
-                  securityManager,
-                  frameTransformer,
-                  color,
-                  reservedFlagNames,
-                  reservedFlagShortNames,
-                  (fileOutput) -> new FileOutputImpl(this, fileOutput));
-          run.accept(commandRunner.parse(module));
-          return null;
-        });
-  }
-
   @Override
   public <T> T evaluateOutputValueAs(ModuleSource moduleSource, PClassInfo<T> classInfo) {
     return doEvaluate(
         moduleSource,
         (module) -> {
-          var output = VmUtils.readModuleOutput(module);
+          var output = readModuleOutput(module);
           var value = VmUtils.readMember(output, Identifier.VALUE);
           var valueClassInfo = VmUtils.getClass(value).getPClassInfo();
           if (valueClassInfo.equals(classInfo)) {
@@ -366,7 +353,7 @@ public final class EvaluatorImpl implements Evaluator {
     try {
       evalResult = supplier.get();
     } catch (VmStackOverflowException e) {
-      if (VmUtils.isPklBug(e)) {
+      if (isPklBug(e)) {
         throw new VmExceptionBuilder()
             .bug("Stack overflow")
             .withCause(e.getCause())
@@ -378,9 +365,6 @@ public final class EvaluatorImpl implements Evaluator {
     } catch (VmException e) {
       handleTimeout(timeoutTask);
       throw e.toPklException(frameTransformer, color);
-    } catch (PklException e) {
-      // evaluateCommand can throw PklException from the CLI layer, pass them through
-      throw e;
     } catch (Exception e) {
       throw new PklBugException(e);
     } catch (ExceptionInInitializerError e) {
@@ -395,7 +379,7 @@ public final class EvaluatorImpl implements Evaluator {
       if (e.getClass()
           .getName()
           .equals("com.oracle.truffle.polyglot.PolyglotEngineImpl$CancelExecution")) {
-        // Truffle canceled evaluation in response to polyglotContext.close(true) triggered by
+        // Truffle cancelled evaluation in response to polyglotContext.close(true) triggered by
         // TimeoutTask
         handleTimeout(timeoutTask);
         throw PklBugException.unreachableCode();
@@ -406,7 +390,7 @@ public final class EvaluatorImpl implements Evaluator {
       try {
         polyglotContext.leave();
       } catch (IllegalStateException ignored) {
-        // happens if evaluation has already been canceled with polyglotContext.close(true)
+        // happens if evaluation has already been cancelled with polyglotContext.close(true)
       }
     }
 
@@ -434,6 +418,32 @@ public final class EvaluatorImpl implements Evaluator {
             "evaluationTimedOut", (timeout.getSeconds() + timeout.getNano() / 1_000_000_000d)));
   }
 
+  private VmTyped readModuleOutput(VmTyped module) {
+    var value = VmUtils.readMember(module, Identifier.OUTPUT);
+    if (value instanceof VmTyped typedOutput
+        && typedOutput.getVmClass().getPClassInfo() == PClassInfo.ModuleOutput) {
+      return typedOutput;
+    }
+
+    var moduleUri = module.getModuleInfo().getModuleKey().getUri();
+    var builder =
+        new VmExceptionBuilder()
+            .evalError(
+                "invalidModuleOutput",
+                "output",
+                PClassInfo.ModuleOutput.getDisplayName(),
+                VmUtils.getClass(value).getPClassInfo().getDisplayName(),
+                moduleUri);
+    var outputMember = module.getMember(Identifier.OUTPUT);
+    assert outputMember != null;
+    var uriOfValueMember = outputMember.getSourceSection().getSource().getURI();
+    // If `output` was explicitly re-assigned, show that in the stack trace.
+    if (!uriOfValueMember.equals(PClassInfo.pklBaseUri)) {
+      builder.withSourceSection(outputMember.getBodySection()).withMemberName("output");
+    }
+    throw builder.build();
+  }
+
   private VmException moduleOutputValueTypeMismatch(
       VmTyped module, PClassInfo<?> expectedClassInfo, Object value, VmTyped output) {
     var moduleUri = module.getModuleInfo().getModuleKey().getUri();
@@ -472,6 +482,15 @@ public final class EvaluatorImpl implements Evaluator {
     }
   }
 
+  private boolean isPklBug(VmStackOverflowException e) {
+    // There's no good way to tell if a StackOverflowError came from Pkl, or from our
+    // implementation.
+    // This is a simple heuristic; it's pretty likely that any stack overflow error that occurs
+    // if there's less than 100 truffle frames is due to our own doing.
+    var truffleStackTraceElements = TruffleStackTrace.getStackTrace(e);
+    return truffleStackTraceElements != null && truffleStackTraceElements.size() < 100;
+  }
+
   // ScheduledFuture.cancel() is problematic, so let's handle cancellation on our own
   private final class TimeoutTask implements Runnable {
     // both fields guarded by synchronizing on `this`

pkl-core/src/main/java/org/pkl/core/JsonRenderer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -105,8 +105,7 @@ final class JsonRenderer implements ValueRenderer {
     @Override
     public void visitBytes(byte[] value) {
       throw new RendererException(
-          String.format(
+          String.format("Values of type `Bytes` cannot be rendered as JSON. Value: %s", value));
-              "Values of type `Bytes` cannot be rendered as JSON. Value: %s", (Object) value));
     }
 
     @Override

pkl-core/src/main/java/org/pkl/core/PropertiesRenderer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -110,8 +110,7 @@ final class PropertiesRenderer implements ValueRenderer {
     public String convertBytes(byte[] value) {
       throw new RendererException(
           String.format(
-              "Values of type `Bytes` cannot be rendered as Properties. Value: %s",
+              "Values of type `Bytes` cannot be rendered as Properties. Value: %s", value));
-              (Object) value));
     }
 
     @Override

pkl-core/src/main/java/org/pkl/core/SecurityManager.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,10 +15,7 @@
  */
 package org.pkl.core;
 
-import java.io.IOException;
 import java.net.URI;
-import java.nio.file.Path;
-import org.pkl.core.util.Nullable;
 
 /**
  * Enforces a security model during {@link Evaluator evaluation}.
@@ -43,20 +40,4 @@ public interface SecurityManager {
    * to access the given URI.
    */
   void checkResolveResource(URI resource) throws SecurityManagerException;
-
-  /**
-   * Resolves the given {@code file:} URI to a secure, symlink-free path that has been verified to
-   * be within the root directory (if one is configured). The returned path can be opened with
-   * {@link java.nio.file.LinkOption#NOFOLLOW_LINKS}.
-   *
-   * <p>Returns {@code null} for non-{@code file:} URIs or if no root directory is configured.
-   *
-   * @param uri the URI to resolve
-   * @return the resolved, symlink-free path under root directory, or {@code null}
-   * @throws SecurityManagerException if the resolved path is not within the root directory
-   * @throws IOException if the path cannot be resolved
-   */
-  default @Nullable Path resolveSecurePath(URI uri) throws SecurityManagerException, IOException {
-    return null;
-  }
 }

pkl-core/src/main/java/org/pkl/core/SecurityManagers.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,7 +24,6 @@ import java.util.*;
 import java.util.function.Function;
 import java.util.regex.Pattern;
 import org.pkl.core.util.ErrorMessages;
-import org.pkl.core.util.IoUtils;
 import org.pkl.core.util.Nullable;
 
 /** A provider for {@link SecurityManager}s. */
@@ -172,19 +171,6 @@ public final class SecurityManagers {
       }
     }
 
-    @Override
-    public @Nullable Path resolveSecurePath(URI uri) throws SecurityManagerException, IOException {
-      if (rootDir == null || !uri.isAbsolute() || !uri.getScheme().equals("file")) {
-        return null;
-      }
-      var path = Path.of(uri);
-      var realPath = path.toRealPath();
-      if (!realPath.startsWith(rootDir)) {
-        throw new SecurityManagerException(ErrorMessages.create("modulePastRootDir", uri, rootDir));
-      }
-      return realPath;
-    }
-
     private @Nullable Path normalizePath(@Nullable Path path) {
       if (path == null) {
         return null;
@@ -214,17 +200,13 @@ public final class SecurityManagers {
     }
 
     private void checkIsUnderRootDir(URI uri, boolean isResource) throws SecurityManagerException {
-      // handle jar:file: URIs correctly:
+      if (!uri.isAbsolute()) {
-      var checkUri =
+        throw new AssertionError("Expected absolute URI but got: " + uri);
-          uri.getScheme().equals("jar") ? IoUtils.createUri(uri.getSchemeSpecificPart()) : uri;
-
-      if (!checkUri.isAbsolute()) {
-        throw new AssertionError("Expected absolute URI but got: " + checkUri);
       }
 
-      if (rootDir == null || !checkUri.getScheme().equals("file")) return;
+      if (rootDir == null || !uri.getScheme().equals("file")) return;
 
-      var path = Path.of(checkUri);
+      var path = Path.of(uri);
       if (Files.exists(path)) {
         try {
           path = path.toRealPath();

pkl-core/src/main/java/org/pkl/core/ast/ExpressionNode.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,18 +16,12 @@
 package org.pkl.core.ast;
 
 import com.oracle.truffle.api.frame.VirtualFrame;
-import com.oracle.truffle.api.instrumentation.GenerateWrapper;
-import com.oracle.truffle.api.instrumentation.InstrumentableNode;
-import com.oracle.truffle.api.instrumentation.ProbeNode;
-import com.oracle.truffle.api.instrumentation.Tag;
 import com.oracle.truffle.api.nodes.UnexpectedResultException;
 import com.oracle.truffle.api.source.SourceSection;
-import org.pkl.core.runtime.PklTags;
 import org.pkl.core.runtime.VmTypesGen;
 import org.pkl.core.runtime.VmUtils;
 
-@GenerateWrapper
+public abstract class ExpressionNode extends PklNode {
-public abstract class ExpressionNode extends PklNode implements InstrumentableNode {
   protected ExpressionNode(SourceSection sourceSection) {
     super(sourceSection);
   }
@@ -49,19 +43,4 @@ public abstract class ExpressionNode extends PklNode implements InstrumentableNo
   public boolean executeBoolean(VirtualFrame frame) throws UnexpectedResultException {
     return VmTypesGen.expectBoolean(executeGeneric(frame));
   }
-
-  @Override
-  public boolean hasTag(Class<? extends Tag> tag) {
-    return tag == PklTags.Expression.class;
-  }
-
-  @Override
-  public boolean isInstrumentable() {
-    return true;
-  }
-
-  @Override
-  public WrapperNode createWrapper(ProbeNode probe) {
-    return new ExpressionNodeWrapper(this, probe);
-  }
 }

pkl-core/src/main/java/org/pkl/core/ast/MemberNode.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@
 package org.pkl.core.ast;
 
 import com.oracle.truffle.api.frame.FrameDescriptor;
-import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.source.SourceSection;
 import org.pkl.core.ast.member.DefaultPropertyBodyNode;
 import org.pkl.core.runtime.VmExceptionBuilder;
@@ -47,8 +46,7 @@ public abstract class MemberNode extends PklRootNode {
     return new VmExceptionBuilder().withSourceSection(getHeaderSection());
   }
 
-  public boolean isUndefined(VirtualFrame frame) {
+  public boolean isUndefined() {
-    return bodyNode instanceof DefaultPropertyBodyNode propBodyNode
+    return bodyNode instanceof DefaultPropertyBodyNode propBodyNode && propBodyNode.isUndefined();
-        && propBodyNode.isUndefined(frame);
   }
 }

pkl-core/src/main/java/org/pkl/core/ast/PklNode.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@ package org.pkl.core.ast;
 
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.dsl.TypeSystemReference;
-import com.oracle.truffle.api.instrumentation.InstrumentableNode.WrapperNode;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.nodes.NodeInfo;
 import com.oracle.truffle.api.source.SourceSection;
@@ -39,10 +38,7 @@ public abstract class PklNode extends Node {
   }
 
   @Override
-  public final SourceSection getSourceSection() {
+  public SourceSection getSourceSection() {
-    if (this instanceof WrapperNode wrapperNode) {
-      return wrapperNode.getDelegateNode().getSourceSection();
-    }
     return sourceSection;
   }
 

pkl-core/src/main/java/org/pkl/core/ast/VmModifier.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -146,10 +146,6 @@ public final class VmModifier {
     return (modifiers & (LOCAL | EXTERNAL | ABSTRACT)) != 0;
   }
 
-  public static boolean isLocalOrExternalOrAbstractOrFixedOrConst(int modifiers) {
-    return (modifiers & (LOCAL | EXTERNAL | ABSTRACT | FIXED | CONST)) != 0;
-  }
-
   public static boolean isConstOrFixed(int modifiers) {
     return (modifiers & (CONST | FIXED)) != 0;
   }

pkl-core/src/main/java/org/pkl/core/ast/builder/AstBuilder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -2449,7 +2449,8 @@ public class AstBuilder extends AbstractAstBuilder<Object> {
       if (dataSizeUnit != null) {
         //noinspection ConstantConditions
         return new ConstantValueNode(
-            sourceSection, new VmDataSize(intLiteralNode.executeInt(null), dataSizeUnit));
+            sourceSection,
+            new VmDataSize(((IntLiteralNode) receiver).executeInt(null), dataSizeUnit));
       }
     }
 
@@ -2464,7 +2465,8 @@ public class AstBuilder extends AbstractAstBuilder<Object> {
       if (dataSizeUnit != null) {
         //noinspection ConstantConditions
         return new ConstantValueNode(
-            sourceSection, new VmDataSize(floatLiteralNode.executeFloat(null), dataSizeUnit));
+            sourceSection,
+            new VmDataSize(((FloatLiteralNode) receiver).executeFloat(null), dataSizeUnit));
       }
     }
 
@@ -2813,7 +2815,7 @@ public class AstBuilder extends AbstractAstBuilder<Object> {
       throw exceptionBuilder()
           .evalError(e.getMessage(), e.getMessageArguments())
           .withCause(e.getCause())
-          .withHintBuilder(e.getHintBuilder())
+          .withHint(e.getHint())
           .withSourceSection(createSourceSection(ctx))
           .build();
     } catch (ExternalReaderProcessException e) {

pkl-core/src/main/java/org/pkl/core/ast/builder/SymbolTable.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -327,8 +327,6 @@ public final class SymbolTable {
     }
 
     public final boolean isClassMemberScope() {
-      var effectiveScope = skipLambdaScopes();
-      var parent = effectiveScope.parent;
       if (parent == null) return false;
 
       return parent.isClassScope()

pkl-core/src/main/java/org/pkl/core/ast/expression/binary/ComparatorNode.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,13 +15,12 @@
  */
 package org.pkl.core.ast.expression.binary;
 
-import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.source.SourceSection;
 
 public abstract class ComparatorNode extends BinaryExpressionNode {
-  protected ComparatorNode(SourceSection sourceSection) {
+  public ComparatorNode(SourceSection sourceSection) {
     super(sourceSection);
   }
 
-  public abstract boolean executeWith(VirtualFrame frame, Object left, Object right);
+  public abstract boolean executeWith(Object left, Object right);
 }

pkl-core/src/main/java/org/pkl/core/ast/expression/binary/GreaterThanNode.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,15 +17,12 @@ package org.pkl.core.ast.expression.binary;
 
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.dsl.Specialization;
-import com.oracle.truffle.api.instrumentation.GenerateWrapper;
-import com.oracle.truffle.api.instrumentation.ProbeNode;
 import com.oracle.truffle.api.nodes.NodeInfo;
 import com.oracle.truffle.api.source.SourceSection;
 import org.pkl.core.runtime.VmDataSize;
 import org.pkl.core.runtime.VmDuration;
 
 @NodeInfo(shortName = ">")
-@GenerateWrapper
 public abstract class GreaterThanNode extends ComparatorNode {
   protected GreaterThanNode(SourceSection sourceSection) {
     super(sourceSection);
@@ -66,9 +63,4 @@ public abstract class GreaterThanNode extends ComparatorNode {
   protected boolean eval(VmDataSize left, VmDataSize right) {
     return left.compareTo(right) > 0;
   }
-
-  @Override
-  public WrapperNode createWrapper(ProbeNode probe) {
-    return new GreaterThanNodeWrapper(sourceSection, this, probe);
-  }
 }