Merge upstream/master into fix-logging-newline-split

Author: rishika0212

.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/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

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.
+

CLAUDE.md

@@ -0,0 +1,3 @@
+# Claude Code Guidelines
+
+Refer to the shared [AI Rules](AI_RULES.md) for guidelines when working in this repository.

GEMINI.md

@@ -1,24 +1,3 @@
-# Repository rules
-
-When making changes to this code base, follow these rules, which are listed
-in no particular order:
-- `packages/devtools_shared` should never introduce a Flutter dependency or a
-dependency on web-only Dart libraries.
-- never import the `packages/devtools_app/lib/devtools_app.dart` file in code
-that lives under `packages/devtools_app/lib/src/`. This file is okay to import
-in code that lives under `packages/devtools_app/test/`.
-
-# Running tests
-
-Unit test and widget tests are all contained under a package's `test/`
-directory. These tests should be run with `flutter test` in all packages except
-for `packages/devtools_shared`, whose tests should be run with `dart test`.
-
 # Gemini Guidelines
 
-- Prefer to use MCP server tools over shell commands whenever possible.
-- When you are done making code changes, ensure the code does not have analysis
-errors or warnings. Also ensure it is formatted properly. You should have MCP
-server tools available to you to perform these tasks. If not, you can get
-analysis errors and warnings by running the `dart analyze` shell command, and
-you can perform Dart formatting with the `dart format` shell command.
+Refer to the shared [AI Rules](AI_RULES.md) for guidelines when working in this repository.

flutter-candidate.txt

@@ -1 +1 @@
-c6cec79f1f5d4ea1242936c7574af02bd39207c4
+49233d08009d7e3313da0bfbd859960d14d9c90c

packages/devtools_app/benchmark/web_bundle_size_test.dart

@@ -11,7 +11,7 @@ import 'package:path/path.dart' as path;
 import 'package:test/test.dart';
 
 // Benchmark size in kB.
-const bundleSizeBenchmark = 5550;
+const bundleSizeBenchmark = 5600;
 const gzipBundleSizeBenchmark = 1650;
 
 void main() {

packages/devtools_app/lib/devtools.dart

@@ -10,4 +10,4 @@
 /// Note: a regexp in the `dt update-version' command logic matches the constant
 /// declaration `const version =`. If you change the declaration you must also
 /// modify the regex in the `dt update-version' command logic.
-const version = '2.57.0-dev.0';
+const version = '2.58.0-dev.0';

packages/devtools_app/lib/src/shared/console/eval/auto_complete.dart

@@ -94,9 +94,7 @@ Future<List<String>> autoCompleteResultsFor(
       }
     } catch (_) {}
   }
-  return result.nonNulls
-      .where((name) => name.startsWith(parts.activeWord))
-      .toList();
+  return result.where((name) => name.startsWith(parts.activeWord)).toList();
 }
 
 // Due to https://github.com/dart-lang/sdk/issues/46221
@@ -197,7 +195,7 @@ Future<Set<String>> _libraryMemberAutocompletes(
     final members = functions.map(
       (funcRef) => funcRef.name!.replaceAll('=', ''),
     );
-    result.addAll(members.nonNulls);
+    result.addAll(members);
   }
   final classes = library.classes;
   if (classes != null) {