@neverinfamous/postgres-mcp 1.3.0 → 2.1.0

package/dist/adapters/postgresql/tools/ltree.js

@@ -5,8 +5,8 @@
 import { z } from "zod";
 import { readOnly, write } from "../../../utils/annotations.js";
 import { getToolIcons } from "../../../utils/icons.js";
-import { parsePostgresError } from "./core/error-helpers.js";
-import { LtreeQuerySchema, LtreeQuerySchemaBase, LtreeSubpathSchema, LtreeSubpathSchemaBase, LtreeLcaSchema, LtreeMatchSchema, LtreeMatchSchemaBase, LtreeListColumnsSchemaBase, LtreeListColumnsSchema, LtreeConvertColumnSchema, LtreeConvertColumnSchemaBase, LtreeIndexSchema, LtreeIndexSchemaBase, 
+import { formatPostgresError } from "./core/error-helpers.js";
+import { LtreeQuerySchema, LtreeQuerySchemaBase, LtreeSubpathSchema, LtreeSubpathSchemaBase, LtreeLcaSchemaBase, LtreeLcaSchema, LtreeMatchSchema, LtreeMatchSchemaBase, LtreeListColumnsSchemaBase, LtreeListColumnsSchema, LtreeConvertColumnSchema, LtreeConvertColumnSchemaBase, LtreeIndexSchema, LtreeIndexSchemaBase, 
 // Output schemas
 LtreeCreateExtensionOutputSchema, LtreeQueryOutputSchema, LtreeSubpathOutputSchema, LtreeLcaOutputSchema, LtreeMatchOutputSchema, LtreeListColumnsOutputSchema, LtreeConvertColumnOutputSchema, LtreeCreateIndexOutputSchema, } from "../schemas/index.js";
 export function getLtreeTools(adapter) {
@@ -31,8 +31,18 @@ function createLtreeExtensionTool(adapter) {
         annotations: write("Create Ltree Extension"),
         icons: getToolIcons("ltree", write("Create Ltree Extension")),
         handler: async (_params, _context) => {
-            await adapter.executeQuery("CREATE EXTENSION IF NOT EXISTS ltree");
-            return { success: true, message: "ltree extension enabled" };
+            try {
+                await adapter.executeQuery("CREATE EXTENSION IF NOT EXISTS ltree");
+                return { success: true, message: "ltree extension enabled" };
+            }
+            catch (error) {
+                return {
+                    success: false,
+                    error: formatPostgresError(error, {
+                        tool: "pg_ltree_create_extension",
+                    }),
+                };
+            }
         },
     };
 }
@@ -46,42 +56,64 @@ function createLtreeQueryTool(adapter) {
         annotations: readOnly("Query Ltree"),
         icons: getToolIcons("ltree", readOnly("Query Ltree")),
         handler: async (params, _context) => {
-            const { table, column, path, mode, schema, limit } = LtreeQuerySchema.parse(params);
-            const schemaName = schema ?? "public";
-            const queryMode = mode ?? "descendants";
-            const qualifiedTable = `"${schemaName}"."${table}"`;
-            const limitClause = limit !== undefined ? `LIMIT ${String(limit)}` : "";
-            // Validate column is ltree type
-            const colCheck = await adapter.executeQuery(`SELECT udt_name FROM information_schema.columns WHERE table_schema = $1 AND table_name = $2 AND column_name = $3`, [schemaName, table, column]);
-            if (!colCheck.rows || colCheck.rows.length === 0) {
-                // Distinguish table-not-found from column-not-found
-                const tableCheck = await adapter.executeQuery(`SELECT 1 FROM information_schema.tables WHERE table_schema = $1 AND table_name = $2`, [schemaName, table]);
-                if (!tableCheck.rows || tableCheck.rows.length === 0) {
+            try {
+                const { table, column, path, mode, schema, limit } = LtreeQuerySchema.parse(params);
+                const schemaName = schema ?? "public";
+                const queryMode = mode ?? "descendants";
+                const qualifiedTable = `"${schemaName}"."${table}"`;
+                const limitClause = limit !== undefined ? `LIMIT ${String(limit)}` : "";
+                // Validate column is ltree type
+                const colCheck = await adapter.executeQuery(`SELECT udt_name FROM information_schema.columns WHERE table_schema = $1 AND table_name = $2 AND column_name = $3`, [schemaName, table, column]);
+                if (!colCheck.rows || colCheck.rows.length === 0) {
+                    // Distinguish table-not-found from column-not-found
+                    const tableCheck = await adapter.executeQuery(`SELECT 1 FROM information_schema.tables WHERE table_schema = $1 AND table_name = $2`, [schemaName, table]);
+                    if (!tableCheck.rows || tableCheck.rows.length === 0) {
+                        return {
+                            success: false,
+                            error: `Table ${qualifiedTable} does not exist.`,
+                        };
+                    }
                     return {
                         success: false,
-                        error: `Table ${qualifiedTable} does not exist.`,
+                        error: `Column "${column}" not found in table ${qualifiedTable}.`,
                     };
                 }
-                return {
-                    success: false,
-                    error: `Column "${column}" not found in table ${qualifiedTable}.`,
-                };
-            }
-            const udtName = colCheck.rows[0]?.["udt_name"];
-            if (udtName !== "ltree") {
-                return {
-                    success: false,
-                    error: `Column "${column}" is not an ltree type (found: ${udtName}). Use an ltree column or convert with pg_ltree_convert_column.`,
-                };
-            }
-            // Detect if path contains lquery pattern characters
-            const isLqueryPattern = /[*?{!@|]/.test(path);
-            // Get total count when limit is applied for truncation indicators
-            let totalCount;
-            if (limit !== undefined) {
-                let countSql;
+                const udtName = colCheck.rows[0]?.["udt_name"];
+                if (udtName !== "ltree") {
+                    return {
+                        success: false,
+                        error: `Column "${column}" is not an ltree type (found: ${udtName}). Use an ltree column or convert with pg_ltree_convert_column.`,
+                    };
+                }
+                // Detect if path contains lquery pattern characters
+                const isLqueryPattern = /[*?{!@|]/.test(path);
+                // Get total count when limit is applied for truncation indicators
+                let totalCount;
+                if (limit !== undefined) {
+                    let countSql;
+                    if (isLqueryPattern) {
+                        countSql = `SELECT COUNT(*)::int as total FROM ${qualifiedTable} WHERE "${column}" ~ $1::lquery`;
+                    }
+                    else {
+                        let operator;
+                        switch (queryMode) {
+                            case "ancestors":
+                                operator = "@>";
+                                break;
+                            case "exact":
+                                operator = "=";
+                                break;
+                            default:
+                                operator = "<@";
+                        }
+                        countSql = `SELECT COUNT(*)::int as total FROM ${qualifiedTable} WHERE "${column}" ${operator} $1::ltree`;
+                    }
+                    const countResult = await adapter.executeQuery(countSql, [path]);
+                    totalCount = countResult.rows?.[0]?.["total"];
+                }
+                let sql;
                 if (isLqueryPattern) {
-                    countSql = `SELECT COUNT(*)::int as total FROM ${qualifiedTable} WHERE "${column}" ~ $1::lquery`;
+                    sql = `SELECT *, nlevel("${column}") as depth FROM ${qualifiedTable} WHERE "${column}" ~ $1::lquery ORDER BY "${column}" ${limitClause}`;
                 }
                 else {
                     let operator;
@@ -95,50 +127,38 @@ function createLtreeQueryTool(adapter) {
                         default:
                             operator = "<@";
                     }
-                    countSql = `SELECT COUNT(*)::int as total FROM ${qualifiedTable} WHERE "${column}" ${operator} $1::ltree`;
+                    sql = `SELECT *, nlevel("${column}") as depth FROM ${qualifiedTable} WHERE "${column}" ${operator} $1::ltree ORDER BY "${column}" ${limitClause}`;
                 }
-                const countResult = await adapter.executeQuery(countSql, [path]);
-                totalCount = countResult.rows?.[0]?.["total"];
-            }
-            let sql;
-            if (isLqueryPattern) {
-                // Use lquery pattern matching with ~ operator
-                sql = `SELECT *, nlevel("${column}") as depth FROM ${qualifiedTable} WHERE "${column}" ~ $1::lquery ORDER BY "${column}" ${limitClause}`;
-            }
-            else {
-                // Use standard ltree hierarchy operators
-                // @> means "is ancestor of" (left contains right)
-                // <@ means "is descendant of" (left is contained by right)
-                let operator;
-                switch (queryMode) {
-                    // ancestors: column @> path means column contains path, i.e., column is ancestor of path
-                    case "ancestors":
-                        operator = "@>";
-                        break;
-                    case "exact":
-                        operator = "=";
-                        break;
-                    // descendants: column <@ path means column is contained by path, i.e., column is descendant of path
-                    default:
-                        operator = "<@";
+                const result = await adapter.executeQuery(sql, [path]);
+                const resultCount = result.rows?.length ?? 0;
+                const response = {
+                    path,
+                    mode: isLqueryPattern ? "pattern" : queryMode,
+                    isPattern: isLqueryPattern,
+                    results: result.rows ?? [],
+                    count: resultCount,
+                };
+                // Add truncation indicators when limit is applied
+                if (limit !== undefined && totalCount !== undefined) {
+                    response["truncated"] = resultCount < totalCount;
+                    response["totalCount"] = totalCount;
                 }
-                sql = `SELECT *, nlevel("${column}") as depth FROM ${qualifiedTable} WHERE "${column}" ${operator} $1::ltree ORDER BY "${column}" ${limitClause}`;
+                return response;
             }
-            const result = await adapter.executeQuery(sql, [path]);
-            const resultCount = result.rows?.length ?? 0;
-            const response = {
-                path,
-                mode: isLqueryPattern ? "pattern" : queryMode,
-                isPattern: isLqueryPattern,
-                results: result.rows ?? [],
-                count: resultCount,
-            };
-            // Add truncation indicators when limit is applied
-            if (limit !== undefined && totalCount !== undefined) {
-                response["truncated"] = resultCount < totalCount;
-                response["totalCount"] = totalCount;
+            catch (error) {
+                if (error instanceof z.ZodError) {
+                    return {
+                        success: false,
+                        error: error.issues.map((i) => i.message).join("; "),
+                    };
+                }
+                return {
+                    success: false,
+                    error: formatPostgresError(error, {
+                        tool: "pg_ltree_query",
+                    }),
+                };
             }
-            return response;
         },
     };
 }
@@ -152,33 +172,49 @@ function createLtreeSubpathTool(adapter) {
         annotations: readOnly("Ltree Subpath"),
         icons: getToolIcons("ltree", readOnly("Ltree Subpath")),
         handler: async (params, _context) => {
-            const { path, offset, length } = LtreeSubpathSchema.parse(params);
-            // First get the path depth for validation
-            const depthResult = await adapter.executeQuery(`SELECT nlevel($1::ltree) as depth`, [path]);
-            const pathDepth = depthResult.rows?.[0]?.["depth"];
-            // Validate offset is within bounds
-            const effectiveOffset = offset < 0 ? pathDepth + offset : offset;
-            if (effectiveOffset < 0 || effectiveOffset >= pathDepth) {
+            try {
+                const { path, offset, length } = LtreeSubpathSchema.parse(params);
+                // First get the path depth for validation
+                const depthResult = await adapter.executeQuery(`SELECT nlevel($1::ltree) as depth`, [path]);
+                const pathDepth = depthResult.rows?.[0]?.["depth"];
+                // Validate offset is within bounds
+                const effectiveOffset = offset < 0 ? pathDepth + offset : offset;
+                if (effectiveOffset < 0 || effectiveOffset >= pathDepth) {
+                    return {
+                        success: false,
+                        error: `Invalid offset: ${String(offset)}. Path "${path}" has ${String(pathDepth)} labels (valid offset range: 0 to ${String(pathDepth - 1)}, or -${String(pathDepth)} to -1 for negative indexing).`,
+                        originalPath: path,
+                        pathDepth,
+                    };
+                }
+                const sql = length !== undefined
+                    ? `SELECT subpath($1::ltree, $2, $3) as subpath, nlevel($1::ltree) as original_depth`
+                    : `SELECT subpath($1::ltree, $2) as subpath, nlevel($1::ltree) as original_depth`;
+                const queryParams = length !== undefined ? [path, offset, length] : [path, offset];
+                const result = await adapter.executeQuery(sql, queryParams);
+                const row = result.rows?.[0];
                 return {
-                    success: false,
-                    error: `Invalid offset: ${String(offset)}. Path "${path}" has ${String(pathDepth)} labels (valid offset range: 0 to ${String(pathDepth - 1)}, or -${String(pathDepth)} to -1 for negative indexing).`,
                     originalPath: path,
-                    pathDepth,
+                    offset,
+                    length: length ?? "to end",
+                    subpath: row?.["subpath"],
+                    originalDepth: row?.["original_depth"],
+                };
+            }
+            catch (error) {
+                if (error instanceof z.ZodError) {
+                    return {
+                        success: false,
+                        error: error.issues.map((i) => i.message).join("; "),
+                    };
+                }
+                return {
+                    success: false,
+                    error: formatPostgresError(error, {
+                        tool: "pg_ltree_subpath",
+                    }),
                 };
             }
-            const sql = length !== undefined
-                ? `SELECT subpath($1::ltree, $2, $3) as subpath, nlevel($1::ltree) as original_depth`
-                : `SELECT subpath($1::ltree, $2) as subpath, nlevel($1::ltree) as original_depth`;
-            const queryParams = length !== undefined ? [path, offset, length] : [path, offset];
-            const result = await adapter.executeQuery(sql, queryParams);
-            const row = result.rows?.[0];
-            return {
-                originalPath: path,
-                offset,
-                length: length ?? "to end",
-                subpath: row?.["subpath"],
-                originalDepth: row?.["original_depth"],
-            };
         },
     };
 }
@@ -187,23 +223,39 @@ function createLtreeLcaTool(adapter) {
         name: "pg_ltree_lca",
         description: "Find the longest common ancestor of multiple ltree paths.",
         group: "ltree",
-        inputSchema: LtreeLcaSchema,
+        inputSchema: LtreeLcaSchemaBase, // Base schema for MCP visibility
         outputSchema: LtreeLcaOutputSchema,
         annotations: readOnly("Ltree LCA"),
         icons: getToolIcons("ltree", readOnly("Ltree LCA")),
         handler: async (params, _context) => {
-            const { paths } = LtreeLcaSchema.parse(params);
-            const arrayLiteral = paths
-                .map((p) => `'${p.replace(/'/g, "''")}'::ltree`)
-                .join(", ");
-            const sql = `SELECT lca(ARRAY[${arrayLiteral}]) as lca`;
-            const result = await adapter.executeQuery(sql);
-            const lca = result.rows?.[0]?.["lca"];
-            return {
-                paths,
-                longestCommonAncestor: lca ?? "",
-                hasCommonAncestor: lca !== null && lca !== "",
-            };
+            try {
+                const { paths } = LtreeLcaSchema.parse(params);
+                const arrayLiteral = paths
+                    .map((p) => `'${p.replace(/'/g, "''")}'::ltree`)
+                    .join(", ");
+                const sql = `SELECT lca(ARRAY[${arrayLiteral}]) as lca`;
+                const result = await adapter.executeQuery(sql);
+                const lca = result.rows?.[0]?.["lca"];
+                return {
+                    paths,
+                    longestCommonAncestor: lca ?? "",
+                    hasCommonAncestor: lca !== null && lca !== "",
+                };
+            }
+            catch (error) {
+                if (error instanceof z.ZodError) {
+                    return {
+                        success: false,
+                        error: error.issues.map((i) => i.message).join("; "),
+                    };
+                }
+                return {
+                    success: false,
+                    error: formatPostgresError(error, {
+                        tool: "pg_ltree_lca",
+                    }),
+                };
+            }
         },
     };
 }
@@ -217,33 +269,33 @@ function createLtreeMatchTool(adapter) {
         annotations: readOnly("Ltree Match"),
         icons: getToolIcons("ltree", readOnly("Ltree Match")),
         handler: async (params, _context) => {
-            const { table, column, pattern, schema, limit } = LtreeMatchSchema.parse(params);
-            const schemaName = schema ?? "public";
-            const qualifiedTable = `"${schemaName}"."${table}"`;
-            const limitClause = limit !== undefined ? `LIMIT ${String(limit)}` : "";
-            // Validate table exists and column is ltree type
-            const colCheck = await adapter.executeQuery(`SELECT udt_name FROM information_schema.columns WHERE table_schema = $1 AND table_name = $2 AND column_name = $3`, [schemaName, table, column]);
-            if (!colCheck.rows || colCheck.rows.length === 0) {
-                const tableCheck = await adapter.executeQuery(`SELECT 1 FROM information_schema.tables WHERE table_schema = $1 AND table_name = $2`, [schemaName, table]);
-                if (!tableCheck.rows || tableCheck.rows.length === 0) {
+            try {
+                const { table, column, pattern, schema, limit } = LtreeMatchSchema.parse(params);
+                const schemaName = schema ?? "public";
+                const qualifiedTable = `"${schemaName}"."${table}"`;
+                const limitClause = limit !== undefined ? `LIMIT ${String(limit)}` : "";
+                // Validate table exists and column is ltree type
+                const colCheck = await adapter.executeQuery(`SELECT udt_name FROM information_schema.columns WHERE table_schema = $1 AND table_name = $2 AND column_name = $3`, [schemaName, table, column]);
+                if (!colCheck.rows || colCheck.rows.length === 0) {
+                    const tableCheck = await adapter.executeQuery(`SELECT 1 FROM information_schema.tables WHERE table_schema = $1 AND table_name = $2`, [schemaName, table]);
+                    if (!tableCheck.rows || tableCheck.rows.length === 0) {
+                        return {
+                            success: false,
+                            error: `Table ${qualifiedTable} does not exist.`,
+                        };
+                    }
                     return {
                         success: false,
-                        error: `Table ${qualifiedTable} does not exist.`,
+                        error: `Column "${column}" not found in table ${qualifiedTable}.`,
+                    };
+                }
+                const udtName = colCheck.rows[0]?.["udt_name"];
+                if (udtName !== "ltree") {
+                    return {
+                        success: false,
+                        error: `Column "${column}" is not an ltree type (found: ${udtName}). Use an ltree column or convert with pg_ltree_convert_column.`,
                     };
                 }
-                return {
-                    success: false,
-                    error: `Column "${column}" not found in table ${qualifiedTable}.`,
-                };
-            }
-            const udtName = colCheck.rows[0]?.["udt_name"];
-            if (udtName !== "ltree") {
-                return {
-                    success: false,
-                    error: `Column "${column}" is not an ltree type (found: ${udtName}). Use an ltree column or convert with pg_ltree_convert_column.`,
-                };
-            }
-            try {
                 // Get total count when limit is applied for truncation indicators
                 let totalCount;
                 if (limit !== undefined) {
@@ -267,13 +319,17 @@ function createLtreeMatchTool(adapter) {
                 return response;
             }
             catch (error) {
+                if (error instanceof z.ZodError) {
+                    return {
+                        success: false,
+                        error: error.issues.map((i) => i.message).join("; "),
+                    };
+                }
                 return {
                     success: false,
-                    error: parsePostgresError(error, {
+                    error: formatPostgresError(error, {
                         tool: "pg_ltree_match",
-                        table,
-                        schema: schemaName,
-                    }).message,
+                    }),
                 };
             }
         },
@@ -289,19 +345,35 @@ function createLtreeListColumnsTool(adapter) {
         annotations: readOnly("List Ltree Columns"),
         icons: getToolIcons("ltree", readOnly("List Ltree Columns")),
         handler: async (params, _context) => {
-            const { schema } = LtreeListColumnsSchema.parse(params);
-            const conditions = [
-                "udt_name = 'ltree'",
-                "table_schema NOT IN ('pg_catalog', 'information_schema')",
-            ];
-            const queryParams = [];
-            if (schema !== undefined) {
-                conditions.push(`table_schema = $1`);
-                queryParams.push(schema);
+            try {
+                const { schema } = LtreeListColumnsSchema.parse(params);
+                const conditions = [
+                    "udt_name = 'ltree'",
+                    "table_schema NOT IN ('pg_catalog', 'information_schema')",
+                ];
+                const queryParams = [];
+                if (schema !== undefined) {
+                    conditions.push(`table_schema = $1`);
+                    queryParams.push(schema);
+                }
+                const sql = `SELECT table_schema, table_name, column_name, is_nullable, column_default FROM information_schema.columns WHERE ${conditions.join(" AND ")} ORDER BY table_schema, table_name, ordinal_position`;
+                const result = await adapter.executeQuery(sql, queryParams);
+                return { columns: result.rows ?? [], count: result.rows?.length ?? 0 };
+            }
+            catch (error) {
+                if (error instanceof z.ZodError) {
+                    return {
+                        success: false,
+                        error: error.issues.map((i) => i.message).join("; "),
+                    };
+                }
+                return {
+                    success: false,
+                    error: formatPostgresError(error, {
+                        tool: "pg_ltree_list_columns",
+                    }),
+                };
             }
-            const sql = `SELECT table_schema, table_name, column_name, is_nullable, column_default FROM information_schema.columns WHERE ${conditions.join(" AND ")} ORDER BY table_schema, table_name, ordinal_position`;
-            const result = await adapter.executeQuery(sql, queryParams);
-            return { columns: result.rows ?? [], count: result.rows?.length ?? 0 };
         },
     };
 }
@@ -315,88 +387,88 @@ function createLtreeConvertColumnTool(adapter) {
         annotations: write("Convert to Ltree"),
         icons: getToolIcons("ltree", write("Convert to Ltree")),
         handler: async (params, _context) => {
-            const { table, column, schema } = LtreeConvertColumnSchema.parse(params);
-            const schemaName = schema ?? "public";
-            const qualifiedTable = `"${schemaName}"."${table}"`;
-            // Check if ltree extension is installed
-            const extCheck = await adapter.executeQuery(`
-        SELECT EXISTS(
-          SELECT 1 FROM pg_extension WHERE extname = 'ltree'
-        ) as installed
-      `);
-            const hasExt = extCheck.rows?.[0]?.["installed"] ?? false;
-            if (!hasExt) {
-                return {
-                    success: false,
-                    error: "ltree extension is not installed. Run pg_ltree_create_extension first.",
-                };
-            }
-            const colCheck = await adapter.executeQuery(`SELECT data_type, udt_name FROM information_schema.columns WHERE table_schema = $1 AND table_name = $2 AND column_name = $3`, [schemaName, table, column]);
-            if (!colCheck.rows || colCheck.rows.length === 0) {
-                // Distinguish table-not-found from column-not-found
-                const tableCheck = await adapter.executeQuery(`SELECT 1 FROM information_schema.tables WHERE table_schema = $1 AND table_name = $2`, [schemaName, table]);
-                if (!tableCheck.rows || tableCheck.rows.length === 0) {
+            try {
+                const { table, column, schema } = LtreeConvertColumnSchema.parse(params);
+                const schemaName = schema ?? "public";
+                const qualifiedTable = `"${schemaName}"."${table}"`;
+                // Check if ltree extension is installed
+                const extCheck = await adapter.executeQuery(`
+          SELECT EXISTS(
+            SELECT 1 FROM pg_extension WHERE extname = 'ltree'
+          ) as installed
+        `);
+                const hasExt = extCheck.rows?.[0]?.["installed"] ?? false;
+                if (!hasExt) {
                     return {
                         success: false,
-                        error: `Table ${qualifiedTable} does not exist. Verify the table name.`,
+                        error: "ltree extension is not installed. Run pg_ltree_create_extension first.",
+                    };
+                }
+                const colCheck = await adapter.executeQuery(`SELECT data_type, udt_name FROM information_schema.columns WHERE table_schema = $1 AND table_name = $2 AND column_name = $3`, [schemaName, table, column]);
+                if (!colCheck.rows || colCheck.rows.length === 0) {
+                    // Distinguish table-not-found from column-not-found
+                    const tableCheck = await adapter.executeQuery(`SELECT 1 FROM information_schema.tables WHERE table_schema = $1 AND table_name = $2`, [schemaName, table]);
+                    if (!tableCheck.rows || tableCheck.rows.length === 0) {
+                        return {
+                            success: false,
+                            error: `Table ${qualifiedTable} does not exist. Verify the table name.`,
+                        };
+                    }
+                    return {
+                        success: false,
+                        error: `Column "${column}" not found in table ${qualifiedTable}. Verify the column name.`,
+                    };
+                }
+                const dataType = colCheck.rows[0]?.["data_type"];
+                const udtName = colCheck.rows[0]?.["udt_name"];
+                const currentType = dataType === "USER-DEFINED" ? udtName : dataType;
+                if (udtName === "ltree") {
+                    return {
+                        success: true,
+                        message: `Column ${column} is already ltree`,
+                        table: qualifiedTable,
+                        previousType: "ltree",
+                        wasAlreadyLtree: true,
+                    };
+                }
+                // Validate source column is text-based (like citext tool does)
+                const allowedTypes = ["text", "varchar", "character varying", "bpchar"];
+                const normalizedType = dataType.toLowerCase();
+                if (!allowedTypes.includes(normalizedType)) {
+                    return {
+                        success: false,
+                        error: `Cannot convert column "${column}" of type "${currentType}" to ltree. Only text-based columns can be converted.`,
+                        currentType,
+                        allowedTypes: ["text", "varchar", "character varying"],
+                        suggestion: "Create a new TEXT column with ltree-formatted paths, then convert that column.",
+                    };
+                }
+                // Check for dependent views before attempting the conversion
+                const depCheck = await adapter.executeQuery(`
+          SELECT DISTINCT
+            c.relname as dependent_view,
+            n.nspname as view_schema
+          FROM pg_depend d
+          JOIN pg_rewrite r ON d.objid = r.oid
+          JOIN pg_class c ON r.ev_class = c.oid
+          JOIN pg_namespace n ON c.relnamespace = n.oid
+          JOIN pg_class t ON d.refobjid = t.oid
+          JOIN pg_namespace tn ON t.relnamespace = tn.oid
+          JOIN pg_attribute a ON d.refobjid = a.attrelid AND d.refobjsubid = a.attnum
+          WHERE c.relkind = 'v'
+            AND tn.nspname = $1
+            AND t.relname = $2
+            AND a.attname = $3
+          `, [schemaName, table, column]);
+                const dependentViews = depCheck.rows ?? [];
+                if (dependentViews.length > 0) {
+                    return {
+                        success: false,
+                        error: "Column has dependent views that must be dropped before conversion",
+                        dependentViews: dependentViews.map((v) => `${v["view_schema"]}.${v["dependent_view"]}`),
+                        hint: "Drop the listed views, run this conversion, then recreate the views. PostgreSQL cannot ALTER COLUMN TYPE when views depend on it.",
                     };
                 }
-                return {
-                    success: false,
-                    error: `Column "${column}" not found in table ${qualifiedTable}. Verify the column name.`,
-                };
-            }
-            const dataType = colCheck.rows[0]?.["data_type"];
-            const udtName = colCheck.rows[0]?.["udt_name"];
-            const currentType = dataType === "USER-DEFINED" ? udtName : dataType;
-            if (udtName === "ltree") {
-                return {
-                    success: true,
-                    message: `Column ${column} is already ltree`,
-                    table: qualifiedTable,
-                    previousType: "ltree",
-                    wasAlreadyLtree: true,
-                };
-            }
-            // Validate source column is text-based (like citext tool does)
-            const allowedTypes = ["text", "varchar", "character varying", "bpchar"];
-            const normalizedType = dataType.toLowerCase();
-            if (!allowedTypes.includes(normalizedType)) {
-                return {
-                    success: false,
-                    error: `Cannot convert column "${column}" of type "${currentType}" to ltree. Only text-based columns can be converted.`,
-                    currentType,
-                    allowedTypes: ["text", "varchar", "character varying"],
-                    suggestion: "Create a new TEXT column with ltree-formatted paths, then convert that column.",
-                };
-            }
-            // Check for dependent views before attempting the conversion
-            const depCheck = await adapter.executeQuery(`
-        SELECT DISTINCT 
-          c.relname as dependent_view,
-          n.nspname as view_schema
-        FROM pg_depend d
-        JOIN pg_rewrite r ON d.objid = r.oid
-        JOIN pg_class c ON r.ev_class = c.oid
-        JOIN pg_namespace n ON c.relnamespace = n.oid
-        JOIN pg_class t ON d.refobjid = t.oid
-        JOIN pg_namespace tn ON t.relnamespace = tn.oid
-        JOIN pg_attribute a ON d.refobjid = a.attrelid AND d.refobjsubid = a.attnum
-        WHERE c.relkind = 'v'
-          AND tn.nspname = $1
-          AND t.relname = $2
-          AND a.attname = $3
-        `, [schemaName, table, column]);
-            const dependentViews = depCheck.rows ?? [];
-            if (dependentViews.length > 0) {
-                return {
-                    success: false,
-                    error: "Column has dependent views that must be dropped before conversion",
-                    dependentViews: dependentViews.map((v) => `${v["view_schema"]}.${v["dependent_view"]}`),
-                    hint: "Drop the listed views, run this conversion, then recreate the views. PostgreSQL cannot ALTER COLUMN TYPE when views depend on it.",
-                };
-            }
-            try {
                 await adapter.executeQuery(`ALTER TABLE ${qualifiedTable} ALTER COLUMN "${column}" TYPE ltree USING "${column}"::ltree`);
                 return {
                     success: true,
@@ -406,11 +478,17 @@ function createLtreeConvertColumnTool(adapter) {
                 };
             }
             catch (error) {
-                const errorMessage = error instanceof Error ? error.message : String(error);
+                if (error instanceof z.ZodError) {
+                    return {
+                        success: false,
+                        error: error.issues.map((i) => i.message).join("; "),
+                    };
+                }
                 return {
                     success: false,
-                    error: `Failed to convert column: ${errorMessage}`,
-                    hint: "If views depend on this column, they may need to be dropped and recreated",
+                    error: formatPostgresError(error, {
+                        tool: "pg_ltree_convert_column",
+                    }),
                 };
             }
         },
@@ -426,33 +504,34 @@ function createLtreeCreateIndexTool(adapter) {
         annotations: write("Create Ltree Index"),
         icons: getToolIcons("ltree", write("Create Ltree Index")),
         handler: async (params, _context) => {
-            const { table, column, indexName, schema } = LtreeIndexSchema.parse(params);
-            const schemaName = schema ?? "public";
-            const qualifiedTable = `"${schemaName}"."${table}"`;
-            const idxName = indexName ?? `idx_${table}_${column}_ltree`;
-            // Validate table exists and column is ltree type
-            const colCheck = await adapter.executeQuery(`SELECT udt_name FROM information_schema.columns WHERE table_schema = $1 AND table_name = $2 AND column_name = $3`, [schemaName, table, column]);
-            if (!colCheck.rows || colCheck.rows.length === 0) {
-                const tableCheck = await adapter.executeQuery(`SELECT 1 FROM information_schema.tables WHERE table_schema = $1 AND table_name = $2`, [schemaName, table]);
-                if (!tableCheck.rows || tableCheck.rows.length === 0) {
+            try {
+                const { table, column, indexName, schema } = LtreeIndexSchema.parse(params);
+                const schemaName = schema ?? "public";
+                const qualifiedTable = `"${schemaName}"."${table}"`;
+                const idxName = indexName ?? `idx_${table}_${column}_ltree`;
+                // Validate table exists and column is ltree type
+                const colCheck = await adapter.executeQuery(`SELECT udt_name FROM information_schema.columns WHERE table_schema = $1 AND table_name = $2 AND column_name = $3`, [schemaName, table, column]);
+                if (!colCheck.rows || colCheck.rows.length === 0) {
+                    const tableCheck = await adapter.executeQuery(`SELECT 1 FROM information_schema.tables WHERE table_schema = $1 AND table_name = $2`, [schemaName, table]);
+                    if (!tableCheck.rows || tableCheck.rows.length === 0) {
+                        return {
+                            success: false,
+                            error: `Table ${qualifiedTable} does not exist.`,
+                        };
+                    }
                     return {
                         success: false,
-                        error: `Table ${qualifiedTable} does not exist.`,
+                        error: `Column "${column}" not found in table ${qualifiedTable}.`,
                     };
                 }
-                return {
-                    success: false,
-                    error: `Column "${column}" not found in table ${qualifiedTable}.`,
-                };
-            }
-            const udtName = colCheck.rows[0]?.["udt_name"];
-            if (udtName !== "ltree") {
-                return {
-                    success: false,
-                    error: `Column "${column}" is not an ltree type (found: ${udtName}). Use an ltree column or convert with pg_ltree_convert_column.`,
-                };
-            }
-            try {
+                const udtName = colCheck.rows[0]?.["udt_name"];
+                if (udtName !== "ltree") {
+                    return {
+                        success: false,
+                        error: `Column "${column}" is not an ltree type (found: ${udtName}). Use an ltree column or convert with pg_ltree_convert_column.`,
+                    };
+                }
+                // Check for existing index by name
                 const idxCheck = await adapter.executeQuery(`SELECT EXISTS(SELECT 1 FROM pg_indexes WHERE schemaname = $1 AND indexname = $2) as exists`, [schemaName, idxName]);
                 if (idxCheck.rows?.[0]?.["exists"])
                     return {
@@ -464,6 +543,23 @@ function createLtreeCreateIndexTool(adapter) {
                         indexType: "gist",
                         alreadyExists: true,
                     };
+                // Check for existing GiST index on same table+column (semantic duplicate)
+                const semanticCheck = await adapter.executeQuery(`SELECT indexname FROM pg_indexes
+           WHERE schemaname = $1 AND tablename = $2
+             AND indexdef ILIKE '%using gist%'
+             AND (indexdef ILIKE $3 OR indexdef ILIKE $4)`, [schemaName, table, `%(${column})%`, `%("${column}")%`]);
+                if (semanticCheck.rows && semanticCheck.rows.length > 0) {
+                    const existingName = semanticCheck.rows[0]?.["indexname"];
+                    return {
+                        success: true,
+                        message: `GiST index already exists on column "${column}" as "${existingName}"`,
+                        indexName: existingName,
+                        table: qualifiedTable,
+                        column,
+                        indexType: "gist",
+                        alreadyExists: true,
+                    };
+                }
                 await adapter.executeQuery(`CREATE INDEX "${idxName}" ON ${qualifiedTable} USING GIST ("${column}")`);
                 return {
                     success: true,
@@ -475,14 +571,17 @@ function createLtreeCreateIndexTool(adapter) {
                 };
             }
             catch (error) {
+                if (error instanceof z.ZodError) {
+                    return {
+                        success: false,
+                        error: error.issues.map((i) => i.message).join("; "),
+                    };
+                }
                 return {
                     success: false,
-                    error: parsePostgresError(error, {
+                    error: formatPostgresError(error, {
                         tool: "pg_ltree_create_index",
-                        table,
-                        schema: schemaName,
-                        index: idxName,
-                    }).message,
+                    }),
                 };
             }
         },