@assistant-ui/core 0.3.20 → 0.3.21

package/dist/store/clients/external-thread.js

@@ -1,10 +1,14 @@
 import { generateId } from "../../utils/id.js";
 import { fileMatchesAccept } from "../../adapters/attachment.js";
 import { getThreadMessageText } from "../../utils/text.js";
+import { createToolInteraction } from "../../runtime/utils/tool-interactions.js";
 import { toMessagePartStatus } from "../../utils/normalizePartStatus.js";
 import { resolveToolApprovalResponse } from "../../runtime/utils/resolveToolApprovalResponse.js";
 import { isAttachmentComplete, isCreateAttachment } from "../../types/attachment.js";
 import { AttachmentAddOperations, drainAttachmentAdd } from "../../runtime/utils/attachment-add-operations.js";
+import { AttachmentSendOperations } from "../../runtime/utils/attachment-send-operations.js";
+import { ThreadMessageClient } from "./thread-message-client.js";
+import { submissionThreadMessage } from "./submission-message.js";
 import { ThreadSuggestions } from "./suggestions.js";
 import { TaskClient, createTaskDeriver, getTaskKey } from "./thread-tasks.js";
 import { ModelContext } from "./model-context-client.js";
@@ -16,6 +20,7 @@ import { ToolResponse } from "assistant-stream";
 import { c } from "@assistant-ui/tap/react-shim/compiler-runtime";
 import { useEffect, useRef, useState } from "@assistant-ui/tap/react-shim";
 import { resource, withKey } from "@assistant-ui/tap";
+import { useAssistantClientDestroySignal } from "@assistant-ui/store/internal";
 //#region src/store/clients/external-thread.ts
 const EMPTY_QUEUE_ITEMS = [];
 const EMPTY_BRANCH_IDS = [];
@@ -26,17 +31,18 @@ const derivePartStatus = (message, partIndex, part) => {
 	return toMessagePartStatus(message, partIndex, part);
 };
 const useMessageClient = (t0) => {
-	const $ = c(71);
-	const { message, index, parentId, onEdit, onReload, queue, branches, onRespondToToolApproval, onAddToolResult, onResumeToolCall, attachmentAdapter, submittedFeedback, onSubmitFeedback, speech, onSpeak, onStopSpeaking } = t0;
+	const $ = c(73);
+	const { message, index, isLast, parentId, onEdit, onReload, queue, branches, onRespondToToolApproval, unstable_onRecordToolInteraction, onAddToolResult, onResumeToolCall, attachmentAdapter, submittedFeedback, onSubmitFeedback, speech, onSpeak, onStopSpeaking } = t0;
 	const [isCopied, setIsCopied] = useState(false);
 	const [isHovering, setIsHovering] = useState(false);
 	let t1;
-	if ($[0] !== message || $[1] !== onAddToolResult || $[2] !== onRespondToToolApproval || $[3] !== onResumeToolCall) {
+	if ($[0] !== message || $[1] !== onAddToolResult || $[2] !== onRespondToToolApproval || $[3] !== onResumeToolCall || $[4] !== unstable_onRecordToolInteraction) {
 		t1 = message.content.map((part, idx) => withKey(idx, PartResource({
 			part,
 			status: derivePartStatus(message, idx, part),
 			messageId: message.id,
 			onRespondToToolApproval,
+			unstable_onRecordToolInteraction,
 			onAddToolResult,
 			onResumeToolCall
 		})));
@@ -44,33 +50,34 @@ const useMessageClient = (t0) => {
 		$[1] = onAddToolResult;
 		$[2] = onRespondToToolApproval;
 		$[3] = onResumeToolCall;
-		$[4] = t1;
-	} else t1 = $[4];
+		$[4] = unstable_onRecordToolInteraction;
+		$[5] = t1;
+	} else t1 = $[5];
 	const partClients = useClientLookup(t1);
 	let t2;
-	if ($[5] !== message.attachments) {
+	if ($[6] !== message.attachments) {
 		t2 = message.attachments ?? [];
-		$[5] = message.attachments;
-		$[6] = t2;
-	} else t2 = $[6];
+		$[6] = message.attachments;
+		$[7] = t2;
+	} else t2 = $[7];
 	let t3;
-	if ($[7] !== t2) {
+	if ($[8] !== t2) {
 		t3 = t2.map(_temp2);
-		$[7] = t2;
-		$[8] = t3;
-	} else t3 = $[8];
+		$[8] = t2;
+		$[9] = t3;
+	} else t3 = $[9];
 	const attachmentClients = useClientLookup(t3);
 	let t4;
-	if ($[9] !== onEdit) {
+	if ($[10] !== onEdit) {
 		t4 = () => {
 			if (!onEdit) throw new Error("Runtime does not support editing.");
 		};
-		$[9] = onEdit;
-		$[10] = t4;
-	} else t4 = $[10];
+		$[10] = onEdit;
+		$[11] = t4;
+	} else t4 = $[11];
 	const handleBeginEdit = t4;
 	let t5;
-	if ($[11] !== message.id || $[12] !== onEdit || $[13] !== parentId) {
+	if ($[12] !== message.id || $[13] !== onEdit || $[14] !== parentId) {
 		t5 = (msg) => {
 			if (!onEdit) throw new Error("Runtime does not support editing.");
 			onEdit({
@@ -79,14 +86,14 @@ const useMessageClient = (t0) => {
 				sourceId: message.id
 			});
 		};
-		$[11] = message.id;
-		$[12] = onEdit;
-		$[13] = parentId;
-		$[14] = t5;
-	} else t5 = $[14];
+		$[12] = message.id;
+		$[13] = onEdit;
+		$[14] = parentId;
+		$[15] = t5;
+	} else t5 = $[15];
 	const handleSendEdit = t5;
 	let t6;
-	if ($[15] !== attachmentAdapter || $[16] !== handleBeginEdit || $[17] !== handleSendEdit || $[18] !== message || $[19] !== queue) {
+	if ($[16] !== attachmentAdapter || $[17] !== handleBeginEdit || $[18] !== handleSendEdit || $[19] !== message || $[20] !== queue) {
 		t6 = ComposerClientResource({
 			type: "edit",
 			canCancel: true,
@@ -96,32 +103,32 @@ const useMessageClient = (t0) => {
 			queue,
 			attachmentAdapter
 		});
-		$[15] = attachmentAdapter;
-		$[16] = handleBeginEdit;
-		$[17] = handleSendEdit;
-		$[18] = message;
-		$[19] = queue;
-		$[20] = t6;
-	} else t6 = $[20];
+		$[16] = attachmentAdapter;
+		$[17] = handleBeginEdit;
+		$[18] = handleSendEdit;
+		$[19] = message;
+		$[20] = queue;
+		$[21] = t6;
+	} else t6 = $[21];
 	const composerClient = useClientResource(t6);
 	let branchIds;
 	let t7;
-	if ($[21] !== branches || $[22] !== message.id) {
+	if ($[22] !== branches || $[23] !== message.id) {
 		branchIds = branches?.getBranches(message.id) ?? EMPTY_BRANCH_IDS;
 		t7 = branchIds.indexOf(message.id);
-		$[21] = branches;
-		$[22] = message.id;
-		$[23] = branchIds;
-		$[24] = t7;
+		$[22] = branches;
+		$[23] = message.id;
+		$[24] = branchIds;
+		$[25] = t7;
 	} else {
-		branchIds = $[23];
-		t7 = $[24];
+		branchIds = $[24];
+		t7 = $[25];
 	}
 	const branchIndex = t7;
 	const branchNumber = branchIndex === -1 ? 1 : branchIndex + 1;
 	const branchCount = branchIndex === -1 ? 1 : branchIds.length;
 	let t8;
-	if ($[25] !== message || $[26] !== submittedFeedback) {
+	if ($[26] !== message || $[27] !== submittedFeedback) {
 		t8 = submittedFeedback && message.role === "assistant" ? {
 			...message,
 			metadata: {
@@ -129,24 +136,24 @@ const useMessageClient = (t0) => {
 				submittedFeedback
 			}
 		} : message;
-		$[25] = message;
-		$[26] = submittedFeedback;
-		$[27] = t8;
-	} else t8 = $[27];
+		$[26] = message;
+		$[27] = submittedFeedback;
+		$[28] = t8;
+	} else t8 = $[28];
 	const messageWithFeedback = t8;
 	let t9;
-	if ($[28] !== message.attachments) {
+	if ($[29] !== message.attachments) {
 		t9 = message.attachments ?? [];
-		$[28] = message.attachments;
-		$[29] = t9;
-	} else t9 = $[29];
+		$[29] = message.attachments;
+		$[30] = t9;
+	} else t9 = $[30];
 	let t10;
-	if ($[30] !== branchCount || $[31] !== branchNumber || $[32] !== composerClient.state || $[33] !== index || $[34] !== isCopied || $[35] !== isHovering || $[36] !== messageWithFeedback || $[37] !== parentId || $[38] !== partClients.state || $[39] !== speech || $[40] !== t9) {
+	if ($[31] !== branchCount || $[32] !== branchNumber || $[33] !== composerClient.state || $[34] !== index || $[35] !== isCopied || $[36] !== isHovering || $[37] !== isLast || $[38] !== messageWithFeedback || $[39] !== parentId || $[40] !== partClients.state || $[41] !== speech || $[42] !== t9) {
 		t10 = {
 			...messageWithFeedback,
 			attachments: t9,
 			parentId,
-			isLast: false,
+			isLast,
 			branchNumber,
 			branchCount,
 			speech,
@@ -156,82 +163,83 @@ const useMessageClient = (t0) => {
 			index,
 			composer: composerClient.state
 		};
-		$[30] = branchCount;
-		$[31] = branchNumber;
-		$[32] = composerClient.state;
-		$[33] = index;
-		$[34] = isCopied;
-		$[35] = isHovering;
-		$[36] = messageWithFeedback;
-		$[37] = parentId;
-		$[38] = partClients.state;
-		$[39] = speech;
-		$[40] = t9;
-		$[41] = t10;
-	} else t10 = $[41];
+		$[31] = branchCount;
+		$[32] = branchNumber;
+		$[33] = composerClient.state;
+		$[34] = index;
+		$[35] = isCopied;
+		$[36] = isHovering;
+		$[37] = isLast;
+		$[38] = messageWithFeedback;
+		$[39] = parentId;
+		$[40] = partClients.state;
+		$[41] = speech;
+		$[42] = t9;
+		$[43] = t10;
+	} else t10 = $[43];
 	const state = t10;
 	let t11;
-	if ($[42] !== state) {
+	if ($[44] !== state) {
 		t11 = () => state;
-		$[42] = state;
-		$[43] = t11;
-	} else t11 = $[43];
+		$[44] = state;
+		$[45] = t11;
+	} else t11 = $[45];
 	let t12;
-	if ($[44] !== composerClient.methods) {
+	if ($[46] !== composerClient.methods) {
 		t12 = () => composerClient.methods;
-		$[44] = composerClient.methods;
-		$[45] = t12;
-	} else t12 = $[45];
+		$[46] = composerClient.methods;
+		$[47] = t12;
+	} else t12 = $[47];
 	let t13;
-	if ($[46] !== onReload) {
+	if ($[48] !== onReload) {
 		t13 = () => {
 			onReload?.();
 		};
-		$[46] = onReload;
-		$[47] = t13;
-	} else t13 = $[47];
+		$[48] = onReload;
+		$[49] = t13;
+	} else t13 = $[49];
 	let t14;
-	if ($[48] !== branchIds || $[49] !== branchIndex || $[50] !== branches || $[51] !== message.id) {
+	if ($[50] !== branchIds || $[51] !== branchIndex || $[52] !== branches || $[53] !== message.id) {
 		t14 = (t15) => {
 			const { position, branchId } = t15;
 			if (!branches) return;
 			const target = branchId ?? (branchIndex === -1 ? void 0 : position === "previous" ? branchIds[branchIndex - 1] : position === "next" ? branchIds[branchIndex + 1] : void 0);
 			if (target !== void 0 && target !== message.id) branches.switchToBranch(target);
 		};
-		$[48] = branchIds;
-		$[49] = branchIndex;
-		$[50] = branches;
-		$[51] = message.id;
-		$[52] = t14;
-	} else t14 = $[52];
+		$[50] = branchIds;
+		$[51] = branchIndex;
+		$[52] = branches;
+		$[53] = message.id;
+		$[54] = t14;
+	} else t14 = $[54];
 	let t15;
-	if ($[53] !== message) {
+	if ($[55] !== message) {
 		t15 = () => getThreadMessageText(message);
-		$[53] = message;
-		$[54] = t15;
-	} else t15 = $[54];
+		$[55] = message;
+		$[56] = t15;
+	} else t15 = $[56];
 	let t16;
-	if ($[55] !== partClients || $[56] !== state) {
+	if ($[57] !== partClients || $[58] !== state) {
 		t16 = (selector) => {
 			if ("index" in selector) return partClients.get(selector);
 			const partIndex = state.parts.findIndex((p) => p.type === "tool-call" && p.toolCallId === selector.toolCallId);
 			return partClients.get({ index: partIndex });
 		};
-		$[55] = partClients;
-		$[56] = state;
-		$[57] = t16;
-	} else t16 = $[57];
+		$[57] = partClients;
+		$[58] = state;
+		$[59] = t16;
+	} else t16 = $[59];
 	let t17;
-	if ($[58] !== attachmentClients) {
+	if ($[60] !== attachmentClients) {
 		t17 = (selector_0) => {
 			if ("id" in selector_0) return attachmentClients.get({ key: selector_0.id });
 			return attachmentClients.get(selector_0);
 		};
-		$[58] = attachmentClients;
-		$[59] = t17;
-	} else t17 = $[59];
+		$[60] = attachmentClients;
+		$[61] = t17;
+	} else t17 = $[61];
 	let t18;
-	if ($[60] !== onSpeak || $[61] !== onStopSpeaking || $[62] !== onSubmitFeedback || $[63] !== t11 || $[64] !== t12 || $[65] !== t13 || $[66] !== t14 || $[67] !== t15 || $[68] !== t16 || $[69] !== t17) {
+	if ($[62] !== onSpeak || $[63] !== onStopSpeaking || $[64] !== onSubmitFeedback || $[65] !== t11 || $[66] !== t12 || $[67] !== t13 || $[68] !== t14 || $[69] !== t15 || $[70] !== t16 || $[71] !== t17) {
 		t18 = {
 			getState: t11,
 			composer: t12,
@@ -247,24 +255,24 @@ const useMessageClient = (t0) => {
 			setIsCopied,
 			setIsHovering
 		};
-		$[60] = onSpeak;
-		$[61] = onStopSpeaking;
-		$[62] = onSubmitFeedback;
-		$[63] = t11;
-		$[64] = t12;
-		$[65] = t13;
-		$[66] = t14;
-		$[67] = t15;
-		$[68] = t16;
-		$[69] = t17;
-		$[70] = t18;
-	} else t18 = $[70];
+		$[62] = onSpeak;
+		$[63] = onStopSpeaking;
+		$[64] = onSubmitFeedback;
+		$[65] = t11;
+		$[66] = t12;
+		$[67] = t13;
+		$[68] = t14;
+		$[69] = t15;
+		$[70] = t16;
+		$[71] = t17;
+		$[72] = t18;
+	} else t18 = $[72];
 	return t18;
 };
 const MessageClient = resource(useMessageClient);
 const usePartResource = (t0) => {
-	const $ = c(20);
-	const { part, status, messageId, onRespondToToolApproval, onAddToolResult, onResumeToolCall } = t0;
+	const $ = c(27);
+	const { part, status, messageId, onRespondToToolApproval, unstable_onRecordToolInteraction, onAddToolResult, onResumeToolCall } = t0;
 	const t1 = status;
 	let t2;
 	if ($[0] !== part || $[1] !== t1) {
@@ -305,7 +313,7 @@ const usePartResource = (t0) => {
 		$[8] = t4;
 	} else t4 = $[8];
 	let t5;
-	if ($[9] !== onResumeToolCall || $[10] !== part) {
+	if ($[9] !== messageId || $[10] !== onResumeToolCall || $[11] !== part || $[12] !== unstable_onRecordToolInteraction) {
 		t5 = (payload) => {
 			if (!onResumeToolCall) throw new Error("Runtime does not support resuming tool calls (onResumeToolCall is not set).");
 			if (part.type !== "tool-call") throw new Error("Tried to resume tool call on non-tool message part");
@@ -313,13 +321,23 @@ const usePartResource = (t0) => {
 				toolCallId: part.toolCallId,
 				payload
 			});
+			Promise.resolve().then(() => unstable_onRecordToolInteraction?.({
+				messageId,
+				toolCallId: part.toolCallId,
+				interaction: createToolInteraction({
+					type: "human-response",
+					payload
+				})
+			})).catch(_temp4);
 		};
-		$[9] = onResumeToolCall;
-		$[10] = part;
-		$[11] = t5;
-	} else t5 = $[11];
+		$[9] = messageId;
+		$[10] = onResumeToolCall;
+		$[11] = part;
+		$[12] = unstable_onRecordToolInteraction;
+		$[13] = t5;
+	} else t5 = $[13];
 	let t6;
-	if ($[12] !== onRespondToToolApproval || $[13] !== part) {
+	if ($[14] !== onRespondToToolApproval || $[15] !== part) {
 		t6 = (response_0) => {
 			if (!onRespondToToolApproval) throw new Error("Runtime does not support tool approvals.");
 			if (part.type !== "tool-call") throw new Error("Tried to respond to tool approval on non-tool message part");
@@ -332,25 +350,43 @@ const usePartResource = (t0) => {
 				return Promise.reject(error);
 			}
 		};
-		$[12] = onRespondToToolApproval;
-		$[13] = part;
-		$[14] = t6;
-	} else t6 = $[14];
+		$[14] = onRespondToToolApproval;
+		$[15] = part;
+		$[16] = t6;
+	} else t6 = $[16];
 	let t7;
-	if ($[15] !== t3 || $[16] !== t4 || $[17] !== t5 || $[18] !== t6) {
-		t7 = {
+	if ($[17] !== messageId || $[18] !== part || $[19] !== unstable_onRecordToolInteraction) {
+		t7 = async (input) => {
+			if (!unstable_onRecordToolInteraction) throw new Error("Runtime does not support recording tool interactions.");
+			if (part.type !== "tool-call") throw new Error("Tried to record interaction on non-tool message part");
+			await unstable_onRecordToolInteraction({
+				messageId,
+				toolCallId: part.toolCallId,
+				interaction: createToolInteraction(input)
+			});
+		};
+		$[17] = messageId;
+		$[18] = part;
+		$[19] = unstable_onRecordToolInteraction;
+		$[20] = t7;
+	} else t7 = $[20];
+	let t8;
+	if ($[21] !== t3 || $[22] !== t4 || $[23] !== t5 || $[24] !== t6 || $[25] !== t7) {
+		t8 = {
 			getState: t3,
 			addToolResult: t4,
 			resumeToolCall: t5,
-			respondToToolApproval: t6
+			respondToToolApproval: t6,
+			unstable_recordInteraction: t7
 		};
-		$[15] = t3;
-		$[16] = t4;
-		$[17] = t5;
-		$[18] = t6;
-		$[19] = t7;
-	} else t7 = $[19];
-	return t7;
+		$[21] = t3;
+		$[22] = t4;
+		$[23] = t5;
+		$[24] = t6;
+		$[25] = t7;
+		$[26] = t8;
+	} else t8 = $[26];
+	return t8;
 };
 const PartResource = resource(usePartResource);
 const useAttachmentResource = ({ attachment, onRemove }) => {
@@ -362,6 +398,7 @@ const useAttachmentResource = ({ attachment, onRemove }) => {
 	};
 };
 const AttachmentResource = resource(useAttachmentResource);
+const EMPTY_MESSAGE_KEYS = Object.freeze([]);
 const useQueueItemClient = ({ item, onMove, onRemove }) => {
 	return {
 		getState: () => item,
@@ -399,144 +436,327 @@ const useLiveState = (initial) => {
 	} else t1 = $[2];
 	return t1;
 };
-const removeAttachmentThroughAdapter = async (attachment, attachmentAdapter, setAttachments) => {
+const removeAttachmentThroughAdapter = async (attachment, attachmentAdapter, onError) => {
 	try {
 		await attachmentAdapter?.remove(attachment);
 	} catch (error) {
-		const message = error instanceof Error ? error.message : String(error);
-		setAttachments((prev) => prev.map((candidate) => candidate.id === attachment.id && !isAttachmentComplete(candidate) ? {
-			...candidate,
-			status: {
-				type: "incomplete",
-				reason: "error",
-				message
-			}
-		} : candidate));
+		onError(error instanceof Error ? error.message : String(error));
 		throw error;
 	}
 };
+const dispatchSafely = (dispatch) => {
+	try {
+		dispatch();
+		return;
+	} catch (error) {
+		return { error };
+	}
+};
+const abortOnDestroy = (destroySignal, controller) => {
+	if (!destroySignal) return () => {};
+	const abort = () => controller.abort(destroySignal.reason);
+	if (destroySignal.aborted) {
+		abort();
+		return () => {};
+	}
+	const unlink = () => {
+		destroySignal.removeEventListener("abort", abort);
+		controller.signal.removeEventListener("abort", unlink);
+	};
+	destroySignal.addEventListener("abort", abort, { once: true });
+	controller.signal.addEventListener("abort", unlink, { once: true });
+	return unlink;
+};
+const EMPTY_IN_TRANSIT = Object.freeze([]);
 const useComposerClientResource = (t0) => {
-	const $ = c(108);
-	const { type, canCancel, isRunning: t1, isSendDisabled: t2, onCancel, onBeginEdit, onSend, message, queue, attachmentAdapter } = t0;
+	const $ = c(190);
+	const { type, canCancel, isRunning: t1, isSendDisabled: t2, onCancel, onBeginEdit, onSend, message, queue, attachmentAdapter, messageKeys: t3 } = t0;
 	const isRunning = t1 === void 0 ? false : t1;
 	const isSendDisabled = t2 === void 0 ? false : t2;
+	const messageKeys = t3 === void 0 ? EMPTY_MESSAGE_KEYS : t3;
 	const [isEditing, setIsEditing, isEditingRef] = useLiveState(type === "thread");
 	const [text, setText, textRef] = useLiveState("");
 	const [role, setRole, roleRef] = useLiveState("user");
-	let t3;
-	if ($[0] === Symbol.for("react.memo_cache_sentinel")) {
-		t3 = {};
-		$[0] = t3;
-	} else t3 = $[0];
-	const [runConfig, setRunConfig, runConfigRef] = useLiveState(t3);
 	let t4;
+	if ($[0] === Symbol.for("react.memo_cache_sentinel")) {
+		t4 = {};
+		$[0] = t4;
+	} else t4 = $[0];
+	const [runConfig, setRunConfig, runConfigRef] = useLiveState(t4);
+	let t5;
 	if ($[1] === Symbol.for("react.memo_cache_sentinel")) {
-		t4 = [];
-		$[1] = t4;
-	} else t4 = $[1];
-	const [attachments, setAttachments, attachmentsRef] = useLiveState(t4);
+		t5 = [];
+		$[1] = t5;
+	} else t5 = $[1];
+	const [attachments, setAttachments, attachmentsRef] = useLiveState(t5);
 	const [quote, setQuote, quoteRef] = useLiveState(void 0);
-	let t5;
-	if ($[2] === Symbol.for("react.memo_cache_sentinel")) {
-		t5 = new AttachmentAddOperations();
-		$[2] = t5;
-	} else t5 = $[2];
-	const attachmentAddOperations = t5;
 	let t6;
-	if ($[3] !== message || $[4] !== setAttachments || $[5] !== setRole || $[6] !== setText) {
-		t6 = () => {
+	if ($[2] === Symbol.for("react.memo_cache_sentinel")) {
+		t6 = new AttachmentAddOperations();
+		$[2] = t6;
+	} else t6 = $[2];
+	const attachmentAddOperations = t6;
+	let t7;
+	if ($[3] === Symbol.for("react.memo_cache_sentinel")) {
+		t7 = new AttachmentSendOperations();
+		$[3] = t7;
+	} else t7 = $[3];
+	const attachmentSends = t7;
+	const destroySignal = useAssistantClientDestroySignal();
+	const [submission, setSubmission, submissionRef] = useLiveState(void 0);
+	const submissionSend = useRef(void 0);
+	const [inTransit, setInTransit] = useLiveState(EMPTY_IN_TRANSIT);
+	const messageKeysRef = useRef(messageKeys);
+	const sendGeneration = useRef(0);
+	let claimed;
+	let landed;
+	if ($[4] !== inTransit || $[5] !== messageKeys) {
+		claimed = /* @__PURE__ */ new Set();
+		landed = /* @__PURE__ */ new Set();
+		for (const entry of inTransit) {
+			const key = messageKeys.find((candidate) => !entry.known.has(candidate) && !claimed.has(candidate) && candidate.endsWith(`|${entry.submission.role}`));
+			if (key === void 0) continue;
+			claimed.add(key);
+			landed.add(entry);
+		}
+		$[4] = inTransit;
+		$[5] = messageKeys;
+		$[6] = claimed;
+		$[7] = landed;
+	} else {
+		claimed = $[6];
+		landed = $[7];
+	}
+	let t8;
+	if ($[8] !== claimed || $[9] !== landed) {
+		t8 = {
+			landed,
+			claimed
+		};
+		$[8] = claimed;
+		$[9] = landed;
+		$[10] = t8;
+	} else t8 = $[10];
+	const shown = t8;
+	let t9;
+	if ($[11] !== inTransit || $[12] !== shown.landed) {
+		let t10;
+		if ($[14] !== shown.landed) {
+			t10 = (entry_0) => !shown.landed.has(entry_0);
+			$[14] = shown.landed;
+			$[15] = t10;
+		} else t10 = $[15];
+		t9 = inTransit.filter(t10).map(_temp5);
+		$[11] = inTransit;
+		$[12] = shown.landed;
+		$[13] = t9;
+	} else t9 = $[13];
+	const inTransitSubmissions = t9;
+	let t10;
+	if ($[16] !== messageKeys || $[17] !== setInTransit || $[18] !== shown.claimed || $[19] !== shown.landed) {
+		t10 = () => {
+			messageKeysRef.current = messageKeys;
+			if (shown.landed.size === 0) return;
+			setInTransit((prev) => prev.filter((entry_2) => !shown.landed.has(entry_2)).map((entry_3) => ({
+				...entry_3,
+				known: /* @__PURE__ */ new Set([...entry_3.known, ...shown.claimed])
+			})));
+		};
+		$[16] = messageKeys;
+		$[17] = setInTransit;
+		$[18] = shown.claimed;
+		$[19] = shown.landed;
+		$[20] = t10;
+	} else t10 = $[20];
+	let t11;
+	if ($[21] !== messageKeys || $[22] !== setInTransit || $[23] !== shown) {
+		t11 = [
+			messageKeys,
+			shown,
+			setInTransit
+		];
+		$[21] = messageKeys;
+		$[22] = setInTransit;
+		$[23] = shown;
+		$[24] = t11;
+	} else t11 = $[24];
+	useEffect(t10, t11);
+	let t12;
+	if ($[25] !== message || $[26] !== setAttachments || $[27] !== setRole || $[28] !== setText) {
+		t12 = () => {
 			if (!message) return;
-			const messageText = message.content.filter(_temp4).map(_temp5).join("\n\n");
+			const messageText = message.content.filter(_temp6).map(_temp7).join("\n\n");
 			setText(messageText);
 			setRole(message.role);
-			setAttachments(message.attachments ?? []);
+			const restored = message.attachments ?? [];
+			for (const attachment of restored) attachmentSends.unmarkRemoved(attachment);
+			setAttachments(restored);
 		};
-		$[3] = message;
-		$[4] = setAttachments;
-		$[5] = setRole;
-		$[6] = setText;
-		$[7] = t6;
-	} else t6 = $[7];
-	const updateFromMessage = t6;
-	let t7;
-	if ($[8] !== attachmentAdapter || $[9] !== attachments || $[10] !== setAttachments) {
-		let t8;
-		if ($[12] !== attachmentAdapter || $[13] !== setAttachments) {
-			t8 = (attachment) => withKey(attachment.id, AttachmentResource({
-				attachment,
-				onRemove: async () => {
-					attachmentAddOperations.cancel(attachment.id);
-					if (!isAttachmentComplete(attachment)) await removeAttachmentThroughAdapter(attachment, attachmentAdapter, setAttachments);
-					setAttachments((prev) => prev.filter((a) => a.id !== attachment.id));
+		$[25] = message;
+		$[26] = setAttachments;
+		$[27] = setRole;
+		$[28] = setText;
+		$[29] = t12;
+	} else t12 = $[29];
+	const updateFromMessage = t12;
+	let t13;
+	if ($[30] !== attachmentAdapter || $[31] !== setAttachments) {
+		t13 = async (attachment_0) => {
+			attachmentAddOperations.cancel(attachment_0.id);
+			attachmentSends.markRemoved(attachment_0);
+			if (!isAttachmentComplete(attachment_0)) await removeAttachmentThroughAdapter(attachment_0, attachmentAdapter, (message_0) => setAttachments((prev_0) => prev_0.map((candidate_0) => candidate_0.id === attachment_0.id && !isAttachmentComplete(candidate_0) ? attachmentSends.transfer(candidate_0, {
+				...candidate_0,
+				status: {
+					type: "incomplete",
+					reason: "error",
+					message: message_0
 				}
+			}) : candidate_0)));
+			setAttachments((prev_1) => prev_1.filter((a) => a.id !== attachment_0.id));
+		};
+		$[30] = attachmentAdapter;
+		$[31] = setAttachments;
+		$[32] = t13;
+	} else t13 = $[32];
+	const handleRemoveAttachment = t13;
+	let t14;
+	if ($[33] !== attachmentAdapter || $[34] !== setSubmission) {
+		t14 = async (attachment_1) => {
+			attachmentAddOperations.cancel(attachment_1.id);
+			attachmentSends.markRemoved(attachment_1);
+			if (!isAttachmentComplete(attachment_1)) await removeAttachmentThroughAdapter(attachment_1, attachmentAdapter, (message_1) => setSubmission((prev_2) => prev_2 ? {
+				...prev_2,
+				attachments: prev_2.attachments.map((candidate_1) => {
+					if (candidate_1.id !== attachment_1.id || isAttachmentComplete(candidate_1)) return candidate_1;
+					const failed = attachmentSends.transfer(candidate_1, {
+						...candidate_1,
+						status: {
+							type: "incomplete",
+							reason: "error",
+							message: message_1
+						}
+					});
+					attachmentSends.markRemoved(failed);
+					return failed;
+				})
+			} : prev_2));
+			setSubmission((prev_3) => prev_3 ? {
+				...prev_3,
+				attachments: prev_3.attachments.filter((a_0) => a_0.id !== attachment_1.id)
+			} : prev_3);
+		};
+		$[33] = attachmentAdapter;
+		$[34] = setSubmission;
+		$[35] = t14;
+	} else t14 = $[35];
+	const handleRemoveSubmittedAttachment = t14;
+	let t15;
+	if ($[36] !== attachments || $[37] !== handleRemoveAttachment) {
+		let t16;
+		if ($[39] !== handleRemoveAttachment) {
+			t16 = (attachment_2) => withKey(attachment_2.id, AttachmentResource({
+				attachment: attachment_2,
+				onRemove: () => handleRemoveAttachment(attachment_2)
 			}));
-			$[12] = attachmentAdapter;
-			$[13] = setAttachments;
-			$[14] = t8;
-		} else t8 = $[14];
-		t7 = attachments.map(t8);
-		$[8] = attachmentAdapter;
-		$[9] = attachments;
-		$[10] = setAttachments;
-		$[11] = t7;
-	} else t7 = $[11];
-	const attachmentClients = useClientLookup(t7);
-	let t8;
-	if ($[15] !== attachmentAdapter) {
-		t8 = async (removed) => {
+			$[39] = handleRemoveAttachment;
+			$[40] = t16;
+		} else t16 = $[40];
+		t15 = attachments.map(t16);
+		$[36] = attachments;
+		$[37] = handleRemoveAttachment;
+		$[38] = t15;
+	} else t15 = $[38];
+	const attachmentClients = useClientLookup(t15);
+	let t16;
+	if ($[41] !== attachments || $[42] !== handleRemoveSubmittedAttachment || $[43] !== submission?.attachments) {
+		let t17;
+		if ($[45] !== attachments) {
+			t17 = (attachment_3) => !attachments.some((a_1) => a_1.id === attachment_3.id);
+			$[45] = attachments;
+			$[46] = t17;
+		} else t17 = $[46];
+		let t18;
+		if ($[47] !== handleRemoveSubmittedAttachment) {
+			t18 = (attachment_4) => withKey(attachment_4.id, AttachmentResource({
+				attachment: attachment_4,
+				onRemove: () => handleRemoveSubmittedAttachment(attachment_4)
+			}));
+			$[47] = handleRemoveSubmittedAttachment;
+			$[48] = t18;
+		} else t18 = $[48];
+		t16 = (submission?.attachments ?? []).filter(t17).map(t18);
+		$[41] = attachments;
+		$[42] = handleRemoveSubmittedAttachment;
+		$[43] = submission?.attachments;
+		$[44] = t16;
+	} else t16 = $[44];
+	const submittedAttachmentClients = useClientLookup(t16);
+	let t17;
+	if ($[49] !== attachmentAdapter) {
+		t17 = async (removed) => {
 			if (!attachmentAdapter) return;
-			await Promise.all(removed.filter(_temp6).map(async (a_1) => attachmentAdapter.remove(a_1)));
+			await Promise.all(removed.filter(_temp8).map(async (a_3) => attachmentAdapter.remove(a_3)));
 		};
-		$[15] = attachmentAdapter;
-		$[16] = t8;
-	} else t8 = $[16];
-	const removePendingAttachments = t8;
-	let t9;
-	if ($[17] !== setAttachments) {
-		t9 = (attachment_0) => {
-			setAttachments((prev_0) => {
-				const idx = prev_0.findIndex((a_2) => a_2.id === attachment_0.id);
-				if (idx === -1) return [...prev_0, attachment_0];
-				const next = [...prev_0];
-				next[idx] = attachment_0;
+		$[49] = attachmentAdapter;
+		$[50] = t17;
+	} else t17 = $[50];
+	const removePendingAttachments = t17;
+	let t18;
+	if ($[51] !== setAttachments || $[52] !== setSubmission || $[53] !== submissionRef) {
+		t18 = (attachment_5) => {
+			const current = submissionRef.current;
+			if (current?.attachments.some((a_5) => a_5.id === attachment_5.id)) {
+				setSubmission({
+					...current,
+					attachments: current.attachments.map((a_4) => a_4.id === attachment_5.id ? attachmentSends.transfer(a_4, attachment_5) : a_4)
+				});
+				return;
+			}
+			setAttachments((prev_4) => {
+				const idx = prev_4.findIndex((a_6) => a_6.id === attachment_5.id);
+				if (idx === -1) return [...prev_4, attachment_5];
+				const next = [...prev_4];
+				next[idx] = attachment_5;
 				return next;
 			});
 		};
-		$[17] = setAttachments;
-		$[18] = t9;
-	} else t9 = $[18];
-	const upsertAttachment = t9;
+		$[51] = setAttachments;
+		$[52] = setSubmission;
+		$[53] = submissionRef;
+		$[54] = t18;
+	} else t18 = $[54];
+	const upsertAttachment = t18;
 	const steerItems = queue?.steerItems ?? EMPTY_QUEUE_ITEMS;
 	const laneItems = queue?.items ?? EMPTY_QUEUE_ITEMS;
-	let t10;
-	if ($[19] !== laneItems || $[20] !== steerItems) {
-		t10 = steerItems.length === 0 ? laneItems : laneItems.length === 0 ? steerItems : [...steerItems, ...laneItems];
-		$[19] = laneItems;
-		$[20] = steerItems;
-		$[21] = t10;
-	} else t10 = $[21];
-	const queueItems = t10;
-	let t11;
-	if ($[22] !== queue || $[23] !== queueItems) {
-		let t12;
-		if ($[25] !== queue) {
-			t12 = (item) => withKey(item.id, QueueItemClient({
+	let t19;
+	if ($[55] !== laneItems || $[56] !== steerItems) {
+		t19 = steerItems.length === 0 ? laneItems : laneItems.length === 0 ? steerItems : [...steerItems, ...laneItems];
+		$[55] = laneItems;
+		$[56] = steerItems;
+		$[57] = t19;
+	} else t19 = $[57];
+	const queueItems = t19;
+	let t20;
+	if ($[58] !== queue || $[59] !== queueItems) {
+		let t21;
+		if ($[61] !== queue) {
+			t21 = (item) => withKey(item.id, QueueItemClient({
 				item,
 				onMove: (placement) => queue?.move(item.id, placement),
 				onRemove: () => queue?.remove(item.id)
 			}));
-			$[25] = queue;
-			$[26] = t12;
-		} else t12 = $[26];
-		t11 = queueItems.map(t12);
-		$[22] = queue;
-		$[23] = queueItems;
-		$[24] = t11;
-	} else t11 = $[24];
-	const queueItemClients = useClientLookup(t11);
-	let t12;
-	if ($[27] !== attachmentAdapter?.accept || $[28] !== attachmentClients.state || $[29] !== attachments.length || $[30] !== canCancel || $[31] !== isEditing || $[32] !== isSendDisabled || $[33] !== queueItems || $[34] !== quote || $[35] !== role || $[36] !== runConfig || $[37] !== text || $[38] !== type) {
-		t12 = () => {
+			$[61] = queue;
+			$[62] = t21;
+		} else t21 = $[62];
+		t20 = queueItems.map(t21);
+		$[58] = queue;
+		$[59] = queueItems;
+		$[60] = t20;
+	} else t20 = $[60];
+	const queueItemClients = useClientLookup(t20);
+	let t21;
+	if ($[63] !== attachmentAdapter?.accept || $[64] !== attachmentClients.state || $[65] !== attachments.length || $[66] !== canCancel || $[67] !== inTransitSubmissions || $[68] !== isEditing || $[69] !== isSendDisabled || $[70] !== queueItems || $[71] !== quote || $[72] !== role || $[73] !== runConfig || $[74] !== submission || $[75] !== text || $[76] !== type) {
+		t21 = () => {
 			const isEmpty = !text.trim() && !attachments.length;
 			return {
 				text,
@@ -544,47 +764,248 @@ const useComposerClientResource = (t0) => {
 				attachments: attachmentClients.state,
 				runConfig,
 				isEditing,
-				canCancel,
-				canSend: isEditing && !isEmpty && !isSendDisabled,
+				canCancel: canCancel || submission !== void 0,
+				canSend: isEditing && !isEmpty && !isSendDisabled && submission === void 0,
 				attachmentAccept: attachmentAdapter?.accept ?? "*",
 				isEmpty,
 				type,
 				dictation: void 0,
 				quote,
-				queue: queueItems
+				queue: queueItems,
+				submission,
+				inTransit: inTransitSubmissions
 			};
 		};
-		$[27] = attachmentAdapter?.accept;
-		$[28] = attachmentClients.state;
-		$[29] = attachments.length;
-		$[30] = canCancel;
-		$[31] = isEditing;
-		$[32] = isSendDisabled;
-		$[33] = queueItems;
-		$[34] = quote;
-		$[35] = role;
-		$[36] = runConfig;
-		$[37] = text;
-		$[38] = type;
-		$[39] = t12;
-	} else t12 = $[39];
+		$[63] = attachmentAdapter?.accept;
+		$[64] = attachmentClients.state;
+		$[65] = attachments.length;
+		$[66] = canCancel;
+		$[67] = inTransitSubmissions;
+		$[68] = isEditing;
+		$[69] = isSendDisabled;
+		$[70] = queueItems;
+		$[71] = quote;
+		$[72] = role;
+		$[73] = runConfig;
+		$[74] = submission;
+		$[75] = text;
+		$[76] = type;
+		$[77] = t21;
+	} else t21 = $[77];
 	attachmentAdapter?.accept;
-	let t13;
-	if ($[40] !== t12) {
-		t13 = t12();
-		$[40] = t12;
-		$[41] = t13;
-	} else t13 = $[41];
-	const state = t13;
-	let t14;
-	if ($[42] !== state) {
-		t14 = () => state;
-		$[42] = state;
-		$[43] = t14;
-	} else t14 = $[43];
-	let t15;
-	if ($[44] !== attachmentAdapter || $[45] !== setAttachments || $[46] !== upsertAttachment) {
-		t15 = async (fileOrAttachment) => {
+	let t22;
+	if ($[78] !== t21) {
+		t22 = t21();
+		$[78] = t21;
+		$[79] = t22;
+	} else t22 = $[79];
+	const state = t22;
+	let t23;
+	if ($[80] !== setSubmission) {
+		t23 = () => {
+			sendGeneration.current = sendGeneration.current + 1;
+			submissionSend.current = void 0;
+			setSubmission(void 0);
+		};
+		$[80] = setSubmission;
+		$[81] = t23;
+	} else t23 = $[81];
+	const endSubmission = t23;
+	let t24;
+	if ($[82] !== setAttachments || $[83] !== setQuote || $[84] !== setText || $[85] !== type) {
+		t24 = (content) => {
+			if (type !== "thread") {
+				const returned = new Map(content.attachments.map(_temp9));
+				setAttachments((prev_5) => prev_5.map((attachment_7) => returned.get(attachment_7.id) ?? attachment_7));
+				return;
+			}
+			const kept = content.attachments.filter((attachment_8) => !attachmentSends.isRemoved(attachment_8));
+			setAttachments((prev_6) => [...kept, ...prev_6]);
+			setText((prev_7) => [content.text, prev_7].filter(Boolean).join("\n"));
+			setQuote((prev_8) => prev_8 ?? content.quote);
+		};
+		$[82] = setAttachments;
+		$[83] = setQuote;
+		$[84] = setText;
+		$[85] = type;
+		$[86] = t24;
+	} else t24 = $[86];
+	const returnToDraft = t24;
+	let t25;
+	if ($[87] !== endSubmission || $[88] !== returnToDraft || $[89] !== submissionRef) {
+		t25 = () => {
+			const current_0 = submissionRef.current;
+			if (!current_0) return;
+			submissionSend.current?.controller.abort();
+			endSubmission();
+			returnToDraft(current_0);
+		};
+		$[87] = endSubmission;
+		$[88] = returnToDraft;
+		$[89] = submissionRef;
+		$[90] = t25;
+	} else t25 = $[90];
+	const cancelSubmission = t25;
+	let t26;
+	if ($[91] !== attachmentsRef || $[92] !== endSubmission || $[93] !== removePendingAttachments || $[94] !== submissionRef) {
+		t26 = async () => {
+			const current_1 = submissionRef.current;
+			if (!current_1) return;
+			submissionSend.current?.controller.abort();
+			endSubmission();
+			const drafted = new Set(attachmentsRef.current.map(_temp0));
+			await removePendingAttachments(current_1.attachments.filter((attachment_9) => !drafted.has(attachment_9.id)));
+		};
+		$[91] = attachmentsRef;
+		$[92] = endSubmission;
+		$[93] = removePendingAttachments;
+		$[94] = submissionRef;
+		$[95] = t26;
+	} else t26 = $[95];
+	const discardSubmission = t26;
+	let t27;
+	if ($[96] !== endSubmission || $[97] !== returnToDraft || $[98] !== submissionRef) {
+		t27 = (sent, settled, reason) => {
+			const current_2 = submissionRef.current;
+			if (!current_2) return;
+			const failures = /* @__PURE__ */ new Map();
+			settled.forEach((result, index) => {
+				if (result.status === "rejected") failures.set(sent[index].id, result.reason);
+			});
+			const attachments_0 = current_2.attachments.map((attachment_10) => {
+				if (!failures.has(attachment_10.id) || isAttachmentComplete(attachment_10)) return attachment_10;
+				const failure = failures.get(attachment_10.id);
+				return attachmentSends.transfer(attachment_10, {
+					...attachment_10,
+					status: {
+						type: "incomplete",
+						reason: "error",
+						message: failure instanceof Error ? failure.message : String(failure)
+					}
+				});
+			});
+			endSubmission();
+			returnToDraft({
+				...current_2,
+				attachments: attachments_0
+			});
+			console.error("Failed to send attachments", reason);
+		};
+		$[96] = endSubmission;
+		$[97] = returnToDraft;
+		$[98] = submissionRef;
+		$[99] = t27;
+	} else t27 = $[99];
+	const returnSubmissionToDraft = t27;
+	let t28;
+	if ($[100] !== isRunning || $[101] !== onSend || $[102] !== queue || $[103] !== returnToDraft || $[104] !== setAttachments || $[105] !== setInTransit || $[106] !== setIsEditing || $[107] !== setSubmission || $[108] !== type) {
+		t28 = (current_3, attachments_1, context, isSubmission) => {
+			const composedMessage = {
+				role: current_3.role,
+				content: current_3.text ? [{
+					type: "text",
+					text: current_3.text
+				}] : [],
+				attachments: attachments_1,
+				createdAt: /* @__PURE__ */ new Date(),
+				parentId: null,
+				sourceId: null,
+				runConfig: context.runConfig,
+				startRun: context.options?.startRun,
+				metadata: { custom: { ...current_3.quote ? { quote: current_3.quote } : {} } }
+			};
+			const sent_0 = {
+				...current_3,
+				attachments: attachments_1
+			};
+			const queued = queue && type === "thread";
+			if (isSubmission) {
+				submissionSend.current = void 0;
+				setSubmission(void 0);
+			}
+			if (isSubmission && type !== "thread") {
+				const delivered = new Map(attachments_1.map(_temp1));
+				setAttachments((prev_9) => prev_9.map((attachment_12) => delivered.get(attachment_12.id) ?? attachment_12));
+			}
+			const entry_4 = isSubmission && type === "thread" && !queued ? {
+				submission: sent_0,
+				known: new Set(messageKeysRef.current)
+			} : void 0;
+			if (entry_4) setInTransit((prev_10) => [...prev_10, entry_4]);
+			const failure_0 = dispatchSafely(() => {
+				if (queued) {
+					if (context.options?.steer ?? isRunning) queue.steer(composedMessage);
+					else queue.enqueue(composedMessage);
+				} else onSend?.(composedMessage);
+			});
+			if (failure_0) {
+				console.error("[assistant-ui] Failed to send the message", failure_0.error);
+				if (entry_4) setInTransit((prev_11) => prev_11.filter((candidate_2) => candidate_2 !== entry_4));
+				returnToDraft(sent_0);
+				return;
+			}
+			if (type === "edit") {
+				attachmentAddOperations.cancelAll();
+				setIsEditing(false);
+			}
+		};
+		$[100] = isRunning;
+		$[101] = onSend;
+		$[102] = queue;
+		$[103] = returnToDraft;
+		$[104] = setAttachments;
+		$[105] = setInTransit;
+		$[106] = setIsEditing;
+		$[107] = setSubmission;
+		$[108] = type;
+		$[109] = t28;
+	} else t28 = $[109];
+	const dispatchMessage = t28;
+	let t29;
+	if ($[110] !== attachmentAdapter || $[111] !== dispatchMessage || $[112] !== returnSubmissionToDraft || $[113] !== submissionRef) {
+		t29 = async (generation) => {
+			const context_0 = submissionSend.current;
+			if (!context_0) return;
+			const { signal } = context_0.controller;
+			if (signal.aborted) return;
+			const uploads = (submissionRef.current?.attachments ?? []).flatMap((attachment_13) => {
+				const upload = attachmentAddOperations.whenSendable(attachment_13.id);
+				return upload ? [upload] : [];
+			});
+			if (uploads.length > 0) {
+				await Promise.all(uploads);
+				if (generation !== sendGeneration.current || signal.aborted) return;
+			}
+			const current_4 = submissionRef.current;
+			if (!current_4) return;
+			const sent_1 = current_4.attachments.filter((attachment_14) => !attachmentSends.isRemoved(attachment_14));
+			for (const attachment_15 of sent_1) attachmentAddOperations.cancel(attachment_15.id);
+			const settled_0 = await Promise.allSettled(sent_1.map((attachment_16) => attachmentSends.send(attachment_16, attachmentAdapter, signal)));
+			if (generation !== sendGeneration.current || signal.aborted) return;
+			const rejection = settled_0.find(_temp10);
+			if (rejection) {
+				returnSubmissionToDraft(sent_1, settled_0, rejection.reason);
+				return;
+			}
+			const finalAttachments = settled_0.flatMap((result_1, index_0) => attachmentSends.isRemoved(sent_1[index_0]) || result_1.status === "rejected" ? [] : [result_1.value]);
+			dispatchMessage(submissionRef.current ?? current_4, finalAttachments, context_0, true);
+		};
+		$[110] = attachmentAdapter;
+		$[111] = dispatchMessage;
+		$[112] = returnSubmissionToDraft;
+		$[113] = submissionRef;
+		$[114] = t29;
+	} else t29 = $[114];
+	const prepareSubmission = t29;
+	let t30;
+	if ($[115] !== state) {
+		t30 = () => state;
+		$[115] = state;
+		$[116] = t30;
+	} else t30 = $[116];
+	let t31;
+	if ($[117] !== attachmentAdapter || $[118] !== setAttachments || $[119] !== upsertAttachment) {
+		t31 = async (fileOrAttachment) => {
 			if (attachmentAdapter) {
 				const file = isCreateAttachment(fileOrAttachment) ? {
 					name: fileOrAttachment.name,
@@ -598,14 +1019,14 @@ const useComposerClientResource = (t0) => {
 			if (!isCreateAttachment(fileOrAttachment) && attachmentAdapter) {
 				const operation = attachmentAddOperations.start();
 				try {
-					await drainAttachmentAdd(attachmentAdapter.add({ file: fileOrAttachment }), (attachment_1) => {
-						if (!attachmentAddOperations.accept(operation, attachment_1.id)) return false;
-						upsertAttachment(attachment_1);
+					await drainAttachmentAdd(attachmentAdapter.add({ file: fileOrAttachment }), (attachment_17) => {
+						if (!attachmentAddOperations.accept(operation, attachment_17)) return false;
+						upsertAttachment(attachment_17);
 						return true;
 					});
 					attachmentAddOperations.finish(operation);
-				} catch (t16) {
-					const error = t16;
+				} catch (t32) {
+					const error = t32;
 					attachmentAddOperations.finish(operation);
 					if (!attachmentAddOperations.isCancelled(operation)) throw error;
 				}
@@ -619,7 +1040,7 @@ const useComposerClientResource = (t0) => {
 					status: { type: "complete" },
 					content: []
 				};
-				setAttachments((prev_1) => [...prev_1, newAttachment]);
+				setAttachments((prev_12) => [...prev_12, newAttachment]);
 			} else {
 				const newAttachment_0 = {
 					id: fileOrAttachment.id ?? generateId(),
@@ -629,199 +1050,220 @@ const useComposerClientResource = (t0) => {
 					content: fileOrAttachment.content,
 					status: { type: "complete" }
 				};
-				setAttachments((prev_2) => [...prev_2, newAttachment_0]);
+				setAttachments((prev_13) => [...prev_13, newAttachment_0]);
 			}
 		};
-		$[44] = attachmentAdapter;
-		$[45] = setAttachments;
-		$[46] = upsertAttachment;
-		$[47] = t15;
-	} else t15 = $[47];
-	let t16;
-	if ($[48] !== attachmentsRef || $[49] !== removePendingAttachments || $[50] !== setAttachments) {
-		t16 = async () => {
+		$[117] = attachmentAdapter;
+		$[118] = setAttachments;
+		$[119] = upsertAttachment;
+		$[120] = t31;
+	} else t31 = $[120];
+	let t32;
+	if ($[121] !== attachmentsRef || $[122] !== removePendingAttachments || $[123] !== setAttachments || $[124] !== submissionRef) {
+		t32 = async () => {
 			attachmentAddOperations.cancelAll();
 			const removed_0 = attachmentsRef.current;
+			if (submissionRef.current) for (const attachment_18 of removed_0) attachmentSends.markRemoved(attachment_18);
 			setAttachments([]);
 			await removePendingAttachments(removed_0);
 		};
-		$[48] = attachmentsRef;
-		$[49] = removePendingAttachments;
-		$[50] = setAttachments;
-		$[51] = t16;
-	} else t16 = $[51];
-	let t17;
-	if ($[52] !== attachmentClients) {
-		t17 = (selector) => {
-			if ("id" in selector) return attachmentClients.get({ key: selector.id });
+		$[121] = attachmentsRef;
+		$[122] = removePendingAttachments;
+		$[123] = setAttachments;
+		$[124] = submissionRef;
+		$[125] = t32;
+	} else t32 = $[125];
+	let t33;
+	if ($[126] !== attachmentClients || $[127] !== attachments || $[128] !== submission?.attachments || $[129] !== submittedAttachmentClients) {
+		t33 = (selector) => {
+			if ("id" in selector) {
+				const submitted = submission?.attachments.some((attachment_19) => attachment_19.id === selector.id);
+				const inDraft = attachments.some((attachment_20) => attachment_20.id === selector.id);
+				if (submitted && !inDraft) return submittedAttachmentClients.get({ key: selector.id });
+				return attachmentClients.get({ key: selector.id });
+			}
 			return attachmentClients.get(selector);
 		};
-		$[52] = attachmentClients;
-		$[53] = t17;
-	} else t17 = $[53];
-	let t18;
-	if ($[54] !== attachmentsRef || $[55] !== removePendingAttachments || $[56] !== setAttachments || $[57] !== setQuote || $[58] !== setRole || $[59] !== setRunConfig || $[60] !== setText) {
-		t18 = async () => {
+		$[126] = attachmentClients;
+		$[127] = attachments;
+		$[128] = submission?.attachments;
+		$[129] = submittedAttachmentClients;
+		$[130] = t33;
+	} else t33 = $[130];
+	let t34;
+	if ($[131] !== attachmentsRef || $[132] !== discardSubmission || $[133] !== removePendingAttachments || $[134] !== setAttachments || $[135] !== setQuote || $[136] !== setRole || $[137] !== setRunConfig || $[138] !== setText) {
+		t34 = async () => {
 			attachmentAddOperations.cancelAll();
+			sendGeneration.current = sendGeneration.current + 1;
+			const discarded = discardSubmission();
 			const removed_1 = attachmentsRef.current;
 			setText("");
 			setRole("user");
 			setRunConfig({});
 			setAttachments([]);
 			setQuote(void 0);
-			await removePendingAttachments(removed_1);
+			await Promise.all([removePendingAttachments(removed_1), discarded]);
 		};
-		$[54] = attachmentsRef;
-		$[55] = removePendingAttachments;
-		$[56] = setAttachments;
-		$[57] = setQuote;
-		$[58] = setRole;
-		$[59] = setRunConfig;
-		$[60] = setText;
-		$[61] = t18;
-	} else t18 = $[61];
-	let t19;
-	if ($[62] !== attachmentAdapter || $[63] !== attachmentsRef || $[64] !== isEditingRef || $[65] !== isRunning || $[66] !== isSendDisabled || $[67] !== onSend || $[68] !== queue || $[69] !== quoteRef || $[70] !== roleRef || $[71] !== runConfigRef || $[72] !== setAttachments || $[73] !== setIsEditing || $[74] !== setQuote || $[75] !== setText || $[76] !== textRef || $[77] !== type) {
-		t19 = (opts) => {
-			const currentQuote = quoteRef.current;
-			const currentText = textRef.current;
-			const currentRole = roleRef.current;
-			const currentRunConfig = runConfigRef.current;
-			const currentAttachments = attachmentsRef.current;
-			const isEmpty_0 = !currentText.trim() && !currentAttachments.length;
+		$[131] = attachmentsRef;
+		$[132] = discardSubmission;
+		$[133] = removePendingAttachments;
+		$[134] = setAttachments;
+		$[135] = setQuote;
+		$[136] = setRole;
+		$[137] = setRunConfig;
+		$[138] = setText;
+		$[139] = t34;
+	} else t34 = $[139];
+	let t35;
+	if ($[140] !== attachmentsRef || $[141] !== destroySignal || $[142] !== dispatchMessage || $[143] !== isEditingRef || $[144] !== isSendDisabled || $[145] !== prepareSubmission || $[146] !== quoteRef || $[147] !== roleRef || $[148] !== runConfigRef || $[149] !== setAttachments || $[150] !== setQuote || $[151] !== setSubmission || $[152] !== setText || $[153] !== submissionRef || $[154] !== textRef || $[155] !== type) {
+		t35 = (opts) => {
+			const currentAttachments = attachmentsRef.current.filter((attachment_21) => !attachmentSends.isRemoved(attachment_21));
+			const isEmpty_0 = !textRef.current.trim() && !currentAttachments.length;
 			if (!isEditingRef.current) throw new Error("Composer is not available");
-			if (isEmpty_0 || isSendDisabled) return;
-			attachmentAddOperations.cancelAll();
-			setText("");
-			setAttachments([]);
-			setQuote(void 0);
-			const dispatch = (sendAttachments) => {
-				const composedMessage = {
-					role: currentRole,
-					content: currentText ? [{
-						type: "text",
-						text: currentText
-					}] : [],
-					attachments: sendAttachments,
-					createdAt: /* @__PURE__ */ new Date(),
-					parentId: null,
-					sourceId: null,
-					runConfig: currentRunConfig,
-					startRun: opts?.startRun,
-					metadata: { custom: { ...currentQuote ? { quote: currentQuote } : {} } }
-				};
-				if (queue && type === "thread") {
-					if (opts?.steer ?? isRunning) queue.steer(composedMessage);
-					else queue.enqueue(composedMessage);
-				} else onSend?.(composedMessage);
-				if (type === "edit") setIsEditing(false);
+			if (isEmpty_0 || isSendDisabled || submissionRef.current) return;
+			const submitted_0 = {
+				id: generateId(),
+				role: roleRef.current,
+				text: textRef.current,
+				quote: quoteRef.current,
+				attachments: currentAttachments
 			};
-			if (attachmentAdapter && currentAttachments.length > 0) Promise.all(currentAttachments.map((attachment_2) => attachment_2.status.type === "complete" ? attachment_2 : attachmentAdapter.send(attachment_2))).then(dispatch, (error_0) => {
-				setText((prev_3) => currentText && prev_3 ? currentText + "\n" + prev_3 : currentText || prev_3);
-				setQuote((prev_4) => prev_4 ?? currentQuote);
-				setAttachments((prev_5) => [...currentAttachments, ...prev_5]);
-				console.error("Failed to send attachments", error_0);
-			});
-			else dispatch(currentAttachments);
+			const context_1 = {
+				options: opts,
+				runConfig: runConfigRef.current
+			};
+			const complete = currentAttachments.filter(isAttachmentComplete);
+			const controller = complete.length === currentAttachments.length ? void 0 : new AbortController();
+			if (controller) {
+				submissionSend.current = {
+					...context_1,
+					controller
+				};
+				setSubmission(submitted_0);
+			}
+			if (type === "thread") {
+				const detached = new Set(currentAttachments);
+				setAttachments((prev_14) => prev_14.filter((attachment_22) => !detached.has(attachment_22)));
+				setText("");
+				setQuote(void 0);
+			}
+			const generation_0 = sendGeneration.current = sendGeneration.current + 1;
+			if (!controller) {
+				dispatchMessage(submitted_0, complete, context_1, false);
+				return;
+			}
+			const release = abortOnDestroy(destroySignal, controller);
+			prepareSubmission(generation_0).finally(release);
 		};
-		$[62] = attachmentAdapter;
-		$[63] = attachmentsRef;
-		$[64] = isEditingRef;
-		$[65] = isRunning;
-		$[66] = isSendDisabled;
-		$[67] = onSend;
-		$[68] = queue;
-		$[69] = quoteRef;
-		$[70] = roleRef;
-		$[71] = runConfigRef;
-		$[72] = setAttachments;
-		$[73] = setIsEditing;
-		$[74] = setQuote;
-		$[75] = setText;
-		$[76] = textRef;
-		$[77] = type;
-		$[78] = t19;
-	} else t19 = $[78];
-	let t20;
-	if ($[79] !== attachmentsRef || $[80] !== onCancel || $[81] !== removePendingAttachments || $[82] !== setAttachments || $[83] !== setIsEditing || $[84] !== type) {
-		t20 = () => {
+		$[140] = attachmentsRef;
+		$[141] = destroySignal;
+		$[142] = dispatchMessage;
+		$[143] = isEditingRef;
+		$[144] = isSendDisabled;
+		$[145] = prepareSubmission;
+		$[146] = quoteRef;
+		$[147] = roleRef;
+		$[148] = runConfigRef;
+		$[149] = setAttachments;
+		$[150] = setQuote;
+		$[151] = setSubmission;
+		$[152] = setText;
+		$[153] = submissionRef;
+		$[154] = textRef;
+		$[155] = type;
+		$[156] = t35;
+	} else t35 = $[156];
+	let t36;
+	if ($[157] !== attachmentsRef || $[158] !== canCancel || $[159] !== cancelSubmission || $[160] !== discardSubmission || $[161] !== onCancel || $[162] !== removePendingAttachments || $[163] !== setAttachments || $[164] !== setIsEditing || $[165] !== submissionRef || $[166] !== type) {
+		t36 = () => {
+			if (type === "thread" && submissionRef.current) {
+				cancelSubmission();
+				if (canCancel) onCancel?.();
+				return;
+			}
 			if (type === "edit") {
 				attachmentAddOperations.cancelAll();
+				sendGeneration.current = sendGeneration.current + 1;
+				discardSubmission();
 				const removed_2 = attachmentsRef.current;
 				setAttachments([]);
-				removePendingAttachments(removed_2).catch(_temp7);
+				removePendingAttachments(removed_2).catch(_temp11);
 			}
 			onCancel?.();
 			if (type === "edit") setIsEditing(false);
 		};
-		$[79] = attachmentsRef;
-		$[80] = onCancel;
-		$[81] = removePendingAttachments;
-		$[82] = setAttachments;
-		$[83] = setIsEditing;
-		$[84] = type;
-		$[85] = t20;
-	} else t20 = $[85];
-	let t21;
-	if ($[86] !== isEditingRef || $[87] !== onBeginEdit || $[88] !== setIsEditing || $[89] !== type || $[90] !== updateFromMessage) {
-		t21 = () => {
+		$[157] = attachmentsRef;
+		$[158] = canCancel;
+		$[159] = cancelSubmission;
+		$[160] = discardSubmission;
+		$[161] = onCancel;
+		$[162] = removePendingAttachments;
+		$[163] = setAttachments;
+		$[164] = setIsEditing;
+		$[165] = submissionRef;
+		$[166] = type;
+		$[167] = t36;
+	} else t36 = $[167];
+	let t37;
+	if ($[168] !== isEditingRef || $[169] !== onBeginEdit || $[170] !== setIsEditing || $[171] !== type || $[172] !== updateFromMessage) {
+		t37 = () => {
 			onBeginEdit?.();
 			if (type === "thread") return;
 			if (isEditingRef.current) throw new Error("Edit already in progress");
 			setIsEditing(true);
 			updateFromMessage();
 		};
-		$[86] = isEditingRef;
-		$[87] = onBeginEdit;
-		$[88] = setIsEditing;
-		$[89] = type;
-		$[90] = updateFromMessage;
-		$[91] = t21;
-	} else t21 = $[91];
-	let t22;
-	if ($[92] !== queueItemClients) {
-		t22 = (selector_0) => {
+		$[168] = isEditingRef;
+		$[169] = onBeginEdit;
+		$[170] = setIsEditing;
+		$[171] = type;
+		$[172] = updateFromMessage;
+		$[173] = t37;
+	} else t37 = $[173];
+	let t38;
+	if ($[174] !== queueItemClients) {
+		t38 = (selector_0) => {
 			if ("id" in selector_0) return queueItemClients.get({ key: selector_0.id });
 			return queueItemClients.get(selector_0);
 		};
-		$[92] = queueItemClients;
-		$[93] = t22;
-	} else t22 = $[93];
-	let t23;
-	if ($[94] !== setQuote || $[95] !== setRole || $[96] !== setRunConfig || $[97] !== setText || $[98] !== t14 || $[99] !== t15 || $[100] !== t16 || $[101] !== t17 || $[102] !== t18 || $[103] !== t19 || $[104] !== t20 || $[105] !== t21 || $[106] !== t22) {
-		t23 = {
-			getState: t14,
+		$[174] = queueItemClients;
+		$[175] = t38;
+	} else t38 = $[175];
+	let t39;
+	if ($[176] !== setQuote || $[177] !== setRole || $[178] !== setRunConfig || $[179] !== setText || $[180] !== t30 || $[181] !== t31 || $[182] !== t32 || $[183] !== t33 || $[184] !== t34 || $[185] !== t35 || $[186] !== t36 || $[187] !== t37 || $[188] !== t38) {
+		t39 = {
+			getState: t30,
 			setText,
 			setRole,
 			setRunConfig,
-			addAttachment: t15,
-			clearAttachments: t16,
-			attachment: t17,
-			reset: t18,
-			send: t19,
-			cancel: t20,
-			beginEdit: t21,
-			startDictation: _temp8,
-			stopDictation: _temp9,
+			addAttachment: t31,
+			clearAttachments: t32,
+			attachment: t33,
+			reset: t34,
+			send: t35,
+			cancel: t36,
+			beginEdit: t37,
+			startDictation: _temp12,
+			stopDictation: _temp13,
 			setQuote,
-			queueItem: t22
+			queueItem: t38
 		};
-		$[94] = setQuote;
-		$[95] = setRole;
-		$[96] = setRunConfig;
-		$[97] = setText;
-		$[98] = t14;
-		$[99] = t15;
-		$[100] = t16;
-		$[101] = t17;
-		$[102] = t18;
-		$[103] = t19;
-		$[104] = t20;
-		$[105] = t21;
-		$[106] = t22;
-		$[107] = t23;
-	} else t23 = $[107];
-	return t23;
+		$[176] = setQuote;
+		$[177] = setRole;
+		$[178] = setRunConfig;
+		$[179] = setText;
+		$[180] = t30;
+		$[181] = t31;
+		$[182] = t32;
+		$[183] = t33;
+		$[184] = t34;
+		$[185] = t35;
+		$[186] = t36;
+		$[187] = t37;
+		$[188] = t38;
+		$[189] = t39;
+	} else t39 = $[189];
+	return t39;
 };
 const ComposerClientResource = resource(useComposerClientResource);
 const createSpeechController = (notify) => {
@@ -890,8 +1332,8 @@ const dedupeMessagesById = (messages) => {
 	return deduped.length === messages.length ? messages : deduped.reverse();
 };
 const useExternalThread = (t0) => {
-	const $ = c(125);
-	const { messages: messagesProp, isRunning: t1, isLoading: t2, state: threadState, extras, isSendDisabled: t3, onNew, onEdit, onReload, onStartRun, onCancel, onResume, onRefetchThread, onAddToolResult, onResumeToolCall, onLoadExternalState, attachmentAdapter, feedbackAdapter, speechAdapter, queue, branches, onRespondToToolApproval } = t0;
+	const $ = c(146);
+	const { messages: messagesProp, isRunning: t1, isLoading: t2, state: threadState, extras, isSendDisabled: t3, onNew, onEdit, onReload, onStartRun, onCancel, onResume, onRefetchThread, onAddToolResult, onResumeToolCall, unstable_onRecordToolInteraction, onLoadExternalState, attachmentAdapter, feedbackAdapter, speechAdapter, queue, branches, onRespondToToolApproval } = t0;
 	const isRunning = t1 === void 0 ? false : t1;
 	const isLoading = t2 === void 0 ? false : t2;
 	const isSendDisabled = t3 === void 0 ? false : t3;
@@ -1028,146 +1470,209 @@ const useExternalThread = (t0) => {
 	} else t16 = $[23];
 	const handleReload = t16;
 	let t17;
-	if ($[24] !== attachmentAdapter || $[25] !== branches || $[26] !== feedbackFor || $[27] !== handleReload || $[28] !== handleSpeak || $[29] !== handleSubmitFeedback || $[30] !== messages || $[31] !== onAddToolResult || $[32] !== onEdit || $[33] !== onRespondToToolApproval || $[34] !== onResumeToolCall || $[35] !== queue || $[36] !== speech || $[37] !== speechController) {
-		t17 = messages.map((msg_1, index) => {
-			const props = {
-				message: msg_1,
-				index,
-				parentId: index > 0 ? messages[index - 1].id : null,
-				onReload: () => handleReload(msg_1.id),
-				queue,
-				branches,
-				onRespondToToolApproval,
-				onAddToolResult,
-				onResumeToolCall,
-				attachmentAdapter,
-				submittedFeedback: feedbackFor(msg_1),
-				onSubmitFeedback: (feedback_0) => handleSubmitFeedback(msg_1, feedback_0),
-				speech: speech?.messageId === msg_1.id ? speech : void 0,
-				onSpeak: () => handleSpeak(msg_1),
-				onStopSpeaking: () => speechController.stopMessage(msg_1.id)
-			};
-			if (onEdit) props.onEdit = onEdit;
-			return withKey(msg_1.id, MessageClient(props));
-		});
-		$[24] = attachmentAdapter;
-		$[25] = branches;
-		$[26] = feedbackFor;
-		$[27] = handleReload;
-		$[28] = handleSpeak;
-		$[29] = handleSubmitFeedback;
-		$[30] = messages;
-		$[31] = onAddToolResult;
-		$[32] = onEdit;
-		$[33] = onRespondToToolApproval;
-		$[34] = onResumeToolCall;
-		$[35] = queue;
-		$[36] = speech;
-		$[37] = speechController;
-		$[38] = t17;
-	} else t17 = $[38];
-	const messageClients = useClientLookup(t17);
+	if ($[24] !== messages) {
+		t17 = messages.map(_temp14);
+		$[24] = messages;
+		$[25] = t17;
+	} else t17 = $[25];
+	const messageKeys = t17;
 	let t18;
-	if ($[39] === Symbol.for("react.memo_cache_sentinel")) {
-		t18 = createTaskDeriver();
-		$[39] = t18;
-	} else t18 = $[39];
-	const taskDeriver = t18;
-	let t19;
-	if ($[40] !== messages) {
-		t19 = taskDeriver(messages);
-		$[40] = messages;
-		$[41] = t19;
-	} else t19 = $[41];
-	const tasks = t19;
-	let t20;
-	if ($[42] !== tasks) {
-		t20 = tasks.map(_temp0);
-		$[42] = tasks;
-		$[43] = t20;
-	} else t20 = $[43];
-	const taskClients = useClientLookup(t20);
-	let t21;
-	if ($[44] !== onCancel || $[45] !== queue) {
-		t21 = () => {
+	if ($[26] !== onCancel || $[27] !== queue) {
+		t18 = () => {
 			if (!onCancel) return;
 			queue?.__internal_notifyCancelled?.();
 			onCancel();
 		};
-		$[44] = onCancel;
-		$[45] = queue;
-		$[46] = t21;
-	} else t21 = $[46];
-	const handleCancelRun = t21;
-	let t22;
-	if ($[47] !== messages || $[48] !== onNew) {
-		t22 = (message_1) => {
+		$[26] = onCancel;
+		$[27] = queue;
+		$[28] = t18;
+	} else t18 = $[28];
+	const handleCancelRun = t18;
+	let t19;
+	if ($[29] !== messages || $[30] !== onNew) {
+		t19 = (message_2) => {
 			onNew?.({
-				...message_1,
+				...message_2,
 				parentId: messages.at(-1)?.id ?? null
 			});
 		};
-		$[47] = messages;
-		$[48] = onNew;
-		$[49] = t22;
-	} else t22 = $[49];
-	const handleSendNew = t22;
-	let t23;
-	if ($[50] !== messages) {
-		t23 = messages.at(-1)?.id ?? null;
-		$[50] = messages;
-		$[51] = t23;
-	} else t23 = $[51];
-	const headId = t23;
+		$[29] = messages;
+		$[30] = onNew;
+		$[31] = t19;
+	} else t19 = $[31];
+	const handleSendNew = t19;
+	let t20;
+	if ($[32] !== messages) {
+		t20 = messages.at(-1)?.id ?? null;
+		$[32] = messages;
+		$[33] = t20;
+	} else t20 = $[33];
+	const headId = t20;
 	const hasCancel = !!onCancel;
 	const hasRefetchThread = !!onRefetchThread;
-	let t24;
-	if ($[52] !== headId || $[53] !== queue) {
-		t24 = queue && {
+	let t21;
+	if ($[34] !== headId || $[35] !== queue) {
+		t21 = queue && {
 			...queue,
-			enqueue: (message_2) => queue.enqueue({
-				...message_2,
-				parentId: message_2.parentId ?? headId
-			}),
-			steer: (message_3) => queue.steer({
+			enqueue: (message_3) => queue.enqueue({
 				...message_3,
 				parentId: message_3.parentId ?? headId
+			}),
+			steer: (message_4) => queue.steer({
+				...message_4,
+				parentId: message_4.parentId ?? headId
 			})
 		};
-		$[52] = headId;
-		$[53] = queue;
-		$[54] = t24;
-	} else t24 = $[54];
-	const composerQueue = t24;
-	const t25 = isRunning && hasCancel;
-	let t26;
-	if ($[55] !== attachmentAdapter || $[56] !== composerQueue || $[57] !== handleCancelRun || $[58] !== handleSendNew || $[59] !== isRunning || $[60] !== isSendDisabled || $[61] !== t25) {
-		t26 = ComposerClientResource({
+		$[34] = headId;
+		$[35] = queue;
+		$[36] = t21;
+	} else t21 = $[36];
+	const composerQueue = t21;
+	const t22 = isRunning && hasCancel;
+	let t23;
+	if ($[37] !== attachmentAdapter || $[38] !== composerQueue || $[39] !== handleCancelRun || $[40] !== handleSendNew || $[41] !== isRunning || $[42] !== isSendDisabled || $[43] !== messageKeys || $[44] !== t22) {
+		t23 = ComposerClientResource({
 			type: "thread",
-			canCancel: t25,
+			canCancel: t22,
 			isRunning,
 			isSendDisabled,
 			onCancel: handleCancelRun,
 			onSend: handleSendNew,
 			queue: composerQueue,
-			attachmentAdapter
+			attachmentAdapter,
+			messageKeys
 		});
-		$[55] = attachmentAdapter;
-		$[56] = composerQueue;
-		$[57] = handleCancelRun;
-		$[58] = handleSendNew;
-		$[59] = isRunning;
-		$[60] = isSendDisabled;
-		$[61] = t25;
-		$[62] = t26;
-	} else t26 = $[62];
-	const composerClient = useClientResource(t26);
+		$[37] = attachmentAdapter;
+		$[38] = composerQueue;
+		$[39] = handleCancelRun;
+		$[40] = handleSendNew;
+		$[41] = isRunning;
+		$[42] = isSendDisabled;
+		$[43] = messageKeys;
+		$[44] = t22;
+		$[45] = t23;
+	} else t23 = $[45];
+	const composerClient = useClientResource(t23);
+	const submission = composerClient.state.submission;
+	const inTransit = composerClient.state.inTransit;
+	let t24;
+	if ($[46] !== inTransit) {
+		t24 = inTransit ?? [];
+		$[46] = inTransit;
+		$[47] = t24;
+	} else t24 = $[47];
+	let t25;
+	if ($[48] !== submission) {
+		t25 = submission ? [submission] : [];
+		$[48] = submission;
+		$[49] = t25;
+	} else t25 = $[49];
+	let t26;
+	if ($[50] !== t24 || $[51] !== t25) {
+		t26 = [...t24, ...t25];
+		$[50] = t24;
+		$[51] = t25;
+		$[52] = t26;
+	} else t26 = $[52];
+	const pending = t26;
+	const hasPending = pending.length > 0;
 	let t27;
-	if ($[63] === Symbol.for("react.memo_cache_sentinel")) {
-		t27 = ThreadSuggestions(EMPTY_SUGGESTIONS);
-		$[63] = t27;
-	} else t27 = $[63];
-	const suggestionsClient = useClientResource(t27);
+	if ($[53] !== attachmentAdapter || $[54] !== branches || $[55] !== feedbackFor || $[56] !== handleReload || $[57] !== handleSpeak || $[58] !== handleSubmitFeedback || $[59] !== hasPending || $[60] !== messages || $[61] !== onAddToolResult || $[62] !== onEdit || $[63] !== onRespondToToolApproval || $[64] !== onResumeToolCall || $[65] !== queue || $[66] !== speech || $[67] !== speechController || $[68] !== unstable_onRecordToolInteraction) {
+		t27 = messages.map((msg_1, index) => {
+			const props = {
+				message: msg_1,
+				index,
+				isLast: index === messages.length - 1 && !hasPending,
+				parentId: index > 0 ? messages[index - 1].id : null,
+				onReload: () => handleReload(msg_1.id),
+				queue,
+				branches,
+				onRespondToToolApproval,
+				unstable_onRecordToolInteraction,
+				onAddToolResult,
+				onResumeToolCall,
+				attachmentAdapter,
+				submittedFeedback: feedbackFor(msg_1),
+				onSubmitFeedback: (feedback_0) => handleSubmitFeedback(msg_1, feedback_0),
+				speech: speech?.messageId === msg_1.id ? speech : void 0,
+				onSpeak: () => handleSpeak(msg_1),
+				onStopSpeaking: () => speechController.stopMessage(msg_1.id)
+			};
+			if (onEdit) props.onEdit = onEdit;
+			return withKey(msg_1.id, MessageClient(props));
+		});
+		$[53] = attachmentAdapter;
+		$[54] = branches;
+		$[55] = feedbackFor;
+		$[56] = handleReload;
+		$[57] = handleSpeak;
+		$[58] = handleSubmitFeedback;
+		$[59] = hasPending;
+		$[60] = messages;
+		$[61] = onAddToolResult;
+		$[62] = onEdit;
+		$[63] = onRespondToToolApproval;
+		$[64] = onResumeToolCall;
+		$[65] = queue;
+		$[66] = speech;
+		$[67] = speechController;
+		$[68] = unstable_onRecordToolInteraction;
+		$[69] = t27;
+	} else t27 = $[69];
+	const messageClients = useClientLookup(t27);
+	let t28;
+	if ($[70] !== pending) {
+		t28 = pending.map(submissionThreadMessage);
+		$[70] = pending;
+		$[71] = t28;
+	} else t28 = $[71];
+	const pendingMessages = t28;
+	let t29;
+	if ($[72] !== messages.length || $[73] !== pending || $[74] !== pendingMessages) {
+		t29 = pending.map((row, index_0) => withKey(row.id, ThreadMessageClient({
+			message: pendingMessages[index_0],
+			submission: row,
+			index: messages.length + index_0,
+			isLast: index_0 === pending.length - 1
+		}), [
+			pendingMessages[index_0],
+			row,
+			messages.length,
+			index_0,
+			pending.length
+		]));
+		$[72] = messages.length;
+		$[73] = pending;
+		$[74] = pendingMessages;
+		$[75] = t29;
+	} else t29 = $[75];
+	const pendingClients = useClientLookup(t29);
+	let t30;
+	if ($[76] === Symbol.for("react.memo_cache_sentinel")) {
+		t30 = createTaskDeriver();
+		$[76] = t30;
+	} else t30 = $[76];
+	const taskDeriver = t30;
+	let t31;
+	if ($[77] !== messages) {
+		t31 = taskDeriver(messages);
+		$[77] = messages;
+		$[78] = t31;
+	} else t31 = $[78];
+	const tasks = t31;
+	let t32;
+	if ($[79] !== tasks) {
+		t32 = tasks.map(_temp15);
+		$[79] = tasks;
+		$[80] = t32;
+	} else t32 = $[80];
+	const taskClients = useClientLookup(t32);
+	let t33;
+	if ($[81] === Symbol.for("react.memo_cache_sentinel")) {
+		t33 = ThreadSuggestions(EMPTY_SUGGESTIONS);
+		$[81] = t33;
+	} else t33 = $[81];
+	const suggestionsClient = useClientResource(t33);
 	const hasQueue = !!queue;
 	const hasBranches = !!branches;
 	const hasEdit = !!onEdit;
@@ -1175,17 +1680,18 @@ const useExternalThread = (t0) => {
 	const hasAttachments = !!attachmentAdapter;
 	const hasFeedback = !!feedbackAdapter;
 	const hasSpeech = !!speechAdapter;
-	let t28;
-	if ($[64] !== messageClients.state) {
-		t28 = messageClients.state.map(_temp1);
-		$[64] = messageClients.state;
-		$[65] = t28;
-	} else t28 = $[65];
-	const messageStates = t28;
-	const t29 = messages.length === 0 && !isLoading;
-	let t30;
-	if ($[66] !== hasAttachments || $[67] !== hasBranches || $[68] !== hasCancel || $[69] !== hasEdit || $[70] !== hasFeedback || $[71] !== hasQueue || $[72] !== hasRefetchThread || $[73] !== hasReload || $[74] !== hasSpeech) {
-		t30 = {
+	let t34;
+	if ($[82] !== messageClients.state || $[83] !== pendingClients.state) {
+		t34 = pendingClients.state.length === 0 ? messageClients.state : [...messageClients.state, ...pendingClients.state];
+		$[82] = messageClients.state;
+		$[83] = pendingClients.state;
+		$[84] = t34;
+	} else t34 = $[84];
+	const messageStates = t34;
+	const t35 = messageStates.length === 0 && !isLoading;
+	let t36;
+	if ($[85] !== hasAttachments || $[86] !== hasBranches || $[87] !== hasCancel || $[88] !== hasEdit || $[89] !== hasFeedback || $[90] !== hasQueue || $[91] !== hasRefetchThread || $[92] !== hasReload || $[93] !== hasSpeech) {
+		t36 = {
 			edit: hasEdit,
 			delete: false,
 			reload: hasReload,
@@ -1201,88 +1707,88 @@ const useExternalThread = (t0) => {
 			dictation: false,
 			queue: hasQueue
 		};
-		$[66] = hasAttachments;
-		$[67] = hasBranches;
-		$[68] = hasCancel;
-		$[69] = hasEdit;
-		$[70] = hasFeedback;
-		$[71] = hasQueue;
-		$[72] = hasRefetchThread;
-		$[73] = hasReload;
-		$[74] = hasSpeech;
-		$[75] = t30;
-	} else t30 = $[75];
-	let t31;
-	if ($[76] !== threadState) {
-		t31 = threadState ?? {};
-		$[76] = threadState;
-		$[77] = t31;
-	} else t31 = $[77];
-	let t32;
-	if ($[78] !== composerClient.state || $[79] !== extras || $[80] !== isLoading || $[81] !== isRunning || $[82] !== messageStates || $[83] !== speech || $[84] !== t29 || $[85] !== t30 || $[86] !== t31 || $[87] !== tasks) {
-		t32 = {
-			isEmpty: t29,
+		$[85] = hasAttachments;
+		$[86] = hasBranches;
+		$[87] = hasCancel;
+		$[88] = hasEdit;
+		$[89] = hasFeedback;
+		$[90] = hasQueue;
+		$[91] = hasRefetchThread;
+		$[92] = hasReload;
+		$[93] = hasSpeech;
+		$[94] = t36;
+	} else t36 = $[94];
+	let t37;
+	if ($[95] !== threadState) {
+		t37 = threadState ?? {};
+		$[95] = threadState;
+		$[96] = t37;
+	} else t37 = $[96];
+	let t38;
+	if ($[97] !== composerClient.state || $[98] !== extras || $[99] !== isLoading || $[100] !== isRunning || $[101] !== messageStates || $[102] !== speech || $[103] !== t35 || $[104] !== t36 || $[105] !== t37 || $[106] !== tasks) {
+		t38 = {
+			isEmpty: t35,
 			isDisabled: false,
 			isLoading,
 			isRunning,
-			capabilities: t30,
+			capabilities: t36,
 			messages: messageStates,
 			tasks,
-			state: t31,
+			state: t37,
 			suggestions: EMPTY_SUGGESTIONS,
 			extras,
 			speech,
 			voice: void 0,
 			composer: composerClient.state
 		};
-		$[78] = composerClient.state;
-		$[79] = extras;
-		$[80] = isLoading;
-		$[81] = isRunning;
-		$[82] = messageStates;
-		$[83] = speech;
-		$[84] = t29;
-		$[85] = t30;
-		$[86] = t31;
-		$[87] = tasks;
-		$[88] = t32;
-	} else t32 = $[88];
-	const state = t32;
-	let t33;
-	if ($[89] !== state) {
-		t33 = () => state;
-		$[89] = state;
-		$[90] = t33;
-	} else t33 = $[90];
-	let t34;
-	if ($[91] !== composerClient.methods) {
-		t34 = () => composerClient.methods;
-		$[91] = composerClient.methods;
-		$[92] = t34;
-	} else t34 = $[92];
-	let t35;
-	if ($[93] !== suggestionsClient) {
-		t35 = () => suggestionsClient.methods;
-		$[93] = suggestionsClient;
-		$[94] = t35;
-	} else t35 = $[94];
-	let t36;
-	if ($[95] !== taskClients || $[96] !== tasks) {
-		t36 = (selector) => {
+		$[97] = composerClient.state;
+		$[98] = extras;
+		$[99] = isLoading;
+		$[100] = isRunning;
+		$[101] = messageStates;
+		$[102] = speech;
+		$[103] = t35;
+		$[104] = t36;
+		$[105] = t37;
+		$[106] = tasks;
+		$[107] = t38;
+	} else t38 = $[107];
+	const state = t38;
+	let t39;
+	if ($[108] !== state) {
+		t39 = () => state;
+		$[108] = state;
+		$[109] = t39;
+	} else t39 = $[109];
+	let t40;
+	if ($[110] !== composerClient.methods) {
+		t40 = () => composerClient.methods;
+		$[110] = composerClient.methods;
+		$[111] = t40;
+	} else t40 = $[111];
+	let t41;
+	if ($[112] !== suggestionsClient) {
+		t41 = () => suggestionsClient.methods;
+		$[112] = suggestionsClient;
+		$[113] = t41;
+	} else t41 = $[113];
+	let t42;
+	if ($[114] !== taskClients || $[115] !== tasks) {
+		t42 = (selector) => {
 			if ("id" in selector) {
 				const task_0 = tasks.find((candidate) => candidate.id === selector.id);
 				return taskClients.get({ key: task_0 ? getTaskKey(task_0) : selector.id });
 			}
 			return taskClients.get(selector);
 		};
-		$[95] = taskClients;
-		$[96] = tasks;
-		$[97] = t36;
-	} else t36 = $[97];
-	let t37;
-	if ($[98] !== messages || $[99] !== onNew || $[100] !== queue) {
-		t37 = (message_4) => {
-			const appendMessage = typeof message_4 === "string" ? {
+		$[114] = taskClients;
+		$[115] = tasks;
+		$[116] = t42;
+	} else t42 = $[116];
+	let t43;
+	if ($[117] !== messages || $[118] !== onNew || $[119] !== queue) {
+		t43 = (message_5) => {
+			const appendMessage = typeof message_5 === "string" ? {
 				createdAt: /* @__PURE__ */ new Date(),
 				parentId: messages.at(-1)?.id ?? null,
 				sourceId: null,
@@ -1290,112 +1796,118 @@ const useExternalThread = (t0) => {
 				role: "user",
 				content: [{
 					type: "text",
-					text: message_4
+					text: message_5
 				}],
 				attachments: [],
 				metadata: { custom: {} }
 			} : {
-				createdAt: message_4.createdAt ?? /* @__PURE__ */ new Date(),
-				parentId: message_4.parentId === void 0 ? messages.at(-1)?.id ?? null : message_4.parentId,
-				sourceId: message_4.sourceId ?? null,
-				role: message_4.role ?? "user",
-				content: message_4.content,
-				attachments: message_4.attachments ?? [],
-				metadata: message_4.metadata ?? { custom: {} },
-				runConfig: message_4.runConfig ?? {},
-				startRun: message_4.startRun
+				createdAt: message_5.createdAt ?? /* @__PURE__ */ new Date(),
+				parentId: message_5.parentId === void 0 ? messages.at(-1)?.id ?? null : message_5.parentId,
+				sourceId: message_5.sourceId ?? null,
+				role: message_5.role ?? "user",
+				content: message_5.content,
+				attachments: message_5.attachments ?? [],
+				metadata: message_5.metadata ?? { custom: {} },
+				runConfig: message_5.runConfig ?? {},
+				startRun: message_5.startRun
 			};
 			if (queue) queue.enqueue(appendMessage);
 			else onNew?.(appendMessage);
 		};
-		$[98] = messages;
-		$[99] = onNew;
-		$[100] = queue;
-		$[101] = t37;
-	} else t37 = $[101];
-	let t38;
-	if ($[102] !== onStartRun) {
-		t38 = () => {
+		$[117] = messages;
+		$[118] = onNew;
+		$[119] = queue;
+		$[120] = t43;
+	} else t43 = $[120];
+	let t44;
+	if ($[121] !== onStartRun) {
+		t44 = () => {
 			onStartRun?.();
 		};
-		$[102] = onStartRun;
-		$[103] = t38;
-	} else t38 = $[103];
-	let t39;
-	if ($[104] !== onResume) {
-		t39 = () => {
+		$[121] = onStartRun;
+		$[122] = t44;
+	} else t44 = $[122];
+	let t45;
+	if ($[123] !== onResume) {
+		t45 = () => {
 			if (!onResume) throw new Error("Runtime does not support resuming runs (onResume is not set).");
 			onResume();
 		};
-		$[104] = onResume;
-		$[105] = t39;
-	} else t39 = $[105];
-	let t40;
-	if ($[106] !== onRefetchThread) {
-		t40 = onRefetchThread && { unstable_refetchThread: onRefetchThread };
-		$[106] = onRefetchThread;
-		$[107] = t40;
-	} else t40 = $[107];
-	let t41;
-	if ($[108] !== onLoadExternalState) {
-		t41 = (state_0) => {
+		$[123] = onResume;
+		$[124] = t45;
+	} else t45 = $[124];
+	let t46;
+	if ($[125] !== onRefetchThread) {
+		t46 = onRefetchThread && { unstable_refetchThread: onRefetchThread };
+		$[125] = onRefetchThread;
+		$[126] = t46;
+	} else t46 = $[126];
+	let t47;
+	if ($[127] !== onLoadExternalState) {
+		t47 = (state_0) => {
 			if (!onLoadExternalState) throw new Error("Runtime does not support importing external states (onLoadExternalState is not set).");
 			onLoadExternalState(state_0);
 		};
-		$[108] = onLoadExternalState;
-		$[109] = t41;
-	} else t41 = $[109];
-	let t42;
-	if ($[110] !== messageClients) {
-		t42 = (selector_0) => {
-			if ("id" in selector_0) return messageClients.get({ key: selector_0.id });
+		$[127] = onLoadExternalState;
+		$[128] = t47;
+	} else t47 = $[128];
+	let t48;
+	if ($[129] !== messageClients || $[130] !== pending || $[131] !== pendingClients) {
+		t48 = (selector_0) => {
+			if ("id" in selector_0) {
+				if (pending.some((row_0) => row_0.id === selector_0.id)) return pendingClients.get({ key: selector_0.id });
+				return messageClients.get({ key: selector_0.id });
+			}
+			if (selector_0.index >= messageClients.state.length) return pendingClients.get({ index: selector_0.index - messageClients.state.length });
 			return messageClients.get(selector_0);
 		};
-		$[110] = messageClients;
-		$[111] = t42;
-	} else t42 = $[111];
-	let t43;
-	if ($[112] !== handleCancelRun || $[113] !== speechController.stop || $[114] !== t33 || $[115] !== t34 || $[116] !== t35 || $[117] !== t36 || $[118] !== t37 || $[119] !== t38 || $[120] !== t39 || $[121] !== t40 || $[122] !== t41 || $[123] !== t42) {
-		t43 = {
-			getState: t33,
-			composer: t34,
-			suggestions: t35,
-			task: t36,
-			append: t37,
-			deleteMessage: _temp10,
-			startRun: t38,
-			resumeRun: t39,
+		$[129] = messageClients;
+		$[130] = pending;
+		$[131] = pendingClients;
+		$[132] = t48;
+	} else t48 = $[132];
+	let t49;
+	if ($[133] !== handleCancelRun || $[134] !== speechController.stop || $[135] !== t39 || $[136] !== t40 || $[137] !== t41 || $[138] !== t42 || $[139] !== t43 || $[140] !== t44 || $[141] !== t45 || $[142] !== t46 || $[143] !== t47 || $[144] !== t48) {
+		t49 = {
+			getState: t39,
+			composer: t40,
+			suggestions: t41,
+			task: t42,
+			append: t43,
+			deleteMessage: _temp16,
+			startRun: t44,
+			resumeRun: t45,
 			cancelRun: handleCancelRun,
-			...t40,
-			importExternalState: t41,
-			getModelContext: _temp11,
-			export: _temp12,
-			import: _temp13,
-			reset: _temp14,
-			message: t42,
+			...t46,
+			importExternalState: t47,
+			getModelContext: _temp17,
+			export: _temp18,
+			import: _temp19,
+			reset: _temp20,
+			message: t48,
 			stopSpeaking: speechController.stop,
-			connectVoice: _temp15,
-			disconnectVoice: _temp16,
-			getVoiceVolume: _temp17,
-			subscribeVoiceVolume: _temp19,
-			muteVoice: _temp20,
-			unmuteVoice: _temp21
+			connectVoice: _temp21,
+			disconnectVoice: _temp22,
+			getVoiceVolume: _temp23,
+			subscribeVoiceVolume: _temp25,
+			muteVoice: _temp26,
+			unmuteVoice: _temp27
 		};
-		$[112] = handleCancelRun;
-		$[113] = speechController.stop;
-		$[114] = t33;
-		$[115] = t34;
-		$[116] = t35;
-		$[117] = t36;
-		$[118] = t37;
-		$[119] = t38;
-		$[120] = t39;
-		$[121] = t40;
-		$[122] = t41;
-		$[123] = t42;
-		$[124] = t43;
-	} else t43 = $[124];
-	return t43;
+		$[133] = handleCancelRun;
+		$[134] = speechController.stop;
+		$[135] = t39;
+		$[136] = t40;
+		$[137] = t41;
+		$[138] = t42;
+		$[139] = t43;
+		$[140] = t44;
+		$[141] = t45;
+		$[142] = t46;
+		$[143] = t47;
+		$[144] = t48;
+		$[145] = t49;
+	} else t49 = $[145];
+	return t49;
 };
 const ExternalThread = resource(useExternalThread);
 attachTransformScopes(useExternalThread, (scopes, parent) => {
@@ -1436,52 +1948,65 @@ function _temp2(attachment) {
 	}));
 }
 function _temp3() {}
-function _temp4(part) {
+function _temp4() {}
+function _temp5(entry_1) {
+	return entry_1.submission;
+}
+function _temp6(part) {
 	return part.type === "text";
 }
-function _temp5(part_0) {
+function _temp7(part_0) {
 	return part_0.text;
 }
-function _temp6(a_0) {
-	return a_0.status.type !== "complete";
+function _temp8(a_2) {
+	return a_2.status.type !== "complete";
 }
-function _temp7(error_1) {
-	console.error("Failed to remove cancelled edit attachments", error_1);
+function _temp9(attachment_6) {
+	return [attachment_6.id, attachment_6];
 }
-function _temp8() {}
-function _temp9() {}
-function _temp0(task) {
-	return withKey(getTaskKey(task), TaskClient({ task }), [task]);
+function _temp0(a_7) {
+	return a_7.id;
 }
-function _temp1(s, idx, arr) {
-	return {
-		...s,
-		isLast: idx === arr.length - 1
-	};
+function _temp1(attachment_11) {
+	return [attachment_11.id, attachment_11];
+}
+function _temp10(result_0) {
+	return result_0.status === "rejected";
+}
+function _temp11(error_0) {
+	console.error("Failed to remove cancelled edit attachments", error_0);
+}
+function _temp12() {}
+function _temp13() {}
+function _temp14(message_1) {
+	return `${message_1.id}|${message_1.role}`;
+}
+function _temp15(task) {
+	return withKey(getTaskKey(task), TaskClient({ task }), [task]);
 }
-function _temp10() {}
-function _temp11() {
+function _temp16() {}
+function _temp17() {
 	return {
 		tools: {},
 		config: {}
 	};
 }
-function _temp12() {
+function _temp18() {
 	return { messages: [] };
 }
-function _temp13() {}
-function _temp14() {}
-function _temp15() {}
-function _temp16() {}
-function _temp17() {
+function _temp19() {}
+function _temp20() {}
+function _temp21() {}
+function _temp22() {}
+function _temp23() {
 	return 0;
 }
-function _temp18() {}
-function _temp19() {
-	return _temp18;
+function _temp24() {}
+function _temp25() {
+	return _temp24;
 }
-function _temp20() {}
-function _temp21() {}
+function _temp26() {}
+function _temp27() {}
 //#endregion
 export { ExternalThread };