@confluentinc/mcp-confluent 1.2.2 → 1.4.0

package/dist/confluent/tools/handlers/flink/catalog/catalog-resolver.js

@@ -1,26 +1,32 @@
 import { executeFlinkSql } from "../../../../../confluent/tools/handlers/flink/flink-sql-helper.js";
-import env from "../../../../../env.js";
 /**
  * Resolves the Flink catalog name from various inputs.
  *
  * In Confluent Cloud Flink, the catalog name is always the environment ID (env-xxxxx).
- * This function handles cases where a friendly name or invalid value is provided,
- * falling back to the environment ID from config.
+ * Pass the already-resolved `environment_id` (from `resolveOrgAndEnvIds`) as
+ * `fallbackEnvId` so that an explicit `environmentId` tool arg takes precedence
+ * over the connection config value.
  *
  * Resolution order:
  * 1. If catalogName is provided and looks like an env ID (starts with "env-"), use it
- * 2. Otherwise, use FLINK_ENV_ID from environment
+ * 2. If fallbackEnvId looks like an env ID (starts with "env-"), use it
+ * 3. Otherwise return undefined — callers should surface a configuration/argument error
+ *
+ * Both inputs are validated against the "env-" prefix so a non-env-* environmentId arg
+ * (e.g. a friendly name) does not silently produce an invalid catalog name.
  *
  * @param catalogName - Optional catalog name from user/LLM input
+ * @param fallbackEnvId - Already-resolved environment ID to use when catalogName is absent/invalid
  * @returns The resolved catalog name (environment ID), or undefined if not resolvable
  */
-export function resolveCatalogName(catalogName) {
-    // If provided value looks like an environment ID, use it
+export function resolveCatalogName(catalogName, fallbackEnvId) {
     if (catalogName && catalogName.startsWith("env-")) {
         return catalogName;
     }
-    // Fall back to FLINK_ENV_ID (the actual environment ID)
-    return env.FLINK_ENV_ID;
+    if (fallbackEnvId?.startsWith("env-")) {
+        return fallbackEnvId;
+    }
+    return undefined;
 }
 /**
  * Resolves the Flink database name from various inputs.
@@ -33,18 +39,18 @@ export function resolveCatalogName(catalogName) {
  *
  * Resolution order:
  * 1. If databaseName is provided and non-empty, use it (could be cluster ID or friendly name)
- * 2. Otherwise, use KAFKA_CLUSTER_ID from environment
+ * 2. Otherwise, use kafka.cluster_id from connection config
  *
  * @param databaseName - Optional database name from user/LLM input
  * @returns The resolved database name, or undefined if not resolvable
  */
-export function resolveDatabaseName(databaseName) {
+export function resolveDatabaseName(databaseName, conn) {
     // If any non-empty value is provided, use it (could be lkc-* or friendly name)
     if (databaseName && databaseName.trim()) {
         return databaseName.trim();
     }
-    // Fall back to KAFKA_CLUSTER_ID
-    return env.KAFKA_CLUSTER_ID;
+    // Fall back to conn.kafka.cluster_id
+    return conn?.kafka?.cluster_id?.trim() || undefined;
 }
 /**
  * Looks up catalog mappings from INFORMATION_SCHEMA.CATALOGS.
@@ -58,7 +64,7 @@ export async function getCatalogMapping(clientManager, catalogName, options) {
         computePoolId: options.computePoolId,
     });
     if (!result.success || !result.data) {
-        return [];
+        return { mappings: [], statementName: result.statementName };
     }
     const mappings = [];
     for (const row of result.data) {
@@ -69,7 +75,7 @@ export async function getCatalogMapping(clientManager, catalogName, options) {
             mappings.push({ catalogId, catalogName: catalogNameValue });
         }
     }
-    return mappings;
+    return { mappings, statementName: result.statementName };
 }
 /**
  * Resolves a catalog identifier (could be env ID or friendly name) to the friendly CATALOG_NAME.
@@ -101,7 +107,7 @@ export async function getSchemaMapping(clientManager, catalogName, options) {
         computePoolId: options.computePoolId,
     });
     if (!result.success || !result.data) {
-        return [];
+        return { mappings: [], statementName: result.statementName };
     }
     const mappings = [];
     for (const row of result.data) {
@@ -112,7 +118,7 @@ export async function getSchemaMapping(clientManager, catalogName, options) {
             mappings.push({ schemaId, schemaName });
         }
     }
-    return mappings;
+    return { mappings, statementName: result.statementName };
 }
 /**
  * Resolves a database identifier (could be cluster ID or friendly name) to the friendly SCHEMA_NAME.

package/dist/confluent/tools/handlers/flink/catalog/catalog-resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"catalog-resolver.js","sourceRoot":"","sources":["../../../../../../src/confluent/tools/handlers/flink/catalog/catalog-resolver.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,yDAAyD,CAAC;AAC1F,OAAO,GAAG,MAAM,aAAa,CAAC;AAE9B;;;;;;;;;;;;;GAaG;AACH,MAAM,UAAU,kBAAkB,CAAC,WAAoB;IACrD,yDAAyD;IACzD,IAAI,WAAW,IAAI,WAAW,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;QAClD,OAAO,WAAW,CAAC;IACrB,CAAC;IAED,wDAAwD;IACxD,OAAO,GAAG,CAAC,YAAY,CAAC;AAC1B,CAAC;AAED;;;;;;;;;;;;;;;GAeG;AACH,MAAM,UAAU,mBAAmB,CAAC,YAAqB;IACvD,+EAA+E;IAC/E,IAAI,YAAY,IAAI,YAAY,CAAC,IAAI,EAAE,EAAE,CAAC;QACxC,OAAO,YAAY,CAAC,IAAI,EAAE,CAAC;IAC7B,CAAC;IAED,gCAAgC;IAChC,OAAO,GAAG,CAAC,gBAAgB,CAAC;AAC9B,CAAC;AAYD;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,aAA4B,EAC5B,WAAmB,EACnB,OAIC;IAED,MAAM,GAAG,GAAG,kDAAkD,WAAW,wCAAwC,CAAC;IAElH,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC,aAAa,EAAE,GAAG,EAAE;QACvD,cAAc,EAAE,OAAO,CAAC,cAAc;QACtC,aAAa,EAAE,OAAO,CAAC,aAAa;QACpC,aAAa,EAAE,OAAO,CAAC,aAAa;KACrC,CAAC,CAAC;IAEH,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QACpC,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,MAAM,QAAQ,GAAqB,EAAE,CAAC;IACtC,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC;QAC9B,MAAM,CAAC,GAAG,GAA8B,CAAC;QACzC,MAAM,SAAS,GAAG,CAAC,EAAE,UAAU,CAAC;QAChC,MAAM,gBAAgB,GAAG,CAAC,EAAE,YAAY,CAAC;QACzC,IAAI,OAAO,SAAS,KAAK,QAAQ,IAAI,OAAO,gBAAgB,KAAK,QAAQ,EAAE,CAAC;YAC1E,QAAQ,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,WAAW,EAAE,gBAAgB,EAAE,CAAC,CAAC;QAC9D,CAAC;IACH,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,oBAAoB,CAClC,YAAoB,EACpB,QAA0B;IAE1B,gEAAgE;IAChE,IAAI,YAAY,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;QACpC,MAAM,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,KAAK,YAAY,CAAC,CAAC;QACnE,IAAI,OAAO,EAAE,CAAC;YACZ,OAAO,OAAO,CAAC,WAAW,CAAC;QAC7B,CAAC;IACH,CAAC;IAED,iEAAiE;IACjE,OAAO,YAAY,CAAC;AACtB,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,aAA4B,EAC5B,WAAmB,EACnB,OAIC;IAED,MAAM,GAAG,GAAG,gDAAgD,WAAW,sFAAsF,CAAC;IAE9J,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC,aAAa,EAAE,GAAG,EAAE;QACvD,cAAc,EAAE,OAAO,CAAC,cAAc;QACtC,aAAa,EAAE,OAAO,CAAC,aAAa;QACpC,aAAa,EAAE,OAAO,CAAC,aAAa;KACrC,CAAC,CAAC;IAEH,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QACpC,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,MAAM,QAAQ,GAAoB,EAAE,CAAC;IACrC,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC;QAC9B,MAAM,CAAC,GAAG,GAA8B,CAAC;QACzC,MAAM,QAAQ,GAAG,CAAC,EAAE,SAAS,CAAC;QAC9B,MAAM,UAAU,GAAG,CAAC,EAAE,WAAW,CAAC;QAClC,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE,CAAC;YACnE,QAAQ,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC,CAAC;QAC1C,CAAC;IACH,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,mBAAmB,CACjC,aAAqB,EACrB,QAAyB;IAEzB,2DAA2D;IAC3D,IAAI,aAAa,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;QACrC,MAAM,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,aAAa,CAAC,CAAC;QACnE,IAAI,OAAO,EAAE,CAAC;YACZ,OAAO,OAAO,CAAC,UAAU,CAAC;QAC5B,CAAC;IACH,CAAC;IAED,iEAAiE;IACjE,OAAO,aAAa,CAAC;AACvB,CAAC"}
+{"version":3,"file":"catalog-resolver.js","sourceRoot":"","sources":["../../../../../../src/confluent/tools/handlers/flink/catalog/catalog-resolver.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,yDAAyD,CAAC;AAE1F;;;;;;;;;;;;;;;;;;;GAmBG;AACH,MAAM,UAAU,kBAAkB,CAChC,WAAoB,EACpB,aAAsB;IAEtB,IAAI,WAAW,IAAI,WAAW,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;QAClD,OAAO,WAAW,CAAC;IACrB,CAAC;IACD,IAAI,aAAa,EAAE,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;QACtC,OAAO,aAAa,CAAC;IACvB,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED;;;;;;;;;;;;;;;GAeG;AACH,MAAM,UAAU,mBAAmB,CACjC,YAAqB,EACrB,IAA6B;IAE7B,+EAA+E;IAC/E,IAAI,YAAY,IAAI,YAAY,CAAC,IAAI,EAAE,EAAE,CAAC;QACxC,OAAO,YAAY,CAAC,IAAI,EAAE,CAAC;IAC7B,CAAC;IAED,qCAAqC;IACrC,OAAO,IAAI,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,IAAI,SAAS,CAAC;AACtD,CAAC;AA4BD;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,aAAgC,EAChC,WAAmB,EACnB,OAIC;IAED,MAAM,GAAG,GAAG,kDAAkD,WAAW,wCAAwC,CAAC;IAElH,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC,aAAa,EAAE,GAAG,EAAE;QACvD,cAAc,EAAE,OAAO,CAAC,cAAc;QACtC,aAAa,EAAE,OAAO,CAAC,aAAa;QACpC,aAAa,EAAE,OAAO,CAAC,aAAa;KACrC,CAAC,CAAC;IAEH,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QACpC,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,aAAa,EAAE,MAAM,CAAC,aAAa,EAAE,CAAC;IAC/D,CAAC;IAED,MAAM,QAAQ,GAAqB,EAAE,CAAC;IACtC,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC;QAC9B,MAAM,CAAC,GAAG,GAA8B,CAAC;QACzC,MAAM,SAAS,GAAG,CAAC,EAAE,UAAU,CAAC;QAChC,MAAM,gBAAgB,GAAG,CAAC,EAAE,YAAY,CAAC;QACzC,IAAI,OAAO,SAAS,KAAK,QAAQ,IAAI,OAAO,gBAAgB,KAAK,QAAQ,EAAE,CAAC;YAC1E,QAAQ,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,WAAW,EAAE,gBAAgB,EAAE,CAAC,CAAC;QAC9D,CAAC;IACH,CAAC;IACD,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,CAAC,aAAa,EAAE,CAAC;AAC3D,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,oBAAoB,CAClC,YAAoB,EACpB,QAA0B;IAE1B,gEAAgE;IAChE,IAAI,YAAY,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;QACpC,MAAM,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,KAAK,YAAY,CAAC,CAAC;QACnE,IAAI,OAAO,EAAE,CAAC;YACZ,OAAO,OAAO,CAAC,WAAW,CAAC;QAC7B,CAAC;IACH,CAAC;IAED,iEAAiE;IACjE,OAAO,YAAY,CAAC;AACtB,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,aAAgC,EAChC,WAAmB,EACnB,OAIC;IAED,MAAM,GAAG,GAAG,gDAAgD,WAAW,sFAAsF,CAAC;IAE9J,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC,aAAa,EAAE,GAAG,EAAE;QACvD,cAAc,EAAE,OAAO,CAAC,cAAc;QACtC,aAAa,EAAE,OAAO,CAAC,aAAa;QACpC,aAAa,EAAE,OAAO,CAAC,aAAa;KACrC,CAAC,CAAC;IAEH,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QACpC,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,aAAa,EAAE,MAAM,CAAC,aAAa,EAAE,CAAC;IAC/D,CAAC;IAED,MAAM,QAAQ,GAAoB,EAAE,CAAC;IACrC,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC;QAC9B,MAAM,CAAC,GAAG,GAA8B,CAAC;QACzC,MAAM,QAAQ,GAAG,CAAC,EAAE,SAAS,CAAC;QAC9B,MAAM,UAAU,GAAG,CAAC,EAAE,WAAW,CAAC;QAClC,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE,CAAC;YACnE,QAAQ,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC,CAAC;QAC1C,CAAC;IACH,CAAC;IACD,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,CAAC,aAAa,EAAE,CAAC;AAC3D,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,mBAAmB,CACjC,aAAqB,EACrB,QAAyB;IAEzB,2DAA2D;IAC3D,IAAI,aAAa,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;QACrC,MAAM,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,aAAa,CAAC,CAAC;QACnE,IAAI,OAAO,EAAE,CAAC;YACZ,OAAO,OAAO,CAAC,UAAU,CAAC;QAC5B,CAAC;IACH,CAAC;IAED,iEAAiE;IACjE,OAAO,aAAa,CAAC;AACvB,CAAC"}

package/dist/confluent/tools/handlers/flink/catalog/describe-table-handler.d.ts

@@ -1,11 +1,9 @@
-import { ClientManager } from "../../../../../confluent/client-manager.js";
 import { CallToolResult } from "../../../../../confluent/schema.js";
-import { BaseToolHandler, ToolConfig } from "../../../../../confluent/tools/base-tools.js";
-import { EnvVar } from "../../../../../env-schema.js";
-export declare class DescribeTableHandler extends BaseToolHandler {
-    handle(clientManager: ClientManager, toolArguments: Record<string, unknown> | undefined): Promise<CallToolResult>;
+import { ToolConfig } from "../../../../../confluent/tools/base-tools.js";
+import { FlinkCatalogToolHandler } from "../../../../../confluent/tools/handlers/flink/catalog/flink-catalog-tool-handler.js";
+import { ServerRuntime } from "../../../../../server-runtime.js";
+export declare class DescribeTableHandler extends FlinkCatalogToolHandler {
+    handle(runtime: ServerRuntime, toolArguments: Record<string, unknown> | undefined): Promise<CallToolResult>;
     getToolConfig(): ToolConfig;
-    getRequiredEnvVars(): readonly EnvVar[];
-    isConfluentCloudOnly(): boolean;
 }
 //# sourceMappingURL=describe-table-handler.d.ts.map

package/dist/confluent/tools/handlers/flink/catalog/describe-table-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"describe-table-handler.d.ts","sourceRoot":"","sources":["../../../../../../src/confluent/tools/handlers/flink/catalog/describe-table-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AAEjE,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EACL,eAAe,EAEf,UAAU,EACX,MAAM,oCAAoC,CAAC;AAS5C,OAAO,EAAE,MAAM,EAA2B,MAAM,oBAAoB,CAAC;AAwCrE,qBAAa,oBAAqB,SAAQ,eAAe;IACjD,MAAM,CACV,aAAa,EAAE,aAAa,EAC5B,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,GACjD,OAAO,CAAC,cAAc,CAAC;IAqF1B,aAAa,IAAI,UAAU;IAU3B,kBAAkB,IAAI,SAAS,MAAM,EAAE;IAIvC,oBAAoB,IAAI,OAAO;CAGhC"}
+{"version":3,"file":"describe-table-handler.d.ts","sourceRoot":"","sources":["../../../../../../src/confluent/tools/handlers/flink/catalog/describe-table-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAa,UAAU,EAAE,MAAM,oCAAoC,CAAC;AAM3E,OAAO,EAAE,uBAAuB,EAAE,MAAM,2EAA2E,CAAC;AAMpH,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAwCvD,qBAAa,oBAAqB,SAAQ,uBAAuB;IACzD,MAAM,CACV,OAAO,EAAE,aAAa,EACtB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,GACjD,OAAO,CAAC,cAAc,CAAC;IAuF1B,aAAa,IAAI,UAAU;CAS5B"}

package/dist/confluent/tools/handlers/flink/catalog/describe-table-handler.js

@@ -1,9 +1,8 @@
-import { getEnsuredParam } from "../../../../../confluent/helpers.js";
-import { BaseToolHandler, READ_ONLY, } from "../../../../../confluent/tools/base-tools.js";
-import { getSchemaMapping, resolveCatalogName, resolveDatabaseName, resolveToSchemaName, } from "../../../../../confluent/tools/handlers/flink/catalog/catalog-resolver.js";
-import { executeFlinkSql } from "../../../../../confluent/tools/handlers/flink/flink-sql-helper.js";
+import { READ_ONLY } from "../../../../../confluent/tools/base-tools.js";
+import { getSchemaMapping, resolveDatabaseName, resolveToSchemaName, } from "../../../../../confluent/tools/handlers/flink/catalog/catalog-resolver.js";
+import { FlinkCatalogToolHandler } from "../../../../../confluent/tools/handlers/flink/catalog/flink-catalog-tool-handler.js";
+import { executeFlinkSql, } from "../../../../../confluent/tools/handlers/flink/flink-sql-helper.js";
 import { ToolName } from "../../../../../confluent/tools/tool-name.js";
-import { FLINK_REQUIRED_ENV_VARS } from "../../../../../env-schema.js";
 import { z } from "zod";
 const describeTableArguments = z.object({
     organizationId: z
@@ -37,28 +36,34 @@ const describeTableArguments = z.object({
         .nonempty()
         .describe("The name of the table to describe."),
 });
-export class DescribeTableHandler extends BaseToolHandler {
-    async handle(clientManager, toolArguments) {
+export class DescribeTableHandler extends FlinkCatalogToolHandler {
+    async handle(runtime, toolArguments) {
+        const clientManager = runtime.clientManager;
         const { organizationId, environmentId, computePoolId, catalogName, databaseName, tableName, } = describeTableArguments.parse(toolArguments);
-        const organization_id = getEnsuredParam("FLINK_ORG_ID", "Organization ID is required", organizationId);
-        const environment_id = getEnsuredParam("FLINK_ENV_ID", "Environment ID is required", environmentId);
-        const compute_pool_id = getEnsuredParam("FLINK_COMPUTE_POOL_ID", "Compute Pool ID is required", computePoolId);
-        // Smart resolution: only accept env-* format, otherwise fall back to FLINK_ENV_ID
-        const catalog_name = resolveCatalogName(catalogName);
-        if (!catalog_name) {
-            return this.createResponse("Catalog name could not be resolved. Set FLINK_ENV_ID or provide a valid environment ID (env-xxxxx).", true);
-        }
+        const flink = this.getFlinkDirectConfig(runtime.config);
+        const conn = runtime.config.getSoleDirectConnection(); // needed for kafka.cluster_id in resolveDatabaseName
+        const { organization_id, environment_id } = this.resolveOrgAndEnvIds(flink, organizationId, environmentId);
+        const compute_pool_id = this.resolveComputePoolId(flink, computePoolId);
+        const catalog = this.resolveCatalogNameOrError(catalogName, environment_id);
+        if (!catalog.ok)
+            return catalog.error;
+        const catalog_name = catalog.name;
         // Database name is optional - if provided, resolve it to friendly SCHEMA_NAME
-        const database_input = resolveDatabaseName(databaseName);
-        // If a database was specified, resolve cluster ID to friendly name
-        let schema_name;
-        if (database_input) {
-            const mappings = await getSchemaMapping(clientManager, catalog_name, {
+        const database_input = resolveDatabaseName(databaseName, conn);
+        const statementsCreated = [];
+        // Only run getSchemaMapping for lkc-* inputs; resolveToSchemaName
+        // passes friendly names through, so the roundtrip would just leak a
+        // statement.
+        let schema_name = database_input;
+        if (database_input?.startsWith("lkc-")) {
+            const lookup = await getSchemaMapping(clientManager, catalog_name, {
                 organizationId: organization_id,
                 environmentId: environment_id,
                 computePoolId: compute_pool_id,
             });
-            schema_name = resolveToSchemaName(database_input, mappings);
+            if (lookup.statementName)
+                statementsCreated.push(lookup.statementName);
+            schema_name = resolveToSchemaName(database_input, lookup.mappings);
         }
         // Query INFORMATION_SCHEMA.COLUMNS for full schema details
         // Must fully qualify with catalog and use backticks per Confluent Cloud requirements
@@ -72,18 +77,23 @@ export class DescribeTableHandler extends BaseToolHandler {
             environmentId: environment_id,
             computePoolId: compute_pool_id,
         });
+        if (result.statementName)
+            statementsCreated.push(result.statementName);
+        const meta = {
+            flinkStatementsCreated: statementsCreated,
+        };
         if (!result.success) {
-            return this.createResponse(`Failed to describe table: ${result.error}`, true);
+            return this.createResponse(`Failed to describe table: ${result.error}`, true, meta);
         }
         const columns = result.data ?? [];
         if (columns.length === 0) {
             const scope = schema_name
                 ? `'${catalog_name}.${schema_name}.${tableName}'`
                 : `'${tableName}' in catalog '${catalog_name}'`;
-            return this.createResponse(`Table ${scope} not found or has no columns.`, true);
+            return this.createResponse(`Table ${scope} not found or has no columns.`, true, meta);
         }
         // Include TABLE_SCHEMA in response so user knows which database the table is in
-        return this.createResponse(`Table '${tableName}' schema:\n${JSON.stringify(columns, null, 2)}`);
+        return this.createResponse(`Table '${tableName}' schema:\n${JSON.stringify(columns, null, 2)}`, false, meta);
     }
     getToolConfig() {
         return {
@@ -93,11 +103,5 @@ export class DescribeTableHandler extends BaseToolHandler {
             annotations: READ_ONLY,
         };
     }
-    getRequiredEnvVars() {
-        return FLINK_REQUIRED_ENV_VARS;
-    }
-    isConfluentCloudOnly() {
-        return true;
-    }
 }
 //# sourceMappingURL=describe-table-handler.js.map

package/dist/confluent/tools/handlers/flink/catalog/describe-table-handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"describe-table-handler.js","sourceRoot":"","sources":["../../../../../../src/confluent/tools/handlers/flink/catalog/describe-table-handler.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"describe-table-handler.js","sourceRoot":"","sources":["../../../../../../src/confluent/tools/handlers/flink/catalog/describe-table-handler.ts"],"names":[],"mappings":"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"}

package/dist/confluent/tools/handlers/flink/catalog/flink-catalog-tool-handler.d.ts

@@ -0,0 +1,14 @@
+import { CallToolResult } from "../../../../../confluent/schema.js";
+import { FlinkToolHandler } from "../../../../../confluent/tools/handlers/flink/flink-tool-handler.js";
+export type CatalogResolution = {
+    ok: true;
+    name: string;
+} | {
+    ok: false;
+    error: CallToolResult;
+};
+/** Intermediate base class for Flink catalog tool handlers */
+export declare abstract class FlinkCatalogToolHandler extends FlinkToolHandler {
+    protected resolveCatalogNameOrError(catalogName: string | undefined, environmentId: string): CatalogResolution;
+}
+//# sourceMappingURL=flink-catalog-tool-handler.d.ts.map

package/dist/confluent/tools/handlers/flink/catalog/flink-catalog-tool-handler.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"flink-catalog-tool-handler.d.ts","sourceRoot":"","sources":["../../../../../../src/confluent/tools/handlers/flink/catalog/flink-catalog-tool-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAE1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,2DAA2D,CAAC;AAE7F,MAAM,MAAM,iBAAiB,GACzB;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAC1B;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,cAAc,CAAA;CAAE,CAAC;AAEzC,8DAA8D;AAC9D,8BAAsB,uBAAwB,SAAQ,gBAAgB;IACpE,SAAS,CAAC,yBAAyB,CACjC,WAAW,EAAE,MAAM,GAAG,SAAS,EAC/B,aAAa,EAAE,MAAM,GACpB,iBAAiB;CAYrB"}

package/dist/confluent/tools/handlers/flink/catalog/flink-catalog-tool-handler.js

@@ -0,0 +1,15 @@
+import { resolveCatalogName } from "../../../../../confluent/tools/handlers/flink/catalog/catalog-resolver.js";
+import { FlinkToolHandler } from "../../../../../confluent/tools/handlers/flink/flink-tool-handler.js";
+/** Intermediate base class for Flink catalog tool handlers */
+export class FlinkCatalogToolHandler extends FlinkToolHandler {
+    resolveCatalogNameOrError(catalogName, environmentId) {
+        const name = resolveCatalogName(catalogName, environmentId);
+        if (!name)
+            return {
+                ok: false,
+                error: this.createResponse("Catalog name could not be resolved. Pass catalogName or environmentId as env-xxxxx, or set flink.environment_id in config.", true),
+            };
+        return { ok: true, name };
+    }
+}
+//# sourceMappingURL=flink-catalog-tool-handler.js.map

package/dist/confluent/tools/handlers/flink/catalog/flink-catalog-tool-handler.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"flink-catalog-tool-handler.js","sourceRoot":"","sources":["../../../../../../src/confluent/tools/handlers/flink/catalog/flink-catalog-tool-handler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,iEAAiE,CAAC;AACrG,OAAO,EAAE,gBAAgB,EAAE,MAAM,2DAA2D,CAAC;AAM7F,8DAA8D;AAC9D,MAAM,OAAgB,uBAAwB,SAAQ,gBAAgB;IAC1D,yBAAyB,CACjC,WAA+B,EAC/B,aAAqB;QAErB,MAAM,IAAI,GAAG,kBAAkB,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC;QAC5D,IAAI,CAAC,IAAI;YACP,OAAO;gBACL,EAAE,EAAE,KAAK;gBACT,KAAK,EAAE,IAAI,CAAC,cAAc,CACxB,4HAA4H,EAC5H,IAAI,CACL;aACF,CAAC;QACJ,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IAC5B,CAAC;CACF"}

package/dist/confluent/tools/handlers/flink/catalog/get-table-info-handler.d.ts

@@ -1,11 +1,9 @@
-import { ClientManager } from "../../../../../confluent/client-manager.js";
 import { CallToolResult } from "../../../../../confluent/schema.js";
-import { BaseToolHandler, ToolConfig } from "../../../../../confluent/tools/base-tools.js";
-import { EnvVar } from "../../../../../env-schema.js";
-export declare class GetTableInfoHandler extends BaseToolHandler {
-    handle(clientManager: ClientManager, toolArguments: Record<string, unknown> | undefined): Promise<CallToolResult>;
+import { ToolConfig } from "../../../../../confluent/tools/base-tools.js";
+import { FlinkCatalogToolHandler } from "../../../../../confluent/tools/handlers/flink/catalog/flink-catalog-tool-handler.js";
+import { ServerRuntime } from "../../../../../server-runtime.js";
+export declare class GetTableInfoHandler extends FlinkCatalogToolHandler {
+    handle(runtime: ServerRuntime, toolArguments: Record<string, unknown> | undefined): Promise<CallToolResult>;
     getToolConfig(): ToolConfig;
-    getRequiredEnvVars(): readonly EnvVar[];
-    isConfluentCloudOnly(): boolean;
 }
 //# sourceMappingURL=get-table-info-handler.d.ts.map

package/dist/confluent/tools/handlers/flink/catalog/get-table-info-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-table-info-handler.d.ts","sourceRoot":"","sources":["../../../../../../src/confluent/tools/handlers/flink/catalog/get-table-info-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AAEjE,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EACL,eAAe,EAEf,UAAU,EACX,MAAM,oCAAoC,CAAC;AAS5C,OAAO,EAAE,MAAM,EAA2B,MAAM,oBAAoB,CAAC;AAwCrE,qBAAa,mBAAoB,SAAQ,eAAe;IAChD,MAAM,CACV,aAAa,EAAE,aAAa,EAC5B,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,GACjD,OAAO,CAAC,cAAc,CAAC;IAiF1B,aAAa,IAAI,UAAU;IAU3B,kBAAkB,IAAI,SAAS,MAAM,EAAE;IAIvC,oBAAoB,IAAI,OAAO;CAGhC"}
+{"version":3,"file":"get-table-info-handler.d.ts","sourceRoot":"","sources":["../../../../../../src/confluent/tools/handlers/flink/catalog/get-table-info-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAa,UAAU,EAAE,MAAM,oCAAoC,CAAC;AAM3E,OAAO,EAAE,uBAAuB,EAAE,MAAM,2EAA2E,CAAC;AAMpH,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAwCvD,qBAAa,mBAAoB,SAAQ,uBAAuB;IACxD,MAAM,CACV,OAAO,EAAE,aAAa,EACtB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,GACjD,OAAO,CAAC,cAAc,CAAC;IAkF1B,aAAa,IAAI,UAAU;CAS5B"}

package/dist/confluent/tools/handlers/flink/catalog/get-table-info-handler.js

@@ -1,9 +1,8 @@
-import { getEnsuredParam } from "../../../../../confluent/helpers.js";
-import { BaseToolHandler, READ_ONLY, } from "../../../../../confluent/tools/base-tools.js";
-import { getSchemaMapping, resolveCatalogName, resolveDatabaseName, resolveToSchemaName, } from "../../../../../confluent/tools/handlers/flink/catalog/catalog-resolver.js";
-import { executeFlinkSql } from "../../../../../confluent/tools/handlers/flink/flink-sql-helper.js";
+import { READ_ONLY } from "../../../../../confluent/tools/base-tools.js";
+import { getSchemaMapping, resolveDatabaseName, resolveToSchemaName, } from "../../../../../confluent/tools/handlers/flink/catalog/catalog-resolver.js";
+import { FlinkCatalogToolHandler } from "../../../../../confluent/tools/handlers/flink/catalog/flink-catalog-tool-handler.js";
+import { executeFlinkSql, } from "../../../../../confluent/tools/handlers/flink/flink-sql-helper.js";
 import { ToolName } from "../../../../../confluent/tools/tool-name.js";
-import { FLINK_REQUIRED_ENV_VARS } from "../../../../../env-schema.js";
 import { z } from "zod";
 const getTableInfoArguments = z.object({
     organizationId: z
@@ -37,28 +36,34 @@ const getTableInfoArguments = z.object({
         .nonempty()
         .describe("The name of the table to get info for."),
 });
-export class GetTableInfoHandler extends BaseToolHandler {
-    async handle(clientManager, toolArguments) {
+export class GetTableInfoHandler extends FlinkCatalogToolHandler {
+    async handle(runtime, toolArguments) {
+        const clientManager = runtime.clientManager;
         const { organizationId, environmentId, computePoolId, catalogName, databaseName, tableName, } = getTableInfoArguments.parse(toolArguments);
-        const organization_id = getEnsuredParam("FLINK_ORG_ID", "Organization ID is required", organizationId);
-        const environment_id = getEnsuredParam("FLINK_ENV_ID", "Environment ID is required", environmentId);
-        const compute_pool_id = getEnsuredParam("FLINK_COMPUTE_POOL_ID", "Compute Pool ID is required", computePoolId);
-        // Smart resolution: only accept env-* format, otherwise fall back to FLINK_ENV_ID
-        const catalog_name = resolveCatalogName(catalogName);
-        if (!catalog_name) {
-            return this.createResponse("Catalog name could not be resolved. Set FLINK_ENV_ID or provide a valid environment ID (env-xxxxx).", true);
-        }
+        const flink = this.getFlinkDirectConfig(runtime.config);
+        const conn = runtime.config.getSoleDirectConnection(); // needed for kafka.cluster_id in resolveDatabaseName
+        const { organization_id, environment_id } = this.resolveOrgAndEnvIds(flink, organizationId, environmentId);
+        const compute_pool_id = this.resolveComputePoolId(flink, computePoolId);
+        const catalog = this.resolveCatalogNameOrError(catalogName, environment_id);
+        if (!catalog.ok)
+            return catalog.error;
+        const catalog_name = catalog.name;
         // Database name is optional - if provided, resolve it to friendly SCHEMA_NAME
-        const database_input = resolveDatabaseName(databaseName);
-        // If a database was specified, resolve cluster ID to friendly name
-        let schema_name;
-        if (database_input) {
-            const mappings = await getSchemaMapping(clientManager, catalog_name, {
+        const database_input = resolveDatabaseName(databaseName, conn);
+        const statementsCreated = [];
+        // Only run getSchemaMapping for lkc-* inputs; resolveToSchemaName
+        // passes friendly names through, so the roundtrip would just leak a
+        // statement.
+        let schema_name = database_input;
+        if (database_input?.startsWith("lkc-")) {
+            const lookup = await getSchemaMapping(clientManager, catalog_name, {
                 organizationId: organization_id,
                 environmentId: environment_id,
                 computePoolId: compute_pool_id,
             });
-            schema_name = resolveToSchemaName(database_input, mappings);
+            if (lookup.statementName)
+                statementsCreated.push(lookup.statementName);
+            schema_name = resolveToSchemaName(database_input, lookup.mappings);
         }
         // Query INFORMATION_SCHEMA.TABLES for table metadata including watermarks
         // Must fully qualify with catalog and use backticks per Confluent Cloud requirements
@@ -72,17 +77,22 @@ export class GetTableInfoHandler extends BaseToolHandler {
             environmentId: environment_id,
             computePoolId: compute_pool_id,
         });
+        if (result.statementName)
+            statementsCreated.push(result.statementName);
+        const meta = {
+            flinkStatementsCreated: statementsCreated,
+        };
         if (!result.success) {
-            return this.createResponse(`Failed to get table info: ${result.error}`, true);
+            return this.createResponse(`Failed to get table info: ${result.error}`, true, meta);
         }
         const tables = result.data ?? [];
         if (tables.length === 0) {
             const scope = schema_name
                 ? `'${catalog_name}.${schema_name}.${tableName}'`
                 : `'${tableName}' in catalog '${catalog_name}'`;
-            return this.createResponse(`Table ${scope} not found.`, true);
+            return this.createResponse(`Table ${scope} not found.`, true, meta);
         }
-        return this.createResponse(`Table info for '${tableName}':\n${JSON.stringify(tables[0], null, 2)}`);
+        return this.createResponse(`Table info for '${tableName}':\n${JSON.stringify(tables[0], null, 2)}`, false, meta);
     }
     getToolConfig() {
         return {
@@ -92,11 +102,5 @@ export class GetTableInfoHandler extends BaseToolHandler {
             annotations: READ_ONLY,
         };
     }
-    getRequiredEnvVars() {
-        return FLINK_REQUIRED_ENV_VARS;
-    }
-    isConfluentCloudOnly() {
-        return true;
-    }
 }
 //# sourceMappingURL=get-table-info-handler.js.map

package/dist/confluent/tools/handlers/flink/catalog/get-table-info-handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-table-info-handler.js","sourceRoot":"","sources":["../../../../../../src/confluent/tools/handlers/flink/catalog/get-table-info-handler.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"get-table-info-handler.js","sourceRoot":"","sources":["../../../../../../src/confluent/tools/handlers/flink/catalog/get-table-info-handler.ts"],"names":[],"mappings":"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"}

package/dist/confluent/tools/handlers/flink/catalog/list-catalogs-handler.d.ts

@@ -1,11 +1,9 @@
-import { ClientManager } from "../../../../../confluent/client-manager.js";
 import { CallToolResult } from "../../../../../confluent/schema.js";
-import { BaseToolHandler, ToolConfig } from "../../../../../confluent/tools/base-tools.js";
-import { EnvVar } from "../../../../../env-schema.js";
-export declare class ListCatalogsHandler extends BaseToolHandler {
-    handle(clientManager: ClientManager, toolArguments: Record<string, unknown> | undefined): Promise<CallToolResult>;
+import { ToolConfig } from "../../../../../confluent/tools/base-tools.js";
+import { FlinkCatalogToolHandler } from "../../../../../confluent/tools/handlers/flink/catalog/flink-catalog-tool-handler.js";
+import { ServerRuntime } from "../../../../../server-runtime.js";
+export declare class ListCatalogsHandler extends FlinkCatalogToolHandler {
+    handle(runtime: ServerRuntime, toolArguments: Record<string, unknown> | undefined): Promise<CallToolResult>;
     getToolConfig(): ToolConfig;
-    getRequiredEnvVars(): readonly EnvVar[];
-    isConfluentCloudOnly(): boolean;
 }
 //# sourceMappingURL=list-catalogs-handler.d.ts.map

package/dist/confluent/tools/handlers/flink/catalog/list-catalogs-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"list-catalogs-handler.d.ts","sourceRoot":"","sources":["../../../../../../src/confluent/tools/handlers/flink/catalog/list-catalogs-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AAEjE,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EACL,eAAe,EAEf,UAAU,EACX,MAAM,oCAAoC,CAAC;AAI5C,OAAO,EAAE,MAAM,EAA2B,MAAM,oBAAoB,CAAC;AAqBrE,qBAAa,mBAAoB,SAAQ,eAAe;IAChD,MAAM,CACV,aAAa,EAAE,aAAa,EAC5B,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,GACjD,OAAO,CAAC,cAAc,CAAC;IAuD1B,aAAa,IAAI,UAAU;IAU3B,kBAAkB,IAAI,SAAS,MAAM,EAAE;IAIvC,oBAAoB,IAAI,OAAO;CAGhC"}
+{"version":3,"file":"list-catalogs-handler.d.ts","sourceRoot":"","sources":["../../../../../../src/confluent/tools/handlers/flink/catalog/list-catalogs-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAa,UAAU,EAAE,MAAM,oCAAoC,CAAC;AAC3E,OAAO,EAAE,uBAAuB,EAAE,MAAM,2EAA2E,CAAC;AAMpH,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAqBvD,qBAAa,mBAAoB,SAAQ,uBAAuB;IACxD,MAAM,CACV,OAAO,EAAE,aAAa,EACtB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,GACjD,OAAO,CAAC,cAAc,CAAC;IAmD1B,aAAa,IAAI,UAAU;CAS5B"}

package/dist/confluent/tools/handlers/flink/catalog/list-catalogs-handler.js

@@ -1,9 +1,7 @@
-import { getEnsuredParam } from "../../../../../confluent/helpers.js";
-import { BaseToolHandler, READ_ONLY, } from "../../../../../confluent/tools/base-tools.js";
-import { resolveCatalogName } from "../../../../../confluent/tools/handlers/flink/catalog/catalog-resolver.js";
-import { executeFlinkSql } from "../../../../../confluent/tools/handlers/flink/flink-sql-helper.js";
+import { READ_ONLY } from "../../../../../confluent/tools/base-tools.js";
+import { FlinkCatalogToolHandler } from "../../../../../confluent/tools/handlers/flink/catalog/flink-catalog-tool-handler.js";
+import { executeFlinkSql, } from "../../../../../confluent/tools/handlers/flink/flink-sql-helper.js";
 import { ToolName } from "../../../../../confluent/tools/tool-name.js";
-import { FLINK_REQUIRED_ENV_VARS } from "../../../../../env-schema.js";
 import { z } from "zod";
 const listCatalogsArguments = z.object({
     organizationId: z
@@ -22,17 +20,17 @@ const listCatalogsArguments = z.object({
         .optional()
         .describe("The id associated with the compute pool in context."),
 });
-export class ListCatalogsHandler extends BaseToolHandler {
-    async handle(clientManager, toolArguments) {
+export class ListCatalogsHandler extends FlinkCatalogToolHandler {
+    async handle(runtime, toolArguments) {
+        const clientManager = runtime.clientManager;
         const { organizationId, environmentId, computePoolId } = listCatalogsArguments.parse(toolArguments);
-        const organization_id = getEnsuredParam("FLINK_ORG_ID", "Organization ID is required", organizationId);
-        const environment_id = getEnsuredParam("FLINK_ENV_ID", "Environment ID is required", environmentId);
-        const compute_pool_id = getEnsuredParam("FLINK_COMPUTE_POOL_ID", "Compute Pool ID is required", computePoolId);
-        // Smart resolution: use FLINK_ENV_ID as the catalog name
-        const catalog_name = resolveCatalogName();
-        if (!catalog_name) {
-            return this.createResponse("Catalog name could not be resolved. Set FLINK_ENV_ID.", true);
-        }
+        const flink = this.getFlinkDirectConfig(runtime.config);
+        const { organization_id, environment_id } = this.resolveOrgAndEnvIds(flink, organizationId, environmentId);
+        const compute_pool_id = this.resolveComputePoolId(flink, computePoolId);
+        const catalog = this.resolveCatalogNameOrError(undefined, environment_id);
+        if (!catalog.ok)
+            return catalog.error;
+        const catalog_name = catalog.name;
         // Query INFORMATION_SCHEMA.CATALOGS for all available catalogs
         // Must fully qualify with catalog and use backticks per Confluent Cloud requirements
         const sql = `SELECT \`CATALOG_NAME\` FROM \`${catalog_name}\`.\`INFORMATION_SCHEMA\`.\`CATALOGS\``;
@@ -41,14 +39,19 @@ export class ListCatalogsHandler extends BaseToolHandler {
             environmentId: environment_id,
             computePoolId: compute_pool_id,
         });
+        const meta = {
+            flinkStatementsCreated: result.statementName
+                ? [result.statementName]
+                : [],
+        };
         if (!result.success) {
-            return this.createResponse(`Failed to list catalogs: ${result.error}`, true);
+            return this.createResponse(`Failed to list catalogs: ${result.error}`, true, meta);
         }
         const catalogs = result.data ?? [];
         if (catalogs.length === 0) {
-            return this.createResponse("No catalogs found.");
+            return this.createResponse("No catalogs found.", false, meta);
         }
-        return this.createResponse(`Catalogs:\n${JSON.stringify(catalogs, null, 2)}`);
+        return this.createResponse(`Catalogs:\n${JSON.stringify(catalogs, null, 2)}`, false, meta);
     }
     getToolConfig() {
         return {
@@ -58,11 +61,5 @@ export class ListCatalogsHandler extends BaseToolHandler {
             annotations: READ_ONLY,
         };
     }
-    getRequiredEnvVars() {
-        return FLINK_REQUIRED_ENV_VARS;
-    }
-    isConfluentCloudOnly() {
-        return true;
-    }
 }
 //# sourceMappingURL=list-catalogs-handler.js.map

package/dist/confluent/tools/handlers/flink/catalog/list-catalogs-handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"list-catalogs-handler.js","sourceRoot":"","sources":["../../../../../../src/confluent/tools/handlers/flink/catalog/list-catalogs-handler.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"list-catalogs-handler.js","sourceRoot":"","sources":["../../../../../../src/confluent/tools/handlers/flink/catalog/list-catalogs-handler.ts"],"names":[],"mappings":"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"}

package/dist/confluent/tools/handlers/flink/catalog/list-databases-handler.d.ts

@@ -1,11 +1,9 @@
-import { ClientManager } from "../../../../../confluent/client-manager.js";
 import { CallToolResult } from "../../../../../confluent/schema.js";
-import { BaseToolHandler, ToolConfig } from "../../../../../confluent/tools/base-tools.js";
-import { EnvVar } from "../../../../../env-schema.js";
-export declare class ListDatabasesHandler extends BaseToolHandler {
-    handle(clientManager: ClientManager, toolArguments: Record<string, unknown> | undefined): Promise<CallToolResult>;
+import { ToolConfig } from "../../../../../confluent/tools/base-tools.js";
+import { FlinkCatalogToolHandler } from "../../../../../confluent/tools/handlers/flink/catalog/flink-catalog-tool-handler.js";
+import { ServerRuntime } from "../../../../../server-runtime.js";
+export declare class ListDatabasesHandler extends FlinkCatalogToolHandler {
+    handle(runtime: ServerRuntime, toolArguments: Record<string, unknown> | undefined): Promise<CallToolResult>;
     getToolConfig(): ToolConfig;
-    getRequiredEnvVars(): readonly EnvVar[];
-    isConfluentCloudOnly(): boolean;
 }
 //# sourceMappingURL=list-databases-handler.d.ts.map