Merge remote-tracking branch 'origin/master' into fair-benchmark-comparison

# Conflicts:
#	templates/keynote-2/src/connectors/index.ts

Author: zalo

.cargo/config.toml

@@ -5,8 +5,10 @@ rustflags = ["--cfg", "tokio_unstable"]
 bump-versions = "run -p upgrade-version --"
 llm = "run --package xtask-llm-benchmark --bin llm_benchmark --"
 ci = "run -p ci --"
+regen = "run -p regen --"
 smoketest = "ci smoketests --"
 smoketests = "smoketest"
+lint = "ci lint --"
 
 [target.x86_64-pc-windows-msvc]
 # Use a different linker. Otherwise, the build fails with some obscure linker error that

.github/CODEOWNERS

@@ -1,16 +1,17 @@
 /crates/core/src/db/datastore/traits.rs @cloutiertyler
 /rust-toolchain.toml @cloutiertyler
-/.github/CODEOWNERS @cloutiertyler
 LICENSE @cloutiertyler
 LICENSE.txt @cloutiertyler
 /licenses/ @cloutiertyler
 /crates/client-api-messages/src/websocket.rs @centril @gefjon
 
 /crates/cli/src/ @bfops @cloutiertyler @jdetter
 /tools/ci/ @bfops @cloutiertyler @jdetter
-/tools/upgrade-version/ @bfops @jdetter
-/tools/license-check/ @bfops @jdetter
-/.github/ @bfops @jdetter
+/tools/upgrade-version/ @bfops @jdetter @cloutiertyler
+/tools/license-check/ @bfops @jdetter @cloutiertyler
+/.github/ @bfops @jdetter @cloutiertyler
 
 /crates/sdk/examples/quickstart-chat/ @gefjon
 /modules/quickstart-chat/ @gefjon
+
+/.github/CODEOWNERS @cloutiertyler

.github/workflows/check-merge-labels.yml

@@ -2,17 +2,21 @@ name: Check merge labels
 
 on:
   pull_request:
-    types: [labeled, unlabeled]
+    types: [opened, reopened, synchronize, labeled, unlabeled]
   merge_group:
+
 permissions: read-all
 
 jobs:
   label_checks:
+    name: Check merge labels
     runs-on: ubuntu-latest
     steps:
-      - id: manually_blocked
-        if: |
-          contains(github.event.pull_request.labels.*.name, 'do not merge')
+      - if: github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'do not merge')
         run: |
           echo "This is labeled \"Do not merge\"."
           exit 1
+
+      # If we're in a merge queue, the PR has already passed checks these checks before being added to the queue.
+      - if: github.event_name == 'merge_group'
+        run: echo "Merge group run; skipping merge-label checks."