Merge upstream/master into fix-network-cancelled-status

Author: rishika0212

.agents/skills/adding-release-notes/scripts/add_note.dart

@@ -1,4 +1,4 @@
-// Copyright 2019 The Flutter Authors
+// Copyright 2026 The Flutter Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
 

.agents/skills/authoring-skills/CHECKLIST.md

@@ -0,0 +1,14 @@
+# Skill Authoring Checklist
+
+Copy this checklist into your response when starting the creation of a new skill.
+
+```markdown
+Skill Development Progress:
+- [ ] Define Purpose: Confirm the skill is necessary and distinct from existing ones.
+- [ ] Naming: Select a lowercase, kebab-case name (prefer gerund form, e.g., adding-release-notes).
+- [ ] Description: Write a third-person "what + when" description for the YAML frontmatter.
+- [ ] Planning: Outline the `SKILL.md` sections (Workflow, Guidelines, Resources).
+- [ ] Progressive Disclosure: Identify if any content should be moved to secondary files (EXAMPLES.md, REFERENCE.md).
+- [ ] Automation (Dart): Ensure any utility scripts in `scripts/` are written in **Dart**.
+- [ ] Final Review: Ensure instructions are concise and skip "obvious" explanations.
+```

.agents/skills/authoring-skills/EXAMPLES.md

@@ -0,0 +1,60 @@
+# Skill Authoring Examples
+
+## 1. Effective YAML Frontmatter
+
+**Good (Gerund + What/When Description):**
+```yaml
+---
+name: processing-logs
+description: Extracts and summarizes error patterns from system logs. Use when the user asks to analyze logs or troubleshoot runtime errors.
+---
+```
+
+**Bad (Vague + First Person):**
+```yaml
+---
+name: helper-tool
+description: I can help you look at files and tell you what is wrong.
+---
+```
+
+## 2. Progressive Disclosure Pattern
+
+If a skill has a complex API or many configuration options, do not put them all in `SKILL.md`.
+
+**SKILL.md:**
+```markdown
+## Advanced Configuration
+For detailed information on environment variables and performance tuning, see [CONFIG.md](CONFIG.md).
+```
+
+## 3. Workflow Patterns
+
+Always use checklists to track state.
+
+```markdown
+## Workflow
+Copy this checklist:
+- [ ] Step 1: Analyze input.
+- [ ] Step 2: Generate draft.
+- [ ] Step 3: Run validation script.
+```
+
+## 4. Automation with Dart
+
+All scripts should be written in Dart and placed in the `scripts/` directory.
+
+**Good Script Usage:**
+```markdown
+## Step 4: Add the entry
+Use the provided utility script to insert the note safely.
+`dart .agents/skills/adding-release-notes/scripts/add_note.dart "Inspector updates" "Added XYZ" TODO`
+```
+
+## 5. Anti-Patterns to Avoid
+
+- **Prohibited**: Using non-Dart languages for utility scripts.
+- **Prohibited**: Using Windows-style paths (always use `/`).
+- **Prohibited**: Offering too many options (narrow the scope to recommended defaults).
+- **Prohibited**: Verbose background stories (Claude already knows how to code).
+- **Prohibited**: Interactive prompts (Agents should be autonomous, not ask for permission at every step).

.agents/skills/authoring-skills/SKILL.md

@@ -0,0 +1,22 @@
+---
+name: authoring-skills
+description: Guides the creation of high-quality, effective skills for agentic workflows. Use when creating or modifying skills in the .agents/skills/ directory.
+---
+
+# Authoring Skills
+
+When creating or modifying skills in this repository, follow these best practices:
+
+- **Antigravity Guidelines**: [Skill authoring best practices](https://antigravity.google/docs/skills)
+- **Anthropic Guidelines**: [Skill authoring best practices](https://platform.claude.com/docs/en/agents-and-tools/agent-skills/best-practices)
+
+## Repository-Specific Guidelines
+
+- **Location**: All skills must be placed in the `.agents/skills/` directory.
+- **Avoid Duplication**: Before creating a skill, check if one already exists in the [flutter/skills](https://github.com/flutter/skills/tree/main/skills) repository. If it does, do not create a local skill; instead, instruct the user to install it via `npx`.
+- **Naming**: Use the gerund form (**verb-ing-noun**) or **noun-phrase** (e.g., `authoring-skills`, `adding-release-notes`). Use only lowercase letters, numbers, and hyphens.
+- **Conciseness**: Prioritize brevity in `SKILL.md`. Agents are already highly capable; only provide context they don't already have.
+- **Automation**: Any utility scripts placed in the `scripts/` directory MUST be written in **Dart**.
+- **Progressive Disclosure**: Use the patterns below to organize instructions effectively:
+  - [CHECKLIST.md](CHECKLIST.md): Template for tracking skill development progress.
+  - [EXAMPLES.md](EXAMPLES.md): Local examples and anti-patterns.

.agents/skills/preparing-pr/SKILL.md

@@ -0,0 +1,27 @@
+---
+name: preparing-pr
+description: Prepare a pull request by running presubmit with fixes. Use when preparing to commit or send a PR.
+---
+
+# Preparing a Pull Request
+
+Follow these steps to prepare a pull request for DevTools:
+
+1.  **Verify `dt` configuration**:
+    -   Ensure `dt` is available on the path by running `dt --help` or verifying its alias.
+    -   If not available, refer to the [CONTRIBUTING guide](../../../CONTRIBUTING.md#L64-L80) for instructions on how to set up the `dt` executable on your path.
+2.  **Update Flutter SDK**:
+    -   Run `dt update-flutter-sdk` to ensure the SDK is up to date.
+3.  **Run Presubmit with Fixes**:
+    -   Run `dt presubmit --fix` to address automated fixes.
+    -   If any issues remain or if the command fails, fix the issues manually and run `dt presubmit --fix` again to verify the fix.
+4.  **Run Tests for Affected Code**:
+    -   Use `git status` or `git diff upstream/master` to find changed files.
+    -   Run tests that are associated with the changed code. For example, if you edited `packages/devtools_app/lib/src/screens/logging/logging_screen.dart`, run the logging tests under `packages/devtools_app/test/screens/logging/`.
+
+## Verification
+
+If any step fails, stop and address the issue, and then verify the issue is fixed before proceeding.
+
+> [!IMPORTANT]
+> Do NOT commit or push changes without getting explicit user approval first.

.cursor/rules/ai_rules.mdc

@@ -0,0 +1,8 @@
+---
+description: Apply rules from AI_RULES.md to all interactions.
+globs: "*"
+alwaysApply: true
+---
+# AI Rules
+
+Follow the rules defined in [AI_RULES.md](../../AI_RULES.md).

.github/PULL_REQUEST_TEMPLATE.md

@@ -53,6 +53,6 @@ If you need help, consider asking for help on [Discord].
 [CLA]: https://cla.developers.google.com/
 [`contributions-welcome`]: https://github.com/flutter/devtools/issues?q=state%3Aopen%20label%3Acontributions-welcome
 [`good-first-issue`]: https://github.com/flutter/devtools/issues?q=state%3Aopen%20label%3Agood-first-issue
-[AI contributions guideline]: https://github.com/flutter/flutter/blob/master/docs/contributing/Tree-hygiene.md#ai-contribution-guidelines
+[AI contributions guidelines]: https://github.com/flutter/flutter/blob/master/docs/contributing/Tree-hygiene.md#ai-contribution-guidelines
 [build.yaml badge]: https://github.com/flutter/devtools/actions/workflows/build.yaml/badge.svg
 [Discord]: https://github.com/flutter/flutter/blob/master/docs/contributing/Chat.md

.github/workflows/build.yaml

@@ -74,7 +74,7 @@ jobs:
           wget -qO- https://dcm.dev/pgp-key.public | sudo gpg --dearmor -o /usr/share/keyrings/dcm.gpg
           echo 'deb [signed-by=/usr/share/keyrings/dcm.gpg arch=amd64] https://dcm.dev/debian stable main' | sudo tee /etc/apt/sources.list.d/dart_stable.list
           sudo apt-get update
-          sudo apt-get install dcm=1.30.0-1 # To avoid errors add `-1` (build number) to the version
+          sudo apt-get install dcm=1.36.0-1 # To avoid errors add `-1` (build number) to the version
           sudo chmod +x /usr/bin/dcm
           echo "$(dcm --version)"
       - name: Setup Dart SDK
@@ -208,7 +208,7 @@ jobs:
         # TODO(https://github.com/flutter/devtools/issues/9357): Re-enable tests on windows-latest.
         os: [macos-latest]
         # Consider running integration tests in ddc mode, too.
-        bot: [integration_dart2js]
+        bot: [integration_dart2js, integration_dart2wasm]
         device: [flutter, flutter-web, dart-cli]
         # Option 1/1 will run all tests for a device in a single shard.
         # Option 1/2 and 2/2 should be enabled to run tests for a device in 2 shards.
@@ -273,7 +273,7 @@ jobs:
       fail-fast: false
       matrix:
         # Consider running integration tests in ddc mode, too.
-        bot: [integration_dart2js]
+        bot: [integration_dart2js, integration_wasm]
         os: [ubuntu-latest, windows-latest]
     steps:
       - name: git clone

.gitignore

@@ -51,3 +51,7 @@ DEPENDENCIES.md
 
 # Ignore devtools_options.yaml files under example.
 **/example/**/devtools_options.yaml
+
+# macOS generated Flutter files
+**/macos/Flutter/ephemeral/
+**/macos/Flutter/GeneratedPluginRegistrant.swift

AI_RULES.md

@@ -0,0 +1,36 @@
+# DevTools Repo Guidelines for AI Assistants
+
+Follow these rules when working in this repository.
+
+## Repository Rules
+
+### Dependencies
+-   **`packages/devtools_shared`**: Never introduce a Flutter dependency or a dependency on web-only Dart libraries.
+-   **Imports**: Never import `packages/devtools_app/lib/devtools_app.dart` in code under `packages/devtools_app/lib/src/`. It is acceptable in test code.
+
+### Code Style
+-   **Style Guide**: Follow the DevTools style guide in [STYLE.md](STYLE.md).
+-   **Formatting & Analysis**: Always ensure code is formatted properly and has no analysis errors or warnings before completing a task.
+
+## Running Tests
+
+-   **Standard Packages**: Run unit and widget tests with `flutter test`.
+-   **`packages/devtools_shared`**: Run tests with `dart test`.
+-   **Integration Tests**: Refer to the [Integration Test README](packages/devtools_app/integration_test/README.md) for instructions on running integration tests.
+
+## Tooling Best Practices
+
+-   **MCP Tools**: Prefer using MCP server tools over shell commands whenever possible.
+
+## UI Development Guidelines
+
+### Constants and Magic Values
+-   **Avoid Raw Values**: Avoid using raw strings or numbers in UI code. Use named constants instead.
+
+### Themes and Styles
+-   **Use Existing Themes**: Use existing theme values and text styles from `packages/devtools_app_shared/lib/src/ui/theme/theme.dart` (e.g., `Theme.of(context).regularTextStyle`).
+-   **Reuse Patterns**: Reuse common patterns and styles used in other UI code in the repository.
+
+### Code Reuse
+-   **Use Shared Components & Utils**: Prefer using reusable components from `shared/ui/` (such as `packages/devtools_app/lib/src/shared/ui/common_widgets.dart`), primitives from `shared/primitives/`, and utilities from `shared/utils/` rather than creating things from scratch.
+