Refactoring changes plus updated tests

Author: allison-grady

packages/b2c-cli/package.json

@@ -77,6 +77,9 @@
     "bin": "b2c",
     "dirname": "b2c",
     "commands": "./dist/commands",
+    "telemetry": {
+      "connectionString": "InstrumentationKey=6fcc215f-0b11-4864-ad5c-3945ae19e2f3;IngestionEndpoint=https://eastus-8.in.applicationinsights.azure.com/;LiveEndpoint=https://eastus.livediagnostics.monitor.azure.com/;ApplicationId=a60f17ec-265a-4dfc-b8df-03a64695697d"
+    },
     "plugins": [
       "@oclif/plugin-help",
       "@oclif/plugin-plugins",

packages/b2c-dx-mcp/package.json

@@ -34,7 +34,10 @@
       "strategy": "single",
       "target": "./dist/commands/mcp.js"
     },
-    "topicSeparator": " "
+    "topicSeparator": " ",
+    "telemetry": {
+      "connectionString": "InstrumentationKey=6fcc215f-0b11-4864-ad5c-3945ae19e2f3;IngestionEndpoint=https://eastus-8.in.applicationinsights.azure.com/;LiveEndpoint=https://eastus.livediagnostics.monitor.azure.com/;ApplicationId=a60f17ec-265a-4dfc-b8df-03a64695697d"
+    }
   },
   "files": [
     "bin",

packages/b2c-dx-mcp/src/commands/mcp.ts

@@ -20,10 +20,12 @@
  * | `--tools` | `SFCC_TOOLS` | Comma-separated individual tools to enable (case-insensitive) |
  * | `--allow-non-ga-tools` | `SFCC_ALLOW_NON_GA_TOOLS` | Enable experimental/non-GA tools |
  *
- * ### Environment Variables (no flag equivalent)
+ * ### Environment Variables for Telemetry
  * | Env Variable | Description |
  * |--------------|-------------|
- * | `SFCC_TELEMETRY` | Set to `false` to disable telemetry collection |
+ * | `SF_DISABLE_TELEMETRY` | Set to `true` to disable telemetry (sf CLI standard) |
+ * | `SFCC_DISABLE_TELEMETRY` | Set to `true` to disable telemetry |
+ * | `SFCC_APP_INSIGHTS_KEY` | Override connection string from package.json |
  *
  * ### MRT Flags (from MrtCommand.baseFlags)
  * | Flag | Env Variable | Description |
@@ -143,12 +145,10 @@ import {
 } from '@salesforce/b2c-tooling-sdk/cli';
 import type {LoadConfigOptions} from '@salesforce/b2c-tooling-sdk/cli';
 import type {ResolvedB2CConfig} from '@salesforce/b2c-tooling-sdk/config';
-import {createTelemetry, type Telemetry} from '@salesforce/b2c-tooling-sdk/telemetry';
 import {StdioServerTransport} from '@modelcontextprotocol/sdk/server/stdio.js';
 import {B2CDxMcpServer} from '../server.js';
 import {Services} from '../services.js';
 import {registerToolsets} from '../registry.js';
-import {APPLICATION_INSIGHTS_CONNECTION_STRING} from '../config.js';
 import {TOOLSETS, type StartupFlags} from '../utils/index.js';
 
 /**
@@ -159,6 +159,7 @@ import {TOOLSETS, type StartupFlags} from '../utils/index.js';
  * - Global flags for config, logging, and debugging
  * - Structured pino logging via `this.logger`
  * - Automatic dw.json loading via `this.resolvedConfig`
+ * - Automatic telemetry initialization via `this.telemetry`
  * - `this.config` - package.json metadata and standard config paths
  */
 export default class McpServerCommand extends BaseCommand<typeof McpServerCommand> {
@@ -254,9 +255,9 @@ export default class McpServerCommand extends BaseCommand<typeof McpServerComman
    * Main entry point - starts the MCP server.
    *
    * Execution flow:
-   * 1. BaseCommand.init() parses flags and loads config
+   * 1. BaseCommand.init() parses flags, loads config, and initializes telemetry
    * 2. Filter and validate toolsets (invalid ones are skipped with warning)
-   * 3. Create B2CDxMcpServer instance
+   * 3. Create B2CDxMcpServer instance with telemetry from BaseCommand
    * 4. Create Services via Services.fromResolvedConfig() using already-resolved config
    * 5. Register tools based on --toolsets and --tools flags
    * 6. Connect to stdio transport (JSON-RPC over stdin/stdout)
@@ -268,6 +269,7 @@ export default class McpServerCommand extends BaseCommand<typeof McpServerComman
    * - `this.flags` - Parsed flags including global flags (config, debug, log-level, etc.)
    * - `this.resolvedConfig` - Loaded dw.json configuration
    * - `this.logger` - Structured pino logger
+   * - `this.telemetry` - Telemetry instance (auto-initialized from package.json config)
    *
    * oclif provides standard config paths via `this.config`:
    * - `this.config.configDir` - User config (~/.config/b2c-dx-mcp)
@@ -288,25 +290,12 @@ export default class McpServerCommand extends BaseCommand<typeof McpServerComman
       workingDirectory: this.flags['working-directory'],
     };
 
-    // Initialize telemetry unless disabled via SFCC_TELEMETRY=false
-    let telemetry: Telemetry | undefined;
-    if (process.env.SFCC_TELEMETRY !== 'false') {
-      telemetry = createTelemetry({
-        project: 'b2c-dx-mcp',
-        appInsightsKey: APPLICATION_INSIGHTS_CONNECTION_STRING,
-        version: this.config.version,
-        initialAttributes: {
-          toolsets: (startupFlags.toolsets ?? []).join(', '),
-        },
-      });
-      await telemetry.start();
-      process.stdin.on('close', (err) => {
-        telemetry?.sendEvent(err ? 'SERVER_STOPPED_ERROR' : 'SERVER_STOPPED_SUCCESS');
-        telemetry?.stop();
-      });
+    // Add toolsets to telemetry attributes
+    if (this.telemetry && startupFlags.toolsets) {
+      this.telemetry.addAttributes({toolsets: startupFlags.toolsets.join(', ')});
     }
 
-    // Create MCP server with telemetry
+    // Create MCP server with telemetry from BaseCommand
     const server = new B2CDxMcpServer(
       {
         name: this.config.name,
@@ -317,7 +306,7 @@ export default class McpServerCommand extends BaseCommand<typeof McpServerComman
           resources: {},
           tools: {},
         },
-        telemetry,
+        telemetry: this.telemetry,
       },
     );
 
@@ -331,6 +320,13 @@ export default class McpServerCommand extends BaseCommand<typeof McpServerComman
     const transport = new StdioServerTransport();
     await server.connect(transport);
 
+    // Track server stop when stdin closes (MCP client disconnects)
+    // Note: The 'close' event has no arguments - it's just a signal that the stream closed
+    process.stdin.on('close', () => {
+      this.telemetry?.sendEvent('SERVER_STOPPED');
+      // Don't call stop() here - let finally() handle telemetry cleanup
+    });
+
     // Log startup message using the structured logger
     this.logger.info({version: this.config.version}, 'MCP Server running on stdio');
   }

packages/b2c-dx-mcp/src/config.ts

@@ -3,37 +3,21 @@
  * SPDX-License-Identifier: Apache-2
  * For full license text, see the license.txt file in the repo root or http://www.apache.org/licenses/LICENSE-2.0
  */
+
 /**
- * Configuration constants.
+ * Configuration module.
+ *
+ * Telemetry configuration has been moved to package.json under oclif.telemetry.connectionString.
+ * Telemetry is now auto-initialized by BaseCommand from the SDK.
+ *
+ * Environment variables for telemetry:
+ * - SF_DISABLE_TELEMETRY=true - Disable telemetry (sf CLI standard)
+ * - SFCC_DISABLE_TELEMETRY=true - Disable telemetry
+ * - SFCC_APP_INSIGHTS_KEY - Override connection string from package.json
  *
  * @module config
  */
 
-const DEFAULT_APPLICATION_INSIGHTS_CONNECTION_STRING =
-  'InstrumentationKey=6fcc215f-0b11-4864-ad5c-3945ae19e2f3;IngestionEndpoint=https://eastus-8.in.applicationinsights.azure.com/;LiveEndpoint=https://eastus.livediagnostics.monitor.azure.com/;ApplicationId=a60f17ec-265a-4dfc-b8df-03a64695697d';
-
-/**
- * Determines if telemetry should be enabled based on environment.
- * Telemetry is disabled in development mode to avoid polluting production data.
- */
-function getConnectionString(): string | undefined {
-  // Allow explicit override via env var
-  if (process.env.B2C_DX_MCP_APP_INSIGHTS_CONNECTION_STRING) {
-    return process.env.B2C_DX_MCP_APP_INSIGHTS_CONNECTION_STRING;
-  }
-
-  // Disable telemetry in development mode
-  if (process.env.NODE_ENV === 'development') {
-    return undefined;
-  }
-
-  return DEFAULT_APPLICATION_INSIGHTS_CONNECTION_STRING;
-}
-
-/**
- * Application Insights connection string for telemetry.
- *
- * Returns undefined in development mode (NODE_ENV=development) to disable telemetry.
- * Can be overridden via the `B2C_DX_MCP_APP_INSIGHTS_CONNECTION_STRING` environment variable.
- */
-export const APPLICATION_INSIGHTS_CONNECTION_STRING = getConnectionString();
+// Export placeholder to satisfy ESLint "no empty files" rule
+// Configuration constants can be added here as needed
+export const CONFIG_MODULE_VERSION = '1.0.0';