diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
new file mode 100644
index 0000000000..1c088c7cc7
--- /dev/null
+++ b/.devcontainer/Dockerfile
@@ -0,0 +1,14 @@
+FROM mcr.microsoft.com/devcontainers/base:bookworm
+
+RUN apt-get update \
+ && apt-get install -y --no-install-recommends git-lfs ca-certificates curl \
+ && git lfs install \
+ && rm -rf /var/lib/apt/lists/*
+
+# Node 20.x (change 20 to 18/22 if desired)
+RUN curl -fsSL https://deb.nodesource.com/setup_20.x | bash - \
+  && apt-get update \
+  && apt-get install -y --no-install-recommends nodejs \
+  && rm -rf /var/lib/apt/lists/*
+
+RUN npm install -g @anthropic-ai/claude-code
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
new file mode 100644
index 0000000000..ec9dbe33ef
--- /dev/null
+++ b/.devcontainer/devcontainer.json
@@ -0,0 +1,13 @@
+{
+  "name": "Codespaces (Ubuntu) + Bun",
+
+  "build": { "dockerfile": "Dockerfile" },
+
+  "remoteUser": "vscode",
+
+  "postCreateCommand": "curl -fsSL https://bun.sh/install | bash",
+  "remoteEnv": {
+    "BUN_INSTALL": "/home/vscode/.bun",
+    "PATH": "/home/vscode/.bun/bin:${containerEnv:PATH}"
+  }
+}