From ddda379214645ea9000aaceea39b094e3d373519 Mon Sep 17 00:00:00 2001
From: Cursor Agent <cursoragent@cursor.com>
Date: Mon, 21 Sep 2026 13:01:13 +0000
Subject: [PATCH 01/10] ci: fall back if e2e clone branch is gone

Resolve the determined bitkit-e2e-tests ref immediately before checkout
so companion cleanup and re-runs do not fail Clone E2E tests. Fall back
to main with a warning unless an explicit custom e2e_branch is missing.

Co-authored-by: piotr-iohk <piotr-iohk@users.noreply.github.com>
---
 .github/workflows/e2e-staging.yml   | 61 ++++++++++++++++--
 .github/workflows/e2e-tests.yml     | 30 +++++++--
 .github/workflows/e2e_migration.yml | 99 ++++++++++++++++++++++++++---
 3 files changed, 172 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/e2e-staging.yml b/.github/workflows/e2e-staging.yml
index 84e0f6278..2cd3e0f69 100644
--- a/.github/workflows/e2e-staging.yml
+++ b/.github/workflows/e2e-staging.yml
@@ -136,17 +136,39 @@ jobs:
       BACKEND: regtest
 
     steps:
-      - name: Show selected E2E branch
+      - name: Resolve E2E tests ref
+        id: e2e-ref
         env:
-          E2E_BRANCH: ${{ needs.e2e-branch.outputs.branch }}
-        run: echo $E2E_BRANCH
+          SELECTED: ${{ needs.e2e-branch.outputs.branch }}
+          E2E_BRANCH_INPUT: ${{ github.event.inputs.e2e_branch || 'default-feature-branch' }}
+        run: |
+          set -euo pipefail
+          TEST_REPO="synonymdev/bitkit-e2e-tests"
+          SELECTED="${SELECTED:-}"
+
+          if [ -z "$SELECTED" ] || [ "$SELECTED" = "main" ]; then
+            REF="main"
+          elif git ls-remote --exit-code "https://github.com/${TEST_REPO}.git" "refs/heads/${SELECTED}" >/dev/null 2>&1; then
+            REF="$SELECTED"
+          elif [ -n "${E2E_BRANCH_INPUT}" ] && [ "${E2E_BRANCH_INPUT}" != "main" ] && [ "${E2E_BRANCH_INPUT}" != "default-feature-branch" ]; then
+            echo "::error title=Missing e2e_branch::Branch '${SELECTED}' was requested via e2e_branch='${E2E_BRANCH_INPUT}' but no longer exists in ${TEST_REPO}."
+            exit 1
+          else
+            echo "::warning title=Missing E2E branch::Determined branch '${SELECTED}' no longer exists in ${TEST_REPO}; falling back to main."
+            REF="main"
+          fi
+
+          echo "Selected E2E branch: ${SELECTED:-<empty>}"
+          echo "e2e_branch input: ${E2E_BRANCH_INPUT}"
+          echo "Effective E2E tests ref: ${REF}"
+          echo "ref=${REF}" >> "$GITHUB_OUTPUT"
 
       - name: Clone E2E tests
         uses: actions/checkout@v7
         with:
           repository: synonymdev/bitkit-e2e-tests
           path: bitkit-e2e-tests
-          ref: ${{ needs.e2e-branch.outputs.branch }}
+          ref: ${{ steps.e2e-ref.outputs.ref }}
 
       - name: Download iOS app (regtest)
         uses: actions/download-artifact@v8
@@ -262,11 +284,38 @@ jobs:
     needs: [build-staging, e2e-branch, e2e-tests-staging]
 
     steps:
+      - name: Resolve E2E tests ref
+        id: e2e-ref
+        env:
+          SELECTED: ${{ needs.e2e-branch.outputs.branch }}
+          E2E_BRANCH_INPUT: ${{ github.event.inputs.e2e_branch || 'default-feature-branch' }}
+        run: |
+          set -euo pipefail
+          TEST_REPO="synonymdev/bitkit-e2e-tests"
+          SELECTED="${SELECTED:-}"
+
+          if [ -z "$SELECTED" ] || [ "$SELECTED" = "main" ]; then
+            REF="main"
+          elif git ls-remote --exit-code "https://github.com/${TEST_REPO}.git" "refs/heads/${SELECTED}" >/dev/null 2>&1; then
+            REF="$SELECTED"
+          elif [ -n "${E2E_BRANCH_INPUT}" ] && [ "${E2E_BRANCH_INPUT}" != "main" ] && [ "${E2E_BRANCH_INPUT}" != "default-feature-branch" ]; then
+            echo "::error title=Missing e2e_branch::Branch '${SELECTED}' was requested via e2e_branch='${E2E_BRANCH_INPUT}' but no longer exists in ${TEST_REPO}."
+            exit 1
+          else
+            echo "::warning title=Missing E2E branch::Determined branch '${SELECTED}' no longer exists in ${TEST_REPO}; falling back to main."
+            REF="main"
+          fi
+
+          echo "Selected E2E branch: ${SELECTED:-<empty>}"
+          echo "e2e_branch input: ${E2E_BRANCH_INPUT}"
+          echo "Effective E2E tests ref: ${REF}"
+          echo "ref=${REF}" >> "$GITHUB_OUTPUT"
+
       - name: Checkout E2E tests
         uses: actions/checkout@v7
         with:
           repository: synonymdev/bitkit-e2e-tests
-          ref: ${{ needs.e2e-branch.outputs.branch }}
+          ref: ${{ steps.e2e-ref.outputs.ref }}
 
       - name: Post Slack summary
         env:
@@ -278,5 +327,5 @@ jobs:
           E2E_TESTS_RESULT: ${{ needs.e2e-tests-staging.result }}
           RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
           RUN_ATTEMPT: ${{ github.run_attempt }}
-          E2E_TESTS_REF: ${{ needs.e2e-branch.outputs.branch }}
+          E2E_TESTS_REF: ${{ steps.e2e-ref.outputs.ref }}
         run: python3 scripts/slack_summary.py e2e-staging
diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml
index ebc2390f9..adab677b5 100644
--- a/.github/workflows/e2e-tests.yml
+++ b/.github/workflows/e2e-tests.yml
@@ -157,17 +157,39 @@ jobs:
     name: e2e-tests-local - ${{ matrix.shard.name }}
 
     steps:
-      - name: Show selected E2E branch
+      - name: Resolve E2E tests ref
+        id: e2e-ref
         env:
-          E2E_BRANCH: ${{ needs.e2e-branch.outputs.branch }}
-        run: echo $E2E_BRANCH
+          SELECTED: ${{ needs.e2e-branch.outputs.branch }}
+          E2E_BRANCH_INPUT: ${{ github.event.inputs.e2e_branch || 'default-feature-branch' }}
+        run: |
+          set -euo pipefail
+          TEST_REPO="synonymdev/bitkit-e2e-tests"
+          SELECTED="${SELECTED:-}"
+
+          if [ -z "$SELECTED" ] || [ "$SELECTED" = "main" ]; then
+            REF="main"
+          elif git ls-remote --exit-code "https://github.com/${TEST_REPO}.git" "refs/heads/${SELECTED}" >/dev/null 2>&1; then
+            REF="$SELECTED"
+          elif [ -n "${E2E_BRANCH_INPUT}" ] && [ "${E2E_BRANCH_INPUT}" != "main" ] && [ "${E2E_BRANCH_INPUT}" != "default-feature-branch" ]; then
+            echo "::error title=Missing e2e_branch::Branch '${SELECTED}' was requested via e2e_branch='${E2E_BRANCH_INPUT}' but no longer exists in ${TEST_REPO}."
+            exit 1
+          else
+            echo "::warning title=Missing E2E branch::Determined branch '${SELECTED}' no longer exists in ${TEST_REPO}; falling back to main."
+            REF="main"
+          fi
+
+          echo "Selected E2E branch: ${SELECTED:-<empty>}"
+          echo "e2e_branch input: ${E2E_BRANCH_INPUT}"
+          echo "Effective E2E tests ref: ${REF}"
+          echo "ref=${REF}" >> "$GITHUB_OUTPUT"
 
       - name: Clone E2E tests
         uses: actions/checkout@v7
         with:
           repository: synonymdev/bitkit-e2e-tests
           path: bitkit-e2e-tests
-          ref: ${{ needs.e2e-branch.outputs.branch }}
+          ref: ${{ steps.e2e-ref.outputs.ref }}
 
       - name: Download iOS app
         uses: actions/download-artifact@v8
diff --git a/.github/workflows/e2e_migration.yml b/.github/workflows/e2e_migration.yml
index efc8505d0..5bc0f99d8 100644
--- a/.github/workflows/e2e_migration.yml
+++ b/.github/workflows/e2e_migration.yml
@@ -123,10 +123,44 @@ jobs:
       app_branch: ${{ github.head_ref || github.ref_name }}
       e2e_branch_input: ${{ github.event.inputs.e2e_branch || 'default-feature-branch' }}
 
+  resolve-e2e-ref:
+    if: github.event_name != 'pull_request' || (github.event.pull_request.draft == false && (startsWith(github.head_ref, 'release-') || startsWith(github.base_ref, 'release-')))
+    needs: [e2e-branch]
+    runs-on: ubuntu-latest
+    outputs:
+      ref: ${{ steps.e2e-ref.outputs.ref }}
+    steps:
+      - name: Resolve E2E tests ref
+        id: e2e-ref
+        env:
+          SELECTED: ${{ needs.e2e-branch.outputs.branch }}
+          E2E_BRANCH_INPUT: ${{ github.event.inputs.e2e_branch || 'default-feature-branch' }}
+        run: |
+          set -euo pipefail
+          TEST_REPO="synonymdev/bitkit-e2e-tests"
+          SELECTED="${SELECTED:-}"
+
+          if [ -z "$SELECTED" ] || [ "$SELECTED" = "main" ]; then
+            REF="main"
+          elif git ls-remote --exit-code "https://github.com/${TEST_REPO}.git" "refs/heads/${SELECTED}" >/dev/null 2>&1; then
+            REF="$SELECTED"
+          elif [ -n "${E2E_BRANCH_INPUT}" ] && [ "${E2E_BRANCH_INPUT}" != "main" ] && [ "${E2E_BRANCH_INPUT}" != "default-feature-branch" ]; then
+            echo "::error title=Missing e2e_branch::Branch '${SELECTED}' was requested via e2e_branch='${E2E_BRANCH_INPUT}' but no longer exists in ${TEST_REPO}."
+            exit 1
+          else
+            echo "::warning title=Missing E2E branch::Determined branch '${SELECTED}' no longer exists in ${TEST_REPO}; falling back to main."
+            REF="main"
+          fi
+
+          echo "Selected E2E branch: ${SELECTED:-<empty>}"
+          echo "e2e_branch input: ${E2E_BRANCH_INPUT}"
+          echo "Effective E2E tests ref: ${REF}"
+          echo "ref=${REF}" >> "$GITHUB_OUTPUT"
+
   prepare-wallets:
     if: github.event_name != 'pull_request' || (github.event.pull_request.draft == false && (startsWith(github.head_ref, 'release-') || startsWith(github.base_ref, 'release-')))
     uses: synonymdev/bitkit-e2e-tests/.github/workflows/migration-wallet-setup.yml@main
-    needs: [e2e-branch]
+    needs: [e2e-branch, resolve-e2e-ref]
     strategy:
       fail-fast: false
       matrix:
@@ -138,7 +172,7 @@ jobs:
           - { name: migration_3-with-passphrase, setup_type: passphrase }
           - { name: migration_4-with-sweep, setup_type: sweep }
     with:
-      e2e_branch: ${{ needs.e2e-branch.outputs.branch }}
+      e2e_branch: ${{ needs.resolve-e2e-ref.outputs.ref }}
       rn_version: ${{ matrix.rn_version }}
       setup_type: ${{ matrix.scenario.setup_type }}
       scenario_name: ${{ matrix.scenario.name }}
@@ -165,17 +199,39 @@ jobs:
       BACKEND: regtest
 
     steps:
-      - name: Show selected E2E branch
+      - name: Resolve E2E tests ref
+        id: e2e-ref
         env:
-          E2E_BRANCH: ${{ needs.e2e-branch.outputs.branch }}
-        run: echo $E2E_BRANCH
+          SELECTED: ${{ needs.e2e-branch.outputs.branch }}
+          E2E_BRANCH_INPUT: ${{ github.event.inputs.e2e_branch || 'default-feature-branch' }}
+        run: |
+          set -euo pipefail
+          TEST_REPO="synonymdev/bitkit-e2e-tests"
+          SELECTED="${SELECTED:-}"
+
+          if [ -z "$SELECTED" ] || [ "$SELECTED" = "main" ]; then
+            REF="main"
+          elif git ls-remote --exit-code "https://github.com/${TEST_REPO}.git" "refs/heads/${SELECTED}" >/dev/null 2>&1; then
+            REF="$SELECTED"
+          elif [ -n "${E2E_BRANCH_INPUT}" ] && [ "${E2E_BRANCH_INPUT}" != "main" ] && [ "${E2E_BRANCH_INPUT}" != "default-feature-branch" ]; then
+            echo "::error title=Missing e2e_branch::Branch '${SELECTED}' was requested via e2e_branch='${E2E_BRANCH_INPUT}' but no longer exists in ${TEST_REPO}."
+            exit 1
+          else
+            echo "::warning title=Missing E2E branch::Determined branch '${SELECTED}' no longer exists in ${TEST_REPO}; falling back to main."
+            REF="main"
+          fi
+
+          echo "Selected E2E branch: ${SELECTED:-<empty>}"
+          echo "e2e_branch input: ${E2E_BRANCH_INPUT}"
+          echo "Effective E2E tests ref: ${REF}"
+          echo "ref=${REF}" >> "$GITHUB_OUTPUT"
 
       - name: Clone E2E tests
         uses: actions/checkout@v7
         with:
           repository: synonymdev/bitkit-e2e-tests
           path: bitkit-e2e-tests
-          ref: ${{ needs.e2e-branch.outputs.branch }}
+          ref: ${{ steps.e2e-ref.outputs.ref }}
 
       - name: Download iOS app
         uses: actions/download-artifact@v8
@@ -336,11 +392,38 @@ jobs:
     runs-on: ubuntu-latest
     needs: [build, e2e-branch, prepare-wallets, e2e-tests]
     steps:
+      - name: Resolve E2E tests ref
+        id: e2e-ref
+        env:
+          SELECTED: ${{ needs.e2e-branch.outputs.branch }}
+          E2E_BRANCH_INPUT: ${{ github.event.inputs.e2e_branch || 'default-feature-branch' }}
+        run: |
+          set -euo pipefail
+          TEST_REPO="synonymdev/bitkit-e2e-tests"
+          SELECTED="${SELECTED:-}"
+
+          if [ -z "$SELECTED" ] || [ "$SELECTED" = "main" ]; then
+            REF="main"
+          elif git ls-remote --exit-code "https://github.com/${TEST_REPO}.git" "refs/heads/${SELECTED}" >/dev/null 2>&1; then
+            REF="$SELECTED"
+          elif [ -n "${E2E_BRANCH_INPUT}" ] && [ "${E2E_BRANCH_INPUT}" != "main" ] && [ "${E2E_BRANCH_INPUT}" != "default-feature-branch" ]; then
+            echo "::error title=Missing e2e_branch::Branch '${SELECTED}' was requested via e2e_branch='${E2E_BRANCH_INPUT}' but no longer exists in ${TEST_REPO}."
+            exit 1
+          else
+            echo "::warning title=Missing E2E branch::Determined branch '${SELECTED}' no longer exists in ${TEST_REPO}; falling back to main."
+            REF="main"
+          fi
+
+          echo "Selected E2E branch: ${SELECTED:-<empty>}"
+          echo "e2e_branch input: ${E2E_BRANCH_INPUT}"
+          echo "Effective E2E tests ref: ${REF}"
+          echo "ref=${REF}" >> "$GITHUB_OUTPUT"
+
       - name: Checkout E2E tests
         uses: actions/checkout@v7
         with:
           repository: synonymdev/bitkit-e2e-tests
-          ref: ${{ needs.e2e-branch.outputs.branch }}
+          ref: ${{ steps.e2e-ref.outputs.ref }}
 
       - name: Post Slack summary
         env:
@@ -353,5 +436,5 @@ jobs:
           E2E_TESTS_RESULT: ${{ needs.e2e-tests.result }}
           RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
           RUN_ATTEMPT: ${{ github.run_attempt }}
-          E2E_TESTS_REF: ${{ needs.e2e-branch.outputs.branch }}
+          E2E_TESTS_REF: ${{ steps.e2e-ref.outputs.ref }}
         run: python3 scripts/slack_summary.py e2e-migration

From ad2d4fdfb10a31bc501f3078b6915e5cc425d6f8 Mon Sep 17 00:00:00 2001
From: Cursor Agent <cursoragent@cursor.com>
Date: Mon, 21 Sep 2026 13:17:04 +0000
Subject: [PATCH 02/10] ci: use shared resolve-e2e-ref action

Replace duplicated inline resolve-e2e-ref bash in local, staging, and
migration workflows with the composite action from bitkit-e2e-tests#252.

Co-authored-by: piotr-iohk <piotr-iohk@users.noreply.github.com>
---
 .github/workflows/e2e-staging.yml   | 56 +++----------------
 .github/workflows/e2e-tests.yml     | 28 ++--------
 .github/workflows/e2e_migration.yml | 84 +++++------------------------
 3 files changed, 24 insertions(+), 144 deletions(-)

diff --git a/.github/workflows/e2e-staging.yml b/.github/workflows/e2e-staging.yml
index 2cd3e0f69..9f25819ec 100644
--- a/.github/workflows/e2e-staging.yml
+++ b/.github/workflows/e2e-staging.yml
@@ -138,30 +138,10 @@ jobs:
     steps:
       - name: Resolve E2E tests ref
         id: e2e-ref
-        env:
-          SELECTED: ${{ needs.e2e-branch.outputs.branch }}
-          E2E_BRANCH_INPUT: ${{ github.event.inputs.e2e_branch || 'default-feature-branch' }}
-        run: |
-          set -euo pipefail
-          TEST_REPO="synonymdev/bitkit-e2e-tests"
-          SELECTED="${SELECTED:-}"
-
-          if [ -z "$SELECTED" ] || [ "$SELECTED" = "main" ]; then
-            REF="main"
-          elif git ls-remote --exit-code "https://github.com/${TEST_REPO}.git" "refs/heads/${SELECTED}" >/dev/null 2>&1; then
-            REF="$SELECTED"
-          elif [ -n "${E2E_BRANCH_INPUT}" ] && [ "${E2E_BRANCH_INPUT}" != "main" ] && [ "${E2E_BRANCH_INPUT}" != "default-feature-branch" ]; then
-            echo "::error title=Missing e2e_branch::Branch '${SELECTED}' was requested via e2e_branch='${E2E_BRANCH_INPUT}' but no longer exists in ${TEST_REPO}."
-            exit 1
-          else
-            echo "::warning title=Missing E2E branch::Determined branch '${SELECTED}' no longer exists in ${TEST_REPO}; falling back to main."
-            REF="main"
-          fi
-
-          echo "Selected E2E branch: ${SELECTED:-<empty>}"
-          echo "e2e_branch input: ${E2E_BRANCH_INPUT}"
-          echo "Effective E2E tests ref: ${REF}"
-          echo "ref=${REF}" >> "$GITHUB_OUTPUT"
+        uses: synonymdev/bitkit-e2e-tests/.github/actions/resolve-e2e-ref@ci/resolve-e2e-ref
+        with:
+          selected: ${{ needs.e2e-branch.outputs.branch }}
+          e2e_branch_input: ${{ github.event.inputs.e2e_branch || 'default-feature-branch' }}
 
       - name: Clone E2E tests
         uses: actions/checkout@v7
@@ -286,30 +266,10 @@ jobs:
     steps:
       - name: Resolve E2E tests ref
         id: e2e-ref
-        env:
-          SELECTED: ${{ needs.e2e-branch.outputs.branch }}
-          E2E_BRANCH_INPUT: ${{ github.event.inputs.e2e_branch || 'default-feature-branch' }}
-        run: |
-          set -euo pipefail
-          TEST_REPO="synonymdev/bitkit-e2e-tests"
-          SELECTED="${SELECTED:-}"
-
-          if [ -z "$SELECTED" ] || [ "$SELECTED" = "main" ]; then
-            REF="main"
-          elif git ls-remote --exit-code "https://github.com/${TEST_REPO}.git" "refs/heads/${SELECTED}" >/dev/null 2>&1; then
-            REF="$SELECTED"
-          elif [ -n "${E2E_BRANCH_INPUT}" ] && [ "${E2E_BRANCH_INPUT}" != "main" ] && [ "${E2E_BRANCH_INPUT}" != "default-feature-branch" ]; then
-            echo "::error title=Missing e2e_branch::Branch '${SELECTED}' was requested via e2e_branch='${E2E_BRANCH_INPUT}' but no longer exists in ${TEST_REPO}."
-            exit 1
-          else
-            echo "::warning title=Missing E2E branch::Determined branch '${SELECTED}' no longer exists in ${TEST_REPO}; falling back to main."
-            REF="main"
-          fi
-
-          echo "Selected E2E branch: ${SELECTED:-<empty>}"
-          echo "e2e_branch input: ${E2E_BRANCH_INPUT}"
-          echo "Effective E2E tests ref: ${REF}"
-          echo "ref=${REF}" >> "$GITHUB_OUTPUT"
+        uses: synonymdev/bitkit-e2e-tests/.github/actions/resolve-e2e-ref@ci/resolve-e2e-ref
+        with:
+          selected: ${{ needs.e2e-branch.outputs.branch }}
+          e2e_branch_input: ${{ github.event.inputs.e2e_branch || 'default-feature-branch' }}
 
       - name: Checkout E2E tests
         uses: actions/checkout@v7
diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml
index adab677b5..fecd33d1d 100644
--- a/.github/workflows/e2e-tests.yml
+++ b/.github/workflows/e2e-tests.yml
@@ -159,30 +159,10 @@ jobs:
     steps:
       - name: Resolve E2E tests ref
         id: e2e-ref
-        env:
-          SELECTED: ${{ needs.e2e-branch.outputs.branch }}
-          E2E_BRANCH_INPUT: ${{ github.event.inputs.e2e_branch || 'default-feature-branch' }}
-        run: |
-          set -euo pipefail
-          TEST_REPO="synonymdev/bitkit-e2e-tests"
-          SELECTED="${SELECTED:-}"
-
-          if [ -z "$SELECTED" ] || [ "$SELECTED" = "main" ]; then
-            REF="main"
-          elif git ls-remote --exit-code "https://github.com/${TEST_REPO}.git" "refs/heads/${SELECTED}" >/dev/null 2>&1; then
-            REF="$SELECTED"
-          elif [ -n "${E2E_BRANCH_INPUT}" ] && [ "${E2E_BRANCH_INPUT}" != "main" ] && [ "${E2E_BRANCH_INPUT}" != "default-feature-branch" ]; then
-            echo "::error title=Missing e2e_branch::Branch '${SELECTED}' was requested via e2e_branch='${E2E_BRANCH_INPUT}' but no longer exists in ${TEST_REPO}."
-            exit 1
-          else
-            echo "::warning title=Missing E2E branch::Determined branch '${SELECTED}' no longer exists in ${TEST_REPO}; falling back to main."
-            REF="main"
-          fi
-
-          echo "Selected E2E branch: ${SELECTED:-<empty>}"
-          echo "e2e_branch input: ${E2E_BRANCH_INPUT}"
-          echo "Effective E2E tests ref: ${REF}"
-          echo "ref=${REF}" >> "$GITHUB_OUTPUT"
+        uses: synonymdev/bitkit-e2e-tests/.github/actions/resolve-e2e-ref@ci/resolve-e2e-ref
+        with:
+          selected: ${{ needs.e2e-branch.outputs.branch }}
+          e2e_branch_input: ${{ github.event.inputs.e2e_branch || 'default-feature-branch' }}
 
       - name: Clone E2E tests
         uses: actions/checkout@v7
diff --git a/.github/workflows/e2e_migration.yml b/.github/workflows/e2e_migration.yml
index 5bc0f99d8..99642592c 100644
--- a/.github/workflows/e2e_migration.yml
+++ b/.github/workflows/e2e_migration.yml
@@ -132,30 +132,10 @@ jobs:
     steps:
       - name: Resolve E2E tests ref
         id: e2e-ref
-        env:
-          SELECTED: ${{ needs.e2e-branch.outputs.branch }}
-          E2E_BRANCH_INPUT: ${{ github.event.inputs.e2e_branch || 'default-feature-branch' }}
-        run: |
-          set -euo pipefail
-          TEST_REPO="synonymdev/bitkit-e2e-tests"
-          SELECTED="${SELECTED:-}"
-
-          if [ -z "$SELECTED" ] || [ "$SELECTED" = "main" ]; then
-            REF="main"
-          elif git ls-remote --exit-code "https://github.com/${TEST_REPO}.git" "refs/heads/${SELECTED}" >/dev/null 2>&1; then
-            REF="$SELECTED"
-          elif [ -n "${E2E_BRANCH_INPUT}" ] && [ "${E2E_BRANCH_INPUT}" != "main" ] && [ "${E2E_BRANCH_INPUT}" != "default-feature-branch" ]; then
-            echo "::error title=Missing e2e_branch::Branch '${SELECTED}' was requested via e2e_branch='${E2E_BRANCH_INPUT}' but no longer exists in ${TEST_REPO}."
-            exit 1
-          else
-            echo "::warning title=Missing E2E branch::Determined branch '${SELECTED}' no longer exists in ${TEST_REPO}; falling back to main."
-            REF="main"
-          fi
-
-          echo "Selected E2E branch: ${SELECTED:-<empty>}"
-          echo "e2e_branch input: ${E2E_BRANCH_INPUT}"
-          echo "Effective E2E tests ref: ${REF}"
-          echo "ref=${REF}" >> "$GITHUB_OUTPUT"
+        uses: synonymdev/bitkit-e2e-tests/.github/actions/resolve-e2e-ref@ci/resolve-e2e-ref
+        with:
+          selected: ${{ needs.e2e-branch.outputs.branch }}
+          e2e_branch_input: ${{ github.event.inputs.e2e_branch || 'default-feature-branch' }}
 
   prepare-wallets:
     if: github.event_name != 'pull_request' || (github.event.pull_request.draft == false && (startsWith(github.head_ref, 'release-') || startsWith(github.base_ref, 'release-')))
@@ -201,30 +181,10 @@ jobs:
     steps:
       - name: Resolve E2E tests ref
         id: e2e-ref
-        env:
-          SELECTED: ${{ needs.e2e-branch.outputs.branch }}
-          E2E_BRANCH_INPUT: ${{ github.event.inputs.e2e_branch || 'default-feature-branch' }}
-        run: |
-          set -euo pipefail
-          TEST_REPO="synonymdev/bitkit-e2e-tests"
-          SELECTED="${SELECTED:-}"
-
-          if [ -z "$SELECTED" ] || [ "$SELECTED" = "main" ]; then
-            REF="main"
-          elif git ls-remote --exit-code "https://github.com/${TEST_REPO}.git" "refs/heads/${SELECTED}" >/dev/null 2>&1; then
-            REF="$SELECTED"
-          elif [ -n "${E2E_BRANCH_INPUT}" ] && [ "${E2E_BRANCH_INPUT}" != "main" ] && [ "${E2E_BRANCH_INPUT}" != "default-feature-branch" ]; then
-            echo "::error title=Missing e2e_branch::Branch '${SELECTED}' was requested via e2e_branch='${E2E_BRANCH_INPUT}' but no longer exists in ${TEST_REPO}."
-            exit 1
-          else
-            echo "::warning title=Missing E2E branch::Determined branch '${SELECTED}' no longer exists in ${TEST_REPO}; falling back to main."
-            REF="main"
-          fi
-
-          echo "Selected E2E branch: ${SELECTED:-<empty>}"
-          echo "e2e_branch input: ${E2E_BRANCH_INPUT}"
-          echo "Effective E2E tests ref: ${REF}"
-          echo "ref=${REF}" >> "$GITHUB_OUTPUT"
+        uses: synonymdev/bitkit-e2e-tests/.github/actions/resolve-e2e-ref@ci/resolve-e2e-ref
+        with:
+          selected: ${{ needs.e2e-branch.outputs.branch }}
+          e2e_branch_input: ${{ github.event.inputs.e2e_branch || 'default-feature-branch' }}
 
       - name: Clone E2E tests
         uses: actions/checkout@v7
@@ -394,30 +354,10 @@ jobs:
     steps:
       - name: Resolve E2E tests ref
         id: e2e-ref
-        env:
-          SELECTED: ${{ needs.e2e-branch.outputs.branch }}
-          E2E_BRANCH_INPUT: ${{ github.event.inputs.e2e_branch || 'default-feature-branch' }}
-        run: |
-          set -euo pipefail
-          TEST_REPO="synonymdev/bitkit-e2e-tests"
-          SELECTED="${SELECTED:-}"
-
-          if [ -z "$SELECTED" ] || [ "$SELECTED" = "main" ]; then
-            REF="main"
-          elif git ls-remote --exit-code "https://github.com/${TEST_REPO}.git" "refs/heads/${SELECTED}" >/dev/null 2>&1; then
-            REF="$SELECTED"
-          elif [ -n "${E2E_BRANCH_INPUT}" ] && [ "${E2E_BRANCH_INPUT}" != "main" ] && [ "${E2E_BRANCH_INPUT}" != "default-feature-branch" ]; then
-            echo "::error title=Missing e2e_branch::Branch '${SELECTED}' was requested via e2e_branch='${E2E_BRANCH_INPUT}' but no longer exists in ${TEST_REPO}."
-            exit 1
-          else
-            echo "::warning title=Missing E2E branch::Determined branch '${SELECTED}' no longer exists in ${TEST_REPO}; falling back to main."
-            REF="main"
-          fi
-
-          echo "Selected E2E branch: ${SELECTED:-<empty>}"
-          echo "e2e_branch input: ${E2E_BRANCH_INPUT}"
-          echo "Effective E2E tests ref: ${REF}"
-          echo "ref=${REF}" >> "$GITHUB_OUTPUT"
+        uses: synonymdev/bitkit-e2e-tests/.github/actions/resolve-e2e-ref@ci/resolve-e2e-ref
+        with:
+          selected: ${{ needs.e2e-branch.outputs.branch }}
+          e2e_branch_input: ${{ github.event.inputs.e2e_branch || 'default-feature-branch' }}
 
       - name: Checkout E2E tests
         uses: actions/checkout@v7

From 6ed7db412649c27ab16874a3c9813332e7ad5e3e Mon Sep 17 00:00:00 2001
From: Cursor Agent <cursoragent@cursor.com>
Date: Mon, 21 Sep 2026 13:37:47 +0000
Subject: [PATCH 03/10] ci: temporary resolve-e2e-ref smoke workflow

Co-authored-by: piotr-iohk <piotr-iohk@users.noreply.github.com>
---
 .github/workflows/resolve-e2e-ref-smoke.yml | 57 +++++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 .github/workflows/resolve-e2e-ref-smoke.yml

diff --git a/.github/workflows/resolve-e2e-ref-smoke.yml b/.github/workflows/resolve-e2e-ref-smoke.yml
new file mode 100644
index 000000000..286e76303
--- /dev/null
+++ b/.github/workflows/resolve-e2e-ref-smoke.yml
@@ -0,0 +1,57 @@
+name: resolve-e2e-ref smoke
+
+on:
+  workflow_dispatch:
+    inputs:
+      e2e_branch:
+        description: "E2E branch input (main | default-feature-branch | custom)"
+        required: false
+        default: "default-feature-branch"
+        type: string
+      pre_resolve_sleep_seconds:
+        description: "Sleep before resolve job (race simulation)"
+        required: false
+        default: "0"
+        type: string
+
+jobs:
+  determine:
+    uses: synonymdev/bitkit-e2e-tests/.github/workflows/determine-e2e-branch.yml@main
+    with:
+      app_branch: ${{ github.ref_name }}
+      e2e_branch_input: ${{ inputs.e2e_branch }}
+
+  resolve:
+    needs: determine
+    runs-on: macos-latest
+    steps:
+      - name: Optional pre-resolve sleep
+        if: inputs.pre_resolve_sleep_seconds != '0'
+        run: |
+          echo "Sleeping ${{ inputs.pre_resolve_sleep_seconds }}s before resolve..."
+          sleep "${{ inputs.pre_resolve_sleep_seconds }}"
+
+      - name: Resolve e2e ref
+        id: e2e-ref
+        uses: synonymdev/bitkit-e2e-tests/.github/actions/resolve-e2e-ref@ci/resolve-e2e-ref
+        with:
+          selected: ${{ needs.determine.outputs.branch }}
+          e2e_branch_input: ${{ inputs.e2e_branch }}
+
+      - name: Checkout e2e tests
+        uses: actions/checkout@v4
+        with:
+          repository: synonymdev/bitkit-e2e-tests
+          ref: ${{ steps.e2e-ref.outputs.ref }}
+          fetch-depth: 1
+          path: e2e-tests
+
+      - name: Confirm checkout
+        working-directory: e2e-tests
+        run: |
+          echo "selected=${{ needs.determine.outputs.branch }}"
+          echo "effective=${{ steps.e2e-ref.outputs.ref }}"
+          echo "HEAD=$(git rev-parse HEAD)"
+          git branch -r || true
+          git log -1 --oneline
+          echo "PASS"

From 07f364758bdf51e59679fa5427cec25c7e4887ea Mon Sep 17 00:00:00 2001
From: Cursor Agent <cursoragent@cursor.com>
Date: Mon, 21 Sep 2026 13:38:47 +0000
Subject: [PATCH 04/10] ci: smoke trigger via push/PR for resolve-e2e-ref

Co-authored-by: piotr-iohk <piotr-iohk@users.noreply.github.com>
---
 .github/workflows/resolve-e2e-ref-smoke.yml | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/resolve-e2e-ref-smoke.yml b/.github/workflows/resolve-e2e-ref-smoke.yml
index 286e76303..0e03f1c69 100644
--- a/.github/workflows/resolve-e2e-ref-smoke.yml
+++ b/.github/workflows/resolve-e2e-ref-smoke.yml
@@ -4,29 +4,37 @@ on:
   workflow_dispatch:
     inputs:
       e2e_branch:
-        description: "E2E branch input (main | default-feature-branch | custom)"
+        description: "E2E branch input"
         required: false
         default: "default-feature-branch"
         type: string
       pre_resolve_sleep_seconds:
-        description: "Sleep before resolve job (race simulation)"
+        description: "Sleep before resolve"
         required: false
         default: "0"
         type: string
+  push:
+    branches:
+      - 'cursor/e2e-clone-branch-fallback-2163'
+    paths:
+      - '.github/workflows/resolve-e2e-ref-smoke.yml'
+  pull_request:
+    paths:
+      - '.github/workflows/resolve-e2e-ref-smoke.yml'
 
 jobs:
   determine:
     uses: synonymdev/bitkit-e2e-tests/.github/workflows/determine-e2e-branch.yml@main
     with:
-      app_branch: ${{ github.ref_name }}
-      e2e_branch_input: ${{ inputs.e2e_branch }}
+      app_branch: ${{ github.head_ref || github.ref_name }}
+      e2e_branch_input: ${{ inputs.e2e_branch || 'default-feature-branch' }}
 
   resolve:
     needs: determine
     runs-on: macos-latest
     steps:
       - name: Optional pre-resolve sleep
-        if: inputs.pre_resolve_sleep_seconds != '0'
+        if: ${{ (inputs.pre_resolve_sleep_seconds || '0') != '0' }}
         run: |
           echo "Sleeping ${{ inputs.pre_resolve_sleep_seconds }}s before resolve..."
           sleep "${{ inputs.pre_resolve_sleep_seconds }}"
@@ -36,7 +44,7 @@ jobs:
         uses: synonymdev/bitkit-e2e-tests/.github/actions/resolve-e2e-ref@ci/resolve-e2e-ref
         with:
           selected: ${{ needs.determine.outputs.branch }}
-          e2e_branch_input: ${{ inputs.e2e_branch }}
+          e2e_branch_input: ${{ inputs.e2e_branch || 'default-feature-branch' }}
 
       - name: Checkout e2e tests
         uses: actions/checkout@v4

From f21025341edbaf425047e3e3621cfe9265ae81f0 Mon Sep 17 00:00:00 2001
From: Cursor Agent <cursoragent@cursor.com>
Date: Mon, 21 Sep 2026 13:41:43 +0000
Subject: [PATCH 05/10] ci: smoke cases A/B/C for resolve-e2e-ref

Co-authored-by: piotr-iohk <piotr-iohk@users.noreply.github.com>
---
 .github/workflows/resolve-e2e-ref-smoke.yml | 101 +++++++++++++++-----
 1 file changed, 76 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/resolve-e2e-ref-smoke.yml b/.github/workflows/resolve-e2e-ref-smoke.yml
index 0e03f1c69..ad83a3a5e 100644
--- a/.github/workflows/resolve-e2e-ref-smoke.yml
+++ b/.github/workflows/resolve-e2e-ref-smoke.yml
@@ -1,18 +1,6 @@
 name: resolve-e2e-ref smoke
 
 on:
-  workflow_dispatch:
-    inputs:
-      e2e_branch:
-        description: "E2E branch input"
-        required: false
-        default: "default-feature-branch"
-        type: string
-      pre_resolve_sleep_seconds:
-        description: "Sleep before resolve"
-        required: false
-        default: "0"
-        type: string
   push:
     branches:
       - 'cursor/e2e-clone-branch-fallback-2163'
@@ -21,31 +9,58 @@ on:
   pull_request:
     paths:
       - '.github/workflows/resolve-e2e-ref-smoke.yml'
+  workflow_dispatch:
 
 jobs:
-  determine:
+  determine-A:
     uses: synonymdev/bitkit-e2e-tests/.github/workflows/determine-e2e-branch.yml@main
     with:
       app_branch: ${{ github.head_ref || github.ref_name }}
-      e2e_branch_input: ${{ inputs.e2e_branch || 'default-feature-branch' }}
+      e2e_branch_input: main
 
-  resolve:
-    needs: determine
+  resolve-A:
+    needs: determine-A
     runs-on: macos-latest
     steps:
-      - name: Optional pre-resolve sleep
-        if: ${{ (inputs.pre_resolve_sleep_seconds || '0') != '0' }}
+      - name: Resolve e2e ref
+        id: e2e-ref
+        uses: synonymdev/bitkit-e2e-tests/.github/actions/resolve-e2e-ref@ci/resolve-e2e-ref
+        with:
+          selected: ${{ needs.determine-A.outputs.branch }}
+          e2e_branch_input: main
+      - name: Checkout e2e tests
+        uses: actions/checkout@v4
+        with:
+          repository: synonymdev/bitkit-e2e-tests
+          ref: ${{ steps.e2e-ref.outputs.ref }}
+          fetch-depth: 1
+          path: e2e-tests
+      - name: Confirm checkout
+        working-directory: e2e-tests
         run: |
-          echo "Sleeping ${{ inputs.pre_resolve_sleep_seconds }}s before resolve..."
-          sleep "${{ inputs.pre_resolve_sleep_seconds }}"
+          echo "case=A"
+          echo "selected=${{ needs.determine-A.outputs.branch }}"
+          echo "effective=${{ steps.e2e-ref.outputs.ref }}"
+          echo "HEAD=$(git rev-parse HEAD)"
+          git log -1 --oneline
+          echo "PASS"
 
+  determine-B:
+    uses: synonymdev/bitkit-e2e-tests/.github/workflows/determine-e2e-branch.yml@main
+    with:
+      app_branch: ${{ github.head_ref || github.ref_name }}
+      e2e_branch_input: default-feature-branch
+
+  resolve-B:
+    needs: determine-B
+    runs-on: macos-latest
+    steps:
       - name: Resolve e2e ref
         id: e2e-ref
         uses: synonymdev/bitkit-e2e-tests/.github/actions/resolve-e2e-ref@ci/resolve-e2e-ref
         with:
-          selected: ${{ needs.determine.outputs.branch }}
-          e2e_branch_input: ${{ inputs.e2e_branch || 'default-feature-branch' }}
-
+          selected: ${{ needs.determine-B.outputs.branch }}
+          e2e_branch_input: default-feature-branch
       - name: Checkout e2e tests
         uses: actions/checkout@v4
         with:
@@ -53,13 +68,49 @@ jobs:
           ref: ${{ steps.e2e-ref.outputs.ref }}
           fetch-depth: 1
           path: e2e-tests
+      - name: Confirm checkout
+        working-directory: e2e-tests
+        run: |
+          echo "case=B"
+          echo "selected=${{ needs.determine-B.outputs.branch }}"
+          echo "effective=${{ steps.e2e-ref.outputs.ref }}"
+          echo "HEAD=$(git rev-parse HEAD)"
+          git log -1 --oneline
+          echo "PASS"
 
+  determine-C:
+    uses: synonymdev/bitkit-e2e-tests/.github/workflows/determine-e2e-branch.yml@main
+    with:
+      app_branch: ${{ github.head_ref || github.ref_name }}
+      e2e_branch_input: default-feature-branch
+
+  resolve-C:
+    needs: determine-C
+    runs-on: macos-latest
+    steps:
+      - name: Pre-resolve sleep for race simulation
+        run: |
+          echo "Sleeping 90s before resolve (case C race)..."
+          sleep 90
+      - name: Resolve e2e ref
+        id: e2e-ref
+        uses: synonymdev/bitkit-e2e-tests/.github/actions/resolve-e2e-ref@ci/resolve-e2e-ref
+        with:
+          selected: ${{ needs.determine-C.outputs.branch }}
+          e2e_branch_input: default-feature-branch
+      - name: Checkout e2e tests
+        uses: actions/checkout@v4
+        with:
+          repository: synonymdev/bitkit-e2e-tests
+          ref: ${{ steps.e2e-ref.outputs.ref }}
+          fetch-depth: 1
+          path: e2e-tests
       - name: Confirm checkout
         working-directory: e2e-tests
         run: |
-          echo "selected=${{ needs.determine.outputs.branch }}"
+          echo "case=C"
+          echo "selected=${{ needs.determine-C.outputs.branch }}"
           echo "effective=${{ steps.e2e-ref.outputs.ref }}"
           echo "HEAD=$(git rev-parse HEAD)"
-          git branch -r || true
           git log -1 --oneline
           echo "PASS"

From 28617169cbdbff89e21b2efc9571f33bdd594a80 Mon Sep 17 00:00:00 2001
From: Cursor Agent <cursoragent@cursor.com>
Date: Mon, 21 Sep 2026 13:45:13 +0000
Subject: [PATCH 06/10] ci: smoke case C race only

Co-authored-by: piotr-iohk <piotr-iohk@users.noreply.github.com>
---
 .github/workflows/resolve-e2e-ref-smoke.yml | 70 +--------------------
 1 file changed, 2 insertions(+), 68 deletions(-)

diff --git a/.github/workflows/resolve-e2e-ref-smoke.yml b/.github/workflows/resolve-e2e-ref-smoke.yml
index ad83a3a5e..4951984ca 100644
--- a/.github/workflows/resolve-e2e-ref-smoke.yml
+++ b/.github/workflows/resolve-e2e-ref-smoke.yml
@@ -12,72 +12,6 @@ on:
   workflow_dispatch:
 
 jobs:
-  determine-A:
-    uses: synonymdev/bitkit-e2e-tests/.github/workflows/determine-e2e-branch.yml@main
-    with:
-      app_branch: ${{ github.head_ref || github.ref_name }}
-      e2e_branch_input: main
-
-  resolve-A:
-    needs: determine-A
-    runs-on: macos-latest
-    steps:
-      - name: Resolve e2e ref
-        id: e2e-ref
-        uses: synonymdev/bitkit-e2e-tests/.github/actions/resolve-e2e-ref@ci/resolve-e2e-ref
-        with:
-          selected: ${{ needs.determine-A.outputs.branch }}
-          e2e_branch_input: main
-      - name: Checkout e2e tests
-        uses: actions/checkout@v4
-        with:
-          repository: synonymdev/bitkit-e2e-tests
-          ref: ${{ steps.e2e-ref.outputs.ref }}
-          fetch-depth: 1
-          path: e2e-tests
-      - name: Confirm checkout
-        working-directory: e2e-tests
-        run: |
-          echo "case=A"
-          echo "selected=${{ needs.determine-A.outputs.branch }}"
-          echo "effective=${{ steps.e2e-ref.outputs.ref }}"
-          echo "HEAD=$(git rev-parse HEAD)"
-          git log -1 --oneline
-          echo "PASS"
-
-  determine-B:
-    uses: synonymdev/bitkit-e2e-tests/.github/workflows/determine-e2e-branch.yml@main
-    with:
-      app_branch: ${{ github.head_ref || github.ref_name }}
-      e2e_branch_input: default-feature-branch
-
-  resolve-B:
-    needs: determine-B
-    runs-on: macos-latest
-    steps:
-      - name: Resolve e2e ref
-        id: e2e-ref
-        uses: synonymdev/bitkit-e2e-tests/.github/actions/resolve-e2e-ref@ci/resolve-e2e-ref
-        with:
-          selected: ${{ needs.determine-B.outputs.branch }}
-          e2e_branch_input: default-feature-branch
-      - name: Checkout e2e tests
-        uses: actions/checkout@v4
-        with:
-          repository: synonymdev/bitkit-e2e-tests
-          ref: ${{ steps.e2e-ref.outputs.ref }}
-          fetch-depth: 1
-          path: e2e-tests
-      - name: Confirm checkout
-        working-directory: e2e-tests
-        run: |
-          echo "case=B"
-          echo "selected=${{ needs.determine-B.outputs.branch }}"
-          echo "effective=${{ steps.e2e-ref.outputs.ref }}"
-          echo "HEAD=$(git rev-parse HEAD)"
-          git log -1 --oneline
-          echo "PASS"
-
   determine-C:
     uses: synonymdev/bitkit-e2e-tests/.github/workflows/determine-e2e-branch.yml@main
     with:
@@ -90,8 +24,8 @@ jobs:
     steps:
       - name: Pre-resolve sleep for race simulation
         run: |
-          echo "Sleeping 90s before resolve (case C race)..."
-          sleep 90
+          echo "Sleeping 120s before resolve (case C race)..."
+          sleep 120
       - name: Resolve e2e ref
         id: e2e-ref
         uses: synonymdev/bitkit-e2e-tests/.github/actions/resolve-e2e-ref@ci/resolve-e2e-ref

From d7a6e9eed855ce9c37a3d9a915f1406c1f0aac74 Mon Sep 17 00:00:00 2001
From: Cursor Agent <cursoragent@cursor.com>
Date: Mon, 21 Sep 2026 13:51:58 +0000
Subject: [PATCH 07/10] ci: smoke case C race retry

Co-authored-by: piotr-iohk <piotr-iohk@users.noreply.github.com>
---
 .github/workflows/resolve-e2e-ref-smoke.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/resolve-e2e-ref-smoke.yml b/.github/workflows/resolve-e2e-ref-smoke.yml
index 4951984ca..503fb04a4 100644
--- a/.github/workflows/resolve-e2e-ref-smoke.yml
+++ b/.github/workflows/resolve-e2e-ref-smoke.yml
@@ -1,4 +1,5 @@
 name: resolve-e2e-ref smoke
+# race retry $(date)
 
 on:
   push:

From d8468ddca95aaf09db43cfe1b6220858628a83c6 Mon Sep 17 00:00:00 2001
From: Cursor Agent <cursoragent@cursor.com>
Date: Mon, 21 Sep 2026 13:55:10 +0000
Subject: [PATCH 08/10] ci: remove temporary resolve-e2e-ref smoke

Co-authored-by: piotr-iohk <piotr-iohk@users.noreply.github.com>
---
 .github/workflows/resolve-e2e-ref-smoke.yml | 51 ---------------------
 1 file changed, 51 deletions(-)
 delete mode 100644 .github/workflows/resolve-e2e-ref-smoke.yml

diff --git a/.github/workflows/resolve-e2e-ref-smoke.yml b/.github/workflows/resolve-e2e-ref-smoke.yml
deleted file mode 100644
index 503fb04a4..000000000
--- a/.github/workflows/resolve-e2e-ref-smoke.yml
+++ /dev/null
@@ -1,51 +0,0 @@
-name: resolve-e2e-ref smoke
-# race retry $(date)
-
-on:
-  push:
-    branches:
-      - 'cursor/e2e-clone-branch-fallback-2163'
-    paths:
-      - '.github/workflows/resolve-e2e-ref-smoke.yml'
-  pull_request:
-    paths:
-      - '.github/workflows/resolve-e2e-ref-smoke.yml'
-  workflow_dispatch:
-
-jobs:
-  determine-C:
-    uses: synonymdev/bitkit-e2e-tests/.github/workflows/determine-e2e-branch.yml@main
-    with:
-      app_branch: ${{ github.head_ref || github.ref_name }}
-      e2e_branch_input: default-feature-branch
-
-  resolve-C:
-    needs: determine-C
-    runs-on: macos-latest
-    steps:
-      - name: Pre-resolve sleep for race simulation
-        run: |
-          echo "Sleeping 120s before resolve (case C race)..."
-          sleep 120
-      - name: Resolve e2e ref
-        id: e2e-ref
-        uses: synonymdev/bitkit-e2e-tests/.github/actions/resolve-e2e-ref@ci/resolve-e2e-ref
-        with:
-          selected: ${{ needs.determine-C.outputs.branch }}
-          e2e_branch_input: default-feature-branch
-      - name: Checkout e2e tests
-        uses: actions/checkout@v4
-        with:
-          repository: synonymdev/bitkit-e2e-tests
-          ref: ${{ steps.e2e-ref.outputs.ref }}
-          fetch-depth: 1
-          path: e2e-tests
-      - name: Confirm checkout
-        working-directory: e2e-tests
-        run: |
-          echo "case=C"
-          echo "selected=${{ needs.determine-C.outputs.branch }}"
-          echo "effective=${{ steps.e2e-ref.outputs.ref }}"
-          echo "HEAD=$(git rev-parse HEAD)"
-          git log -1 --oneline
-          echo "PASS"

From 3604e795a839c6d07be87c909776902b8e152897 Mon Sep 17 00:00:00 2001
From: Cursor Agent <cursoragent@cursor.com>
Date: Mon, 21 Sep 2026 14:13:40 +0000
Subject: [PATCH 09/10] ci: pin resolve-e2e-ref to main

Co-authored-by: piotr-iohk <piotr-iohk@users.noreply.github.com>
---
 .github/workflows/e2e-staging.yml   | 4 ++--
 .github/workflows/e2e-tests.yml     | 2 +-
 .github/workflows/e2e_migration.yml | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/e2e-staging.yml b/.github/workflows/e2e-staging.yml
index 9f25819ec..c6f0a13b9 100644
--- a/.github/workflows/e2e-staging.yml
+++ b/.github/workflows/e2e-staging.yml
@@ -138,7 +138,7 @@ jobs:
     steps:
       - name: Resolve E2E tests ref
         id: e2e-ref
-        uses: synonymdev/bitkit-e2e-tests/.github/actions/resolve-e2e-ref@ci/resolve-e2e-ref
+        uses: synonymdev/bitkit-e2e-tests/.github/actions/resolve-e2e-ref@main
         with:
           selected: ${{ needs.e2e-branch.outputs.branch }}
           e2e_branch_input: ${{ github.event.inputs.e2e_branch || 'default-feature-branch' }}
@@ -266,7 +266,7 @@ jobs:
     steps:
       - name: Resolve E2E tests ref
         id: e2e-ref
-        uses: synonymdev/bitkit-e2e-tests/.github/actions/resolve-e2e-ref@ci/resolve-e2e-ref
+        uses: synonymdev/bitkit-e2e-tests/.github/actions/resolve-e2e-ref@main
         with:
           selected: ${{ needs.e2e-branch.outputs.branch }}
           e2e_branch_input: ${{ github.event.inputs.e2e_branch || 'default-feature-branch' }}
diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml
index fecd33d1d..d84ac0e75 100644
--- a/.github/workflows/e2e-tests.yml
+++ b/.github/workflows/e2e-tests.yml
@@ -159,7 +159,7 @@ jobs:
     steps:
       - name: Resolve E2E tests ref
         id: e2e-ref
-        uses: synonymdev/bitkit-e2e-tests/.github/actions/resolve-e2e-ref@ci/resolve-e2e-ref
+        uses: synonymdev/bitkit-e2e-tests/.github/actions/resolve-e2e-ref@main
         with:
           selected: ${{ needs.e2e-branch.outputs.branch }}
           e2e_branch_input: ${{ github.event.inputs.e2e_branch || 'default-feature-branch' }}
diff --git a/.github/workflows/e2e_migration.yml b/.github/workflows/e2e_migration.yml
index 99642592c..1f1418399 100644
--- a/.github/workflows/e2e_migration.yml
+++ b/.github/workflows/e2e_migration.yml
@@ -132,7 +132,7 @@ jobs:
     steps:
       - name: Resolve E2E tests ref
         id: e2e-ref
-        uses: synonymdev/bitkit-e2e-tests/.github/actions/resolve-e2e-ref@ci/resolve-e2e-ref
+        uses: synonymdev/bitkit-e2e-tests/.github/actions/resolve-e2e-ref@main
         with:
           selected: ${{ needs.e2e-branch.outputs.branch }}
           e2e_branch_input: ${{ github.event.inputs.e2e_branch || 'default-feature-branch' }}
@@ -181,7 +181,7 @@ jobs:
     steps:
       - name: Resolve E2E tests ref
         id: e2e-ref
-        uses: synonymdev/bitkit-e2e-tests/.github/actions/resolve-e2e-ref@ci/resolve-e2e-ref
+        uses: synonymdev/bitkit-e2e-tests/.github/actions/resolve-e2e-ref@main
         with:
           selected: ${{ needs.e2e-branch.outputs.branch }}
           e2e_branch_input: ${{ github.event.inputs.e2e_branch || 'default-feature-branch' }}
@@ -354,7 +354,7 @@ jobs:
     steps:
       - name: Resolve E2E tests ref
         id: e2e-ref
-        uses: synonymdev/bitkit-e2e-tests/.github/actions/resolve-e2e-ref@ci/resolve-e2e-ref
+        uses: synonymdev/bitkit-e2e-tests/.github/actions/resolve-e2e-ref@main
         with:
           selected: ${{ needs.e2e-branch.outputs.branch }}
           e2e_branch_input: ${{ github.event.inputs.e2e_branch || 'default-feature-branch' }}

From 9d89d65b6c799d93bff9385b675df1abb749c296 Mon Sep 17 00:00:00 2001
From: Cursor Agent <cursoragent@cursor.com>
Date: Tue, 22 Sep 2026 12:39:38 +0000
Subject: [PATCH 10/10] ci: soften slack-report e2e resolve so posts still fire

Co-authored-by: piotr-iohk <piotr-iohk@users.noreply.github.com>
---
 .github/workflows/e2e-staging.yml   | 3 ++-
 .github/workflows/e2e_migration.yml | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/e2e-staging.yml b/.github/workflows/e2e-staging.yml
index c6f0a13b9..1ea4308bc 100644
--- a/.github/workflows/e2e-staging.yml
+++ b/.github/workflows/e2e-staging.yml
@@ -266,6 +266,7 @@ jobs:
     steps:
       - name: Resolve E2E tests ref
         id: e2e-ref
+        continue-on-error: true
         uses: synonymdev/bitkit-e2e-tests/.github/actions/resolve-e2e-ref@main
         with:
           selected: ${{ needs.e2e-branch.outputs.branch }}
@@ -275,7 +276,7 @@ jobs:
         uses: actions/checkout@v7
         with:
           repository: synonymdev/bitkit-e2e-tests
-          ref: ${{ steps.e2e-ref.outputs.ref }}
+          ref: ${{ steps.e2e-ref.outputs.ref || 'main' }}
 
       - name: Post Slack summary
         env:
diff --git a/.github/workflows/e2e_migration.yml b/.github/workflows/e2e_migration.yml
index 1f1418399..04ab743b9 100644
--- a/.github/workflows/e2e_migration.yml
+++ b/.github/workflows/e2e_migration.yml
@@ -354,6 +354,7 @@ jobs:
     steps:
       - name: Resolve E2E tests ref
         id: e2e-ref
+        continue-on-error: true
         uses: synonymdev/bitkit-e2e-tests/.github/actions/resolve-e2e-ref@main
         with:
           selected: ${{ needs.e2e-branch.outputs.branch }}
@@ -363,7 +364,7 @@ jobs:
         uses: actions/checkout@v7
         with:
           repository: synonymdev/bitkit-e2e-tests
-          ref: ${{ steps.e2e-ref.outputs.ref }}
+          ref: ${{ steps.e2e-ref.outputs.ref || 'main' }}
 
       - name: Post Slack summary
         env: