diff --git a/package.json b/package.json
index 3adce103..240c7ca3 100644
--- a/package.json
+++ b/package.json
@@ -10,8 +10,8 @@
     "build": "npm run build --workspaces",
     "clean": "rm -rf node_modules && npm run clean --workspaces",
     "test": "npm run test --workspaces",
-    "start": "node ./scripts/check-build-status.js && node node_modules/@gemini-code/cli",
-    "debug": "node ./scripts/check-build-status.js && node --inspect-brk node_modules/@gemini-code/cli",
+    "start": "scripts/start.sh",
+    "debug": "scripts/debug.sh",
     "lint": "eslint . --ext .ts,.tsx",
     "typecheck": "tsc --noEmit --jsx react",
     "format": "prettier --write .",
diff --git a/scripts/build_container.sh b/scripts/build_container.sh
index f459a294..a4247d46 100755
--- a/scripts/build_container.sh
+++ b/scripts/build_container.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -euo pipefail
 
 IMAGE=gemini-code-sandbox
 
diff --git a/scripts/debug.sh b/scripts/debug.sh
new file mode 100755
index 00000000..b476e2ca
--- /dev/null
+++ b/scripts/debug.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+set -euo pipefail
+
+node ./scripts/check-build-status.js
+node --inspect-brk node_modules/@gemini-code/cli/dist
\ No newline at end of file
diff --git a/scripts/start.sh b/scripts/start.sh
new file mode 100755
index 00000000..4e0cd54a
--- /dev/null
+++ b/scripts/start.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+set -euo pipefail
+
+node ./scripts/check-build-status.js
+node node_modules/@gemini-code/cli/dist
\ No newline at end of file
diff --git a/scripts/start_container.sh b/scripts/start_container.sh
index ca03203e..dbdd305d 100755
--- a/scripts/start_container.sh
+++ b/scripts/start_container.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -euo pipefail
 
 IMAGE=gemini-code-sandbox
 CLI_DIST=/usr/local/share/npm-global/lib/node_modules/\@gemini-code/cli