@confluentinc/mcp-confluent 1.2.1 → 1.3.0

package/dist/confluent/tools/handlers/docs/search-product-docs-handler.js

@@ -0,0 +1,285 @@
+import { nodeFetch } from "../../../../confluent/node-deps.js";
+import { BaseToolHandler, READ_ONLY, } from "../../../../confluent/tools/base-tools.js";
+import { alwaysEnabled } from "../../../../confluent/tools/connection-predicates.js";
+import { ToolName } from "../../../../confluent/tools/tool-name.js";
+import { logger } from "../../../../logger.js";
+import { z } from "zod";
+// Public search-only key from docs.confluent.io frontend; safe to hardcode.
+const SWIFTYPE_ENGINE_KEY = "FbBthqzRNii8B32is9R2";
+const SWIFTYPE_SEARCH_URL = "https://search-api.swiftype.com/api/v1/public/engines/search.json";
+const DEVELOPER_SEARCH_URL = "https://developer.confluent.io/api/search";
+const SUPPORT_SEARCH_URL = "https://support.confluent.io/api/v2/help_center/articles/search.json";
+const ALLOWED_HOSTS = new Set([
+    "docs.confluent.io",
+    "developer.confluent.io",
+    "support.confluent.io",
+]);
+const DEVELOPER_CONTENT_TYPES = [
+    "documentation",
+    "tutorial",
+    "course",
+    "article",
+    "quickstart",
+    "recipe",
+    "pattern",
+    "faq",
+];
+const DESCRIPTION_MAX_LENGTH = 300;
+const USER_AGENT = "mcp-confluent/search-product-docs";
+const REQUEST_TIMEOUT_MS = 10_000;
+const searchProductDocsArguments = z.object({
+    query: z
+        .string()
+        .trim()
+        .min(1)
+        .describe("Keyword or phrase to search for in Confluent product docs."),
+    limit: z.coerce
+        .number()
+        .int()
+        .positive()
+        .max(50)
+        .default(10)
+        .describe("Maximum number of results to return (1-50, default 10)."),
+});
+export class SearchProductDocsHandler extends BaseToolHandler {
+    async handle(_runtime, toolArguments) {
+        const { query, limit } = searchProductDocsArguments.parse(toolArguments);
+        const [docsSettled, developerSettled, supportSettled] = await Promise.allSettled([
+            this.searchSwiftype(query, limit),
+            this.searchDeveloperProxy(query, limit),
+            this.searchSupportZendesk(query, limit),
+        ]);
+        const warnings = [];
+        // Whichever backend pushes into a bucket first leads it.
+        // dev-proxy is curated, so its hits outrank Swiftype's; Swiftype fills gaps.
+        const all = [
+            ...extractResults(developerSettled, "developer.confluent.io", warnings),
+            ...extractResults(supportSettled, "support.confluent.io", warnings),
+            ...extractResults(docsSettled, "docs.confluent.io", warnings),
+        ];
+        // Bucket by URL hostname, not backend: Swiftype indexes *.confluent.io
+        // and dev-proxy returns docs URLs, so backend→bucket would starve slots.
+        const buckets = {
+            "docs.confluent.io": [],
+            "developer.confluent.io": [],
+            "support.confluent.io": [],
+        };
+        for (const r of all)
+            buckets[r.source].push(r);
+        const merged = interleaveAndDedupe([
+            buckets["docs.confluent.io"],
+            buckets["developer.confluent.io"],
+            buckets["support.confluent.io"],
+        ], limit);
+        const payload = { results: merged, warnings };
+        if (merged.length === 0) {
+            payload.message = `No results found for "${query}".`;
+        }
+        return this.createResponse(JSON.stringify(payload, null, 2), merged.length === 0 && warnings.length > 0);
+    }
+    async searchSwiftype(query, limit) {
+        // Over-fetch: host-filtering may drop hits before we reach `limit`.
+        const params = new URLSearchParams({
+            engine_key: SWIFTYPE_ENGINE_KEY,
+            q: query,
+            per_page: String(Math.min(50, limit * 3)),
+            page: "1",
+        });
+        const json = await fetchSourceJson(`${SWIFTYPE_SEARCH_URL}?${params.toString()}`, { headers: { "user-agent": USER_AGENT, accept: "application/json" } }, "Swiftype");
+        const hits = json.records?.page ?? [];
+        return hits
+            .map((h) => {
+            const url = typeof h.url === "string" ? h.url : "";
+            const source = sourceForUrl(url);
+            if (source === null)
+                return null;
+            return {
+                title: coerceTitle(h.title) ?? url,
+                url,
+                description: buildDescription(h.highlight?.body, h.body),
+                source,
+            };
+        })
+            .filter((r) => r !== null);
+    }
+    async searchDeveloperProxy(query, limit) {
+        const json = await fetchSourceJson(DEVELOPER_SEARCH_URL, {
+            method: "POST",
+            headers: {
+                "content-type": "application/json",
+                "user-agent": USER_AGENT,
+                accept: "application/json",
+            },
+            body: JSON.stringify({
+                query,
+                page: 1,
+                perPage: limit,
+                contentTypes: DEVELOPER_CONTENT_TYPES,
+            }),
+        }, "developer.confluent.io /api/search");
+        const results = [];
+        for (const contentType of DEVELOPER_CONTENT_TYPES) {
+            const items = json[contentType]?.items ?? [];
+            for (const item of items) {
+                const url = typeof item.url === "string" ? item.url : "";
+                const source = sourceForUrl(url);
+                if (source === null)
+                    continue;
+                results.push({
+                    title: coerceTitle(item.title) ?? url,
+                    url,
+                    description: buildDescription(item.highlight?.body, item.description, item.body),
+                    source,
+                });
+            }
+        }
+        return results;
+    }
+    /** Zendesk Help Center public search API — no auth, support hits only. */
+    async searchSupportZendesk(query, limit) {
+        const params = new URLSearchParams({
+            query,
+            per_page: String(limit),
+        });
+        const json = await fetchSourceJson(`${SUPPORT_SEARCH_URL}?${params.toString()}`, { headers: { "user-agent": USER_AGENT, accept: "application/json" } }, "Zendesk");
+        const hits = json.results ?? [];
+        return hits
+            .map((h) => {
+            const url = typeof h.html_url === "string" ? h.html_url : "";
+            const source = sourceForUrl(url);
+            if (source === null)
+                return null;
+            return {
+                title: coerceTitle(h.title) ?? url,
+                url,
+                description: buildDescription(h.snippet, h.body),
+                source,
+            };
+        })
+            .filter((r) => r !== null);
+    }
+    getToolConfig() {
+        return {
+            name: ToolName.SEARCH_PRODUCT_DOCS,
+            description: "Search Confluent product documentation (docs.confluent.io, developer.confluent.io, support.confluent.io) by keyword.",
+            inputSchema: searchProductDocsArguments.shape,
+            annotations: READ_ONLY,
+        };
+    }
+    // No service-block requirement; enabled on any connection.
+    predicate = alwaysEnabled;
+}
+/** Fetches JSON with a timeout. Errors are rethrown prefixed with `label`. */
+async function fetchSourceJson(url, init, label) {
+    let response;
+    try {
+        response = await nodeFetch.fetch(url, {
+            ...init,
+            signal: AbortSignal.timeout(REQUEST_TIMEOUT_MS),
+        });
+    }
+    catch (err) {
+        if (err instanceof Error && err.name === "TimeoutError") {
+            throw new Error(`${label} timed out after ${REQUEST_TIMEOUT_MS}ms`);
+        }
+        throw err;
+    }
+    if (!response.ok) {
+        throw new Error(`${label} ${response.status} ${response.statusText}`);
+    }
+    return (await response.json());
+}
+function extractResults(settled, source, warnings) {
+    if (settled.status === "fulfilled")
+        return settled.value;
+    const reason = settled.reason instanceof Error
+        ? settled.reason.message
+        : String(settled.reason);
+    warnings.push(`${source} search failed: ${reason}`);
+    logger.warn({ source, reason }, "search-product-docs source failed");
+    return [];
+}
+// Indices into [docs, developer, support]: docs and dev get 2× weight, support 1×.
+const PICKUP_PATTERN = [0, 1, 1, 0, 2];
+/** Interleaves sources per PICKUP_PATTERN, dedupes by URL, stops at `limit`. */
+function interleaveAndDedupe(sources, limit) {
+    const seen = new Set();
+    const out = [];
+    const indices = sources.map(() => 0);
+    let progressed = true;
+    while (out.length < limit && progressed) {
+        progressed = false;
+        for (const s of PICKUP_PATTERN) {
+            if (out.length >= limit)
+                break;
+            const list = sources[s];
+            while (indices[s] < list.length) {
+                const r = list[indices[s]++];
+                progressed = true;
+                if (!seen.has(r.url)) {
+                    seen.add(r.url);
+                    out.push(r);
+                    break;
+                }
+            }
+        }
+    }
+    return out;
+}
+function sourceForUrl(url) {
+    try {
+        const parsed = new URL(url);
+        if (parsed.protocol !== "https:")
+            return null;
+        if (ALLOWED_HOSTS.has(parsed.hostname))
+            return parsed.hostname;
+        return null;
+    }
+    catch {
+        return null;
+    }
+}
+/**
+ * Title may be a string or a `[seo, display]` array; pick the shorter one
+ * (usually the cleaner display title). Returns null if no usable title.
+ */
+function coerceTitle(title) {
+    if (typeof title === "string")
+        return title.trim() || null;
+    if (Array.isArray(title)) {
+        const strings = title.filter((t) => typeof t === "string");
+        if (strings.length === 0)
+            return null;
+        const sorted = [...strings].sort((a, b) => a.length - b.length);
+        return sorted[0].trim() || null;
+    }
+    return null;
+}
+function buildDescription(...candidates) {
+    for (const candidate of candidates) {
+        if (!candidate)
+            continue;
+        const cleaned = stripHtmlAndCollapse(candidate);
+        if (cleaned.length > 0)
+            return truncate(cleaned, DESCRIPTION_MAX_LENGTH);
+    }
+    return "";
+}
+function stripHtmlAndCollapse(html) {
+    return html
+        .replaceAll(/<[^>]+>/g, " ")
+        .replaceAll("&nbsp;", " ")
+        .replaceAll("&amp;", "&")
+        .replaceAll("&lt;", "<")
+        .replaceAll("&gt;", ">")
+        .replaceAll("&quot;", '"')
+        .replaceAll("&#39;", "'")
+        .replaceAll(/\s+/g, " ")
+        .trim();
+}
+function truncate(text, max) {
+    if (text.length <= max)
+        return text;
+    return text.slice(0, max - 1).trimEnd() + "…";
+}
+//# sourceMappingURL=search-product-docs-handler.js.map

package/dist/confluent/tools/handlers/docs/search-product-docs-handler.js.map

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

package/dist/confluent/tools/handlers/environments/list-environments-handler.d.ts

@@ -1,7 +1,6 @@
-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";
+import { ServerRuntime } from "../../../../server-runtime.js";
 import { z } from "zod";
 /**
  * Schema for validating Confluent Cloud environment responses
@@ -52,9 +51,8 @@ export declare const environmentListSchema: z.ZodObject<{
 export type Environment = z.infer<typeof environmentSchema>;
 export type EnvironmentList = z.infer<typeof environmentListSchema>;
 export declare class ListEnvironmentsHandler extends BaseToolHandler {
-    handle(clientManager: ClientManager, toolArguments: Record<string, unknown>): Promise<CallToolResult>;
+    handle(runtime: ServerRuntime, toolArguments: Record<string, unknown>): Promise<CallToolResult>;
     getToolConfig(): ToolConfig;
-    getRequiredEnvVars(): EnvVar[];
-    isConfluentCloudOnly(): boolean;
+    readonly predicate: import("../../../../confluent/tools/connection-predicates.js").ConnectionPredicate;
 }
 //# sourceMappingURL=list-environments-handler.d.ts.map

package/dist/confluent/tools/handlers/environments/list-environments-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"list-environments-handler.d.ts","sourceRoot":"","sources":["../../../../../src/confluent/tools/handlers/environments/list-environments-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AACjE,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EACL,eAAe,EACf,UAAU,EACX,MAAM,oCAAoC,CAAC;AAE5C,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAI5C,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAexB;;GAEG;AACH,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;iBAiB5B,CAAC;AAEH,eAAO,MAAM,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;;iBAahC,CAAC;AAEH,MAAM,MAAM,WAAW,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAC5D,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,qBAAqB,CAAC,CAAC;AAEpE,qBAAa,uBAAwB,SAAQ,eAAe;IACpD,MAAM,CACV,aAAa,EAAE,aAAa,EAC5B,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACrC,OAAO,CAAC,cAAc,CAAC;IAuG1B,aAAa,IAAI,UAAU;IAS3B,kBAAkB,IAAI,MAAM,EAAE;IAI9B,oBAAoB,IAAI,OAAO;CAGhC"}
+{"version":3,"file":"list-environments-handler.d.ts","sourceRoot":"","sources":["../../../../../src/confluent/tools/handlers/environments/list-environments-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EACL,eAAe,EAEf,UAAU,EACX,MAAM,oCAAoC,CAAC;AAI5C,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAEvD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AASxB;;GAEG;AACH,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;iBAiB5B,CAAC;AAEH,eAAO,MAAM,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;;iBAahC,CAAC;AAEH,MAAM,MAAM,WAAW,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAC5D,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,qBAAqB,CAAC,CAAC;AAEpE,qBAAa,uBAAwB,SAAQ,eAAe;IACpD,MAAM,CACV,OAAO,EAAE,aAAa,EACtB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACrC,OAAO,CAAC,cAAc,CAAC;IAmG1B,aAAa,IAAI,UAAU;IAS3B,QAAQ,CAAC,SAAS,8EAA4B;CAC/C"}

package/dist/confluent/tools/handlers/environments/list-environments-handler.js

@@ -1,16 +1,10 @@
-import { BaseToolHandler, } from "../../../../confluent/tools/base-tools.js";
+import { BaseToolHandler, READ_ONLY, } from "../../../../confluent/tools/base-tools.js";
+import { hasConfluentCloudOrOAuth } from "../../../../confluent/tools/connection-predicates.js";
 import { ToolName } from "../../../../confluent/tools/tool-name.js";
-import env from "../../../../env.js";
 import { logger } from "../../../../logger.js";
 import { wrapAsPathBasedClient } from "openapi-fetch";
 import { z } from "zod";
 const listEnvironmentsArguments = z.object({
-    baseUrl: z
-        .string()
-        .describe("The base URL of the Confluent Cloud REST API.")
-        .url()
-        .default(() => env.CONFLUENT_CLOUD_REST_ENDPOINT ?? "")
-        .optional(),
     pageToken: z
         .string()
         .optional()
@@ -52,12 +46,10 @@ export const environmentListSchema = z.object({
     data: z.array(environmentSchema),
 });
 export class ListEnvironmentsHandler extends BaseToolHandler {
-    async handle(clientManager, toolArguments) {
-        const { baseUrl, pageToken } = listEnvironmentsArguments.parse(toolArguments);
+    async handle(runtime, toolArguments) {
+        const clientManager = runtime.clientManager;
+        const { pageToken } = listEnvironmentsArguments.parse(toolArguments);
         try {
-            if (baseUrl !== undefined && baseUrl !== "") {
-                clientManager.setConfluentCloudRestEndpoint(baseUrl);
-            }
             const pathBasedClient = wrapAsPathBasedClient(clientManager.getConfluentCloudRestClient());
             const { data: response, error } = await pathBasedClient["/org/v2/environments"].GET({
                 params: {
@@ -125,13 +117,9 @@ Pagination:${metadata.total_size ? `\n  Total Environments: ${metadata.total_siz
             name: ToolName.LIST_ENVIRONMENTS,
             description: "Get all environments in Confluent Cloud with pagination support",
             inputSchema: listEnvironmentsArguments.shape,
+            annotations: READ_ONLY,
         };
     }
-    getRequiredEnvVars() {
-        return ["CONFLUENT_CLOUD_API_KEY", "CONFLUENT_CLOUD_API_SECRET"];
-    }
-    isConfluentCloudOnly() {
-        return true;
-    }
+    predicate = hasConfluentCloudOrOAuth;
 }
 //# sourceMappingURL=list-environments-handler.js.map

package/dist/confluent/tools/handlers/environments/list-environments-handler.js.map

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

package/dist/confluent/tools/handlers/environments/read-environment-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";
+import { ServerRuntime } from "../../../../server-runtime.js";
 export declare class ReadEnvironmentHandler extends BaseToolHandler {
-    handle(clientManager: ClientManager, toolArguments: Record<string, unknown>): Promise<CallToolResult>;
+    handle(runtime: ServerRuntime, toolArguments: Record<string, unknown>): Promise<CallToolResult>;
     getToolConfig(): ToolConfig;
-    getRequiredEnvVars(): EnvVar[];
-    isConfluentCloudOnly(): boolean;
+    readonly predicate: import("../../../../confluent/tools/connection-predicates.js").ConnectionPredicate;
 }
 //# sourceMappingURL=read-environment-handler.d.ts.map

package/dist/confluent/tools/handlers/environments/read-environment-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"read-environment-handler.d.ts","sourceRoot":"","sources":["../../../../../src/confluent/tools/handlers/environments/read-environment-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AACjE,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EACL,eAAe,EACf,UAAU,EACX,MAAM,oCAAoC,CAAC;AAM5C,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAmB5C,qBAAa,sBAAuB,SAAQ,eAAe;IACnD,MAAM,CACV,aAAa,EAAE,aAAa,EAC5B,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACrC,OAAO,CAAC,cAAc,CAAC;IAyF1B,aAAa,IAAI,UAAU;IAQ3B,kBAAkB,IAAI,MAAM,EAAE;IAI9B,oBAAoB,IAAI,OAAO;CAGhC"}
+{"version":3,"file":"read-environment-handler.d.ts","sourceRoot":"","sources":["../../../../../src/confluent/tools/handlers/environments/read-environment-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EACL,eAAe,EAEf,UAAU,EACX,MAAM,oCAAoC,CAAC;AAQ5C,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAWvD,qBAAa,sBAAuB,SAAQ,eAAe;IACnD,MAAM,CACV,OAAO,EAAE,aAAa,EACtB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACrC,OAAO,CAAC,cAAc,CAAC;IAqF1B,aAAa,IAAI,UAAU;IAQ3B,QAAQ,CAAC,SAAS,8EAA4B;CAC/C"}

package/dist/confluent/tools/handlers/environments/read-environment-handler.js

@@ -1,29 +1,21 @@
-import { BaseToolHandler, } from "../../../../confluent/tools/base-tools.js";
+import { BaseToolHandler, READ_ONLY, } from "../../../../confluent/tools/base-tools.js";
+import { hasConfluentCloudOrOAuth } from "../../../../confluent/tools/connection-predicates.js";
 import { environmentSchema, } from "../../../../confluent/tools/handlers/environments/list-environments-handler.js";
 import { ToolName } from "../../../../confluent/tools/tool-name.js";
-import env from "../../../../env.js";
 import { logger } from "../../../../logger.js";
 import { wrapAsPathBasedClient } from "openapi-fetch";
 import { z } from "zod";
 const readEnvironmentArguments = z.object({
-    baseUrl: z
-        .string()
-        .describe("The base URL of the Confluent Cloud REST API.")
-        .url()
-        .default(() => env.CONFLUENT_CLOUD_REST_ENDPOINT ?? "")
-        .optional(),
     environmentId: z
         .string()
         .describe("The ID of the environment to retrieve")
         .nonempty(),
 });
 export class ReadEnvironmentHandler extends BaseToolHandler {
-    async handle(clientManager, toolArguments) {
-        const { baseUrl, environmentId } = readEnvironmentArguments.parse(toolArguments);
+    async handle(runtime, toolArguments) {
+        const clientManager = runtime.clientManager;
+        const { environmentId } = readEnvironmentArguments.parse(toolArguments);
         try {
-            if (baseUrl !== undefined && baseUrl !== "") {
-                clientManager.setConfluentCloudRestEndpoint(baseUrl);
-            }
             const pathBasedClient = wrapAsPathBasedClient(clientManager.getConfluentCloudRestClient());
             const { data: response, error } = await pathBasedClient["/org/v2/environments/{id}"].GET({
                 params: {
@@ -79,13 +71,9 @@ Environment: ${environmentDetails.name}
             name: ToolName.READ_ENVIRONMENT,
             description: "Get details of a specific environment by ID",
             inputSchema: readEnvironmentArguments.shape,
+            annotations: READ_ONLY,
         };
     }
-    getRequiredEnvVars() {
-        return ["CONFLUENT_CLOUD_API_KEY", "CONFLUENT_CLOUD_API_SECRET"];
-    }
-    isConfluentCloudOnly() {
-        return true;
-    }
+    predicate = hasConfluentCloudOrOAuth;
 }
 //# sourceMappingURL=read-environment-handler.js.map

package/dist/confluent/tools/handlers/environments/read-environment-handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"read-environment-handler.js","sourceRoot":"","sources":["../../../../../src/confluent/tools/handlers/environments/read-environment-handler.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"read-environment-handler.js","sourceRoot":"","sources":["../../../../../src/confluent/tools/handlers/environments/read-environment-handler.ts"],"names":[],"mappings":"AACA,OAAO,EACL,eAAe,EACf,SAAS,GAEV,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAAE,wBAAwB,EAAE,MAAM,+CAA+C,CAAC;AACzF,OAAO,EAEL,iBAAiB,GAClB,MAAM,yEAAyE,CAAC;AACjF,OAAO,EAAE,QAAQ,EAAE,MAAM,mCAAmC,CAAC;AAC7D,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAExC,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,MAAM,wBAAwB,GAAG,CAAC,CAAC,MAAM,CAAC;IACxC,aAAa,EAAE,CAAC;SACb,MAAM,EAAE;SACR,QAAQ,CAAC,uCAAuC,CAAC;SACjD,QAAQ,EAAE;CACd,CAAC,CAAC;AAEH,MAAM,OAAO,sBAAuB,SAAQ,eAAe;IACzD,KAAK,CAAC,MAAM,CACV,OAAsB,EACtB,aAAsC;QAEtC,MAAM,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;QAC5C,MAAM,EAAE,aAAa,EAAE,GAAG,wBAAwB,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;QAExE,IAAI,CAAC;YACH,MAAM,eAAe,GAAG,qBAAqB,CAC3C,aAAa,CAAC,2BAA2B,EAAE,CAC5C,CAAC;YAEF,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,MAAM,eAAe,CACrD,2BAA2B,CAC5B,CAAC,GAAG,CAAC;gBACJ,MAAM,EAAE;oBACN,IAAI,EAAE;wBACJ,EAAE,EAAE,aAAa;qBAClB;iBACF;aACF,CAAC,CAAC;YAEH,IAAI,KAAK,EAAE,CAAC;gBACV,MAAM,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,EAAE,WAAW,CAAC,CAAC;gBACrC,OAAO,IAAI,CAAC,cAAc,CACxB,gCAAgC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,EACvD,IAAI,EACJ,EAAE,KAAK,EAAE,CACV,CAAC;YACJ,CAAC;YAED,IAAI,CAAC;gBACH,MAAM,oBAAoB,GAAG,iBAAiB,CAAC,KAAK,CAClD,QAAQ,CACM,CAAC;gBACjB,MAAM,kBAAkB,GAAG;oBACzB,WAAW,EAAE,oBAAoB,CAAC,WAAW;oBAC7C,IAAI,EAAE,oBAAoB,CAAC,IAAI;oBAC/B,EAAE,EAAE,oBAAoB,CAAC,EAAE;oBAC3B,IAAI,EAAE,oBAAoB,CAAC,YAAY;oBACvC,QAAQ,EAAE;wBACR,UAAU,EAAE,oBAAoB,CAAC,QAAQ,CAAC,UAAU;wBACpD,UAAU,EAAE,oBAAoB,CAAC,QAAQ,CAAC,UAAU;wBACpD,UAAU,EAAE,oBAAoB,CAAC,QAAQ,CAAC,UAAU;wBACpD,aAAa,EAAE,oBAAoB,CAAC,QAAQ,CAAC,aAAa;wBAC1D,IAAI,EAAE,oBAAoB,CAAC,QAAQ,CAAC,IAAI;qBACzC;oBACD,yBAAyB,EACvB,oBAAoB,CAAC,wBAAwB,EAAE,OAAO;iBACzD,CAAC;gBAEF,MAAM,gBAAgB,GAAG;eAClB,kBAAkB,CAAC,IAAI;iBACrB,kBAAkB,CAAC,WAAW;UACrC,kBAAkB,CAAC,IAAI;QACzB,kBAAkB,CAAC,EAAE;mBACV,kBAAkB,CAAC,QAAQ,CAAC,aAAa;eAC7C,kBAAkB,CAAC,QAAQ,CAAC,IAAI;gBAC/B,kBAAkB,CAAC,QAAQ,CAAC,UAAU;gBACtC,kBAAkB,CAAC,QAAQ,CAAC,UAAU,GAAG,kBAAkB,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,mBAAmB,kBAAkB,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,kBAAkB,CAAC,yBAAyB,CAAC,CAAC,CAAC,kCAAkC,kBAAkB,CAAC,yBAAyB,EAAE,CAAC,CAAC,CAAC,EAAE;CACxS,CAAC;gBAEM,OAAO,IAAI,CAAC,cAAc,CACxB,wCAAwC,gBAAgB,EAAE,EAC1D,KAAK,EACL,EAAE,WAAW,EAAE,kBAAkB,EAAE,CACpC,CAAC;YACJ,CAAC;YAAC,OAAO,eAAe,EAAE,CAAC;gBACzB,MAAM,CAAC,KAAK,CACV,EAAE,KAAK,EAAE,eAAe,EAAE,EAC1B,8BAA8B,CAC/B,CAAC;gBACF,OAAO,IAAI,CAAC,cAAc,CACxB,6BAA6B,eAAe,YAAY,KAAK,CAAC,CAAC,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE,EACnH,IAAI,EACJ,EAAE,KAAK,EAAE,eAAe,EAAE,CAC3B,CAAC;YACJ,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,EAAE,iCAAiC,CAAC,CAAC;YAC3D,OAAO,IAAI,CAAC,cAAc,CACxB,gCAAgC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,EACxF,IAAI,EACJ,EAAE,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAClE,CAAC;QACJ,CAAC;IACH,CAAC;IAED,aAAa;QACX,OAAO;YACL,IAAI,EAAE,QAAQ,CAAC,gBAAgB;YAC/B,WAAW,EAAE,6CAA6C;YAC1D,WAAW,EAAE,wBAAwB,CAAC,KAAK;YAC3C,WAAW,EAAE,SAAS;SACvB,CAAC;IACJ,CAAC;IACQ,SAAS,GAAG,wBAAwB,CAAC;CAC/C"}

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

@@ -1,19 +1,26 @@
-import { ClientManager } from "../../../../../confluent/client-manager.js";
+import type { DirectConnectionConfig } from "../../../../../config/index.js";
+import { BaseClientManager } from "../../../../../confluent/base-client-manager.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 declare function resolveCatalogName(catalogName?: string): string | undefined;
+export declare function resolveCatalogName(catalogName?: string, fallbackEnvId?: string): string | undefined;
 /**
  * Resolves the Flink database name from various inputs.
  *
@@ -25,12 +32,12 @@ export declare function resolveCatalogName(catalogName?: string): string | undef
  *
  * 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 declare function resolveDatabaseName(databaseName?: string): string | undefined;
+export declare function resolveDatabaseName(databaseName?: string, conn?: DirectConnectionConfig): string | undefined;
 export interface CatalogMapping {
     catalogId: string;
     catalogName: string;
@@ -43,7 +50,7 @@ export interface SchemaMapping {
  * Looks up catalog mappings from INFORMATION_SCHEMA.CATALOGS.
  * Returns a 1:1 mapping between environment IDs (CATALOG_ID) and friendly names (CATALOG_NAME).
  */
-export declare function getCatalogMapping(clientManager: ClientManager, catalogName: string, options: {
+export declare function getCatalogMapping(clientManager: BaseClientManager, catalogName: string, options: {
     organizationId: string;
     environmentId: string;
     computePoolId: string;
@@ -60,7 +67,7 @@ export declare function resolveToCatalogName(catalogInput: string, mappings: Cat
  * Looks up schema mappings from INFORMATION_SCHEMA.SCHEMATA.
  * Returns a 1:1 mapping between cluster IDs (SCHEMA_ID) and friendly names (SCHEMA_NAME).
  */
-export declare function getSchemaMapping(clientManager: ClientManager, catalogName: string, options: {
+export declare function getSchemaMapping(clientManager: BaseClientManager, catalogName: string, options: {
     organizationId: string;
     environmentId: string;
     computePoolId: string;

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

@@ -1 +1 @@
-{"version":3,"file":"catalog-resolver.d.ts","sourceRoot":"","sources":["../../../../../../src/confluent/tools/handlers/flink/catalog/catalog-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AAIjE;;;;;;;;;;;;;GAaG;AACH,wBAAgB,kBAAkB,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAQ3E;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,mBAAmB,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAQ7E;AAED,MAAM,WAAW,cAAc;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,aAAa;IAC5B,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED;;;GAGG;AACH,wBAAsB,iBAAiB,CACrC,aAAa,EAAE,aAAa,EAC5B,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE;IACP,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;CACvB,GACA,OAAO,CAAC,cAAc,EAAE,CAAC,CAuB3B;AAED;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAClC,YAAY,EAAE,MAAM,EACpB,QAAQ,EAAE,cAAc,EAAE,GACzB,MAAM,CAWR;AAED;;;GAGG;AACH,wBAAsB,gBAAgB,CACpC,aAAa,EAAE,aAAa,EAC5B,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE;IACP,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;CACvB,GACA,OAAO,CAAC,aAAa,EAAE,CAAC,CAuB1B;AAED;;;;;;;GAOG;AACH,wBAAgB,mBAAmB,CACjC,aAAa,EAAE,MAAM,EACrB,QAAQ,EAAE,aAAa,EAAE,GACxB,MAAM,CAWR"}
+{"version":3,"file":"catalog-resolver.d.ts","sourceRoot":"","sources":["../../../../../../src/confluent/tools/handlers/flink/catalog/catalog-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AACnE,OAAO,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAG1E;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,kBAAkB,CAChC,WAAW,CAAC,EAAE,MAAM,EACpB,aAAa,CAAC,EAAE,MAAM,GACrB,MAAM,GAAG,SAAS,CAQpB;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,mBAAmB,CACjC,YAAY,CAAC,EAAE,MAAM,EACrB,IAAI,CAAC,EAAE,sBAAsB,GAC5B,MAAM,GAAG,SAAS,CAQpB;AAED,MAAM,WAAW,cAAc;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,aAAa;IAC5B,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED;;;GAGG;AACH,wBAAsB,iBAAiB,CACrC,aAAa,EAAE,iBAAiB,EAChC,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE;IACP,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;CACvB,GACA,OAAO,CAAC,cAAc,EAAE,CAAC,CAuB3B;AAED;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAClC,YAAY,EAAE,MAAM,EACpB,QAAQ,EAAE,cAAc,EAAE,GACzB,MAAM,CAWR;AAED;;;GAGG;AACH,wBAAsB,gBAAgB,CACpC,aAAa,EAAE,iBAAiB,EAChC,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE;IACP,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;CACvB,GACA,OAAO,CAAC,aAAa,EAAE,CAAC,CAuB1B;AAED;;;;;;;GAOG;AACH,wBAAgB,mBAAmB,CACjC,aAAa,EAAE,MAAM,EACrB,QAAQ,EAAE,aAAa,EAAE,GACxB,MAAM,CAWR"}