@pilat/mcp-datalink 1.0.3 → 1.2.0

package/dist/server.js

@@ -5,14 +5,28 @@
  */
 import { Server } from '@modelcontextprotocol/sdk/server/index.js';
 import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
-import { CallToolRequestSchema, ListToolsRequestSchema, } from '@modelcontextprotocol/sdk/types.js';
-import { listDatabases } from './tools/list-databases.js';
-import { listTables } from './tools/list-tables.js';
-import { describeTable } from './tools/describe-table.js';
-import { query, formatQueryResultAsMarkdown } from './tools/query.js';
-import { execute } from './tools/execute.js';
-import { explain } from './tools/explain.js';
+import { CallToolRequestSchema, ListToolsRequestSchema } from '@modelcontextprotocol/sdk/types.js';
+import { describeTable, formatTableDescriptionAsMarkdown } from './tools/describe-table.js';
+import { execute, formatExecuteResultAsMarkdown } from './tools/execute.js';
+import { explain, formatExplainResultAsMarkdown } from './tools/explain.js';
+import { formatListDatabasesResultAsMarkdown, listDatabases } from './tools/list-databases.js';
+import { formatListTablesResultAsMarkdown, listTables } from './tools/list-tables.js';
+import { formatQueryResultAsMarkdown, query } from './tools/query.js';
 import { DbMcpError } from './utils/errors.js';
+/**
+ * Server instructions for LLM agents.
+ * Provides workflow guidance for proper tool usage sequence.
+ */
+const SERVER_INSTRUCTIONS = `Database Query Workflow:
+1. Discovery: Use list_databases to find available database connections.
+2. Exploration: Use list_tables to discover tables in a database schema.
+3. Schema Validation: Always call describe_table before writing queries to verify exact column names, types, and constraints. Never assume or guess column names.
+4. Query Execution: Use query for SELECT statements, execute for INSERT/UPDATE/DELETE.
+5. Security: All queries must use parameterized placeholders ($1, $2, ...). Never interpolate values directly into SQL strings.
+6. Performance: Use explain to analyze query execution plans for optimization.
+
+The recommended sequence is: list_databases → list_tables → describe_table → query/execute.
+Skipping describe_table often leads to errors due to incorrect column names or types.`;
 /**
  * Creates an MCP server configured with all db-mcp tools.
  *
@@ -27,13 +41,13 @@ export function createServer(config) {
         capabilities: {
             tools: {},
         },
+        instructions: SERVER_INSTRUCTIONS,
     });
-    // Register list tools handler
     server.setRequestHandler(ListToolsRequestSchema, async () => ({
         tools: [
             {
                 name: 'list_databases',
-                description: 'List all configured database connections',
+                description: 'List all configured database connections available in this server.',
                 inputSchema: {
                     type: 'object',
                     properties: {},
@@ -42,97 +56,149 @@ export function createServer(config) {
             },
             {
                 name: 'list_tables',
-                description: 'List tables in a database schema',
+                description: 'List all tables and views in a database schema with row counts and metadata.',
                 inputSchema: {
                     type: 'object',
                     properties: {
-                        database: { type: 'string', description: 'Database connection name' },
-                        schema: { type: 'string', description: 'Schema name (default: public)' },
+                        database: {
+                            type: 'string',
+                            description: 'Database connection name as returned by list_databases',
+                        },
+                        schema: {
+                            type: 'string',
+                            description: 'Schema name to list tables from (default: public for PostgreSQL, none for SQLite)',
+                        },
                     },
                     required: ['database'],
                 },
             },
             {
                 name: 'describe_table',
-                description: 'Get table structure including columns, indexes, and foreign keys',
+                description: 'Retrieve detailed table structure: column names, data types, nullability, defaults, indexes, and foreign key relationships.',
                 inputSchema: {
                     type: 'object',
                     properties: {
-                        database: { type: 'string', description: 'Database connection name' },
-                        table: { type: 'string', description: 'Table name' },
-                        schema: { type: 'string', description: 'Schema name (default: public)' },
+                        database: {
+                            type: 'string',
+                            description: 'Database connection name as returned by list_databases',
+                        },
+                        table: {
+                            type: 'string',
+                            description: 'Table name as returned by list_tables',
+                        },
+                        schema: {
+                            type: 'string',
+                            description: 'Schema name (default: public for PostgreSQL)',
+                        },
                     },
                     required: ['database', 'table'],
                 },
             },
             {
                 name: 'query',
-                description: 'Execute a read-only SELECT query. Use $1, $2, ... placeholders for parameters.',
+                description: 'Execute a read-only SELECT query and return results as structured data.',
                 inputSchema: {
                     type: 'object',
                     properties: {
-                        database: { type: 'string', description: 'Database connection name' },
-                        sql: { type: 'string', description: 'SQL SELECT query. Use $1, $2, ... for parameter placeholders' },
-                        params: { type: 'array', description: 'Parameter values in order ($1, $2, ...). Always use params instead of interpolating values into SQL.' },
+                        database: {
+                            type: 'string',
+                            description: 'Database connection name as returned by list_databases',
+                        },
+                        sql: {
+                            type: 'string',
+                            description: 'SELECT query using parameterized placeholders ($1, $2, ...) for values. ' +
+                                'Example: SELECT * FROM users WHERE status = $1 AND created_at > $2',
+                        },
+                        params: {
+                            type: 'array',
+                            description: 'Parameter values corresponding to placeholders in order. ' +
+                                'Example: ["active", "2024-01-01"] for $1 and $2',
+                        },
                     },
                     required: ['database', 'sql'],
                 },
             },
             {
                 name: 'execute',
-                description: 'Execute INSERT/UPDATE/DELETE query. Use $1, $2, ... placeholders for parameters.',
+                description: 'Execute INSERT, UPDATE, or DELETE query and return affected row count.',
                 inputSchema: {
                     type: 'object',
                     properties: {
-                        database: { type: 'string', description: 'Database connection name' },
-                        sql: { type: 'string', description: 'SQL INSERT/UPDATE/DELETE query. Use $1, $2, ... for parameter placeholders' },
-                        params: { type: 'array', description: 'Parameter values in order ($1, $2, ...). Always use params instead of interpolating values into SQL.' },
+                        database: {
+                            type: 'string',
+                            description: 'Database connection name as returned by list_databases',
+                        },
+                        sql: {
+                            type: 'string',
+                            description: 'INSERT/UPDATE/DELETE query using parameterized placeholders ($1, $2, ...). ' +
+                                'Example: UPDATE users SET status = $1 WHERE id = $2',
+                        },
+                        params: {
+                            type: 'array',
+                            description: 'Parameter values corresponding to placeholders in order. ' +
+                                'Example: ["inactive", 123] for $1 and $2',
+                        },
                     },
                     required: ['database', 'sql'],
                 },
             },
             {
                 name: 'explain',
-                description: 'Show query execution plan',
+                description: 'Analyze query execution plan to understand performance characteristics and identify optimization opportunities.',
                 inputSchema: {
                     type: 'object',
                     properties: {
-                        database: { type: 'string', description: 'Database connection name' },
-                        sql: { type: 'string', description: 'SQL query to explain' },
-                        analyze: { type: 'boolean', description: 'Run EXPLAIN ANALYZE (default: false)' },
+                        database: {
+                            type: 'string',
+                            description: 'Database connection name as returned by list_databases',
+                        },
+                        sql: {
+                            type: 'string',
+                            description: 'SQL query to analyze (typically a SELECT statement)',
+                        },
+                        analyze: {
+                            type: 'boolean',
+                            description: 'If true, actually execute the query to get real timing statistics (EXPLAIN ANALYZE). ' +
+                                'If false, show estimated plan only. Default: false',
+                        },
                     },
                     required: ['database', 'sql'],
                 },
             },
         ],
     }));
-    // Register call tool handler
     server.setRequestHandler(CallToolRequestSchema, async (request) => {
         const { name, arguments: args } = request.params;
         try {
             switch (name) {
-                case 'list_databases':
+                case 'list_databases': {
+                    const result = listDatabases(config);
                     return {
-                        content: [{ type: 'text', text: JSON.stringify(listDatabases(config), null, 2) }],
+                        content: [{ type: 'text', text: formatListDatabasesResultAsMarkdown(result, config) }],
                     };
-                case 'list_tables':
+                }
+                case 'list_tables': {
+                    const result = await listTables(args, config);
                     return {
                         content: [
                             {
                                 type: 'text',
-                                text: JSON.stringify(await listTables(args, config), null, 2),
+                                text: formatListTablesResultAsMarkdown(result),
                             },
                         ],
                     };
-                case 'describe_table':
+                }
+                case 'describe_table': {
+                    const result = await describeTable(args, config);
                     return {
                         content: [
                             {
                                 type: 'text',
-                                text: JSON.stringify(await describeTable(args, config), null, 2),
+                                text: formatTableDescriptionAsMarkdown(result),
                             },
                         ],
                     };
+                }
                 case 'query': {
                     const result = await query(args, config);
                     return {
@@ -144,24 +210,28 @@ export function createServer(config) {
                         ],
                     };
                 }
-                case 'execute':
+                case 'execute': {
+                    const result = await execute(args, config);
                     return {
                         content: [
                             {
                                 type: 'text',
-                                text: JSON.stringify(await execute(args, config), null, 2),
+                                text: formatExecuteResultAsMarkdown(result),
                             },
                         ],
                     };
-                case 'explain':
+                }
+                case 'explain': {
+                    const result = await explain(args, config);
                     return {
                         content: [
                             {
                                 type: 'text',
-                                text: JSON.stringify(await explain(args, config), null, 2),
+                                text: formatExplainResultAsMarkdown(result),
                             },
                         ],
                     };
+                }
                 default:
                     throw new Error(`Unknown tool: ${name}`);
             }
@@ -173,7 +243,10 @@ export function createServer(config) {
                     isError: true,
                 };
             }
-            throw error;
+            if (error instanceof Error) {
+                throw error;
+            }
+            throw new Error(String(error));
         }
     });
     return server;

package/dist/server.js.map

@@ -1 +1 @@
-{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"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"}

package/dist/tools/describe-table.d.ts

@@ -1,11 +1,10 @@
 /**
  * describe_table tool - Returns table structure including columns, indexes, and foreign keys
  */
-import type { Config, TableDescription } from '../types.js';
-export interface DescribeTableParams {
-    database: string;
-    table: string;
-    schema?: string;
-}
+import type { Config, DescribeTableParams, TableDescription } from '../types.js';
+/**
+ * Format TableDescription as Markdown with sections for columns, indexes, and foreign keys
+ */
+export declare function formatTableDescriptionAsMarkdown(result: TableDescription): string;
 export declare function describeTable(params: DescribeTableParams, config: Config): Promise<TableDescription>;
 //# sourceMappingURL=describe-table.d.ts.map

package/dist/tools/describe-table.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"describe-table.d.ts","sourceRoot":"","sources":["../../src/tools/describe-table.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAI5D,MAAM,WAAW,mBAAmB;IAClC,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,wBAAsB,aAAa,CACjC,MAAM,EAAE,mBAAmB,EAC3B,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,gBAAgB,CAAC,CAwB3B"}
+{"version":3,"file":"describe-table.d.ts","sourceRoot":"","sources":["../../src/tools/describe-table.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAKjF;;GAEG;AACH,wBAAgB,gCAAgC,CAAC,MAAM,EAAE,gBAAgB,GAAG,MAAM,CA6DjF;AAGD,wBAAsB,aAAa,CACjC,MAAM,EAAE,mBAAmB,EAC3B,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,gBAAgB,CAAC,CAU3B"}

package/dist/tools/describe-table.js

@@ -2,19 +2,75 @@
  * describe_table tool - Returns table structure including columns, indexes, and foreign keys
  */
 import { createAdapter } from '../adapters/index.js';
-import { DbMcpError, ErrorCode } from '../utils/errors.js';
+import { formatAsMarkdownTable } from '../utils/formatter.js';
+/**
+ * Format TableDescription as Markdown with sections for columns, indexes, and foreign keys
+ */
+export function formatTableDescriptionAsMarkdown(result) {
+    const parts = [];
+    // Header
+    parts.push(`## ${result.schema}.${result.table}`);
+    parts.push('');
+    // Columns section
+    parts.push('### Columns');
+    if (result.columns.length > 0) {
+        const columnHeaders = ['name', 'type', 'nullable', 'default', 'primary_key'];
+        const columnRows = result.columns.map((col) => [
+            col.name,
+            col.type,
+            col.nullable ? 'YES' : 'NO',
+            col.default ?? 'NULL',
+            col.primaryKey ? 'YES' : 'NO',
+        ]);
+        parts.push(formatAsMarkdownTable(columnHeaders, columnRows));
+    }
+    else {
+        parts.push('_No columns_');
+    }
+    parts.push('');
+    // Indexes section
+    parts.push('### Indexes');
+    if (result.indexes.length > 0) {
+        const indexHeaders = ['name', 'columns', 'unique', 'primary'];
+        const indexRows = result.indexes.map((idx) => [
+            idx.name,
+            idx.columns.join(', '),
+            idx.unique ? 'YES' : 'NO',
+            idx.primary ? 'YES' : 'NO',
+        ]);
+        parts.push(formatAsMarkdownTable(indexHeaders, indexRows));
+    }
+    else {
+        parts.push('_No indexes_');
+    }
+    parts.push('');
+    // Foreign keys section
+    parts.push('### Foreign Keys');
+    if (result.foreignKeys.length > 0) {
+        const fkHeaders = ['column', 'references_table', 'references_column'];
+        const fkRows = result.foreignKeys.map((fk) => [
+            fk.column,
+            fk.references.table,
+            fk.references.column,
+        ]);
+        parts.push(formatAsMarkdownTable(fkHeaders, fkRows));
+    }
+    else {
+        parts.push('_No foreign keys_');
+    }
+    // Truncation info
+    if (result.truncated && result.truncationReason) {
+        parts.push('');
+        parts.push(`**Note:** Results truncated (${result.truncationReason})`);
+    }
+    return parts.join('\n');
+}
+import { getValidatedDatabase } from '../utils/validation.js';
 export async function describeTable(params, config) {
     const { table, database } = params;
     const { maxColumns, maxIndexes } = config.defaults;
-    // Get database config
-    const dbConfig = config.databases[database];
-    if (!dbConfig) {
-        throw new DbMcpError(ErrorCode.DATABASE_NOT_FOUND, `Database "${database}" not found in configuration`, { database, available: Object.keys(config.databases) });
-    }
-    // Create adapter for this database
+    const dbConfig = getValidatedDatabase(database, config);
     const adapter = createAdapter(dbConfig, config.defaults);
-    // Use provided schema or adapter's default schema
-    // PostgreSQL: "public", MySQL: database name, SQLite: "main"
     const schema = params.schema ?? adapter.getDefaultSchema();
     return adapter.withConnection(async (conn) => {
         return conn.describeTable(table, schema, { maxColumns, maxIndexes });

package/dist/tools/describe-table.js.map

@@ -1 +1 @@
-{"version":3,"file":"describe-table.js","sourceRoot":"","sources":["../../src/tools/describe-table.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAQ3D,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,MAA2B,EAC3B,MAAc;IAEd,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;IACnC,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,MAAM,CAAC,QAAQ,CAAC;IAEnD,sBAAsB;IACtB,MAAM,QAAQ,GAAG,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;IAC5C,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,MAAM,IAAI,UAAU,CAClB,SAAS,CAAC,kBAAkB,EAC5B,aAAa,QAAQ,8BAA8B,EACnD,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CACvD,CAAC;IACJ,CAAC;IAED,mCAAmC;IACnC,MAAM,OAAO,GAAG,aAAa,CAAC,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;IAEzD,kDAAkD;IAClD,6DAA6D;IAC7D,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,IAAI,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAE3D,OAAO,OAAO,CAAC,cAAc,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;QAC3C,OAAO,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,UAAU,EAAE,UAAU,EAAE,CAAC,CAAC;IACvE,CAAC,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"describe-table.js","sourceRoot":"","sources":["../../src/tools/describe-table.ts"],"names":[],"mappings":"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"}

package/dist/tools/execute.d.ts

@@ -1,12 +1,11 @@
 /**
  * Execute tool for INSERT/UPDATE/DELETE statements
  */
-import type { Config, ExecuteResult } from '../types.js';
-export interface ExecuteParams {
-    database: string;
-    sql: string;
-    params?: unknown[];
-}
+import type { Config, ExecuteParams, ExecuteResult } from '../types.js';
+/**
+ * Format ExecuteResult as Markdown
+ */
+export declare function formatExecuteResultAsMarkdown(result: ExecuteResult): string;
 /**
  * Execute an INSERT/UPDATE/DELETE statement
  *

package/dist/tools/execute.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"execute.d.ts","sourceRoot":"","sources":["../../src/tools/execute.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAIzD,MAAM,WAAW,aAAa;IAC5B,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,CAAC,EAAE,OAAO,EAAE,CAAC;CACpB;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,OAAO,CAC3B,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,aAAa,CAAC,CA+CxB"}
+{"version":3,"file":"execute.d.ts","sourceRoot":"","sources":["../../src/tools/execute.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAIxE;;GAEG;AACH,wBAAgB,6BAA6B,CAAC,MAAM,EAAE,aAAa,GAAG,MAAM,CAQ3E;AAID;;;;;;;;;;GAUG;AACH,wBAAsB,OAAO,CAC3B,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,aAAa,CAAC,CA+BxB"}

package/dist/tools/execute.js

@@ -2,7 +2,18 @@
  * Execute tool for INSERT/UPDATE/DELETE statements
  */
 import { createAdapter } from '../adapters/index.js';
+/**
+ * Format ExecuteResult as Markdown
+ */
+export function formatExecuteResultAsMarkdown(result) {
+    const parts = [];
+    parts.push(`**Command:** ${result.command}`);
+    parts.push(`**Rows affected:** ${result.rowsAffected}`);
+    parts.push(`**Execution time:** ${result.executionTime}ms`);
+    return parts.join('\n');
+}
 import { DbMcpError, ErrorCode } from '../utils/errors.js';
+import { getValidatedDatabase, validateParamCount } from '../utils/validation.js';
 /**
  * Execute an INSERT/UPDATE/DELETE statement
  *
@@ -16,24 +27,15 @@ import { DbMcpError, ErrorCode } from '../utils/errors.js';
  */
 export async function execute(params, config) {
     const startTime = Date.now();
-    // Get database config
-    const dbConfig = config.databases[params.database];
-    if (!dbConfig) {
-        throw new DbMcpError(ErrorCode.DATABASE_NOT_FOUND, `Database "${params.database}" not found in configuration`, { database: params.database, available: Object.keys(config.databases) });
-    }
-    // Step 1: Check if database is readonly
+    const dbConfig = getValidatedDatabase(params.database, config);
     if (dbConfig.readonly) {
         throw new DbMcpError(ErrorCode.READONLY_VIOLATION, `Database "${params.database}" is configured as readonly. INSERT/UPDATE/DELETE operations are not allowed.`, { database: params.database });
     }
-    // Create adapter for this database
     const adapter = createAdapter(dbConfig, config.defaults);
-    // Step 2: Validate query type - blocks SELECT and dangerous DDL
     adapter.validateQueryForTool(params.sql, 'execute');
-    // Step 3: Get the command type from parsed query
+    validateParamCount(params.sql, params.params ?? []);
     const parsed = adapter.parseQuery(params.sql);
     const command = parsed.type.toUpperCase();
-    // Step 4: Convert placeholders for non-PostgreSQL dialects
-    // PostgreSQL uses $1, $2; MySQL/SQLite use ?
     const sql = adapter.convertPlaceholders(params.sql);
     const result = await adapter.withConnection(async (conn) => {
         return conn.query(sql, params.params ?? []);

package/dist/tools/execute.js.map

@@ -1 +1 @@
-{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../src/tools/execute.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAQ3D;;;;;;;;;;GAUG;AACH,MAAM,CAAC,KAAK,UAAU,OAAO,CAC3B,MAAqB,EACrB,MAAc;IAEd,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAE7B,sBAAsB;IACtB,MAAM,QAAQ,GAAG,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IACnD,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,MAAM,IAAI,UAAU,CAClB,SAAS,CAAC,kBAAkB,EAC5B,aAAa,MAAM,CAAC,QAAQ,8BAA8B,EAC1D,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,SAAS,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CACxE,CAAC;IACJ,CAAC;IAED,wCAAwC;IACxC,IAAI,QAAQ,CAAC,QAAQ,EAAE,CAAC;QACtB,MAAM,IAAI,UAAU,CAClB,SAAS,CAAC,kBAAkB,EAC5B,aAAa,MAAM,CAAC,QAAQ,+EAA+E,EAC3G,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,CAC9B,CAAC;IACJ,CAAC;IAED,mCAAmC;IACnC,MAAM,OAAO,GAAG,aAAa,CAAC,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;IAEzD,gEAAgE;IAChE,OAAO,CAAC,oBAAoB,CAAC,MAAM,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IAEpD,iDAAiD;IACjD,MAAM,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAC9C,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;IAE1C,2DAA2D;IAC3D,6CAA6C;IAC7C,MAAM,GAAG,GAAG,OAAO,CAAC,mBAAmB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAEpD,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,cAAc,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;QACzD,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC;IAC9C,CAAC,CAAC,CAAC;IAEH,MAAM,aAAa,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC;IAE7C,OAAO;QACL,OAAO;QACP,YAAY,EAAE,MAAM,CAAC,QAAQ;QAC7B,aAAa;KACd,CAAC;AACJ,CAAC"}
+{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../src/tools/execute.ts"],"names":[],"mappings":"AAAA;;GAEG;AAIH,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAErD;;GAEG;AACH,MAAM,UAAU,6BAA6B,CAAC,MAAqB;IACjE,MAAM,KAAK,GAAa,EAAE,CAAC;IAE3B,KAAK,CAAC,IAAI,CAAC,gBAAgB,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;IAC7C,KAAK,CAAC,IAAI,CAAC,sBAAsB,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;IACxD,KAAK,CAAC,IAAI,CAAC,uBAAuB,MAAM,CAAC,aAAa,IAAI,CAAC,CAAC;IAE5D,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC1B,CAAC;AACD,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAElF;;;;;;;;;;GAUG;AACH,MAAM,CAAC,KAAK,UAAU,OAAO,CAC3B,MAAqB,EACrB,MAAc;IAEd,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAC7B,MAAM,QAAQ,GAAG,oBAAoB,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IAE/D,IAAI,QAAQ,CAAC,QAAQ,EAAE,CAAC;QACtB,MAAM,IAAI,UAAU,CAClB,SAAS,CAAC,kBAAkB,EAC5B,aAAa,MAAM,CAAC,QAAQ,+EAA+E,EAC3G,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,CAC9B,CAAC;IACJ,CAAC;IAED,MAAM,OAAO,GAAG,aAAa,CAAC,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;IACzD,OAAO,CAAC,oBAAoB,CAAC,MAAM,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IACpD,kBAAkB,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC;IAEpD,MAAM,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAC9C,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;IAC1C,MAAM,GAAG,GAAG,OAAO,CAAC,mBAAmB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAEpD,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,cAAc,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;QACzD,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC;IAC9C,CAAC,CAAC,CAAC;IAEH,MAAM,aAAa,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC;IAE7C,OAAO;QACL,OAAO;QACP,YAAY,EAAE,MAAM,CAAC,QAAQ;QAC7B,aAAa;KACd,CAAC;AACJ,CAAC"}

package/dist/tools/explain.d.ts

@@ -1,16 +1,11 @@
 /**
  * Explain tool for showing query execution plans
  */
-import type { Config } from '../types.js';
-export interface ExplainParams {
-    database: string;
-    sql: string;
-    analyze?: boolean;
-}
-export interface ExplainResult {
-    plan: string;
-    executionTime: number;
-}
+import type { Config, ExplainParams, ExplainResult } from '../types.js';
+/**
+ * Format ExplainResult as Markdown
+ */
+export declare function formatExplainResultAsMarkdown(result: ExplainResult): string;
 /**
  * Get the execution plan for a SQL query
  *

package/dist/tools/explain.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"explain.d.ts","sourceRoot":"","sources":["../../src/tools/explain.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAI1C,MAAM,WAAW,aAAa;IAC5B,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,MAAM,CAAC;CACvB;AAED;;;;;;;;;GASG;AACH,wBAAsB,OAAO,CAC3B,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,aAAa,CAAC,CAmFxB"}
+{"version":3,"file":"explain.d.ts","sourceRoot":"","sources":["../../src/tools/explain.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAIxE;;GAEG;AACH,wBAAgB,6BAA6B,CAAC,MAAM,EAAE,aAAa,GAAG,MAAM,CAU3E;AAID;;;;;;;;;GASG;AACH,wBAAsB,OAAO,CAC3B,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,aAAa,CAAC,CA+DxB"}

package/dist/tools/explain.js

@@ -2,7 +2,20 @@
  * Explain tool for showing query execution plans
  */
 import { createAdapter } from '../adapters/index.js';
+/**
+ * Format ExplainResult as Markdown
+ */
+export function formatExplainResultAsMarkdown(result) {
+    const parts = [];
+    parts.push('```');
+    parts.push(result.plan);
+    parts.push('```');
+    parts.push('');
+    parts.push(`**Execution time:** ${result.executionTime}ms`);
+    return parts.join('\n');
+}
 import { DbMcpError, ErrorCode } from '../utils/errors.js';
+import { getValidatedDatabase } from '../utils/validation.js';
 /**
  * Get the execution plan for a SQL query
  *
@@ -15,34 +28,19 @@ import { DbMcpError, ErrorCode } from '../utils/errors.js';
  */
 export async function explain(params, config) {
     const startTime = Date.now();
-    // Get database config
-    const dbConfig = config.databases[params.database];
-    if (!dbConfig) {
-        throw new DbMcpError(ErrorCode.DATABASE_NOT_FOUND, `Database "${params.database}" not found in configuration`, { database: params.database, available: Object.keys(config.databases) });
-    }
-    // Create adapter for this database
+    const dbConfig = getValidatedDatabase(params.database, config);
     const adapter = createAdapter(dbConfig, config.defaults);
-    // Step 1: Parse query and check for dangerous operations
     const parsed = adapter.parseQuery(params.sql);
     if (parsed.isDangerous) {
         throw new DbMcpError(ErrorCode.QUERY_BLOCKED, parsed.dangerousReason ?? 'This operation is not allowed', { sql: params.sql, queryType: parsed.type });
     }
     const result = await adapter.withConnection(async (conn) => {
-        // Build EXPLAIN query using adapter-specific prefix
         const explainPrefix = adapter.getExplainPrefix(params.analyze ?? false);
-        // SQLite and MySQL don't need READ ONLY transactions for EXPLAIN:
-        // - SQLite: Doesn't support READ ONLY transactions
-        // - MySQL: EXPLAIN doesn't execute the query, and READ ONLY tx blocks
-        //   EXPLAIN on UPDATE/DELETE even though they're safe
-        //
-        // Defense in depth is still provided by:
-        // 1. SQL parser blocking dangerous operations (DROP, TRUNCATE, etc.)
-        // 2. EXPLAIN not executing the query (MySQL) / EXPLAIN QUERY PLAN (SQLite)
-        // 3. Database adapter opening in readonly mode when configured
+        // SQLite/MySQL: EXPLAIN doesn't execute the query, no transaction needed
+        // PostgreSQL: EXPLAIN ANALYZE runs the query, wrap in READ ONLY transaction
         if (adapter.type === 'sqlite' || adapter.type === 'mysql') {
             return await conn.query(explainPrefix + params.sql);
         }
-        // PostgreSQL: Use READ ONLY transaction since EXPLAIN ANALYZE executes the query
         await conn.execute('BEGIN TRANSACTION READ ONLY');
         try {
             const queryResult = await conn.query(explainPrefix + params.sql);
@@ -51,18 +49,19 @@ export async function explain(params, config) {
         }
         catch (error) {
             await conn.execute('ROLLBACK');
-            throw error;
+            if (error instanceof Error) {
+                throw error;
+            }
+            throw new Error(String(error));
         }
     });
-    // Step 3: Format plan as text (join rows with newlines)
-    // Different databases have different EXPLAIN output formats:
-    // - PostgreSQL: Single column with plan text
-    // - MySQL: Multiple columns (id, select_type, table, type, key, rows, Extra, etc.)
-    // - SQLite: 4 columns (id, parent, notused, detail)
     const planLines = result.rows.map((row) => {
+        if (row.length === 0) {
+            return '';
+        }
         if (adapter.type === 'sqlite' && row.length >= 4) {
             // SQLite: extract the 'detail' column (4th column, index 3)
-            return String(row[3]);
+            return String(row[3] ?? '');
         }
         if (adapter.type === 'mysql' && row.length > 1) {
             // MySQL: Join all columns with tabs for tabular output
@@ -70,7 +69,7 @@ export async function explain(params, config) {
             return row.map((col) => (col === null ? 'NULL' : String(col))).join('\t');
         }
         // PostgreSQL: first column is the plan line
-        return row[0];
+        return String(row[0] ?? '');
     });
     const executionTime = Date.now() - startTime;
     return {