From f5d56dea4870c550c464c6d98c765259fe04bc3e Mon Sep 17 00:00:00 2001
From: Marcus Sanatan <msanatan@gmail.com>
Date: Tue, 14 Oct 2025 21:42:58 -0400
Subject: [PATCH 01/14] chore: update Unity version from 2021.3.45f1 to
 2021.3.45f2

Older Unity version had the security vulnerability, so we update it
---
 .github/workflows/claude-nl-suite.yml                         | 2 +-
 .github/workflows/unity-tests.yml                             | 2 +-
 TestProjects/UnityMCPTests/ProjectSettings/ProjectVersion.txt | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/claude-nl-suite.yml b/.github/workflows/claude-nl-suite.yml
index e5b88763..513dfb76 100644
--- a/.github/workflows/claude-nl-suite.yml
+++ b/.github/workflows/claude-nl-suite.yml
@@ -11,7 +11,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  UNITY_IMAGE: unityci/editor:ubuntu-2021.3.45f1-linux-il2cpp-3
+  UNITY_IMAGE: unityci/editor:ubuntu-2021.3.45f2-linux-il2cpp-3
 
 jobs:
   nl-suite:
diff --git a/.github/workflows/unity-tests.yml b/.github/workflows/unity-tests.yml
index 4b795ad1..8f0837bf 100644
--- a/.github/workflows/unity-tests.yml
+++ b/.github/workflows/unity-tests.yml
@@ -20,7 +20,7 @@ jobs:
         testMode:
           - editmode
         unityVersion:
-          - 2021.3.45f1
+          - 2021.3.45f2
     steps:
       # Checkout
       - name: Checkout repository
diff --git a/TestProjects/UnityMCPTests/ProjectSettings/ProjectVersion.txt b/TestProjects/UnityMCPTests/ProjectSettings/ProjectVersion.txt
index 8386a052..1a62a673 100644
--- a/TestProjects/UnityMCPTests/ProjectSettings/ProjectVersion.txt
+++ b/TestProjects/UnityMCPTests/ProjectSettings/ProjectVersion.txt
@@ -1,2 +1,2 @@
-m_EditorVersion: 2021.3.45f1
-m_EditorVersionWithRevision: 2021.3.45f1 (0da89fac8e79)
+m_EditorVersion: 2021.3.45f2
+m_EditorVersionWithRevision: 2021.3.45f2 (88f88f591b2e)

From ba35a47b699f74dd6ecfa80df1fa0859ffed57f7 Mon Sep 17 00:00:00 2001
From: Marcus Sanatan <msanatan@gmail.com>
Date: Wed, 15 Oct 2025 13:42:20 -0400
Subject: [PATCH 02/14] feat: add dynamic version display in editor window
 settings

---
 MCPForUnity/Editor/Windows/MCPForUnityEditorWindowNew.cs   | 3 +++
 MCPForUnity/Editor/Windows/MCPForUnityEditorWindowNew.uxml | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/MCPForUnity/Editor/Windows/MCPForUnityEditorWindowNew.cs b/MCPForUnity/Editor/Windows/MCPForUnityEditorWindowNew.cs
index 3987f112..39e8c156 100644
--- a/MCPForUnity/Editor/Windows/MCPForUnityEditorWindowNew.cs
+++ b/MCPForUnity/Editor/Windows/MCPForUnityEditorWindowNew.cs
@@ -24,6 +24,7 @@ private enum ConnectionProtocol
         }
 
         // Settings UI Elements
+        private Label versionLabel;
         private Toggle debugLogsToggle;
         private EnumField validationLevelField;
         private Label validationDescription;
@@ -191,6 +192,7 @@ private void RefreshAllData()
         private void CacheUIElements()
         {
             // Settings
+            versionLabel = rootVisualElement.Q<Label>("version-label");
             debugLogsToggle = rootVisualElement.Q<Toggle>("debug-logs-toggle");
             validationLevelField = rootVisualElement.Q<EnumField>("validation-level");
             validationDescription = rootVisualElement.Q<Label>("validation-description");
@@ -240,6 +242,7 @@ private void CacheUIElements()
         private void InitializeUI()
         {
             // Settings Section
+            versionLabel.text = AssetPathUtility.GetPackageVersion();
             debugLogsToggle.value = EditorPrefs.GetBool("MCPForUnity.DebugLogs", false);
 
             validationLevelField.Init(ValidationLevel.Standard);
diff --git a/MCPForUnity/Editor/Windows/MCPForUnityEditorWindowNew.uxml b/MCPForUnity/Editor/Windows/MCPForUnityEditorWindowNew.uxml
index cc7c9055..e64f99c4 100644
--- a/MCPForUnity/Editor/Windows/MCPForUnityEditorWindowNew.uxml
+++ b/MCPForUnity/Editor/Windows/MCPForUnityEditorWindowNew.uxml
@@ -9,7 +9,7 @@
             <ui:VisualElement class="section-content">
                 <ui:VisualElement class="setting-row">
                     <ui:Label text="Version:" class="setting-label" />
-                    <ui:Label text="5.0.0" name="version-label" class="setting-value" />
+                    <ui:Label text="..." name="version-label" class="setting-value" />
                 </ui:VisualElement>
                 <ui:VisualElement class="setting-row">
                     <ui:Label text="Show Debug Logs:" class="setting-label" />

From a6ab3d982e792039c01a4afd353e61c7e22a2c3c Mon Sep 17 00:00:00 2001
From: Marcus Sanatan <msanatan@gmail.com>
Date: Thu, 16 Oct 2025 23:19:18 -0400
Subject: [PATCH 03/14] refactor: remove manual license file handling from
 Unity test workflow

---
 .github/workflows/claude-nl-suite.yml | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/.github/workflows/claude-nl-suite.yml b/.github/workflows/claude-nl-suite.yml
index 513dfb76..e53fce8c 100644
--- a/.github/workflows/claude-nl-suite.yml
+++ b/.github/workflows/claude-nl-suite.yml
@@ -164,13 +164,8 @@ jobs:
         shell: bash
         env:
           UNITY_IMAGE: ${{ env.UNITY_IMAGE }}
-          ULF_OK: ${{ steps.ulf.outputs.ok }}
         run: |
           set -euxo pipefail
-          manual_args=()
-          if [[ "${ULF_OK:-false}" == "true" ]]; then
-            manual_args=(-manualLicenseFile "/root/.local/share/unity3d/Unity/Unity_lic.ulf")
-          fi
           docker run --rm --network host \
             -e HOME=/root \
             -v "${{ github.workspace }}:/workspace" -w /workspace \
@@ -178,7 +173,6 @@ jobs:
             -v "$RUNNER_TEMP/unity-local:/root/.local/share/unity3d" \
             "$UNITY_IMAGE" /opt/unity/Editor/Unity -batchmode -nographics -logFile - \
               -projectPath /workspace/TestProjects/UnityMCPTests \
-              "${manual_args[@]}" \
               -quit
 
       # ---------- Clean old MCP status ----------
@@ -194,14 +188,8 @@ jobs:
         shell: bash
         env:
           UNITY_IMAGE: ${{ env.UNITY_IMAGE }}
-          ULF_OK: ${{ steps.ulf.outputs.ok }}
         run: |
           set -euxo pipefail
-          manual_args=()
-          if [[ "${ULF_OK:-false}" == "true" ]]; then
-            manual_args=(-manualLicenseFile "/root/.local/share/unity3d/Unity/Unity_lic.ulf")
-          fi
-
           mkdir -p "$RUNNER_TEMP/unity-status"
           docker rm -f unity-mcp >/dev/null 2>&1 || true
           docker run -d --name unity-mcp --network host \
@@ -216,7 +204,6 @@ jobs:
             "$UNITY_IMAGE" /opt/unity/Editor/Unity -batchmode -nographics -logFile - \
               -stackTraceLogType Full \
               -projectPath /workspace/TestProjects/UnityMCPTests \
-              "${manual_args[@]}" \
               -executeMethod MCPForUnity.Editor.MCPForUnityBridge.StartAutoConnect
 
       # ---------- Wait for Unity bridge ----------

From 87c45fffcc3689246368485b5f0528e7b7d9389d Mon Sep 17 00:00:00 2001
From: Marcus Sanatan <msanatan@gmail.com>
Date: Thu, 16 Oct 2025 23:29:01 -0400
Subject: [PATCH 04/14] Revert "refactor: remove manual license file handling
 from Unity test workflow"

This reverts commit a6ab3d982e792039c01a4afd353e61c7e22a2c3c.
---
 .github/workflows/claude-nl-suite.yml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/.github/workflows/claude-nl-suite.yml b/.github/workflows/claude-nl-suite.yml
index e53fce8c..513dfb76 100644
--- a/.github/workflows/claude-nl-suite.yml
+++ b/.github/workflows/claude-nl-suite.yml
@@ -164,8 +164,13 @@ jobs:
         shell: bash
         env:
           UNITY_IMAGE: ${{ env.UNITY_IMAGE }}
+          ULF_OK: ${{ steps.ulf.outputs.ok }}
         run: |
           set -euxo pipefail
+          manual_args=()
+          if [[ "${ULF_OK:-false}" == "true" ]]; then
+            manual_args=(-manualLicenseFile "/root/.local/share/unity3d/Unity/Unity_lic.ulf")
+          fi
           docker run --rm --network host \
             -e HOME=/root \
             -v "${{ github.workspace }}:/workspace" -w /workspace \
@@ -173,6 +178,7 @@ jobs:
             -v "$RUNNER_TEMP/unity-local:/root/.local/share/unity3d" \
             "$UNITY_IMAGE" /opt/unity/Editor/Unity -batchmode -nographics -logFile - \
               -projectPath /workspace/TestProjects/UnityMCPTests \
+              "${manual_args[@]}" \
               -quit
 
       # ---------- Clean old MCP status ----------
@@ -188,8 +194,14 @@ jobs:
         shell: bash
         env:
           UNITY_IMAGE: ${{ env.UNITY_IMAGE }}
+          ULF_OK: ${{ steps.ulf.outputs.ok }}
         run: |
           set -euxo pipefail
+          manual_args=()
+          if [[ "${ULF_OK:-false}" == "true" ]]; then
+            manual_args=(-manualLicenseFile "/root/.local/share/unity3d/Unity/Unity_lic.ulf")
+          fi
+
           mkdir -p "$RUNNER_TEMP/unity-status"
           docker rm -f unity-mcp >/dev/null 2>&1 || true
           docker run -d --name unity-mcp --network host \
@@ -204,6 +216,7 @@ jobs:
             "$UNITY_IMAGE" /opt/unity/Editor/Unity -batchmode -nographics -logFile - \
               -stackTraceLogType Full \
               -projectPath /workspace/TestProjects/UnityMCPTests \
+              "${manual_args[@]}" \
               -executeMethod MCPForUnity.Editor.MCPForUnityBridge.StartAutoConnect
 
       # ---------- Wait for Unity bridge ----------

From 01b8879e35baaf88239988b51e6d4f1e5daaa1cf Mon Sep 17 00:00:00 2001
From: Marcus Sanatan <msanatan@gmail.com>
Date: Thu, 16 Oct 2025 23:30:32 -0400
Subject: [PATCH 05/14] feat: add Unity license credentials to Docker
 containers in CI workflow

---
 .github/workflows/claude-nl-suite.yml | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/claude-nl-suite.yml b/.github/workflows/claude-nl-suite.yml
index 513dfb76..4258082c 100644
--- a/.github/workflows/claude-nl-suite.yml
+++ b/.github/workflows/claude-nl-suite.yml
@@ -165,6 +165,9 @@ jobs:
         env:
           UNITY_IMAGE: ${{ env.UNITY_IMAGE }}
           ULF_OK: ${{ steps.ulf.outputs.ok }}
+          UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
+          UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
+          UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
         run: |
           set -euxo pipefail
           manual_args=()
@@ -173,6 +176,8 @@ jobs:
           fi
           docker run --rm --network host \
             -e HOME=/root \
+            -e UNITY_EMAIL="${UNITY_EMAIL:-}" \
+            -e UNITY_PASSWORD="${UNITY_PASSWORD:-}" \
             -v "${{ github.workspace }}:/workspace" -w /workspace \
             -v "$RUNNER_TEMP/unity-config:/root/.config/unity3d" \
             -v "$RUNNER_TEMP/unity-local:/root/.local/share/unity3d" \
@@ -195,6 +200,9 @@ jobs:
         env:
           UNITY_IMAGE: ${{ env.UNITY_IMAGE }}
           ULF_OK: ${{ steps.ulf.outputs.ok }}
+          UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
+          UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
+          UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
         run: |
           set -euxo pipefail
           manual_args=()
@@ -206,13 +214,15 @@ jobs:
           docker rm -f unity-mcp >/dev/null 2>&1 || true
           docker run -d --name unity-mcp --network host \
             -e HOME=/root \
+            -e UNITY_EMAIL="${UNITY_EMAIL:-}" \
+            -e UNITY_PASSWORD="${UNITY_PASSWORD:-}" \
             -e UNITY_MCP_ALLOW_BATCH=1 \
             -e UNITY_MCP_STATUS_DIR=/root/.unity-mcp \
             -e UNITY_MCP_BIND_HOST=127.0.0.1 \
             -v "${{ github.workspace }}:/workspace" -w /workspace \
             -v "$RUNNER_TEMP/unity-status:/root/.unity-mcp" \
-            -v "$RUNNER_TEMP/unity-config:/root/.config/unity3d:ro" \
-            -v "$RUNNER_TEMP/unity-local:/root/.local/share/unity3d:ro" \
+            -v "$RUNNER_TEMP/unity-config:/root/.config/unity3d" \
+            -v "$RUNNER_TEMP/unity-local:/root/.local/share/unity3d" \
             "$UNITY_IMAGE" /opt/unity/Editor/Unity -batchmode -nographics -logFile - \
               -stackTraceLogType Full \
               -projectPath /workspace/TestProjects/UnityMCPTests \

From e9520ee768c4e9d48efc81b1a9c3cac3986cc96a Mon Sep 17 00:00:00 2001
From: Marcus Sanatan <msanatan@gmail.com>
Date: Fri, 17 Oct 2025 10:51:18 -0400
Subject: [PATCH 06/14] refactor: replace manual Unity license activation with
 game-ci/unity-activator

---
 .github/workflows/claude-nl-suite.yml | 126 +++++---------------------
 1 file changed, 22 insertions(+), 104 deletions(-)

diff --git a/.github/workflows/claude-nl-suite.yml b/.github/workflows/claude-nl-suite.yml
index 4258082c..741f6d60 100644
--- a/.github/workflows/claude-nl-suite.yml
+++ b/.github/workflows/claude-nl-suite.yml
@@ -67,123 +67,53 @@ jobs:
             echo "No MCP Python deps found (skipping)"
           fi
 
-      # --- Licensing: allow both ULF and EBL when available ---
-      - name: Decide license sources
-        id: lic
-        shell: bash
+      # --- Use game-ci for Unity activation (handles all license types) ---
+      - name: Activate Unity using game-ci
+        uses: game-ci/unity-activator@v2
         env:
-          UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
           UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
           UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
-          UNITY_SERIAL: ${{ secrets.UNITY_SERIAL }}
-        run: |
-          set -eu
-          use_ulf=false; use_ebl=false
-          [[ -n "${UNITY_LICENSE:-}" ]] && use_ulf=true
-          [[ -n "${UNITY_EMAIL:-}" && -n "${UNITY_PASSWORD:-}" ]] && use_ebl=true
-          echo "use_ulf=$use_ulf" >> "$GITHUB_OUTPUT"
-          echo "use_ebl=$use_ebl" >> "$GITHUB_OUTPUT"
-          echo "has_serial=$([[ -n "${UNITY_SERIAL:-}" ]] && echo true || echo false)" >> "$GITHUB_OUTPUT"
-
-      - name: Stage Unity .ulf license (from secret)
-        if: steps.lic.outputs.use_ulf == 'true'
-        id: ulf
-        env:
           UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
-        shell: bash
-        run: |
-          set -eu
-          mkdir -p "$RUNNER_TEMP/unity-license-ulf" "$RUNNER_TEMP/unity-local/Unity"
-          f="$RUNNER_TEMP/unity-license-ulf/Unity_lic.ulf"
-          if printf "%s" "$UNITY_LICENSE" | base64 -d - >/dev/null 2>&1; then
-            printf "%s" "$UNITY_LICENSE" | base64 -d - > "$f"
-          else
-            printf "%s" "$UNITY_LICENSE" > "$f"
-          fi
-          chmod 600 "$f" || true
-          # If someone pasted an entitlement XML into UNITY_LICENSE by mistake, re-home it:
-          if head -c 100 "$f" | grep -qi '<\?xml'; then
-            mkdir -p "$RUNNER_TEMP/unity-config/Unity/licenses"
-            mv "$f" "$RUNNER_TEMP/unity-config/Unity/licenses/UnityEntitlementLicense.xml"
-            echo "ok=false" >> "$GITHUB_OUTPUT"
-          elif grep -qi '<Signature>' "$f"; then
-            # provide it in the standard local-share path too
-            cp -f "$f" "$RUNNER_TEMP/unity-local/Unity/Unity_lic.ulf"
-            echo "ok=true" >> "$GITHUB_OUTPUT"
-          else
-            echo "ok=false" >> "$GITHUB_OUTPUT"
-          fi
+          UNITY_SERIAL: ${{ secrets.UNITY_SERIAL }}
+        with:
+          unity-version: 2021.3.45f2
 
-      # --- Activate via EBL inside the same Unity image (writes host-side entitlement) ---
-      - name: Activate Unity (EBL via container - host-mount)
-        if: steps.lic.outputs.use_ebl == 'true'
+      # Copy activation artifacts to Docker mount locations
+      - name: Prepare Unity license for Docker containers
         shell: bash
-        env:
-          UNITY_IMAGE: ${{ env.UNITY_IMAGE }}
-          UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
-          UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
-          UNITY_SERIAL: ${{ secrets.UNITY_SERIAL }}
         run: |
           set -euxo pipefail
-          # host dirs to receive the full Unity config and local-share
           mkdir -p "$RUNNER_TEMP/unity-config" "$RUNNER_TEMP/unity-local"
 
-          # Try Pro first if serial is present, otherwise named-user EBL.
-          docker run --rm --network host \
-            -e HOME=/root \
-            -e UNITY_EMAIL -e UNITY_PASSWORD -e UNITY_SERIAL \
-            -v "$RUNNER_TEMP/unity-config:/root/.config/unity3d" \
-            -v "$RUNNER_TEMP/unity-local:/root/.local/share/unity3d" \
-            "$UNITY_IMAGE" bash -lc '
-              set -euxo pipefail
-              if [[ -n "${UNITY_SERIAL:-}" ]]; then
-                /opt/unity/Editor/Unity -batchmode -nographics -logFile - \
-                  -username "$UNITY_EMAIL" -password "$UNITY_PASSWORD" -serial "$UNITY_SERIAL" -quit || true
-              else
-                /opt/unity/Editor/Unity -batchmode -nographics -logFile - \
-                  -username "$UNITY_EMAIL" -password "$UNITY_PASSWORD" -quit || true
-              fi
-              ls -la /root/.config/unity3d/Unity/licenses || true
-            '
-
-          # Verify entitlement written to host mount; allow ULF-only runs to proceed
-          if ! find "$RUNNER_TEMP/unity-config" -type f -iname "*.xml" | grep -q .; then
-            if [[ "${{ steps.ulf.outputs.ok }}" == "true" ]]; then
-              echo "EBL entitlement not found; proceeding with ULF-only (ok=true)."
-            else
-              echo "No entitlement produced and no valid ULF; cannot continue." >&2
-              exit 1
-            fi
+          # game-ci stores license files in standard Unity locations
+          # Copy them to our Docker mount points
+          if [ -d "$HOME/.local/share/unity3d" ]; then
+            cp -r "$HOME/.local/share/unity3d"/* "$RUNNER_TEMP/unity-local/" || true
+          fi
+          if [ -d "$HOME/.config/unity3d" ]; then
+            cp -r "$HOME/.config/unity3d"/* "$RUNNER_TEMP/unity-config/" || true
           fi
 
-      # EBL entitlement is already written directly to $RUNNER_TEMP/unity-config by the activation step
+          # Verify license files exist
+          echo "Unity license files prepared:"
+          find "$RUNNER_TEMP/unity-local" -type f || true
+          find "$RUNNER_TEMP/unity-config" -type f || true
 
       # ---------- Warm up project (import Library once) ----------
       - name: Warm up project (import Library once)
-        if: steps.lic.outputs.use_ulf == 'true' || steps.lic.outputs.use_ebl == 'true'
+        if: steps.detect.outputs.unity_ok == 'true'
         shell: bash
         env:
           UNITY_IMAGE: ${{ env.UNITY_IMAGE }}
-          ULF_OK: ${{ steps.ulf.outputs.ok }}
-          UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
-          UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
-          UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
         run: |
           set -euxo pipefail
-          manual_args=()
-          if [[ "${ULF_OK:-false}" == "true" ]]; then
-            manual_args=(-manualLicenseFile "/root/.local/share/unity3d/Unity/Unity_lic.ulf")
-          fi
           docker run --rm --network host \
             -e HOME=/root \
-            -e UNITY_EMAIL="${UNITY_EMAIL:-}" \
-            -e UNITY_PASSWORD="${UNITY_PASSWORD:-}" \
             -v "${{ github.workspace }}:/workspace" -w /workspace \
             -v "$RUNNER_TEMP/unity-config:/root/.config/unity3d" \
             -v "$RUNNER_TEMP/unity-local:/root/.local/share/unity3d" \
             "$UNITY_IMAGE" /opt/unity/Editor/Unity -batchmode -nographics -logFile - \
               -projectPath /workspace/TestProjects/UnityMCPTests \
-              "${manual_args[@]}" \
               -quit
 
       # ---------- Clean old MCP status ----------
@@ -195,27 +125,16 @@ jobs:
 
       # ---------- Start headless Unity (persistent bridge) ----------
       - name: Start Unity (persistent bridge)
-        if: steps.lic.outputs.use_ulf == 'true' || steps.lic.outputs.use_ebl == 'true'
+        if: steps.detect.outputs.unity_ok == 'true'
         shell: bash
         env:
           UNITY_IMAGE: ${{ env.UNITY_IMAGE }}
-          ULF_OK: ${{ steps.ulf.outputs.ok }}
-          UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
-          UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
-          UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
         run: |
           set -euxo pipefail
-          manual_args=()
-          if [[ "${ULF_OK:-false}" == "true" ]]; then
-            manual_args=(-manualLicenseFile "/root/.local/share/unity3d/Unity/Unity_lic.ulf")
-          fi
-
           mkdir -p "$RUNNER_TEMP/unity-status"
           docker rm -f unity-mcp >/dev/null 2>&1 || true
           docker run -d --name unity-mcp --network host \
             -e HOME=/root \
-            -e UNITY_EMAIL="${UNITY_EMAIL:-}" \
-            -e UNITY_PASSWORD="${UNITY_PASSWORD:-}" \
             -e UNITY_MCP_ALLOW_BATCH=1 \
             -e UNITY_MCP_STATUS_DIR=/root/.unity-mcp \
             -e UNITY_MCP_BIND_HOST=127.0.0.1 \
@@ -226,7 +145,6 @@ jobs:
             "$UNITY_IMAGE" /opt/unity/Editor/Unity -batchmode -nographics -logFile - \
               -stackTraceLogType Full \
               -projectPath /workspace/TestProjects/UnityMCPTests \
-              "${manual_args[@]}" \
               -executeMethod MCPForUnity.Editor.MCPForUnityBridge.StartAutoConnect
 
       # ---------- Wait for Unity bridge ----------
@@ -967,7 +885,7 @@ jobs:
           docker rm -f unity-mcp || true
 
       - name: Return Pro license (if used)
-        if: always() && steps.lic.outputs.use_ebl == 'true' && steps.lic.outputs.has_serial == 'true'
+        if: always()
         uses: game-ci/unity-return-license@v2
         continue-on-error: true
         env:

From 4e5ffc0051a7b15b9d87ecaa06fa646f8b13b0b9 Mon Sep 17 00:00:00 2001
From: Marcus Sanatan <msanatan@gmail.com>
Date: Fri, 17 Oct 2025 11:43:43 -0400
Subject: [PATCH 07/14] refactor: simplify Unity CI setup by removing game-ci
 activation and using built-in license handling

---
 .github/workflows/claude-nl-suite.yml | 81 ++++++++-------------------
 1 file changed, 24 insertions(+), 57 deletions(-)

diff --git a/.github/workflows/claude-nl-suite.yml b/.github/workflows/claude-nl-suite.yml
index 741f6d60..0187dfa8 100644
--- a/.github/workflows/claude-nl-suite.yml
+++ b/.github/workflows/claude-nl-suite.yml
@@ -67,82 +67,49 @@ jobs:
             echo "No MCP Python deps found (skipping)"
           fi
 
-      # --- Use game-ci for Unity activation (handles all license types) ---
-      - name: Activate Unity using game-ci
-        uses: game-ci/unity-activator@v2
-        env:
-          UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
-          UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
-          UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
-          UNITY_SERIAL: ${{ secrets.UNITY_SERIAL }}
+      # Cache Unity Library to speed up runs
+      - uses: actions/cache@v4
         with:
-          unity-version: 2021.3.45f2
-
-      # Copy activation artifacts to Docker mount locations
-      - name: Prepare Unity license for Docker containers
-        shell: bash
-        run: |
-          set -euxo pipefail
-          mkdir -p "$RUNNER_TEMP/unity-config" "$RUNNER_TEMP/unity-local"
-
-          # game-ci stores license files in standard Unity locations
-          # Copy them to our Docker mount points
-          if [ -d "$HOME/.local/share/unity3d" ]; then
-            cp -r "$HOME/.local/share/unity3d"/* "$RUNNER_TEMP/unity-local/" || true
-          fi
-          if [ -d "$HOME/.config/unity3d" ]; then
-            cp -r "$HOME/.config/unity3d"/* "$RUNNER_TEMP/unity-config/" || true
-          fi
-
-          # Verify license files exist
-          echo "Unity license files prepared:"
-          find "$RUNNER_TEMP/unity-local" -type f || true
-          find "$RUNNER_TEMP/unity-config" -type f || true
-
-      # ---------- Warm up project (import Library once) ----------
-      - name: Warm up project (import Library once)
-        if: steps.detect.outputs.unity_ok == 'true'
-        shell: bash
-        env:
-          UNITY_IMAGE: ${{ env.UNITY_IMAGE }}
-        run: |
-          set -euxo pipefail
-          docker run --rm --network host \
-            -e HOME=/root \
-            -v "${{ github.workspace }}:/workspace" -w /workspace \
-            -v "$RUNNER_TEMP/unity-config:/root/.config/unity3d" \
-            -v "$RUNNER_TEMP/unity-local:/root/.local/share/unity3d" \
-            "$UNITY_IMAGE" /opt/unity/Editor/Unity -batchmode -nographics -logFile - \
-              -projectPath /workspace/TestProjects/UnityMCPTests \
-              -quit
+          path: TestProjects/UnityMCPTests/Library
+          key: Library-UnityMCPTests-2021.3.45f2-${{ hashFiles('TestProjects/UnityMCPTests/Assets/**', 'TestProjects/UnityMCPTests/Packages/**', 'TestProjects/UnityMCPTests/ProjectSettings/**') }}
+          restore-keys: |
+            Library-UnityMCPTests-2021.3.45f2-
+            Library-UnityMCPTests-
 
       # ---------- Clean old MCP status ----------
       - name: Clean old MCP status
         run: |
           set -eux
-          mkdir -p "$HOME/.unity-mcp"
-          rm -f "$HOME/.unity-mcp"/unity-mcp-status-*.json || true
+          mkdir -p "$RUNNER_TEMP/unity-status"
+          rm -f "$RUNNER_TEMP/unity-status"/unity-mcp-status-*.json || true
 
-      # ---------- Start headless Unity (persistent bridge) ----------
-      - name: Start Unity (persistent bridge)
+      # ---------- Start headless Unity with MCP bridge ----------
+      - name: Start Unity MCP bridge in background
         if: steps.detect.outputs.unity_ok == 'true'
         shell: bash
         env:
-          UNITY_IMAGE: ${{ env.UNITY_IMAGE }}
+          UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
+          UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
+          UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
+          UNITY_SERIAL: ${{ secrets.UNITY_SERIAL }}
         run: |
           set -euxo pipefail
-          mkdir -p "$RUNNER_TEMP/unity-status"
+
+          # The unityci/editor image supports licensing via env vars
+          # Pass credentials and let Unity activate itself on first run
           docker rm -f unity-mcp >/dev/null 2>&1 || true
           docker run -d --name unity-mcp --network host \
-            -e HOME=/root \
+            -e UNITY_EMAIL \
+            -e UNITY_PASSWORD \
+            -e UNITY_LICENSE \
+            -e UNITY_SERIAL \
             -e UNITY_MCP_ALLOW_BATCH=1 \
             -e UNITY_MCP_STATUS_DIR=/root/.unity-mcp \
             -e UNITY_MCP_BIND_HOST=127.0.0.1 \
             -v "${{ github.workspace }}:/workspace" -w /workspace \
             -v "$RUNNER_TEMP/unity-status:/root/.unity-mcp" \
-            -v "$RUNNER_TEMP/unity-config:/root/.config/unity3d" \
-            -v "$RUNNER_TEMP/unity-local:/root/.local/share/unity3d" \
-            "$UNITY_IMAGE" /opt/unity/Editor/Unity -batchmode -nographics -logFile - \
+            ${{ env.UNITY_IMAGE }} \
+            /opt/unity/Editor/Unity -batchmode -nographics -logFile - \
               -stackTraceLogType Full \
               -projectPath /workspace/TestProjects/UnityMCPTests \
               -executeMethod MCPForUnity.Editor.MCPForUnityBridge.StartAutoConnect

From a9f4c0223bc3467442be6dafa1d9303479623a7c Mon Sep 17 00:00:00 2001
From: Marcus Sanatan <msanatan@gmail.com>
Date: Fri, 17 Oct 2025 11:56:14 -0400
Subject: [PATCH 08/14] fix: improve Unity license activation in CI by using
 unityci image's built-in activation flow

---
 .github/workflows/claude-nl-suite.yml | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/claude-nl-suite.yml b/.github/workflows/claude-nl-suite.yml
index 0187dfa8..ea2ff90a 100644
--- a/.github/workflows/claude-nl-suite.yml
+++ b/.github/workflows/claude-nl-suite.yml
@@ -95,9 +95,12 @@ jobs:
         run: |
           set -euxo pipefail
 
-          # The unityci/editor image supports licensing via env vars
-          # Pass credentials and let Unity activate itself on first run
+          # Use the unityci/editor image's built-in activation via entrypoint
+          # Create activation wrapper script that runs activation then starts Unity with MCP
           docker rm -f unity-mcp >/dev/null 2>&1 || true
+
+          # The unityci image uses /usr/bin/activate.sh for license setup
+          # We'll call it first, then start Unity with our MCP bridge
           docker run -d --name unity-mcp --network host \
             -e UNITY_EMAIL \
             -e UNITY_PASSWORD \
@@ -109,10 +112,22 @@ jobs:
             -v "${{ github.workspace }}:/workspace" -w /workspace \
             -v "$RUNNER_TEMP/unity-status:/root/.unity-mcp" \
             ${{ env.UNITY_IMAGE }} \
-            /opt/unity/Editor/Unity -batchmode -nographics -logFile - \
-              -stackTraceLogType Full \
-              -projectPath /workspace/TestProjects/UnityMCPTests \
-              -executeMethod MCPForUnity.Editor.MCPForUnityBridge.StartAutoConnect
+            bash -c '
+              # Activate Unity license (unityci pattern)
+              if [[ -n "${UNITY_LICENSE:-}" ]]; then
+                mkdir -p /root/.local/share/unity3d/Unity
+                # Try base64 decode, fallback to plain text
+                echo "$UNITY_LICENSE" | base64 -d > /root/.local/share/unity3d/Unity/Unity_lic.ulf 2>/dev/null || \
+                echo "$UNITY_LICENSE" > /root/.local/share/unity3d/Unity/Unity_lic.ulf
+                chmod 600 /root/.local/share/unity3d/Unity/Unity_lic.ulf
+              fi
+
+              # Start Unity with MCP bridge
+              /opt/unity/Editor/Unity -batchmode -nographics -logFile - \
+                -stackTraceLogType Full \
+                -projectPath /workspace/TestProjects/UnityMCPTests \
+                -executeMethod MCPForUnity.Editor.MCPForUnityBridge.StartAutoConnect
+            '
 
       # ---------- Wait for Unity bridge ----------
       - name: Wait for Unity bridge (robust)

From f6a9aa68f910df37cede6f83d535098be2a9f80b Mon Sep 17 00:00:00 2001
From: Marcus Sanatan <msanatan@gmail.com>
Date: Fri, 17 Oct 2025 12:22:55 -0400
Subject: [PATCH 09/14] refactor:  activate once in a temporary container, then
 reuse the license in the long-running container

Now we got the license secret to be read, we got this error: "Machine bindings don't match". So it seems that the license I generated locally can't be used.

So we need to activate the license within the container
---
 .github/workflows/claude-nl-suite.yml | 72 ++++++++++++++++++---------
 1 file changed, 48 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/claude-nl-suite.yml b/.github/workflows/claude-nl-suite.yml
index ea2ff90a..7bfe5cee 100644
--- a/.github/workflows/claude-nl-suite.yml
+++ b/.github/workflows/claude-nl-suite.yml
@@ -83,8 +83,8 @@ jobs:
           mkdir -p "$RUNNER_TEMP/unity-status"
           rm -f "$RUNNER_TEMP/unity-status"/unity-mcp-status-*.json || true
 
-      # ---------- Start headless Unity with MCP bridge ----------
-      - name: Start Unity MCP bridge in background
+      # ---------- Activate Unity using game-ci's activation scripts ----------
+      - name: Activate Unity license in temporary container
         if: steps.detect.outputs.unity_ok == 'true'
         shell: bash
         env:
@@ -95,39 +95,63 @@ jobs:
         run: |
           set -euxo pipefail
 
-          # Use the unityci/editor image's built-in activation via entrypoint
-          # Create activation wrapper script that runs activation then starts Unity with MCP
-          docker rm -f unity-mcp >/dev/null 2>&1 || true
+          # Create directories for license persistence
+          mkdir -p "$RUNNER_TEMP/unity-license"
 
-          # The unityci image uses /usr/bin/activate.sh for license setup
-          # We'll call it first, then start Unity with our MCP bridge
-          docker run -d --name unity-mcp --network host \
+          # Run game-ci's activation in a temporary container
+          # This uses their built-in /steps/activate.sh script
+          docker run --rm \
             -e UNITY_EMAIL \
             -e UNITY_PASSWORD \
             -e UNITY_LICENSE \
             -e UNITY_SERIAL \
+            -v "$RUNNER_TEMP/unity-license:/root/.local/share/unity3d" \
+            ${{ env.UNITY_IMAGE }} \
+            bash -c '
+              # game-ci images have activation scripts at /steps/
+              if [ -f /steps/activate.sh ]; then
+                bash /steps/activate.sh
+              else
+                # Fallback: manual activation
+                if [[ -n "${UNITY_LICENSE:-}" ]]; then
+                  mkdir -p /root/.local/share/unity3d/Unity
+                  echo "$UNITY_LICENSE" | base64 -d > /root/.local/share/unity3d/Unity/Unity_lic.ulf 2>/dev/null || \
+                  echo "$UNITY_LICENSE" > /root/.local/share/unity3d/Unity/Unity_lic.ulf
+                elif [[ -n "${UNITY_EMAIL:-}" && -n "${UNITY_PASSWORD:-}" ]]; then
+                  /opt/unity/Editor/Unity -quit -batchmode -nographics -logFile - \
+                    -username "$UNITY_EMAIL" -password "$UNITY_PASSWORD" ${UNITY_SERIAL:+-serial "$UNITY_SERIAL"}
+                fi
+              fi
+              echo "License files:"
+              find /root/.local/share/unity3d -type f -ls || true
+            '
+
+          # Verify license was created
+          echo "Checking for license files on host:"
+          find "$RUNNER_TEMP/unity-license" -type f || echo "No license files found!"
+
+      # ---------- Start Unity with MCP bridge ----------
+      - name: Start Unity MCP bridge in background
+        if: steps.detect.outputs.unity_ok == 'true'
+        shell: bash
+        run: |
+          set -euxo pipefail
+
+          docker rm -f unity-mcp >/dev/null 2>&1 || true
+
+          # Start Unity with the pre-activated license mounted
+          docker run -d --name unity-mcp --network host \
             -e UNITY_MCP_ALLOW_BATCH=1 \
             -e UNITY_MCP_STATUS_DIR=/root/.unity-mcp \
             -e UNITY_MCP_BIND_HOST=127.0.0.1 \
             -v "${{ github.workspace }}:/workspace" -w /workspace \
             -v "$RUNNER_TEMP/unity-status:/root/.unity-mcp" \
+            -v "$RUNNER_TEMP/unity-license:/root/.local/share/unity3d" \
             ${{ env.UNITY_IMAGE }} \
-            bash -c '
-              # Activate Unity license (unityci pattern)
-              if [[ -n "${UNITY_LICENSE:-}" ]]; then
-                mkdir -p /root/.local/share/unity3d/Unity
-                # Try base64 decode, fallback to plain text
-                echo "$UNITY_LICENSE" | base64 -d > /root/.local/share/unity3d/Unity/Unity_lic.ulf 2>/dev/null || \
-                echo "$UNITY_LICENSE" > /root/.local/share/unity3d/Unity/Unity_lic.ulf
-                chmod 600 /root/.local/share/unity3d/Unity/Unity_lic.ulf
-              fi
-
-              # Start Unity with MCP bridge
-              /opt/unity/Editor/Unity -batchmode -nographics -logFile - \
-                -stackTraceLogType Full \
-                -projectPath /workspace/TestProjects/UnityMCPTests \
-                -executeMethod MCPForUnity.Editor.MCPForUnityBridge.StartAutoConnect
-            '
+            /opt/unity/Editor/Unity -batchmode -nographics -logFile - \
+              -stackTraceLogType Full \
+              -projectPath /workspace/TestProjects/UnityMCPTests \
+              -executeMethod MCPForUnity.Editor.MCPForUnityBridge.StartAutoConnect
 
       # ---------- Wait for Unity bridge ----------
       - name: Wait for Unity bridge (robust)

From 0708ace413af6067ff55592381c6d54f26aa2f65 Mon Sep 17 00:00:00 2001
From: Marcus Sanatan <msanatan@gmail.com>
Date: Fri, 17 Oct 2025 12:41:36 -0400
Subject: [PATCH 10/14] Revert "refactor:  activate once in a temporary
 container, then reuse the license in the long-running container"

This reverts commit f6a9aa68f910df37cede6f83d535098be2a9f80b.
---
 .github/workflows/claude-nl-suite.yml | 72 +++++++++------------------
 1 file changed, 24 insertions(+), 48 deletions(-)

diff --git a/.github/workflows/claude-nl-suite.yml b/.github/workflows/claude-nl-suite.yml
index 7bfe5cee..ea2ff90a 100644
--- a/.github/workflows/claude-nl-suite.yml
+++ b/.github/workflows/claude-nl-suite.yml
@@ -83,8 +83,8 @@ jobs:
           mkdir -p "$RUNNER_TEMP/unity-status"
           rm -f "$RUNNER_TEMP/unity-status"/unity-mcp-status-*.json || true
 
-      # ---------- Activate Unity using game-ci's activation scripts ----------
-      - name: Activate Unity license in temporary container
+      # ---------- Start headless Unity with MCP bridge ----------
+      - name: Start Unity MCP bridge in background
         if: steps.detect.outputs.unity_ok == 'true'
         shell: bash
         env:
@@ -95,63 +95,39 @@ jobs:
         run: |
           set -euxo pipefail
 
-          # Create directories for license persistence
-          mkdir -p "$RUNNER_TEMP/unity-license"
+          # Use the unityci/editor image's built-in activation via entrypoint
+          # Create activation wrapper script that runs activation then starts Unity with MCP
+          docker rm -f unity-mcp >/dev/null 2>&1 || true
 
-          # Run game-ci's activation in a temporary container
-          # This uses their built-in /steps/activate.sh script
-          docker run --rm \
+          # The unityci image uses /usr/bin/activate.sh for license setup
+          # We'll call it first, then start Unity with our MCP bridge
+          docker run -d --name unity-mcp --network host \
             -e UNITY_EMAIL \
             -e UNITY_PASSWORD \
             -e UNITY_LICENSE \
             -e UNITY_SERIAL \
-            -v "$RUNNER_TEMP/unity-license:/root/.local/share/unity3d" \
-            ${{ env.UNITY_IMAGE }} \
-            bash -c '
-              # game-ci images have activation scripts at /steps/
-              if [ -f /steps/activate.sh ]; then
-                bash /steps/activate.sh
-              else
-                # Fallback: manual activation
-                if [[ -n "${UNITY_LICENSE:-}" ]]; then
-                  mkdir -p /root/.local/share/unity3d/Unity
-                  echo "$UNITY_LICENSE" | base64 -d > /root/.local/share/unity3d/Unity/Unity_lic.ulf 2>/dev/null || \
-                  echo "$UNITY_LICENSE" > /root/.local/share/unity3d/Unity/Unity_lic.ulf
-                elif [[ -n "${UNITY_EMAIL:-}" && -n "${UNITY_PASSWORD:-}" ]]; then
-                  /opt/unity/Editor/Unity -quit -batchmode -nographics -logFile - \
-                    -username "$UNITY_EMAIL" -password "$UNITY_PASSWORD" ${UNITY_SERIAL:+-serial "$UNITY_SERIAL"}
-                fi
-              fi
-              echo "License files:"
-              find /root/.local/share/unity3d -type f -ls || true
-            '
-
-          # Verify license was created
-          echo "Checking for license files on host:"
-          find "$RUNNER_TEMP/unity-license" -type f || echo "No license files found!"
-
-      # ---------- Start Unity with MCP bridge ----------
-      - name: Start Unity MCP bridge in background
-        if: steps.detect.outputs.unity_ok == 'true'
-        shell: bash
-        run: |
-          set -euxo pipefail
-
-          docker rm -f unity-mcp >/dev/null 2>&1 || true
-
-          # Start Unity with the pre-activated license mounted
-          docker run -d --name unity-mcp --network host \
             -e UNITY_MCP_ALLOW_BATCH=1 \
             -e UNITY_MCP_STATUS_DIR=/root/.unity-mcp \
             -e UNITY_MCP_BIND_HOST=127.0.0.1 \
             -v "${{ github.workspace }}:/workspace" -w /workspace \
             -v "$RUNNER_TEMP/unity-status:/root/.unity-mcp" \
-            -v "$RUNNER_TEMP/unity-license:/root/.local/share/unity3d" \
             ${{ env.UNITY_IMAGE }} \
-            /opt/unity/Editor/Unity -batchmode -nographics -logFile - \
-              -stackTraceLogType Full \
-              -projectPath /workspace/TestProjects/UnityMCPTests \
-              -executeMethod MCPForUnity.Editor.MCPForUnityBridge.StartAutoConnect
+            bash -c '
+              # Activate Unity license (unityci pattern)
+              if [[ -n "${UNITY_LICENSE:-}" ]]; then
+                mkdir -p /root/.local/share/unity3d/Unity
+                # Try base64 decode, fallback to plain text
+                echo "$UNITY_LICENSE" | base64 -d > /root/.local/share/unity3d/Unity/Unity_lic.ulf 2>/dev/null || \
+                echo "$UNITY_LICENSE" > /root/.local/share/unity3d/Unity/Unity_lic.ulf
+                chmod 600 /root/.local/share/unity3d/Unity/Unity_lic.ulf
+              fi
+
+              # Start Unity with MCP bridge
+              /opt/unity/Editor/Unity -batchmode -nographics -logFile - \
+                -stackTraceLogType Full \
+                -projectPath /workspace/TestProjects/UnityMCPTests \
+                -executeMethod MCPForUnity.Editor.MCPForUnityBridge.StartAutoConnect
+            '
 
       # ---------- Wait for Unity bridge ----------
       - name: Wait for Unity bridge (robust)

From e08779e13daa936cd98ded2e1e1e9c22d761513a Mon Sep 17 00:00:00 2001
From: Marcus Sanatan <msanatan@gmail.com>
Date: Fri, 17 Oct 2025 12:41:52 -0400
Subject: [PATCH 11/14] Revert "fix: improve Unity license activation in CI by
 using unityci image's built-in activation flow"

This reverts commit a9f4c0223bc3467442be6dafa1d9303479623a7c.
---
 .github/workflows/claude-nl-suite.yml | 27 ++++++---------------------
 1 file changed, 6 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/claude-nl-suite.yml b/.github/workflows/claude-nl-suite.yml
index ea2ff90a..0187dfa8 100644
--- a/.github/workflows/claude-nl-suite.yml
+++ b/.github/workflows/claude-nl-suite.yml
@@ -95,12 +95,9 @@ jobs:
         run: |
           set -euxo pipefail
 
-          # Use the unityci/editor image's built-in activation via entrypoint
-          # Create activation wrapper script that runs activation then starts Unity with MCP
+          # The unityci/editor image supports licensing via env vars
+          # Pass credentials and let Unity activate itself on first run
           docker rm -f unity-mcp >/dev/null 2>&1 || true
-
-          # The unityci image uses /usr/bin/activate.sh for license setup
-          # We'll call it first, then start Unity with our MCP bridge
           docker run -d --name unity-mcp --network host \
             -e UNITY_EMAIL \
             -e UNITY_PASSWORD \
@@ -112,22 +109,10 @@ jobs:
             -v "${{ github.workspace }}:/workspace" -w /workspace \
             -v "$RUNNER_TEMP/unity-status:/root/.unity-mcp" \
             ${{ env.UNITY_IMAGE }} \
-            bash -c '
-              # Activate Unity license (unityci pattern)
-              if [[ -n "${UNITY_LICENSE:-}" ]]; then
-                mkdir -p /root/.local/share/unity3d/Unity
-                # Try base64 decode, fallback to plain text
-                echo "$UNITY_LICENSE" | base64 -d > /root/.local/share/unity3d/Unity/Unity_lic.ulf 2>/dev/null || \
-                echo "$UNITY_LICENSE" > /root/.local/share/unity3d/Unity/Unity_lic.ulf
-                chmod 600 /root/.local/share/unity3d/Unity/Unity_lic.ulf
-              fi
-
-              # Start Unity with MCP bridge
-              /opt/unity/Editor/Unity -batchmode -nographics -logFile - \
-                -stackTraceLogType Full \
-                -projectPath /workspace/TestProjects/UnityMCPTests \
-                -executeMethod MCPForUnity.Editor.MCPForUnityBridge.StartAutoConnect
-            '
+            /opt/unity/Editor/Unity -batchmode -nographics -logFile - \
+              -stackTraceLogType Full \
+              -projectPath /workspace/TestProjects/UnityMCPTests \
+              -executeMethod MCPForUnity.Editor.MCPForUnityBridge.StartAutoConnect
 
       # ---------- Wait for Unity bridge ----------
       - name: Wait for Unity bridge (robust)

From b5bec1b4a96737f33849fc67f96012f2f3fa11bb Mon Sep 17 00:00:00 2001
From: Marcus Sanatan <msanatan@gmail.com>
Date: Fri, 17 Oct 2025 12:42:01 -0400
Subject: [PATCH 12/14] Revert "refactor: simplify Unity CI setup by removing
 game-ci activation and using built-in license handling"

This reverts commit 4e5ffc0051a7b15b9d87ecaa06fa646f8b13b0b9.
---
 .github/workflows/claude-nl-suite.yml | 81 +++++++++++++++++++--------
 1 file changed, 57 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/claude-nl-suite.yml b/.github/workflows/claude-nl-suite.yml
index 0187dfa8..741f6d60 100644
--- a/.github/workflows/claude-nl-suite.yml
+++ b/.github/workflows/claude-nl-suite.yml
@@ -67,49 +67,82 @@ jobs:
             echo "No MCP Python deps found (skipping)"
           fi
 
-      # Cache Unity Library to speed up runs
-      - uses: actions/cache@v4
+      # --- Use game-ci for Unity activation (handles all license types) ---
+      - name: Activate Unity using game-ci
+        uses: game-ci/unity-activator@v2
+        env:
+          UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
+          UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
+          UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
+          UNITY_SERIAL: ${{ secrets.UNITY_SERIAL }}
         with:
-          path: TestProjects/UnityMCPTests/Library
-          key: Library-UnityMCPTests-2021.3.45f2-${{ hashFiles('TestProjects/UnityMCPTests/Assets/**', 'TestProjects/UnityMCPTests/Packages/**', 'TestProjects/UnityMCPTests/ProjectSettings/**') }}
-          restore-keys: |
-            Library-UnityMCPTests-2021.3.45f2-
-            Library-UnityMCPTests-
+          unity-version: 2021.3.45f2
+
+      # Copy activation artifacts to Docker mount locations
+      - name: Prepare Unity license for Docker containers
+        shell: bash
+        run: |
+          set -euxo pipefail
+          mkdir -p "$RUNNER_TEMP/unity-config" "$RUNNER_TEMP/unity-local"
+
+          # game-ci stores license files in standard Unity locations
+          # Copy them to our Docker mount points
+          if [ -d "$HOME/.local/share/unity3d" ]; then
+            cp -r "$HOME/.local/share/unity3d"/* "$RUNNER_TEMP/unity-local/" || true
+          fi
+          if [ -d "$HOME/.config/unity3d" ]; then
+            cp -r "$HOME/.config/unity3d"/* "$RUNNER_TEMP/unity-config/" || true
+          fi
+
+          # Verify license files exist
+          echo "Unity license files prepared:"
+          find "$RUNNER_TEMP/unity-local" -type f || true
+          find "$RUNNER_TEMP/unity-config" -type f || true
+
+      # ---------- Warm up project (import Library once) ----------
+      - name: Warm up project (import Library once)
+        if: steps.detect.outputs.unity_ok == 'true'
+        shell: bash
+        env:
+          UNITY_IMAGE: ${{ env.UNITY_IMAGE }}
+        run: |
+          set -euxo pipefail
+          docker run --rm --network host \
+            -e HOME=/root \
+            -v "${{ github.workspace }}:/workspace" -w /workspace \
+            -v "$RUNNER_TEMP/unity-config:/root/.config/unity3d" \
+            -v "$RUNNER_TEMP/unity-local:/root/.local/share/unity3d" \
+            "$UNITY_IMAGE" /opt/unity/Editor/Unity -batchmode -nographics -logFile - \
+              -projectPath /workspace/TestProjects/UnityMCPTests \
+              -quit
 
       # ---------- Clean old MCP status ----------
       - name: Clean old MCP status
         run: |
           set -eux
-          mkdir -p "$RUNNER_TEMP/unity-status"
-          rm -f "$RUNNER_TEMP/unity-status"/unity-mcp-status-*.json || true
+          mkdir -p "$HOME/.unity-mcp"
+          rm -f "$HOME/.unity-mcp"/unity-mcp-status-*.json || true
 
-      # ---------- Start headless Unity with MCP bridge ----------
-      - name: Start Unity MCP bridge in background
+      # ---------- Start headless Unity (persistent bridge) ----------
+      - name: Start Unity (persistent bridge)
         if: steps.detect.outputs.unity_ok == 'true'
         shell: bash
         env:
-          UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
-          UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
-          UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
-          UNITY_SERIAL: ${{ secrets.UNITY_SERIAL }}
+          UNITY_IMAGE: ${{ env.UNITY_IMAGE }}
         run: |
           set -euxo pipefail
-
-          # The unityci/editor image supports licensing via env vars
-          # Pass credentials and let Unity activate itself on first run
+          mkdir -p "$RUNNER_TEMP/unity-status"
           docker rm -f unity-mcp >/dev/null 2>&1 || true
           docker run -d --name unity-mcp --network host \
-            -e UNITY_EMAIL \
-            -e UNITY_PASSWORD \
-            -e UNITY_LICENSE \
-            -e UNITY_SERIAL \
+            -e HOME=/root \
             -e UNITY_MCP_ALLOW_BATCH=1 \
             -e UNITY_MCP_STATUS_DIR=/root/.unity-mcp \
             -e UNITY_MCP_BIND_HOST=127.0.0.1 \
             -v "${{ github.workspace }}:/workspace" -w /workspace \
             -v "$RUNNER_TEMP/unity-status:/root/.unity-mcp" \
-            ${{ env.UNITY_IMAGE }} \
-            /opt/unity/Editor/Unity -batchmode -nographics -logFile - \
+            -v "$RUNNER_TEMP/unity-config:/root/.config/unity3d" \
+            -v "$RUNNER_TEMP/unity-local:/root/.local/share/unity3d" \
+            "$UNITY_IMAGE" /opt/unity/Editor/Unity -batchmode -nographics -logFile - \
               -stackTraceLogType Full \
               -projectPath /workspace/TestProjects/UnityMCPTests \
               -executeMethod MCPForUnity.Editor.MCPForUnityBridge.StartAutoConnect

From 172d7fd170c8d2f5d8c88ed0acf8fe132dae3ded Mon Sep 17 00:00:00 2001
From: Marcus Sanatan <msanatan@gmail.com>
Date: Fri, 17 Oct 2025 12:42:14 -0400
Subject: [PATCH 13/14] Revert "refactor: replace manual Unity license
 activation with game-ci/unity-activator"

This reverts commit e9520ee768c4e9d48efc81b1a9c3cac3986cc96a.
---
 .github/workflows/claude-nl-suite.yml | 126 +++++++++++++++++++++-----
 1 file changed, 104 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/claude-nl-suite.yml b/.github/workflows/claude-nl-suite.yml
index 741f6d60..4258082c 100644
--- a/.github/workflows/claude-nl-suite.yml
+++ b/.github/workflows/claude-nl-suite.yml
@@ -67,53 +67,123 @@ jobs:
             echo "No MCP Python deps found (skipping)"
           fi
 
-      # --- Use game-ci for Unity activation (handles all license types) ---
-      - name: Activate Unity using game-ci
-        uses: game-ci/unity-activator@v2
+      # --- Licensing: allow both ULF and EBL when available ---
+      - name: Decide license sources
+        id: lic
+        shell: bash
         env:
+          UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
           UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
           UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
-          UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
           UNITY_SERIAL: ${{ secrets.UNITY_SERIAL }}
-        with:
-          unity-version: 2021.3.45f2
+        run: |
+          set -eu
+          use_ulf=false; use_ebl=false
+          [[ -n "${UNITY_LICENSE:-}" ]] && use_ulf=true
+          [[ -n "${UNITY_EMAIL:-}" && -n "${UNITY_PASSWORD:-}" ]] && use_ebl=true
+          echo "use_ulf=$use_ulf" >> "$GITHUB_OUTPUT"
+          echo "use_ebl=$use_ebl" >> "$GITHUB_OUTPUT"
+          echo "has_serial=$([[ -n "${UNITY_SERIAL:-}" ]] && echo true || echo false)" >> "$GITHUB_OUTPUT"
+
+      - name: Stage Unity .ulf license (from secret)
+        if: steps.lic.outputs.use_ulf == 'true'
+        id: ulf
+        env:
+          UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
+        shell: bash
+        run: |
+          set -eu
+          mkdir -p "$RUNNER_TEMP/unity-license-ulf" "$RUNNER_TEMP/unity-local/Unity"
+          f="$RUNNER_TEMP/unity-license-ulf/Unity_lic.ulf"
+          if printf "%s" "$UNITY_LICENSE" | base64 -d - >/dev/null 2>&1; then
+            printf "%s" "$UNITY_LICENSE" | base64 -d - > "$f"
+          else
+            printf "%s" "$UNITY_LICENSE" > "$f"
+          fi
+          chmod 600 "$f" || true
+          # If someone pasted an entitlement XML into UNITY_LICENSE by mistake, re-home it:
+          if head -c 100 "$f" | grep -qi '<\?xml'; then
+            mkdir -p "$RUNNER_TEMP/unity-config/Unity/licenses"
+            mv "$f" "$RUNNER_TEMP/unity-config/Unity/licenses/UnityEntitlementLicense.xml"
+            echo "ok=false" >> "$GITHUB_OUTPUT"
+          elif grep -qi '<Signature>' "$f"; then
+            # provide it in the standard local-share path too
+            cp -f "$f" "$RUNNER_TEMP/unity-local/Unity/Unity_lic.ulf"
+            echo "ok=true" >> "$GITHUB_OUTPUT"
+          else
+            echo "ok=false" >> "$GITHUB_OUTPUT"
+          fi
 
-      # Copy activation artifacts to Docker mount locations
-      - name: Prepare Unity license for Docker containers
+      # --- Activate via EBL inside the same Unity image (writes host-side entitlement) ---
+      - name: Activate Unity (EBL via container - host-mount)
+        if: steps.lic.outputs.use_ebl == 'true'
         shell: bash
+        env:
+          UNITY_IMAGE: ${{ env.UNITY_IMAGE }}
+          UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
+          UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
+          UNITY_SERIAL: ${{ secrets.UNITY_SERIAL }}
         run: |
           set -euxo pipefail
+          # host dirs to receive the full Unity config and local-share
           mkdir -p "$RUNNER_TEMP/unity-config" "$RUNNER_TEMP/unity-local"
 
-          # game-ci stores license files in standard Unity locations
-          # Copy them to our Docker mount points
-          if [ -d "$HOME/.local/share/unity3d" ]; then
-            cp -r "$HOME/.local/share/unity3d"/* "$RUNNER_TEMP/unity-local/" || true
-          fi
-          if [ -d "$HOME/.config/unity3d" ]; then
-            cp -r "$HOME/.config/unity3d"/* "$RUNNER_TEMP/unity-config/" || true
+          # Try Pro first if serial is present, otherwise named-user EBL.
+          docker run --rm --network host \
+            -e HOME=/root \
+            -e UNITY_EMAIL -e UNITY_PASSWORD -e UNITY_SERIAL \
+            -v "$RUNNER_TEMP/unity-config:/root/.config/unity3d" \
+            -v "$RUNNER_TEMP/unity-local:/root/.local/share/unity3d" \
+            "$UNITY_IMAGE" bash -lc '
+              set -euxo pipefail
+              if [[ -n "${UNITY_SERIAL:-}" ]]; then
+                /opt/unity/Editor/Unity -batchmode -nographics -logFile - \
+                  -username "$UNITY_EMAIL" -password "$UNITY_PASSWORD" -serial "$UNITY_SERIAL" -quit || true
+              else
+                /opt/unity/Editor/Unity -batchmode -nographics -logFile - \
+                  -username "$UNITY_EMAIL" -password "$UNITY_PASSWORD" -quit || true
+              fi
+              ls -la /root/.config/unity3d/Unity/licenses || true
+            '
+
+          # Verify entitlement written to host mount; allow ULF-only runs to proceed
+          if ! find "$RUNNER_TEMP/unity-config" -type f -iname "*.xml" | grep -q .; then
+            if [[ "${{ steps.ulf.outputs.ok }}" == "true" ]]; then
+              echo "EBL entitlement not found; proceeding with ULF-only (ok=true)."
+            else
+              echo "No entitlement produced and no valid ULF; cannot continue." >&2
+              exit 1
+            fi
           fi
 
-          # Verify license files exist
-          echo "Unity license files prepared:"
-          find "$RUNNER_TEMP/unity-local" -type f || true
-          find "$RUNNER_TEMP/unity-config" -type f || true
+      # EBL entitlement is already written directly to $RUNNER_TEMP/unity-config by the activation step
 
       # ---------- Warm up project (import Library once) ----------
       - name: Warm up project (import Library once)
-        if: steps.detect.outputs.unity_ok == 'true'
+        if: steps.lic.outputs.use_ulf == 'true' || steps.lic.outputs.use_ebl == 'true'
         shell: bash
         env:
           UNITY_IMAGE: ${{ env.UNITY_IMAGE }}
+          ULF_OK: ${{ steps.ulf.outputs.ok }}
+          UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
+          UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
+          UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
         run: |
           set -euxo pipefail
+          manual_args=()
+          if [[ "${ULF_OK:-false}" == "true" ]]; then
+            manual_args=(-manualLicenseFile "/root/.local/share/unity3d/Unity/Unity_lic.ulf")
+          fi
           docker run --rm --network host \
             -e HOME=/root \
+            -e UNITY_EMAIL="${UNITY_EMAIL:-}" \
+            -e UNITY_PASSWORD="${UNITY_PASSWORD:-}" \
             -v "${{ github.workspace }}:/workspace" -w /workspace \
             -v "$RUNNER_TEMP/unity-config:/root/.config/unity3d" \
             -v "$RUNNER_TEMP/unity-local:/root/.local/share/unity3d" \
             "$UNITY_IMAGE" /opt/unity/Editor/Unity -batchmode -nographics -logFile - \
               -projectPath /workspace/TestProjects/UnityMCPTests \
+              "${manual_args[@]}" \
               -quit
 
       # ---------- Clean old MCP status ----------
@@ -125,16 +195,27 @@ jobs:
 
       # ---------- Start headless Unity (persistent bridge) ----------
       - name: Start Unity (persistent bridge)
-        if: steps.detect.outputs.unity_ok == 'true'
+        if: steps.lic.outputs.use_ulf == 'true' || steps.lic.outputs.use_ebl == 'true'
         shell: bash
         env:
           UNITY_IMAGE: ${{ env.UNITY_IMAGE }}
+          ULF_OK: ${{ steps.ulf.outputs.ok }}
+          UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
+          UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
+          UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
         run: |
           set -euxo pipefail
+          manual_args=()
+          if [[ "${ULF_OK:-false}" == "true" ]]; then
+            manual_args=(-manualLicenseFile "/root/.local/share/unity3d/Unity/Unity_lic.ulf")
+          fi
+
           mkdir -p "$RUNNER_TEMP/unity-status"
           docker rm -f unity-mcp >/dev/null 2>&1 || true
           docker run -d --name unity-mcp --network host \
             -e HOME=/root \
+            -e UNITY_EMAIL="${UNITY_EMAIL:-}" \
+            -e UNITY_PASSWORD="${UNITY_PASSWORD:-}" \
             -e UNITY_MCP_ALLOW_BATCH=1 \
             -e UNITY_MCP_STATUS_DIR=/root/.unity-mcp \
             -e UNITY_MCP_BIND_HOST=127.0.0.1 \
@@ -145,6 +226,7 @@ jobs:
             "$UNITY_IMAGE" /opt/unity/Editor/Unity -batchmode -nographics -logFile - \
               -stackTraceLogType Full \
               -projectPath /workspace/TestProjects/UnityMCPTests \
+              "${manual_args[@]}" \
               -executeMethod MCPForUnity.Editor.MCPForUnityBridge.StartAutoConnect
 
       # ---------- Wait for Unity bridge ----------
@@ -885,7 +967,7 @@ jobs:
           docker rm -f unity-mcp || true
 
       - name: Return Pro license (if used)
-        if: always()
+        if: always() && steps.lic.outputs.use_ebl == 'true' && steps.lic.outputs.has_serial == 'true'
         uses: game-ci/unity-return-license@v2
         continue-on-error: true
         env:

From 0778e7c05c5a4353e0ebc9d19dcc329161f17630 Mon Sep 17 00:00:00 2001
From: Marcus Sanatan <msanatan@gmail.com>
Date: Fri, 17 Oct 2025 12:42:23 -0400
Subject: [PATCH 14/14] Revert "feat: add Unity license credentials to Docker
 containers in CI workflow"

This reverts commit 01b8879e35baaf88239988b51e6d4f1e5daaa1cf.
---
 .github/workflows/claude-nl-suite.yml | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/claude-nl-suite.yml b/.github/workflows/claude-nl-suite.yml
index 4258082c..513dfb76 100644
--- a/.github/workflows/claude-nl-suite.yml
+++ b/.github/workflows/claude-nl-suite.yml
@@ -165,9 +165,6 @@ jobs:
         env:
           UNITY_IMAGE: ${{ env.UNITY_IMAGE }}
           ULF_OK: ${{ steps.ulf.outputs.ok }}
-          UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
-          UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
-          UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
         run: |
           set -euxo pipefail
           manual_args=()
@@ -176,8 +173,6 @@ jobs:
           fi
           docker run --rm --network host \
             -e HOME=/root \
-            -e UNITY_EMAIL="${UNITY_EMAIL:-}" \
-            -e UNITY_PASSWORD="${UNITY_PASSWORD:-}" \
             -v "${{ github.workspace }}:/workspace" -w /workspace \
             -v "$RUNNER_TEMP/unity-config:/root/.config/unity3d" \
             -v "$RUNNER_TEMP/unity-local:/root/.local/share/unity3d" \
@@ -200,9 +195,6 @@ jobs:
         env:
           UNITY_IMAGE: ${{ env.UNITY_IMAGE }}
           ULF_OK: ${{ steps.ulf.outputs.ok }}
-          UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
-          UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
-          UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
         run: |
           set -euxo pipefail
           manual_args=()
@@ -214,15 +206,13 @@ jobs:
           docker rm -f unity-mcp >/dev/null 2>&1 || true
           docker run -d --name unity-mcp --network host \
             -e HOME=/root \
-            -e UNITY_EMAIL="${UNITY_EMAIL:-}" \
-            -e UNITY_PASSWORD="${UNITY_PASSWORD:-}" \
             -e UNITY_MCP_ALLOW_BATCH=1 \
             -e UNITY_MCP_STATUS_DIR=/root/.unity-mcp \
             -e UNITY_MCP_BIND_HOST=127.0.0.1 \
             -v "${{ github.workspace }}:/workspace" -w /workspace \
             -v "$RUNNER_TEMP/unity-status:/root/.unity-mcp" \
-            -v "$RUNNER_TEMP/unity-config:/root/.config/unity3d" \
-            -v "$RUNNER_TEMP/unity-local:/root/.local/share/unity3d" \
+            -v "$RUNNER_TEMP/unity-config:/root/.config/unity3d:ro" \
+            -v "$RUNNER_TEMP/unity-local:/root/.local/share/unity3d:ro" \
             "$UNITY_IMAGE" /opt/unity/Editor/Unity -batchmode -nographics -logFile - \
               -stackTraceLogType Full \
               -projectPath /workspace/TestProjects/UnityMCPTests \