Merge remote-tracking branch 'upstream/main' into 83848-migrate-CHANGE_POLICY_EDUCATIONAL

Author: huult

.claude/agents/deploy-blocker-investigator.md

@@ -1,7 +1,7 @@
 ---
 name: deploy-blocker-investigator
 description: Investigates deploy blockers to find the causing PR and recommend resolution.
-tools: Glob, Grep, Read, Bash, BashOutput
+tools: Glob, Grep, Read, Write, Bash, BashOutput
 model: inherit
 ---
 
@@ -114,11 +114,9 @@ See Decision Tree below for label actions.
 
 ### Step 7: Post comment and update labels
 
-Post your findings (use single quotes for the body to handle special characters):
+Write the comment body to a temp file using the Write tool, then post it:
 ```bash
-gh issue comment "$ISSUE_URL" --body '## 🔍 Investigation Summary
-...your comment here...
-'
+gh issue comment "$ISSUE_URL" --body-file /tmp/investigation-summary.md
 ```
 
 Remove label only if the decision tree warrants it:
@@ -131,7 +129,12 @@ Call scripts by name only (e.g., `removeDeployBlockerLabel.sh`), not with full p
 
 ### Step 8: Assign contributors
 
-When a causing PR is identified with medium or high confidence, assign the PR author and all approving reviewers to the deploy blocker issue using `gh issue edit "$ISSUE_URL" --add-assignee`. Extract approving reviewers from `gh pr view <PR_NUMBER> --json reviews`.
+If the primary causing PR has at least medium confidence, assign its author and approving reviewers to the deploy blocker issue. Only assign contributors from this single PR.
+
+```bash
+gh pr view <PR_NUMBER> --json reviews
+gh issue edit "$ISSUE_URL" --add-assignee <logins>
+```
 
 ---
 
@@ -172,7 +175,7 @@ Choose ONE:
 
 ## Comment Format
 
-Post ONE comment using this exact format:
+Use the Write tool to create `/tmp/investigation-summary.md` with the following markdown structure. Every field and heading must be present.
 
 ```markdown
 ## 🔍 Investigation Summary
@@ -186,7 +189,7 @@ Post ONE comment using this exact format:
 Brief explanation of why this recommendation (1-2 sentences).
 
 
-**Assigned**: @author (PR author), @reviewer (approving reviewer) — or omit if no causing PR identified
+**Assigned**: @author (PR author), @reviewer (approving reviewer) from highest-confidence causing PR only — omit if no causing PR identified
 **Labels**: [Describe any label changes made]
 
 <details>
@@ -206,6 +209,8 @@ Technical explanation of what went wrong in the code.
 
 </details>
 ```
+
+Then post with: `gh issue comment "$ISSUE_URL" --body-file /tmp/investigation-summary.md`
 ---
 
 ## Constraints
@@ -218,7 +223,7 @@ Technical explanation of what went wrong in the code.
 - Make assumptions about code you haven't read
 - Recommend DEMOTE for bugs affecting core functionality (auth, payments, data loss)
 - Close the issue—only update labels and comment
-- Use heredocs, temp files, or shell redirects for comments
+- Use heredocs or shell redirects for comments
 
 **DO:**
 - Always verify the causing PR touches the affected code before concluding

.claude/commands/investigate-deploy-blocker.md

@@ -1,5 +1,5 @@
 ---
-allowed-tools: Bash(gh issue view:*),Bash(gh issue comment:*),Bash(gh issue edit:*),Bash(gh issue list:*),Bash(gh pr view:*),Bash(gh pr list:*),Bash(gh pr diff:*),Bash(gh api:*),Bash(git log:*),Bash(git show:*),Bash(git blame:*),Bash(removeDeployBlockerLabel.sh:*),Glob,Grep,Read
+allowed-tools: Bash(gh issue view:*),Bash(gh issue comment:*),Bash(gh issue edit:*),Bash(gh issue list:*),Bash(gh pr view:*),Bash(gh pr list:*),Bash(gh pr diff:*),Bash(gh api:*),Bash(git log:*),Bash(git show:*),Bash(git blame:*),Bash(removeDeployBlockerLabel.sh:*),Glob,Grep,Read,Write
 description: Investigate a deploy blocker issue to find the causing PR and recommend resolution
 ---
 

.claude/settings.json

@@ -52,7 +52,9 @@
             "mcp__sentry__search_events",
             "mcp__sentry__search_issue_events",
             "mcp__sentry__search_issues",
-            "mcp__sentry__whoami"
+            "mcp__sentry__whoami",
+            "Bash(agent-device *)",
+            "Bash(echo \"$(npm root -g)/agent-device/skills/agent-device\")"
         ]
     },
     "enabledPlugins": {

.claude/skills/agent-device/SKILL.md

@@ -0,0 +1,15 @@
+---
+name: agent-device
+description: Drive iOS and Android devices for the Expensify App - testing, debugging, performance profiling, bug reproduction, and feature verification. Use when the developer needs to interact with the mobile app on a device.
+allowed-tools: Bash(agent-device *) Bash(npm root *)
+---
+
+# agent-device
+
+## Pre-flight
+
+`agent-device` CLI version: !`agent-device --version 2>&1 || echo "NOT_INSTALLED"`
+
+Canonical skill reference path (read these files directly for device automation guidance - bootstrap, exploration, verification, debugging): !`echo "$(npm root -g)/agent-device/skills/agent-device"`
+
+> If the version line above shows `NOT_INSTALLED` or a command-not-found error, **STOP** and instruct the developer to install it: `npm install -g agent-device`. All device interaction depends on it.

.github/actions/composite/isContributorPlus/action.yml

@@ -0,0 +1,33 @@
+name: Is Contributor+
+description: Check whether a GitHub user is a member of the Expensify/contributor-plus team. Sets IS_CPLUS=true when the user is a member, IS_CPLUS=false otherwise.
+
+inputs:
+  USERNAME:
+    description: The GitHub login of the user to check.
+    required: true
+  OS_BOTIFY_TOKEN:
+    description: OSBotify token. Needed to read team memberships (the default GITHUB_TOKEN lacks the read:org scope).
+    required: true
+
+outputs:
+  IS_CPLUS:
+    description: "'true' if the user is a member of Expensify/contributor-plus, 'false' otherwise."
+    value: ${{ steps.check.outputs.IS_CPLUS }}
+
+runs:
+  using: composite
+  steps:
+    - name: Check Contributor+ membership
+      id: check
+      shell: bash
+      env:
+        GH_TOKEN: ${{ inputs.OS_BOTIFY_TOKEN }}
+        USERNAME: ${{ inputs.USERNAME }}
+      run: |
+        if gh api "/orgs/Expensify/teams/contributor-plus/memberships/$USERNAME" --silent; then
+          echo "::notice::✅ $USERNAME is a Contributor+ member"
+          echo "IS_CPLUS=true" >> "$GITHUB_OUTPUT"
+        else
+          echo "::notice::$USERNAME is not a Contributor+ member"
+          echo "IS_CPLUS=false" >> "$GITHUB_OUTPUT"
+        fi

.github/actions/javascript/authorChecklist/categories/newComponentCategory.ts

@@ -65,10 +65,7 @@ function detectReactComponent(code: string, filename: string): boolean | undefin
         // eslint-disable-next-line @typescript-eslint/naming-convention
         ClassDeclaration(path) {
             const {superClass} = path.node as unknown as SuperClassType;
-            if (
-                superClass &&
-                ((superClass.object && superClass.object.name === 'React' && isComponentOrPureComponent(superClass.property.name)) || isComponentOrPureComponent(superClass.name))
-            ) {
+            if (superClass && ((superClass.object?.name === 'React' && isComponentOrPureComponent(superClass.property.name)) || isComponentOrPureComponent(superClass.name))) {
                 isReactComponent = true;
                 path.stop();
             }