@confluentinc/mcp-confluent 1.2.2 → 1.3.0

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":"AACA,OAAO,EAAE,SAAS,EAAc,MAAM,oCAAoC,CAAC;AAC3E,OAAO,EAAE,uBAAuB,EAAE,MAAM,2EAA2E,CAAC;AACpH,OAAO,EAAE,eAAe,EAAE,MAAM,yDAAyD,CAAC;AAC1F,OAAO,EAAE,QAAQ,EAAE,MAAM,mCAAmC,CAAC;AAE7D,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,MAAM,qBAAqB,GAAG,CAAC,CAAC,MAAM,CAAC;IACrC,cAAc,EAAE,CAAC;SACd,MAAM,EAAE;SACR,IAAI,EAAE;SACN,QAAQ,EAAE;SACV,QAAQ,CAAC,6CAA6C,CAAC;IAC1D,aAAa,EAAE,CAAC;SACb,MAAM,EAAE;SACR,IAAI,EAAE;SACN,QAAQ,EAAE;SACV,QAAQ,CAAC,4CAA4C,CAAC;IACzD,aAAa,EAAE,CAAC;SACb,MAAM,EAAE;SACR,IAAI,EAAE;SACN,QAAQ,EAAE;SACV,QAAQ,CAAC,qDAAqD,CAAC;CACnE,CAAC,CAAC;AAEH,MAAM,OAAO,mBAAoB,SAAQ,uBAAuB;IAC9D,KAAK,CAAC,MAAM,CACV,OAAsB,EACtB,aAAkD;QAElD,MAAM,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;QAC5C,MAAM,EAAE,cAAc,EAAE,aAAa,EAAE,aAAa,EAAE,GACpD,qBAAqB,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;QAE7C,MAAM,KAAK,GAAG,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACxD,MAAM,EAAE,eAAe,EAAE,cAAc,EAAE,GAAG,IAAI,CAAC,mBAAmB,CAClE,KAAK,EACL,cAAc,EACd,aAAa,CACd,CAAC;QACF,MAAM,eAAe,GAAG,IAAI,CAAC,oBAAoB,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC;QACxE,MAAM,OAAO,GAAG,IAAI,CAAC,yBAAyB,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC;QAC1E,IAAI,CAAC,OAAO,CAAC,EAAE;YAAE,OAAO,OAAO,CAAC,KAAK,CAAC;QACtC,MAAM,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;QAElC,+DAA+D;QAC/D,qFAAqF;QACrF,MAAM,GAAG,GAAG,kCAAkC,YAAY,wCAAwC,CAAC;QAEnG,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC,aAAa,EAAE,GAAG,EAAE;YACvD,cAAc,EAAE,eAAe;YAC/B,aAAa,EAAE,cAAc;YAC7B,aAAa,EAAE,eAAe;SAC/B,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YACpB,OAAO,IAAI,CAAC,cAAc,CACxB,4BAA4B,MAAM,CAAC,KAAK,EAAE,EAC1C,IAAI,CACL,CAAC;QACJ,CAAC;QAED,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC;QACnC,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC1B,OAAO,IAAI,CAAC,cAAc,CAAC,oBAAoB,CAAC,CAAC;QACnD,CAAC;QAED,OAAO,IAAI,CAAC,cAAc,CACxB,cAAc,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAClD,CAAC;IACJ,CAAC;IAED,aAAa;QACX,OAAO;YACL,IAAI,EAAE,QAAQ,CAAC,mBAAmB;YAClC,WAAW,EACT,uFAAuF;YACzF,WAAW,EAAE,qBAAqB,CAAC,KAAK;YACxC,WAAW,EAAE,SAAS;SACvB,CAAC;IACJ,CAAC;CACF"}

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

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

@@ -1 +1 @@
-{"version":3,"file":"list-databases-handler.d.ts","sourceRoot":"","sources":["../../../../../../src/confluent/tools/handlers/flink/catalog/list-databases-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;AA4BrE,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;IAuD1B,aAAa,IAAI,UAAU;IAU3B,kBAAkB,IAAI,SAAS,MAAM,EAAE;IAIvC,oBAAoB,IAAI,OAAO;CAGhC"}
+{"version":3,"file":"list-databases-handler.d.ts","sourceRoot":"","sources":["../../../../../../src/confluent/tools/handlers/flink/catalog/list-databases-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;AAGpH,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AA4BvD,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;IA2C1B,aAAa,IAAI,UAAU;CAS5B"}

package/dist/confluent/tools/handlers/flink/catalog/list-databases-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 { 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 listDatabasesArguments = z.object({
     organizationId: z
@@ -27,17 +25,17 @@ const listDatabasesArguments = z.object({
         .optional()
         .describe("The Flink catalog name (environment ID, e.g., env-xxxxx). Omit to use defaults."),
 });
-export class ListDatabasesHandler extends BaseToolHandler {
-    async handle(clientManager, toolArguments) {
+export class ListDatabasesHandler extends FlinkCatalogToolHandler {
+    async handle(runtime, toolArguments) {
+        const clientManager = runtime.clientManager;
         const { organizationId, environmentId, computePoolId, catalogName } = listDatabasesArguments.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 { 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;
         // Build SQL query for INFORMATION_SCHEMA.SCHEMATA
         // Must fully qualify with catalog and use backticks per Confluent Cloud requirements
         const sql = `SELECT \`SCHEMA_ID\`, \`SCHEMA_NAME\` FROM \`${catalog_name}\`.\`INFORMATION_SCHEMA\`.\`SCHEMATA\` WHERE \`SCHEMA_NAME\` <> 'INFORMATION_SCHEMA'`;
@@ -63,11 +61,5 @@ export class ListDatabasesHandler extends BaseToolHandler {
             annotations: READ_ONLY,
         };
     }
-    getRequiredEnvVars() {
-        return FLINK_REQUIRED_ENV_VARS;
-    }
-    isConfluentCloudOnly() {
-        return true;
-    }
 }
 //# sourceMappingURL=list-databases-handler.js.map

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

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

package/dist/confluent/tools/handlers/flink/catalog/list-tables-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 ListTablesHandler 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 ListTablesHandler extends FlinkCatalogToolHandler {
+    handle(runtime: ServerRuntime, toolArguments: Record<string, unknown> | undefined): Promise<CallToolResult>;
     getToolConfig(): ToolConfig;
-    getRequiredEnvVars(): readonly EnvVar[];
-    isConfluentCloudOnly(): boolean;
 }
 //# sourceMappingURL=list-tables-handler.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"list-tables-handler.d.ts","sourceRoot":"","sources":["../../../../../../src/confluent/tools/handlers/flink/catalog/list-tables-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;AAmCrE,qBAAa,iBAAkB,SAAQ,eAAe;IAC9C,MAAM,CACV,aAAa,EAAE,aAAa,EAC5B,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,GACjD,OAAO,CAAC,cAAc,CAAC;IAkE1B,aAAa,IAAI,UAAU;IAU3B,kBAAkB,IAAI,SAAS,MAAM,EAAE;IAIvC,oBAAoB,IAAI,OAAO;CAGhC"}
+{"version":3,"file":"list-tables-handler.d.ts","sourceRoot":"","sources":["../../../../../../src/confluent/tools/handlers/flink/catalog/list-tables-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;AAGpH,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AA4BvD,qBAAa,iBAAkB,SAAQ,uBAAuB;IACtD,MAAM,CACV,OAAO,EAAE,aAAa,EACtB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,GACjD,OAAO,CAAC,cAAc,CAAC;IA8C1B,aAAa,IAAI,UAAU;CAS5B"}

package/dist/confluent/tools/handlers/flink/catalog/list-tables-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 { 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 listTablesArguments = z.object({
     organizationId: z
@@ -26,26 +24,18 @@ const listTablesArguments = z.object({
         .trim()
         .optional()
         .describe("The Flink catalog name (environment ID, e.g., env-xxxxx). Omit to use defaults."),
-    databaseName: z
-        .string()
-        .trim()
-        .optional()
-        .describe("The database/schema name (Kafka cluster ID, e.g., lkc-xxxxx). Omit to list all tables across the catalog."),
 });
-export class ListTablesHandler extends BaseToolHandler {
-    async handle(clientManager, toolArguments) {
-        const { organizationId, environmentId, computePoolId, catalogName, databaseName, } = listTablesArguments.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);
-        }
-        // Note: databaseName parameter is currently unused - we fetch all tables and let the client filter
-        // This is because TABLE_SCHEMA may contain friendly names, not cluster IDs
-        void databaseName;
+export class ListTablesHandler extends FlinkCatalogToolHandler {
+    async handle(runtime, toolArguments) {
+        const clientManager = runtime.clientManager;
+        const { organizationId, environmentId, computePoolId, catalogName } = listTablesArguments.parse(toolArguments);
+        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(catalogName, environment_id);
+        if (!catalog.ok)
+            return catalog.error;
+        const catalog_name = catalog.name;
         // Query INFORMATION_SCHEMA.TABLES for all tables
         // Must fully qualify with catalog and use backticks per Confluent Cloud requirements
         // Return all tables (excluding INFORMATION_SCHEMA) - client can filter by TABLE_SCHEMA as needed
@@ -72,11 +62,5 @@ export class ListTablesHandler extends BaseToolHandler {
             annotations: READ_ONLY,
         };
     }
-    getRequiredEnvVars() {
-        return FLINK_REQUIRED_ENV_VARS;
-    }
-    isConfluentCloudOnly() {
-        return true;
-    }
 }
 //# sourceMappingURL=list-tables-handler.js.map

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

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

package/dist/confluent/tools/handlers/flink/create-flink-statement-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 CreateFlinkStatementHandler extends BaseToolHandler {
-    handle(clientManager: ClientManager, toolArguments: Record<string, unknown> | undefined): Promise<CallToolResult>;
+import { ToolConfig } from "../../../../confluent/tools/base-tools.js";
+import { FlinkToolHandler } from "../../../../confluent/tools/handlers/flink/flink-tool-handler.js";
+import { ServerRuntime } from "../../../../server-runtime.js";
+export declare class CreateFlinkStatementHandler extends FlinkToolHandler {
+    handle(runtime: ServerRuntime, toolArguments: Record<string, unknown> | undefined): Promise<CallToolResult>;
     getToolConfig(): ToolConfig;
-    getRequiredEnvVars(): readonly EnvVar[];
-    isConfluentCloudOnly(): boolean;
 }
 //# sourceMappingURL=create-flink-statement-handler.d.ts.map

package/dist/confluent/tools/handlers/flink/create-flink-statement-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create-flink-statement-handler.d.ts","sourceRoot":"","sources":["../../../../../src/confluent/tools/handlers/flink/create-flink-statement-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;AAE5C,OAAO,EAAE,MAAM,EAA2B,MAAM,oBAAoB,CAAC;AA0DrE,qBAAa,2BAA4B,SAAQ,eAAe;IACxD,MAAM,CACV,aAAa,EAAE,aAAa,EAC5B,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,GACjD,OAAO,CAAC,cAAc,CAAC;IA+D1B,aAAa,IAAI,UAAU;IAS3B,kBAAkB,IAAI,SAAS,MAAM,EAAE;IAIvC,oBAAoB,IAAI,OAAO;CAGhC"}
+{"version":3,"file":"create-flink-statement-handler.d.ts","sourceRoot":"","sources":["../../../../../src/confluent/tools/handlers/flink/create-flink-statement-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAiB,UAAU,EAAE,MAAM,oCAAoC,CAAC;AAC/E,OAAO,EAAE,gBAAgB,EAAE,MAAM,2DAA2D,CAAC;AAE7F,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAuDvD,qBAAa,2BAA4B,SAAQ,gBAAgB;IACzD,MAAM,CACV,OAAO,EAAE,aAAa,EACtB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,GACjD,OAAO,CAAC,cAAc,CAAC;IAkE1B,aAAa,IAAI,UAAU;CAQ5B"}

package/dist/confluent/tools/handlers/flink/create-flink-statement-handler.js

@@ -1,8 +1,6 @@
-import { getEnsuredParam } from "../../../../confluent/helpers.js";
-import { BaseToolHandler, CREATE_UPDATE, } from "../../../../confluent/tools/base-tools.js";
+import { CREATE_UPDATE } from "../../../../confluent/tools/base-tools.js";
+import { FlinkToolHandler } from "../../../../confluent/tools/handlers/flink/flink-tool-handler.js";
 import { ToolName } from "../../../../confluent/tools/tool-name.js";
-import { FLINK_REQUIRED_ENV_VARS } from "../../../../env-schema.js";
-import env from "../../../../env.js";
 import { wrapAsPathBasedClient } from "openapi-fetch";
 import { z } from "zod";
 const createFlinkStatementArguments = z.object({
@@ -35,22 +33,23 @@ const createFlinkStatementArguments = z.object({
     catalogName: z
         .string()
         .trim()
-        .nonempty()
-        .default(() => env.FLINK_ENV_NAME ?? "")
-        .describe("The catalog name to be used for the statement. Typically the confluent environment name."),
+        .optional()
+        .describe("The catalog name to be used for the statement. Typically the environment's display name in Confluent Cloud."),
     databaseName: z
         .string()
         .trim()
-        .nonempty()
-        .default(() => env.FLINK_DATABASE_NAME ?? "")
+        .optional()
         .describe("The database name to be used for the statement. Typically the Kafka cluster name."),
 });
-export class CreateFlinkStatementHandler extends BaseToolHandler {
-    async handle(clientManager, toolArguments) {
+export class CreateFlinkStatementHandler extends FlinkToolHandler {
+    async handle(runtime, toolArguments) {
+        const clientManager = runtime.clientManager;
         const { catalogName, databaseName, statement, statementName, computePoolId, environmentId, organizationId, } = createFlinkStatementArguments.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);
+        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 resolvedCatalogName = this.resolveOptionalParam(catalogName, flink.catalog_name);
+        const resolvedDatabaseName = this.resolveOptionalParam(databaseName, flink.database_name);
         const pathBasedClient = wrapAsPathBasedClient(clientManager.getConfluentCloudFlinkRestClient());
         const { data: response, error } = await pathBasedClient["/sql/v1/organizations/{organization_id}/environments/{environment_id}/statements"].POST({
             params: {
@@ -68,9 +67,11 @@ export class CreateFlinkStatementHandler extends BaseToolHandler {
                     statement: statement,
                     properties: {
                         // only include the catalog and database properties if they are defined
-                        ...(catalogName && { "sql.current-catalog": catalogName }),
-                        ...(databaseName && {
-                            "sql.current-database": databaseName,
+                        ...(resolvedCatalogName && {
+                            "sql.current-catalog": resolvedCatalogName,
+                        }),
+                        ...(resolvedDatabaseName && {
+                            "sql.current-database": resolvedDatabaseName,
                         }),
                     },
                 },
@@ -89,11 +90,5 @@ export class CreateFlinkStatementHandler extends BaseToolHandler {
             annotations: CREATE_UPDATE,
         };
     }
-    getRequiredEnvVars() {
-        return FLINK_REQUIRED_ENV_VARS;
-    }
-    isConfluentCloudOnly() {
-        return true;
-    }
 }
 //# sourceMappingURL=create-flink-statement-handler.js.map

package/dist/confluent/tools/handlers/flink/create-flink-statement-handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"create-flink-statement-handler.js","sourceRoot":"","sources":["../../../../../src/confluent/tools/handlers/flink/create-flink-statement-handler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAE5D,OAAO,EACL,eAAe,EACf,aAAa,GAEd,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,mCAAmC,CAAC;AAC7D,OAAO,EAAU,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AACrE,OAAO,GAAG,MAAM,aAAa,CAAC;AAC9B,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,MAAM,6BAA6B,GAAG,CAAC,CAAC,MAAM,CAAC;IAC7C,cAAc,EAAE,CAAC;SACd,MAAM,EAAE;SACR,IAAI,EAAE;SACN,QAAQ,EAAE;SACV,QAAQ,CAAC,6CAA6C,CAAC;IAC1D,aAAa,EAAE,CAAC;SACb,MAAM,EAAE;SACR,IAAI,EAAE;SACN,QAAQ,EAAE;SACV,QAAQ,CAAC,4CAA4C,CAAC;IACzD,aAAa,EAAE,CAAC;SACb,MAAM,EAAE;SACR,IAAI,EAAE;SACN,QAAQ,EAAE;SACV,QAAQ,CAAC,qDAAqD,CAAC;IAClE,SAAS,EAAE,CAAC;SACT,MAAM,EAAE;SACR,QAAQ,EAAE;SACV,GAAG,CAAC,MAAM,CAAC;SACX,QAAQ,CACP,kNAAkN,CACnN;IACH,aAAa,EAAE,CAAC;SACb,MAAM,EAAE;SACR,KAAK,CACJ,IAAI,MAAM,CACR,kEAAkE,CACnE,CACF;SACA,QAAQ,EAAE;SACV,GAAG,CAAC,GAAG,CAAC;SACR,QAAQ,CACP,yEAAyE,CAC1E;IACH,WAAW,EAAE,CAAC;SACX,MAAM,EAAE;SACR,IAAI,EAAE;SACN,QAAQ,EAAE;SACV,OAAO,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,cAAc,IAAI,EAAE,CAAC;SACvC,QAAQ,CACP,0FAA0F,CAC3F;IACH,YAAY,EAAE,CAAC;SACZ,MAAM,EAAE;SACR,IAAI,EAAE;SACN,QAAQ,EAAE;SACV,OAAO,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,mBAAmB,IAAI,EAAE,CAAC;SAC5C,QAAQ,CACP,mFAAmF,CACpF;CACJ,CAAC,CAAC;AAEH,MAAM,OAAO,2BAA4B,SAAQ,eAAe;IAC9D,KAAK,CAAC,MAAM,CACV,aAA4B,EAC5B,aAAkD;QAElD,MAAM,EACJ,WAAW,EACX,YAAY,EACZ,SAAS,EACT,aAAa,EACb,aAAa,EACb,aAAa,EACb,cAAc,GACf,GAAG,6BAA6B,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;QACvD,MAAM,eAAe,GAAG,eAAe,CACrC,cAAc,EACd,6BAA6B,EAC7B,cAAc,CACf,CAAC;QACF,MAAM,cAAc,GAAG,eAAe,CACpC,cAAc,EACd,4BAA4B,EAC5B,aAAa,CACd,CAAC;QACF,MAAM,eAAe,GAAG,eAAe,CACrC,uBAAuB,EACvB,6BAA6B,EAC7B,aAAa,CACd,CAAC;QAEF,MAAM,eAAe,GAAG,qBAAqB,CAC3C,aAAa,CAAC,gCAAgC,EAAE,CACjD,CAAC;QACF,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,MAAM,eAAe,CACrD,kFAAkF,CACnF,CAAC,IAAI,CAAC;YACL,MAAM,EAAE;gBACN,IAAI,EAAE;oBACJ,cAAc,EAAE,cAAc;oBAC9B,eAAe,EAAE,eAAe;iBACjC;aACF;YACD,IAAI,EAAE;gBACJ,IAAI,EAAE,aAAa;gBACnB,eAAe,EAAE,eAAe;gBAChC,cAAc,EAAE,cAAc;gBAC9B,IAAI,EAAE;oBACJ,eAAe,EAAE,eAAe;oBAChC,SAAS,EAAE,SAAS;oBACpB,UAAU,EAAE;wBACV,uEAAuE;wBACvE,GAAG,CAAC,WAAW,IAAI,EAAE,qBAAqB,EAAE,WAAW,EAAE,CAAC;wBAC1D,GAAG,CAAC,YAAY,IAAI;4BAClB,sBAAsB,EAAE,YAAY;yBACrC,CAAC;qBACH;iBACF;aACF;SACF,CAAC,CAAC;QACH,IAAI,KAAK,EAAE,CAAC;YACV,OAAO,IAAI,CAAC,cAAc,CACxB,0CAA0C,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,EACjE,IAAI,CACL,CAAC;QACJ,CAAC;QACD,OAAO,IAAI,CAAC,cAAc,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IAC5D,CAAC;IACD,aAAa;QACX,OAAO;YACL,IAAI,EAAE,QAAQ,CAAC,sBAAsB;YACrC,WAAW,EAAE,uCAAuC;YACpD,WAAW,EAAE,6BAA6B,CAAC,KAAK;YAChD,WAAW,EAAE,aAAa;SAC3B,CAAC;IACJ,CAAC;IAED,kBAAkB;QAChB,OAAO,uBAAuB,CAAC;IACjC,CAAC;IAED,oBAAoB;QAClB,OAAO,IAAI,CAAC;IACd,CAAC;CACF"}
+{"version":3,"file":"create-flink-statement-handler.js","sourceRoot":"","sources":["../../../../../src/confluent/tools/handlers/flink/create-flink-statement-handler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAc,MAAM,oCAAoC,CAAC;AAC/E,OAAO,EAAE,gBAAgB,EAAE,MAAM,2DAA2D,CAAC;AAC7F,OAAO,EAAE,QAAQ,EAAE,MAAM,mCAAmC,CAAC;AAE7D,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,MAAM,6BAA6B,GAAG,CAAC,CAAC,MAAM,CAAC;IAC7C,cAAc,EAAE,CAAC;SACd,MAAM,EAAE;SACR,IAAI,EAAE;SACN,QAAQ,EAAE;SACV,QAAQ,CAAC,6CAA6C,CAAC;IAC1D,aAAa,EAAE,CAAC;SACb,MAAM,EAAE;SACR,IAAI,EAAE;SACN,QAAQ,EAAE;SACV,QAAQ,CAAC,4CAA4C,CAAC;IACzD,aAAa,EAAE,CAAC;SACb,MAAM,EAAE;SACR,IAAI,EAAE;SACN,QAAQ,EAAE;SACV,QAAQ,CAAC,qDAAqD,CAAC;IAClE,SAAS,EAAE,CAAC;SACT,MAAM,EAAE;SACR,QAAQ,EAAE;SACV,GAAG,CAAC,MAAM,CAAC;SACX,QAAQ,CACP,kNAAkN,CACnN;IACH,aAAa,EAAE,CAAC;SACb,MAAM,EAAE;SACR,KAAK,CACJ,IAAI,MAAM,CACR,kEAAkE,CACnE,CACF;SACA,QAAQ,EAAE;SACV,GAAG,CAAC,GAAG,CAAC;SACR,QAAQ,CACP,yEAAyE,CAC1E;IACH,WAAW,EAAE,CAAC;SACX,MAAM,EAAE;SACR,IAAI,EAAE;SACN,QAAQ,EAAE;SACV,QAAQ,CACP,6GAA6G,CAC9G;IACH,YAAY,EAAE,CAAC;SACZ,MAAM,EAAE;SACR,IAAI,EAAE;SACN,QAAQ,EAAE;SACV,QAAQ,CACP,mFAAmF,CACpF;CACJ,CAAC,CAAC;AAEH,MAAM,OAAO,2BAA4B,SAAQ,gBAAgB;IAC/D,KAAK,CAAC,MAAM,CACV,OAAsB,EACtB,aAAkD;QAElD,MAAM,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;QAC5C,MAAM,EACJ,WAAW,EACX,YAAY,EACZ,SAAS,EACT,aAAa,EACb,aAAa,EACb,aAAa,EACb,cAAc,GACf,GAAG,6BAA6B,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;QACvD,MAAM,KAAK,GAAG,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACxD,MAAM,EAAE,eAAe,EAAE,cAAc,EAAE,GAAG,IAAI,CAAC,mBAAmB,CAClE,KAAK,EACL,cAAc,EACd,aAAa,CACd,CAAC;QACF,MAAM,eAAe,GAAG,IAAI,CAAC,oBAAoB,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC;QACxE,MAAM,mBAAmB,GAAG,IAAI,CAAC,oBAAoB,CACnD,WAAW,EACX,KAAK,CAAC,YAAY,CACnB,CAAC;QACF,MAAM,oBAAoB,GAAG,IAAI,CAAC,oBAAoB,CACpD,YAAY,EACZ,KAAK,CAAC,aAAa,CACpB,CAAC;QAEF,MAAM,eAAe,GAAG,qBAAqB,CAC3C,aAAa,CAAC,gCAAgC,EAAE,CACjD,CAAC;QACF,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,MAAM,eAAe,CACrD,kFAAkF,CACnF,CAAC,IAAI,CAAC;YACL,MAAM,EAAE;gBACN,IAAI,EAAE;oBACJ,cAAc,EAAE,cAAc;oBAC9B,eAAe,EAAE,eAAe;iBACjC;aACF;YACD,IAAI,EAAE;gBACJ,IAAI,EAAE,aAAa;gBACnB,eAAe,EAAE,eAAe;gBAChC,cAAc,EAAE,cAAc;gBAC9B,IAAI,EAAE;oBACJ,eAAe,EAAE,eAAe;oBAChC,SAAS,EAAE,SAAS;oBACpB,UAAU,EAAE;wBACV,uEAAuE;wBACvE,GAAG,CAAC,mBAAmB,IAAI;4BACzB,qBAAqB,EAAE,mBAAmB;yBAC3C,CAAC;wBACF,GAAG,CAAC,oBAAoB,IAAI;4BAC1B,sBAAsB,EAAE,oBAAoB;yBAC7C,CAAC;qBACH;iBACF;aACF;SACF,CAAC,CAAC;QACH,IAAI,KAAK,EAAE,CAAC;YACV,OAAO,IAAI,CAAC,cAAc,CACxB,0CAA0C,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,EACjE,IAAI,CACL,CAAC;QACJ,CAAC;QACD,OAAO,IAAI,CAAC,cAAc,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IAC5D,CAAC;IACD,aAAa;QACX,OAAO;YACL,IAAI,EAAE,QAAQ,CAAC,sBAAsB;YACrC,WAAW,EAAE,uCAAuC;YACpD,WAAW,EAAE,6BAA6B,CAAC,KAAK;YAChD,WAAW,EAAE,aAAa;SAC3B,CAAC;IACJ,CAAC;CACF"}

package/dist/confluent/tools/handlers/flink/delete-flink-statement-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 DeleteFlinkStatementHandler extends BaseToolHandler {
-    handle(clientManager: ClientManager, toolArguments: Record<string, unknown> | undefined): Promise<CallToolResult>;
+import { ToolConfig } from "../../../../confluent/tools/base-tools.js";
+import { FlinkToolHandler } from "../../../../confluent/tools/handlers/flink/flink-tool-handler.js";
+import { ServerRuntime } from "../../../../server-runtime.js";
+export declare class DeleteFlinkStatementHandler extends FlinkToolHandler {
+    handle(runtime: ServerRuntime, toolArguments: Record<string, unknown> | undefined): Promise<CallToolResult>;
     getToolConfig(): ToolConfig;
-    getRequiredEnvVars(): readonly EnvVar[];
-    isConfluentCloudOnly(): boolean;
 }
 //# sourceMappingURL=delete-flink-statement-handler.d.ts.map

package/dist/confluent/tools/handlers/flink/delete-flink-statement-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"delete-flink-statement-handler.d.ts","sourceRoot":"","sources":["../../../../../src/confluent/tools/handlers/flink/delete-flink-statement-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;AAE5C,OAAO,EAAE,MAAM,EAA2B,MAAM,oBAAoB,CAAC;AA6BrE,qBAAa,2BAA4B,SAAQ,eAAe;IACxD,MAAM,CACV,aAAa,EAAE,aAAa,EAC5B,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,GACjD,OAAO,CAAC,cAAc,CAAC;IAsC1B,aAAa,IAAI,UAAU;IAS3B,kBAAkB,IAAI,SAAS,MAAM,EAAE;IAIvC,oBAAoB,IAAI,OAAO;CAGhC"}
+{"version":3,"file":"delete-flink-statement-handler.d.ts","sourceRoot":"","sources":["../../../../../src/confluent/tools/handlers/flink/delete-flink-statement-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAe,UAAU,EAAE,MAAM,oCAAoC,CAAC;AAC7E,OAAO,EAAE,gBAAgB,EAAE,MAAM,2DAA2D,CAAC;AAE7F,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AA6BvD,qBAAa,2BAA4B,SAAQ,gBAAgB;IACzD,MAAM,CACV,OAAO,EAAE,aAAa,EACtB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,GACjD,OAAO,CAAC,cAAc,CAAC;IAmC1B,aAAa,IAAI,UAAU;CAQ5B"}

package/dist/confluent/tools/handlers/flink/delete-flink-statement-handler.js

@@ -1,7 +1,6 @@
-import { getEnsuredParam } from "../../../../confluent/helpers.js";
-import { BaseToolHandler, DESTRUCTIVE, } from "../../../../confluent/tools/base-tools.js";
+import { DESTRUCTIVE } from "../../../../confluent/tools/base-tools.js";
+import { FlinkToolHandler } from "../../../../confluent/tools/handlers/flink/flink-tool-handler.js";
 import { ToolName } from "../../../../confluent/tools/tool-name.js";
-import { FLINK_REQUIRED_ENV_VARS } from "../../../../env-schema.js";
 import { wrapAsPathBasedClient } from "openapi-fetch";
 import { z } from "zod";
 const deleteFlinkStatementArguments = z.object({
@@ -22,11 +21,12 @@ const deleteFlinkStatementArguments = z.object({
         .max(100)
         .describe("The user provided name of the resource, unique within this environment."),
 });
-export class DeleteFlinkStatementHandler extends BaseToolHandler {
-    async handle(clientManager, toolArguments) {
+export class DeleteFlinkStatementHandler extends FlinkToolHandler {
+    async handle(runtime, toolArguments) {
+        const clientManager = runtime.clientManager;
         const { statementName, environmentId, organizationId } = deleteFlinkStatementArguments.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 flink = this.getFlinkDirectConfig(runtime.config);
+        const { organization_id, environment_id } = this.resolveOrgAndEnvIds(flink, organizationId, environmentId);
         const pathBasedClient = wrapAsPathBasedClient(clientManager.getConfluentCloudFlinkRestClient());
         const { response, error } = await pathBasedClient["/sql/v1/organizations/{organization_id}/environments/{environment_id}/statements/{statement_name}"].DELETE({
             params: {
@@ -50,11 +50,5 @@ export class DeleteFlinkStatementHandler extends BaseToolHandler {
             annotations: DESTRUCTIVE,
         };
     }
-    getRequiredEnvVars() {
-        return FLINK_REQUIRED_ENV_VARS;
-    }
-    isConfluentCloudOnly() {
-        return true;
-    }
 }
 //# sourceMappingURL=delete-flink-statement-handler.js.map

package/dist/confluent/tools/handlers/flink/delete-flink-statement-handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"delete-flink-statement-handler.js","sourceRoot":"","sources":["../../../../../src/confluent/tools/handlers/flink/delete-flink-statement-handler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAE5D,OAAO,EACL,eAAe,EACf,WAAW,GAEZ,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,mCAAmC,CAAC;AAC7D,OAAO,EAAU,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AACrE,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,MAAM,6BAA6B,GAAG,CAAC,CAAC,MAAM,CAAC;IAC7C,cAAc,EAAE,CAAC;SACd,MAAM,EAAE;SACR,IAAI,EAAE;SACN,QAAQ,EAAE;SACV,QAAQ,CAAC,6CAA6C,CAAC;IAC1D,aAAa,EAAE,CAAC;SACb,MAAM,EAAE;SACR,IAAI,EAAE;SACN,QAAQ,EAAE;SACV,QAAQ,CAAC,4CAA4C,CAAC;IACzD,aAAa,EAAE,CAAC;SACb,MAAM,EAAE;SACR,KAAK,CACJ,IAAI,MAAM,CACR,kEAAkE,CACnE,CACF;SACA,QAAQ,EAAE;SACV,GAAG,CAAC,GAAG,CAAC;SACR,QAAQ,CACP,yEAAyE,CAC1E;CACJ,CAAC,CAAC;AAEH,MAAM,OAAO,2BAA4B,SAAQ,eAAe;IAC9D,KAAK,CAAC,MAAM,CACV,aAA4B,EAC5B,aAAkD;QAElD,MAAM,EAAE,aAAa,EAAE,aAAa,EAAE,cAAc,EAAE,GACpD,6BAA6B,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;QACrD,MAAM,eAAe,GAAG,eAAe,CACrC,cAAc,EACd,6BAA6B,EAC7B,cAAc,CACf,CAAC;QACF,MAAM,cAAc,GAAG,eAAe,CACpC,cAAc,EACd,4BAA4B,EAC5B,aAAa,CACd,CAAC;QAEF,MAAM,eAAe,GAAG,qBAAqB,CAC3C,aAAa,CAAC,gCAAgC,EAAE,CACjD,CAAC;QACF,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,MAAM,eAAe,CAC/C,mGAAmG,CACpG,CAAC,MAAM,CAAC;YACP,MAAM,EAAE;gBACN,IAAI,EAAE;oBACJ,eAAe,EAAE,eAAe;oBAChC,cAAc,EAAE,cAAc;oBAC9B,cAAc,EAAE,aAAa;iBAC9B;aACF;SACF,CAAC,CAAC;QACH,IAAI,KAAK,EAAE,CAAC;YACV,OAAO,IAAI,CAAC,cAAc,CACxB,yCAAyC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,EAChE,IAAI,CACL,CAAC;QACJ,CAAC;QACD,OAAO,IAAI,CAAC,cAAc,CACxB,6CAA6C,QAAQ,EAAE,MAAM,EAAE,CAChE,CAAC;IACJ,CAAC;IACD,aAAa;QACX,OAAO;YACL,IAAI,EAAE,QAAQ,CAAC,uBAAuB;YACtC,WAAW,EAAE,uCAAuC;YACpD,WAAW,EAAE,6BAA6B,CAAC,KAAK;YAChD,WAAW,EAAE,WAAW;SACzB,CAAC;IACJ,CAAC;IAED,kBAAkB;QAChB,OAAO,uBAAuB,CAAC;IACjC,CAAC;IAED,oBAAoB;QAClB,OAAO,IAAI,CAAC;IACd,CAAC;CACF"}
+{"version":3,"file":"delete-flink-statement-handler.js","sourceRoot":"","sources":["../../../../../src/confluent/tools/handlers/flink/delete-flink-statement-handler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAc,MAAM,oCAAoC,CAAC;AAC7E,OAAO,EAAE,gBAAgB,EAAE,MAAM,2DAA2D,CAAC;AAC7F,OAAO,EAAE,QAAQ,EAAE,MAAM,mCAAmC,CAAC;AAE7D,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,MAAM,6BAA6B,GAAG,CAAC,CAAC,MAAM,CAAC;IAC7C,cAAc,EAAE,CAAC;SACd,MAAM,EAAE;SACR,IAAI,EAAE;SACN,QAAQ,EAAE;SACV,QAAQ,CAAC,6CAA6C,CAAC;IAC1D,aAAa,EAAE,CAAC;SACb,MAAM,EAAE;SACR,IAAI,EAAE;SACN,QAAQ,EAAE;SACV,QAAQ,CAAC,4CAA4C,CAAC;IACzD,aAAa,EAAE,CAAC;SACb,MAAM,EAAE;SACR,KAAK,CACJ,IAAI,MAAM,CACR,kEAAkE,CACnE,CACF;SACA,QAAQ,EAAE;SACV,GAAG,CAAC,GAAG,CAAC;SACR,QAAQ,CACP,yEAAyE,CAC1E;CACJ,CAAC,CAAC;AAEH,MAAM,OAAO,2BAA4B,SAAQ,gBAAgB;IAC/D,KAAK,CAAC,MAAM,CACV,OAAsB,EACtB,aAAkD;QAElD,MAAM,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;QAC5C,MAAM,EAAE,aAAa,EAAE,aAAa,EAAE,cAAc,EAAE,GACpD,6BAA6B,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;QACrD,MAAM,KAAK,GAAG,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACxD,MAAM,EAAE,eAAe,EAAE,cAAc,EAAE,GAAG,IAAI,CAAC,mBAAmB,CAClE,KAAK,EACL,cAAc,EACd,aAAa,CACd,CAAC;QAEF,MAAM,eAAe,GAAG,qBAAqB,CAC3C,aAAa,CAAC,gCAAgC,EAAE,CACjD,CAAC;QACF,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,MAAM,eAAe,CAC/C,mGAAmG,CACpG,CAAC,MAAM,CAAC;YACP,MAAM,EAAE;gBACN,IAAI,EAAE;oBACJ,eAAe,EAAE,eAAe;oBAChC,cAAc,EAAE,cAAc;oBAC9B,cAAc,EAAE,aAAa;iBAC9B;aACF;SACF,CAAC,CAAC;QACH,IAAI,KAAK,EAAE,CAAC;YACV,OAAO,IAAI,CAAC,cAAc,CACxB,yCAAyC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,EAChE,IAAI,CACL,CAAC;QACJ,CAAC;QACD,OAAO,IAAI,CAAC,cAAc,CACxB,6CAA6C,QAAQ,EAAE,MAAM,EAAE,CAChE,CAAC;IACJ,CAAC;IACD,aAAa;QACX,OAAO;YACL,IAAI,EAAE,QAAQ,CAAC,uBAAuB;YACtC,WAAW,EAAE,uCAAuC;YACpD,WAAW,EAAE,6BAA6B,CAAC,KAAK;YAChD,WAAW,EAAE,WAAW;SACzB,CAAC;IACJ,CAAC;CACF"}

package/dist/confluent/tools/handlers/flink/diagnostics/check-health-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 CheckHealthHandler extends BaseToolHandler {
-    handle(clientManager: ClientManager, toolArguments: Record<string, unknown> | undefined): Promise<CallToolResult>;
+import { ToolConfig } from "../../../../../confluent/tools/base-tools.js";
+import { FlinkToolHandler } from "../../../../../confluent/tools/handlers/flink/flink-tool-handler.js";
+import { ServerRuntime } from "../../../../../server-runtime.js";
+export declare class CheckHealthHandler extends FlinkToolHandler {
+    handle(runtime: ServerRuntime, toolArguments: Record<string, unknown> | undefined): Promise<CallToolResult>;
     getToolConfig(): ToolConfig;
-    getRequiredEnvVars(): readonly EnvVar[];
-    isConfluentCloudOnly(): boolean;
 }
 //# sourceMappingURL=check-health-handler.d.ts.map

package/dist/confluent/tools/handlers/flink/diagnostics/check-health-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"check-health-handler.d.ts","sourceRoot":"","sources":["../../../../../../src/confluent/tools/handlers/flink/diagnostics/check-health-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;AAE5C,OAAO,EAAE,MAAM,EAA2B,MAAM,oBAAoB,CAAC;AAwCrE,qBAAa,kBAAmB,SAAQ,eAAe;IAC/C,MAAM,CACV,aAAa,EAAE,aAAa,EAC5B,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,GACjD,OAAO,CAAC,cAAc,CAAC;IAqH1B,aAAa,IAAI,UAAU;IAU3B,kBAAkB,IAAI,SAAS,MAAM,EAAE;IAIvC,oBAAoB,IAAI,OAAO;CAGhC"}
+{"version":3,"file":"check-health-handler.d.ts","sourceRoot":"","sources":["../../../../../../src/confluent/tools/handlers/flink/diagnostics/check-health-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAa,UAAU,EAAE,MAAM,oCAAoC,CAAC;AAC3E,OAAO,EAAE,gBAAgB,EAAE,MAAM,2DAA2D,CAAC;AAE7F,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAwCvD,qBAAa,kBAAmB,SAAQ,gBAAgB;IAChD,MAAM,CACV,OAAO,EAAE,aAAa,EACtB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,GACjD,OAAO,CAAC,cAAc,CAAC;IAkH1B,aAAa,IAAI,UAAU;CAS5B"}

package/dist/confluent/tools/handlers/flink/diagnostics/check-health-handler.js

@@ -1,7 +1,6 @@
-import { getEnsuredParam } from "../../../../../confluent/helpers.js";
-import { BaseToolHandler, READ_ONLY, } from "../../../../../confluent/tools/base-tools.js";
+import { READ_ONLY } from "../../../../../confluent/tools/base-tools.js";
+import { FlinkToolHandler } from "../../../../../confluent/tools/handlers/flink/flink-tool-handler.js";
 import { ToolName } from "../../../../../confluent/tools/tool-name.js";
-import { FLINK_REQUIRED_ENV_VARS } from "../../../../../env-schema.js";
 import { wrapAsPathBasedClient } from "openapi-fetch";
 import { z } from "zod";
 const checkHealthArguments = z.object({
@@ -22,11 +21,12 @@ const checkHealthArguments = z.object({
         .max(100)
         .describe("The name of the Flink SQL statement to check health for."),
 });
-export class CheckHealthHandler extends BaseToolHandler {
-    async handle(clientManager, toolArguments) {
+export class CheckHealthHandler extends FlinkToolHandler {
+    async handle(runtime, toolArguments) {
+        const clientManager = runtime.clientManager;
         const { statementName, environmentId, organizationId } = checkHealthArguments.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 flink = this.getFlinkDirectConfig(runtime.config);
+        const { organization_id, environment_id } = this.resolveOrgAndEnvIds(flink, organizationId, environmentId);
         const pathBasedClient = wrapAsPathBasedClient(clientManager.getConfluentCloudFlinkRestClient());
         // Get statement status
         const { data: statementData, error: statusError } = await pathBasedClient["/sql/v1/organizations/{organization_id}/environments/{environment_id}/statements/{statement_name}"].GET({
@@ -113,11 +113,5 @@ export class CheckHealthHandler extends BaseToolHandler {
             annotations: READ_ONLY,
         };
     }
-    getRequiredEnvVars() {
-        return FLINK_REQUIRED_ENV_VARS;
-    }
-    isConfluentCloudOnly() {
-        return true;
-    }
 }
 //# sourceMappingURL=check-health-handler.js.map

package/dist/confluent/tools/handlers/flink/diagnostics/check-health-handler.js.map

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

package/dist/confluent/tools/handlers/flink/diagnostics/detect-issues-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 DetectIssuesHandler extends BaseToolHandler {
-    handle(clientManager: ClientManager, toolArguments: Record<string, unknown> | undefined): Promise<CallToolResult>;
+import { ToolConfig } from "../../../../../confluent/tools/base-tools.js";
+import { FlinkToolHandler } from "../../../../../confluent/tools/handlers/flink/flink-tool-handler.js";
+import { ServerRuntime } from "../../../../../server-runtime.js";
+export declare class DetectIssuesHandler extends FlinkToolHandler {
+    handle(runtime: ServerRuntime, toolArguments: Record<string, unknown> | undefined): Promise<CallToolResult>;
     getToolConfig(): ToolConfig;
-    getRequiredEnvVars(): readonly EnvVar[];
-    isConfluentCloudOnly(): boolean;
 }
 //# sourceMappingURL=detect-issues-handler.d.ts.map

package/dist/confluent/tools/handlers/flink/diagnostics/detect-issues-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"detect-issues-handler.d.ts","sourceRoot":"","sources":["../../../../../../src/confluent/tools/handlers/flink/diagnostics/detect-issues-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;AAM5C,OAAO,EAAE,MAAM,EAA2B,MAAM,oBAAoB,CAAC;AA8CrE,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;IAoQ1B,aAAa,IAAI,UAAU;IAU3B,kBAAkB,IAAI,SAAS,MAAM,EAAE;IAIvC,oBAAoB,IAAI,OAAO;CAGhC"}
+{"version":3,"file":"detect-issues-handler.d.ts","sourceRoot":"","sources":["../../../../../../src/confluent/tools/handlers/flink/diagnostics/detect-issues-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAa,UAAU,EAAE,MAAM,oCAAoC,CAAC;AAK3E,OAAO,EAAE,gBAAgB,EAAE,MAAM,2DAA2D,CAAC;AAE7F,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AA6CvD,qBAAa,mBAAoB,SAAQ,gBAAgB;IACjD,MAAM,CACV,OAAO,EAAE,aAAa,EACtB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,GACjD,OAAO,CAAC,cAAc,CAAC;IAoQ1B,aAAa,IAAI,UAAU;CAS5B"}

package/dist/confluent/tools/handlers/flink/diagnostics/detect-issues-handler.js

@@ -1,9 +1,7 @@
-import { getEnsuredParam } from "../../../../../confluent/helpers.js";
-import { BaseToolHandler, READ_ONLY, } from "../../../../../confluent/tools/base-tools.js";
+import { READ_ONLY } from "../../../../../confluent/tools/base-tools.js";
 import { analyzeMetrics, getStatementMetrics, } from "../../../../../confluent/tools/handlers/flink/diagnostics/metrics-helper.js";
+import { FlinkToolHandler } from "../../../../../confluent/tools/handlers/flink/flink-tool-handler.js";
 import { ToolName } from "../../../../../confluent/tools/tool-name.js";
-import { FLINK_REQUIRED_ENV_VARS } from "../../../../../env-schema.js";
-import env from "../../../../../env.js";
 import { wrapAsPathBasedClient } from "openapi-fetch";
 import { z } from "zod";
 const detectIssuesArguments = z.object({
@@ -33,12 +31,13 @@ const detectIssuesArguments = z.object({
         .default(true)
         .describe("Include performance metrics analysis (backpressure, lag, etc.). Requires CONFLUENT_CLOUD_API_KEY."),
 });
-export class DetectIssuesHandler extends BaseToolHandler {
-    async handle(clientManager, toolArguments) {
+export class DetectIssuesHandler extends FlinkToolHandler {
+    async handle(runtime, toolArguments) {
+        const clientManager = runtime.clientManager;
         const { statementName, environmentId, organizationId, computePoolId, includeMetrics, } = detectIssuesArguments.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 = computePoolId || env.FLINK_COMPUTE_POOL_ID;
+        const flink = this.getFlinkDirectConfig(runtime.config);
+        const { organization_id, environment_id } = this.resolveOrgAndEnvIds(flink, organizationId, environmentId);
+        const compute_pool_id = this.resolveOptionalComputePoolId(flink, computePoolId);
         const pathBasedClient = wrapAsPathBasedClient(clientManager.getConfluentCloudFlinkRestClient());
         // Get statement status
         const { data: statementData, error: statusError } = await pathBasedClient["/sql/v1/organizations/{organization_id}/environments/{environment_id}/statements/{statement_name}"].GET({
@@ -231,11 +230,5 @@ export class DetectIssuesHandler extends BaseToolHandler {
             annotations: READ_ONLY,
         };
     }
-    getRequiredEnvVars() {
-        return FLINK_REQUIRED_ENV_VARS;
-    }
-    isConfluentCloudOnly() {
-        return true;
-    }
 }
 //# sourceMappingURL=detect-issues-handler.js.map