diff --git a/scripts/ci/scopes.mjs b/scripts/ci/scopes.mjs
index d80e5ca6e0..18828192ff 100644
--- a/scripts/ci/scopes.mjs
+++ b/scripts/ci/scopes.mjs
@@ -441,20 +441,13 @@ export const SCOPES = {
   agentenv: [
     ".github/workflows/real-agentenv.yml",
     "scripts/verify-agentenv-environment.mjs",
-    "src/application/environment/**",
-    "src/server/environment/**",
-    "src/cli/environmentCommands.ts",
-    "src/cli.ts",
-    "src/cliCommandNames.ts",
-    "src/config/environmentName.ts",
-    "src/config/mcpHttpEndpoint.ts",
+    "src/{application,server}/environment/**",
     "src/server/http/**",
-    "src/domain/analysisView/environmentManifest*.ts",
-    "src/application/analysisView/EnvironmentManifest*.ts",
-    "src/process/OwnedCommand.ts",
-    "src/process/ProviderProcess.ts",
+    "src/{cli,cliCommandNames,cli/environmentCommands}.ts",
+    "src/config/{environmentName,mcpHttpEndpoint}.ts",
+    "src/domain/analysisView/{e,E}nvironmentManifest*.ts",
+    "src/process/{OwnedCommand,ProviderProcess,PrivateRuntimeRoot}.ts",
     "src/process/ProcessOwnership*.ts",
-    "src/process/PrivateRuntimeRoot.ts",
     "tests/fixtures/historicalHar.ts",
   ],
   nativeaot: [