Merge public/master: align histories for unified sync

Author: mowens3

.gitattributes

@@ -25,6 +25,9 @@
 /behat.yml               export-ignore
 /behat.yml.dist          export-ignore
 
+# Project instructions (dev-only)
+/CLAUDE.md               export-ignore
+
 # Documentation (keep README and CHANGELOG, exclude dev docs)
 /CONTRIBUTING.md         export-ignore
 /ROADMAP.md              export-ignore

.github/workflows/ci.yml

@@ -210,8 +210,94 @@ jobs:
           SIMPLETEST_BASE_URL: http://localhost:8888
           SIMPLETEST_DB: mysql://root:root@127.0.0.1/drupal
 
-  # NOTE: E2E tests (mcp-e2e job) run in the dev repo only.
-  # They require scripts/ which are not included in the public release.
+  mcp-e2e:
+    name: MCP E2E (STDIO + HTTP)
+    runs-on: ubuntu-latest
+    services:
+      mysql:
+        image: mysql:8.0
+        env:
+          MYSQL_ROOT_PASSWORD: root
+          MYSQL_DATABASE: drupal
+        ports:
+          - 3306:3306
+        options: >-
+          --health-cmd="mysqladmin ping"
+          --health-interval=10s
+          --health-timeout=5s
+          --health-retries=3
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '8.3'
+          extensions: mbstring, pdo_mysql, gd, dom, xml
+          tools: composer
+          coverage: none
+
+      - name: Install Drupal
+        run: |
+          composer create-project drupal/recommended-project:^10.3 drupal --no-interaction
+          cd drupal
+          composer require --dev drupal/core-dev:^10.3 phpspec/prophecy-phpunit:^2 drush/drush --with-all-dependencies --no-interaction
+          composer require drupal/tool:1.0.0-alpha9 mcp/sdk:^0.2.2 code-wheel/mcp-http-security:^1.0 code-wheel/mcp-error-codes:^1.2 code-wheel/mcp-events:^2.0 code-wheel/mcp-schema-builder:^1.1 code-wheel/mcp-tool-gateway:^1.1 -W --no-interaction
+
+      - name: Copy MCP Tools module
+        run: |
+          mkdir -p drupal/web/modules/contrib/mcp_tools
+          rsync -av \
+            --exclude='.git' \
+            --exclude='.github' \
+            --exclude='.ddev' \
+            --exclude='docs' \
+            --exclude='scripts' \
+            --exclude='drupal' \
+            --exclude='vendor' \
+            --exclude='.phpunit.cache' \
+            ./ drupal/web/modules/contrib/mcp_tools/
+
+      - name: Install Drupal site
+        run: |
+          cd drupal
+          ./vendor/bin/drush site:install minimal \
+            --db-url=mysql://root:root@127.0.0.1/drupal \
+            --site-name="MCP Tools Test" \
+            --account-name=admin \
+            --account-pass=admin \
+            -y
+
+      - name: Enable modules
+        run: |
+          cd drupal
+          ./vendor/bin/drush en tool dblog update -y
+          ./vendor/bin/drush en mcp_tools -y
+          ./vendor/bin/drush en mcp_tools_stdio mcp_tools_remote mcp_tools_cache -y
+          ./vendor/bin/drush cr
+
+      - name: Setup Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20'
+
+      - name: Install MCP JS SDK (no-lock)
+        run: |
+          npm install --no-save --no-package-lock @modelcontextprotocol/sdk zod
+
+      - name: JS SDK STDIO compatibility
+        run: |
+          node scripts/mcp_js_sdk_compat.mjs --drupal-root drupal
+
+      - name: STDIO transport E2E
+        run: |
+          python3 scripts/mcp_stdio_e2e.py --drupal-root drupal
+
+      - name: HTTP transport E2E
+        run: |
+          python3 scripts/mcp_http_e2e.py --drupal-root drupal --base-url http://localhost:8888
 
   code-coverage:
     name: Code Coverage

.github/workflows/full-tool-registration.yml

@@ -1,6 +1,6 @@
 # =============================================================================
 # Full Tool Registration Workflow
-# Installs optional contrib dependencies and verifies all 205 tools register.
+# Installs optional contrib dependencies and verifies all 222 tools register.
 # Intended for scheduled/manual runs (not every PR) to keep CI fast and stable.
 # =============================================================================
 
@@ -13,7 +13,7 @@ on:
 
 jobs:
   all-tools-register:
-    name: Verify All 205 Tools Register
+    name: Verify All 222 Tools Register
     runs-on: ubuntu-latest
     services:
       mysql:
@@ -108,11 +108,11 @@ jobs:
           MCP_TOOL_COUNT=$(./vendor/bin/drush eval '$defs = \Drupal::service("plugin.manager.tool")->getDefinitions(); $defs = array_filter($defs, static fn($def): bool => str_starts_with($def->getProvider(), "mcp_tools")); echo count($defs);')
           echo "Registered MCP Tools tools: $MCP_TOOL_COUNT"
 
-          if [ "$MCP_TOOL_COUNT" -ne 205 ]; then
-            echo "ERROR: Expected 205 MCP Tools tools, found $MCP_TOOL_COUNT"
+          if [ "$MCP_TOOL_COUNT" -ne 222 ]; then
+            echo "ERROR: Expected 222 MCP Tools tools, found $MCP_TOOL_COUNT"
             exit 1
           fi
-          echo "✓ All tools registered (205)"
+          echo "✓ All tools registered (222)"
 
       - name: Verify all tool schemas convert
         run: |

.github/workflows/release.yml

@@ -85,7 +85,7 @@ jobs:
       - name: Install MCP dependencies
         run: |
           cd drupal
-          composer require drupal/tool:1.0.0-alpha9 mcp/sdk:^0.2.2 code-wheel/mcp-http-security:^1.0 code-wheel/mcp-error-codes:^1.2 code-wheel/mcp-events:^2.0 code-wheel/mcp-schema-builder:^1.1 code-wheel/mcp-tool-gateway:^1.1 -W --no-interaction
+          composer require drupal/tool:1.0.0-alpha9 mcp/sdk:^0.2.2 code-wheel/mcp-http-security:^1.0 -W --no-interaction
 
       - name: Copy module
         run: |
@@ -152,8 +152,10 @@ jobs:
 
           ./vendor/bin/phpunit --testsuite unit,kernel,functional --colors=always
 
-      # NOTE: E2E tests using scripts/ are only available in the dev repo
-      # and are excluded from the public release package
+      - name: MCP transport E2E
+        run: |
+          python3 scripts/mcp_stdio_e2e.py --drupal-root drupal
+          python3 scripts/mcp_http_e2e.py --drupal-root drupal --base-url http://localhost:8888
 
   release:
     name: Create GitHub Release

.github/workflows/security.yml

@@ -30,10 +30,8 @@ jobs:
           chmod +x gitleaks
 
       - name: Run Gitleaks
-        # Note: May report false positives on test data. Review findings manually.
-        continue-on-error: true
         run: |
-          ./gitleaks detect --source . --verbose
+          ./gitleaks detect --source . --config .gitleaks.toml --verbose
 
   php-security:
     name: PHP Security Check

.gitignore

@@ -7,3 +7,6 @@ mcp.json
 # Environment files
 .env
 .env.local
+
+# PromptWheel
+.promptwheel/

RELEASE_NOTES.md

@@ -670,6 +670,97 @@ public function devProfile(array $options = ['skip-modules' => FALSE]): void {
     $this->io()->text('  3) Run drush mcp:status to verify configuration');
   }
 
+  /**
+   * Generate MCP client configuration JSON for AI editors.
+   */
+  #[CLI\Command(name: 'mcp-tools:client-config', aliases: ['mcp-client-config'])]
+  #[CLI\Usage(name: 'drush mcp-tools:client-config', description: 'Generate MCP client config JSON')]
+  #[CLI\Usage(name: 'drush mcp-tools:client-config --scope=read', description: 'Generate read-only config')]
+  #[CLI\Usage(name: 'drush mcp-tools:client-config > .mcp.json', description: 'Save config directly to file')]
+  #[CLI\Option(name: 'scope', description: 'Scopes for the MCP server (default: read,write)')]
+  #[CLI\Option(name: 'uid', description: 'Drupal user ID for tool execution (default: 1)')]
+  public function clientConfig(array $options = ['scope' => 'read,write', 'uid' => '1']): void {
+    $scope = is_string($options['scope']) ? $options['scope'] : 'read,write';
+    $uid = is_string($options['uid']) ? $options['uid'] : '1';
+
+    $drupalRoot = \Drupal::root();
+    $isDdev = (bool) getenv('IS_DDEV_PROJECT');
+    $isLando = (bool) getenv('LANDO');
+
+    if ($isDdev) {
+      // Inside DDEV: the project root is one level above the Drupal root
+      // (web/ docroot), or if Drupal IS the project root, use that.
+      $projectRoot = dirname($drupalRoot);
+      if (basename($drupalRoot) === $drupalRoot) {
+        $projectRoot = $drupalRoot;
+      }
+      $config = [
+        'mcpServers' => [
+          'drupal' => [
+            'command' => 'ddev',
+            'args' => [
+              'drush',
+              'mcp-tools:serve',
+              '--quiet',
+              "--uid={$uid}",
+              "--scope={$scope}",
+            ],
+            'cwd' => $projectRoot,
+          ],
+        ],
+      ];
+    }
+    elseif ($isLando) {
+      $projectRoot = dirname($drupalRoot);
+      if (basename($drupalRoot) === $drupalRoot) {
+        $projectRoot = $drupalRoot;
+      }
+      $config = [
+        'mcpServers' => [
+          'drupal' => [
+            'command' => 'lando',
+            'args' => [
+              'drush',
+              'mcp-tools:serve',
+              '--quiet',
+              "--uid={$uid}",
+              "--scope={$scope}",
+            ],
+            'cwd' => $projectRoot,
+          ],
+        ],
+      ];
+    }
+    else {
+      // Bare metal / native.
+      $drushPath = $drupalRoot . '/vendor/bin/drush';
+      $config = [
+        'mcpServers' => [
+          'drupal' => [
+            'command' => $drushPath,
+            'args' => [
+              'mcp-tools:serve',
+              '--quiet',
+              "--uid={$uid}",
+              "--scope={$scope}",
+            ],
+            'cwd' => $drupalRoot,
+          ],
+        ],
+      ];
+    }
+
+    // JSON to stdout (pipeable to file).
+    $this->output()->write(json_encode($config, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES) . "\n");
+
+    // Instructions to stderr (not captured when piping).
+    fwrite(\STDERR, "\nSave this as one of:\n");
+    fwrite(\STDERR, "  Claude Code:    .mcp.json (project root)\n");
+    fwrite(\STDERR, "  Claude Desktop: ~/Library/Application Support/Claude/claude_desktop_config.json\n");
+    fwrite(\STDERR, "  Cursor:         .cursor/mcp.json (project root)\n");
+    fwrite(\STDERR, "  Windsurf:       .windsurf/mcp.json (project root)\n");
+  }
+
   /**
    * Count MCP tools from the tool manager.
    *