mirror of
https://github.com/tiennm99/goclaw.git
synced 2026-10-11 03:13:24 +00:00
viettranx
933c2e10d9
Wake up the dead builtin_tool_tenant_configs.settings column (exists in migrations 000027/SQLite 1180 since v3 tenant foundation, never read/written). Add GetSettings/SetSettings/ListAllSettings interface methods with a json.RawMessage Settings field on BuiltinToolTenantConfig. Both DBs use explicit column-list DO UPDATE SET so Set(enabled) and SetSettings(raw) never clobber each other. Add ErrInvalidTenant sentinel so nil-tenant callers fail fast (no silent master fallback). ListAll now filters enabled IS NOT NULL — rows created via SetSettings stay in their own lane. 9 SQLite unit tests + 4 new PG integration tests (round-trip, column coexist, cross-tenant isolation, nil-tenant guard).
74 lines
3.8 KiB
Go
74 lines
3.8 KiB
Go
package store
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"errors"
|
|
|
|
"github.com/google/uuid"
|
|
)
|
|
|
|
// ErrInvalidTenant is returned when a store method requires an explicit tenant
|
|
// but receives uuid.Nil. Callers can check via errors.Is(err, store.ErrInvalidTenant).
|
|
var ErrInvalidTenant = errors.New("tenant_id cannot be nil")
|
|
|
|
// BuiltinToolTenantConfig represents a per-tenant override for a builtin tool.
|
|
//
|
|
// Two independent override dimensions:
|
|
// - Enabled: tenant admin can force-enable or force-disable the tool (nil = use default).
|
|
// - Settings: tenant admin can override the tool's config JSON blob (nil = no override,
|
|
// falls back to global builtin_tools.settings).
|
|
//
|
|
// The two columns are managed by distinct Set*/Get* methods so a write to one never
|
|
// clobbers the other (see PG/SQLite impl: upsert uses explicit column list on conflict).
|
|
type BuiltinToolTenantConfig struct {
|
|
ToolName string `json:"tool_name" db:"tool_name"`
|
|
TenantID uuid.UUID `json:"tenant_id" db:"tenant_id"`
|
|
Enabled *bool `json:"enabled,omitempty" db:"enabled"` // nil = use default, false = disabled, true = enabled
|
|
Settings json.RawMessage `json:"settings,omitempty" db:"settings"` // nil = no override; tool uses global/hardcoded default
|
|
}
|
|
|
|
// BuiltinToolTenantConfigStore manages per-tenant builtin tool overrides.
|
|
//
|
|
// All methods require an explicit tenantID parameter — passing uuid.Nil returns
|
|
// ErrInvalidTenant. This avoids silent master-default leaks via fallback logic.
|
|
type BuiltinToolTenantConfigStore interface {
|
|
// ListDisabled returns tool names disabled for a tenant.
|
|
ListDisabled(ctx context.Context, tenantID uuid.UUID) ([]string, error)
|
|
// ListAll returns all tenant enabled overrides (tool_name → enabled) for a tenant.
|
|
ListAll(ctx context.Context, tenantID uuid.UUID) (map[string]bool, error)
|
|
// Set creates or updates a tenant tool's enabled override. Preserves settings column.
|
|
Set(ctx context.Context, tenantID uuid.UUID, toolName string, enabled bool) error
|
|
// Delete removes a tenant tool config row entirely (reverts both enabled + settings).
|
|
Delete(ctx context.Context, tenantID uuid.UUID, toolName string) error
|
|
|
|
// GetSettings returns the raw tenant settings JSON for a tool.
|
|
// Returns (nil, nil) when the row doesn't exist or settings column is NULL.
|
|
GetSettings(ctx context.Context, tenantID uuid.UUID, toolName string) (json.RawMessage, error)
|
|
// SetSettings upserts the tenant settings JSON for a tool. Preserves enabled column.
|
|
// Passing nil writes SQL NULL (clears the override without deleting the row).
|
|
SetSettings(ctx context.Context, tenantID uuid.UUID, toolName string, settings json.RawMessage) error
|
|
// ListAllSettings returns tool_name → settings JSON for every row where settings IS NOT NULL.
|
|
// Used by the agent resolver to bulk-load tenant settings at Loop construction.
|
|
ListAllSettings(ctx context.Context, tenantID uuid.UUID) (map[string]json.RawMessage, error)
|
|
}
|
|
|
|
// SkillTenantConfig represents a per-tenant override for a skill.
|
|
type SkillTenantConfig struct {
|
|
SkillID uuid.UUID `json:"skill_id" db:"skill_id"`
|
|
TenantID uuid.UUID `json:"tenant_id" db:"tenant_id"`
|
|
Enabled bool `json:"enabled" db:"enabled"`
|
|
}
|
|
|
|
// SkillTenantConfigStore manages per-tenant skill visibility.
|
|
type SkillTenantConfigStore interface {
|
|
// ListDisabledSkillIDs returns skill IDs disabled for a tenant.
|
|
ListDisabledSkillIDs(ctx context.Context, tenantID uuid.UUID) ([]uuid.UUID, error)
|
|
// ListAll returns all tenant overrides (skillID → enabled) for a tenant.
|
|
ListAll(ctx context.Context, tenantID uuid.UUID) (map[uuid.UUID]bool, error)
|
|
// Set creates or updates a tenant skill config.
|
|
Set(ctx context.Context, tenantID uuid.UUID, skillID uuid.UUID, enabled bool) error
|
|
// Delete removes a tenant skill config (reverts to default).
|
|
Delete(ctx context.Context, tenantID uuid.UUID, skillID uuid.UUID) error
|
|
}
|