diff --git a/.github/workflows/asf-source-candidate.yml b/.github/workflows/asf-source-candidate.yml
index c16fc390fc4..e09fcb31174 100644
--- a/.github/workflows/asf-source-candidate.yml
+++ b/.github/workflows/asf-source-candidate.yml
@@ -130,7 +130,9 @@ jobs:
 
       - name: Test the extracted source
         working-directory: candidate-source
-        run: npm test
+        # Each workspace already runs test files concurrently. Keep the real
+        # Host processes from competing with other suites for their startup budget.
+        run: npm test -- --concurrency=1
 
       - name: Upload the verified unsigned candidate
         id: candidate
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ab4bb99eaff..6905df31787 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -45,6 +45,7 @@
 
 ### Changed
 
+- Use one Composer model selector for native models and external agents, with shared search and thinking controls (#6158).
 - Bound transcript work on session switches and Read line-index memory; allow providers to own reasoning defaults (#5712, #5461, #6092).
 - Use dedicated directories for projectless tasks and preserve distinct titles for branched sessions (#5966, #4994).
 - Improve Computer Use cursor positioning and visibility; recover interrupted macOS notarization and validation requests and native Windows PTY exit codes (#5051, #5052, #6125, #6101, #6097, #6094).