drupal-mcp-connector 2.18.0 → 2.19.0

package/.agents/commands/drupal-codegen-diff.md

@@ -1,11 +1,11 @@
 ---
-description: "Compare the live graphql_compose schema to the last gqcc:generate snapshot (`drush graphql-compose-codegen:diff`). Requires the module and drushSsh. Missing command fails loud. If allowedCommands is set, include graphql-compose-codegen:diff."
+description: "Compare the live graphql_compose schema to the last gqcc:generate snapshot (`drush graphql-compose-codegen:diff`). Uses the configured module binding; unbound sites require the module and drushSsh. Missing command fails loud. If allowedCommands is set, include graphql-compose-codegen:diff."
 argument-hint: "[site] [bundles] [skipFields]"
 ---
 
 Call the MCP tool `drupal_codegen_diff`.
 
-Compare the live graphql_compose schema to the last gqcc:generate snapshot (`drush graphql-compose-codegen:diff`). Requires the module and drushSsh. Missing command fails loud. If allowedCommands is set, include graphql-compose-codegen:diff.
+Compare the live graphql_compose schema to the last gqcc:generate snapshot (`drush graphql-compose-codegen:diff`). Uses the configured module binding; unbound sites require the module and drushSsh. Missing command fails loud. If allowedCommands is set, include graphql-compose-codegen:diff.
 
 Parse the arguments supplied with this command into this tool's parameters:
 

package/.agents/commands/drupal-codegen-generate.md

@@ -1,11 +1,11 @@
 ---
-description: "Return TypeScript/GraphQL scaffold artefacts from graphql_compose_codegen as text (`drush graphql-compose-codegen:generate --dry-run`). Never writes on the Drupal host (no --output-dir). Copy artefacts locally. Requires the module and drushSsh. Missing command fails loud. If allowedCommands is set, include graphql-compose-codegen:generate."
+description: "Return TypeScript/GraphQL scaffold artefacts from graphql_compose_codegen as text (`drush graphql-compose-codegen:generate --dry-run`). Never writes on the Drupal host (no --output-dir). Copy artefacts locally. Uses the configured module binding; unbound sites require the module and drushSsh. Missing command fails loud. If allowedCommands is set, include graphql-compose-codegen:generate."
 argument-hint: "[site] [bundles] [skipFields]"
 ---
 
 Call the MCP tool `drupal_codegen_generate`.
 
-Return TypeScript/GraphQL scaffold artefacts from graphql_compose_codegen as text (`drush graphql-compose-codegen:generate --dry-run`). Never writes on the Drupal host (no --output-dir). Copy artefacts locally. Requires the module and drushSsh. Missing command fails loud. If allowedCommands is set, include graphql-compose-codegen:generate.
+Return TypeScript/GraphQL scaffold artefacts from graphql_compose_codegen as text (`drush graphql-compose-codegen:generate --dry-run`). Never writes on the Drupal host (no --output-dir). Copy artefacts locally. Uses the configured module binding; unbound sites require the module and drushSsh. Missing command fails loud. If allowedCommands is set, include graphql-compose-codegen:generate.
 
 Parse the arguments supplied with this command into this tool's parameters:
 

package/.agents/commands/drupal-codegen-inspect.md

@@ -1,11 +1,11 @@
 ---
-description: "List node and paragraph bundles and extra fields from graphql_compose_codegen (`drush graphql-compose-codegen:inspect`). Requires the module and drushSsh. Missing command fails loud. If allowedCommands is set, include graphql-compose-codegen:inspect. Does not write files."
+description: "List node and paragraph bundles and extra fields from graphql_compose_codegen (`drush graphql-compose-codegen:inspect`). Uses the configured module binding; unbound sites require the module and drushSsh. Missing command fails loud. If allowedCommands is set, include graphql-compose-codegen:inspect. Does not write files."
 argument-hint: "[site] [bundles] [skipFields]"
 ---
 
 Call the MCP tool `drupal_codegen_inspect`.
 
-List node and paragraph bundles and extra fields from graphql_compose_codegen (`drush graphql-compose-codegen:inspect`). Requires the module and drushSsh. Missing command fails loud. If allowedCommands is set, include graphql-compose-codegen:inspect. Does not write files.
+List node and paragraph bundles and extra fields from graphql_compose_codegen (`drush graphql-compose-codegen:inspect`). Uses the configured module binding; unbound sites require the module and drushSsh. Missing command fails loud. If allowedCommands is set, include graphql-compose-codegen:inspect. Does not write files.
 
 Parse the arguments supplied with this command into this tool's parameters:
 

package/.agents/commands/drupal-drush-sql-query.md

@@ -1,11 +1,11 @@
 ---
-description: "Run a single read-only SELECT through mcp_sentinel's governed command (`drush mcp-sentinel:sql-query`). Requires the site to set drushSsh.rawSql=\"governed\" AND the site's policy profile to set allow_raw_sql; both are off by default. The server refuses statements touching a denied entity type, a non-entity table, or a redacted field, and records every attempt in the tamper-evident audit log. Use the site-context or entity-schema tools for schema introspection."
+description: "Run a single read-only SELECT through the configured sqlQuery module binding, or the legacy governed Drush command on unbound sites. Requires the site to set drushSsh.rawSql=\"governed\" AND the site's policy profile to set allow_raw_sql; both are off by default. The server refuses statements touching a denied entity type, a non-entity table, or a redacted field, and records every attempt in the tamper-evident audit log. Use the site-context or entity-schema tools for schema introspection."
 argument-hint: "<query> [site]"
 ---
 
 Call the MCP tool `drupal_drush_sql_query`.
 
-Run a single read-only SELECT through mcp_sentinel's governed command (`drush mcp-sentinel:sql-query`). Requires the site to set drushSsh.rawSql="governed" AND the site's policy profile to set allow_raw_sql; both are off by default. The server refuses statements touching a denied entity type, a non-entity table, or a redacted field, and records every attempt in the tamper-evident audit log. Use the site-context or entity-schema tools for schema introspection.
+Run a single read-only SELECT through the configured sqlQuery module binding, or the legacy governed Drush command on unbound sites. Requires the site to set drushSsh.rawSql="governed" AND the site's policy profile to set allow_raw_sql; both are off by default. The server refuses statements touching a denied entity type, a non-entity table, or a redacted field, and records every attempt in the tamper-evident audit log. Use the site-context or entity-schema tools for schema introspection.
 
 Parse the arguments supplied with this command into this tool's parameters:
 

package/CHANGELOG.md

@@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [2.19.0] - 2026-09-16
+
+### Added
+- Codegen and governed SQL compatibility commands can use module-owned Tool API
+  actions through explicit bindings (#317). Configured calls validate fresh
+  schemas and never fall back to SSH on failure. Core and third-party commands
+  remain available; unbound sites retain their existing migration path.
+
 ## [2.18.0] - 2026-09-16
 
 ### Fixed

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drupal-mcp-connector",
-  "version": "2.18.0",
+  "version": "2.19.0",
   "description": "Drupal MCP Connector — multi-site MCP server for Drupal with JSON:API and GraphQL, governed writes, draft translations, content tools, audit reports, and an SSH Drush bridge.",
   "type": "module",
   "main": "src/index.js",

package/src/tools/codegen.js

@@ -1,7 +1,8 @@
 /**
  * Tool group: GraphQL Compose Codegen (TypeScript / Next.js scaffolds).
  *
- * Thin Drush wrappers around `drupal/graphql_compose_codegen`. The generator
+ * Compatibility adapters through configured module bindings, or legacy Drush.
+ * Thin wrappers around `drupal/graphql_compose_codegen`. The generator
  * lives on the Drupal site; this connector does not reimplement it and does
  * not run GraphQL Code Generator against the SDL.
  *
@@ -16,6 +17,7 @@
 
 import { getSiteConfig } from "../lib/config.js";
 import { sshDrush } from "./drush.js";
+import { callBoundModuleTool, toolResultData } from "../lib/server-tools.js";
 import { SecurityError } from "../lib/security.js";
 import { validateMachineName } from "../lib/validate.js";
 
@@ -75,6 +77,18 @@ async function runGqcc(
   const site = getSiteConfig(siteName);
   const names = parseMachineNameList(bundles, "bundles");
   const skip = parseMachineNameList(skipFields, "skipFields");
+  if (site.serverTools?.bindings !== undefined) {
+    const binding = new Map([
+      [INSPECT, "codegenInspect"], [DIFF, "codegenDiff"], [GENERATE, "codegenPreview"],
+    ]).get(subcommand);
+    const result = toolResultData(await callBoundModuleTool(site, binding, {
+      bundles: names, skip_fields: skip,
+    }, { operation: "read", scope: "mcp_config", capabilities: ["configRead"] }));
+    if (result?.success !== true || !result.data || typeof result.data !== "object" || Array.isArray(result.data)) {
+      throw new SecurityError("Codegen module returned an invalid result. No SSH fallback was attempted.");
+    }
+    return { output: JSON.stringify(result.data), command: `module:${binding}`, wroteFiles: false };
+  }
   const args = [subcommand];
   if (names.length) args.push(`--bundles=${names.join(",")}`);
   if (skip.length) args.push(`--skip-fields=${skip.join(",")}`);
@@ -126,19 +140,19 @@ export const definitions = [
   {
     name: "drupal_codegen_inspect",
     description:
-      "List node and paragraph bundles and extra fields from graphql_compose_codegen (`drush graphql-compose-codegen:inspect`). Requires the module and drushSsh. Missing command fails loud. If allowedCommands is set, include graphql-compose-codegen:inspect. Does not write files.",
+      "List node and paragraph bundles and extra fields from graphql_compose_codegen (`drush graphql-compose-codegen:inspect`). Uses the configured module binding; unbound sites require the module and drushSsh. Missing command fails loud. If allowedCommands is set, include graphql-compose-codegen:inspect. Does not write files.",
     inputSchema: { type: "object", properties: LIST_PROPS },
   },
   {
     name: "drupal_codegen_diff",
     description:
-      "Compare the live graphql_compose schema to the last gqcc:generate snapshot (`drush graphql-compose-codegen:diff`). Requires the module and drushSsh. Missing command fails loud. If allowedCommands is set, include graphql-compose-codegen:diff.",
+      "Compare the live graphql_compose schema to the last gqcc:generate snapshot (`drush graphql-compose-codegen:diff`). Uses the configured module binding; unbound sites require the module and drushSsh. Missing command fails loud. If allowedCommands is set, include graphql-compose-codegen:diff.",
     inputSchema: { type: "object", properties: LIST_PROPS },
   },
   {
     name: "drupal_codegen_generate",
     description:
-      "Return TypeScript/GraphQL scaffold artefacts from graphql_compose_codegen as text (`drush graphql-compose-codegen:generate --dry-run`). Never writes on the Drupal host (no --output-dir). Copy artefacts locally. Requires the module and drushSsh. Missing command fails loud. If allowedCommands is set, include graphql-compose-codegen:generate.",
+      "Return TypeScript/GraphQL scaffold artefacts from graphql_compose_codegen as text (`drush graphql-compose-codegen:generate --dry-run`). Never writes on the Drupal host (no --output-dir). Copy artefacts locally. Uses the configured module binding; unbound sites require the module and drushSsh. Missing command fails loud. If allowedCommands is set, include graphql-compose-codegen:generate.",
     inputSchema: { type: "object", properties: LIST_PROPS },
   },
 ];

package/src/tools/drush.js

@@ -20,6 +20,7 @@
  * Requires per-site "drushSsh" config block — tools fail gracefully if absent.
  */
 
+import { callBoundModuleTool, toolResultData } from "../lib/server-tools.js";
 import { Client }        from "ssh2";
 import { readFileSync }  from "fs";
 import { homedir }       from "os";
@@ -456,6 +457,15 @@ async function sqlQuery({ site: siteName, query }) {
   assertGovernedRawSql(sshCfg, site._name);
   // Fast local reject only; mcp_sentinel's guard is the authority.
   validateSqlQuery(query);
+  if (site.serverTools?.bindings !== undefined) {
+    const result = toolResultData(await callBoundModuleTool(site, "sqlQuery", { query }, {
+      operation: "read", scope: "mcp_admin", capabilities: ["rawSql"],
+    }));
+    if (result?.success !== true || !result.data || !Array.isArray(result.data.rows)) {
+      throw new SecurityError("SQL module returned an invalid governed result. No SSH fallback was attempted.");
+    }
+    return result.data;
+  }
   const out = await sshDrush(site, ["mcp-sentinel:sql-query", query]);
   // The command emits a JSON object; a non-JSON reply means the command was
   // not found (mcp_sentinel absent or too old), which must not be reported as
@@ -534,7 +544,7 @@ export const definitions = [
   },
   {
     name: "drupal_drush_sql_query",
-    description: "Run a single read-only SELECT through mcp_sentinel's governed command (`drush mcp-sentinel:sql-query`). Requires the site to set drushSsh.rawSql=\"governed\" AND the site's policy profile to set allow_raw_sql; both are off by default. The server refuses statements touching a denied entity type, a non-entity table, or a redacted field, and records every attempt in the tamper-evident audit log. Use the site-context or entity-schema tools for schema introspection.",
+    description: "Run a single read-only SELECT through the configured sqlQuery module binding, or the legacy governed Drush command on unbound sites. Requires the site to set drushSsh.rawSql=\"governed\" AND the site's policy profile to set allow_raw_sql; both are off by default. The server refuses statements touching a denied entity type, a non-entity table, or a redacted field, and records every attempt in the tamper-evident audit log. Use the site-context or entity-schema tools for schema introspection.",
     inputSchema: { type: "object", required: ["query"], properties: { site: { type: "string" }, query: { type: "string" } } },
   },
   {