cache capability scope builtins for contract rebinding

Author: mgomes

vibes/capability_contracts_scanner.go

@@ -51,6 +51,9 @@ func (s *capabilityContractScanner) bindContracts(
 		if _, skip := s.excluded[builtin]; skip {
 			return
 		}
+		if scope != nil && scope.knownBuiltins != nil {
+			scope.knownBuiltins[builtin] = struct{}{}
+		}
 		ownerScope, seen := scopes[builtin]
 		if !seen {
 			scopes[builtin] = scope

vibes/execution.go

@@ -59,8 +59,9 @@ type Execution struct {
 }
 
 type capabilityContractScope struct {
-	contracts map[string]CapabilityMethodContract
-	roots     []Value
+	contracts     map[string]CapabilityMethodContract
+	roots         []Value
+	knownBuiltins map[*Builtin]struct{}
 }
 
 type moduleContext struct {

vibes/execution_call_capabilities.go

@@ -25,7 +25,8 @@ func bindCapabilitiesForCall(exec *Execution, root *Env, rebinder *callFunctionR
 			continue
 		}
 		scope := &capabilityContractScope{
-			contracts: map[string]CapabilityMethodContract{},
+			contracts:     map[string]CapabilityMethodContract{},
+			knownBuiltins: make(map[*Builtin]struct{}),
 		}
 		if provider, ok := adapter.(CapabilityContractProvider); ok {
 			for methodName, contract := range provider.CapabilityContracts() {

vibes/execution_calls.go

@@ -4,6 +4,15 @@ import (
 	"errors"
 )
 
+func valueCanContainBuiltins(val Value) bool {
+	switch val.Kind() {
+	case KindBuiltin, KindArray, KindHash, KindObject, KindClass, KindInstance:
+		return true
+	default:
+		return false
+	}
+}
+
 func (exec *Execution) autoInvokeIfNeeded(expr Expression, val Value, receiver Value) (Value, error) {
 	switch val.Kind() {
 	case KindFunction:
@@ -39,18 +48,21 @@ func (exec *Execution) invokeCallable(callee Value, receiver Value, args []Value
 		scope := exec.capabilityContractScopes[builtin]
 		var preCallKnownBuiltins map[*Builtin]struct{}
 		if scope != nil && len(scope.contracts) > 0 {
-			preCallKnownBuiltins = make(map[*Builtin]struct{})
+			preCallKnownBuiltins = scope.knownBuiltins
 			preCallScanner := newCapabilityContractScanner()
-			if receiver.Kind() != KindNil {
+			if valueCanContainBuiltins(receiver) {
 				preCallScanner.collectBuiltins(receiver, preCallKnownBuiltins)
 			}
-			for _, root := range scope.roots {
-				preCallScanner.collectBuiltins(root, preCallKnownBuiltins)
-			}
 			for _, arg := range args {
+				if !valueCanContainBuiltins(arg) {
+					continue
+				}
 				preCallScanner.collectBuiltins(arg, preCallKnownBuiltins)
 			}
 			for _, kwarg := range kwargs {
+				if !valueCanContainBuiltins(kwarg) {
+					continue
+				}
 				preCallScanner.collectBuiltins(kwarg, preCallKnownBuiltins)
 			}
 		}
@@ -94,9 +106,15 @@ func (exec *Execution) invokeCallable(callee Value, receiver Value, args []Value
 			// Methods can also publish builtins by mutating positional or keyword
 			// argument objects supplied by script code.
 			for _, arg := range args {
+				if !valueCanContainBuiltins(arg) {
+					continue
+				}
 				postCallScanner.bindContracts(arg, scope, exec.capabilityContracts, exec.capabilityContractScopes)
 			}
 			for _, kwarg := range kwargs {
+				if !valueCanContainBuiltins(kwarg) {
+					continue
+				}
 				postCallScanner.bindContracts(kwarg, scope, exec.capabilityContracts, exec.capabilityContractScopes)
 			}
 		}