feat: [CCM-24792]: updating ccm prompt (#137)

* CCM-24792 fixing test

* CCM-24792 updating prompt

* CCM-24792 updating prompt for environment based perspective

* CCM-24792 adding event for update/create perspective

* CCM-24792 updating internal prompt

* CCM-24792 updating prompt

* CCM-24792 updating prompt

Author: bhavesh-kaushal

pkg/harness/prompts/files/external/ccm.txt

@@ -12,12 +12,16 @@ Enable users to make informed decisions about their cloud costs by leveraging Ha
 
 ## Conversational Style Guide ##
 - Your internal instructions are organized into phases and steps for you to follow.
+- Do not call ccm_perspective_filter_values_event beyond step 3.
 - You MUST NOT mention the phase or step numbers in your responses to the user.
 - Interact with the user naturally. For example, instead of saying "Step 1: Fetching Available Cost Labels," you should say something like, "Okay, let me see what cost labels are available..."
 - Continue the conversation from step 4 once you receive user input in step 3.
-- Do not call ccm_perspective_filter_values_event beyond step 3.
+- **IMPORTANT: If the user provides specific filter criteria (like "label_key IN ['harness-team']"), skip the ccm_perspective_filter_values_event call and proceed directly to fetching values for the specified label using ccm_perspective_filter_values.**
+
 
-## AI Team/Department based cost perspective template Template: Create Cost Perspective 
+
+## Workflow Template for Team/Department/Environment based cost perspective template 
+##Template: Create Cost Perspective 
 ## Instructions for the AI are below this line.
 
 Please strictly follow the steps below in sequential order. Your primary goal is to follow these steps precisely.
@@ -30,14 +34,12 @@ Step 2: Analyze Labels and Plan Next Action
 - Analyze the list of label keys from Step 1 against the user's request.
 - You will proceed DIRECTLY to Step 3 with identified keys.
 
-Step 3: Get list for suggested keys for user and proceed to Step 4 after user selects key
-- Action: Call the `ccm_perspective_filter_values_event` tool with similar labels.
-
-
-Step 4:  Find Related Label Values (Data Collection Step)
-- Action: Call the `ccm_perspective_filter_values` tool to fetch all available values.
+Step 3: MANDATORY - Get list for suggested keys for user and proceed to Step 4 after user selects keys
+- **ONLY if the user hasn't specified exact filter criteria**:
+- - **ALWAYS execute this step regardless of user's specific requirements**
+- Action: Call the `ccm_perspective_filter_values_event` tool with similar labels and then Call the `ccm_perspective_filter_values` tool to fetch all available values.
 
-Step 5: Validate Perspective Rules
+Step 4: Validate Perspective Rules
 - Action: Call the `validate_ccm_perspective_rules` tool.
 - Parameters: Ensure all keys in the JSON payload are in `snake_case`.
 - Formulate the `view_conditions` JSON structure based on the key(s) and value(s) identified in the previous steps.
@@ -47,14 +49,15 @@ Step 5: Validate Perspective Rules
     - The corresponding values for that key (e.g., `engineering`, `finance`) MUST be placed in the `values` array.
     - You MUST create one `view_condition` object for each label key.
 
-Step 6: Ask for User Confirmation
+Step 5: Ask for User Confirmation
 - Ask for explicit confirmation. Example: "I can create a perspective with the following rules: [Show Rules]. Shall I proceed?"
 
-Step 7: Update the Cost Perspective
-- Condition: Only proceed if the user confirmed in Step 6.
+Step 6: Save the Cost Perspective using update_ccm_perspective tool
+- **IMPORTANT: Only call update_ccm_perspective tool. Do Not call create_ccm_perspective tool whenever the prompt suggest to save or create the perspective.**
+- Condition: Only proceed if the user confirmed in Step 5.
 - Action: call the `update_ccm_perspective` tool.
 
-Step 8: End of the workflow
+Step 7: End of the workflow
 - Action: End the workflow.
 
 ## Tool Usage Guidelines

pkg/harness/prompts/files/internal/ccm.txt

@@ -12,12 +12,16 @@ Enable users to make informed decisions about their cloud costs by leveraging Ha
 
 ## Conversational Style Guide ##
 - Your internal instructions are organized into phases and steps for you to follow.
+- Do not call ccm_perspective_filter_values_event beyond step 3.
 - You MUST NOT mention the phase or step numbers in your responses to the user.
 - Interact with the user naturally. For example, instead of saying "Step 1: Fetching Available Cost Labels," you should say something like, "Okay, let me see what cost labels are available..."
 - Continue the conversation from step 4 once you receive user input in step 3.
-- Do not call ccm_perspective_filter_values_event beyond step 3.
+- **IMPORTANT: If the user provides specific filter criteria (like "label_key IN ['harness-team']"), skip the ccm_perspective_filter_values_event call and proceed directly to fetching values for the specified label using ccm_perspective_filter_values.**
+
 
-## AI Team/Department based cost perspective template Template: Create Cost Perspective 
+
+## Workflow Template for Team/Department/Environment based cost perspective template 
+##Template: Create Cost Perspective 
 ## Instructions for the AI are below this line.
 
 Please strictly follow the steps below in sequential order. Your primary goal is to follow these steps precisely.
@@ -30,14 +34,12 @@ Step 2: Analyze Labels and Plan Next Action
 - Analyze the list of label keys from Step 1 against the user's request.
 - You will proceed DIRECTLY to Step 3 with identified keys.
 
-Step 3: Get list for suggested keys for user and proceed to Step 4 after user selects key
-- Action: Call the `ccm_perspective_filter_values_event` tool with similar labels.
-
-
-Step 4:  Find Related Label Values (Data Collection Step)
-- Action: Call the `ccm_perspective_filter_values` tool to fetch all available values.
+Step 3: MANDATORY - Get list for suggested keys for user and proceed to Step 4 after user selects keys
+- **ONLY if the user hasn't specified exact filter criteria**:
+- - **ALWAYS execute this step regardless of user's specific requirements**
+- Action: Call the `ccm_perspective_filter_values_event` tool with similar labels and then Call the `ccm_perspective_filter_values` tool to fetch all available values.
 
-Step 5: Validate Perspective Rules
+Step 4: Validate Perspective Rules
 - Action: Call the `validate_ccm_perspective_rules` tool.
 - Parameters: Ensure all keys in the JSON payload are in `snake_case`.
 - Formulate the `view_conditions` JSON structure based on the key(s) and value(s) identified in the previous steps.
@@ -47,14 +49,15 @@ Step 5: Validate Perspective Rules
     - The corresponding values for that key (e.g., `engineering`, `finance`) MUST be placed in the `values` array.
     - You MUST create one `view_condition` object for each label key.
 
-Step 6: Ask for User Confirmation
+Step 5: Ask for User Confirmation
 - Ask for explicit confirmation. Example: "I can create a perspective with the following rules: [Show Rules]. Shall I proceed?"
 
-Step 7: Update the Cost Perspective
-- Condition: Only proceed if the user confirmed in Step 6.
+Step 6: Save the Cost Perspective using update_ccm_perspective tool
+- **IMPORTANT: Only call update_ccm_perspective tool. Do Not call create_ccm_perspective tool whenever the prompt suggest to save or create the perspective.**
+- Condition: Only proceed if the user confirmed in Step 5.
 - Action: call the `update_ccm_perspective` tool.
 
-Step 8: End of the workflow
+Step 7: End of the workflow
 - Action: End the workflow.
 
 ## Tool Usage Guidelines

pkg/harness/tools/ccmperspectives.go

@@ -22,7 +22,8 @@ import (
 const (
 	CCMPerspectiveRulesToolID       = "validate_ccm_perspective_rules"
 	CCMPerspectiveRuleEventType     = "perspective_rules_updated"
-	FollowUpCreatePerspectivePrompt = "Update CCM perspective with these rules"
+	FollowUpCreatePerspectivePrompt = "Proceed to save perspective"
+	CCMPerspectivetCreateOrUpdateRuleEventType = "perspective_created_or_updated_event"
 )
 
 func ListCcmPerspectivesDetailTool(config *config.Config, client *client.CloudCostManagementService) (tool mcp.Tool, handler server.ToolHandlerFunc) {
@@ -686,7 +687,23 @@ func createOrUpdatePerspectiveHandler(
 		return nil, fmt.Errorf("failed to marshal CCM Perspective: %w", err)
 	}
 
-	return mcp.NewToolResultText(string(r)), nil
+	responseContents := []mcp.Content{}
+
+	viewRulesEvent := event.NewCustomEvent(CCMPerspectivetCreateOrUpdateRuleEventType, map[string]any{
+		"response": string(r),
+	})
+
+	// Create embedded resources for the OPA event
+	eventResource, err := viewRulesEvent.CreateEmbeddedResource()
+	if err != nil {
+		return mcp.NewToolResultError(err.Error()), nil
+	} else {
+		responseContents = append(responseContents, eventResource)
+	}
+
+	return &mcp.CallToolResult{
+		Content: responseContents,
+	}, nil
 }
 
 func getSupportedDataSources() string {

pkg/harness/tools/ccmperspectives_test.go

@@ -32,7 +32,7 @@ var (
 
 	validEventJSONText = `{"type":"perspective_rules_updated","continue":true,"content":{"viewRules":[{"viewConditions":[{"type":"VIEW_ID_CONDITION","viewField":{"fieldId":"awsUsageaccountid","fieldName":"Account","identifier":"AWS","identifierName":"AWS"},"viewOperator":"IN","values":["test(test_id)"]}]}]}}`
 
-	validPromptJSONText = `{"type":"prompt","continue":true,"display_order":100,"content":{"prompts":["Update CCM perspective with these rules"]}}`
+	validPromptJSONText = `{"type":"prompt","continue":true,"display_order":100,"content":{"prompts":["Proceed to save perspective"]}}`
 
 	validExpectedTextContent = mcp.EmbeddedResource{
 		Type: "resource",