@assistant-ui/core 0.3.20 → 0.3.21

package/dist/runtimes/local/local-thread-runtime-core.d.ts

@@ -1,101 +1,97 @@
-import { AppendMessage, ThreadMessage } from "../../types/message.js";
-import { AttachmentAdapter } from "../../adapters/attachment.js";
-import { FeedbackAdapter } from "../../adapters/feedback.js";
-import { DictationAdapter, SpeechSynthesisAdapter } from "../../adapters/speech.js";
-import { RealtimeVoiceAdapter } from "../../adapters/voice.js";
-import { ModelContextProvider } from "../../model-context/types.js";
-import { ChatModelAdapter } from "../../runtime/utils/chat-model-adapter.js";
-import { ExportedMessageRepository } from "../../runtime/utils/message-repository.js";
-import { QueueItemState } from "../../runtime/queue/queue-item.js";
-import { QueuePlacement } from "../../runtime/queue/external-thread-queue-adapter.js";
-import { AddToolResultOptions, RespondToToolApprovalOptions, ResumeRunConfig, ResumeToolCallOptions, StartRunConfig, ThreadRuntimeCore, ThreadSuggestion } from "../../runtime/interfaces/thread-runtime-core.js";
-import { SuggestionAdapter } from "../../adapters/suggestion.js";
-import { ThreadHistoryAdapter } from "../../adapters/thread-history.js";
+import type { ChatModelAdapter } from "../../runtime/utils/chat-model-adapter.js";
+import type { ExportedMessageRepository } from "../../runtime/utils/message-repository.js";
+import type { LocalRuntimeOptionsBase } from "./local-runtime-options.js";
+import type { AddToolResultOptions, ResumeToolCallOptions, RespondToToolApprovalOptions, ThreadSuggestion, ThreadRuntimeCore, Unstable_RecordToolInteractionOptions, StartRunConfig, ResumeRunConfig } from "../../runtime/interfaces/thread-runtime-core.js";
 import { BaseThreadRuntimeCore } from "../../runtime/base/base-thread-runtime-core.js";
-import { LocalRuntimeOptionsBase } from "./local-runtime-options.js";
-import "../../index.js";
-//#region src/runtimes/local/local-thread-runtime-core.d.ts
+import type { AppendMessage, ThreadAssistantMessage } from "../../types/message.js";
+import type { ThreadMessage } from "../../types/message.js";
+import type { ModelContextProvider } from "../../model-context/types.js";
+import type { QueuePlacement } from "../../runtime/queue/external-thread-queue-adapter.js";
+import { type QueueItemState } from "../../runtime/queue/queue-item.js";
 export declare class LocalThreadRuntimeCore extends BaseThreadRuntimeCore implements ThreadRuntimeCore {
-  readonly capabilities: {
-    switchToBranch: boolean;
-    switchBranchDuringRun: boolean;
-    edit: boolean;
-    delete: boolean;
-    reload: boolean;
-    refetchThread: boolean;
-    cancel: boolean;
-    unstable_copy: boolean;
-    speech: boolean;
-    dictation: boolean;
-    voice: boolean;
-    attachments: boolean;
-    feedback: boolean;
-    queue: boolean;
-  };
-  private abortController;
-  private _queue;
-  private _queueRunInFlight;
-  private _activeRun;
-  private _runGeneration;
-  private _historyWrites;
-  private _chainHistoryWrite;
-  private _persistPausedMessage;
-  readonly isDisabled = false;
-  readonly isSendDisabled = false;
-  private _isLoading;
-  get isLoading(): boolean;
-  private _suggestions;
-  private _suggestionsController;
-  get suggestions(): readonly ThreadSuggestion[];
-  get adapters(): {
-    chatModel: ChatModelAdapter;
-    history?: ThreadHistoryAdapter | undefined;
-    attachments?: AttachmentAdapter | undefined;
-    speech?: SpeechSynthesisAdapter | undefined;
-    dictation?: DictationAdapter | undefined;
-    voice?: RealtimeVoiceAdapter | undefined;
-    feedback?: FeedbackAdapter | undefined;
-    suggestion?: SuggestionAdapter | undefined;
-  };
-  constructor(contextProvider: ModelContextProvider, options: LocalRuntimeOptionsBase);
-  private _options;
-  private _lastRunConfig;
-  private _getThreadId?;
-  __internal_setGetThreadId(getThreadId: () => string | undefined): void;
-  private _getInitializePromise?;
-  __internal_setGetInitializePromise(getPromise: () => Promise<unknown> | undefined): void;
-  get extras(): undefined;
-  __internal_setOptions(options: LocalRuntimeOptionsBase): void;
-  private _loadPromise;
-  private _loadRequested;
-  __internal_load(): Promise<void>;
-  append(message: AppendMessage): Promise<void>;
-  protected _commitVoiceMessage(message: ThreadMessage): void;
-  protected _onVoiceConnected(): void;
-  protected _onVoiceDisconnected(): void;
-  getQueueItems(): readonly QueueItemState[];
-  getSteerQueueItems(): readonly QueueItemState[];
-  moveQueueItem(queueItemId: string, placement: QueuePlacement): void;
-  removeQueueItem(queueItemId: string): void;
-  private _rollbackAppend;
-  private _pendingAppends;
-  protected _isRunActive(): boolean;
-  private _runAppend;
-  private _runAppendInner;
-  deleteMessage(messageId: string): Promise<void>;
-  resumeRun({ stream, ...startConfig }: ResumeRunConfig): Promise<void>;
-  exportExternalState(): any;
-  import(data: ExportedMessageRepository): void;
-  importExternalState(): void;
-  unstable_notifySessionReset(): void;
-  startRun({ parentId, sourceId, runConfig }: StartRunConfig, runCallback?: ChatModelAdapter["run"]): Promise<void>;
-  private _runLoop;
-  private performRoundtrip;
-  detach(): void;
-  cancelRun(): void;
-  addToolResult({ messageId, toolCallId, result, isError, artifact, modelContent }: AddToolResultOptions): void;
-  resumeToolCall(_options: ResumeToolCallOptions): void;
-  respondToToolApproval({ approvalId, approved, optionId, text, reason }: RespondToToolApprovalOptions): Promise<void>;
+    readonly capabilities: {
+        switchToBranch: boolean;
+        switchBranchDuringRun: boolean;
+        edit: boolean;
+        delete: boolean;
+        reload: boolean;
+        refetchThread: boolean;
+        cancel: boolean;
+        unstable_copy: boolean;
+        speech: boolean;
+        dictation: boolean;
+        voice: boolean;
+        attachments: boolean;
+        feedback: boolean;
+        queue: boolean;
+    };
+    private abortController;
+    private _queue;
+    private _queueRunInFlight;
+    private _activeRun;
+    private _runGeneration;
+    private _messageReplacements;
+    private _historyWrites;
+    private _chainHistoryWrite;
+    private _persistMessageUpdate;
+    readonly isDisabled = false;
+    readonly isSendDisabled = false;
+    private _isLoading;
+    get isLoading(): boolean;
+    private _suggestions;
+    private _suggestionsController;
+    get suggestions(): readonly ThreadSuggestion[];
+    get adapters(): {
+        chatModel: ChatModelAdapter;
+        history?: import("../../index.js").ThreadHistoryAdapter | undefined;
+        attachments?: import("../../index.js").AttachmentAdapter | undefined;
+        speech?: import("../../index.js").SpeechSynthesisAdapter | undefined;
+        dictation?: import("../../index.js").DictationAdapter | undefined;
+        voice?: import("../../index.js").RealtimeVoiceAdapter | undefined;
+        feedback?: import("../../index.js").FeedbackAdapter | undefined;
+        suggestion?: import("../../index.js").SuggestionAdapter | undefined;
+    };
+    constructor(contextProvider: ModelContextProvider, options: LocalRuntimeOptionsBase);
+    private _options;
+    private _lastRunConfig;
+    private _getThreadId?;
+    __internal_setGetThreadId(getThreadId: () => string | undefined): void;
+    private _getInitializePromise?;
+    __internal_setGetInitializePromise(getPromise: () => Promise<unknown> | undefined): void;
+    get extras(): undefined;
+    __internal_setOptions(options: LocalRuntimeOptionsBase): void;
+    private _loadPromise;
+    private _loadRequested;
+    __internal_load(): Promise<void>;
+    private _getHistoryLoadBarrier;
+    append(message: AppendMessage): Promise<void>;
+    protected _commitVoiceMessage(message: ThreadMessage): void | Promise<void>;
+    protected _onVoiceConnected(): void;
+    protected _onVoiceDisconnected(): void;
+    getQueueItems(): readonly QueueItemState[];
+    getSteerQueueItems(): readonly QueueItemState[];
+    moveQueueItem(queueItemId: string, placement: QueuePlacement): void;
+    removeQueueItem(queueItemId: string): void;
+    private _rollbackAppend;
+    private _pendingAppends;
+    protected _isRunActive(): boolean;
+    private _runAppend;
+    private _runAppendInner;
+    deleteMessage(messageId: string): Promise<void>;
+    resumeRun({ stream, ...startConfig }: ResumeRunConfig): Promise<void>;
+    exportExternalState(): any;
+    import(data: ExportedMessageRepository): void;
+    importExternalState(): void;
+    unstable_notifySessionReset(): void;
+    startRun({ parentId, sourceId, runConfig }: StartRunConfig, runCallback?: ChatModelAdapter["run"]): Promise<void>;
+    private _runLoop;
+    private performRoundtrip;
+    detach(): void;
+    cancelRun(): void;
+    protected _onMessageMetadataChanged(previousMessage: ThreadAssistantMessage, message: ThreadAssistantMessage): void;
+    addToolResult({ messageId, toolCallId, result, isError, artifact, modelContent, }: AddToolResultOptions): void;
+    resumeToolCall(_options: ResumeToolCallOptions): void;
+    unstable_recordToolInteraction({ messageId, toolCallId, interaction, }: Unstable_RecordToolInteractionOptions): Promise<void>;
+    respondToToolApproval({ approvalId, approved, optionId, text, reason, }: RespondToToolApprovalOptions): Promise<void>;
 }
-//#endregion
 //# sourceMappingURL=local-thread-runtime-core.d.ts.map

package/dist/runtimes/local/local-thread-runtime-core.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"local-thread-runtime-core.d.ts","names":[],"sources":["../../../src/runtimes/local/local-thread-runtime-core.ts"],"mappings":";;;;;;;;;;;;;;;;;qBA4Fa,+BACH,iCACG;WAEK;;;;;;;;;;;;;;;;UAiBR;UAEA;UAIA;UACA;UACA;UAEA;UAIA;UAuBA;WAYQ;WACA;UAER;MACG;UAIH;UACA;MACG,wBAAwB;MAIxB;;;;;;;;;;EAKT,YAAA,iBAAiB,sBACjB,SAAS;UAMH;UAEA;UAEA;EAED,0BAA0B;UAIzB;EAED,mCACL,kBAAkB;MAKT;EAIJ,sBAAsB,SAAS;UAoG9B;UACA;EACD,mBAAe;EAyCT,OAAO,SAAS,gBAAgB;YA4B1B,oBAAoB,SAAS;YAc7B;YAIA;EAIZ,0BAA0B;EAM1B,+BAA+B;EAI/B,cAAc,qBAAqB,WAAW;EAI9C,gBAAgB;UAIf;UASA;YAEW;UAIL;UASA;EA4DD,cAAc,oBAAoB;EAmBxC,YAAY,WAAW,eAAe,kBAAkB;EAMxD;EAIS,OAAO,MAAM;EAItB;EAIA;EAIM,WACT,UAAU,UAAU,aAAa,gBACnC,cAAc,0BACb;UA2BW;UA+EA;EA8NP;EAWA;EAgBA,gBACL,WACA,YACA,QACA,SACA,UACA,gBACC;EAoDI,eAAe,UAAU;EAMzB,wBACL,YACA,UACA,UACA,MACA,UACC,+BAA+B"}
+{"version":3,"file":"local-thread-runtime-core.d.ts","sourceRoot":"","sources":["../../../src/runtimes/local/local-thread-runtime-core.ts"],"names":[],"mappings":"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"}

package/dist/runtimes/local/local-thread-runtime-core.js

@@ -1,13 +1,14 @@
 import { generateId } from "../../utils/id.js";
 import { consumeSuggestionResult } from "../../adapters/suggestion.js";
 import { MessageNotSentError, toAssistantError } from "../../types/error.js";
+import { appendToolInteraction } from "../../runtime/utils/tool-interactions.js";
 import { fromThreadMessageLike } from "../../runtime/utils/thread-message-like.js";
 import { getAutoStatus } from "../../runtime/utils/auto-status.js";
 import { EMPTY_QUEUE_ITEMS } from "../../runtime/queue/queue-item.js";
 import { createMessageQueue } from "../../runtime/queue/message-queue.js";
+import { captureThreadRuntimeGeneration, invalidateThreadRuntime } from "../../runtime/utils/thread-runtime-lifecycle.js";
 import { BaseThreadRuntimeCore } from "../../runtime/base/base-thread-runtime-core.js";
 import { shouldContinue } from "./should-continue.js";
-import { captureThreadRuntimeGeneration, invalidateThreadRuntime, isThreadRuntimeGenerationCurrent } from "../../runtime/utils/thread-runtime-lifecycle.js";
 //#region src/runtimes/local/local-thread-runtime-core.ts
 var AbortError = class extends Error {
 	name = "AbortError";
@@ -31,6 +32,26 @@ const withLocalPauseReasons = (data) => ({
 		message: withLocalPauseReason(item.message)
 	}))
 });
+const withoutToolInteractions = (message) => {
+	if (message.role !== "assistant") return message;
+	let hasInteractions = false;
+	const content = message.content.map((part) => {
+		if (part.type !== "tool-call") return part;
+		const nestedMessages = part.messages?.map(withoutToolInteractions);
+		const hasNestedInteractions = nestedMessages?.some((nestedMessage, index) => nestedMessage !== part.messages?.[index]);
+		if (part.unstable_interactions === void 0 && hasNestedInteractions !== true) return part;
+		hasInteractions = true;
+		const { unstable_interactions: _, ...withoutInteractions } = part;
+		return hasNestedInteractions ? {
+			...withoutInteractions,
+			messages: nestedMessages
+		} : withoutInteractions;
+	});
+	return hasInteractions ? {
+		...message,
+		content
+	} : message;
+};
 var LocalThreadRuntimeCore = class extends BaseThreadRuntimeCore {
 	capabilities = {
 		switchToBranch: true,
@@ -53,6 +74,7 @@ var LocalThreadRuntimeCore = class extends BaseThreadRuntimeCore {
 	_queueRunInFlight = null;
 	_activeRun = null;
 	_runGeneration = 0;
+	_messageReplacements = /* @__PURE__ */ new WeakMap();
 	_historyWrites = /* @__PURE__ */ new Map();
 	_chainHistoryWrite(id, write) {
 		const next = (this._historyWrites.get(id) ?? Promise.resolve()).then(write, write);
@@ -63,10 +85,17 @@ var LocalThreadRuntimeCore = class extends BaseThreadRuntimeCore {
 		});
 		return next;
 	}
-	_persistPausedMessage(parentId, message) {
-		if (message.status?.type !== "requires-action") return;
+	_persistMessageUpdate(messageId) {
 		const history = this._options.adapters.history;
 		if (!history?.update) return;
+		let entry;
+		try {
+			entry = this.repository.getMessage(messageId);
+		} catch {
+			return;
+		}
+		const { parentId, message } = entry;
+		if (message.role !== "assistant" || message.status.type === "running") return;
 		const update = history.update.bind(history);
 		const item = {
 			parentId,
@@ -175,7 +204,6 @@ var LocalThreadRuntimeCore = class extends BaseThreadRuntimeCore {
 		if (!this.adapters.history) return Promise.resolve();
 		const promise = this.adapters.history.load();
 		this._isLoading = true;
-		this._notifySubscribers();
 		this._loadPromise = promise.then((repo) => {
 			if (!repo) return;
 			this.repository.import(withLocalPauseReasons(repo));
@@ -191,14 +219,19 @@ var LocalThreadRuntimeCore = class extends BaseThreadRuntimeCore {
 			this._isLoading = false;
 			this._notifySubscribers();
 		});
+		this._notifySubscribers();
 		return this._loadPromise;
 	}
+	_getHistoryLoadBarrier() {
+		if (!this._isLoading || !this._loadPromise) return void 0;
+		return this._loadPromise.catch(() => {});
+	}
 	async append(message) {
 		message = {
 			...message,
 			parentId: this._resolveAppendParent(message.parentId)
 		};
-		if (this.voice) throw new Error("Cannot send a text message while a voice session is connected");
+		if (this.voice) return this._appendToVoiceSession(message);
 		if (this._isVoiceMessage(message.sourceId)) throw new Error("Voice transcript messages cannot be edited");
 		const isTail = message.parentId === (this.messages.at(-1)?.id ?? null);
 		const willRun = message.startRun ?? message.role === "user";
@@ -211,16 +244,26 @@ var LocalThreadRuntimeCore = class extends BaseThreadRuntimeCore {
 		return this._runAppend(message);
 	}
 	_commitVoiceMessage(message) {
-		const parentId = this.repository.headId;
-		this.repository.addOrUpdateMessage(parentId, message);
-		this.repository.resetHead(message.id);
-		this._options.adapters.history?.append({
-			parentId,
-			message
-		}).catch(() => {});
-		const index = this._voiceMessages.findIndex((voiceMessage) => voiceMessage.id === message.id);
-		if (index !== -1) this._voiceMessages.splice(index, 1);
-		this._markVoiceMessagesDirty();
+		const generation = captureThreadRuntimeGeneration(this);
+		const commit = (notify) => {
+			if (generation.aborted) {
+				this._dropVoiceMessage(message.id, notify);
+				return;
+			}
+			const parentId = this.repository.headId;
+			this.repository.addOrUpdateMessage(parentId, message);
+			this.repository.resetHead(message.id);
+			const historyWrite = this._options.adapters.history?.append({
+				parentId,
+				message
+			});
+			historyWrite?.catch(() => {});
+			this._dropVoiceMessage(message.id, false);
+			if (notify) this._notifySubscribers();
+			return historyWrite;
+		};
+		const barrier = this._getVoiceCommitBarrier();
+		return barrier ? barrier.then(() => commit(true)) : commit(false);
 	}
 	_onVoiceConnected() {
 		this._queue?.hold();
@@ -262,6 +305,16 @@ var LocalThreadRuntimeCore = class extends BaseThreadRuntimeCore {
 	}
 	async _runAppendInner(rawMessage) {
 		const generation = captureThreadRuntimeGeneration(this);
+		const loadBarrier = this._getHistoryLoadBarrier();
+		if (loadBarrier) {
+			const wasAtTail = rawMessage.parentId === (this.messages.at(-1)?.id ?? null);
+			await loadBarrier;
+			if (generation.aborted) return;
+			if (wasAtTail) rawMessage = {
+				...rawMessage,
+				parentId: this._resolveAppendParent(this.messages.at(-1)?.id ?? null)
+			};
+		}
 		const message = this.enrichAppendMetadata(rawMessage);
 		this.ensureInitialized();
 		const newMessage = fromThreadMessageLike(message, generateId(), {
@@ -275,12 +328,12 @@ var LocalThreadRuntimeCore = class extends BaseThreadRuntimeCore {
 			if (initPromise) await initPromise;
 		} catch (error) {
 			this._rollbackAppend(newMessage.id);
-			if (!isThreadRuntimeGenerationCurrent(this, generation)) return;
+			if (generation.aborted) return;
 			const notSent = new MessageNotSentError();
 			notSent.cause = error;
 			throw notSent;
 		}
-		if (!isThreadRuntimeGenerationCurrent(this, generation)) {
+		if (generation.aborted) {
 			this._rollbackAppend(newMessage.id);
 			return;
 		}
@@ -373,6 +426,12 @@ var LocalThreadRuntimeCore = class extends BaseThreadRuntimeCore {
 				message = await this.performRoundtrip(parentId, message, runConfig, alreadyPersisted, run, runCallback);
 				runCallback = void 0;
 				if (this._activeRun !== run) break;
+				let replacement = this._messageReplacements.get(message);
+				while (replacement) {
+					message = replacement.message;
+					replacement = this._messageReplacements.get(message);
+				}
+				if (this.getMessageById(message.id)?.message !== message) break;
 			} while (shouldContinue(message, this._options.unstable_humanToolNames));
 		} finally {
 			this._notifyEventSubscribers("runEnd", {});
@@ -402,7 +461,7 @@ var LocalThreadRuntimeCore = class extends BaseThreadRuntimeCore {
 		}
 	}
 	async performRoundtrip(parentId, message, runConfig, alreadyPersisted, run, runCallback) {
-		const messages = parentId ? this.repository.getMessages(parentId) : [];
+		const modelMessages = (parentId ? this.repository.getMessages(parentId) : []).map(withoutToolInteractions);
 		this.abortController?.abort();
 		const abortController = new AbortController();
 		this.abortController = abortController;
@@ -411,31 +470,79 @@ var LocalThreadRuntimeCore = class extends BaseThreadRuntimeCore {
 		const initialData = message.metadata?.unstable_data;
 		const initialSteps = message.metadata?.steps;
 		const initialCustom = message.metadata?.custom;
+		const externalToolCallIds = /* @__PURE__ */ new Set();
 		let hasStoredMessage = true;
 		try {
 			this.repository.getMessage(message.id);
 		} catch {
 			hasStoredMessage = false;
 		}
-		const ownsMessage = () => {
+		const syncOwnedMessage = () => {
 			if (!hasStoredMessage) return this._activeRun === run;
 			try {
-				return this.repository.getMessage(message.id).message === message;
+				let ownedMessage = message;
+				let replacement = this._messageReplacements.get(ownedMessage);
+				while (replacement) {
+					if (replacement.toolCallId !== void 0) externalToolCallIds.add(replacement.toolCallId);
+					ownedMessage = replacement.message;
+					replacement = this._messageReplacements.get(ownedMessage);
+				}
+				if (this.repository.getMessage(message.id).message !== ownedMessage) return false;
+				message = ownedMessage;
+				return true;
 			} catch {
 				return false;
 			}
 		};
+		const withExternalResults = (parts) => {
+			const interactions = /* @__PURE__ */ new Map();
+			for (const part of message.content) if (part.type === "tool-call" && part.unstable_interactions !== void 0) interactions.set(part.toolCallId, part.unstable_interactions);
+			const withInteractions = parts.map((part) => {
+				if (part.type !== "tool-call" || part.unstable_interactions !== void 0) return part;
+				const unstable_interactions = interactions.get(part.toolCallId);
+				return unstable_interactions === void 0 ? part : {
+					...part,
+					unstable_interactions
+				};
+			});
+			if (externalToolCallIds.size === 0) return withInteractions;
+			const previousToolCalls = /* @__PURE__ */ new Map();
+			for (const part of message.content) {
+				if (part.type !== "tool-call" || !externalToolCallIds.has(part.toolCallId)) continue;
+				const occurrences = previousToolCalls.get(part.toolCallId) ?? [];
+				occurrences.push(part);
+				previousToolCalls.set(part.toolCallId, occurrences);
+			}
+			const incomingOccurrences = /* @__PURE__ */ new Map();
+			return withInteractions.map((part) => {
+				if (part.type !== "tool-call") return part;
+				const occurrence = incomingOccurrences.get(part.toolCallId) ?? 0;
+				incomingOccurrences.set(part.toolCallId, occurrence + 1);
+				if (part.result !== void 0 && part.isPreliminary !== true) return part;
+				const completed = previousToolCalls.get(part.toolCallId)?.[occurrence];
+				if (!completed || completed.result === void 0 || completed.isPreliminary === true) return part;
+				const { isPreliminary: _, artifact: _artifact, modelContent: _modelContent, ...settledPart } = part;
+				return {
+					...settledPart,
+					result: completed.result,
+					isError: completed.isError,
+					...completed.artifact !== void 0 && { artifact: completed.artifact },
+					...completed.modelContent !== void 0 && { modelContent: completed.modelContent }
+				};
+			});
+		};
 		const updateMessage = (m) => {
-			if (!ownsMessage()) return;
+			if (!syncOwnedMessage()) return;
 			const newSteps = m.metadata?.steps;
 			const steps = newSteps ? [...initialSteps ?? [], ...newSteps] : void 0;
 			const newAnnotations = m.metadata?.unstable_annotations;
 			const newData = m.metadata?.unstable_data;
 			const annotations = newAnnotations ? [...initialAnnotations ?? [], ...newAnnotations] : void 0;
 			const data = newData ? [...initialData ?? [], ...newData] : void 0;
+			const content = m.content ? withExternalResults([...initialContent, ...m.content]) : void 0;
 			message = {
 				...message,
-				...m.content ? { content: [...initialContent, ...m.content ?? []] } : void 0,
+				...content ? { content } : void 0,
 				status: m.status ?? message.status,
 				...m.metadata ? { metadata: {
 					...message.metadata,
@@ -473,7 +580,7 @@ var LocalThreadRuntimeCore = class extends BaseThreadRuntimeCore {
 			const shouldCancelMessage = () => abortSignal.aborted && (message.status.type === "running" || message.status.type === "requires-action" && (this._activeRun !== run || shouldContinue(message, this._options.unstable_humanToolNames)));
 			const threadId = this._getThreadId?.();
 			const promiseOrGenerator = runCallback({
-				messages,
+				messages: modelMessages,
 				runConfig: this._lastRunConfig,
 				abortSignal,
 				context,
@@ -481,7 +588,8 @@ var LocalThreadRuntimeCore = class extends BaseThreadRuntimeCore {
 				unstable_threadId: threadId,
 				unstable_parentId: parentId,
 				unstable_getMessage() {
-					return message;
+					syncOwnedMessage();
+					return withoutToolInteractions(message);
 				}
 			});
 			if (Symbol.asyncIterator in promiseOrGenerator) for await (const r of promiseOrGenerator) {
@@ -523,6 +631,7 @@ var LocalThreadRuntimeCore = class extends BaseThreadRuntimeCore {
 		} finally {
 			if (this.abortController === abortController) this.abortController = null;
 			const history = this._options.adapters.history;
+			const ownsCurrentMessage = syncOwnedMessage();
 			const item = {
 				parentId,
 				message,
@@ -530,7 +639,7 @@ var LocalThreadRuntimeCore = class extends BaseThreadRuntimeCore {
 			};
 			const isTerminal = message.status.type === "complete" || message.status.type === "incomplete";
 			const isPausing = message.status.type === "requires-action" && !shouldContinue(message, this._options.unstable_humanToolNames);
-			if (ownsMessage() && (isTerminal || isPausing && history?.update)) {
+			if (ownsCurrentMessage && (isTerminal || isPausing && history?.update)) {
 				const write = alreadyPersisted && history?.update ? history.update.bind(history) : history?.append.bind(history);
 				if (write) await this._chainHistoryWrite(message.id, () => write(item));
 			}
@@ -560,6 +669,10 @@ var LocalThreadRuntimeCore = class extends BaseThreadRuntimeCore {
 		this._suggestionsController?.abort();
 		this._suggestionsController = null;
 	}
+	_onMessageMetadataChanged(previousMessage, message) {
+		this._messageReplacements.set(previousMessage, { message });
+		this._persistMessageUpdate(message.id);
+	}
 	addToolResult({ messageId, toolCallId, result, isError, artifact, modelContent }) {
 		if (this.voice) throw new Error("Cannot add a tool result while a voice session is connected");
 		const messageData = this.repository.getMessage(messageId);
@@ -572,9 +685,10 @@ var LocalThreadRuntimeCore = class extends BaseThreadRuntimeCore {
 			if (c.type !== "tool-call") return c;
 			if (c.toolCallId !== toolCallId) return c;
 			found = true;
-			if (c.result === void 0) added = true;
+			if (c.result === void 0 || c.isPreliminary === true) added = true;
+			const { isPreliminary: _isPreliminary, ...part } = c;
 			return {
-				...c,
+				...part,
 				result,
 				isError,
 				...artifact !== void 0 && { artifact },
@@ -582,18 +696,50 @@ var LocalThreadRuntimeCore = class extends BaseThreadRuntimeCore {
 			};
 		});
 		if (!found) throw new Error("Tried to add tool result to non-existing tool call");
+		const previousMessage = message;
 		message = {
 			...message,
 			content: newContent
 		};
+		if (previousMessage.status.type === "running") this._messageReplacements.set(previousMessage, {
+			message,
+			toolCallId
+		});
 		this.repository.addOrUpdateMessage(parentId, message);
 		this._notifySubscribers();
-		if (added && shouldContinue(message, this._options.unstable_humanToolNames)) this._runLoop(parentId, message, this._lastRunConfig).catch(() => {});
-		else if (added) this._persistPausedMessage(parentId, message);
+		if (!added) return;
+		const stored = this.getMessageById(messageId);
+		if (stored?.message.role === "assistant" && shouldContinue(stored.message, this._options.unstable_humanToolNames)) this._runLoop(stored.parentId, stored.message, this._lastRunConfig).catch(() => {});
+		else this._persistMessageUpdate(messageId);
 	}
 	resumeToolCall(_options) {
 		throw new Error("Local runtime does not support resuming tool calls. For human-in-the-loop tools, list the tool in unstable_humanToolNames and complete the call with addToolResult.");
 	}
+	async unstable_recordToolInteraction({ messageId, toolCallId, interaction }) {
+		let messageData;
+		try {
+			messageData = this.repository.getMessage(messageId);
+		} catch {
+			throw new Error("Tried to record a tool interaction on a non-existing message");
+		}
+		const { parentId, message: previousMessage } = messageData;
+		if (previousMessage.role !== "assistant") throw new Error("Tried to record a tool interaction on a non-assistant message");
+		const toolCallIndex = previousMessage.content.findIndex((part) => part.type === "tool-call" && part.toolCallId === toolCallId);
+		if (toolCallIndex === -1) throw new Error("Tried to record a tool interaction on a non-existing tool call");
+		const target = previousMessage.content[toolCallIndex];
+		if (target.type !== "tool-call") throw new Error("Tried to record a tool interaction on a non-existing tool call");
+		const message = {
+			...previousMessage,
+			content: previousMessage.content.map((part, index) => index === toolCallIndex ? {
+				...part,
+				unstable_interactions: appendToolInteraction(target.unstable_interactions, interaction)
+			} : part)
+		};
+		if (previousMessage.status.type === "running") this._messageReplacements.set(previousMessage, { message });
+		this.repository.addOrUpdateMessage(parentId, message);
+		this._notifySubscribers();
+		this._persistMessageUpdate(message.id);
+	}
 	respondToToolApproval({ approvalId, approved, optionId, text, reason }) {
 		if (this.voice) throw new Error("Cannot respond to a tool approval while a voice session is connected");
 		let message = this.repository.getMessages().findLast((m) => m.role === "assistant" && m.content.some((c) => c.type === "tool-call" && c.approval?.id === approvalId));
@@ -633,8 +779,9 @@ var LocalThreadRuntimeCore = class extends BaseThreadRuntimeCore {
 		this.repository.addOrUpdateMessage(parentId, message);
 		this._notifySubscribers();
 		this._notifyToolApprovalAnswered(message.id, target.toolCallId, target.toolName, approved);
-		if (this.repository.headId === message.id && shouldContinue(message, this._options.unstable_humanToolNames)) this._runLoop(parentId, message, this._lastRunConfig).catch(() => {});
-		else this._persistPausedMessage(parentId, message);
+		const stored = this.getMessageById(message.id);
+		if (this.repository.headId === message.id && stored?.message.role === "assistant" && shouldContinue(stored.message, this._options.unstable_humanToolNames)) this._runLoop(stored.parentId, stored.message, this._lastRunConfig).catch(() => {});
+		else this._persistMessageUpdate(message.id);
 		return Promise.resolve();
 	}
 };