From 74b7140a6eb05c0a2de39419f4a0e1734cd513c1 Mon Sep 17 00:00:00 2001
From: Christian Leithner <christian_leithner@comcast.com>
Date: Thu, 6 Aug 2026 15:09:36 +0000
Subject: [PATCH 1/2] chore: Add support for rtk

Add support in the devcontainer for rtk and mount the user's ~/.claude
directory. To use rtk automatically in vs code copilot chat, enable
"chat.useClaudeHooks" in your vsc settings and reload (only works on new
sessions). This change assumes the user has rtk installed and
initialized globally. It does not run rtk init in the project.
---
 .devcontainer/devcontainer.json | 3 ++-
 docker/Dockerfile.devcontainer  | 6 ++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 56522125..32530536 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -31,7 +31,8 @@
     // NOTE: VSC will copy some files post-config; .ssh/known_hosts, .gitconfig, etc
     "mounts": [
         "source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind",
-        "source=${localEnv:HOME}/.ssh,target=/home/${localEnv:USER}/.ssh,type=bind"
+        "source=${localEnv:HOME}/.ssh,target=/home/${localEnv:USER}/.ssh,type=bind",
+        "source=${localEnv:HOME}/.claude,target=/home/${localEnv:USER}/.claude,type=bind"
     ],
 
     // By setting this value to true, VSC will not run the entrypoint/CMD in the Dockerfile
diff --git a/docker/Dockerfile.devcontainer b/docker/Dockerfile.devcontainer
index 938478d1..e6f860f7 100644
--- a/docker/Dockerfile.devcontainer
+++ b/docker/Dockerfile.devcontainer
@@ -58,3 +58,9 @@ RUN npm install -g @fission-ai/openspec@v1.4.1
 # Formatting tooling for the pre-commit hook: Prettier formats the JavaScript SBMD
 # drivers (see .prettierrc.yaml) and lint-staged runs it over staged files.
 RUN npm install -g prettier@3.3.3 lint-staged@15.2.10
+
+# User local installations
+USER $BUILDER_USER
+
+RUN curl -fsSL https://raw.githubusercontent.com/rtk-ai/rtk/refs/heads/master/install.sh | sh && \
+    echo 'export PATH="$HOME/.local/bin:$PATH"' >> ~/.bashrc

From 608221b040577aca5d28548051fd4b081ecae3a4 Mon Sep 17 00:00:00 2001
From: Christian Leithner <87389808+cleithner-comcast@users.noreply.github.com>
Date: Thu, 6 Aug 2026 10:21:04 -0500
Subject: [PATCH 2/2] Potential fix for pull request finding

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
---
 docker/Dockerfile.devcontainer | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker/Dockerfile.devcontainer b/docker/Dockerfile.devcontainer
index e6f860f7..cbe15fb9 100644
--- a/docker/Dockerfile.devcontainer
+++ b/docker/Dockerfile.devcontainer
@@ -62,5 +62,5 @@ RUN npm install -g prettier@3.3.3 lint-staged@15.2.10
 # User local installations
 USER $BUILDER_USER
 
-RUN curl -fsSL https://raw.githubusercontent.com/rtk-ai/rtk/refs/heads/master/install.sh | sh && \
-    echo 'export PATH="$HOME/.local/bin:$PATH"' >> ~/.bashrc
+RUN curl -fsSL https://raw.githubusercontent.com/rtk-ai/rtk/refs/heads/master/install.sh | sh
+ENV PATH="/home/${BUILDER_USER}/.local/bin:${PATH}"