redash-mcp 3.0.3 → 3.1.0

package/README.ko.md

@@ -136,6 +136,10 @@ Redash → 우측 상단 프로필 → **Edit Profile** → **API Key** 복사
 | `REDASH_DEFAULT_MAX_AGE` | `0` | Redash 캐시 TTL (초) |
 | `REDASH_MCP_CACHE_TTL` | `300` | MCP 쿼리 캐시 TTL (초, 0 = 비활성화) |
 | `REDASH_MCP_CACHE_MAX_MB` | `50` | MCP 쿼리 캐시 최대 메모리 (MB) |
+| `REDASH_MCP_CONFIG_DIR` | `~/.redash-mcp` | BIRD few-shot/피드백/평가/키워드맵 저장 디렉터리 |
+| `REDASH_BIRD_ENABLED` | `true` | `false`로 설정하면 BIRD smart query 도구 비활성화 |
+| `REDASH_HTTP_TIMEOUT_SECS` | `30` | Redash API 요청 단위 HTTP 타임아웃 |
+| `ANTHROPIC_API_KEY` | — | 설정 시 BIRD smart_query가 키워드 매칭 실패 시 Claude Haiku로 테이블 선택 폴백 |
 
 ---
 

package/README.md

@@ -136,6 +136,10 @@ Open `~/.claude/settings.json` and add:
 | `REDASH_DEFAULT_MAX_AGE` | `0` | Redash cache TTL in seconds |
 | `REDASH_MCP_CACHE_TTL` | `300` | MCP query cache TTL in seconds (0 = disabled) |
 | `REDASH_MCP_CACHE_MAX_MB` | `50` | Max memory for MCP query cache in MB |
+| `REDASH_MCP_CONFIG_DIR` | `~/.redash-mcp` | Directory for BIRD few-shot, feedback, eval, keyword-map data |
+| `REDASH_BIRD_ENABLED` | `true` | Set to `false` to disable BIRD smart query tools |
+| `REDASH_HTTP_TIMEOUT_SECS` | `30` | Per-request HTTP timeout against the Redash API |
+| `ANTHROPIC_API_KEY` | — | If set, BIRD smart_query falls back to Claude Haiku for table selection when keyword scoring fails |
 
 ---
 

package/dist/bird/evaluation.js

@@ -1,6 +1,6 @@
 import { readFile, writeFile } from "node:fs/promises";
 import { ensureConfigDir, getDataSourcePath } from "./config.js";
-import { redashFetch } from "../redash-client.js";
+import { redashFetch, pollQueryResult } from "../redash-client.js";
 export async function loadTestSuite(dataSourceId) {
     try {
         const raw = await readFile(getDataSourcePath("eval", dataSourceId), "utf-8");
@@ -135,19 +135,7 @@ async function executeQuery(dataSourceId, sql) {
     });
     let result;
     if (res.job) {
-        for (let i = 0; i < 30; i++) {
-            const job = await redashFetch(`/jobs/${res.job.id}`);
-            if (job.job.status === 3) {
-                result = await redashFetch(`/query_results/${job.job.query_result_id}`);
-                break;
-            }
-            if (job.job.status === 4) {
-                throw new Error(`Query failed: ${job.job.error}`);
-            }
-            await new Promise((r) => setTimeout(r, 1000));
-        }
-        if (!result)
-            throw new Error("Query timed out");
+        result = await pollQueryResult(res.job.id, 30);
     }
     else {
         result = res;

package/dist/bird/feedback.js

@@ -29,7 +29,6 @@ export async function recordFeedback(dataSourceId, entry) {
         createdAt: new Date().toISOString(),
     };
     entries.push(newEntry);
-    await saveFeedback(dataSourceId, entries);
     if (newEntry.rating === "down" && newEntry.correctSql && newEntry.errorType) {
         const config = await loadConfig();
         if (config.bird.feedback.enabled) {
@@ -37,10 +36,10 @@ export async function recordFeedback(dataSourceId, entry) {
             if (sameErrorCount >= config.bird.feedback.autoPromoteThreshold) {
                 await promoteToFewShot(dataSourceId, newEntry);
                 newEntry.promotedToFewShot = true;
-                await saveFeedback(dataSourceId, entries);
             }
         }
     }
+    await saveFeedback(dataSourceId, entries);
     return newEntry;
 }
 export function classifyError(generatedSql, correctSql) {

package/dist/bird/few-shot.js

@@ -83,7 +83,7 @@ function tokenize(text) {
         "it", "its", "this", "that", "these", "those", "what", "which",
         "who", "whom", "how", "where", "when", "why",
         "show", "give", "tell", "get", "find", "list", "display",
-        "의", "���", "이", "은", "는", "을", "를", "에", "에서", "와", "과",
+        "의", "가", "이", "은", "는", "을", "를", "에", "에서", "와", "과",
         "도", "로", "으로", "만", "까지", "부터", "에게", "한테", "께",
         "좀", "해줘", "알려줘", "보여줘", "해", "하는", "된", "인",
     ]);

package/dist/bird/smart-query.js

@@ -99,8 +99,13 @@ function detectVagueness(question, prunedTables) {
     if (hasTimeKeyword && !hasTimeSpecifier) {
         clarifications.push("Which specific time period? (e.g., last 7 days, last month, 2025-01-01 ~ 2025-03-31)");
     }
-    const wordCount = question.trim().split(/\s+/).length;
-    if (wordCount < 4) {
+    const trimmed = question.trim();
+    const wordCount = trimmed.split(/\s+/).length;
+    const hasCJK = /[ㄱ-힝]/.test(trimmed);
+    const tooShort = hasCJK
+        ? trimmed.replace(/\s+/g, "").length < 6
+        : wordCount < 4;
+    if (tooShort) {
         clarifications.push("Could you provide more details about what data you need?");
     }
     const maxScore = Math.max(...prunedTables.map((t) => t.score), 0);

package/dist/bird/tools.js

@@ -5,6 +5,7 @@ import { recordFeedback } from "./feedback.js";
 import { loadTestSuite, addTestCase, removeTestCase, runEvaluation, formatEvalResults } from "./evaluation.js";
 import { loadConfig, getConfigDir } from "./config.js";
 import { getEffectiveMap, addMappings, removeMappings, resetMappings, loadKeywordMap, DEFAULT_KEYWORD_MAP } from "./keyword-map.js";
+import { handleToolError } from "../tool-error.js";
 export function registerBirdTools(server) {
     if (process.env.REDASH_BIRD_ENABLED === "false")
         return;
@@ -13,36 +14,41 @@ export function registerBirdTools(server) {
         question: z.string().describe("Natural-language question (e.g., 'How many payments were completed last month?')"),
         context: z.string().optional().describe("User's answer to a previous clarification question (for multi-turn)"),
     }, { readOnlyHint: true }, async ({ data_source_id, question, context }) => {
-        const result = await handleSmartQuery({ question, data_source_id, context });
-        if (result.action === "clarify") {
-            const text = [
-                "## Clarification needed\n",
-                "Before generating SQL, I need more information:\n",
-                ...(result.clarificationQuestions?.map((q, i) => `${i + 1}. ${q}`) ?? []),
-                "\nPlease provide answers, then call smart_query again with the `context` parameter containing your answers.",
-            ].join("\n");
-            return { content: [{ type: "text", text }] };
-        }
-        if (result.action === "explain") {
-            return {
-                content: [{ type: "text", text: result.explanation ?? "Cannot generate SQL for this question." }],
-            };
-        }
-        const parts = [];
-        if (result.schema) {
-            parts.push(result.schema);
-        }
-        if (result.fewShotExamples) {
-            parts.push(result.fewShotExamples);
-        }
-        if (result.complexity) {
-            parts.push(`## Complexity: ${result.complexity.level}\n`);
+        try {
+            const result = await handleSmartQuery({ question, data_source_id, context });
+            if (result.action === "clarify") {
+                const text = [
+                    "## Clarification needed\n",
+                    "Before generating SQL, I need more information:\n",
+                    ...(result.clarificationQuestions?.map((q, i) => `${i + 1}. ${q}`) ?? []),
+                    "\nPlease provide answers, then call smart_query again with the `context` parameter containing your answers.",
+                ].join("\n");
+                return { content: [{ type: "text", text }] };
+            }
+            if (result.action === "explain") {
+                return {
+                    content: [{ type: "text", text: result.explanation ?? "Cannot generate SQL for this question." }],
+                };
+            }
+            const parts = [];
+            if (result.schema) {
+                parts.push(result.schema);
+            }
+            if (result.fewShotExamples) {
+                parts.push(result.fewShotExamples);
+            }
+            if (result.complexity) {
+                parts.push(`## Complexity: ${result.complexity.level}\n`);
+            }
+            if (result.guidance) {
+                parts.push(`## Guidance\n${result.guidance}`);
+            }
+            parts.push("\n---\nUse the schema and examples above to generate SQL, then execute with `run_query`.");
+            return { content: [{ type: "text", text: parts.join("\n") }] };
         }
-        if (result.guidance) {
-            parts.push(`## Guidance\n${result.guidance}`);
+        catch (error) {
+            return handleToolError("smart_query", error);
         }
-        parts.push("\n---\nUse the schema and examples above to generate SQL, then execute with `run_query`.");
-        return { content: [{ type: "text", text: parts.join("\n") }] };
     });
     server.tool("manage_few_shot_examples", "Manage few-shot examples (list/add/remove). Register domain-specific examples to improve SQL accuracy.", {
         data_source_id: z.number().describe("Data source ID"),
@@ -58,48 +64,53 @@ export function registerBirdTools(server) {
             .optional()
             .describe("Example to add (required when action=add)"),
         example_id: z.string().optional().describe("Example ID to remove (required when action=remove)"),
-    }, { destructiveHint: true }, async ({ data_source_id, action, example, example_id }) => {
-        if (action === "list") {
-            const examples = await loadExamples(data_source_id);
-            if (examples.length === 0) {
-                return { content: [{ type: "text", text: "No few-shot examples registered." }] };
+    }, {}, async ({ data_source_id, action, example, example_id }) => {
+        try {
+            if (action === "list") {
+                const examples = await loadExamples(data_source_id);
+                if (examples.length === 0) {
+                    return { content: [{ type: "text", text: "No few-shot examples registered." }] };
+                }
+                const text = examples
+                    .map((e) => `**[${e.id}]** ${e.question}\n\`\`\`sql\n${e.sql}\n\`\`\`\nTables: ${e.tables.join(", ")} | Tags: ${e.tags.join(", ")} | Source: ${e.source}`)
+                    .join("\n\n---\n\n");
+                return { content: [{ type: "text", text: `Total ${examples.length} example(s):\n\n${text}` }] };
             }
-            const text = examples
-                .map((e) => `**[${e.id}]** ${e.question}\n\`\`\`sql\n${e.sql}\n\`\`\`\nTables: ${e.tables.join(", ")} | Tags: ${e.tags.join(", ")} | Source: ${e.source}`)
-                .join("\n\n---\n\n");
-            return { content: [{ type: "text", text: `Total ${examples.length} example(s):\n\n${text}` }] };
-        }
-        if (action === "add") {
-            if (!example) {
-                return { content: [{ type: "text", text: "The example parameter is required." }] };
+            if (action === "add") {
+                if (!example) {
+                    return { content: [{ type: "text", text: "The example parameter is required." }] };
+                }
+                const added = await addExample(data_source_id, {
+                    question: example.question,
+                    sql: example.sql,
+                    tables: example.tables,
+                    tags: example.tags ?? [],
+                    notes: example.notes ?? "",
+                    source: "manual",
+                });
+                return {
+                    content: [{ type: "text", text: `Few-shot example added. (ID: ${added.id})` }],
+                };
             }
-            const added = await addExample(data_source_id, {
-                question: example.question,
-                sql: example.sql,
-                tables: example.tables,
-                tags: example.tags ?? [],
-                notes: example.notes ?? "",
-                source: "manual",
-            });
-            return {
-                content: [{ type: "text", text: `Few-shot example added. (ID: ${added.id})` }],
-            };
-        }
-        if (action === "remove") {
-            if (!example_id) {
-                return { content: [{ type: "text", text: "The example_id parameter is required." }] };
+            if (action === "remove") {
+                if (!example_id) {
+                    return { content: [{ type: "text", text: "The example_id parameter is required." }] };
+                }
+                const removed = await removeExample(data_source_id, example_id);
+                return {
+                    content: [
+                        {
+                            type: "text",
+                            text: removed ? `Example ${example_id} has been removed.` : `Example ${example_id} not found.`,
+                        },
+                    ],
+                };
             }
-            const removed = await removeExample(data_source_id, example_id);
-            return {
-                content: [
-                    {
-                        type: "text",
-                        text: removed ? `Example ${example_id} has been removed.` : `Example ${example_id} not found.`,
-                    },
-                ],
-            };
+            return { content: [{ type: "text", text: "Invalid action" }] };
+        }
+        catch (error) {
+            return handleToolError("manage_few_shot_examples", error);
         }
-        return { content: [{ type: "text", text: "Invalid action" }] };
     });
     server.tool("submit_query_feedback", "Submit feedback on generated SQL. Incorrect SQL is automatically classified and may be promoted to a few-shot example.", {
         data_source_id: z.number().describe("Data source ID"),
@@ -107,21 +118,26 @@ export function registerBirdTools(server) {
         generated_sql: z.string().describe("Generated SQL"),
         correct_sql: z.string().optional().describe("Correct SQL (provide when rating=down for automatic learning)"),
         rating: z.enum(["up", "down"]).describe("Rating: up (correct) or down (incorrect)"),
-    }, { destructiveHint: true }, async ({ data_source_id, question, generated_sql, correct_sql, rating }) => {
-        const entry = await recordFeedback(data_source_id, {
-            question,
-            generatedSql: generated_sql,
-            correctSql: correct_sql,
-            rating,
-        });
-        const parts = [`Feedback recorded. (ID: ${entry.id})`];
-        if (entry.errorType) {
-            parts.push(`Error type: ${entry.errorType}`);
+    }, {}, async ({ data_source_id, question, generated_sql, correct_sql, rating }) => {
+        try {
+            const entry = await recordFeedback(data_source_id, {
+                question,
+                generatedSql: generated_sql,
+                correctSql: correct_sql,
+                rating,
+            });
+            const parts = [`Feedback recorded. (ID: ${entry.id})`];
+            if (entry.errorType) {
+                parts.push(`Error type: ${entry.errorType}`);
+            }
+            if (entry.promotedToFewShot) {
+                parts.push("Repeated errors of the same type — auto-promoted to few-shot example.");
+            }
+            return { content: [{ type: "text", text: parts.join("\n") }] };
         }
-        if (entry.promotedToFewShot) {
-            parts.push("Repeated errors of the same type — auto-promoted to few-shot example.");
+        catch (error) {
+            return handleToolError("submit_query_feedback", error);
         }
-        return { content: [{ type: "text", text: parts.join("\n") }] };
     });
     server.tool("evaluate_queries", "Manage SQL accuracy evaluation. Add/list test cases, run evaluations, and view results.", {
         data_source_id: z.number().describe("Data source ID"),
@@ -143,146 +159,161 @@ export function registerBirdTools(server) {
         }))
             .optional()
             .describe("List of SQL to evaluate (required when action=run)"),
-    }, { destructiveHint: true }, async ({ data_source_id, action, test_case, test_case_id, generated_sqls }) => {
-        if (action === "list_tests") {
-            const store = await loadTestSuite(data_source_id);
-            if (store.testCases.length === 0) {
-                return { content: [{ type: "text", text: "No test cases registered." }] };
+    }, {}, async ({ data_source_id, action, test_case, test_case_id, generated_sqls }) => {
+        try {
+            if (action === "list_tests") {
+                const store = await loadTestSuite(data_source_id);
+                if (store.testCases.length === 0) {
+                    return { content: [{ type: "text", text: "No test cases registered." }] };
+                }
+                const text = store.testCases
+                    .map((tc) => `**[${tc.id}]** ${tc.question}\nDifficulty: ${tc.difficulty} | Tags: ${tc.tags.join(", ")}\n\`\`\`sql\n${tc.groundTruthSql}\n\`\`\``)
+                    .join("\n\n---\n\n");
+                return { content: [{ type: "text", text: `Total ${store.testCases.length} test case(s):\n\n${text}` }] };
             }
-            const text = store.testCases
-                .map((tc) => `**[${tc.id}]** ${tc.question}\nDifficulty: ${tc.difficulty} | Tags: ${tc.tags.join(", ")}\n\`\`\`sql\n${tc.groundTruthSql}\n\`\`\``)
-                .join("\n\n---\n\n");
-            return { content: [{ type: "text", text: `Total ${store.testCases.length} test case(s):\n\n${text}` }] };
-        }
-        if (action === "add_test") {
-            if (!test_case) {
-                return { content: [{ type: "text", text: "The test_case parameter is required." }] };
+            if (action === "add_test") {
+                if (!test_case) {
+                    return { content: [{ type: "text", text: "The test_case parameter is required." }] };
+                }
+                const added = await addTestCase(data_source_id, {
+                    question: test_case.question,
+                    groundTruthSql: test_case.ground_truth_sql,
+                    difficulty: test_case.difficulty,
+                    tags: test_case.tags ?? [],
+                });
+                return {
+                    content: [{ type: "text", text: `Test case added. (ID: ${added.id})` }],
+                };
             }
-            const added = await addTestCase(data_source_id, {
-                question: test_case.question,
-                groundTruthSql: test_case.ground_truth_sql,
-                difficulty: test_case.difficulty,
-                tags: test_case.tags ?? [],
-            });
-            return {
-                content: [{ type: "text", text: `Test case added. (ID: ${added.id})` }],
-            };
-        }
-        if (action === "remove_test") {
-            if (!test_case_id) {
-                return { content: [{ type: "text", text: "The test_case_id parameter is required." }] };
+            if (action === "remove_test") {
+                if (!test_case_id) {
+                    return { content: [{ type: "text", text: "The test_case_id parameter is required." }] };
+                }
+                const removed = await removeTestCase(data_source_id, test_case_id);
+                return {
+                    content: [
+                        {
+                            type: "text",
+                            text: removed ? `Test case ${test_case_id} has been removed.` : `Test case ${test_case_id} not found.`,
+                        },
+                    ],
+                };
             }
-            const removed = await removeTestCase(data_source_id, test_case_id);
-            return {
-                content: [
-                    {
-                        type: "text",
-                        text: removed ? `Test case ${test_case_id} has been removed.` : `Test case ${test_case_id} not found.`,
-                    },
-                ],
-            };
-        }
-        if (action === "run") {
-            if (!generated_sqls || generated_sqls.length === 0) {
-                return { content: [{ type: "text", text: "The generated_sqls parameter is required." }] };
+            if (action === "run") {
+                if (!generated_sqls || generated_sqls.length === 0) {
+                    return { content: [{ type: "text", text: "The generated_sqls parameter is required." }] };
+                }
+                const run = await runEvaluation(data_source_id, generated_sqls.map((gs) => ({
+                    testCaseId: gs.test_case_id,
+                    generatedSql: gs.generated_sql,
+                })));
+                return { content: [{ type: "text", text: formatEvalResults(run) }] };
             }
-            const run = await runEvaluation(data_source_id, generated_sqls.map((gs) => ({
-                testCaseId: gs.test_case_id,
-                generatedSql: gs.generated_sql,
-            })));
-            return { content: [{ type: "text", text: formatEvalResults(run) }] };
-        }
-        if (action === "results") {
-            const store = await loadTestSuite(data_source_id);
-            if (store.runs.length === 0) {
-                return { content: [{ type: "text", text: "No evaluation runs found." }] };
+            if (action === "results") {
+                const store = await loadTestSuite(data_source_id);
+                if (store.runs.length === 0) {
+                    return { content: [{ type: "text", text: "No evaluation runs found." }] };
+                }
+                const lastRun = store.runs[store.runs.length - 1];
+                return { content: [{ type: "text", text: formatEvalResults(lastRun) }] };
             }
-            const lastRun = store.runs[store.runs.length - 1];
-            return { content: [{ type: "text", text: formatEvalResults(lastRun) }] };
+            return { content: [{ type: "text", text: "Invalid action" }] };
+        }
+        catch (error) {
+            return handleToolError("evaluate_queries", error);
         }
-        return { content: [{ type: "text", text: "Invalid action" }] };
     });
     server.tool("manage_keyword_map", "Manage keyword-to-table-name mappings. After inspecting the schema with list_tables, register domain-specific mappings to improve smart_query table-matching accuracy. e.g., {\"revenue\": [\"payment\"], \"creator\": [\"creator\"]}", {
         data_source_id: z.number().describe("Data source ID"),
         action: z.enum(["list", "add", "remove", "reset"]).describe("Action to perform"),
         mappings: z
-            .record(z.array(z.string()))
+            .record(z.string(), z.array(z.string()))
             .optional()
             .describe("Mappings to add (required when action=add). e.g., {\"revenue\": [\"payment\", \"billing\"]}"),
         keywords: z
             .array(z.string())
             .optional()
             .describe("Keywords to remove (required when action=remove). e.g., [\"revenue\", \"order\"]"),
-    }, { destructiveHint: true }, async ({ data_source_id, action, mappings, keywords }) => {
-        if (action === "list") {
-            const effective = await getEffectiveMap(data_source_id);
-            const custom = await loadKeywordMap(data_source_id);
-            const defaultCount = Object.keys(DEFAULT_KEYWORD_MAP).length;
-            const customCount = Object.keys(custom).length;
-            const lines = [
-                `## Keyword Map (Data Source ${data_source_id})\n`,
-                `Default: ${defaultCount} | Custom: ${customCount} | Total: ${Object.keys(effective).length}\n`,
-            ];
-            if (customCount > 0) {
-                lines.push("### Custom mappings:");
-                for (const [ko, en] of Object.entries(custom)) {
-                    lines.push(`- **${ko}** → ${en.join(", ")}`);
+    }, {}, async ({ data_source_id, action, mappings, keywords }) => {
+        try {
+            if (action === "list") {
+                const effective = await getEffectiveMap(data_source_id);
+                const custom = await loadKeywordMap(data_source_id);
+                const defaultCount = Object.keys(DEFAULT_KEYWORD_MAP).length;
+                const customCount = Object.keys(custom).length;
+                const lines = [
+                    `## Keyword Map (Data Source ${data_source_id})\n`,
+                    `Default: ${defaultCount} | Custom: ${customCount} | Total: ${Object.keys(effective).length}\n`,
+                ];
+                if (customCount > 0) {
+                    lines.push("### Custom mappings:");
+                    for (const [ko, en] of Object.entries(custom)) {
+                        lines.push(`- **${ko}** → ${en.join(", ")}`);
+                    }
+                    lines.push("");
                 }
-                lines.push("");
+                lines.push("### All effective mappings:");
+                for (const [ko, en] of Object.entries(effective)) {
+                    const isCustom = ko in custom;
+                    lines.push(`- ${isCustom ? "**" : ""}${ko}${isCustom ? "** (custom)" : ""} → ${en.join(", ")}`);
+                }
+                return { content: [{ type: "text", text: lines.join("\n") }] };
             }
-            lines.push("### All effective mappings:");
-            for (const [ko, en] of Object.entries(effective)) {
-                const isCustom = ko in custom;
-                lines.push(`- ${isCustom ? "**" : ""}${ko}${isCustom ? "** (custom)" : ""} → ${en.join(", ")}`);
+            if (action === "add") {
+                if (!mappings || Object.keys(mappings).length === 0) {
+                    return { content: [{ type: "text", text: "The mappings parameter is required. e.g., {\"revenue\": [\"payment\"]}" }] };
+                }
+                const updated = await addMappings(data_source_id, mappings);
+                const added = Object.keys(mappings);
+                return {
+                    content: [
+                        {
+                            type: "text",
+                            text: `${added.length} keyword mapping(s) added/updated: ${added.join(", ")}`,
+                        },
+                    ],
+                };
             }
-            return { content: [{ type: "text", text: lines.join("\n") }] };
-        }
-        if (action === "add") {
-            if (!mappings || Object.keys(mappings).length === 0) {
-                return { content: [{ type: "text", text: "The mappings parameter is required. e.g., {\"revenue\": [\"payment\"]}" }] };
+            if (action === "remove") {
+                if (!keywords || keywords.length === 0) {
+                    return { content: [{ type: "text", text: "The keywords parameter is required." }] };
+                }
+                await removeMappings(data_source_id, keywords);
+                return {
+                    content: [{ type: "text", text: `${keywords.length} custom keyword(s) removed: ${keywords.join(", ")}` }],
+                };
             }
-            const updated = await addMappings(data_source_id, mappings);
-            const added = Object.keys(mappings);
-            return {
-                content: [
-                    {
-                        type: "text",
-                        text: `${added.length} keyword mapping(s) added/updated: ${added.join(", ")}`,
-                    },
-                ],
-            };
-        }
-        if (action === "remove") {
-            if (!keywords || keywords.length === 0) {
-                return { content: [{ type: "text", text: "The keywords parameter is required." }] };
+            if (action === "reset") {
+                await resetMappings(data_source_id);
+                return {
+                    content: [{ type: "text", text: "Custom mappings have been reset. Only default mappings will be used." }],
+                };
             }
-            await removeMappings(data_source_id, keywords);
-            return {
-                content: [{ type: "text", text: `${keywords.length} custom keyword(s) removed: ${keywords.join(", ")}` }],
-            };
+            return { content: [{ type: "text", text: "Invalid action" }] };
         }
-        if (action === "reset") {
-            await resetMappings(data_source_id);
-            return {
-                content: [{ type: "text", text: "Custom mappings have been reset. Only default mappings will be used." }],
-            };
+        catch (error) {
+            return handleToolError("manage_keyword_map", error);
         }
-        return { content: [{ type: "text", text: "Invalid action" }] };
     });
     server.tool("get_bird_config", "View BIRD SQL configuration and status.", {}, { readOnlyHint: true }, async () => {
-        const config = await loadConfig();
-        const configDir = getConfigDir();
-        const lines = [
-            "## BIRD SQL Configuration\n",
-            `Config directory: \`${configDir}\`\n`,
-            "### Settings:",
-            `- Schema Pruning: ${config.bird.schemaPruning.enabled ? "ON" : "OFF"} (Top-K: ${config.bird.schemaPruning.topK})`,
-            `- Few-shot Examples: ${config.bird.fewShot.enabled ? "ON" : "OFF"} (Max per query: ${config.bird.fewShot.maxExamplesPerQuery})`,
-            `- Feedback Loop: ${config.bird.feedback.enabled ? "ON" : "OFF"} (Auto-promote threshold: ${config.bird.feedback.autoPromoteThreshold})`,
-            `- Complexity Assessment: ${config.bird.complexity.enabled ? "ON" : "OFF"}`,
-            "",
-            `Edit \`${configDir}/config.json\` to customize settings.`,
-        ];
-        return { content: [{ type: "text", text: lines.join("\n") }] };
+        try {
+            const config = await loadConfig();
+            const configDir = getConfigDir();
+            const lines = [
+                "## BIRD SQL Configuration\n",
+                `Config directory: \`${configDir}\`\n`,
+                "### Settings:",
+                `- Schema Pruning: ${config.bird.schemaPruning.enabled ? "ON" : "OFF"} (Top-K: ${config.bird.schemaPruning.topK})`,
+                `- Few-shot Examples: ${config.bird.fewShot.enabled ? "ON" : "OFF"} (Max per query: ${config.bird.fewShot.maxExamplesPerQuery})`,
+                `- Feedback Loop: ${config.bird.feedback.enabled ? "ON" : "OFF"} (Auto-promote threshold: ${config.bird.feedback.autoPromoteThreshold})`,
+                `- Complexity Assessment: ${config.bird.complexity.enabled ? "ON" : "OFF"}`,
+                "",
+                `Edit \`${configDir}/config.json\` to customize settings.`,
+            ];
+            return { content: [{ type: "text", text: lines.join("\n") }] };
+        }
+        catch (error) {
+            return handleToolError("get_bird_config", error);
+        }
     });
 }