Merge main into branch and resolve build cache conflicts

Author: Copilot

apps/rush/CHANGELOG.json

@@ -1,6 +1,18 @@
 {
   "name": "@microsoft/rush",
   "entries": [
+    {
+      "version": "5.177.2",
+      "tag": "@microsoft/rush_v5.177.2",
+      "date": "Wed, 08 Jul 2026 21:27:15 GMT",
+      "comments": {
+        "patch": [
+          {
+            "comment": "Upgrade the `pnpm-sync-lib` dependency to 0.3.4."
+          }
+        ]
+      }
+    },
     {
       "version": "5.177.1",
       "tag": "@microsoft/rush_v5.177.1",

apps/rush/CHANGELOG.md

@@ -1,6 +1,13 @@
 # Change Log - @microsoft/rush
 
-This log was last generated on Sat, 20 Jun 2026 21:37:30 GMT and should not be manually modified.
+This log was last generated on Wed, 08 Jul 2026 21:27:15 GMT and should not be manually modified.
+
+## 5.177.2
+Wed, 08 Jul 2026 21:27:15 GMT
+
+### Patches
+
+- Upgrade the `pnpm-sync-lib` dependency to 0.3.4.
 
 ## 5.177.1
 Sat, 20 Jun 2026 21:37:30 GMT

apps/rush/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/rush",
-  "version": "5.177.1",
+  "version": "5.177.2",
   "description": "A professional solution for consolidating all your JavaScript projects in one Git repo",
   "keywords": [
     "install",
@@ -48,6 +48,7 @@
     "@rushstack/rush-amazon-s3-build-cache-plugin": "workspace:*",
     "@rushstack/rush-azure-storage-build-cache-plugin": "workspace:*",
     "@rushstack/rush-http-build-cache-plugin": "workspace:*",
+    "@rushstack/rush-serve-plugin": "workspace:*",
     "@types/semver": "7.7.1"
   },
   "exports": {

apps/rush/src/start-dev.ts

@@ -29,6 +29,7 @@ function includePlugin(pluginName: string, pluginPackageName?: string): void {
 includePlugin('rush-amazon-s3-build-cache-plugin');
 includePlugin('rush-azure-storage-build-cache-plugin');
 includePlugin('rush-http-build-cache-plugin');
+includePlugin('rush-serve-plugin');
 // Including this here so that developers can reuse it without installing the plugin a second time
 includePlugin('rush-azure-interactive-auth-plugin', '@rushstack/rush-azure-storage-build-cache-plugin');
 

common/autoinstallers/plugins/pnpm-lock.yaml

@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "comment": "Fix `minimumReleaseAge` and `minimumReleaseAgeExclude` in `pnpm-config.json` being silently ignored because they were written to package.json instead of `pnpm-workspace.yaml`",
+      "type": "none",
+      "packageName": "@microsoft/rush"
+    }
+  ],
+  "packageName": "@microsoft/rush",
+  "email": "aaronmaxlevy@users.noreply.github.com"
+}

common/changes/@microsoft/rush/aaron_fix_pnpm_minimum_release_age_2026-07-02-19-35-11.json

@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@microsoft/rush",
+      "comment": "Pass change file paths as discrete Git arguments when adding commit details during publishing.",
+      "type": "patch"
+    }
+  ],
+  "packageName": "@microsoft/rush"
+}

common/changes/@microsoft/rush/fix-publish-command-injection_2026-07-13-15-40.json

@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@microsoft/rush",
+      "comment": "(PLUGIN BREAKING CHANGE) Overhaul watch-mode commands such that the graph is only created once at the start of command invocation, along with a stateful manager object. Plugins may now access the manager object and use it to orchestrate and tap into the build process.",
+      "type": "none"
+    }
+  ],
+  "packageName": "@microsoft/rush"
+}

common/changes/@microsoft/rush/watch-rework_2025-09-26-23-50.json

@@ -0,0 +1,7 @@
+{
+  "$schema": "https://developer.microsoft.com/json-schemas/rush/v5/rush-serve-plugin-options.schema.json",
+  "phasedCommands": ["start"],
+  "portParameterLongName": "--port",
+  "buildStatusWebSocketPath": "/ws",
+  "logServePath": "/logs"
+}

common/config/rush-plugins/rush-serve-plugin.json

@@ -245,24 +245,25 @@
       // Used for very simple builds that don't support CLI arguments like `--production` or `--fix`
       "name": "_phase:lite-build",
       "dependencies": {
-        "upstream": ["_phase:lite-build", "_phase:build"]
+        "upstream": ["_phase:build"]
       },
       "missingScriptBehavior": "silent",
       "allowWarningsOnSuccess": false
     },
     {
       "name": "_phase:build",
       "dependencies": {
-        "self": ["_phase:lite-build"],
-        "upstream": ["_phase:build"]
+        // Don't need to declare the dependency on _phase:build because it is transitive via _phase:lite-build
+        "self": ["_phase:lite-build"]
       },
       "missingScriptBehavior": "log",
       "allowWarningsOnSuccess": false
     },
     {
       "name": "_phase:test",
       "dependencies": {
-        "self": ["_phase:lite-build", "_phase:build"]
+        // Dependency on _phase:lite-build is transitive via _phase:build
+        "self": ["_phase:build"]
       },
       "missingScriptBehavior": "silent",
       "allowWarningsOnSuccess": false
@@ -494,6 +495,14 @@
       "associatedPhases": ["_phase:build", "_phase:test"],
       "associatedCommands": ["build", "rebuild", "test", "retest"]
     },
+    {
+      "longName": "--port",
+      "parameterKind": "integer",
+      "argumentName": "PORT",
+      "description": "The port to use for the server",
+      "associatedPhases": [],
+      "associatedCommands": ["start"]
+    },
     {
       "longName": "--update-snapshots",
       "parameterKind": "flag",