Update claude-code and rtk features to version 2.0.0 and 2.1.0 respectively, enhancing installation paths and dependencies

Author: chapterjason

README.md

@@ -9,12 +9,12 @@ Published to GHCR under the `sourecode/devcontainer-features` namespace.
 
 | Feature | OCI reference | Summary |
 |---|---|---|
-| `claude-code` | `ghcr.io/sourecode/devcontainer-features/claude-code:1` | Installs the Claude Code CLI via the official native installer (no Node.js required). **Temporary** — will be retired once [anthropics/devcontainer-features#37](https://github.com/anthropics/devcontainer-features/pull/37) is merged. |
-| `rtk` | `ghcr.io/sourecode/devcontainer-features/rtk:1` | Installs [rtk](https://github.com/rtk-ai/rtk), an LLM token-reducing CLI proxy; auto-patches Claude Code if present. |
+| `claude-code` | `ghcr.io/sourecode/devcontainer-features/claude-code:2` | Installs the Claude Code CLI via the official native installer into `/usr/local/bin`, so the binary survives home-directory volume mounts. Requires Node.js — automatically pulls in the `nvm` feature via `dependsOn`. |
+| `rtk` | `ghcr.io/sourecode/devcontainer-features/rtk:2` | Installs [rtk](https://github.com/rtk-ai/rtk), an LLM token-reducing CLI proxy, into `/usr/local/bin`. Auto-patches Claude Code via `postCreateCommand` so the hook is written against the mounted home, not the image. |
 | `context-mode` | `ghcr.io/sourecode/devcontainer-features/context-mode:1` | Installs the [`context-mode`](https://github.com/mksglu/context-mode) Claude Code plugin. |
-| `nvm` | `ghcr.io/sourecode/devcontainer-features/nvm:2` | Installs [nvm](https://github.com/nvm-sh/nvm) system-wide and optionally a Node version (defaults to LTS), with `node`/`npm`/`npx` symlinked into `/usr/local/bin`. No yarn. |
+| `nvm` | `ghcr.io/sourecode/devcontainer-features/nvm:2` | Installs [nvm](https://github.com/nvm-sh/nvm) system-wide at `/usr/local/share/nvm` and optionally a Node version (defaults to LTS), with `node`/`npm`/`npx` symlinked into `/usr/local/bin`. No yarn. |
 
-`rtk` and `context-mode` declare `installsAfter` for both `ghcr.io/sourecode/devcontainer-features/claude-code` and `ghcr.io/anthropics/devcontainer-features/claude-code`, so the runtime orders them after whichever claude-code feature is present.
+All binaries land in `/usr/local/bin` (or `/usr/local/share/...`) rather than the user's home, so they survive the shared home-volume pattern described in [`docs/persistence.md`](docs/persistence.md). `rtk` and `context-mode` declare `installsAfter` for both `ghcr.io/sourecode/devcontainer-features/claude-code` and `ghcr.io/anthropics/devcontainer-features/claude-code`, so the runtime orders them after whichever claude-code feature is present.
 
 ## Using the features
 
@@ -25,24 +25,27 @@ image you already use:
 {
   "image": "debian:trixie-slim",
   "features": {
-    "ghcr.io/sourecode/devcontainer-features/claude-code:1": {},
-    "ghcr.io/sourecode/devcontainer-features/rtk:1": {
+    "ghcr.io/sourecode/devcontainer-features/claude-code:2": {},
+    "ghcr.io/sourecode/devcontainer-features/rtk:2": {
       "autoPatchClaude": true
     },
     "ghcr.io/sourecode/devcontainer-features/context-mode:1": {}
   }
 }
 ```
 
-Features run inside the image during build (as root), installing into the
-container's `remoteUser` home. After rebuild, the tools are available on the
-user's `PATH`.
+Features run inside the image during build (as root) and install system-wide
+under `/usr/local/`. After rebuild, the tools are available on every user's
+`PATH` with no home-directory footprint.
 
 ### Feature options
 
 #### `claude-code`
 
-No options. Always installs the latest release.
+No options. Always installs the latest release. Declares `dependsOn` for
+`ghcr.io/sourecode/devcontainer-features/nvm:2`, so adding `claude-code` to a
+devcontainer automatically pulls in `nvm` (and therefore Node.js) even if you
+don't list `nvm` yourself.
 
 #### `rtk`
 
@@ -66,9 +69,9 @@ resolve the correct install order automatically).
 ### Persisting Claude Code state
 
 Claude login (`~/.claude/.credentials.json`) and chat history (`projects/`,
-`sessions/`, `session-env/`) are not persisted across rebuilds by default. See
-[`docs/persistence.md`](docs/persistence.md) for mount strategies (host login
-bind mount, per-project credentials, or a shared named volume).
+`sessions/`, `session-env/`) live in the user's home. Persist them by mounting
+`$HOME` as a named volume — see [`docs/persistence.md`](docs/persistence.md)
+for the shared-home pattern we use across every devcontainer.
 
 ## Developing on this repo
 
@@ -91,6 +94,7 @@ src/
     devcontainer-feature.json
     install.sh
 docs/
+  migration-guide.md
   persistence.md
 ```
 
@@ -100,9 +104,21 @@ that runs as `root` inside the container during the build.
 
 ### Writing an install.sh
 
-- `install.sh` starts as `root`. To land files in the remote user's home,
-  resolve the user via `_REMOTE_USER` / `_REMOTE_USER_HOME` (set by the
-  devcontainer runtime) and `su - "$USER"` for user-scoped steps.
+- `install.sh` starts as `root`. **Prefer system-wide install paths**
+  (`/usr/local/bin`, `/usr/local/share/<id>`, `/etc/profile.d`) over anything
+  under the remote user's home. The shared-home volume pattern
+  ([`docs/persistence.md`](docs/persistence.md)) means writes into
+  `/home/<user>` at build time only appear on first-create and then get
+  shadowed by the named volume on every subsequent run.
+- If a tool's upstream installer insists on writing to `$HOME`, run it under
+  a scratch `HOME` (`mktemp -d`) and relocate the resulting binary to
+  `/usr/local/bin` (see `src/claude-code/install.sh`). If the tool supports
+  an override env var (e.g. `RTK_INSTALL_DIR`), pass it directly.
+- For anything that genuinely needs to live in the user's real home
+  (credentials, plugin state, shell-rc tweaks), emit a script to
+  `/usr/local/share/<id>/post-create.sh` and wire it via `postCreateCommand`
+  in `devcontainer-feature.json` so it runs against the mounted home, not
+  the image.
 - Feature options are exposed as **uppercased** environment variables (e.g.
   option `autoPatchClaude` → `$AUTOPATCHCLAUDE`). Always apply a default:
   `"${FOO:-true}"`.
@@ -111,9 +127,9 @@ that runs as `root` inside the container during the build.
 - Don't assume the base image has any particular tools — install `curl`,
   `ca-certificates`, etc. from `apt-get` if absent. Keep installs idempotent
   where reasonable.
-- Declare dependencies with `installsAfter` so the runtime orders features
-  correctly (e.g. `rtk` and `context-mode` list both the `sourecode` and
-  `anthropics` claude-code feature IDs so either ordering target works).
+- Use `installsAfter` for soft ordering (e.g. `rtk` lists both the `sourecode`
+  and `anthropics` claude-code IDs), and `dependsOn` for hard requirements
+  that should auto-pull another feature (e.g. `claude-code` → `nvm`).
 
 ### Testing a feature locally
 

docs/migration-guide.md

@@ -158,8 +158,9 @@ Typical `features` block for a C++ project:
   "ghcr.io/sourecode/devcontainer-features/cmake:1": {},
   "ghcr.io/sourecode/devcontainer-features/llvm:1": {},
   "ghcr.io/sourecode/devcontainer-features/sccache:1": {},
-  "ghcr.io/sourecode/devcontainer-features/claude-code:1": {},
-  "ghcr.io/sourecode/devcontainer-features/rtk:1": {},
+  "ghcr.io/sourecode/devcontainer-features/nvm:2": {},
+  "ghcr.io/sourecode/devcontainer-features/claude-code:2": {},
+  "ghcr.io/sourecode/devcontainer-features/rtk:2": {},
   "ghcr.io/sourecode/devcontainer-features/context-mode:1": {}
 }
 ```

src/claude-code/devcontainer-feature.json

@@ -1,7 +1,10 @@
 {
   "id": "claude-code",
-  "version": "1.0.0",
+  "version": "2.0.0",
   "name": "claude-code",
-  "description": "TEMPORARY: Installs the latest Claude Code CLI via the official native installer (no Node.js required). Drop this feature in favor of `ghcr.io/anthropics/devcontainer-features/claude-code` once https://github.com/anthropics/devcontainer-features/pull/37 is merged.",
-  "documentationURL": "https://github.com/SoureCode/devcontainer-features/tree/master/src/claude-code"
+  "description": "Installs the latest Claude Code CLI via the official native installer, placing the binary in /usr/local/bin so it survives home-directory volume mounts.",
+  "documentationURL": "https://github.com/SoureCode/devcontainer-features/tree/master/src/claude-code",
+  "dependsOn": {
+    "ghcr.io/sourecode/devcontainer-features/nvm:2": {}
+  }
 }

src/claude-code/install.sh

@@ -1,36 +1,30 @@
 #!/usr/bin/env bash
-# claude-code feature installer. TEMPORARY — remove this feature in favor of
-# ghcr.io/anthropics/devcontainer-features/claude-code once
-# https://github.com/anthropics/devcontainer-features/pull/37 is merged.
+# claude-code feature installer.
+#
+# Requires Node.js on PATH (provided by the nvm feature via `dependsOn`).
+#
+# The official installer writes to $HOME/.local/bin. Because our devcontainers
+# mount $HOME as a named volume (see docs/persistence.md), anything dropped in
+# the user's home at build time is hidden on any run where the volume already
+# has content. Install into a scratch HOME and relocate the binary to
+# /usr/local/bin so it lives in image layers, outside the mount.
 set -e
 
-USER_NAME="${_REMOTE_USER:-${USERNAME:-root}}"
-if [ "$USER_NAME" = "root" ]; then
-  USER_HOME="/root"
-else
-  USER_HOME="$(getent passwd "$USER_NAME" | cut -d: -f6)"
-fi
-
 if ! command -v curl >/dev/null 2>&1; then
   apt-get update
   apt-get install -y --no-install-recommends curl ca-certificates
   rm -rf /var/lib/apt/lists/*
 fi
 
-run_as_user() {
-  if [ "$USER_NAME" = "root" ]; then
-    bash -c "$1"
-  else
-    su - "$USER_NAME" -c "$1"
-  fi
-}
+SCRATCH="$(mktemp -d)"
+trap 'rm -rf "$SCRATCH"' EXIT
 
-run_as_user 'curl -fsSL https://claude.ai/install.sh | bash'
+HOME="$SCRATCH" curl -fsSL https://claude.ai/install.sh | HOME="$SCRATCH" bash
 
-CLAUDE_BIN="$USER_HOME/.local/bin/claude"
-if [ -x "$CLAUDE_BIN" ]; then
-  ln -sf "$CLAUDE_BIN" /usr/local/bin/claude
-else
-  echo "claude-code feature: expected $CLAUDE_BIN after install, but it was not found." >&2
+SRC_BIN="$SCRATCH/.local/bin/claude"
+if [ ! -x "$SRC_BIN" ]; then
+  echo "claude-code feature: expected $SRC_BIN after install, but it was not found." >&2
   exit 1
 fi
+
+install -m 0755 "$SRC_BIN" /usr/local/bin/claude

src/nvm/devcontainer-feature.json

@@ -1,6 +1,6 @@
 {
   "id": "nvm",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "name": "nvm",
   "description": "Installs nvm (Node Version Manager) system-wide at /usr/local/share/nvm and optionally a Node version (defaults to LTS), with node/npm/npx symlinked into /usr/local/bin so every shell and subsequent feature sees them. No yarn.",
   "documentationURL": "https://github.com/SoureCode/devcontainer-features/tree/master/src/nvm",

src/nvm/install.sh

@@ -35,6 +35,32 @@ export NVM_DIR="$NVM_DIR"
 EOF
 chmod 644 /etc/profile.d/nvm.sh
 
+# Non-login interactive bash shells (VS Code / code-server terminals) source
+# /etc/bash.bashrc, not /etc/profile.d. Without this hook, the `nvm` shell
+# function isn't defined in those shells even though `node` / `npm` work via
+# the /usr/local/bin symlinks below. Idempotent guard so re-running the
+# feature install doesn't duplicate the block.
+if [ ! -f /etc/bash.bashrc ] || ! grep -q 'nvm-feature-hook' /etc/bash.bashrc; then
+  cat >>/etc/bash.bashrc <<'EOF'
+
+# nvm-feature-hook: sourced by non-login interactive bash shells.
+if [ -z "${NVM_DIR:-}" ] && [ -s /etc/profile.d/nvm.sh ]; then
+  . /etc/profile.d/nvm.sh
+fi
+EOF
+fi
+
+# Same for zsh if the distro ships /etc/zsh/zshrc.
+if [ -f /etc/zsh/zshrc ] && ! grep -q 'nvm-feature-hook' /etc/zsh/zshrc; then
+  cat >>/etc/zsh/zshrc <<'EOF'
+
+# nvm-feature-hook: sourced by interactive zsh shells.
+if [ -z "${NVM_DIR:-}" ] && [ -s /etc/profile.d/nvm.sh ]; then
+  . /etc/profile.d/nvm.sh
+fi
+EOF
+fi
+
 if [ "$NODE_VERSION" != "none" ]; then
   if [ "$NODE_VERSION" = "lts" ]; then
     NVM_INSTALL_ARG="--lts"

src/rtk/devcontainer-feature.json

@@ -1,16 +1,17 @@
 {
   "id": "rtk",
-  "version": "1.0.2",
+  "version": "2.0.0",
   "name": "rtk",
-  "description": "Installs rtk, an LLM token-reducing CLI proxy, and optionally wires its auto-rewrite hook into Claude Code.",
+  "description": "Installs rtk, an LLM token-reducing CLI proxy, and optionally wires its auto-rewrite hook into Claude Code via postCreateCommand.",
   "documentationURL": "https://github.com/SoureCode/devcontainer-features/tree/master/src/rtk",
   "options": {
     "autoPatchClaude": {
       "type": "boolean",
       "default": true,
-      "description": "Run `rtk init -g --auto-patch` to wire the auto-rewrite hook into Claude Code (requires a claude-code feature)."
+      "description": "Run `rtk init -g --auto-patch` post-create to wire the auto-rewrite hook into Claude Code (requires a claude-code feature)."
     }
   },
+  "postCreateCommand": "/usr/local/share/rtk/post-create.sh",
   "installsAfter": [
     "ghcr.io/sourecode/devcontainer-features/claude-code",
     "ghcr.io/anthropics/devcontainer-features/claude-code"

src/rtk/install.sh

@@ -1,48 +1,48 @@
 #!/usr/bin/env bash
 # rtk feature installer.
 # https://github.com/rtk-ai/rtk
+#
+# Our devcontainers mount $HOME as a named volume (see docs/persistence.md),
+# so anything written to the user's home at build time is hidden on runs
+# where the volume already has contents. Install the binary system-wide to
+# /usr/local/bin, and defer the `rtk init` auto-patch to postCreateCommand
+# so it runs after the mount against the real home.
 set -e
 
 AUTO_PATCH_CLAUDE="${AUTOPATCHCLAUDE:-true}"
 
-USER_NAME="${_REMOTE_USER:-${USERNAME:-root}}"
-USER_HOME="${_REMOTE_USER_HOME:-}"
-if [ -z "$USER_HOME" ]; then
-  if [ "$USER_NAME" = "root" ]; then
-    USER_HOME="/root"
-  else
-    USER_HOME="$(getent passwd "$USER_NAME" | cut -d: -f6)"
-  fi
-fi
-
 if ! command -v curl >/dev/null 2>&1; then
   apt-get update
   apt-get install -y --no-install-recommends curl ca-certificates
   rm -rf /var/lib/apt/lists/*
 fi
 
-run_as_user() {
-  if [ "$USER_NAME" = "root" ]; then
-    bash -c "$1"
-  else
-    su - "$USER_NAME" -c "$1"
-  fi
-}
-
-run_as_user 'curl -fsSL https://raw.githubusercontent.com/rtk-ai/rtk/refs/heads/master/install.sh | sh'
-
-RTK_BIN="$USER_HOME/.local/bin/rtk"
-if [ -x "$RTK_BIN" ]; then
-  ln -sf "$RTK_BIN" /usr/local/bin/rtk
-else
-  echo "rtk feature: expected $RTK_BIN after install, but it was not found." >&2
+curl -fsSL https://raw.githubusercontent.com/rtk-ai/rtk/refs/heads/master/install.sh |
+  RTK_INSTALL_DIR=/usr/local/bin sh
+
+if [ ! -x /usr/local/bin/rtk ]; then
+  echo "rtk feature: expected /usr/local/bin/rtk after install, but it was not found." >&2
   exit 1
 fi
 
-if [ "$AUTO_PATCH_CLAUDE" = "true" ]; then
-  if command -v claude >/dev/null 2>&1; then
-    run_as_user 'rtk init -g --auto-patch'
-  else
-    echo "rtk feature: claude CLI not on PATH, skipping auto-patch. Install a claude-code feature (e.g. ghcr.io/sourecode/devcontainer-features/claude-code) to enable it." >&2
-  fi
+mkdir -p /usr/local/share/rtk
+cat >/usr/local/share/rtk/post-create.sh <<EOF
+#!/usr/bin/env bash
+# Written by the rtk devcontainer feature at build time.
+# Runs as the remote user via postCreateCommand so it can safely write to
+# the (volume-mounted) home directory.
+set -e
+
+if [ "${AUTO_PATCH_CLAUDE}" != "true" ]; then
+  exit 0
+fi
+
+if ! command -v claude >/dev/null 2>&1; then
+  echo "rtk feature: claude CLI not on PATH, skipping auto-patch. Install a claude-code feature (e.g. ghcr.io/sourecode/devcontainer-features/claude-code) to enable it." >&2
+  exit 0
 fi
+
+mkdir -p "\$HOME/.claude"
+rtk init -g --auto-patch
+EOF
+chmod 0755 /usr/local/share/rtk/post-create.sh