react-instantsearch-core 7.39.1 → 7.41.0

package/dist/umd/ReactInstantSearchCore.js

@@ -1,4 +1,4 @@
-/*! React InstantSearch Core 7.39.1 | © Algolia, Inc. and contributors; MIT License | https://github.com/algolia/instantsearch */
+/*! React InstantSearch Core 7.41.0 | © Algolia, Inc. and contributors; MIT License | https://github.com/algolia/instantsearch */
 (function (global, factory) {
     typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('react')) :
     typeof define === 'function' && define.amd ? define(['exports', 'react'], factory) :
@@ -24,7 +24,7 @@
 
     var React__namespace = /*#__PURE__*/_interopNamespaceDefault(React);
 
-    var version$2 = '7.39.1';
+    var version$2 = '7.41.0';
 
     function _define_property(obj, key, value) {
         if (key in obj) {
@@ -7528,6 +7528,9 @@
             current: 0
         },
         waitForResultsRef: null,
+        resolveWaitForResultsRef: {
+            current: null
+        },
         ignoreMultipleHooksWarning: false
     });
 
@@ -7762,7 +7765,10 @@
         useWidget({
             widget: widget,
             parentIndex: parentIndex,
-            props: stableProps,
+            props: [
+                stableProps,
+                stableAdditionalWidgetProperties
+            ],
             shouldSsr: Boolean(serverContext),
             skipSuspense: skipSuspense
         });
@@ -8499,13 +8505,47 @@
             ].concat(_to_consumable_array(resolveScopedResultsFromWidgets(current.getWidgets()))));
         }, []);
     }
+    function getWidgetsRequestDependencies(widgets) {
+        return widgets.reduce(function(dependencies, widget) {
+            if (isIndexWidget(widget)) {
+                if (widget._isolated) {
+                    return dependencies;
+                }
+                var childDependencies = getWidgetsRequestDependencies(widget.getWidgets());
+                return {
+                    hasSearchWidget: dependencies.hasSearchWidget || childDependencies.hasSearchWidget,
+                    hasRecommendWidget: dependencies.hasRecommendWidget || childDependencies.hasRecommendWidget
+                };
+            }
+            if (widget.dependsOn === 'recommend') {
+                return _object_spread_props(_object_spread({}, dependencies), {
+                    hasRecommendWidget: true
+                });
+            }
+            if (widget.dependsOn === 'none') {
+                return dependencies;
+            }
+            return _object_spread_props(_object_spread({}, dependencies), {
+                hasSearchWidget: true
+            });
+        }, {
+            hasSearchWidget: false,
+            hasRecommendWidget: false
+        });
+    }
+    function recomputeInstantSearchRequestDependencies(instantSearchInstance) {
+        var _getWidgetsRequestDependencies = getWidgetsRequestDependencies(instantSearchInstance.mainIndex.getWidgets()), hasSearchWidget = _getWidgetsRequestDependencies.hasSearchWidget, hasRecommendWidget = _getWidgetsRequestDependencies.hasRecommendWidget;
+        instantSearchInstance._hasSearchWidget = hasSearchWidget;
+        instantSearchInstance._hasRecommendWidget = hasRecommendWidget;
+    }
     var index = function index(widgetParams) {
-        if (widgetParams === undefined || widgetParams.indexName === undefined && !widgetParams.EXPERIMENTAL_isolated) {
+        var _widgetParams_EXPERIMENTAL_isolated;
+        if (widgetParams === undefined || widgetParams.indexName === undefined && !widgetParams.isolated && !widgetParams.EXPERIMENTAL_isolated) {
             throw new Error(withUsage$s('The `indexName` option is required.'));
         }
         // When isolated=true, we use an empty string as the default indexName.
         // This is intentional: isolated indices do not require a real index name.
-        var _widgetParams_indexName = widgetParams.indexName, indexName = _widgetParams_indexName === void 0 ? '' : _widgetParams_indexName, _widgetParams_indexId = widgetParams.indexId, indexId = _widgetParams_indexId === void 0 ? indexName : _widgetParams_indexId, tmp = widgetParams.EXPERIMENTAL_isolated, isolated = tmp === void 0 ? false : tmp;
+        var _widgetParams_indexName = widgetParams.indexName, indexName = _widgetParams_indexName === void 0 ? '' : _widgetParams_indexName, _widgetParams_indexId = widgetParams.indexId, indexId = _widgetParams_indexId === void 0 ? indexName : _widgetParams_indexId, _widgetParams_isolated = widgetParams.isolated, isolated = _widgetParams_isolated === void 0 ? (_widgetParams_EXPERIMENTAL_isolated = widgetParams.EXPERIMENTAL_isolated) !== null && _widgetParams_EXPERIMENTAL_isolated !== void 0 ? _widgetParams_EXPERIMENTAL_isolated : false : _widgetParams_isolated;
         var localWidgets = [];
         var localUiState = {};
         var localInstantSearchInstance = null;
@@ -8513,8 +8553,11 @@
         var helper = null;
         var derivedHelper = null;
         var lastValidSearchParameters = null;
-        var hasRecommendWidget = false;
-        var hasSearchWidget = false;
+        var recomputeLocalRequestDependencies = function recomputeLocalRequestDependencies() {
+            if (localInstantSearchInstance) {
+                recomputeInstantSearchRequestDependencies(localInstantSearchInstance);
+            }
+        };
         return {
             $$type: 'ais.index',
             $$widgetType: 'ais.index',
@@ -8605,21 +8648,12 @@
                 }
                 flatWidgets.forEach(function(widget) {
                     widget.parent = _this;
-                    if (isIndexWidget(widget)) {
-                        return;
-                    }
-                    if (localInstantSearchInstance && widget.dependsOn === 'recommend') {
-                        localInstantSearchInstance._hasRecommendWidget = true;
-                    } else if (localInstantSearchInstance) {
-                        localInstantSearchInstance._hasSearchWidget = true;
-                    } else if (widget.dependsOn === 'recommend') {
-                        hasRecommendWidget = true;
-                    } else {
-                        hasSearchWidget = true;
+                    if (!isIndexWidget(widget)) {
+                        addWidgetId(widget);
                     }
-                    addWidgetId(widget);
                 });
                 localWidgets = localWidgets.concat(flatWidgets);
+                recomputeLocalRequestDependencies();
                 if (localInstantSearchInstance && Boolean(flatWidgets.length)) {
                     privateHelperSetState(helper, {
                         state: getLocalWidgetsSearchParameters(localWidgets, {
@@ -8676,21 +8710,10 @@
                 localWidgets = localWidgets.filter(function(widget) {
                     return flatWidgets.indexOf(widget) === -1;
                 });
-                localWidgets.forEach(function(widget) {
+                flatWidgets.forEach(function(widget) {
                     widget.parent = undefined;
-                    if (isIndexWidget(widget)) {
-                        return;
-                    }
-                    if (localInstantSearchInstance && widget.dependsOn === 'recommend') {
-                        localInstantSearchInstance._hasRecommendWidget = true;
-                    } else if (localInstantSearchInstance) {
-                        localInstantSearchInstance._hasSearchWidget = true;
-                    } else if (widget.dependsOn === 'recommend') {
-                        hasRecommendWidget = true;
-                    } else {
-                        hasSearchWidget = true;
-                    }
                 });
+                recomputeLocalRequestDependencies();
                 if (localInstantSearchInstance && Boolean(flatWidgets.length)) {
                     var _flatWidgets_reduce = flatWidgets.reduce(function(states, widget) {
                         // the `dispose` method exists at this point we already assert it
@@ -8913,12 +8936,7 @@
                     // schedule a render that will render the results injected on the helper.
                     instantSearchInstance.scheduleRender();
                 }
-                if (hasRecommendWidget) {
-                    instantSearchInstance._hasRecommendWidget = true;
-                }
-                if (hasSearchWidget) {
-                    instantSearchInstance._hasSearchWidget = true;
-                }
+                recomputeLocalRequestDependencies();
             },
             render: function render(param) {
                 var _this = this;
@@ -9192,7 +9210,7 @@
         });
     }
 
-    var version = '4.106.0';
+    var version = '4.108.0';
 
     var ANONYMOUS_TOKEN_COOKIE_KEY = '_ALGOLIA';
     function getCookie(name) {
@@ -11333,8 +11351,11 @@
                         mainHelper.searchForFacetValues = mainHelper.searchForCompositionFacetValues.bind(mainHelper);
                     }
                     mainHelper.search = function() {
-                        _this.status = 'loading';
-                        _this.scheduleRender(false);
+                        var hasSearchOrRecommendWidget = _this._hasSearchWidget || _this._hasRecommendWidget;
+                        if (hasSearchOrRecommendWidget) {
+                            _this.status = 'loading';
+                        }
+                        _this.scheduleRender(!hasSearchOrRecommendWidget);
                         // This solution allows us to keep the exact same API for the users but
                         // under the hood, we have a different implementation. It should be
                         // completely transparent for the rest of the codebase. Only this module
@@ -11398,7 +11419,7 @@
                         error.error = error;
                         _this.error = error;
                         _this.status = 'error';
-                        _this.scheduleRender(false);
+                        _this.scheduleRender(!_this._hasSearchWidget && !_this._hasRecommendWidget);
                         // This needs to execute last because it throws the error.
                         _this.emit('error', error);
                     });
@@ -12106,10 +12127,14 @@
         return function(widgetParams) {
             var _ref = widgetParams || {}, _ref_escapeHTML = _ref.escapeHTML, escapeHTML = _ref_escapeHTML === void 0 ? true : _ref_escapeHTML, _ref_transformItems = _ref.transformItems, transformItems = _ref_transformItems === void 0 ? function(indices) {
                 return indices;
-            } : _ref_transformItems, tmp = _ref.future, _ref1 = tmp === void 0 ? {} : tmp, _ref_undefinedEmptyQuery = _ref1.undefinedEmptyQuery, undefinedEmptyQuery = _ref_undefinedEmptyQuery === void 0 ? false : _ref_undefinedEmptyQuery;
+            } : _ref_transformItems, _ref_requiresSearch = _ref.requiresSearch, requiresSearch = _ref_requiresSearch === void 0 ? true : _ref_requiresSearch, tmp = _ref.future, _ref1 = tmp === void 0 ? {} : tmp, _ref_undefinedEmptyQuery = _ref1.undefinedEmptyQuery, undefinedEmptyQuery = _ref_undefinedEmptyQuery === void 0 ? false : _ref_undefinedEmptyQuery;
             var connectorState = {};
             return {
                 $$type: 'ais.autocomplete',
+                dependsOn: requiresSearch ? 'search' : 'none',
+                shouldRender: requiresSearch ? undefined : function() {
+                    return true;
+                },
                 init: function init(initOptions) {
                     var instantSearchInstance = initOptions.instantSearchInstance;
                     renderFn(_object_spread_props(_object_spread({}, this.getWidgetRenderState(initOptions)), {
@@ -12650,6 +12675,7 @@
         return undefined;
     }
 
+    var _computedKey$1;
     var tryParseJson = function tryParseJson(value) {
         try {
             return JSON.parse(value);
@@ -12720,6 +12746,8 @@
         return fallbackInput;
     };
     var defaultGuardrailFallbackResponse = 'Sorry, we are not able to generate a response at the moment.';
+    _computedKey$1 = /** @internal */ '~addToolResultForMessage';
+    var _computedKey1$1 = _computedKey$1;
     /**
      * Abstract base class for chat implementations.
      */ var AbstractChat = /*#__PURE__*/ function() {
@@ -12739,6 +12767,12 @@
             _define_property(this, "sendAutomaticallyWhen", void 0);
             _define_property(this, "shouldRepairToolInput", void 0);
             _define_property(this, "activeResponse", null);
+            _define_property(this, "latestResponse", null);
+            _define_property(this, "responsesByToolCallId", new Map());
+            _define_property(this, "responseByMessage", new WeakMap());
+            // Once tool ownership is discarded, an identifier-only result cannot prove
+            // which response generation submitted it. Scoped submissions remain safe.
+            _define_property(this, "acceptsIdentifierOnlyToolResults", true);
             _define_property(this, "jobExecutor", new SerialJobExecutor());
             /**
        * Appends or replaces a user message to the chat list. This triggers the API call to fetch
@@ -12824,13 +12858,13 @@
                     // Find the message to regenerate from
                     var targetIndex = -1;
                     if (messageId) {
-                        targetIndex = _this1.state.messages.findIndex(function(m) {
+                        targetIndex = _this1.messages.findIndex(function(m) {
                             return m.id === messageId;
                         });
                     } else {
                         // Find the last assistant message
-                        for(var i = _this1.state.messages.length - 1; i >= 0; i--){
-                            if (_this1.state.messages[i].role === 'assistant') {
+                        for(var i = _this1.messages.length - 1; i >= 0; i--){
+                            if (_this1.messages[i].role === 'assistant') {
                                 targetIndex = i;
                                 break;
                             }
@@ -12838,7 +12872,7 @@
                     }
                     if (targetIndex >= 0) {
                         // Remove the assistant message and all messages after it
-                        _this1.state.messages = _this1.state.messages.slice(0, targetIndex);
+                        _this1.messages = _this1.messages.slice(0, targetIndex);
                     }
                     return _this1.makeRequest(_object_spread({
                         trigger: 'regenerate-message',
@@ -12853,23 +12887,10 @@
                     if (!_this.transport) {
                         return Promise.reject(new Error('Transport is required for resuming stream. Please provide a transport when initializing the chat.'));
                     }
-                    _this.setStatus({
-                        status: 'submitted'
-                    });
-                    return _this.transport.reconnectToStream(_object_spread({
-                        chatId: _this.id
-                    }, options)).then(function(stream) {
-                        if (stream) {
-                            return _this.processStreamWithCallbacks(stream);
-                        } else {
-                            _this.setStatus({
-                                status: 'ready'
-                            });
-                            return Promise.resolve();
-                        }
-                    }, function(error) {
-                        _this.handleError(error);
-                        return Promise.resolve();
+                    return _this.consume(function() {
+                        return _this.transport.reconnectToStream(_object_spread({
+                            chatId: _this.id
+                        }, options));
                     });
                 });
             });
@@ -12885,53 +12906,57 @@
             });
             /**
        * Add a tool result for a tool call.
-       */ _define_property(this, "addToolResult", function(param) {
-                var tool = param.tool, toolCallId = param.toolCallId, output = param.output;
-                return _this.jobExecutor.run(function() {
-                    // Find the message with this tool call
-                    var messageIndex = _this.state.messages.findIndex(function(m) {
-                        var _ref;
-                        var _m_parts;
-                        return (_ref = (_m_parts = m.parts) === null || _m_parts === void 0 ? void 0 : _m_parts.some(function(p) {
-                            return 'toolCallId' in p && p.toolCallId === toolCallId || 'type' in p && p.type === "tool-".concat(String(tool));
-                        })) !== null && _ref !== void 0 ? _ref : false;
-                    });
-                    if (messageIndex === -1) return Promise.resolve();
-                    var message = _this.state.messages[messageIndex];
-                    var updatedParts = message.parts.map(function(part) {
-                        if ('toolCallId' in part && part.toolCallId === toolCallId && 'state' in part) {
-                            return _object_spread_props(_object_spread({}, part), {
-                                state: 'output-available',
-                                output: output
-                            });
-                        }
-                        return part;
-                    });
-                    _this.state.replaceMessage(messageIndex, _object_spread_props(_object_spread({}, message), {
-                        parts: updatedParts
-                    }));
-                    // Check if we should auto-send based on sendAutomaticallyWhen
-                    if (_this.sendAutomaticallyWhen) {
-                        return Promise.resolve(_this.sendAutomaticallyWhen({
-                            messages: _this.state.messages
-                        })).then(function(shouldSend) {
-                            if (shouldSend) {
-                                return _this.makeRequest({
-                                    trigger: 'submit-message'
-                                });
-                            }
-                            return Promise.resolve();
+       */ _define_property(this, "addToolResult", function(options) {
+                if (!_this.acceptsIdentifierOnlyToolResults) {
+                    return Promise.resolve();
+                }
+                var owners = _this.responsesByToolCallId.get(options.toolCallId);
+                var response = (owners === null || owners === void 0 ? void 0 : owners.size) === 1 ? owners.values().next().value : undefined;
+                if (response) return _this.submitToolResult(response, options);
+                var findMatchingMessage = function findMatchingMessage() {
+                    var matchingMessages = _this.messages.filter(function(message) {
+                        var _message_parts;
+                        return (_message_parts = message.parts) === null || _message_parts === void 0 ? void 0 : _message_parts.some(function(part) {
+                            return 'toolCallId' in part && part.toolCallId === options.toolCallId;
                         });
+                    });
+                    return matchingMessages.length === 1 ? matchingMessages[0] : undefined;
+                };
+                if (!findMatchingMessage()) return Promise.resolve();
+                return _this.jobExecutor.run(function() {
+                    if (!_this.acceptsIdentifierOnlyToolResults) return Promise.resolve();
+                    var message = findMatchingMessage();
+                    if (!message || !_this.commit(options.toolCallId, options.output, message.id, undefined, message)) {
+                        return Promise.resolve();
                     }
-                    return Promise.resolve();
+                    return _this.continueResponse();
                 });
             });
+            _define_property(this, _computedKey1$1, function(message, options) {
+                var hasToolCall = function hasToolCall(candidate) {
+                    var _candidate_parts;
+                    return ((_candidate_parts = candidate.parts) === null || _candidate_parts === void 0 ? void 0 : _candidate_parts.some(function(part) {
+                        return 'toolCallId' in part && part.toolCallId === options.toolCallId;
+                    })) === true;
+                };
+                if (!hasToolCall(message)) {
+                    return Promise.resolve();
+                }
+                var response = _this.responseByMessage.get(message);
+                var currentMessage = _this.messages.includes(message) ? message : response && !response.isRetired ? _this.messages.find(function(candidate) {
+                    return candidate.id === message.id && _this.responseByMessage.get(candidate) === response && hasToolCall(candidate);
+                }) : undefined;
+                if (!currentMessage) return Promise.resolve();
+                return _this.submitToolResult(response, options, currentMessage.id, currentMessage);
+            });
             /**
        * Abort the current request immediately, keep the generated tokens if any.
        */ _define_property(this, "stop", function() {
                 if (_this.activeResponse) {
-                    _this.activeResponse.abortController.abort();
+                    var response = _this.activeResponse;
+                    response.outcome = 'aborted';
                     _this.activeResponse = null;
+                    response.abortController.abort();
                 }
                 _this.setStatus({
                     status: 'ready'
@@ -12993,6 +13018,14 @@
        * context.
        */ key: "resetConversationId",
                 value: function resetConversationId() {
+                    if (this.responsesByToolCallId.size > 0 || this.messages.some(function(message) {
+                        var _message_parts;
+                        return (_message_parts = message.parts) === null || _message_parts === void 0 ? void 0 : _message_parts.some(function(part) {
+                            return 'toolCallId' in part;
+                        });
+                    })) {
+                        this.acceptsIdentifierOnlyToolResults = false;
+                    }
                     this.conversationId = this.generateId();
                 }
             },
@@ -13002,7 +13035,93 @@
                     return this.state.messages;
                 },
                 set: function set(messages) {
+                    var _this = this;
+                    var getToolOccurrences = function getToolOccurrences(message) {
+                        return message.parts.filter(function(part) {
+                            return 'toolCallId' in part;
+                        }).map(function(part) {
+                            return {
+                                type: part.type,
+                                toolCallId: part.toolCallId,
+                                state: 'state' in part ? part.state : undefined,
+                                input: 'input' in part ? part.input : undefined,
+                                output: 'output' in part ? part.output : undefined,
+                                errorText: 'errorText' in part ? part.errorText : undefined,
+                                providerExecuted: 'providerExecuted' in part ? part.providerExecuted : undefined
+                            };
+                        });
+                    };
+                    var isEquivalentRehydration = function isEquivalentRehydration(message) {
+                        var replacements = messages.filter(function(candidate) {
+                            return candidate.id === message.id;
+                        });
+                        if (replacements.length !== 1) return false;
+                        var toolOccurrences = getToolOccurrences(message);
+                        var replacementToolOccurrences = getToolOccurrences(replacements[0]);
+                        return toolOccurrences.length > 0 || replacementToolOccurrences.length > 0 ? isEqual(toolOccurrences, replacementToolOccurrences) : isEqual(message.parts, replacements[0].parts);
+                    };
+                    var detachedResponses = new Set();
+                    this.state.messages.forEach(function(message) {
+                        if (!messages.includes(message)) {
+                            var response = _this.responseByMessage.get(message);
+                            if (response && !isEquivalentRehydration(message)) {
+                                detachedResponses.add(response);
+                            }
+                        }
+                    });
+                    var removedToolOwner = this.state.messages.some(function(message) {
+                        var _message_parts;
+                        return ((_message_parts = message.parts) === null || _message_parts === void 0 ? void 0 : _message_parts.some(function(part) {
+                            return 'toolCallId' in part;
+                        })) && !messages.includes(message) && !isEquivalentRehydration(message);
+                    });
+                    var toolCallIds = new Set();
+                    var hasDuplicateToolCallId = messages.some(function(message) {
+                        var _message_parts;
+                        return ((_message_parts = message.parts) === null || _message_parts === void 0 ? void 0 : _message_parts.some(function(part) {
+                            if (!('toolCallId' in part)) {
+                                return false;
+                            }
+                            if (toolCallIds.has(part.toolCallId)) {
+                                return true;
+                            }
+                            toolCallIds.add(part.toolCallId);
+                            return false;
+                        })) === true;
+                    });
+                    if (removedToolOwner || hasDuplicateToolCallId) {
+                        this.acceptsIdentifierOnlyToolResults = false;
+                    }
                     this.state.messages = messages;
+                    var retainedMessageIds = new Set(messages.map(function(message) {
+                        return message.id;
+                    }));
+                    var responses = new Set();
+                    this.responsesByToolCallId.forEach(function(owners) {
+                        owners.forEach(function(response) {
+                            return responses.add(response);
+                        });
+                    });
+                    if (this.activeResponse) {
+                        responses.add(this.activeResponse);
+                    }
+                    detachedResponses.forEach(function(response) {
+                        responses.add(response);
+                        _this.retireResponse(response);
+                    });
+                    responses.forEach(function(response) {
+                        var message = response.messageId ? messages.find(function(candidate) {
+                            return candidate.id === response.messageId;
+                        }) : undefined;
+                        if (message && !response.isRetired && !detachedResponses.has(response)) {
+                            _this.responseByMessage.set(message, response);
+                        }
+                    });
+                    responses.forEach(function(response) {
+                        if (detachedResponses.has(response) || response.messageId && !retainedMessageIds.has(response.messageId)) {
+                            _this.pruneDetachedResponse(response);
+                        }
+                    });
                 }
             },
             {
@@ -13011,6 +13130,154 @@
                     return this.state.messages[this.state.messages.length - 1];
                 }
             },
+            {
+                key: "replaceMessage",
+                value: function replaceMessage(index, message, response) {
+                    var _this_messages_index;
+                    this.state.replaceMessage(index, message);
+                    var canonicalMessage = (_this_messages_index = this.messages[index]) !== null && _this_messages_index !== void 0 ? _this_messages_index : message;
+                    if (response && this.messages.includes(canonicalMessage)) {
+                        this.responseByMessage.set(canonicalMessage, response);
+                    }
+                    return canonicalMessage;
+                }
+            },
+            {
+                key: "commit",
+                value: function commit(toolCallId, output, messageId, response, expectedMessage) {
+                    var isTargetPart = function isTargetPart(part) {
+                        return 'toolCallId' in part && part.toolCallId === toolCallId;
+                    };
+                    var messageIndex = this.messages.findIndex(function(message) {
+                        return (!messageId || message.id === messageId) && (!expectedMessage || message === expectedMessage) && message.parts.some(isTargetPart);
+                    });
+                    if (messageIndex === -1) return false;
+                    var message = this.messages[messageIndex];
+                    var partIndex = message.parts.findIndex(isTargetPart);
+                    var part = message.parts[partIndex];
+                    if (!('state' in part) || part.state === 'output-available' && !part.preliminary || part.state === 'output-error') {
+                        return false;
+                    }
+                    // eslint-disable-next-line no-unused-vars, @typescript-eslint/no-unused-vars
+                    part.preliminary; // eslint-disable-next-line no-unused-vars, @typescript-eslint/no-unused-vars
+                    part.rawOutput;
+                    var committedPart = _object_without_properties(part, [
+                        "preliminary",
+                        "rawOutput"
+                    ]);
+                    var updatedParts = _to_consumable_array(message.parts);
+                    updatedParts[partIndex] = _object_spread_props(_object_spread({}, committedPart), {
+                        state: 'output-available',
+                        output: output
+                    });
+                    var updatedMessage = _object_spread_props(_object_spread({}, message), {
+                        parts: updatedParts
+                    });
+                    this.replaceMessage(messageIndex, updatedMessage, response);
+                    return true;
+                }
+            },
+            {
+                key: "continueResponse",
+                value: function continueResponse(response) {
+                    var _this = this;
+                    if (response) {
+                        this.pruneDetachedResponse(response);
+                        if (response.isRetired || response.outcome !== 'succeeded' || response.requiredToolCallIds.size === 0 || Array.from(response.requiredToolCallIds).some(function(toolCallId) {
+                            return !response.resolvedToolCallIds.has(toolCallId);
+                        }) || !response.didNotifyFinish || response.didEvaluateContinuation) {
+                            return Promise.resolve();
+                        }
+                        response.didEvaluateContinuation = true;
+                    }
+                    if (!this.sendAutomaticallyWhen) return Promise.resolve();
+                    return Promise.resolve().then(function() {
+                        return _this.sendAutomaticallyWhen({
+                            messages: _this.messages
+                        });
+                    }).then(function(shouldSend) {
+                        if (response) {
+                            _this.pruneDetachedResponse(response);
+                            if (response.isRetired) return undefined;
+                        }
+                        return shouldSend ? _this.makeRequest({
+                            trigger: 'submit-message'
+                        }) : undefined;
+                    }).catch(function(error) {
+                        if (response) {
+                            _this.pruneDetachedResponse(response);
+                            if (response.isRetired) return;
+                            _this.handleError(error, {
+                                updateState: _this.latestResponse === response
+                            });
+                            return;
+                        }
+                        _this.handleError(error);
+                    });
+                }
+            },
+            {
+                key: "retireResponse",
+                value: function retireResponse(response) {
+                    if (response.isRetired) return;
+                    response.isRetired = true;
+                    response.didEvaluateContinuation = true;
+                    if (this.activeResponse === response) {
+                        response.outcome = 'aborted';
+                        this.activeResponse = null;
+                        response.abortController.abort();
+                        this.setStatus({
+                            status: 'ready'
+                        });
+                    }
+                }
+            },
+            {
+                key: "pruneDetachedResponse",
+                value: function pruneDetachedResponse(response) {
+                    var _this = this;
+                    if (!response.isRetired) {
+                        if (!response.messageId || this.messages.some(function(message) {
+                            return message.id === response.messageId;
+                        })) {
+                            return;
+                        }
+                        this.retireResponse(response);
+                    }
+                    // Keep a routing tombstone while a callback is running so public
+                    // addToolResult calls settle directly instead of entering the executor.
+                    if (response.pendingToolCallbacks > 0) return;
+                    this.responsesByToolCallId.forEach(function(owners, toolCallId) {
+                        owners.delete(response);
+                        if (owners.size === 0) {
+                            _this.responsesByToolCallId.delete(toolCallId);
+                        }
+                    });
+                }
+            },
+            {
+                key: "submitToolResult",
+                value: function submitToolResult(response, param) {
+                    var _this = this;
+                    var toolCallId = param.toolCallId, output = param.output, messageId = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : response === null || response === void 0 ? void 0 : response.messageId, expectedMessage = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : messageId ? this.messages.find(function(message) {
+                        return message.id === messageId;
+                    }) : undefined;
+                    if (response === null || response === void 0 ? void 0 : response.isRetired) return Promise.resolve();
+                    var commitResult = function commitResult() {
+                        if (!_this.commit(toolCallId, output, messageId, response, expectedMessage)) {
+                            return Promise.resolve();
+                        }
+                        if (response === null || response === void 0 ? void 0 : response.requiredToolCallIds.has(toolCallId)) {
+                            response.resolvedToolCallIds.add(toolCallId);
+                        }
+                        return _this.continueResponse(response);
+                    };
+                    if (response && (this.activeResponse === response || response.outcome !== 'succeeded' || response.didEvaluateContinuation)) {
+                        return commitResult();
+                    }
+                    return this.jobExecutor.run(commitResult);
+                }
+            },
             {
                 key: "makeRequest",
                 value: function makeRequest(options) {
@@ -13018,42 +13285,72 @@
                     if (!this.transport) {
                         return Promise.reject(new Error('Transport is required for sending messages. Please provide a transport when initializing the chat.'));
                     }
-                    // Abort any existing request
+                    return this.consume(function(abortSignal) {
+                        return _this.transport.sendMessages({
+                            chatId: _this.id,
+                            messages: _this.messages,
+                            abortSignal: abortSignal,
+                            trigger: options.trigger,
+                            messageId: options.messageId,
+                            headers: options.headers,
+                            body: options.body,
+                            requestMetadata: options.metadata
+                        });
+                    });
+                }
+            },
+            {
+                key: "consume",
+                value: function consume(createStream) {
+                    var _this = this;
                     if (this.activeResponse) {
+                        this.activeResponse.outcome = 'aborted';
                         this.activeResponse.abortController.abort();
                     }
-                    var abortController = new AbortController();
-                    this.activeResponse = {
-                        abortController: abortController
+                    var response = {
+                        abortController: new AbortController(),
+                        outcome: 'active',
+                        isRetired: false,
+                        requiredToolCallIds: new Set(),
+                        resolvedToolCallIds: new Set(),
+                        returnedToolCallbacks: [],
+                        pendingToolCallbacks: 0,
+                        didNotifyFinish: false,
+                        didEvaluateContinuation: false
                     };
+                    this.activeResponse = response;
+                    this.latestResponse = response;
                     this.setStatus({
                         status: 'submitted'
                     });
-                    return this.transport.sendMessages({
-                        chatId: this.id,
-                        messages: this.state.messages,
-                        abortSignal: abortController.signal,
-                        trigger: options.trigger,
-                        messageId: options.messageId,
-                        headers: options.headers,
-                        body: options.body,
-                        requestMetadata: options.metadata
-                    }).then(function(stream) {
-                        _this.activeResponse.stream = stream;
-                        return _this.processStreamWithCallbacks(stream);
+                    return createStream(response.abortController.signal).then(function(stream) {
+                        if (_this.activeResponse === response) {
+                            if (stream) return _this.processStream(stream, response);
+                            response.outcome = 'succeeded';
+                            _this.activeResponse = null;
+                            _this.setStatus({
+                                status: 'ready'
+                            });
+                        }
+                        return undefined;
                     }, function(error) {
+                        if (_this.activeResponse !== response) return;
+                        _this.activeResponse = null;
                         if (error.name === 'AbortError') {
-                            // Request was aborted, don't treat as error
-                            return Promise.resolve();
+                            response.outcome = 'aborted';
+                            _this.setStatus({
+                                status: 'ready'
+                            });
+                        } else {
+                            response.outcome = 'failed';
+                            _this.handleError(error);
                         }
-                        _this.handleError(error);
-                        return Promise.resolve();
                     });
                 }
             },
             {
-                key: "processStreamWithCallbacks",
-                value: function processStreamWithCallbacks(stream) {
+                key: "processStream",
+                value: function processStream1(stream, response) {
                     var _this = this;
                     this.setStatus({
                         status: 'streaming'
@@ -13062,26 +13359,135 @@
                     var currentMessage;
                     var currentMessageIndex = -1;
                     var isAbort = false;
-                    var isDisconnect = false;
                     var isError = false;
-                    // Track current text/reasoning part state
-                    var currentTextPartId;
-                    var currentReasoningPartId;
                     var toolRawInputByCallId = {};
                     var toolRawOutputByCallId = {};
-                    // Promise chain for handling tool calls that return promises
-                    var pendingToolCall = Promise.resolve();
+                    var findToolPart = function findToolPart(toolCallId) {
+                        return currentMessage.parts.findIndex(function(part) {
+                            return 'toolCallId' in part && part.toolCallId === toolCallId;
+                        });
+                    };
+                    var setPart = function setPart(index, part) {
+                        var parts = _to_consumable_array(currentMessage.parts);
+                        parts[index < 0 ? parts.length : index] = part;
+                        currentMessage = _object_spread_props(_object_spread({}, currentMessage), {
+                            parts: parts
+                        });
+                        currentMessage = _this.replaceMessage(currentMessageIndex, currentMessage, response);
+                    };
+                    var mergeCallProviderMetadata = function mergeCallProviderMetadata(toolCallId, metadata) {
+                        var toolIndex = findToolPart(toolCallId);
+                        if (toolIndex < 0) return;
+                        var existingPart = currentMessage.parts[toolIndex];
+                        setPart(toolIndex, _object_spread_props(_object_spread({}, existingPart), {
+                            callProviderMetadata: metadata !== null && metadata !== void 0 ? metadata : existingPart.callProviderMetadata
+                        }));
+                    };
+                    var getCanonicalMessage = function getCanonicalMessage() {
+                        var _this_messages_find;
+                        return response.messageId ? (_this_messages_find = _this.messages.find(function(message) {
+                            return message.id === response.messageId;
+                        })) !== null && _this_messages_find !== void 0 ? _this_messages_find : currentMessage : currentMessage;
+                    };
+                    var notifyFinish = function notifyFinish(param) {
+                        var isAbort = param.isAbort, isDisconnect = param.isDisconnect, isError = param.isError, message = param.message, _param_allowRetired = param.allowRetired, allowRetired = _param_allowRetired === void 0 ? false : _param_allowRetired;
+                        _this.pruneDetachedResponse(response);
+                        if (response.isRetired && !allowRetired || response.didNotifyFinish) {
+                            return;
+                        }
+                        response.didNotifyFinish = true;
+                        var canonicalMessage = message !== null && message !== void 0 ? message : getCanonicalMessage();
+                        if (_this.onFinish && canonicalMessage) {
+                            _this.onFinish({
+                                message: canonicalMessage,
+                                messages: _this.messages,
+                                isAbort: isAbort,
+                                isDisconnect: isDisconnect,
+                                isError: isError
+                            });
+                        }
+                    };
+                    var failToolCall = function failToolCall(reason) {
+                        if (response.outcome !== 'active') return;
+                        var message = getCanonicalMessage();
+                        var wasRetired = response.isRetired;
+                        var error = _instanceof(reason, Error) ? reason : new Error(String(reason));
+                        response.outcome = 'failed';
+                        response.abortController.abort();
+                        if (_this.activeResponse === response) {
+                            _this.activeResponse = null;
+                            _this.handleError(error);
+                        }
+                        notifyFinish({
+                            isAbort: false,
+                            isDisconnect: false,
+                            isError: true,
+                            message: message,
+                            allowRetired: !wasRetired
+                        });
+                    };
+                    var acceptServerToolResult = function acceptServerToolResult(toolCallId) {
+                        if (response.requiredToolCallIds.has(toolCallId)) {
+                            response.resolvedToolCallIds.add(toolCallId);
+                        }
+                    };
                     return new Promise(function(resolve) {
+                        var finish = function finish(error) {
+                            if (response.outcome === 'failed') {
+                                resolve();
+                                return;
+                            }
+                            isAbort || (isAbort = response.outcome === 'aborted' || !!error && error.name === 'AbortError');
+                            response.outcome = isAbort ? 'aborted' : error ? 'failed' : 'succeeded';
+                            if (_this.activeResponse === response) {
+                                _this.activeResponse = null;
+                                if (error && !isAbort) {
+                                    _this.handleError(error);
+                                } else {
+                                    _this.setStatus({
+                                        status: 'ready'
+                                    });
+                                }
+                            }
+                            notifyFinish({
+                                isAbort: isAbort,
+                                isDisconnect: !!error && !isAbort,
+                                isError: isError
+                            });
+                            resolve(isAbort || error ? undefined : _this.continueResponse(response));
+                        };
                         processStream(stream, function(chunk) {
+                            if (_this.activeResponse !== response || response.isRetired) return;
+                            if (currentMessageId) {
+                                var canonicalMessageIndex = _this.messages.findIndex(function(message) {
+                                    return message.id === currentMessageId;
+                                });
+                                if (canonicalMessageIndex === -1) {
+                                    _this.pruneDetachedResponse(response);
+                                    return;
+                                }
+                                currentMessageIndex = canonicalMessageIndex;
+                                currentMessage = _this.messages[canonicalMessageIndex];
+                                _this.responseByMessage.set(currentMessage, response);
+                            }
                             switch(chunk.type){
                                 case 'start':
                                     {
                                         currentMessageId = chunk.messageId || _this.generateId();
+                                        response.messageId = currentMessageId;
                                         // Check if we're continuing an existing message or creating a new one
                                         var lastMessage = _this.lastMessage;
                                         if (lastMessage && lastMessage.role === 'assistant' && lastMessage.id === currentMessageId) {
-                                            currentMessage = lastMessage;
-                                            currentMessageIndex = _this.state.messages.length - 1;
+                                            if (lastMessage.parts.some(function(part) {
+                                                return 'toolCallId' in part;
+                                            })) {
+                                                _this.acceptsIdentifierOnlyToolResults = false;
+                                            }
+                                            currentMessage = _object_spread_props(_object_spread({}, lastMessage), {
+                                                parts: _to_consumable_array(lastMessage.parts)
+                                            });
+                                            currentMessageIndex = _this.messages.length - 1;
+                                            currentMessage = _this.replaceMessage(currentMessageIndex, currentMessage, response);
                                         } else {
                                             currentMessage = {
                                                 id: currentMessageId,
@@ -13090,123 +13496,60 @@
                                                 metadata: chunk.messageMetadata
                                             };
                                             _this.state.pushMessage(currentMessage);
-                                            currentMessageIndex = _this.state.messages.length - 1;
+                                            currentMessageIndex = _this.messages.length - 1;
+                                            _this.responseByMessage.set(currentMessage, response);
                                         }
                                         break;
                                     }
                                 case 'text-start':
+                                case 'reasoning-start':
                                     {
                                         if (!currentMessage) break;
-                                        currentTextPartId = chunk.id;
-                                        var textPart = {
-                                            type: 'text',
+                                        var type = chunk.type === 'text-start' ? 'text' : 'reasoning';
+                                        setPart(-1, {
+                                            type: type,
                                             text: '',
                                             state: 'streaming',
                                             providerMetadata: chunk.providerMetadata
-                                        };
-                                        currentMessage = _object_spread_props(_object_spread({}, currentMessage), {
-                                            parts: _to_consumable_array(currentMessage.parts).concat([
-                                                textPart
-                                            ])
                                         });
-                                        _this.state.replaceMessage(currentMessageIndex, currentMessage);
                                         break;
                                     }
                                 case 'text-delta':
+                                case 'reasoning-delta':
                                     {
-                                        if (!currentMessage || !currentTextPartId) break;
-                                        var partIndex = currentMessage.parts.findIndex(function(p) {
-                                            return p.type === 'text' && p.state === 'streaming';
+                                        var type1 = chunk.type === 'text-delta' ? 'text' : 'reasoning';
+                                        if (!currentMessage) break;
+                                        var partIndex = currentMessage.parts.findIndex(function(part) {
+                                            return part.type === type1 && part.state === 'streaming';
                                         });
                                         if (partIndex === -1) break;
-                                        var updatedParts = _to_consumable_array(currentMessage.parts);
-                                        var textPart1 = updatedParts[partIndex];
-                                        updatedParts[partIndex] = _object_spread_props(_object_spread({}, textPart1), {
-                                            text: textPart1.text + chunk.delta
-                                        });
-                                        currentMessage = _object_spread_props(_object_spread({}, currentMessage), {
-                                            parts: updatedParts
-                                        });
-                                        _this.state.replaceMessage(currentMessageIndex, currentMessage);
+                                        var part = currentMessage.parts[partIndex];
+                                        setPart(partIndex, _object_spread_props(_object_spread({}, part), {
+                                            text: part.text + chunk.delta
+                                        }));
                                         break;
                                     }
                                 case 'text-end':
-                                    {
-                                        if (!currentMessage) break;
-                                        var partIndex1 = currentMessage.parts.findIndex(function(p) {
-                                            return p.type === 'text' && p.state === 'streaming';
-                                        });
-                                        if (partIndex1 === -1) break;
-                                        var updatedParts1 = _to_consumable_array(currentMessage.parts);
-                                        var textPart2 = updatedParts1[partIndex1];
-                                        updatedParts1[partIndex1] = _object_spread_props(_object_spread({}, textPart2), {
-                                            state: 'done'
-                                        });
-                                        currentMessage = _object_spread_props(_object_spread({}, currentMessage), {
-                                            parts: updatedParts1
-                                        });
-                                        _this.state.replaceMessage(currentMessageIndex, currentMessage);
-                                        currentTextPartId = undefined;
-                                        break;
-                                    }
-                                case 'reasoning-start':
-                                    {
-                                        if (!currentMessage) break;
-                                        currentReasoningPartId = chunk.id;
-                                        var reasoningPart = {
-                                            type: 'reasoning',
-                                            text: '',
-                                            state: 'streaming',
-                                            providerMetadata: chunk.providerMetadata
-                                        };
-                                        currentMessage = _object_spread_props(_object_spread({}, currentMessage), {
-                                            parts: _to_consumable_array(currentMessage.parts).concat([
-                                                reasoningPart
-                                            ])
-                                        });
-                                        _this.state.replaceMessage(currentMessageIndex, currentMessage);
-                                        break;
-                                    }
-                                case 'reasoning-delta':
-                                    {
-                                        if (!currentMessage || !currentReasoningPartId) break;
-                                        var partIndex2 = currentMessage.parts.findIndex(function(p) {
-                                            return p.type === 'reasoning' && p.state === 'streaming';
-                                        });
-                                        if (partIndex2 === -1) break;
-                                        var updatedParts2 = _to_consumable_array(currentMessage.parts);
-                                        var reasoningPart1 = updatedParts2[partIndex2];
-                                        updatedParts2[partIndex2] = _object_spread_props(_object_spread({}, reasoningPart1), {
-                                            text: reasoningPart1.text + chunk.delta
-                                        });
-                                        currentMessage = _object_spread_props(_object_spread({}, currentMessage), {
-                                            parts: updatedParts2
-                                        });
-                                        _this.state.replaceMessage(currentMessageIndex, currentMessage);
-                                        break;
-                                    }
                                 case 'reasoning-end':
                                     {
                                         if (!currentMessage) break;
-                                        var partIndex3 = currentMessage.parts.findIndex(function(p) {
-                                            return p.type === 'reasoning' && p.state === 'streaming';
+                                        var type2 = chunk.type === 'text-end' ? 'text' : 'reasoning';
+                                        var partIndex1 = currentMessage.parts.findIndex(function(part) {
+                                            return part.type === type2 && part.state === 'streaming';
                                         });
-                                        if (partIndex3 === -1) break;
-                                        var updatedParts3 = _to_consumable_array(currentMessage.parts);
-                                        var reasoningPart2 = updatedParts3[partIndex3];
-                                        updatedParts3[partIndex3] = _object_spread_props(_object_spread({}, reasoningPart2), {
+                                        if (partIndex1 === -1) break;
+                                        setPart(partIndex1, _object_spread_props(_object_spread({}, currentMessage.parts[partIndex1]), {
                                             state: 'done'
-                                        });
-                                        currentMessage = _object_spread_props(_object_spread({}, currentMessage), {
-                                            parts: updatedParts3
-                                        });
-                                        _this.state.replaceMessage(currentMessageIndex, currentMessage);
-                                        currentReasoningPartId = undefined;
+                                        }));
                                         break;
                                     }
                                 case 'tool-input-start':
                                     {
                                         if (!currentMessage) break;
+                                        var completedPart = currentMessage.parts.find(function(part) {
+                                            return 'toolCallId' in part && part.toolCallId === chunk.toolCallId && 'state' in part && (part.state === 'output-available' || part.state === 'output-error');
+                                        });
+                                        if (completedPart) break;
                                         var initialRawInput = typeof chunk.input === 'string' ? chunk.input : chunk.input !== undefined ? JSON.stringify(chunk.input) : '';
                                         toolRawInputByCallId[chunk.toolCallId] = initialRawInput;
                                         var toolPart = {
@@ -13217,12 +13560,7 @@
                                             rawInput: initialRawInput || undefined,
                                             providerExecuted: chunk.providerExecuted
                                         };
-                                        currentMessage = _object_spread_props(_object_spread({}, currentMessage), {
-                                            parts: _to_consumable_array(currentMessage.parts).concat([
-                                                toolPart
-                                            ])
-                                        });
-                                        _this.state.replaceMessage(currentMessageIndex, currentMessage);
+                                        setPart(-1, toolPart);
                                         break;
                                     }
                                 case 'tool-input-delta':
@@ -13230,10 +13568,11 @@
                                         var _ref, _ref1, _chunk_toolName, _ref2;
                                         var _existingPart_type, _this_shouldRepairToolInput, _this1;
                                         if (!currentMessage) break;
-                                        var toolIndex = currentMessage.parts.findIndex(function(p) {
-                                            return 'toolCallId' in p && p.toolCallId === chunk.toolCallId;
-                                        });
+                                        var toolIndex = findToolPart(chunk.toolCallId);
                                         var existingPart = toolIndex >= 0 ? currentMessage.parts[toolIndex] : null;
+                                        if ((existingPart === null || existingPart === void 0 ? void 0 : existingPart.state) === 'output-available' || (existingPart === null || existingPart === void 0 ? void 0 : existingPart.state) === 'output-error') {
+                                            break;
+                                        }
                                         var previousRawInput = (_ref = (_ref1 = existingPart === null || existingPart === void 0 ? void 0 : existingPart.rawInput) !== null && _ref1 !== void 0 ? _ref1 : toolRawInputByCallId[chunk.toolCallId]) !== null && _ref !== void 0 ? _ref : '';
                                         var nextRawInput = "".concat(previousRawInput).concat(chunk.inputTextDelta);
                                         toolRawInputByCallId[chunk.toolCallId] = nextRawInput;
@@ -13248,30 +13587,20 @@
                                             input: parsedInput,
                                             rawInput: nextRawInput
                                         });
-                                        if (toolIndex >= 0) {
-                                            var updatedParts4 = _to_consumable_array(currentMessage.parts);
-                                            updatedParts4[toolIndex] = nextToolPart;
-                                            currentMessage = _object_spread_props(_object_spread({}, currentMessage), {
-                                                parts: updatedParts4
-                                            });
-                                        } else {
-                                            currentMessage = _object_spread_props(_object_spread({}, currentMessage), {
-                                                parts: _to_consumable_array(currentMessage.parts).concat([
-                                                    nextToolPart
-                                                ])
-                                            });
-                                        }
-                                        _this.state.replaceMessage(currentMessageIndex, currentMessage);
+                                        setPart(toolIndex, nextToolPart);
                                         break;
                                     }
                                 case 'tool-input-available':
                                     {
                                         if (!currentMessage) break;
+                                        if (response.requiredToolCallIds.has(chunk.toolCallId)) break;
                                         delete toolRawInputByCallId[chunk.toolCallId];
                                         // Find existing tool part or create new one
-                                        var existingIndex = currentMessage.parts.findIndex(function(p) {
-                                            return 'toolCallId' in p && p.toolCallId === chunk.toolCallId;
-                                        });
+                                        var existingIndex = findToolPart(chunk.toolCallId);
+                                        var existingPart1 = existingIndex >= 0 ? currentMessage.parts[existingIndex] : null;
+                                        if ((existingPart1 === null || existingPart1 === void 0 ? void 0 : existingPart1.state) === 'output-available' || (existingPart1 === null || existingPart1 === void 0 ? void 0 : existingPart1.state) === 'output-error') {
+                                            break;
+                                        }
                                         var toolPart1 = {
                                             type: "tool-".concat(chunk.toolName),
                                             toolCallId: chunk.toolCallId,
@@ -13280,35 +13609,63 @@
                                             callProviderMetadata: chunk.callProviderMetadata,
                                             providerExecuted: chunk.providerExecuted
                                         };
-                                        if (existingIndex >= 0) {
-                                            var updatedParts5 = _to_consumable_array(currentMessage.parts);
-                                            updatedParts5[existingIndex] = toolPart1;
-                                            currentMessage = _object_spread_props(_object_spread({}, currentMessage), {
-                                                parts: updatedParts5
-                                            });
-                                        } else {
-                                            currentMessage = _object_spread_props(_object_spread({}, currentMessage), {
-                                                parts: _to_consumable_array(currentMessage.parts).concat([
-                                                    toolPart1
-                                                ])
-                                            });
+                                        setPart(existingIndex, toolPart1);
+                                        if (_this.messages.some(function(message) {
+                                            var _message_parts;
+                                            return message !== currentMessage && ((_message_parts = message.parts) === null || _message_parts === void 0 ? void 0 : _message_parts.some(function(part) {
+                                                return 'toolCallId' in part && part.toolCallId === chunk.toolCallId;
+                                            }));
+                                        })) {
+                                            _this.acceptsIdentifierOnlyToolResults = false;
                                         }
-                                        _this.state.replaceMessage(currentMessageIndex, currentMessage);
                                         // Trigger onToolCall callback only for client-executed tools
                                         // (server-executed tools have providerExecuted: true and don't need client handling)
                                         if (_this.onToolCall && !chunk.providerExecuted) {
-                                            var result = _this.onToolCall({
-                                                toolCall: {
-                                                    toolName: chunk.toolName,
-                                                    toolCallId: chunk.toolCallId,
-                                                    input: chunk.input,
-                                                    dynamic: 'dynamic' in chunk ? chunk.dynamic : undefined
-                                                }
+                                            var _this_responsesByToolCallId_get;
+                                            var owners = (_this_responsesByToolCallId_get = _this.responsesByToolCallId.get(chunk.toolCallId)) !== null && _this_responsesByToolCallId_get !== void 0 ? _this_responsesByToolCallId_get : new Set();
+                                            var existingOwners = Array.from(owners).filter(function(owner) {
+                                                return owner !== response;
                                             });
-                                            if (result && typeof result.then === 'function') {
-                                                pendingToolCall = pendingToolCall.then(function() {
-                                                    return result;
+                                            if (existingOwners.length > 0) {
+                                                _this.acceptsIdentifierOnlyToolResults = false;
+                                                var conflictingOwner = existingOwners.find(function(owner) {
+                                                    return !owner.isRetired && (owner.outcome === 'active' || owner.outcome === 'succeeded' && (!owner.resolvedToolCallIds.has(chunk.toolCallId) || owner.pendingToolCallbacks > 0));
                                                 });
+                                                if (conflictingOwner) {
+                                                    // Neither response may continue once ownership is ambiguous.
+                                                    conflictingOwner.didEvaluateContinuation = true;
+                                                    failToolCall(new Error('Tool call "'.concat(chunk.toolCallId, '" is already owned by another response.')));
+                                                    break;
+                                                }
+                                            }
+                                            response.requiredToolCallIds.add(chunk.toolCallId);
+                                            owners.add(response);
+                                            _this.responsesByToolCallId.set(chunk.toolCallId, owners);
+                                            response.pendingToolCallbacks++;
+                                            try {
+                                                var result = _this.onToolCall({
+                                                    toolCall: {
+                                                        toolName: chunk.toolName,
+                                                        toolCallId: chunk.toolCallId,
+                                                        input: chunk.input,
+                                                        dynamic: 'dynamic' in chunk ? chunk.dynamic : undefined
+                                                    }
+                                                }, function(options) {
+                                                    return response.isRetired ? Promise.resolve() : _this.submitToolResult(response, options);
+                                                });
+                                                if (result) {
+                                                    response.returnedToolCallbacks.push(Promise.resolve(result).catch(failToolCall).then(function() {
+                                                        response.pendingToolCallbacks--;
+                                                        _this.pruneDetachedResponse(response);
+                                                    }));
+                                                } else {
+                                                    response.pendingToolCallbacks--;
+                                                    _this.pruneDetachedResponse(response);
+                                                }
+                                            } catch (error) {
+                                                response.pendingToolCallbacks--;
+                                                failToolCall(error);
+                                                _this.pruneDetachedResponse(response);
                                             }
                                         }
                                         break;
@@ -13318,15 +13675,14 @@
                                         var _ref3, _ref4;
                                         if (!currentMessage) break;
                                         var _chunk_data = chunk.data, toolCallId = _chunk_data.toolCallId, toolName1 = _chunk_data.toolName, delta = _chunk_data.delta;
-                                        var toolIndex1 = currentMessage.parts.findIndex(function(p) {
-                                            return 'toolCallId' in p && p.toolCallId === toolCallId;
-                                        });
-                                        var existingPart1 = toolIndex1 >= 0 ? currentMessage.parts[toolIndex1] : null;
-                                        var previousRawOutput = (_ref3 = (_ref4 = existingPart1 === null || existingPart1 === void 0 ? void 0 : existingPart1.rawOutput) !== null && _ref4 !== void 0 ? _ref4 : toolRawOutputByCallId[toolCallId]) !== null && _ref3 !== void 0 ? _ref3 : '';
+                                        if (response.resolvedToolCallIds.has(toolCallId)) break;
+                                        var toolIndex1 = findToolPart(toolCallId);
+                                        var existingPart2 = toolIndex1 >= 0 ? currentMessage.parts[toolIndex1] : null;
+                                        var previousRawOutput = (_ref3 = (_ref4 = existingPart2 === null || existingPart2 === void 0 ? void 0 : existingPart2.rawOutput) !== null && _ref4 !== void 0 ? _ref4 : toolRawOutputByCallId[toolCallId]) !== null && _ref3 !== void 0 ? _ref3 : '';
                                         var nextRawOutput = "".concat(previousRawOutput).concat(delta);
                                         toolRawOutputByCallId[toolCallId] = nextRawOutput;
-                                        var parsedOutput = parseToolInputDelta(nextRawOutput, existingPart1 === null || existingPart1 === void 0 ? void 0 : existingPart1.output);
-                                        var nextToolPart1 = _object_spread_props(_object_spread({}, existingPart1 !== null && existingPart1 !== void 0 ? existingPart1 : {
+                                        var parsedOutput = parseToolInputDelta(nextRawOutput, existingPart2 === null || existingPart2 === void 0 ? void 0 : existingPart2.output);
+                                        var nextToolPart1 = _object_spread_props(_object_spread({}, existingPart2 !== null && existingPart2 !== void 0 ? existingPart2 : {
                                             type: "tool-".concat(toolName1),
                                             toolCallId: toolCallId,
                                             input: undefined
@@ -13336,47 +13692,34 @@
                                             rawOutput: nextRawOutput,
                                             preliminary: true
                                         });
-                                        if (toolIndex1 >= 0) {
-                                            var updatedParts6 = _to_consumable_array(currentMessage.parts);
-                                            updatedParts6[toolIndex1] = nextToolPart1;
-                                            currentMessage = _object_spread_props(_object_spread({}, currentMessage), {
-                                                parts: updatedParts6
-                                            });
-                                        } else {
-                                            currentMessage = _object_spread_props(_object_spread({}, currentMessage), {
-                                                parts: _to_consumable_array(currentMessage.parts).concat([
-                                                    nextToolPart1
-                                                ])
-                                            });
-                                        }
-                                        _this.state.replaceMessage(currentMessageIndex, currentMessage);
+                                        setPart(toolIndex1, nextToolPart1);
                                         break;
                                     }
                                 case 'tool-output-available':
                                     {
                                         if (!currentMessage) break;
-                                        var toolIndex2 = currentMessage.parts.findIndex(function(p) {
-                                            return 'toolCallId' in p && p.toolCallId === chunk.toolCallId;
-                                        });
+                                        var toolIndex2 = findToolPart(chunk.toolCallId);
                                         if (toolIndex2 >= 0) {
                                             delete toolRawInputByCallId[chunk.toolCallId];
                                             delete toolRawOutputByCallId[chunk.toolCallId];
-                                            var updatedParts7 = _to_consumable_array(currentMessage.parts);
-                                            var existingPart2 = updatedParts7[toolIndex2];
+                                            var existingPart3 = currentMessage.parts[toolIndex2];
+                                            if (response.resolvedToolCallIds.has(chunk.toolCallId)) {
+                                                mergeCallProviderMetadata(chunk.toolCallId, chunk.callProviderMetadata);
+                                                break;
+                                            }
                                             // eslint-disable-next-line no-unused-vars, @typescript-eslint/no-unused-vars
-                                            var _ignored = existingPart2.rawOutput, rest = _object_without_properties(existingPart2, [
+                                            var _ignored = existingPart3.rawOutput, rest = _object_without_properties(existingPart3, [
                                                 "rawOutput"
                                             ]);
-                                            updatedParts7[toolIndex2] = _object_spread_props(_object_spread({}, rest), {
+                                            setPart(toolIndex2, _object_spread_props(_object_spread({}, rest), {
                                                 state: 'output-available',
                                                 output: chunk.output,
                                                 callProviderMetadata: chunk.callProviderMetadata,
                                                 preliminary: chunk.preliminary
-                                            });
-                                            currentMessage = _object_spread_props(_object_spread({}, currentMessage), {
-                                                parts: updatedParts7
-                                            });
-                                            _this.state.replaceMessage(currentMessageIndex, currentMessage);
+                                            }));
+                                            if (!chunk.preliminary) {
+                                                acceptServerToolResult(chunk.toolCallId);
+                                            }
                                         }
                                         break;
                                     }
@@ -13384,13 +13727,15 @@
                                     {
                                         var _chunk_input, _chunk_providerExecuted, _chunk_providerMetadata;
                                         if (!currentMessage) break;
+                                        if (response.resolvedToolCallIds.has(chunk.toolCallId)) {
+                                            mergeCallProviderMetadata(chunk.toolCallId, chunk.providerMetadata);
+                                            break;
+                                        }
                                         delete toolRawInputByCallId[chunk.toolCallId];
                                         delete toolRawOutputByCallId[chunk.toolCallId];
-                                        var toolIndex3 = currentMessage.parts.findIndex(function(p) {
-                                            return 'toolCallId' in p && p.toolCallId === chunk.toolCallId;
-                                        });
-                                        var existingPart3 = toolIndex3 >= 0 ? currentMessage.parts[toolIndex3] : null;
-                                        var _ref5 = existingPart3 !== null && existingPart3 !== void 0 ? existingPart3 : {}, _ignoredOutput = _ref5.output, _ignoredRawOutput = _ref5.rawOutput, _ignoredPreliminary = _ref5.preliminary, carryOver = _object_without_properties(_ref5, [
+                                        var toolIndex3 = findToolPart(chunk.toolCallId);
+                                        var existingPart4 = toolIndex3 >= 0 ? currentMessage.parts[toolIndex3] : null;
+                                        var _ref5 = existingPart4 !== null && existingPart4 !== void 0 ? existingPart4 : {}, _ignoredOutput = _ref5.output, _ignoredRawOutput = _ref5.rawOutput, _ignoredPreliminary = _ref5.preliminary, carryOver = _object_without_properties(_ref5, [
                                             "output",
                                             "rawOutput",
                                             "preliminary"
@@ -13405,49 +13750,35 @@
                                             providerExecuted: (_chunk_providerExecuted = chunk.providerExecuted) !== null && _chunk_providerExecuted !== void 0 ? _chunk_providerExecuted : carryOver.providerExecuted,
                                             callProviderMetadata: (_chunk_providerMetadata = chunk.providerMetadata) !== null && _chunk_providerMetadata !== void 0 ? _chunk_providerMetadata : carryOver.callProviderMetadata
                                         });
-                                        if (toolIndex3 >= 0) {
-                                            var updatedParts8 = _to_consumable_array(currentMessage.parts);
-                                            updatedParts8[toolIndex3] = nextToolPart2;
-                                            currentMessage = _object_spread_props(_object_spread({}, currentMessage), {
-                                                parts: updatedParts8
-                                            });
-                                        } else {
-                                            currentMessage = _object_spread_props(_object_spread({}, currentMessage), {
-                                                parts: _to_consumable_array(currentMessage.parts).concat([
-                                                    nextToolPart2
-                                                ])
-                                            });
-                                        }
-                                        _this.state.replaceMessage(currentMessageIndex, currentMessage);
+                                        setPart(toolIndex3, nextToolPart2);
+                                        acceptServerToolResult(chunk.toolCallId);
                                         break;
                                     }
                                 case 'tool-output-error':
                                     {
                                         var _chunk_providerExecuted1, _chunk_providerMetadata1;
                                         if (!currentMessage) break;
-                                        var toolIndex4 = currentMessage.parts.findIndex(function(p) {
-                                            return 'toolCallId' in p && p.toolCallId === chunk.toolCallId;
-                                        });
+                                        if (response.resolvedToolCallIds.has(chunk.toolCallId)) {
+                                            mergeCallProviderMetadata(chunk.toolCallId, chunk.providerMetadata);
+                                            break;
+                                        }
+                                        var toolIndex4 = findToolPart(chunk.toolCallId);
                                         if (toolIndex4 < 0) break;
                                         delete toolRawInputByCallId[chunk.toolCallId];
                                         delete toolRawOutputByCallId[chunk.toolCallId];
-                                        var updatedParts9 = _to_consumable_array(currentMessage.parts);
-                                        var existingPart4 = updatedParts9[toolIndex4];
-                                        var _ignoredRawOutput1 = existingPart4.rawOutput, _ignoredPreliminary1 = existingPart4.preliminary, _ignoredOutput1 = existingPart4.output, rest1 = _object_without_properties(existingPart4, [
+                                        var existingPart5 = currentMessage.parts[toolIndex4];
+                                        var _ignoredRawOutput1 = existingPart5.rawOutput, _ignoredPreliminary1 = existingPart5.preliminary, _ignoredOutput1 = existingPart5.output, rest1 = _object_without_properties(existingPart5, [
                                             "rawOutput",
                                             "preliminary",
                                             "output"
                                         ]);
-                                        updatedParts9[toolIndex4] = _object_spread_props(_object_spread({}, rest1), {
+                                        setPart(toolIndex4, _object_spread_props(_object_spread({}, rest1), {
                                             state: 'output-error',
                                             errorText: chunk.errorText,
                                             providerExecuted: (_chunk_providerExecuted1 = chunk.providerExecuted) !== null && _chunk_providerExecuted1 !== void 0 ? _chunk_providerExecuted1 : rest1.providerExecuted,
                                             callProviderMetadata: (_chunk_providerMetadata1 = chunk.providerMetadata) !== null && _chunk_providerMetadata1 !== void 0 ? _chunk_providerMetadata1 : rest1.callProviderMetadata
-                                        });
-                                        currentMessage = _object_spread_props(_object_spread({}, currentMessage), {
-                                            parts: updatedParts9
-                                        });
-                                        _this.state.replaceMessage(currentMessageIndex, currentMessage);
+                                        }));
+                                        acceptServerToolResult(chunk.toolCallId);
                                         break;
                                     }
                                 case 'source-url':
@@ -13459,12 +13790,7 @@
                                             url: chunk.url,
                                             title: chunk.title
                                         };
-                                        currentMessage = _object_spread_props(_object_spread({}, currentMessage), {
-                                            parts: _to_consumable_array(currentMessage.parts).concat([
-                                                sourcePart
-                                            ])
-                                        });
-                                        _this.state.replaceMessage(currentMessageIndex, currentMessage);
+                                        setPart(-1, sourcePart);
                                         break;
                                     }
                                 case 'source-document':
@@ -13478,12 +13804,7 @@
                                             filename: chunk.filename,
                                             providerMetadata: chunk.providerMetadata
                                         };
-                                        currentMessage = _object_spread_props(_object_spread({}, currentMessage), {
-                                            parts: _to_consumable_array(currentMessage.parts).concat([
-                                                docPart
-                                            ])
-                                        });
-                                        _this.state.replaceMessage(currentMessageIndex, currentMessage);
+                                        setPart(-1, docPart);
                                         break;
                                     }
                                 case 'file':
@@ -13494,26 +13815,15 @@
                                             url: chunk.url,
                                             mediaType: chunk.mediaType
                                         };
-                                        currentMessage = _object_spread_props(_object_spread({}, currentMessage), {
-                                            parts: _to_consumable_array(currentMessage.parts).concat([
-                                                filePart
-                                            ])
-                                        });
-                                        _this.state.replaceMessage(currentMessageIndex, currentMessage);
+                                        setPart(-1, filePart);
                                         break;
                                     }
                                 case 'start-step':
                                     {
                                         if (!currentMessage) break;
-                                        var stepPart = {
+                                        setPart(-1, {
                                             type: 'step-start'
-                                        };
-                                        currentMessage = _object_spread_props(_object_spread({}, currentMessage), {
-                                            parts: _to_consumable_array(currentMessage.parts).concat([
-                                                stepPart
-                                            ])
                                         });
-                                        _this.state.replaceMessage(currentMessageIndex, currentMessage);
                                         break;
                                     }
                                 case 'message-metadata':
@@ -13522,7 +13832,7 @@
                                         currentMessage = _object_spread_props(_object_spread({}, currentMessage), {
                                             metadata: chunk.messageMetadata
                                         });
-                                        _this.state.replaceMessage(currentMessageIndex, currentMessage);
+                                        currentMessage = _this.replaceMessage(currentMessageIndex, currentMessage, response);
                                         break;
                                     }
                                 case 'error':
@@ -13542,7 +13852,7 @@
                                             currentMessage = _object_spread_props(_object_spread({}, currentMessage), {
                                                 metadata: chunk.messageMetadata
                                             });
-                                            _this.state.replaceMessage(currentMessageIndex, currentMessage);
+                                            currentMessage = _this.replaceMessage(currentMessageIndex, currentMessage, response);
                                         }
                                         break;
                                     }
@@ -13568,14 +13878,13 @@
                                             ]
                                         };
                                         if (currentMessageIndex >= 0) {
-                                            _this.state.replaceMessage(currentMessageIndex, currentMessage);
+                                            currentMessage = _this.replaceMessage(currentMessageIndex, currentMessage, response);
                                         } else {
                                             _this.state.pushMessage(currentMessage);
-                                            currentMessageIndex = _this.state.messages.length - 1;
+                                            currentMessageIndex = _this.messages.length - 1;
+                                            _this.responseByMessage.set(currentMessage, response);
                                         }
                                         currentMessageId = currentMessage.id;
-                                        currentTextPartId = undefined;
-                                        currentReasoningPartId = undefined;
                                         break;
                                     }
                                 default:
@@ -13588,12 +13897,7 @@
                                                 id: chunk.id,
                                                 data: chunk.data
                                             };
-                                            currentMessage = _object_spread_props(_object_spread({}, currentMessage), {
-                                                parts: _to_consumable_array(currentMessage.parts).concat([
-                                                    dataPart
-                                                ])
-                                            });
-                                            _this.state.replaceMessage(currentMessageIndex, currentMessage);
+                                            setPart(-1, dataPart);
                                             // Trigger onData callback
                                             if (_this.onData) {
                                                 _this.onData(dataPart);
@@ -13602,49 +13906,11 @@
                                     }
                             }
                         }, function() {
-                            // Wait for any pending tool calls to complete
-                            pendingToolCall.then(function() {
-                                // Stream finished successfully
-                                _this.setStatus({
-                                    status: 'ready'
-                                });
-                                _this.activeResponse = null;
-                                // Trigger onFinish callback
-                                if (_this.onFinish && currentMessage) {
-                                    _this.onFinish({
-                                        message: currentMessage,
-                                        messages: _this.state.messages,
-                                        isAbort: isAbort,
-                                        isDisconnect: isDisconnect,
-                                        isError: isError
-                                    });
-                                }
-                                // Note: sendAutomaticallyWhen is only checked in addToolResult,
-                                // not here. For server-executed tools, the server continues the
-                                // conversation. For client-executed tools, addToolResult handles it.
-                                resolve();
+                            return Promise.all(response.returnedToolCallbacks).then(function() {
+                                return finish();
                             });
                         }, function(error) {
-                            if (error.name === 'AbortError') {
-                                isAbort = true;
-                                _this.setStatus({
-                                    status: 'ready'
-                                });
-                            } else {
-                                isDisconnect = true;
-                                _this.handleError(error);
-                            }
-                            // Still call onFinish even on error/abort
-                            if (_this.onFinish && currentMessage) {
-                                _this.onFinish({
-                                    message: currentMessage,
-                                    messages: _this.state.messages,
-                                    isAbort: isAbort,
-                                    isDisconnect: isDisconnect,
-                                    isError: isError
-                                });
-                            }
-                            resolve();
+                            return finish(error);
                         });
                     });
                 }
@@ -13652,10 +13918,13 @@
             {
                 key: "handleError",
                 value: function handleError(error) {
-                    this.setStatus({
-                        status: 'error',
-                        error: error
-                    });
+                    var _ref = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {}, _ref_updateState = _ref.updateState, updateState = _ref_updateState === void 0 ? true : _ref_updateState;
+                    if (updateState) {
+                        this.setStatus({
+                            status: 'error',
+                            error: error
+                        });
+                    }
                     if (this.onError) {
                         this.onError(error);
                     }
@@ -14143,14 +14412,16 @@
         var unmountFn = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : noop;
         checkRendering(renderFn, withUsage$o());
         return function(widgetParams) {
-            var _ref = widgetParams || {}, _ref_resume = _ref.resume, resume = _ref_resume === void 0 ? false : _ref_resume, _ref_tools = _ref.tools, tools = _ref_tools === void 0 ? {} : _ref_tools, _ref_type = _ref.type, type = _ref_type === void 0 ? 'chat' : _ref_type, context = _ref.context, initialUserMessage = _ref.initialUserMessage, initialMessages = _ref.initialMessages, _ref_disableTriggerValidation = _ref.disableTriggerValidation, disableTriggerValidation = _ref_disableTriggerValidation === void 0 ? false : _ref_disableTriggerValidation, options = _object_without_properties(_ref, [
+            var _ref = widgetParams || {}, _ref_resume = _ref.resume, resume = _ref_resume === void 0 ? false : _ref_resume, _ref_tools = _ref.tools, tools = _ref_tools === void 0 ? {} : _ref_tools, _ref_type = _ref.type, type = _ref_type === void 0 ? 'chat' : _ref_type, context = _ref.context, initialUserMessage = _ref.initialUserMessage, initialMessages = _ref.initialMessages, _ref_disableTriggerValidation = _ref.disableTriggerValidation, disableTriggerValidation = _ref_disableTriggerValidation === void 0 ? false : _ref_disableTriggerValidation, _ref_sendAutomaticallyWhen = _ref.sendAutomaticallyWhen, sendAutomaticallyWhen = _ref_sendAutomaticallyWhen === void 0 ? lastAssistantMessageIsCompleteWithToolCalls : _ref_sendAutomaticallyWhen, _ref_requiresSearch = _ref.requiresSearch, requiresSearch = _ref_requiresSearch === void 0 ? true : _ref_requiresSearch, options = _object_without_properties(_ref, [
                 "resume",
                 "tools",
                 "type",
                 "context",
                 "initialUserMessage",
                 "initialMessages",
-                "disableTriggerValidation"
+                "disableTriggerValidation",
+                "sendAutomaticallyWhen",
+                "requiresSearch"
             ]);
             var _chatInstance;
             var input = '';
@@ -14311,8 +14582,8 @@
                     return options.chat;
                 }
                 return new Chat(_object_spread_props(_object_spread({}, options), {
+                    sendAutomaticallyWhen: sendAutomaticallyWhen,
                     transport: transport,
-                    sendAutomaticallyWhen: lastAssistantMessageIsCompleteWithToolCalls,
                     shouldRepairToolInput: function shouldRepairToolInput(toolName) {
                         var tool = tools[toolName];
                         if (!tool && toolName.startsWith("".concat(SearchIndexToolType, "_"))) {
@@ -14321,7 +14592,7 @@
                         if (!tool) return true;
                         return Boolean(tool.streamInput);
                     },
-                    onToolCall: function onToolCall(param) {
+                    onToolCall: function onToolCall(param, submitToolResult) {
                         var toolCall = param.toolCall;
                         var tool = tools[toolCall.toolName];
                         // Compatibility shim with Algolia MCP Server search tool
@@ -14329,7 +14600,7 @@
                             tool = tools[SearchIndexToolType];
                         }
                         if (!tool) {
-                            return _chatInstance.addToolResult({
+                            return submitToolResult({
                                 output: 'No tool implemented for "'.concat(toolCall.toolName, '".'),
                                 tool: toolCall.toolName,
                                 toolCallId: toolCall.toolCallId
@@ -14338,7 +14609,7 @@
                         if (tool.onToolCall) {
                             var addToolResult = function addToolResult(param) {
                                 var output = param.output;
-                                return _chatInstance.addToolResult({
+                                return submitToolResult({
                                     output: output,
                                     tool: toolCall.toolName,
                                     toolCallId: toolCall.toolCallId
@@ -14354,6 +14625,7 @@
             };
             return {
                 $$type: 'ais.chat',
+                dependsOn: requiresSearch ? 'search' : 'none',
                 init: function init(initOptions) {
                     var _this = this;
                     var instantSearchInstance = initOptions.instantSearchInstance;
@@ -14459,6 +14731,7 @@
                         var _param = _sliced_to_array(param, 2), key = _param[0], tool = _param[1];
                         var toolWithAddToolResult = _object_spread_props(_object_spread({}, tool), {
                             addToolResult: _chatInstance.addToolResult,
+                            '~addToolResultForMessage': _chatInstance['~addToolResultForMessage'],
                             applyFilters: applyFilters,
                             sendEvent: sendEvent
                         });
@@ -14566,6 +14839,7 @@
             return {
                 $$type: 'ais.chatTrigger',
                 opensChat: true,
+                dependsOn: 'none',
                 init: function init(initOptions) {
                     lastOptions = initOptions;
                     renderFn(_object_spread_props(_object_spread({}, this.getWidgetRenderState(initOptions)), {
@@ -14594,6 +14868,9 @@
                     return _object_spread_props(_object_spread({}, renderState), {
                         chatTrigger: this.getWidgetRenderState(renderOptions)
                     });
+                },
+                shouldRender: function shouldRender() {
+                    return true;
                 }
             };
         };
@@ -18534,6 +18811,8 @@
         // later during hydration.
         var requestParamsList;
         var client = helper.getClient();
+        var waitsForSearch = search._hasSearchWidget;
+        var waitsForRecommend = !skipRecommend && search._hasRecommendWidget;
         if (search.compositionID) {
             helper.setClient(_object_spread_props(_object_spread({}, client), {
                 search: function search(query) {
@@ -18554,17 +18833,22 @@
                 }
             }));
         }
-        if (search._hasSearchWidget) {
+        if (waitsForSearch) {
             if (search.compositionID) {
                 helper.searchWithComposition();
             } else {
                 helper.searchOnlyWithDerivedHelpers();
             }
         }
-        !skipRecommend && search._hasRecommendWidget && helper.recommend();
+        if (waitsForRecommend) {
+            helper.recommend();
+        }
+        if (!waitsForSearch && !waitsForRecommend) {
+            return Promise.resolve([]);
+        }
         return new Promise(function(resolve, reject) {
-            var searchResultsReceived = !search._hasSearchWidget;
-            var recommendResultsReceived = !search._hasRecommendWidget || skipRecommend;
+            var searchResultsReceived = !waitsForSearch;
+            var recommendResultsReceived = !waitsForRecommend;
             // All derived helpers resolve in the same tick so we're safe only relying
             // on the first one.
             helper.derivedHelpers[0].on('result', function() {
@@ -18604,6 +18888,13 @@
         var requestParamsIndex = 0;
         walkIndex(rootIndex, function(widget) {
             var _widget_getHelper;
+            var currentIndex = widget;
+            while(currentIndex){
+                if (currentIndex._isolated) {
+                    return;
+                }
+                currentIndex = currentIndex.getParent();
+            }
             var searchResults = widget.getResults();
             var recommendResults = (_widget_getHelper = widget.getHelper()) === null || _widget_getHelper === void 0 ? void 0 : _widget_getHelper.lastRecommendResults;
             if (searchResults || recommendResults) {
@@ -18634,7 +18925,7 @@
                 });
             }
         });
-        if (Object.keys(initialResults).length === 0) {
+        if (Object.keys(initialResults).length === 0 && (requestParamsList === null || requestParamsList === void 0 ? void 0 : requestParamsList.length) !== 0) {
             throw new Error('The root index does not have any results. Make sure you have at least one widget that provides results.');
         }
         return initialResults;
@@ -18669,6 +18960,13 @@
             var shouldRefetch = false;
             // Two-pass widgets require another query to discover and mount child widgets.
             walkIndex(searchRef.current.mainIndex, function(index) {
+                var current = index;
+                while(current){
+                    if (current._isolated) {
+                        return;
+                    }
+                    current = current.getParent();
+                }
                 shouldRefetch = shouldRefetch || index.getWidgets().some(isTwoPassWidget);
             });
             if (shouldRefetch) {