@salesforce/mcp 0.27.1 → 0.28.1

package/lib/index.d.ts

@@ -4,7 +4,7 @@ export default class McpServerCommand extends Command {
     static description: string;
     static flags: {
         orgs: import("@oclif/core/interfaces").OptionFlag<string[], import("@oclif/core/interfaces").CustomOptions>;
-        toolsets: import("@oclif/core/interfaces").OptionFlag<(import("@salesforce/mcp-provider-api/src/enums.js").Toolset | "all")[] | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        toolsets: import("@oclif/core/interfaces").OptionFlag<(import("@salesforce/mcp-provider-api").Toolset | "all")[] | undefined, import("@oclif/core/interfaces").CustomOptions>;
         tools: import("@oclif/core/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/interfaces").CustomOptions>;
         version: import("@oclif/core/interfaces").BooleanFlag<void>;
         'no-telemetry': import("@oclif/core/interfaces").BooleanFlag<boolean>;

package/lib/sf-mcp-server.d.ts

@@ -46,5 +46,16 @@ export declare class SfMcpServer extends McpServer implements ToolMethodSignatur
         outputSchema?: OutputArgs;
         annotations?: ToolAnnotations;
     }, cb: ToolCallback<InputArgs>): RegisteredTool;
+    /**
+     * Calculates the total character count from tool result content and structured output.
+     * Used for token usage. Accounts for both:
+     * - content: text (and other) content items
+     * - structuredContent: structured tool output when the tool defines an outputSchema
+     *
+     * @see https://modelcontextprotocol.io/specification/2025-11-25/server/tools#output-schema
+     * @param result - The CallToolResult from tool execution
+     * @returns Total character count across text content and structured content
+     */
+    private calculateResponseCharCount;
 }
 export {};

package/lib/sf-mcp-server.js

@@ -86,6 +86,14 @@ export class SfMcpServer extends McpServer {
             this.logger.debug(`Tool ${name} completed in ${runtimeMs}ms`);
             if (result.isError)
                 this.logger.debug(`Tool ${name} errored`);
+            // Calculate response character count for token usage (never let telemetry instrumentation fail a tool call)
+            let responseCharCount = 0;
+            try {
+                responseCharCount = this.calculateResponseCharCount(result);
+            }
+            catch (err) {
+                // never let telemetry instrumentation fail a tool call
+            }
             this.telemetry?.sendEvent('TOOL_CALLED', {
                 name,
                 runtimeMs,
@@ -96,6 +104,7 @@ export class SfMcpServer extends McpServer {
                 //
                 // https://modelcontextprotocol.io/specification/2025-06-18/schema#calltoolresult
                 isError: result.isError ?? false,
+                responseCharCount: responseCharCount.toString(),
             });
             this.telemetry?.sendPdpEvent({
                 eventName: 'salesforceMcp.executed',
@@ -107,5 +116,35 @@ export class SfMcpServer extends McpServer {
         const tool = super.registerTool(name, config, wrappedCb);
         return tool;
     }
+    /**
+     * Calculates the total character count from tool result content and structured output.
+     * Used for token usage. Accounts for both:
+     * - content: text (and other) content items
+     * - structuredContent: structured tool output when the tool defines an outputSchema
+     *
+     * @see https://modelcontextprotocol.io/specification/2025-11-25/server/tools#output-schema
+     * @param result - The CallToolResult from tool execution
+     * @returns Total character count across text content and structured content
+     */
+    calculateResponseCharCount(result) {
+        let total = 0;
+        // Plain text (and other) content items
+        if (result.content && Array.isArray(result.content)) {
+            total += result.content
+                .filter((item) => item.type === 'text')
+                .reduce((sum, item) => sum + item.text.length, 0);
+        }
+        // Structured content (JSON object per outputSchema)
+        const structured = result.structuredContent;
+        if (structured !== undefined && structured !== null && typeof structured === 'object') {
+            try {
+                total += JSON.stringify(structured).length;
+            }
+            catch {
+                // ignore serialization errors
+            }
+        }
+        return total;
+    }
 }
 //# sourceMappingURL=sf-mcp-server.js.map