@tanstack/ai-persistence 0.6.7 → 0.7.1

package/dist/esm/middleware.js

@@ -24,6 +24,39 @@ function generationScope(ctx, opts) {
 var DEFAULT_ARTIFACT_FETCH_TIMEOUT_MS = 3e4;
 var DEFAULT_MAX_ARTIFACT_BYTES = 1073741824;
 var runState = /* @__PURE__ */ new WeakMap();
+/** `metadata.tanstack.run.id` of a stored message, when set. */
+function runTagOf(message) {
+	const tanstack = message.metadata?.tanstack;
+	if (typeof tanstack !== "object" || tanstack === null) return;
+	const run = tanstack.run;
+	if (typeof run !== "object" || run === null) return;
+	const id = run.id;
+	return typeof id === "string" && id !== "" ? id : void 0;
+}
+function withRunTag(message, runId) {
+	const metadata = message.metadata ?? {};
+	const tanstack = metadata.tanstack;
+	return {
+		...message,
+		metadata: {
+			...metadata,
+			tanstack: {
+				...typeof tanstack === "object" && tanstack !== null ? tanstack : {},
+				run: { id: runId }
+			}
+		}
+	};
+}
+/**
+* The thread to save, with this run's id on the assistant messages it added
+* (`metadata.tanstack.run.id`). `reconstructChat` uses it to match each
+* message to its run. Messages from earlier runs are left as they are.
+*/
+function runMessages(ctx, state) {
+	const from = state?.firstRunMessage;
+	if (from === void 0) return [...ctx.messages];
+	return ctx.messages.map((message, index) => index >= from && message.role === "assistant" && runTagOf(message) === void 0 ? withRunTag(message, ctx.runId) : message);
+}
 var validResumeStatuses = /* @__PURE__ */ new Set(["resolved", "cancelled"]);
 function mergeMaps(left, right) {
 	if (!left && !right) return void 0;
@@ -39,6 +72,7 @@ function mergeResumeToolState(left, right) {
 	return {
 		approvals: mergeMaps(left.approvals, right.approvals),
 		clientToolResults: mergeMaps(left.clientToolResults, right.clientToolResults),
+		clientToolErrors: mergeMaps(left.clientToolErrors, right.clientToolErrors),
 		genericInterrupts: mergeMaps(left.genericInterrupts, right.genericInterrupts),
 		genericInterruptRequests: mergeMaps(left.genericInterruptRequests, right.genericInterruptRequests),
 		deniedToolResults: mergeMaps(left.deniedToolResults, right.deniedToolResults),
@@ -321,6 +355,7 @@ function resumeToolStateFromPending(pending, resumeByInterruptId) {
 	for (const interrupt of pending) {
 		const entry = resumeByInterruptId.get(interrupt.interruptId);
 		if (!entry) continue;
+		if (hasReservedInterruptBinding(interrupt.payload)) continue;
 		const kind = interruptKind(interrupt);
 		const reason = stringField(interrupt.payload, "reason");
 		const toolCallId = stringField(interrupt.payload, "toolCallId");
@@ -1075,6 +1110,8 @@ function withPersistence(persistence, options = {}) {
 			return Object.keys(patch).length > 0 ? patch : void 0;
 		},
 		async onStart(ctx) {
+			const state = runState.get(ctx);
+			if (state) state.firstRunMessage = ctx.messages.length;
 			try {
 				await messageStore.saveThread(ctx.threadId, [...ctx.messages]);
 			} catch {}
@@ -1131,7 +1168,7 @@ function withPersistence(persistence, options = {}) {
 			const usage = ctx.phase === "modelStream" && chunkUsage ? accumulateTokenUsage(state.usage, chunkUsage) : state.usage ?? chunkUsage;
 			state.usage = usage;
 			await interruptRun(runs, ctx.runId, usage);
-			await messageStore.saveThread(ctx.threadId, [...ctx.messages]);
+			await messageStore.saveThread(ctx.threadId, runMessages(ctx, state));
 			state.interrupted = true;
 		},
 		onUsage(ctx, usage) {
@@ -1143,7 +1180,7 @@ function withPersistence(persistence, options = {}) {
 			const state = runState.get(ctx);
 			if (state?.interrupted) return;
 			try {
-				await messageStore.saveThread(ctx.threadId, [...ctx.messages]);
+				await messageStore.saveThread(ctx.threadId, runMessages(ctx, state));
 				await commitPendingResumes(state, persistence.stores.interrupts);
 				await completeRun(runs, ctx.runId, state?.usage ?? info.usage);
 				state?.completion?.resolve();