Merge remote-tracking branch 'upstream/main' into 83363-migrate-debug-final-misc

Author: huult

.claude/settings.json

@@ -38,7 +38,21 @@
             "mcp__playwright__browser_wait_for",
             "mcp__playwright__browser_close",
             "mcp__playwright__browser_evaluate",
-            "mcp__playwright__browser_handle_dialog"
+            "mcp__playwright__browser_handle_dialog",
+            "mcp__sentry__find_organizations",
+            "mcp__sentry__find_projects",
+            "mcp__sentry__find_releases",
+            "mcp__sentry__find_teams",
+            "mcp__sentry__get_doc",
+            "mcp__sentry__get_event_attachment",
+            "mcp__sentry__get_issue_details",
+            "mcp__sentry__get_issue_tag_values",
+            "mcp__sentry__get_trace_details",
+            "mcp__sentry__search_docs",
+            "mcp__sentry__search_events",
+            "mcp__sentry__search_issue_events",
+            "mcp__sentry__search_issues",
+            "mcp__sentry__whoami"
         ]
     },
     "enabledPlugins": {

.claude/skills/coding-standards/rules/clean-react-0-compiler.md

@@ -101,6 +101,8 @@ Before flagging, verify that the file actually compiles with React Compiler:
 check-compiler.sh <filepath>
 ```
 
+**IMPORTANT:** Run `check-compiler.sh` exactly as shown above - by name only, without an absolute path or `bash` prefix. The script is already on `$PATH`.
+
 If the output contains **"Failed to compile"** for the file under review, the rule **does not apply** — the author may have no alternative to manual memoization until the compilation issue is resolved.
 
 #### Condition

.claude/skills/sentry/SKILL.md

@@ -0,0 +1,48 @@
+---
+name: sentry
+description: Analyze Sentry issues, spans, crashes, and performance metrics. Use when user requests check in Sentry, asks about performance metrics and spans or asks about crash rates.
+---
+
+# Sentry 
+
+## When to Use This Skill
+
+Use Sentry skill when:
+- User requests any data from Sentry
+- User asks about performance metrics or span summary
+- User want to compare metrics between any date ranges
+- User asks about latest production crashes and issues
+- User want to investigate profiles or traces from production sessions
+
+## Sentry MCP
+
+The Sentry MCP server is configured in `.mcp.json` and gives Claude Code direct access to Sentry.
+
+### Prerequisites
+
+**Setup** (one-time per engineer): On first use, Claude Code will open a browser OAuth login to Sentry. Sign in and authorize — no manual token setup required.
+
+### Available MCP Tools
+
+Use these tools for data analysis:
+
+| Tool | Purpose |
+|------|---------|
+| `mcp__sentry__find_releases` | Find release versions for scoping queries |
+| `mcp__sentry__search_issues` | Search for errors/crashes by query, project, date range |
+| `mcp__sentry__search_events` | Query raw events/spans (performance data, durations) |
+| `mcp__sentry__search_issue_events` | Get individual events for a known issue ID |
+| `mcp__sentry__get_issue_tag_values` | Inspect tag distributions (e.g. device, version) on an issue |
+| `mcp__sentry__get_sentry_resource` | Fetch a specific Sentry resource by URL/ID |
+
+**Do not use** `mcp__sentry__analyze_issue_with_seer` — AI analysis is out of scope for this skill.
+
+Always use:
+- **org slug**: `expensify`
+- **project slug**: `app`
+
+## Example uses
+
+- "Search Sentry for crashes in the last 24h related to expense creation"
+- "Get details on Sentry issue APP-123"
+- "Compare P90 of ManualAppStartup durations between last two weeks"

.env.example

@@ -44,5 +44,6 @@ FB_PROJECT_ID=YOUR_PROJECT_ID
 GITHUB_TOKEN=YOUR_TOKEN
 OPENAI_API_KEY=YOUR_TOKEN
 
+SENTRY_DSN=https://7b463fb4d4402d342d1166d929a62f4e@o4510228013121536.ingest.us.sentry.io/4510228107427840
 SENTRY_AUTH_TOKEN=SENTRY_AUTH_TOKEN
 SENTRY_ALLOW_FAILURE=true

.env.production

@@ -7,7 +7,6 @@ PUSHER_APP_KEY=268df511a204fbb60884
 USE_WEB_PROXY=false
 ENVIRONMENT=production
 SEND_CRASH_REPORTS=true
-
 FB_API_KEY=AIzaSyBrLKgCuo6Vem6Xi5RPokdumssW8HaWBow
 FB_APP_ID=1:1008697809946:web:08de4ecb7656b7235445a3
 FB_PROJECT_ID=expensify-mobile-app

.mcp.json

@@ -3,6 +3,10 @@
         "playwright": {
             "command": "npx",
             "args": ["@playwright/mcp@latest", "--isolated", "--output-dir", ".playwright-output"]
+        },
+        "sentry": {
+            "type": "http",
+            "url": "https://mcp.sentry.dev/mcp"
         }
     }
 }

CLAUDE.md

@@ -224,6 +224,10 @@ The skill provides guidance on:
 
 ## Development Setup Requirements
 
+### Sentry analysis
+
+Use Sentry skill whenever user wants to analyze any data from Sentry. It may be: spans, metrics, crashes, crash free rate etc.
+
 ## Command Reference
 
 ### Common Tasks

Mobile-Expensify

@@ -111,8 +111,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009034202
-        versionName "9.3.42-2"
+        versionCode 1009035002
+        versionName "9.3.50-2"
         // Supported language variants must be declared here to avoid from being removed during the compilation.
         // This also helps us to not include unnecessary language variants in the APK.
         resConfigs "en", "es"