@@ -250,11 +250,39 @@ def _resolve_call_id(approval_item: ToolApprovalItem) -> str | None:
250250 candidate = getattr (raw , "id" , None )
251251 return RunContextWrapper ._to_str_or_none (candidate )
252252
253+ @staticmethod
254+ def _approval_keys_for_scope (
255+ approval_key : str | HostedMCPApprovalKey , approval_scope : str | None
256+ ) -> tuple [str | HostedMCPApprovalKey , ...]:
257+ if approval_key == "apply_patch" and approval_scope is not None :
258+ return (f"apply_patch:{ approval_scope } " , approval_key )
259+ return (approval_key ,)
260+
253261 def _get_or_create_approval_entry (
254262 self ,
255263 approval_key : str | HostedMCPApprovalKey ,
264+ * ,
265+ approval_scope : str | None = None ,
256266 ) -> _ApprovalRecord :
257267 approval_entry = self ._approvals .get (approval_key )
268+ scoped_key = self ._approval_keys_for_scope (approval_key , approval_scope )[0 ]
269+ if scoped_key != approval_key :
270+ other_scope = approval_entry is not None and (
271+ (
272+ approval_entry .sticky_scope is not None
273+ and approval_entry .sticky_scope != approval_scope
274+ )
275+ or any (
276+ invocation .approval_scope != approval_scope
277+ for decisions in (approval_entry .approved , approval_entry .rejected )
278+ if isinstance (decisions , list )
279+ for call_id in decisions
280+ if (invocation := self ._tool_invocations .get (call_id )) is not None
281+ )
282+ )
283+ if scoped_key in self ._approvals or other_scope :
284+ approval_key = scoped_key
285+ approval_entry = self ._approvals .get (approval_key )
258286 if approval_entry is None :
259287 approval_entry = _ApprovalRecord ()
260288 self ._approvals [approval_key ] = approval_entry
@@ -462,13 +490,14 @@ def _matching_sticky_approval_keys(
462490
463491 matching_keys : set [str | HostedMCPApprovalKey ] = set ()
464492 for approval_key in approval_keys :
465- record = self ._approvals .get (approval_key )
466- if (
467- record is not None
468- and (isinstance (record .approved , bool ) or isinstance (record .rejected , bool ))
469- and record .sticky_scope == approval_scope
470- ):
471- matching_keys .add (approval_key )
493+ for scoped_key in self ._approval_keys_for_scope (approval_key , approval_scope ):
494+ record = self ._approvals .get (scoped_key )
495+ if (
496+ record is not None
497+ and (isinstance (record .approved , bool ) or isinstance (record .rejected , bool ))
498+ and record .sticky_scope == approval_scope
499+ ):
500+ matching_keys .add (scoped_key )
472501 return frozenset (matching_keys )
473502
474503 def _mark_tool_call_completed (
@@ -620,11 +649,38 @@ def is_tool_approved(self, tool_name: str, call_id: str) -> bool | None:
620649 return hosted_query_status
621650 return self ._get_approval_status_for_key (tool_name , call_id )
622651
623- def _get_approval_status_for_key (self , approval_key : str , call_id : str ) -> bool | None :
652+ def _get_approval_status_for_key (
653+ self , approval_key : str , call_id : str , * , approval_scope : str | None = None
654+ ) -> bool | None :
624655 """Return True/False/None for a concrete approval key and tool call."""
625- approval_entry = self ._approvals .get (approval_key )
656+ approval_entry = self ._get_approval_record_for_key (
657+ approval_key , call_id , approval_scope = approval_scope
658+ )
626659 return self ._get_approval_status_for_record (approval_entry , call_id )
627660
661+ def _get_approval_record_for_key (
662+ self , approval_key : str , call_id : str , * , approval_scope : str | None = None
663+ ) -> _ApprovalRecord | None :
664+ if approval_scope is None :
665+ invocation = self ._tool_invocations .get (call_id )
666+ approval_scope = invocation .approval_scope if invocation is not None else None
667+ for scoped_key in self ._approval_keys_for_scope (approval_key , approval_scope ):
668+ record = self ._approvals .get (scoped_key )
669+ if record is None or self ._get_approval_status_for_record (record , call_id ) is None :
670+ continue
671+ if self ._get_per_call_approval_status_for_record (record , call_id ) is not None :
672+ return record
673+ if (
674+ approval_scope is None
675+ or record .sticky_scope == approval_scope
676+ or (
677+ record .sticky_scope is None
678+ and self ._allow_legacy_approval_binding_reconstruction
679+ )
680+ ):
681+ return record
682+ return None
683+
628684 @staticmethod
629685 def _get_approval_status_for_record (
630686 approval_entry : _ApprovalRecord | None ,
@@ -877,7 +933,7 @@ def get_rejection_message(
877933 candidates .append (pending_tool_name )
878934
879935 for candidate in candidates :
880- approval_entry = self ._approvals . get (candidate )
936+ approval_entry = self ._get_approval_record_for_key (candidate , call_id )
881937 if not approval_entry :
882938 continue
883939 message = self ._get_rejection_message_for_key (approval_entry , call_id )
@@ -991,7 +1047,13 @@ def _apply_approval_decision(
9911047 exact_approval_key = self ._resolve_approval_key (approval_item )
9921048 decision_keys = (exact_approval_key ,) if always or call_id is None else approval_keys
9931049 approval_entries = tuple (
994- (self ._get_or_create_approval_entry (approval_key ), always )
1050+ (
1051+ self ._get_or_create_approval_entry (
1052+ approval_key ,
1053+ approval_scope = scope_identity [1 ] if scope_identity is not None else None ,
1054+ ),
1055+ always ,
1056+ )
9951057 for approval_key in decision_keys
9961058 )
9971059
@@ -1162,16 +1224,35 @@ def get_approval_status(
11621224 ):
11631225 candidates .append (pending_tool_name )
11641226
1227+ selected_invocation = (
1228+ current_invocation if current_invocation is not None else existing_pending
1229+ )
1230+ if selected_invocation is not None and call_id in self ._tool_invocations :
1231+ self ._tool_invocation_status (
1232+ selected_invocation .raw_item ,
1233+ tool_lookup_key = selected_invocation .tool_lookup_key ,
1234+ tool_name = selected_invocation .tool_name ,
1235+ )
1236+ scope_identity = (
1237+ tool_invocation_approval_scope (
1238+ selected_invocation .raw_item ,
1239+ tool_lookup_key = selected_invocation .tool_lookup_key ,
1240+ tool_name = selected_invocation .tool_name ,
1241+ )
1242+ if selected_invocation is not None
1243+ else None
1244+ )
11651245 status : bool | None = None
11661246 matched_record : _ApprovalRecord | None = None
11671247 for candidate in candidates :
1168- status = self ._get_approval_status_for_key (candidate , call_id )
1248+ matched_record = self ._get_approval_record_for_key (
1249+ candidate ,
1250+ call_id ,
1251+ approval_scope = scope_identity [1 ] if scope_identity is not None else None ,
1252+ )
1253+ status = self ._get_approval_status_for_record (matched_record , call_id )
11691254 if status is not None :
1170- matched_record = self ._approvals .get (candidate )
11711255 break
1172- selected_invocation = (
1173- current_invocation if current_invocation is not None else existing_pending
1174- )
11751256 if status is None or matched_record is None or selected_invocation is None :
11761257 return status
11771258 is_sticky = isinstance (matched_record .approved , bool ) or isinstance (
0 commit comments