@confluentinc/mcp-confluent 1.4.0 → 1.5.0

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

@@ -5,51 +5,54 @@ import { executeFlinkSql, } from "../../../../../confluent/tools/handlers/flink/
 import { ToolName } from "../../../../../confluent/tools/tool-name.js";
 import { z } from "zod";
 const getTableInfoArguments = z.object({
-    organizationId: z
+    tableName: z
         .string()
         .trim()
-        .optional()
-        .describe("The unique identifier for the organization."),
-    environmentId: z
+        .nonempty()
+        .describe("The name of the table to get info for."),
+    catalogName: z
         .string()
         .trim()
         .optional()
-        .describe("The unique identifier for the environment."),
-    computePoolId: z
+        .describe("The Flink catalog name (environment ID, e.g., env-xxxxx). Omit to use defaults."),
+    databaseName: z
         .string()
         .trim()
         .optional()
-        .describe("The id associated with the compute pool in context."),
-    catalogName: z
+        .describe("The database/schema name. Can be cluster ID (lkc-xxxxx) or friendly name. Optional."),
+    organizationId: z
         .string()
         .trim()
         .optional()
-        .describe("The Flink catalog name (environment ID, e.g., env-xxxxx). Omit to use defaults."),
-    databaseName: z
+        .describe("Confluent Cloud organization ID. Discover via list-organizations."),
+    environmentId: z
         .string()
         .trim()
         .optional()
-        .describe("The database/schema name. Can be cluster ID (lkc-xxxxx) or friendly name. Optional."),
-    tableName: z
+        .describe("Confluent Cloud environment ID (env-...) that owns the Flink compute pool. Discover via list-environments."),
+    computePoolId: z
         .string()
         .trim()
-        .nonempty()
-        .describe("The name of the table to get info for."),
+        .optional()
+        .describe("Confluent Cloud Flink compute pool ID (lfcp-...). Discover via list-compute-pools."),
 });
 export class GetTableInfoHandler extends FlinkCatalogToolHandler {
     async handle(runtime, toolArguments) {
-        const clientManager = runtime.clientManager;
         const { organizationId, environmentId, computePoolId, catalogName, databaseName, tableName, } = getTableInfoArguments.parse(toolArguments);
-        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 { conn, clientManager } = this.resolveConnection(runtime, toolArguments);
+        const { organization_id, environment_id, compute_pool_id } = this.resolveFlinkRouting(conn, {
+            organizationId,
+            environmentId,
+            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, conn);
+        // Database name is optional - if provided, resolve it to friendly SCHEMA_NAME.
+        // The config fallback (kafka.cluster_id) only exists on direct connections;
+        // under OAuth callers supply databaseName explicitly.
+        const database_input = resolveDatabaseName(databaseName, conn.type === "direct" ? conn : undefined);
         const statementsCreated = [];
         // Only run getSchemaMapping for lkc-* inputs; resolveToSchemaName
         // passes friendly names through, so the roundtrip would just leak a

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.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,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"}
+{"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;AA2BvD,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;IAqD1B,aAAa,IAAI,UAAU;CAS5B"}

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

@@ -8,25 +8,27 @@ const listCatalogsArguments = z.object({
         .string()
         .trim()
         .optional()
-        .describe("The unique identifier for the organization."),
+        .describe("Confluent Cloud organization ID. Discover via list-organizations."),
     environmentId: z
         .string()
         .trim()
         .optional()
-        .describe("The unique identifier for the environment."),
+        .describe("Confluent Cloud environment ID (env-...) that owns the Flink compute pool. Discover via list-environments."),
     computePoolId: z
         .string()
         .trim()
         .optional()
-        .describe("The id associated with the compute pool in context."),
+        .describe("Confluent Cloud Flink compute pool ID (lfcp-...). Discover via list-compute-pools."),
 });
 export class ListCatalogsHandler extends FlinkCatalogToolHandler {
     async handle(runtime, toolArguments) {
-        const clientManager = runtime.clientManager;
         const { organizationId, environmentId, computePoolId } = listCatalogsArguments.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 { conn, clientManager } = this.resolveConnection(runtime, toolArguments);
+        const { organization_id, environment_id, compute_pool_id } = this.resolveFlinkRouting(conn, {
+            organizationId,
+            environmentId,
+            computePoolId,
+        });
         const catalog = this.resolveCatalogNameOrError(undefined, environment_id);
         if (!catalog.ok)
             return catalog.error;

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,EACL,eAAe,GAEhB,MAAM,yDAAyD,CAAC;AACjE,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,CACP,mEAAmE,CACpE;IACH,aAAa,EAAE,CAAC;SACb,MAAM,EAAE;SACR,IAAI,EAAE;SACN,QAAQ,EAAE;SACV,QAAQ,CACP,4GAA4G,CAC7G;IACH,aAAa,EAAE,CAAC;SACb,MAAM,EAAE;SACR,IAAI,EAAE;SACN,QAAQ,EAAE;SACV,QAAQ,CACP,oFAAoF,CACrF;CACJ,CAAC,CAAC;AAEH,MAAM,OAAO,mBAAoB,SAAQ,uBAAuB;IAC9D,KAAK,CAAC,MAAM,CACV,OAAsB,EACtB,aAAkD;QAElD,MAAM,EAAE,cAAc,EAAE,aAAa,EAAE,aAAa,EAAE,GACpD,qBAAqB,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;QAE7C,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,GAAG,IAAI,CAAC,iBAAiB,CACpD,OAAO,EACP,aAAa,CACd,CAAC;QACF,MAAM,EAAE,eAAe,EAAE,cAAc,EAAE,eAAe,EAAE,GACxD,IAAI,CAAC,mBAAmB,CAAC,IAAI,EAAE;YAC7B,cAAc;YACd,aAAa;YACb,aAAa;SACd,CAAC,CAAC;QACL,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;QACH,MAAM,IAAI,GAAuB;YAC/B,sBAAsB,EAAE,MAAM,CAAC,aAAa;gBAC1C,CAAC,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC;gBACxB,CAAC,CAAC,EAAE;SACP,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YACpB,OAAO,IAAI,CAAC,cAAc,CACxB,4BAA4B,MAAM,CAAC,KAAK,EAAE,EAC1C,IAAI,EACJ,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,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;QAChE,CAAC;QAED,OAAO,IAAI,CAAC,cAAc,CACxB,cAAc,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,EACjD,KAAK,EACL,IAAI,CACL,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.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,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;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;IAmD1B,aAAa,IAAI,UAAU;CAS5B"}
+{"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;AAMpH,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAkCvD,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;IAqD1B,aAAa,IAAI,UAAU;CAS5B"}

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

@@ -4,34 +4,36 @@ import { executeFlinkSql, } from "../../../../../confluent/tools/handlers/flink/
 import { ToolName } from "../../../../../confluent/tools/tool-name.js";
 import { z } from "zod";
 const listDatabasesArguments = z.object({
-    organizationId: z
+    catalogName: z
         .string()
         .trim()
         .optional()
-        .describe("The unique identifier for the organization."),
-    environmentId: z
+        .describe("The Flink catalog name (environment ID, e.g., env-xxxxx). Omit to use defaults."),
+    organizationId: z
         .string()
         .trim()
         .optional()
-        .describe("The unique identifier for the environment."),
-    computePoolId: z
+        .describe("Confluent Cloud organization ID. Discover via list-organizations."),
+    environmentId: z
         .string()
         .trim()
         .optional()
-        .describe("The id associated with the compute pool in context."),
-    catalogName: z
+        .describe("Confluent Cloud environment ID (env-...) that owns the Flink compute pool. Discover via list-environments."),
+    computePoolId: z
         .string()
         .trim()
         .optional()
-        .describe("The Flink catalog name (environment ID, e.g., env-xxxxx). Omit to use defaults."),
+        .describe("Confluent Cloud Flink compute pool ID (lfcp-...). Discover via list-compute-pools."),
 });
 export class ListDatabasesHandler extends FlinkCatalogToolHandler {
     async handle(runtime, toolArguments) {
-        const clientManager = runtime.clientManager;
         const { organizationId, environmentId, computePoolId, catalogName } = listDatabasesArguments.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 { conn, clientManager } = this.resolveConnection(runtime, toolArguments);
+        const { organization_id, environment_id, compute_pool_id } = this.resolveFlinkRouting(conn, {
+            organizationId,
+            environmentId,
+            computePoolId,
+        });
         const catalog = this.resolveCatalogNameOrError(catalogName, environment_id);
         if (!catalog.ok)
             return catalog.error;

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.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,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;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;IAwD1B,aAAa,IAAI,UAAU;CAS5B"}
+{"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;AAMpH,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAkCvD,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;IA0D1B,aAAa,IAAI,UAAU;CAS5B"}

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

@@ -4,34 +4,36 @@ import { executeFlinkSql, } from "../../../../../confluent/tools/handlers/flink/
 import { ToolName } from "../../../../../confluent/tools/tool-name.js";
 import { z } from "zod";
 const listTablesArguments = z.object({
-    organizationId: z
+    catalogName: z
         .string()
         .trim()
         .optional()
-        .describe("The unique identifier for the organization."),
-    environmentId: z
+        .describe("The Flink catalog name (environment ID, e.g., env-xxxxx). Omit to use defaults."),
+    organizationId: z
         .string()
         .trim()
         .optional()
-        .describe("The unique identifier for the environment."),
-    computePoolId: z
+        .describe("Confluent Cloud organization ID. Discover via list-organizations."),
+    environmentId: z
         .string()
         .trim()
         .optional()
-        .describe("The id associated with the compute pool in context."),
-    catalogName: z
+        .describe("Confluent Cloud environment ID (env-...) that owns the Flink compute pool. Discover via list-environments."),
+    computePoolId: z
         .string()
         .trim()
         .optional()
-        .describe("The Flink catalog name (environment ID, e.g., env-xxxxx). Omit to use defaults."),
+        .describe("Confluent Cloud Flink compute pool ID (lfcp-...). Discover via list-compute-pools."),
 });
 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 { conn, clientManager } = this.resolveConnection(runtime, toolArguments);
+        const { organization_id, environment_id, compute_pool_id } = this.resolveFlinkRouting(conn, {
+            organizationId,
+            environmentId,
+            computePoolId,
+        });
         const catalog = this.resolveCatalogNameOrError(catalogName, environment_id);
         if (!catalog.ok)
             return catalog.error;

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.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,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"}
+{"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;AA6DvD,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;IAwE1B,aAAa,IAAI,UAAU;CAQ5B"}

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

@@ -4,21 +4,6 @@ import { ToolName } from "../../../../confluent/tools/tool-name.js";
 import { wrapAsPathBasedClient } from "openapi-fetch";
 import { z } from "zod";
 const createFlinkStatementArguments = z.object({
-    organizationId: z
-        .string()
-        .trim()
-        .optional()
-        .describe("The unique identifier for the organization."),
-    environmentId: z
-        .string()
-        .trim()
-        .optional()
-        .describe("The unique identifier for the environment."),
-    computePoolId: z
-        .string()
-        .trim()
-        .optional()
-        .describe("The id associated with the compute pool in context."),
     statement: z
         .string()
         .nonempty()
@@ -40,17 +25,37 @@ const createFlinkStatementArguments = z.object({
         .trim()
         .optional()
         .describe("The database name to be used for the statement. Typically the Kafka cluster name."),
+    organizationId: z
+        .string()
+        .trim()
+        .optional()
+        .describe("Confluent Cloud organization ID. Discover via list-organizations."),
+    environmentId: z
+        .string()
+        .trim()
+        .optional()
+        .describe("Confluent Cloud environment ID (env-...) that owns the Flink compute pool. Discover via list-environments."),
+    computePoolId: z
+        .string()
+        .trim()
+        .optional()
+        .describe("Confluent Cloud Flink compute pool ID (lfcp-...). Discover via list-compute-pools."),
 });
 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 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 { conn, clientManager } = this.resolveConnection(runtime, toolArguments);
+        const { organization_id, environment_id, compute_pool_id } = this.resolveFlinkRouting(conn, {
+            organizationId,
+            environmentId,
+            computePoolId,
+        });
+        // resolveFlinkRouting already asserted the flink block on direct, so
+        // getFlinkDirectConfig keeps that invariant explicit here.
+        const flink = conn.type === "direct" ? this.getFlinkDirectConfig(conn) : undefined;
+        const resolvedCatalogName = this.resolveOptionalParam(catalogName, flink?.catalog_name);
+        const resolvedDatabaseName = this.resolveOptionalParam(databaseName, flink?.database_name);
+        const pathBasedClient = wrapAsPathBasedClient(await clientManager.getFlinkRestClient(compute_pool_id, environment_id));
         const { data: response, error } = await pathBasedClient["/sql/v1/organizations/{organization_id}/environments/{environment_id}/statements"].POST({
             params: {
                 path: {

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":"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"}
+{"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,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;IACH,cAAc,EAAE,CAAC;SACd,MAAM,EAAE;SACR,IAAI,EAAE;SACN,QAAQ,EAAE;SACV,QAAQ,CACP,mEAAmE,CACpE;IACH,aAAa,EAAE,CAAC;SACb,MAAM,EAAE;SACR,IAAI,EAAE;SACN,QAAQ,EAAE;SACV,QAAQ,CACP,4GAA4G,CAC7G;IACH,aAAa,EAAE,CAAC;SACb,MAAM,EAAE;SACR,IAAI,EAAE;SACN,QAAQ,EAAE;SACV,QAAQ,CACP,oFAAoF,CACrF;CACJ,CAAC,CAAC;AAEH,MAAM,OAAO,2BAA4B,SAAQ,gBAAgB;IAC/D,KAAK,CAAC,MAAM,CACV,OAAsB,EACtB,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,IAAI,EAAE,aAAa,EAAE,GAAG,IAAI,CAAC,iBAAiB,CACpD,OAAO,EACP,aAAa,CACd,CAAC;QACF,MAAM,EAAE,eAAe,EAAE,cAAc,EAAE,eAAe,EAAE,GACxD,IAAI,CAAC,mBAAmB,CAAC,IAAI,EAAE;YAC7B,cAAc;YACd,aAAa;YACb,aAAa;SACd,CAAC,CAAC;QACL,qEAAqE;QACrE,2DAA2D;QAC3D,MAAM,KAAK,GACT,IAAI,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACvE,MAAM,mBAAmB,GAAG,IAAI,CAAC,oBAAoB,CACnD,WAAW,EACX,KAAK,EAAE,YAAY,CACpB,CAAC;QACF,MAAM,oBAAoB,GAAG,IAAI,CAAC,oBAAoB,CACpD,YAAY,EACZ,KAAK,EAAE,aAAa,CACrB,CAAC;QAEF,MAAM,eAAe,GAAG,qBAAqB,CAC3C,MAAM,aAAa,CAAC,kBAAkB,CAAC,eAAe,EAAE,cAAc,CAAC,CACxE,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.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,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"}
+{"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;AAwCvD,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;IAsC1B,aAAa,IAAI,UAAU;CAQ5B"}

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

@@ -4,30 +4,38 @@ import { ToolName } from "../../../../confluent/tools/tool-name.js";
 import { wrapAsPathBasedClient } from "openapi-fetch";
 import { z } from "zod";
 const deleteFlinkStatementArguments = z.object({
+    statementName: z
+        .string()
+        .regex(new RegExp("[a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*"))
+        .nonempty()
+        .max(100)
+        .describe("The user provided name of the resource, unique within this environment."),
     organizationId: z
         .string()
         .trim()
         .optional()
-        .describe("The unique identifier for the organization."),
+        .describe("Confluent Cloud organization ID. Discover via list-organizations."),
     environmentId: z
         .string()
         .trim()
         .optional()
-        .describe("The unique identifier for the environment."),
-    statementName: z
+        .describe("Confluent Cloud environment ID (env-...) that owns the Flink compute pool. Discover via list-environments."),
+    computePoolId: z
         .string()
-        .regex(new RegExp("[a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*"))
-        .nonempty()
-        .max(100)
-        .describe("The user provided name of the resource, unique within this environment."),
+        .trim()
+        .optional()
+        .describe("Confluent Cloud Flink compute pool ID (lfcp-...). Discover via list-compute-pools."),
 });
 export class DeleteFlinkStatementHandler extends FlinkToolHandler {
     async handle(runtime, toolArguments) {
-        const clientManager = runtime.clientManager;
-        const { statementName, environmentId, organizationId } = deleteFlinkStatementArguments.parse(toolArguments);
-        const flink = this.getFlinkDirectConfig(runtime.config);
-        const { organization_id, environment_id } = this.resolveOrgAndEnvIds(flink, organizationId, environmentId);
-        const pathBasedClient = wrapAsPathBasedClient(clientManager.getConfluentCloudFlinkRestClient());
+        const { statementName, environmentId, organizationId, computePoolId } = deleteFlinkStatementArguments.parse(toolArguments);
+        const { conn, clientManager } = this.resolveConnection(runtime, toolArguments);
+        const { organization_id, environment_id, compute_pool_id } = this.resolveFlinkRouting(conn, {
+            organizationId,
+            environmentId,
+            computePoolId,
+        });
+        const pathBasedClient = wrapAsPathBasedClient(await clientManager.getFlinkRestClient(compute_pool_id, environment_id));
         const { response, error } = await pathBasedClient["/sql/v1/organizations/{organization_id}/environments/{environment_id}/statements/{statement_name}"].DELETE({
             params: {
                 path: {

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,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"}
+{"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,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,cAAc,EAAE,CAAC;SACd,MAAM,EAAE;SACR,IAAI,EAAE;SACN,QAAQ,EAAE;SACV,QAAQ,CACP,mEAAmE,CACpE;IACH,aAAa,EAAE,CAAC;SACb,MAAM,EAAE;SACR,IAAI,EAAE;SACN,QAAQ,EAAE;SACV,QAAQ,CACP,4GAA4G,CAC7G;IACH,aAAa,EAAE,CAAC;SACb,MAAM,EAAE;SACR,IAAI,EAAE;SACN,QAAQ,EAAE;SACV,QAAQ,CACP,oFAAoF,CACrF;CACJ,CAAC,CAAC;AAEH,MAAM,OAAO,2BAA4B,SAAQ,gBAAgB;IAC/D,KAAK,CAAC,MAAM,CACV,OAAsB,EACtB,aAAkD;QAElD,MAAM,EAAE,aAAa,EAAE,aAAa,EAAE,cAAc,EAAE,aAAa,EAAE,GACnE,6BAA6B,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;QACrD,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,GAAG,IAAI,CAAC,iBAAiB,CACpD,OAAO,EACP,aAAa,CACd,CAAC;QACF,MAAM,EAAE,eAAe,EAAE,cAAc,EAAE,eAAe,EAAE,GACxD,IAAI,CAAC,mBAAmB,CAAC,IAAI,EAAE;YAC7B,cAAc;YACd,aAAa;YACb,aAAa;SACd,CAAC,CAAC;QAEL,MAAM,eAAe,GAAG,qBAAqB,CAC3C,MAAM,aAAa,CAAC,kBAAkB,CAAC,eAAe,EAAE,cAAc,CAAC,CACxE,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.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,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"}
+{"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;AAmDvD,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;IAqH1B,aAAa,IAAI,UAAU;CAS5B"}

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

@@ -4,30 +4,38 @@ import { ToolName } from "../../../../../confluent/tools/tool-name.js";
 import { wrapAsPathBasedClient } from "openapi-fetch";
 import { z } from "zod";
 const checkHealthArguments = z.object({
+    statementName: z
+        .string()
+        .regex(new RegExp("[a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*"))
+        .nonempty()
+        .max(100)
+        .describe("The name of the Flink SQL statement to check health for."),
     organizationId: z
         .string()
         .trim()
         .optional()
-        .describe("The unique identifier for the organization."),
+        .describe("Confluent Cloud organization ID. Discover via list-organizations."),
     environmentId: z
         .string()
         .trim()
         .optional()
-        .describe("The unique identifier for the environment."),
-    statementName: z
+        .describe("Confluent Cloud environment ID (env-...) that owns the Flink compute pool. Discover via list-environments."),
+    computePoolId: z
         .string()
-        .regex(new RegExp("[a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*"))
-        .nonempty()
-        .max(100)
-        .describe("The name of the Flink SQL statement to check health for."),
+        .trim()
+        .optional()
+        .describe("Confluent Cloud Flink compute pool ID (lfcp-...). Discover via list-compute-pools."),
 });
 export class CheckHealthHandler extends FlinkToolHandler {
     async handle(runtime, toolArguments) {
-        const clientManager = runtime.clientManager;
-        const { statementName, environmentId, organizationId } = checkHealthArguments.parse(toolArguments);
-        const flink = this.getFlinkDirectConfig(runtime.config);
-        const { organization_id, environment_id } = this.resolveOrgAndEnvIds(flink, organizationId, environmentId);
-        const pathBasedClient = wrapAsPathBasedClient(clientManager.getConfluentCloudFlinkRestClient());
+        const { statementName, environmentId, organizationId, computePoolId } = checkHealthArguments.parse(toolArguments);
+        const { conn, clientManager } = this.resolveConnection(runtime, toolArguments);
+        const { organization_id, environment_id, compute_pool_id } = this.resolveFlinkRouting(conn, {
+            organizationId,
+            environmentId,
+            computePoolId,
+        });
+        const pathBasedClient = wrapAsPathBasedClient(await clientManager.getFlinkRestClient(compute_pool_id, environment_id));
         // Get statement status
         const { data: statementData, error: statusError } = await pathBasedClient["/sql/v1/organizations/{organization_id}/environments/{environment_id}/statements/{statement_name}"].GET({
             params: {

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.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,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"}
+{"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;AAmDvD,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;IAmQ1B,aAAa,IAAI,UAAU;CAS5B"}