FLOW-1758: Add attribute to track RDS/RDE paid or unpaid seat in feedback collector - (Rovo Dev)

CHANGELOG.md

@@ -4,10 +4,10 @@
 
 ### Improvements
 
+- **RovoDev**: Added user entitlement type (RDS/RDE paid or unpaid seat) to the feedback collector context, enabling better triage and analysis of feedback by seat type
 - **RovoDev**: Upgraded Rovo Dev to v0.13.63
 - **RovoDev**: Generalized MCP tool parsing in chat UI to support any MCP toolset via regex matching (`mcp__<name>__invoke_tool` / `mcp__<name>__get_tool_schema`) instead of hardcoded tool names
 
-
 ## What's new in 4.0.27
 
 ### Improvements
@@ -45,7 +45,6 @@
 
 - **RovoDev**: Added copy code button within the Rovo Dev chat for code blocks in the chat.
 
-
 ## What's new in 4.0.23
 
 ### Features

src/rovo-dev/rovoDevFeedbackManager.test.ts

@@ -1,6 +1,16 @@
 jest.mock('src/logger');
 jest.mock('vscode');
 
+const mockCheckEntitlement = jest.fn();
+
+jest.mock('src/container', () => ({
+    Container: {
+        rovoDevEntitlementChecker: {
+            checkEntitlement: mockCheckEntitlement,
+        },
+    },
+}));
+
 const mockExtensionApiInstance = {
     metadata: {
         version: jest.fn(),
@@ -41,6 +51,7 @@ describe('RovoDevFeedbackManager', () => {
 
         // Default return values
         mockExtensionApiInstance.metadata.version.mockReturnValue('1.0.0');
+        mockCheckEntitlement.mockResolvedValue({ isEntitled: true, type: 'ROVO_DEV_STANDARD' });
     });
 
     describe('submitFeedback', () => {
@@ -246,5 +257,83 @@ describe('RovoDevFeedbackManager', () => {
                 }),
             );
         });
+
+        it('should include entitlement type in context', async () => {
+            mockCheckEntitlement.mockResolvedValue({ isEntitled: true, type: 'ROVO_DEV_EVERYWHERE' });
+
+            const feedback = {
+                feedbackType: 'general' as const,
+                feedbackMessage: 'Test feedback',
+                canContact: false,
+            };
+
+            await RovoDevFeedbackManager.submitFeedback(feedback);
+
+            expect(mockTransport).toHaveBeenCalledWith(
+                expect.any(String),
+                expect.objectContaining({
+                    data: expect.objectContaining({
+                        fields: expect.arrayContaining([
+                            expect.objectContaining({
+                                id: 'customfield_10047',
+                                value: expect.stringContaining('"entitlementType": "ROVO_DEV_EVERYWHERE"'),
+                            }),
+                        ]),
+                    }),
+                }),
+            );
+        });
+
+        it('should include entitlement type for non-entitled users', async () => {
+            mockCheckEntitlement.mockResolvedValue({ isEntitled: false, type: 'NO_ACTIVE_PRODUCT' });
+
+            const feedback = {
+                feedbackType: 'bug' as const,
+                feedbackMessage: 'Bug with entitlement',
+                canContact: false,
+            };
+
+            await RovoDevFeedbackManager.submitFeedback(feedback);
+
+            expect(mockTransport).toHaveBeenCalledWith(
+                expect.any(String),
+                expect.objectContaining({
+                    data: expect.objectContaining({
+                        fields: expect.arrayContaining([
+                            expect.objectContaining({
+                                id: 'customfield_10047',
+                                value: expect.stringContaining('"entitlementType": "NO_ACTIVE_PRODUCT"'),
+                            }),
+                        ]),
+                    }),
+                }),
+            );
+        });
+
+        it('should default entitlement type to unknown when entitlement check fails', async () => {
+            mockCheckEntitlement.mockRejectedValue(new Error('Entitlement check failed'));
+
+            const feedback = {
+                feedbackType: 'general' as const,
+                feedbackMessage: 'Test feedback',
+                canContact: false,
+            };
+
+            await RovoDevFeedbackManager.submitFeedback(feedback);
+
+            expect(mockTransport).toHaveBeenCalledWith(
+                expect.any(String),
+                expect.objectContaining({
+                    data: expect.objectContaining({
+                        fields: expect.arrayContaining([
+                            expect.objectContaining({
+                                id: 'customfield_10047',
+                                value: expect.stringContaining('"entitlementType": "unknown"'),
+                            }),
+                        ]),
+                    }),
+                }),
+            );
+        });
     });
 });

src/rovo-dev/rovoDevFeedbackManager.ts

@@ -1,4 +1,5 @@
 import { truncate } from 'lodash';
+import { Container } from 'src/container';
 import { UserInfo } from 'src/rovo-dev/api/extensionApiTypes';
 import * as vscode from 'vscode';
 
@@ -23,7 +24,7 @@ export class RovoDevFeedbackManager {
         isBBY: boolean = false,
     ): Promise<void> {
         const transport = getAxiosInstance();
-        const context = this.getContext(isBBY, feedback.rovoDevSessionId);
+        const context = await this.getContext(isBBY, feedback.rovoDevSessionId);
 
         let userEmail = 'do-not-reply@atlassian.com';
         let userName = 'unknown';
@@ -97,13 +98,23 @@ export class RovoDevFeedbackManager {
         }
     }
 
-    private static getContext(isBBY: boolean = false, rovoDevSessionId?: string): any {
+    private static async getContext(isBBY: boolean = false, rovoDevSessionId?: string): Promise<any> {
         const extensionApi = new ExtensionApi();
+
+        let entitlementType: string = 'unknown';
+        try {
+            const entitlement = await Container.rovoDevEntitlementChecker.checkEntitlement();
+            entitlementType = entitlement.type;
+        } catch {
+            entitlementType = 'unknown';
+        }
+
         return {
             component: isBBY ? 'Boysenberry - vscode' : 'IDE - vscode',
             extensionVersion: extensionApi.metadata.version(),
             vscodeVersion: vscode.version,
             rovoDevVersion: MIN_SUPPORTED_ROVODEV_VERSION,
+            entitlementType,
             ...(rovoDevSessionId && { rovoDevSessionId }),
         };
     }