Merge fix/claude-json-local-file into develop

Author: mohsin-wiser

.coder/template.tf

@@ -45,6 +45,20 @@ provider "docker" {
   host = "unix:///var/run/docker.sock"
 }
 
+# Create .claude.json file using Terraform (ensures it exists before Docker mounts)
+resource "local_file" "claude_config" {
+  filename = "/home/coder/.coder-mount/${data.coder_workspace_owner.me.name}/claude/.claude.json"
+  content  = "{}"
+
+  # Only create if doesn't exist, don't overwrite user's config
+  lifecycle {
+    ignore_changes = [content]
+  }
+
+  # Ensure parent directory exists first
+  depends_on = [null_resource.host_directories]
+}
+
 # Create host directories for bind mounts before container starts
 resource "null_resource" "host_directories" {
   # Re-run when workspace is rebuilt
@@ -71,24 +85,8 @@ resource "null_resource" "host_directories" {
       mkdir -p "$BASE_DIR/bash_history"
       mkdir -p "$BASE_DIR/gitconfig"
 
-      # Create .claude.json as a file (not directory) - CRITICAL FIX
-      # Docker creates missing mount paths as directories, so we must ensure this exists as a file first
-      if [ -d "$BASE_DIR/claude/.claude.json" ]; then
-        rm -rf "$BASE_DIR/claude/.claude.json"
-        echo "⚠️  Removed .claude.json directory (was incorrectly created as directory)"
-      fi
-      # Always ensure it's a file, not a directory
-      if [ ! -f "$BASE_DIR/claude/.claude.json" ]; then
-        touch "$BASE_DIR/claude/.claude.json"
-        echo '{}' > "$BASE_DIR/claude/.claude.json"
-        chmod 644 "$BASE_DIR/claude/.claude.json"
-        echo "✅ Created .claude.json as file with proper permissions"
-      fi
-      # Verify it's a file (safety check)
-      if [ ! -f "$BASE_DIR/claude/.claude.json" ]; then
-        echo "❌ ERROR: .claude.json could not be created as file!"
-        exit 1
-      fi
+      # NOTE: .claude.json is now created by Terraform local_file resource
+      # This ensures it exists before Docker tries to mount it
 
       # Create .gemini/config.json if it doesn't exist
       if [ ! -f "$BASE_DIR/gemini/.gemini/config.json" ]; then
@@ -524,7 +522,8 @@ resource "docker_container" "workspace" {
   depends_on = [
     docker_container.postgres,
     docker_container.redis,
-    null_resource.host_directories
+    null_resource.host_directories,
+    local_file.claude_config  # Ensure .claude.json exists before mounting
   ]
 
   # Auto-restart on failure