@@ -31,6 +31,10 @@ name: Drupal Integration Tests
 env:
   FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
+  cancel-in-progress: true
+
 on:
   schedule:
     - cron: '0 4 * * *'
@@ -60,7 +64,7 @@ jobs:
       run:
         shell: bash -euo pipefail {0}
     env:
-      WORKSPACE_NAME: ci-drupal-${{ matrix.drupal_version }}-${{ github.run_id }}
+      WORKSPACE_NAME: cd-${{ matrix.drupal_version }}-${{ github.run_number }}-${{ github.run_attempt }}
       CI: "true"
       DDEV_NONINTERACTIVE: "true"
       NO_COLOR: "1"
@@ -110,6 +114,7 @@ jobs:
             --parameter issue_fork= \
             --parameter issue_branch= \
             --parameter install_profile=minimal \
+            --parameter share_drupal_site=owner \
             --yes
 
       - &verify-agent
@@ -200,7 +205,7 @@ jobs:
       run:
         shell: bash -euo pipefail {0}
     env:
-      WORKSPACE_NAME: ci-drupal-fork-${{ github.run_id }}
+      WORKSPACE_NAME: cd-fork-${{ github.run_number }}-${{ github.run_attempt }}
       CI: "true"
       DDEV_NONINTERACTIVE: "true"
       NO_COLOR: "1"
@@ -261,7 +266,7 @@ jobs:
           coder templates push drupal-core \
             --directory drupal-core \
             --activate=false \
-            --name ci-${{ github.run_id }} \
+            --name cd-${{ github.run_number }}-${{ github.run_attempt }} \
             --yes \
             --variable workspace_image_registry=index.docker.io/ddev/coder-ddev \
             --variable cache_path=/tmp/ci-no-cache
@@ -270,12 +275,13 @@ jobs:
         run: |
           coder create ${{ env.WORKSPACE_NAME }} \
             --template drupal-core \
-            --template-version ci-${{ github.run_id }} \
+            --template-version cd-${{ github.run_number }}-${{ github.run_attempt }} \
             --parameter "vscode_extensions=[]" \
             --parameter drupal_version=${{ env.ISSUE_FORK_VERSION }} \
             --parameter issue_fork=${{ env.ISSUE_FORK }} \
             --parameter issue_branch=${{ env.ISSUE_BRANCH }} \
             --parameter install_profile=minimal \
+            --parameter share_drupal_site=owner \
             --yes
 
       - name: Verify workspace — agent connected
@@ -350,4 +356,4 @@ jobs:
 
       - name: Archive CI template version
         if: always()
-        run: coder templates versions archive drupal-core ci-${{ github.run_id }} --yes || true
+        run: coder templates versions archive drupal-core cd-${{ github.run_number }}-${{ github.run_attempt }} --yes || true
@@ -44,7 +44,13 @@ env:
 on:
   push:
     branches: [main]
+    paths-ignore:
+      - 'drupal-core/**'
+      - 'drupal-contrib/**'
   pull_request:
+    paths-ignore:
+      - 'drupal-core/**'
+      - 'drupal-contrib/**'
   schedule:
     - cron: '0 3 * * *'
   workflow_dispatch:
@@ -82,8 +88,8 @@ jobs:
       run:
         shell: bash -euo pipefail {0}
     env:
-      CI_TAG: ${{ github.run_id }}-${{ github.run_attempt }}
-      WORKSPACE_NAME: ci-${{ matrix.ws_name }}-${{ github.run_id }}-${{ github.run_attempt }}
+      CI_TAG: ${{ github.run_number }}-${{ github.run_attempt }}
+      WORKSPACE_NAME: ci-${{ matrix.ws_name }}-${{ github.run_number }}-${{ github.run_attempt }}
       CI: "true"
       DDEV_NONINTERACTIVE: "true"
       NO_COLOR: "1"
 
@@ -19,6 +19,25 @@ This project provides a Coder v2+ template for DDEV-based development environmen
 
 - Use `jq` (not `python3 -m json.tool`) for JSON pretty-printing and querying
 
+## Before Pushing / Pre-push Checklist
+
+Run these before every push to avoid CI failures:
+
+```bash
+# Terraform formatting (CI runs terraform fmt -check -recursive)
+terraform fmt -recursive
+
+# Terraform validation for each template you touched
+terraform -chdir=drupal-core init -backend=false && terraform -chdir=drupal-core validate
+terraform -chdir=drupal-contrib init -backend=false && terraform -chdir=drupal-contrib validate
+
+# Terraform tests (plan-level, no real infrastructure)
+terraform -chdir=drupal-core test
+terraform -chdir=drupal-contrib test
+```
+
+`terraform fmt -recursive` must be run from the repo root. It is non-destructive (rewrites in place) and the CI check fails with exit code 3 if any file is not formatted.
+
 ## Working with Coder Workspaces via SSH
 
 After running `coder config-ssh --yes`, workspaces are available as SSH hosts named `<workspace>.coder`. Use `scp` to copy files in or out, then `ssh` to execute scripts non-interactively:
@@ -39,6 +58,10 @@ ssh mp1.coder ddev list
 
 When running commands via `coder ssh -- ...` or piped heredocs, the PTY allocation causes interactive prompts and pipe-stall issues. Writing a script to `/tmp/` and executing it via `ssh workspace.coder bash /tmp/script.sh` is reliable for multi-step operations.
 
+**CI scripting rule**: In GitHub Actions, for any `coder ssh` invocation that does more than a single trivial command, push a script file and run it — do not use `bash -c "..."`. Single commands with standard flags (e.g. `git -C /path branch --show-current`) are fine inline. Anything with `&&`, conditionals, or multiple statements belongs in a script file under the template's `scripts/` directory.
+
+To run a command in a specific directory without a shell wrapper, use `env -C <dir> <cmd>` (available on Ubuntu 24.04 via GNU coreutils): `coder ssh ws -- env -C /home/coder/myproject ddev drush status`
+
 ## Essential Commands
 
 ### Template Management
 
@@ -7,7 +7,7 @@ DOCKERFILE_DIR := image
 DOCKERFILE := $(DOCKERFILE_DIR)/Dockerfile
 
 # Template directories (name == directory name == Coder template name)
-TEMPLATES := user-defined-web drupal-core freeform
+TEMPLATES := user-defined-web drupal-core drupal-contrib freeform
 
 # Host path to the drupal-core seed cache (bind-mounted read-only into workspaces).
 # This path is specific to the server where the template is deployed.
@@ -30,13 +30,16 @@ IMAGE_LATEST := $(IMAGE_NAME):latest
 TEMPLATE_VARS_user-defined-web := --variable workspace_image_registry=index.docker.io/$(IMAGE_NAME)
 TEMPLATE_VARS_drupal-core      := --variable workspace_image_registry=index.docker.io/$(IMAGE_NAME) \
                                    --variable cache_path=$(DRUPAL_CACHE_PATH)
+TEMPLATE_VARS_drupal-contrib   := --variable workspace_image_registry=index.docker.io/$(IMAGE_NAME)
 TEMPLATE_VARS_freeform         := --variable workspace_image_registry=index.docker.io/$(IMAGE_NAME)
 
 # Per-template display metadata set via `coder templates edit` after push
 # (coder templates push only supports --name, not --description)
 TEMPLATE_EDIT_user-defined-web := --display-name "DDEV Web Workspace"
 TEMPLATE_EDIT_drupal-core      := --display-name "Drupal Core Development" \
                                    --description "Drupal core dev environment: full DDEV stack, core clone, Umami demo site. Ready in about a minute."
+TEMPLATE_EDIT_drupal-contrib   := --display-name "Drupal Contrib Development" \
+                                   --description "Drupal contrib module/theme dev: clone any drupal.org project, optional issue branch checkout. Ready in 5-10 minutes."
 TEMPLATE_EDIT_freeform         := --display-name "DDEV Freeform (Traefik)" --default-ttl 24h
 
 # Shared recipe for pushing any template (call with template name as argument)
@@ -167,12 +170,16 @@ push-template-user-defined-web: ## Push user-defined-web template to Coder
 push-template-drupal-core: ## Push drupal-core template to Coder
 	$(call push_template,drupal-core)
 
+.PHONY: push-template-drupal-contrib
+push-template-drupal-contrib: ## Push drupal-contrib template to Coder
+	$(call push_template,drupal-contrib)
+
 .PHONY: push-template-freeform
 push-template-freeform: ## Push freeform template to Coder
 	$(call push_template,freeform)
 
 .PHONY: push-all-templates
-push-all-templates: push-template-user-defined-web push-template-drupal-core push-template-freeform ## Push all templates to Coder (no image build)
+push-all-templates: push-template-user-defined-web push-template-drupal-core push-template-drupal-contrib push-template-freeform ## Push all templates to Coder (no image build)
 	@echo "All templates pushed!"
 
 # --- Deploy targets ---
@@ -189,6 +196,10 @@ deploy-user-defined-web-no-cache: build-and-push-no-cache push-template-user-def
 deploy-drupal-core: push-template-drupal-core ## Deploy drupal-core template (uses existing image)
 	@echo "Deployment of drupal-core complete!"
 
+.PHONY: deploy-drupal-contrib
+deploy-drupal-contrib: push-template-drupal-contrib ## Deploy drupal-contrib template (uses existing image)
+	@echo "Deployment of drupal-contrib complete!"
+
 .PHONY: deploy-freeform
 deploy-freeform: push-template-freeform ## Deploy freeform template (uses existing image)
 	@echo "Deployment of freeform complete!"
 
@@ -123,7 +123,7 @@ Fully automated Drupal core development environment, including issue fork suppor
 - **Setup**: Automatic (Drupal core cloned and installed, ~30s with seed cache)
 - **Use Case**: Drupal core development, contribution, patch testing
 - **Template Directory**: `drupal-core/`
-- **Issue Picker**: [start.coder.ddev.com/drupal-issue](https://start.coder.ddev.com/drupal-issue) — paste any drupal.org issue URL to launch a workspace with the issue branch pre-checked-out
+- **Issue Picker**: [start.coder.ddev.com/drupal-issue](https://start.coder.ddev.com/drupal-issue) — paste any drupal.org issue URL; the picker auto-detects core vs. contrib and routes to the right template
 - **Includes**:
   - Pre-cloned Drupal core (main branch by default)
   - Issue fork checkout with automatic Composer dependency resolution (Drupal 10, 11, and 12/main)
@@ -136,20 +136,43 @@ Fully automated Drupal core development environment, including issue fork suppor
 coder create --template drupal-core my-drupal-dev
 ```
 
+### drupal-contrib (Drupal Contrib Development)
+
+Automated environment for developing Drupal contrib modules and themes, with optional issue branch support.
+
+- **Setup**: Automatic (module/theme cloned, Drupal installed as dev dependency via `ddev-drupal-contrib`, ~5-10 min)
+- **Use Case**: Contrib module/theme development, issue queue work on any drupal.org project
+- **Template Directory**: `drupal-contrib/`
+- **Issue Picker**: [start.coder.ddev.com/drupal-issue](https://start.coder.ddev.com/drupal-issue) — paste a drupal.org issue or project URL; auto-detects contrib
+- **Includes**:
+  - Any drupal.org project cloned (modules and themes)
+  - Issue fork checkout via `issue_fork` + `issue_branch` parameters
+  - DDEV with [`ddev-drupal-contrib`](https://github.com/ddev/ddev-drupal-contrib) addon (adds `ddev phpunit`, `ddev phpcs`, `ddev phpstan`)
+  - Drupal installed as a dev dependency (module/theme auto-symlinked into web root)
+
+**Create workspace:**
+```bash
+coder create --template drupal-contrib my-contrib-dev \
+  --parameter project_name=token \
+  --parameter drupal_version=11
+```
+
 ### Choosing a Template
 
 - Use **user-defined-web** for:
-  - Contrib module development
-  - Site building
+  - Site building and custom site projects
   - General Drupal/PHP projects
   - Maximum flexibility
 
 - Use **drupal-core** for:
-  - Drupal core patches
-  - Core issue queue work
+  - Drupal core patches and issue queue work
   - Testing Drupal core changes
   - Learning Drupal internals
 
+- Use **drupal-contrib** for:
+  - Contrib module or theme development
+  - Working on drupal.org contrib issue queues
+
 ## Usage
 
 Create a new workspace using your chosen template:
@@ -160,6 +183,10 @@ coder create --template user-defined-web <workspace-name>
 
 # Drupal core development environment
 coder create --template drupal-core <workspace-name>
+
+# Drupal contrib module/theme development
+coder create --template drupal-contrib <workspace-name> \
+  --parameter project_name=token --parameter drupal_version=11
 ```
 
 **Access your project:**