assistant-stream 0.3.25 → 0.3.27

package/dist/core/utils/stream/SSEEventDecoder.js

@@ -0,0 +1,84 @@
+//#region src/core/utils/stream/SSEEventDecoder.ts
+var SSEEventDecoder = class {
+	lineBuffer = "";
+	dataLines = [];
+	eventName;
+	lastEventId;
+	retry;
+	pendingLF = false;
+	trailing;
+	constructor(options) {
+		this.trailing = options?.trailing ?? "drop";
+	}
+	push(text) {
+		const events = [];
+		if (text === "") return events;
+		if (this.pendingLF && text.startsWith("\n")) text = text.slice(1);
+		this.pendingLF = text.endsWith("\r");
+		this.lineBuffer += text;
+		const lines = this.lineBuffer.split(/\r\n|\r|\n/);
+		this.lineBuffer = lines.pop();
+		for (const line of lines) {
+			const event = this.processLine(line);
+			if (event) events.push(event);
+		}
+		return events;
+	}
+	flush() {
+		if (this.trailing === "drop") {
+			this.resetFrame();
+			this.lineBuffer = "";
+			this.pendingLF = false;
+			return null;
+		}
+		if (this.lineBuffer.length > 0) this.processLine(this.lineBuffer);
+		this.lineBuffer = "";
+		this.pendingLF = false;
+		return this.dispatchEvent();
+	}
+	processLine(line) {
+		if (line === "") return this.dispatchEvent();
+		if (line.startsWith(":")) return null;
+		const separator = line.indexOf(":");
+		const field = separator === -1 ? line : line.slice(0, separator);
+		let value = separator === -1 ? "" : line.slice(separator + 1);
+		if (value.startsWith(" ")) value = value.slice(1);
+		switch (field) {
+			case "data":
+				this.dataLines.push(value);
+				break;
+			case "event":
+				this.eventName = value;
+				break;
+			case "id":
+				if (!value.includes("\0")) this.lastEventId = value;
+				break;
+			case "retry": {
+				const retry = Number(value);
+				if (/^\d+$/.test(value) && Number.isSafeInteger(retry)) this.retry = retry;
+				break;
+			}
+		}
+		return null;
+	}
+	dispatchEvent() {
+		if (this.dataLines.length === 0) {
+			this.resetFrame();
+			return null;
+		}
+		const event = { data: this.dataLines.join("\n") };
+		if (this.eventName !== void 0) event.event = this.eventName;
+		if (this.lastEventId !== void 0) event.id = this.lastEventId;
+		if (this.retry !== void 0) event.retry = this.retry;
+		this.resetFrame();
+		return event;
+	}
+	resetFrame() {
+		this.dataLines = [];
+		this.eventName = void 0;
+	}
+};
+//#endregion
+export { SSEEventDecoder };
+
+//# sourceMappingURL=SSEEventDecoder.js.map

package/dist/core/utils/stream/SSEEventDecoder.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SSEEventDecoder.js","names":[],"sources":["../../../../src/core/utils/stream/SSEEventDecoder.ts"],"sourcesContent":["export type SSEEvent = {\n  event?: string;\n  data: string;\n  id?: string;\n  retry?: number;\n};\n\nexport class SSEEventDecoder {\n  private lineBuffer = \"\";\n  private dataLines: string[] = [];\n  private eventName: string | undefined;\n  private lastEventId: string | undefined;\n  private retry: number | undefined;\n  private pendingLF = false;\n  private readonly trailing: \"drop\" | \"dispatch\";\n\n  constructor(options?: { trailing?: \"drop\" | \"dispatch\" }) {\n    this.trailing = options?.trailing ?? \"drop\";\n  }\n\n  push(text: string): SSEEvent[] {\n    const events: SSEEvent[] = [];\n    if (text === \"\") return events;\n\n    // Lines end with LF, CRLF, or CR. A chunk-trailing \"\\r\" terminates its\n    // line immediately; pendingLF then swallows the leading \"\\n\" of the next\n    // chunk so a CRLF split across chunks is not counted twice.\n    if (this.pendingLF && text.startsWith(\"\\n\")) text = text.slice(1);\n    this.pendingLF = text.endsWith(\"\\r\");\n\n    this.lineBuffer += text;\n    const lines = this.lineBuffer.split(/\\r\\n|\\r|\\n/);\n    this.lineBuffer = lines.pop()!;\n\n    for (const line of lines) {\n      const event = this.processLine(line);\n      if (event) events.push(event);\n    }\n\n    return events;\n  }\n\n  flush(): SSEEvent | null {\n    if (this.trailing === \"drop\") {\n      this.resetFrame();\n      this.lineBuffer = \"\";\n      this.pendingLF = false;\n      return null;\n    }\n\n    if (this.lineBuffer.length > 0) {\n      this.processLine(this.lineBuffer);\n    }\n\n    this.lineBuffer = \"\";\n    this.pendingLF = false;\n    return this.dispatchEvent();\n  }\n\n  private processLine(line: string): SSEEvent | null {\n    if (line === \"\") return this.dispatchEvent();\n    if (line.startsWith(\":\")) return null;\n\n    const separator = line.indexOf(\":\");\n    const field = separator === -1 ? line : line.slice(0, separator);\n    let value = separator === -1 ? \"\" : line.slice(separator + 1);\n    if (value.startsWith(\" \")) value = value.slice(1);\n\n    switch (field) {\n      case \"data\":\n        this.dataLines.push(value);\n        break;\n      case \"event\":\n        this.eventName = value;\n        break;\n      case \"id\":\n        if (!value.includes(\"\\u0000\")) this.lastEventId = value;\n        break;\n      case \"retry\": {\n        const retry = Number(value);\n        if (/^\\d+$/.test(value) && Number.isSafeInteger(retry)) {\n          this.retry = retry;\n        }\n        break;\n      }\n    }\n\n    return null;\n  }\n\n  private dispatchEvent(): SSEEvent | null {\n    if (this.dataLines.length === 0) {\n      this.resetFrame();\n      return null;\n    }\n\n    const event: SSEEvent = { data: this.dataLines.join(\"\\n\") };\n    if (this.eventName !== undefined) event.event = this.eventName;\n    if (this.lastEventId !== undefined) event.id = this.lastEventId;\n    if (this.retry !== undefined) event.retry = this.retry;\n    this.resetFrame();\n    return event;\n  }\n\n  private resetFrame() {\n    this.dataLines = [];\n    this.eventName = undefined;\n  }\n}\n"],"mappings":";AAOA,IAAa,kBAAb,MAA6B;CAC3B,aAAqB;CACrB,YAA8B,CAAC;CAC/B;CACA;CACA;CACA,YAAoB;CACpB;CAEA,YAAY,SAA8C;EACxD,KAAK,WAAW,SAAS,YAAY;CACvC;CAEA,KAAK,MAA0B;EAC7B,MAAM,SAAqB,CAAC;EAC5B,IAAI,SAAS,IAAI,OAAO;EAKxB,IAAI,KAAK,aAAa,KAAK,WAAW,IAAI,GAAG,OAAO,KAAK,MAAM,CAAC;EAChE,KAAK,YAAY,KAAK,SAAS,IAAI;EAEnC,KAAK,cAAc;EACnB,MAAM,QAAQ,KAAK,WAAW,MAAM,YAAY;EAChD,KAAK,aAAa,MAAM,IAAI;EAE5B,KAAK,MAAM,QAAQ,OAAO;GACxB,MAAM,QAAQ,KAAK,YAAY,IAAI;GACnC,IAAI,OAAO,OAAO,KAAK,KAAK;EAC9B;EAEA,OAAO;CACT;CAEA,QAAyB;EACvB,IAAI,KAAK,aAAa,QAAQ;GAC5B,KAAK,WAAW;GAChB,KAAK,aAAa;GAClB,KAAK,YAAY;GACjB,OAAO;EACT;EAEA,IAAI,KAAK,WAAW,SAAS,GAC3B,KAAK,YAAY,KAAK,UAAU;EAGlC,KAAK,aAAa;EAClB,KAAK,YAAY;EACjB,OAAO,KAAK,cAAc;CAC5B;CAEA,YAAoB,MAA+B;EACjD,IAAI,SAAS,IAAI,OAAO,KAAK,cAAc;EAC3C,IAAI,KAAK,WAAW,GAAG,GAAG,OAAO;EAEjC,MAAM,YAAY,KAAK,QAAQ,GAAG;EAClC,MAAM,QAAQ,cAAc,KAAK,OAAO,KAAK,MAAM,GAAG,SAAS;EAC/D,IAAI,QAAQ,cAAc,KAAK,KAAK,KAAK,MAAM,YAAY,CAAC;EAC5D,IAAI,MAAM,WAAW,GAAG,GAAG,QAAQ,MAAM,MAAM,CAAC;EAEhD,QAAQ,OAAR;GACE,KAAK;IACH,KAAK,UAAU,KAAK,KAAK;IACzB;GACF,KAAK;IACH,KAAK,YAAY;IACjB;GACF,KAAK;IACH,IAAI,CAAC,MAAM,SAAS,IAAQ,GAAG,KAAK,cAAc;IAClD;GACF,KAAK,SAAS;IACZ,MAAM,QAAQ,OAAO,KAAK;IAC1B,IAAI,QAAQ,KAAK,KAAK,KAAK,OAAO,cAAc,KAAK,GACnD,KAAK,QAAQ;IAEf;GACF;EACF;EAEA,OAAO;CACT;CAEA,gBAAyC;EACvC,IAAI,KAAK,UAAU,WAAW,GAAG;GAC/B,KAAK,WAAW;GAChB,OAAO;EACT;EAEA,MAAM,QAAkB,EAAE,MAAM,KAAK,UAAU,KAAK,IAAI,EAAE;EAC1D,IAAI,KAAK,cAAc,KAAA,GAAW,MAAM,QAAQ,KAAK;EACrD,IAAI,KAAK,gBAAgB,KAAA,GAAW,MAAM,KAAK,KAAK;EACpD,IAAI,KAAK,UAAU,KAAA,GAAW,MAAM,QAAQ,KAAK;EACjD,KAAK,WAAW;EAChB,OAAO;CACT;CAEA,aAAqB;EACnB,KAAK,YAAY,CAAC;EAClB,KAAK,YAAY,KAAA;CACnB;AACF"}

package/dist/core/utils/stream/SSEEventDecoderStream.d.ts

@@ -0,0 +1,13 @@
+//#region src/core/utils/stream/SSEEventDecoderStream.d.ts
+type PipelineSSEEvent = {
+  event: string;
+  data: string;
+  id?: string;
+  retry?: number;
+};
+declare class SSEEventDecoderStream extends TransformStream<string, PipelineSSEEvent> {
+  constructor();
+}
+//#endregion
+export { PipelineSSEEvent, SSEEventDecoderStream };
+//# sourceMappingURL=SSEEventDecoderStream.d.ts.map

package/dist/core/utils/stream/SSEEventDecoderStream.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"SSEEventDecoderStream.d.ts","names":[],"sources":["../../../../src/core/utils/stream/SSEEventDecoderStream.ts"],"mappings":";KAGY;EACV;EACA;EACA;EACA;;cAGW,8BAA8B,wBAEzC"}

package/dist/core/utils/stream/SSEEventDecoderStream.js

@@ -0,0 +1,24 @@
+import { SSEEventDecoder } from "./SSEEventDecoder.js";
+//#region src/core/utils/stream/SSEEventDecoderStream.ts
+var SSEEventDecoderStream = class extends TransformStream {
+	constructor() {
+		const decoder = new SSEEventDecoder({ trailing: "drop" });
+		const normalize = (event) => ({
+			...event,
+			event: event.event || "message"
+		});
+		super({
+			transform(chunk, controller) {
+				for (const event of decoder.push(chunk)) controller.enqueue(normalize(event));
+			},
+			flush(controller) {
+				const event = decoder.flush();
+				if (event) controller.enqueue(normalize(event));
+			}
+		});
+	}
+};
+//#endregion
+export { SSEEventDecoderStream };
+
+//# sourceMappingURL=SSEEventDecoderStream.js.map

package/dist/core/utils/stream/SSEEventDecoderStream.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SSEEventDecoderStream.js","names":[],"sources":["../../../../src/core/utils/stream/SSEEventDecoderStream.ts"],"sourcesContent":["import { SSEEventDecoder } from \"./SSEEventDecoder\";\nimport type { SSEEvent } from \"./SSEEventDecoder\";\n\nexport type PipelineSSEEvent = {\n  event: string;\n  data: string;\n  id?: string;\n  retry?: number;\n};\n\nexport class SSEEventDecoderStream extends TransformStream<\n  string,\n  PipelineSSEEvent\n> {\n  constructor() {\n    const decoder = new SSEEventDecoder({ trailing: \"drop\" });\n    const normalize = (event: SSEEvent): PipelineSSEEvent => ({\n      ...event,\n      event: event.event || \"message\",\n    });\n\n    super({\n      transform(chunk, controller) {\n        for (const event of decoder.push(chunk)) {\n          controller.enqueue(normalize(event));\n        }\n      },\n      flush(controller) {\n        const event = decoder.flush();\n        if (event) controller.enqueue(normalize(event));\n      },\n    });\n  }\n}\n"],"mappings":";;AAUA,IAAa,wBAAb,cAA2C,gBAGzC;CACA,cAAc;EACZ,MAAM,UAAU,IAAI,gBAAgB,EAAE,UAAU,OAAO,CAAC;EACxD,MAAM,aAAa,WAAuC;GACxD,GAAG;GACH,OAAO,MAAM,SAAS;EACxB;EAEA,MAAM;GACJ,UAAU,OAAO,YAAY;IAC3B,KAAK,MAAM,SAAS,QAAQ,KAAK,KAAK,GACpC,WAAW,QAAQ,UAAU,KAAK,CAAC;GAEvC;GACA,MAAM,YAAY;IAChB,MAAM,QAAQ,QAAQ,MAAM;IAC5B,IAAI,OAAO,WAAW,QAAQ,UAAU,KAAK,CAAC;GAChD;EACF,CAAC;CACH;AACF"}

package/dist/core/utils/stream/UnderlyingReadable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"UnderlyingReadable.d.ts","names":[],"sources":["../../../../src/core/utils/stream/UnderlyingReadable.ts"],"mappings":";KAAY,kBAAA;EACV,KAAA,IAAS,UAAA,EAAY,WAAA;EACrB,IAAA,IAAQ,UAAA,EAAY,WAAA,YAAuB,WAAA;EAC3C,MAAA,GAAS,8BAAA;AAAA"}
+{"version":3,"file":"UnderlyingReadable.d.ts","names":[],"sources":["../../../../src/core/utils/stream/UnderlyingReadable.ts"],"mappings":";KAAY,mBAAmB;EAC7B,SAAS,YAAY;EACrB,QAAQ,YAAY,uBAAuB;EAC3C,SAAS"}

package/dist/core/utils/stream/merge.d.ts

@@ -1,9 +1,10 @@
 import { AssistantStreamChunk } from "../../AssistantStreamChunk.js";
-
 //#region src/core/utils/stream/merge.d.ts
 declare const createMergeStream: () => {
   readable: ReadableStream<AssistantStreamChunk>;
   isSealed(): boolean;
+  isCancelled(): boolean;
+  isErrored(): boolean;
   seal(): void;
   addStream(stream: ReadableStream<AssistantStreamChunk>): void;
   enqueue(chunk: AssistantStreamChunk): void;

package/dist/core/utils/stream/merge.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"merge.d.ts","names":[],"sources":["../../../../src/core/utils/stream/merge.ts"],"mappings":";;;cAQa,iBAAA;;;;oBA0ES,cAAA,CAAe,oBAAA;iBAUlB,oBAAA;AAAA"}
+{"version":3,"file":"merge.d.ts","names":[],"sources":["../../../../src/core/utils/stream/merge.ts"],"mappings":";;cAQa;;;;;;EA2FS,UAAA,QAAA,eAAe;EAelB,QAAA,OAAA"}

package/dist/core/utils/stream/merge.js

@@ -3,11 +3,20 @@ import { promiseWithResolvers } from "../../../utils/promiseWithResolvers.js";
 const createMergeStream = () => {
 	const list = [];
 	let sealed = false;
+	let cancelled = false;
+	let errored = false;
 	let controller;
 	let currentPull;
+	const cancelAllReaders = () => {
+		list.forEach((item) => {
+			item.reader.cancel().catch(() => void 0);
+		});
+		list.length = 0;
+	};
 	const handlePull = (item) => {
 		if (!item.promise) item.promise = item.reader.read().then(({ done, value }) => {
 			item.promise = void 0;
+			if (cancelled || errored) return;
 			if (done) {
 				list.splice(list.indexOf(item), 1);
 				if (sealed && list.length === 0) controller.close();
@@ -15,11 +24,10 @@ const createMergeStream = () => {
 			currentPull?.resolve();
 			currentPull = void 0;
 		}).catch((e) => {
+			if (cancelled || errored) return;
+			errored = true;
 			console.error(e);
-			list.forEach((item) => {
-				item.reader.cancel();
-			});
-			list.length = 0;
+			cancelAllReaders();
 			controller.error(e);
 			currentPull?.reject(e);
 			currentPull = void 0;
@@ -38,20 +46,31 @@ const createMergeStream = () => {
 				return currentPull.promise;
 			},
 			cancel() {
-				list.forEach((item) => {
-					item.reader.cancel();
-				});
-				list.length = 0;
+				cancelled = true;
+				cancelAllReaders();
+				currentPull?.resolve();
+				currentPull = void 0;
 			}
 		}),
 		isSealed() {
 			return sealed;
 		},
+		isCancelled() {
+			return cancelled;
+		},
+		isErrored() {
+			return errored;
+		},
 		seal() {
+			if (cancelled || errored) return;
 			sealed = true;
 			if (list.length === 0) controller.close();
 		},
 		addStream(stream) {
+			if (cancelled || errored) {
+				stream.cancel().catch(() => void 0);
+				return;
+			}
 			if (sealed) throw new Error("Cannot add streams after the run callback has settled.");
 			const item = { reader: stream.getReader() };
 			list.push(item);

package/dist/core/utils/stream/merge.js.map

@@ -1 +1 @@
-{"version":3,"file":"merge.js","names":[],"sources":["../../../../src/core/utils/stream/merge.ts"],"sourcesContent":["import type { AssistantStreamChunk } from \"../../AssistantStreamChunk\";\nimport { promiseWithResolvers } from \"../../../utils/promiseWithResolvers\";\n\ntype MergeStreamItem = {\n  reader: ReadableStreamDefaultReader<AssistantStreamChunk>;\n  promise?: Promise<unknown> | undefined;\n};\n\nexport const createMergeStream = () => {\n  const list: MergeStreamItem[] = [];\n  let sealed = false;\n  let controller: ReadableStreamDefaultController<AssistantStreamChunk>;\n  let currentPull: ReturnType<typeof promiseWithResolvers<void>> | undefined;\n\n  const handlePull = (item: MergeStreamItem) => {\n    if (!item.promise) {\n      // TODO for most streams, we can directly pipeTo to avoid the microTask queue\n      // add an option to eagerly pipe the stream to the merge stream\n      // ideally, using assistant-stream w sync run method + piping to a sync WritableStream runs in the same microtask\n      // this is useful because we often use AssistantStreams internally as a serialization utility, e. g. AssistantTransformStream\n      // idea: avoid reader.read() by instead using a WritableStream & if (!hasPendingPull) await waitForPull()?\n      item.promise = item.reader\n        .read()\n        .then(({ done, value }) => {\n          item.promise = undefined;\n          if (done) {\n            list.splice(list.indexOf(item), 1);\n            if (sealed && list.length === 0) {\n              controller.close();\n            }\n          } else {\n            controller.enqueue(value);\n          }\n\n          currentPull?.resolve();\n          currentPull = undefined;\n        })\n        .catch((e) => {\n          console.error(e);\n\n          list.forEach((item) => {\n            item.reader.cancel();\n          });\n          list.length = 0;\n\n          controller.error(e);\n\n          currentPull?.reject(e);\n          currentPull = undefined;\n        });\n    }\n  };\n\n  const readable = new ReadableStream<AssistantStreamChunk>({\n    start(c) {\n      controller = c;\n    },\n    pull() {\n      currentPull = promiseWithResolvers();\n      list.forEach((item) => {\n        handlePull(item);\n      });\n\n      return currentPull.promise;\n    },\n    cancel() {\n      list.forEach((item) => {\n        item.reader.cancel();\n      });\n      list.length = 0;\n    },\n  });\n\n  return {\n    readable,\n    isSealed() {\n      return sealed;\n    },\n    seal() {\n      sealed = true;\n      if (list.length === 0) controller.close();\n    },\n    addStream(stream: ReadableStream<AssistantStreamChunk>) {\n      if (sealed)\n        throw new Error(\n          \"Cannot add streams after the run callback has settled.\",\n        );\n\n      const item = { reader: stream.getReader() };\n      list.push(item);\n      handlePull(item);\n    },\n    enqueue(chunk: AssistantStreamChunk) {\n      this.addStream(\n        new ReadableStream({\n          start(c) {\n            c.enqueue(chunk);\n            c.close();\n          },\n        }),\n      );\n    },\n  };\n};\n\n// TODO\n// export class SpanContainerMerger {\n//   public get isSealed() {\n//     return this.mergeStream.isSealed();\n//   }\n\n//   public get readable() {\n//     return this.mergeStream.readable;\n//   }\n\n//   private subAllocator = new Counter();\n//   private mergeStream = createMergeStream();\n\n//   constructor() {\n//     // id 0 is auto allocated\n//     this.subAllocator.up();\n//   }\n\n//   add(stream: ReadableStream<AssistantStreamChunk>) {\n//     this.mergeStream.addStream(\n//       stream.pipeThrough(new SpanParentEncoder(this.subAllocator)),\n//     );\n//   }\n\n//   enqueue(chunk: AssistantStreamChunk & { parentId: 0 }) {\n//     this.mergeStream.addStream(\n//       new ReadableStream({\n//         start(c) {\n//           c.enqueue(chunk);\n//           c.close();\n//         },\n//       }),\n//     );\n//   }\n\n//   seal() {\n//     this.mergeStream.seal();\n//   }\n// }\n\n// export class SpanContainerSplitter {\n//   public writable;\n\n//   private isSealed = false;\n//   private writers = new Map<\n//     number,\n//     WritableStreamDefaultWriter<AssistantStreamChunk>\n//   >();\n\n//   private closeTasks: Promise<void>[] = [];\n\n//   private allocator = new Counter();\n//   private subAllocator = new Counter();\n\n//   constructor() {\n//     // id 0 is auto-allocated\n//     this.allocator.up();\n\n//     this.writable = new WritableStream({\n//       write: (chunk) => {\n//         const { type, parentId } = chunk;\n\n//         const writer = this.writers.get(parentId);\n//         if (writer === undefined) throw new Error(\"Parent id not found\");\n\n//         writer.write(chunk);\n\n//         if (type === \"span\") {\n//           // allocate a new span id\n//           this.writers.set(this.allocator.up(), writer);\n//         }\n//         if (type === \"finish\") {\n//           this.writers.delete(parentId);\n//           writer.close();\n\n//           if (this.writers.size === 0) {\n//             const closeTask = this.writable.close();\n//             this.closeTasks.push(closeTask);\n//             closeTask.then(() => {\n//               this.closeTasks.splice(this.closeTasks.indexOf(closeTask), 1);\n//             });\n//           }\n//         }\n//       },\n//       close: async () => {\n//         if (this.writers.size > 0) throw new Error(\"Not all writers closed\");\n\n//         // await and throw on any errors\n//         await Promise.all(this.closeTasks);\n//       },\n//     });\n//   }\n\n//   add(stream: WritableStream<AssistantStreamChunk>) {\n//     if (this.isSealed) throw new Error(\"Cannot add streams after sealing\");\n\n//     const decoder = new SpanParentDecoder(this.subAllocator);\n//     decoder.readable.pipeTo(stream);\n\n//     this.writers.set(this.allocator.up(), decoder.writable.getWriter());\n//   }\n\n//   seal() {\n//     this.isSealed = true;\n//     if (this.writers.size === 0) this.writable.close();\n//   }\n// }\n"],"mappings":";;AAQA,MAAa,0BAA0B;CACrC,MAAM,OAA0B,CAAC;CACjC,IAAI,SAAS;CACb,IAAI;CACJ,IAAI;CAEJ,MAAM,cAAc,SAA0B;EAC5C,IAAI,CAAC,KAAK,SAMR,KAAK,UAAU,KAAK,OACjB,KAAK,CAAC,CACN,MAAM,EAAE,MAAM,YAAY;GACzB,KAAK,UAAU,KAAA;GACf,IAAI,MAAM;IACR,KAAK,OAAO,KAAK,QAAQ,IAAI,GAAG,CAAC;IACjC,IAAI,UAAU,KAAK,WAAW,GAC5B,WAAW,MAAM;GAErB,OACE,WAAW,QAAQ,KAAK;GAG1B,aAAa,QAAQ;GACrB,cAAc,KAAA;EAChB,CAAC,CAAC,CACD,OAAO,MAAM;GACZ,QAAQ,MAAM,CAAC;GAEf,KAAK,SAAS,SAAS;IACrB,KAAK,OAAO,OAAO;GACrB,CAAC;GACD,KAAK,SAAS;GAEd,WAAW,MAAM,CAAC;GAElB,aAAa,OAAO,CAAC;GACrB,cAAc,KAAA;EAChB,CAAC;CAEP;CAsBA,OAAO;EACL,UAAA,IArBmB,eAAqC;GACxD,MAAM,GAAG;IACP,aAAa;GACf;GACA,OAAO;IACL,cAAc,qBAAqB;IACnC,KAAK,SAAS,SAAS;KACrB,WAAW,IAAI;IACjB,CAAC;IAED,OAAO,YAAY;GACrB;GACA,SAAS;IACP,KAAK,SAAS,SAAS;KACrB,KAAK,OAAO,OAAO;IACrB,CAAC;IACD,KAAK,SAAS;GAChB;EACF,CAGS;EACP,WAAW;GACT,OAAO;EACT;EACA,OAAO;GACL,SAAS;GACT,IAAI,KAAK,WAAW,GAAG,WAAW,MAAM;EAC1C;EACA,UAAU,QAA8C;GACtD,IAAI,QACF,MAAM,IAAI,MACR,wDACF;GAEF,MAAM,OAAO,EAAE,QAAQ,OAAO,UAAU,EAAE;GAC1C,KAAK,KAAK,IAAI;GACd,WAAW,IAAI;EACjB;EACA,QAAQ,OAA6B;GACnC,KAAK,UACH,IAAI,eAAe,EACjB,MAAM,GAAG;IACP,EAAE,QAAQ,KAAK;IACf,EAAE,MAAM;GACV,EACF,CAAC,CACH;EACF;CACF;AACF"}
+{"version":3,"file":"merge.js","names":[],"sources":["../../../../src/core/utils/stream/merge.ts"],"sourcesContent":["import type { AssistantStreamChunk } from \"../../AssistantStreamChunk\";\nimport { promiseWithResolvers } from \"../../../utils/promiseWithResolvers\";\n\ntype MergeStreamItem = {\n  reader: ReadableStreamDefaultReader<AssistantStreamChunk>;\n  promise?: Promise<unknown> | undefined;\n};\n\nexport const createMergeStream = () => {\n  const list: MergeStreamItem[] = [];\n  let sealed = false;\n  let cancelled = false;\n  let errored = false;\n  let controller: ReadableStreamDefaultController<AssistantStreamChunk>;\n  let currentPull: ReturnType<typeof promiseWithResolvers<void>> | undefined;\n\n  const cancelAllReaders = () => {\n    list.forEach((item) => {\n      void item.reader.cancel().catch(() => undefined);\n    });\n    list.length = 0;\n  };\n\n  const handlePull = (item: MergeStreamItem) => {\n    if (!item.promise) {\n      // TODO for most streams, we can directly pipeTo to avoid the microTask queue\n      // add an option to eagerly pipe the stream to the merge stream\n      // ideally, using assistant-stream w sync run method + piping to a sync WritableStream runs in the same microtask\n      // this is useful because we often use AssistantStreams internally as a serialization utility, e. g. AssistantTransformStream\n      // idea: avoid reader.read() by instead using a WritableStream & if (!hasPendingPull) await waitForPull()?\n      item.promise = item.reader\n        .read()\n        .then(({ done, value }) => {\n          item.promise = undefined;\n          if (cancelled || errored) return;\n\n          if (done) {\n            list.splice(list.indexOf(item), 1);\n            if (sealed && list.length === 0) {\n              controller.close();\n            }\n          } else {\n            controller.enqueue(value);\n          }\n\n          currentPull?.resolve();\n          currentPull = undefined;\n        })\n        .catch((e) => {\n          if (cancelled || errored) return;\n\n          errored = true;\n          console.error(e);\n          cancelAllReaders();\n\n          controller.error(e);\n\n          currentPull?.reject(e);\n          currentPull = undefined;\n        });\n    }\n  };\n\n  const readable = new ReadableStream<AssistantStreamChunk>({\n    start(c) {\n      controller = c;\n    },\n    pull() {\n      currentPull = promiseWithResolvers();\n      list.forEach((item) => {\n        handlePull(item);\n      });\n\n      return currentPull.promise;\n    },\n    cancel() {\n      cancelled = true;\n      cancelAllReaders();\n      currentPull?.resolve();\n      currentPull = undefined;\n    },\n  });\n\n  return {\n    readable,\n    isSealed() {\n      return sealed;\n    },\n    isCancelled() {\n      return cancelled;\n    },\n    isErrored() {\n      return errored;\n    },\n    seal() {\n      if (cancelled || errored) return;\n      sealed = true;\n      if (list.length === 0) controller.close();\n    },\n    addStream(stream: ReadableStream<AssistantStreamChunk>) {\n      if (cancelled || errored) {\n        void stream.cancel().catch(() => undefined);\n        return;\n      }\n\n      if (sealed)\n        throw new Error(\n          \"Cannot add streams after the run callback has settled.\",\n        );\n\n      const item = { reader: stream.getReader() };\n      list.push(item);\n      handlePull(item);\n    },\n    enqueue(chunk: AssistantStreamChunk) {\n      this.addStream(\n        new ReadableStream({\n          start(c) {\n            c.enqueue(chunk);\n            c.close();\n          },\n        }),\n      );\n    },\n  };\n};\n\n// TODO\n// export class SpanContainerMerger {\n//   public get isSealed() {\n//     return this.mergeStream.isSealed();\n//   }\n\n//   public get readable() {\n//     return this.mergeStream.readable;\n//   }\n\n//   private subAllocator = new Counter();\n//   private mergeStream = createMergeStream();\n\n//   constructor() {\n//     // id 0 is auto allocated\n//     this.subAllocator.up();\n//   }\n\n//   add(stream: ReadableStream<AssistantStreamChunk>) {\n//     this.mergeStream.addStream(\n//       stream.pipeThrough(new SpanParentEncoder(this.subAllocator)),\n//     );\n//   }\n\n//   enqueue(chunk: AssistantStreamChunk & { parentId: 0 }) {\n//     this.mergeStream.addStream(\n//       new ReadableStream({\n//         start(c) {\n//           c.enqueue(chunk);\n//           c.close();\n//         },\n//       }),\n//     );\n//   }\n\n//   seal() {\n//     this.mergeStream.seal();\n//   }\n// }\n\n// export class SpanContainerSplitter {\n//   public writable;\n\n//   private isSealed = false;\n//   private writers = new Map<\n//     number,\n//     WritableStreamDefaultWriter<AssistantStreamChunk>\n//   >();\n\n//   private closeTasks: Promise<void>[] = [];\n\n//   private allocator = new Counter();\n//   private subAllocator = new Counter();\n\n//   constructor() {\n//     // id 0 is auto-allocated\n//     this.allocator.up();\n\n//     this.writable = new WritableStream({\n//       write: (chunk) => {\n//         const { type, parentId } = chunk;\n\n//         const writer = this.writers.get(parentId);\n//         if (writer === undefined) throw new Error(\"Parent id not found\");\n\n//         writer.write(chunk);\n\n//         if (type === \"span\") {\n//           // allocate a new span id\n//           this.writers.set(this.allocator.up(), writer);\n//         }\n//         if (type === \"finish\") {\n//           this.writers.delete(parentId);\n//           writer.close();\n\n//           if (this.writers.size === 0) {\n//             const closeTask = this.writable.close();\n//             this.closeTasks.push(closeTask);\n//             closeTask.then(() => {\n//               this.closeTasks.splice(this.closeTasks.indexOf(closeTask), 1);\n//             });\n//           }\n//         }\n//       },\n//       close: async () => {\n//         if (this.writers.size > 0) throw new Error(\"Not all writers closed\");\n\n//         // await and throw on any errors\n//         await Promise.all(this.closeTasks);\n//       },\n//     });\n//   }\n\n//   add(stream: WritableStream<AssistantStreamChunk>) {\n//     if (this.isSealed) throw new Error(\"Cannot add streams after sealing\");\n\n//     const decoder = new SpanParentDecoder(this.subAllocator);\n//     decoder.readable.pipeTo(stream);\n\n//     this.writers.set(this.allocator.up(), decoder.writable.getWriter());\n//   }\n\n//   seal() {\n//     this.isSealed = true;\n//     if (this.writers.size === 0) this.writable.close();\n//   }\n// }\n"],"mappings":";;AAQA,MAAa,0BAA0B;CACrC,MAAM,OAA0B,CAAC;CACjC,IAAI,SAAS;CACb,IAAI,YAAY;CAChB,IAAI,UAAU;CACd,IAAI;CACJ,IAAI;CAEJ,MAAM,yBAAyB;EAC7B,KAAK,SAAS,SAAS;GACrB,KAAU,OAAO,OAAO,CAAC,CAAC,YAAY,KAAA,CAAS;EACjD,CAAC;EACD,KAAK,SAAS;CAChB;CAEA,MAAM,cAAc,SAA0B;EAC5C,IAAI,CAAC,KAAK,SAMR,KAAK,UAAU,KAAK,OACjB,KAAK,CAAC,CACN,MAAM,EAAE,MAAM,YAAY;GACzB,KAAK,UAAU,KAAA;GACf,IAAI,aAAa,SAAS;GAE1B,IAAI,MAAM;IACR,KAAK,OAAO,KAAK,QAAQ,IAAI,GAAG,CAAC;IACjC,IAAI,UAAU,KAAK,WAAW,GAC5B,WAAW,MAAM;GAErB,OACE,WAAW,QAAQ,KAAK;GAG1B,aAAa,QAAQ;GACrB,cAAc,KAAA;EAChB,CAAC,CAAC,CACD,OAAO,MAAM;GACZ,IAAI,aAAa,SAAS;GAE1B,UAAU;GACV,QAAQ,MAAM,CAAC;GACf,iBAAiB;GAEjB,WAAW,MAAM,CAAC;GAElB,aAAa,OAAO,CAAC;GACrB,cAAc,KAAA;EAChB,CAAC;CAEP;CAsBA,OAAO;EACL,UAAA,IArBmB,eAAqC;GACxD,MAAM,GAAG;IACP,aAAa;GACf;GACA,OAAO;IACL,cAAc,qBAAqB;IACnC,KAAK,SAAS,SAAS;KACrB,WAAW,IAAI;IACjB,CAAC;IAED,OAAO,YAAY;GACrB;GACA,SAAS;IACP,YAAY;IACZ,iBAAiB;IACjB,aAAa,QAAQ;IACrB,cAAc,KAAA;GAChB;EACF,CAGS;EACP,WAAW;GACT,OAAO;EACT;EACA,cAAc;GACZ,OAAO;EACT;EACA,YAAY;GACV,OAAO;EACT;EACA,OAAO;GACL,IAAI,aAAa,SAAS;GAC1B,SAAS;GACT,IAAI,KAAK,WAAW,GAAG,WAAW,MAAM;EAC1C;EACA,UAAU,QAA8C;GACtD,IAAI,aAAa,SAAS;IACxB,OAAY,OAAO,CAAC,CAAC,YAAY,KAAA,CAAS;IAC1C;GACF;GAEA,IAAI,QACF,MAAM,IAAI,MACR,wDACF;GAEF,MAAM,OAAO,EAAE,QAAQ,OAAO,UAAU,EAAE;GAC1C,KAAK,KAAK,IAAI;GACd,WAAW,IAAI;EACjB;EACA,QAAQ,OAA6B;GACnC,KAAK,UACH,IAAI,eAAe,EACjB,MAAM,GAAG;IACP,EAAE,QAAQ,KAAK;IACf,EAAE,MAAM;GACV,EACF,CAAC,CACH;EACF;CACF;AACF"}

package/dist/core/utils/stream/path-utils.d.ts

@@ -1,6 +1,5 @@
 import { AssistantStreamChunk } from "../../AssistantStreamChunk.js";
 import { Counter } from "../Counter.js";
-
 //#region src/core/utils/stream/path-utils.d.ts
 declare class PathAppendEncoder extends TransformStream<AssistantStreamChunk, AssistantStreamChunk> {
   constructor(idx: number);

package/dist/core/utils/stream/path-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"path-utils.d.ts","names":[],"sources":["../../../../src/core/utils/stream/path-utils.ts"],"mappings":";;;;cAGa,iBAAA,SAA0B,eAAA,CACrC,oBAAA,EACA,oBAAA;cAEY,GAAA;AAAA;AAAA,cAYD,iBAAA,SAA0B,eAAA,CACrC,oBAAA,EACA,oBAAA;cAEY,GAAA;AAAA;AAAA,cAmBD,gBAAA,SAAyB,eAAA,CACpC,oBAAA,EACA,oBAAA;cAEY,OAAA,EAAS,OAAA;AAAA"}
+{"version":3,"file":"path-utils.d.ts","names":[],"sources":["../../../../src/core/utils/stream/path-utils.ts"],"mappings":";;;cAGa,0BAA0B,gBACrC,sBACA;EAEY,YAAA;;cAYD,0BAA0B,gBACrC,sBACA;EAEY,YAAA;;cAmBD,yBAAyB,gBACpC,sBACA;EAEY,YAAA,SAAS"}

package/dist/core/utils/types.d.ts

@@ -1,6 +1,5 @@
 import { ReadonlyJSONObject, ReadonlyJSONValue } from "../../utils/json/json-value.js";
 import { ToolModelContentPart } from "../tool/tool-types.js";
-
 //#region src/core/utils/types.d.ts
 type TextStatus = {
   type: "running";
@@ -43,7 +42,9 @@ type ToolCallStatus = {
  * themselves.
  */
 type ToolCallTiming = {
-  /** Epoch milliseconds when the tool call started streaming or executing. */readonly startedAt: number; /** Epoch milliseconds when the result landed. Absent while the call runs. */
+  /** Epoch milliseconds when the tool call started streaming or executing. */
+  readonly startedAt: number;
+  /** Epoch milliseconds when the result landed. Absent while the call runs. */
   readonly completedAt?: number;
 };
 type ToolCallPartBase = {
@@ -122,12 +123,19 @@ type AssistantMessageStatus = {
   error?: ReadonlyJSONValue;
 };
 type AssistantMessageTiming = {
-  /** Timestamp when the stream started (ms since epoch) */streamStartTime: number; /** Time to first text token (ms), undefined if no text was generated */
-  firstTokenTime?: number; /** Total stream duration (ms) */
-  totalStreamTime?: number; /** Estimated or actual completion token count */
-  tokenCount?: number; /** Tokens per second throughput */
-  tokensPerSecond?: number; /** Total number of chunks received */
-  totalChunks: number; /** Number of tool calls in the message */
+  /** Timestamp when the stream started (ms since epoch) */
+  streamStartTime: number;
+  /** Time to first text token (ms), undefined if no text was generated */
+  firstTokenTime?: number;
+  /** Total stream duration (ms) */
+  totalStreamTime?: number;
+  /** Estimated or actual completion token count */
+  tokenCount?: number;
+  /** Tokens per second throughput */
+  tokensPerSecond?: number;
+  /** Total number of chunks received */
+  totalChunks: number;
+  /** Number of tool calls in the message */
   toolCallCount: number;
 };
 type AssistantMessage = {

package/dist/core/utils/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","names":[],"sources":["../../../src/core/utils/types.ts"],"mappings":";;;;KAMK,UAAA;EAEC,IAAA;AAAA;EAGA,IAAA;EACA,MAAA;AAAA;EAGA,IAAA;EACA,MAAA;AAAA;AAAA,KAOM,QAAA;EACV,IAAA;EACA,IAAA;EACA,MAAA,EAAQ,UAAU;EAClB,QAAA;AAAA;AAAA,KAGU,aAAA;EACV,IAAA;EACA,IAAA;EACA,MAAA,EAAQ,UAAU;EAClB,QAAA;AAAA;AAAA,KAGG,cAAA;EAEC,IAAA;EACA,cAAA;AAAA;EAGA,IAAA;EACA,MAAA;AAAA;EAGA,IAAA;EACA,MAAA;AAAA;EAGA,IAAA;EACA,MAAA;AAAA;AAlBI;AACR;;;;;AADQ,KA2BE,cAAA;EAlBN,qFAoBK,SAAA,UAhBL;EAAA,SAkBK,WAAW;AAAA;AAAA,KAGjB,gBAAA;EACH,IAAA;EACA,MAAA,EAAQ,cAAA;EACR,UAAA;EACA,QAAA;EACA,QAAA;EACA,IAAA,EAAM,kBAAA;EACN,MAAA,GAAS,cAAA;EACT,QAAA,GAAW,iBAAA;EACX,MAAA,GAAS,iBAAA;EACT,YAAA,YAAwB,oBAAA;EACxB,OAAA;EACA,QAAA;AAAA;AAAA,KAGG,yBAAA,GAA4B,gBAAgB;EAC/C,KAAA;EACA,MAAA;EACA,YAAA;AAAA;AAAA,KAGG,sBAAA,GAAyB,gBAAA;EAC5B,KAAA;EACA,MAAA,EAAQ,iBAAA;EACR,QAAA,GAAW,iBAAA;EACX,YAAA,YAAwB,oBAAA;EACxB,OAAA;AAAA;AAAA,KAGU,YAAA,GAAe,yBAAA,GAA4B,sBAAsB;AAAA,KAEjE,UAAA;EACV,IAAA;EACA,UAAA;EACA,EAAA;EACA,GAAA;EACA,KAAA;EACA,QAAA;AAAA;AAAA,KAGU,QAAA;EACV,IAAA;EACA,IAAA;EACA,QAAA;EACA,QAAA;AAAA;AAAA,KAGU,QAAA;EACV,IAAA;EACA,IAAA;EACA,IAAA,EAAM,iBAAiB;EACvB,QAAA;AAAA;AAAA,KAGU,oBAAA,GACR,QAAA,GACA,aAAA,GACA,YAAA,GACA,UAAA,GACA,QAAA,GACA,QAAA;AAAA,KAEC,yBAAA;EACH,WAAA;EACA,YAAY;AAAA;AAAA,KAGT,4BAAA;EAEC,KAAA;EACA,SAAA;AAAA;EAGA,KAAA;EACA,SAAA;EACA,YAAA;EAQA,KAAA,GAAQ,yBAAyB;EACjC,WAAA;AAAA;AAAA,KAGM,sBAAA;EAEN,IAAA;AAAA;EAGA,IAAA;EACA,MAAA;AAAA;EAGA,IAAA;EACA,MAAA;AAAA;EAGA,IAAA;EACA,MAAA;EAOA,KAAA,GAAQ,iBAAiB;AAAA;AAAA,KAGnB,sBAAA;2DAEV,eAAA,UAjFA;EAmFA,cAAA,WAjFA;EAmFA,eAAA,WAjFA;EAmFA,UAAA,WAlFQ;EAoFR,eAAA,WAjFU;EAmFV,WAAA;EAEA,aAAA;AAAA;AAAA,KAGU,gBAAA;EACV,IAAA;EACA,MAAA,EAAQ,sBAAA;EACR,KAAA,EAAO,oBAAA;EAvFC;AAGV;;EAwFE,OAAA,EAAS,oBAAA;EAET,QAAA;IACE,cAAA,EAAgB,iBAAA;IAChB,aAAA,EAAe,iBAAA;IACf,oBAAA,EAAsB,iBAAA;IACtB,KAAA,EAAO,4BAAA;IACP,MAAA,EAAQ,MAAA;IACR,MAAA,GAAS,sBAAA;EAAA;AAAA"}
+{"version":3,"file":"types.d.ts","names":[],"sources":["../../../src/core/utils/types.ts"],"mappings":";;;KAMK;EAEC;;EAGA;EACA;;EAGA;EACA;;KAOM;EACV;EACA;EACA,QAAQ;EACR;;KAGU;EACV;EACA;EACA,QAAQ;EACR;;KAGG;EAEC;EACA;;EAGA;EACA;;EAGA;EACA;;EAGA;EACA;;;;;;;;KASM;;WAED;;WAEA;;KAGN;EACH;EACA,QAAQ;EACR;EACA;EACA;EACA,MAAM;EACN,SAAS;EACT,WAAW;EACX,SAAS;EACT,wBAAwB;EACxB;EACA;;KAGG,4BAA4B;EAC/B;EACA;EACA;;KAGG,yBAAyB;EAC5B;EACA,QAAQ;EACR,WAAW;EACX,wBAAwB;EACxB;;KAGU,eAAe,4BAA4B;KAE3C;EACV;EACA;EACA;EACA;EACA;EACA;;KAGU;EACV;EACA;EACA;EACA;;KAGU;EACV;EACA;EACA,MAAM;EACN;;KAGU,uBACR,WACA,gBACA,eACA,aACA,WACA;KAEC;EACH;EACA;;KAGG;EAEC;EACA;;EAGA;EACA;EACA;EAQA,QAAQ;EACR;;KAGM;EAEN;;EAGA;EACA;;EAGA;EACA;;EAGA;EACA;EAOA,QAAQ;;KAGF;;EAEV;;EAEA;;EAEA;;EAEA;;EAEA;;EAEA;;EAEA;;KAGU;EACV;EACA,QAAQ;EACR,OAAO;;;;EAIP,SAAS;EAET;IACE,gBAAgB;IAChB,eAAe;IACf,sBAAsB;IACtB,OAAO;IACP,QAAQ;IACR,SAAS"}

package/dist/core/utils/withPromiseOrValue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"withPromiseOrValue.d.ts","names":[],"sources":["../../../src/core/utils/withPromiseOrValue.ts"],"mappings":";iBAAgB,kBAAA,IACd,QAAA,QAAgB,CAAA,GAAI,WAAA,CAAY,CAAA,GAChC,WAAA,GAAc,KAAA,EAAO,CAAA,KAAM,WAAA,eAC3B,YAAA,GAAe,KAAA,cAAmB,WAAA,gBACjC,WAAA"}
+{"version":3,"file":"withPromiseOrValue.d.ts","names":[],"sources":["../../../src/core/utils/withPromiseOrValue.ts"],"mappings":";iBAAgB,mBAAmB,GACjC,gBAAgB,IAAI,YAAY,IAChC,cAAc,OAAO,MAAM,0BAC3B,eAAe,mBAAmB,2BACjC"}

package/dist/index.d.ts

@@ -1,17 +1,19 @@
+import { ReadonlyJSONValue } from "./utils/json/json-value.js";
 import { TextStreamController } from "./core/modules/text.js";
 import { McpServerConfig, ProviderOptions, Tool, ToolCallReader, ToolDeclaration, ToolModelContentPart, ToolModelOutputFunction } from "./core/tool/tool-types.js";
 import { ToolResponse, ToolResponseLike } from "./core/tool/ToolResponse.js";
 import { ToolCallStreamController } from "./core/modules/tool-call.js";
 import { AssistantMessage, AssistantMessageTiming, DataPart, ToolCallTiming } from "./core/utils/types.js";
 import { AssistantStreamController, createAssistantStream, createAssistantStreamController, createAssistantStreamResponse } from "./core/modules/assistant-stream.js";
-import { ObjectStreamChunk } from "./core/object/types.js";
+import "./utils.js";
+import { AssistantTransportStateOperation, GorpStreamChunk, GorpStreamOperation } from "./core/gorp/types.js";
 import { AssistantStreamChunk } from "./core/AssistantStreamChunk.js";
 import { AssistantStream } from "./core/AssistantStream.js";
 import { AssistantMessageStream } from "./core/accumulators/AssistantMessageStream.js";
 import { AssistantMessageAccumulator, createInitialMessage } from "./core/accumulators/assistant-message-accumulator.js";
 import { GenericAssistantMessage, GenericFilePart, GenericMessage, GenericSystemMessage, GenericTextPart, GenericToolCallPart, GenericToolMessage, GenericToolResultPart, GenericUserMessage, toGenericMessages } from "./core/converters/toGenericMessages.js";
-import { ObjectStreamResponse, fromObjectStreamResponse } from "./core/object/ObjectStreamResponse.js";
-import { createObjectStream } from "./core/object/createObjectStream.js";
+import { GorpStreamDeltaTracker } from "./core/gorp/GorpStreamDeltaTracker.js";
+import { GorpStreamResponse } from "./core/gorp/GorpStreamResponse.js";
 import { PlainTextDecoder, PlainTextEncoder } from "./core/serialization/PlainText.js";
 import { AssistantTransportDecoder, AssistantTransportEncoder } from "./core/serialization/assistant-transport/AssistantTransport.js";
 import { DataStreamDecoder, DataStreamEncoder } from "./core/serialization/data-stream/DataStream.js";
@@ -20,4 +22,23 @@ import { UIMessageStreamDecoder, UIMessageStreamDecoderOptions } from "./core/se
 import { ToolExecutionStream } from "./core/tool/ToolExecutionStream.js";
 import { ToToolsJSONSchemaOptions, ToolJSONSchema, toJSONSchema, toPartialJSONSchema, toToolsJSONSchema } from "./core/tool/schema-utils.js";
 import { ToolResultStreamOptions, toolResultStream, unstable_runPendingTools } from "./core/tool/toolResultStream.js";
-export { type AssistantMessage, AssistantMessageAccumulator, AssistantMessageStream, type AssistantMessageTiming, AssistantStream, type AssistantStreamChunk, type AssistantStreamController, AssistantTransportDecoder, AssistantTransportEncoder, type DataPart, DataStreamDecoder, DataStreamEncoder, type GenericAssistantMessage, type GenericFilePart, type GenericMessage, type GenericSystemMessage, type GenericTextPart, type GenericToolCallPart, type GenericToolMessage, type GenericToolResultPart, type GenericUserMessage, type McpServerConfig, type ObjectStreamChunk, ObjectStreamResponse, PlainTextDecoder, PlainTextEncoder, type ProviderOptions, type TextStreamController, type ToToolsJSONSchemaOptions, type Tool, type ToolCallReader, type ToolCallStreamController, type ToolCallTiming, type ToolDeclaration, ToolExecutionStream, type ToolJSONSchema, type ToolModelContentPart, type ToolModelOutputFunction, ToolResponse, type ToolResponseLike, type ToolResultStreamOptions, type UIMessageStreamChunk, type UIMessageStreamDataChunk, UIMessageStreamDecoder, type UIMessageStreamDecoderOptions, createAssistantStream, createAssistantStreamController, createAssistantStreamResponse, createObjectStream, fromObjectStreamResponse, toGenericMessages, toJSONSchema, toPartialJSONSchema, toToolsJSONSchema, createInitialMessage as unstable_createInitialMessage, unstable_runPendingTools, toolResultStream as unstable_toolResultStream };
+//#region src/index.d.ts
+/** @deprecated Use the assistant-transport surface instead. */
+declare const createObjectStream: ({ execute, defaultValue }: {
+  execute: (controller: {
+    readonly abortSignal: AbortSignal;
+    enqueue(operations: readonly GorpStreamOperation[]): void;
+  }) => void | PromiseLike<void>;
+  defaultValue?: ReadonlyJSONValue;
+}) => ReadableStream<GorpStreamChunk>;
+/** @deprecated Use the assistant-transport surface instead. */
+declare const ObjectStreamResponse: typeof GorpStreamResponse;
+/** @deprecated Use the assistant-transport surface instead. */
+type ObjectStreamResponse = GorpStreamResponse;
+/** @deprecated Use the assistant-transport surface instead. */
+declare const fromObjectStreamResponse: (response: Response) => ReadableStream<GorpStreamChunk>;
+/** @deprecated Use the assistant-transport surface instead. */
+type ObjectStreamChunk = GorpStreamChunk;
+//#endregion
+export { type AssistantMessage, AssistantMessageAccumulator, AssistantMessageStream, type AssistantMessageTiming, AssistantStream, type AssistantStreamChunk, type AssistantStreamController, AssistantTransportDecoder, GorpStreamDeltaTracker as AssistantTransportDeltaTracker, AssistantTransportEncoder, type AssistantTransportStateOperation, type DataPart, DataStreamDecoder, DataStreamEncoder, type GenericAssistantMessage, type GenericFilePart, type GenericMessage, type GenericSystemMessage, type GenericTextPart, type GenericToolCallPart, type GenericToolMessage, type GenericToolResultPart, type GenericUserMessage, type McpServerConfig, ObjectStreamChunk, ObjectStreamResponse, PlainTextDecoder, PlainTextEncoder, type ProviderOptions, type TextStreamController, type ToToolsJSONSchemaOptions, type Tool, type ToolCallReader, type ToolCallStreamController, type ToolCallTiming, type ToolDeclaration, ToolExecutionStream, type ToolJSONSchema, type ToolModelContentPart, type ToolModelOutputFunction, ToolResponse, type ToolResponseLike, type ToolResultStreamOptions, type UIMessageStreamChunk, type UIMessageStreamDataChunk, UIMessageStreamDecoder, type UIMessageStreamDecoderOptions, createAssistantStream, createAssistantStreamController, createAssistantStreamResponse, createObjectStream, fromObjectStreamResponse, toGenericMessages, toJSONSchema, toPartialJSONSchema, toToolsJSONSchema, createInitialMessage as unstable_createInitialMessage, unstable_runPendingTools, toolResultStream as unstable_toolResultStream };
+//# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","names":[],"sources":["../src/index.ts"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;cA4Ea,uBAAkB,SAAA;;;;;;MAAmB,eAAA;;cAErC,6BAAoB;;KAErB,uBAAuB;;cAEtB,2BAAwB,UAAA,aAAA,eAAA;;KAEzB,oBAAoB"}

package/dist/index.js

@@ -10,7 +10,18 @@ import { ToolResponse } from "./core/tool/ToolResponse.js";
 import { ToolExecutionStream } from "./core/tool/ToolExecutionStream.js";
 import { toolResultStream, unstable_runPendingTools } from "./core/tool/toolResultStream.js";
 import { toJSONSchema, toPartialJSONSchema, toToolsJSONSchema } from "./core/tool/schema-utils.js";
-import { createObjectStream } from "./core/object/createObjectStream.js";
-import { ObjectStreamResponse, fromObjectStreamResponse } from "./core/object/ObjectStreamResponse.js";
+import { createGorpStream } from "./core/gorp/createGorpStream.js";
+import { GorpStreamResponse, fromGorpStreamResponse } from "./core/gorp/GorpStreamResponse.js";
+import { GorpStreamDeltaTracker } from "./core/gorp/GorpStreamDeltaTracker.js";
 import { toGenericMessages } from "./core/converters/toGenericMessages.js";
-export { AssistantMessageAccumulator, AssistantMessageStream, AssistantStream, AssistantTransportDecoder, AssistantTransportEncoder, DataStreamDecoder, DataStreamEncoder, ObjectStreamResponse, PlainTextDecoder, PlainTextEncoder, ToolExecutionStream, ToolResponse, UIMessageStreamDecoder, createAssistantStream, createAssistantStreamController, createAssistantStreamResponse, createObjectStream, fromObjectStreamResponse, toGenericMessages, toJSONSchema, toPartialJSONSchema, toToolsJSONSchema, createInitialMessage as unstable_createInitialMessage, unstable_runPendingTools, toolResultStream as unstable_toolResultStream };
+//#region src/index.ts
+/** @deprecated Use the assistant-transport surface instead. */
+const createObjectStream = createGorpStream;
+/** @deprecated Use the assistant-transport surface instead. */
+const ObjectStreamResponse = GorpStreamResponse;
+/** @deprecated Use the assistant-transport surface instead. */
+const fromObjectStreamResponse = fromGorpStreamResponse;
+//#endregion
+export { AssistantMessageAccumulator, AssistantMessageStream, AssistantStream, AssistantTransportDecoder, GorpStreamDeltaTracker as AssistantTransportDeltaTracker, AssistantTransportEncoder, DataStreamDecoder, DataStreamEncoder, ObjectStreamResponse, PlainTextDecoder, PlainTextEncoder, ToolExecutionStream, ToolResponse, UIMessageStreamDecoder, createAssistantStream, createAssistantStreamController, createAssistantStreamResponse, createObjectStream, fromObjectStreamResponse, toGenericMessages, toJSONSchema, toPartialJSONSchema, toToolsJSONSchema, createInitialMessage as unstable_createInitialMessage, unstable_runPendingTools, toolResultStream as unstable_toolResultStream };
+
+//# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","names":[],"sources":["../src/index.ts"],"sourcesContent":["export {\n  createAssistantStream,\n  createAssistantStreamResponse,\n  createAssistantStreamController,\n} from \"./core/modules/assistant-stream\";\nexport {\n  AssistantMessageAccumulator,\n  createInitialMessage as unstable_createInitialMessage,\n} from \"./core/accumulators/assistant-message-accumulator\";\nexport { AssistantStream } from \"./core/AssistantStream\";\nexport type { AssistantStreamController } from \"./core/modules/assistant-stream\";\nexport type { AssistantStreamChunk } from \"./core/AssistantStreamChunk\";\nexport {\n  DataStreamDecoder,\n  DataStreamEncoder,\n} from \"./core/serialization/data-stream/DataStream\";\nexport {\n  PlainTextDecoder,\n  PlainTextEncoder,\n} from \"./core/serialization/PlainText\";\nexport {\n  AssistantTransportDecoder,\n  AssistantTransportEncoder,\n} from \"./core/serialization/assistant-transport/AssistantTransport\";\nexport {\n  UIMessageStreamDecoder,\n  type UIMessageStreamChunk,\n  type UIMessageStreamDataChunk,\n  type UIMessageStreamDecoderOptions,\n} from \"./core/serialization/ui-message-stream/UIMessageStream\";\nexport { AssistantMessageStream } from \"./core/accumulators/AssistantMessageStream\";\nexport type {\n  AssistantMessage,\n  AssistantMessageTiming,\n  DataPart,\n  ToolCallTiming,\n} from \"./core/utils/types\";\n\nexport type {\n  Tool,\n  ToolDeclaration,\n  McpServerConfig,\n  ToolModelContentPart,\n  ToolModelOutputFunction,\n} from \"./core/tool/tool-types\";\nexport { ToolResponse, type ToolResponseLike } from \"./core/tool/ToolResponse\";\nexport { ToolExecutionStream } from \"./core/tool/ToolExecutionStream\";\nexport type { ProviderOptions, ToolCallReader } from \"./core/tool/tool-types\";\nexport {\n  toolResultStream as unstable_toolResultStream,\n  unstable_runPendingTools,\n  type ToolResultStreamOptions,\n} from \"./core/tool/toolResultStream\";\nexport {\n  toJSONSchema,\n  toPartialJSONSchema,\n  toToolsJSONSchema,\n  type ToolJSONSchema,\n  type ToToolsJSONSchemaOptions,\n} from \"./core/tool/schema-utils\";\n\nexport type { TextStreamController } from \"./core/modules/text\";\nexport type { ToolCallStreamController } from \"./core/modules/tool-call\";\n\nimport { createGorpStream } from \"./core/gorp/createGorpStream\";\nimport {\n  GorpStreamResponse,\n  fromGorpStreamResponse,\n} from \"./core/gorp/GorpStreamResponse\";\nimport type { GorpStreamChunk } from \"./core/gorp/types\";\nimport { GorpStreamDeltaTracker } from \"./core/gorp/GorpStreamDeltaTracker\";\n\nexport { GorpStreamDeltaTracker as AssistantTransportDeltaTracker };\nexport type { AssistantTransportStateOperation } from \"./core/gorp/types\";\n\n/** @deprecated Use the assistant-transport surface instead. */\nexport const createObjectStream = createGorpStream;\n/** @deprecated Use the assistant-transport surface instead. */\nexport const ObjectStreamResponse = GorpStreamResponse;\n/** @deprecated Use the assistant-transport surface instead. */\nexport type ObjectStreamResponse = GorpStreamResponse;\n/** @deprecated Use the assistant-transport surface instead. */\nexport const fromObjectStreamResponse = fromGorpStreamResponse;\n/** @deprecated Use the assistant-transport surface instead. */\nexport type ObjectStreamChunk = GorpStreamChunk;\n\nexport {\n  toGenericMessages,\n  type GenericMessage,\n  type GenericSystemMessage,\n  type GenericUserMessage,\n  type GenericAssistantMessage,\n  type GenericToolMessage,\n  type GenericTextPart,\n  type GenericFilePart,\n  type GenericToolCallPart,\n  type GenericToolResultPart,\n} from \"./core/converters/toGenericMessages\";\n"],"mappings":";;;;;;;;;;;;;;;;;;AA4EA,MAAa,qBAAqB;;AAElC,MAAa,uBAAuB;;AAIpC,MAAa,2BAA2B"}

package/dist/node_modules/.pnpm/@types_json-schema@7.0.15/node_modules/@types/json-schema/index.d.ts

@@ -9,13 +9,13 @@
  * @see https://tools.ietf.org/html/draft-handrews-json-schema-validation-01#section-6.1.1
  */
 type JSONSchema7TypeName = "string" //
-| "number" | "integer" | "boolean" | "object" | "array" | "null";
+ | "number" | "integer" | "boolean" | "object" | "array" | "null";
 /**
  * Primitive type
  * @see https://tools.ietf.org/html/draft-handrews-json-schema-validation-01#section-6.1.1
  */
 type JSONSchema7Type = string //
-| number | boolean | JSONSchema7Object | JSONSchema7Array | null;
+ | number | boolean | JSONSchema7Object | JSONSchema7Array | null;
 // Workaround for infinite type recursion
 interface JSONSchema7Object {
   [key: string]: JSONSchema7Type;
@@ -137,5 +137,5 @@ interface JSONSchema7 {
   examples?: JSONSchema7Type | undefined;
 }
 //#endregion
-export { JSONSchema7 };
+export { JSONSchema7, JSONSchema7Array, JSONSchema7Definition, JSONSchema7Object, JSONSchema7Type, JSONSchema7TypeName, JSONSchema7Version };
 //# sourceMappingURL=index.d.ts.map

package/dist/node_modules/.pnpm/@types_json-schema@7.0.15/node_modules/@types/json-schema/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","names":["JSONSchema4Object","JSONSchema4Array","key","JSONSchema4Type","Array","id","$ref","$schema","JSONSchema4Version","title","description","default","multipleOf","maximum","exclusiveMaximum","minimum","exclusiveMinimum","maxLength","minLength","pattern","additionalItems","JSONSchema4","items","maxItems","minItems","uniqueItems","maxProperties","minProperties","required","additionalProperties","definitions","k","properties","patternProperties","dependencies","enum","type","JSONSchema4TypeName","allOf","anyOf","oneOf","not","extends","format","JSONSchema6Object","JSONSchema6Array","JSONSchema6Type","JSONSchema6","$id","JSONSchema6Version","JSONSchema6Definition","contains","propertyNames","const","JSONSchema6TypeName","examples","JSONSchema7Object","JSONSchema7Array","JSONSchema7Type","JSONSchema7","JSONSchema7Version","$comment","$defs","JSONSchema7Definition","JSONSchema7TypeName","if","then","else","contentMediaType","contentEncoding","readOnly","writeOnly","valid","errors","ValidationError","property","message","instance","schema","ValidationResult","value","result"],"sources":["../../../../../../../../../node_modules/.pnpm/@types+json-schema@7.0.15/node_modules/@types/json-schema/index.d.ts"],"x_google_ignoreList":[0],"mappings":";;;;;;;;;;KA+iBY,mBAAA;AAAA;;;;;KAaA,eAAA;AAAA,qBAIN,iBAAA,GACA,gBAAgB;AAAA;AAAA,UAIL,iBAAA;EAAA,CACZE,GAAAA,WAAc,eAAe;AAAA;AAAA;AAAA;AAAA,UAKjB,gBAAA,SAAyB,KAAK,CAAC,eAAA;;;;;;;;;;;;KAapC,kBAAA;;;;;KAMA,qBAAA,GAAwB,WAAW;AAAA,UAC9B,WAAA;EACb8C,GAAAA;EACA1C,IAAAA;EACAC,OAAAA,GAAU,kBAAA;EACVsD,QAAAA;;;;;EAMAC,KAAAA;IAAAA,CACK5D,GAAAA,WAAc,qBAAA;EAAA;;;;EAMnBkC,IAAAA,GAAO,mBAAA,GAAsB,mBAAA;EAC7BD,IAAAA,GAAO,eAAA;EACPkB,KAAAA,GAAQ,eAAA;;;;EAKRzC,UAAAA;EACAC,OAAAA;EACAC,gBAAAA;EACAC,OAAAA;EACAC,gBAAAA;;;;EAKAC,SAAAA;EACAC,SAAAA;EACAC,OAAAA;;;;EAKAG,KAAAA,GAAQ,qBAAA,GAAwB,qBAAA;EAChCF,eAAAA,GAAkB,qBAAA;EAClBG,QAAAA;EACAC,QAAAA;EACAC,WAAAA;EACA0B,QAAAA,GAAW,qBAAA;;;;EAKXzB,aAAAA;EACAC,aAAAA;EACAC,QAAAA;EACAI,UAAAA;IAAAA,CACK9B,GAAAA,WAAc,qBAAA;EAAA;EAEnB+B,iBAAAA;IAAAA,CACK/B,GAAAA,WAAc,qBAAA;EAAA;EAEnB2B,oBAAAA,GAAuB,qBAAA;EACvBK,YAAAA;IAAAA,CACKhC,GAAAA,WAAc,qBAAA;EAAA;EAEnBkD,aAAAA,GAAgB,qBAAA;;;;EAKhBa,EAAAA,GAAK,qBAAA;EACLC,IAAAA,GAAO,qBAAA;EACPC,IAAAA,GAAO,qBAAA;;;;EAKP7B,KAAAA,GAAQ,qBAAA;EACRC,KAAAA,GAAQ,qBAAA;EACRC,KAAAA,GAAQ,qBAAA;EACRC,GAAAA,GAAM,qBAAA;;;;EAKNE,MAAAA;;;;EAKAyB,gBAAAA;EACAC,eAAAA;;;;EAKAvC,WAAAA;IAAAA,CACK5B,GAAAA,WAAc,qBAAA;EAAA;;;;EAMnBO,KAAAA;EACAC,WAAAA;EACAC,OAAAA,GAAU,eAAA;EACV2D,QAAAA;EACAC,SAAAA;EACAhB,QAAAA,GAAW,eAAA;AAAA"}
+{"version":3,"file":"index.d.ts","names":[],"sources":["../../../../../../../../../node_modules/.pnpm/@types+json-schema@7.0.15/node_modules/@types/json-schema/index.d.ts"],"x_google_ignoreList":[0],"mappings":";;;;;;;;;;KA+iBY;;;;;;KAaA;sBAIN,oBACA;;UAIW;GACZ,cAAc;;;;UAKF,yBAAyB,MAAM;;;;;;;;;;;;KAapC;;;;;KAMA,wBAAwB;UACnB;EACb;EACA;EACA,UAAU;EACV;;;;;EAMA;KACK,cAAc;;;;;EAMnB,OAAO,sBAAsB;EAC7B,OAAO;EACP,QAAQ;;;;EAKR;EACA;EACA;EACA;EACA;;;;EAKA;EACA;EACA;;;;EAKA,QAAQ,wBAAwB;EAChC,kBAAkB;EAClB;EACA;EACA;EACA,WAAW;;;;EAKX;EACA;EACA;EACA;KACK,cAAc;;EAEnB;KACK,cAAc;;EAEnB,uBAAuB;EACvB;KACK,cAAc;;EAEnB,gBAAgB;;;;EAKhB,KAAK;EACL,OAAO;EACP,OAAO;;;;EAKP,QAAQ;EACR,QAAQ;EACR,QAAQ;EACR,MAAM;;;;EAKN;;;;EAKA;EACA;;;;EAKA;KACK,cAAc;;;;;EAMnB;EACA;EACA,UAAU;EACV;EACA;EACA,WAAW"}

package/dist/resumable/ResumableStreamContext.d.ts

@@ -1,5 +1,4 @@
 import { ResumableStreamRole, ResumableStreamStatus, ResumableStreamStore } from "./types.js";
-
 //#region src/resumable/ResumableStreamContext.d.ts
 type ResumableStreamContextOptions = {
   readonly store: ResumableStreamStore;

package/dist/resumable/ResumableStreamContext.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ResumableStreamContext.d.ts","names":[],"sources":["../../src/resumable/ResumableStreamContext.ts"],"mappings":";;;KAOY,6BAAA;EAAA,SACD,KAAA,EAAO,oBAAA;EAAA,SACP,KAAA;EAF8B;;;;;EAAA,SAQ9B,SAAA,IAAa,OAAA,EAAS,OAAA;EAAA,SACtB,SAAA,IAAa,QAAA,UAAkB,IAAA,EAAM,mBAAA;EAAA,SACrC,QAAA,IAAY,QAAA,UAAkB,UAAA;EAAA,SAC9B,UAAA,IACP,QAAA,UACA,MAAA,oBACA,KAAA;EAAA,SAEO,OAAA,IAAW,QAAA,UAAkB,KAAA;AAAA;AAAA,UAGvB,sBAAA;EAXO;EAatB,GAAA,CACE,QAAA,UACA,UAAA,QAAkB,cAAA,CAAe,UAAA,IAChC,OAAA,CAAQ,cAAA,CAAe,UAAA;EAfJ;EAkBtB,MAAA,CAAO,QAAA,WAAmB,OAAA,CAAQ,cAAA,CAAe,UAAA;EAlBT;EAqBxC,aAAA,CAAc,QAAA,WAAmB,OAAA,CAAQ,cAAA,CAAe,UAAA;EAExD,MAAA,CAAO,QAAA,WAAmB,OAAA,CAAQ,qBAAA;EAElC,MAAA,CAAO,QAAA,WAAmB,OAAA;AAAA;AAAA,iBAGZ,4BAAA,CACd,OAAA,EAAS,6BAAA,GACR,sBAAsB"}
+{"version":3,"file":"ResumableStreamContext.d.ts","names":[],"sources":["../../src/resumable/ResumableStreamContext.ts"],"mappings":";;KAQY;WACD,OAAO;WACP;;;;;;WAMA,aAAa,SAAS;WACtB,aAAa,kBAAkB,MAAM;WACrC,YAAY,kBAAkB;WAC9B,cACP,kBACA,0BACA;WAEO,WAAW,kBAAkB;;UAGvB;;EAEf,IACE,kBACA,kBAAkB,eAAe,cAChC,QAAQ,eAAe;;EAG1B,OAAO,mBAAmB,QAAQ,eAAe;;EAGjD,cAAc,mBAAmB,QAAQ,eAAe;EAExD,OAAO,mBAAmB,QAAQ;EAElC,OAAO,mBAAmB;;iBAkBZ,6BACd,SAAS,gCACR"}

package/dist/resumable/ResumableStreamContext.js

@@ -1,12 +1,19 @@
+import { withPromiseOrValue } from "../core/utils/withPromiseOrValue.js";
 import { ResumableStreamError } from "./errors.js";
 //#region src/resumable/ResumableStreamContext.ts
+const invokeObservabilityHook = (name, hook, ...args) => {
+	if (!hook) return;
+	withPromiseOrValue(() => hook(...args), () => {}, (error) => {
+		console.error(`resumable stream ${name} hook failed:`, error);
+	});
+};
 function createResumableStreamContext(options) {
 	const { store, waitUntil, onAcquire, onAppend, onFinalize, onError } = options;
 	const acquireOptions = options.ttlMs !== void 0 ? { ttlMs: options.ttlMs } : void 0;
 	return {
 		async run(streamId, makeStream) {
 			const role = await store.acquire(streamId, acquireOptions);
-			onAcquire?.(streamId, role);
+			invokeObservabilityHook("onAcquire", onAcquire, streamId, role);
 			if (role === "producer") startProducerTask(store, streamId, makeStream, {
 				waitUntil,
 				onAppend,
@@ -42,13 +49,13 @@ function startProducerTask(store, streamId, makeStream, hooks) {
 				const { done, value } = await reader.read();
 				if (done) break;
 				await store.append(streamId, value);
-				onAppend?.(streamId, value.byteLength);
+				invokeObservabilityHook("onAppend", onAppend, streamId, value.byteLength);
 			}
 			await store.finalize(streamId, "done");
-			onFinalize?.(streamId, "done");
+			invokeObservabilityHook("onFinalize", onFinalize, streamId, "done");
 		} catch (err) {
 			cancelled = true;
-			onError?.(streamId, err);
+			invokeObservabilityHook("onError", onError, streamId, err);
 			const message = err instanceof Error ? err.message : String(err);
 			try {
 				await reader?.cancel(err);
@@ -57,7 +64,7 @@ function startProducerTask(store, streamId, makeStream, hooks) {
 			}
 			try {
 				await store.finalize(streamId, "error", message);
-				onFinalize?.(streamId, "error", message);
+				invokeObservabilityHook("onFinalize", onFinalize, streamId, "error", message);
 			} catch (finalizeErr) {
 				console.error("resumable stream finalize failed:", finalizeErr);
 			}

package/dist/resumable/ResumableStreamContext.js.map

@@ -1 +1 @@
-{"version":3,"file":"ResumableStreamContext.js","names":[],"sources":["../../src/resumable/ResumableStreamContext.ts"],"sourcesContent":["import { ResumableStreamError } from \"./errors\";\nimport type {\n  ResumableStreamRole,\n  ResumableStreamStatus,\n  ResumableStreamStore,\n} from \"./types\";\n\nexport type ResumableStreamContextOptions = {\n  readonly store: ResumableStreamStore;\n  readonly ttlMs?: number;\n  /**\n   * Required on serverless runtimes that terminate background work when the\n   * request handler returns (Vercel, Cloudflare). Pass `after` from\n   * `next/server` so the producer task outlives the response.\n   */\n  readonly waitUntil?: (promise: Promise<unknown>) => void;\n  readonly onAcquire?: (streamId: string, role: ResumableStreamRole) => void;\n  readonly onAppend?: (streamId: string, byteLength: number) => void;\n  readonly onFinalize?: (\n    streamId: string,\n    status: \"done\" | \"error\",\n    error?: string,\n  ) => void;\n  readonly onError?: (streamId: string, error: unknown) => void;\n};\n\nexport interface ResumableStreamContext {\n  /** Producer or consumer entrypoint. Atomically elects the role. */\n  run(\n    streamId: string,\n    makeStream: () => ReadableStream<Uint8Array>,\n  ): Promise<ReadableStream<Uint8Array>>;\n\n  /** Returns `null` when the stream does not exist. */\n  resume(streamId: string): Promise<ReadableStream<Uint8Array> | null>;\n\n  /** Throws `ResumableStreamError(\"missing\")` when the stream does not exist. */\n  requireResume(streamId: string): Promise<ReadableStream<Uint8Array>>;\n\n  status(streamId: string): Promise<ResumableStreamStatus>;\n\n  delete(streamId: string): Promise<void>;\n}\n\nexport function createResumableStreamContext(\n  options: ResumableStreamContextOptions,\n): ResumableStreamContext {\n  const { store, waitUntil, onAcquire, onAppend, onFinalize, onError } =\n    options;\n  const acquireOptions =\n    options.ttlMs !== undefined ? { ttlMs: options.ttlMs } : undefined;\n\n  return {\n    async run(streamId, makeStream) {\n      const role = await store.acquire(streamId, acquireOptions);\n      onAcquire?.(streamId, role);\n      if (role === \"producer\") {\n        startProducerTask(store, streamId, makeStream, {\n          waitUntil,\n          onAppend,\n          onFinalize,\n          onError,\n        });\n      }\n      return readFromStore(store, streamId);\n    },\n\n    async resume(streamId) {\n      const status = await store.status(streamId);\n      if (status === \"missing\") return null;\n      return readFromStore(store, streamId);\n    },\n\n    async requireResume(streamId) {\n      const status = await store.status(streamId);\n      if (status === \"missing\") {\n        throw new ResumableStreamError(\n          \"missing\",\n          `resumable stream not found: ${streamId}`,\n        );\n      }\n      return readFromStore(store, streamId);\n    },\n\n    async status(streamId) {\n      return store.status(streamId);\n    },\n\n    async delete(streamId) {\n      await store.delete(streamId);\n    },\n  };\n}\n\ntype ProducerHooks = {\n  readonly waitUntil: ((promise: Promise<unknown>) => void) | undefined;\n  readonly onAppend:\n    | ((streamId: string, byteLength: number) => void)\n    | undefined;\n  readonly onFinalize:\n    | ((streamId: string, status: \"done\" | \"error\", error?: string) => void)\n    | undefined;\n  readonly onError: ((streamId: string, error: unknown) => void) | undefined;\n};\n\nfunction startProducerTask(\n  store: ResumableStreamStore,\n  streamId: string,\n  makeStream: () => ReadableStream<Uint8Array>,\n  hooks: ProducerHooks,\n): void {\n  const { waitUntil, onAppend, onFinalize, onError } = hooks;\n  const task = (async () => {\n    let reader: ReadableStreamDefaultReader<Uint8Array> | undefined;\n    let cancelled = false;\n    try {\n      reader = makeStream().getReader();\n      while (true) {\n        const { done, value } = await reader.read();\n        if (done) break;\n        await store.append(streamId, value);\n        onAppend?.(streamId, value.byteLength);\n      }\n      await store.finalize(streamId, \"done\");\n      onFinalize?.(streamId, \"done\");\n    } catch (err) {\n      cancelled = true;\n      onError?.(streamId, err);\n      const message = err instanceof Error ? err.message : String(err);\n      try {\n        await reader?.cancel(err);\n      } catch (cancelErr) {\n        console.error(\"resumable stream reader cancel failed:\", cancelErr);\n      }\n      try {\n        await store.finalize(streamId, \"error\", message);\n        onFinalize?.(streamId, \"error\", message);\n      } catch (finalizeErr) {\n        console.error(\"resumable stream finalize failed:\", finalizeErr);\n      }\n    } finally {\n      if (!cancelled) reader?.releaseLock();\n    }\n  })();\n\n  if (waitUntil) waitUntil(task);\n  task.catch((err) => {\n    console.error(\"resumable producer task failed:\", err);\n  });\n}\n\nfunction readFromStore(\n  store: ResumableStreamStore,\n  streamId: string,\n): ReadableStream<Uint8Array> {\n  const ac = new AbortController();\n  let iterator: AsyncIterator<{ chunk: Uint8Array }> | undefined;\n\n  return new ReadableStream<Uint8Array>({\n    start() {\n      iterator = store.read(streamId, \"\", ac.signal)[Symbol.asyncIterator]();\n    },\n    async pull(controller) {\n      try {\n        if (!iterator) return;\n        const { done, value } = await iterator.next();\n        if (done) {\n          controller.close();\n          return;\n        }\n        controller.enqueue(value.chunk);\n      } catch (err) {\n        // the platform never calls cancel() on errored streams, so unwind\n        // the store iterator and abort the signal explicitly.\n        ac.abort();\n        try {\n          await iterator?.return?.();\n        } catch {}\n        controller.error(err);\n      }\n    },\n    cancel() {\n      ac.abort();\n      iterator?.return?.().catch(() => {});\n    },\n  });\n}\n"],"mappings":";;AA4CA,SAAgB,6BACd,SACwB;CACxB,MAAM,EAAE,OAAO,WAAW,WAAW,UAAU,YAAY,YACzD;CACF,MAAM,iBACJ,QAAQ,UAAU,KAAA,IAAY,EAAE,OAAO,QAAQ,MAAM,IAAI,KAAA;CAE3D,OAAO;EACL,MAAM,IAAI,UAAU,YAAY;GAC9B,MAAM,OAAO,MAAM,MAAM,QAAQ,UAAU,cAAc;GACzD,YAAY,UAAU,IAAI;GAC1B,IAAI,SAAS,YACX,kBAAkB,OAAO,UAAU,YAAY;IAC7C;IACA;IACA;IACA;GACF,CAAC;GAEH,OAAO,cAAc,OAAO,QAAQ;EACtC;EAEA,MAAM,OAAO,UAAU;GAErB,IAAI,MADiB,MAAM,OAAO,QAAQ,MAC3B,WAAW,OAAO;GACjC,OAAO,cAAc,OAAO,QAAQ;EACtC;EAEA,MAAM,cAAc,UAAU;GAE5B,IAAI,MADiB,MAAM,OAAO,QAAQ,MAC3B,WACb,MAAM,IAAI,qBACR,WACA,+BAA+B,UACjC;GAEF,OAAO,cAAc,OAAO,QAAQ;EACtC;EAEA,MAAM,OAAO,UAAU;GACrB,OAAO,MAAM,OAAO,QAAQ;EAC9B;EAEA,MAAM,OAAO,UAAU;GACrB,MAAM,MAAM,OAAO,QAAQ;EAC7B;CACF;AACF;AAaA,SAAS,kBACP,OACA,UACA,YACA,OACM;CACN,MAAM,EAAE,WAAW,UAAU,YAAY,YAAY;CACrD,MAAM,QAAQ,YAAY;EACxB,IAAI;EACJ,IAAI,YAAY;EAChB,IAAI;GACF,SAAS,WAAW,CAAC,CAAC,UAAU;GAChC,OAAO,MAAM;IACX,MAAM,EAAE,MAAM,UAAU,MAAM,OAAO,KAAK;IAC1C,IAAI,MAAM;IACV,MAAM,MAAM,OAAO,UAAU,KAAK;IAClC,WAAW,UAAU,MAAM,UAAU;GACvC;GACA,MAAM,MAAM,SAAS,UAAU,MAAM;GACrC,aAAa,UAAU,MAAM;EAC/B,SAAS,KAAK;GACZ,YAAY;GACZ,UAAU,UAAU,GAAG;GACvB,MAAM,UAAU,eAAe,QAAQ,IAAI,UAAU,OAAO,GAAG;GAC/D,IAAI;IACF,MAAM,QAAQ,OAAO,GAAG;GAC1B,SAAS,WAAW;IAClB,QAAQ,MAAM,0CAA0C,SAAS;GACnE;GACA,IAAI;IACF,MAAM,MAAM,SAAS,UAAU,SAAS,OAAO;IAC/C,aAAa,UAAU,SAAS,OAAO;GACzC,SAAS,aAAa;IACpB,QAAQ,MAAM,qCAAqC,WAAW;GAChE;EACF,UAAU;GACR,IAAI,CAAC,WAAW,QAAQ,YAAY;EACtC;CACF,EAAA,CAAG;CAEH,IAAI,WAAW,UAAU,IAAI;CAC7B,KAAK,OAAO,QAAQ;EAClB,QAAQ,MAAM,mCAAmC,GAAG;CACtD,CAAC;AACH;AAEA,SAAS,cACP,OACA,UAC4B;CAC5B,MAAM,KAAK,IAAI,gBAAgB;CAC/B,IAAI;CAEJ,OAAO,IAAI,eAA2B;EACpC,QAAQ;GACN,WAAW,MAAM,KAAK,UAAU,IAAI,GAAG,MAAM,CAAC,CAAC,OAAO,cAAc,CAAC;EACvE;EACA,MAAM,KAAK,YAAY;GACrB,IAAI;IACF,IAAI,CAAC,UAAU;IACf,MAAM,EAAE,MAAM,UAAU,MAAM,SAAS,KAAK;IAC5C,IAAI,MAAM;KACR,WAAW,MAAM;KACjB;IACF;IACA,WAAW,QAAQ,MAAM,KAAK;GAChC,SAAS,KAAK;IAGZ,GAAG,MAAM;IACT,IAAI;KACF,MAAM,UAAU,SAAS;IAC3B,QAAQ,CAAC;IACT,WAAW,MAAM,GAAG;GACtB;EACF;EACA,SAAS;GACP,GAAG,MAAM;GACT,UAAU,SAAS,CAAC,CAAC,YAAY,CAAC,CAAC;EACrC;CACF,CAAC;AACH"}
+{"version":3,"file":"ResumableStreamContext.js","names":[],"sources":["../../src/resumable/ResumableStreamContext.ts"],"sourcesContent":["import { ResumableStreamError } from \"./errors\";\nimport { withPromiseOrValue } from \"../core/utils/withPromiseOrValue\";\nimport type {\n  ResumableStreamRole,\n  ResumableStreamStatus,\n  ResumableStreamStore,\n} from \"./types\";\n\nexport type ResumableStreamContextOptions = {\n  readonly store: ResumableStreamStore;\n  readonly ttlMs?: number;\n  /**\n   * Required on serverless runtimes that terminate background work when the\n   * request handler returns (Vercel, Cloudflare). Pass `after` from\n   * `next/server` so the producer task outlives the response.\n   */\n  readonly waitUntil?: (promise: Promise<unknown>) => void;\n  readonly onAcquire?: (streamId: string, role: ResumableStreamRole) => void;\n  readonly onAppend?: (streamId: string, byteLength: number) => void;\n  readonly onFinalize?: (\n    streamId: string,\n    status: \"done\" | \"error\",\n    error?: string,\n  ) => void;\n  readonly onError?: (streamId: string, error: unknown) => void;\n};\n\nexport interface ResumableStreamContext {\n  /** Producer or consumer entrypoint. Atomically elects the role. */\n  run(\n    streamId: string,\n    makeStream: () => ReadableStream<Uint8Array>,\n  ): Promise<ReadableStream<Uint8Array>>;\n\n  /** Returns `null` when the stream does not exist. */\n  resume(streamId: string): Promise<ReadableStream<Uint8Array> | null>;\n\n  /** Throws `ResumableStreamError(\"missing\")` when the stream does not exist. */\n  requireResume(streamId: string): Promise<ReadableStream<Uint8Array>>;\n\n  status(streamId: string): Promise<ResumableStreamStatus>;\n\n  delete(streamId: string): Promise<void>;\n}\n\nconst invokeObservabilityHook = <TArgs extends unknown[]>(\n  name: string,\n  hook: ((...args: TArgs) => void) | undefined,\n  ...args: TArgs\n): void => {\n  if (!hook) return;\n  void withPromiseOrValue(\n    () => hook(...args),\n    () => {},\n    (error) => {\n      console.error(`resumable stream ${name} hook failed:`, error);\n    },\n  );\n};\n\nexport function createResumableStreamContext(\n  options: ResumableStreamContextOptions,\n): ResumableStreamContext {\n  const { store, waitUntil, onAcquire, onAppend, onFinalize, onError } =\n    options;\n  const acquireOptions =\n    options.ttlMs !== undefined ? { ttlMs: options.ttlMs } : undefined;\n\n  return {\n    async run(streamId, makeStream) {\n      const role = await store.acquire(streamId, acquireOptions);\n      invokeObservabilityHook(\"onAcquire\", onAcquire, streamId, role);\n      if (role === \"producer\") {\n        startProducerTask(store, streamId, makeStream, {\n          waitUntil,\n          onAppend,\n          onFinalize,\n          onError,\n        });\n      }\n      return readFromStore(store, streamId);\n    },\n\n    async resume(streamId) {\n      const status = await store.status(streamId);\n      if (status === \"missing\") return null;\n      return readFromStore(store, streamId);\n    },\n\n    async requireResume(streamId) {\n      const status = await store.status(streamId);\n      if (status === \"missing\") {\n        throw new ResumableStreamError(\n          \"missing\",\n          `resumable stream not found: ${streamId}`,\n        );\n      }\n      return readFromStore(store, streamId);\n    },\n\n    async status(streamId) {\n      return store.status(streamId);\n    },\n\n    async delete(streamId) {\n      await store.delete(streamId);\n    },\n  };\n}\n\ntype ProducerHooks = {\n  readonly waitUntil: ((promise: Promise<unknown>) => void) | undefined;\n  readonly onAppend:\n    | ((streamId: string, byteLength: number) => void)\n    | undefined;\n  readonly onFinalize:\n    | ((streamId: string, status: \"done\" | \"error\", error?: string) => void)\n    | undefined;\n  readonly onError: ((streamId: string, error: unknown) => void) | undefined;\n};\n\nfunction startProducerTask(\n  store: ResumableStreamStore,\n  streamId: string,\n  makeStream: () => ReadableStream<Uint8Array>,\n  hooks: ProducerHooks,\n): void {\n  const { waitUntil, onAppend, onFinalize, onError } = hooks;\n  const task = (async () => {\n    let reader: ReadableStreamDefaultReader<Uint8Array> | undefined;\n    let cancelled = false;\n    try {\n      reader = makeStream().getReader();\n      while (true) {\n        const { done, value } = await reader.read();\n        if (done) break;\n        await store.append(streamId, value);\n        invokeObservabilityHook(\n          \"onAppend\",\n          onAppend,\n          streamId,\n          value.byteLength,\n        );\n      }\n      await store.finalize(streamId, \"done\");\n      invokeObservabilityHook(\"onFinalize\", onFinalize, streamId, \"done\");\n    } catch (err) {\n      cancelled = true;\n      invokeObservabilityHook(\"onError\", onError, streamId, err);\n      const message = err instanceof Error ? err.message : String(err);\n      try {\n        await reader?.cancel(err);\n      } catch (cancelErr) {\n        console.error(\"resumable stream reader cancel failed:\", cancelErr);\n      }\n      try {\n        await store.finalize(streamId, \"error\", message);\n        invokeObservabilityHook(\n          \"onFinalize\",\n          onFinalize,\n          streamId,\n          \"error\",\n          message,\n        );\n      } catch (finalizeErr) {\n        console.error(\"resumable stream finalize failed:\", finalizeErr);\n      }\n    } finally {\n      if (!cancelled) reader?.releaseLock();\n    }\n  })();\n\n  if (waitUntil) waitUntil(task);\n  task.catch((err) => {\n    console.error(\"resumable producer task failed:\", err);\n  });\n}\n\nfunction readFromStore(\n  store: ResumableStreamStore,\n  streamId: string,\n): ReadableStream<Uint8Array> {\n  const ac = new AbortController();\n  let iterator: AsyncIterator<{ chunk: Uint8Array }> | undefined;\n\n  return new ReadableStream<Uint8Array>({\n    start() {\n      iterator = store.read(streamId, \"\", ac.signal)[Symbol.asyncIterator]();\n    },\n    async pull(controller) {\n      try {\n        if (!iterator) return;\n        const { done, value } = await iterator.next();\n        if (done) {\n          controller.close();\n          return;\n        }\n        controller.enqueue(value.chunk);\n      } catch (err) {\n        // the platform never calls cancel() on errored streams, so unwind\n        // the store iterator and abort the signal explicitly.\n        ac.abort();\n        try {\n          await iterator?.return?.();\n        } catch {}\n        controller.error(err);\n      }\n    },\n    cancel() {\n      ac.abort();\n      iterator?.return?.().catch(() => {});\n    },\n  });\n}\n"],"mappings":";;;AA6CA,MAAM,2BACJ,MACA,MACA,GAAG,SACM;CACT,IAAI,CAAC,MAAM;CACX,yBACQ,KAAK,GAAG,IAAI,SACZ,CAAC,IACN,UAAU;EACT,QAAQ,MAAM,oBAAoB,KAAK,gBAAgB,KAAK;CAC9D,CACF;AACF;AAEA,SAAgB,6BACd,SACwB;CACxB,MAAM,EAAE,OAAO,WAAW,WAAW,UAAU,YAAY,YACzD;CACF,MAAM,iBACJ,QAAQ,UAAU,KAAA,IAAY,EAAE,OAAO,QAAQ,MAAM,IAAI,KAAA;CAE3D,OAAO;EACL,MAAM,IAAI,UAAU,YAAY;GAC9B,MAAM,OAAO,MAAM,MAAM,QAAQ,UAAU,cAAc;GACzD,wBAAwB,aAAa,WAAW,UAAU,IAAI;GAC9D,IAAI,SAAS,YACX,kBAAkB,OAAO,UAAU,YAAY;IAC7C;IACA;IACA;IACA;GACF,CAAC;GAEH,OAAO,cAAc,OAAO,QAAQ;EACtC;EAEA,MAAM,OAAO,UAAU;GAErB,IAAI,MADiB,MAAM,OAAO,QAAQ,MAC3B,WAAW,OAAO;GACjC,OAAO,cAAc,OAAO,QAAQ;EACtC;EAEA,MAAM,cAAc,UAAU;GAE5B,IAAI,MADiB,MAAM,OAAO,QAAQ,MAC3B,WACb,MAAM,IAAI,qBACR,WACA,+BAA+B,UACjC;GAEF,OAAO,cAAc,OAAO,QAAQ;EACtC;EAEA,MAAM,OAAO,UAAU;GACrB,OAAO,MAAM,OAAO,QAAQ;EAC9B;EAEA,MAAM,OAAO,UAAU;GACrB,MAAM,MAAM,OAAO,QAAQ;EAC7B;CACF;AACF;AAaA,SAAS,kBACP,OACA,UACA,YACA,OACM;CACN,MAAM,EAAE,WAAW,UAAU,YAAY,YAAY;CACrD,MAAM,QAAQ,YAAY;EACxB,IAAI;EACJ,IAAI,YAAY;EAChB,IAAI;GACF,SAAS,WAAW,CAAC,CAAC,UAAU;GAChC,OAAO,MAAM;IACX,MAAM,EAAE,MAAM,UAAU,MAAM,OAAO,KAAK;IAC1C,IAAI,MAAM;IACV,MAAM,MAAM,OAAO,UAAU,KAAK;IAClC,wBACE,YACA,UACA,UACA,MAAM,UACR;GACF;GACA,MAAM,MAAM,SAAS,UAAU,MAAM;GACrC,wBAAwB,cAAc,YAAY,UAAU,MAAM;EACpE,SAAS,KAAK;GACZ,YAAY;GACZ,wBAAwB,WAAW,SAAS,UAAU,GAAG;GACzD,MAAM,UAAU,eAAe,QAAQ,IAAI,UAAU,OAAO,GAAG;GAC/D,IAAI;IACF,MAAM,QAAQ,OAAO,GAAG;GAC1B,SAAS,WAAW;IAClB,QAAQ,MAAM,0CAA0C,SAAS;GACnE;GACA,IAAI;IACF,MAAM,MAAM,SAAS,UAAU,SAAS,OAAO;IAC/C,wBACE,cACA,YACA,UACA,SACA,OACF;GACF,SAAS,aAAa;IACpB,QAAQ,MAAM,qCAAqC,WAAW;GAChE;EACF,UAAU;GACR,IAAI,CAAC,WAAW,QAAQ,YAAY;EACtC;CACF,EAAA,CAAG;CAEH,IAAI,WAAW,UAAU,IAAI;CAC7B,KAAK,OAAO,QAAQ;EAClB,QAAQ,MAAM,mCAAmC,GAAG;CACtD,CAAC;AACH;AAEA,SAAS,cACP,OACA,UAC4B;CAC5B,MAAM,KAAK,IAAI,gBAAgB;CAC/B,IAAI;CAEJ,OAAO,IAAI,eAA2B;EACpC,QAAQ;GACN,WAAW,MAAM,KAAK,UAAU,IAAI,GAAG,MAAM,CAAC,CAAC,OAAO,cAAc,CAAC;EACvE;EACA,MAAM,KAAK,YAAY;GACrB,IAAI;IACF,IAAI,CAAC,UAAU;IACf,MAAM,EAAE,MAAM,UAAU,MAAM,SAAS,KAAK;IAC5C,IAAI,MAAM;KACR,WAAW,MAAM;KACjB;IACF;IACA,WAAW,QAAQ,MAAM,KAAK;GAChC,SAAS,KAAK;IAGZ,GAAG,MAAM;IACT,IAAI;KACF,MAAM,UAAU,SAAS;IAC3B,QAAQ,CAAC;IACT,WAAW,MAAM,GAAG;GACtB;EACF;EACA,SAAS;GACP,GAAG,MAAM;GACT,UAAU,SAAS,CAAC,CAAC,YAAY,CAAC,CAAC;EACrC;CACF,CAAC;AACH"}

package/dist/resumable/constants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","names":[],"sources":["../../src/resumable/constants.ts"],"mappings":";cAAa,cAAA"}
+{"version":3,"file":"constants.d.ts","names":[],"sources":["../../src/resumable/constants.ts"],"mappings":";cAAa"}