switchboard/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Releases 9 Wiki Activity

Feat settings cascade with user_overridable flag

Browse Source 
Three-tier settings resolution (global → team → user) with per-key
user_overridable flag in package manifests. Admins can lock settings
that team admins and users cannot override.

- Add package_team_settings table (migration 010)
- Add GetTeamSettings/SetTeamSettings/DeleteTeamSettings to PackageStore
- Add ResolveSettings, ParseSettingsSchema, FilterOverridableKeys
- Rewrite Starlark settings.get() to use cascade resolver
- Add TeamID to RunContext for team-aware resolution
- Enforce user_overridable on user settings save
- Add team package settings API (GET/PUT/DELETE)
- 12 unit tests for cascade resolution

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
Jeffrey Smith
2026-03-26 17:57:14 +00:00
parent a830ae3684
commit 45448698d6
13 changed files with 664 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
server/sandbox/settings_module.go
View File

@@ -1,10 +1,12 @@
package sandbox
// settings_module.go — v0.30.0 CS2
// settings_module.go — v0.2.0
//
// The settings module lets extensions read their admin-configured and
// per-user settings. Always injected (no permission required — a package
// reads its own settings).
// The settings module lets extensions read their resolved settings via
// the three-tier cascade: global → team → user, respecting the
// user_overridable flag per setting key.
//
// Always injected (no permission required — a package reads its own settings).
//
// Starlark API:
// val = settings.get("key") # returns string, number, bool, or None
@@ -12,7 +14,6 @@ package sandbox
import (
"context"
"encoding/json"
"go.starlark.net/starlark"
"go.starlark.net/starlarkstruct"
@@ -21,16 +22,15 @@ import (
)
// BuildSettingsModule creates the "settings" Starlark module for a package.
// It reads from package_settings (admin-configured) merged with per-user
// settings when a userID is provided. Package-level settings are the base;
// user-level settings override.
func BuildSettingsModule(ctx context.Context, stores store.Stores, packageID string, userID string) *starlarkstruct.Module {
// It resolves the three-tier cascade (global → team → user) respecting
// the user_overridable flag from the package manifest.
func BuildSettingsModule(ctx context.Context, stores store.Stores, packageID, userID, teamID string) *starlarkstruct.Module {
return MakeModule("settings", starlark.StringDict{
"get": starlark.NewBuiltin("settings.get", settingsGet(ctx, stores, packageID, userID)),
"get": starlark.NewBuiltin("settings.get", settingsGet(ctx, stores, packageID, userID, teamID)),
})
}
func settingsGet(ctx context.Context, stores store.Stores, packageID string, userID string) func(*starlark.Thread, *starlark.Builtin, starlark.Tuple, []starlark.Tuple) (starlark.Value, error) {
func settingsGet(ctx context.Context, stores store.Stores, packageID, userID, teamID string) func(*starlark.Thread, *starlark.Builtin, starlark.Tuple, []starlark.Tuple) (starlark.Value, error) {
return func(_ *starlark.Thread, _ *starlark.Builtin, args starlark.Tuple, kwargs []starlark.Tuple) (starlark.Value, error) {
var key string
var defaultVal starlark.Value = starlark.None
@@ -38,28 +38,44 @@ func settingsGet(ctx context.Context, stores store.Stores, packageID string, use
return nil, err
}
// Load package-level settings
merged := make(map[string]any)
if stores.Packages != nil {
pkgSettings, err := stores.Packages.GetPackageSettings(ctx, packageID)
if err == nil && len(pkgSettings) > 0 {
json.Unmarshal([]byte(pkgSettings), &merged)
if stores.Packages == nil {
return defaultVal, nil
}
// Load global (admin) settings
globalSettings, err := stores.Packages.GetPackageSettings(ctx, packageID)
if err != nil {
globalSettings = nil
}
// Load team settings if team context is available
var teamSettings []byte
if teamID != "" {
ts, err := stores.Packages.GetTeamSettings(ctx, packageID, teamID)
if err == nil {
teamSettings = ts
}
}
// Overlay user-level settings if a user context is available
if userID != "" && stores.Packages != nil {
userSettings, err := stores.Packages.GetUserSettings(ctx, packageID, userID)
if err == nil && userSettings != nil && len(userSettings.Settings) > 0 {
var userMap map[string]any
if json.Unmarshal([]byte(userSettings.Settings), &userMap) == nil {
for k, v := range userMap {
merged[k] = v
}
}
// Load user settings if user context is available
var userSettings []byte
if userID != "" {
pus, err := stores.Packages.GetUserSettings(ctx, packageID, userID)
if err == nil && pus != nil {
userSettings = pus.Settings
}
}
// Parse schema from manifest for user_overridable flags
var schema []store.SettingSchema
pkg, err := stores.Packages.Get(ctx, packageID)
if err == nil && pkg != nil && pkg.Manifest != nil {
schema = store.ParseSettingsSchema(pkg.Manifest)
}
// Resolve cascade
merged := store.ResolveSettings(globalSettings, teamSettings, userSettings, schema)
val, ok := merged[key]
if !ok {
return defaultVal, nil