Fix for the connector normalisation

Author: shashi-stackone

src/utils/normalize.test.ts

@@ -1,7 +1,11 @@
 import { normalizeActionName } from './normalize';
 
 describe('normalizeActionName', () => {
-	test('strips versioned API name to MCP format', () => {
+	test('prepends connector when actionId has no prefix', () => {
+		expect(normalizeActionName('slack_1.0.0_send_message_global')).toBe('slack_send_message');
+	});
+
+	test('does not duplicate connector when actionId already has prefix', () => {
 		expect(normalizeActionName('calendly_1.0.0_calendly_create_scheduling_link_global')).toBe(
 			'calendly_create_scheduling_link',
 		);
@@ -13,6 +17,12 @@ describe('normalizeActionName', () => {
 		);
 	});
 
+	test('handles actionId without connector prefix and multi-digit version', () => {
+		expect(normalizeActionName('bamboohr_2.10.3_list_employees_global')).toBe(
+			'bamboohr_list_employees',
+		);
+	});
+
 	test('returns input unchanged when no version pattern matches', () => {
 		expect(normalizeActionName('bamboohr_create_employee')).toBe('bamboohr_create_employee');
 	});
@@ -21,15 +31,9 @@ describe('normalizeActionName', () => {
 		expect(normalizeActionName('')).toBe('');
 	});
 
-	test('returns input unchanged when missing _global suffix', () => {
-		expect(normalizeActionName('calendly_1.0.0_calendly_create_link')).toBe(
-			'calendly_1.0.0_calendly_create_link',
-		);
-	});
-
-	test('returns input unchanged for uppercase names', () => {
+	test('handles uppercase connector names', () => {
 		expect(normalizeActionName('Calendly_1.0.0_create_link_global')).toBe(
-			'Calendly_1.0.0_create_link_global',
+			'Calendly_create_link',
 		);
 	});
 
@@ -38,4 +42,16 @@ describe('normalizeActionName', () => {
 			'api2cart_get_products',
 		);
 	});
+
+	test('handles connector with digits and no prefix in actionId', () => {
+		expect(normalizeActionName('api2cart_1.0.0_get_products_global')).toBe(
+			'api2cart_get_products',
+		);
+	});
+
+	test('handles non-global project IDs', () => {
+		expect(normalizeActionName('jira_1.0.0_search_issues_103/dev-56501')).toBe(
+			'jira_search_issues',
+		);
+	});
 });

src/utils/normalize.ts

@@ -1,33 +1,64 @@
 /**
  * Action name normalization utilities.
  *
- * The semantic search API returns versioned action names like:
- *   'calendly_1.0.0_calendly_create_scheduling_link_global'
+ * The semantic search API returns composite IDs like:
+ *   'slack_1.0.0_send_message_global'
  *
- * MCP tools use simplified names:
- *   'calendly_create_scheduling_link'
+ * MCP tools use names like:
+ *   'slack_send_message'
  *
- * This module bridges the two formats.
+ * This module bridges the two formats by extracting the connector
+ * and action parts, then combining them.
  */
 
-const VERSIONED_ACTION_RE = /^[a-z][a-z0-9]*_\d+(?:\.\d+)+_(.+)_global$/;
+const VERSION_RE = /^\d+(?:\.\d+)+$/;
 
 /**
- * Convert semantic search API action name to MCP tool name.
+ * Convert semantic search API composite ID to MCP tool name.
  *
- * @param actionName - The raw action name from the API
+ * Composite ID format: {connector}_{version}_{actionId}_{projectId}
+ *
+ * @param compositeId - The composite ID from the API
  * @returns The normalized MCP-compatible tool name
  *
  * @example
  * ```typescript
+ * normalizeActionName('slack_1.0.0_send_message_global');
+ * // => 'slack_send_message'
+ *
  * normalizeActionName('calendly_1.0.0_calendly_create_scheduling_link_global');
- * // => 'calendly_create_scheduling_link'
+ * // => 'calendly_create_scheduling_link' (no duplicate prefix)
  *
  * normalizeActionName('bamboohr_create_employee');
- * // => 'bamboohr_create_employee' (unchanged)
+ * // => 'bamboohr_create_employee' (unchanged, no version)
  * ```
  */
-export function normalizeActionName(actionName: string): string {
-	const match = VERSIONED_ACTION_RE.exec(actionName);
-	return match ? match[1] : actionName;
+export function normalizeActionName(compositeId: string): string {
+	const parts = compositeId.split('_');
+
+	// Find the version segment (e.g. "1.0.0")
+	let versionIdx = -1;
+	for (let i = 0; i < parts.length; i++) {
+		if (VERSION_RE.test(parts[i])) {
+			versionIdx = i;
+			break;
+		}
+	}
+
+	if (versionIdx < 1) return compositeId;
+
+	const connector = parts.slice(0, versionIdx).join('_');
+
+	// Everything after version, excluding the last segment (projectId)
+	const afterVersion = parts.slice(versionIdx + 1);
+	if (afterVersion.length < 2) return compositeId;
+
+	const actionParts = afterVersion.slice(0, -1); // drop projectId (last segment)
+	const actionId = actionParts.join('_');
+
+	// If actionId already starts with connector prefix, don't duplicate
+	if (actionId.startsWith(`${connector}_`)) {
+		return actionId;
+	}
+	return `${connector}_${actionId}`;
 }