@positronic/core 0.0.55 → 0.0.57

package/dist/src/dsl/execution/event-stream.js

@@ -6,6 +6,9 @@ function _array_like_to_array(arr, len) {
 function _array_with_holes(arr) {
     if (Array.isArray(arr)) return arr;
 }
+function _array_without_holes(arr) {
+    if (Array.isArray(arr)) return _array_like_to_array(arr);
+}
 function _async_generator(gen) {
     var front, back;
     function send(key, arg) {
@@ -198,6 +201,9 @@ function _define_property(obj, key, value) {
     }
     return obj;
 }
+function _iterable_to_array(iter) {
+    if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
+}
 function _iterable_to_array_limit(arr, i) {
     var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"];
     if (_i == null) return;
@@ -225,6 +231,9 @@ function _iterable_to_array_limit(arr, i) {
 function _non_iterable_rest() {
     throw new TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
 }
+function _non_iterable_spread() {
+    throw new TypeError("Invalid attempt to spread non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+}
 function _object_spread(target) {
     for(var i = 1; i < arguments.length; i++){
         var source = arguments[i] != null ? arguments[i] : {};
@@ -298,6 +307,9 @@ function _overload_yield(value, kind) {
 function _sliced_to_array(arr, i) {
     return _array_with_holes(arr) || _iterable_to_array_limit(arr, i) || _unsupported_iterable_to_array(arr, i) || _non_iterable_rest();
 }
+function _to_consumable_array(arr) {
+    return _array_without_holes(arr) || _iterable_to_array(arr) || _unsupported_iterable_to_array(arr) || _non_iterable_spread();
+}
 function _type_of(obj) {
     "@swc/helpers - typeof";
     return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
@@ -426,8 +438,10 @@ import { STATUS, BRAIN_EVENTS } from '../constants.js';
 import { createPatch, applyPatches } from '../json-patch.js';
 import { generateUI } from '../../ui/generate-ui.js';
 import { generatePageHtml } from '../../ui/generate-page-html.js';
+import { createScopedMemory } from '../../memory/scoped-memory.js';
 import { Step } from '../builder/step.js';
 import { DEFAULT_ENV, DEFAULT_AGENT_SYSTEM_PROMPT, MAX_RETRIES } from './constants.js';
+import { defaultDoneSchema } from '../../tools/index.js';
 var clone = function(value) {
     return structuredClone(value);
 };
@@ -438,7 +452,6 @@ export var BrainEventStream = /*#__PURE__*/ function() {
         _define_property(this, "currentState", void 0);
         _define_property(this, "steps", void 0);
         _define_property(this, "currentStepIndex", 0);
-        _define_property(this, "initialState", void 0);
         _define_property(this, "brainRunId", void 0);
         _define_property(this, "title", void 0);
         _define_property(this, "description", void 0);
@@ -450,12 +463,17 @@ export var BrainEventStream = /*#__PURE__*/ function() {
         _define_property(this, "env", void 0);
         _define_property(this, "currentResponse", undefined);
         _define_property(this, "currentPage", undefined);
-        _define_property(this, "agentResumeContext", undefined);
-        _define_property(this, "initialCompletedSteps", void 0);
+        _define_property(this, "resumeContext", void 0);
         _define_property(this, "components", void 0);
         _define_property(this, "defaultTools", void 0);
-        var _params_initialState = params.initialState, initialState = _params_initialState === void 0 ? {} : _params_initialState, initialCompletedSteps = params.initialCompletedSteps, blocks = params.blocks, title = params.title, description = params.description, providedBrainRunId = params.brainRunId, _params_options = params.options, options = _params_options === void 0 ? {} : _params_options, client = params.client, services = params.services, _params_resources = params.resources, resources = _params_resources === void 0 ? {} : _params_resources, pages = params.pages, env = params.env, response = params.response, agentResumeContext = params.agentResumeContext, components = params.components, defaultTools = params.defaultTools;
-        this.initialState = initialState;
+        _define_property(this, "signalProvider", void 0);
+        _define_property(this, "memoryProvider", void 0);
+        _define_property(this, "scopedMemory", void 0);
+        var blocks = params.blocks, title = params.title, description = params.description, providedBrainRunId = params.brainRunId, _params_options = params.options, options = _params_options === void 0 ? {} : _params_options, client = params.client, services = params.services, _params_resources = params.resources, resources = _params_resources === void 0 ? {} : _params_resources, pages = params.pages, env = params.env, components = params.components, defaultTools = params.defaultTools, signalProvider = params.signalProvider, memoryProvider = params.memoryProvider;
+        // Check if this is a resume run or fresh start
+        var resumeParams = params;
+        var initialParams = params;
+        var resumeContext = resumeParams.resumeContext;
         this.title = title;
         this.description = description;
         this.client = client;
@@ -464,63 +482,58 @@ export var BrainEventStream = /*#__PURE__*/ function() {
         this.resources = resources;
         this.pages = pages;
         this.env = env !== null && env !== void 0 ? env : DEFAULT_ENV;
-        this.initialCompletedSteps = initialCompletedSteps;
+        this.resumeContext = resumeContext;
         this.components = components;
         this.defaultTools = defaultTools;
-        // Initialize steps array with UUIDs and pending status
-        this.steps = blocks.map(function(block, index) {
-            var completedStep = initialCompletedSteps === null || initialCompletedSteps === void 0 ? void 0 : initialCompletedSteps[index];
-            if (completedStep) {
-                return new Step(block, completedStep.id).withStatus(completedStep.status).withPatch(completedStep.patch);
-            }
+        this.signalProvider = signalProvider;
+        this.memoryProvider = memoryProvider;
+        // Create scoped memory if provider is configured
+        if (memoryProvider) {
+            this.scopedMemory = createScopedMemory(memoryProvider, title);
+        }
+        // Initialize steps - all start as pending (fresh UUIDs)
+        this.steps = blocks.map(function(block) {
             return new Step(block);
         });
-        this.currentState = clone(this.initialState);
-        var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
-        try {
-            for(var _iterator = this.steps[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
-                var step = _step.value;
-                if (step.serialized.status === STATUS.COMPLETE && step.serialized.patch) {
-                    this.currentState = applyPatches(this.currentState, [
-                        step.serialized.patch
-                    ]);
-                }
+        if (resumeContext) {
+            // Resume: use state and stepIndex directly from resumeContext
+            this.currentState = clone(resumeContext.state);
+            this.currentStepIndex = resumeContext.stepIndex;
+            // Mark steps before stepIndex as complete (they won't be re-executed)
+            for(var i = 0; i < resumeContext.stepIndex; i++){
+                this.steps[i].withStatus(STATUS.COMPLETE);
             }
-        } catch (err) {
-            _didIteratorError = true;
-            _iteratorError = err;
-        } finally{
-            try {
-                if (!_iteratorNormalCompletion && _iterator.return != null) {
-                    _iterator.return();
-                }
-            } finally{
-                if (_didIteratorError) {
-                    throw _iteratorError;
-                }
+            // For inner brains (no signalProvider), check resumeContext for webhookResponse
+            // The outer brain will have set this from the signal
+            if (!signalProvider && resumeContext.webhookResponse && !resumeContext.agentContext) {
+                this.currentResponse = resumeContext.webhookResponse;
             }
+        // Agent webhook response is handled via agentContext (checked in executeAgent)
+        } else {
+            var _initialParams_initialState;
+            // Fresh start: use initialState or empty object
+            this.currentState = clone((_initialParams_initialState = initialParams.initialState) !== null && _initialParams_initialState !== void 0 ? _initialParams_initialState : {});
+            this.currentStepIndex = 0;
         }
         // Use provided ID if available, otherwise generate one
         this.brainRunId = providedBrainRunId !== null && providedBrainRunId !== void 0 ? providedBrainRunId : uuidv4();
-        // Set agent resume context if provided (for agent webhook restarts)
-        if (agentResumeContext) {
-            this.agentResumeContext = agentResumeContext;
-        // Note: We intentionally do NOT set currentResponse here.
-        // For agent resumption, the webhook response should flow through
-        // the messages array (via agentResumeContext), not through the
-        // config function's response parameter. The config function is
-        // for agent setup, not for processing webhook responses.
-        } else if (response) {
-            // Set initial response only for non-agent webhook restarts
-            this.currentResponse = response;
-        }
     }
     _create_class(BrainEventStream, [
+        {
+            key: "findWebhookResponseInResumeContext",
+            value: /**
+   * Find webhookResponse anywhere in the resumeContext tree (for nested brain resumes)
+   */ function findWebhookResponseInResumeContext(context) {
+                if (!context) return undefined;
+                if (context.webhookResponse) return context.webhookResponse;
+                return this.findWebhookResponseInResumeContext(context.innerResumeContext);
+            }
+        },
         {
             key: "next",
             value: function next() {
                 return _wrap_async_generator(function() {
-                    var _this, steps, brainTitle, brainDescription, currentState, options, brainRunId, hasCompletedSteps, step, err, error, currentStep;
+                    var _this, steps, brainTitle, brainDescription, currentState, options, brainRunId, webhookResponse, signals, webhookSignal, deepest, signals1, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, signal, err, step, err1, error, currentStep;
                     return _ts_generator(this, function(_state) {
                         switch(_state.label){
                             case 0:
@@ -529,26 +542,25 @@ export var BrainEventStream = /*#__PURE__*/ function() {
                             case 1:
                                 _state.trys.push([
                                     1,
-                                    11,
+                                    29,
                                     ,
-                                    14
+                                    32
                                 ]);
-                                hasCompletedSteps = steps.some(function(step) {
-                                    return step.serialized.status !== STATUS.PENDING;
-                                });
+                                if (!!this.resumeContext) return [
+                                    3,
+                                    4
+                                ];
                                 return [
                                     4,
-                                    _object_spread_props(_object_spread({
-                                        type: hasCompletedSteps ? BRAIN_EVENTS.RESTART : BRAIN_EVENTS.START,
+                                    {
+                                        type: BRAIN_EVENTS.START,
                                         status: STATUS.RUNNING,
                                         brainTitle: brainTitle,
-                                        brainDescription: brainDescription
-                                    }, hasCompletedSteps ? {} : {
-                                        initialState: currentState
-                                    }), {
+                                        brainDescription: brainDescription,
+                                        initialState: currentState,
                                         options: options,
                                         brainRunId: brainRunId
-                                    })
+                                    }
                                 ];
                             case 2:
                                 _state.sent();
@@ -569,19 +581,199 @@ export var BrainEventStream = /*#__PURE__*/ function() {
                                 ];
                             case 3:
                                 _state.sent();
-                                _state.label = 4;
+                                return [
+                                    3,
+                                    11
+                                ];
                             case 4:
-                                if (!(this.currentStepIndex < steps.length)) return [
+                                if (!this.signalProvider) return [
+                                    3,
+                                    6
+                                ];
+                                return [
+                                    4,
+                                    _await_async_generator(this.signalProvider.getSignals('WEBHOOK'))
+                                ];
+                            case 5:
+                                signals = _state.sent();
+                                webhookSignal = signals.find(function(s) {
+                                    return s.type === 'WEBHOOK_RESPONSE';
+                                });
+                                if (webhookSignal && webhookSignal.type === 'WEBHOOK_RESPONSE') {
+                                    webhookResponse = webhookSignal.response;
+                                    // Set currentResponse for step consumption (non-agent webhooks)
+                                    this.currentResponse = webhookResponse;
+                                    // Set webhookResponse at the deepest level of the resumeContext tree
+                                    // This is needed for:
+                                    // 1. Agent webhook resumes (via resumeContext.webhookResponse)
+                                    // 2. Nested brain resumes (inner brain accesses via innerResumeContext)
+                                    if (this.resumeContext) {
+                                        deepest = this.resumeContext;
+                                        while(deepest.innerResumeContext){
+                                            deepest = deepest.innerResumeContext;
+                                        }
+                                        deepest.webhookResponse = webhookResponse;
+                                    }
+                                }
+                                return [
+                                    3,
+                                    7
+                                ];
+                            case 6:
+                                // Inner brain (no signalProvider): check resumeContext for webhookResponse
+                                // The outer brain will have set this from the signal
+                                webhookResponse = this.findWebhookResponseInResumeContext(this.resumeContext);
+                                _state.label = 7;
+                            case 7:
+                                if (!webhookResponse) return [
                                     3,
                                     9
                                 ];
+                                // Emit WEBHOOK_RESPONSE to transition state machine from 'waiting' to 'running'
+                                return [
+                                    4,
+                                    {
+                                        type: BRAIN_EVENTS.WEBHOOK_RESPONSE,
+                                        brainRunId: brainRunId,
+                                        response: webhookResponse,
+                                        options: options !== null && options !== void 0 ? options : {}
+                                    }
+                                ];
+                            case 8:
+                                _state.sent();
+                                return [
+                                    3,
+                                    11
+                                ];
+                            case 9:
+                                // RESUME signal or default resume behavior - emit RESUMED to transition state machine
+                                return [
+                                    4,
+                                    {
+                                        type: BRAIN_EVENTS.RESUMED,
+                                        status: STATUS.RUNNING,
+                                        brainTitle: brainTitle,
+                                        brainDescription: brainDescription,
+                                        brainRunId: brainRunId,
+                                        options: options !== null && options !== void 0 ? options : {}
+                                    }
+                                ];
+                            case 10:
+                                _state.sent();
+                                _state.label = 11;
+                            case 11:
+                                if (!(this.currentStepIndex < steps.length)) return [
+                                    3,
+                                    27
+                                ];
+                                if (!this.signalProvider) return [
+                                    3,
+                                    22
+                                ];
+                                return [
+                                    4,
+                                    _await_async_generator(this.signalProvider.getSignals('CONTROL'))
+                                ];
+                            case 12:
+                                signals1 = _state.sent();
+                                _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+                                _state.label = 13;
+                            case 13:
+                                _state.trys.push([
+                                    13,
+                                    20,
+                                    21,
+                                    22
+                                ]);
+                                _iterator = signals1[Symbol.iterator]();
+                                _state.label = 14;
+                            case 14:
+                                if (!!(_iteratorNormalCompletion = (_step = _iterator.next()).done)) return [
+                                    3,
+                                    19
+                                ];
+                                signal = _step.value;
+                                if (!(signal.type === 'KILL')) return [
+                                    3,
+                                    16
+                                ];
+                                return [
+                                    4,
+                                    {
+                                        type: BRAIN_EVENTS.CANCELLED,
+                                        status: STATUS.CANCELLED,
+                                        brainTitle: brainTitle,
+                                        brainDescription: brainDescription,
+                                        brainRunId: brainRunId,
+                                        options: options
+                                    }
+                                ];
+                            case 15:
+                                _state.sent();
+                                return [
+                                    2
+                                ];
+                            case 16:
+                                if (!(signal.type === 'PAUSE')) return [
+                                    3,
+                                    18
+                                ];
+                                return [
+                                    4,
+                                    {
+                                        type: BRAIN_EVENTS.PAUSED,
+                                        status: STATUS.PAUSED,
+                                        brainTitle: brainTitle,
+                                        brainDescription: brainDescription,
+                                        brainRunId: brainRunId,
+                                        options: options
+                                    }
+                                ];
+                            case 17:
+                                _state.sent();
+                                return [
+                                    2
+                                ];
+                            case 18:
+                                _iteratorNormalCompletion = true;
+                                return [
+                                    3,
+                                    14
+                                ];
+                            case 19:
+                                return [
+                                    3,
+                                    22
+                                ];
+                            case 20:
+                                err = _state.sent();
+                                _didIteratorError = true;
+                                _iteratorError = err;
+                                return [
+                                    3,
+                                    22
+                                ];
+                            case 21:
+                                try {
+                                    if (!_iteratorNormalCompletion && _iterator.return != null) {
+                                        _iterator.return();
+                                    }
+                                } finally{
+                                    if (_didIteratorError) {
+                                        throw _iteratorError;
+                                    }
+                                }
+                                return [
+                                    7
+                                ];
+                            case 22:
                                 step = steps[this.currentStepIndex];
                                 // Skip completed steps
                                 if (step.serialized.status === STATUS.COMPLETE) {
                                     this.currentStepIndex++;
                                     return [
                                         3,
-                                        4
+                                        11
                                     ];
                                 }
                                 // Step start event
@@ -592,11 +784,12 @@ export var BrainEventStream = /*#__PURE__*/ function() {
                                         status: STATUS.RUNNING,
                                         stepTitle: step.block.title,
                                         stepId: step.id,
+                                        stepIndex: this.currentStepIndex,
                                         options: options,
                                         brainRunId: brainRunId
                                     }
                                 ];
-                            case 5:
+                            case 23:
                                 _state.sent();
                                 step.withStatus(STATUS.RUNNING);
                                 // Step Status Event to indicate that the step is running
@@ -614,7 +807,7 @@ export var BrainEventStream = /*#__PURE__*/ function() {
                                         brainRunId: brainRunId
                                     }
                                 ];
-                            case 6:
+                            case 24:
                                 _state.sent();
                                 // Execute step and yield the STEP_COMPLETE event and
                                 // all events from inner brains if any
@@ -622,7 +815,7 @@ export var BrainEventStream = /*#__PURE__*/ function() {
                                     5,
                                     _ts_values(_async_generator_delegate(_async_iterator(this.executeStep(step))))
                                 ];
-                            case 7:
+                            case 25:
                                 _state.sent();
                                 // Step Status Event
                                 return [
@@ -639,14 +832,14 @@ export var BrainEventStream = /*#__PURE__*/ function() {
                                         brainRunId: brainRunId
                                     }
                                 ];
-                            case 8:
+                            case 26:
                                 _state.sent();
                                 this.currentStepIndex++;
                                 return [
                                     3,
-                                    4
+                                    11
                                 ];
-                            case 9:
+                            case 27:
                                 return [
                                     4,
                                     {
@@ -658,15 +851,15 @@ export var BrainEventStream = /*#__PURE__*/ function() {
                                         options: options
                                     }
                                 ];
-                            case 10:
+                            case 28:
                                 _state.sent();
                                 return [
                                     3,
-                                    14
+                                    32
                                 ];
-                            case 11:
-                                err = _state.sent();
-                                error = err;
+                            case 29:
+                                err1 = _state.sent();
+                                error = err1;
                                 currentStep = steps[this.currentStepIndex];
                                 currentStep === null || currentStep === void 0 ? void 0 : currentStep.withStatus(STATUS.ERROR);
                                 return [
@@ -685,7 +878,7 @@ export var BrainEventStream = /*#__PURE__*/ function() {
                                         options: options
                                     }
                                 ];
-                            case 12:
+                            case 30:
                                 _state.sent();
                                 // Step Status Event
                                 return [
@@ -702,10 +895,10 @@ export var BrainEventStream = /*#__PURE__*/ function() {
                                         brainRunId: brainRunId
                                     }
                                 ];
-                            case 13:
+                            case 31:
                                 _state.sent();
                                 throw error;
-                            case 14:
+                            case 32:
                                 return [
                                     2
                                 ];
@@ -718,7 +911,7 @@ export var BrainEventStream = /*#__PURE__*/ function() {
             key: "executeStep",
             value: function executeStep(step) {
                 return _wrap_async_generator(function() {
-                    var block, stepBlock, _this_initialCompletedSteps, brainBlock, initialState, stepIndex, completedStepEntry, innerCompletedSteps, patches, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, completedStep, innerBrainPaused, _this_options, _this_options1, innerRun, _iteratorAbruptCompletion, _didIteratorError1, _iteratorError1, _iterator1, _step1, _value, event, err1, innerState, prevState, _, prevState1, stepBlock1, retries, result, _this_options2, actionPromise, error, _this_options3, serializedWaitFor;
+                    var block, stepBlock, _this_resumeContext, brainBlock, initialState, innerResumeContext, patches, innerBrainPaused, _this_options, _this_options1, innerRun, _iteratorAbruptCompletion, _didIteratorError, _iteratorError, _iterator, _step, _value, event, err, _innerResumeContext_state, baseState, innerState, prevState, _, prevState1, stepBlock1, retries, result, _this_options2, actionPromise, error, _this_options3, serializedWaitFor;
                     return _ts_generator(this, function(_state) {
                         switch(_state.label){
                             case 0:
@@ -748,51 +941,20 @@ export var BrainEventStream = /*#__PURE__*/ function() {
                                 ];
                                 brainBlock = block;
                                 initialState = typeof brainBlock.initialState === 'function' ? brainBlock.initialState(this.currentState) : brainBlock.initialState;
-                                // Check if this inner brain step has completed inner steps (for resume)
-                                stepIndex = this.steps.indexOf(step);
-                                completedStepEntry = (_this_initialCompletedSteps = this.initialCompletedSteps) === null || _this_initialCompletedSteps === void 0 ? void 0 : _this_initialCompletedSteps[stepIndex];
-                                innerCompletedSteps = completedStepEntry === null || completedStepEntry === void 0 ? void 0 : completedStepEntry.innerSteps;
+                                // Check if we're resuming and if there's an inner resume context
+                                innerResumeContext = (_this_resumeContext = this.resumeContext) === null || _this_resumeContext === void 0 ? void 0 : _this_resumeContext.innerResumeContext;
                                 // Run inner brain and yield all its events
                                 // Pass brainRunId so inner brain shares outer brain's run ID
-                                // Pass innerSteps and response for resume scenarios
                                 patches = [];
-                                // If resuming, include patches from already-completed inner steps
-                                // These won't be re-emitted as STEP_COMPLETE events
-                                if (innerCompletedSteps) {
-                                    _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
-                                    try {
-                                        for(_iterator = innerCompletedSteps[Symbol.iterator](); !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
-                                            completedStep = _step.value;
-                                            if (completedStep.patch) {
-                                                patches.push(completedStep.patch);
-                                            }
-                                        }
-                                    } catch (err) {
-                                        _didIteratorError = true;
-                                        _iteratorError = err;
-                                    } finally{
-                                        try {
-                                            if (!_iteratorNormalCompletion && _iterator.return != null) {
-                                                _iterator.return();
-                                            }
-                                        } finally{
-                                            if (_didIteratorError) {
-                                                throw _iteratorError;
-                                            }
-                                        }
-                                    }
-                                }
                                 innerBrainPaused = false;
-                                innerRun = innerCompletedSteps ? brainBlock.innerBrain.run({
+                                innerRun = innerResumeContext ? brainBlock.innerBrain.run({
                                     resources: this.resources,
                                     client: this.client,
-                                    initialState: initialState,
-                                    initialCompletedSteps: innerCompletedSteps,
+                                    resumeContext: innerResumeContext,
                                     options: (_this_options = this.options) !== null && _this_options !== void 0 ? _this_options : {},
                                     pages: this.pages,
                                     env: this.env,
-                                    brainRunId: this.brainRunId,
-                                    response: this.currentResponse
+                                    brainRunId: this.brainRunId
                                 }) : brainBlock.innerBrain.run({
                                     resources: this.resources,
                                     client: this.client,
@@ -802,7 +964,7 @@ export var BrainEventStream = /*#__PURE__*/ function() {
                                     env: this.env,
                                     brainRunId: this.brainRunId
                                 });
-                                _iteratorAbruptCompletion = false, _didIteratorError1 = false;
+                                _iteratorAbruptCompletion = false, _didIteratorError = false;
                                 _state.label = 3;
                             case 3:
                                 _state.trys.push([
@@ -811,19 +973,19 @@ export var BrainEventStream = /*#__PURE__*/ function() {
                                     10,
                                     15
                                 ]);
-                                _iterator1 = _async_iterator(innerRun);
+                                _iterator = _async_iterator(innerRun);
                                 _state.label = 4;
                             case 4:
                                 return [
                                     4,
-                                    _await_async_generator(_iterator1.next())
+                                    _await_async_generator(_iterator.next())
                                 ];
                             case 5:
-                                if (!(_iteratorAbruptCompletion = !(_step1 = _state.sent()).done)) return [
+                                if (!(_iteratorAbruptCompletion = !(_step = _state.sent()).done)) return [
                                     3,
                                     8
                                 ];
-                                _value = _step1.value;
+                                _value = _step.value;
                                 event = _value;
                                 return [
                                     4,
@@ -858,9 +1020,9 @@ export var BrainEventStream = /*#__PURE__*/ function() {
                                     15
                                 ];
                             case 9:
-                                err1 = _state.sent();
-                                _didIteratorError1 = true;
-                                _iteratorError1 = err1;
+                                err = _state.sent();
+                                _didIteratorError = true;
+                                _iteratorError = err;
                                 return [
                                     3,
                                     15
@@ -872,13 +1034,13 @@ export var BrainEventStream = /*#__PURE__*/ function() {
                                     13,
                                     14
                                 ]);
-                                if (!(_iteratorAbruptCompletion && _iterator1.return != null)) return [
+                                if (!(_iteratorAbruptCompletion && _iterator.return != null)) return [
                                     3,
                                     12
                                 ];
                                 return [
                                     4,
-                                    _await_async_generator(_iterator1.return())
+                                    _await_async_generator(_iterator.return())
                                 ];
                             case 11:
                                 _state.sent();
@@ -889,8 +1051,8 @@ export var BrainEventStream = /*#__PURE__*/ function() {
                                     14
                                 ];
                             case 13:
-                                if (_didIteratorError1) {
-                                    throw _iteratorError1;
+                                if (_didIteratorError) {
+                                    throw _iteratorError;
                                 }
                                 return [
                                     7
@@ -908,7 +1070,9 @@ export var BrainEventStream = /*#__PURE__*/ function() {
                                     ];
                                 }
                                 // Apply collected patches to get final inner state
-                                innerState = applyPatches(initialState, patches);
+                                // When resuming, use the resumed state as base; otherwise use initialState
+                                baseState = (_innerResumeContext_state = innerResumeContext === null || innerResumeContext === void 0 ? void 0 : innerResumeContext.state) !== null && _innerResumeContext_state !== void 0 ? _innerResumeContext_state : initialState;
+                                innerState = applyPatches(baseState, patches);
                                 // Get previous state before action
                                 prevState = this.currentState;
                                 // Update state with inner brain results
@@ -972,7 +1136,8 @@ export var BrainEventStream = /*#__PURE__*/ function() {
                                     response: this.currentResponse,
                                     page: this.currentPage,
                                     pages: this.pages,
-                                    env: this.env
+                                    env: this.env,
+                                    memory: this.scopedMemory
                                 }, this.services)));
                                 return [
                                     4,
@@ -1082,7 +1247,7 @@ export var BrainEventStream = /*#__PURE__*/ function() {
             key: "executeAgent",
             value: function executeAgent(step) {
                 return _wrap_async_generator(function() {
-                    var block, prevState, _this_defaultTools, defaultTools, _this_components, components, _this_options, config, _config_tools, mergedTools, messages, resumeContext, _this_options1, _this_options2, _config_prompt, prompt, _this_options3, totalTokens, iteration, _this_options4, toolsForClient, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, _step_value, name, toolDef, tool, systemPrompt, response, _this_options5, _this_options6, _iteratorNormalCompletion1, _didIteratorError1, _iteratorError1, _iterator1, _step1, toolCall, _this_options7, tool1, _this_options8, toolResult, waitForResult, webhooks, _this_options9, _this_options10, _this_options11, err;
+                    var _this_resumeContext, _this_resumeContext1, block, prevState, _this_defaultTools, defaultTools, _this_components, components, _this_options, config, _config_tools, mergedTools, _config_outputSchema, schema, name, responseMessages, initialMessages, agentContext, webhookResponse, _agentContext_stepId, effectiveStepId, _this_options1, _this_options2, userMessage, toolResultMessage, _this_options3, userMessage1, _config_prompt, prompt, _this_options4, totalTokens, iteration, _config_maxIterations, maxIterations, _response_responseMessages, signals, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, signal, userMessage2, _this_options5, err, _this_options6, toolsForClient, _iteratorNormalCompletion1, _didIteratorError1, _iteratorError1, _iterator1, _step1, _step_value, name1, toolDef, tool, description, componentList, systemPrompt, response, newAssistantMessage, _this_options7, tokensThisIteration, _this_options8, _this_options9, _this_options10, pendingWebhook, _iteratorNormalCompletion2, _didIteratorError2, _iteratorError2, _iterator2, _step2, toolCall, _this_options11, tool1, _this_options12, _this_options13, toolContext, toolResult, waitForResult, webhooks, _this_options14, placeholderMessage, _this_options15, toolResultMessage1, _this_options16, err, _this_options17, _this_options18;
                     return _ts_generator(this, function(_state) {
                         switch(_state.label){
                             case 0:
@@ -1103,7 +1268,8 @@ export var BrainEventStream = /*#__PURE__*/ function() {
                                         response: this.currentResponse,
                                         page: this.currentPage,
                                         pages: this.pages,
-                                        env: this.env
+                                        env: this.env,
+                                        memory: this.scopedMemory
                                     }, this.services)))
                                 ];
                             case 1:
@@ -1112,17 +1278,43 @@ export var BrainEventStream = /*#__PURE__*/ function() {
                                 this.currentPage = undefined;
                                 // Merge tools: step tools override defaults
                                 mergedTools = _object_spread({}, defaultTools, (_config_tools = config.tools) !== null && _config_tools !== void 0 ? _config_tools : {});
-                                if (!this.agentResumeContext) return [
+                                // Always generate a 'done' terminal tool for every agent
+                                // If outputSchema is provided, use that schema; otherwise use defaultDoneSchema
+                                if (config.outputSchema) {
+                                    _config_outputSchema = config.outputSchema, schema = _config_outputSchema.schema, name = _config_outputSchema.name;
+                                    mergedTools['done'] = {
+                                        description: "Signal that the task is complete and provide the final ".concat(name, " result.\n\nPURPOSE: End agent execution and return structured output to the calling system.\n\nBEHAVIOR:\n- This is a TERMINAL tool - calling it immediately ends the agent\n- No further tools will execute after this\n- No further iterations will occur\n- The input you provide becomes the agent's final output\n\nWHEN TO CALL:\n- When you have completed the assigned task\n- When you have gathered all required information\n- When you have the final answer or result ready\n\nDO NOT CALL IF:\n- You still need to gather more information\n- You are waiting for user input (use waitForWebhook instead)\n- The task is not yet complete\n\nThe schema for this result is: ").concat(name),
+                                        inputSchema: schema,
+                                        terminal: true
+                                    };
+                                } else {
+                                    mergedTools['done'] = {
+                                        description: "Signal that the task is complete and provide a summary of what was accomplished.\n\nPURPOSE: End agent execution and return a result string to the calling system.\n\nBEHAVIOR:\n- This is a TERMINAL tool - calling it immediately ends the agent\n- No further tools will execute after this\n- No further iterations will occur\n- The result string you provide becomes the agent's final output\n\nWHEN TO CALL:\n- When you have completed the assigned task\n- When you have gathered all required information\n- When you have the final answer ready to report\n\nDO NOT CALL IF:\n- You still need to gather more information\n- You are waiting for user input (use waitForWebhook instead)\n- The task is not yet complete\n\nProvide a clear, concise summary of the outcome in the 'result' field.",
+                                        inputSchema: defaultDoneSchema,
+                                        terminal: true
+                                    };
+                                }
+                                // Check if we're resuming from a previous agent execution
+                                agentContext = (_this_resumeContext = this.resumeContext) === null || _this_resumeContext === void 0 ? void 0 : _this_resumeContext.agentContext;
+                                webhookResponse = (_this_resumeContext1 = this.resumeContext) === null || _this_resumeContext1 === void 0 ? void 0 : _this_resumeContext1.webhookResponse;
+                                // Use preserved stepId from agentContext when resuming, or step.id for fresh start
+                                // This ensures all events for the same agent use the same stepId across resumes
+                                effectiveStepId = (_agentContext_stepId = agentContext === null || agentContext === void 0 ? void 0 : agentContext.stepId) !== null && _agentContext_stepId !== void 0 ? _agentContext_stepId : step.id;
+                                if (!agentContext) return [
                                     3,
-                                    4
+                                    9
                                 ];
-                                resumeContext = this.agentResumeContext;
+                                if (!(webhookResponse && agentContext.pendingToolCallId && agentContext.pendingToolName)) return [
+                                    3,
+                                    7
+                                ];
+                                // WEBHOOK RESUME: Agent was waiting for a webhook response
                                 // Emit WEBHOOK_RESPONSE event to record the response
                                 return [
                                     4,
                                     {
                                         type: BRAIN_EVENTS.WEBHOOK_RESPONSE,
-                                        response: resumeContext.webhookResponse,
+                                        response: webhookResponse,
                                         options: (_this_options1 = this.options) !== null && _this_options1 !== void 0 ? _this_options1 : {},
                                         brainRunId: this.brainRunId
                                     }
@@ -1135,25 +1327,86 @@ export var BrainEventStream = /*#__PURE__*/ function() {
                                     {
                                         type: BRAIN_EVENTS.AGENT_TOOL_RESULT,
                                         stepTitle: step.block.title,
-                                        stepId: step.id,
-                                        toolCallId: resumeContext.pendingToolCallId,
-                                        toolName: resumeContext.pendingToolName,
-                                        result: resumeContext.webhookResponse,
+                                        stepId: effectiveStepId,
+                                        toolCallId: agentContext.pendingToolCallId,
+                                        toolName: agentContext.pendingToolName,
+                                        result: webhookResponse,
                                         options: (_this_options2 = this.options) !== null && _this_options2 !== void 0 ? _this_options2 : {},
                                         brainRunId: this.brainRunId
                                     }
                                 ];
                             case 3:
                                 _state.sent();
-                                // Use restored messages from the resume context
-                                messages = resumeContext.messages;
-                                // Clear the context so it's only used once
-                                this.agentResumeContext = undefined;
+                                // Use restored responseMessages from the agent context (preserves providerOptions)
+                                // Prepend the user message and append the webhook response
+                                // Note: reconstructed messages don't include the placeholder (we don't emit events for it),
+                                // so we just append the real webhook response here.
+                                userMessage = {
+                                    role: 'user',
+                                    content: agentContext.prompt
+                                };
+                                if (!this.client.createToolResultMessage) return [
+                                    3,
+                                    5
+                                ];
+                                toolResultMessage = this.client.createToolResultMessage(agentContext.pendingToolCallId, agentContext.pendingToolName, webhookResponse);
+                                responseMessages = [
+                                    userMessage
+                                ].concat(_to_consumable_array(agentContext.responseMessages), [
+                                    toolResultMessage
+                                ]);
+                                // Emit event for this tool result message (for reconstruction if there's another pause)
+                                return [
+                                    4,
+                                    {
+                                        type: BRAIN_EVENTS.AGENT_RAW_RESPONSE_MESSAGE,
+                                        stepTitle: step.block.title,
+                                        stepId: effectiveStepId,
+                                        iteration: 0,
+                                        message: toolResultMessage,
+                                        options: (_this_options3 = this.options) !== null && _this_options3 !== void 0 ? _this_options3 : {},
+                                        brainRunId: this.brainRunId
+                                    }
+                                ];
+                            case 4:
+                                _state.sent();
                                 return [
                                     3,
                                     6
                                 ];
-                            case 4:
+                            case 5:
+                                // Fallback if client doesn't support createToolResultMessage
+                                responseMessages = [
+                                    userMessage
+                                ].concat(_to_consumable_array(agentContext.responseMessages));
+                                _state.label = 6;
+                            case 6:
+                                // Set empty initial messages since user message is in responseMessages
+                                initialMessages = [];
+                                return [
+                                    3,
+                                    8
+                                ];
+                            case 7:
+                                // PAUSE RESUME: Agent was paused mid-execution (no pending webhook)
+                                // Restore conversation history and continue from where we left off
+                                userMessage1 = {
+                                    role: 'user',
+                                    content: agentContext.prompt
+                                };
+                                responseMessages = [
+                                    userMessage1
+                                ].concat(_to_consumable_array(agentContext.responseMessages));
+                                initialMessages = [];
+                                _state.label = 8;
+                            case 8:
+                                // Clear the resume context so it's only used once
+                                this.resumeContext = undefined;
+                                return [
+                                    3,
+                                    11
+                                ];
+                            case 9:
                                 // Use "Begin." as default prompt if not provided
                                 prompt = (_config_prompt = config.prompt) !== null && _config_prompt !== void 0 ? _config_prompt : 'Begin.';
                                 // Emit agent start event (only for fresh starts)
@@ -1162,75 +1415,255 @@ export var BrainEventStream = /*#__PURE__*/ function() {
                                     {
                                         type: BRAIN_EVENTS.AGENT_START,
                                         stepTitle: step.block.title,
-                                        stepId: step.id,
+                                        stepId: effectiveStepId,
                                         prompt: prompt,
                                         system: config.system,
-                                        options: (_this_options3 = this.options) !== null && _this_options3 !== void 0 ? _this_options3 : {},
+                                        tools: Object.keys(mergedTools),
+                                        options: (_this_options4 = this.options) !== null && _this_options4 !== void 0 ? _this_options4 : {},
                                         brainRunId: this.brainRunId
                                     }
                                 ];
-                            case 5:
+                            case 10:
                                 _state.sent();
                                 // Initialize messages for fresh start
-                                messages = [
+                                initialMessages = [
                                     {
                                         role: 'user',
                                         content: prompt
                                     }
                                 ];
-                                _state.label = 6;
-                            case 6:
+                                _state.label = 11;
+                            case 11:
                                 // Initialize token tracking
                                 totalTokens = 0;
                                 iteration = 0;
-                                _state.label = 7;
-                            case 7:
+                                maxIterations = (_config_maxIterations = config.maxIterations) !== null && _config_maxIterations !== void 0 ? _config_maxIterations : 100;
+                                _state.label = 12;
+                            case 12:
                                 if (!true) return [
                                     3,
-                                    33
+                                    60
                                 ];
                                 iteration++;
-                                // Emit iteration event
+                                if (!this.signalProvider) return [
+                                    3,
+                                    26
+                                ];
                                 return [
                                     4,
-                                    {
-                                        type: BRAIN_EVENTS.AGENT_ITERATION,
-                                        stepTitle: step.block.title,
-                                        stepId: step.id,
-                                        iteration: iteration,
-                                        options: (_this_options4 = this.options) !== null && _this_options4 !== void 0 ? _this_options4 : {},
-                                        brainRunId: this.brainRunId
+                                    _await_async_generator(this.signalProvider.getSignals('ALL'))
+                                ];
+                            case 13:
+                                signals = _state.sent();
+                                _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+                                _state.label = 14;
+                            case 14:
+                                _state.trys.push([
+                                    14,
+                                    24,
+                                    25,
+                                    26
+                                ]);
+                                _iterator = signals[Symbol.iterator]();
+                                _state.label = 15;
+                            case 15:
+                                if (!!(_iteratorNormalCompletion = (_step = _iterator.next()).done)) return [
+                                    3,
+                                    23
+                                ];
+                                signal = _step.value;
+                                if (!(signal.type === 'KILL')) return [
+                                    3,
+                                    17
+                                ];
+                                return [
+                                    4,
+                                    {
+                                        type: BRAIN_EVENTS.CANCELLED,
+                                        status: STATUS.CANCELLED,
+                                        brainTitle: this.title,
+                                        brainDescription: this.description,
+                                        brainRunId: this.brainRunId,
+                                        options: this.options
                                     }
                                 ];
-                            case 8:
+                            case 16:
+                                _state.sent();
+                                return [
+                                    2
+                                ];
+                            case 17:
+                                if (!(signal.type === 'PAUSE')) return [
+                                    3,
+                                    19
+                                ];
+                                return [
+                                    4,
+                                    {
+                                        type: BRAIN_EVENTS.PAUSED,
+                                        status: STATUS.PAUSED,
+                                        brainTitle: this.title,
+                                        brainDescription: this.description,
+                                        brainRunId: this.brainRunId,
+                                        options: this.options
+                                    }
+                                ];
+                            case 18:
+                                _state.sent();
+                                return [
+                                    2
+                                ];
+                            case 19:
+                                if (!(signal.type === 'USER_MESSAGE')) return [
+                                    3,
+                                    22
+                                ];
+                                // Emit event for user message injection
+                                return [
+                                    4,
+                                    {
+                                        type: BRAIN_EVENTS.AGENT_USER_MESSAGE,
+                                        stepTitle: step.block.title,
+                                        stepId: effectiveStepId,
+                                        content: signal.content,
+                                        options: this.options,
+                                        brainRunId: this.brainRunId
+                                    }
+                                ];
+                            case 20:
+                                _state.sent();
+                                // Inject as user message into conversation
+                                userMessage2 = {
+                                    role: 'user',
+                                    content: signal.content
+                                };
+                                if (responseMessages) {
+                                    responseMessages = _to_consumable_array(responseMessages).concat([
+                                        userMessage2
+                                    ]);
+                                } else {
+                                    initialMessages = _to_consumable_array(initialMessages).concat([
+                                        {
+                                            role: 'user',
+                                            content: signal.content
+                                        }
+                                    ]);
+                                }
+                                // Emit raw response message event so it shows up in agent chat view
+                                return [
+                                    4,
+                                    {
+                                        type: BRAIN_EVENTS.AGENT_RAW_RESPONSE_MESSAGE,
+                                        stepTitle: step.block.title,
+                                        stepId: effectiveStepId,
+                                        iteration: iteration,
+                                        message: userMessage2,
+                                        options: (_this_options5 = this.options) !== null && _this_options5 !== void 0 ? _this_options5 : {},
+                                        brainRunId: this.brainRunId
+                                    }
+                                ];
+                            case 21:
+                                _state.sent();
+                                _state.label = 22;
+                            case 22:
+                                _iteratorNormalCompletion = true;
+                                return [
+                                    3,
+                                    15
+                                ];
+                            case 23:
+                                return [
+                                    3,
+                                    26
+                                ];
+                            case 24:
+                                err = _state.sent();
+                                _didIteratorError = true;
+                                _iteratorError = err;
+                                return [
+                                    3,
+                                    26
+                                ];
+                            case 25:
+                                try {
+                                    if (!_iteratorNormalCompletion && _iterator.return != null) {
+                                        _iterator.return();
+                                    }
+                                } finally{
+                                    if (_didIteratorError) {
+                                        throw _iteratorError;
+                                    }
+                                }
+                                return [
+                                    7
+                                ];
+                            case 26:
+                                if (!(iteration > maxIterations)) return [
+                                    3,
+                                    29
+                                ];
+                                return [
+                                    4,
+                                    {
+                                        type: BRAIN_EVENTS.AGENT_ITERATION_LIMIT,
+                                        stepTitle: step.block.title,
+                                        stepId: effectiveStepId,
+                                        iteration: iteration - 1,
+                                        maxIterations: maxIterations,
+                                        totalTokens: totalTokens,
+                                        options: (_this_options6 = this.options) !== null && _this_options6 !== void 0 ? _this_options6 : {},
+                                        brainRunId: this.brainRunId
+                                    }
+                                ];
+                            case 27:
+                                _state.sent();
+                                return [
+                                    5,
+                                    _ts_values(_async_generator_delegate(_async_iterator(this.completeStep(step, prevState))))
+                                ];
+                            case 28:
                                 _state.sent();
+                                return [
+                                    2
+                                ];
+                            case 29:
                                 // Check if client supports generateText
                                 if (!this.client.generateText) {
                                     throw new Error('Client does not support generateText. Use a client that implements generateText for agent steps.');
                                 }
                                 // Build tools object for the client (description and inputSchema only)
                                 toolsForClient = {};
-                                _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+                                _iteratorNormalCompletion1 = true, _didIteratorError1 = false, _iteratorError1 = undefined;
                                 try {
-                                    for(_iterator = Object.entries(mergedTools)[Symbol.iterator](); !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
-                                        _step_value = _sliced_to_array(_step.value, 2), name = _step_value[0], toolDef = _step_value[1];
+                                    for(_iterator1 = Object.entries(mergedTools)[Symbol.iterator](); !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true){
+                                        _step_value = _sliced_to_array(_step1.value, 2), name1 = _step_value[0], toolDef = _step_value[1];
                                         tool = toolDef;
-                                        toolsForClient[name] = {
-                                            description: tool.description,
+                                        description = tool.description;
+                                        // Enrich generateUI description with available component information
+                                        if (name1 === 'generateUI' && components && Object.keys(components).length > 0) {
+                                            componentList = Object.entries(components).map(function(param) {
+                                                var _param = _sliced_to_array(param, 2), compName = _param[0], comp = _param[1];
+                                                var desc = comp.description.split('\n')[0]; // First line only
+                                                return "- ".concat(compName, ": ").concat(desc);
+                                            }).join('\n');
+                                            description = "Generate a web page for displaying rich content or collecting user input.\n\nSometimes you need more than simple notifications to communicate with users. This tool creates web pages that can display formatted content, dashboards, or forms to collect information.\n\nAVAILABLE COMPONENTS:\n".concat(componentList, "\n\nRETURNS: { url: string, webhook: { slug: string, identifier: string } | null }\n- url: The page URL\n- webhook: For forms (hasForm=true), contains slug and identifier that can be passed to waitForWebhook to pause execution until the user submits the form\n\nIMPORTANT: Users have no way to discover the page URL on their own. After generating a page, you must tell them the URL using whatever communication tools are available.");
+                                        }
+                                        toolsForClient[name1] = {
+                                            description: description,
                                             inputSchema: tool.inputSchema
                                         };
                                     }
                                 } catch (err) {
-                                    _didIteratorError = true;
-                                    _iteratorError = err;
+                                    _didIteratorError1 = true;
+                                    _iteratorError1 = err;
                                 } finally{
                                     try {
-                                        if (!_iteratorNormalCompletion && _iterator.return != null) {
-                                            _iterator.return();
+                                        if (!_iteratorNormalCompletion1 && _iterator1.return != null) {
+                                            _iterator1.return();
                                         }
                                     } finally{
-                                        if (_didIteratorError) {
-                                            throw _iteratorError;
+                                        if (_didIteratorError1) {
+                                            throw _iteratorError1;
                                         }
                                     }
                                 }
@@ -1240,110 +1673,153 @@ export var BrainEventStream = /*#__PURE__*/ function() {
                                     4,
                                     _await_async_generator(this.client.generateText({
                                         system: systemPrompt,
-                                        messages: messages,
+                                        messages: initialMessages,
+                                        responseMessages: responseMessages,
                                         tools: toolsForClient
                                     }))
                                 ];
-                            case 9:
+                            case 30:
                                 response = _state.sent();
+                                // Update responseMessages for next iteration (preserves providerOptions)
+                                responseMessages = response.responseMessages;
+                                // Get the new assistant message (the last one added by generateText)
+                                newAssistantMessage = (_response_responseMessages = response.responseMessages) === null || _response_responseMessages === void 0 ? void 0 : _response_responseMessages.at(-1);
+                                if (!newAssistantMessage) return [
+                                    3,
+                                    32
+                                ];
+                                return [
+                                    4,
+                                    {
+                                        type: BRAIN_EVENTS.AGENT_RAW_RESPONSE_MESSAGE,
+                                        stepTitle: step.block.title,
+                                        stepId: effectiveStepId,
+                                        iteration: iteration,
+                                        message: newAssistantMessage,
+                                        options: (_this_options7 = this.options) !== null && _this_options7 !== void 0 ? _this_options7 : {},
+                                        brainRunId: this.brainRunId
+                                    }
+                                ];
+                            case 31:
+                                _state.sent();
+                                _state.label = 32;
+                            case 32:
                                 // Track tokens
-                                totalTokens += response.usage.totalTokens;
+                                tokensThisIteration = response.usage.totalTokens;
+                                totalTokens += tokensThisIteration;
+                                // Emit iteration event (after LLM call so we have token info)
+                                return [
+                                    4,
+                                    {
+                                        type: BRAIN_EVENTS.AGENT_ITERATION,
+                                        stepTitle: step.block.title,
+                                        stepId: effectiveStepId,
+                                        iteration: iteration,
+                                        tokensThisIteration: tokensThisIteration,
+                                        totalTokens: totalTokens,
+                                        options: (_this_options8 = this.options) !== null && _this_options8 !== void 0 ? _this_options8 : {},
+                                        brainRunId: this.brainRunId
+                                    }
+                                ];
+                            case 33:
+                                _state.sent();
                                 if (!(config.maxTokens && totalTokens > config.maxTokens)) return [
                                     3,
-                                    12
+                                    36
                                 ];
                                 return [
                                     4,
                                     {
                                         type: BRAIN_EVENTS.AGENT_TOKEN_LIMIT,
                                         stepTitle: step.block.title,
-                                        stepId: step.id,
+                                        stepId: effectiveStepId,
                                         totalTokens: totalTokens,
                                         maxTokens: config.maxTokens,
-                                        options: (_this_options5 = this.options) !== null && _this_options5 !== void 0 ? _this_options5 : {},
+                                        options: (_this_options9 = this.options) !== null && _this_options9 !== void 0 ? _this_options9 : {},
                                         brainRunId: this.brainRunId
                                     }
                                 ];
-                            case 10:
+                            case 34:
                                 _state.sent();
                                 return [
                                     5,
                                     _ts_values(_async_generator_delegate(_async_iterator(this.completeStep(step, prevState))))
                                 ];
-                            case 11:
+                            case 35:
                                 _state.sent();
                                 return [
                                     2
                                 ];
-                            case 12:
+                            case 36:
                                 if (!response.text) return [
                                     3,
-                                    14
+                                    38
                                 ];
+                                // Log assistant messages to console as fallback (users shouldn't rely on this)
+                                console.log("[Assistant] ".concat(response.text));
                                 return [
                                     4,
                                     {
                                         type: BRAIN_EVENTS.AGENT_ASSISTANT_MESSAGE,
                                         stepTitle: step.block.title,
-                                        stepId: step.id,
+                                        stepId: effectiveStepId,
                                         content: response.text,
-                                        options: (_this_options6 = this.options) !== null && _this_options6 !== void 0 ? _this_options6 : {},
+                                        options: (_this_options10 = this.options) !== null && _this_options10 !== void 0 ? _this_options10 : {},
                                         brainRunId: this.brainRunId
                                     }
                                 ];
-                            case 13:
+                            case 37:
                                 _state.sent();
-                                messages.push({
-                                    role: 'assistant',
-                                    content: response.text
-                                });
-                                _state.label = 14;
-                            case 14:
+                                _state.label = 38;
+                            case 38:
                                 if (!(!response.toolCalls || response.toolCalls.length === 0)) return [
                                     3,
-                                    16
+                                    40
                                 ];
                                 return [
                                     5,
                                     _ts_values(_async_generator_delegate(_async_iterator(this.completeStep(step, prevState))))
                                 ];
-                            case 15:
+                            case 39:
                                 _state.sent();
                                 return [
                                     2
                                 ];
-                            case 16:
-                                _iteratorNormalCompletion1 = true, _didIteratorError1 = false, _iteratorError1 = undefined;
-                                _state.label = 17;
-                            case 17:
+                            case 40:
+                                // Track pending webhook if any tool returns waitFor
+                                // We process ALL tool calls first, then pause for webhook at the end
+                                pendingWebhook = null;
+                                _iteratorNormalCompletion2 = true, _didIteratorError2 = false, _iteratorError2 = undefined;
+                                _state.label = 41;
+                            case 41:
                                 _state.trys.push([
-                                    17,
-                                    30,
-                                    31,
-                                    32
+                                    41,
+                                    54,
+                                    55,
+                                    56
                                 ]);
-                                _iterator1 = response.toolCalls[Symbol.iterator]();
-                                _state.label = 18;
-                            case 18:
-                                if (!!(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done)) return [
+                                _iterator2 = response.toolCalls[Symbol.iterator]();
+                                _state.label = 42;
+                            case 42:
+                                if (!!(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done)) return [
                                     3,
-                                    29
+                                    53
                                 ];
-                                toolCall = _step1.value;
+                                toolCall = _step2.value;
                                 return [
                                     4,
                                     {
                                         type: BRAIN_EVENTS.AGENT_TOOL_CALL,
                                         stepTitle: step.block.title,
-                                        stepId: step.id,
+                                        stepId: effectiveStepId,
                                         toolName: toolCall.toolName,
                                         toolCallId: toolCall.toolCallId,
                                         input: toolCall.args,
-                                        options: (_this_options7 = this.options) !== null && _this_options7 !== void 0 ? _this_options7 : {},
+                                        options: (_this_options11 = this.options) !== null && _this_options11 !== void 0 ? _this_options11 : {},
                                         brainRunId: this.brainRunId
                                     }
                                 ];
-                            case 19:
+                            case 43:
                                 _state.sent();
                                 tool1 = mergedTools[toolCall.toolName];
                                 if (!tool1) {
@@ -1351,152 +1827,241 @@ export var BrainEventStream = /*#__PURE__*/ function() {
                                 }
                                 if (!tool1.terminal) return [
                                     3,
-                                    22
+                                    46
                                 ];
                                 return [
                                     4,
                                     {
                                         type: BRAIN_EVENTS.AGENT_COMPLETE,
                                         stepTitle: step.block.title,
-                                        stepId: step.id,
+                                        stepId: effectiveStepId,
                                         terminalToolName: toolCall.toolName,
                                         result: toolCall.args,
                                         totalIterations: iteration,
-                                        options: (_this_options8 = this.options) !== null && _this_options8 !== void 0 ? _this_options8 : {},
+                                        totalTokens: totalTokens,
+                                        options: (_this_options12 = this.options) !== null && _this_options12 !== void 0 ? _this_options12 : {},
                                         brainRunId: this.brainRunId
                                     }
                                 ];
-                            case 20:
+                            case 44:
                                 _state.sent();
                                 // Merge terminal result into state
-                                this.currentState = _object_spread({}, this.currentState, toolCall.args);
+                                // Only namespace under outputSchema.name when 'done' tool is called with outputSchema
+                                if (config.outputSchema && toolCall.toolName === 'done') {
+                                    // Namespace result under outputSchema.name
+                                    this.currentState = _object_spread_props(_object_spread({}, this.currentState), _define_property({}, config.outputSchema.name, toolCall.args));
+                                } else {
+                                    // Default behavior: spread into state root (for other terminal tools)
+                                    this.currentState = _object_spread({}, this.currentState, toolCall.args);
+                                }
                                 return [
                                     5,
                                     _ts_values(_async_generator_delegate(_async_iterator(this.completeStep(step, prevState))))
                                 ];
-                            case 21:
+                            case 45:
                                 _state.sent();
                                 return [
                                     2
                                 ];
-                            case 22:
+                            case 46:
                                 if (!tool1.execute) return [
                                     3,
-                                    28
+                                    52
                                 ];
+                                toolContext = {
+                                    state: this.currentState,
+                                    options: (_this_options13 = this.options) !== null && _this_options13 !== void 0 ? _this_options13 : {},
+                                    client: this.client,
+                                    resources: this.resources,
+                                    response: this.currentResponse,
+                                    page: this.currentPage,
+                                    pages: this.pages,
+                                    env: this.env,
+                                    components: this.components,
+                                    brainRunId: this.brainRunId,
+                                    stepId: effectiveStepId,
+                                    memory: this.scopedMemory
+                                };
                                 return [
                                     4,
-                                    _await_async_generator(tool1.execute(toolCall.args))
+                                    _await_async_generator(tool1.execute(toolCall.args, toolContext))
                                 ];
-                            case 23:
+                            case 47:
                                 toolResult = _state.sent();
                                 if (!(toolResult && (typeof toolResult === "undefined" ? "undefined" : _type_of(toolResult)) === 'object' && 'waitFor' in toolResult)) return [
                                     3,
-                                    26
+                                    49
                                 ];
                                 waitForResult = toolResult;
                                 // Normalize waitFor to array (supports single or multiple webhooks)
                                 webhooks = Array.isArray(waitForResult.waitFor) ? waitForResult.waitFor : [
                                     waitForResult.waitFor
                                 ];
-                                // Emit agent webhook event first (captures pending tool context)
+                                // Store webhook info - we'll emit the events after processing all tool calls
+                                // This ensures all other tool results are processed before pausing
+                                pendingWebhook = {
+                                    toolCallId: toolCall.toolCallId,
+                                    toolName: toolCall.toolName,
+                                    input: toolCall.args,
+                                    webhooks: webhooks.map(function(w) {
+                                        return {
+                                            slug: w.slug,
+                                            identifier: w.identifier
+                                        };
+                                    })
+                                };
+                                // Emit tool result event for debugging/visibility (with pending status)
                                 return [
                                     4,
                                     {
-                                        type: BRAIN_EVENTS.AGENT_WEBHOOK,
+                                        type: BRAIN_EVENTS.AGENT_TOOL_RESULT,
                                         stepTitle: step.block.title,
-                                        stepId: step.id,
-                                        toolCallId: toolCall.toolCallId,
+                                        stepId: effectiveStepId,
                                         toolName: toolCall.toolName,
-                                        input: toolCall.args,
-                                        options: (_this_options9 = this.options) !== null && _this_options9 !== void 0 ? _this_options9 : {},
+                                        toolCallId: toolCall.toolCallId,
+                                        result: {
+                                            status: 'waiting_for_webhook',
+                                            webhooks: pendingWebhook.webhooks
+                                        },
+                                        options: (_this_options14 = this.options) !== null && _this_options14 !== void 0 ? _this_options14 : {},
                                         brainRunId: this.brainRunId
                                     }
                                 ];
-                            case 24:
+                            case 48:
                                 _state.sent();
-                                // Then emit webhook event with all webhooks (first response wins)
+                                // Add placeholder to responseMessages locally so the conversation stays valid
+                                // for any subsequent generateText calls in this execution.
+                                // We DON'T emit an event for it - on resume, we reconstruct from events
+                                // and append the real webhook response.
+                                if (this.client.createToolResultMessage && responseMessages) {
+                                    placeholderMessage = this.client.createToolResultMessage(toolCall.toolCallId, toolCall.toolName, {
+                                        status: 'waiting_for_webhook',
+                                        webhooks: pendingWebhook.webhooks
+                                    });
+                                    responseMessages = _to_consumable_array(responseMessages).concat([
+                                        placeholderMessage
+                                    ]);
+                                }
+                                // Continue processing other tool calls - don't return yet
+                                return [
+                                    3,
+                                    52
+                                ];
+                            case 49:
+                                // Emit tool result event for debugging/visibility
                                 return [
                                     4,
                                     {
-                                        type: BRAIN_EVENTS.WEBHOOK,
-                                        waitFor: webhooks.map(function(w) {
-                                            return {
-                                                slug: w.slug,
-                                                identifier: w.identifier
-                                            };
-                                        }),
-                                        options: (_this_options10 = this.options) !== null && _this_options10 !== void 0 ? _this_options10 : {},
+                                        type: BRAIN_EVENTS.AGENT_TOOL_RESULT,
+                                        stepTitle: step.block.title,
+                                        stepId: effectiveStepId,
+                                        toolName: toolCall.toolName,
+                                        toolCallId: toolCall.toolCallId,
+                                        result: toolResult,
+                                        options: (_this_options15 = this.options) !== null && _this_options15 !== void 0 ? _this_options15 : {},
                                         brainRunId: this.brainRunId
                                     }
                                 ];
-                            case 25:
+                            case 50:
                                 _state.sent();
-                                return [
-                                    2
+                                if (!(this.client.createToolResultMessage && responseMessages)) return [
+                                    3,
+                                    52
                                 ];
-                            case 26:
-                                // Normal tool result
+                                toolResultMessage1 = this.client.createToolResultMessage(toolCall.toolCallId, toolCall.toolName, toolResult);
+                                responseMessages = _to_consumable_array(responseMessages).concat([
+                                    toolResultMessage1
+                                ]);
+                                // Emit event for this tool result message
                                 return [
                                     4,
                                     {
-                                        type: BRAIN_EVENTS.AGENT_TOOL_RESULT,
+                                        type: BRAIN_EVENTS.AGENT_RAW_RESPONSE_MESSAGE,
                                         stepTitle: step.block.title,
-                                        stepId: step.id,
-                                        toolName: toolCall.toolName,
-                                        toolCallId: toolCall.toolCallId,
-                                        result: toolResult,
-                                        options: (_this_options11 = this.options) !== null && _this_options11 !== void 0 ? _this_options11 : {},
+                                        stepId: effectiveStepId,
+                                        iteration: iteration,
+                                        message: toolResultMessage1,
+                                        options: (_this_options16 = this.options) !== null && _this_options16 !== void 0 ? _this_options16 : {},
                                         brainRunId: this.brainRunId
                                     }
                                 ];
-                            case 27:
+                            case 51:
                                 _state.sent();
-                                messages.push({
-                                    role: 'tool',
-                                    content: JSON.stringify(toolResult),
-                                    toolCallId: toolCall.toolCallId,
-                                    toolName: toolCall.toolName
-                                });
-                                _state.label = 28;
-                            case 28:
-                                _iteratorNormalCompletion1 = true;
+                                _state.label = 52;
+                            case 52:
+                                _iteratorNormalCompletion2 = true;
                                 return [
                                     3,
-                                    18
+                                    42
                                 ];
-                            case 29:
+                            case 53:
                                 return [
                                     3,
-                                    32
+                                    56
                                 ];
-                            case 30:
+                            case 54:
                                 err = _state.sent();
-                                _didIteratorError1 = true;
-                                _iteratorError1 = err;
+                                _didIteratorError2 = true;
+                                _iteratorError2 = err;
                                 return [
                                     3,
-                                    32
+                                    56
                                 ];
-                            case 31:
+                            case 55:
                                 try {
-                                    if (!_iteratorNormalCompletion1 && _iterator1.return != null) {
-                                        _iterator1.return();
+                                    if (!_iteratorNormalCompletion2 && _iterator2.return != null) {
+                                        _iterator2.return();
                                     }
                                 } finally{
-                                    if (_didIteratorError1) {
-                                        throw _iteratorError1;
+                                    if (_didIteratorError2) {
+                                        throw _iteratorError2;
                                     }
                                 }
                                 return [
                                     7
                                 ];
-                            case 32:
+                            case 56:
+                                if (!pendingWebhook) return [
+                                    3,
+                                    59
+                                ];
+                                // Emit AGENT_WEBHOOK event
+                                return [
+                                    4,
+                                    {
+                                        type: BRAIN_EVENTS.AGENT_WEBHOOK,
+                                        stepTitle: step.block.title,
+                                        stepId: effectiveStepId,
+                                        toolCallId: pendingWebhook.toolCallId,
+                                        toolName: pendingWebhook.toolName,
+                                        input: pendingWebhook.input,
+                                        options: (_this_options17 = this.options) !== null && _this_options17 !== void 0 ? _this_options17 : {},
+                                        brainRunId: this.brainRunId
+                                    }
+                                ];
+                            case 57:
+                                _state.sent();
+                                // Emit WEBHOOK event with all webhooks (first response wins)
+                                return [
+                                    4,
+                                    {
+                                        type: BRAIN_EVENTS.WEBHOOK,
+                                        waitFor: pendingWebhook.webhooks,
+                                        options: (_this_options18 = this.options) !== null && _this_options18 !== void 0 ? _this_options18 : {},
+                                        brainRunId: this.brainRunId
+                                    }
+                                ];
+                            case 58:
+                                _state.sent();
+                                return [
+                                    2
+                                ];
+                            case 59:
                                 return [
                                     3,
-                                    7
+                                    12
                                 ];
-                            case 33:
+                            case 60:
                                 return [
                                     2
                                 ];