diff --git a/lib/container.sh b/lib/container.sh
index 94c4b65..a952dad 100644
--- a/lib/container.sh
+++ b/lib/container.sh
@@ -82,7 +82,20 @@ echo "→ Starting agents container '\$CONTAINER_NAME'..."
     "\$IMAGE_NAME" \\
     sleep infinity
 
-echo "→ Container ready."
+# ── Wait for container to be running ────────────────────────────────────
+echo -n "→ Waiting for container..."
+for _i in 1 2 3 4 5 6 7 8 9 10; do
+    if "\$RUNTIME" container inspect "\$CONTAINER_NAME" --format '{{.State.Running}}' 2>/dev/null | grep -q true; then
+        echo " ready."
+        break
+    fi
+    echo -n "."
+    sleep 0.5
+done
+if ! "\$RUNTIME" container inspect "\$CONTAINER_NAME" --format '{{.State.Running}}' 2>/dev/null | grep -q true; then
+    echo ""
+    echo "Error: container failed to start." >&2; exit 1
+fi
 
 # ── Put claude wrapper first on PATH ────────────────────────────────────
 export PATH="\$PROJECT_DIR/bin:\$PATH"