fix: keep drupal repo current on restart and correct timing claims (#35)

Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: rfay

Makefile

@@ -28,7 +28,7 @@ TEMPLATE_VARS_freeform         := --variable workspace_image_registry=index.dock
 # (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 ~30 seconds."
+                                   --description "Drupal core dev environment: full DDEV stack, core clone, Umami demo site. Ready in about a minute."
 TEMPLATE_EDIT_freeform         := --display-name "DDEV Freeform (Traefik)"
 
 # Shared recipe for pushing any template (call with template name as argument)

docs/admin/server-setup.md

@@ -458,7 +458,7 @@ make deploy-user-defined-web
 
 ## Step 8: Set Up the Drupal Core Seed Cache (optional, highly recommended)
 
-The `drupal-core` template can provision a fully configured Drupal core development environment on new workspaces using a **seed cache** on the host. Without the cache, first-time workspace setup downloads a full git clone and all composer dependencies (~10-13 minutes). With the cache, that drops to ~15 seconds.
+The `drupal-core` template can provision a fully configured Drupal core development environment on new workspaces using a **seed cache** on the host. Without the cache, first-time workspace setup downloads a full git clone and all composer dependencies (~10-13 minutes). With the cache, the install phase drops to ~15 seconds, and total workspace startup is about a minute.
 
 The cache is a standing DDEV project on the host that is periodically refreshed. New workspaces copy the git checkout, vendor directory, and a pre-built database snapshot from it.
 

docs/drupal-issue.html

@@ -384,10 +384,15 @@ <h2>Notes</h2>
       <ul>
         <li>Requires a GitHub account — <a href="https://coder.ddev.com/login" style="color:#a78bfa">sign in at coder.ddev.com</a> first</li>
         <li>Issue fork workspaces always run a full <code>ddev drush si</code> (branch code may differ from the cached database)</li>
-        <li>The <code>demo_umami</code> fast path (~30s) is only used for standard Drupal core without an issue fork</li>
+        <li>The <code>demo_umami</code> fast path (about a minute) is only used for standard Drupal core without an issue fork</li>
         <li>Issue fork must exist on <a href="https://git.drupalcode.org" style="color:#a78bfa">git.drupalcode.org</a> — click "Get push access" on the issue page to create one</li>
       </ul>
     </div>
+
+    <div class="notes" style="margin-top:1.5rem;">
+      <h2>Feedback &amp; Community</h2>
+      <p style="color:#999;font-size:0.95rem;line-height:1.7;">Any problems or friction? Create an issue at <a href="https://github.com/ddev/coder-ddev/issues" style="color:#a78bfa;">ddev/coder-ddev</a> or join us for conversation on Drupal Slack <strong>#ddev</strong> or <a href="https://ddev.com/s/discord" style="color:#a78bfa;">DDEV Discord</a>.</p>
+    </div>
   </div>
 
   <script>

docs/index.html

@@ -220,7 +220,7 @@
   <section class="hero">
     <img class="logo" src="https://raw.githubusercontent.com/ddev/ddev/main/docs/content/developers/logos/SVG/Logo_w_text_dark.svg" alt="DDEV">
     <h1>Coder Workspaces</h1>
-    <p class="tagline">Cloud-hosted development environments powered by DDEV. Full stack, ready in ~30 seconds — no local setup required.</p>
+    <p class="tagline">Cloud-hosted development environments powered by DDEV. Full stack, ready in about a minute — no local setup required.</p>
 
     <div class="auth-callout">
       <!-- GitHub mark -->
@@ -305,6 +305,11 @@ <h2>Resources</h2>
       </div>
     </section>
 
+    <section>
+      <h2>Feedback &amp; Community</h2>
+      <p style="color:#999;font-size:0.95rem;line-height:1.7;">Any problems or friction? Create an issue at <a href="https://github.com/ddev/coder-ddev/issues" style="color:#a78bfa;">ddev/coder-ddev</a> or join us for conversation on Drupal Slack <strong>#ddev</strong> or <a href="https://ddev.com/s/discord" style="color:#a78bfa;">DDEV Discord</a>.</p>
+    </section>
+
   </div>
 
 </body>

docs/user/getting-started.md

@@ -489,7 +489,7 @@ coder start my-first-workspace
 # Via UI: Click "Start" button on workspace
 ```
 
-**Startup time:** 30-60 seconds (faster than initial create)
+**Startup time:** about a minute (faster than initial create without cache)
 
 **After starting:**
 ```bash

docs/user/quickstart.md

@@ -1,6 +1,6 @@
 # Quickstart: Drupal Core Development on coder.ddev.com
 
-Cloud-hosted DDEV workspaces for Drupal core development. Full environment — Drupal core clone, running site, drush — ready in ~30 seconds.
+Cloud-hosted DDEV workspaces for Drupal core development. Full environment — Drupal core clone, running site, drush — ready in about a minute.
 
 [![Open in Coder](https://coder.ddev.com/open-in-coder.svg)](https://coder.ddev.com/templates/coder/drupal-core/workspace?mode=manual)
 
@@ -16,7 +16,7 @@ Go to **[coder.ddev.com](https://coder.ddev.com)** and sign in with GitHub.
 
 Click the button above, or go to **Create Workspace** → select the **drupal-core** template → click **Create Workspace**.
 
-Wait ~30 seconds for the startup script to complete. Watch progress in the **Logs** tab.
+Wait about a minute for the startup script to complete. Watch progress in the **Logs** tab.
 
 ---
 
@@ -114,7 +114,7 @@ Then create a merge request on [drupal.org](https://www.drupal.org/project/drupa
 | Action | Effect |
 |--------|--------|
 | **Stop** workspace | Containers stop; your files persist on disk |
-| **Start** workspace | DDEV resumes in ~15 seconds; no reinstall needed |
+| **Start** workspace | Ready in about a minute; no reinstall needed |
 | **Delete** workspace | All data deleted permanently |
 
 ---

drupal-core/template.tf

@@ -610,6 +610,13 @@ WELCOME_STATIC
     if [ -f "composer.json" ] && [ -d "repos/drupal/.git" ]; then
       log_setup "✓ Drupal core project already present — skipping setup"
       update_status "✓ Setup: Already present"
+      # For HEAD workspaces (non-issue-fork), keep the drupal repo current on every start
+      if [ "$USING_ISSUE_FORK" = "false" ]; then
+        _t=$SECONDS
+        git -C "$DRUPAL_DIR/repos/drupal" fetch --all --prune >> "$SETUP_LOG" 2>&1 || true
+        git -C "$DRUPAL_DIR/repos/drupal" merge --ff-only origin/main >> "$SETUP_LOG" 2>&1 || true
+        log_setup "  git fetch+merge complete ($((SECONDS - _t))s)"
+      fi
     elif [ "$USING_ISSUE_FORK" = "false" ] && [ -f "$CACHE_SEED/composer.json" ] && [ -d "$CACHE_SEED/repos/drupal/.git" ]; then
       _t=$SECONDS
       log_setup "Cache hit: seeding project from host cache (fast path)..."
@@ -1182,6 +1189,7 @@ module "vscode-web" {
   agent_id       = coder_agent.main.id
   folder         = "/home/coder/drupal-core"
   accept_license = true
+  order          = 2
   extensions     = [
     "xdebug.php-debug",
     "bmewburn.vscode-intelephense-client",
@@ -1201,8 +1209,9 @@ resource "coder_app" "ddev-web" {
   agent_id     = coder_agent.main.id
   slug         = "ddev-web"
   display_name = "DDEV Web"
+  order        = 1
   url          = "http://localhost:80"
-  icon         = "https://avatars.githubusercontent.com/u/47573844?s=128"
+  icon         = "https://raw.githubusercontent.com/ddev/ddev/main/docs/content/developers/logos/SVG/Logo.svg"
   subdomain    = true
   share        = "owner"
 

freeform/template.tf

@@ -305,6 +305,7 @@ module "vscode-web" {
   agent_id       = coder_agent.main.id
   folder         = "/home/coder/${data.coder_workspace.me.name}"
   accept_license = true
+  order          = 2
   extensions     = [
     "xdebug.php-debug",
     "bmewburn.vscode-intelephense-client",
@@ -325,8 +326,9 @@ resource "coder_app" "ddev-web" {
   agent_id     = coder_agent.main.id
   slug         = data.coder_workspace.me.name
   display_name = "DDEV Web"
+  order        = 1
   url          = "http://localhost:80"
-  icon         = "https://avatars.githubusercontent.com/u/47573512"
+  icon         = "https://raw.githubusercontent.com/ddev/ddev/main/docs/content/developers/logos/SVG/Logo.svg"
   subdomain    = true
   share        = "owner"
 

user-defined-web/template.tf

@@ -469,6 +469,7 @@ module "vscode-web" {
   agent_id       = coder_agent.main.id
   folder         = "/home/coder"
   accept_license = true
+  order          = 2
   extensions     = [
     "xdebug.php-debug",
     "bmewburn.vscode-intelephense-client",
@@ -488,8 +489,9 @@ resource "coder_app" "ddev-web" {
   agent_id     = coder_agent.main.id
   slug         = "ddev-web"
   display_name = "DDEV Web"
+  order        = 1
   url          = "http://localhost:80"
-  icon         = "https://avatars.githubusercontent.com/u/47573844?s=128"
+  icon         = "https://raw.githubusercontent.com/ddev/ddev/main/docs/content/developers/logos/SVG/Logo.svg"
   subdomain    = true
   share        = "owner"