openai 7.4.0 → 7.6.0

package/lib/AssistantStream.js

@@ -1,5 +1,5 @@
 "use strict";
-var _AssistantStream_instances, _a, _AssistantStream_events, _AssistantStream_runStepSnapshots, _AssistantStream_messageSnapshots, _AssistantStream_messageSnapshot, _AssistantStream_finalRun, _AssistantStream_currentContentIndex, _AssistantStream_currentContent, _AssistantStream_currentToolCallIndex, _AssistantStream_currentToolCall, _AssistantStream_currentEvent, _AssistantStream_currentRunSnapshot, _AssistantStream_currentRunStepSnapshot, _AssistantStream_addEvent, _AssistantStream_endRequest, _AssistantStream_handleMessage, _AssistantStream_handleRunStep, _AssistantStream_handleEvent, _AssistantStream_accumulateRunStep, _AssistantStream_accumulateMessage, _AssistantStream_accumulateContent, _AssistantStream_handleRun;
+var _AssistantStream_instances, _AssistantStream_runStepSnapshots, _AssistantStream_runStepIDOwners, _AssistantStream_activeRunStepID, _AssistantStream_messageSnapshots, _AssistantStream_messageIDOwners, _AssistantStream_messageSnapshot, _AssistantStream_activeMessageID, _AssistantStream_finalRun, _AssistantStream_currentContentIndex, _AssistantStream_currentContent, _AssistantStream_currentToolCallIndex, _AssistantStream_currentToolCall, _AssistantStream_currentEvent, _AssistantStream_currentRunSnapshot, _AssistantStream_currentRunStepSnapshot, _AssistantStream_addEvent, _AssistantStream_endRequest, _AssistantStream_validateRunStepEvent, _AssistantStream_reserveRunStepAlias, _AssistantStream_validateMessageEvent, _AssistantStream_reserveMessageAlias, _AssistantStream_handleMessage, _AssistantStream_handleRunStep, _AssistantStream_emitExposed, _AssistantStream_handleEvent, _AssistantStream_accumulateRunStep, _AssistantStream_accumulateMessage, _AssistantStream_accumulateContent, _AssistantStream_handleRun;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AssistantStream = void 0;
 const tslib_1 = require("../internal/tslib.js");
@@ -7,17 +7,62 @@ const streaming_1 = require("../streaming.js");
 const error_1 = require("../error.js");
 const EventStream_1 = require("./EventStream.js");
 const utils_1 = require("../internal/utils.js");
+const assistant_stream_delta_1 = require("../internal/assistant-stream-delta.js");
+function stabilizeAssistantStreamEvent(event) {
+    const eventDescriptor = Object.getOwnPropertyDescriptor(event, 'event');
+    const dataDescriptor = Object.getOwnPropertyDescriptor(event, 'data');
+    const eventType = Reflect.get(event, 'event', event);
+    const data = Reflect.get(event, 'data', event);
+    let stableData = data;
+    if (eventType === 'thread.message.created' ||
+        eventType === 'thread.message.in_progress' ||
+        eventType === 'thread.message.delta' ||
+        eventType === 'thread.message.completed' ||
+        eventType === 'thread.message.incomplete' ||
+        eventType === 'thread.run.step.created' ||
+        eventType === 'thread.run.step.in_progress' ||
+        eventType === 'thread.run.step.delta' ||
+        eventType === 'thread.run.step.completed' ||
+        eventType === 'thread.run.step.failed' ||
+        eventType === 'thread.run.step.cancelled' ||
+        eventType === 'thread.run.step.expired') {
+        const messageID = Object.getOwnPropertyDescriptor(data, 'id');
+        if (messageID && 'value' in messageID && Reflect.get(data, 'id', data) !== messageID.value) {
+            const canonicalID = messageID.value;
+            stableData = new Proxy(data, {
+                get(target, property) {
+                    return property === 'id' ? canonicalID : Reflect.get(target, property, target);
+                },
+            });
+        }
+    }
+    const stableEvent = Object.freeze({ event: eventType, data: stableData });
+    const ordinaryEvent = eventDescriptor !== undefined &&
+        'value' in eventDescriptor &&
+        eventDescriptor.value === eventType &&
+        dataDescriptor !== undefined &&
+        'value' in dataDescriptor &&
+        dataDescriptor.value === data &&
+        stableData === data;
+    return {
+        event: stableEvent,
+        exposedEvent: ordinaryEvent ? event : { event: eventType, data: stableData },
+    };
+}
+/** Streams assistant-run events while accumulating messages, run steps, and tool-call snapshots. */
 class AssistantStream extends EventStream_1.EventStream {
     constructor() {
         super(...arguments);
         _AssistantStream_instances.add(this);
-        //Track all events in a single list for reference
-        _AssistantStream_events.set(this, []);
         //Used to accumulate deltas
         //We are accumulating many types so the value here is not strict
-        _AssistantStream_runStepSnapshots.set(this, {});
-        _AssistantStream_messageSnapshots.set(this, {});
+        _AssistantStream_runStepSnapshots.set(this, Object.create(null));
+        _AssistantStream_runStepIDOwners.set(this, new Map());
+        _AssistantStream_activeRunStepID.set(this, void 0);
+        _AssistantStream_messageSnapshots.set(this, Object.create(null));
+        _AssistantStream_messageIDOwners.set(this, new Map());
         _AssistantStream_messageSnapshot.set(this, void 0);
+        _AssistantStream_activeMessageID.set(this, void 0);
         _AssistantStream_finalRun.set(this, void 0);
         _AssistantStream_currentContentIndex.set(this, void 0);
         _AssistantStream_currentContent.set(this, void 0);
@@ -28,61 +73,18 @@ class AssistantStream extends EventStream_1.EventStream {
         _AssistantStream_currentRunSnapshot.set(this, void 0);
         _AssistantStream_currentRunStepSnapshot.set(this, void 0);
     }
-    [(_AssistantStream_events = new WeakMap(), _AssistantStream_runStepSnapshots = new WeakMap(), _AssistantStream_messageSnapshots = new WeakMap(), _AssistantStream_messageSnapshot = new WeakMap(), _AssistantStream_finalRun = new WeakMap(), _AssistantStream_currentContentIndex = new WeakMap(), _AssistantStream_currentContent = new WeakMap(), _AssistantStream_currentToolCallIndex = new WeakMap(), _AssistantStream_currentToolCall = new WeakMap(), _AssistantStream_currentEvent = new WeakMap(), _AssistantStream_currentRunSnapshot = new WeakMap(), _AssistantStream_currentRunStepSnapshot = new WeakMap(), _AssistantStream_instances = new WeakSet(), Symbol.asyncIterator)]() {
-        const pushQueue = [];
-        const readQueue = [];
-        let done = false;
-        //Catch all for passing along all events
-        this.on('event', (event) => {
-            const eventCopy = structuredClone(event);
-            const reader = readQueue.shift();
-            if (reader) {
-                reader.resolve(eventCopy);
-            }
-            else {
-                pushQueue.push(eventCopy);
-            }
-        });
-        this.on('end', () => {
-            done = true;
-            for (const reader of readQueue) {
-                reader.resolve(undefined);
-            }
-            readQueue.length = 0;
-        });
-        this.on('abort', (err) => {
-            done = true;
-            for (const reader of readQueue) {
-                reader.reject(err);
-            }
-            readQueue.length = 0;
-        });
-        this.on('error', (err) => {
-            done = true;
-            for (const reader of readQueue) {
-                reader.reject(err);
-            }
-            readQueue.length = 0;
-        });
-        return {
-            next: async () => {
-                if (!pushQueue.length) {
-                    if (done) {
-                        return { value: undefined, done: true };
-                    }
-                    return new Promise((resolve, reject) => readQueue.push({ resolve, reject })).then((chunk) => (chunk ? { value: chunk, done: false } : { value: undefined, done: true }));
-                }
-                const chunk = pushQueue.shift();
-                return { value: chunk, done: false };
-            },
-            return: async () => {
-                this.abort();
-                return { value: undefined, done: true };
-            },
-        };
+    /** Iterates over cloned raw assistant events; stopping early aborts the underlying request. */
+    [(_AssistantStream_runStepSnapshots = new WeakMap(), _AssistantStream_runStepIDOwners = new WeakMap(), _AssistantStream_activeRunStepID = new WeakMap(), _AssistantStream_messageSnapshots = new WeakMap(), _AssistantStream_messageIDOwners = new WeakMap(), _AssistantStream_messageSnapshot = new WeakMap(), _AssistantStream_activeMessageID = new WeakMap(), _AssistantStream_finalRun = new WeakMap(), _AssistantStream_currentContentIndex = new WeakMap(), _AssistantStream_currentContent = new WeakMap(), _AssistantStream_currentToolCallIndex = new WeakMap(), _AssistantStream_currentToolCall = new WeakMap(), _AssistantStream_currentEvent = new WeakMap(), _AssistantStream_currentRunSnapshot = new WeakMap(), _AssistantStream_currentRunStepSnapshot = new WeakMap(), _AssistantStream_instances = new WeakSet(), Symbol.asyncIterator)]() {
+        return this._createIterator((push) => {
+            //Catch all for passing along all events
+            const onEvent = (event) => push(structuredClone(event));
+            this.on('event', onEvent);
+            return () => this.off('event', onEvent);
+        }, { onReturn: () => this.abort() });
     }
+    /** Restores an assistant stream from events serialized by `toReadableStream()`. */
     static fromReadableStream(stream) {
-        const runner = new _a();
+        const runner = new AssistantStream();
         runner._run(() => runner._fromReadableStream(stream));
         return runner;
     }
@@ -98,15 +100,17 @@ class AssistantStream extends EventStream_1.EventStream {
         }
         return this._addRun(tslib_1.__classPrivateFieldGet(this, _AssistantStream_instances, "m", _AssistantStream_endRequest).call(this));
     }
+    /** Serializes assistant events into a readable stream for transfer to another runtime. */
     toReadableStream() {
         const stream = new streaming_1.Stream(this[Symbol.asyncIterator].bind(this), this.controller);
         return stream.toReadableStream();
     }
+    /** Submits tool outputs and starts streaming the continuation of an existing assistant run. */
     static createToolAssistantStream(runId, runs, params, options) {
-        const runner = new _a();
+        const runner = new AssistantStream();
         runner._run(() => runner._runToolAssistantStream(runId, runs, params, {
             ...options,
-            headers: { ...options?.headers, 'X-Stainless-Helper-Method': 'stream' },
+            __metadata: { ...options?.__metadata, helperMethod: 'stream' },
         }));
         return runner;
     }
@@ -126,46 +130,60 @@ class AssistantStream extends EventStream_1.EventStream {
         }
         return this._addRun(tslib_1.__classPrivateFieldGet(this, _AssistantStream_instances, "m", _AssistantStream_endRequest).call(this));
     }
+    /** Creates an assistant thread and starts streaming its newly created run. */
     static createThreadAssistantStream(params, thread, options) {
-        const runner = new _a();
+        const runner = new AssistantStream();
         runner._run(() => runner._threadAssistantStream(params, thread, {
             ...options,
-            headers: { ...options?.headers, 'X-Stainless-Helper-Method': 'stream' },
+            __metadata: { ...options?.__metadata, helperMethod: 'stream' },
         }));
         return runner;
     }
+    /** Creates a run on an existing assistant thread and starts streaming its events. */
     static createAssistantStream(threadId, runs, params, options) {
-        const runner = new _a();
+        const runner = new AssistantStream();
         runner._run(() => runner._runAssistantStream(threadId, runs, params, {
             ...options,
-            headers: { ...options?.headers, 'X-Stainless-Helper-Method': 'stream' },
+            __metadata: { ...options?.__metadata, helperMethod: 'stream' },
         }));
         return runner;
     }
+    /** Returns the most recent raw event, or `undefined` before any event arrives. */
     currentEvent() {
+        (0, assistant_stream_delta_1.markAssistantStreamValueExternallyMutable)(tslib_1.__classPrivateFieldGet(this, _AssistantStream_currentEvent, "f"));
         return tslib_1.__classPrivateFieldGet(this, _AssistantStream_currentEvent, "f");
     }
+    /** Returns the latest run snapshot, or `undefined` before a run event arrives. */
     currentRun() {
+        (0, assistant_stream_delta_1.markAssistantStreamValueExternallyMutable)(tslib_1.__classPrivateFieldGet(this, _AssistantStream_currentRunSnapshot, "f"));
         return tslib_1.__classPrivateFieldGet(this, _AssistantStream_currentRunSnapshot, "f");
     }
+    /** Returns the message currently being accumulated, or `undefined` before message creation. */
     currentMessageSnapshot() {
+        (0, assistant_stream_delta_1.markAssistantStreamValueExternallyMutable)(tslib_1.__classPrivateFieldGet(this, _AssistantStream_messageSnapshot, "f"));
         return tslib_1.__classPrivateFieldGet(this, _AssistantStream_messageSnapshot, "f");
     }
+    /** Returns the run step currently being accumulated, or `undefined` before a step begins. */
     currentRunStepSnapshot() {
+        (0, assistant_stream_delta_1.markAssistantStreamValueExternallyMutable)(tslib_1.__classPrivateFieldGet(this, _AssistantStream_currentRunStepSnapshot, "f"));
         return tslib_1.__classPrivateFieldGet(this, _AssistantStream_currentRunStepSnapshot, "f");
     }
+    /** Waits for successful completion and returns the final snapshot of every observed run step. */
     async finalRunSteps() {
         await this.done();
         return Object.values(tslib_1.__classPrivateFieldGet(this, _AssistantStream_runStepSnapshots, "f"));
     }
+    /** Waits for successful completion and returns the final snapshot of every observed message. */
     async finalMessages() {
         await this.done();
         return Object.values(tslib_1.__classPrivateFieldGet(this, _AssistantStream_messageSnapshots, "f"));
     }
+    /** Waits for completion and returns the final run, or rejects if no terminal run was received. */
     async finalRun() {
         await this.done();
-        if (!tslib_1.__classPrivateFieldGet(this, _AssistantStream_finalRun, "f"))
-            throw Error('Final run was not received.');
+        if (!tslib_1.__classPrivateFieldGet(this, _AssistantStream_finalRun, "f")) {
+            throw new Error('Final run was not received.');
+        }
         return tslib_1.__classPrivateFieldGet(this, _AssistantStream_finalRun, "f");
     }
     async _createThreadAssistantStream(thread, params, options) {
@@ -194,67 +212,15 @@ class AssistantStream extends EventStream_1.EventStream {
         }
         return this._addRun(tslib_1.__classPrivateFieldGet(this, _AssistantStream_instances, "m", _AssistantStream_endRequest).call(this));
     }
+    /**
+     * Applies an assistant delta to its mutable snapshot, concatenating text and
+     * merging nested objects and indexed array entries.
+     */
     static accumulateDelta(acc, delta) {
-        for (const [key, deltaValue] of Object.entries(delta)) {
-            if (!acc.hasOwnProperty(key)) {
-                acc[key] = deltaValue;
-                continue;
-            }
-            let accValue = acc[key];
-            if (accValue === null || accValue === undefined) {
-                acc[key] = deltaValue;
-                continue;
-            }
-            // We don't accumulate these special properties
-            if (key === 'index' || key === 'type') {
-                acc[key] = deltaValue;
-                continue;
-            }
-            // Type-specific accumulation logic
-            if (typeof accValue === 'string' && typeof deltaValue === 'string') {
-                accValue += deltaValue;
-            }
-            else if (typeof accValue === 'number' && typeof deltaValue === 'number') {
-                accValue += deltaValue;
-            }
-            else if ((0, utils_1.isObj)(accValue) && (0, utils_1.isObj)(deltaValue)) {
-                accValue = this.accumulateDelta(accValue, deltaValue);
-            }
-            else if (Array.isArray(accValue) && Array.isArray(deltaValue)) {
-                if (accValue.every((x) => typeof x === 'string' || typeof x === 'number')) {
-                    accValue.push(...deltaValue); // Use spread syntax for efficient addition
-                    continue;
-                }
-                for (const deltaEntry of deltaValue) {
-                    if (!(0, utils_1.isObj)(deltaEntry)) {
-                        throw new Error(`Expected array delta entry to be an object but got: ${deltaEntry}`);
-                    }
-                    const index = deltaEntry['index'];
-                    if (index == null) {
-                        console.error(deltaEntry);
-                        throw new Error('Expected array delta entry to have an `index` property');
-                    }
-                    if (typeof index !== 'number') {
-                        throw new Error(`Expected array delta entry \`index\` property to be a number but got ${index}`);
-                    }
-                    const accEntry = accValue[index];
-                    if (accEntry == null) {
-                        accValue[index] = deltaEntry;
-                    }
-                    else {
-                        accValue[index] = this.accumulateDelta(accEntry, deltaEntry);
-                    }
-                }
-                continue;
-            }
-            else {
-                throw Error(`Unhandled record type: ${key}, deltaValue: ${deltaValue}, accValue: ${accValue}`);
-            }
-            acc[key] = accValue;
-        }
-        return acc;
+        return (0, assistant_stream_delta_1.accumulateAssistantStreamDelta)(acc, delta);
     }
     _addRun(run) {
+        tslib_1.__classPrivateFieldGet(this, _AssistantStream_instances, "m", _AssistantStream_emitExposed).call(this, 'run', run);
         return run;
     }
     async _threadAssistantStream(params, thread, options) {
@@ -268,15 +234,53 @@ class AssistantStream extends EventStream_1.EventStream {
     }
 }
 exports.AssistantStream = AssistantStream;
-_a = AssistantStream, _AssistantStream_addEvent = function _AssistantStream_addEvent(event) {
-    if (this.ended)
+_AssistantStream_addEvent = function _AssistantStream_addEvent(event) {
+    if (this.ended) {
         return;
-    tslib_1.__classPrivateFieldSet(this, _AssistantStream_currentEvent, event, "f");
-    tslib_1.__classPrivateFieldGet(this, _AssistantStream_instances, "m", _AssistantStream_handleEvent).call(this, event);
-    switch (event.event) {
-        case 'thread.created':
+    }
+    const { event: stableEvent, exposedEvent } = stabilizeAssistantStreamEvent(event);
+    let messageID;
+    let messageData;
+    let runStepID;
+    let runStepData;
+    switch (stableEvent.event) {
+        case 'thread.message.created':
+        case 'thread.message.in_progress':
+        case 'thread.message.delta':
+        case 'thread.message.completed':
+        case 'thread.message.incomplete': {
+            messageID = tslib_1.__classPrivateFieldGet(this, _AssistantStream_instances, "m", _AssistantStream_validateMessageEvent).call(this, stableEvent);
+            messageData = stableEvent.data;
+            break;
+        }
+        case 'thread.run.step.created':
+        case 'thread.run.step.in_progress':
+        case 'thread.run.step.delta':
+        case 'thread.run.step.completed':
+        case 'thread.run.step.failed':
+        case 'thread.run.step.cancelled':
+        case 'thread.run.step.expired': {
+            runStepID = tslib_1.__classPrivateFieldGet(this, _AssistantStream_instances, "m", _AssistantStream_validateRunStepEvent).call(this, stableEvent);
+            runStepData = stableEvent.data;
+            break;
+        }
+    }
+    tslib_1.__classPrivateFieldSet(this, _AssistantStream_currentEvent, exposedEvent, "f");
+    tslib_1.__classPrivateFieldGet(this, _AssistantStream_instances, "m", _AssistantStream_handleEvent).call(this, exposedEvent);
+    if (messageID !== undefined && messageData !== undefined) {
+        tslib_1.__classPrivateFieldGet(this, _AssistantStream_instances, "m", _AssistantStream_reserveMessageAlias).call(this, messageData, messageID);
+    }
+    if (runStepID !== undefined && runStepData !== undefined) {
+        tslib_1.__classPrivateFieldGet(this, _AssistantStream_instances, "m", _AssistantStream_reserveRunStepAlias).call(this, runStepData, runStepID);
+    }
+    if (runStepID === undefined && tslib_1.__classPrivateFieldGet(this, _AssistantStream_activeRunStepID, "f") !== undefined && tslib_1.__classPrivateFieldGet(this, _AssistantStream_currentRunStepSnapshot, "f")) {
+        tslib_1.__classPrivateFieldGet(this, _AssistantStream_instances, "m", _AssistantStream_reserveRunStepAlias).call(this, tslib_1.__classPrivateFieldGet(this, _AssistantStream_currentRunStepSnapshot, "f"), tslib_1.__classPrivateFieldGet(this, _AssistantStream_activeRunStepID, "f"));
+    }
+    switch (stableEvent.event) {
+        case 'thread.created': {
             //No action on this event.
             break;
+        }
         case 'thread.run.created':
         case 'thread.run.queued':
         case 'thread.run.in_progress':
@@ -286,79 +290,199 @@ _a = AssistantStream, _AssistantStream_addEvent = function _AssistantStream_addE
         case 'thread.run.failed':
         case 'thread.run.cancelling':
         case 'thread.run.cancelled':
-        case 'thread.run.expired':
-            tslib_1.__classPrivateFieldGet(this, _AssistantStream_instances, "m", _AssistantStream_handleRun).call(this, event);
+        case 'thread.run.expired': {
+            tslib_1.__classPrivateFieldGet(this, _AssistantStream_instances, "m", _AssistantStream_handleRun).call(this, stableEvent);
             break;
+        }
         case 'thread.run.step.created':
         case 'thread.run.step.in_progress':
         case 'thread.run.step.delta':
         case 'thread.run.step.completed':
         case 'thread.run.step.failed':
         case 'thread.run.step.cancelled':
-        case 'thread.run.step.expired':
-            tslib_1.__classPrivateFieldGet(this, _AssistantStream_instances, "m", _AssistantStream_handleRunStep).call(this, event);
+        case 'thread.run.step.expired': {
+            if (runStepID === undefined) {
+                throw new error_1.OpenAIError('Received assistant run-step event without a canonical run-step ID');
+            }
+            const activeRunStep = tslib_1.__classPrivateFieldGet(this, _AssistantStream_runStepSnapshots, "f")[runStepID];
+            if (activeRunStep) {
+                tslib_1.__classPrivateFieldGet(this, _AssistantStream_instances, "m", _AssistantStream_reserveRunStepAlias).call(this, activeRunStep, runStepID);
+            }
+            tslib_1.__classPrivateFieldGet(this, _AssistantStream_instances, "m", _AssistantStream_handleRunStep).call(this, stableEvent, runStepID);
+            tslib_1.__classPrivateFieldGet(this, _AssistantStream_instances, "m", _AssistantStream_reserveRunStepAlias).call(this, stableEvent.data, runStepID);
+            const retainedRunStep = tslib_1.__classPrivateFieldGet(this, _AssistantStream_runStepSnapshots, "f")[runStepID];
+            if (retainedRunStep) {
+                tslib_1.__classPrivateFieldGet(this, _AssistantStream_instances, "m", _AssistantStream_reserveRunStepAlias).call(this, retainedRunStep, runStepID);
+            }
             break;
+        }
         case 'thread.message.created':
         case 'thread.message.in_progress':
         case 'thread.message.delta':
         case 'thread.message.completed':
-        case 'thread.message.incomplete':
-            tslib_1.__classPrivateFieldGet(this, _AssistantStream_instances, "m", _AssistantStream_handleMessage).call(this, event);
+        case 'thread.message.incomplete': {
+            tslib_1.__classPrivateFieldGet(this, _AssistantStream_instances, "m", _AssistantStream_handleMessage).call(this, stableEvent);
+            if (messageID !== undefined) {
+                tslib_1.__classPrivateFieldGet(this, _AssistantStream_instances, "m", _AssistantStream_reserveMessageAlias).call(this, stableEvent.data, messageID);
+                const retainedMessage = tslib_1.__classPrivateFieldGet(this, _AssistantStream_messageSnapshots, "f")[messageID];
+                if (retainedMessage) {
+                    tslib_1.__classPrivateFieldGet(this, _AssistantStream_instances, "m", _AssistantStream_reserveMessageAlias).call(this, retainedMessage, messageID);
+                }
+            }
             break;
-        case 'error':
+        }
+        case 'error': {
             //This is included for completeness, but errors are processed in the SSE event processing so this should not occur
             throw new Error('Encountered an error event in event processing - errors should be processed earlier');
-        default:
-            assertNever(event);
+        }
+        default: {
+            assertNever(stableEvent);
+        }
     }
 }, _AssistantStream_endRequest = function _AssistantStream_endRequest() {
     if (this.ended) {
         throw new error_1.OpenAIError(`stream has ended, this shouldn't happen`);
     }
-    if (!tslib_1.__classPrivateFieldGet(this, _AssistantStream_finalRun, "f"))
-        throw Error('Final run has not been received');
+    if (!tslib_1.__classPrivateFieldGet(this, _AssistantStream_finalRun, "f")) {
+        throw new Error('Final run has not been received');
+    }
     return tslib_1.__classPrivateFieldGet(this, _AssistantStream_finalRun, "f");
+}, _AssistantStream_validateRunStepEvent = function _AssistantStream_validateRunStepEvent(event) {
+    const descriptor = Object.getOwnPropertyDescriptor(event.data, 'id');
+    const runStepID = descriptor && 'value' in descriptor ? descriptor.value : undefined;
+    if (typeof runStepID !== 'string' || runStepID.length === 0) {
+        throw new error_1.OpenAIError('Received assistant run-step event with an invalid run-step ID');
+    }
+    if (event.event === 'thread.run.step.created') {
+        if (tslib_1.__classPrivateFieldGet(this, _AssistantStream_activeRunStepID, "f") !== undefined) {
+            throw new error_1.OpenAIError(`Received run-step creation for "${runStepID}" before the active run step "${tslib_1.__classPrivateFieldGet(this, _AssistantStream_activeRunStepID, "f")}" reached a terminal state`);
+        }
+        if ((0, utils_1.hasOwn)(tslib_1.__classPrivateFieldGet(this, _AssistantStream_runStepSnapshots, "f"), runStepID) || tslib_1.__classPrivateFieldGet(this, _AssistantStream_runStepIDOwners, "f").has(runStepID)) {
+            throw new error_1.OpenAIError(`Received run-step creation for run step "${runStepID}", which has already been created`);
+        }
+        tslib_1.__classPrivateFieldSet(this, _AssistantStream_activeRunStepID, runStepID, "f");
+        tslib_1.__classPrivateFieldGet(this, _AssistantStream_runStepIDOwners, "f").set(runStepID, runStepID);
+        return runStepID;
+    }
+    if (tslib_1.__classPrivateFieldGet(this, _AssistantStream_activeRunStepID, "f") !== undefined) {
+        if (runStepID !== tslib_1.__classPrivateFieldGet(this, _AssistantStream_activeRunStepID, "f")) {
+            throw new error_1.OpenAIError(`Received ${event.event} for run step "${runStepID}", which does not match the active run step "${tslib_1.__classPrivateFieldGet(this, _AssistantStream_activeRunStepID, "f")}"`);
+        }
+        return runStepID;
+    }
+    if (event.event === 'thread.run.step.delta') {
+        if (!(0, utils_1.hasOwn)(tslib_1.__classPrivateFieldGet(this, _AssistantStream_runStepSnapshots, "f"), runStepID)) {
+            throw new error_1.OpenAIError('Received a RunStepDelta before creation of a snapshot');
+        }
+        throw new error_1.OpenAIError(`Received run-step delta for "${runStepID}" with no active run step`);
+    }
+    if ((0, utils_1.hasOwn)(tslib_1.__classPrivateFieldGet(this, _AssistantStream_runStepSnapshots, "f"), runStepID) || tslib_1.__classPrivateFieldGet(this, _AssistantStream_runStepIDOwners, "f").has(runStepID)) {
+        throw new error_1.OpenAIError(`Received run-step event for run step "${runStepID}", which has already been created`);
+    }
+    tslib_1.__classPrivateFieldGet(this, _AssistantStream_runStepIDOwners, "f").set(runStepID, runStepID);
+    if (event.event === 'thread.run.step.in_progress') {
+        tslib_1.__classPrivateFieldSet(this, _AssistantStream_activeRunStepID, runStepID, "f");
+    }
+    return runStepID;
+}, _AssistantStream_reserveRunStepAlias = function _AssistantStream_reserveRunStepAlias(data, canonicalID) {
+    const descriptor = Object.getOwnPropertyDescriptor(data, 'id');
+    const runStepID = descriptor && 'value' in descriptor ? descriptor.value : undefined;
+    if (typeof runStepID !== 'string' || runStepID.length === 0) {
+        throw new error_1.OpenAIError('Received assistant run-step event with an invalid run-step ID');
+    }
+    const owner = tslib_1.__classPrivateFieldGet(this, _AssistantStream_runStepIDOwners, "f").get(runStepID);
+    if (owner !== undefined && owner !== canonicalID) {
+        throw new error_1.OpenAIError(`Received run-step creation for run step "${runStepID}", which has already been created`);
+    }
+    tslib_1.__classPrivateFieldGet(this, _AssistantStream_runStepIDOwners, "f").set(runStepID, canonicalID);
+}, _AssistantStream_validateMessageEvent = function _AssistantStream_validateMessageEvent(event) {
+    const descriptor = Object.getOwnPropertyDescriptor(event.data, 'id');
+    const messageID = descriptor && 'value' in descriptor ? descriptor.value : undefined;
+    if (typeof messageID !== 'string' || messageID.length === 0) {
+        throw new error_1.OpenAIError('Received assistant message event with an invalid message ID');
+    }
+    if (event.event === 'thread.message.created') {
+        if (tslib_1.__classPrivateFieldGet(this, _AssistantStream_messageSnapshot, "f")) {
+            throw new error_1.OpenAIError(`Received message creation for "${messageID}" before the active message "${tslib_1.__classPrivateFieldGet(this, _AssistantStream_activeMessageID, "f")}" reached a terminal state`);
+        }
+        if ((0, utils_1.hasOwn)(tslib_1.__classPrivateFieldGet(this, _AssistantStream_messageSnapshots, "f"), messageID) || tslib_1.__classPrivateFieldGet(this, _AssistantStream_messageIDOwners, "f").has(messageID)) {
+            throw new error_1.OpenAIError(`Received message creation for message "${messageID}", which has already been created`);
+        }
+        tslib_1.__classPrivateFieldSet(this, _AssistantStream_activeMessageID, messageID, "f");
+        tslib_1.__classPrivateFieldGet(this, _AssistantStream_messageIDOwners, "f").set(messageID, messageID);
+        return messageID;
+    }
+    if (!tslib_1.__classPrivateFieldGet(this, _AssistantStream_messageSnapshot, "f")) {
+        if (event.event === 'thread.message.delta') {
+            throw new error_1.OpenAIError('Received a delta with no existing snapshot (there should be one from message creation)');
+        }
+        throw new error_1.OpenAIError('Received thread message event with no existing snapshot');
+    }
+    if (messageID !== tslib_1.__classPrivateFieldGet(this, _AssistantStream_activeMessageID, "f")) {
+        throw new error_1.OpenAIError(`Received ${event.event} for message "${messageID}", which does not match the active message "${tslib_1.__classPrivateFieldGet(this, _AssistantStream_activeMessageID, "f")}"`);
+    }
+    return messageID;
+}, _AssistantStream_reserveMessageAlias = function _AssistantStream_reserveMessageAlias(data, canonicalID) {
+    const descriptor = Object.getOwnPropertyDescriptor(data, 'id');
+    const messageID = descriptor && 'value' in descriptor ? descriptor.value : undefined;
+    if (typeof messageID !== 'string' || messageID.length === 0) {
+        throw new error_1.OpenAIError('Received assistant message event with an invalid message ID');
+    }
+    const owner = tslib_1.__classPrivateFieldGet(this, _AssistantStream_messageIDOwners, "f").get(messageID);
+    if (owner !== undefined && owner !== canonicalID) {
+        throw new error_1.OpenAIError(`Received message creation for message "${messageID}", which has already been created`);
+    }
+    tslib_1.__classPrivateFieldGet(this, _AssistantStream_messageIDOwners, "f").set(messageID, canonicalID);
 }, _AssistantStream_handleMessage = function _AssistantStream_handleMessage(event) {
     const [accumulatedMessage, newContent] = tslib_1.__classPrivateFieldGet(this, _AssistantStream_instances, "m", _AssistantStream_accumulateMessage).call(this, event, tslib_1.__classPrivateFieldGet(this, _AssistantStream_messageSnapshot, "f"));
     tslib_1.__classPrivateFieldSet(this, _AssistantStream_messageSnapshot, accumulatedMessage, "f");
-    tslib_1.__classPrivateFieldGet(this, _AssistantStream_messageSnapshots, "f")[accumulatedMessage.id] = accumulatedMessage;
+    if (!tslib_1.__classPrivateFieldGet(this, _AssistantStream_activeMessageID, "f")) {
+        throw new error_1.OpenAIError('Received thread message event with no active message ID');
+    }
+    tslib_1.__classPrivateFieldGet(this, _AssistantStream_messageSnapshots, "f")[tslib_1.__classPrivateFieldGet(this, _AssistantStream_activeMessageID, "f")] = accumulatedMessage;
     for (const content of newContent) {
         const snapshotContent = accumulatedMessage.content[content.index];
-        if (snapshotContent?.type == 'text') {
-            this._emit('textCreated', snapshotContent.text);
+        if (snapshotContent?.type === 'text') {
+            tslib_1.__classPrivateFieldGet(this, _AssistantStream_instances, "m", _AssistantStream_emitExposed).call(this, 'textCreated', snapshotContent.text);
         }
     }
     switch (event.event) {
-        case 'thread.message.created':
-            this._emit('messageCreated', event.data);
+        case 'thread.message.created': {
+            tslib_1.__classPrivateFieldSet(this, _AssistantStream_currentContentIndex, undefined, "f");
+            tslib_1.__classPrivateFieldSet(this, _AssistantStream_currentContent, undefined, "f");
+            tslib_1.__classPrivateFieldGet(this, _AssistantStream_instances, "m", _AssistantStream_emitExposed).call(this, 'messageCreated', event.data);
             break;
-        case 'thread.message.in_progress':
+        }
+        case 'thread.message.in_progress': {
             break;
-        case 'thread.message.delta':
-            this._emit('messageDelta', event.data.delta, accumulatedMessage);
+        }
+        case 'thread.message.delta': {
+            tslib_1.__classPrivateFieldGet(this, _AssistantStream_instances, "m", _AssistantStream_emitExposed).call(this, 'messageDelta', event.data.delta, accumulatedMessage);
             if (event.data.delta.content) {
                 for (const content of event.data.delta.content) {
                     //If it is text delta, emit a text delta event
-                    if (content.type == 'text' && content.text) {
-                        let textDelta = content.text;
-                        let snapshot = accumulatedMessage.content[content.index];
-                        if (snapshot && snapshot.type == 'text') {
-                            this._emit('textDelta', textDelta, snapshot.text);
+                    if (content.type === 'text' && content.text) {
+                        const textDelta = content.text;
+                        const snapshot = accumulatedMessage.content[content.index];
+                        if (snapshot && snapshot.type === 'text') {
+                            tslib_1.__classPrivateFieldGet(this, _AssistantStream_instances, "m", _AssistantStream_emitExposed).call(this, 'textDelta', textDelta, snapshot.text);
                         }
                         else {
-                            throw Error('The snapshot associated with this text delta is not text or missing');
+                            throw new Error('The snapshot associated with this text delta is not text or missing');
                         }
                     }
-                    if (content.index != tslib_1.__classPrivateFieldGet(this, _AssistantStream_currentContentIndex, "f")) {
+                    if (content.index !== tslib_1.__classPrivateFieldGet(this, _AssistantStream_currentContentIndex, "f")) {
                         //See if we have in progress content
                         if (tslib_1.__classPrivateFieldGet(this, _AssistantStream_currentContent, "f")) {
                             switch (tslib_1.__classPrivateFieldGet(this, _AssistantStream_currentContent, "f").type) {
-                                case 'text':
-                                    this._emit('textDone', tslib_1.__classPrivateFieldGet(this, _AssistantStream_currentContent, "f").text, tslib_1.__classPrivateFieldGet(this, _AssistantStream_messageSnapshot, "f"));
+                                case 'text': {
+                                    tslib_1.__classPrivateFieldGet(this, _AssistantStream_instances, "m", _AssistantStream_emitExposed).call(this, 'textDone', tslib_1.__classPrivateFieldGet(this, _AssistantStream_currentContent, "f").text, tslib_1.__classPrivateFieldGet(this, _AssistantStream_messageSnapshot, "f"));
                                     break;
-                                case 'image_file':
-                                    this._emit('imageFileDone', tslib_1.__classPrivateFieldGet(this, _AssistantStream_currentContent, "f").image_file, tslib_1.__classPrivateFieldGet(this, _AssistantStream_messageSnapshot, "f"));
+                                }
+                                case 'image_file': {
+                                    tslib_1.__classPrivateFieldGet(this, _AssistantStream_instances, "m", _AssistantStream_emitExposed).call(this, 'imageFileDone', tslib_1.__classPrivateFieldGet(this, _AssistantStream_currentContent, "f").image_file, tslib_1.__classPrivateFieldGet(this, _AssistantStream_messageSnapshot, "f"));
                                     break;
+                                }
                             }
                         }
                         tslib_1.__classPrivateFieldSet(this, _AssistantStream_currentContentIndex, content.index, "f");
@@ -367,168 +491,205 @@ _a = AssistantStream, _AssistantStream_addEvent = function _AssistantStream_addE
                 }
             }
             break;
+        }
         case 'thread.message.completed':
-        case 'thread.message.incomplete':
+        case 'thread.message.incomplete': {
             //We emit the latest content we were working on on completion (including incomplete)
             if (tslib_1.__classPrivateFieldGet(this, _AssistantStream_currentContentIndex, "f") !== undefined) {
                 const currentContent = event.data.content[tslib_1.__classPrivateFieldGet(this, _AssistantStream_currentContentIndex, "f")];
                 if (currentContent) {
                     switch (currentContent.type) {
-                        case 'image_file':
-                            this._emit('imageFileDone', currentContent.image_file, tslib_1.__classPrivateFieldGet(this, _AssistantStream_messageSnapshot, "f"));
+                        case 'image_file': {
+                            tslib_1.__classPrivateFieldGet(this, _AssistantStream_instances, "m", _AssistantStream_emitExposed).call(this, 'imageFileDone', currentContent.image_file, tslib_1.__classPrivateFieldGet(this, _AssistantStream_messageSnapshot, "f"));
                             break;
-                        case 'text':
-                            this._emit('textDone', currentContent.text, tslib_1.__classPrivateFieldGet(this, _AssistantStream_messageSnapshot, "f"));
+                        }
+                        case 'text': {
+                            tslib_1.__classPrivateFieldGet(this, _AssistantStream_instances, "m", _AssistantStream_emitExposed).call(this, 'textDone', currentContent.text, tslib_1.__classPrivateFieldGet(this, _AssistantStream_messageSnapshot, "f"));
                             break;
+                        }
                     }
                 }
             }
             if (tslib_1.__classPrivateFieldGet(this, _AssistantStream_messageSnapshot, "f")) {
-                this._emit('messageDone', event.data);
+                tslib_1.__classPrivateFieldGet(this, _AssistantStream_instances, "m", _AssistantStream_emitExposed).call(this, 'messageDone', event.data);
             }
+            tslib_1.__classPrivateFieldSet(this, _AssistantStream_currentContentIndex, undefined, "f");
+            tslib_1.__classPrivateFieldSet(this, _AssistantStream_currentContent, undefined, "f");
             tslib_1.__classPrivateFieldSet(this, _AssistantStream_messageSnapshot, undefined, "f");
+            tslib_1.__classPrivateFieldSet(this, _AssistantStream_activeMessageID, undefined, "f");
+        }
     }
-}, _AssistantStream_handleRunStep = function _AssistantStream_handleRunStep(event) {
-    const accumulatedRunStep = tslib_1.__classPrivateFieldGet(this, _AssistantStream_instances, "m", _AssistantStream_accumulateRunStep).call(this, event);
+}, _AssistantStream_handleRunStep = function _AssistantStream_handleRunStep(event, runStepID) {
+    const accumulatedRunStep = tslib_1.__classPrivateFieldGet(this, _AssistantStream_instances, "m", _AssistantStream_accumulateRunStep).call(this, event, runStepID);
     tslib_1.__classPrivateFieldSet(this, _AssistantStream_currentRunStepSnapshot, accumulatedRunStep, "f");
     switch (event.event) {
-        case 'thread.run.step.created':
-            this._emit('runStepCreated', event.data);
+        case 'thread.run.step.created': {
+            tslib_1.__classPrivateFieldSet(this, _AssistantStream_currentToolCallIndex, undefined, "f");
+            tslib_1.__classPrivateFieldSet(this, _AssistantStream_currentToolCall, undefined, "f");
+            tslib_1.__classPrivateFieldGet(this, _AssistantStream_instances, "m", _AssistantStream_emitExposed).call(this, 'runStepCreated', event.data);
             break;
-        case 'thread.run.step.delta':
+        }
+        case 'thread.run.step.delta': {
             const delta = event.data.delta;
             if (delta.step_details &&
-                delta.step_details.type == 'tool_calls' &&
+                delta.step_details.type === 'tool_calls' &&
                 delta.step_details.tool_calls &&
-                accumulatedRunStep.step_details.type == 'tool_calls') {
+                accumulatedRunStep.step_details.type === 'tool_calls') {
                 for (const toolCall of delta.step_details.tool_calls) {
-                    if (toolCall.index == tslib_1.__classPrivateFieldGet(this, _AssistantStream_currentToolCallIndex, "f")) {
-                        this._emit('toolCallDelta', toolCall, accumulatedRunStep.step_details.tool_calls[toolCall.index]);
+                    if (toolCall.index === tslib_1.__classPrivateFieldGet(this, _AssistantStream_currentToolCallIndex, "f")) {
+                        tslib_1.__classPrivateFieldGet(this, _AssistantStream_instances, "m", _AssistantStream_emitExposed).call(this, 'toolCallDelta', toolCall, accumulatedRunStep.step_details.tool_calls[toolCall.index]);
                     }
                     else {
                         if (tslib_1.__classPrivateFieldGet(this, _AssistantStream_currentToolCall, "f")) {
-                            this._emit('toolCallDone', tslib_1.__classPrivateFieldGet(this, _AssistantStream_currentToolCall, "f"));
+                            tslib_1.__classPrivateFieldGet(this, _AssistantStream_instances, "m", _AssistantStream_emitExposed).call(this, 'toolCallDone', tslib_1.__classPrivateFieldGet(this, _AssistantStream_currentToolCall, "f"));
                         }
                         tslib_1.__classPrivateFieldSet(this, _AssistantStream_currentToolCallIndex, toolCall.index, "f");
                         tslib_1.__classPrivateFieldSet(this, _AssistantStream_currentToolCall, accumulatedRunStep.step_details.tool_calls[toolCall.index], "f");
-                        if (tslib_1.__classPrivateFieldGet(this, _AssistantStream_currentToolCall, "f"))
-                            this._emit('toolCallCreated', tslib_1.__classPrivateFieldGet(this, _AssistantStream_currentToolCall, "f"));
+                        if (tslib_1.__classPrivateFieldGet(this, _AssistantStream_currentToolCall, "f")) {
+                            tslib_1.__classPrivateFieldGet(this, _AssistantStream_instances, "m", _AssistantStream_emitExposed).call(this, 'toolCallCreated', tslib_1.__classPrivateFieldGet(this, _AssistantStream_currentToolCall, "f"));
+                        }
                     }
                 }
             }
-            this._emit('runStepDelta', event.data.delta, accumulatedRunStep);
+            tslib_1.__classPrivateFieldGet(this, _AssistantStream_instances, "m", _AssistantStream_emitExposed).call(this, 'runStepDelta', event.data.delta, accumulatedRunStep);
             break;
+        }
         case 'thread.run.step.completed':
         case 'thread.run.step.failed':
         case 'thread.run.step.cancelled':
-        case 'thread.run.step.expired':
+        case 'thread.run.step.expired': {
             tslib_1.__classPrivateFieldSet(this, _AssistantStream_currentRunStepSnapshot, undefined, "f");
+            tslib_1.__classPrivateFieldSet(this, _AssistantStream_activeRunStepID, undefined, "f");
             const details = event.data.step_details;
-            if (details.type == 'tool_calls') {
-                if (tslib_1.__classPrivateFieldGet(this, _AssistantStream_currentToolCall, "f")) {
-                    this._emit('toolCallDone', tslib_1.__classPrivateFieldGet(this, _AssistantStream_currentToolCall, "f"));
-                    tslib_1.__classPrivateFieldSet(this, _AssistantStream_currentToolCall, undefined, "f");
-                }
+            if (details.type === 'tool_calls' && tslib_1.__classPrivateFieldGet(this, _AssistantStream_currentToolCall, "f")) {
+                tslib_1.__classPrivateFieldGet(this, _AssistantStream_instances, "m", _AssistantStream_emitExposed).call(this, 'toolCallDone', tslib_1.__classPrivateFieldGet(this, _AssistantStream_currentToolCall, "f"));
             }
-            this._emit('runStepDone', event.data, accumulatedRunStep);
+            tslib_1.__classPrivateFieldGet(this, _AssistantStream_instances, "m", _AssistantStream_emitExposed).call(this, 'runStepDone', event.data, accumulatedRunStep);
+            tslib_1.__classPrivateFieldSet(this, _AssistantStream_currentToolCallIndex, undefined, "f");
+            tslib_1.__classPrivateFieldSet(this, _AssistantStream_currentToolCall, undefined, "f");
             break;
-        case 'thread.run.step.in_progress':
+        }
+        case 'thread.run.step.in_progress': {
             break;
+        }
+    }
+}, _AssistantStream_emitExposed = function _AssistantStream_emitExposed(event, ...args) {
+    if (this._hasListeners(event)) {
+        for (const value of args) {
+            (0, assistant_stream_delta_1.markAssistantStreamValueExternallyMutable)(value);
+        }
     }
+    this._emit(event, ...args);
 }, _AssistantStream_handleEvent = function _AssistantStream_handleEvent(event) {
-    tslib_1.__classPrivateFieldGet(this, _AssistantStream_events, "f").push(event);
-    this._emit('event', event);
-}, _AssistantStream_accumulateRunStep = function _AssistantStream_accumulateRunStep(event) {
+    tslib_1.__classPrivateFieldGet(this, _AssistantStream_instances, "m", _AssistantStream_emitExposed).call(this, 'event', event);
+}, _AssistantStream_accumulateRunStep = function _AssistantStream_accumulateRunStep(event, runStepID) {
     switch (event.event) {
-        case 'thread.run.step.created':
-            tslib_1.__classPrivateFieldGet(this, _AssistantStream_runStepSnapshots, "f")[event.data.id] = event.data;
+        case 'thread.run.step.created': {
+            tslib_1.__classPrivateFieldGet(this, _AssistantStream_runStepSnapshots, "f")[runStepID] = event.data;
             return event.data;
-        case 'thread.run.step.delta':
-            let snapshot = tslib_1.__classPrivateFieldGet(this, _AssistantStream_runStepSnapshots, "f")[event.data.id];
+        }
+        case 'thread.run.step.delta': {
+            const snapshot = tslib_1.__classPrivateFieldGet(this, _AssistantStream_runStepSnapshots, "f")[runStepID];
             if (!snapshot) {
-                throw Error('Received a RunStepDelta before creation of a snapshot');
+                throw new Error('Received a RunStepDelta before creation of a snapshot');
             }
-            let data = event.data;
+            const data = event.data;
             if (data.delta) {
-                const accumulated = _a.accumulateDelta(snapshot, data.delta);
-                tslib_1.__classPrivateFieldGet(this, _AssistantStream_runStepSnapshots, "f")[event.data.id] = accumulated;
+                const accumulated = (0, assistant_stream_delta_1.accumulateAssistantStreamDelta)(snapshot, data.delta, true);
+                tslib_1.__classPrivateFieldGet(this, _AssistantStream_runStepSnapshots, "f")[runStepID] = accumulated;
             }
-            return tslib_1.__classPrivateFieldGet(this, _AssistantStream_runStepSnapshots, "f")[event.data.id];
+            return tslib_1.__classPrivateFieldGet(this, _AssistantStream_runStepSnapshots, "f")[runStepID];
+        }
         case 'thread.run.step.completed':
         case 'thread.run.step.failed':
         case 'thread.run.step.cancelled':
         case 'thread.run.step.expired':
-        case 'thread.run.step.in_progress':
-            tslib_1.__classPrivateFieldGet(this, _AssistantStream_runStepSnapshots, "f")[event.data.id] = event.data;
+        case 'thread.run.step.in_progress': {
+            tslib_1.__classPrivateFieldGet(this, _AssistantStream_runStepSnapshots, "f")[runStepID] = event.data;
             break;
+        }
+    }
+    if (tslib_1.__classPrivateFieldGet(this, _AssistantStream_runStepSnapshots, "f")[runStepID]) {
+        return tslib_1.__classPrivateFieldGet(this, _AssistantStream_runStepSnapshots, "f")[runStepID];
     }
-    if (tslib_1.__classPrivateFieldGet(this, _AssistantStream_runStepSnapshots, "f")[event.data.id])
-        return tslib_1.__classPrivateFieldGet(this, _AssistantStream_runStepSnapshots, "f")[event.data.id];
     throw new Error('No snapshot available');
 }, _AssistantStream_accumulateMessage = function _AssistantStream_accumulateMessage(event, snapshot) {
-    let newContent = [];
+    const newContent = [];
     switch (event.event) {
-        case 'thread.message.created':
+        case 'thread.message.created': {
             //On creation the snapshot is just the initial message
             return [event.data, newContent];
-        case 'thread.message.delta':
+        }
+        case 'thread.message.delta': {
             if (!snapshot) {
-                throw Error('Received a delta with no existing snapshot (there should be one from message creation)');
+                throw new Error('Received a delta with no existing snapshot (there should be one from message creation)');
             }
-            let data = event.data;
+            const data = event.data;
             //If this delta does not have content, nothing to process
             if (data.delta.content) {
+                (0, assistant_stream_delta_1.assertSafeAssistantStreamDelta)(data.delta);
+                const cacheArrays = !(0, assistant_stream_delta_1.isAssistantStreamValueExternallyMutable)(snapshot);
+                const commitProjection = (0, assistant_stream_delta_1.createAssistantStreamArrayDeltaCommit)(snapshot.content, data.delta.content, 'content', cacheArrays);
                 for (const contentElement of data.delta.content) {
-                    if (contentElement.index in snapshot.content) {
-                        let currentContent = snapshot.content[contentElement.index];
-                        snapshot.content[contentElement.index] = tslib_1.__classPrivateFieldGet(this, _AssistantStream_instances, "m", _AssistantStream_accumulateContent).call(this, contentElement, currentContent);
+                    if ((0, utils_1.hasOwn)(snapshot.content, contentElement.index)) {
+                        const currentContent = snapshot.content[contentElement.index];
+                        snapshot.content[contentElement.index] = tslib_1.__classPrivateFieldGet(this, _AssistantStream_instances, "m", _AssistantStream_accumulateContent).call(this, contentElement, currentContent, cacheArrays);
                     }
                     else {
-                        snapshot.content[contentElement.index] = contentElement;
+                        (0, assistant_stream_delta_1.defineAssistantStreamArrayEntry)(snapshot.content, contentElement.index, contentElement);
                         // This is a new element
                         newContent.push(contentElement);
                     }
                 }
+                commitProjection();
             }
             return [snapshot, newContent];
+        }
         case 'thread.message.in_progress':
         case 'thread.message.completed':
-        case 'thread.message.incomplete':
+        case 'thread.message.incomplete': {
             //No changes on other thread events
             if (snapshot) {
                 return [snapshot, newContent];
             }
-            else {
-                throw Error('Received thread message event with no existing snapshot');
-            }
+            throw new Error('Received thread message event with no existing snapshot');
+        }
     }
-    throw Error('Tried to accumulate a non-message event');
-}, _AssistantStream_accumulateContent = function _AssistantStream_accumulateContent(contentElement, currentContent) {
-    return _a.accumulateDelta(currentContent, contentElement);
+    throw new Error('Tried to accumulate a non-message event');
+}, _AssistantStream_accumulateContent = function _AssistantStream_accumulateContent(contentElement, currentContent, cacheArrays) {
+    return (0, assistant_stream_delta_1.accumulateAssistantStreamDelta)(currentContent, contentElement, cacheArrays);
 }, _AssistantStream_handleRun = function _AssistantStream_handleRun(event) {
     tslib_1.__classPrivateFieldSet(this, _AssistantStream_currentRunSnapshot, event.data, "f");
     switch (event.event) {
-        case 'thread.run.created':
+        case 'thread.run.created': {
             break;
-        case 'thread.run.queued':
+        }
+        case 'thread.run.queued': {
             break;
-        case 'thread.run.in_progress':
+        }
+        case 'thread.run.in_progress': {
             break;
+        }
         case 'thread.run.requires_action':
         case 'thread.run.cancelled':
         case 'thread.run.failed':
         case 'thread.run.completed':
         case 'thread.run.expired':
-        case 'thread.run.incomplete':
+        case 'thread.run.incomplete': {
             tslib_1.__classPrivateFieldSet(this, _AssistantStream_finalRun, event.data, "f");
             if (tslib_1.__classPrivateFieldGet(this, _AssistantStream_currentToolCall, "f")) {
-                this._emit('toolCallDone', tslib_1.__classPrivateFieldGet(this, _AssistantStream_currentToolCall, "f"));
-                tslib_1.__classPrivateFieldSet(this, _AssistantStream_currentToolCall, undefined, "f");
+                tslib_1.__classPrivateFieldGet(this, _AssistantStream_instances, "m", _AssistantStream_emitExposed).call(this, 'toolCallDone', tslib_1.__classPrivateFieldGet(this, _AssistantStream_currentToolCall, "f"));
             }
+            tslib_1.__classPrivateFieldSet(this, _AssistantStream_currentToolCallIndex, undefined, "f");
+            tslib_1.__classPrivateFieldSet(this, _AssistantStream_currentToolCall, undefined, "f");
             break;
-        case 'thread.run.cancelling':
+        }
+        case 'thread.run.cancelling': {
             break;
+        }
     }
 };
-function assertNever(_x) { }
+function assertNever(_x) {
+    return _x;
+}
 //# sourceMappingURL=AssistantStream.js.map