Revert "fix: standardize to vscode user across all configurations"

This reverts commit 9d53582.

Author: mohsin-wiser

.coder/template.tf

@@ -290,8 +290,8 @@ resource "docker_container" "workspace" {
     "MAVEN_OPTS=-Xmx2g -XX:+UseG1GC -XX:+UseStringDeduplication",
     "JAVA_TOOL_OPTIONS=-XX:+UseContainerSupport -XX:MaxRAMPercentage=50.0",
     "NODE_OPTIONS=--max-old-space-size=2048",
-    "HISTFILE=/home/vscode/.bash_history_dir/bash_history",
-    "GIT_CONFIG_GLOBAL=/home/vscode/.gitconfig_dir/gitconfig"
+    "HISTFILE=/root/.bash_history_dir/bash_history",
+    "GIT_CONFIG_GLOBAL=/root/.gitconfig_dir/gitconfig"
   ]
 
   # Workspace directory (persistent Git repository)
@@ -303,58 +303,64 @@ resource "docker_container" "workspace" {
   # Cache volumes (rebuilds are OK)
   volumes {
     volume_name    = docker_volume.vscode_extensions.name
-    container_path = "/home/vscode/.vscode-server/extensions"
+    container_path = "/root/.vscode-server/extensions"
   }
 
   volumes {
     volume_name    = docker_volume.maven_cache.name
-    container_path = "/home/vscode/.m2"
+    container_path = "/root/.m2"
   }
 
   volumes {
     volume_name    = docker_volume.npm_cache.name
-    container_path = "/home/vscode/.npm"
+    container_path = "/root/.npm"
   }
 
   # User credentials (persistent across host)
   volumes {
     host_path      = "/home/coder/.coder-mount/${data.coder_workspace_owner.me.name}/claude/.claude"
-    container_path = "/home/vscode/.claude"
+    container_path = "/root/.claude"
+  }
+
+  # Claude configuration file (must be pre-created as a file on host)
+  volumes {
+    host_path      = "/home/coder/.coder-mount/${data.coder_workspace_owner.me.name}/claude/.claude.json"
+    container_path = "/root/.claude.json"
   }
 
   volumes {
     host_path      = "/home/coder/.coder-mount/${data.coder_workspace_owner.me.name}/gemini/.gemini"
-    container_path = "/home/vscode/.gemini"
+    container_path = "/root/.gemini"
   }
 
   volumes {
     host_path      = "/home/coder/.coder-mount/${data.coder_workspace_owner.me.name}/.config/gh"
-    container_path = "/home/vscode/.config/gh"
+    container_path = "/root/.config/gh"
   }
 
   volumes {
     host_path      = "/home/coder/.coder-mount/${data.coder_workspace_owner.me.name}/bash-history/.bash_history"
-    container_path = "/home/vscode/.bash_history_dir"
+    container_path = "/root/.bash_history_dir"
   }
 
   volumes {
     host_path      = "/home/coder/.coder-mount/${data.coder_workspace_owner.me.name}/gitconfig/.gitconfig"
-    container_path = "/home/vscode/.gitconfig_dir"
+    container_path = "/root/.gitconfig_dir"
   }
 
   volumes {
     host_path      = "/home/coder/.coder-mount/${data.coder_workspace_owner.me.name}/ssh/.ssh"
-    container_path = "/home/vscode/.ssh"
+    container_path = "/root/.ssh"
   }
 
   volumes {
     host_path      = "/home/coder/.coder-mount/${data.coder_workspace_owner.me.name}/docker/.docker"
-    container_path = "/home/vscode/.docker"
+    container_path = "/root/.docker"
   }
 
   volumes {
     host_path      = "/home/coder/.coder-mount/${data.coder_workspace_owner.me.name}/kube/.kube"
-    container_path = "/home/vscode/.kube"
+    container_path = "/root/.kube"
   }
 
   # Docker socket for Docker-in-Docker

.devcontainer/Dockerfile

@@ -156,13 +156,9 @@ USER vscode
 RUN mkdir -p ~/.m2/repository ~/.m2/wrapper/dists ~/.npm ~/.cache/ms-playwright \
     && chmod -R 755 ~/.m2 ~/.npm ~/.cache
 
-# Reset working directory and user
+# Reset working directory
 USER root
 WORKDIR /workspaces
 
-# Set default user to vscode (non-root)
-# This ensures container starts as vscode user even without devcontainer.json
-USER vscode
-
 # Default command
 CMD ["sleep", "infinity"]