diff --git a/infra/scripts/assign_azure_ai_user_role.sh b/infra/scripts/assign_foundry_user_role.sh
similarity index 98%
rename from infra/scripts/assign_azure_ai_user_role.sh
rename to infra/scripts/assign_foundry_user_role.sh
index 12326e806..fde7abb5a 100644
--- a/infra/scripts/assign_azure_ai_user_role.sh
+++ b/infra/scripts/assign_foundry_user_role.sh
@@ -4,6 +4,7 @@
 resource_group="$1"
 aif_resource_id="$2"
 principal_ids="$3"
+managedIdentityClientId="$4"
 
 
 # Authenticate with Azure
diff --git a/infra/scripts/cosmosdb_and_ai_user_role_assignment.sh b/infra/scripts/cosmosdb_and_foundry_user_role_assignment.sh
similarity index 94%
rename from infra/scripts/cosmosdb_and_ai_user_role_assignment.sh
rename to infra/scripts/cosmosdb_and_foundry_user_role_assignment.sh
index f8c14522a..f1ae7ced9 100644
--- a/infra/scripts/cosmosdb_and_ai_user_role_assignment.sh
+++ b/infra/scripts/cosmosdb_and_foundry_user_role_assignment.sh
@@ -153,11 +153,11 @@ fi
 echo "add_cosmosdb_access.sh completed successfully."
 
 
-# Call add_cosmosdb_access.sh
-echo "Running assign_azure_ai_user_role.sh"
-bash infra/scripts/assign_azure_ai_user_role.sh "$resourceGroupName" "$aif_resource_id" "$principal_ids" "$managedIdentityClientId"
+# Call assign_foundry_user_role.sh
+echo "Running assign_foundry_user_role.sh"
+bash infra/scripts/assign_foundry_user_role.sh "$resourceGroupName" "$aif_resource_id" "$principal_ids" "$managedIdentityClientId"
 if [ $? -ne 0 ]; then
-    echo "Error: assign_azure_ai_user_role.sh failed."
+    echo "Error: assign_foundry_user_role.sh failed."
     exit 1
 fi
-echo "assign_azure_ai_user_role.sh completed successfully."
\ No newline at end of file
+echo "assign_foundry_user_role.sh completed successfully."
\ No newline at end of file
diff --git a/src/App/src/hooks/usePlanWebSocket.tsx b/src/App/src/hooks/usePlanWebSocket.tsx
index af038e116..234768ff2 100644
--- a/src/App/src/hooks/usePlanWebSocket.tsx
+++ b/src/App/src/hooks/usePlanWebSocket.tsx
@@ -209,7 +209,7 @@ export function usePlanWebSocket({
                         steps: [],
                         next_steps: [],
                         content: formatErrorMessage(errorContent),
-                        raw_data: finalMessage || '',
+                        raw_data: finalMessage,
                     };
                     dispatch(addAgentMessage(errorAgent));
                     dispatch(planFailedFinal());
diff --git a/src/App/uv.lock b/src/App/uv.lock
index c5159217d..385383703 100644
--- a/src/App/uv.lock
+++ b/src/App/uv.lock
@@ -382,11 +382,11 @@ wheels = [
 
 [[package]]
 name = "idna"
-version = "3.11"
+version = "3.16"
 source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/6f/6d/0703ccc57f3a7233505399edb88de3cbd678da106337b9fcde432b65ed60/idna-3.11.tar.gz", hash = "sha256:795dafcc9c04ed0c1fb032c2aa73654d8e8c5023a7df64a53f39190ada629902", size = 194582, upload-time = "2025-10-12T14:55:20.501Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/1a/88/bcf9709822fe69d02c2a6a77956c98ce6ea8ca8767a9aadcedc7eb6a2390/idna-3.16.tar.gz", hash = "sha256:d7a6da03db833450fca25d2358ac9ff06cd624577a4aea3a596d5c0f77b8e03d", size = 203770, upload-time = "2026-05-22T00:16:18.781Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/0e/61/66938bbb5fc52dbdf84594873d5b51fb1f7c7794e9c0f5bd885f30bc507b/idna-3.11-py3-none-any.whl", hash = "sha256:771a87f49d9defaf64091e6e6fe9c18d4833f140bd19464795bc32d966ca37ea", size = 71008, upload-time = "2025-10-12T14:55:18.883Z" },
+    { url = "https://files.pythonhosted.org/packages/94/16/70255075a9859a0e3adb789b68ceb0e210dec03934245fd98d248226572f/idna-3.16-py3-none-any.whl", hash = "sha256:cc246e3a3f89580c3a951b5ad298ca4638078b2cdd4f115654332b5c26daded5", size = 74165, upload-time = "2026-05-22T00:16:16.698Z" },
 ]
 
 [[package]]
diff --git a/src/backend/uv.lock b/src/backend/uv.lock
index db0ce3b0c..ef5c4e854 100644
--- a/src/backend/uv.lock
+++ b/src/backend/uv.lock
@@ -1118,11 +1118,11 @@ wheels = [
 
 [[package]]
 name = "idna"
-version = "3.11"
+version = "3.16"
 source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/6f/6d/0703ccc57f3a7233505399edb88de3cbd678da106337b9fcde432b65ed60/idna-3.11.tar.gz", hash = "sha256:795dafcc9c04ed0c1fb032c2aa73654d8e8c5023a7df64a53f39190ada629902", size = 194582, upload-time = "2025-10-12T14:55:20.501Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/1a/88/bcf9709822fe69d02c2a6a77956c98ce6ea8ca8767a9aadcedc7eb6a2390/idna-3.16.tar.gz", hash = "sha256:d7a6da03db833450fca25d2358ac9ff06cd624577a4aea3a596d5c0f77b8e03d", size = 203770, upload-time = "2026-05-22T00:16:18.781Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/0e/61/66938bbb5fc52dbdf84594873d5b51fb1f7c7794e9c0f5bd885f30bc507b/idna-3.11-py3-none-any.whl", hash = "sha256:771a87f49d9defaf64091e6e6fe9c18d4833f140bd19464795bc32d966ca37ea", size = 71008, upload-time = "2025-10-12T14:55:18.883Z" },
+    { url = "https://files.pythonhosted.org/packages/94/16/70255075a9859a0e3adb789b68ceb0e210dec03934245fd98d248226572f/idna-3.16-py3-none-any.whl", hash = "sha256:cc246e3a3f89580c3a951b5ad298ca4638078b2cdd4f115654332b5c26daded5", size = 74165, upload-time = "2026-05-22T00:16:16.698Z" },
 ]
 
 [[package]]
diff --git a/src/mcp_server/uv.lock b/src/mcp_server/uv.lock
index 0756bc0b7..110a5cf87 100644
--- a/src/mcp_server/uv.lock
+++ b/src/mcp_server/uv.lock
@@ -605,11 +605,11 @@ wheels = [
 
 [[package]]
 name = "idna"
-version = "3.11"
+version = "3.16"
 source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/6f/6d/0703ccc57f3a7233505399edb88de3cbd678da106337b9fcde432b65ed60/idna-3.11.tar.gz", hash = "sha256:795dafcc9c04ed0c1fb032c2aa73654d8e8c5023a7df64a53f39190ada629902", size = 194582, upload-time = "2025-10-12T14:55:20.501Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/1a/88/bcf9709822fe69d02c2a6a77956c98ce6ea8ca8767a9aadcedc7eb6a2390/idna-3.16.tar.gz", hash = "sha256:d7a6da03db833450fca25d2358ac9ff06cd624577a4aea3a596d5c0f77b8e03d", size = 203770, upload-time = "2026-05-22T00:16:18.781Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/0e/61/66938bbb5fc52dbdf84594873d5b51fb1f7c7794e9c0f5bd885f30bc507b/idna-3.11-py3-none-any.whl", hash = "sha256:771a87f49d9defaf64091e6e6fe9c18d4833f140bd19464795bc32d966ca37ea", size = 71008, upload-time = "2025-10-12T14:55:18.883Z" },
+    { url = "https://files.pythonhosted.org/packages/94/16/70255075a9859a0e3adb789b68ceb0e210dec03934245fd98d248226572f/idna-3.16-py3-none-any.whl", hash = "sha256:cc246e3a3f89580c3a951b5ad298ca4638078b2cdd4f115654332b5c26daded5", size = 74165, upload-time = "2026-05-22T00:16:16.698Z" },
 ]
 
 [[package]]