temporarily revert: preserve permission ordering by accepting a layered array (#27258)

This commit is contained in:
Aiden Cline
2026-05-12 23:55:45 -05:00
committed by GitHub
parent 10b99b2f5a
commit 28204720dc
5 changed files with 18 additions and 224 deletions
+1 -5
View File
@@ -1,5 +1,4 @@
import { Config } from "@/config/config"
import { ConfigPermission } from "@/config/permission"
import { Provider } from "@/provider/provider"
import { ModelID, ProviderID } from "../provider/schema"
import { generateObject, streamObject, type ModelMessage } from "ai"
@@ -118,10 +117,7 @@ export const layer = Layer.effect(
},
})
// Convert permission layers to rulesets and merge them
// Each layer's rules come after the previous, so later configs override earlier ones
const layers = ConfigPermission.toLayers(cfg.permission)
const user = Permission.merge(...layers.map((p) => Permission.fromConfig(p)))
const user = Permission.fromConfig(cfg.permission ?? {})
const agents: Record<string, Info> = {
build: {