Repository navigation
Commit d98ac29
* Python: Fix duplicate function call on approval round-trip (#7267)
`_replace_approval_contents_with_results` deduped restored function calls
against only the message currently being scanned. On an approval round-trip
the hosting layer replays the stored `function_call` item and its
`mcp_approval_request` item as two separate assistant messages, so the
per-message check never fired and the approval request restored a second
copy of the call.
Only one copy received the function result; the orphaned copy was left
unanswered, which the Responses API rejects with
"No tool output found for function call call_<id>".
Collect existing call ids across all messages instead, and add a restored
call to that set so two approval requests for the same call cannot both
expand.
Co-Authored-By: Claude Opus 4.8 <[email protected]>
* Refactor approval placeholder result handling
Refactor approval handling logic to improve clarity and maintainability.
* Refactor test to support reused call IDs after completion
Updated the test to allow reused call IDs after completion, ensuring that a completed call does not suppress later approval requests with the same ID. Adjusted assertions to reflect the new behavior.
---------
Co-authored-by: Claude Opus 4.8 <[email protected]>
1 parent 040e270 commit d98ac29
2 files changed
Lines changed: 68 additions & 11 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2096 | 2096 | | |
2097 | 2097 | | |
2098 | 2098 | | |
| 2099 | + | |
| 2100 | + | |
| 2101 | + | |
| 2102 | + | |
| 2103 | + | |
| 2104 | + | |
2099 | 2105 | | |
2100 | 2106 | | |
2101 | 2107 | | |
| |||
2119 | 2125 | | |
2120 | 2126 | | |
2121 | 2127 | | |
2122 | | - | |
2123 | | - | |
2124 | | - | |
2125 | | - | |
2126 | | - | |
| 2128 | + | |
| 2129 | + | |
| 2130 | + | |
| 2131 | + | |
| 2132 | + | |
| 2133 | + | |
| 2134 | + | |
| 2135 | + | |
| 2136 | + | |
| 2137 | + | |
| 2138 | + | |
| 2139 | + | |
| 2140 | + | |
| 2141 | + | |
| 2142 | + | |
| 2143 | + | |
| 2144 | + | |
| 2145 | + | |
| 2146 | + | |
| 2147 | + | |
| 2148 | + | |
| 2149 | + | |
2127 | 2150 | | |
| 2151 | + | |
2128 | 2152 | | |
2129 | 2153 | | |
2130 | 2154 | | |
| |||
2140 | 2164 | | |
2141 | 2165 | | |
2142 | 2166 | | |
| 2167 | + | |
| 2168 | + | |
2143 | 2169 | | |
2144 | 2170 | | |
2145 | 2171 | | |
| |||
2169 | 2195 | | |
2170 | 2196 | | |
2171 | 2197 | | |
2172 | | - | |
2173 | | - | |
2174 | | - | |
2175 | | - | |
2176 | | - | |
2177 | | - | |
| 2198 | + | |
2178 | 2199 | | |
2179 | 2200 | | |
2180 | 2201 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2338 | 2338 | | |
2339 | 2339 | | |
2340 | 2340 | | |
| 2341 | + | |
| 2342 | + | |
| 2343 | + | |
| 2344 | + | |
| 2345 | + | |
| 2346 | + | |
| 2347 | + | |
| 2348 | + | |
| 2349 | + | |
| 2350 | + | |
| 2351 | + | |
| 2352 | + | |
| 2353 | + | |
| 2354 | + | |
| 2355 | + | |
| 2356 | + | |
| 2357 | + | |
| 2358 | + | |
| 2359 | + | |
| 2360 | + | |
| 2361 | + | |
| 2362 | + | |
| 2363 | + | |
| 2364 | + | |
| 2365 | + | |
| 2366 | + | |
| 2367 | + | |
| 2368 | + | |
| 2369 | + | |
| 2370 | + | |
| 2371 | + | |
| 2372 | + | |
| 2373 | + | |
| 2374 | + | |
| 2375 | + | |
| 2376 | + | |
2341 | 2377 | | |
2342 | 2378 | | |
2343 | 2379 | | |
| |||
0 commit comments