@confluentinc/mcp-confluent 1.4.0 → 1.6.0

package/dist/confluent/tools/handlers/kafka/produce-kafka-message-handler.js

@@ -7,8 +7,8 @@ import { ToolName } from "../../../../confluent/tools/tool-name.js";
 import { z } from "zod";
 const messageOptions = z.object({
     message: z
-        .union([z.object({}).passthrough(), z.string()])
-        .describe("The payload to produce. If using schema registry, this should be an object matching the schema. Otherwise, a string."),
+        .union([z.object({}).passthrough(), z.string(), z.number(), z.boolean()])
+        .describe("The payload to produce. When using schema registry, this should match the schema: an object for record schemas, or a primitive (string/number/boolean) for top-level primitive schemas such as Avro long. Without schema registry, a string is sent raw and anything else is JSON-encoded."),
     useSchemaRegistry: z
         .boolean()
         .optional()
@@ -22,14 +22,46 @@ const messageOptions = z.object({
         .string()
         .optional()
         .describe("Schema definition to register (as JSON string for AVRO/JSON, or .proto for PROTOBUF). If omitted, uses latest registered schema."),
+    messageName: z
+        .string()
+        .optional()
+        .describe("Fully-qualified Protobuf message type to encode the payload as (e.g. com.example.User). Required when schemaType is PROTOBUF; ignored otherwise. Payload keys may use either the proto field name (e.g. user_id) or its camelCase JSON name (e.g. userId)."),
     subject: z
         .string()
         .optional()
         .describe("Schema Registry subject. Defaults to {topicName}-value or {topicName}-key."),
     normalize: z.boolean().optional(),
+    schemaIdLocation: z
+        .enum(["payload", "header"])
+        .optional()
+        .default("payload")
+        .describe('Where the Schema Registry schema identifier is written on the wire when useSchemaRegistry is true. "payload" (default) embeds the integer schema ID as magic bytes at the front of the serialized payload — the standard Confluent wire format. "header" writes the schema GUID (UUID) to the __value_schema_id / __key_schema_id Kafka record header and leaves the payload as bare serialized bytes; the matching consume-messages decode reads it back from the header. Ignored when useSchemaRegistry is false.'),
 });
-const valueOptions = z.object({}).extend(messageOptions.shape);
-const keyOptions = z.object({}).extend(messageOptions.shape);
+// PROTOBUF serialization needs a fully-qualified message type to encode the
+// payload as; AVRO/JSON do not. Surface the requirement in the schema so the
+// contract is visible to callers rather than only failing at serialize time.
+// Only enforce when schema registry is actually in use: with useSchemaRegistry
+// false, schemaType is ignored and the payload is sent raw, so messageName is
+// irrelevant and requiring it would reject otherwise-valid raw produces.
+const requireMessageNameForProtobuf = (opts, ctx) => {
+    if (opts.useSchemaRegistry &&
+        opts.schemaType === "PROTOBUF" &&
+        !opts.messageName) {
+        ctx.addIssue({
+            code: "custom",
+            message: "messageName is required when schemaType is PROTOBUF (e.g. com.example.User).",
+            path: ["messageName"],
+        });
+    }
+};
+const valueOptions = z
+    .object({})
+    .extend(messageOptions.shape)
+    .superRefine(requireMessageNameForProtobuf);
+const keyOptions = z
+    .object({})
+    .extend(messageOptions.shape)
+    .superRefine(requireMessageNameForProtobuf);
 const produceKafkaMessageArguments = z.object({
     topicName: z
         .string()
@@ -45,7 +77,62 @@ const produceKafkaMessageArguments = z.object({
         .string()
         .optional()
         .describe("Confluent Cloud environment ID (env-...) that owns the cluster. Discover via list-environments."),
+    partition: z
+        .number()
+        .int()
+        .min(0)
+        .optional()
+        .describe("Target partition number. If omitted, the producer's partitioner picks one — hashing the record key when one is set, or choosing a partition otherwise (random by default under librdkafka)."),
+    timestamp: z
+        .union([z.string(), z.number().int().min(0)])
+        .optional()
+        .describe('Record timestamp: a Date.parse-able date-time string (ISO 8601 recommended, e.g. "2026-05-14T17:00:00Z") or a non-negative integer ms-since-epoch number. If omitted, the record is stamped with the producer client\'s current time (CreateTime); a topic configured for LogAppendTime instead has the broker override the timestamp on append.'),
+    headers: z
+        .record(z.string(), z.union([z.string(), z.array(z.string())]))
+        .optional()
+        .describe("Kafka record headers as a map of name to a string or array of strings (multi-valued). Sent as raw headers, independent of schema-registry serialization of the key/value."),
 });
+/**
+ * Parse a user-supplied record timestamp into epoch milliseconds, accepting any
+ * Date.parse-able date-time string or a ms-since-epoch number. Returns null when
+ * the value can't be parsed into a finite, non-negative instant — Date.parse maps
+ * pre-1970 date-times to negative ms, which the numeric branch already rejects at
+ * the Zod boundary, so the string branch must reject them too.
+ */
+function toEpochMs(input) {
+    const ms = typeof input === "number" ? input : Date.parse(input);
+    return Number.isFinite(ms) && ms >= 0 ? ms : null;
+}
+/**
+ * Reduce a librdkafka delivery report into user-facing text plus the aggregate
+ * error flag — any record with a non-zero errorCode marks the whole response an
+ * error.
+ */
+function formatDeliveryReport(deliveryReport) {
+    const message = deliveryReport
+        .map((metadata) => metadata.errorCode === 0
+        ? `Message produced successfully to [Topic: ${metadata.topicName}, Partition: ${metadata.partition}, Offset: ${metadata.offset}]`
+        : `Error producing message to [Topic: ${metadata.topicName}, Partition: ${metadata.partition}, Offset: ${metadata.offset} with ErrorCode: ${metadata.errorCode}]`)
+        .join("\n");
+    const isError = deliveryReport.some((metadata) => metadata.errorCode !== 0);
+    return { message, isError };
+}
+/**
+ * Build the producer message from the serialized key/value and the optional
+ * record-level metadata, omitting any field the caller didn't supply.
+ */
+function assembleProducerMessage(parts) {
+    const message = { value: parts.value };
+    if (parts.key !== undefined)
+        message.key = parts.key;
+    if (parts.partition !== undefined)
+        message.partition = parts.partition;
+    if (parts.timestampMs !== undefined)
+        message.timestamp = String(parts.timestampMs);
+    if (parts.headers !== undefined)
+        message.headers = parts.headers;
+    return message;
+}
 /**
  * Handler for producing messages to a Kafka topic, with support for Confluent Schema Registry serialization (AVRO, JSON, PROTOBUF) for both key and value.
  *
@@ -67,6 +154,24 @@ export class ProduceKafkaMessageHandler extends BaseToolHandler {
             return null;
         return this.createResponse(`No schema registered for subject '${result.subject}', and no schema provided to register.`, true);
     }
+    /**
+     * Run the pre-serialization schema check for both sides. Returns an error
+     * CallToolResult when either side needs a registered schema that isn't there
+     * (and none was provided to register), or null when both sides are ready.
+     */
+    async checkSchemasReady(topicName, value, key, registry) {
+        const valueSchemaCheck = await checkSchemaNeeded(topicName, value, SerdeType.VALUE, registry);
+        const valueSchemaResult = this.handleSchemaCheckResult(valueSchemaCheck);
+        if (valueSchemaResult)
+            return valueSchemaResult;
+        if (key) {
+            const keySchemaCheck = await checkSchemaNeeded(topicName, key, SerdeType.KEY, registry);
+            const keySchemaResult = this.handleSchemaCheckResult(keySchemaCheck);
+            if (keySchemaResult)
+                return keySchemaResult;
+        }
+        return null;
+    }
     /**
      * Main handler for producing a message to a Kafka topic, including schema registry logic and serialization.
      * Handles both value and key, and returns a CallToolResult with the outcome.
@@ -76,32 +181,35 @@ export class ProduceKafkaMessageHandler extends BaseToolHandler {
      */
     async handle(runtime, toolArguments) {
         const parsed = produceKafkaMessageArguments.parse(toolArguments);
-        const { topicName, value, key } = parsed;
-        const { connId, clientManager } = this.resolveSoleConnection(runtime);
+        const { topicName, value, key, partition, timestamp, headers } = parsed;
+        const { connId, clientManager } = this.resolveConnection(runtime, toolArguments);
         const resolved = resolveKafkaClusterArgs(parsed, runtime, connId);
+        let timestampMs;
+        if (timestamp !== undefined) {
+            const ms = toEpochMs(timestamp);
+            if (ms === null) {
+                return this.createResponse(`Invalid timestamp '${timestamp}': expected a Date.parse-able date-time string (e.g. ISO 8601) or a non-negative integer ms-since-epoch number.`, true);
+            }
+            timestampMs = ms;
+        }
         const needsRegistry = (value && value.useSchemaRegistry) || (key && key.useSchemaRegistry);
         let registry;
         if (needsRegistry) {
             registry = await clientManager.getSchemaRegistrySdkClient(resolved.envId);
         }
-        // Check for latest schema if needed (value)
-        const valueSchemaCheck = await checkSchemaNeeded(topicName, value, SerdeType.VALUE, registry);
-        const valueSchemaResult = this.handleSchemaCheckResult(valueSchemaCheck);
-        if (valueSchemaResult)
-            return valueSchemaResult;
-        // Check for latest schema if needed (key)
-        if (key) {
-            const keySchemaCheck = await checkSchemaNeeded(topicName, key, SerdeType.KEY, registry);
-            const keySchemaResult = this.handleSchemaCheckResult(keySchemaCheck);
-            if (keySchemaResult)
-                return keySchemaResult;
-        }
+        const schemaIssue = await this.checkSchemasReady(topicName, value, key, registry);
+        if (schemaIssue)
+            return schemaIssue;
+        // One header map per record: seeded from the caller's headers, then handed
+        // to both serialize calls so a schemaIdLocation: "header" side writes its
+        // __value_schema_id / __key_schema_id into the same map the record carries.
+        const recordHeaders = { ...headers };
         let valueToSend;
         let keyToSend;
         try {
-            valueToSend = await serializeMessage(topicName, value, SerdeType.VALUE, registry);
+            valueToSend = await serializeMessage(topicName, value, SerdeType.VALUE, registry, recordHeaders);
             if (key) {
-                keyToSend = await serializeMessage(topicName, key, SerdeType.KEY, registry);
+                keyToSend = await serializeMessage(topicName, key, SerdeType.KEY, registry, recordHeaders);
             }
         }
         catch (err) {
@@ -117,25 +225,23 @@ export class ProduceKafkaMessageHandler extends BaseToolHandler {
                 deliveryReport = await producer.send({
                     topic: topicName,
                     messages: [
-                        typeof keyToSend !== "undefined"
-                            ? { key: keyToSend, value: valueToSend }
-                            : { value: valueToSend },
+                        assembleProducerMessage({
+                            value: valueToSend,
+                            key: keyToSend,
+                            partition,
+                            timestampMs,
+                            headers: Object.keys(recordHeaders).length > 0
+                                ? recordHeaders
+                                : undefined,
+                        }),
                     ],
                 });
             }
             catch (err) {
                 return this.createResponse(`Failed to produce message: ${formatKafkaError(err)}`, true);
             }
-            const formattedResponse = deliveryReport
-                .map((metadata) => {
-                if (metadata.errorCode !== 0) {
-                    return `Error producing message to [Topic: ${metadata.topicName}, Partition: ${metadata.partition}, Offset: ${metadata.offset} with ErrorCode: ${metadata.errorCode}]`;
-                }
-                return `Message produced successfully to [Topic: ${metadata.topicName}, Partition: ${metadata.partition}, Offset: ${metadata.offset}]`;
-            })
-                .join("\n");
-            const isError = deliveryReport.some((metadata) => metadata.errorCode !== 0);
-            return this.createResponse(formattedResponse, isError);
+            const { message, isError } = formatDeliveryReport(deliveryReport);
+            return this.createResponse(message, isError);
         }
         finally {
             await disposeIfOAuth(runtime, connId, producer);
@@ -148,7 +254,7 @@ export class ProduceKafkaMessageHandler extends BaseToolHandler {
     getToolConfig() {
         return {
             name: ToolName.PRODUCE_MESSAGE,
-            description: `Produce records to a Kafka topic. Supports Confluent Schema Registry serialization (AVRO, JSON, PROTOBUF) for both key and value.\n\nBefore producing, check if the topic has a registered schema for <topicName>-value and <topicName>-key. If a schema exists, set useSchemaRegistry to true and specify the appropriate schemaType. If the topic does not exist, it can be created via the ${ToolName.CREATE_TOPICS} tool.`,
+            description: `Produce records to a Kafka topic. Supports Confluent Schema Registry serialization (AVRO, JSON, PROTOBUF) for both key and value, plus optional record-level partition, timestamp, and headers for faithful reproduction of records across clusters.\n\nBefore producing, check if the topic has a registered schema for <topicName>-value and <topicName>-key. If a schema exists, set useSchemaRegistry to true and specify the appropriate schemaType. If the topic does not exist, it can be created via the ${ToolName.CREATE_TOPICS} tool.`,
             inputSchema: produceKafkaMessageArguments.shape,
             annotations: CREATE_UPDATE,
         };

package/dist/confluent/tools/handlers/kafka/produce-kafka-message-handler.js.map

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

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

@@ -1,11 +1,11 @@
-import { CallToolResult } from "../../../../confluent/schema.js";
-import { BaseToolHandler, ToolCategory, ToolConfig } from "../../../../confluent/tools/base-tools.js";
-import { hasTelemetry } from "../../../../confluent/tools/connection-predicates.js";
-import { ServerRuntime } from "../../../../server-runtime.js";
+import type { CallToolResult } from "../../../../confluent/schema.js";
+import type { ToolConfig } from "../../../../confluent/tools/base-tools.js";
+import { BaseToolHandler, ToolCategory } from "../../../../confluent/tools/base-tools.js";
+import type { ServerRuntime } from "../../../../server-runtime.js";
 export declare class ListMetricsHandler extends BaseToolHandler {
     handle(runtime: ServerRuntime, toolArguments: Record<string, unknown>): Promise<CallToolResult>;
     getToolConfig(): ToolConfig;
     readonly category = ToolCategory.Metrics;
-    readonly predicate: typeof hasTelemetry;
+    readonly predicate: import("../../../../confluent/tools/connection-predicates.js").ConnectionPredicate;
 }
 //# sourceMappingURL=list-metrics-handler.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"list-metrics-handler.d.ts","sourceRoot":"","sources":["../../../../../src/confluent/tools/handlers/metrics/list-metrics-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EACL,eAAe,EAEf,YAAY,EACZ,UAAU,EACX,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,+CAA+C,CAAC;AAG7E,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAoIvD,qBAAa,kBAAmB,SAAQ,eAAe;IAC/C,MAAM,CACV,OAAO,EAAE,aAAa,EACtB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACrC,OAAO,CAAC,cAAc,CAAC;IA6G1B,aAAa,IAAI,UAAU;IAS3B,QAAQ,CAAC,QAAQ,wBAAwB;IACzC,QAAQ,CAAC,SAAS,sBAAgB;CACnC"}
+{"version":3,"file":"list-metrics-handler.d.ts","sourceRoot":"","sources":["../../../../../src/confluent/tools/handlers/metrics/list-metrics-handler.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAC;AACrE,OAAO,EACL,eAAe,EAEf,YAAY,EACb,MAAM,oCAAoC,CAAC;AAQ5C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAoI5D,qBAAa,kBAAmB,SAAQ,eAAe;IAC/C,MAAM,CACV,OAAO,EAAE,aAAa,EACtB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACrC,OAAO,CAAC,cAAc,CAAC;IAoC1B,aAAa,IAAI,UAAU;IAS3B,QAAQ,CAAC,QAAQ,wBAAwB;IACzC,QAAQ,CAAC,SAAS,8EAAuB;CAC1C"}

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

@@ -1,5 +1,6 @@
 import { BaseToolHandler, READ_ONLY, ToolCategory, } from "../../../../confluent/tools/base-tools.js";
-import { hasTelemetry } from "../../../../confluent/tools/connection-predicates.js";
+import { hasTelemetryOrOAuth } from "../../../../confluent/tools/connection-predicates.js";
+import { describeTelemetryError, formatHttpStatusPart, } from "../../../../confluent/tools/handlers/metrics/telemetry-error.js";
 import { ToolName } from "../../../../confluent/tools/tool-name.js";
 import { logger } from "../../../../logger.js";
 import { z } from "zod";
@@ -109,72 +110,22 @@ const KAFKA_SERVER_METRICS = [
 ];
 export class ListMetricsHandler extends BaseToolHandler {
     async handle(runtime, toolArguments) {
-        const clientManager = runtime.clientManager;
         const { resource_type } = listMetricsArguments.parse(toolArguments);
+        const { clientManager } = this.resolveConnection(runtime, toolArguments);
         try {
-            const telemetryClient = clientManager.getConfluentCloudTelemetryRestClient();
-            // Fetch both metrics and resources descriptors
-            const [metricsResponse, resourcesResponse] = await Promise.all([
-                telemetryClient.GET("/v2/metrics/{dataset}/descriptors/metrics", { params: { path: { dataset: "cloud" } } }),
-                telemetryClient.GET("/v2/metrics/{dataset}/descriptors/resources", { params: { path: { dataset: "cloud" } } }),
-            ]);
-            const metrics = metricsResponse.data?.data;
-            const resources = resourcesResponse.data?.data;
+            const { metrics, resources } = await fetchDescriptors(clientManager.getConfluentCloudTelemetryRestClient());
             if (!metrics || metrics.length === 0) {
                 return this.createResponse("No metrics descriptors available from the Telemetry API.", true);
             }
-            // Filter by resource type if specified
-            let filteredMetrics = resource_type
-                ? metrics.filter((m) => m.resources.includes(resource_type))
-                : metrics;
-            // The descriptors endpoint may not list Kafka server metrics depending
-            // on API key permissions, but they still work when queried directly.
-            // Include well-known Kafka server metrics as a fallback.
-            if ((!resource_type || resource_type === "kafka") &&
-                !filteredMetrics.some((m) => m.name.startsWith("io.confluent.kafka.server/"))) {
-                const kafkaServerMetrics = KAFKA_SERVER_METRICS.map((m) => ({
-                    ...m,
-                    type: "GAUGE_DOUBLE",
-                    unit: m.unit,
-                    lifecycle_stage: "GENERAL_AVAILABILITY",
-                    resources: ["kafka"],
-                }));
-                filteredMetrics = [...kafkaServerMetrics, ...filteredMetrics];
-            }
-            // Format resources section
-            const lines = [];
-            if (resources && resources.length > 0) {
-                const relevantResources = resource_type
-                    ? resources.filter((r) => r.type === resource_type)
-                    : resources;
-                if (relevantResources.length > 0) {
-                    lines.push("Resource Types and Filter Fields:");
-                    for (const r of relevantResources) {
-                        lines.push(`  ${r.type}: ${r.description}`);
-                        for (const label of r.labels) {
-                            lines.push(`    resource.${label.key} — ${label.description}`);
-                        }
-                    }
-                    lines.push("");
-                }
-            }
-            // Format metrics
-            lines.push(`Available Metrics${resource_type ? ` (${resource_type})` : ""}: ${filteredMetrics.length}`);
-            lines.push("");
-            for (const m of filteredMetrics) {
-                lines.push(`${m.name}`);
-                lines.push(`  ${m.description}`);
-                lines.push(`  Type: ${m.type} | Unit: ${m.unit} | Resources: ${m.resources.join(", ")}`);
-                if (m.labels.length > 0) {
-                    const labelKeys = m.labels.map((l) => `metric.${l.key}`).join(", ");
-                    lines.push(`  Filter/group_by labels: ${labelKeys}`);
-                }
-                lines.push("");
-            }
+            const filteredMetrics = withKafkaServerFallback(filterMetricsByResourceType(metrics, resource_type), resource_type);
+            const lines = [
+                ...formatResourcesSection(resources, resource_type),
+                ...formatMetricsSection(filteredMetrics, resource_type),
+            ];
             return this.createResponse(lines.join("\n").trimEnd());
         }
         catch (error) {
-            logger.error({ error }, "Error in ListMetricsHandler");
+            logger.error({ err: error }, "Error in ListMetricsHandler");
             return this.createResponse(`Failed to list metrics: ${error instanceof Error ? error.message : String(error)}`, true);
         }
     }
@@ -187,6 +138,100 @@ export class ListMetricsHandler extends BaseToolHandler {
         };
     }
     category = ToolCategory.Metrics;
-    predicate = hasTelemetry;
+    predicate = hasTelemetryOrOAuth;
+}
+/**
+ * Fetch the metrics and resources descriptor lists from the Telemetry API in
+ * parallel. Metrics descriptors are essential — an HTTP failure there throws so
+ * `handle()` surfaces the real cause. Resources descriptors are best-effort:
+ * they only feed the optional "Resource Types" section, so a failure there is
+ * logged and the section is omitted rather than failing the whole call.
+ */
+async function fetchDescriptors(telemetryClient) {
+    const [metricsResult, resourcesResult] = await Promise.all([
+        telemetryClient.GET("/v2/metrics/{dataset}/descriptors/metrics", {
+            params: { path: { dataset: "cloud" } },
+        }),
+        telemetryClient.GET("/v2/metrics/{dataset}/descriptors/resources", { params: { path: { dataset: "cloud" } } }),
+    ]);
+    return {
+        metrics: requireDescriptors("metrics", metricsResult),
+        resources: optionalDescriptors("resources", resourcesResult),
+    };
+}
+/**
+ * Return the descriptor payload, throwing an actionable error when the
+ * Telemetry API reported an HTTP-level failure so `handle()` surfaces the real
+ * cause instead of a misleading "no descriptors available" message.
+ */
+function requireDescriptors(kind, result) {
+    if (result.error !== undefined) {
+        const statusPart = formatHttpStatusPart(result.response?.status);
+        throw new Error(`Telemetry API error fetching ${kind} descriptors${statusPart}: ${describeTelemetryError(result.error)}`);
+    }
+    return result.data?.data;
+}
+/**
+ * Return the descriptor payload, or `undefined` (with a logged warning) when
+ * the Telemetry API reported an HTTP-level failure — for best-effort sections
+ * that should degrade gracefully rather than fail the whole call.
+ */
+function optionalDescriptors(kind, result) {
+    if (result.error !== undefined) {
+        logger.warn({ err: result.error, status: result.response?.status, kind }, "Telemetry API descriptors request failed; omitting best-effort section");
+        return undefined;
+    }
+    return result.data?.data;
+}
+function filterMetricsByResourceType(metrics, resourceType) {
+    return resourceType
+        ? metrics.filter((m) => m.resources.includes(resourceType))
+        : metrics;
+}
+/**
+ * Prepend well-known Kafka server metrics when the filtered set covers Kafka
+ * yet lacks them. The descriptors endpoint may omit these depending on API key
+ * permissions, but they remain queryable directly, so we surface them anyway.
+ */
+function withKafkaServerFallback(filteredMetrics, resourceType) {
+    const kafkaInScope = !resourceType || resourceType === "kafka";
+    const alreadyPresent = filteredMetrics.some((m) => m.name.startsWith("io.confluent.kafka.server/"));
+    if (!kafkaInScope || alreadyPresent) {
+        return filteredMetrics;
+    }
+    const kafkaServerMetrics = KAFKA_SERVER_METRICS.map((m) => ({
+        ...m,
+        type: "GAUGE_DOUBLE",
+        unit: m.unit,
+        lifecycle_stage: "GENERAL_AVAILABILITY",
+        resources: ["kafka"],
+    }));
+    return [...kafkaServerMetrics, ...filteredMetrics];
+}
+function formatResourcesSection(resources, resourceType) {
+    const relevantResources = (resources ?? []).filter((r) => !resourceType || r.type === resourceType);
+    if (relevantResources.length === 0) {
+        return [];
+    }
+    const lines = ["Resource Types and Filter Fields:"];
+    for (const r of relevantResources) {
+        lines.push(`  ${r.type}: ${r.description}`);
+        for (const label of r.labels) {
+            lines.push(`    resource.${label.key} — ${label.description}`);
+        }
+    }
+    lines.push("");
+    return lines;
+}
+function formatMetricsSection(filteredMetrics, resourceType) {
+    const scope = resourceType ? ` (${resourceType})` : "";
+    const lines = [`Available Metrics${scope}: ${filteredMetrics.length}`, ""];
+    for (const m of filteredMetrics) {
+        const detail = `  Type: ${m.type} | Unit: ${m.unit} | Resources: ${m.resources.join(", ")}`;
+        const labelKeys = m.labels.map((l) => `metric.${l.key}`).join(", ");
+        const labelLine = m.labels.length > 0 ? [`  Filter/group_by labels: ${labelKeys}`] : [];
+        lines.push(`${m.name}`, `  ${m.description}`, detail, ...labelLine, "");
+    }
+    return lines;
 }
 //# sourceMappingURL=list-metrics-handler.js.map

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

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

package/dist/confluent/tools/handlers/metrics/query-metrics-handler.d.ts

@@ -1,12 +1,12 @@
-import { CallToolResult } from "../../../../confluent/schema.js";
-import { BaseToolHandler, ToolCategory, ToolConfig } from "../../../../confluent/tools/base-tools.js";
-import { hasTelemetry } from "../../../../confluent/tools/connection-predicates.js";
-import { ServerRuntime } from "../../../../server-runtime.js";
+import type { CallToolResult } from "../../../../confluent/schema.js";
+import type { ToolConfig } from "../../../../confluent/tools/base-tools.js";
+import { BaseToolHandler, ToolCategory } from "../../../../confluent/tools/base-tools.js";
+import type { ServerRuntime } from "../../../../server-runtime.js";
 export declare class QueryMetricsHandler extends BaseToolHandler {
     handle(runtime: ServerRuntime, toolArguments: Record<string, unknown>): Promise<CallToolResult>;
     getToolConfig(): ToolConfig;
     readonly category = ToolCategory.Metrics;
-    readonly predicate: typeof hasTelemetry;
+    readonly predicate: import("../../../../confluent/tools/connection-predicates.js").ConnectionPredicate;
 }
 /**
  * Normalises the caller-supplied interval to a "start/end" pair.

package/dist/confluent/tools/handlers/metrics/query-metrics-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"query-metrics-handler.d.ts","sourceRoot":"","sources":["../../../../../src/confluent/tools/handlers/metrics/query-metrics-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EACL,eAAe,EAEf,YAAY,EACZ,UAAU,EACX,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,+CAA+C,CAAC;AAG7E,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AA4DvD,qBAAa,mBAAoB,SAAQ,eAAe;IAChD,MAAM,CACV,OAAO,EAAE,aAAa,EACtB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACrC,OAAO,CAAC,cAAc,CAAC;IA+F1B,aAAa,IAAI,UAAU;IAS3B,QAAQ,CAAC,QAAQ,wBAAwB;IACzC,QAAQ,CAAC,SAAS,sBAAgB;CACnC;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAMpE;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,EAC1C,MAAM,EAAE,MAAM,EACd,kBAAkB,EAAE,MAAM,GAAG,SAAS,GACrC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAmBxB;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,MAAM,EACb,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACvC,QAAQ,EAAE,MAAM,EAAE,GAAG,SAAS,GAC7B,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAkCzB"}
+{"version":3,"file":"query-metrics-handler.d.ts","sourceRoot":"","sources":["../../../../../src/confluent/tools/handlers/metrics/query-metrics-handler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAC;AACrE,OAAO,EACL,eAAe,EAEf,YAAY,EACb,MAAM,oCAAoC,CAAC;AAQ5C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AA4D5D,qBAAa,mBAAoB,SAAQ,eAAe;IAChD,MAAM,CACV,OAAO,EAAE,aAAa,EACtB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACrC,OAAO,CAAC,cAAc,CAAC;IA+G1B,aAAa,IAAI,UAAU;IAS3B,QAAQ,CAAC,QAAQ,wBAAwB;IACzC,QAAQ,CAAC,SAAS,8EAAuB;CAC1C;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAMpE;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,EAC1C,MAAM,EAAE,MAAM,EACd,kBAAkB,EAAE,MAAM,GAAG,SAAS,GACrC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAmBxB;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,MAAM,EACb,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACvC,QAAQ,EAAE,MAAM,EAAE,GAAG,SAAS,GAC7B,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAkCzB"}