chore: merge upstream main and resolve event package conflicts

Preserve package selection alongside updated resource telemetry and nullable
event context documentation.

Co-Authored-By: GPT-6 (Codex) <noreply@openai.com>

Author: mr-danya

.claude/settings.json

@@ -74,7 +74,6 @@
       "Bash(pnpm -w run:*)",
       "Bash(pnpm -r list:*)",
       "Bash(pnpm --filter:*)",
-      "Bash(pnpm turbo:*)",
       "Bash(pnpm vitest:*)",
       "Bash(pnpx vitest:*)",
       "Bash(pnpx tsx:*)",

.craft.yml

@@ -1,7 +1,100 @@
-changelogPolicy: none
-preReleaseCommand: bash bin/bump-version.sh
-targets:
-  - name: github
-  - name: npm
-    id: "@sentry/mcp-server"
-    includeNames: /^sentry-mcp-server-\d.*\.tgz$/
+minVersion: '2.33.0'
+workspaces:
+  packages/cli:
+    changelog:
+      policy: auto
+      # The CLI release also ships the documentation workspace.
+      includePaths:
+        - apps/cli-docs
+    versioning:
+      policy: auto
+    preReleaseCommand: bash -c 'cd packages/cli && node --experimental-strip-types script/bump-version.ts --pre'
+    postReleaseCommand: bash -c 'cd packages/cli && node --experimental-strip-types script/bump-version.ts --post'
+    releaseBranchPrefix: release/cli
+    artifactProvider:
+      name: github
+      config:
+        artifacts:
+          Build:
+            - '/^sentry-.*$/'
+            - 'npm-package'
+            - 'vercel'
+    targets:
+      - name: npm
+        includeNames: '/^sentry-\d.*\.tgz$/'
+      - name: github
+        tagPrefix: 'cli@'
+      - name: vercel
+        projectId: prj_wVkOnIwI3eIQbGD1Gw7qS1MqFFIK
+      - name: registry
+        apps:
+          'app:sentry':
+            name: 'Sentry CLI'
+            packageUrl: 'https://www.npmjs.com/package/sentry'
+            mainDocsUrl: 'https://cli.sentry.dev'
+            urlTemplate: 'https://github.com/getsentry/toolkit/releases/download/cli@{{version}}/{{file}}'
+            includeNames: '/^sentry-.*\.gz$/'
+            checksums:
+              - algorithm: sha256
+                format: hex
+      - name: brew
+        tap: getsentry/tools
+        formula: sentry
+        path: Formula
+        includeNames: '/^sentry-(darwin|linux)-(arm64|x64)\.gz$/'
+        template: |
+          class Sentry < Formula
+            desc "Sentry command-line tool for error monitoring and debugging"
+            homepage "https://cli.sentry.dev"
+            version "{{version}}"
+            license "FSL-1.1-Apache-2.0"
+
+            if OS.mac?
+              if Hardware::CPU.arm?
+                url "https://github.com/getsentry/toolkit/releases/download/cli@{{version}}/sentry-darwin-arm64.gz"
+                sha256 "{{checksums.sentry-darwin-arm64__gz}}"
+              elsif Hardware::CPU.intel?
+                url "https://github.com/getsentry/toolkit/releases/download/cli@{{version}}/sentry-darwin-x64.gz"
+                sha256 "{{checksums.sentry-darwin-x64__gz}}"
+              else
+                raise "Unsupported macOS CPU architecture: #{Hardware::CPU.type}"
+              end
+            elsif OS.linux?
+              if Hardware::CPU.arm? && Hardware::CPU.is_64_bit?
+                url "https://github.com/getsentry/toolkit/releases/download/cli@{{version}}/sentry-linux-arm64.gz"
+                sha256 "{{checksums.sentry-linux-arm64__gz}}"
+              elsif Hardware::CPU.intel? && Hardware::CPU.is_64_bit?
+                url "https://github.com/getsentry/toolkit/releases/download/cli@{{version}}/sentry-linux-x64.gz"
+                sha256 "{{checksums.sentry-linux-x64__gz}}"
+              else
+                raise "Unsupported Linux CPU architecture: #{Hardware::CPU.type} (only 64-bit arm and x86_64 are supported)"
+              end
+            else
+              raise "Unsupported operating system"
+            end
+
+            def install
+              bin.install Dir["sentry-*"].first => "sentry"
+            end
+
+            def post_install
+              system bin/"sentry", "cli", "setup", "--method", "brew", "--no-modify-path"
+            end
+
+            test do
+              assert_match version.to_s, shell_output("#{bin}/sentry --version").chomp
+            end
+          end
+  packages/mcp-server:
+    changelogPolicy: none
+    preReleaseCommand: >-
+      bash -c 'set -e; for package in packages/mcp-* packages/smoke-tests; do
+      (cd "$package" && npm version "$CRAFT_NEW_VERSION" --no-git-tag-version);
+      done'
+    releaseBranchPrefix: release/mcp
+    targets:
+      - name: github
+        includeNames: '/^sentry-mcp-server-\d.*\.tgz$/'
+      - name: npm
+        id: '@sentry/mcp-server'
+        includeNames: '/^sentry-mcp-server-\d.*\.tgz$/'

.github/dependency-review-config.yml

@@ -1,4 +1,8 @@
 # React Router's advisory only affects applications using its unstable RSC APIs.
 # This application uses the stable browser router and has no RSC integration.
+# provider-utils 2.2.8 retains APIs required by ui-utils 1.2.11. Its checked-in
+# pnpm patch backports the upstream bounded-response fix, and check:patches
+# exercises oversized-body rejection and cancellation against the nested copy.
 allow-ghsas:
   - GHSA-qwww-vcr4-c8h2
+  - GHSA-866g-f22w-33x8