Merge remote-tracking branch 'origin/main' into sharing_improvements

Author: mrubens

.roo/rules-issue-fixer/1_Workflow.xml

@@ -491,4 +491,62 @@
       ```
     </instructions>
   </step>
+
+  <step number="11">
+    <name>Monitor PR Checks</name>
+    <instructions>
+      After the PR is created, monitor the CI/CD checks to ensure they pass:
+      
+      <execute_command>
+      <command>gh pr checks --watch</command>
+      </execute_command>
+      
+      This command will:
+      1. Display all CI/CD checks configured for the repository
+      2. Show the status of each check in real-time
+      3. Update automatically as checks complete
+      4. Exit when all checks have finished running
+      
+      Monitor the output and note:
+      - Which checks are running (e.g., tests, linting, build)
+      - Any checks that fail and their error messages
+      - The overall status of the PR checks
+      
+      If any checks fail:
+      1. Analyze the failure logs
+      2. Identify what needs to be fixed
+      3. Ask the user if they want you to address the failures
+      
+      <ask_followup_question>
+      <question>The PR checks have completed. Here's the status:
+
+      [Show check results - passing/failing]
+
+      [If all pass]: All checks have passed successfully! The PR is ready for review.
+
+      [If any fail]: Some checks have failed:
+      - [Failed check 1]: [Brief error description]
+      - [Failed check 2]: [Brief error description]
+
+      Would you like me to fix these issues?</question>
+      <follow_up>
+      <suggest>Yes, please fix the failing checks</suggest>
+      <suggest>Show me the detailed error logs</suggest>
+      <suggest>I'll handle the failures manually</suggest>
+      <suggest>The PR is fine as-is, these failures are expected</suggest>
+      </follow_up>
+      </ask_followup_question>
+      
+      If user wants fixes:
+      1. Create a plan to address each failure
+      2. Make necessary code changes
+      3. Commit and push the fixes
+      4. Monitor checks again to ensure they pass
+      
+      Important notes:
+      - The --watch flag will keep the command running until all checks complete
+      - This step helps ensure the PR meets all quality standards before review
+      - Early detection of CI/CD failures saves reviewer time
+    </instructions>
+  </step>
 </workflow>

.roo/rules-pr-fixer/1_workflow.xml

@@ -47,6 +47,13 @@
         <step>Resolve conflicts by rebasing the PR branch and force-pushing.</step>
       </steps>
     </phase>
+
+    <phase name="validation">
+      <description>Verify that the pushed changes resolve the issues.</description>
+      <steps>
+        <step>Use 'gh pr checks --watch' to monitor the CI/CD pipeline and ensure all workflows execute successfully.</step>
+      </steps>
+    </phase>
   </main_workflow>
 
   <completion_criteria>

.roo/rules-pr-fixer/3_common_patterns.xml

@@ -45,4 +45,10 @@
       <command tool="gh">gh pr checkout <pr_number_or_url></command>
     </template>
   </pattern>
+  <pattern name="watching_pr_checks">
+    <usage>After pushing changes, use this command to monitor the CI/CD pipeline in real-time.</usage>
+    <template>
+      <command tool="gh">gh pr checks --watch</command>
+    </template>
+  </pattern>
 </common_patterns>

.roo/rules-pr-fixer/4_tool_usage.xml

@@ -9,8 +9,13 @@
       <tool>gh pr checks</tool>
       <when>After getting comments, to check the technical status.</when>
       <why>Quickly identifies if there are failing automated checks that need investigation.</why>
-    </priority>
-  </tool_priorities>
+   </priority>
+   <priority level="3">
+     <tool>gh pr checks --watch</tool>
+     <when>After pushing a fix, to confirm that the changes have resolved the CI/CD failures.</when>
+     <why>Provides real-time feedback on whether the fix was successful.</why>
+   </priority>
+ </tool_priorities>
 
   <tool_specific_guidance>
     <tool name="use_mcp_tool (github: get_pull_request)">

.roo/rules-pr-fixer/5_examples.xml

@@ -81,6 +81,15 @@
 </ask_followup_question>
         </tool_use>
       </step>
+     <step number="6">
+       <description>After pushing the changes, watch the PR checks to confirm the fix.</description>
+       <tool_use>
+         <execute_command>
+           <command>gh pr checks --watch</command>
+         </execute_command>
+       </tool_use>
+       <analysis>Confirm that all checks are passing after the fix.</analysis>
+     </step>
     </workflow>
 
     <key_takeaways>

.roo/rules-pr-reviewer/1_workflow.xml

@@ -163,12 +163,10 @@
       [Summary of findings organized by priority]
 
       Would you like me to:
-      1. Submit these as individual review comments
-      2. Create a comprehensive review with all comments
-      3. Modify any of the suggestions
-      4. Skip the review submission</question>
+      1. Create a comprehensive review with all comments
+      2. Modify any of the suggestions
+      3. Skip the review submission</question>
       <follow_up>
-      <suggest>Submit as individual review comments</suggest>
       <suggest>Create a comprehensive review</suggest>
       <suggest>Let me modify the suggestions first</suggest>
       <suggest>Skip submission - just wanted the analysis</suggest>
@@ -180,41 +178,38 @@
   <step number="9">
     <name>Submit Review</name>
     <instructions>
-      Based on user preference, submit the review:
+      Based on user preference, submit the review as a comprehensive review:
 
-      For individual comments:
+      1. First create a pending review:
       <use_mcp_tool>
       <server_name>github</server_name>
-      <tool_name>add_pull_request_review_comment_to_pending_review</tool_name>
+      <tool_name>create_pending_pull_request_review</tool_name>
       <arguments>
       {
         "owner": "[owner]",
         "repo": "[repo]",
-        "pullNumber": [number],
-        "path": "[file path]",
-        "line": [line number],
-        "body": "[comment text]",
-        "subjectType": "LINE"
+        "pullNumber": [number]
       }
       </arguments>
       </use_mcp_tool>
 
-      For comprehensive review:
-      1. First create a pending review:
+      2. Add comments to the pending review using:
       <use_mcp_tool>
       <server_name>github</server_name>
-      <tool_name>create_pending_pull_request_review</tool_name>
+      <tool_name>add_pull_request_review_comment_to_pending_review</tool_name>
       <arguments>
       {
         "owner": "[owner]",
         "repo": "[repo]",
-        "pullNumber": [number]
+        "pullNumber": [number],
+        "path": "[file path]",
+        "line": [line number],
+        "body": "[comment text]",
+        "subjectType": "LINE"
       }
       </arguments>
       </use_mcp_tool>
 
-      2. Add comments to the pending review
-      
       3. Submit the review:
       <use_mcp_tool>
       <server_name>github</server_name>

packages/cloud/src/CloudService.ts

@@ -52,8 +52,11 @@ export class CloudService {
 			this.authService.on("logged-out", this.authListener)
 			this.authService.on("user-info", this.authListener)
 
-			this.settingsService = new SettingsService(this.context, this.authService, () =>
-				this.callbacks.stateChanged?.(),
+			this.settingsService = new SettingsService(
+				this.context,
+				this.authService,
+				() => this.callbacks.stateChanged?.(),
+				this.log,
 			)
 			this.settingsService.initialize()
 

packages/cloud/src/SettingsService.ts

@@ -18,10 +18,17 @@ export class SettingsService {
 	private authService: AuthService
 	private settings: OrganizationSettings | undefined = undefined
 	private timer: RefreshTimer
-
-	constructor(context: vscode.ExtensionContext, authService: AuthService, callback: () => void) {
+	private log: (...args: unknown[]) => void
+
+	constructor(
+		context: vscode.ExtensionContext,
+		authService: AuthService,
+		callback: () => void,
+		log?: (...args: unknown[]) => void,
+	) {
 		this.context = context
 		this.authService = authService
+		this.log = log || console.log
 
 		this.timer = new RefreshTimer({
 			callback: async () => {
@@ -70,15 +77,19 @@ export class SettingsService {
 			})
 
 			if (!response.ok) {
-				console.error(`Failed to fetch organization settings: ${response.status} ${response.statusText}`)
+				this.log(
+					"[cloud-settings] Failed to fetch organization settings:",
+					response.status,
+					response.statusText,
+				)
 				return false
 			}
 
 			const data = await response.json()
 			const result = organizationSettingsSchema.safeParse(data)
 
 			if (!result.success) {
-				console.error("Invalid organization settings format:", result.error)
+				this.log("[cloud-settings] Invalid organization settings format:", result.error)
 				return false
 			}
 
@@ -92,7 +103,7 @@ export class SettingsService {
 
 			return true
 		} catch (error) {
-			console.error("Error fetching organization settings:", error)
+			this.log("[cloud-settings] Error fetching organization settings:", error)
 			return false
 		}
 	}

packages/cloud/src/__tests__/CloudService.test.ts

@@ -176,7 +176,12 @@ describe("CloudService", () => {
 
 			expect(cloudService).toBeInstanceOf(CloudService)
 			expect(AuthService).toHaveBeenCalledWith(mockContext, expect.any(Function))
-			expect(SettingsService).toHaveBeenCalledWith(mockContext, mockAuthService, expect.any(Function))
+			expect(SettingsService).toHaveBeenCalledWith(
+				mockContext,
+				mockAuthService,
+				expect.any(Function),
+				expect.any(Function),
+			)
 		})
 
 		it("should throw error if instance already exists", async () => {

packages/telemetry/src/TelemetryService.ts

@@ -152,6 +152,31 @@ export class TelemetryService {
 		this.captureEvent(TelemetryEventName.CONSECUTIVE_MISTAKE_ERROR, { taskId })
 	}
 
+	/**
+	 * Captures when a tab is shown due to user action
+	 * @param tab The tab that was shown
+	 */
+	public captureTabShown(tab: string): void {
+		this.captureEvent(TelemetryEventName.TAB_SHOWN, { tab })
+	}
+
+	/**
+	 * Captures when a setting is changed in ModesView
+	 * @param settingName The name of the setting that was changed
+	 */
+	public captureModeSettingChanged(settingName: string): void {
+		this.captureEvent(TelemetryEventName.MODE_SETTINGS_CHANGED, { settingName })
+	}
+
+	/**
+	 * Captures when a user creates a new custom mode
+	 * @param modeSlug The slug of the custom mode
+	 * @param modeName The name of the custom mode
+	 */
+	public captureCustomModeCreated(modeSlug: string, modeName: string): void {
+		this.captureEvent(TelemetryEventName.CUSTOM_MODE_CREATED, { modeSlug, modeName })
+	}
+
 	/**
 	 * Captures a marketplace item installation event
 	 * @param itemId The unique identifier of the marketplace item