From a5a90d37e6220f8bfe2f212838ecddf233aa6ae8 Mon Sep 17 00:00:00 2001
From: Savio <72797635+Savio-Sou@users.noreply.github.com>
Date: Thu, 7 May 2026 16:15:23 -0400
Subject: [PATCH 1/2] Fix port racing condition

---
 scripts/run.sh | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/scripts/run.sh b/scripts/run.sh
index e111d42..bd8f2b0 100755
--- a/scripts/run.sh
+++ b/scripts/run.sh
@@ -1,7 +1,16 @@
 #!/usr/bin/env bash
 set -eu
 
-export PORT=8095
+export PORT="${PORT:-8095}"
+TS_SERVER_PID=""
+
+cleanup() {
+    if [[ -n "$TS_SERVER_PID" ]]; then
+        kill "$TS_SERVER_PID" 2>/dev/null || true
+        wait "$TS_SERVER_PID" 2>/dev/null || true
+    fi
+}
+trap cleanup EXIT
 
 # Build TypeScript first
 echo "Building TypeScript..."
@@ -9,13 +18,17 @@ yarn build
 
 # Start TypeScript RPC server in background
 echo "Starting TypeScript RPC server..."
-yarn start &
+node dist/oracle_server.js &
 TS_SERVER_PID=$!
-trap 'kill $TS_SERVER_PID' EXIT
 
 # Wait for server to start
 sleep 2
 
+if ! kill -0 "$TS_SERVER_PID" 2>/dev/null; then
+    echo "TypeScript RPC server failed to start" >&2
+    exit 1
+fi
+
 project_dir="$(dirname "$0")/.."
 
 # Run the Noir tests with oracle resolver

From 33fce7fcfb262052d5ff21cdf100f04f49a6a31d Mon Sep 17 00:00:00 2001
From: Savio <72797635+Savio-Sou@users.noreply.github.com>
Date: Thu, 7 May 2026 16:53:03 -0400
Subject: [PATCH 2/2] Fix CI error (define full path)

---
 scripts/run.sh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/scripts/run.sh b/scripts/run.sh
index bd8f2b0..84fdbdb 100755
--- a/scripts/run.sh
+++ b/scripts/run.sh
@@ -3,6 +3,7 @@ set -eu
 
 export PORT="${PORT:-8095}"
 TS_SERVER_PID=""
+project_dir="$(cd "$(dirname "$0")/.." && pwd)"
 
 cleanup() {
     if [[ -n "$TS_SERVER_PID" ]]; then
@@ -18,7 +19,7 @@ yarn build
 
 # Start TypeScript RPC server in background
 echo "Starting TypeScript RPC server..."
-node dist/oracle_server.js &
+node "$project_dir/dist/oracle_server.js" &
 TS_SERVER_PID=$!
 
 # Wait for server to start
@@ -29,8 +30,6 @@ if ! kill -0 "$TS_SERVER_PID" 2>/dev/null; then
     exit 1
 fi
 
-project_dir="$(dirname "$0")/.."
-
 # Run the Noir tests with oracle resolver
 nargo --program-dir="$project_dir" test --oracle-resolver http://localhost:${PORT}