diff --git a/docs/drupal-contrib-picker.html b/docs/drupal-contrib-picker.html
deleted file mode 100644
index 608c5e9..0000000
--- a/docs/drupal-contrib-picker.html
+++ /dev/null
@@ -1,925 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <title>Drupal Issue Picker (Beta) — DDEV Coder Workspaces</title>
-  <link rel="icon" type="image/svg+xml" href="/favicon.svg">
-  <style>
-    *, *::before, *::after { box-sizing: border-box; margin: 0; padding: 0; }
-
-    body {
-      font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif;
-      background: #0e0e10;
-      color: #e8e8e8;
-      line-height: 1.6;
-      min-height: 100vh;
-    }
-
-    header {
-      padding: 1.25rem 2rem;
-      border-bottom: 1px solid #1c1c1e;
-      display: flex;
-      align-items: center;
-      gap: 1rem;
-    }
-
-    header a {
-      color: #a78bfa;
-      text-decoration: none;
-      font-size: 0.9rem;
-    }
-
-    header a:hover { text-decoration: underline; }
-
-    /* Separator is aria-hidden (decorative), but still needs visible contrast for sighted users.
-       #666 on #0e0e10 gives ~3.6:1, meeting WCAG 1.4.3 (Level AA) for UI text.
-       Previous #444 yielded ~2.3:1 and failed. */
-    header .sep { color: #666; }
-
-    header .title { color: #e8e8e8; font-weight: 600; font-size: 0.9rem; }
-
-    .page {
-      max-width: 640px;
-      margin: 0 auto;
-      padding: 3rem 2rem 5rem;
-    }
-
-    h1 {
-      font-size: 1.75rem;
-      font-weight: 700;
-      letter-spacing: -0.02em;
-      margin-bottom: 0.5rem;
-    }
-
-    .subtitle {
-      color: #777;
-      font-size: 1rem;
-      margin-bottom: 2.5rem;
-    }
-
-    /* ── Input section ───────────────────────────────── */
-    .input-row {
-      display: flex;
-      gap: 0.75rem;
-      margin-bottom: 2rem;
-    }
-
-    .input-row input {
-      flex: 1;
-      background: #161619;
-      /* #636377 on #161619 gives ~3.5:1, meeting WCAG 1.4.11 Non-text Contrast (Level AA) minimum 3:1.
-         Previous #2a2a32 yielded ~1.3:1 and failed. */
-      border: 1px solid #636377;
-      border-radius: 8px;
-      padding: 0.7rem 1rem;
-      color: #e8e8e8;
-      font-size: 0.95rem;
-      outline: none;
-      transition: border-color 0.15s;
-    }
-
-    /* #888 on #161619 gives ~5.9:1 contrast, meeting WCAG 1.4.3 (Level AA) minimum 4.5:1.
-       Previous #555 yielded ~2.4:1 and failed. */
-    .input-row input::placeholder { color: #888; }
-    /* Combined border+outline focus indicator meets WCAG 2.4.11 Focus Appearance (Level AA).
-       outline: none was an anti-pattern; replaced with a visible 2px offset outline. */
-    .input-row input:focus {
-      border-color: #7c5af0;
-      outline: 2px solid #7c5af0;
-      outline-offset: 2px;
-    }
-
-    .btn-load {
-      background: #7c5af0;
-      color: #fff;
-      border: none;
-      border-radius: 8px;
-      padding: 0.7rem 1.25rem;
-      font-size: 0.95rem;
-      font-weight: 600;
-      cursor: pointer;
-      white-space: nowrap;
-      transition: background 0.15s;
-    }
-
-    .btn-load:hover { background: #6d4de0; }
-    .btn-load:disabled { background: #3a3050; color: #777; cursor: not-allowed; }
-    /* WCAG 2.4.11 Focus Appearance (Level AA): explicit focus outline prevents relying on the
-       dim browser default (#21397f) which fails contrast requirements. */
-    .btn-load:focus-visible {
-      outline: 2px solid #c4b5fd;
-      outline-offset: 2px;
-    }
-
-    /* ── Status / error ──────────────────────────────── */
-    .status {
-      font-size: 0.9rem;
-      padding: 0.75rem 1rem;
-      border-radius: 8px;
-      margin-bottom: 1.5rem;
-      display: none;
-    }
-
-    .status.loading {
-      display: block;
-      background: #161619;
-      /* #636377 on #161619 gives ~3.5:1, meeting WCAG 1.4.11 Non-text Contrast (Level AA) minimum 3:1.
-         Previous #2a2a32 yielded ~1.3:1 and failed. */
-      border: 1px solid #636377;
-      color: #999;
-    }
-
-    .status.error {
-      display: block;
-      background: #1f0f0f;
-      border: 1px solid #5a1a1a;
-      color: #f87171;
-    }
-
-    .status.info {
-      display: block;
-      background: #0f1a1f;
-      border: 1px solid #1a4a5a;
-      color: #7dd3fc;
-    }
-
-    /* ── Result form ─────────────────────────────────── */
-    #result-form { display: none; }
-    #plain-dev-form { display: none; }
-
-    .issue-title {
-      font-size: 1.05rem;
-      font-weight: 600;
-      color: #c4b5fd;
-      margin-bottom: 1.75rem;
-      padding: 0.75rem 1rem;
-      background: #13101f;
-      border: 1px solid #2a2040;
-      border-radius: 8px;
-    }
-
-    .issue-title span {
-      display: block;
-      font-size: 0.75rem;
-      font-weight: 400;
-      /* #888 on #13101f gives ~4.9:1, meeting WCAG 1.4.3 (Level AA) minimum 4.5:1 for normal text.
-         Previous #666 yielded ~3.4:1 and failed. */
-      color: #888;
-      margin-bottom: 0.2rem;
-      text-transform: uppercase;
-      letter-spacing: 0.06em;
-    }
-
-    .template-badge {
-      display: inline-block;
-      font-size: 0.7rem;
-      font-weight: 600;
-      text-transform: uppercase;
-      letter-spacing: 0.08em;
-      padding: 0.15rem 0.5rem;
-      border-radius: 4px;
-      margin-top: 0.4rem;
-    }
-
-    .template-badge.core {
-      background: #1a2a1a;
-      color: #86efac;
-      border: 1px solid #166534;
-    }
-
-    .template-badge.contrib {
-      background: #1a1a2a;
-      color: #a78bfa;
-      border: 1px solid #3730a3;
-    }
-
-    .fields {
-      display: flex;
-      flex-direction: column;
-      gap: 1.25rem;
-      margin-bottom: 2rem;
-    }
-
-    .field label {
-      display: block;
-      font-size: 0.8rem;
-      font-weight: 600;
-      text-transform: uppercase;
-      letter-spacing: 0.07em;
-      color: #777;
-      margin-bottom: 0.4rem;
-    }
-
-    .field select,
-    .field input[type="text"] {
-      width: 100%;
-      background: #161619;
-      /* #636377 on #161619 gives ~3.5:1 — WCAG 1.4.11 Non-text Contrast (Level AA) requires 3:1.
-         Previous #2a2a32 yielded ~1.3:1 and failed. */
-      border: 1px solid #636377;
-      border-radius: 8px;
-      padding: 0.65rem 1rem;
-      color: #e8e8e8;
-      font-size: 0.95rem;
-      outline: none;
-      transition: border-color 0.15s;
-      appearance: none;
-    }
-
-    .field select {
-      background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='12' height='8' viewBox='0 0 12 8'%3E%3Cpath fill='%23777' d='M1 1l5 5 5-5'/%3E%3C/svg%3E");
-      background-repeat: no-repeat;
-      background-position: right 1rem center;
-      padding-right: 2.5rem;
-    }
-
-    .field input[type="text"][readonly] {
-      color: #aaa;
-      cursor: default;
-    }
-
-    /* WCAG 2.4.11 Focus Appearance (Level AA): visible focus indicator with 3:1 contrast.
-       Combined border + outline replaces the single border-color change that was easy to miss. */
-    .field select:focus,
-    .field input[type="text"]:focus {
-      border-color: #7c5af0;
-      outline: 2px solid #7c5af0;
-      outline-offset: 2px;
-    }
-
-    .field .hint {
-      font-size: 0.8rem;
-      /* #888 on #161619 gives ~5.9:1, meeting WCAG 1.4.3 (Level AA) minimum 4.5:1.
-         Previous #555 yielded ~2.5:1 and failed. */
-      color: #888;
-      margin-top: 0.3rem;
-    }
-
-    .btn-open {
-      width: 100%;
-      background: #7c5af0;
-      color: #fff;
-      border: none;
-      border-radius: 8px;
-      padding: 0.85rem 1.5rem;
-      font-size: 1rem;
-      font-weight: 600;
-      cursor: pointer;
-      transition: background 0.15s;
-    }
-
-    .btn-open:hover { background: #6d4de0; }
-    /* WCAG 2.4.11 Focus Appearance (Level AA) */
-    .btn-open:focus-visible {
-      outline: 2px solid #c4b5fd;
-      outline-offset: 2px;
-    }
-
-    /* ── Manual fallback ─────────────────────────────── */
-    #manual-form { display: none; }
-
-    .manual-notice {
-      font-size: 0.85rem;
-      color: #888;
-      margin-bottom: 1.25rem;
-      padding: 0.65rem 0.9rem;
-      background: #111114;
-      border: 1px solid #222228;
-      border-radius: 6px;
-    }
-
-    /* ── Notes ───────────────────────────────────────── */
-    .notes {
-      margin-top: 2.5rem;
-      border-top: 1px solid #1c1c1e;
-      padding-top: 2rem;
-    }
-
-    .notes h2 {
-      font-size: 0.8rem;
-      font-weight: 600;
-      text-transform: uppercase;
-      letter-spacing: 0.08em;
-      /* #888 on #0e0e10 gives ~5.9:1, meeting WCAG 1.4.3 (Level AA) minimum 4.5:1 for normal text.
-         Previous #555 yielded ~2.6:1 and failed. */
-      color: #888;
-      margin-bottom: 0.9rem;
-    }
-
-    .notes ul {
-      list-style: none;
-      display: flex;
-      flex-direction: column;
-      gap: 0.5rem;
-    }
-
-    .notes li {
-      font-size: 0.88rem;
-      /* #888 on #0e0e10 gives ~5.9:1 contrast ratio, meeting WCAG 2.2 §1.4.3 (Level AA) minimum 4.5:1 for normal text.
-         Previous value #666 yielded ~3.6:1 and failed. */
-      color: #888;
-      padding-left: 1rem;
-      position: relative;
-    }
-
-    .notes li::before {
-      content: '·';
-      position: absolute;
-      left: 0;
-      color: #444;
-    }
-
-    code {
-      background: #1a1a1f;
-      border: 1px solid #2a2a30;
-      padding: 0.1em 0.35em;
-      border-radius: 4px;
-      font-family: 'SF Mono', Consolas, monospace;
-      font-size: 0.85em;
-      color: #c4b5fd;
-    }
-
-    /* Visually hidden but available to assistive technology.
-       Use for labels that would be redundant visually but are required for AT.
-       WCAG 1.3.1 Info and Relationships (Level A) */
-    .sr-only {
-      position: absolute;
-      width: 1px;
-      height: 1px;
-      padding: 0;
-      margin: -1px;
-      overflow: hidden;
-      clip: rect(0, 0, 0, 0);
-      white-space: nowrap;
-      border: 0;
-    }
-
-    /* Skip link — visually hidden until focused; lets keyboard users bypass the header nav.
-       WCAG 2.4.1 Bypass Blocks (Level A) */
-    .skip-link {
-      position: absolute;
-      top: -100%;
-      left: 1rem;
-      background: #7c5af0;
-      color: #fff;
-      padding: 0.5rem 1rem;
-      border-radius: 0 0 6px 6px;
-      font-size: 0.9rem;
-      font-weight: 600;
-      text-decoration: none;
-      z-index: 999;
-    }
-    .skip-link:focus { top: 0; }
-  </style>
-</head>
-<body>
-  <!-- WCAG 2.4.1 Bypass Blocks (Level A): skip link lets keyboard users jump past the site header -->
-  <a class="skip-link" href="#main-content">Skip to main content</a>
-
-  <header>
-    <a href="/">DDEV Coder Workspaces</a>
-    <!-- Decorative separator — hidden from AT to avoid noise; WCAG 1.3.1 Info and Relationships (Level A) -->
-    <span class="sep" aria-hidden="true">/</span>
-    <span class="title">Drupal Issue Picker</span>
-  </header>
-
-  <!-- id="main-content" is the skip link target (WCAG 2.4.1) -->
-  <div class="page" id="main-content">
-    <h1>Drupal Issue Picker <span style="font-size:0.55em;vertical-align:middle;background:#7c3aed;color:#fff;padding:0.2em 0.6em;border-radius:4px;letter-spacing:0.04em">BETA</span></h1>
-    <p class="subtitle">Enter a Drupal issue URL or number to launch a workspace. Also accepts a project URL or machine name for plain contrib development (no specific issue). <strong style="color:#f59e0b">Targets staging-coder.ddev.com — add <code>?coder=https://coder.ddev.com</code> to use production.</strong></p>
-
-    <div class="input-row">
-      <!-- Explicit <label> associates the field name with the input for screen readers.
-           Visually hidden because the heading and subtitle already describe the field.
-           WCAG 1.3.1 Info and Relationships / 3.3.2 Labels or Instructions (Level A) -->
-      <label for="issue-input" class="sr-only">Issue number, URL, or project name</label>
-      <input type="text" id="issue-input"
-        placeholder="e.g. 3568144 · drupal.org/project/drupal/issues/3568144 · drupal.org/project/token"
-        autofocus>
-      <button class="btn-load" id="load-btn" onclick="loadInput()">Load</button>
-    </div>
-
-    <!-- role="status" announces dynamic updates to screen readers without interrupting current speech.
-         WCAG 4.1.3 Status Messages (Level AA) -->
-    <div class="status" id="status" role="status" aria-live="polite"></div>
-
-    <!-- Auto-populated form (issues: both core and contrib) -->
-    <div id="result-form">
-      <div class="issue-title">
-        <span id="result-label">Issue</span>
-        <span id="issue-title-text"></span>
-        <span id="template-badge" class="template-badge"></span>
-      </div>
-
-      <div class="fields">
-        <!-- Branch selector (issues only) -->
-        <div class="field">
-          <label for="branch-select">Branch</label>
-          <select id="branch-select"></select>
-        </div>
-
-        <div class="field">
-          <label for="profile-select">Install Profile</label>
-          <select id="profile-select">
-            <option value="demo_umami">demo_umami</option>
-            <option value="minimal">minimal</option>
-            <option value="standard">standard</option>
-          </select>
-          <div class="hint" id="profile-hint">demo_umami uses a pre-built database snapshot. Issue fork workspaces always run a full site install regardless of profile.</div>
-        </div>
-
-        <div class="field">
-          <label for="drupal-version-select">Drupal Version</label>
-          <select id="drupal-version-select">
-            <option value="12">12.x (HEAD / upcoming)</option>
-            <option value="11">11.x (stable)</option>
-            <option value="10">10.x (stable)</option>
-          </select>
-          <div class="hint">Auto-detected from the issue. Sets the DDEV project type (drupal10/11/12).</div>
-        </div>
-
-        <div class="field">
-          <label for="workspace-name">Workspace Name</label>
-          <input type="text" id="workspace-name" placeholder="issue-3568144">
-          <div class="hint">Must be lowercase letters, numbers, and hyphens only.</div>
-        </div>
-      </div>
-
-      <button class="btn-open" onclick="openWorkspace()">Open Dev Environment</button>
-    </div>
-
-    <!-- Plain contrib dev form (project URL or machine name, no issue) -->
-    <div id="plain-dev-form">
-      <div class="issue-title">
-        <span>Contrib Project</span>
-        <span id="plain-project-display"></span>
-        <span class="template-badge contrib">drupal-contrib template</span>
-      </div>
-
-      <div class="fields">
-        <div class="field">
-          <label for="plain-drupal-version">Drupal Version</label>
-          <select id="plain-drupal-version">
-            <option value="11">11.x (stable)</option>
-            <option value="12">12.x (HEAD / upcoming)</option>
-            <option value="10">10.x (stable)</option>
-          </select>
-          <div class="hint">Sets the Drupal version installed as a dev dependency.</div>
-        </div>
-
-        <div class="field">
-          <label for="plain-profile">Install Profile</label>
-          <select id="plain-profile">
-            <option value="minimal">minimal</option>
-            <option value="standard">standard</option>
-            <option value="demo_umami">demo_umami</option>
-          </select>
-          <div class="hint">minimal is recommended for contrib development.</div>
-        </div>
-
-        <div class="field">
-          <label for="plain-workspace-name">Workspace Name</label>
-          <input type="text" id="plain-workspace-name" placeholder="my-token-dev">
-          <div class="hint">Must be lowercase letters, numbers, and hyphens only.</div>
-        </div>
-      </div>
-
-      <button class="btn-open" onclick="openPlainDevWorkspace()">Open Dev Environment</button>
-    </div>
-
-    <!-- Manual fallback form (shown on API error) -->
-    <div id="manual-form">
-      <div class="manual-notice">
-        Could not fetch issue data automatically. Enter values manually below.
-      </div>
-
-      <div class="fields">
-        <div class="field">
-          <label for="manual-fork">Issue Fork Name</label>
-          <input type="text" id="manual-fork" placeholder="drupal-3568144">
-          <div class="hint">For core: drupal-{issue}. For contrib: {module}-{issue}</div>
-        </div>
-
-        <div class="field">
-          <label for="manual-branch">Issue Branch</label>
-          <input type="text" id="manual-branch" placeholder="3568144-editorfilterxss-11.x">
-        </div>
-
-        <div class="field">
-          <label for="manual-profile">Install Profile</label>
-          <select id="manual-profile">
-            <option value="demo_umami">demo_umami</option>
-            <option value="minimal">minimal</option>
-            <option value="standard">standard</option>
-          </select>
-        </div>
-
-        <div class="field">
-          <label for="manual-drupal-version">Drupal Version</label>
-          <select id="manual-drupal-version">
-            <option value="12">12.x (HEAD / upcoming)</option>
-            <option value="11">11.x (stable)</option>
-            <option value="10">10.x (stable)</option>
-          </select>
-        </div>
-
-        <div class="field">
-          <label for="manual-workspace-name">Workspace Name</label>
-          <input type="text" id="manual-workspace-name" placeholder="issue-3568144">
-        </div>
-      </div>
-
-      <button class="btn-open" onclick="openManualWorkspace()">Open Dev Environment</button>
-    </div>
-
-    <div class="notes">
-      <h2>Notes</h2>
-      <ul>
-        <li>Requires a GitHub account — <a href="https://staging-coder.ddev.com/login" style="color:#a78bfa">sign in at staging-coder.ddev.com</a> first</li>
-        <li>Core issues use the <strong>drupal-core</strong> template; contrib issues use the <strong>drupal-contrib</strong> template — detected automatically</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 (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>
-        <li>Contrib dev without an issue: enter a project URL like <code>drupal.org/project/token</code> or just the machine name <code>token</code></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>
-    // Beta picker — defaults to staging; override via ?coder=https://coder.ddev.com
-    const CODER_BASE = new URLSearchParams(window.location.search).get('coder') || 'https://staging-coder.ddev.com';
-    const CODER_TEMPLATE_CORE   = 'coder/drupal-core';
-    const CODER_TEMPLATE_CONTRIB = 'coder/drupal-contrib';
-
-    // State for the current loaded result
-    let currentIssueFork = '';   // fork name: 'drupal-NID' for core, '{module}-NID' for contrib
-    let currentNid = '';
-    let currentProjectName = ''; // 'drupal' for core, module machine name for contrib
-    let currentIsContrib = false;
-
-    function setStatus(msg, type) {
-      const el = document.getElementById('status');
-      el.textContent = msg;
-      el.className = 'status ' + type;
-    }
-
-    function clearStatus() {
-      const el = document.getElementById('status');
-      el.className = 'status';
-    }
-
-    function hideAllForms() {
-      document.getElementById('result-form').style.display = 'none';
-      document.getElementById('plain-dev-form').style.display = 'none';
-      document.getElementById('manual-form').style.display = 'none';
-    }
-
-    // Returns { type: 'issue'|'project', nid, project } or null
-    function parseInput(raw) {
-      const s = raw.trim();
-
-      // Plain issue number
-      if (/^\d+$/.test(s)) return { type: 'issue', nid: s, project: null };
-
-      // Full issue URL: .../project/PROJECT/issues/NID
-      const issueUrlM = s.match(/\/project\/([a-z][a-z0-9_]*)\/issues\/(\d+)/);
-      if (issueUrlM) return { type: 'issue', nid: issueUrlM[2], project: issueUrlM[1] };
-
-      // Project URL: .../project/PROJECT (no issue segment)
-      const projUrlM = s.match(/\/project\/([a-z][a-z0-9_]*)(?:\/|$)/);
-      if (projUrlM) return { type: 'project', nid: null, project: projUrlM[1] };
-
-      // Bare machine name (lowercase, no hyphens, no slashes)
-      if (/^[a-z][a-z0-9_]*$/.test(s)) return { type: 'project', nid: null, project: s };
-
-      return null;
-    }
-
-    function sanitizeWorkspaceName(name) {
-      return name.toLowerCase().replace(/[^a-z0-9-]/g, '-').replace(/-+/g, '-').replace(/^-|-$/g, '');
-    }
-
-    async function loadInput() {
-      const raw = document.getElementById('issue-input').value;
-      const parsed = parseInput(raw);
-
-      if (!parsed) {
-        setStatus('Could not parse input. Enter an issue number, a drupal.org issue or project URL, or a module machine name.', 'error');
-        return;
-      }
-
-      hideAllForms();
-      document.getElementById('load-btn').disabled = true;
-
-      if (parsed.type === 'project') {
-        await loadPlainProject(parsed.project);
-      } else {
-        await loadIssue(parsed.nid, parsed.project);
-      }
-
-      document.getElementById('load-btn').disabled = false;
-    }
-
-    async function loadPlainProject(projectName) {
-      setStatus('Verifying project ' + projectName + '...', 'loading');
-      // Verify project exists on git.drupalcode.org
-      try {
-        const resp = await fetch(
-          'https://git.drupalcode.org/api/v4/projects/' + encodeURIComponent('project/' + projectName)
-        );
-        if (!resp.ok && resp.status !== 404) {
-          // Non-404 error — just show the form anyway (API might be down)
-          console.warn('git.drupalcode.org project check returned', resp.status);
-        } else if (resp.status === 404) {
-          setStatus('Project "' + projectName + '" not found on git.drupalcode.org. Check the machine name and try again.', 'error');
-          return;
-        }
-      } catch (_) {
-        // Network error — show form anyway with a warning
-        setStatus('Could not verify project (network error). Proceeding anyway.', 'info');
-      }
-
-      clearStatus();
-      document.getElementById('plain-project-display').textContent = projectName;
-      document.getElementById('plain-workspace-name').value = sanitizeWorkspaceName(projectName + '-dev');
-      currentProjectName = projectName;
-      document.getElementById('plain-dev-form').style.display = 'block';
-    }
-
-    async function loadIssue(nid, hintedProject) {
-      currentNid = nid;
-      setStatus('Loading issue ' + nid + '...', 'loading');
-
-      try {
-        // Step 1: fetch issue data from Drupal.org to determine project
-        setStatus('Fetching issue data from drupal.org...', 'loading');
-        let projectName = hintedProject;
-        let title = 'Issue #' + nid;
-        let drupalMajor = '11';
-        let projectType = 'module'; // used later for contrib template hint
-
-        try {
-          const issueResp = await fetch('https://www.drupal.org/api-d7/node/' + nid + '.json');
-          if (issueResp.ok) {
-            const issue = await issueResp.json();
-            if (issue.title) title = issue.title;
-            // Resolve project name from API (overrides URL-hinted project)
-            const apiProject = issue.field_project && issue.field_project.machine_name;
-            if (apiProject) projectName = apiProject;
-            // Detect project type (module vs theme)
-            if (issue.field_project && issue.field_project.field_project_type) {
-              projectType = issue.field_project.field_project_type;
-            }
-            // Detect Drupal major version from field_issue_version — core issues only.
-            // For contrib, field_issue_version is the MODULE version (e.g. "8.x-1.x"
-            // means module 1.x, not Drupal 8), so we leave drupalMajor at its default.
-            if (!apiProject || apiProject === 'drupal') {
-              const ver = issue.field_issue_version || '';
-              const verM = ver.match(/^(\d+)\./);
-              if (verM) drupalMajor = verM[1];
-              else if (ver === 'main' || ver.startsWith('12')) drupalMajor = '12';
-            }
-          }
-        } catch (_) { /* title/version stay as fallback */ }
-
-        // If we still don't know the project, assume it from hinted URL or default to 'drupal'
-        if (!projectName) projectName = 'drupal';
-
-        currentProjectName = projectName;
-        currentIsContrib = (projectName !== 'drupal');
-
-        // Issue fork name: 'drupal-{nid}' for core, '{module}-{nid}' for contrib
-        const issueFork = currentIsContrib ? (projectName + '-' + nid) : ('drupal-' + nid);
-        currentIssueFork = issueFork;
-
-        // Step 2: fetch branches from git.drupalcode.org
-        const encodedFork = encodeURIComponent('issue/' + issueFork);
-        setStatus('Loading issue fork ' + issueFork + '...', 'loading');
-        const branchResp = await fetch(
-          'https://git.drupalcode.org/api/v4/projects/' + encodedFork + '/repository/branches?per_page=100'
-        );
-
-        if (branchResp.status === 404) {
-          // Check if issue exists
-          const issueUrl = 'https://www.drupal.org/project/' + projectName + '/issues/' + nid;
-          if (currentIsContrib) {
-            setStatus(
-              'No issue fork exists for #' + nid + ' on ' + projectName + ' yet. Visit the issue page on drupal.org and click "Get push access" to create a fork, then come back here.',
-              'info'
-            );
-          } else {
-            setStatus(
-              'No issue fork exists for #' + nid + ' yet. To work on this issue, visit the issue page on drupal.org and click "Get push access" to create a fork, then come back here.',
-              'info'
-            );
-          }
-          return;
-        }
-        if (!branchResp.ok) throw new Error('git.drupalcode.org API returned ' + branchResp.status);
-        const branches = await branchResp.json();
-
-        // Step 3: try to get visible branches from Drupal.org issue page (drupalorgBranchData)
-        const issuePageUrl = 'https://www.drupal.org/project/' + projectName + '/issues/' + nid;
-        let visibleBranchNames = null;
-        try {
-          const pageResp = await fetch(issuePageUrl);
-          if (pageResp.ok) {
-            const html = await pageResp.text();
-            const settingsMatch = html.match(/<script[^>]+data-drupal-selector="drupal-settings-json"[^>]*>([\s\S]*?)<\/script>/);
-            if (settingsMatch) {
-              const settings = JSON.parse(settingsMatch[1]);
-              if (settings.drupalorgBranchData && Object.keys(settings.drupalorgBranchData).length > 0) {
-                visibleBranchNames = new Set(Object.keys(settings.drupalorgBranchData));
-              }
-            }
-          }
-        } catch (_) { /* CORS or parse error — fall through */ }
-
-        // Filter branches: visible set from drupal.org, or fallback to NID-prefix filter
-        const issueBranches = visibleBranchNames
-          ? branches.filter(b => visibleBranchNames.has(b.name))
-          : branches.filter(b => b.name.startsWith(nid + '-'));
-        const displayBranches = issueBranches.length > 0 ? issueBranches : branches;
-
-        // Populate branch selector
-        const branchSelect = document.getElementById('branch-select');
-        branchSelect.innerHTML = '';
-        displayBranches.forEach(b => {
-          const opt = document.createElement('option');
-          opt.value = b.name;
-          opt.textContent = b.name;
-          branchSelect.appendChild(opt);
-        });
-
-        // Pre-select the most recently committed branch
-        const preferred = displayBranches.reduce((best, b) => {
-          if (!best) return b;
-          return b.commit.committed_date > best.commit.committed_date ? b : best;
-        }, null);
-        if (preferred) branchSelect.value = preferred.name;
-
-        // Set issue title with link
-        const titleEl = document.getElementById('issue-title-text');
-        titleEl.innerHTML = '';
-        const issueLink = document.createElement('a');
-        issueLink.href = issuePageUrl;
-        issueLink.target = '_blank';
-        issueLink.textContent = '#' + nid + ': ' + title;
-        issueLink.style.cssText = 'color: inherit; text-decoration: underline;';
-        titleEl.appendChild(issueLink);
-
-        // Template badge and form customization
-        const badge = document.getElementById('template-badge');
-        const resultLabel = document.getElementById('result-label');
-        const profileHint = document.getElementById('profile-hint');
-        const profileSelect = document.getElementById('profile-select');
-
-        if (currentIsContrib) {
-          badge.textContent = 'drupal-contrib template · ' + projectName;
-          badge.className = 'template-badge contrib';
-          resultLabel.textContent = 'Contrib Issue (' + projectName + ')';
-          // Default to minimal for contrib
-          profileSelect.value = 'minimal';
-          profileHint.textContent = 'minimal is recommended for contrib development.';
-        } else {
-          badge.textContent = 'drupal-core template';
-          badge.className = 'template-badge core';
-          resultLabel.textContent = 'Issue';
-          profileSelect.value = 'demo_umami';
-          profileHint.textContent = 'demo_umami uses a pre-built database snapshot. Issue fork workspaces always run a full site install regardless of profile.';
-        }
-
-        document.getElementById('drupal-version-select').value = drupalMajor;
-        document.getElementById('workspace-name').value = 'issue-' + nid;
-
-        clearStatus();
-        document.getElementById('result-form').style.display = 'block';
-
-      } catch (err) {
-        console.error(err);
-        setStatus('Could not load issue data automatically (' + err.message + '). Enter values below.', 'error');
-        document.getElementById('manual-workspace-name').value = 'issue-' + nid;
-        document.getElementById('manual-fork').value = (currentIsContrib && currentProjectName)
-          ? (currentProjectName + '-' + nid) : ('drupal-' + nid);
-        document.getElementById('manual-form').style.display = 'block';
-      }
-    }
-
-    function buildCoreUrl(issueFork, issueBranch, installProfile, drupalVersion, workspaceName) {
-      const base = CODER_BASE + '/templates/' + CODER_TEMPLATE_CORE + '/workspace';
-      const params = new URLSearchParams({
-        mode: 'manual',
-        name: sanitizeWorkspaceName(workspaceName),
-        'param.issue_fork': issueFork,
-        'param.issue_branch': issueBranch,
-        'param.install_profile': installProfile,
-        'param.drupal_version': drupalVersion,
-      });
-      return base + '?' + params.toString();
-    }
-
-    function buildContribIssueUrl(projectName, issueNumber, issueBranch, installProfile, drupalVersion, workspaceName) {
-      const base = CODER_BASE + '/templates/' + CODER_TEMPLATE_CONTRIB + '/workspace';
-      const params = new URLSearchParams({
-        mode: 'manual',
-        name: sanitizeWorkspaceName(workspaceName),
-        'param.project_name': projectName,
-        'param.project_type': 'module', // will be overridden manually for themes
-        'param.issue_fork': issueNumber,
-        'param.issue_branch': issueBranch,
-        'param.install_profile': installProfile,
-        'param.drupal_version': drupalVersion,
-      });
-      return base + '?' + params.toString();
-    }
-
-    function buildContribPlainUrl(projectName, drupalVersion, installProfile, workspaceName) {
-      const base = CODER_BASE + '/templates/' + CODER_TEMPLATE_CONTRIB + '/workspace';
-      const params = new URLSearchParams({
-        mode: 'manual',
-        name: sanitizeWorkspaceName(workspaceName),
-        'param.project_name': projectName,
-        'param.project_type': 'module',
-        'param.issue_fork': '',
-        'param.issue_branch': '',
-        'param.install_profile': installProfile,
-        'param.drupal_version': drupalVersion,
-      });
-      return base + '?' + params.toString();
-    }
-
-    function openWorkspace() {
-      const branch = document.getElementById('branch-select').value;
-      const profile = document.getElementById('profile-select').value;
-      const drupalVersion = document.getElementById('drupal-version-select').value;
-      const wsName = document.getElementById('workspace-name').value || ('issue-' + currentNid);
-
-      if (!currentIssueFork || !branch) {
-        setStatus('Please load an issue first.', 'error');
-        return;
-      }
-
-      let url;
-      if (currentIsContrib) {
-        url = buildContribIssueUrl(currentProjectName, currentNid, branch, profile, drupalVersion, wsName);
-      } else {
-        url = buildCoreUrl(currentIssueFork, branch, profile, drupalVersion, wsName);
-      }
-      window.open(url, '_blank');
-    }
-
-    function openPlainDevWorkspace() {
-      const drupalVersion = document.getElementById('plain-drupal-version').value;
-      const profile = document.getElementById('plain-profile').value;
-      const wsName = document.getElementById('plain-workspace-name').value || (currentProjectName + '-dev');
-
-      if (!currentProjectName) {
-        setStatus('No project loaded. Enter a project URL or machine name first.', 'error');
-        return;
-      }
-
-      const url = buildContribPlainUrl(currentProjectName, drupalVersion, profile, wsName);
-      window.open(url, '_blank');
-    }
-
-    function openManualWorkspace() {
-      const fork = document.getElementById('manual-fork').value.trim();
-      const branch = document.getElementById('manual-branch').value.trim();
-      const profile = document.getElementById('manual-profile').value;
-      const drupalVersion = document.getElementById('manual-drupal-version').value;
-      const wsName = document.getElementById('manual-workspace-name').value || ('issue-' + currentNid);
-
-      if (!fork || !branch) {
-        setStatus('Issue fork name and branch are required.', 'error');
-        return;
-      }
-
-      // Detect if this is a core fork (drupal-NID) or contrib (MODULE-NID)
-      const isCoreManual = fork.startsWith('drupal-');
-      let url;
-      if (isCoreManual) {
-        url = buildCoreUrl(fork, branch, profile, drupalVersion, wsName);
-      } else {
-        // Extract project name from fork name (MODULE-NID → MODULE)
-        const forkParts = fork.match(/^([a-z][a-z0-9_]*)-(\d+)$/);
-        const project = forkParts ? forkParts[1] : 'unknown';
-        const nidFromFork = forkParts ? forkParts[2] : currentNid;
-        url = buildContribIssueUrl(project, nidFromFork, branch, profile, drupalVersion, wsName);
-      }
-      window.open(url, '_blank');
-    }
-
-    // Allow Enter key in input
-    document.getElementById('issue-input').addEventListener('keydown', function(e) {
-      if (e.key === 'Enter') loadInput();
-    });
-  </script>
-
-</body>
-</html>
diff --git a/docs/drupal-issue.html b/docs/drupal-issue.html
index dee7120..a9bda2a 100644
--- a/docs/drupal-issue.html
+++ b/docs/drupal-issue.html
@@ -3,7 +3,7 @@
 <head>
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <title>Drupal Core Issue Picker — DDEV Coder Workspaces</title>
+  <title>Drupal Issue Picker — DDEV Coder Workspaces</title>
   <link rel="icon" type="image/svg+xml" href="/favicon.svg">
   <style>
     *, *::before, *::after { box-sizing: border-box; margin: 0; padding: 0; }
@@ -146,6 +146,7 @@
 
     /* ── Result form ─────────────────────────────────── */
     #result-form { display: none; }
+    #plain-dev-form { display: none; }
 
     .issue-title {
       font-size: 1.05rem;
@@ -170,6 +171,29 @@
       letter-spacing: 0.06em;
     }
 
+    .template-badge {
+      display: inline-block;
+      font-size: 0.7rem;
+      font-weight: 600;
+      text-transform: uppercase;
+      letter-spacing: 0.08em;
+      padding: 0.15rem 0.5rem;
+      border-radius: 4px;
+      margin-top: 0.4rem;
+    }
+
+    .template-badge.core {
+      background: #1a2a1a;
+      color: #86efac;
+      border: 1px solid #166534;
+    }
+
+    .template-badge.contrib {
+      background: #1a1a2a;
+      color: #a78bfa;
+      border: 1px solid #3730a3;
+    }
+
     .fields {
       display: flex;
       flex-direction: column;
@@ -210,6 +234,11 @@
       padding-right: 2.5rem;
     }
 
+    .field input[type="text"][readonly] {
+      color: #aaa;
+      cursor: default;
+    }
+
     /* WCAG 2.4.11 Focus Appearance (Level AA): visible focus indicator with 3:1 contrast.
        Combined border + outline replaces the single border-color change that was easy to miss. */
     .field select:focus,
@@ -352,37 +381,39 @@
     <a href="/">DDEV Coder Workspaces</a>
     <!-- Decorative separator — hidden from AT to avoid noise; WCAG 1.3.1 Info and Relationships (Level A) -->
     <span class="sep" aria-hidden="true">/</span>
-    <span class="title">Drupal Core Issue Picker</span>
+    <span class="title">Drupal Issue Picker</span>
   </header>
 
   <!-- id="main-content" is the skip link target (WCAG 2.4.1) -->
   <div class="page" id="main-content">
-    <h1>Drupal Core Issue Picker</h1>
-    <p class="subtitle">Enter a Drupal core issue URL or number to launch a pre-configured workspace.</p>
+    <h1>Drupal Issue Picker</h1>
+    <p class="subtitle">Enter a Drupal issue URL or number to launch a workspace. Also accepts a project URL or machine name for plain contrib development (no specific issue).</p>
 
     <div class="input-row">
       <!-- Explicit <label> associates the field name with the input for screen readers.
            Visually hidden because the heading and subtitle already describe the field.
            WCAG 1.3.1 Info and Relationships / 3.3.2 Labels or Instructions (Level A) -->
-      <label for="issue-input" class="sr-only">Issue number or URL</label>
+      <label for="issue-input" class="sr-only">Issue number, URL, or project name</label>
       <input type="text" id="issue-input"
-        placeholder="e.g. 3568144 or https://www.drupal.org/project/drupal/issues/3568144"
+        placeholder="e.g. 3568144 · drupal.org/project/drupal/issues/3568144 · drupal.org/project/token"
         autofocus>
-      <button class="btn-load" id="load-btn" onclick="loadIssue()">Load Issue</button>
+      <button class="btn-load" id="load-btn" onclick="loadInput()">Load</button>
     </div>
 
     <!-- role="status" announces dynamic updates to screen readers without interrupting current speech.
          WCAG 4.1.3 Status Messages (Level AA) -->
     <div class="status" id="status" role="status" aria-live="polite"></div>
 
-    <!-- Auto-populated form -->
+    <!-- Auto-populated form (issues: both core and contrib) -->
     <div id="result-form">
       <div class="issue-title">
-        <span>Issue</span>
+        <span id="result-label">Issue</span>
         <span id="issue-title-text"></span>
+        <span id="template-badge" class="template-badge"></span>
       </div>
 
       <div class="fields">
+        <!-- Branch selector (issues only) -->
         <div class="field">
           <label for="branch-select">Branch</label>
           <select id="branch-select"></select>
@@ -395,7 +426,7 @@ <h1>Drupal Core Issue Picker</h1>
             <option value="minimal">minimal</option>
             <option value="standard">standard</option>
           </select>
-          <div class="hint">demo_umami uses a pre-built database snapshot. Issue fork workspaces always run a full site install regardless of profile.</div>
+          <div class="hint" id="profile-hint">demo_umami uses a pre-built database snapshot. Issue fork workspaces always run a full site install regardless of profile.</div>
         </div>
 
         <div class="field">
@@ -418,6 +449,45 @@ <h1>Drupal Core Issue Picker</h1>
       <button class="btn-open" onclick="openWorkspace()">Open Dev Environment</button>
     </div>
 
+    <!-- Plain contrib dev form (project URL or machine name, no issue) -->
+    <div id="plain-dev-form">
+      <div class="issue-title">
+        <span>Contrib Project</span>
+        <span id="plain-project-display"></span>
+        <span class="template-badge contrib">drupal-contrib template</span>
+      </div>
+
+      <div class="fields">
+        <div class="field">
+          <label for="plain-drupal-version">Drupal Version</label>
+          <select id="plain-drupal-version">
+            <option value="11">11.x (stable)</option>
+            <option value="12">12.x (HEAD / upcoming)</option>
+            <option value="10">10.x (stable)</option>
+          </select>
+          <div class="hint">Sets the Drupal version installed as a dev dependency.</div>
+        </div>
+
+        <div class="field">
+          <label for="plain-profile">Install Profile</label>
+          <select id="plain-profile">
+            <option value="minimal">minimal</option>
+            <option value="standard">standard</option>
+            <option value="demo_umami">demo_umami</option>
+          </select>
+          <div class="hint">minimal is recommended for contrib development.</div>
+        </div>
+
+        <div class="field">
+          <label for="plain-workspace-name">Workspace Name</label>
+          <input type="text" id="plain-workspace-name" placeholder="my-token-dev">
+          <div class="hint">Must be lowercase letters, numbers, and hyphens only.</div>
+        </div>
+      </div>
+
+      <button class="btn-open" onclick="openPlainDevWorkspace()">Open Dev Environment</button>
+    </div>
+
     <!-- Manual fallback form (shown on API error) -->
     <div id="manual-form">
       <div class="manual-notice">
@@ -428,7 +498,7 @@ <h1>Drupal Core Issue Picker</h1>
         <div class="field">
           <label for="manual-fork">Issue Fork Name</label>
           <input type="text" id="manual-fork" placeholder="drupal-3568144">
-          <div class="hint">Format: drupal-{issue-number}</div>
+          <div class="hint">For core: drupal-{issue}. For contrib: {module}-{issue}</div>
         </div>
 
         <div class="field">
@@ -467,9 +537,11 @@ <h1>Drupal Core Issue Picker</h1>
       <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>Core issues use the <strong>drupal-core</strong> template; contrib issues use the <strong>drupal-contrib</strong> template — detected automatically</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 (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>
+        <li>Contrib dev without an issue: enter a project URL like <code>drupal.org/project/token</code> or just the machine name <code>token</code></li>
       </ul>
     </div>
 
@@ -481,11 +553,14 @@ <h2>Feedback &amp; Community</h2>
 
   <script>
     const CODER_BASE = 'https://coder.ddev.com';
-    const CODER_TEMPLATE = 'coder/drupal-core';
+    const CODER_TEMPLATE_CORE   = 'coder/drupal-core';
+    const CODER_TEMPLATE_CONTRIB = 'coder/drupal-contrib';
 
-    let currentIssueFork = '';
+    // State for the current loaded result
+    let currentIssueFork = '';   // fork name: 'drupal-NID' for core, '{module}-NID' for contrib
     let currentNid = '';
-    let currentDrupalMajor = '12';
+    let currentProjectName = ''; // 'drupal' for core, module machine name for contrib
+    let currentIsContrib = false;
 
     function setStatus(msg, type) {
       const el = document.getElementById('status');
@@ -498,13 +573,30 @@ <h2>Feedback &amp; Community</h2>
       el.className = 'status';
     }
 
-    function parseIssueNumber(raw) {
+    function hideAllForms() {
+      document.getElementById('result-form').style.display = 'none';
+      document.getElementById('plain-dev-form').style.display = 'none';
+      document.getElementById('manual-form').style.display = 'none';
+    }
+
+    // Returns { type: 'issue'|'project', nid, project } or null
+    function parseInput(raw) {
       const s = raw.trim();
-      // Plain number
-      if (/^\d+$/.test(s)) return s;
-      // URL: .../issues/3568144 or .../issues/3568144/...
-      const m = s.match(/\/issues\/(\d+)/);
-      if (m) return m[1];
+
+      // Plain issue number
+      if (/^\d+$/.test(s)) return { type: 'issue', nid: s, project: null };
+
+      // Full issue URL: .../project/PROJECT/issues/NID
+      const issueUrlM = s.match(/\/project\/([a-z][a-z0-9_]*)\/issues\/(\d+)/);
+      if (issueUrlM) return { type: 'issue', nid: issueUrlM[2], project: issueUrlM[1] };
+
+      // Project URL: .../project/PROJECT (no issue segment)
+      const projUrlM = s.match(/\/project\/([a-z][a-z0-9_]*)(?:\/|$)/);
+      if (projUrlM) return { type: 'project', nid: null, project: projUrlM[1] };
+
+      // Bare machine name (lowercase, no hyphens, no slashes)
+      if (/^[a-z][a-z0-9_]*$/.test(s)) return { type: 'project', nid: null, project: s };
+
       return null;
     }
 
@@ -512,84 +604,130 @@ <h2>Feedback &amp; Community</h2>
       return name.toLowerCase().replace(/[^a-z0-9-]/g, '-').replace(/-+/g, '-').replace(/^-|-$/g, '');
     }
 
-    async function loadIssue() {
+    async function loadInput() {
       const raw = document.getElementById('issue-input').value;
-      const nid = parseIssueNumber(raw);
+      const parsed = parseInput(raw);
 
-      if (!nid) {
-        setStatus('Could not parse an issue number from that input. Enter a number like 3568144 or a full drupal.org issue URL.', 'error');
+      if (!parsed) {
+        setStatus('Could not parse input. Enter an issue number, a drupal.org issue or project URL, or a module machine name.', 'error');
         return;
       }
 
-      currentNid = nid;
-      document.getElementById('result-form').style.display = 'none';
-      document.getElementById('manual-form').style.display = 'none';
+      hideAllForms();
       document.getElementById('load-btn').disabled = true;
-      setStatus('Loading issue ' + nid + '...', 'loading');
 
-      try {
-        // Issue fork name is always drupal-{nid} by convention on git.drupalcode.org
-        const issueFork = 'drupal-' + nid;
-        const encodedProject = encodeURIComponent('issue/' + issueFork);
+      if (parsed.type === 'project') {
+        await loadPlainProject(parsed.project);
+      } else {
+        await loadIssue(parsed.nid, parsed.project);
+      }
 
-        // Step 1: verify fork exists and fetch branches from git.drupalcode.org
-        setStatus('Loading issue fork ' + issueFork + '...', 'loading');
-        const branchResp = await fetch(
-          'https://git.drupalcode.org/api/v4/projects/' + encodedProject + '/repository/branches?per_page=100'
+      document.getElementById('load-btn').disabled = false;
+    }
+
+    async function loadPlainProject(projectName) {
+      setStatus('Verifying project ' + projectName + '...', 'loading');
+      // Verify project exists on git.drupalcode.org
+      try {
+        const resp = await fetch(
+          'https://git.drupalcode.org/api/v4/projects/' + encodeURIComponent('project/' + projectName)
         );
-        if (branchResp.status === 404) {
-          // Distinguish: issue doesn't exist vs. issue exists but no fork yet
-          try {
-            const checkResp = await fetch('https://www.drupal.org/api-d7/node/' + nid + '.json');
-            if (!checkResp.ok) {
-              setStatus('Issue #' + nid + ' does not exist on drupal.org. Check the issue number and try again.', 'error');
-            } else {
-              // Verify the response is actually a valid node (not a redirect or error page)
-              let nodeData;
-              try { nodeData = await checkResp.json(); } catch (_) { nodeData = null; }
-              const projectName = nodeData && nodeData.field_project && nodeData.field_project.machine_name;
-              if (!nodeData || String(nodeData.nid) !== String(nid)) {
-                setStatus('Issue #' + nid + ' does not exist on drupal.org. Check the issue number and try again.', 'error');
-              } else if (projectName && projectName !== 'drupal') {
-                setStatus('Issue #' + nid + ' is a ' + projectName + ' issue, not a Drupal core issue. At this time this picker only supports Drupal core.', 'error');
-              } else {
-                setStatus('No issue fork exists for #' + nid + ' yet. To work on this issue, visit the issue page on drupal.org and click "Get push access" to create a fork, then come back here.', 'info');
-              }
-            }
-          } catch (_) {
-            setStatus('Issue #' + nid + ' does not appear to exist on drupal.org. Check the issue number and try again.', 'error');
-          }
-          document.getElementById('load-btn').disabled = false;
+        if (!resp.ok && resp.status !== 404) {
+          // Non-404 error — just show the form anyway (API might be down)
+          console.warn('git.drupalcode.org project check returned', resp.status);
+        } else if (resp.status === 404) {
+          setStatus('Project "' + projectName + '" not found on git.drupalcode.org. Check the machine name and try again.', 'error');
           return;
         }
-        if (!branchResp.ok) throw new Error('git.drupalcode.org API returned ' + branchResp.status);
-        const branches = await branchResp.json();
+      } catch (_) {
+        // Network error — show form anyway with a warning
+        setStatus('Could not verify project (network error). Proceeding anyway.', 'info');
+      }
 
-        currentIssueFork = issueFork;
+      clearStatus();
+      document.getElementById('plain-project-display').textContent = projectName;
+      document.getElementById('plain-workspace-name').value = sanitizeWorkspaceName(projectName + '-dev');
+      currentProjectName = projectName;
+      document.getElementById('plain-dev-form').style.display = 'block';
+    }
+
+    async function loadIssue(nid, hintedProject) {
+      currentNid = nid;
+      setStatus('Loading issue ' + nid + '...', 'loading');
 
-        // Step 2: fetch issue title and version from Drupal.org API (best-effort — don't block on failure)
+      try {
+        // Step 1: fetch issue data from Drupal.org to determine project
+        setStatus('Fetching issue data from drupal.org...', 'loading');
+        let projectName = hintedProject;
         let title = 'Issue #' + nid;
-        let drupalMajor = '12';
+        let drupalMajor = '11';
+        let projectType = 'module'; // used later for contrib template hint
+
         try {
           const issueResp = await fetch('https://www.drupal.org/api-d7/node/' + nid + '.json');
           if (issueResp.ok) {
             const issue = await issueResp.json();
             if (issue.title) title = issue.title;
-            // field_issue_version is "10.6.x-dev", "11.x-dev", "12.x-dev", or "main"
-            // "main" means the current development branch (D12+); no leading digit → use 12.
-            const ver = issue.field_issue_version || '';
-            const m = ver.match(/^(\d+)\./);
-            if (m) drupalMajor = m[1];
-            else if (ver === 'main' || ver.startsWith('12')) drupalMajor = '12';
+            // Resolve project name from API (overrides URL-hinted project)
+            const apiProject = issue.field_project && issue.field_project.machine_name;
+            if (apiProject) projectName = apiProject;
+            // Detect project type (module vs theme)
+            if (issue.field_project && issue.field_project.field_project_type) {
+              projectType = issue.field_project.field_project_type;
+            }
+            // Detect Drupal major version from field_issue_version — core issues only.
+            // For contrib, field_issue_version is the MODULE version (e.g. "8.x-1.x"
+            // means module 1.x, not Drupal 8), so we leave drupalMajor at its default.
+            if (!apiProject || apiProject === 'drupal') {
+              const ver = issue.field_issue_version || '';
+              const verM = ver.match(/^(\d+)\./);
+              if (verM) drupalMajor = verM[1];
+              else if (ver === 'main' || ver.startsWith('12')) drupalMajor = '12';
+            }
           }
         } catch (_) { /* title/version stay as fallback */ }
 
-        // Step 2.5: Try to get visible branches from Drupal.org issue page.
-        // The drupalorgBranchData settings key lists only non-hidden branches (those with MRs).
-        // Hidden branches exist in GitLab but are suppressed in the Drupal.org UI.
+        // If we still don't know the project, assume it from hinted URL or default to 'drupal'
+        if (!projectName) projectName = 'drupal';
+
+        currentProjectName = projectName;
+        currentIsContrib = (projectName !== 'drupal');
+
+        // Issue fork name: 'drupal-{nid}' for core, '{module}-{nid}' for contrib
+        const issueFork = currentIsContrib ? (projectName + '-' + nid) : ('drupal-' + nid);
+        currentIssueFork = issueFork;
+
+        // Step 2: fetch branches from git.drupalcode.org
+        const encodedFork = encodeURIComponent('issue/' + issueFork);
+        setStatus('Loading issue fork ' + issueFork + '...', 'loading');
+        const branchResp = await fetch(
+          'https://git.drupalcode.org/api/v4/projects/' + encodedFork + '/repository/branches?per_page=100'
+        );
+
+        if (branchResp.status === 404) {
+          // Check if issue exists
+          const issueUrl = 'https://www.drupal.org/project/' + projectName + '/issues/' + nid;
+          if (currentIsContrib) {
+            setStatus(
+              'No issue fork exists for #' + nid + ' on ' + projectName + ' yet. Visit the issue page on drupal.org and click "Get push access" to create a fork, then come back here.',
+              'info'
+            );
+          } else {
+            setStatus(
+              'No issue fork exists for #' + nid + ' yet. To work on this issue, visit the issue page on drupal.org and click "Get push access" to create a fork, then come back here.',
+              'info'
+            );
+          }
+          return;
+        }
+        if (!branchResp.ok) throw new Error('git.drupalcode.org API returned ' + branchResp.status);
+        const branches = await branchResp.json();
+
+        // Step 3: try to get visible branches from Drupal.org issue page (drupalorgBranchData)
+        const issuePageUrl = 'https://www.drupal.org/project/' + projectName + '/issues/' + nid;
         let visibleBranchNames = null;
         try {
-          const pageResp = await fetch('https://www.drupal.org/project/drupal/issues/' + nid);
+          const pageResp = await fetch(issuePageUrl);
           if (pageResp.ok) {
             const html = await pageResp.text();
             const settingsMatch = html.match(/<script[^>]+data-drupal-selector="drupal-settings-json"[^>]*>([\s\S]*?)<\/script>/);
@@ -600,16 +738,12 @@ <h2>Feedback &amp; Community</h2>
               }
             }
           }
-        } catch (_) { /* CORS or parse error — fall through to prefix filter */ }
+        } catch (_) { /* CORS or parse error — fall through */ }
 
-        // Filter to visible branches only:
-        // - Primary: use Drupal.org's drupalorgBranchData (excludes hidden branches)
-        // - Fallback: branches matching the issue number prefix (excludes inherited upstream branches)
+        // Filter branches: visible set from drupal.org, or fallback to NID-prefix filter
         const issueBranches = visibleBranchNames
           ? branches.filter(b => visibleBranchNames.has(b.name))
           : branches.filter(b => b.name.startsWith(nid + '-'));
-
-        // Use filtered list, falling back to all branches only if filtering yields nothing
         const displayBranches = issueBranches.length > 0 ? issueBranches : branches;
 
         // Populate branch selector
@@ -622,48 +756,62 @@ <h2>Feedback &amp; Community</h2>
           branchSelect.appendChild(opt);
         });
 
-        // Pre-select the most recently committed branch (most actively worked on)
+        // Pre-select the most recently committed branch
         const preferred = displayBranches.reduce((best, b) => {
           if (!best) return b;
           return b.commit.committed_date > best.commit.committed_date ? b : best;
         }, null);
         if (preferred) branchSelect.value = preferred.name;
 
-        // Set issue title with clickable link
+        // Set issue title with link
         const titleEl = document.getElementById('issue-title-text');
         titleEl.innerHTML = '';
         const issueLink = document.createElement('a');
-        issueLink.href = 'https://www.drupal.org/project/drupal/issues/' + nid;
+        issueLink.href = issuePageUrl;
         issueLink.target = '_blank';
         issueLink.textContent = '#' + nid + ': ' + title;
         issueLink.style.cssText = 'color: inherit; text-decoration: underline;';
         titleEl.appendChild(issueLink);
 
-        // Store and display detected Drupal version
-        currentDrupalMajor = drupalMajor;
-        document.getElementById('drupal-version-select').value = drupalMajor;
+        // Template badge and form customization
+        const badge = document.getElementById('template-badge');
+        const resultLabel = document.getElementById('result-label');
+        const profileHint = document.getElementById('profile-hint');
+        const profileSelect = document.getElementById('profile-select');
+
+        if (currentIsContrib) {
+          badge.textContent = 'drupal-contrib template · ' + projectName;
+          badge.className = 'template-badge contrib';
+          resultLabel.textContent = 'Contrib Issue (' + projectName + ')';
+          // Default to minimal for contrib
+          profileSelect.value = 'minimal';
+          profileHint.textContent = 'minimal is recommended for contrib development.';
+        } else {
+          badge.textContent = 'drupal-core template';
+          badge.className = 'template-badge core';
+          resultLabel.textContent = 'Issue';
+          profileSelect.value = 'demo_umami';
+          profileHint.textContent = 'demo_umami uses a pre-built database snapshot. Issue fork workspaces always run a full site install regardless of profile.';
+        }
 
-        // Pre-fill workspace name
-        const wsName = document.getElementById('workspace-name');
-        wsName.value = 'issue-' + nid;
+        document.getElementById('drupal-version-select').value = drupalMajor;
+        document.getElementById('workspace-name').value = 'issue-' + nid;
 
         clearStatus();
         document.getElementById('result-form').style.display = 'block';
 
       } catch (err) {
         console.error(err);
-        // Show manual fallback
         setStatus('Could not load issue data automatically (' + err.message + '). Enter values below.', 'error');
         document.getElementById('manual-workspace-name').value = 'issue-' + nid;
-        document.getElementById('manual-fork').value = 'drupal-' + nid;
+        document.getElementById('manual-fork').value = (currentIsContrib && currentProjectName)
+          ? (currentProjectName + '-' + nid) : ('drupal-' + nid);
         document.getElementById('manual-form').style.display = 'block';
       }
-
-      document.getElementById('load-btn').disabled = false;
     }
 
-    function buildCoderUrl(issueFork, issueBranch, installProfile, drupalVersion, workspaceName) {
-      const base = CODER_BASE + '/templates/' + CODER_TEMPLATE + '/workspace';
+    function buildCoreUrl(issueFork, issueBranch, installProfile, drupalVersion, workspaceName) {
+      const base = CODER_BASE + '/templates/' + CODER_TEMPLATE_CORE + '/workspace';
       const params = new URLSearchParams({
         mode: 'manual',
         name: sanitizeWorkspaceName(workspaceName),
@@ -675,6 +823,36 @@ <h2>Feedback &amp; Community</h2>
       return base + '?' + params.toString();
     }
 
+    function buildContribIssueUrl(projectName, issueNumber, issueBranch, installProfile, drupalVersion, workspaceName) {
+      const base = CODER_BASE + '/templates/' + CODER_TEMPLATE_CONTRIB + '/workspace';
+      const params = new URLSearchParams({
+        mode: 'manual',
+        name: sanitizeWorkspaceName(workspaceName),
+        'param.project_name': projectName,
+        'param.project_type': 'module', // will be overridden manually for themes
+        'param.issue_fork': issueNumber,
+        'param.issue_branch': issueBranch,
+        'param.install_profile': installProfile,
+        'param.drupal_version': drupalVersion,
+      });
+      return base + '?' + params.toString();
+    }
+
+    function buildContribPlainUrl(projectName, drupalVersion, installProfile, workspaceName) {
+      const base = CODER_BASE + '/templates/' + CODER_TEMPLATE_CONTRIB + '/workspace';
+      const params = new URLSearchParams({
+        mode: 'manual',
+        name: sanitizeWorkspaceName(workspaceName),
+        'param.project_name': projectName,
+        'param.project_type': 'module',
+        'param.issue_fork': '',
+        'param.issue_branch': '',
+        'param.install_profile': installProfile,
+        'param.drupal_version': drupalVersion,
+      });
+      return base + '?' + params.toString();
+    }
+
     function openWorkspace() {
       const branch = document.getElementById('branch-select').value;
       const profile = document.getElementById('profile-select').value;
@@ -686,7 +864,26 @@ <h2>Feedback &amp; Community</h2>
         return;
       }
 
-      const url = buildCoderUrl(currentIssueFork, branch, profile, drupalVersion, wsName);
+      let url;
+      if (currentIsContrib) {
+        url = buildContribIssueUrl(currentProjectName, currentNid, branch, profile, drupalVersion, wsName);
+      } else {
+        url = buildCoreUrl(currentIssueFork, branch, profile, drupalVersion, wsName);
+      }
+      window.open(url, '_blank');
+    }
+
+    function openPlainDevWorkspace() {
+      const drupalVersion = document.getElementById('plain-drupal-version').value;
+      const profile = document.getElementById('plain-profile').value;
+      const wsName = document.getElementById('plain-workspace-name').value || (currentProjectName + '-dev');
+
+      if (!currentProjectName) {
+        setStatus('No project loaded. Enter a project URL or machine name first.', 'error');
+        return;
+      }
+
+      const url = buildContribPlainUrl(currentProjectName, drupalVersion, profile, wsName);
       window.open(url, '_blank');
     }
 
@@ -702,13 +899,24 @@ <h2>Feedback &amp; Community</h2>
         return;
       }
 
-      const url = buildCoderUrl(fork, branch, profile, drupalVersion, wsName);
+      // Detect if this is a core fork (drupal-NID) or contrib (MODULE-NID)
+      const isCoreManual = fork.startsWith('drupal-');
+      let url;
+      if (isCoreManual) {
+        url = buildCoreUrl(fork, branch, profile, drupalVersion, wsName);
+      } else {
+        // Extract project name from fork name (MODULE-NID → MODULE)
+        const forkParts = fork.match(/^([a-z][a-z0-9_]*)-(\d+)$/);
+        const project = forkParts ? forkParts[1] : 'unknown';
+        const nidFromFork = forkParts ? forkParts[2] : currentNid;
+        url = buildContribIssueUrl(project, nidFromFork, branch, profile, drupalVersion, wsName);
+      }
       window.open(url, '_blank');
     }
 
     // Allow Enter key in input
     document.getElementById('issue-input').addEventListener('keydown', function(e) {
-      if (e.key === 'Enter') loadIssue();
+      if (e.key === 'Enter') loadInput();
     });
   </script>
 
diff --git a/docs/index.html b/docs/index.html
index cd3756b..884a150 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -292,17 +292,10 @@ <h2>Drupal issue development</h2>
         <div class="template-card">
           <div class="info">
             <h3>Drupal Issue Picker</h3>
-            <p>Enter a Drupal.org issue URL or number — launches a Drupal core workspace with the issue fork checked out</p>
+            <p>Enter a Drupal.org issue URL or number — launches a workspace with the issue fork checked out. Supports both Drupal core and contrib modules/themes.</p>
           </div>
           <a class="btn" href="drupal-issue" style="background:#7c5af0;color:#fff;border-radius:8px;padding:0.6rem 1rem;font-size:0.9rem;font-weight:600;text-decoration:none;white-space:nowrap;">Open Picker</a>
         </div>
-        <div class="template-card">
-          <div class="info">
-            <h3>Drupal Issue Picker <span style="font-size:0.75em;background:#7c3aed;color:#fff;padding:0.15em 0.5em;border-radius:4px;vertical-align:middle">BETA</span></h3>
-            <p>New unified picker — handles both Drupal core and contrib modules/themes. Targets <strong>staging-coder.ddev.com</strong>. Try it out and report any issues.</p>
-          </div>
-          <a class="btn" href="drupal-contrib-picker" style="background:#059669;color:#fff;border-radius:8px;padding:0.6rem 1rem;font-size:0.9rem;font-weight:600;text-decoration:none;white-space:nowrap;">Open Beta Picker</a>
-        </div>
       </div>
     </section>
 
